finally fix image static

diff --git a/telemeta/templates/postman/base.html b/telemeta/templates/postman/base.html
index b0061a35f78d18e606c96767058b23987dc1ef2a..c209be0633367da76b1101b0aef033ff1e501b0c 100644 (file)
--- a/telemeta/templates/postman/base.html
+++ b/telemeta/templates/postman/base.html
@@ -2,7 +2,7 @@
 {% load i18n %}{% load postman_tags %}
 
 {% block title %}
-<img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" />
+<img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" />
 {% trans "Messages"%}
 {% endblock %}
 

diff --git a/telemeta/templates/telemeta/admin.html b/telemeta/templates/telemeta/admin.html
index 522596c0b9d5f556145abdc779ed1d64514c3697..7d193dd59d1e0313038f0826461ac66431c7be71 100644 (file)
--- a/telemeta/templates/telemeta/admin.html
+++ b/telemeta/templates/telemeta/admin.html
@@ -4,11 +4,11 @@
 
 {% block stylesheets %}
 {{ block.super }}
-<link rel="stylesheet" type="text/css" href="{% url telemeta-css "admin.css" %}" />
+<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/admin.css" />
 {% endblock %}
 
 {% block title %}
-<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %}</h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> {% trans "Administration" %}</h1>
 {% endblock %}
 
 {% block content %}

diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html
index b773437509fbbbad9a04cc582dbc78d64bb627e4..c6352b7ebab093747e8e12dfa37f1a1ff3a50c54 100644 (file)
--- a/telemeta/templates/telemeta/admin_enumerations.html
+++ b/telemeta/templates/telemeta/admin_enumerations.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 
 {% block title %}
-<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Enumerations" %}</h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Enumerations" %}</h1>
 {% endblock %}
 
 {% block tabcontents %}
@@ -19,7 +19,7 @@
     {% endfor %}
     </tbody>
   </table>
- 
+
   {% else %}
     <p class="help">{% trans "No enumerations" %}</p>
  {% endif %}

diff --git a/telemeta/templates/telemeta/admin_general.html b/telemeta/templates/telemeta/admin_general.html
index a8e2970202adb82e812779f7067860842a801114..00bcfcce180f83670f49d0fe18f9770c69cfc0e3 100644 (file)
--- a/telemeta/templates/telemeta/admin_general.html
+++ b/telemeta/templates/telemeta/admin_general.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block title %}
-<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "General" %}</h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "General" %}</h1>
 {% endblock %}
 
 {% block tabcontents %}

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index b9283c6cfdfb0e87b2d4e1cc57afbe9252924083..f798fd34c6b9607e7e3ac4dfaf8aafe48c32f957 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -13,10 +13,10 @@
 <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}telemeta/css/telemeta.css" />
 <link rel="alternate" href="/rss" title="RSS 2.0" type="application/rss+xml" />
 <!--[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 %}
 
@@ -24,7 +24,7 @@
 
 {% block javascript %}
 <script src="{% url django.views.i18n.javascript_catalog %}" type="text/javascript"></script>
-<!--<script src="{% url telemeta-js "jquery-1.6.min.js" %}" type="text/javascript"></script>-->
+<!--<script src="{{ STATIC_URL }}telemeta/js/jquery-1.6.min.js" type="text/javascript"></script>-->
 <script src="{{ STATIC_URL }}timeside/js/libs/jquery-1.6.min.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}telemeta/js/locale.js" type="text/javascript"></script>
 <script src="{{ STATIC_URL }}telemeta/js/application.js" type="text/javascript"></script>

diff --git a/telemeta/templates/telemeta/collection_add.html b/telemeta/templates/telemeta/collection_add.html
index abbda5b7a601073f64361ca0cbb1bbacb5b91490..eb1cf6b7631da7a13bf4727ba164e41debc2e912 100644 (file)
--- a/telemeta/templates/telemeta/collection_add.html
+++ b/telemeta/templates/telemeta/collection_add.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-    <img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> Collection : NEW
+    <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" /> Collection : NEW
 {% endblock %}
 
 {% block title_buttons %}

