Commit 26b0455c by lwilms

correct icons and order of sections

parent bb1450a9
...@@ -51,4 +51,4 @@ if __name__ == '__main__': ...@@ -51,4 +51,4 @@ if __name__ == '__main__':
exit(main('new_template')) exit(main('new_template'))
# TODO # TODO
# icons # order of sections
\ No newline at end of file \ No newline at end of file
...@@ -42,30 +42,25 @@ ...@@ -42,30 +42,25 @@
% Binwalk & Entropy Graph % Binwalk & Entropy Graph
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
\BLOCK{if 'binwalk' in analysis} \BLOCK{if 'binwalk' in analysis}
\section{Entropy Graph} %\section{Entropy Graph}
\includegraphics[width = \textwidth]{\VAR{analysis['binwalk']['entropy_analysis_graph'] | base64_to_png('entropy_analysis_graph', tmp_dir)}} \includegraphics[width = \textwidth]{\VAR{analysis['binwalk']['entropy_analysis_graph'] | base64_to_png('entropy_analysis_graph', tmp_dir)}}
\BLOCK{endif} \BLOCK{endif}
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
% Executables % Software Components
% ----------------------------------------------------------------------------------------------------------------------
\section{Executables}
\begin{twentyshort}
\BLOCK{for selected_summary in analysis['cpu_architecture']['summary']}
\twentyitemshort{\VAR{analysis['cpu_architecture']['summary'][selected_summary] | elements_count}}{\VAR{selected_summary | filter_chars}}
\BLOCK{endfor}
\end{twentyshort}\\
% ----------------------------------------------------------------------------------------------------------------------
% Top 5 File Types
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
\section{Top five occuring file types} \BLOCK{if 'software_components' in analysis}
\section{Software}
\begin{twentyshort} \begin{twentyshort}
\BLOCK{for selected_summary in analysis['file_type']['summary'] | top_five} \BLOCK{for summary in analysis['software_components']['summary'] | sort | x_entires}
\twentyitemshort{\VAR{analysis['file_type']['summary'][selected_summary] | elements_count}}{\VAR{selected_summary | filter_chars}} \twentyitemshort{\VAR{summary | split_space}}
\BLOCK{endfor} \BLOCK{endfor}
\end{twentyshort}\\ \BLOCK{if analysis['software_components']['summary'] | elements_count > 10}
\twentyitemshort{}{and \VAR{analysis['software_components']['summary'] | elements_count - 10} others}
\BLOCK{endif}
\end{twentyshort}
\BLOCK{endif}\\
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
% Known Vulnerabilities % Known Vulnerabilities
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
...@@ -79,21 +74,15 @@ ...@@ -79,21 +74,15 @@
\end{twentyshort} \end{twentyshort}
\BLOCK{endif}\\ \BLOCK{endif}\\
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
% Software Components % Top 5 File Types
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
\BLOCK{if 'software_components' in analysis} \section{Top five occuring file types}
\section{Software}
\begin{twentyshort} \begin{twentyshort}
\BLOCK{for summary in analysis['software_components']['summary'] | sort | x_entires} \BLOCK{for selected_summary in analysis['file_type']['summary'] | top_five}
\twentyitemshort{\VAR{summary | split_space}} \twentyitemshort{\VAR{analysis['file_type']['summary'][selected_summary] | elements_count}}{\VAR{selected_summary | filter_chars}}
\BLOCK{endfor} \BLOCK{endfor}
\BLOCK{if analysis['software_components']['summary'] | elements_count > 10} \end{twentyshort}\\
\twentyitemshort{}{and \VAR{analysis['software_components']['summary'] | elements_count - 10} others}
\BLOCK{endif}
\end{twentyshort}
\BLOCK{endif}\\
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
% IP & URI % IP & URI
% ---------------------------------------------------------------------------------------------------------------------- % ----------------------------------------------------------------------------------------------------------------------
...@@ -106,7 +95,16 @@ ...@@ -106,7 +95,16 @@
\BLOCK{endfor} \BLOCK{endfor}
\end{twentyshort} \end{twentyshort}
\BLOCK{endif} \BLOCK{endif}
% ----------------------------------------------------------------------------------------------------------------------
% Executables
% ----------------------------------------------------------------------------------------------------------------------
\section{Executables}
\begin{twentyshort}
\BLOCK{for selected_summary in analysis['cpu_architecture']['summary']}
\twentyitemshort{\VAR{analysis['cpu_architecture']['summary'][selected_summary] | elements_count}}{\VAR{selected_summary | filter_chars}}
\BLOCK{endfor}
\end{twentyshort}\\
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
% SECOND PAGE EXAMPLE % SECOND PAGE EXAMPLE
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
......
...@@ -22,6 +22,20 @@ ...@@ -22,6 +22,20 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax \ProcessOptions\relax
\newbool{icon}
\DeclareOption{icon}{%
\booltrue{icon}
}
\DeclareOption{print}{\def\@cv@print{}}
\DeclareOption*{
\PassOptionsToClass{\CurrentOption}{article}
}
\ProcessOptions\relax
\ifbool{icon}{\RequirePackage{fontawesome}}{}
\usetikzlibrary{calc}
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
% COLOURS % COLOURS
%---------------------------------------------------------------------------------------- %----------------------------------------------------------------------------------------
...@@ -139,10 +153,10 @@ ...@@ -139,10 +153,10 @@
\renewcommand{\arraystretch}{1.6} \renewcommand{\arraystretch}{1.6}
\begin{tabular}{p{0.5cm} @{\hskip 0.5cm}p{5cm}} \begin{tabular}{p{0.5cm} @{\hskip 0.5cm}p{5cm}}
\ifthenelse{\equal{\cvdate}{}}{}{\textsc{\Large\icon{\Info}} & \cvdate\\} \ifthenelse{\equal{\cvdate}{}}{}{\textsc{\large\icon{\faIndustry}} & \cvdate\\}
\ifthenelse{\equal{\cvaddress}{}}{}{\textsc{\Large\icon{\Letter}} & \cvaddress\\} \ifthenelse{\equal{\cvaddress}{}}{}{\textsc{\Large\icon{\faArrowsH}} & \cvaddress\\}
\ifthenelse{\equal{\cvnumberphone}{}}{}{\textsc{\Large\icon{\Telefon}} & \cvnumberphone\\} \ifthenelse{\equal{\cvnumberphone}{}}{}{\textsc{\Large\icon{\faCodeFork}} & \cvnumberphone\\}
\ifthenelse{\equal{\cvsite}{}}{}{\textsc{\Large\icon{\Mundus}} & \cvsite\\} \ifthenelse{\equal{\cvsite}{}}{}{\textsc{\large\icon{\faCalendar}} & \cvsite\\}
\ifthenelse{\equal{\cvmail}{}}{}{\textsc{\large\icon{@}} & \href{mailto:\cvmail}{\cvmail}} \ifthenelse{\equal{\cvmail}{}}{}{\textsc{\large\icon{@}} & \href{mailto:\cvmail}{\cvmail}}
\end{tabular} \end{tabular}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment