Skip to content

GitLab

Commit 4ff98a1e authored by Sofia Papagiannaki's avatar Sofia Papagiannaki
Browse files

change IM_MEDIA_URL to IM_STATIC_URL 

Refs: #1993
parent 92defad4
Hide whitespace changes
Inline Side-by-side
astakos/im/admin/templates/admin_base.html
View file @ 4ff98a1e
......@@ -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 %}
......
astakos/im/context_processors.py
View file @ 4ff98a1e
......@@ -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}
astakos/im/settings.py
View file @ 4ff98a1e
......@@ -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')
......
astakos/im/templates/im/base.html
View file @ 4ff98a1e
......@@ -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 %}
......
astakos/im/templates/im/login.html
View file @ 4ff98a1e
......@@ -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 %}
......
astakos/im/templates/im/services_description.html
View file @ 4ff98a1e
......@@ -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
......
astakos/im/templates/im/signup.html
View file @ 4ff98a1e
......@@ -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 %}
......
astakos/im/templates/registration/password_reset_form.html
View file @ 4ff98a1e
......@@ -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 %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment