--- a/src/ldt/ldt/settings.py Tue Aug 30 16:57:03 2011 +0200
+++ b/src/ldt/ldt/settings.py Wed Aug 31 11:56:04 2011 +0200
@@ -76,3 +76,4 @@
AUTO_INDEX_AFTER_SAVE = getattr(settings, 'AUTO_INDEX_AFTER_SAVE', True)
+WEB_VERSION = getattr(settings, 'WEB_VERSION', '')
\ No newline at end of file
--- a/src/ldt/ldt/static/ldt/css/style.css Tue Aug 30 16:57:03 2011 +0200
+++ b/src/ldt/ldt/static/ldt/css/style.css Wed Aug 31 11:56:04 2011 +0200
@@ -91,7 +91,6 @@
.version
{
text-align: right;
- color: white;
font-size:9px;
}
--- a/src/ldt/ldt/templates/ldt/ldt_base.html Tue Aug 30 16:57:03 2011 +0200
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html Wed Aug 31 11:56:04 2011 +0200
@@ -11,6 +11,7 @@
<![endif]-->
<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.qtip.min.js"></script>
<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.validate.js" ></script>
+
{% endblock %}
{% block js_declaration %}
@@ -150,8 +151,7 @@
</div>
<div style="float: right; text-align: right;" class="small" id="copyright_version">
<div>©2011 <a style="text-decoration: none; color: #4F5155;" href="http://www.iri.centrepompidou.fr">IRI</a></div>
- <div id="versionwrapper"><span class="version" id="version">{{VERSION}}</span></div>
- <div id="versionwrapper"><span class="version" id="version">{{WEB_VERSION}}</span></div>
+ <div id="versionwrapper"><span class="version" id="version"> {% trans "web" %} {{ WEB_VERSION }} | {% trans "platform" %} : {{VERSION}}</span></div>
</div>
{% endblock %}
</div>
--- a/src/ldt/ldt/utils/context_processors.py Tue Aug 30 16:57:03 2011 +0200
+++ b/src/ldt/ldt/utils/context_processors.py Wed Aug 31 11:56:04 2011 +0200
@@ -5,5 +5,6 @@
def ldtcontext(request):
return {'BASE_URL': settings.BASE_URL, 'MEDIA_URL': settings.MEDIA_URL, \
'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'WEB_URL': settings.WEB_URL, \
- 'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX, 'VERSION': ldt.get_version() }
+ 'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX, 'VERSION': ldt.get_version(), \
+ 'WEB_VERSION' : settings.WEB_VERSION, }
--- a/web/ldtplatform/settings.py Tue Aug 30 16:57:03 2011 +0200
+++ b/web/ldtplatform/settings.py Wed Aug 31 11:56:04 2011 +0200
@@ -1,5 +1,6 @@
#@PydevCodeAnalysisIgnore
import os.path
+import ldtplatform
# Django settings for project.
DEBUG = True
@@ -37,6 +38,7 @@
LANGUAGES = (
('fr', ugettext('French')),
+ ('en', ugettext('English')),
)
@@ -185,6 +187,8 @@
AUTO_INDEX_AFTER_SAVE = True
+WEB_VERSION = ldtplatform.get_version()
+
from config import *
if not "LOGIN_URL" in locals():
@@ -205,7 +209,6 @@
GLOBAL_LOG_LEVEL = LOG_LEVEL
if not "GLOBAL_LOG_HANDLERS" in locals():
GLOBAL_LOG_HANDLERS = [{'handler':logging.FileHandler(LOG_FILE), 'format':"%(asctime)s - %(levelname)s : %(message)s"}]
-
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
@@ -218,3 +221,4 @@
# URL that handles the media served from MEDIA_ROOT.
if not "MEDIA_URL" in locals():
MEDIA_URL = BASE_URL + 'static/media/'
+