From 58835d553a94d44a5b5d6636e9f1357a01e8ff3c Mon Sep 17 00:00:00 2001
From: Sina Atalay <sinatalay@hotmail.com>
Date: Sat, 14 Oct 2023 18:31:43 +0200
Subject: [PATCH] update template folder structure

---
 .../templates/{ => classic}/classic.tex.j2    | 19 +++++++++++++++----
 .../date_and_location_strings.tex.j2          |  0
 .../components}/entry.tex.j2                  |  4 ++--
 .../components}/header.tex.j2                 |  2 +-
 .../components}/header_connections.tex.j2     |  0
 .../components}/highlights.tex.j2             |  0
 .../components}/section_contents.tex.j2       | 13 +++++++------
 7 files changed, 25 insertions(+), 13 deletions(-)
 rename rendercv/templates/{ => classic}/classic.tex.j2 (86%)
 rename rendercv/templates/{components/classic => classic/components}/date_and_location_strings.tex.j2 (100%)
 rename rendercv/templates/{components/classic => classic/components}/entry.tex.j2 (94%)
 rename rendercv/templates/{components/classic => classic/components}/header.tex.j2 (76%)
 rename rendercv/templates/{components/classic => classic/components}/header_connections.tex.j2 (100%)
 rename rendercv/templates/{components/classic => classic/components}/highlights.tex.j2 (100%)
 rename rendercv/templates/{components/classic => classic/components}/section_contents.tex.j2 (78%)

