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

Update themes

parent 63d32f7f
<ul> <ul class="recentblogpost">
{foreach from=$mostrecent item=post} {foreach from=$mostrecent item=post}
<li> <li>
<a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&amp;view={$view}">{$post->title}</a> <strong><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&amp;view={$view}">{$post->title}</a></strong>
{str tag='postedin' section='blocktype.blog/recentposts'} {str tag='postedin' section='blocktype.blog/recentposts'}
<a href="{$WWWROOT}view/artefact.php?artefact={$post->parent}&amp;view={$view}">{$post->parenttitle}</a> <a href="{$WWWROOT}view/artefact.php?artefact={$post->parent}&amp;view={$view}">{$post->parenttitle}</a>
{str tag='postedon' section='blocktype.blog/recentposts'} {str tag='postedon' section='blocktype.blog/recentposts'}
{$post->displaydate} <span class="description">{$post->displaydate}</span>
</li> </li>
{/foreach} {/foreach}
</ul> </ul>
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
padding: 1em 0 .25em 0; padding: 1em 0 .25em 0;
vertical-align: bottom; vertical-align: bottom;
} }
#postlist td {
padding: .25em 0;
}
#postlist th.posttitle { #postlist th.posttitle {
font-size: 1.8em; font-size: 1.8em;
} }
...@@ -64,17 +67,26 @@ ...@@ -64,17 +67,26 @@
padding-bottom: 1em; padding-bottom: 1em;
} }
#postlist td h1,
#postlist td h2 {
font-size: 1.3333em !important;
margin: 1em 0 0 0;
}
#postlist td h3,
#postlist td h4 {
font-size: 1.1333em !important;
margin: 1em 0 0 0;
}
/* attachment files */ /* attachment files */
#postlist .attachments th { #postlist .attachments th {
padding: .25em .5em; padding: .25em .5em;
font-size: 1em; font-size: 1em;
border: 0; border: 0;
} }
#postlist .attachments td {
padding: .25em .5em;
}
.attachments .unselect { .attachments .unselect {
font-size: .9167em; font-size: .9167em;
}
#postlist td h1,
#postlist td h2 {
font-size: 1.3333em !important;
margin: 1em 0 0.5em 0;
} }
\ No newline at end of file
{foreach $files file} {foreach $files file}
<div title="{$file.title}"> <div title="{$file.title}">
<div class="fl"><a href="{$WWWROOT}{$file.downloadurl}" target="_blank"><img src="{$file.iconsrc}" alt=""></a></div> <div class="fl"><a href="{$WWWROOT}{$file.downloadurl}" target="_blank"><img src="{$file.iconsrc}" alt=""></a></div>
<div style="margin-left: 30px;"> <div style="margin-left: 40px;">
<h4><a href="{$file.downloadurl}" target="_blank">{$file.title|str_shorten_text:20}</a></h4> <h4><a href="{$file.downloadurl}" target="_blank">{$file.title|str_shorten_text:20}</a></h4>
{if $file.description}<p style="margin: 0;"><strong>{$file.description}</strong></p>{/if} {if $file.description}<p>{$file.description}</p>{/if}
{$file.size|display_size} | {$file.ctime|format_date:'strftimedaydate'} <div class="description">{$file.size|display_size} | {$file.ctime|format_date:'strftimedaydate'}
| <a href="{$WWWROOT}view/artefact.php?artefact={$file.id}&view={$viewid}">{str tag=Details section=artefact.file}</a> | <a href="{$WWWROOT}view/artefact.php?artefact={$file.id}&view={$viewid}">{str tag=Details section=artefact.file}</a></div>
</div> </div>
</div> </div>
{/foreach} {/foreach}
...@@ -4,11 +4,9 @@ ...@@ -4,11 +4,9 @@
{if $tags}<div class="tags"><label>{str tag=tags}:</label> {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))}
<h3>{str tag=contents section=artefact.file}:</h3>
<table class="fullwidth"> <table class="fullwidth">
<thead> <thead>
<tr>
<th colspan="5">{str tag=contents section=artefact.file}:</th>
</tr>
<tr> <tr>
<th></th> <th></th>
<th>{str tag=name}</th> <th>{str tag=name}</th>
...@@ -21,7 +19,7 @@ ...@@ -21,7 +19,7 @@
<tr class="{cycle values='r0,r1'}"> <tr class="{cycle values='r0,r1'}">
<td><img src="{$child->iconsrc}" border="0" alt="{$child->artefacttype}"></td> <td><img src="{$child->iconsrc}" border="0" alt="{$child->artefacttype}"></td>
<td><a href="{$WWWROOT}view/artefact.php?artefact={$child->id}&amp;view={$viewid}" title="{$child->hovertitle}">{$child->title}</a></td> <td><a href="{$WWWROOT}view/artefact.php?artefact={$child->id}&amp;view={$viewid}" title="{$child->hovertitle}">{$child->title}</a></td>
<td>{$child->description}</td> <td class="s">{$child->description}</td>
{if !$simpledisplay} {if !$simpledisplay}
<td>{$child->date}</td> <td>{$child->date}</td>
{/if} {/if}
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<th>{str tag=Date section=artefact.file}</th> <th>{str tag=Date section=artefact.file}</th>
{/if} {/if}
{if $showtags} {if $showtags}
<th><div class="tags">{str tag=tags}</div></th> <th><div>{str tag=tags}</div></th>
{/if} {/if}
{if $editmeta} {if $editmeta}
<th></th> <th></th>
......
<p id="{$prefix}_empty_selectlist"{if !$selectedlist} class="hidden"{/if}>{str tag=nofilesfound section=artefact.file}</p> <p id="{$prefix}_empty_selectlist"{if !$selectedlist} class="hidden"{/if}>{str tag=nofilesfound section=artefact.file}</p>
<table id="{$prefix}_selectlist" class="fullwidth{if !$selectedlist} hidden{/if}"> <table id="{$prefix}_selectlist" class="fullwidth {if !$selectedlist} hidden{/if}">
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
......
...@@ -39,14 +39,14 @@ ...@@ -39,14 +39,14 @@
/* folder nav */ /* folder nav */
.foldernav { .foldernav {
font-weight: bold; font-weight: bold;
padding: 0 0 0 1.6667em; padding: 0 0 0 20px;
font-size: 1.3333em; font-size: 1.3333em;
line-height: 1.6667em; line-height: 1.6667em;
height: 1.6667em; height: 1.6667em;
background: url(../images/foldernav_small.png) no-repeat left; background: url(../images/foldernav_small.png) no-repeat left;
} }
form#files .foldernav { form#files .foldernav {
padding: 0 0 0 1.6667em; padding: 0 0 0 30px;
font-size: 1.3333em; font-size: 1.3333em;
line-height: 1.6667em; line-height: 1.6667em;
height: 1.6667em; height: 1.6667em;
......
<div class="blockinstance-content"> <div class="blockinstance-content">
{if $tasks.data} {if $tasks.data}
<table id="tasktable_{$blockid}"> <table id="tasktable_{$blockid}" class="plansblocktable">
<colgroup width="50%" span="2"></colgroup> <colgroup width="50%" span="2"></colgroup>
<thead> <thead>
<tr> <tr>
......
...@@ -59,13 +59,13 @@ class PluginBlocktypeCreativecommons extends SystemBlocktype { ...@@ -59,13 +59,13 @@ class PluginBlocktypeCreativecommons extends SystemBlocktype {
$licenseurl = "http://creativecommons.org/licenses/$licensetype/3.0/"; $licenseurl = "http://creativecommons.org/licenses/$licensetype/3.0/";
$licensename = get_string($licensetype, 'blocktype.creativecommons'); $licensename = get_string($licensetype, 'blocktype.creativecommons');
$html = '<p class="licensedesc"><a rel="license" href="http://creativecommons.org/licenses/'.$licensetype.'/3.0/"><img alt="'. $html = '<div class="licensedesc"><a class="fl" rel="license" href="http://creativecommons.org/licenses/'.$licensetype.'/3.0/"><img alt="'.
get_string('alttext', 'blocktype.creativecommons'). get_string('alttext', 'blocktype.creativecommons').
'" style="border-width:0" src="'. '" style="border-width:0" src="'.
$THEME->get_url('images/' . $licensetype . '-3_0.png', false, 'blocktype/creativecommons') . '" /></a>'; $THEME->get_url('images/' . $licensetype . '-3_0.png', false, 'blocktype/creativecommons') . '" /></a>';
$html .= '<br />'; $html .= '<div>';
$html .= get_string('licensestatement', 'blocktype.creativecommons', $licenseurl, $licensename); $html .= get_string('licensestatement', 'blocktype.creativecommons', $licenseurl, $licensename);
$html .= '</p>'; $html .= '</div></div>';
return $html; return $html;
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
{$entry->title} {$entry->title}
{if $entry->link}</a>{/if} {if $entry->link}</a>{/if}
</h4> </h4>
{$entry->description|clean_html|safe} <div class="s">{$entry->description|clean_html|safe}</div>
{/foreach} {/foreach}
{else} {else}
<ol> <ol>
......
...@@ -34,21 +34,27 @@ ...@@ -34,21 +34,27 @@
{if $group_view_submission_form} {if $group_view_submission_form}
<h5>{str tag="submitaviewtogroup" section="view"}</h5> <h5>{str tag="submitaviewtogroup" section="view"}</h5>
{/if} {/if}
<table class="fullwidth listing">
{if $mysubmittedviews} {if $mysubmittedviews}
{foreach from=$mysubmittedviews item=view} {foreach from=$mysubmittedviews item=view}
<div>{$view.strsubmitted}</div> <tr class="{cycle values='r0,r1'}">
<td class="submittedform">{$view.strsubmitted}</td>
</tr>
{/foreach} {/foreach}
{/if} {/if}
{if $group_view_submission_form} {if $group_view_submission_form}
<div>{$group_view_submission_form}</div> <tr class="{cycle values='r0,r1'}">
<td class="submissionform">{$group_view_submission_form}</td>
</tr>
{/if} {/if}
</table>
</div> </div>
{/if} {/if}
{if $allsubmittedviews} {if $allsubmittedviews}
<div class="groupviewsection"> <div class="groupviewsection">
<h5>{str tag="viewssubmittedtogroup" section="view"}</h5> <h5>{str tag="viewssubmittedtogroup" section="view"}</h5>
<table class="fullwidth"> <table class="fullwidth listing">
{foreach from=$allsubmittedviews item=view} {foreach from=$allsubmittedviews item=view}
<tr class="{cycle values='r0,r1'}"> <tr class="{cycle values='r0,r1'}">
<td> <td>
......
{if $views} {if $views}
<table class="viewlist"> <table class="viewlist">
{foreach from=$views item=view} {foreach from=$views item=view}
<tr> <tr class="{cycle values='r0,r1'}">
<td class="{cycle values='r0,r1'}"><h4><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title}</a></h4> <td><h4><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title}</a></h4>
<div class="details">{$view.shortdescription|safe|clean_html}</div> <div class="details">{$view.shortdescription|safe|clean_html}</div></td>
{if $view.sharedby} {if $view.sharedby}
<div> <td>
{if $view.group && $loggedin} {if $view.group && $loggedin}
<a href="{$WWWROOT}group/view.php?id={$view.group}" class="s">{$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}
...@@ -13,13 +13,11 @@ ...@@ -13,13 +13,11 @@
{else} {else}
{$view.sharedby} {$view.sharedby}
{/if} {/if}
<span class="postedon"> <div class="postedon nowrap">
{if $view.mtime == $view.ctime}{str tag=Created}{else}{str tag=Updated}{/if} {if $view.mtime == $view.ctime}{str tag=Created}{else}{str tag=Updated}{/if}
{$view.mtime|strtotime|format_date:'strftimedate'} {$view.mtime|strtotime|format_date:'strftimedate'}</div>
</span>
</div>
{/if}
</td> </td>
{/if}
</tr> </tr>
{/foreach} {/foreach}
</table> </table>
......
<div> <div id="recentforumpostsblock">
{if $foruminfo} {if $foruminfo}
<table class="fullwidth">
{foreach from=$foruminfo item=postinfo} {foreach from=$foruminfo item=postinfo}
<h4><a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}#post{$postinfo->id}">{$postinfo->topicname}</a></h4> <tr class="{cycle values='r0,r1'}">
<div> <td><strong><a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}#post{$postinfo->id}">{$postinfo->topicname}</a></strong><br />
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$postinfo->poster}" alt=""> <div class="s">{$postinfo->body|str_shorten_html:100:true|safe}</div></td>
<a href="{$WWWROOT}user/view.php?id={$postinfo->poster}">{$postinfo->poster|display_name|escape}</a> <td class="s"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$postinfo->poster}" alt="">
</div> <a href="{$WWWROOT}user/view.php?id={$postinfo->poster}">{$postinfo->poster|display_name|escape}</a></td>
<div>{$postinfo->body|str_shorten_html:100:true|safe}</div> </tr>
{/foreach} {/foreach}
</table>
{else} {else}
<p>{str tag=noforumpostsyet section=interaction.forum}</p> <table class="fullwidth"><tr class="{cycle values='r0,r1'}">
<td align="center">{str tag=noforumpostsyet section=interaction.forum}</td>
</tr>
</table>
{/if} {/if}
<p><a href="{$WWWROOT}interaction/forum/?group={$group->id}" target="_blank">{str tag=gotoforums section=interaction.forum} &raquo;</a></p> <a class="morelink" href="{$WWWROOT}interaction/forum/?group={$group->id}" target="_blank">{str tag=gotoforums section=interaction.forum} &raquo;</a>
<div class="cb"></div>
</div> </div>
...@@ -5,22 +5,20 @@ ...@@ -5,22 +5,20 @@
{if $wallposts} {if $wallposts}
{foreach from=$wallposts item=wallpost} {foreach from=$wallposts item=wallpost}
<div class="wallpost{if $wallpost->private} private{/if}"> <div class="wallpost{if $wallpost->private} private{/if}">
<div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=25&amp;maxheight=25&amp;id={$wallpost->from}" alt="Profile Icon"> <div class="userinfo"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxwidth=25&amp;maxheight=25&amp;id={$wallpost->from}" alt="Profile Icon"><strong><a href="{$WWWROOT}user/view.php?id={$wallpost->userid}">{$wallpost->displayname}</a></strong><span class="postedon"> - {$wallpost->postdate|format_date}</span></div>
<div class="userinforight"><strong><a href="{$WWWROOT}user/view.php?id={$wallpost->userid}">{$wallpost->displayname}</a></strong><span class="postedon"> - {$wallpost->postdate|format_date}</span></div>
</div>
<div class="text">{$wallpost->text|parse_bbcode|safe}</div> <div class="text">{$wallpost->text|parse_bbcode|safe}</div>
<div class="controls"> <div class="controls right">
{* {if $ownwall} {* {if $ownwall}
[ <a href="{$WWWROOT}blocktype/wall/wall.php?instance={$instanceid}&amp;replyto={$wallpost->id}">{str tag='reply' section='blocktype.wall'}</a> ] <a href="{$WWWROOT}blocktype/wall/wall.php?instance={$instanceid}&amp;replyto={$wallpost->id}" class="btn-reply">{str tag='reply' section='blocktype.wall'}</a>
{/if}*} {/if}*}
{if $wallpost->deletable} {if $wallpost->deletable}
[ <a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}">{str tag='delete' section='blocktype.wall'}</a> ] <a href="{$WWWROOT}blocktype/wall/deletepost.php?postid={$wallpost->postid}&return={if $wholewall}wall{else}profile{/if}" class="btn-del">{str tag='delete' section='blocktype.wall'}</a>
{/if} {/if}
</div> </div>
</div> </div>
{/foreach} {/foreach}
{if !$wholewall} {if !$wholewall}
<div class="right"><strong><a href="{$WWWROOT}blocktype/wall/wall.php?id={$instanceid}">{str tag='wholewall' section='blocktype.wall'} &raquo;</a></strong></div> <a class="morelink" href="{$WWWROOT}blocktype/wall/wall.php?id={$instanceid}">{str tag='wholewall' section='blocktype.wall'} &raquo;</a>
{/if} {/if}
{/if} {/if}
</div> </div>
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
// element, but there's no validation or descriptions on this form currently // element, but there's no validation or descriptions on this form currently
echo $form_tag; echo $form_tag;
echo '<div class="description">' . $elements['postsizelimit']['html'] . ' ' . $elements['text']['description'] . '</div>'; echo '<div id="wall"><div class="description">' . $elements['postsizelimit']['html'] . ' ' . $elements['text']['description'] . '</div>';
echo '<div>' . $elements['text']['html'] .'</div>'; echo '<div>' . $elements['text']['html'] .'</div>';
if (isset($elements['text']['error'])) { if (isset($elements['text']['error'])) {
echo '<div>' . $elements['text']['error'] . '</div>'; echo '<div>' . $elements['text']['error'] . '</div>';
} }
echo '<div class="makeprivate">' . $elements['private']['labelhtml'] . ' ' . $elements['private']['html'] . '</div>'; echo '<div class="makeprivate">' . $elements['private']['labelhtml'] . ' ' . $elements['private']['html'] . '</div>';
echo '<div>' . $elements['submit']['html'] . '</div>'; echo '<div>' . $elements['submit']['html'] . '</div></div>';
echo $hidden_elements; echo $hidden_elements;
echo '</form>'; echo '</form>';
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/* forum description */ /* forum description */
#forumdescription { #forumdescription {
margin: 2em 0 .5em 0; margin: .5em 0;
clear: both; clear: both;
} }
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
* html #viewforum .rbuttons { * html #viewforum .rbuttons {
right: 3em; right: 3em;
} }
#forumtopicstable {
border-bottom: 1px solid #ccc;
}
#forumtopicstable th {
border-bottom: 1px solid #ccc;
}
/* to get user picts to align with text */ /* to get user picts to align with text */
.forumuser, .forumuser,
.inlinelist a img { .inlinelist a img {
...@@ -69,6 +63,7 @@ ...@@ -69,6 +63,7 @@
/* topic types */ /* topic types */
.stickytopic td { .stickytopic td {
background-color: #fffcd8; background-color: #fffcd8;
border-bottom: 2px solid #fff;
} }
...@@ -110,18 +105,19 @@ ...@@ -110,18 +105,19 @@
margin: 0 0 1em 0; margin: 0 0 1em 0;
} }
.forumpost { .forumpost {
border: 1px solid #eee; border: 2px solid #eee;
clear: both; clear: both;
} }
.forumsubject { .forumsubject {
border-bottom: 1px solid #eee; border-bottom: 2px solid #eee;
background: #eee;
} }
.forumsubject h6 { .forumsubject h6 {
margin: 0 !important; margin: 0 !important;
} }
.forumpostleft { .forumpostleft {
width: 160px; width: 160px;
border-right: 1px solid #eee; border-right: 2px solid #eee;
text-align: center; text-align: center;
font-size: .9167em; font-size: .9167em;
} }
...@@ -144,6 +140,7 @@ ...@@ -144,6 +140,7 @@
font-size: .9167em; font-size: .9167em;
text-align: right; text-align: right;
color: #d1d1d1; color: #d1d1d1;
margin: 0 0 1em 0;
} }
.postbtns a { .postbtns a {
margin: 0 .5em; margin: 0 .5em;
......
...@@ -18,15 +18,17 @@ ...@@ -18,15 +18,17 @@
{/if} {/if}
{if $stickytopics || $regulartopics} {if $stickytopics || $regulartopics}
<form action="" method="post"> <form action="" method="post">
<table id="forumtopicstable" class="fullwidth nohead"> <table id="forumtopicstable" class="fullwidth">
<thead>
<tr> <tr>
<th width="12px"></th> <th width="12px"></th>
<th width="12px"></th> <th width="12px"></th>
<th width="40%">{str tag="Topic" section="interaction.forum"}</th> <th>{str tag="Topic" section="interaction.forum"}</th>
<th>{str tag="Poster" section="interaction.forum"}</th> <th>{str tag="Poster" section="interaction.forum"}</th>
<th class="postscount center" width="10%">{str tag="Posts" section="interaction.forum"}</th> <th class="postscount center" width="10%">{str tag="Posts" section="interaction.forum"}</th>
<th class="lastpost" width="25%">{str tag="lastpost" section="interaction.forum"}</th> <th class="lastpost" width="20%">{str tag="lastpost" section="interaction.forum"}</th>
</tr> </tr>
</thead>
{if $stickytopics} {if $stickytopics}
{include file="interaction:forum:topics.tpl" topics=$stickytopics moderator=$moderator forum=$forum publicgroup=$publicgroup sticky=true} {include file="interaction:forum:topics.tpl" topics=$stickytopics moderator=$moderator forum=$forum publicgroup=$publicgroup sticky=true}
{/if} {/if}
...@@ -84,7 +86,10 @@ ...@@ -84,7 +86,10 @@
{/if} {/if}
</div> </div>
{else} {else}
<p>{str tag="notopics" section="interaction.forum"}</p> <table class="fullwidth nohead">
<tr><td class="{cycle values='r0,r1'} center">{str tag="notopics" section="interaction.forum"}</td>
</tr>
</table>
{/if} {/if}
{include file="footer.tpl"}