Commit ae2411ba authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
parent 5d1bb8af
......@@ -13,8 +13,16 @@
#bloglist td .addicon {
margin: 0;
}
#blogdescription {
padding: 10px;
margin: 10px 0;
background: #eee;
}
#blogdescription p {
margin: 0;
}
#bloglist td div.postcontrols {
min-width: 12.5em;
min-width: 150px;
}
td a.btn-add{
margin-left:10px;
......@@ -24,17 +32,16 @@ td a.btn-add{
#postlist th {
border-bottom: 1px dotted #d1d1d1;
font-size: 1em;
padding: 1em 0 .25em 0;
padding: 10px 0 3px 0;
vertical-align: bottom;
}
#postlist td {
padding: .25em 0;
}
#postlist th.posttitle {
font-size: 1.8em;
line-height: 1.1667em;
}
#postlist th.controls {
text-align: right;
width: 35px;
}
#postlist th.controls .btn-big-del {
background:url("../images/delete.gif") no-repeat scroll left center transparent;
......@@ -43,7 +50,7 @@ td a.btn-add{
cursor:pointer;
font-size:1%;
height:16px;
margin-left:0.5em;
margin-left: 5px;
padding-left:0;
width:16px;
}
......@@ -55,34 +62,31 @@ td a.btn-add{
display: inline;
}
#postlist p {
margin: 0 0 1em 0;
margin: 0 0 10px 0;
}
#postlist td.postdetails {
font-size: .9167em;
color: #888;
padding-bottom: 1em;
padding-bottom: 10px;
}
#postlist td h1,
#postlist td h2 {
font-size: 1.3333em !important;
margin: 1em 0 0 0;
margin: 10px 0 0 0;
}
#postlist td h3,
#postlist td h4 {
font-size: 1.1333em !important;
margin: 1em 0 0 0;
margin: 10px 0 0 0;
}
/* attachment files */
#postlist .attachments th {
padding: .25em .5em;
padding: 3px 5px;
font-size: 1em;
border: 0;
}
#postlist .attachments td {
padding: .25em .5em;
}
.attachments .unselect {
font-size: .9167em;
}
......
......@@ -8,8 +8,8 @@
<a class="btn" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
</div>
<p>{clean_html($blog->get('description'))|safe}</p>
{if $blog->get('tags')}<p class="tags"><label>{str tag=tags}:</label> {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}</p>{/if}
<div id="blogdescription"><p>{clean_html($blog->get('description'))|safe}</p>
{if $blog->get('tags')}<p class="tags s"><label>{str tag=tags}:</label> {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}</p>{/if}</div>
{if $posts}
<table id="postlist" class="tablerenderer fullwidth nohead">
......
<tr id="{$prefix}_edit_row"{if !$fileinfo} class="hidden"{/if}>
<tr id="{$prefix}_edit_row"{if !$fileinfo} class="hidden editrow"{/if}>
<td></td>
<td colspan="5">
<td colspan="5" class="fileedittablewrap">
<table class="fileedittable">
<tbody>
<tr>
......
......@@ -78,13 +78,6 @@
<input type="hidden" name="{$prefix}_move" id="{$prefix}_move" value="" />
<input type="hidden" name="{$prefix}_moveto" id="{$prefix}_moveto" value="" />
{/if}
{if $config.createfolder}
<div id="{$prefix}_createfolder_messages" class="createfolder-message"></div>
<div class="fr">
<input type="text" class="text" name="{$prefix}_createfolder_name" id="{$prefix}_createfolder_name" size="40" />
<input type="submit" class="submit" name="{$prefix}_createfolder" id="{$prefix}_createfolder" value="{str tag=createfolder section=artefact.file}" />
</div>
{/if}
<div id="{$prefix}_foldernav" class="foldernav">
{include file="artefact:file:form/folderpath.tpl" path=$path querybase=$querybase owner=$tabs.owner ownerid=$tabs.ownerid}
......@@ -106,5 +99,12 @@
{if $tabs}
</div>
{/if}
{if $config.createfolder}
<div id="createfolder">
<div id="{$prefix}_createfolder_messages" class="createfolder-message"></div>
<input type="text" class="text" name="{$prefix}_createfolder_name" id="{$prefix}_createfolder_name" size="40" />
<input type="submit" class="submit" name="{$prefix}_createfolder" id="{$prefix}_createfolder" value="{str tag=createfolder section=artefact.file}" />
</div>
{/if}
</div>
......@@ -19,7 +19,7 @@
<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" target="_blank" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}">{$displaytitle}</a>
</td>
<td>{$file->description}</td>
<td>
<td class="right">
<input type="submit" class="button submit s unselect" name="{$prefix}_unselect[{$file->id}]" value="{str tag=remove}" />
<input type="hidden" name="{$prefix}_selected[{$file->id}]" value="{$file->id}">
</td>
......
......@@ -16,11 +16,15 @@
.fileupload {
background: #eee;
border: 1px solid #d1d1d1;
margin-bottom: 1em;
margin-bottom: 10px;
width: 100%;
}
* html .fileupload {
width: 98%;
}
.fileupload th {
text-align: left;
padding-left: 1em;
padding-left: 10px !important;
}
.fileupload th label,
.uploadform th label {
......@@ -31,13 +35,13 @@
font-size: .9167em;
line-height: 1.3333em;
}
.fileupload td#files_filebrowser_upload_messages,
.fileupload td#editpost_filebrowser_upload_messages {
padding: 0;
}
.createfolder-message div {
margin-bottom: .5em;
margin-bottom: 3px;
}
#createfolder {
background-color: #E7E7E7;
padding: 3px 5px;
}
/* folder nav */
......@@ -45,12 +49,12 @@
font-weight: bold;
padding: 0 0 0 20px;
font-size: 1.3333em;
background: url(../images/foldernav_small.png) no-repeat left;
background: url(../images/foldernav_small.png) no-repeat top;
}
form#files .foldernav {
padding: 0 0 0 30px;
font-size: 1.3333em;
background: url(../images/foldernav.png) no-repeat left;
background: url(../images/foldernav.png) no-repeat left top;
}
/* File list */
......@@ -64,9 +68,11 @@ form#files .foldernav {
.filelist table th {
border-bottom: 0;
}
.filelist td.right {
padding-top: 5px;
}
.filelist td.right input {
font-size: .9167em;
font-family: Arial, Helvetica, sans-serif;
}
.filelist td.right input.btn-big-del {
font-size: 1%;
......@@ -103,11 +109,15 @@ tr.folderhover a {
cursor: move;
}
/* File list edit box */
#files_filebrowser_edit_row td.fileedittablewrap {
padding: 0;
}
#files_filebrowser_edit_row #files_filebrowser_edit_heading {
font-size: 1.3333em;
}
#files_filebrowser_edit_row table th {
border: 0;
text-align: left;
}
#files_filebrowser_edit_row table th label {
font-weight: bold;
......@@ -118,11 +128,11 @@ tr.folderhover a {
/* Edit post File list */
#editpost_filebrowser_upload_container {
margin-top: 1em;
margin-top: 10px;
}
#editpost_filebrowser_upload_browse,
#editpost_filebrowser_open_upload_browse_container {
padding: 1em;
padding: 10px;
border-top: 1px solid #eee;
border-right: 1px solid #eee;
border-bottom: 4px solid #eee;
......
......@@ -23,7 +23,7 @@ input#myfriends_addfriend_add {
#email_list a {
color: #ca0000;
text-decoration: none;
margin-left: .5em;
margin-left: 5px;
}
#profileform_email_container a {
font-size: .9167em;
......
......@@ -2,9 +2,9 @@
<tr class="{cycle values='r0,r1'}">
<td>
<div class="fr planstatus">
<a class="icon btn-manage" href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{str tag="managetasks" section="artefact.plans"}</a>
<a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" class="icon btn-big-edit" title="{str tag="edit"}" ></a>
<a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" class="icon btn-big-del" title="{str tag="delete"}"></a>
<a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}"><img src="{theme_url filename='images/manage.gif'}" alt="{str tag=managetasks}"></a>
<a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" title="{str tag="edit"}" ><img src="{theme_url filename='images/edit.gif'}" alt="{str tag=edit}"></a>
<a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" title="{str tag="delete"}"><img src="{theme_url filename='images/icon_close.gif'}" alt="{str tag=delete}"></a>
</div>
<h3><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{$plan->title}</a></h3>
......
......@@ -25,7 +25,7 @@ th.planscontrols {
#planswrap table th {
text-align: left;
padding: 0.25em;
padding: 3px;
}
#planswrap table td div.completed {
......@@ -35,7 +35,7 @@ th.planscontrols {
}
#container #planswrap table td.errmsg {
padding-left: 2em;
padding-left: 20px;
}
fieldset legend.plansh3 a {
......@@ -48,5 +48,5 @@ ul.planslist {
}
ul.planslist li {
list-style: none;
margin: 0 0 0.25em;
margin: 0 0 3px 0;
}
......@@ -719,8 +719,8 @@ EOF;
global $THEME;
$editstr = get_string('edit');
$delstr = get_string('delete');
$imagemoveblockup = json_encode($THEME->get_url('images/move-block-up.png'));
$imagemoveblockdown = json_encode($THEME->get_url('images/move-block-down.png'));
$imagemoveblockup = json_encode($THEME->get_url('images/move-up.gif'));
$imagemoveblockdown = json_encode($THEME->get_url('images/move-down.gif'));
$upstr = get_string('moveup', 'artefact.resume');
$downstr = get_string('movedown', 'artefact.resume');
......@@ -748,7 +748,7 @@ EOF;
buttons.push(up);
}
if (!r._last) {
var down = A({'href': ''}, IMG({'src': {$imagemoveblockdown}, 'alt':'{$downstr}'}));
var down = A({'href': '', 'class':'movedown'}, IMG({'src': {$imagemoveblockdown}, 'alt':'{$downstr}'}));
connect(down, 'onclick', function (e) {
e.stop();
return moveComposite(d.type, r.id, r.artefact, 'down');
......@@ -756,7 +756,7 @@ EOF;
buttons.push(' ');
buttons.push(down);
}
return TD({'style':'text-align:center;'}, buttons);
return TD({'class':'movebuttons'}, buttons);
},
function (r, d) {
var editlink = A({'href': 'editcomposite.php?id=' + r.id + '&artefact=' + r.artefact, 'title': '{$editstr}'}, IMG({'src': config.theme['images/edit.gif'], 'alt':'{$editstr}'}));
......@@ -765,7 +765,7 @@ EOF;
e.stop();
return deleteComposite(d.type, r.id, r.artefact);
});
return TD(null, editlink, ' ', dellink);
return TD({'class':'right'}, null, editlink, ' ', dellink);
}
]
);
......
......@@ -18,7 +18,7 @@
</thead>
<tbody>
{foreach from=$rows item=row}
<tr class="{cycle values='r0,r0,r1,r1'} expandable-head">
<tr class="{cycle values='r0,r0,r1,r1'} expandable-head">
<td class="toggle">{$row->startdate}</td>
<td>{$row->enddate}</td>
<td>{$row->jobtitle}: {$row->employer}</td>
......
......@@ -5,11 +5,14 @@
* This file is distributed under the same terms as Mahara itself
*/
.tablerenderer th.resumecontrols {
width:50px; !important;
width: 35px !important;
}
.tablerenderer th.resumecontrols .movebuttons {
width: 35px !important;
}
.tablerenderer th.resumedate {
width:100px; !important;
width: 100px !important;
}
#resumewrap table {
width: 100%;
......@@ -19,17 +22,17 @@
}
#resumewrap table tr#coverletter_save_container td,
#resumewrap table tr#interests_save_container td {
padding-top: .5em;
padding-top: 5px;
}
#resumewrap table.resumecomposite {
margin-bottom: .5em;
margin-bottom: 5px;
}
#resumewrap table.resumecomposite .btn-edit,
#resumewrap table.resumecomposite .btn-del {
font-size: .9167em;
}
#resumewrap table.resumecomposite td {
padding: .25em .5em;
padding: 3px 5px;
}
#resumewrap table.mceLayout {
width: 570px !important;
......@@ -53,7 +56,7 @@
#addbook th,
#addmembership th {
text-align: left;
padding: 0.25em;
padding: 3px;
}
#resumewrap #addemploymenthistory table td,
......@@ -65,7 +68,7 @@
#resumewrap form .resumecontactinfo tbody th,
#personalinformation table table td,
#personalinformation table table tbody th {
padding: 0.25em;
padding: 3px;
}
#resumewrap table table {
width: auto;
......@@ -74,7 +77,7 @@
margin: 0;
}
#container #resumewrap table td.errmsg {
padding-left: 2em;
padding-left: 20px;
}
fieldset legend.resumeh3 a {
background: none;
......@@ -91,5 +94,5 @@ fieldset legend.resumeh3 a {
#goalform .mceEditor .mceLayout,
#skillform .mceEditor .mceLayout {
margin-bottom: 1em;
margin-bottom: 10px;
}
......@@ -77,7 +77,6 @@ h6 {
.listing div h3 a:visited,
.listing div h3 a:link {
color: #186194 !important;
text-decoration: underline;
}
.main-column table h3 a:hover,
.listing div h3 a:hover {
......@@ -278,7 +277,7 @@ input#files_filebrowser_edit_artefact:active {
/**************** TOP NAVIGATION ****************/
#right-nav ul {
margin: .5em 0;
margin: 5px 0;
}
#main-nav li {
color: #e6c560;
......@@ -327,7 +326,7 @@ input#files_filebrowser_edit_artefact:active {
border: none;
}
#sub-nav ul {
padding: 0 0 0 .5em;
padding: 0 0 0 5px;
background: none;
}
#sub-nav li a,
......@@ -456,7 +455,7 @@ div.sideblock h3 a:hover {
/* Side Search */
.sidebar #selfsearch input {
width: 186px;
padding: .25em .5em;
padding: 3px 5px;
font-size: 1em;
color: #767676;
background-color: #ecf3d4;
......@@ -548,16 +547,11 @@ div.sideblock h3 a:hover {
* html #collectionviews {
width: 96%;
}
#collectionviews td {
vertical-align: middle;
#collectionviews td.displayordercontrols div {
padding-top: 5px;
}
#collectionviews td label {
font-size: 1em;
font-weight: bold;
}
#collectionviews td div {
text-align: center;
#collectionviews td.displayordercontrols div.justdown {
padding-left: 19px;
}
.inbox-message {
......
......@@ -7,8 +7,8 @@
/* Installer/upgrader */
#gpl-terms {
margin: 1em auto;
width: 30em;
margin: 10px auto;
width: 350px;
}
#jsrequiredforupgrade {
color: #f00;
......@@ -18,7 +18,7 @@
width: 90%;
}
#installer tr {
height: 2em;
height: 20px;
}
#installer th {
vertical-align: middle;
......@@ -30,7 +30,7 @@
#finished {
font-size: 1.6667em;
font-weight: bold;
margin-top: 1em;
margin-top: 10px;
text-align: center;
visibility: hidden;
}
......@@ -62,10 +62,10 @@
border: 1px solid #e98a88;
background: #fbeceb;
text-align: left;
padding: 1em 1.5em;
padding: 10px 15px;
width: 24%;
float: left;
margin: 0 0 0 1em;
margin: 0 0 0 10px;
min-height: 160px;
}
#close-site h3 {
......@@ -73,15 +73,15 @@
}
#close_site {
margin-top: .5em;
margin-top: 5px;
}
/* register site box */
#register-site {
text-align: left;
padding: 1em 1.5em;
margin: 0 1em 1em 0;
padding: 10px 15px;
margin: 0 10px 10px 0;
float: left;
width: 35%;
min-height: 160px;
......@@ -98,19 +98,19 @@
}
#register-site table {
margin-left: 0;
margin-top: 1em;
margin-top: 10px;
width: 100%;
}
#register-site table th {
text-align: left;
padding: .5em 0.5em;
padding: 5px;
width: 140px;
}
#register-site table td {
padding: 0 1em 0 0;
padding: 0 10px 0 0;
}
#register-site table table {
margin-left: .75em;
margin-left: 8px;
margin-top: 0;
width: 100%;
}
......@@ -118,7 +118,7 @@
margin: 0;
}
#register-site table fieldset table td {
padding: 0 0 0 1.5em;
padding: 0 0 0 15px;
}
#register-site table fieldset table table th {
border-bottom: 1px solid #ccc;
......@@ -126,7 +126,7 @@
}
#register-site table fieldset table table td {
border-bottom: 1px solid #eee;
padding: 0 .5em;
padding: 0 5px;
background: #fefefe;
}
#register-site fieldset legend a {
......@@ -137,18 +137,18 @@
}
#register_register_container td {
float: left;
margin-left: .5em;
margin-left:5px;
}
input#register_register {
* margin-bottom: 1em;
* margin-bottom: 10px;
}
/* run upgrade box */
#runupgrade {
padding: 1em 1.5em;
padding: 10px 15px;
background: #f6f6f6;
border: 1px solid #ddd;
margin: 0 0 1em 0;
margin: 0 0 10px 0;
float: left;
}
#runupgrade h4 {
......@@ -161,7 +161,7 @@ input#register_register {
width: 100%;
}
#upgradestable th {
padding: .5em .5em .25em .5em;
padding: 5px 5px 3px 5px;
text-align: left;
border-bottom: 1px solid #ccc;
}
......@@ -171,8 +171,8 @@ input#register_register {
}
#site-stats {
margin: 0 0 1em 0;
padding: 1em 1.5em;
margin: 0 0 10px 0;
padding: 10px 15px;
text-align: left;
float: left;
width: 25%;
......@@ -185,10 +185,10 @@ input#register_register {
#site-stats p:first-child,
#site-stats p:last-child,
#site-stats p {
margin: .1em;
margin: 1px;
}
#site-stats-graph {