summaryrefslogtreecommitdiff
path: root/src/templates
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-04-05 12:36:58 +0200
committerLeif Johansson <leifj@sunet.se>2011-04-05 12:36:58 +0200
commit838b9d6fdbb9112ee70a72b8846f739e8a3b8879 (patch)
treec210512b1054e882d455de6466097705f3a485e7 /src/templates
parent79383e47a772e7d9197179c2be8e6b66e160806c (diff)
new skin
Diffstat (limited to 'src/templates')
-rw-r--r--src/templates/apps/auth/login.html (renamed from src/templates/login.html)0
-rw-r--r--src/templates/apps/room/list.html14
-rw-r--r--src/templates/base.html57
3 files changed, 37 insertions, 34 deletions
diff --git a/src/templates/login.html b/src/templates/apps/auth/login.html
index b5302a7..b5302a7 100644
--- a/src/templates/login.html
+++ b/src/templates/apps/auth/login.html
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 %}
- <h1>Your Rooms</h1>
+ <h1>Your meeting rooms</h1>
{% if rooms %}
<div id="rooms">
{% for r in rooms %}
@@ -23,12 +23,10 @@
<div>
<p>Created by {{r.creator}} {{r.timecreated|datehumanize}}.</p>
<p>Meeting room URL: <a href="{{r|roomurl}}">{{r|roomurl}}</a></p>
- <div class="buttons ilist">
- <ul>
+ <ul class="ilist">
<li><div class="button"><a href="{% prefix %}/room/{{r.id}}/modify">Modify Room</a></li>
<li><div class="button"><a href="{% prefix %}/room/{{r.id}}/delete">Delete Room</a></li>
</ul>
- </div>
</div>
</div>
{% endfor %}
@@ -37,9 +35,7 @@
<p>You don't have any rooms listed right now...</p>
{% endif %}
<br/>
- <div class="buttons">
- <ul>
- <li><div class="button"><a href="{% prefix %}/room/create">Create a new room</a></div></li>
- </ul>
- </div>
+ <ul class="ilist">
+ <li><div class="button"><a href="{% prefix %}/room/create">Create a new room</a></div></li>
+ </ul>
{% 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 @@
<meta http-equiv="content-type"
content="text/html;charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
- <link href="{% prefix %}/site-media/css/reset.css" rel="stylesheet" type="text/css" />
<link type="text/css" href="{% prefix %}/site-media/css/flick/jquery-ui-1.8.2.custom.css" rel="stylesheet">
- <link href="{% prefix %}/site-media/css/sunet.css" rel="stylesheet" type="text/css" />
- <link href="{% prefix %}/site-media/css/gs.css" rel="stylesheet" type="text/css" />
<link href="{% prefix %}/site-media/css/style.css" rel="stylesheet" type="text/css" />
+ <link href="{% prefix %}/site-media/css/gs.css" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="{% prefix %}/site-media/js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="{% prefix %}/site-media/js/jquery-ui-1.8.6.custom.min.js"></script>
<script type="text/javascript" src="{% prefix %}/site-media/js/jquery.validate.js"></script>
@@ -60,31 +58,40 @@
</head>
<body>
- <div class="wrapper">
- <div class="wCont">
- <div class="header">
- <a href="#" id="logo">&nbsp;</a>
- <div id="menuContL"><h1>Meeting Tools</h1></div>
- <div id="menuContR">
- </div>
- </div>
-
- <div class="content">
- <div style="display:none;" class="contL"></div>
- {% block content %}{% endblock %}
- <div style="display:none;" class="blockCont"></div>
- <div style="display:none;" class="contR"></div>
- <div class="clr"></div>
- </div>
+ <div id="container">
+ <div id="header">
+ <div id="headline"><h1>SUNET Meting Tools</h1></div>
+ <a href="#"><img src="{% prefix %}/site-media/img/sunet-banner.png"/></a>
+
+ <ul class="ui-helper-reset ui-widget ilist">
+ <li><a href="http://www.sunet.se">SUNET</a>&raquo;</li>
+ <li><a href="#">SUNET Meeting tools</a></li>
+ </ul>
</div>
- <div class="push"></div>
- </div>
- <div class="clr"></div>
- <div class="footer">
- <div class="wCont">
- <div id="footerText">
+ <div id="content">
+ <div style="width: 80%;">
+ {% block content %}{% endblock %}
</div>
</div>
+ <div class="clear"/>
+ <div id="footer">
+ <ul>
+ <li>
+ <ul>
+ <li><h3>Users</h3></li>
+ <li><a class="tip" title="{{ user.get_full_name }}" href="{% prefix %}/rooms">My Profile</a></li>
+ <li><a class="tip" title="Logout" id="logout" href="{% prefix %}/accounts/logout/">Logout</a></li>
+ </ul>
+ </li>
+ <li>
+ <ul>
+ <li><h3>Support</h3></li>
+ <li><a class="tip" title="SUNET" href="http://www.sunet.se">SUNET</a></li>
+ <li><a class="tip" title="SUNET Community Support" href="http://community.sunet.se">SUNET Community Support</a></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
</div>
</body>
</html>