oops

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 2c5bdaada56a33acfd10131ae075b552bc3aedf7..b4555587996b7abc1f700c5b028db77c1ff2ec0c 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -6,7 +6,6 @@
 {% block module-action %}
 {% get_telecaster as telecaster %}
 {%  if telecaster %}
-
 <script type="text/javascript">
     var conferenceUtils = {
         stop : function(id){
@@ -26,41 +25,6 @@
 <a href="#" class="component_icon button" id="action_red">{% trans "S T O P" %}</a>
 </div>
 {% endif %}
-
-{% if user.is_staff %}
-
-<script type="text/javascript">
-    var mediaUtils = {
-        publish : function(id){
-            json([id],'teleforma.publish_media',function(){return false;});
-         }
-        unpublish : function(id){
-            json([id],'teleforma.unpublish_media',function(){return false;});
-         }
-        }
-
-    jQuery(window).ready(function(){
-        var p = jQuery('#publish');
-        var f = mediaUtils;
-        p.unbind('click').click(function(){
-            if (p.hasClass('component_icon button icon_edit')){
-                f.publish('{{media.id}}');
-                p.removeClass('component_icon button icon_edit').addClass('component_icon button icon_speaker')
-                p.html('Unpublish')
-                return false;
-                }
-            if (p.hasClass('component_icon button icon_speaker')){
-                f.unpublish('{{media.id}}');
-                p.removeClass('component_icon button icon_speaker').addClass('component_icon button icon_edit')
-                p.html('Publish')
-                return false;
-                }
-            });
-        });
-</script>
-
-{% endif %}
-
 {% endblock module-action %}
 
 {% block course %}
@@ -69,9 +33,6 @@
 <div class="course_title">
     <div style="float: right; font-size: 0.9em;">
         <a href="{% url teleforma-conference-audio conference.id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
-        {% if user.is_staff %}
-        <a id="publish" href="#" class="{% if media.is_published %}component_icon button icon_speaker{% else %}component_icon button icon_edit{% endif %}">Publish</a>
-        {% endif %}
     </div>
 
 {{ course.title }}{% if course.description %} - {{ course.description }}{% endif %} - {{ conference.session }} - {{ conference.professor }}

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 46f88f45286971080a3bd2634bcd6ca9f0d0b87d..21465266bd7ab8deb95adc939d3c46e88889af57 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -17,6 +17,38 @@ $(document).ready(function(){
     });
 </script>
 
+{% if user.is_staff %}
+<script type="text/javascript">
+    var mediaUtils = {
+        publish : function(id){
+            json([id],'teleforma.publish_media',function(){return false;});
+         }
+        unpublish : function(id){
+            json([id],'teleforma.unpublish_media',function(){return false;});
+         }
+        }
+
+    jQuery(window).ready(function(){
+        var p = jQuery('#publish');
+        var f = mediaUtils;
+        p.unbind('click').click(function(){
+            if (p.hasClass('component_icon button icon_edit')){
+                f.publish('{{media.id}}');
+                p.removeClass('component_icon button icon_edit').addClass('component_icon button icon_speaker')
+                p.html('Unpublish')
+                return false;
+                }
+            if (p.hasClass('component_icon button icon_speaker')){
+                f.unpublish('{{media.id}}');
+                p.removeClass('component_icon button icon_speaker').addClass('component_icon button icon_edit')
+                p.html('Publish')
+                return false;
+                }
+            });
+        });
+</script>
+{% endif %}
+
 {% endblock extra_javascript %}
 
 {% block module-action %}
@@ -38,6 +70,9 @@ $(document).ready(function(){
         {% if "audio" in media.mime_type %}
         <a href="{% url teleforma-media-detail media|get_video_id %}" class="component_icon button icon_clap">&nbsp;{% trans "Video" %}</a>
         {% endif %}
+        {% if user.is_staff %}
+        <a id="publish" href="#" class="{% if media.is_published %}component_icon button icon_speaker{% else %}component_icon button icon_edit{% endif %}">Publish</a>
+        {% endif %}
     </div>
 
     {{ course.title }} - {{ type }}{% if media.conference %} - {% trans "Session" %} {{ media.conference.session }}{% endif %}