diff --git a/telemeta/templates/telemeta/collection_edit.html b/telemeta/templates/telemeta/collection_edit.html
index 305915cbcbed21d60323e4c3838d1560596616d2..6d7cd1f4f06a5913a9ae7c6a7ecd4dfb7a6659c1 100644 (file)
--- a/telemeta/templates/telemeta/collection_edit.html
+++ b/telemeta/templates/telemeta/collection_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-    <img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> Collection : {{ collection }}
+    <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" /> Collection : {{ collection }}
 {% endblock %}
 {% block title_buttons %}
     <a href="{% url telemeta-collection-detail collection.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>

diff --git a/telemeta/templates/telemeta/collection_list.html b/telemeta/templates/telemeta/collection_list.html
index 64ffd7ce1d6754013ed2864568c21f0188186d22..1d4470fb6c862bce97abadb383a6b319bbc347f5 100644 (file)
--- a/telemeta/templates/telemeta/collection_list.html
+++ b/telemeta/templates/telemeta/collection_list.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Media Collections" %} - {{ block.super }}{% endblock %}
 
 {% block title%}
- <img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> {% trans "Media Collections" %}
+ <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" /> {% trans "Media Collections" %}
 {% endblock %}
 
 {% block title_buttons %}

diff --git a/telemeta/templates/telemeta/collection_related_edit.html b/telemeta/templates/telemeta/collection_related_edit.html
index 6f689e9579f2163c5676f3100063f1959a95b0e8..618589d062c14163bee79634d539ca0697d89a1f 100644 (file)
--- a/telemeta/templates/telemeta/collection_related_edit.html
+++ b/telemeta/templates/telemeta/collection_related_edit.html
@@ -5,7 +5,7 @@
 {% block extra_javascript %}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "collections_red.png" %}" style="vertical-align:middle" /> Collection : {{ collection }}
+ <img src="{{ STATIC_URL }}telemeta/images/collections_red.png" style="vertical-align:middle" /> Collection : {{ collection }}
 {% endblock %}
 
 {% block title_buttons %}
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-  {% block infos %}    
+  {% block infos %}
     <div class="infos">
      <form enctype="multipart/form-data" method="post" id="_editMediaCollectionRelatedFileForm" action="">{% csrf_token %}
 

diff --git a/telemeta/templates/telemeta/enumeration_edit.html b/telemeta/templates/telemeta/enumeration_edit.html
index ec16531d3dc99b87f293505c36aa2401250393e9..042637a5f50a3b51f4cf654aa7a560a460a2a409 100644 (file)
--- a/telemeta/templates/telemeta/enumeration_edit.html
+++ b/telemeta/templates/telemeta/enumeration_edit.html
@@ -4,7 +4,7 @@
 {% block head_title %}{% trans "Enumeration" %} : {{ enumeration_name|capfirst }} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Enumerations" %}</h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Enumerations" %}</h1>
 {% endblock %}
 
 {% block tabcontents %}

diff --git a/telemeta/templates/telemeta/geo_continents.html b/telemeta/templates/telemeta/geo_continents.html
index 6e36b610f51e2d3d498af8798502d54ebc298a41..9fec8aee423fdc4e39644ff2205d2591c7d01e9c 100644 (file)
--- a/telemeta/templates/telemeta/geo_continents.html
+++ b/telemeta/templates/telemeta/geo_continents.html
@@ -7,7 +7,7 @@
 {% block extra_javascript %}
 {% if gmap_key %}
 <script src="http://www.google.com/jsapi?key={{ gmap_key }}" type="text/javascript"></script>
