projects / astakos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 92defad)
change IM_MEDIA_URL to IM_STATIC_URL
authorSofia Papagiannaki <papagian@gmail.com>
Mon, 6 Feb 2012 14:19:19 +0000 (16:19 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Mon, 6 Feb 2012 14:19:19 +0000 (16:19 +0200)
Refs: #1993

astakos/im/admin/templates/admin_base.html patch | blob | history
astakos/im/context_processors.py patch | blob | history
astakos/im/settings.py patch | blob | history
astakos/im/templates/im/base.html patch | blob | history
astakos/im/templates/im/login.html patch | blob | history
astakos/im/templates/im/services_description.html patch | blob | history
astakos/im/templates/im/signup.html patch | blob | history
astakos/im/templates/registration/password_reset_form.html patch | blob | history

diff --git a/astakos/im/admin/templates/admin_base.html b/astakos/im/admin/templates/admin_base.html
index 216cb61..a0690eb 100644 (file)
--- a/astakos/im/admin/templates/admin_base.html
+++ b/astakos/im/admin/templates/admin_base.html
@@ -3,16 +3,16 @@
 <head>
   <meta charset="utf-8" />
   <title>{{ title|default:"Astakos Login" }}</title>
-  <link rel="stylesheet" href="{{ IM_MEDIA_URL }}css/bootstrap.css">
-  <script src="{{ IM_MEDIA_URL }}js/jquery.js"></script>
-  <script src="{{ IM_MEDIA_URL }}js/jquery.tablesorter.js"></script>
-  <script src="{{ IM_MEDIA_URL }}js/main.js"></script>
+  <link rel="stylesheet" href="{{ IM_STATIC_URL }}css/bootstrap.css">
+  <script src="{{ IM_STATIC_URL }}js/jquery.js"></script>
+  <script src="{{ IM_STATIC_URL }}js/jquery.tablesorter.js"></script>
+  <script src="{{ IM_STATIC_URL }}js/main.js"></script>
   {% block head %}{% endblock %}
 </head>
 <body>
   <div class="container">
     <div style="padding: 5px 0px 0px 0px">
-        <img src="{{ IM_MEDIA_URL }}images/banner.png" width="900" height="200">
+        <img src="{{ IM_STATIC_URL }}images/banner.png" width="900" height="200">
     </div>
     {% block title %}{% endblock %}
     
diff --git a/astakos/im/context_processors.py b/astakos/im/context_processors.py
index 47adce3..9f5eff0 100644 (file)
--- a/astakos/im/context_processors.py
+++ b/astakos/im/context_processors.py
@@ -31,7 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED, IM_MEDIA_URL
+from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED, IM_STATIC_URL
 
 def im_modules(request):
     return {'im_modules': IM_MODULES}
@@ -46,5 +46,5 @@ def invitations(request):
     return {'invitations_enabled' :INVITATIONS_ENABLED}
 
 def media(request):
-    return {'IM_MEDIA_URL' : IM_MEDIA_URL}
+    return {'IM_STATIC_URL' : IM_STATIC_URL}
 
diff --git a/astakos/im/settings.py b/astakos/im/settings.py
index 18aeb0a..42db7ae 100644 (file)
--- a/astakos/im/settings.py
+++ b/astakos/im/settings.py
@@ -46,7 +46,7 @@ LOGIN_URL = getattr(settings, 'ASTAKOS_LOGIN_URL', '/im')
 COOKIE_NAME = getattr(settings, 'ASTAKOS_COOKIE_NAME', '_pithos2_a')
 COOKIE_DOMAIN = getattr(settings, 'ASTAKOS_COOKIE_DOMAIN', None)
 
-IM_MEDIA_URL = getattr(settings, 'ASTAKOS_IM_MEDIA_URL', '/im/static/im/')
+IM_STATIC_URL = getattr(settings, 'ASTAKOS_IM_STATIC_URL', '/im/static/im/')
 
 # SQLAlchemy (choose SQLite/MySQL/PostgreSQL).
 BACKEND_DB_MODULE =  getattr(settings, 'PITHOS_BACKEND_DB_MODULE', 'pithos.backends.lib.sqlalchemy')
diff --git a/astakos/im/templates/im/base.html b/astakos/im/templates/im/base.html
index 951dc8c..c29a432 100644 (file)
--- a/astakos/im/templates/im/base.html
+++ b/astakos/im/templates/im/base.html
@@ -20,7 +20,7 @@
   {% block page.js %}
   <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
   <!--[if lt IE 9]>
-      <script src="{{ IM_MEDIA_URL }}js/html5.js"></script>
+      <script src="{{ IM_STATIC_URL }}js/html5.js"></script>
   <![endif]-->
   {% endblock %}
   
@@ -32,22 +32,22 @@
   {% block page.css %}
       <link href='http://fonts.googleapis.com/css?family=Antic' 
         rel='stylesheet' type='text/css'>
-      <link rel="stylesheet" href="{{ IM_MEDIA_URL }}css/styles.css" 
+      <link rel="stylesheet" href="{{ IM_STATIC_URL }}css/styles.css" 
         type='text/css'>
-      <link rel="stylesheet" href="{{ IM_MEDIA_URL }}css/custom.css" 
+      <link rel="stylesheet" href="{{ IM_STATIC_URL }}css/custom.css" 
         type='text/css'>
   {% endblock page.css %}
 
   {% block headjs %}
-      <script src="{{ IM_MEDIA_URL }}js/modernizr-2.0.6.js"
+      <script src="{{ IM_STATIC_URL }}js/modernizr-2.0.6.js"
           type="text/javascript"></script>
-      <script src="{{ IM_MEDIA_URL }}js/jquery.js" 
+      <script src="{{ IM_STATIC_URL }}js/jquery.js" 
           type="text/javascript"></script>
-      <script src="{{ IM_MEDIA_URL }}js/jquery.infieldlabel.js" 
+      <script src="{{ IM_STATIC_URL }}js/jquery.infieldlabel.js" 
           type="text/javascript"></script>
-      <script src="{{ IM_MEDIA_URL }}js/bootstrap-tooltip.js" 
+      <script src="{{ IM_STATIC_URL }}js/bootstrap-tooltip.js" 
           type="text/javascript"></script>
-      <script src="{{ IM_MEDIA_URL }}js/form-errors.js" 
+      <script src="{{ IM_STATIC_URL }}js/form-errors.js" 
           type="text/javascript"></script>
   {% endblock headjs %}
   {% block endhead %}{% endblock endhead %}
diff --git a/astakos/im/templates/im/login.html b/astakos/im/templates/im/login.html
index 9a81541..f9bd2aa 100644 (file)
--- a/astakos/im/templates/im/login.html
+++ b/astakos/im/templates/im/login.html
@@ -7,7 +7,7 @@ Login
 
 {% block body %}
 <div class="section">
-    <img class="pic" src="{{ IM_MEDIA_URL }}images/pictures/login_pic.png" />
+    <img class="pic" src="{{ IM_STATIC_URL }}images/pictures/login_pic.png" />
 </div>
 {% include "im/services_description.html" %}
 {% endblock body %}
diff --git a/astakos/im/templates/im/services_description.html b/astakos/im/templates/im/services_description.html
index 8572a96..addc2d5 100644 (file)
--- a/astakos/im/templates/im/services_description.html
+++ b/astakos/im/templates/im/services_description.html
@@ -9,7 +9,7 @@
 </div>
 <div class="section service-desc okeanos">
     <h2>
-        <img class="pic" src="{{ IM_MEDIA_URL }}images/service_okeanos_logo.png" />
+        <img class="pic" src="{{ IM_STATIC_URL }}images/service_okeanos_logo.png" />
     </h2>
     <p>
     There will be some text here explaining about what i am signing up for
@@ -20,7 +20,7 @@
 </div>
 <div class="section service-desc">
     <h2>
-        <img class="pic" src="{{ IM_MEDIA_URL }}images/service_pithos_logo.png" />
+        <img class="pic" src="{{ IM_STATIC_URL }}images/service_pithos_logo.png" />
     </h2>
     <p>
     There will be some text here explaining about what i am signing up for
diff --git a/astakos/im/templates/im/signup.html b/astakos/im/templates/im/signup.html
index 52a05e9..a702605 100644 (file)
--- a/astakos/im/templates/im/signup.html
+++ b/astakos/im/templates/im/signup.html
@@ -8,7 +8,7 @@
 
 {% block body %}
 <div class="section">
-    <img class="pic" src="{{ IM_MEDIA_URL }}images/pictures/signup_pic.png" />
+    <img class="pic" src="{{ IM_STATIC_URL }}images/pictures/signup_pic.png" />
 </div>
 {% include "im/services_description.html" %}
 {% endblock body %}
diff --git a/astakos/im/templates/registration/password_reset_form.html b/astakos/im/templates/registration/password_reset_form.html
index 9596d41..4df80ec 100644 (file)
--- a/astakos/im/templates/registration/password_reset_form.html
+++ b/astakos/im/templates/registration/password_reset_form.html
@@ -6,7 +6,7 @@ Login
 
 {% block body %}
 <div class="section">
-    <img class="pic" src="{{ IM_MEDIA_URL }}images/pictures/login_pic.png" />
+    <img class="pic" src="{{ IM_STATIC_URL }}images/pictures/login_pic.png" />
 </div>
 {% include "im/services_description.html" %}
 {% endblock body %}
Unnamed repository; edit this file 'description' to name the repository.