diff --git a/rendercv/templates/classic.tex.j2 b/rendercv/templates/classic/classic.tex.j2
similarity index 86%
rename from rendercv/templates/classic.tex.j2
rename to rendercv/templates/classic/classic.tex.j2
index 099c051..895e2a4 100644
--- a/rendercv/templates/classic.tex.j2
+++ b/rendercv/templates/classic/classic.tex.j2
@@ -1,8 +1,8 @@
 ((# IMPORT MACROS #))
-((* from "components/classic/section_contents.tex.j2" import section_contents with context *))
-((* from "components/classic/header.tex.j2" import header with context *))
+((* from "components/section_contents.tex.j2" import section_contents with context *))
+((* from "components/header.tex.j2" import header with context *))
 
-\documentclass[<<design.font_size>>, a4paper]{article}
+\documentclass[<<design.font_size>>, <<design.page_size>>]{article}
 
 % Packages:
 \usepackage[
@@ -117,10 +117,21 @@
 ((* endif *))
 
     <<header(name=cv.name, connections=cv.connections)|indent(4)>>
+((* if cv.summary is not none *))
+    \section{Summary}
+    \setlength{\leftskip}{<<theme_options.margins.entry_area.left>>}
+    \setlength{\rightskip}{<<theme_options.margins.entry_area.right>>}
+
+    <<cv.summary>>
+
+    \setlength{\leftskip}{0cm}
+    \setlength{\rightskip}{0cm}
+((* endif *))
 
 ((* for section in cv.sections *))
     \section{<<section.title>>}
-    <<section_contents(entries=section.entries, entry_type=section.entry_type)|indent(4)>>
+    <<section_contents(title=section.title, entries=section.entries, entry_type=section.entry_type, link_text=section.link_text)|indent(4)>>
+
 ((* endfor *))
 
 \end{document}
\ No newline at end of file
diff --git a/rendercv/templates/components/classic/date_and_location_strings.tex.j2 b/rendercv/templates/classic/components/date_and_location_strings.tex.j2
similarity index 100%
rename from rendercv/templates/components/classic/date_and_location_strings.tex.j2
rename to rendercv/templates/classic/components/date_and_location_strings.tex.j2
diff --git a/rendercv/templates/components/classic/entry.tex.j2 b/rendercv/templates/classic/components/entry.tex.j2
similarity index 94%
rename from rendercv/templates/components/classic/entry.tex.j2
rename to rendercv/templates/classic/components/entry.tex.j2
index 4cd8a29..1f1db87 100644
--- a/rendercv/templates/components/classic/entry.tex.j2
+++ b/rendercv/templates/classic/components/entry.tex.j2
@@ -1,5 +1,5 @@
-((* from "components/classic/highlights.tex.j2" import highlights as print_higlights with context *))
-((* from "components/classic/date_and_location_strings.tex.j2" import date_and_location_strings as print_date_and_locations with context *))
+((* from "components/highlights.tex.j2" import highlights as print_higlights with context *))
+((* from "components/date_and_location_strings.tex.j2" import date_and_location_strings as print_date_and_locations with context *))
 
 ((* macro education(study_type, institution, area, highlights, date_and_location_strings)*))
 ((# \begin{tabularx}{⟨width⟩}[⟨pos⟩]{⟨preamble⟩} #))
diff --git a/rendercv/templates/components/classic/header.tex.j2 b/rendercv/templates/classic/components/header.tex.j2
similarity index 76%
rename from rendercv/templates/components/classic/header.tex.j2
rename to rendercv/templates/classic/components/header.tex.j2
index f7e90c9..fcfcb6e 100644
--- a/rendercv/templates/components/classic/header.tex.j2
+++ b/rendercv/templates/classic/components/header.tex.j2
@@ -1,4 +1,4 @@
-((* import "components/classic/header_connections.tex.j2" as print_connections *))
+((* import "components/header_connections.tex.j2" as print_connections *))
 ((* macro header(name, connections) *))
 \begin{header}
     \Huge
diff --git a/rendercv/templates/components/classic/header_connections.tex.j2 b/rendercv/templates/classic/components/header_connections.tex.j2
similarity index 100%
rename from rendercv/templates/components/classic/header_connections.tex.j2
rename to rendercv/templates/classic/components/header_connections.tex.j2
diff --git a/rendercv/templates/components/classic/highlights.tex.j2 b/rendercv/templates/classic/components/highlights.tex.j2
similarity index 100%
rename from rendercv/templates/components/classic/highlights.tex.j2
rename to rendercv/templates/classic/components/highlights.tex.j2
diff --git a/rendercv/templates/components/classic/section_contents.tex.j2 b/rendercv/templates/classic/components/section_contents.tex.j2
similarity index 78%
rename from rendercv/templates/components/classic/section_contents.tex.j2
rename to rendercv/templates/classic/components/section_contents.tex.j2
index 589e907..017d0c5 100644
--- a/rendercv/templates/components/classic/section_contents.tex.j2
+++ b/rendercv/templates/classic/components/section_contents.tex.j2
@@ -1,8 +1,12 @@
-((* import "components/classic/entry.tex.j2" as entry with context *))
+((* import "components/entry.tex.j2" as entry with context *))
 
-((* macro section_contents(entries, entry_type, link_text=none)*))
+((* macro section_contents(title, entries, entry_type, link_text=none)*))
     ((* for value in entries *))
-        ((* set date_and_location_strings = value.date_and_location_strings_without_timespan *))
+        ((* if title in theme_options.show_timespan_in *))
+            ((* set date_and_location_strings = value.date_and_location_strings_with_timespan *))
+        ((* else *))
+            ((* set date_and_location_strings = value.date_and_location_strings_without_timespan *))
+        ((* endif *))
         ((* if entry_type == "EducationEntry" *))
     <<entry["education"](
         study_type=value.study_type,
@@ -12,9 +16,6 @@
         date_and_location_strings=date_and_location_strings
     )|indent(4)>>
         ((* elif entry_type == "ExperienceEntry" *))
-            ((* if theme_options.show_timespan_in_experience_entries *))
-                ((* set date_and_location_strings = value.date_and_location_strings_with_timespan *))
-            ((* endif *))
     <<entry["experience"](
         company=value.company,
         position=value.position,