Commit 3f5f517e authored by Hugh Davenport's avatar Hugh Davenport Committed by Gerrit Code Review
Browse files

Merge changes...

Merge changes I0deed72e,I74e6de26,Ibea53451,I3d7b5040,I9206f63a,Ie51b967b,I8a666c9c,I27a2cc89,Ibd937026,Icdbd6050,I2783e73e

* changes:
  Responsive Design - hide 'Print' and disable 'Export' functionality
  interaction/forum: Theme update
  Theme update for blocktypes
  artefact/comment: Theme update
  artefact/resume: Theme update
  artefact/plans: Theme update
  artefact/internal: Theme update
  artefact/file: Theme update
  artefact/blog: Theme update
  theme/ultima: Theme update
  theme/sunset: Theme update
parents a3c359b3 f8c7d135
{foreach from=$blogs->data item=blog}
{foreach from=$blogs->data item=blog}
<tr class="{cycle name=rows values='r0,r1'}">
<td>
<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="valign"><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="valign s"><a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn">{str tag=addpost section=artefact.blog}</a></td>
<td class="valign 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}" title="{str tag=settings}"><img src="{theme_url filename='images/manage.gif'}" alt="{str tag=settings}"></a>
{$blog->deleteform|safe}
{/if}
</td>
<td colspan="2">
<div class="fr">
<span class="entries"><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></span>
<span class="newentry"><a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn">{str tag=addpost section=artefact.blog}</a></span>
<span class="btns2">
{if $blog->locked}
<span class="s dull">{str tag=submittedforassessment section=view}</span>
{else}
<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>
{$blog->deleteform|safe}
{/if}
</span>
</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>
</tr>
{/foreach}
{/foreach}
{foreach from=$posts item=post}
<tr id="posttitle_{$post->id}">
<th class="posttitle">{$post->title}</th>
<th id="poststatus{$post->id}" class="poststatus">
{if $post->published}
{str tag=published section=artefact.blog}
{else}
{str tag=draft section=artefact.blog}
{/if}
</th>
<th id="changepoststatus{$post->id}" class="changepoststatus">
{if !$post->locked}
{$post->changepoststatus|safe}
{/if}
</th>
<th class="controls">
{if $post->locked}
{str tag=submittedforassessment section=view}
{else}
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/blog/post.php">
<input type="hidden" name="id" value="{$post->id}">
<input type="image" src="{theme_url filename="images/edit.gif"}" title="{str tag=edit}">
</form>
{$post->delete|safe}
{/if}
</th>
</tr>
<tr id="postdescription_{$post->id}">
<td colspan=4>{$post->description|clean_html|safe}</td>
</tr>
{if $post->files}
<tr id="postfiles_{$post->id}">
<td colspan=3>
<table class="attachments fullwidth">
<col width="5%">
<col width="40%">
<col width="55%">
<tbody>
<tr><th colspan=3>{str tag=attachedfiles section=artefact.blog}</th></tr>
{foreach from=$post->files item=file}
<tr class="{cycle values='r1,r0'}">
<td><img src="{$file->icon}" alt=""></td>
<td class="valign"><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}">{$file->title}</a></td>
<td class="valign">{$file->description}</td>
</tr>
{/foreach}
</tbody>
</table>
</td>
</tr>
{/if}
<tr id="postdetails_{$post->id}"><td colspan=2 class="postdetails">{str tag=postedon section=artefact.blog} {$post->ctime}</td></tr>
{/foreach}
\ No newline at end of file
<div id="posttitle_{$post->id}" class="{if $post->published}published{else}draft{/if}">
<div class="fr">
<span id="poststatus{$post->id}" class="poststatus">
{if $post->published}
{str tag=published section=artefact.blog}
{else}
{str tag=draft section=artefact.blog}
{/if}
</span>
<span id="changepoststatus{$post->id}" class="changepoststatus">
{if !$post->locked}
{$post->changepoststatus|safe}
{/if}
</span>
<span class="controls">
{if $post->locked}
{str tag=submittedforassessment section=view}
{else}
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/blog/post.php">
<input type="hidden" name="id" value="{$post->id}">
<input type="image" src="{theme_url filename="images/edit.gif"}" title="{str tag=edit}">
</form>
{$post->delete|safe}
{/if}
</span>
</div>
<h1 class="posttitle">{$post->title}</h1>
<div id="postdescription_{$post->id}" class="postdescription">
{$post->description|clean_html|safe}
</div>
{if $post->files}
<div id="postfiles_{$post->id}">
<table class="attachments fullwidth">
<col width="5%">
<col width="40%">
<col width="55%">
<tbody>
<tr><th colspan=3>{str tag=attachedfiles section=artefact.blog}</th></tr>
{foreach from=$post->files item=file}
<tr class="{cycle values='r1,r0'}">
<td><img src="{$file->icon}" alt=""></td>
<td class="valign"><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}">{$file->title}</a></td>
<td class="valign">{$file->description}</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
{/if}
<div id="postdetails_{$post->id}" class="postdetails">
{str tag=postedon section=artefact.blog} {$post->ctime}
</div>
</div>
{/foreach}
/**
* CSS rules for the blog artefact plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* Copyright (C) 2006-2012 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* Blog list */
/*#bloglist .right a {
font-size: .9167em;
margin-left: 1em;
}*/
#bloglist td .addicon {
margin: 0;
}
#bloglist h4 {
margin: 0;
margin: 0 0 3px 0;
}
#bloglist #blogdesc p {
margin: 0;
font-size: .9167em;
line-height: 1.25em;
}
#blogdescription {
margin: 0 0 10px 0;
}
#blogdescription p {
margin: 0;
}
td a.btn-add{
margin-left:10px;
margin-right:10px;
margin: 5px 0 0 0;
}
td a.btn {
white-space: nowrap;
#bloglist .buttonscell form, #bloglist .buttonscell form div, #postlist form, #postlist form div {
display: inline;
vertical-align: top;
}
/* Post list */
#postlist th {
border-bottom: 1px dotted #d1d1d1;
font-size: 1em;
padding: 15px 5px 3px 5px;
vertical-align: bottom;
}
#postlist th.posttitle {
font-size: 1.8em;
line-height: 1.1667em;
}
#postlist th.poststatus {
color: #888;
#postlist .poststatus {
font-weight: bold;
font-style: italic;
white-space: nowrap;
margin: 1px 10px 0 10px;
display: block;
float: left;
}
#postlist th.poststatus input {
#postlist .changepoststatus {
font-size: .9167em;
vertical-align: top;
}
#postlist th.controls {
text-align: right;
#postlist .changepoststatus input {
padding: 0 3px;
height: 16px;
}
#postlist th.controls .btn-big-del {
background:url("../images/delete.gif") no-repeat scroll left center transparent;
border:0 none;
color:#FFFFFF;
cursor:pointer;
font-size:1%;
height:16px;
margin-left: 5px;
padding-left:0;
width:16px;
#postlist .published {
padding: 10px;
margin-bottom: 15px;
}
#postlist th.controls span.btn-big-del {
padding-bottom: 6px;
#postlist .draft {
padding: 10px;
margin-bottom: 15px;
}
#bloglist td.buttonscell form,
#bloglist td.buttonscell form div,
#postlist th form,
#postlist th form div {
display: inline;
#postlist .postdescription h1, #postlist .postdescription h2, #postlist .postdescription h3, #postlist .postdescription h4, #postlist .postdescription h5, #postlist .postdescription h6 {
margin: 5px 0 0 0;
}
#postlist p {
margin: 0 0 10px 0;
#postlist .postdescription p {
margin: 5px 0 15px 0;
}
#postlist td.postdetails {
#postlist .postdetails {
font-size: .9167em;
color: #888;
padding-bottom: 10px;
}
#postlist td h1,
#postlist td h2 {
font-size: 1.3333em !important;
margin: 10px 0 0 0;
padding-top: 5px;
}
#postlist td h3,
#postlist td h4 {
font-size: 1.1333em !important;
margin: 10px 0 0 0;
}
/* attachment files */
#postlist .attachments th {
padding: 3px 5px;
font-size: 1em;
border: 0;
}
.attachments .unselect {
.attachments input.unselect, .filebrowser input.unselect {
font-size: .9167em;
}
/* Insert Image Dialog */
#img_src[disabled=""] {
background-color: #F0F0EE;
}
background-color: #F0F0EE;
}
\ No newline at end of file
......@@ -12,11 +12,9 @@
{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">
<tbody>
<div id="postlist">
{$posts.tablerows|safe}
</tbody>
</table>
</div>
<div id="blogpost_page_container" class="hidden">{$posts.pagination|safe}</div>
<script>
addLoadEvent(function() {literal}{{/literal}
......
{foreach from=$data item=item}
<tr class="{cycle name=rows values='r0,r1'}{if $item->highlight} highlight{/if}">
<td>
<div class="fr">
{if $item->canedit}
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/comment/edit.php">
<input type="hidden" name="id" value="{$item->id}">
<input type="hidden" name="view" value="{$viewid}">
<input type="image" src="{theme_url filename="images/edit.gif"}" title="{str tag=edit}">
</form>
{/if}
{if $item->deleteform}{$item->deleteform|safe}{/if}
</div>
<div class="details commentleft">
{if $item->author}
<div class="icon"><a href="{$item->author->profileurl}">
......@@ -21,14 +11,21 @@
{$item->authorname}
{/if}
</div>
{if $item->deletedmessage}
<div class="commentright">
<div class="commentrightwrap">
<div class="fr">
{if $item->makepublicform}<div class="makepublicbtn">{$item->makepublicform|safe}</div>{/if}
{if $item->canedit}
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/comment/edit.php">
<input type="hidden" name="id" value="{$item->id}">
<input type="hidden" name="view" value="{$viewid}">
<input type="image" src="{theme_url filename="images/edit.gif"}" title="{str tag=edit}">
</form>
{/if}
{if $item->deleteform}{$item->deleteform|safe}{/if}
</div>
{if $item->deletedmessage}
<span class="details">{str tag=commentremoved section=artefact.comment}</span>
</div>
{else}
<div class="commentright">
{if $item->makepublicform}<div class="makepublicbtn">{$item->makepublicform|safe}</div>{/if}
{if $item->ratingdata}
<div class="commentrating">
{for i $item->ratingdata->min_rating $item->ratingdata->max_rating}
......@@ -42,8 +39,8 @@
{/if}
{$item->description|safe|clean_html}
{if $item->attachmessage}<div class="attachmessage">{$item->attachmessage}</div>{/if}
</div>
{/if}
</div>
<div class="undercomment">
{if $item->deletedmessage}
<span>{$item->deletedmessage} | </span>
......
......@@ -8,7 +8,7 @@
<p>
<a href="http://www.roytanck.com">Roy Tanck</a>'s Flickr Widget requires Flash Player 9 or better.</p>
</object>
<span style="font-size:9px;"><a href="http://www.roytanck.com">roytanck.com</a></span>
<span class="s"><a href="http://www.roytanck.com">roytanck.com</a></span>
</div>
{else}
{str tag=noimagesfound section=artefact.file}
......
{if $images}
<div class="slideshow" id="slideshow{$instanceid}">
<table class="images">
<table class="images fullwidth">
<tr>
<td class="control">
<span class="first hidden">&laquo;</span>
......
<div class="thumbnails">
{foreach from=$images item=image}
<span style="float:left;{if $frame} padding:0.3em;{/if}">
<span style="float:left;{if $frame} padding: 3px;{/if}">
<a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}" target="_blank">
<img src="{$image.source}" alt="{$image.title}" title="{$image.title}" width="{$width}" height="{$width}" {if $frame}class="frame"{/if}/>
</a>
</span>
{/foreach}
<div class="cb"></div>
</div>
{if isset($copyright)}<div class="cb" id="lbBottom">{$copyright|safe}</div>{/if}
<div class="thumbnails">
{foreach from=$images item=image}
<span style="float:left;{if $frame} padding:0.3em;{/if}">
<span style="float:left;{if $frame} padding: 3px;{/if}">
<a rel="{$image.slimbox2}" href="{$image.link}" title="{$image.title}" target="_blank">
<img src="{$image.source}" alt="{$image.title}" title="{$image.title}" {if $frame}class="frame"{/if} />
</a>
</span>
{/foreach}
<div class="cb"></div>
</div>
{if isset($copyright)}<div class="cb" id="lbBottom">{$copyright|safe}</div>{/if}
......@@ -96,10 +96,10 @@ var table = new TableRenderer(
[
function(rowdata) {
if (rowdata.id) {
return TD({'class': 'center', 'width': '120px'}, null, IMG({'src': '{$wwwroot}thumb.php?type=profileiconbyid&maxsize=100&id=' + rowdata.id, 'alt': rowdata.note}));
return TD({'class': 'profileiconcell'}, null, IMG({'src': '{$wwwroot}thumb.php?type=profileiconbyid&maxsize=100&id=' + rowdata.id, 'alt': rowdata.note}));
}
else {
return TD({'class': 'center', 'width': '120px'}, null, IMG({'src': '{$ravatar}', 'alt': rowdata.note}));
return TD({'class': 'profileiconcell'}, null, IMG({'src': '{$ravatar}', 'alt': rowdata.note}));
}
},
function(rowdata) {
......@@ -114,14 +114,14 @@ var table = new TableRenderer(
if (rowdata['isdefault'] == 't' || rowdata['isdefault'] == 1) {
options.checked = 'checked';
}
return TD({'class': 'left', 'width': '110px'}, INPUT(options));
return TD({'class': 'defaultcell'}, INPUT(options));
},
function(rowdata) {
if (rowdata.id) {
return TD({'class': 'left', 'width': '110px'}, INPUT({'type': 'checkbox', 'class': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
return TD({'class': 'deletecell'}, INPUT({'type': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
}
else {
return TD({'class': 'left', 'width': '110px'}, INPUT({'disabled': 'disabled', 'type': 'checkbox', 'class': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
return TD({'class': 'deletecell'}, INPUT({'disabled': 'disabled', 'type': 'checkbox', 'name': 'icons[' + rowdata.id + ']', 'value': rowdata.attachcount + ',' + rowdata.viewcount}));
}
}
]
......
/**
* CSS rules for the file artefact plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* File upload box */
#upload,
.fileupload {
background-color: #ebf0f4;
border: 0;
}
/* File list */
.filelist td.right input.btn-del {
color: #BC0909;
}
/* parent folder row */
tr.parentfolder td {
background-color: #f0f4f7 !important;
}
/* new row */
.filelist tr.highlight-file td {
background-color: #fffcd8;
}
/* folder row */
tr.folder td {
background-color: #f0f4f7 !important;
}
/* folder row being moved */
tr.folderhover td {
background-color: #daf0ff !important;
}
#createfolder {
background-color: #ebf0f4;
border: 0;
}
/**
* CSS rules for the file artefact plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* File upload box */
.fileupload {
background: #1C3740;
border: 0;
}
/* File list */
.filelist th {
border-bottom: 1px dotted #BEE3F1;
}
/* folder row */
tr.folder td {
background-color:#10171A;
}
#editpost_filebrowser_upload_browse, #editpost_filebrowser_open_upload_browse_container {
border-color: #10171A;
}
\ No newline at end of file
......@@ -69,7 +69,7 @@
<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>
<tr><td colspan="2" id="{$prefix}_edit_messages"></td></tr>
</tbody>
</table>
</td>
......
......@@ -35,53 +35,44 @@
</div>
{/if}
<table id="{$prefix}_upload_container" class="fileupload{if ($tabs && !$tabs.upload) || $uploaddisabled} hidden{/if}">
<tbody>
<div id="{$prefix}_upload_container" class="fileupload{if ($tabs && !$tabs.upload) || $uploaddisabled} hidden{/if}">
{if $config.upload}
{* config.uploadagreement: disable the file chooser unless the agreement is checked *}
{* config.simpleupload: the form only contains a file chooser *}
{* config.submitbutton: add submit button even if js is enabled & don't start uploading as soon as a file is chosen *}
<input type="hidden" name="{$prefix}_uploadnumber" id="{$prefix}_uploadnumber" value="1" />
<input type="hidden" name="MAX_FILE_SIZE" value="{$phpmaxfilesize}" />
<tr><td colspan=2 id="{$prefix}_upload_messages"></td></tr>
<div id="{$prefix}_upload_messages"></div>
{if $config.uploadagreement}
<tr id="{$prefix}_agreement" class="uploadform">
<th><label>{str tag='uploadfile' section='artefact.file'}</label></th>
<td>
<div id="{$prefix}_agreement" class="uploadform">
<label>{str tag='uploadfile' section='artefact.file'}</label>
<input type="checkbox" name="{$prefix}_notice" id="{$prefix}_notice" />
{$agreementtext|clean_html|safe}
</td>
</tr>
</div>
{/if}
<tr class="uploadform">
<th><label>{if $config.simpleupload}{str tag='uploadfile' section='artefact.file'}{else}{str tag='File' section='artefact.file'}{/if}</label></th>
<td>
<span id="{$prefix}_userfile_container"><input type="file" class="file" id="{$prefix}_userfile" name="userfile[]" multiple size="40" /></span>
<span id="{$prefix}_userfile_maxuploadsize">({str tag=maxuploadsize section=artefact.file} {$maxuploadsize})</span>
<div class="uploadform">
<label>{if $config.simpleupload}{str tag='uploadfile' section='artefact.file'}{else}{str tag='File' section='artefact.file'}{/if}</label>
<span id="{$prefix}_userfile_container"><input type="file" class="file" id="{$prefix}_userfile" name="userfile[]" multiple size="20" /></span>
<span id="{$prefix}_userfile_maxuploadsize" class="s">({str tag=maxuploadsize section=artefact.file} {$maxuploadsize})</span>
{if $config.uploadagreement}<script>setNodeAttribute('{$prefix}_userfile', 'disabled', true);</script>{/if}
</td>
</tr>
</div>
{if $config.resizeonuploaduseroption}
<tr id="{$prefix}_resizeonuploaduseroption" class="description">
<th></th>
<td>{str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight}
<div id="{$prefix}_resizeonuploaduseroption" class="description">
{str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight}
<input type="checkbox" name="{$prefix}_resizeonuploaduserenable" id="{$prefix}_resizeonuploaduserenable" {if $resizeonuploadenable && $config.resizeonuploaduserdefault}checked{/if}/>
{contextualhelp plugintype='artefact' pluginname='file' form='files_filebrowser' element='resizeonuploaduseroption'}
</td>
</tr>
</div>
{/if}
<tr class="uploadform">
<th></th>
<td id="{$prefix}_uploadsubmit_container">{* filebrowser.js may add a submit button in here even if config.submitbutton is off *}
<div class="uploadform">
<div id="{$prefix}_uploadsubmit_container">{* filebrowser.js may add a submit button in here even if config.submitbutton is off *}
{if $config.submitbutton}
<input type="submit" class="submit nojs-hidden-block" name="{$prefix}_uploadsubmit" id="{$prefix}_uploadsubmit" value="{str tag=upload section=artefact.file}" />
{/if}
<noscript><input type="submit" class="submit" name="{$prefix}_upload" id="{$prefix}_upload" value="{str tag=upload section=artefact.file}" /></noscript>