From: yomguy <yomguy@parisson.com>
Date: Thu, 4 Oct 2012 09:16:51 +0000 (+0200)
Subject: fix item remarks
X-Git-Tag: 1.4.5~2^2~4^2~2^2~33^2~19
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bde9716bed8ad4306bba826edf6b8be136c81313;p=telemeta.git

fix item remarks
---

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 27250f46..7dde9850 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -200,9 +200,6 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
 
             <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd>
 
-            <dt>{% trans "Remarks" %}</dt>
-            <dd>{{ item.comment|html_line_break|safe }}</dd>
-
             {% if last_revision %}
             <dt>{% trans "Last modification" %}</dt>
             <dd>{{ last_revision.time }} {% if user.is_authenticated %}(<a href="{% url telemeta-profile-detail last_revision.user.username %}">{{last_revision.user.username}}</a>){% endif %}</dd>
@@ -283,6 +280,9 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
                 <dt>{% trans "Published references" %}</dt>
                 <dd>{{ item.external_references|html_line_break|safe }}</dd>
                 {% dl_field item "public_access_label" %}
+
+                <dt>{% trans "Remarks" %}</dt>
+                <dd>{{ item.comment|html_line_break|safe }}</dd>
             </dl>
         </div>
         {% endblock archive_data %}
diff --git a/tools/dev/push.sh b/tools/dev/push.sh
index 6369c231..3b99d10b 100755
--- a/tools/dev/push.sh
+++ b/tools/dev/push.sh
@@ -4,13 +4,13 @@ git branch | tr -d \* | while read line
 do
     branch=${line/#\ }
 
-    echo "Push $branch to origin:"
     git push origin $branch
-
-    if [[ $branch == *master* ]]; then
-        echo "Push $branch to github:"
-        git push hub $branch
-    fi
+    git push hub $branch
+ 
+#    if [[ $branch == *master* ]]; then
+#        echo "Push $branch to github:"
+#        git push hub $branch
+#    fi
 
 done