Commit 16a4e207 authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
parent d47cb19b
{foreach from=$posts item=post}
<tr id="posttitle_{$post->id}">
<th class="posttitle">{$post->title}</th>
<th id="poststatus{$post->id}">
<th id="poststatus{$post->id}" class="poststatus">
{if $post->published}
{str tag=published section=artefact.blog}
{else}
......
......@@ -46,6 +46,13 @@ td a.btn-add{
font-size: 1.8em;
line-height: 1.1667em;
}
#postlist th.poststatus {
color: #888;
white-space: nowrap;
}
#postlist th.poststatus input {
font-size: .9167em;
}
#postlist th.controls {
text-align: right;
width: 35px;
......
......@@ -24,7 +24,7 @@
{foreach from=$filelist item=file}
{if !$publishing || !$file->permissions || $file->can_republish}{assign var=publishable value=1}{else}{assign var=publishable value=0}{/if}
<tr id="file:{$file->id}" class="{cycle values='r0,r1'} directory-item{if $file->isparent} parentfolder{/if}{if $file->artefacttype == 'folder'} folder{/if}{if $highlight && $highlight == $file->id} highlight-file{/if}{if $edit == $file->id} hidden{/if}{if !$publishable && $file->artefacttype != 'folder'} disabled{/if}" {if !$publishable && $file->artefacttype != 'folder'} title="{str tag=notpublishable section=artefact.file}"{/if}>
<td>
<td class="filethumb">
{if $editable}
<div{if !$file->isparent} class="icon-drag" id="drag:{$file->id}"{/if}>
<img src="{$file->icon}"{if !$file->isparent} title="{str tag=clickanddragtomovefile section=artefact.file arg1=$file->title}"{/if}>
......@@ -43,10 +43,10 @@
<a href="{$WWWROOT}artefact/file/download.php?file={$file->id}" target="_blank" title="{str tag=downloadfile section=artefact.file arg1=$displaytitle}">{$displaytitle}</a>
{/if}
</td>
<td>{$file->description}</td>
<td class="filedescription">{$file->description}</td>
{if !$showtags && !$editmeta}
<td>{tif $file->size ?: ''}</td>
<td>{tif $file->mtime ?: ''}</td>
<td class="filesize">{tif $file->size ?: ''}</td>
<td class="filedate">{tif $file->mtime ?: ''}</td>
{/if}
{if $showtags}
<td>{if $file->tags}<span>{list_tags tags=$file->tags owner=$showtags}</span>{/if}</td>
......
......@@ -52,11 +52,32 @@
background: url(../images/foldernav_small.png) no-repeat top;
}
form#files .foldernav {
padding: 0 0 0 30px;
padding: 5px 0 3px 30px;
font-size: 1.3333em;
background: url(../images/foldernav.png) no-repeat left top;
}
td.filethumb {
width: 25px;
vertical-align: middle;
}
td.filename {
padding: 5px 5px 3px 5px;
}
td.filedescription {
padding: 5px 5px 3px 5px;
font-size: .9167em;
}
td.filesize {
padding: 6px 5px 3px 5px;
font-size: .9167em;
}
td.filedate {
padding: 6px 5px 3px 5px;
font-size: .9167em;
color: #888888;
}
/* File list */
.filelist {
width: 100%;
......
......@@ -10,11 +10,6 @@
<h3><a href="{$WWWROOT}artefact/plans/plan.php?id={$plan->id}">{$plan->title}</a></h3>
<div class="codesc">{$plan->description}</div>
<div class="fl">
<ul class="planslist">
<li></li>
</ul>
</div>
</td>
</tr>
{/foreach}
......@@ -5,7 +5,7 @@
* This file is distributed under the same terms as Mahara itself
*/
th.planscontrols {
width: 35px !important;
width: 40px !important;
}
#planswrap table {
......@@ -20,8 +20,7 @@ th.planscontrols {
}
#planswrap table td div.completed {
margin: 3px;
text-align:center;
text-align: center;
width: 60px;
}
......@@ -44,4 +43,7 @@ ul.planslist li {
.codesc {
font-size: .9167em;
}
#taskslist td {
padding: 5px 5px 3px 5px;
}
\ No newline at end of file
......@@ -34,7 +34,7 @@
font-size: .9167em;
}
#resumewrap table.resumecomposite td {
padding: 3px 5px;
padding: 5px 5px;
}
#resumewrap table.mceLayout {
width: 570px !important;
......
......@@ -67,7 +67,7 @@
{/foreach}
{/if}
{if $group_view_submission_form}
<tr class="{cycle values='r0,r1'}">
<tr>
<td class="submissionform">{$group_view_submission_form|safe}</td>
</tr>
{/if}
......@@ -88,7 +88,7 @@
<a href="{$WWWROOT}user/view.php?id={$view.owner}">{$view.sharedby}</a>
{/if}
{if $view.submittedtime}
<span> ({str tag=timeofsubmission section=view}: {$view.submittedtime|format_date})</span>
<span class="date s"> ({str tag=timeofsubmission section=view}: {$view.submittedtime|format_date})</span>
{/if}
<div>{$view.shortdescription}</div>
{if $view.tags}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$view.owner tags=$view.tags}</div>{/if}
......
......@@ -2,8 +2,7 @@
<table class="fullwidth">
{foreach from=$foruminfo item=postinfo}
<tr class="{cycle values='r0,r1'}">
<td><strong><a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic|escape}#post{$postinfo->id}">{$postinfo->topicname}</a></strong></td>
<td>{$postinfo->body|str_shorten_html:100:true|safe}</td>
<td><h4><a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic|escape}#post{$postinfo->id}">{$postinfo->topicname}</a></h4><div class="s">{$postinfo->body|str_shorten_html:100:true|safe}</div></td>
<td class="s"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=16&amp;id={$postinfo->poster}" alt="">
<a href="{$WWWROOT}user/view.php?id={$postinfo->poster}">{$postinfo->poster|display_name|escape}</a>
</td>
......
......@@ -7,22 +7,27 @@
/* top buttons */
#forumbtns {
right: 1em;
top: 1em;
right: 10px;
top: 10px;
}
* html #forumbtns {
right: 2.5em;
right: 30px;
}
#forumbtns a.btn {
* padding: 3px 5px 4px 5px;
* display: block;
* float: left;
}
/* forum description */
#forumdescription {
margin: .5em 0;
margin: 5px 0;
clear: both;
}
/* Edit and Delete in list */
.btn-spacer a {
margin-left: 1em;
margin-left: 10px;
}
.btn-spacer a.btn-big-del {
margin-left: 3px;
......@@ -43,7 +48,7 @@
/* Topic list */
#viewforum {
padding: 1em;
padding: 10px;
margin: 0;
border: 1px solid #eee;
}
......@@ -51,11 +56,11 @@
font-size: 1.3333em;
}
#viewforum .rbuttons {
right: 1em;
top: 1em;
right: 10px;
top: 10px;
}
* html #viewforum .rbuttons {
right: 3em;
right: 35px;
}
/* to get user picts to align with text */
.forumuser,
......@@ -67,34 +72,36 @@
background-color: #fffcd8;
border-bottom: 2px solid #fff;
}
#forumtopicstable h4 {
margin: 0;
}
/* Forum Pagination */
#viewforum div.pagination {
background: #eee;
margin: 0;
padding: .5em .25em;
padding: 5px 3px;
}
#viewforum div.pagination .results {
display: inline;
padding: 0.25em 0.5em;
padding: 3px 5px;
}
/* Forum Action Selector */
.forumselectwrap {
padding: 1em 0 0 0;
padding: 10px 0 0 0;
}
/* Forum footer */
.forumfooter {
margin: .5em;
margin: 5px;
}
/* admin & moderator */
.forummods {
font-size: .9167em;
padding: .5em;
margin: .5em 0;
padding: 5px;
margin: 5px 0;
}
.forummods a {
margin-right: .5em;
margin-right: 5px;
}
.groupadmin {
}
......@@ -104,7 +111,7 @@
/* Posts */
.closed {
margin: 0 0 1em 0;
margin: 0 0 10px 0;
}
.forumpost {
border: 2px solid #eee;
......@@ -127,7 +134,7 @@
color: #888;
}
.forumpostleft .author img {
margin: .25em .5em .25em .25em;
margin: 3px 5px 3px 3px;
}
.forumpostleft .author p.poster {
color: #888;
......@@ -142,16 +149,16 @@
font-size: .9167em;
text-align: right;
color: #d1d1d1;
margin: 0 0 1em 0;
margin: 0 0 10px 0;
}
.postbtns a {
margin: 0 .5em;
margin: 0 5px;
}
.deletedpost {
color: #666666;
margin-top: 0;
}
.postreply {
padding: 0 0 0 1em;
padding: 0 0 0 10px;
}
{include file="header.tpl"}
<h3>{str tag=nameplural section=interaction.forum} &gt; <a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}">{$topic->forumtitle}</a></h3>
<h2>{str tag=nameplural section=interaction.forum} &gt; <a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}">{$topic->forumtitle}</a></h2>
<h4>{$topic->subject}</h4>
{if $membership}
<div id="forumbtns" class="rbuttons">
......
......@@ -14,22 +14,22 @@
{/if}
</td>
<td>
<div><a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}">{$topic->subject}</a>{if $publicgroup}<a href="{$topic->feedlink}"><img class="feedicon" src="{theme_url filename='images/rss_small.gif'}"></a>{/if}</div>
<h4><a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}">{$topic->subject}</a>{if $publicgroup}<a href="{$topic->feedlink}"><img class="feedicon" src="{theme_url filename='images/rss_small.gif'}"></a>{/if}</h4>
<div class="s">{$topic->body|str_shorten_html:50:true:false|safe}</div>
</td>
<td class="s">
<a href="{$WWWROOT}user/view.php?id={$topic->poster}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$topic->poster}" alt=""></a>
<a href="{$WWWROOT}user/view.php?id={$topic->poster}" class="forumuser{if in_array($topic->poster, $groupadmins)} groupadmin{elseif $topic->moderator} moderator{/if}">{$topic->poster|display_name:null:true|escape}</a>
</td>
<td class="center">{$topic->postcount}</td>
<td>
<td class="center s">{$topic->postcount}</td>
<td class="s">
{if !$topic->lastpostdeleted}
<a href="{$WWWROOT}interaction/forum/topic.php?id={$topic->id}#post{$topic->lastpost}">{$topic->lastposttime}</a> {str tag=by section=view}
<a href="{$WWWROOT}user/view.php?id={$topic->lastposter}" {if in_array($topic->lastposter, $groupadmins)} class="groupadmin"{elseif $topic->lastpostermoderator} class="moderator"{/if}>{$topic->lastposter|display_name:null:true|escape}</a>
{/if}
</td>
{if $moderator}
<td >
<td>
<div class="s btn-spacer fr">
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-edit" title="{str tag="edit"}"></a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}&amp;returnto=view" class="btn-big-del" title="{str tag="delete"}"></a>
......
{include file="header.tpl"}
<h3>{str tag=nameplural section=interaction.forum} &gt; {$subheading}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h3>
<h2>{str tag=nameplural section=interaction.forum} &gt; {$subheading}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h2>
<div id="forumbtns" class="rbuttons">
{if $admin}
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}" class="btn">{str tag="edittitle" section="interaction.forum"}</a>
......
......@@ -70,18 +70,6 @@ h6 {
#activitylist tfoot td {
border-top: 1px solid #ccc;
}
.main-column table h3 a,
.main-column table h3 a:visited,
.main-column table h3 a:link,
.listing div h3 a,
.listing div h3 a:visited,
.listing div h3 a:link {
color: #186194 !important;
}
.main-column table h3 a:hover,
.listing div h3 a:hover {
color: #0a77cb !important;
}
.tablerenderer-loading {
}
/* Alternative row background colours */
......
......@@ -17,7 +17,8 @@ body {
margin: 0;
padding: 0;
}
#container { /* Use a 12px base font size with a 16px line height */
#container,
#containerX { /* Use a 12px base font size with a 16px line height */
font-size: 0.75em; /* 16px x .75 = 12px */
line-height: 1.333em; /* 12px x 1.333 = 16px */
}
......@@ -184,13 +185,12 @@ th {
td {
padding: 3px 5px;
vertical-align: top;
line-height: 1.8em;
}
.main-column tfoot td {
padding: 5px 0;
}
td.narrow {
padding: 0;
padding: 3px 0 0 0;
}
/* table with th border-bottom */
#searchresults thead th, .filelist, .tag-results #results {
......@@ -348,6 +348,9 @@ div.grippie {
.memberssearch form, .memberssearch form div {
display: inline;
}
#membersearchresults .membericon {
width: 50px;
}
/* Legend */
legend {
font-weight: bold;
......@@ -444,21 +447,22 @@ input.calendar.required {
/** input buttons **/
input.submit, input.cancel, button, .buttondk, input.button, input.select, input#files_filebrowser_edit_artefact {
font-size: 1em;
line-height: 1em;
line-height: 1.3333em;
border-width: 1px;
border-style: solid;
border-color: #7d99ae #003c74 #003c74 #7d99ae;
margin: 0 3px 0 0;
* margin: 0 1px 0 0;
padding: 2px 3px;
background: #c6c5d7 url(../images/btn-bkgd.gif) repeat-x left top;
text-decoration: none;
cursor: default;
color: #333;
* overflow: visible;
}
/** links that need to look like buttons **/
.btn {
font-size: 1em;
line-height: 1.3333em;
border-width: 1px;
border-style: solid;
border-color: #7d99ae #003c74 #003c74 #7d99ae;
......@@ -468,6 +472,7 @@ input.submit, input.cancel, button, .buttondk, input.button, input.select, input
text-decoration: none;
cursor: default;
color: #333;
* overflow: visible;
}
/** hover for buttons **/
.btn:hover, input.submit:hover, input.cancel:hover, button:hover, .buttondk:hover, input.button:hover, input.select:hover, input#files_filebrowser_edit_artefact:hover {
......@@ -731,42 +736,41 @@ div.rbuttons .small-logo {
background: none;
}
/**************************** Top of page elements ****************************/
.viewheader {
padding: 0;
margin: 0 5px 1px 5px;
.viewheadertop {
height: 30px;
margin: 0;
}
.viewheader .small-logo img {
vertical-align: top;
.viewheadertop .small-logo img {
padding: 0;
}
.viewheader .links {
.viewheadertop .links {
padding: 3px 0 0 5px;
font-size: .9167em;
}
.viewheader .nav {
padding: 0 5px 5px 0;
font-size: .9167em;
color: #d1d1d1;
.viewheadertop .links a {
}
.viewheader .nav a {
padding: 0 3px;
}
.viewheader.top {
height: 15px;
}
.viewheader #mainnav-container {
.viewheadertop #mainnav-container {
width: 60%;
height: 15px;
height: 16px;
padding: 3px 5px 5px 115px;
* padding: 3px 5px 5px 25px;
background: url(../images/icon_fieldset_left.gif) no-repeat 95px center;
background: url(../images/icon_fieldset_left.gif) no-repeat 93px center;
* background: url(../images/icon_fieldset_left.gif) no-repeat 5px center;
font-size: .9167em;
color: #d1d1d1;
}
.viewheader #mainnav-container #mainnav {
.viewheadertop #mainnav-container #mainnav {
margin-left: -10px;
}
.viewheadertop #mainnav-container #mainnav a {
padding: 0 3px;
}
.viewheader {
padding: 0;
margin: 0;
}
.viewheader .title {
padding: 5px 0 3px;
padding: 10px 0;
font-size: 1.5em;
color: #919191;
}
......@@ -781,7 +785,7 @@ div.rbuttons .small-logo {
padding-right: 5px;
}
#container, #containerX {
background-color: #fff;
background: #fff;
margin: 0 auto;
max-width: 1400px;
min-width: 970px;
......@@ -792,7 +796,7 @@ div.rbuttons .small-logo {
}
#containerX #top-wrapper {
background: #eee;
padding: 5px;
padding: 5px 5px 0 5px;
}
#loading-box {
background-color: #ddd;
......@@ -815,6 +819,7 @@ div.rbuttons .small-logo {
padding: 5px 10px;
text-align: right;
white-space: nowrap;
display: block;
}
/* Search and language bar */
#language-select {
......@@ -917,6 +922,7 @@ ul.edit-view-tabs {
padding: 0;
position: relative;
z-index: 0;
clear: both;
}
ul.in-page-tabs li,
ul.edit-view-tabs li {
......@@ -939,14 +945,14 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
padding: 4px 10px;
cursor: default;
}
ul.in-page-tabs li.fr {
float: right !important;
}
.subpage {
border: 1px solid #d1d1d1;
padding: 10px !important;
margin-bottom: 10px;
}
.subpage p:first-child {
margin: 0 0 5px 0;
}
/**************** MAIN CONTENT *****************/
#main-wrapper {
clear: both;
......@@ -964,8 +970,9 @@ ul.edit-view-tabs li a.current-tab, ul.in-page-tabs li a.current-tab:link, ul.ed
* padding-top: 2px;
}
.twocolumn div.rel {
margin-left: 53px;
margin-top: 3px;
margin-left: 50px;
font-size: .9167em;
line-height: 1.3333em;
}
.main-column ul {
margin: 5px 0 10px 0;
......@@ -998,7 +1005,7 @@ div.info img {
/* different message types */
#messages .ok, div.ok {
color: #547c22;
background: #e7f1c3 url(../images/success.gif) no-repeat 5px 5px;
background: #e7f1c3 url(../images/success.gif) no-repeat 5px 3px;
border: 1px solid #C0D76E;
}
#messages .error, div.error {
......@@ -1068,6 +1075,10 @@ div.sideblock h3 {
div.sideblock ul {
padding: 0 0 0 15px;
margin: 0;
line-height: 1.5em;
}
div.sideblock ul li {
padding-bottom: 3px;
}
/* Side Login */
#login_submit_container {
......@@ -1105,13 +1116,13 @@ div.sideblock ul {
}
#sb-profile ul {
font-weight: bold;
font-size: 1.1em;
font-size: 1em;
}
#sb-profile ul li {
padding-bottom: 3px;
}
#sb-profile ul ul {
font-size: .9167em;
font-size: 1em;
font-weight: normal;
padding-left: 15px;
list-style-type: disc;
......@@ -1434,7 +1445,7 @@ table.attachments td {
width: 20px;
height: 20px;
float: left;
padding-right: 5px;
padding: 3px 5px 0 0;
text-align: center;
}
#userview .user-icon .addform {
......@@ -1493,7 +1504,7 @@ table.attachments td {
width: 150px;
}
#viewlayout .fl img {
padding: 0;
padding: 5px 0 0 0;
}
/* My Views */
#myviews .edittitle {
......@@ -1862,7 +1873,6 @@ ul.groupuserstatus {
display: none;
}
.grouphome-admincontrol {
float: right;
}