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

Update themes

parent da200344
...@@ -5,23 +5,6 @@ ...@@ -5,23 +5,6 @@
* This file is distributed under the same terms as Mahara itself * This file is distributed under the same terms as Mahara itself
*/ */
/* Blog list */
/* Post list */
#postlist th {
}
#postlist input.delete {
color: #ca0000;
}
#postlist input.publish,
#postlist input.edit {
color: #4C711D;
}
#postlist td.postdetails {
}
/* attachment files */ /* attachment files */
#postlist .attachments th { #postlist .attachments th {
background: #AABC8B; background: #AABC8B;
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
cursor: pointer; cursor: pointer;
font-size: 1%; font-size: 1%;
margin-left: .5em; margin-left: .5em;
padding-left: 0;
} }
#postlist th form, #postlist th form,
#postlist th form div { #postlist th form div {
...@@ -58,9 +59,9 @@ ...@@ -58,9 +59,9 @@
margin: 0 0 1em 0; margin: 0 0 1em 0;
} }
#postlist td.postdetails { #postlist td.postdetails {
padding-bottom: 2em;
font-size: .9167em; font-size: .9167em;
color: #888; color: #888;
padding-bottom: 1em;
} }
/* attachment files */ /* attachment files */
......
...@@ -41,23 +41,6 @@ tr.folder td { ...@@ -41,23 +41,6 @@ tr.folder td {
tr.folderhover td { tr.folderhover td {
background-color: #daf0ff !important; background-color: #daf0ff !important;
} }
/* File list edit box */
#files_filebrowser_edit_row td {
border: 2px solid #eee;
}
#files_filebrowser_edit_row #files_filebrowser_edit_heading {
color: #333;
}
/* Edit post File list */
#editpost_filebrowser_upload_browse,
#editpost_filebrowser_open_upload_browse_container {
border-top: 1px solid #eee;
border-right: 1px solid #eee;
border-bottom: 4px solid #eee;
border-left: 1px solid #eee;
}
/* Edit post selected file list */ /* Edit post selected file list */
.filelist .disabled { .filelist .disabled {
color: #C3C3C3; color: #C3C3C3;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<table class="filedata"> <table class="filedata">
<tr><th>{str tag=Type section=artefact.file}:</th><td>{$filetype}</td></tr> <tr><th>{str tag=Type section=artefact.file}:</th><td>{$filetype}</td></tr>
<tr><th>{str tag=Description section=artefact.file}:</th><td>{$description}</td></tr> <tr><th>{str tag=Description section=artefact.file}:</th><td>{$description}</td></tr>
<tr><th>{str tag=tags}:</th><td>{list_tags owner=$owner tags=$tags}</td></tr> <tr class="tags"><th>{str tag=tags}:</th><td>{list_tags owner=$owner tags=$tags}</td></tr>
<tr><th>{str tag=Owner section=artefact.file}:</th><td>{$ownername}</td></tr> <tr><th>{str tag=Owner section=artefact.file}:</th><td>{$ownername}</td></tr>
<tr><th>{str tag=Created section=artefact.file}:</th><td>{$created}</td></tr> <tr><th>{str tag=Created section=artefact.file}:</th><td>{$created}</td></tr>
<tr><th>{str tag=lastmodified section=artefact.file}:</th><td>{$modified}</td></tr> <tr><th>{str tag=lastmodified section=artefact.file}:</th><td>{$modified}</td></tr>
......
<div> <div>
{if !$simpledisplay}<h3>{$title}</h3>{/if} {if !$simpledisplay}<h3>{$title}</h3>{/if}
<div>{$description}</div> <div>{$description}</div>
{if $tags}<div class="tags">{str tag=tags}: {list_tags owner=$owner tags=$tags}</div>{/if} {if $tags}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$owner tags=$tags}</div>{/if}
<div> <div>
{if (isset($children))} {if (isset($children))}
<table class="fullwidth"> <table class="fullwidth">
......
<tr id="{$prefix}_edit_row"{if !$fileinfo} class="hidden"{/if}> <tr id="{$prefix}_edit_row"{if !$fileinfo} class="hidden"{/if}>
<td colspan="6"> <td></td>
<td colspan="5">
<table> <table>
<tbody> <tbody>
<tr> <tr>
<th colspan="2" id="{$prefix}_edit_heading"> <th colspan="2" id="{$prefix}_edit_heading" class="fl">
{if $fileinfo}{if $fileinfo->artefacttype == 'folder'}{str tag=editfolder section=artefact.file}{else}{str tag=editfile section=artefact.file}{/if}{/if} {if $fileinfo}{if $fileinfo->artefacttype == 'folder'}{str tag=editfolder section=artefact.file}{else}{str tag=editfile section=artefact.file}{/if}{/if}
</th> </th>
</tr> </tr>
...@@ -15,7 +16,7 @@ ...@@ -15,7 +16,7 @@
<th><label>{str tag=description}</label></th> <th><label>{str tag=description}</label></th>
<td><input type="text" class="text" name="{$prefix}_edit_description" id="{$prefix}_edit_description" value="{$fileinfo->description}" size="40" /></td> <td><input type="text" class="text" name="{$prefix}_edit_description" id="{$prefix}_edit_description" value="{$fileinfo->description}" size="40" /></td>
</tr> </tr>
<tr> <tr class="tags">
<th><label>{str tag=tags}</label></th> <th><label>{str tag=tags}</label></th>
<td> <td>
<input name="{$prefix}_edit_tags" size="40" id="{$prefix}_edit_tags" value="{foreach from=$fileinfo->tags item=tag name=tags}{if !$.foreach.tags.first}, {/if}{$tag}{/foreach}" /> <input name="{$prefix}_edit_tags" size="40" id="{$prefix}_edit_tags" value="{foreach from=$fileinfo->tags item=tag name=tags}{if !$.foreach.tags.first}, {/if}{$tag}{/foreach}" />
...@@ -52,7 +53,8 @@ ...@@ -52,7 +53,8 @@
</tr> </tr>
{/if} {/if}
<tr> <tr>
<td colspan="2"> <td></td>
<td>
<input type="submit" name="{$prefix}_update[{$fileinfo->id}]" id="{$prefix}_edit_artefact" value="{str tag=savechanges section=artefact.file}" /> <input type="submit" name="{$prefix}_update[{$fileinfo->id}]" id="{$prefix}_edit_artefact" value="{str tag=savechanges section=artefact.file}" />
<input type="submit" class="cancel" name="{$prefix}_canceledit" id="{$prefix}_edit_cancel" value="{str tag=cancel}" /> <input type="submit" class="cancel" name="{$prefix}_canceledit" id="{$prefix}_edit_cancel" value="{str tag=cancel}" />
</td> </td>
......
...@@ -94,15 +94,10 @@ tr.folderhover a { ...@@ -94,15 +94,10 @@ tr.folderhover a {
cursor: move; cursor: move;
} }
/* File list edit box */ /* File list edit box */
#files_filebrowser_edit_row td {
border: 2px solid #eee;
}
#files_filebrowser_edit_row #files_filebrowser_edit_heading { #files_filebrowser_edit_row #files_filebrowser_edit_heading {
font-size: 1.1667em; font-size: 1.3333em;
padding: .5em 0.25em 0 .25em;
} }
#files_filebrowser_edit_row table th { #files_filebrowser_edit_row table th {
text-align: left;
border: 0; border: 0;
} }
#files_filebrowser_edit_row table th label { #files_filebrowser_edit_row table th label {
......
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
<td class="{cycle values='r0,r1'}"> <td class="{cycle values='r0,r1'}">
<h4><a href="{$WWWROOT}view/view.php?id={$item->id}">{$item->title}</a></h4> <h4><a href="{$WWWROOT}view/view.php?id={$item->id}">{$item->title}</a></h4>
{if $item->description} {if $item->description}
<div>{$item->description|str_shorten_html:100:true|safe}</div> <div class="details">{$item->description|str_shorten_html:100:true|safe}</div>
{/if} {/if}
{if $item->tags} {if $item->tags}
<div class="tags s"><strong>{str tag=tags}:</strong> {list_tags owner=$item->owner tags=$item->tags}</div> <div class="tags s"><label>{str tag=tags}:</label> {list_tags owner=$item->owner tags=$item->tags}</div>
{/if} {/if}
{if $item->artefacts} {if $item->artefacts}
<div class="artefacts s"> <div class="artefacts s">
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
{foreach from=$views item=view} {foreach from=$views item=view}
<tr> <tr>
<td class="{cycle values='r0,r1'}"><h4><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title}</a></h4> <td class="{cycle values='r0,r1'}"><h4><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title}</a></h4>
<div>{$view.shortdescription|safe|clean_html}</div> <div class="details">{$view.shortdescription|safe|clean_html}</div>
{if $view.sharedby} {if $view.sharedby}
<div> <div>
{if $view.group && $loggedin} {if $view.group && $loggedin}
<a href="{$WWWROOT}group/view.php?id={$view.group}">{$view.sharedby}</a> <a href="{$WWWROOT}group/view.php?id={$view.group}" class="s">{$view.sharedby}</a>
{elseif $view.owner && $loggedin} {elseif $view.owner && $loggedin}
<a href="{$WWWROOT}user/view.php?id={$view.owner}">{$view.sharedby}</a> <a href="{$WWWROOT}user/view.php?id={$view.owner}" class="s">{$view.sharedby}</a>
{else} {else}
{$view.sharedby} {$view.sharedby}
{/if} {/if}
......
...@@ -108,8 +108,6 @@ tr.folder td { ...@@ -108,8 +108,6 @@ tr.folder td {
div.pagination a { div.pagination a {
background-color: #E7EFC5; background-color: #E7EFC5;
} }
div.pagination .disabled {
}
/**************************** Forms ****************************/ /**************************** Forms ****************************/
/* Label */ /* Label */
...@@ -154,15 +152,6 @@ input[type=password], ...@@ -154,15 +152,6 @@ input[type=password],
input[type=file] { input[type=file] {
border: 1px solid #D1D1D1; border: 1px solid #D1D1D1;
} }
input.text.required {
}
/* error */
input.error, select.error {
}
.errmsg {
}
/****************************** Buttons ****************************/ /****************************** Buttons ****************************/
/** input buttons **/ /** input buttons **/
...@@ -170,6 +159,7 @@ input.error, select.error { ...@@ -170,6 +159,7 @@ input.error, select.error {
input.submit, input.submit,
input.cancel, input.cancel,
button, button,
.buttondk,
input.button, input.button,
input.select, input.select,
input#files_filebrowser_edit_artefact { input#files_filebrowser_edit_artefact {
...@@ -197,6 +187,7 @@ input.quiet.btn-del { ...@@ -197,6 +187,7 @@ input.quiet.btn-del {
input.submit:hover, input.submit:hover,
input.cancel:hover, input.cancel:hover,
button:hover, button:hover,
.buttondk:hover,
input.button:hover, input.button:hover,
input.select:hover, input.select:hover,
input#files_filebrowser_edit_artefact:hover { input#files_filebrowser_edit_artefact:hover {
...@@ -208,6 +199,7 @@ input#files_filebrowser_edit_artefact:hover { ...@@ -208,6 +199,7 @@ input#files_filebrowser_edit_artefact:hover {
input.submit:active, input.submit:active,
input.cancel:active, input.cancel:active,
button:active, button:active,
.buttondk:active,
input.button:active, input.button:active,
input.select:active, input.select:active,
input#files_filebrowser_edit_artefact:active { input#files_filebrowser_edit_artefact:active {
...@@ -268,10 +260,6 @@ a.btn-req { ...@@ -268,10 +260,6 @@ a.btn-req {
background: url(../images/icon-pending.gif) no-repeat left center; background: url(../images/icon-pending.gif) no-repeat left center;
padding-left: 12px; padding-left: 12px;
} }
.btn-settings {
background: url(../images/icon-settings.gif) no-repeat left center;
padding-left: 12px;
}
input#addfriend_add, input#addfriend_add,
input#myfriends_addfriend_add { input#myfriends_addfriend_add {
background: transparent url(../images/icon-add.gif) no-repeat left center; background: transparent url(../images/icon-add.gif) no-repeat left center;
...@@ -347,8 +335,6 @@ input#myfriends_addfriend_add { ...@@ -347,8 +335,6 @@ input#myfriends_addfriend_add {
text-align: right; text-align: right;
display: inline; display: inline;
} }
#header-right {
}
/* Search and language bar */ /* Search and language bar */
#language-select, #usf { #language-select, #usf {
font-size: .8333em !important; font-size: .8333em !important;
...@@ -363,15 +349,6 @@ input#myfriends_addfriend_add { ...@@ -363,15 +349,6 @@ input#myfriends_addfriend_add {
#right-nav ul { #right-nav ul {
margin: .5em 0 .5em 0; margin: .5em 0 .5em 0;
} }
#right-nav li {
}
#right-nav li a {
}
#main-nav {
}
#main-nav ul {
}
#main-nav li { #main-nav li {
color: #e6c560; color: #e6c560;
} }
...@@ -394,8 +371,6 @@ input#myfriends_addfriend_add { ...@@ -394,8 +371,6 @@ input#myfriends_addfriend_add {
color: #e4ffb4; color: #e4ffb4;
text-decoration: none; text-decoration: none;
} }
#main-nav li.selected {
}
#main-nav li.selected a, #main-nav li.selected a,
#main-nav li.selected a:link, #main-nav li.selected a:link,
#main-nav li.selected a:visited, #main-nav li.selected a:visited,
...@@ -403,8 +378,6 @@ input#myfriends_addfriend_add { ...@@ -403,8 +378,6 @@ input#myfriends_addfriend_add {
color: #4C711D; color: #4C711D;
background: url(../images/menu-over-bg.gif) no-repeat left bottom; background: url(../images/menu-over-bg.gif) no-repeat left bottom;
} }
#main-nav li.selected a:hover {
}
/**************** SUB NAVIGATION ****************/ /**************** SUB NAVIGATION ****************/
...@@ -421,8 +394,6 @@ input#myfriends_addfriend_add { ...@@ -421,8 +394,6 @@ input#myfriends_addfriend_add {
padding: 0 0 0 .5em; padding: 0 0 0 .5em;
background: none; background: none;
} }
#sub-nav li {
}
#sub-nav li a, #sub-nav li a,
#sub-nav li a:link, #sub-nav li a:link,
#sub-nav li a:visited, #sub-nav li a:visited,
...@@ -436,8 +407,6 @@ input#myfriends_addfriend_add { ...@@ -436,8 +407,6 @@ input#myfriends_addfriend_add {
color: #7e7327; color: #7e7327;
text-decoration: none; text-decoration: none;
} }
#sub-nav li.selected {
}
#sub-nav li.selected a, #sub-nav li.selected a,
#sub-nav li.selected a:link, #sub-nav li.selected a:link,
#sub-nav li.selected a:visited, #sub-nav li.selected a:visited,
...@@ -445,8 +414,6 @@ input#myfriends_addfriend_add { ...@@ -445,8 +414,6 @@ input#myfriends_addfriend_add {
background: url(../images/submenu-over-bg.gif) no-repeat right top; background: url(../images/submenu-over-bg.gif) no-repeat right top;
color: #4c711d; color: #4c711d;
} }
#sub-nav li.selected a:hover {
}
/**************** IN PAGE TAB NAVIGATION ****************/ /**************** IN PAGE TAB NAVIGATION ****************/
ul.in-page-tabs { ul.in-page-tabs {
...@@ -486,36 +453,12 @@ ul.in-page-tabs li a.current-tab:active { ...@@ -486,36 +453,12 @@ ul.in-page-tabs li a.current-tab:active {
color: #000; color: #000;
border-bottom: 1px solid #FFF; border-bottom: 1px solid #FFF;
} }
ul.in-page-tabs li a.current-tab:hover {
}
.subpage { .subpage {
display: block; display: block;
border-top: 0; border-top: 0;
} }
/**************** MAIN CONTENT *****************/
/* system messages between nav and main content */
/* upload file message */
div.info {
}
/* different message types */
#messages .ok,
div.ok {
}
#messages .error,
div.error {
}
#messages .info {
}
/* system messages */
.message {
}
.message.delete {
}
/**************** SIDEBAR *********/ /**************** SIDEBAR *********/
#left-column, #left-column,
#right-column { #right-column {
...@@ -524,8 +467,6 @@ div.error { ...@@ -524,8 +467,6 @@ div.error {
div.sideblock { div.sideblock {
background: url(../images/sidebar-bg.gif) repeat-x top; background: url(../images/sidebar-bg.gif) repeat-x top;
} }
div.sideblock h3 {
}
div.sideblock h3 a, div.sideblock h3 a,
div.sideblock h3 a:link, div.sideblock h3 a:link,
div.sideblock h3 a:visited, div.sideblock h3 a:visited,
...@@ -570,15 +511,6 @@ div.sideblock h3 a:hover { ...@@ -570,15 +511,6 @@ div.sideblock h3 a:hover {
color: #3986c3 !important; color: #3986c3 !important;
} }
/* Side Online Users */
#sb-onlineusers ul {
}
#sb-onlineusers li {
}
#sb-onlineusers ul img {
}
#lastminutes {
}
/* Side Quota Bar */ /* Side Quota Bar */
#quota_used { #quota_used {
...@@ -597,10 +529,6 @@ div.sideblock h3 a:hover { ...@@ -597,10 +529,6 @@ div.sideblock h3 a:hover {
background-color: #ecf3d4; background-color: #ecf3d4;
} }
/* Friends control sideblock */
div.sideblock #friendscontrol label {
}
/* Tags */ /* Tags */
.tag-results .sep { .tag-results .sep {
color: #d1d1d1; color: #d1d1d1;
...@@ -623,15 +551,6 @@ div.sideblock #friendscontrol label { ...@@ -623,15 +551,6 @@ div.sideblock #friendscontrol label {
background: #ca0000; background: #ca0000;
} }
/* Ajax Login */
#ajax-login-form {
}
/* Help popups & icons */
.contextualHelp {
}
/******************** FOOTER ****************************/ /******************** FOOTER ****************************/
#footer-wrap { #footer-wrap {
background: #939393; background: #939393;
...@@ -678,122 +597,6 @@ div.sideblock #friendscontrol label { ...@@ -678,122 +597,6 @@ div.sideblock #friendscontrol label {
} }
/****************************** PAGE BY PAGE STYLES **********************************/
/* Userlists used in admin section and on edit interaction form */
.userlisttable tbody tr th {
}
/* Attached file lists */
.attachments {
}
.attachments tbody th {
}
/* User/view */
#userview .user-icon {
}
/* Wall */
.wallpost {
}
#wall .private {
}
.wallpost .controls {
}
/* My Views */
#myviews td {
}
#myviews h4 {
}
#myviews .submitted-viewitem {
}
#deleteview label {
}
/* Copy a view */
#viewpreview {
}
#viewpreviewinner {
}
#viewpreviewclose {