From ba5d3261e0d6c06b340a11bd892974d8aad76968 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Sat, 25 Oct 2014 02:28:13 -0400
Subject: [PATCH] Remove use of hard coded STATIC_URL template variable

---
 mayan/apps/main/templates/main/generic_confirm.html        | 4 ++--
 .../apps/main/templates/main/generic_form_subtemplate.html | 7 ++++---
 .../main/generic_list_horizontal_subtemplate.html          | 5 +++--
 .../apps/main/templates/main/generic_list_subtemplate.html | 5 +++--
 .../main/templates/main/generic_multiform_subtemplate.html | 5 +++--
 mayan/apps/main/templates/main/home.html                   | 3 ++-
 mayan/apps/main/templates/main/login.html                  | 3 ++-
 mayan/apps/main/templates/main/project_description.html    | 7 ++++---
 8 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/mayan/apps/main/templates/main/generic_confirm.html b/mayan/apps/main/templates/main/generic_confirm.html
index d0192cd31b..d409af2793 100644
--- a/mayan/apps/main/templates/main/generic_confirm.html
+++ b/mayan/apps/main/templates/main/generic_confirm.html
@@ -49,11 +49,11 @@
 
                 <div class="group navform wat-cf">
                   <button class="button" type="submit">
-                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% trans 'Yes' %}" /> {% trans 'Yes' %}
+                    <img src="{% static 'web_theme_media/images/icons/tick.png' %}" alt="{% trans 'Yes' %}" /> {% trans 'Yes' %}
                   </button>
                   {% if previous %}
                   <a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="button">
-                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/cross.png"  alt="{% trans 'No' %}"/> {% trans 'No' %}
+                    <img src="{% static 'web_theme_media/images/icons/cross.png' %}"  alt="{% trans 'No' %}"/> {% trans 'No' %}
                   </a>
                   {% endif %}
                 </div>
diff --git a/mayan/apps/main/templates/main/generic_form_subtemplate.html b/mayan/apps/main/templates/main/generic_form_subtemplate.html
index 8e820ae98d..751a83010c 100644
--- a/mayan/apps/main/templates/main/generic_form_subtemplate.html
+++ b/mayan/apps/main/templates/main/generic_form_subtemplate.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load static %}
 
 {% if side_bar %}
     <div class="block">
@@ -80,20 +81,20 @@
                 {% if submit_icon_famfam %}
                     <span class="famfam active famfam-{{ submit_icon_famfam|default:'tick' }}"></span>
                 {% else %}
-                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}" />
+                    <img src="{% static 'web_theme_media/images/icons/tick.png' %}" alt="{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}" />
                 {% endif %}
                 {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}
             </button>
 
               {% if previous %}
                   <a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="button">
-                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/cross.png"  alt="{% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}"/> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
+                    <img src="{% static 'web_theme_media/images/icons/cross.png' %}"  alt="{% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}"/> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
                   </a>
               {% endif %}
 
             {% comment %}
             <a href="#header" class="button">
-                <img src="{{ STATIC_URL }}web_theme_media/images/icons/cross.png" alt="{% trans 'Cancel' %}"/> {% trans 'Cancel' %}
+                <img src="{% static 'web_theme_media/images/icons/cross.png' %}" alt="{% trans 'Cancel' %}"/> {% trans 'Cancel' %}
             </a>
             {% endcomment %}
         </div>
diff --git a/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html b/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html
index d0f49472f2..62bd40f5f8 100644
--- a/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html
+++ b/mayan/apps/main/templates/main/generic_list_horizontal_subtemplate.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load static %}
 
 {% load attribute_tags %}
 {% load pagination_tags %}
@@ -44,7 +45,7 @@
                     {% endwith %}
                     <div class="group navform wat-cf">
                         <button class="button" type="submit" name="{{ form.prefix }}-submit">
-                            <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}
+                            <img src="{% static 'web_theme_media/images/icons/tick.png' %}" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}
                         </button>
                     </div>
                 {% endif %}
@@ -82,7 +83,7 @@
                     {% endwith %}
                     <div class="group navform wat-cf">
                         <button class="button" type="submit" name="{{ form.prefix }}-submit">
-                            <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}
+                            <img src="{% static 'web_theme_media/images/icons/tick.png' %}" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}
                         </button>
                     </div>
                 {% endif %}
diff --git a/mayan/apps/main/templates/main/generic_list_subtemplate.html b/mayan/apps/main/templates/main/generic_list_subtemplate.html
index e5b7ddb0c0..2144f4e8ae 100644
--- a/mayan/apps/main/templates/main/generic_list_subtemplate.html
+++ b/mayan/apps/main/templates/main/generic_list_subtemplate.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load static %}
 
 {% load attribute_tags %}
 {% load pagination_tags %}
@@ -47,7 +48,7 @@
                         {% endwith %}
                         <div class="group navform wat-cf">
                             <button class="button" type="submit" name="{{ form.prefix }}-submit">
