diff options
Diffstat (limited to 'templates/base.html')
| -rw-r--r-- | templates/base.html | 75 |
1 files changed, 44 insertions, 31 deletions
diff --git a/templates/base.html b/templates/base.html index 2c32c79..0986936 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,15 +2,20 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> - <link type="text/css" href="/site-media/css/base/jquery-ui.css" rel="stylesheet" /> + <!-- <link type="text/css" href="/site-media/css/base/jquery-ui.css" rel="stylesheet" /> --> <!-- link type="text/css" href="/site-media/css/ui-lightness/jquery-ui-1.8.13.custom.css" rel="stylesheet" / --> <!-- link type="text/css" href="/site-media/css/jquery.jnotify.css" rel="stylesheet" /> <link type="text/css" href="/site-media/css/jquery.tooltip.css" rel="stylesheet" /> <link type="text/css" href="/site-media/css/jquery.multiselect2side.css" rel="stylesheet" /--> <link type="text/css" href="/site-media/css/jquery.ui.autocomplete.custom.css" rel="stylesheet" /> <link type="text/css" href="/site-media/css/jquery.wysiwyg.css" rel="stylesheet" /> - <link type="text/css" href="/site-media/css/coip-style.css" rel="stylesheet"/> - <script type="text/javascript" src="/site-media/js/jquery-1.6.2.js"></script> + <!-- <link type="text/css" href="/site-media/css/coip-style.css" rel="stylesheet"/> --> + + <link type="text/css" href="/site-media/bootstrap/css/bootstrap.css" rel="stylesheet"/> + <link type="text/css" href="/site-media/css/style2.css" rel="stylesheet"/> + <script type="text/javascript" src="/site-media/js/jquery-1.7.2.min.js"></script> + <script type="text/javascript" src="/site-media/bootstrap/js/bootstrap.js"></script> + <!-- script type="text/javascript" src="/site-media/js/jquery-ui-1.8.13.custom.min.js"></script --> <script type="text/javascript" src="/site-media/js/jquery-ui.js"></script> <script type="text/javascript" src="/site-media/js/jquery.tooltip.pack.js"></script> @@ -66,34 +71,41 @@ {% block js %}{% endblock %} </head> <body> -<div id="container"> - <div id="header"> - <ul class="ilist"> - <li id="appname" class="left"> - <h1>SUNET Groups</h1> - </li> - <li id="topmenubar" class="right"> - {% if user.is_authenticated %} - <ul class="menubar"> - <li> - <a href="#">{{user|userdisplay}}</a> - <ul> - <li><a href="/user/home">Dashboard</a></li> - <li><a href="/accounts/logout">Logout</a></li> - </ul> - </li> - </ul> - {% else %} - <div style="float: right;" class="button"><a href="/user/home">Login</a></div> - {% endif %} - </li> - </ul> - <div class="clear"></div> - </div> - <div id="content"> - {% block main %}{% endblock %} - </div> - <div class="clear"></div> + +<div id="header"> + <div class="container"> + <div class="row"> + <div class="span12"> + <a href="/" class="pull-left logo">SUNET Groups</a> + {% if user.is_authenticated %} + <div class="login pull-right"> + <a class="white-link" href="/user/home">{{user|userdisplay}}</a> + <a class="white-link" href="/accounts/logout">Logout</a> + </div> + {% else %} + <div class="login pull-right"> + <a class="white-link" href="/accounts/login-federated">Login</a> + </div> + {% endif %} + </div> + </div> + </div> +</div> + +<div class="container"> + <div class="row"> + <div class="span12"> + {% block main %}{% endblock %} + </div> + <!-- + <div class="span3"> + {% block sidebar %}hej{% endblock %} + </div> + --> + </div> +</div> + + <!-- <div id="footer"> <div class="centered"> <ul class="list-of-lists"> @@ -126,5 +138,6 @@ </div> </div> </div> + --> </body> </html> |