fix various static links

diff --git a/teleforma/templates/postman/base.html b/teleforma/templates/postman/base.html
index fe0afe41a300d3d2468680b080c5ab8de6b7ba41..d762a903db958178c7afaf9d184126e062588859 100644 (file)
--- a/teleforma/templates/postman/base.html
+++ b/teleforma/templates/postman/base.html
@@ -7,7 +7,7 @@
 <div id="module-set-left" style="width: 20%;">
 
 <div class="module">
-<h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />{% trans "Folders" %}</h3>
+<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "Folders" %}</h3>
 
 <div style="background: white;">
 {% postman_unread as unread_count %}

diff --git a/teleforma/templates/teleforma/course_document.html b/teleforma/templates/teleforma/course_document.html
index efd422f99fa51ee19d080c1fca7229a3a4b6a3ec..9a33fbb9c86d27308d735f2d13995ce7e252f5cd 100644 (file)
--- a/teleforma/templates/teleforma/course_document.html
+++ b/teleforma/templates/teleforma/course_document.html
@@ -14,7 +14,7 @@ $(document).ready(function(){
 <script type="text/javascript" src="{{ STATIC_URL }}teleforma/js/pdf-min.js"></script>
 
 <script type="text/javascript">
-    PDFJS.workerSrc = '{% url telemeta-js "pdf-min.js" %}';
+    PDFJS.workerSrc = '{{ STATIC_URL }}telemeta/js/pdf-min.js';
 </script>
 
 <script type="text/javascript">

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index b9a7ae1b9253ae04ca7c759b44e11b96e995e5b7..eef2b5a8c386acddb4758839853c94e72389a9ec 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -26,10 +26,10 @@
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}teleforma/css/teleforma.css" />
 
 <!--[if IE]>
-<link rel="stylesheet" type="text/css" href="{% url telemeta-css "telemeta_ie.css" %}" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta_ie.css" />
 <![endif]-->
 <!--[if lte IE 6]>
-<link rel="stylesheet"type="text/css" href="{% url telemeta-css "telemeta_ie6.css" %}" />
+<link rel="stylesheet"type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta_ie6.css" />
 <![endif]-->
 {% endblock %}
 

diff --git a/teleforma/templates/telemeta/home.html b/teleforma/templates/telemeta/home.html
index 64ca6568ab507a83fd06811f7971610090bac7fc..c4186c30268f4bf34c4ebff2293709d04af90e1f 100644 (file)
--- a/teleforma/templates/telemeta/home.html
+++ b/teleforma/templates/telemeta/home.html
@@ -19,7 +19,7 @@
 </div>
 
 <div class="home-description">
-<img class="align-left" src="{% url telemeta-images "vox.png" %}" alt="vox" style="vertical-align:middle;" />
+<img class="align-left" src="{{ STATIC_URL }}telemeta/images/vox.png" alt="vox" style="vertical-align:middle;" />
 {{ page_content|render_flatpage }}
 </div>
 

diff --git a/teleforma/templates/telemeta/inc/module_revisions.html b/teleforma/templates/telemeta/inc/module_revisions.html
index 2f3c81c37900c570d6a989ee5cc99de92497dafa..a8d503adc300bce0205460a03b7f548139920e90 100644 (file)
--- a/teleforma/templates/telemeta/inc/module_revisions.html
+++ b/teleforma/templates/telemeta/inc/module_revisions.html
@@ -5,7 +5,7 @@
 
     {% block rss_title %}
       <a href="{% url telemeta-rss %}">
-      <img src="{% url telemeta-images "rss.png" %}" alt="rss" style="vertical-align:middle" />
+      <img src="{{ STATIC_URL }}telemeta/images/rss.png" alt="rss" style="vertical-align:middle" />
       <h3>{% trans title %}</h3></a>
       <a href="{% url telemeta-rss %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
     {% endblock rss_title %}

diff --git a/teleforma/templates/telemeta/inc/module_searches.html b/teleforma/templates/telemeta/inc/module_searches.html
index b3896471df76d97972b569c7251e1e2224235841..2c6afb1de6b7c22fbfb2287ee37799c21b2d1c0d 100644 (file)
--- a/teleforma/templates/telemeta/inc/module_searches.html
+++ b/teleforma/templates/telemeta/inc/module_searches.html
@@ -3,7 +3,7 @@
 
    <div class="module">
     <h3>
-      <img src="{% url telemeta-images "search_wh2.png" %}" alt="rss" style="vertical-align:middle" />
+      <img src="{{ STATIC_URL }}telemeta/images/search_wh2.png" alt="rss" style="vertical-align:middle" />
       {% trans title %}</h3>
 
     <div class="vscroll">

diff --git a/teleforma/templates/telemeta/inc/module_user_revisions.html b/teleforma/templates/telemeta/inc/module_user_revisions.html
index 9c017056dc482b8f52ef1196a7b0fbb0497c4475..e066fcc857f46b9a0c23eb83469b2dc99a08ebd7 100644 (file)
--- a/teleforma/templates/telemeta/inc/module_user_revisions.html
+++ b/teleforma/templates/telemeta/inc/module_user_revisions.html
@@ -4,7 +4,7 @@
 
 {% block rss_title %}
 <a href="{% url telemeta-user-rss user.username %}">
-<img src="{% url telemeta-images "rss.png" %}" alt="rss" style="vertical-align:middle" />
+<img src="{{ STATIC_URL }}telemeta/images/rss.png" alt="rss" style="vertical-align:middle" />
 <h3>{% trans title %}</h3></a>
 <a href="{% url telemeta-user-rss user.username %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a>
 {% endblock rss_title %}

diff --git a/teleforma/templates/telemeta/lists.html b/teleforma/templates/telemeta/lists.html
index 51c57bda8c5b84e7fbdef7aa3215a6d587c8498b..47e28c24c569ef6f9b321ad34cb90f5091228ea2 100644 (file)
--- a/teleforma/templates/telemeta/lists.html
+++ b/teleforma/templates/telemeta/lists.html
@@ -3,19 +3,19 @@
 {% load i18n %}
 
 {% block extra_javascript %}
-<script src="{% url telemeta-js "popupdiv-min.js" %}" type="text/javascript"></script>
-<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/popupdiv-min.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/playlist.js" type="text/javascript"></script>
 <script>
     jQuery(window).ready(function(){
         var p = playlistUtils;
-        var a = jQuery('#_new_playlist'); 
+        var a = jQuery('#_new_playlist');
         a.unbind('click').click(function(){p.showAdd(a);return false;});
         });
 
     {% for playlist in playlists %}
         playlistUtils.addEditPlaylist('{{playlist.playlist.public_id}}','{{ playlist.playlist.title }}','{{playlist.playlist.description}}');
     {% endfor %}
-        
+
 
 </script>
 {% endblock %}
@@ -28,7 +28,7 @@
     {% include "telemeta/inc/module_searches.html" %}
     {% endwith %}
     {% endblock %}
-    
+
     {% block module_user_revisions %}
     {% with user_revisions as revisions and "My last changes" as title %}
     {% include "telemeta/inc/module_user_revisions.html" %}
@@ -40,7 +40,7 @@
     {% include "telemeta/inc/module_revisions.html" %}
     {% endwith %}
     {% endblock %}
-    
+
 </div>
 
 <div class="desk_media">
@@ -62,7 +62,7 @@
          <tr>
           <td colspan="2" style="border-bottom:1px solid #6A0307;color:#6A0307;font-size: 80%">{{ playlist.playlist.description }}</td>
          </tr>
-        {% endif %}  
+        {% endif %}
     </table>
     <table class="listing" width="100%">
         <tr>
@@ -107,7 +107,7 @@
             </td>
             <td align="center" style="vertical-align:middle">
                 {% if resource.element.file or resource.element.has_mediafile %}
-                <img src="{% url telemeta-images "ok.png" %}" alt="yes" style="vertical-align:middle" /></a>
+                <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" /></a>
                 {% endif %}
             </td>
             <td style="vertical-align:middle">

diff --git a/teleforma/templates/telemeta/profile_detail.html b/teleforma/templates/telemeta/profile_detail.html
index 830efebbb05463e3e7ca7ac88bbabb3a476835bf..53bd0212303d6c2b27c1643490c1f76c9f898d7d 100644 (file)
--- a/teleforma/templates/telemeta/profile_detail.html
+++ b/teleforma/templates/telemeta/profile_detail.html
@@ -13,7 +13,7 @@
   {% block modules %}
 
     <div class="module">
-    <h3><a href="{% url teleforma-desk %}"><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />{% if user.username != usr.username%}{% trans "His courses" %}{% else %}{% trans "My courses" %}{% endif %}</a></h3>
+    <h3><a href="{% url teleforma-desk %}"><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% if user.username != usr.username%}{% trans "His courses" %}{% else %}{% trans "My courses" %}{% endif %}</a></h3>
     <div style="background: white;">
     <ul>
     {% block courses %}