-<script src="{% url telemeta-js "resourcemap.js" %}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/resourcemap.js" type="text/javascript"></script>
 <script type="text/javascript">
 var resourceMap = new ResourceMap('.continents', {
     'countryInfoUri': '/geo/country_info/RESOURCEID/'
@@ -17,7 +17,7 @@ var resourceMap = new ResourceMap('.continents', {
 {% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "world_red.png" %}" alt="geo-navigator" style="vertical-align:middle" /> {% trans "Geographic Navigator" %}
+ <img src="{{ STATIC_URL }}telemeta/images/world_red.png" alt="geo-navigator" style="vertical-align:middle" /> {% trans "Geographic Navigator" %}
 {% endblock %}
 
 {% block title_buttons %}

diff --git a/telemeta/templates/telemeta/geo_countries.html b/telemeta/templates/telemeta/geo_countries.html
index 1c920153f4c7a7dbaa984fdd5232547175b669dd..64d538d7bd582405df8e9fa2cfcbae0bbd95cd29 100644 (file)
--- a/telemeta/templates/telemeta/geo_countries.html
+++ b/telemeta/templates/telemeta/geo_countries.html
@@ -5,7 +5,7 @@
 {% block head_title %}{{ continent }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "world_red.png" %}" alt="geo-countries" style="vertical-align:middle" /> <a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> / {{ continent }}
+ <img src="{{ STATIC_URL }}telemeta/images/world_red.png" alt="geo-countries" style="vertical-align:middle" /> <a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> / {{ continent }}
 {% endblock title %}
 
 {% block content %}
@@ -32,7 +32,7 @@
     </a>
     {% endwith %}
     </td>
-    </tr>  
+    </tr>
 {% endfor %}
 </table>
 {% endblock %}

diff --git a/telemeta/templates/telemeta/geo_country_collections.html b/telemeta/templates/telemeta/geo_country_collections.html
index f1da15cc56a38799e2aedd105335733032d4b74e..2ef5c194706cb6ecf0fc13ad5046b25caeca745f 100644 (file)
--- a/telemeta/templates/telemeta/geo_country_collections.html
+++ b/telemeta/templates/telemeta/geo_country_collections.html
@@ -5,7 +5,7 @@
 {% block head_title %}{{ country }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<img src="{% url telemeta-images "world_red.png" %}" alt="geo-country" style="vertical-align:middle" /> <a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
+<img src="{{ STATIC_URL }}telemeta/images/world_red.png" alt="geo-country" style="vertical-align:middle" /> <a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
   <a href="{% url telemeta-geo-countries continent.flatname %}">{{ continent }}</a> / {{ country }}
 {% endblock title %}
 

diff --git a/telemeta/templates/telemeta/inc/collection_list.html b/telemeta/templates/telemeta/inc/collection_list.html
index 24c6865a4e021457fc24727943778b43413397b8..24fe8cf52bfd3877867ff0975aec427efab757f0 100644 (file)
--- a/telemeta/templates/telemeta/inc/collection_list.html
+++ b/telemeta/templates/telemeta/inc/collection_list.html
@@ -37,7 +37,7 @@
     </td>
     <td>
       {% if collection.has_mediafile %}
-       <img src="images/ok.png" alt="yes" style="vertical-align:middle" />
+       <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" />
       {% endif %}
     </td>
 </tr>

diff --git a/telemeta/templates/telemeta/inc/module_revisions.html b/telemeta/templates/telemeta/inc/module_revisions.html
index 307d8524443444e4ba3ae2b2222e60ee69fa7082..a8d503adc300bce0205460a03b7f548139920e90 100644 (file)
--- a/telemeta/templates/telemeta/inc/module_revisions.html
+++ b/telemeta/templates/telemeta/inc/module_revisions.html
@@ -2,14 +2,14 @@
 {% load i18n %}
 
    <div class="module">
-    
+
     {% 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 %}
-    
+
     <div class="vscroll">
     <table class="listing" bgcolor="#FFFFFF" style="width: 100%">
       <tr>

diff --git a/telemeta/templates/telemeta/inc/module_searches.html b/telemeta/templates/telemeta/inc/module_searches.html
index 82c5ab667c96ea288cd85b64483f1794452f2923..d6c4f17d5c8e19dcd82866f1b6bf66c219093c9e 100644 (file)
--- a/telemeta/templates/telemeta/inc/module_searches.html
+++ b/telemeta/templates/telemeta/inc/module_searches.html
@@ -3,9 +3,9 @@
 
    <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">
     <table class="listing" bgcolor="#FFFFFF" style="width: 100%">
       <tr>

diff --git a/telemeta/templates/telemeta/inc/module_user_revisions.html b/telemeta/templates/telemeta/inc/module_user_revisions.html
index 9c017056dc482b8f52ef1196a7b0fbb0497c4475..e066fcc857f46b9a0c23eb83469b2dc99a08ebd7 100644 (file)
--- a/telemeta/templates/telemeta/inc/module_user_revisions.html
+++ b/telemeta/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/telemeta/templates/telemeta/instrument_edit.html b/telemeta/templates/telemeta/instrument_edit.html
index 29827113317e939a29e4b9096ae2e6e3aa46a56b..46ceb864b6c796ba92d6dd0106cafe9576cdb2f0 100644 (file)
--- a/telemeta/templates/telemeta/instrument_edit.html
+++ b/telemeta/templates/telemeta/instrument_edit.html
@@ -4,7 +4,7 @@
 {% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
-<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Instruments" %}</h1>
+<h1><img src="{{ STATIC_URL }}telemeta/images/admin_red.png" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Instruments" %}</h1>
 {% endblock %}
 
 {% block tabcontents %}

diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html
index fbd545a69e5c66e7b5f872a4123e976b0f44f70e..6bf5b053ffd1bef3412b817d101de839990a0464 100644 (file)
--- a/telemeta/templates/telemeta/lists.html
+++ b/telemeta/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,11 +40,11 @@
     {% include "telemeta/inc/module_revisions.html" %}
     {% endwith %}
     {% endblock %}
-    
+
 </div>
 
 <div class="home-description">
-    <h1><img src="{% url telemeta-images "playlist_title.png" %}" alt="playlists" style="vertical-align:middle" /> {% trans "My playlists" %}</h1>
+    <h1><img src="{{ STATIC_URL }}telemeta/images/playlist_title.png" alt="playlists" style="vertical-align:middle" /> {% trans "My playlists" %}</h1>
     <a href="#" id="_new_playlist" style="float:right" class="component_icon button icon_add">
         {% trans "Add" %}</a>
     {% for playlist in playlists %}
@@ -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/telemeta/templates/telemeta/login.html b/telemeta/templates/telemeta/login.html
index 9e51b1a2e36d8821627c4daa5ee122c056256d7f..8b1b776fb73ff054e370308e65b89c4d08df8fe1 100644 (file)
--- a/telemeta/templates/telemeta/login.html
+++ b/telemeta/templates/telemeta/login.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block title %}
- <img src="{% url telemeta-images "user_red.png" %}" style="vertical-align:middle" /> {% trans "User authentication" %}
+ <img src="{{ STATIC_URL }}telemeta/images/user_red.png" style="vertical-align:middle" /> {% trans "User authentication" %}
 {% endblock %}
 
 {% block content %}

diff --git a/telemeta/templates/telemeta/mediaitem_add.html b/telemeta/templates/telemeta/mediaitem_add.html
index 8e7c031ee9434ba46e4cd2c8a546a453d2bd8476..5d6ce3fd6e76b07c9b9b8e795b9d962bf2e36a3e 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_add.html
+++ b/telemeta/templates/telemeta/mediaitem_add.html
@@ -6,7 +6,7 @@
 
 {% if item %}
 {% block title %}
-    <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> Item : NEW
+    <img src="{{ STATIC_URL }}telemeta/images/images "item.png" alt="item" style="vertical-align:middle" /> Item : NEW
 {% endblock %}
 
 {% block title_buttons %}
@@ -47,7 +47,7 @@
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save"
    onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_addItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-           <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{% url telemeta-images "wait.gif" %}" />
+           <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
        </div>
      </form>
     </div>

diff --git a/telemeta/templates/telemeta/mediaitem_copy.html b/telemeta/templates/telemeta/mediaitem_copy.html
index 1d888e159db2f8eba328a182bda6668857a1628c..38c0caed061ef902f80e77ddc3f088d82003c29c 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_copy.html
+++ b/telemeta/templates/telemeta/mediaitem_copy.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> Item : NEW
+ <img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" /> Item : NEW
 {% endblock %}
 
 {% block title_buttons %}

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 95ee73f1b9756f4742320c84eb28c520defdc292..27250f4635929ad71d4790787eaf5fa699d3017d 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -153,7 +153,7 @@ Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
         <!-- </div> -->
         <div id="tabs_container">
             <!-- this div will be hidden when everything is fully loaded-->
-            <span id="loading_span" href="#"><img style="vertical-align:middle" alt="wait" src="{% url telemeta-images "wait.gif" %}" />&nbsp;
+            <span id="loading_span" href="#"><img style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />&nbsp;
                 <span id="loading_span_text">Loading...</span></span>
             <a id="tab_analysis" style="display:none" class ="tab" href="#">{% trans "Analysis" %}</a><!--
              do not let space here as it appears in the document!!!!!

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index c665d3be34136c22c6e856227aa131934785943c..e22224aac2259630938613184f26e4425c9a8821 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -3,7 +3,7 @@
 {% load telemeta_utils %}
 
 {% block title %}
-<img src="{% url telemeta-images "item.png" %}" style="vertical-align:middle" /> Item : {{ item }}
+<img src="{{ STATIC_URL }}telemeta/images/item.png" style="vertical-align:middle" /> Item : {{ item }}
 {% endblock %}
 
 {% block title_buttons %}
@@ -50,7 +50,7 @@
     <a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a>
     {% endif %}
     <a href="#" class="component_icon button icon_save" onclick="var d=document; d.getElementById('wait-img').style.display='inline'; setTimeout(function(){d.getElementById('_editItemForm').submit();},300); return false;">{% trans "Save" %}</a>
-    <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{% url telemeta-images  "wait.gif" %}" />
+    <img id="wait-img" style="display:none" style="vertical-align:middle" alt="wait" src="{{ STATIC_URL }}telemeta/images/wait.gif" />
     </div>
     </form>
 </div>

diff --git a/telemeta/templates/telemeta/mediaitem_keywords_edit.html b/telemeta/templates/telemeta/mediaitem_keywords_edit.html
index 9e2ca7d6e0338c48e4ac63ba7d0fa2562ad8d1bc..a3db8c744b6d7b5b0b757fb3a95e2c70e4324e84 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_keywords_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_keywords_edit.html
@@ -6,14 +6,14 @@
 {% endblock %}
 
   {% block title %}
-    <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
+    <img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" /> <h1>Item : {{ item }}</h1>
   {% endblock %}
   {% block title_buttons %}
    <a href="{% url telemeta-item-detail item.public_id %}" class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
   {% endblock %}
 
 {% block content %}
-  {% block infos %}    
+  {% block infos %}
     <div class="infos">
      <form method="post" id="_editForm" action="">{% csrf_token %}
 
@@ -33,16 +33,16 @@
        </table>
        <br />
     {% endfor %}
-      
+
       <div align="center">
         <a href="{% url telemeta-item-detail item.public_id %}"
            class="component_icon button icon_cancel">{% trans "Cancel" %}</a>
         <a href="#" class="component_icon button icon_save"
    onclick="document.getElementById('_editForm').submit(); return false;">{% trans "Save" %}</a>
        </div>
-    
+
      </form>
     </div>
-       
+
   {% endblock infos %}
 {% endblock content %}

diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html
index 26e4523793aad29a877d80768d34c4cbb0644830..f307aeeeb9ca8b6a1b5459279c5724af96c21903 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_list.html
+++ b/telemeta/templates/telemeta/mediaitem_list.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Media Items" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> {% trans "Media Items" %}
+ <img src="{{ STATIC_URL }}telemeta/images/item.png" alt="item" style="vertical-align:middle" /> {% trans "Media Items" %}
 {% endblock %}
 
 {% block title_buttons %}

diff --git a/telemeta/templates/telemeta/mediaitem_performances_edit.html b/telemeta/templates/telemeta/mediaitem_performances_edit.html
index a12ff3fe6b716c7914a187ee356e8dcb6a701ab5..3b5fa30b319fd031471c93bafe998aa5f8753147 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_performances_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_performances_edit.html
@@ -5,7 +5,7 @@
 {% block extra_javascript %}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "item.png" %}" style="vertical-align:middle" /> Item : {{ item }}
+ <img src="{{ STATIC_URL }}telemeta/images/item.png" style="vertical-align:middle" /> Item : {{ item }}
 {% endblock %}
 
 {% block title_buttons %}
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-  {% block infos %}    
+  {% block infos %}
     <div class="infos">
      <form method="post" id="_editPerformanceForm" action="">{% csrf_token %}
 

diff --git a/telemeta/templates/telemeta/mediaitem_related_edit.html b/telemeta/templates/telemeta/mediaitem_related_edit.html
index c954c78bce79011c1448fc5123347390737878d8..a7312a88f892c0a7633b74a00c36b0be19dc3227 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_related_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_related_edit.html
@@ -5,7 +5,7 @@
 {% block extra_javascript %}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "item.png" %}" style="vertical-align:middle" /> Item : {{ item }}
+ <img src="{{ STATIC_URL }}telemeta/images/item.png" style="vertical-align:middle" /> Item : {{ item }}
 {% endblock %}
 
 {% block title_buttons %}
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-  {% block infos %}    
+  {% block infos %}
     <div class="infos">
      <form enctype="multipart/form-data" method="post" id="_editMediaItemRelatedFileForm" action="">{% csrf_token %}
 

diff --git a/telemeta/templates/telemeta/profile_detail.html b/telemeta/templates/telemeta/profile_detail.html
index 4bfa103c8518f829a75c18bc5a1f5faef29329ae..48dab507c85a3ede5000f29c3284d761d98494ab 100644 (file)
--- a/telemeta/templates/telemeta/profile_detail.html
+++ b/telemeta/templates/telemeta/profile_detail.html
@@ -1,18 +1,18 @@
 {% extends "telemeta/base.html" %}
 {% load i18n %}
 {% load telemeta_utils %}
-        
+
 {% block head_title %}{% trans "User Profile" %} : {{ usr.username }}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "user_red.png" %}" alt="user" style="vertical-align:middle" /> {% trans "User profile" %} : {{ usr.username }}
+ <img src="{{ STATIC_URL }}telemeta/images/user_red.png" alt="user" style="vertical-align:middle" /> {% trans "User profile" %} : {{ usr.username }}
 {% endblock %}
 
 {% block content %}
   <div id="module-set" style="width: 33%">
   {% block modules %}
   <div class="module">
-    <h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />
+    <h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />
     {% trans "Playlists" %}</h3>
     <ul class="playlist">
     {% for p in playlists %}
@@ -39,7 +39,7 @@
       <dt>{% trans "First Name" %}</dt><dd>{{ usr.first_name }}</dd>
       <dt>{% trans "Last Name" %}</dt><dd>{{ usr.last_name }}</dd>
       <dt>{% trans "Email" %}</dt><dd>{{ usr.email }}</dd>
-      
+
       <dt>{% trans "Institution" %}</dt><dd>{% if profile %}{{ profile.institution }}{% endif %}</dd>
       <dt>{% trans "Department" %}</dt><dd>{% if profile %}{{ profile.department }}{% endif %}</dd>
       <dt>{% trans "Function" %}</dt><dd>{% if profile %}{{ profile.function }}{% endif %}</dd>
@@ -47,7 +47,7 @@
       <dt>{% trans "Address" %}</dt><dd>{% if profile %}{{ profile.address }}{% endif %}</dd>
       <dt>{% trans "Telephone" %}</dt><dd>{% if profile %}{{ profile.telephone }}{% endif %}</dd>
       <dt>{% trans "Expiration date" %}</dt><dd>{% if profile %}{{ profile.expiration_date }}{% endif %}</dd>
-      
+
       <dt>{% trans "Is staff" %}</dt><dd>{{ usr.is_staff }}</dd>
       <dt>{% trans "Is superuser" %}</dt><dd>{{ usr.is_superuser }}</dd>
       <dt>{% blocktrans count user.groups.all.count as counter %}Group{% plural %}Groups{% endblocktrans %}</dt><dd>{% for group in usr.groups.all %}{{ group }} {% endfor %}</dd>
@@ -60,21 +60,21 @@
              <option {% if lang.0 == LANGUAGE_CODE %}selected{% endif %} value="{{ lang.0 }}">{{ lang.1 }}</option>
             {% endfor %}
           </select>
-          <a href="#" class="component_icon button icon_ok" 
+          <a href="#" class="component_icon button icon_ok"
             onclick="document.getElementById('setlang').submit(); return false;">{% trans "Apply" %}</a>
          </form>
         </dd>
       {%  endif %}
      </dl>
     </div>
-        
+
     {% if user.is_authenticated and user.username == usr.username or user.is_staff %}
     <a href="{% url telemeta-profile-edit usr.username %}" class="component_icon button icon_edit">{% trans "Edit" %}</a>
     {%  endif %}
     {% if user.is_authenticated and user.username == usr.username %}
     <a href="{% url telemeta-password-change %}" class="component_icon button icon_login">{% trans "Change password" %}</a>
     {%  endif %}
- 
+
   </div>
 {% endblock %}
 

diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html
index af7632384bf5b6fcf045375c387d019c2525d549..036bc21578c563e4cc1b816f421a55a562ec2695 100644 (file)
--- a/telemeta/templates/telemeta/resource_detail.html
+++ b/telemeta/templates/telemeta/resource_detail.html
@@ -5,17 +5,17 @@
 {% block head_title %}{% trans type %}{{resource|prepend:' : '}} - {{ block.super }}{% endblock %}
 
 {% block extra_javascript %}
-<script src="{% url telemeta-js "popupdiv.js" %}" type="text/javascript"></script>
-<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/popupdiv.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}telemeta/js/playlist.js" type="text/javascript"></script>
 <script>
 {% if user.is_authenticated %}
 jQuery(document).ready(function(){
     var p = playlistUtils;
-    
+
     {% for playlist in playlists %}
     p.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
     {% endfor %}
-    
+
     {% if resource %}
     var anchor = jQuery('#_add_to_playlist');
     if(anchor.length){
@@ -74,7 +74,7 @@ jQuery(document).ready(function(){
                <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>
               {% endif %}
             </dl>
-            
+
         {% endblock general_info %}
 
         {% if related_media %}
@@ -84,9 +84,9 @@ jQuery(document).ready(function(){
             {% endblock related %}
         </div>
         {% endif %}
-        
+
         <div class="extraInfos">
-        <h4><img src="{% url telemeta-images "item_title.png" %}" style="vertical-align:middle" />{{resource.children_type|capitalize }} </h4>
+        <h4><img src="{{ STATIC_URL }}telemeta/images/item_title.png" style="vertical-align:middle" />{{resource.children_type|capitalize }} </h4>
         {% with resource.children.all as children %}
             {% include "telemeta/inc/children_list.html" %}
         {% endwith %}

diff --git a/telemeta/templates/telemeta/resource_related_edit.html b/telemeta/templates/telemeta/resource_related_edit.html
index a0065ddab96e89eb15f06739a27e4a1956eb4ad9..066359595bf680a570436f502026942702b63749 100644 (file)
--- a/telemeta/templates/telemeta/resource_related_edit.html
+++ b/telemeta/templates/telemeta/resource_related_edit.html
@@ -5,7 +5,7 @@
 {% block extra_javascript %}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "item.png" %}" style="vertical-align:middle" /> {{ type|capitalize }} : {{ resource }}
+ <img src="{{ STATIC_URL }}telemeta/images/item.png" style="vertical-align:middle" /> {{ type|capitalize }} : {{ resource }}
 {% endblock %}
 
 {% block title_buttons %}

diff --git a/telemeta/templates/telemeta/search_criteria.html b/telemeta/templates/telemeta/search_criteria.html
index d02bf43d356e596dbc80b388c8464395eb778e6a..6400090309c58ed7125e295e3e0ecb5f1039ea48 100644 (file)
--- a/telemeta/templates/telemeta/search_criteria.html
+++ b/telemeta/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);
@@ -52,7 +52,7 @@ $(document).ready(function () {
 {% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "adv_search_red.png" %}" alt="advanced-search" style="vertical-align:middle" /> {% trans "Advanced Search" %}
+ <img src="{{ STATIC_URL }}telemeta/images/adv_search_red.png" alt="advanced-search" style="vertical-align:middle" /> {% trans "Advanced Search" %}
 {% endblock %}
 
 {% block content %}
@@ -94,7 +94,7 @@ $(document).ready(function () {
     <input type="text" id="collector" name="collector" />
     </p>
 
-    {% if rec_years %} 
+    {% if rec_years %}
     <p>
     <label for="rec_date_from">{% trans "Year of recording" %}</label>
     <select id="rec_year_from" name="rec_year_from" class="tiny">
@@ -113,7 +113,7 @@ $(document).ready(function () {
     </p>
     {% endif %}
 
-    {% if pub_years %} 
+    {% if pub_years %}
     <p>
     <label for="pub_date_from">{% trans "Year of publication" %}</label>
     <select id="pub_year_from" name="pub_year_from" class="tiny">

diff --git a/telemeta/templates/telemeta/search_results.html b/telemeta/templates/telemeta/search_results.html
index 5426898018ad20b82bedbedf7600a454cbd07ad9..0d6ce3175610a989a002ad8ace8436953a7ccaa8 100644 (file)
--- a/telemeta/templates/telemeta/search_results.html
+++ b/telemeta/templates/telemeta/search_results.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Search Results" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "search_red.png" %}" alt="search-results" style="vertical-align:middle" /> {% trans "Search Results" %}
+ <img src="{{ STATIC_URL }}telemeta/images/search_red.png" alt="search-results" style="vertical-align:middle" /> {% trans "Search Results" %}
 {% endblock %}
 
 {% block title_buttons %}
@@ -69,9 +69,9 @@
    <div class="fullpage">
       {% include "telemeta/inc/mediaitem_list.html" %}
    </div>
-  {% endwith %}    
+  {% endwith %}
 {% endifequal %}
-  
+
 {% ifequal type 'collections' %}
 <p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | Collections ({{collections_num}}) | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a>
   </b></p>

diff --git a/telemeta/templates/telemeta/users.html b/telemeta/templates/telemeta/users.html
index 4f73df1e9b71a80a53c0729506a38f7a34a34137..bbf4d913cbb7a4cee5e1780c9c5c694e5598d1fe 100644 (file)
--- a/telemeta/templates/telemeta/users.html
+++ b/telemeta/templates/telemeta/users.html
@@ -5,7 +5,7 @@
 {% block head_title %}{% trans "Users" %} - {{ block.super }}{% endblock %}
 
 {% block title %}
- <img src="{% url telemeta-images "user_red.png" %}" alt="user" style="vertical-align:middle" /> {% trans "Users" %}
+ <img src="{{ STATIC_URL }}telemeta/images/user_red.png" alt="user" style="vertical-align:middle" /> {% trans "Users" %}
 {% endblock %}
 
 {% block content %}