summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/site-media/css/style.css4
-rw-r--r--src/templates/apps/room/list.html29
2 files changed, 12 insertions, 21 deletions
diff --git a/src/site-media/css/style.css b/src/site-media/css/style.css
index 181c740..dd6a342 100644
--- a/src/site-media/css/style.css
+++ b/src/site-media/css/style.css
@@ -1,5 +1,5 @@
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%; }
+body { min-width: 600px; 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; }
@@ -28,7 +28,7 @@ h3.listheader { padding-left: 20px; }
.clist li { display: list-item; }
.nlist ul { list-style: none; }
.nlist li { display: list-item; list-style: none; }
-.square li { list-style: square outside none; }
+.square li { list-style: square inside none; }
.description { clear: both; margin-top: 10px; padding-top: 15px; }
p.info { font-size: 120%; margin-top: 10px; padding-top: 15px; }
div.toolbar{ padding: 4px; float: right; margin-right: 30px; margin-bottom: 20px; margin-top: 50px; }
diff --git a/src/templates/apps/room/list.html b/src/templates/apps/room/list.html
index 126c591..69e17c9 100644
--- a/src/templates/apps/room/list.html
+++ b/src/templates/apps/room/list.html
@@ -27,25 +27,16 @@
<div id="{{r.id}}">
<h3 class="listheader">{{r.name}}</h3>
<div>
- <ul class="ilist">
- <li style="vertical-align: top;">
- <ul class="nlist square" style="margin-top: 5px;">
- <li>Created by {{r.creator}} {{r.timecreated|datehumanize}}.</li>
- {% if r.self_cleaning %}<li>Room will be reset when empty.</li>{%else%}<li>Room state is preserved between sessions.</li>{% endif %}
- {% if r.lastvisited %}<li>Last visited {{r.lastvisited|datehumanize}}</li>{%endif%}
- <li>Meeting room URL: <a href="{{r|roomurl}}">{{r|roomurl}}<span style="vertical-align: bottom;" class="ui-icon ui-icon-extlink"></span></a></li>
- <li>Hosted on {{r.acc.name}}</li>
- </ul>
- </li>
- {% tags_for_object r as tags %}
- <li style="vertical-align: top; width: 45%;">
- <ul class="nlist">
- <li style="margin-top: 5px;" class="infopanel ui-widget ui-corner-all ui-state-highlight"><strong>{{r.name}}</strong><p>{% if r.description %}{{r.description|safe}}{% else %}<em>No description available...</em>{% endif %}</p></li>
- <li style="margin-top: 5px;">Tags: {% for tag in tags %}<a style="margin-right: 5px;" class="ui-widget" href="{% prefix %}/room/+{{tag}}">{{tag}}</a>{% endfor %} {%if edit %}<a style="font-size: 75%;" href="{% prefix %}/room/{{r.id}}/tag"><em>... manage room tags</em></a>{%endif%}</li>
- </ul>
- </li>
- </ul>
-
+ {% tags_for_object r as tags %}
+ <p class="infopanel ui-widget ui-corner-all ui-state-highlight">{% if r.description %}{{r.description|safe}}{% else %}<em>No description available...</em>{% endif %}</p>
+ <ul class="nlist square">
+ <li style="margin-top: 5px;">Tags: {% for tag in tags %}<a style="margin-right: 5px;" class="ui-widget" href="{% prefix %}/room/+{{tag}}">{{tag}}</a>{% endfor %} {%if edit %}<a style="font-size: 75%;" href="{% prefix %}/room/{{r.id}}/tag"><em>... manage room tags</em></a>{%endif%}</li>
+ <li>Created by {{r.creator}} {{r.timecreated|datehumanize}}.</li>
+ {% if r.self_cleaning %}<li>Room will be reset when empty.</li>{%else%}<li>Room state is preserved between sessions.</li>{% endif %}
+ {% if r.lastvisited %}<li>Last visited {{r.lastvisited|datehumanize}}</li>{%endif%}
+ <li>Meeting room URL: <a href="{{r|roomurl}}">{{r|roomurl}}<span style="vertical-align: bottom;" class="ui-icon ui-icon-extlink"></span></a></li>
+ <li>Hosted on {{r.acc.name}}</li>
+ </ul>
<br/>
<ul class="ilist">
<li class="button"><a href="{% prefix %}/go/{{r.id}}">Enter Room</a></li>