From bfed62d83393f6fdebf365161aecdeb9d6578d98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adolfo=20G=C3=B3mez?= <dkmaster@dkmon.com>
Date: Fri, 8 Nov 2013 14:40:52 +0000
Subject: [PATCH] * Basic htm5 template done * Updated translations & texts

---
 server/src/uds/templates/uds/html5/about.html |  7 +++++
 .../uds/templates/uds/html5/downloads.html    | 30 +++++++++----------
 server/src/uds/templates/uds/html5/index.html | 18 ++++++-----
 server/src/uds/templates/uds/index.html       |  8 ++---
 server/src/uds/urls.py                        |  1 +
 server/src/uds/web/views.py                   |  3 ++
 6 files changed, 40 insertions(+), 27 deletions(-)
 create mode 100644 server/src/uds/templates/uds/html5/about.html

diff --git a/server/src/uds/templates/uds/html5/about.html b/server/src/uds/templates/uds/html5/about.html
new file mode 100644
index 000000000..f9a06cb78
--- /dev/null
+++ b/server/src/uds/templates/uds/html5/about.html
@@ -0,0 +1,7 @@
+{% extends "uds/html5/templates/base.html" %}
+{% load i18n %}
+
+
+
+{% block body %}
+{% endblock %}
\ No newline at end of file
diff --git a/server/src/uds/templates/uds/html5/downloads.html b/server/src/uds/templates/uds/html5/downloads.html
index af41512fa..a1d1464d8 100644
--- a/server/src/uds/templates/uds/html5/downloads.html
+++ b/server/src/uds/templates/uds/html5/downloads.html
@@ -2,20 +2,20 @@
 {% load i18n %}
 
 {% block body %}
-<div class="panel panel-default">
-    <div class="panel-heading">
-        {% trans "Downloads" %}
-    </div>
-    <div class="panel-body">
-    	<p>{% trans "This page contains a list of downloadables provided by different modules" %}</p>
-        <div class="list-group">
-          {% for f in files %}
-          <a class="list-group-item" href="{% url "uds.web.views.download" idDownload=f.id %}">
-            <h4 class="list-group-item-heading">{{ f.name }}</h4>
-            <p class="list-group-item-text">{{ f.comment|safe }}</p>
-          </a>
-          {% endfor %}
+        <div class="panel panel-info">
+            <div class="panel-heading">
+                {% trans "Downloads" %}
+            </div>
+            <div class="panel-body">
+            	<p>{% trans "This page contains a list of downloadables provided by different modules" %}</p>
+                <div class="list-group">
+                  {% for f in files %}
+                  <a class="list-group-item" href="{% url "uds.web.views.download" idDownload=f.id %}">
+                    <h4 class="list-group-item-heading">{{ f.name }}</h4>
+                    <p class="list-group-item-text">{{ f.comment|safe }}</p>
+                  </a>
+                  {% endfor %}
+                </div>
+            </div>
         </div>
-    </div>
-</div>
 {% endblock %}
diff --git a/server/src/uds/templates/uds/html5/index.html b/server/src/uds/templates/uds/html5/index.html
index 0cf85f8db..7097fbdce 100644
--- a/server/src/uds/templates/uds/html5/index.html
+++ b/server/src/uds/templates/uds/html5/index.html
@@ -98,12 +98,16 @@
 {% endif %}
 
 {% if user.isStaff %}
-  <div id="adminmsgs">
-	<div>{% trans "Ip" %}: {{ ip }}</li>
-	<div>{% trans "Networks" %}: {{ nets }}</div>
-	<div>{% trans "Transports" %}: {{ transports }}</div>
-	</div>
-    	 	
-  </div>
+        <div class="panel panel-warning">
+            <div class="panel-heading">
+                {% trans "Administrator info panel" %}
+            </div>
+            <div class="panel-body">
+                <p>{% trans "Ip" %}: {{ ip }}</p>
+                <p>{% trans "Networks" %}: {{ nets }}</p>
+                <p>{% trans "Transports" %}: {{ transports }}</p>
+        
+            </div>
+        </div>
 {% endif %}
 {% endblock %} 
\ No newline at end of file
diff --git a/server/src/uds/templates/uds/index.html b/server/src/uds/templates/uds/index.html
index f6cf70c37..c898103ea 100644
--- a/server/src/uds/templates/uds/index.html
+++ b/server/src/uds/templates/uds/index.html
@@ -75,11 +75,9 @@
 
 {% if user.isStaff %}
   <div id="adminmsgs">
-	<div>{% trans "Ip" %}: {{ ip }}</li>
-	<div>{% trans "Networks" %}: {{ nets }}</div>
-	<div>{% trans "Transports" %}: {{ transports }}</div>
-	</div>
-    	 	
+	<p>{% trans "Ip" %}: {{ ip }}</p>
+	<p>{% trans "Networks" %}: {{ nets }}</p>
+	<p>{% trans "Transports" %}: {{ transports }}</p>
   </div>
 {% endif %}
 {% endblock content %} 
\ No newline at end of file
diff --git a/server/src/uds/urls.py b/server/src/uds/urls.py
index e0a562b76..5bf28ab3a 100644
--- a/server/src/uds/urls.py
+++ b/server/src/uds/urls.py
@@ -63,6 +63,7 @@ urlpatterns = patterns('uds',
     (r'^auth/(?P<authName>.+)', 'web.views.authCallback'),
     (r'^authJava/(?P<idAuth>.+)/(?P<hasJava>.*)$', 'web.views.authJava'),
     (r'^authinfo/(?P<authName>.+)', 'web.views.authInfo'),
+    (r'^about', 'web.views.about'),
     
 )
 
diff --git a/server/src/uds/web/views.py b/server/src/uds/web/views.py
index 0825c6429..821bd534b 100644
--- a/server/src/uds/web/views.py
+++ b/server/src/uds/web/views.py
@@ -142,6 +142,9 @@ def customAuth(request, idAuth):
         res = 'error'
     return HttpResponse(res, content_type = 'text/html')
 
+def about(request):
+    return render(request, theme.template('about.html'))
+
 @webLoginRequired
 def logout(request):
     authLogLogout(request)