-                                <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}
+                                <img src="{% static 'web_theme_media/images/icons/tick.png' %}" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}
                             </button>
                         </div>
                     {% endif %}
@@ -167,7 +168,7 @@
                         {% endwith %}
                         <div class="group navform wat-cf">
                             <button class="button" type="submit" name="{{ form.prefix }}-submit">
-                                <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}
+                                <img src="{% static 'web_theme_media/images/icons/tick.png' %}" alt="{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}" /> {% if object %}{% trans "Save" %}{% else %}{% trans "Submit" %}{% endif %}
                             </button>
                         </div>
                     {% endif %}
diff --git a/mayan/apps/main/templates/main/generic_multiform_subtemplate.html b/mayan/apps/main/templates/main/generic_multiform_subtemplate.html
index 78c7f12e2f..adf5e132a1 100644
--- a/mayan/apps/main/templates/main/generic_multiform_subtemplate.html
+++ b/mayan/apps/main/templates/main/generic_multiform_subtemplate.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load static %}
 
 <div class="content">
     <h2 class="title">
@@ -63,14 +64,14 @@
                 {% if submit_icon_famfam %}
                     <span class="famfam active famfam-{{ submit_icon_famfam|default:'tick' }}"></span>
                 {% else %}
-                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/tick.png" alt="{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}" />
+                    <img src="{% static 'web_theme_media/images/icons/tick.png' %}" alt="{% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}" />
                 {% endif %}
                 {% if submit_label %}{{ submit_label }}{% else %}{% if object %}{% trans 'Save' %}{% else %}{% trans 'Submit' %}{% endif %}{% endif %}
             </button>
 
               {% if previous %}
                   <a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="button">
-                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/cross.png"  alt="{% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}"/> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
+                    <img src="{% static 'web_theme_media/images/icons/cross.png' %}"  alt="{% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}"/> {% if cancel_label %}{{ cancel_label }}{% else %}{% trans 'Cancel' %}{% endif %}
                   </a>
               {% endif %}
 
diff --git a/mayan/apps/main/templates/main/home.html b/mayan/apps/main/templates/main/home.html
index 7d09f28d5b..ecd439c966 100644
--- a/mayan/apps/main/templates/main/home.html
+++ b/mayan/apps/main/templates/main/home.html
@@ -1,13 +1,14 @@
 {% extends 'main/base.html' %}
 
 {% load i18n %}
+{% load static %}
 
 {% load project_tags %}
 
 {% block content %}
     <div class="content tc">
         <h1>{% project_name %}</h1>
-        <img src="{{ STATIC_URL }}images/1068504_92921456.jpg" />
+        <img src="{% static 'images/1068504_92921456.jpg' %}" />
         <h2>{% trans 'Django based open source document management system' %}</h2><hr>
     </div>
 {% endblock %}
diff --git a/mayan/apps/main/templates/main/login.html b/mayan/apps/main/templates/main/login.html
index 2eb695e715..9324aae531 100644
--- a/mayan/apps/main/templates/main/login.html
+++ b/mayan/apps/main/templates/main/login.html
@@ -1,6 +1,7 @@
 {% extends 'main/base.html' %}
 
 {% load i18n %}
+{% load static %}
 
 {% load autoadmin_tags %}
 {% load project_tags %}
@@ -59,7 +60,7 @@
                                 <input type="hidden" name="next" value="{{ next|escape }}" />
                                 <div class="group navform wat-cf">
                                 <button class="button" type="submit">
-                                    <img src="{{ STATIC_URL }}web_theme_media/images/icons/key.png" alt="Save" /> {% trans 'Login' %}
+                                    <img src="{% static 'web_theme_media/images/icons/key.png' %}" alt="Save" /> {% trans 'Login' %}
                                 </button>
                             </div>
                         </form>
diff --git a/mayan/apps/main/templates/main/project_description.html b/mayan/apps/main/templates/main/project_description.html
index 71f5392a36..f01cde04c4 100644
--- a/mayan/apps/main/templates/main/project_description.html
+++ b/mayan/apps/main/templates/main/project_description.html
@@ -1,7 +1,8 @@
 {% load i18n %}
+{% load static %}
 
-<link rel="stylesheet" href="{{ STATIC_URL }}css/override.css" type="text/css" media="screen" />
-<link rel="stylesheet" href="{{ STATIC_URL }}css/famfamfam-silk-sprite.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="{% static 'css/override.css' %}" type="text/css" media="screen" />
+<link rel="stylesheet" href="{% static 'css/famfamfam-silk-sprite.css' %}" type="text/css" media="screen" />
 
 <p class="tc">
     {% trans 'Open source, Django based electronic document manager with custom metadata, indexing, tagging, file serving integration, digital signature support and OCR capabilities' %}
@@ -22,5 +23,5 @@
     {% trans 'Released under the Apache 2.0 License' %}
 </p>
 <div class="tc">
-    <img src="{{ STATIC_URL }}images/mayan_logo_landscape_rough.png"/>
+    <img src="{% static 'images/mayan_logo_landscape_rough.png' %}"/>
 </div>