From cf2a621fc3a92f83349a0e8013d7a4b6f697ed8a Mon Sep 17 00:00:00 2001
From: Emilie <zawadzki@ircam.fr>
Date: Thu, 27 Oct 2016 13:00:45 +0200
Subject: [PATCH] Task #315: make editable more content

---
 app/templates/core/inc/block.html          | 12 ++++++++---
 app/templates/core/inc/link.html           |  2 +-
 app/templates/job/inc/candidacy_card.html  | 24 ++++++++++++++--------
 app/templates/job/inc/job_offer_card.html  | 16 +++++++++++----
 app/templates/job/job_offer_detail.html    |  8 ++++----
 app/templates/projects/project_detail.html |  6 +++---
 6 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/app/templates/core/inc/block.html b/app/templates/core/inc/block.html
index fc60592f..8524a175 100644
--- a/app/templates/core/inc/block.html
+++ b/app/templates/core/inc/block.html
@@ -13,14 +13,20 @@
                     <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">{{ block.title }}</h2>
+                                {% editable block.title %}
+                                    <h2 class="dotted">{{ block.title }}</h2>
+                                {% endeditable %}
                                 {% if block.description %}
                                     <div class="chapo">
-                                        {{ block.description }}
+                                        {% editable block.description %}
+                                            {{ block.description }}
+                                        {% endeditable %}
                                     </div>
                                 {% endif %}
                                 {% if block.content %}
-                                     {{ block.content|richtext_filters|safe }}
+                                    {% editable block.content %}
+                                        {{ block.content|richtext_filters|safe }}
+                                    {% endeditable %}
                                 {% endif %}
                             </div>
                         </div>
diff --git a/app/templates/core/inc/link.html b/app/templates/core/inc/link.html
index 32014c56..ed060574 100644
--- a/app/templates/core/inc/link.html
+++ b/app/templates/core/inc/link.html
@@ -1,6 +1,6 @@
 {% load mezzanine_tags i18n %}
 <ul class="unstyled-list fss">
     {% for link in links %}
-      <li><a href="{{ link.url }}" title=""><i class="fa fa-{{ link.link_type.name }}" target="_blank"></i> {% firstof link.title link.url%}</a></li>
+      <li><a href="{{ link.url }}" title="{{ link.link_type.name }}"  target="_blank"><i class="fa fa-{{ link.link_type.name }}"></i> {% firstof link.title link.url%}</a></li>
     {% endfor %}
 </ul>
diff --git a/app/templates/job/inc/candidacy_card.html b/app/templates/job/inc/candidacy_card.html
index 8de658c8..4e528c9d 100644
--- a/app/templates/job/inc/candidacy_card.html
+++ b/app/templates/job/inc/candidacy_card.html
@@ -12,18 +12,24 @@
 
         </div>
         <div class="col-lg-9 col-md-9 col-sm-9 col-xs-9">
+            {% editable content.title %}
+                <h2 class="job-line-box__title">{{ content.title }}</h2>
+            {% endeditable %}
 
-            <h2 class="job-line-box__title">{{ content.title }}</h2>
             <div class="job-line-box__desc">
-                {% if content.date_from and content.date_to %}
-                    <strong>{% trans "From" %}&nbsp;{{ content.date_from|date:"DATE_FORMAT" }}&nbsp;{% trans "to" %}&nbsp;{{ content.date_to|date:"DATE_FORMAT" }}</strong><br/>
-                {% elif content.date_from %}
-                    <strong>{% trans "From" %}&nbsp;{{ content.date_from|date:"DATE_FORMAT" }}</strong><br/>
-                {% elif content.date_to %}
-                    <strong>{% trans "until" %}{{ content.date_to|date:"DATE_FORMAT" }}</strong><br/>
-                {% endif %}
+                {% editable content.date_from content.date_to %}
+                    {% if content.date_from and content.date_to %}
+                        <strong>{% trans "From" %}&nbsp;{{ content.date_from|date:"DATE_FORMAT" }}&nbsp;{% trans "to" %}&nbsp;{{ content.date_to|date:"DATE_FORMAT" }}</strong><br/>
+                    {% elif content.date_from %}
+                        <strong>{% trans "From" %}&nbsp;{{ content.date_from|date:"DATE_FORMAT" }}</strong><br/>
+                    {% elif content.date_to %}
+                        <strong>{% trans "until" %}{{ content.date_to|date:"DATE_FORMAT" }}</strong><br/>
+                    {% endif %}
+                {% endeditable %}
                 <br />
-                {{ content.description }}
+                {% editable content.description %}
+                    {{ content.description }}
+                {% endeditable %}
             </div>
             {% if content.external_content and content.text_button_external %}
                 <a class="button button--small" href="{{ content.external_content }}" title="{{ content.text_button_external }}">{{ content.text_button_external }}</a>
diff --git a/app/templates/job/inc/job_offer_card.html b/app/templates/job/inc/job_offer_card.html
index b79e97e2..32c0577e 100644
--- a/app/templates/job/inc/job_offer_card.html
+++ b/app/templates/job/inc/job_offer_card.html
@@ -2,13 +2,21 @@
 <div class="job-line-box">
     {% if jo.type %}
         <div class="tag tag--small tag--category">
-            {{jo.type}}
+            {% editable jo.type %}
+                {{jo.type}}
+            {% endeditable %}
         </div>
     {% endif %}
-    <a href="{{ jo.get_absolute_url }}"><h2 class="job-line-box__title">{{ jo.title }}</h2></a>
+    <a href="{{ jo.get_absolute_url }}">
+        <h2 class="job-line-box__title">
+            {{ jo.title }}
+        </h2>
+    </a>
     <div class="job-line-box__desc">
-        <strong>{{ jo.publish_date|date:"DATE_FORMAT" }}</strong><br />
-        {{ jo.description|slice:":255" }}
+        <strong>{% trans 'Published on' %} {{ jo.publish_date|date:"DATE_FORMAT" }}</strong><br />
+        {% editable jo.description %}
+            {{ jo.description|slice:":255" }}
+        {% endeditable %}
     </div>
     <a href="{{ jo.get_absolute_url }}" class="button button--small">{% trans "View" %}</a>
 </div>
diff --git a/app/templates/job/job_offer_detail.html b/app/templates/job/job_offer_detail.html
index 1c0d36fd..b02de980 100644
--- a/app/templates/job/job_offer_detail.html
+++ b/app/templates/job/job_offer_detail.html
@@ -10,7 +10,7 @@
 
 {% block page_title %}
 
-    {% editable project.title %}
+    {% editable job_offer.title %}
         <h1 class="dotted">{{ job_offer.title }}</h1>
     {% endeditable %}
 
@@ -23,9 +23,9 @@
     {% comment %}
         <p>{% trans "Category" %} : {{ job_offer.type }}</p>
     {% endcomment %}
-
-    {{ job_offer.content|richtext_filters|safe }}
-
+    {% editable job_offer.content %}
+        {{ job_offer.content|richtext_filters|safe }}
+    {% endeditable %}
 
 
     {% with form as job_offer.job_response %}
diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html
index b97e29ce..eaa5f064 100644
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@ -56,11 +56,11 @@
 {% endblock %}
 
 {% block page_content %}
-
     {% if project.content %}
-        {{ project.content|richtext_filters|safe }}
+        {% editable project.content %}
+            {{ project.content|richtext_filters|safe }}
+        {% endeditable %}
     {% endif %}
-
 {% endblock %}
 
 {% block page_sidebar %}
-- 
2.39.5