From 838b9d6fdbb9112ee70a72b8846f739e8a3b8879 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 5 Apr 2011 12:36:58 +0200 Subject: new skin --- src/templates/apps/auth/login.html | 9 ++++++ src/templates/apps/room/list.html | 14 ++++------ src/templates/base.html | 57 +++++++++++++++++++++----------------- src/templates/login.html | 9 ------ 4 files changed, 46 insertions(+), 43 deletions(-) create mode 100644 src/templates/apps/auth/login.html delete mode 100644 src/templates/login.html (limited to 'src/templates') diff --git a/src/templates/apps/auth/login.html b/src/templates/apps/auth/login.html new file mode 100644 index 0000000..b5302a7 --- /dev/null +++ b/src/templates/apps/auth/login.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} +{% load prefix %} +{% block headline %}Login{% endblock %} +{% block title %}SUNET Meeting Tools{% endblock %} +{% block content %} +

Welcome!

+

This is a technology preview of the SUNET Meeting Tools. Contact Johnny or Marcus for more info!

+
Login
+{% endblock %} \ No newline at end of file diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html index ac78f3c..203d67b 100644 --- a/src/templates/apps/room/list.html +++ b/src/templates/apps/room/list.html @@ -14,7 +14,7 @@ }); {% endblock %} {% block content %} -

Your Rooms

+

Your meeting rooms

{% if rooms %}
{% for r in rooms %} @@ -23,12 +23,10 @@

Created by {{r.creator}} {{r.timecreated|datehumanize}}.

Meeting room URL: {{r|roomurl}}

-
-
{% endfor %} @@ -37,9 +35,7 @@

You don't have any rooms listed right now...

{% endif %}
-
- -
+ {% endblock %} \ No newline at end of file diff --git a/src/templates/base.html b/src/templates/base.html index b2a6708..08cfc82 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -7,11 +7,9 @@ - - - + @@ -60,31 +58,40 @@ -
-
-
- - - -
- -
- - {% block content %}{% endblock %} - - -
-
+
+ -
-
-
-
-
-
+
+
+ {% block content %}{% endblock %}
+
+
diff --git a/src/templates/login.html b/src/templates/login.html deleted file mode 100644 index b5302a7..0000000 --- a/src/templates/login.html +++ /dev/null @@ -1,9 +0,0 @@ -{% extends "base.html" %} -{% load prefix %} -{% block headline %}Login{% endblock %} -{% block title %}SUNET Meeting Tools{% endblock %} -{% block content %} -

Welcome!

-

This is a technology preview of the SUNET Meeting Tools. Contact Johnny or Marcus for more info!

-
Login
-{% endblock %} \ No newline at end of file -- cgit v1.1