Project details and topics changes

diff --git a/app/static/src/sass/global/_typography.scss b/app/static/src/sass/global/_typography.scss
index 6cf086024a598ea3450b6b6aa7381b9170a82854..dbfcec593a72976ad1bc99c95eea70c0cfd15cd4 100755 (executable)
--- 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 e4c0a925237a2ae3d60557b19d4389ab7749b91f..370a8a648b30c59045b439ea07eeeb63f148fcac 100644 (file)
--- a/app/templates/pages/projecttopicpage.html
+++ b/app/templates/pages/projecttopicpage.html
@@ -51,28 +51,22 @@
                     {{ sub_topic.description }}
                 </p>
             {% endif %}
-            {% if sub_topic.projects.all|get_type:"external project" %}
-                <p>
-                    <strong>{% trans "European and national projects" %}</strong>
-                </p>
-                <ul class="unstyled-list">
-                    {% for project in sub_topic.projects.all|get_type:"external project" %}
-                        <li>
-                            <a href="{% url 'organization-project-detail' project.slug %}">{{ project }}</a>
-                        </li>
+            {% if sub_topic.projects.all %}
+                <div class="row">
+                    {% for project in sub_topic.projects.all %}
+                        <div class="col-sm-6">
+                            <h3 class="mt0 mb0">
+                                <a href="{% url 'organization-project-detail' project.slug %}">
+                                    {{ project }}
+                                </a>
+                            </h3>
+                            <p>
+                                {{ project.description }}
+                            </p>
+
+                        </div>
                     {% endfor %}
-                </ul>
-            {% endif %}
-            {% if sub_topic.projects.all|get_type:"internal project" %}
-                <p>
-                    <strong>{% trans "Internal projects" %}</strong>
-                    <ul class="unstyled-list">
-                        {% for project in sub_topic.projects.all|get_type:"internal project" %}
-                            <li>
-                                <a href="{% url 'organization-project-detail' project.slug %}">{{ project }}</a>
-                            </li>
-                        {% endfor %}
-                    </ul>
+                </div>
             {% endif %}
         {% endfor %}
     {% endwith %}

diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html
index 29fc4b2967565aab410cafbac930b9ad8a50bfa6..a8191622c2d37ae343ddbe25fd7db754b3ed29da 100644 (file)
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@ -92,127 +92,136 @@
     {% endwith %}
 {% endblock %}
 
+
 {% block page_related_content %}
 
-    <div class="page__block page__block--yellow">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 col-lg-10 col-lg-push-1">
-                    <div class="row">
-                        <div class="col-sm-6">
-                            <div class="project-details">
-                                <h3 class="dotted project-details__title">{% trans "Project details" %}</h3>
-
-                                <div>
-                                    {% if project.program %}
+    {% if project.type == 'external project' %}
+        <div class="page__block page__block--yellow">
+            <div class="container">
+                <div class="row">
+                    <div class="col-sm-12 col-lg-10 col-lg-push-1">
+                        <div class="row">
+                            <div class="col-sm-6">
+                                <div class="project-details">
+                                    <h3 class="dotted project-details__title">{% trans "Project details" %}</h3>
+
+                                    <div>
+                                        {% if project.program %}
+                                            <div class="project-details__item">
+                                                <div class="project-details__item-title">
+                                                    {% trans "Program" %}
+                                                </div>
+                                                <div class="project-details__item-desc">
+                                                    {{ project.program }}
+                                                </div>
+                                            </div>
+                                        {% endif %}
+
+                                        {% if project.program_type %}
+                                            <div class="project-details__item">
+                                                <div class="project-details__item-title">
+                                                    {% trans "Program type" %}
+                                                </div>
+                                                <div class="project-details__item-desc">
+                                                    {{ project.program_type }}
+                                                </div>
+                                            </div>
+                                        {% endif %}
+
                                         <div class="project-details__item">
                                             <div class="project-details__item-title">
-                                                {% trans "Program" %}
+                                                {% trans "Beginning" %}
                                             </div>
                                             <div class="project-details__item-desc">
-                                                {{ project.program }}
+                                                {{ project.date_from }}
                                             </div>
                                         </div>
-                                    {% endif %}
 
-                                    {% if project.program_type %}
                                         <div class="project-details__item">
                                             <div class="project-details__item-title">
-                                                {% trans "Program type" %}
+                                                {% trans "End" %}
                                             </div>
                                             <div class="project-details__item-desc">
-                                                {{ project.program_type }}
+                                                {{ project.date_to }}
                                             </div>
                                         </div>
-                                    {% endif %}
-
-                                    <div class="project-details__item">
-                                        <div class="project-details__item-title">
-                                            {% trans "Beginning" %}
-                                        </div>
-                                        <div class="project-details__item-desc">
-                                            {{ project.date_from }}
-                                        </div>
-                                    </div>
-
-                                    <div class="project-details__item">
-                                        <div class="project-details__item-title">
-                                            {% trans "End" %}
-                                        </div>
-                                        <div class="project-details__item-desc">
-                                            {{ project.date_to }}
-                                        </div>
-                                    </div>
 
-                                    <div class="project-details__item">
-                                        <div class="project-details__item-title">
-                                            {% trans "Status" %}
-                                        </div>
-                                        <div class="project-details__item-desc">
-                                            {{ project.project_status }}
-                                        </div>
-                                    </div>
-
-                                    {% if project.website %}
                                         <div class="project-details__item">
                                             <div class="project-details__item-title">
