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

Update themes

parent ef083da0
......@@ -172,7 +172,6 @@ $deleteall = pieform(array(
'type' => 'submit',
'value' => get_string('deleteallnotifications', 'activity'),
'confirm' => get_string('reallydeleteallnotifications', 'activity'),
'class' => 'btn-del',
),
),
));
......
......@@ -87,9 +87,9 @@ function displaymenuitems(itemlist) {
// Creates one table row
function formatrow (item) {
// item has id, type, name, link, linkedto
var del = INPUT({'type':'button','class':'button','value':{$getstring['delete']}});
var del = INPUT({'type':'button','class':'s icon btn-del','value':{$getstring['delete']}});
connect(del, 'onclick', function () { delitem(item.id); });
var edit = INPUT({'type':'button','class':'button','value':{$getstring['edit']}});
var edit = INPUT({'type':'button','class':'s icon btn-edit','value':{$getstring['edit']}});
connect(edit, 'onclick', function () { edititem(item); });
var cells = map(
partial(TD,null),
......
......@@ -768,7 +768,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
'help' => true,
),
'submit' => array(
'class' => 'delete',
'class' => 'icon btn-del',
'type' => 'submit',
'value' => get_string('delete', 'artefact.blog'),
'confirm' => get_string('deleteblogpost?', 'artefact.blog'),
......
......@@ -8,10 +8,10 @@
<base target="_self" />
</head>
<body id="image" style="display: none">
<form onsubmit="ImageDialog.update();return false;" action="#">
<form onSubmit="ImageDialog.update();return false;" action="#">
<div class="tabs">
<ul>
<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{str tag=insertimage section=artefact.blog}</a></span></li>
<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onMouseDown="return false;">{str tag=insertimage section=artefact.blog}</a></span></li>
</ul>
</div>
......@@ -67,11 +67,11 @@
<div class="mceActionPanel">
<div style="float: left">
<input type="button" id="insert" name="insert" value="{str section=artefact.blog tag=insert}" onclick="ImageDialog.update();return false;" />
<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">
<input type="button" id="cancel" name="cancel" value="{str section=artefact.blog tag=cancel}" onclick="tinyMCEPopup.close();" />
<input type="button" id="cancel" class="cancel" name="cancel" value="{str section=artefact.blog tag=cancel}" onClick="tinyMCEPopup.close();" />
</div>
</div>
</form>
......
......@@ -15,7 +15,7 @@
{else}
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/blog/post.php">
<input type="hidden" name="id" value="{$post->id}">
<input type="submit" class="edit submit" value="{str tag=edit section=artefact.blog}">
<input type="submit" class="icon btn-edit" value="{str tag=edit section=artefact.blog}">
</form>
{$post->delete|safe}
{/if}
......
......@@ -21,33 +21,18 @@
#postlist th {
border-bottom: 1px dotted #d1d1d1;
font-size: 1em;
padding: .5em 0 .25em 0;
padding: 1em 0 .25em 0;
vertical-align: bottom;
}
#postlist th.posttitle {
font-size: 1.8em;
}
#postlist th.controls {
font-weight: normal;
text-align: right;
}
#postlist input.delete {
font-size: .9167em;
background: url(../images/icon-delete.gif) no-repeat left center;
border: 0;
padding-left: 8px;
* padding-left: 6px;
cursor: pointer;
color: #333;
text-align: right;
}
#postlist input.publish,
#postlist input.edit {
font-size: .9167em;
background: url(../images/icon-edit.gif) no-repeat left center;
border: 0;
padding-left: 8px;
cursor: pointer;
color: #333;
#postlist th.controls input {
margin-left: .5em;
}
#postlist th form,
#postlist th form div {
......
......@@ -554,7 +554,7 @@ class ArtefactTypeComment extends ArtefactType {
'comment' => array('type' => 'hidden', 'value' => $id),
'submit' => array(
'type' => 'submit',
'class' => 'quiet btn-del',
'class' => 'quiet',
'name' => 'delete_comment_submit',
'value' => get_string('delete'),
'confirm' => get_string('reallydeletethiscomment', 'artefact.comment'),
......
......@@ -5,7 +5,7 @@
<span class="details">{str tag=commentremoved section=artefact.comment}</span>
{else}
{$item->description|safe|clean_html}
{if $item->attachmessage}<div>{$item->attachmessage}</div>{/if}
{if $item->attachmessage}<div class="attachmessage">{$item->attachmessage}</div>{/if}
{/if}
<div class="details">
<div class="fr">
......@@ -16,22 +16,22 @@
<div class="icon"><a href="{$WWWROOT}user/view.php?id={$item->author->id}">
<img src="{profile_icon_url user=$item->author maxheight=20 maxwidth=20}" valign="middle" alt="{$item->author|display_name|escape}">
</a></div>
<a href="{$WWWROOT}user/view.php?id={$item->author->id}">{$item->author|display_name|escape}</a>
<a href="{$WWWROOT}user/view.php?id={$item->author->id}" class="username">{$item->author|display_name|escape}</a>
{else}
{$item->authorname}
{/if}
{if $item->deletedmessage}
| {$item->deletedmessage}
| <span>{$item->deletedmessage}</span>
{else}
| {$item->date}
{if $item->pubmessage} | {$item->pubmessage}{/if}
{if $item->makepublicrequested} | {str tag=youhaverequestedpublic section=artefact.comment}{/if}
| <span class="date">{$item->date}</span>
{if $item->pubmessage} | <span>{$item->pubmessage}</span>{/if}
{if $item->makepublicrequested} | <span>{str tag=youhaverequestedpublic section=artefact.comment}</span>{/if}
{strip}
{foreach $item->attachments item=a name=attachments}
{if $.foreach.attachments.first} | {str tag=Attachments section=artefact.comment}:{else},{/if} <a href="{$WWWROOT}artefact/file/download.php?file={$a->attachid}">{$a->attachtitle}</a> ({$a->attachsize})
{if $.foreach.attachments.first} | <span>{str tag=Attachments section=artefact.comment}:{else},{/if} <a href="{$WWWROOT}artefact/file/download.php?file={$a->attachid}">{$a->attachtitle}</a> ({$a->attachsize})</span>
{/foreach}
{/strip}
{if $item->canedit} | <a href="{$WWWROOT}artefact/comment/edit.php?id={$item->id}&view={$viewid}">{str tag=edit}</a>{/if}
{if $item->canedit} | <span><a href="{$WWWROOT}artefact/comment/edit.php?id={$item->id}&view={$viewid}">{str tag=edit}</a></span>{/if}
{/if}
</div>
</td>
......
<tr id="{$prefix}_edit_row"{if !$fileinfo} class="hidden"{/if}>
<td colspan=6>
<td colspan="6">
<table>
<tbody>
<tr>
<th colspan=2 id="{$prefix}_edit_heading">
<th colspan="2" id="{$prefix}_edit_heading">
{if $fileinfo}{if $fileinfo->artefacttype == 'folder'}{str tag=editfolder section=artefact.file}{else}{str tag=editfile section=artefact.file}{/if}{/if}
</th>
</tr>
......@@ -18,7 +18,7 @@
<tr>
<th><label>{str tag=tags}</label></th>
<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}" />
<span>{contextualhelp plugintype='artefact' pluginname='file' section='tags'}</span>
</td>
</tr>
......@@ -52,9 +52,9 @@
</tr>
{/if}
<tr>
<td colspan=2>
<td colspan="2">
<input type="submit" name="{$prefix}_update[{$fileinfo->id}]" id="{$prefix}_edit_artefact" value="{str tag=savechanges section=artefact.file}" />
<input type="submit" class="button" 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>
</tr>
<tr><td colspan=2 id="{$prefix}_edit_messages"></td></tr>
......
......@@ -65,8 +65,8 @@
{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}
<span class="s dull">{str tag=Submitted section=view}</span>
{elseif !isset($file->can_edit) || $file->can_edit !== 0}<input type="submit" class="submit btn-edit s" name="{$prefix}_edit[{$file->id}]" value="{str tag=edit}" />
<input type="submit" class="submit btn-del s" name="{$prefix}_delete[{$file->id}]" value="{str tag=delete}" />{/if}
{elseif !isset($file->can_edit) || $file->can_edit !== 0}<input type="submit" class="icon btn-edit s" name="{$prefix}_edit[{$file->id}]" value="{str tag=edit}" />
<input type="submit" class="icon btn-del s" name="{$prefix}_delete[{$file->id}]" value="{str tag=delete}" />{/if}
{/if}
{if $selectable && ($file->artefacttype != 'folder' || $selectfolders) && $publishable && !$file->isparent}
<input type="submit" class="select small" name="{$prefix}_select[{$file->id}]" id="{$prefix}_select_{$file->id}" value="{str tag=select}" />
......
......@@ -63,23 +63,7 @@ form#files .foldernav {
}
.filelist td.right input {
font-size: .9167em;
}
.filelist td.right input.btn-edit {
font-size: .9167em;
background: transparent url(../images/icon-edit.gif) no-repeat left center;
border: 0;
padding-left: 8px;
cursor: pointer;
color: #333;
}
.filelist td.right input.btn-del {
font-size: .9167em;
background: transparent url(../images/icon-delete.gif) no-repeat left center;
border: 0;
padding-left: 8px;
* padding-left: 10px;
cursor: pointer;
color: #333;
margin-left: .5em;
}
/* parent folder row */
tr.parentfolder td {
......
......@@ -3,8 +3,8 @@
<td>
<div class="fr">
<ul class="groupuserstatus">
<li><a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" class="btn-edit">{str tag="edit"}</a></li>
<li><a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" class="btn-del">{str tag="delete"}</a></li>
<li><a href="{$WWWROOT}artefact/plans/edit/index.php?id={$plan->id}" class="icon btn-edit">{str tag="edit"}</a></li>
<li><a href="{$WWWROOT}artefact/plans/delete/index.php?id={$plan->id}" class="icon btn-del">{str tag="delete"}</a></li>
</ul>
</div>
......@@ -13,9 +13,9 @@
<div class="codesc">{$plan->description}</div>
<div class="fl">
<ul class="planslist">
<li><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{str tag="managetasks" section="artefact.plans"}</a></li>
<li><a class="icon btn-manage" href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{str tag="managetasks" section="artefact.plans"}</a></li>
</ul>
</td>
</div>
</td>
</tr>
{/foreach}
......@@ -5,7 +5,7 @@
* This file is distributed under the same terms as Mahara itself
*/
th.planscontrols {
width:50px; !important;
width: 50px; !important;
}
#planswrap table {
......@@ -13,8 +13,9 @@ th.planscontrols {
}
#planswrap table tr.incomplete {
background: #FFD3D9;
background: #f5e8e9;
color: #DD0221;
border-top: 1px solid #FFF;
}
#planswrap table td {
......@@ -27,9 +28,9 @@ th.planscontrols {
}
#planswrap table td div.completed {
margin:3px;
margin: 3px;
text-align:center;
width:60px;
width: 60px;
}
#container #planswrap table td.errmsg {
......@@ -40,3 +41,11 @@ fieldset legend.plansh3 a {
background: none;
padding: 0;
}
ul.planslist {
margin: 0;
}
ul.planslist li {
list-style: none;
margin: 0 0 0.25em;
}
......@@ -6,8 +6,8 @@
<td class="c2">{$task->title}</td>
<td class="c3">{$task->description}</td>
<td class="c4">&nbsp;</td>
<td class="c5"><a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}">{str tag=edit}</a></td>
<td class="c6"><a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}">{str tag=delete}</a></td>
<td class="c5 s"><a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" class="icon btn-edit">{str tag=edit}</a></td>
<td class="c6 s"><a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" class="icon btn-del">{str tag=delete}</a></td>
</tr>
{else}
<tr class="{cycle values='r0,r1'}">
......@@ -19,8 +19,8 @@
{else}
<td class="c4">&nbsp;</td>
{/if}
<td class="c5"><a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}">Edit</a></td>
<td class="c6"><a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}">Delete</a></td>
<td class="c5 s"><a href="{$WWWROOT}artefact/plans/edit/task.php?id={$task->task}" class="icon btn-edit">Edit</a></td>
<td class="c6 s"><a href="{$WWWROOT}artefact/plans/delete/task.php?id={$task->task}" class="icon btn-del">Delete</a></td>
</tr>
{/if}
{/foreach}
......
......@@ -31,7 +31,7 @@
{if $controls}
<div>
<div id="employmenthistoryform" class="hidden">{$compositeforms.employmenthistory|safe}</div>
<button id="addemploymenthistorybutton" class="cancel" onclick="toggleCompositeForm('employmenthistory');">{str tag='add'}</button>
<button id="addemploymenthistorybutton" class="submit" onclick="toggleCompositeForm('employmenthistory');">{str tag='add'}</button>
</div>
{/if}
</fieldset>
......@@ -17,6 +17,19 @@
#resumewrap table td {
padding: 0;
}
#resumewrap table.resumecomposite {
margin-bottom: .5em;
}
#resumewrap table.resumecomposite td {
padding: .25em .5em;
}
#resumewrap table.mceLayout {
width: 570px !important;
}
#resumewrap #goalform table.mceLayout,
#resumewrap #skillform table.mceLayout {
width: 490px !important;
}
#addemploymenthistory table,
#addeducationhistory table,
......
{if !$items}
{str tag=nomessages section=blocktype.inbox}
{else}
<table>
<table id="inboxblock" class="fullwidth">
{foreach from=$items item=i}
<tr>
<tr class="{cycle values='r0,r1'}">
<td class="icon-container">
<div class="icon">
<img src="{theme_url filename=cat('images/' $i->type '.gif')}" />
......@@ -13,7 +13,7 @@
{if $i->message}
<a href="" class="inbox-showmessage{if !$i->read} unread{/if}">{$i->subject}</a>
<div class="inbox-message hidden" id="inbox-message-{$i->id}">{$i->message|safe}
{if $i->url}<br><a href="{$i->url}" class="s">{if $i->urltext}{$i->urltext} &raquo;{else}{str tag="more..."}{/if}</a>{/if}
{if $i->url}<br><a href="{$i->url}">{if $i->urltext}{$i->urltext} &raquo;{else}{str tag="more..."}{/if}</a>{/if}
</div>
{elseif $i->url}
<a href="{$i->url}">{$i->subject}</a>
......@@ -25,7 +25,7 @@
{/foreach}
</table>
{if $desiredtypes}
<a href="{$WWWROOT}account/activity?type={$desiredtypes}">{str tag=More section=blocktype.inbox} &raquo;</a>
<a class="morelink" href="{$WWWROOT}account/activity?type={$desiredtypes}">{str tag=More section=blocktype.inbox} &raquo;</a>
{/if}
<script>
{literal}
......
......@@ -8,10 +8,10 @@
<div>{$item->description|str_shorten_html:100:true|safe}</div>
{/if}
{if $item->tags}
<div class="tags"><strong>{str tag=tags}:</strong> {list_tags owner=$item->owner tags=$item->tags}</div>
<div class="tags s"><strong>{str tag=tags}:</strong> {list_tags owner=$item->owner tags=$item->tags}</div>
{/if}
{if $item->artefacts}
<div>
<div class="artefacts s">
<strong>{str tag="artefacts" section="view"}:</strong>
{foreach from=$item->artefacts item=artefact name=artefacts}<a href="{$WWWROOT}view/artefact.php?artefact={$artefact.id}&amp;view={$item->id}" class="link-artefacts">{$artefact.title}</a>{if !$.foreach.artefacts.last}, {/if}{/foreach}
</div>
......
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