summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--site-media/css/style.css30
-rw-r--r--templates/apps/name/name.html25
-rw-r--r--templates/base.html14
-rw-r--r--templates/tree.html27
4 files changed, 45 insertions, 51 deletions
diff --git a/site-media/css/style.css b/site-media/css/style.css
index 0ce32d5..15b8fb5 100644
--- a/site-media/css/style.css
+++ b/site-media/css/style.css
@@ -1,28 +1,29 @@
-html { height: 100%; margin: 0; padding: 0;}
-body { font: 61.8% "Trebuchet MS", sans-serif; width: 70%; height: 100%; margin:0; padding:0;}
-div#container { position: relative; height:auto !important; height:100%; min-height:100%; margin: 0; margin-left: 50px;}
+html,body { font-size: 80%; font-family: arial, sans-serif; height: 100%; margin:0; padding:0;}
+div#container { position: relative; width: 70%; height:auto !important; height:100%; min-height:100%; margin: 0; margin-left: 50px;}
label { display:block; }
#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#footer { font: 100% "Trebuchet MS", sans-serif; border-top: 1px solid #CECECE; position: absolute; bottom: 0; width: 100%; padding-bottom: 50px; margin-right: 50px;}
+div#footer { font-size: 100%; border-top: 1px solid #CECECE; position: absolute; bottom: 0; width: 100%; padding-bottom: 50px; margin-right: 50px;}
div#footer ul { margin-right: 50px; list-style: none; padding: 0; margin: 0; }
div#footer li { float: left; margin: 0 0.15em}
.navlist ul { list-style: none; padding: 0; margin: 0; }
-.navlist li { float: right; display: inline; margin: 0 0.15em; }
+.navlist li { float: right; display: inline;}
.ilist ul { list-style: none inside; padding: inherit; }
.ilist li { float: left; display: inline; padding: inherit; }
+.leftright ul { display: inline; list-style: none inside; padding: inherit; }
+.leftright li { display: inline-block; padding: inherit; vertical-align: top; }
.rlist ul { list-style: none inside; padding: inherit; }
.rlist li { float: right; display: inline; padding: inherit; }
.clist ul { list-style: none; }
.clist li { display: block; }
.formpadding { padding: 5px; }
p.description { padding-top: 20px; padding-bottom: 5px; }
-div#headline{ font: 300% "Trebuchet MS", sans-serif; margin-bottom: 20px;}
-.name { font: 100% "Trebuchet MS", sans-serif; margin-top: 5px;}
-div.toolbar{ padding: 4px; float: right; margin-right: 50px; margin-top: 6px; margin-bottom: 20px;}
+div#header { margin-top: 5px; margin-bottom: 20px; margin-right: 50px; }
+div#headline{ font-size: 300%; margin-bottom: 20px;}
+.name { margin-top: 5px;}
div#left { float: left; width: 30%; padding-left: 5px; }
-div#right { float: right; width: 65%; padding-left: 20px; height: 400px; }
+div#right { float: right; width: 65%; }
div#related { position: absolute; bottom: 30%;}
ul.links { list-style: none inside; padding: 0; margin: 0; }
li.links { padding: 0; margin: 0; }
@@ -35,16 +36,15 @@ div#tree { padding-bottom: 50px;}
#linklist { float: right; margin-right: 50px; }
#linklist ul{ list-style: none; padding: 0; margin: 0; }
#linklist li{ float: left; margin: 0 0.15em}
-#linklist a{ font: 120% "Trebuchet MS", sans-serif; }
+#linklist a{ }
a { text-decoration: none; }
a:hover { text-decoration: underline; }
.clear { clear: both; }
-div#content { }
-div#main{ width:95%; height:auto !important; height:100%; min-height: 100%;}
+div#content { padding-bottom: 5px; }
.code{font: 110% "Courier", fixed}
-.infopanel { padding: 5px; }
+.infopanel { padding: 1em 2.2em; }
.infopanel label { display:block; }
div .hidden {visibility:hidden;}
.listheader { padding-left: 20px; }
-.button { margin-right: 2px; }
-legend { font: 120% "Trebuchet MS", sans-serif; font-weight: bold; } \ No newline at end of file
+.button { }
+legend { font-size: 120%; font-weight: bold; } \ No newline at end of file
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index eea1796..93b5fa7 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -16,9 +16,7 @@
});
{% endblock %}
{% block content %}
- {% if not name %}
- <h1>This is the top of the namespace</h1>
- {% endif %}
+ {% if name.description or render.acl or render.edit or render.delete or render.invite or render.join %}
<div class="ui-widget ui-widget-content ui-helper-reset ui-corner-all infopanel">
{% if name.description %}
{% autoescape off %}
@@ -45,37 +43,36 @@
{% endif %}
{% if render.join %}
<li class="button"><a href="/name/{{name.id}}/join/{{user.username}}">Join</a></li>
- {% endif %}
-
+ {% endif %}
</ul>
</div>
+ {% endif %}
<div class="clear"></div>
</div>
-
{% endif %}
- {% if memberships and render.invite %}
+ {% if memberships %}
<h3>Members</h3>
<div id="memberships">
{% for m in memberships.all %}
<div id="m{{m.id}}" class="{{m.status}}">
- <h3 class="listheader">{{m.user|lastidentifier}}</h3>
+ <h3 class="listheader">{{m|memberdisplay}}</h3>
<div>
<div>
- {{m.user|userdisplay}} ({{m.user|lastidentifier}}) became a member of {{name.shortname}} {{m.timecreated|datehumanize}}
+ {{m|memberdisplay}} became a member of {{name.shortname}} {{m.timecreated|datehumanize}}
{% if m.tags %}<h4>Role{{m.tags|pluralize}}</h4>
- <ul class="clist">{% for tag in m.tags %}<li>{{ tag|escape }}</li>{%endfor%}</ul>{%endif%}.
+ <ul class="clist">{% for tag in m.tags %}<li>{{ tag|escape }}</li>{%endfor%}</ul>{%endif%}
</div>
<div class="rlist button">
<ul>
- {% if render.edit %}
+ {% if render.edit and m.user %} <!-- only allow roles for users right now -->
<li><a href="/tag/membership/{{m.id}}/modify">Modify Roles</a></li>
{% endif %}
- {% if render.kick %}
+ {% if render.kick and m.user %} <!-- only allow removing members for users right now -->
<li><a href="/name/{{name.id}}/leave/{{m.user.username}}">{% if m.user == user %}Leave{% else %}Remove from{% endif %} Group</a></li>
{% endif %}
</ul>
</div>
- <div class="clear"></div>
+ <!-- div class="clear"></div-->
</div>
</div>
{% empty %}
@@ -97,7 +94,7 @@
<li class="button"><a href="/invitation/{{i.id}}/resend">Resend</a></li>
</ul>
</div>
- <div class="clear"></div>
+ <!-- div class="clear"></div -->
</div>
</div>
{% empty %}
diff --git a/templates/base.html b/templates/base.html
index 64024e4..f9ea8fb 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -25,7 +25,7 @@
<script type="text/javascript" src="/site-media/js/jquery.form.wizard-3.0.4.js"></script>
<script type="text/javascript" src="/site-media/js/tag-it.js"></script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>{% block title %}{% endblock %}</title>
+ <title>COIP{% if name %} - {{name.shortname}}{% else %} - top{% endif %}</title>
<script type="text/javascript">
$(function() {
$("input:submit, input:reset, input:button, a",".button").button();
@@ -63,7 +63,7 @@
<div id="container">
<div id="header">
{% if name %}
- <div style="float: left;" class="navlist toolbar">
+ <div style="float: left;" class="navlist">
<ul>
{% if render.add %}
<li class="button"><a href="/name/{{name.id}}/add">Add Group</a></li>
@@ -73,14 +73,14 @@
</div>
{% endif %}
{% if user.is_authenticated %}
- <div class="navlist toolbar">
+ <div class="navlist">
<ul>
<li class="button"><a id="logout" href="/accounts/logout">Logout</a></li>
</ul>
</div>
{% endif %}
{% if noname %}
- <div class="navlist toolbar">
+ <div class="navlist">
<ul>
{% if render.acl %}
<li class="button"><a href="/name/{{name.id}}/link/0">Modify Access</a></li>
@@ -100,11 +100,7 @@
<div class="clear"></div>
</div>
<div id="content">
- <div id="headline">{% block headline %}{% endblock %}</div>
- <div id="main">
- {% block main %}{% endblock %}
- </div>
- <div class="clear"></div>
+ {% block main %}{% endblock %}
</div>
<div id="footer">
<ul>
diff --git a/templates/tree.html b/templates/tree.html
index 8e4dddc..144a668 100644
--- a/templates/tree.html
+++ b/templates/tree.html
@@ -25,12 +25,10 @@ $(function() {
});
</script>
{% endblock %}
-{% block headline %}
-<!-- a style="text-decoration: none" href="{% if name %}/name/id/{{name.id}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}Top{% endif %}</a-->
-{% endblock %}
-{% block title %}COIP{% if name %} - {{name.shortname}}{% else %} - top{% endif %}{% endblock %}
{% block main %}
-<div id="left">
+<div class="leftright">
+<ul>
+<li style="width: 35%">
<div id="tree">
<div class="ilist">
<ul>
@@ -45,7 +43,7 @@ $(function() {
</ul>
</div>
<div class="clear"></div>
- <div id="jstree"></div>
+ <div class="ui-helper-reset" id="jstree"></div>
</div>
<!-- div id="related">
{% if name and name.links %}
@@ -65,11 +63,14 @@ $(function() {
<div class="clear"></div>
{% endif %}
</div -->
-</div>
-<div id="right">
-<div id="headline">
-<a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}{% endif %}</a>
-</div>
-{% block content %}{% endblock %}
-</div>
+</li>
+<li style="margin-left: 10px; width: 59%;">
+ <div id="headline">
+ <a style="text-decoration: none" href="{% if name %}{{name.url}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}Top of the namespace{% endif %}</a>
+ </div>
+ <div>
+ {% block content %}{% endblock %}
+ </div>
+</li>
+</ul>
{% endblock %} \ No newline at end of file
generated by cgit v1.1 at 2024-10-06 08:25:33 +0000