From 1343a8726fbe4bd5dddb8cddacc4cbc15ff7e5c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Mon, 26 Sep 2016 11:28:25 +0200 Subject: [PATCH] Project details and topics changes --- app/static/src/sass/global/_typography.scss | 30 +++ app/templates/pages/projecttopicpage.html | 36 ++-- app/templates/projects/project_detail.html | 213 ++++++++++---------- 3 files changed, 157 insertions(+), 122 deletions(-) diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss index 6cf08602..dbfcec59 100755 --- a/app/static/src/sass/global/_typography.scss +++ b/app/static/src/sass/global/_typography.scss @@ -52,6 +52,13 @@ h3 { @include margin-top(1); } +.page__content ul { + font-weight: weight(light); + @include line-height(1.25); + @include margin-top(0); + @include margin-bottom(1); +} + main p, main ul.unstyled-list { @include margin-top(0); @include margin-bottom(1); @@ -89,6 +96,29 @@ main p, main ul.unstyled-list { } } +h3 { + a:not(.button) { + + position: relative; + z-index: 1; + text-decoration: none; + + &:after { + @include transition(all 0.15s ease-in-out); + content: ""; + display: block; + position: absolute; + left: 0; + right: 0; + bottom: 0; + height: 1px; + background: $color-main; + z-index: -1; + } + + } +} + hr { border: 0; border-top: 1px solid black; diff --git a/app/templates/pages/projecttopicpage.html b/app/templates/pages/projecttopicpage.html index e4c0a925..370a8a64 100644 --- a/app/templates/pages/projecttopicpage.html +++ b/app/templates/pages/projecttopicpage.html @@ -51,28 +51,22 @@ {{ sub_topic.description }}

{% endif %} - {% if sub_topic.projects.all|get_type:"external project" %} -

- {% trans "European and national projects" %} -

- - {% endif %} - {% if sub_topic.projects.all|get_type:"internal project" %} -

- {% trans "Internal projects" %} -

+ {% endif %} {% endfor %} {% endwith %} diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html index 29fc4b29..a8191622 100644 --- a/app/templates/projects/project_detail.html +++ b/app/templates/projects/project_detail.html @@ -92,127 +92,136 @@ {% endwith %} {% endblock %} + {% block page_related_content %} -
-
-
-
-
-
-
-

{% trans "Project details" %}

- -
- {% if project.program %} + {% if project.type == 'external project' %} +
+
+
+
+
+
+
+

{% trans "Project details" %}

+ +
+ {% if project.program %} +
+
+ {% trans "Program" %} +
+
+ {{ project.program }} +
+
+ {% endif %} + + {% if project.program_type %} +
+
+ {% trans "Program type" %} +
+
+ {{ project.program_type }} +
+
+ {% endif %} +
- {% trans "Program" %} + {% trans "Beginning" %}
- {{ project.program }} + {{ project.date_from }}
- {% endif %} - {% if project.program_type %}
- {% trans "Program type" %} + {% trans "End" %}
- {{ project.program_type }} + {{ project.date_to }}
- {% endif %} - -
-
- {% trans "Beginning" %} -
-
- {{ project.date_from }} -
-
- -
-
- {% trans "End" %} -
-
- {{ project.date_to }} -
-
-
-
- {% trans "Status" %} -
-
- {{ project.project_status }} -
-
- - {% if project.website %}
- {% trans "Website" %} + {% trans "Status" %}
- {{ project.website }} + {{ project.project_status }}
- {% endif %} - + {% if project.website %} +
+
+ {% trans "Website" %} +
+
+ {{ project.website }} +
+
+ {% endif %} + + +
-
-
-
-

{% trans "Participants" %}

- -
+
+
+

{% trans "Participants" %}

+ +
+ + {% if project.lead_team %} +
+ {% if project.lead_team %} +
+ {% trans "Project lead team" %} +
+
+ {{ project.lead_team }} +
+ {% elif project.lead_organization %} +
+ {% trans "Project lead organization" %} +
+
+ {{ project.lead_organization }} +
+ {% endif %} +
+ {% endif %} - {% if project.lead_team %}
- {% if project.lead_team %} -
- {% trans "Project lead team" %} -
-
- {{ project.lead_team }} -
- {% elif project.lead_organization %}
- {% trans "Project lead organization" %} + {% trans "Partners" %}
- {{ project.lead_organization }} + {% for team in project.teams.all %} + {{ team }}
+ {% endfor %} + {% for organization in project.organizations.all %} + {% if organization.url %} + + {% endif %} + {{ organization }}
+ {% if organization.url %} + + {% endif %} + {% endfor %}
- {% endif %}
- {% endif %} -
-
- {% trans "Partners" %} -
-
- {% for team in project.teams.all %} - {{ team }}
- {% endfor %} - {% for organization in project.organizations.all %} - {{ organization }}
- {% endfor %} -
-
@@ -220,27 +229,29 @@
-
+ {% endif %} {% endblock %} {% block logo %} -
-
-
-
-
-

{% trans "Partners" %}

-
    - {% for organization in project.organizations.all %} - {% with organization.images.all|get_type:'logo' as images %} - {% include 'core/inc/logo.html' %} - {% endwith %} - {% endfor %} -
+ {% if project.organizations.all|length > 0 %} +
+
+
+
+
+

{% trans "Partners" %}

+
    + {% for organization in project.organizations.all %} + {% with organization.images.all|get_type:'logo' as images %} + {% include 'core/inc/logo.html' %} + {% endwith %} + {% endfor %} +
+
-
+ {% endif %} {% endblock %} -- 2.39.5