Commit 38bc7e0b authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
Browse files

Theme updates



Changes to templates and css for: Forums list, Site statistics,
Admin user search, Group members, Search boxes, My Views.

Adds a few extra DIVs to make it possible to customize the layout
further in themes that inherit from the raw theme.

Change-Id: Ib534b2949f93277fd48c9168797c852f12801b7d
Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent 2a707107
......@@ -7,7 +7,7 @@
</div>
{/if}
{if $forums}
<table id="forumslist" class="fullwidth nohead">
<div id="viewforum"><table id="forumslist" class="fullwidth nohead">
<tr>
<th>{str tag="name" section="interaction.forum"}</th>
<th class="center">{str tag="Topics" section="interaction.forum"}</th>
......@@ -43,7 +43,7 @@
</td>
</tr>
{/foreach}
</table>
</table></div>
{else}
<div class="message">{str tag=noforums section=interaction.forum}</div>
{/if}
......
......@@ -56,6 +56,9 @@
#forumslist td .inlinelist span {
font-weight: bold;
}
#forumslist td.right {
width: 60px;
}
/* Topic list */
#viewforum {
......@@ -97,6 +100,12 @@
text-align: right;
}
}
#forumtopicstable td br {
line-height: .3333em;
}
#forumtopicstable td.right {
width: 60px;
}
/* Forum Pagination */
#viewforum div.pagination {
......
......@@ -232,7 +232,9 @@ input#register_register {
.statistics-subpage-right-column {
width: 73%;
}
.statistics-subpage-left-column p {
margin: 0 0 10px 0;
}
.admin-home-column {
width: 49%;
margin: 10px 1px 0 1px;
......@@ -305,8 +307,6 @@ input#register_register {
margin-left: 10px;
}
#bulkactions {
position: relative;
top: 68px;
font-weight: bold;
}
#results h2 {
......@@ -327,6 +327,13 @@ table.tablerenderer th.desc {
#searchresults td {
vertical-align: middle;
}
#searchresults thead tr.search-results-pages div.pagination {
margin: 10px 0 5px 0;
padding: 0;
}
#searchresults thead tr.search-results-pages div.pagination .results {
display: inline;
}
/* USERS > EDIT USER */
......
......@@ -410,8 +410,12 @@ div.grippie {
height: 14px;
padding: 3px 0 0 3px;
}
.memberssearch {
.memberswrap {
padding: 5px 0 5px 4px;
margin-top: 10px;
border: 1px solid #EEEEEE;
}
.memberssearch {
padding: 5px 10px;
background: #eee;
border-right: 4px solid #FFF;
......@@ -426,6 +430,15 @@ div.grippie {
#membersearchresults .membericon {
width: 50px;
}
#membersearchresults .removemember {
padding: 2px 0 5px 0;
}
.grouppageswrap {
border: 1px solid #EEEEEE;
margin: 0;
padding: 10px;
}
/* Legend */
legend {
font-weight: bold;
......@@ -1709,6 +1722,10 @@ table.attachments td {
padding: 5px 0 0 0;
}
/* My Views */
#searchviews {
padding: 5px 0;
margin-bottom: 3px;
}
#searchviews #searchviews_query {
margin-right: 3px;
}
......@@ -2222,7 +2239,7 @@ div.groupbox li.last {
#editgroup th label {
white-space: nowrap;
}
form#search, form#filter, div.searchform, #searchviews {
form#search, form#filter, div.searchform {
margin-bottom: 10px;
}
#friendslist ul.viewlist, #onlinelist ul.viewlist {
......
......@@ -5,11 +5,11 @@
{include file='admin/stats.tpl' cron=1}
</div>
<div class="site-stats-right fr">
<ul class="in-page-tabs">
<div class="tabswrap"><ul class="in-page-tabs">
{foreach from=$subpages item=subpage}
<li><a {if $subpage == $type}class="current-tab" {/if}href="{$WWWROOT}admin/statistics.php?type={$subpage}">{str tag=$subpage}</a></li>
<li{if $subpage == $type} class="current-tab"{/if}><a {if $subpage == $type}class="current-tab" {/if}href="{$WWWROOT}admin/statistics.php?type={$subpage}">{str tag=$subpage}</a></li>
{/foreach}
</ul>
</ul></div>
<div class="subpage rel">
<div class="statistics-subpage-left-column fl">
......
......@@ -22,7 +22,7 @@
{/foreach}
</td>
{foreach from=$types key='type' item='name'}
<td>{if $user.methods.$type}{$user.methods.$type}{else}{str tag='none'}{/if}</td>
<td class="center">{if $user.methods.$type}{$user.methods.$type}{else}{str tag='none'}{/if}</td>
{/foreach}
</tr>
{/foreach}
......
{include file="header.tpl"}
<div>{$instructions|clean_html|safe}</div>
<div class="memberssearch">
<div class="memberswrap"><div class="memberssearch">
{if $membershiptypes}
<div class="membershiptypes">
{foreach from=$membershiptypes item=item implode="&nbsp;|&nbsp;"}
......@@ -25,5 +25,6 @@
</table>
</div>
{$pagination|safe}
</div>
{include file="footer.tpl"}
......@@ -9,7 +9,7 @@
<div class="rel">
<strong>{$results.roles[$r.role]->display}</strong>
{if $caneditroles && $r.canchangerole} (<a href="{$WWWROOT}group/changerole.php?group={$group}&amp;user={$r.id}">{str tag=changerole section=group}</a>){/if}
<div class="rbuttons">{$r.removeform|safe}</div>
<div class="removemember">{$r.removeform|safe}</div>
<div>{$r.introduction|str_shorten_html:80:true|safe}</div>
<label>{str tag="Joined" section="group"}:</label> {$r.jointime}
</div>
......
......@@ -14,7 +14,7 @@
</form>
</div>
{if $institution} {$institutionselector|safe}{/if}
<div class="grouppageswrap">
{$searchform|safe}
{if $views}
......@@ -58,7 +58,9 @@
</tbody>
</table>
{$pagination|safe}
</div>
{else}
<div class="message">{if $GROUP}{str tag="noviewstosee" section="group"}{elseif $institution}{str tag="noviews" section="view"}{else}{str tag="youhavenoviews" section="view"}{/if}</div>
</div>
{/if}
{include file="footer.tpl"}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment