Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
synnefo
Commits
4ff98a1e
Commit
4ff98a1e
authored
Feb 06, 2012
by
Sofia Papagiannaki
Browse files
change IM_MEDIA_URL to IM_STATIC_URL
Refs: #1993
parent
92defad4
Changes
8
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 %}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment