summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2010-12-14 23:17:51 +0100
committerLeif Johansson <leifj@sunet.se>2010-12-14 23:17:51 +0100
commitfebf0655c6ce38cacd8684de806454006233765c (patch)
tree02abe2cd97dedb0f719a572a18a8ba3a9e37b5e2
parent5acacc5b0c384f09bfa1e060b8ddeade882d07cb (diff)
better fullname display
-rw-r--r--site-media/css/style.css3
-rw-r--r--templates/apps/name/name.html1
-rw-r--r--templates/tree.html5
3 files changed, 6 insertions, 3 deletions
diff --git a/site-media/css/style.css b/site-media/css/style.css
index ea5071c..f91074f 100644
--- a/site-media/css/style.css
+++ b/site-media/css/style.css
@@ -12,6 +12,7 @@ div#footer li { float: left; margin: 0 0.15em}
.navlist li { float: right; display: inline; margin: 0 0.15em; }
.description { inherit: none; margin-bottom: 10px;}
div#headline{ font: 300% "Trebuchet MS", sans-serif; margin-bottom: 20px;}
+div.name { font 90% "Trebuchet MS", sans-serif; margin-top: 5px;;}
div.toolbar{ padding: 4px; float: right; margin-right: 10px; margin-top: 6px; margin-bottom: 20px;}
div#left { float: left; width: 30%; padding-left: 5px; }
div#right { float: right; width: 65%; padding-left: 20px; border-left: 1px solid #CECECE; }
@@ -35,4 +36,4 @@ div#main{ font: 100% "Trebuchet MS", sans-serif; width:95%; height:auto !importa
.infopanel { padding-left: 10px; padding-bottom: 10px;}
.infopanel label { display:block; }
div .hidden {visibility:hidden;}
-.listheader { padding-left: 20px; } \ No newline at end of file
+.listheader { padding-left: 20px; }
diff --git a/templates/apps/name/name.html b/templates/apps/name/name.html
index 763afbf..c746e44 100644
--- a/templates/apps/name/name.html
+++ b/templates/apps/name/name.html
@@ -14,7 +14,6 @@
});
{% endblock %}
{% block content %}
- <p>{{ name }}</p>
{% if name.description %}
<div class="ui-widget">
<div class="ui-state-highlight ui-corner-all infopanel">
diff --git a/templates/tree.html b/templates/tree.html
index bd64654..7215a41 100644
--- a/templates/tree.html
+++ b/templates/tree.html
@@ -27,7 +27,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 %}{{profile.display_name}}{% endif %}</a>{% endblock %}
+{% block headline %}
+<a style="text-decoration: none" href="{% if name %}/name/id/{{name.id}}{% else %}/{% endif %}">{% if name %}{{name.shortname}}{% else %}{{profile.display_name}}{% endif %}</a>
+{% if name %}<div class="name">{{ name }}</div>{% endif %}
+{% endblock %}
{% block title %}COIP{% if name %} - {{name.shortname}}{% endif %}{% endblock %}
{% block main %}
{% if name %}