diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/meetingtools/apps/auth/views.py | 19 | ||||
| -rw-r--r-- | src/meetingtools/urls.py | 3 | ||||
| -rw-r--r-- | src/site-media/css/style.css | 19 | ||||
| -rw-r--r-- | src/site-media/css/sunet.css | 11 | ||||
| -rw-r--r-- | src/site-media/img/sunet-banner.png | bin | 0 -> 66931 bytes | |||
| -rw-r--r-- | src/templates/apps/auth/login.html (renamed from src/templates/login.html) | 0 | ||||
| -rw-r--r-- | src/templates/apps/room/list.html | 14 | ||||
| -rw-r--r-- | src/templates/base.html | 57 |
8 files changed, 71 insertions, 52 deletions
diff --git a/src/meetingtools/apps/auth/views.py b/src/meetingtools/apps/auth/views.py index a95a2bd..d74377a 100644 --- a/src/meetingtools/apps/auth/views.py +++ b/src/meetingtools/apps/auth/views.py @@ -9,9 +9,11 @@ import datetime from django.views.decorators.cache import never_cache import logging from meetingtools.apps.userprofile.models import UserProfile -from meetingtools.multiresponse import redirect_to +from meetingtools.multiresponse import redirect_to, make_response_dict from meetingtools.apps.room.views import _acc_for_user from meetingtools.ac import ac_api_client +from django.shortcuts import render_to_response +from django.contrib import auth def meta(request,attr): v = request.META.get(attr) @@ -37,6 +39,15 @@ def _is_member_or_employee(affiliations): lpa = map(_localpart,affiliations) return 'student' in lpa or 'staff' in lpa or ('member' in lpa and not 'student' in lpa) +@never_cache +def logout(request): + auth.logout(request) + return HttpResponseRedirect('/Shibboleth.sso/Logout') + +@never_cache +def login(request): + return render_to_response('apps/auth/login.html',make_response_dict(request,{'next': request.REQUEST.get("next")})); + def accounts_login_federated(request): if request.user.is_authenticated(): profile,created = UserProfile.objects.get_or_create(user=request.user) @@ -122,9 +133,3 @@ def accounts_login_federated(request): else: pass return redirect_to("/") - -@never_cache -def logout(request): - from django.contrib.auth import logout - logout(request) - return HttpResponseRedirect("/Shibboleth.sso/Logout")
\ No newline at end of file diff --git a/src/meetingtools/urls.py b/src/meetingtools/urls.py index 3e6e652..74a2052 100644 --- a/src/meetingtools/urls.py +++ b/src/meetingtools/urls.py @@ -16,8 +16,7 @@ urlpatterns = patterns('', (r'^admin-media/(?P<path>.*)$', 'django.views.static.serve',{'document_root': ADMIN_MEDIA_ROOT}), (r'^site-media/(?P<path>.*)$', 'django.views.static.serve',{'document_root': MEDIA_ROOT}), # Login/Logout - (r'^accounts/login/$',login,{'template_name': "login.html"}), - (r'^accounts/logout$',logout), + (r'^accounts/login/?$','meetingtools.apps.auth.views.login'), (r'^accounts/login-federated/$','meetingtools.apps.auth.views.accounts_login_federated'), (r'^accounts/logout/$','meetingtools.apps.auth.views.logout'), (r'^rooms?$','meetingtools.apps.room.views.list'), diff --git a/src/site-media/css/style.css b/src/site-media/css/style.css index 5fbcc55..deea06e 100644 --- a/src/site-media/css/style.css +++ b/src/site-media/css/style.css @@ -1,17 +1,19 @@ -html,body { font-size: 80%; font-family: arial, sans-serif; height: 100%; margin:0; padding:0;} +html,body { font-size: 80%; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; height: 100%; margin:0; padding:0;} body { min-width: 900px; width: 90%; } div#container { position: relative; height:auto !important; height: 100%; min-height: 80%; margin-left: 50px; margin-top: 0; padding-bottom: 90px;} #modal-dialog { font-size: 110%; } #modal-dialog input.text textarea { margin-bottom:12px; width:95%; padding: .4em; } #modal-dialog fieldset { padding:0; border:0; margin-top:25px; } div#intro { font-size: 150%; margin-top: 50px; } -div#footer { margin-right: 50px; border-top: 1px solid #CECECE; position: absolute; bottom: 0; padding-bottom: 0px; width: 95%; } +div#footer { margin-right: 50px; border-top: 1px solid #CECECE; position: absolute; bottom: 0; padding-bottom: 0px; width: 100%; } div#footer ul { list-style: none; padding: 0; margin: 0; } div#footer li { display: inline; } div#footer li li { display: block; } div#footer ul ul { float: left; padding-right: 50px; } div#header { margin: 0; padding: 0; padding-bottom: 30px; } div#header img { width: 100%; border: 0;} +#headline { position: absolute; top: 20px; left: 150px; z-index: 1; } +div#headline a { text-decoration: none; } h3.listheader { padding-left: 20px; } .navlist ul { list-style: none; padding: 0; margin: 0; font-size: 90%; } .navlist li { float: right; display: inline;} @@ -56,7 +58,18 @@ form .ui-widget li { float: right; border-right: 1px solid #CECECE; padding-righ .left { float: left; } .fieldinput ul { list-style: none inside; padding: 0; margin: 0; } .fieldinput li { padding: 0; margin: 0; display: inline; float: left; } - +a, a:hover, a:visited { + text-decoration: none; + color: #E37424; +} +h1, h1 a { + color: #E37424; + font-size: 220%; +} +h2, h2 a { + color: #E37424; + font-size: 150% +} #files { width: 520px; clear: both; margin: 20px 0 10px; } #files .viewport { width: 500px; height: 200px; overflow: hidden; position: relative; } diff --git a/src/site-media/css/sunet.css b/src/site-media/css/sunet.css index 3226fcd..c1f6319 100644 --- a/src/site-media/css/sunet.css +++ b/src/site-media/css/sunet.css @@ -6,7 +6,6 @@ } html, body { height: 100%; - background: url(../img/header.jpg) center top repeat-x; width: 100%; } .wrapper { @@ -15,7 +14,6 @@ html, body { height: 100%; margin: 0 auto -4em; width: 100%; - margin: 0 auto; } .wCont { width: 850px; @@ -25,10 +23,8 @@ html, body { height: 191px; } #logo { - display: block; - height: 145px; - width: 81px; - background: url(../img/logo.jpg) center no-repeat; + //display: block; + background: url(../img/sunet-banner.png); } .footer, .push { height: 4em; @@ -140,6 +136,9 @@ html, body { background: #EFEFEF; border-top: 2px solid #EBEBEB; border-bottom: 2px solid #EBEBEB; + position: absolute; + bottom: 0; + padding-bottom: 0px; } #footerText { padding: 20px 0 0; diff --git a/src/site-media/img/sunet-banner.png b/src/site-media/img/sunet-banner.png Binary files differnew file mode 100644 index 0000000..dbab61a --- /dev/null +++ b/src/site-media/img/sunet-banner.png 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"> </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>»</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> |