-                                                {% trans "Website" %}
+                                                {% trans "Status" %}
                                             </div>
                                             <div class="project-details__item-desc">
-                                                <a href="{{ project.website }}" target="_blank" title="{{ project.title }}">{{ project.website }}</a>
+                                                {{ project.project_status }}
                                             </div>
                                         </div>
-                                    {% endif %}
 
-                                    <div class="project-details__logo">
-                                        {% with project.images.all|get_type:'logo' as images %}
-                                            {% include 'core/inc/logo.html' %}
-                                        {% endwith %}
-                                    </div>
+                                        {% if project.website %}
+                                            <div class="project-details__item">
+                                                <div class="project-details__item-title">
+                                                    {% trans "Website" %}
+                                                </div>
+                                                <div class="project-details__item-desc">
+                                                    <a href="{{ project.website }}" target="_blank" title="{{ project.title }}">{{ project.website }}</a>
+                                                </div>
+                                            </div>
+                                        {% endif %}
+
+                                        <div class="project-details__logo">
+                                            {% with project.images.all|get_type:'logo' as images %}
+                                                {% include 'core/inc/logo.html' %}
+                                            {% endwith %}
+                                        </div>
 
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="project-details">
-                                <h3 class="dotted project-details__title">{% trans "Participants" %}</h3>
-
-                                <div>
+                            <div class="col-sm-6">
+                                <div class="project-details">
+                                    <h3 class="dotted project-details__title">{% trans "Participants" %}</h3>
+
+                                    <div>
+
+                                        {% if project.lead_team %}
+                                            <div class="project-details__item">
+                                              {% if project.lead_team %}
+                                                <div class="project-details__item-title">
+                                                    {% trans "Project lead team" %}
+                                                </div>
+                                                <div class="project-details__item-desc">
+                                                    {{ project.lead_team }}
+                                                </div>
+                                              {% elif project.lead_organization %}
+                                                <div class="project-details__item-title">
+                                                    {% trans "Project lead organization" %}
+                                                </div>
+                                                <div class="project-details__item-desc">
+                                                    {{ project.lead_organization }}
+                                                </div>
+                                              {% endif %}
+                                            </div>
+                                        {% endif %}
 
-                                    {% if project.lead_team %}
                                         <div class="project-details__item">
-                                          {% if project.lead_team %}
-                                            <div class="project-details__item-title">
-                                                {% trans "Project lead team" %}
-                                            </div>
-                                            <div class="project-details__item-desc">
-                                                {{ project.lead_team }}
-                                            </div>
-                                          {% elif project.lead_organization %}
                                             <div class="project-details__item-title">
-                                                {% trans "Project lead organization" %}
+                                                {% trans "Partners" %}
                                             </div>
                                             <div class="project-details__item-desc">
-                                                {{ project.lead_organization }}
+                                                {% for team in project.teams.all %}
+                                                    {{ team }}<br>
+                                                {% endfor %}
+                                                {% for organization in project.organizations.all %}
+                                                    {% if organization.url %}
+                                                        <a href="{{organisation.url}}" target="_blank" title="{{organisation}}">
+                                                    {% endif %}
+                                                    {{ organization }}<br>
+                                                    {% if organization.url %}
+                                                        </a>
+                                                    {% endif %}
+                                                {% endfor %}
                                             </div>
-                                          {% endif %}
                                         </div>
-                                    {% endif %}
 
-                                    <div class="project-details__item">
-                                        <div class="project-details__item-title">
-                                            {% trans "Partners" %}
-                                        </div>
-                                        <div class="project-details__item-desc">
-                                            {% for team in project.teams.all %}
-                                                {{ team }}<br>
-                                            {% endfor %}
-                                            {% for organization in project.organizations.all %}
-                                                {{ organization }}<br>
-                                            {% endfor %}
-                                        </div>
                                     </div>
-
                                 </div>
                             </div>
                         </div>
@@ -220,27 +229,29 @@
                 </div>
             </div>
         </div>
-    </div>
+    {% endif %}
 
 {% endblock %}
 
 {% block logo %}
-    <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
-        <div class="white-bg pb2">
-            <div class="container">
-                <div class="row" data-summary-content>
-                    <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
-                        <h2 class="dotted">{% trans "Partners" %}</h2>
-                        <ul class="partners-list">
-                            {% for organization in project.organizations.all %}
-                                {% with organization.images.all|get_type:'logo' as images %}
-                                    {% include 'core/inc/logo.html' %}
-                                {% endwith %}
-                            {% endfor %}
-                        </ul>
+    {% if project.organizations.all|length > 0 %}
+        <div class="page__block{% if block.background_color %} page__block--{{ block.background_color }}{% endif %}">
+            <div class="white-bg pb2">
+                <div class="container">
+                    <div class="row" data-summary-content>
+                        <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2">
+                            <h2 class="dotted">{% trans "Partners" %}</h2>
+                            <ul class="partners-list">
+                                {% for organization in project.organizations.all %}
+                                    {% with organization.images.all|get_type:'logo' as images %}
+                                        {% include 'core/inc/logo.html' %}
+                                    {% endwith %}
+                                {% endfor %}
+                            </ul>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
+    {% endif %}
 {% endblock %}