Merge branch 'master' into complete

4 files changed, 68 insertions, 55 deletions

diff --git a/awesome-source-cv.cls b/awesome-source-cv.cls
index 4843cfd..e5a7e98 100755
--- a/awesome-source-cv.cls
+++ b/awesome-source-cv.cls
@@ -32,6 +32,9 @@
 \DeclareOption{indigo}{
   \def\@indigo{indigo}
 }
+\DeclareOption{orange}{
+  \def\@orange{orange}
+}
 
 \DeclareOption{localFont}{
   \def\@local{local}
@@ -57,38 +60,27 @@
 \RequirePackage{tikz}
 \RequirePackage{pgffor}
 
-% Define default colors
-\definecolor{accentcolor}{rgb}{0,0.2,0.6}
-\definecolor{linkcolor}{rgb}{0,0.2,0.6}
-\definecolor{symbolcolor}{rgb}{0,0.2,0.6}
+% Define default accent colors
+\definecolor{basecolor}{HTML}{000066}       %BLUE
 
-\ifundef{\@green} 
-{
-  \ifundef{\@red} 
-  {
-    \ifundef{\@indigo}
-    {}
-    {
-      \definecolor{accentcolor}{rgb}{0.2, 0.07, 0.48}
-      \definecolor{linkcolor}{rgb}{0.2, 0.07, 0.48}
-      \definecolor{symbolcolor}{rgb}{0.2, 0.07, 0.48}
+\ifundef{\@green} {
+  \ifundef{\@red} {
+    \ifundef{\@indigo}{
+      \ifundef{\@orange} {}
+      { \definecolor{basecolor}{HTML}{e68a00} }
     }
+    { \definecolor{basecolor}{rgb}{0.2, 0.07, 0.48} }
   }
-  {
-    \definecolor{accentcolor}{rgb}{0.83, 0.0, 0.0}
-    \definecolor{linkcolor}{rgb}{0.83, 0.0, 0.0}
-    \definecolor{symbolcolor}{rgb}{0.83, 0.0, 0.0}
-  }  
+  { \definecolor{basecolor}{HTML}{b30000} }     %RED
 }
-{
-  \definecolor{accentcolor}{rgb}{0.0, 0.62, 0.38}
-  \definecolor{linkcolor}{rgb}{0.0, 0.62, 0.38}
-  \definecolor{symbolcolor}{rgb}{0.0, 0.62, 0.38}
-}
-
+{ \definecolor{basecolor}{rgb}{0.0, 0.62, 0.38} }
 
 \definecolor{darkGrey}{HTML}{989898}
 
+\colorlet{linkcolor}{basecolor}
+\colorlet{accentcolor}{linkcolor!90}
+\colorlet{symbolcolor}{linkcolor!85}
+
 % Setup hyperref package, and colours for links
 %\definecolor{linkcolour}{rgb}{0,0.2,0.6}
 \hypersetup{breaklinks}
@@ -157,6 +149,13 @@
   \tikz[baseline]\node[anchor=base,draw=darkGrey!70,rounded corners=0.5ex,inner xsep=1ex,inner ysep =0.55ex,text height=1.3ex,text depth=.25ex]{#1};
 }
 
+% Create skill level
+%\newcommand{\cvskill}[2]{%
+%\textcolor{accentcolor}{\textbf{#1}}\hfill
+%\foreach \x in {1,...,5}{%
+%  \space{\color{accentcolor} \ifnumgreater{\x}{#2}{\faCircleThin}{\faCircle}}}\par%
+%}
+
 % Render author's name
 % Usage: \user{<firstanme>}{<lastname>}
 \newcommand\user[2]{\color{accentcolor}{\LARGE #1 \textbf{#2}}\color{Black}}      % Username
@@ -233,6 +232,33 @@
 % Resume part title definition
 \newcommand\sectionTitle[2]{\section{\texorpdfstring{\color{accentcolor}#2\enspace #1}{#1}}}
 
+\newcolumntype{D}{>{\raggedleft}p{\leftcolumn}}
+
+% Define the 'scolarship' environment
+\newenvironment{scolarship}{%
+  \begin{tabular}{D p{\rightcolumnlength}}
+}{%
+  \end{tabular}
+}
+
+\newcommand\scolarshipentry[2]{
+  #1    &  #2 \\
+}
+
+% Define the 'skills' environment
+\newenvironment{skills}{%
+  \begin{longtable}{R{\leftcolumn}p{\rightcolumnlength}}
+}{%
+  \end{longtable}
+}
+
+% Render a skill in the skills environment
+% Usage: 
+% \skill{<skill>}{<level>}
+\newcommand\skill[2]{
+  \textsc{#1}    & \foreach \x in {1,...,5}{{\color{accentcolor!80} \ifnumgreater{\x}{#2}{\faCircleO}{\faCircle}}\enspace } \\
+}
+
 % Define the 'experiences' environment
 \newenvironment{experiences}{%
   \begin{longtable}{R{\leftcolumn}|p{\rightcolumnlength}}
@@ -242,6 +268,7 @@
 
 % Render an experience in the experiences environment
 % Usage: 
+% \experience
 %  {<End date>}      {<Title>}{<Enterprise>}{<Country>}
 %  {<Start date}     {
 %                      <Experience description (Could be a list)>
@@ -257,6 +284,7 @@
 
 % Render a consultant experience in the experiences environment
 % Usage: 
+% \consultantexperience
 %  {<End date>}      {<Consultant title>}{<Consulting Enterprise>}{<Country>}
 %  {<Start date}     {<Client title>}{<Client business unit>}
 %                    {
diff --git a/section_langues.tex b/section_langues.tex
index 213ce9f..01ac4e2 100755
--- a/section_langues.tex
+++ b/section_langues.tex
@@ -11,7 +11,7 @@
 

 %Section: Languages

 \sectionTitle{Langues}{\faLanguage}

-\begin{tabular}{>{\small}r>{\small}l}

- \parbox{\datebox}{\raggedleft\textsc{Français:}}&Langue maternelle\\

-\textsc{Anglais:}&Maîtrise de l'anglais technique\\

-\end{tabular}
\ No newline at end of file
+\begin{skills}

+	\skill{Français}{5}

+	\skill{Anglais}{4}

+\end{skills}
\ No newline at end of file
diff --git a/section_perso.tex b/section_perso.tex
deleted file mode 100755
index 0a0057e..0000000
--- a/section_perso.tex
+++ /dev/null
@@ -1,19 +0,0 @@
-% Awesome Source CV LaTeX Template

-%

-% This template has been downloaded from:

-% https://github.com/darwiin/awesome-neue-latex-cv

-%

-% Author:

-% Christophe Roger

-%

-% Template license:

-% CC BY-SA 4.0 (https://creativecommons.org/licenses/by-sa/4.0/)

-

-%Section: Personal Data

-\user{Christophe}{ROGER}\\

-\small{

-	\linkedin{http://www.linkedin.com/in/christopheroger/fr}{christopheroger} \quad|\quad \viadeo{http://www.viadeo.com/fr/profile/christopheroger}{christopheroger} \quad|\quad \github{https://github.com/darwiin}{darwiin}   \\

-	\smartphone{+687 654 321} \quad|\quad \email{christophe.roger@domain.com}{christophe.roger@domain.com}\\	

-	\address{2 Rue du quartier, 98765 Ville, Pays}\\

-	\infos{Né le 23 septembre 1982 (33 ans) à Nouméa, Nouvelle-Calédonie} 

-}

diff --git a/section_scolarite.tex b/section_scolarite.tex
index 288ad8e..f2e14c8 100755
--- a/section_scolarite.tex
+++ b/section_scolarite.tex
@@ -11,10 +11,14 @@
 

 %Section: Scholarships and additional info

 \sectionTitle{Formation}{\faMortarBoard}

-\begin{tabular}{>{\small}r>{\small}p{14cm}}

- \parbox{\datebox}{\raggedleft 2007} & Master STIC Professionel filière MBDS

- de l'Université de Nice Sophia Antipolis (Master Informatique spécialité Multimédia, Base de Données et

- intégration de Systèmes) \\ 

- 2004 & BTS Informatique de Gestion option administrateurs de réseaux \\

- 2000 & Baccalauréat Scientifique option Mathématiques

-\end{tabular}
\ No newline at end of file
+

+\begin{scolarship}

+	\scolarshipentry{2007}

+					{Master STIC Professionel filière MBDS de l'Université de Nice Sophia Antipolis (Master Informatique spécialité Multimédia, Base de Données et intégration de Systèmes)}

+	\scolarshipentry{2005}

+					{Licence Sciences et Technologies, Mention Informatique, de l'Université de Nouvelle-Calédonie}

+	\scolarshipentry{2004}

+					{BTS Informatique de Gestion option administrateurs de réseaux}

+	\scolarshipentry{2000}

+					{Baccalauréat Scientifique option Mathématiques}

+\end{scolarship}
\ No newline at end of file