diff --git a/teleforma/templates/telemeta/search_criteria.html b/teleforma/templates/telemeta/search_criteria.html
index 0c6ea64da371fd750cd3f934c3b81552bc73d572..bfee8ac2d5561e2f3de618becb1177d2f6f5cb90 100644 (file)
--- a/teleforma/templates/telemeta/search_criteria.html
+++ b/teleforma/templates/telemeta/search_criteria.html
@@ -6,12 +6,12 @@
 
 {% block stylesheets %}
 {{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% url telemeta-css "jquery.autocomplete.css" %}" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/jquery.autocomplete.css" />
 {% endblock %}
 
 {% block extra_javascript %}
-<script src="{% url telemeta-js "jquery.bgiframe.js" %}" type="text/javascript"></script>
-<script src="{% url telemeta-js "jquery.autocomplete.js" %}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/jquery.bgiframe.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/jquery.autocomplete.js" type="text/javascript"></script>
 <script type="text/javascript">
 function update_period(source, from_field, to_field) {
     var from_year = $(from_field);

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index 4f759bd64ceebf8c432ace004d0d70e98a14e896..033510f243ddee699c5e6a695309a4ed601cf2b5 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -12,7 +12,7 @@
 <div id="module-set-left" style="width: 20%">
 
 <div class="module">
-<h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="Trainings" style="vertical-align:middle" />{% trans "Trainings" %}</h3>
+<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="Trainings" style="vertical-align:middle" />{% trans "Trainings" %}</h3>
 <div style="background: white;">
 <ul>
 {% block trainings %}
@@ -25,7 +25,7 @@
 </div>
 
 <div class="module">
-<h3><img src="{% url telemeta-images "module_world.png" %}" alt="IEJ" style="vertical-align:middle" /> {% trans "IEJ" %}</h3>
+<h3><img src="{{ STATIC_URL }}telemeta/images/module_world.png" alt="IEJ" style="vertical-align:middle" /> {% trans "IEJ" %}</h3>
 <div style="background: white;">
 <ul>
 {% block iej %}
@@ -38,7 +38,7 @@
 </div>
 
 <div class="module">
-<h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="Courses" style="vertical-align:middle" />{% trans "Courses" %}</h3>
+<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="Courses" style="vertical-align:middle" />{% trans "Courses" %}</h3>
 <div style="background: white;">
 <ul>
 {% block courses %}