Commit a0e5a33a authored by Evonne Cheung's avatar Evonne Cheung Committed by Gerrit Code Review
Browse files

Design changes to master by Evonne 28 Aug 2014 (Bug #1252085)



Change-Id: Ia7d3759acd3deb1224782970ebde5f5f8e6a08e8
Signed-off-by: default avatarRobert Lyon <robertl@brumbies.wgtn.cat-it.co.nz>
Signed-off-by: default avatarGhada El-Zoghbi <ghada@catalyst-au.net>
parent 806d3d5c
......@@ -2,7 +2,7 @@
<div class="rbuttons">
<a class="btn" href="{$WWWROOT}artefact/blog/new/index.php">{str section="artefact.blog" tag="addblog"}</a>
</div>
<div id="myblogs rel">
<div id="myblogs" class="rel">
{if !$blogs->data}
<div>{str tag=youhavenoblogs section=artefact.blog}</div>
{else}
......
{include file="header.tpl"}
<div id="myblogs rel">
<div id="myblogs" class="rel">
<div class="rbuttons">
<a class="btn addpost" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
{if !$blog->get('locked')}
<a class="btn settings" href="{$WWWROOT}artefact/blog/settings/index.php?id={$blog->get('id')}">{str section="artefact.blog" tag="settings"}</a>
{/if}
</div>
</div>
<div id="blogdescription">{clean_html($blog->get('description'))|safe}</div>
{if $blog->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}</div>{/if}
{if $posts}
<div id="postlist" class="fullwidth">
<div id="postlist" class="fullwidth">
{$posts.tablerows|safe}
</div>
</div>
<div id="blogpost_page_container" class="hidden">{$posts.pagination|safe}</div>
<script>
addLoadEvent(function() {literal}{{/literal}
......
......@@ -100,7 +100,7 @@
{/foreach}
</tbody>
</table>
<p>
<div id="downloadfolder">
<a href="{$WWWROOT}artefact/file/downloadfolder.php?{$folderparams|safe}">{str tag=downloadfolderziplink section=artefact.file}</a>
</p>
</div>
{/if}
......@@ -13,7 +13,7 @@
<tbody>
{foreach from=$data item=n}
<tr class="{cycle values='r1,r0'}">
<td class="notetitle">
<td class="note-name">
{if $n->locked}
<h3 class="title"><a class="notetitle" href="" id="n{$n->id}">{$n->title|str_shorten_text:80:true} <span class="accessible-hidden">{str tag=clickformore}</span></a></h3>
{else}
......@@ -53,14 +53,14 @@
<div class="tags">{str tag=tags}: {list_tags tags=$n->tags owner=$n->owner}</div>
{/if}
</td>
<td>
<td class="note-titled"><label class="hidden">{str tag=currenttitle section=artefact.internal}: </label>
{foreach from=$n->blocks item=b}
<div class="detail">
{$b.blocktitle|str_shorten_text:30:true}
</div>
{/foreach}
</td>
<td>
<td class="note-containedin"><label class="hidden">{str tag=containedin section=artefact.internal}: </label>
{foreach from=$n->views item=v}
<div class="detail">
<a href="{$v.fullurl}">{$v.viewtitle|str_shorten_text:30:true}</a>
......@@ -73,7 +73,7 @@
{/if}
{/foreach}
</td>
<td align="center">{$n->count}</td>
<td class="note-attachment"><label class="hidden">{str tag=Attachments section=artefact.resume}: </label> {$n->count}</td>
<td class="right buttonscell btns2">
{if $n->locked}
<span class="s dull">{str tag=Submitted section=view}</span>
......
......@@ -11,6 +11,9 @@ input#myfriends_addfriend_add {
#userfriendstable a {
display: block;
}
#userfriendstable .membername a {
display: inline;
}
#sendmessage input,
#invitetogroup #invitetogroup_submit_container input {
margin: 0;
......
......@@ -180,7 +180,7 @@ $inlinejs .= <<<EOF
var labelfor = ui.item.attr('for');
if (typeof labelfor !== 'undefined' && labelfor !== false) {
var viewid = ui.item.attr('for').replace(/[^\d.]/g,''); // remove all but the digits
ui.item.replaceWith('<tr id="row_' + viewid + '"><td colspan="3">' + ui.item.text() + '</td></tr>');
ui.item.replaceWith('<tr id="row_' + viewid + '" class="dropped-in-row"><td colspan="3">' + ui.item.text() + '</td></tr>');
updaterows(viewid);
}
else {
......
......@@ -1088,22 +1088,17 @@ $string['choosetheme'] = 'Choose theme...';
// Homepage info block
$string['Hide2'] = 'Hide information box';
$string['createcollect'] = 'Create and collect';
$string['createcollectsubtitle'] = 'Develop your portfolio';
$string['updateprofile'] = 'Update your profile';
$string['uploadfiles'] = 'Upload your files';
$string['createresume'] = 'Create your résumé';
$string['publishblog'] = 'Publish a journal';
$string['Organise'] = 'Organise';
$string['organisesubtitle'] = 'Showcase your portfolio';
$string['organisedescription'] = 'Organise your portfolio into <a href="%s">pages.</a> Create different pages for different audiences - you choose the elements to include.';
$string['sharenetwork'] = 'Share and network';
$string['sharenetworksubtitle'] = 'Find friends and join groups';
$string['findfriends'] = 'Find friends';
$string['joinsomegroups'] = 'Join groups';
$string['controlyourprivacy'] = 'Control your privacy';
$string['discusstopics'] = 'Discuss topics';
$string['howtodisable'] = 'You have hidden the information box. You can control its visibility in <a href="%s">Settings</a>.';
$string['create'] = 'Create';
$string['createsubtitle'] = 'Develop your portfolio';
$string['createdetail'] = 'Create your electronic portfolio in a flexible personal learning environment';
$string['share'] = 'Share';
$string['sharesubtitle'] = 'Control your privacy';
$string['sharedetail'] = 'Share your achievements and development in a space you control';
$string['engage'] = 'Engage';
$string['engagesubtitle'] = 'Find people and join groups';
$string['engagedetail'] = 'Engage with other people in discussion forums and collaborate with them in groups';
$string['howtodisable'] = 'You have hidden the information box. You can control its visibility in <a
href="%s">Settings</a>.';
// Blocktype
$string['setblocktitle'] = 'Set a block title';
......
......@@ -538,7 +538,7 @@ $elements['viewadvanced'] = array(
'elements' => array(
'view_custom_css' => array(
'type' => 'textarea',
'rows' => 10,
'rows' => 7,
'cols' => 50,
'style' => 'font-family:monospace',
'resizable' => true,
......
......@@ -89,7 +89,7 @@ $inlinejs = <<<EOF
}
}
var scrolltop = (((getViewport().h / 2) - 100) > 0) ? (getViewport().h / 2) - 100 : 0;
meta.css('left', (((getViewport().w / 2) - 200) > 0) ? (getViewport().w / 2) - 200 : 0);
meta.css('left', '30%');
meta.css('top', (getViewport().t + scrolltop));
jQuery(document.body).append('<div id="overlay"></div>');
meta.find('.metadataclose').focus();
......
/**
* Stylesheet for Mahara's Aqua theme.
*
* @author Paul Walker <paul.walker@catalyst-eu.net>
* @author Catalyst IT Ltd
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
* @copyright (C) 2006-2013 Catalyst IT Europe http://catalyst-eu.net
*
* This file is licensed under the same terms as Mahara itself
*/
/******************** Body ********************/
......@@ -92,7 +94,8 @@ input#login_submit,
input#viewlayout_submit,
input#files_filebrowser_upload,
input#designskinform_submit,
input#cancel_designskinform_submit {
input#cancel_designskinform_submit,
input#import_submit {
background: url(../images/btn_bkgd.png) repeat-x 0 50%;
border-color: #0b1962;
color: #FFFFFF;
......@@ -127,11 +130,48 @@ input#login_submit:hover,
input#viewlayout_submit:hover,
input#files_filebrowser_upload:hover,
input#designskinform_submit:hover,
input#cancel_designskinform_submit:hover {
input#cancel_designskinform_submit:hover,
input#import_submit:hover {
background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
border-color: #0b1962;
color: #FFFFFF;
}
/* focus for buttons */
tr.submitcancel input.submit:focus,
tr.submitcancel input.cancel:focus,
tr.submit input.submit:focus,
tr.submit input.cancel:focus,
input#profileform_submit:focus,
input#files_filebrowser_edit_artefact:focus,
input#files_filebrowser_edit_cancel:focus,
input#instconf_folder_edit_artefact:focus,
input#instconf_folder_edit_cancel:focus,
input#instconf_artefactids_edit_artefact:focus,
input#instconf_artefactids_edit_cancel:focus,
input#instconf_artefactid_edit_artefact:focus,
input#instconf_artefactid_edit_cancel:focus,
.rbuttons .btn:focus,
.rbuttons input.submit:focus,
#resumewrap input.openedit:focus,
#resumewrap button:focus,
#view-wizard-controls input.submit:focus,
.submitwrap input.submit:focus,
#editaccess_submit_container input.submitcancel:focus,
#collectiondonewrap .btn:focus,
input#export_submit:focus,
#sitelicenses .btn:focus,
#adduser #adduser_submit:focus,
input#login_submit:focus,
.login-externallink a.btn:focus,
input#viewlayout_submit:focus,
input#files_filebrowser_upload:focus,
input#designskinform_submit:focus,
input#cancel_designskinform_submit:focus,
input#import_submit:focus {
background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
border-color: #3C7FB1;
color: #FFFFFF;
}
/* depress for buttons */
tr.submitcancel input.submit:active,
tr.submitcancel input.cancel:active,
......@@ -162,7 +202,8 @@ input#login_submit:active,
input#viewlayout_submit:active,
input#files_filebrowser_upload:active,
input#designskinform_submit:active,
input#cancel_designskinform_submit:active {
input#cancel_designskinform_submit:active,
input#import_submit:active {
background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
border-color: #3C7FB1;
color: #FFFFFF;
......@@ -188,6 +229,16 @@ input#usertype_typesubmit:hover,
background: url(../images/btn_bkgd_grey_hover.png) repeat-x 0 50%;
color: #333333;
}
#forumslist input.btn-subscribe:focus,
input#addviews_submit:focus,
input#edituser_suspend_submit:focus,
input#friendscontrol_submit:focus,
input#usertype_typesubmit:focus,
.subpage .skinsbtns .btn:focus {
border: 1px solid #707070;
background: url(../images/btn_bkgd_grey_focus.png) repeat-x 0 50%;
color: #333333;
}
#forumslist input.btn-subscribe:active,
input#addviews_submit:active,
input#edituser_suspend_submit:active,
......@@ -201,6 +252,7 @@ input#usertype_typesubmit:active,
/* reset some that need grey button colour text */
ul.groupuserstatus li .submit input.submit,
ul.groupuserstatus li .submit input.submit:hover,
ul.groupuserstatus li .submit input.submit:focus,
ul.groupuserstatus li .submit input.submit:active {
color: #333333;
}
......@@ -255,7 +307,9 @@ div.pagination a {
color: #333333;
}
#usf_submit,
#usf_submit:hover {
#usf_submit:hover,
#usf_submit:focus,
#usf_submit:active {
background: transparent url(../images/btn-search.png) no-repeat !important;
border: 0;
color: #1F97D5;
......@@ -279,7 +333,8 @@ div.pagination a {
.viewheadertop #mainnav-container #mainnav a:link,
.viewheadertop #mainnav-container #mainnav a:visited,
.viewheadertop #mainnav-container #mainnav a:active,
.viewheadertop #mainnav-container #mainnav a:hover {
.viewheadertop #mainnav-container #mainnav a:hover,
.viewheadertop #mainnav-container #mainnav a:focus {
color: #65cbff;
}
/******************** Main navigation ********************/
......@@ -300,7 +355,8 @@ div.pagination a {
color: #FFFFFF;
font-weight: normal;
}
.main-nav li a:hover, .main-nav li a:focus {
.main-nav li a:hover,
.main-nav li a:focus {
color: #1F97D5;
text-decoration: underline;
}
......@@ -329,7 +385,8 @@ div.pagination a {
#sub-nav li a:active {
color: #03219D;
}
#sub-nav li a:hover {
#sub-nav li a:hover,
#sub-nav li a:focus {
text-decoration: underline;
}
#sub-nav li.selected a,
......@@ -349,7 +406,8 @@ div.pagination a {
background: #00084F;
color: #FFFFFF;
}
.main-nav .dropdown-sub li a:hover, .main-nav .dropdown-sub li a:focus {
.main-nav .dropdown-sub li a:hover,
.main-nav .dropdown-sub li a:focus {
background: #1F97D5;
}
/******************** Tabs ********************/
......@@ -364,8 +422,11 @@ ul.in-page-tabs li button.linkbtn {
border: 1px solid #00084F;
}
ul.in-page-tabs li a:hover,
ul.in-page-tabs li a:focus,
ul.in-page-tabs li input:hover,
ul.in-page-tabs li button:hover {
ul.in-page-tabs li input:focus,
ul.in-page-tabs li button:hover,
ul.in-page-tabs li button:focus {
text-decoration: underline;
color: #1F97D5;
}
......@@ -430,7 +491,8 @@ ul.in-page-tabs li button.current-tab {
#footer a:link,
#footer a:visited,
#footer a:active,
#footer a:hover {
#footer a:hover,
#footer a:focus {
color: #FFFFFF;
}
/******************** Page by page styles (listed by navigation order) ********************/
......@@ -449,7 +511,9 @@ a.persona-button {
background: -webkit-linear-gradient(top, #012cac, #0b1962);
background: linear-gradient(top, #012cac, #0b1962);
}
a.persona-button:hover {
a.persona-button:active,
a.persona-button:hover,
a.persona-button:focus {
background: #012cac;
background: -moz-linear-gradient(top, #0b1962, #012cac);
background: -ms-linear-gradient(top, #0b1962, #012cac);
......@@ -476,15 +540,15 @@ a.persona-button:before {
background: linear-gradient(-45deg, #3c3c3c, #606060); /* flipped for updated spec */
}
/* Dashboard */
.home-info-table {
border: 3px solid #F4F7F9;
background: #F4F7F9; /* Old browsers */
background: -moz-linear-gradient(top, #F4F7F9 0%, #FFFFFF 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F4F7F9), color-stop(100%, #FFFFFF)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #F4F7F9 0%, #FFFFFF 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #F4F7F9 0%, #FFFFFF 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #F4F7F9 0%, #FFFFFF 100%); /* IE10+ */
background: linear-gradient(to bottom, #F4F7F9 0%, #FFFFFF 100%); /* W3C */
.home-info-box {
background-color: #e9f1f6;
border: 1px solid #cdd9e1;
}
.home-info-box h2.title {
color: #1a428f;
}
.mask {
background-color: rgba(26,66,143,0.9);
}
/* Content > Journals > Journal posts */
/* attachments */
......@@ -496,6 +560,10 @@ table.attachments {
div.currentskin {
background: #e9f1f6;
}
/* Portfolio > Collections > Edit */
fieldset#pagestoadd {
background: #afbbd2;
}
/* Groups > Group's about page */
.group-info {
background: #F4F7F9;
......
......@@ -4,6 +4,8 @@
* @author Catalyst IT Ltd
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
*
* This file is licensed under the same terms as Mahara itself
*/
/******************** Collection navigation ********************/
#collectionnavwrap {
......@@ -33,4 +35,4 @@ ul.colnav li a:active {
#select-theme {
background-color: #d8deea;
border-color: #c6cedd;
}
}
\ No newline at end of file
/**
* Style stylesheet - for Mahara's Custom theme.
*
* @author Catalyst IT Ltd
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
*
* This file is licensed under the same terms as Mahara itself
*/
/******************** Body ********************/
body,
body#micro {
background: #182768;
color: #333333;
color: #333333;
}
/******************** General headings ********************/
h1,
......@@ -109,17 +111,19 @@ div.pagination a {
background: #FFFFFF;
}
#usf_submit,
#usf_submit:hover {
background: #FFFFFF url(../images/btn-search.png) no-repeat center !important;
border: 0;
color: #FFFFFF;
text-indent: -999px;
font-size: 1%;
cursor: pointer;
vertical-align: bottom;
height: 23px;
width: 23px;
margin-left: 0;
#usf_submit:hover,
#usf_submit:active,
#usf_submit:focus {
background: #FFFFFF url(../images/btn-search.png) no-repeat center !important;
border: 0;
color: #FFFFFF;
text-indent: -999px;
font-size: 1%;
cursor: pointer;
vertical-align: bottom;
height: 23px;
width: 23px;
margin-left: 0;
}
#usf_query_container input {
color: #888888;
......@@ -136,7 +140,8 @@ div.pagination a {
.viewheadertop #mainnav-container #mainnav a:link,
.viewheadertop #mainnav-container #mainnav a:visited,
.viewheadertop #mainnav-container #mainnav a:active,
.viewheadertop #mainnav-container #mainnav a:hover {
.viewheadertop #mainnav-container #mainnav a:hover,
.viewheadertop #mainnav-container #mainnav a:focus {
color: #FFFFFF;
}
/******************** Main navigation ********************/
......@@ -158,15 +163,16 @@ div.pagination a {
background: none;
color: #FFFFFF;
}
.main-nav li a:hover, .main-nav li a:focus {
background: none;
.main-nav li a:hover,
.main-nav li a:focus {
background: none;
}
.main-nav li.selected a,
.main-nav li.selected a:link,
.main-nav li.selected a:visited,
.main-nav li.selected a:active {
color: #333333;
background: #FFF4EA;
background: #FFF4EA;
}
/******************** Sub navigation ********************/
#sub-nav ul {
......@@ -202,7 +208,8 @@ div.pagination a {
color: #FFFFFF;
background: #F6871F;
}
.main-nav .dropdown-sub li a:hover, .main-nav .dropdown-sub li a:focus {
.main-nav .dropdown-sub li a:hover,
.main-nav .dropdown-sub li a:focus {
color: #1A428F;
background: #FFF4EA;
}
......@@ -242,33 +249,36 @@ ul.in-page-tabs li button.linkbtn {
.sideblock h3 a:link,
.sideblock h3 a:visited,
.sideblock h3 a:active,
.sideblock h3 a:hover {
color: #FFFFFF;
.sideblock h3 a:hover,
.sideblock h3 a:focus {
color: #FFFFFF;
}
.sideblock #lastminutes {
color: #FFFFFF;
color: #FFFFFF;
}
.sideblock .sidebar-content a,
.sideblock .sidebar-content a:link,
.sideblock .sidebar-content a:visited,
.sideblock .sidebar-content a:active,
.sideblock .sidebar-content a:hover,
.sideblock .sidebar-content a:focus,
#quota_used,
#quota_total {
color: #182768;
color: #182768;
}
/* Sidebar profile */
#sb-profile .sidebar-header {
min-height: 57px;
min-height: 57px;
}
/******************** Footer ********************/
#footer-wrap {
color: #FFFFFF;
color: #FFFFFF;
}
#footer a,
#footer a:link,
#footer a:visited,
#footer a:active,
#footer a:hover {
#footer a:hover,
#footer a:focus {
color: #FFFFFF;
}
\ No newline at end of file
/**
* Views stylesheet - for Custom theme.
* Views stylesheet - for Mahara's Custom theme.
*
* @author Catalyst IT Ltd
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
*
* This file is licensed under the same terms as Mahara itself
*/
/******************** Collection navigation ********************/
......@@ -9,6 +12,6 @@ ul.colnav li a,
ul.colnav li a:link,
ul.colnav li a:visited,
ul.colnav li a:active {
color: #FFFFFF;
background: #F6871F;
color: #FFFFFF;
background: #F6871F;
}
\ No newline at end of file
......@@ -7,7 +7,6 @@
* This file is distributed under the same terms as Mahara itself
*/
/* Admin home > Overview */
.admin-warning-box h3 {
color: #333333;
......@@ -59,6 +58,9 @@
float: none;
width: 98%;
}
.statistics-subpage-full-column {
margin-left: 0;
}
/* Users > Add user */
#adduser table th,
#adduser table td {
......@@ -126,6 +128,23 @@
#fontlist ul.actionlist {
width: 100%;
}
/* Configure site > Cookie consent */
#cookieconsent th,
#cookieconsent td {
float: left;
width: 98%;
padding: 3px 0.9%;
display: block;
}
#cookieconsent tr#cookieconsent_enabled_container th {
width: auto;
display: inline-block;
padding-top: 7px;
}
#cookieconsent tr#cookieconsent_enabled_container td {
width: auto;
display: inline-block;
}
/* Users > Suspended and expired users */
form#usertype {
float: none;
......
/**
* Style stylesheet - for Mahara's Default theme.