summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-08-07 14:34:30 +0200
committerLeif Johansson <leifj@sunet.se>2011-08-07 14:34:30 +0200
commitb3ce5191ae14df73eab5b6a1602281a6b84d721f (patch)
tree4b224b8fe6dbe761f2a5e5bcea95b3bf26be77c8 /templates
parent99a05864a9a9ff8ac1c68400f111ede67cf3fe28 (diff)
new jqueryopensocial
Diffstat (limited to 'templates')
-rw-r--r--templates/base.html127
-rw-r--r--templates/login.html11
-rw-r--r--templates/tree.html112
3 files changed, 94 insertions, 156 deletions
diff --git a/templates/base.html b/templates/base.html
index e784293..5c4a1c3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,7 +1,8 @@
<!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/ui-lightness/jquery-ui-1.8.13.custom.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" /-->
@@ -9,16 +10,17 @@
<link type="text/css" href="/site-media/css/jquery.wysiwyg.css" rel="stylesheet" />
<link type="text/css" href="/site-media/css/style.css" rel="stylesheet"/>
<script type="text/javascript" src="/site-media/js/jquery-1.5.1.min.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-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>
<script type="text/javascript" src="/site-media/js/jquery.gravatar.js"></script>
<script type="text/javascript" src="/site-media/js/md5.js"></script>
<script type="text/javascript" src="/site-media/js/jquery.cookie.js"></script>
- <script type="text/javascript" src="/site-media/js/jquery.timers.js"></script -->
- <!-- script type="text/javascript" src="/site-media/js/jquery.multiselect2side.js"></script -->
+ <script type="text/javascript" src="/site-media/js/jquery.timers.js"></script>
<script type="text/javascript" src="/site-media/js/jquery.jstree.js"></script>
<script type="text/javascript" src="/site-media/js/jquery.wysiwyg.js"></script>
<!-- script type="text/javascript" src="/site-media/js/jquery.form.js"></script-->
+
<script type="text/javascript" src="/site-media/js/jquery.validate.js"></script>
<script type="text/javascript" src="/site-media/js/bbq.js"></script>
<script type="text/javascript" src="/site-media/js/jquery.form.wizard-3.0.4.js"></script>
@@ -29,6 +31,11 @@
$(function() {
$("input:submit, input:reset, input:button, a",".button").button();
$('.tip').tooltip({showURL: false});
+ $('.menubar').menubar({menuIcon: true, buttons: true});
+ $('#endmatter').addClass('ui-state-default');
+ $('a.gravatar').each(function(i,item) {
+ $(item).append($.gravatar($(item).attr('title')));
+ });
$.validator.setDefaults({
highlight: function(input) {
$(input).addClass("ui-state-error");
@@ -60,74 +67,60 @@
<body>
<div id="container">
<div id="header">
- {% if name %}
- <div class="navlist left">
- <ul>
- {% if render.add %}
- <li class="button"><a href="/name/{{name.id}}/add">Create New Group</a></li>
- {% endif %}
- <li class="button"><a class="tip" title="This is the full name of the group. This is the name that will be exposed to applications." href="{{name.url}}">{{ name }}</a></li>
- </ul>
- </div>
- {% endif %}
- {% if user.is_authenticated %}
- <div class="navlist">
- <ul>
- <li class="button"><a id="logout" href="/accounts/logout">Logout</a></li>
- </ul>
- <ul>
- <li class="button"><a id="dashboard" href="/user/home">My Dashboard</a></li>
- </ul>
- </div>
- {% endif %}
- {% if noname %}
- <div class="navlist">
- <ul>
- {% if render.acl %}
- <li class="button"><a href="/name/{{name.id}}/link/0">Modify Access</a></li>
- {% endif %}
- {% if render.edit %}
- <li class="button"><a href="/name/{{name.id}}/edit">Modify</a></li>
- {% endif %}
- {% if render.delete %}
- <li class="button"><a href="/name/{{name.id}}/delete">Delete</a></li>
- {% endif %}
- {% if render.invite %}
- <li class="button"><a href="/name/{{name.id}}/invite">Invite</a></li>
- {% endif %}
- </ul>
- </div>
- {% endif %}
- <div class="clear"></div>
+ <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="#">{{profile.display_name}}</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="/accounts/login-federated">Login</a></div>
+ {% endif %}
+ </li>
+ </ul>
+ <div class="clear"></div>
</div>
<div id="content">
{% block main %}{% endblock %}
- <div class="clear"></div>
</div>
+ <div class="clear"></div>
<div id="footer">
- <ul>
- <li>
- <ul>
- <li><h3>Users</h3></li>
- <li><a href="/user/home">My Dashboard</a></li>
- <li><a class="tip" title="Logout" id="logout" href="/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>
- <li><a href="#about">About COIP</a></li>
- <li><a href="#about">Terms Of Use</a></li>
- </ul>
- </li>
- <li>
- <ul>
- <li><h3>Developers</h3></li>
- </ul>
- </li>
- </ul>
+ <div class="centered">
+ <ul class="list-of-lists">
+ <li>
+ <ul>
+ <li><h3>Users</h3></li>
+ {% if user.is_authenticated %}
+ <li><a href="/user/home">My Dashboard</a></li>
+ <li><a class="tip" title="Logout" id="logout" href="/accounts/logout/">Logout</a></li>
+ {% endif %}
+ </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>
+ <li><a href="#about">About COIP</a></li>
+ <li><a href="#about">Terms Of Use</a></li>
+ </ul>
+ </li>
+ <li>
+ <ul>
+ <li><h3>Developers</h3></li>
+ </ul>
+ </li>
+ </ul>
+ </div>
</div>
</div>
</body>
diff --git a/templates/login.html b/templates/login.html
index aad4740..de58b9c 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -2,8 +2,11 @@
{% block headline %}Login{% endblock %}
{% block title %}COIP{% endblock %}
{% block main %}
-<h2>Welcome!</h2>
-<p class="ui-state-highlight ui-corner-all">This is a technology preview of coip. Please consider signing up for the coip mailing list at coip &lt;at&gt; segate.sunet.se. Note that any data you enter
-into this version of coip <em>will</em> get deleted as the database is reset regularly. Stay tuned!</p>
-<div class="button"><a href="/accounts/login-federated">Login</a></div>
+
+<div id="welcome">
+ <h2>Welcome!</h2>
+ <p>This is a technology preview of coip. Please consider signing up for the coip mailing list at coip &lt;at&gt; segate.sunet.se. Note that any data you enter
+ into this version of coip <em>will</em> get deleted as the database is reset regularly. Stay tuned!</p>
+ <div class="button"><a href="/accounts/login-federated">Login</a></div>
+</div>
{% endblock %} \ No newline at end of file
diff --git a/templates/tree.html b/templates/tree.html
index f1e45b4..01969ab 100644
--- a/templates/tree.html
+++ b/templates/tree.html
@@ -3,56 +3,7 @@
<script type="text/javascript">
$(function() {
{% block widgets %}{% endblock %}
- function _hide_sidebar(first) {
- if (first) {
- $('#thesidebar').hide();
- } else {
- $('#thesidebar').hide("fast");
- }
- $('#theseparator').addClass('ui-icon-arrowthickstop-1-e');
- $('#theseparator').removeClass('ui-icon-arrowthickstop-1-w');
- $.cookie('sidebar', 'off', { expires: 30 });
- return "off";
- }
- function _show_sidebar(first) {
- _refresh_tree();
- if (first) {
- $('#thesidebar').show();
- } else {
- $('#thesidebar').show("fast");
- }
- $('#theseparator').removeClass('ui-icon-arrowthickstop-1-e');
- $('#theseparator').addClass('ui-icon-arrowthickstop-1-w');
- $.cookie('sidebar', 'on', { expires: 30 });
- return "on";
- }
- function _load_state() {
- c = $.cookie('sidebar');
- _hide_sidebar(true);
- if (c == "on") {
- _show_sidebar(true);
- return "on";
- } else {
- return "off";
- }
- }
- var sidebar = _load_state();
- $('#theseparator').addClass('ui-icon');
- //$('#theseparator').hover(function() {
- // $(this).addClass('ui-state-hover');
- //},function() {
- // $(this).removeClass('ui-state-hover');
- //});
- $('#theseparator').click(function() {
- if (sidebar == "on") {
- sidebar = _hide_sidebar();
- } else {
- sidebar = _show_sidebar();
- }
- });
- // must be last to avoid loading the tree if it is invisible
- function _refresh_tree() {
- $('#jstree').jstree({
+ $('#jstree').jstree({
'json_data': {
'ajax': {
'url': function(n) {
@@ -73,55 +24,46 @@ $(function() {
},
'plugins': ['json_data','themeroller']
});
- $('#jstree').removeClass('ui-widget-content');
- }
+ //$('#jstree').removeClass('ui-widget-content');
+ //$('#tree').addClass('ui-widget ui-corner-all ui-widget-content');
+ $('#jstree').addClass('ui-corner-all');
+ $('#sidemenu').menu();
+ $('.tabs').tabs();
});
</script>
{% endblock %}
{% block main %}
-<ul class="ilist" style="margin-bottom: 80px;">
- <li id="thesidebar">
- <div id="tree">
- <ul class="clist">
+<ul class="ilist" style="margin-bottom: 10px;">
+ <li id="left">
+ <ul id="sidemenu">
+ {% if user.is_authenticated %}
+ <li><a class="gravatar" href="#" title="{{profile.email}}"></a></li>
+ <li><a href="/user/home"><span class="ui-icon ui-icon-home"></span>{{profile.display_name}}</a></li>
+ {% endif %}
+ <li style="border-top: 1px solid black; width: 100%; margin-top: 5px;">&nbsp;</li>
{% if name %}
- {% if name.parent %}
- <li>{% if render.up %}<a href="{{name.parent.url}}">{%endif%}{{name.parent.url}}{%if render.up%}</a>{%endif%}</li>
+ <li><a href="/name/{{name.id}}/add"><span class="ui-icon ui-icon-newwin"></span>Create New Group</a></li>
{% else %}
- <li><a href="/name">{{prefix_url}}</a></li>
- {% endif %}
+ <li><a href="/name/{{profile.home.id}}/add"><span class="ui-icon ui-icon-newwin"></span>Create New Group</a></li>
{% endif %}
- <li><div style="min-height: 300px;" class="ui-helper-reset" id="jstree"></div></li>
- </ul>
- </div>
- <!-- div id="related">
- {% if name and name.links %}
- <h3 style="float: left;">Related resources</h3>
- {% if render.edit %}
- <a style="float: left; margin-top: 11px;" class="tip" title="Add Link" href="/name/{{name.id}}/addlink"><span class="ui-icon ui-icon-plus"></span></a>
- {% endif %}
- <div class="clear"></div>
- <ul class="links"">
- {% for link in name.links.all %}
- <li>
- <a class="tip" title="{{link.text}}" href="{{link.url}}">{{link.text}}</a>
- <a class="tip" title="Remove link" href="/link/{{link.id}}/remove"><span class="ui-icon ui-icon-close" style="float: right; clear: both;"></span></a>
- </li>
- {% endfor %}
- </ul>
- <div class="clear"></div>
- {% endif %}
- </div -->
+ </ul>
+ <div class="tabs">
+ <ul>
+ <li><a href="#mygroups">My Groups</a></li>
+ <li><a href="#jstree">All Groups</a></li>
+ </ul>
+ <div id="jstree"></div>
+ <div id="mygroups">My groups</div>
+ </div>
</li>
- <li id="theseparator">&nbsp;</li>
- <li id="thecontent">
+ <li id="main">
<div id="headline">
- <a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/user/home{% endif %}">{% if name %}{{name.shortname}}{% else %}Dashboard{% endif %}</a>
+ {% block headline %}<a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/user/home{% endif %}">{% if name %}{{name.shortname}}{% else %}Dashboard{% endif %}</a>{% endblock %}
</div>
<div>
{% block content %}{% endblock %}
</div>
</li>
-
</ul>
{% endblock %} \ No newline at end of file
generated by cgit v1.1 at 2024-10-06 04:27:48 +0000