Commit 35f889eb authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield

Theme updated

Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
parent e0d1a79d
<tr>
<td style="width: 20px;" rowspan="2">
<td class="iconcell" rowspan="2">
{$formcontrols|safe}
</td>
<th><label for="{$elementname}_{$artefact->id}">{if $artefact->blog}{$artefact->blog}: {/if}{$artefact->title}{if $artefact->draft} [{str tag=draft section=artefact.blog}]{/if}</label></th>
......
......@@ -8,17 +8,17 @@
{foreach from=$blogs->data item=blog}
<tr class="{cycle name=rows values='r0,r1'}">
<td>
<div><strong><a href="{$WWWROOT}artefact/blog/view/?id={$blog->id}">{$blog->title}</a></strong></div>
<div>{$blog->description|clean_html|safe}</div>
<h4><a href="{$WWWROOT}artefact/blog/view/?id={$blog->id}">{$blog->title}</a></h4>
<div id="blogdesc">{$blog->description|clean_html|safe}</div>
</td>
<td class="right">
<a href="{$WWWROOT}artefact/blog/view/?id={$blog->id}">{$blog->postcount} {if $blog->postcount == 1}{str tag=post section=artefact.blog}{else}{str tag=posts section=artefact.blog}{/if}</a>
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn-add">{str tag=addpost section=artefact.blog}</a>
<td><a href="{$WWWROOT}artefact/blog/view/?id={$blog->id}">{$blog->postcount} {if $blog->postcount == 1}{str tag=post section=artefact.blog}{else}{str tag=posts section=artefact.blog}{/if}</a></td>
<td class="s"><a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn s">{str tag=addpost section=artefact.blog}</a></td>
<td class="buttonscell right">
{if $blog->locked}
<span class="s dull">{str tag=submittedforassessment section=view}</span>
{else}
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->id}" class="btn-big-edit" title="{str tag=settings}"></a>
<a href="#" onClick="confirmdelete({$blog->id});" class="btn-big-del" title="{str tag=delete}"></a>
<a href="{$WWWROOT}artefact/blog/settings/?id={$blog->id}" title="{str tag=settings}"><img src="{theme_url filename='images/manage.gif'}" alt="{str tag=settings}"></a>
<a href="#" onClick="confirmdelete({$blog->id});" title="{str tag=delete}"><img src="{theme_url filename='images/icon_close.gif'}" alt="{str tag=delete}"></a>
{/if}
</td>
</tr>
......
......@@ -25,7 +25,7 @@
<table border="0" cellpadding="4" cellspacing="0">
<tr>
<td class="nowrap"><label for="img_src">{str section=artefact.blog tag=src}</label></td>
<td><input id="img_src" name="img_src" type="text" value="" style="width: 200px" onchange="this.form.src.value=this.value;ImageDialog.getImageData();" onmouseup="this.onchange();" onkeyup="this.onchange();"/></td>
<td><input id="img_src" name="img_src" type="text" value="" style="width: 200px" onChange="this.form.src.value=this.value;ImageDialog.getImageData();" onMouseUp="this.onchange();" onKeyUp="this.onchange();"/></td>
</tr>
<!-- Image list -->
<tr>
......@@ -74,11 +74,11 @@
</div>
<div class="mceActionPanel">
<div style="float: left">
<div class="fl">
<input type="button" id="insert" class="submit" name="insert" value="{str section=artefact.blog tag=insert}" onClick="ImageDialog.update();return false;" />
</div>
<div style="float: right">
<div class="fr">
<input type="button" id="cancel" class="cancel" name="cancel" value="{str section=artefact.blog tag=cancel}" onClick="tinyMCEPopup.close();" />
</div>
</div>
......
......@@ -11,7 +11,7 @@
{if $artefact->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}</div>{/if}
{foreach from=$attachments item=item}
<tr class="{cycle values='r0,r1'}">
{if $icons}<td style="width: 22px;"><img src="{$item->iconpath}" alt=""></td>{/if}
{if $icons}<td class="iconcell"><img src="{$item->iconpath}" alt=""></td>{/if}
<td><a href="{$item->viewpath}">{$item->title}</a> ({$item->size}) - <strong><a href="{$item->downloadpath}">{str tag=Download section=artefact.file}</a></strong>
<br>{$item->description}</td>
</tr>
......
......@@ -13,6 +13,13 @@
#bloglist td .addicon {
margin: 0;
}
#bloglist h4 {
margin: 0;
}
#bloglist #blogdesc p {
margin: 0;
font-size: .9167em;
}
#blogdescription {
padding: 10px;
margin: 10px 0;
......
......@@ -17,7 +17,7 @@
<tbody>
{foreach from=$children item=child}
<tr class="{cycle values='r0,r1'}">
<td><img src="{$child->iconsrc}" border="0" alt="{$child->artefacttype}"></td>
<td class="iconcell"><img src="{$child->iconsrc}" border="0" alt="{$child->artefacttype}"></td>
<td><a href="{$WWWROOT}view/artefact.php?artefact={$child->id}&amp;view={$viewid}" title="{$child->hovertitle}">{$child->title}</a></td>
<td class="s">{$child->description}</td>
{if !$simpledisplay}
......
......@@ -52,7 +52,7 @@
<td>{if $file->tags}<span>{list_tags tags=$file->tags owner=$showtags}</span>{/if}</td>
{/if}
{if $editmeta}
<td class="right">
<td class="buttonscell right">
{if $file->locked}
<span class="s dull">{str tag=Submitted section=view}</span>
{elseif !$file->isparent}
......@@ -60,7 +60,7 @@
{/if}
</td>
{/if}
<td class="right">
<td class="buttonscell right">
{if $editable && !$file->isparent}
{if $file->artefacttype == 'archive'}<a href="{$WWWROOT}artefact/file/extract.php?file={$file->id}">{str tag=Unzip section=artefact.file}</a>{/if}
{if $file->locked}
......
......@@ -12,7 +12,7 @@
{foreach from=$selectedlist item=file}
{assign var=displaytitle value=$file->title|str_shorten_text:34|safe}
<tr class="{cycle values='r0,r1'}{if $highlight && $highlight == $file->id} highlight-file{/if}">
<td>
<td class="iconcell">
<img src="{if $file->artefacttype == 'image'}{$WWWROOT}artefact/file/download.php?file={$file->id}&size=20x20{else}{theme_url filename=images/`$file->artefacttype`.gif}{/if}">
</td>
<td>
......
......@@ -60,7 +60,9 @@ form#files .foldernav {
/* File list */
.filelist {
width: 100%;
* width: 96%;
}
* html .filelist {
width: 98%;
}
.filelist th {
border-bottom: 1px solid #CCCCCC;
......@@ -68,12 +70,6 @@ form#files .foldernav {
.filelist table th {
border-bottom: 0;
}
.filelist td.right {
padding-top: 5px;
}
.filelist td.right input {
font-size: .9167em;
}
.filelist td.right input.btn-big-del {
font-size: 1%;
}
......
<tr>
<td style="width: 20px;" rowspan="2">
<td class="iconcell" rowspan="2">
{$formcontrols|safe}
</td>
<th><label for="{$elementname}_{$artefact->id}" title="{$artefact->title|strip_tags|str_shorten_text:60:true|safe}">{str tag=$artefact->artefacttype section=artefact.internal}</label></th>
......
<tr>
<td style="width: 20px;" rowspan="2">
<td class="iconcell" rowspan="2">
{$formcontrols|safe}
</td>
<th><label for="{$elementname}_{$artefact->id}" title="{$artefact->title|strip_tags|str_shorten_text:60:true|safe}">{$artefact->title|strip_tags|safe}</label></th>
......
......@@ -5,7 +5,7 @@
* This file is distributed under the same terms as Mahara itself
*/
th.planscontrols {
width: 50px; !important;
width: 35px !important;
}
#planswrap table {
......@@ -19,15 +19,6 @@ th.planscontrols {
border-bottom: 2px solid #FFF;
}
#planswrap table td {
text-align: left
}
#planswrap table th {
text-align: left;
padding: 3px;
}
#planswrap table td div.completed {
margin: 3px;
text-align:center;
......@@ -50,3 +41,7 @@ ul.planslist li {
list-style: none;
margin: 0 0 3px 0;
}
.codesc {
font-size: .9167em;
}
\ No newline at end of file
......@@ -18,8 +18,8 @@
{/if}
{/if}
<td class="c5 s"><a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" class="icon btn-big-edit" title="{str tag=edit}"></a>
<a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" class="icon btn-big-del" title="{str tag=delete}"></a></td>
<td class="c5 buttonscell"><a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" title="{str tag=edit}"><img src="{theme_url filename='images/edit.gif'}" alt="{str tag=edit}"></a>
<a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" title="{str tag=delete}"><img src="{theme_url filename='images/icon_close.gif'}" alt="{str tag=delete}"></a></td>
</tr>
{/foreach}
{/auto_escape}
<table id="tasktable">
<colgroup width="50%" span="2"></colgroup>
<thead>
<tr>
<th class="c1">{str tag='completiondate' section='artefact.plans'}</th>
......
<tr>
<td style="width: 20px;" rowspan="2">
<td class="iconcell" rowspan="2">
{$formcontrols|safe}
</td>
<th><label for="{$elementname}_{$artefact->id}" title="{$artefact->title|strip_tags|str_shorten_text:60:true|safe}">{str tag=$artefact->artefacttype section=artefact.resume}</label></th>
......
......@@ -15,15 +15,15 @@
<tbody>
{foreach from=$rows item=row}
<tr class="{cycle values='r0,r0,r1,r1'} expandable-head">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td class="toggle">{$row->date}</td>
<td>{$row->title}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
<tr class="{cycle values='r0,r0,r1,r1'} expandable-body">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td colspan="2">{$row->description}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
{/foreach}
</tbody>
......
......@@ -15,15 +15,15 @@
<tbody>
{foreach from=$rows item=row}
<tr class="{cycle values='r0,r0,r1,r1'} expandable-head">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td class="toggle">{$row->date}</td>
<td>{$row->title}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
<tr class="{cycle values='r0,r0,r1,r1'} expandable-body">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td colspan="2">{$row->description}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
{/foreach}
</tbody>
......
......@@ -16,16 +16,16 @@
<tbody>
{foreach from=$rows item=row}
<tr class="{cycle values='r0,r0,r1,r1'} expandable-head">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td class="toggle">{$row->startdate}</td>
<td>{$row->enddate}</td>
<td>{$row->qualification}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
<tr class="{cycle values='r0,r0,r1,r1'} expandable-body">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td colspan="3">{$row->qualdescription}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
{/foreach}
</tbody>
......
......@@ -16,16 +16,16 @@
<tbody>
{foreach from=$rows item=row}
<tr class="{cycle values='r0,r0,r1,r1'} expandable-head">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td class="toggle">{$row->startdate}</td>
<td>{$row->enddate}</td>
<td>{$row->jobtitle}: {$row->employer}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
<tr class="{cycle values='r0,r0,r1,r1'} expandable-body">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td colspan="3">{$row->positiondescription}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
{/foreach}
</tbody>
......
......@@ -16,16 +16,16 @@
<tbody>
{foreach from=$rows item=row}
<tr class="{cycle values='r0,r0,r1,r1'} expandable-head">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td class="toggle">{$row->startdate}</td>
<td>{$row->enddate}</td>
<td>{$row->title}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
<tr class="{cycle values='r0,r0,r1,r1'} expandable-body">
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
<td colspan="3">{$row->description}</td>
{if $controls}<td></td>{/if}
{if $controls}<td class="buttonscell"></td>{/if}
</tr>
{/foreach}
</tbody>
......
......@@ -4,9 +4,6 @@
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
.tablerenderer th.resumecontrols {
width: 35px !important;
}
.tablerenderer th.resumedate {
width: 100px !important;
}
......@@ -16,6 +13,15 @@
#resumewrap table td {
padding: 0;
}
#resumewrap table.resumecomposite .right {
width: 40px;
padding: 5px 5px 3px 5px;
line-height: 1.3333em;
}
#resumewrap table.resumecomposite .movebuttons {
padding: 5px 5px 3px 5px;
line-height: 1.3333em;
}
#resumewrap table tr#coverletter_save_container td,
#resumewrap table tr#interests_save_container td {
padding-top: 5px;
......
......@@ -210,9 +210,6 @@ input#files_filebrowser_edit_artefact:active {
width: 24px;
margin-left: 2px;
}
* html #usf_submit {
height: 22px;
}
#selfsearch button,
.query-button,
#moderator_search_btn,
......@@ -277,15 +274,10 @@ input#files_filebrowser_edit_artefact:active {
/**************** TOP NAVIGATION ****************/
#right-nav ul {
margin: 5px 0;
}
#main-nav li {
color: #e6c560;
* zoom: 1;
* margin-top: -5px;
}
* html #main-nav li {
* margin-top: -8px;
}
#main-nav li a,
#main-nav li a:link,
......
......@@ -340,7 +340,10 @@ div.grippie {
* padding: 3px;
}
.memberssearch {
padding-left: 20px;
margin-top: 10px;
padding: 5px 10px;
background: #eee;
border-right: 4px solid #FFF;
}
.memberssearch form, .memberssearch form div {
display: inline;
......@@ -441,6 +444,7 @@ input.calendar.required {
/** input buttons **/
input.submit, input.cancel, button, .buttondk, input.button, input.select, input#files_filebrowser_edit_artefact {
font-size: 1em;
line-height: 1em;
border-width: 1px;
border-style: solid;
border-color: #7d99ae #003c74 #003c74 #7d99ae;
......@@ -801,7 +805,9 @@ div.rbuttons .small-logo {
#site-logo {
float: left;
margin: 0;
padding: 5px;
}
#site-logo a {
display: block;
}
#header-right {
float: right;
......@@ -835,7 +841,7 @@ div.rbuttons .small-logo {
#right-nav ul {
float: right;
text-align: right;
margin: 5px 0 5px 0;
margin: 5px 0;
min-width: 200px;
}
#right-nav li {
......@@ -850,23 +856,33 @@ div.rbuttons .small-logo {
padding: 0 5px;
}
#main-nav {
clear: left;
clear: both;
font-size: 1.1667em;
line-height: 1.8em;
font-weight: bold;
white-space: nowrap;
margin: 0;
padding: 0;
}
#main-nav ul {
margin: 0;
padding: 0;
}
#main-nav li {
padding: 5px 10px;
line-height: 2em;
padding: 0;
margin: 0;
line-height: 1.8em;
display: inline;
float: left;
}
#main-nav li.selected {
background-color: #ddd;
}
#main-nav li a {
padding: 5px 10px;
display: block;
float: left;
}
#main-nav li.selected a, #main-nav li.selected a:link, #main-nav li.selected a:visited, #main-nav li.selected a:active {
color: #333;
text-decoration: none;
......@@ -892,7 +908,8 @@ div.rbuttons .small-logo {
font-weight: bold;
}
/**************** IN PAGE TAB NAVIGATION ****************/
ul.in-page-tabs {
ul.in-page-tabs,
ul.edit-view-tabs {
font-size: 1em;
font-weight: bold;
list-style: none;
......@@ -901,18 +918,21 @@ ul.in-page-tabs {
position: relative;
z-index: 0;
}
ul.in-page-tabs li {
ul.in-page-tabs li,
ul.edit-view-tabs li {
display: inline;
line-height: 1.8em;
padding: 0;
margin: 0 2px 0 0 !important;
}
ul.in-page-tabs li a, ul.in-page-tabs li a:link, ul.in-page-tabs li a:visited, ul.in-page-tabs li a:active {
ul.in-page-tabs li a, ul.in-page-tabs li a:link, ul.in-page-tabs li a:visited, ul.in-page-tabs li a:active,
ul.edit-view-tabs li a, ul.edit-view-tabs li a:link, ul.edit-view-tabs li a:visited, ul.edit-view-tabs li a:active {
padding: 3px 10px;
background: #EEEEEE;
text-decoration: none;
}
ul.in-page-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.in-page-tabs li a.current-tab:visited, ul.in-page-tabs li a.current-tab:active {
ul.in-page-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.in-page-tabs li a.current-tab:visited, ul.in-page-tabs li a.current-tab:active,
ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.edit-view-tabs li a.current-tab:visited, ul.edit-view-tabs li a.current-tab:active {
color: #333;
text-decoration: none;
background: #D1D1D1;
......@@ -1224,7 +1244,7 @@ a.tag {
.mytags .tagfreq {
font-weight: normal;
font-size: .9167em;
color: #444;
color: #888;
}
.tag-results .sep {
color: #ccc;
......@@ -1328,10 +1348,10 @@ a.tag {
}
#performance-info {
float: right;
margin: 5px;
margin: 10px;
color: #D1D1D1;
text-align: right;
width: 550px;
width: 450px;
}
#micro #footer-wrap #performance-info {
width: auto;
......@@ -1340,6 +1360,7 @@ a.tag {
#performance-info span {
color: #888;
padding: 0 5px;
white-space: nowrap;
}
#version {
clear: right;
......@@ -1354,10 +1375,9 @@ a.tag {
}
/****************************** PAGE BY PAGE STYLES **********************************/
.movebuttons {
width: 35px;
}
.movebuttons .movedown {
float: right;
width: 40px;
text-align: center;
padding-top: 5px;
}
/* Userlists used in admin section and on edit interaction form */
.userlisttable .lrbuttons {
......@@ -1493,11 +1513,11 @@ table.attachments td {
}
#myviews .editlink {
float: right;
margin: 0 5px 0 0;
margin: 3px 0 0 5px;
}
#myviews .viewcontrol {
width: 16px;
margin: 0 5px 0 0;
margin: 3px 0 0 5px;
float: right;
}
.videsc {
......@@ -1518,10 +1538,11 @@ table.attachments td {
margin-left: 3px;
}
#myviews .submitted-viewitem {
padding: 5px 45px 0 0;
padding: 3px 5px;
background: #eee;
font-style: italic;
color: #888;
font-size: 1em;
font-size: .9167em;
}
#deleteview label {
color: #ca0000;
......@@ -1566,7 +1587,7 @@ table.attachments td {
}
.accesslists .cv-listitem {
clear: both;
padding: 3px 5px;
padding: 2px 5px;
border-bottom: 1px solid #FFF;
}
.accesslists .cv-listitem .cv-listitem-edit {
......@@ -1978,9 +1999,10 @@ form#search, form#filter, div.searchform {
margin-left: 5px;
}
/* Group: members */
.listing.twocolumn td {
.twocolumn td {
width: 50%;
border: 4px solid #FFF;
border-top: 4px solid #FFF;
border-right: 4px solid #FFF;
}
#search_filter_container #search_filter {
margin: 0 4px;
......@@ -2181,3 +2203,11 @@ img.feedicon {
#collectionviews td form table td {
border-bottom: 0;
}
.iconcell {
width: 20px;
}
.buttonscell {
padding-top: 5px;
line-height: 1.3333em;
}
\ No newline at end of file
......@@ -5,8 +5,8 @@
<title>{$pagetitle}</title>
</head>
<body>
<div style="font-family: Arial, sans-serif; font-size: smaller; border-bottom: 1px solid #aaa; margin-bottom: 1em; padding-bottom: .5em; text-align: center;">
<div style="float: left; margin-right: 1em; height: 2em;"><a href="" onclick="history.go(-1); return false;">&laquo; {str tag="back"}</a></div>
<div style="font-family: Arial, 'Nimbus Sans L', Helvetica, sans-serif; font-size: 100%; border-bottom: 1px solid #aaa; margin-bottom: 10px; padding-bottom: 5px; text-align: center;">
<div style="float: left; margin-right: 10px; height: 20px;"><a href="" onclick="history.go(-1); return false;">&laquo; {str tag="back"}</a></div>
{$htmlremovedmessage|clean_html|safe}{if $params.downloadurl} <a href="{$params.downloadurl}">{str tag="downloadoriginalversion" section="artefact.file"}</a>{/if}</div>
<div>
{$content|clean_html|safe}
......