Commit 49dabb8e authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
Browse files

Theme updates


Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent 7093a9de
......@@ -4,9 +4,9 @@
{/if}
{if $institution && $institution == 'mahara'}
<p>{str tag="adminfilespagedescription" section="admin" args=$descriptionstrargs}</p>
<p class="intro">{str tag="adminfilespagedescription" section="admin" args=$descriptionstrargs}</p>
{else}
<p>{str tag='fileinstructions' section='artefact.file'}</p>
<p class="intro">{str tag='fileinstructions' section='artefact.file'}</p>
{/if}
<div>{$form|safe}</div>
{include file="footer.tpl"}
......
......@@ -46,4 +46,9 @@
}
.posttime {
color: #BEE3F1;
}
.postedits {
padding: 10px;
background: #000;
}
\ No newline at end of file
......@@ -161,6 +161,7 @@
}
.postedits {
padding: 10px;
background: #FFF;
}
.postbtns {
font-size: .9167em;
......
......@@ -306,14 +306,15 @@ span.btn a.icon, a span.icon {
}
#main-nav {
float: right;
padding: 0;
margin: 0;
height: 27px;
* clear: none;
}
#main-nav ul {
float: right;
}
#main-nav li {
float:left;
float: left;
color: #FFFFFF;
text-decoration: none;
line-height: 1.6em;
......
......@@ -380,6 +380,10 @@ ul.in-page-tabs li a.current-tab:active {
border-top: 0;
}
.main-column-narrow {
width: 69%;
}
/**************** SIDEBAR *********/
#left-column,
......
......@@ -332,14 +332,13 @@ span.btn a.icon, a span.icon {
text-decoration: underline;
}
#main-nav {
float: right;
* clear: none !important;
padding: 0;
margin: 0;
background: transparent;
}
#main-nav ul {
padding-right: 5px;
float: right;
}
#main-nav li {
float:left;
......@@ -467,6 +466,11 @@ ul.in-page-tabs li a.current-tab:active {
}
.main-column {
background: #080D0F;
width: 96%;
}
.main-column-narrow {
width: 67%;
}
/* system messages between nav and main content */
......@@ -498,7 +502,7 @@ div.error {
/**************** SIDEBAR *********/
#left-column,
#right-column {
width: 271px;
min-width: 271px;
background: transparent;
padding: 0px;
}
......@@ -707,7 +711,7 @@ table.attachments td {
}
/* collection */
div.colnav1 {
#collectionnavwrap {
background: #0C2839;
}
ul.colnav li a {
......
......@@ -80,9 +80,6 @@ p {
.fl {
float: left;
}
.fl img {
padding-right: 10px;
}
.fr {
float: right;
}
......@@ -1027,8 +1024,12 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
clear: both;
width: 100%;
}
#main-column {
.main-column {
padding: 15px;
width: 97%;
}
.main-column-narrow {
width: 70%;
}
#containerX .main-column {
padding: 10px 15px;
......@@ -1132,8 +1133,15 @@ div.section {
padding-top: 8px;
}
/**************** SIDEBAR *********/
#left-column, #right-column {
width: 256px;
#left-column {
width: 27%;
min-width: 256px;
float: left;
}
#right-column {
width: 27%;
min-width: 256px;
float: right;
}
div.sideblock {
clear: both;
......@@ -2231,10 +2239,14 @@ form#search, form#filter, div.searchform, #searchviews {
margin: 0 0 5px 0;
}
/* Settings > Preferences */
#accountprefs {
clear: both;
}
#accountprefs table td {
padding-left: 0;
}
#accountprefs table h3 {
margin-top: 10px;
border-bottom: 1px dotted #d1d1d1;
}
#deleteaccount {
......
{include file="header.tpl"}
<p>{str tag="institutionmembershipdescription"}</p>
<p class="intro">{str tag="institutionmembershipdescription"}</p>
{if $memberform}
<h3>{str tag=Memberships}</h3>
{$memberform|safe}
......
......@@ -2,7 +2,7 @@
<div class="rbuttons">
<a class="btn" href="{$WWWROOT}collection/edit.php?new=1">{str section=collection tag=newcollection}</a>
</div>
<p>{str tag=collectiondescription section=collection}</p>
<p class="intro">{str tag=collectiondescription section=collection}</p>
{if $collections}
<table id="myviews" class="fullwidth listing">
<tbody>
......
<div id="collectionnavwrap">
{foreach from=$collection item=chunk name=cchunk}
<div class="{if $dwoo.foreach.cchunk.first}colnav1{else}colnav-extra hidden{/if}">
<ul class="colnav">
......@@ -14,7 +15,6 @@
<li id="colnav-more" class="nojs-hidden"><a href=""></a></li>
{/if}
</ul>
<div class="cb"></div>
</div>
{/foreach}
......@@ -28,4 +28,6 @@ addLoadEvent(function() {
});{/literal}
</script>
{/if}
<div class="cb"></div>
</div>
{if $GROUP}
</div><!--end group-->
{if $SUBPAGENAV}
</div><!--end subpage rel-->
{/if}
</div>
</td>
</div>
{if $SIDEBARS && $SIDEBLOCKS.right}
<td id="right-column" class="sidebar">
<div id="right-column" class="sidebar">
{include file="sidebar.tpl" blocks=$SIDEBLOCKS.right}
</td>
</div>
{/if}
</tr>
</tbody>
</table>
<div class="cb"></div>
</div>
<div id="footer-wrap">
<div class="cb"></div>
<div id="powered-by"><a href="http://mahara.org/"><img src="{theme_url filename='images/powered-by-mahara.png'}" border="0" alt=""></a></div>
......
{include file="header.tpl"}
{if $pagedescription}
<p>{$pagedescription}</p>
<p class="intro">{$pagedescription}</p>
{elseif $pagedescriptionhtml}
{$pagedescriptionhtml|safe}
{/if}
......
{include file="header.tpl"}
<p>{str tag=activetopicsdescription section=interaction.forum}</p>
<p class="intro">{str tag=activetopicsdescription section=interaction.forum}</p>
<table id="topiclist" class="fullwidth">
<thead>
<tr>
......
......@@ -11,15 +11,13 @@
{include file="header/navigation.tpl"}
<div class="cb"></div>
</div>
<table id="main-wrapper">
<tbody>
<tr>
<div id="main-wrapper">
{if $SIDEBARS && $SIDEBLOCKS.left}
<td id="left-column" class="sidebar">
<div id="left-column" class="sidebar">
{include file="sidebar.tpl" blocks=$SIDEBLOCKS.left}
</td>
</div>
{/if}
<td id="main-column" class="main-column">
<div id="main-column" class="main-column{if $SIDEBARS} main-column-narrow {if $SIDEBLOCKS.right}fl{else}fr{/if}{/if}">
{dynamic}{insert_messages}{/dynamic}
<div id="main-column-container">
......
......@@ -8,5 +8,4 @@
</table>
</div>
{$results.pagination|safe}
</div>
{include file="footer.tpl"}
{include file="header.tpl"}
<p>{str tag=sharedviewsdescription section=view}</p>
<p class="intro">{str tag=sharedviewsdescription section=view}</p>
<div>{$searchform|safe}</div>
<table id="sharedviewlist" class="fullwidth">
<thead>
......
......@@ -4,10 +4,6 @@
{if $maintitle}<h1>{$maintitle|safe}</h1>{/if}
{if !$microheaders && $collection}
{include file=collectionnav.tpl}
{/if}
{if !$microheaders && ($mnethost || $editurl)}
<div class="rbuttons">
{if $editurl}{strip}
......@@ -23,6 +19,10 @@
<div id="view-description">{$viewdescription|clean_html|safe}</div>
{if !$microheaders && $collection}
{include file=collectionnav.tpl}
{/if}
<div id="view" class="cb">
<div id="bottom-pane">
<div id="column-container">
......
......@@ -429,6 +429,9 @@ ul.in-page-tabs li a.current-tab:active {
padding: 15px 15px 20px 15px;
background: #fff;
}
.main-column-narrow {
width: 69%;
}
/* system messages between nav and main content */
/* system messages */
......@@ -441,7 +444,7 @@ ul.in-page-tabs li a.current-tab:active {
/**************** SIDEBAR *********/
#left-column,
#right-column {
width: 270px;
min-width: 270px;
background: transparent;
padding: 0px;
}
......
......@@ -316,12 +316,13 @@ span.btn a.icon, a span.icon {
}
#main-nav {
float: right;
* clear: none !important;
padding: 0;
margin: 0;
background: transparent;
}
#main-nav ul {
float: right;
}
#main-nav li {
float:left;
color: #FFFFFF;
......
......@@ -129,6 +129,9 @@ html>body #column-container {
font-style: italic;
margin-bottom: 10px;
}
#column-container {
padding-top: 10px;
}
/* columns
#column-container input.submit {
......@@ -651,7 +654,7 @@ ul.artefactchooser-subtabs li.current a:active {
}
#view-description {
margin: 0 0 20px 0;
margin: 0;
padding: 0;
}
......@@ -672,6 +675,9 @@ ul.artefactchooser-subtabs li.current a:active {
margin: 10px 10px 0 0;
float: left;
}
#collectionnavwrap {
background: none;
}
#containerX div.colnav1 {
margin: 0;
padding: 0;
......@@ -698,15 +704,18 @@ ul.artefactchooser-subtabs li.current a:active {
display: block;
}
#containerX div.colnav-extra {
margin: 8px 0 0;
margin: 0;
float: left;
}
/* Collection navigation normal header */
#collectionnavwrap {
background: #EEE;
padding: 5px 5px 0 5px;
}
div.colnav1 {
clear: both;
margin: 0;
padding: 0;
background: #EEE;
padding: 5px 5px 0 5px;
}
ul.colnav {
list-style: none;
......@@ -726,7 +735,8 @@ ul.colnav li.selected span {
display: block;
}
div.colnav-extra {
margin: 8px 0 0;
margin: 0;
float: left;
}
.submissionform {
......
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