Commit c0f47fda authored by Evonne Cheung's avatar Evonne Cheung Committed by Robert Lyon

Design changes by Evonne - tidying up display problems (Bug #1252085)

Change-Id: If5d628ebc63be8b97a688e4835e21ca4001c7e3f
Signed-off-by: default avatarJono Mingard <jonom@catalyst.net.nz>
parent 596273a5
......@@ -33,42 +33,6 @@ if (!empty($family)) {
else {
$stylesheet = <<< EOF
#fontlist ul.actionlist {
margin: 0;
width: 200px;
}
#fontlist ul.actionlist li {
list-style: none;
margin: 1px 0 2px 0;
line-height: 1.25em;
}
#fontlist ul.actionlist li a {
border: 1px solid #DADADA;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 7px 5px 7px 25px;
display: block;
color: #333333;
text-decoration: none;
background-color: #F7F7F7;
background-position: 7px 50%;
background-repeat: no-repeat;
}
#fontlist ul.actionlist li a:hover {
background-color: #ffffff;
color: #000000;
}
#fontlist ul.actionlist li a:active {
background-color: #989898;
color: #FFFFFF;
opacity: 0.9;
border: 1px solid #e3e3e3;
}
#fontlist ul.actionlist li:first-child {
font-weight: bold;
padding: 5px 0 3px 0;
}
#preview {
margin: 10px 0;
}
......
......@@ -23,7 +23,7 @@
<div class="post">
<h3 class="title"><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$view}">{$post->title}</a></h3>
<div class="detail">{$post->description|clean_html|safe}</div>
<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$post->owner tags=$post->taglist}</div>
<div class="tags">{str tag=tags}: {list_tags owner=$post->owner tags=$post->taglist}</div>
<div class="postdetails">{$post->postedbyon}
{if $post->allowcomments} | <a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$view}">{str tag=Comments section=artefact.comment} ({$post->commentcount})</a>{/if}</div>
</div>
......
......@@ -8,7 +8,7 @@
{/if}
<div id="blogdescription">{$description|clean_html|safe}
{if $tags}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$owner tags=$tags}</div>{/if}
{if $tags}<div class="tags">{str tag=tags}: {list_tags owner=$owner tags=$tags}</div>{/if}
</div>
<div id="postlist{if $blockid}_{$blockid}{/if}" class="postlist fullwidth">
{$posts.tablerows|safe}
......
......@@ -61,14 +61,20 @@
</span>
{if $post.files}
<div id="postfiles_{$post.id}">
<table class="attachments fullwidth">
<table class="cb attachments fullwidth">
<thead>
<tr>
<td colspan="2">
<strong><a href="#">{str tag=attachedfiles section=artefact.blog}</a></strong>
</td>
</tr>
</thead>
<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 class="icon-container"><img src="{$file->icon}" alt=""></td>
<td><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}">{$file->title}</a></td>
<td>{$file->description}</td>
<td><h3 class="title"><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}">{$file->title}</a></h3>
<div class="detail">{$file->description}</div></td>
</tr>
{/foreach}
</tbody>
......
......@@ -31,18 +31,24 @@
</div>
{if $post->files}
<div id="postfiles_{$post->id}">
<table class="attachments fullwidth">
<table class="cb attachments fullwidth">
<thead class="expandable-head">
<tr>
<th colspan="3"><a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a></th>
<td colspan="2">
<a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a>
<span class="fr">
<img class="fl" src="{theme_url filename='images/attachment.png'}" alt="{str tag=Attachments section=artefact.resume}">
{$post->files|count}
</span>
</td>
</tr>
</thead>
<tbody class="expandable-body">
{foreach from=$post->files item=file}
<tr class="{cycle values='r1,r0'}">
<td class="icon-container"><img src="{$file->icon}" alt=""></td>
<td><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}">{$file->title}</a></td>
<td>{$file->description}</td>
<td><h3 class="title"><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}">{$file->title}</a> <span class="description">({$file->size|display_size})</span></h3>
<div class="detail">{$file->description}</div></td>
</tr>
{/foreach}
</tbody>
......
......@@ -5,6 +5,7 @@
{if $artefacttitle}<h3 class="title">{$artefacttitle|safe}</h3>{/if}
{$artefactdescription|clean_html|safe}
{if isset($attachments)}
{if $artefact->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}</div>{/if}
<table class="cb attachments fullwidth">
<thead class="expandable-head">
<tr>
......@@ -18,13 +19,12 @@
</tr>
</thead>
<tbody class="expandable-body">
{if $artefact->get('tags')}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}</div>{/if}
{foreach from=$attachments item=item}
<tr class="{cycle values='r0,r1'}">
{if $icons}<td class="icon-container"><img src="{$item->iconpath}" alt=""></td>{/if}
<td class="icon-container"><img src="{$item->iconpath}" alt=""></td>
<td>
<a href="{$item->viewpath}">{$item->title}</a> ({$item->size}) - <strong><a href="{$item->downloadpath}">{str tag=Download section=artefact.file}</a></strong>
<br>{$item->description}
<h3 class="title"><a href="{$item->viewpath}">{$item->title}</a> <span class="description">({$item->size}) - <a href="{$item->downloadpath}">{str tag=Download section=artefact.file}</a></span></h3>
<div class="detail">{$item->description}</div>
</td>
</tr>
{/foreach}
......
......@@ -39,7 +39,7 @@
#postlist .published,
#postlist .draft {
padding: 10px;
margin-bottom: 15px;
margin: 20px 0;
}
.attachments input.unselect {
font-size: .9167em;
......
......@@ -9,7 +9,7 @@
</div>
<div id="blogdescription">{clean_html($blog->get('description'))|safe}</div>
{if $blog->get('tags')}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}</div>{/if}
{if $blog->get('tags')}<div class="tags">{str tag=tags}: {list_tags owner=$blog->get('owner') tags=$blog->get('tags')}</div>{/if}
{if $posts}
<div id="postlist" class="fullwidth">
......
......@@ -3,13 +3,13 @@
<h3 class="title"><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$options.viewid}">{$post->title}</a></h3>
<div>{$post->description|clean_html|safe}
{if $post->tags}
<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$post->owner tags=$post->tags}</div>
<div class="tags">{str tag=tags}: {list_tags owner=$post->owner tags=$post->tags}</div>
{/if}</div>
{if $post->files}
<table class="cb attachments fullwidth">
<thead class="expandable-head">
<tr>
<td>
<td colspan="2">
<a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a>
<span class="fr">
<img class="fl" src="{theme_url filename='images/attachment.png'}" alt="{str tag=attachments section=artefact.blog}">
......@@ -21,10 +21,13 @@
<tbody class="expandable-body">
{foreach from=$post->files item=file}
<tr class="{cycle values='r0,r1'}">
<td class="icon-container"><img src="{$file->icon}" alt=""></td>
<td>
<a href="{$WWWROOT}view/artefact.php?artefact={$file->attachment}&view={$options.viewid}">{$file->title}</a>
({$file->size|display_size})
- <strong><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}&view={$options.viewid}">{str tag=Download section=artefact.file}</a></strong>
<h3 class="title">
<a href="{$WWWROOT}view/artefact.php?artefact={$file->attachment}&view={$options.viewid}">{$file->title}</a>
<span class="description">({$file->size|display_size}) - <a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}&view={$options.viewid}">{str tag=Download section=artefact.file}</a></span>
</h3>
<div class="detail">{$file->description}</div>
</td>
</tr>
{/foreach}
......
......@@ -3,7 +3,7 @@
<div class="fl"><a href="{$file.downloadurl}" target="_blank"><img src="{$file.iconsrc}" alt=""></a></div>
<div style="margin-left: 30px;">
<h3 class="title"><a href="{$file.downloadurl}" target="_blank">{$file.title}</a></h3>
{if $file.description}<p>{$file.description}</p>{/if}
{if $file.description}<div class="detail">{$file.description}</div>{/if}
<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></div>
</div>
......
<div>
{if !$simpledisplay}<h3 class="title">{$title}</h3>{/if}
<div class="detail">{$description}</div>
{if $tags}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$owner tags=$tags}</div>{/if}
{if $tags}<div class="tags">{str tag=tags}: {list_tags owner=$owner tags=$tags}</div>{/if}
<div id="commentfiles">
{if (isset($children))}
<h4>{str tag=foldercontents section=artefact.file}:</h4>
......@@ -17,7 +17,7 @@
<tbody>
{foreach from=$children item=child}
<tr class="{cycle values='r0,r1'}">
<td class="icon-container"><img src="{$child->iconsrc}" border="0" alt="{$child->artefacttype}"></td>
<td class="icon-container"><img src="{$child->iconsrc}" alt="{$child->artefacttype}"></td>
<td class="filename"><a href="{$WWWROOT}view/artefact.php?artefact={$child->id}&amp;view={$viewid}" title="{$child->hovertitle}">{$child->title}</a></td>
<td class="filedescription">{$child->description}</td>
{if !$simpledisplay}
......
......@@ -3,7 +3,7 @@
<table class="cb attachments fullwidth">
<thead class="expandable-head">
<tr>
<td {if $icons}colspan="2"{/if}>
<td colspan="2">
<a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a>
<span class="fr"><img class="fl" src="{theme_url filename='images/attachment.png'}" alt="{str tag=Attachments section=artefact.resume}">&nbsp;{$count}</span>
</td>
......@@ -12,9 +12,11 @@
<tbody class="expandable-body">
{foreach from=$attachments item=item}
<tr class="{cycle values='r0,r1'}">
{if $icons}<td class="iconcell"><img src="{$item->iconpath}" alt=""></td>{/if}
<td><a href="{$item->viewpath}">{$item->title}</a> ({$item->size}) - <strong><a href="{$item->downloadpath}">{str tag=Download section=artefact.file}</a></strong>
<br>{$item->description}</td>
<td class="icon-container"><img src="{$item->iconpath}" alt=""></td>
<td>
<h3 class="title"><a href="{$item->viewpath}">{$item->title}</a> <span class="description">({$item->size}) - <a href="{$item->downloadpath}">{str tag=Download section=artefact.file}</a></span></h3>
<div class="detail">{$item->description}</div>
</td>
</tr>
{/foreach}
</tbody>
......
{include file="header.tpl"}
<p>{str tag=notesdescription section=artefact.internal}</p>
<table id="notes" class="fullwidth">
<table id="notes" class="fullwidth listing">
<thead>
<tr>
<th>{str tag=Note section=artefact.internal}</th>
......@@ -19,51 +19,50 @@
{else}
<h3 class="title"><a class="notetitle" href="{$WWWROOT}artefact/internal/editnote.php?id={$n->id}" id="n{$n->id}">{$n->title|str_shorten_text:80:true}</a></h3>
{/if}
{if $n->tags}
<div>{str tag=tags}: {list_tags tags=$n->tags owner=$n->owner}</div>
{/if}
<div id="n{$n->id}_desc" class="hidden detail">{$n->description|clean_html|safe}
{if $n->files}
{if $n->tags}
<div class="tags">{str tag=tags}: {list_tags tags=$n->tags owner=$n->owner}</div>
{/if}
<div id="n{$n->id}_desc" class="hidden detail">{$n->description|clean_html|safe}
{if $n->files}
<div id="notefiles_{$n->id}">
<table class="attachments fullwidth">
<col width="5%">
<col width="40%">
<col width="55%">
<thead class="expandable-head">
<tr>
<th colspan="3"><a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a></th>
<th colspan="2"><a class="toggle" href="#">{str tag=attachedfiles section=artefact.blog}</a></th>
</tr>
</thead>
<tbody class="expandable-body">
{foreach from=$n->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>
<td class="icon-container"><img src="{$file->icon}" alt=""></td>
<td class="valign">
<div><a href="{$WWWROOT}artefact/file/download.php?file={$file->attachment}">{$file->title}</a></div>
<div class="detail s">{$file->description}</div>
</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
</div>
{/if}
</div>
</td>
<td>
{foreach from=$n->blocks item=b}
<div>
<div class="detail">
{$b.blocktitle|str_shorten_text:30:true}
</div>
{/foreach}
</td>
<td>
{foreach from=$n->views item=v}
<div>
<div class="detail">
<a href="{$v.fullurl}">{$v.viewtitle|str_shorten_text:30:true}</a>
{if $v.ownername} - {str tag=by section=view} {if $v.ownerurl}<a href="{$v.ownerurl}">{/if}{$v.ownername}{if $v.ownerurl}</a>{/if}{/if}
</div>
{if $v.extrablocks}
{for i 1 $v.extrablocks}
<div>&nbsp;</div>
<div class="detail">&nbsp;</div>
{/for}
{/if}
{/foreach}
......
......@@ -16,8 +16,8 @@
#taskslist td.completed,
#taskslist td.incomplete {
text-align: center;
padding-top: 7px;
padding-top: 8px;
}
.plantaskdescription p {
margin: 0 0 10px;
margin: 0 0 5px;
}
\ No newline at end of file
......@@ -2050,7 +2050,6 @@ function addfriend_form($friendid) {
'elements' => array(
'addfriend_submit' => array(
'type' => 'submit',
'class' => 'linkbtn',
'value' => get_string('addtofriendslist', 'group'),
),
'id' => array(
......
......@@ -491,8 +491,8 @@ form#buttons table#suspendedlist {
margin-left: 20px;
}
#adduser table th {
white-space: nowrap;
padding-top: 8px;
white-space: nowrap;
}
#adduser .step1 table th label {
font-weight: normal;
......@@ -525,6 +525,9 @@ form#buttons table#suspendedlist {
padding: 10px;
display: table-cell;
}
#adduser select#adduser_authinstance {
max-width: 160px;
}
#adduser .step3 {
background: #EFEFEF;
width: 25%;
......
......@@ -375,6 +375,9 @@ div.warning,
.dull {
color: #707070;
}
.tags {
margin: 20px 0 10px 0;
}
/* some common listing text styles */
.title,
.title:first-child {
......@@ -2262,17 +2265,6 @@ tr#unzip_artefact_submit_container td {
#postlist h2 {
margin: 0 0 5px 0;
}
.ie9 #postlist input.publish {
padding: 3px 5px 3px 5px;
}
.ie8 #postlist input.publish {
padding: 3px 5px 3px 5px;
}
@media screen and (-webkit-min-device-pixel-ratio:0) {
#postlist input.publish {
padding: 4px 5px 3px 5px;
}
}
#postlist .poststatus {
font-weight: bold;
white-space: nowrap;
......@@ -2308,9 +2300,16 @@ tr#unzip_artefact_submit_container td {
}
/* attachments */
table.attachments {
border: 2px solid #DDDDDD;
border: 1px solid #DDDDDD;
background-color: #DDDDDD;
margin: 3px 0;
margin: 5px 0;
}
table.attachments thead td {
font-size: 1.167em;
line-height: 19px;
}
table.attachments .title {
font-size: 1em;
}
/* Content > Journals > Edit */
/* Content > Notes > Edit */
......@@ -2341,10 +2340,20 @@ table.attachments {
tr.incomplete td {
background: #FEE7E7;
}
#planslist .detail p:first-child {
margin-top: 0;
}
.completiondate,
.plantasktitle,
.plantaskdescription {
padding-top: 8px;
}
/* Content > My notes */
#notes td.notetitle .detail iframe {
overflow-x: hidden;
width: 100%!important;
}
#notes td.notetitle {
width: 40%;
}
#notes .detail p {
margin: 5px 0;
......@@ -2622,6 +2631,9 @@ fieldset#pagestoadd tr#addviews_submit_container td {
padding: 10px 0;
}
/* Portfolio > Shared by me */
table.accesslists {
margin-bottom: 20px;
}
.accesslists .accesslist {
width: 40%;
}
......@@ -3192,6 +3204,7 @@ ul.groupuserstatus li.jointhisgroup {
ul.groupuserstatus li.jointhisgroup form {
display: inline-block;
margin: 0;
padding: 3px 5px 1px 5px;
}
ul.groupuserstatus li.jointhisgroup table td input,
ul.groupuserstatus li.jointhisgroup table td input:hover,
......@@ -3219,6 +3232,9 @@ ul.groupuserstatus li.requesttojoin {
display: block;
text-align: right;
}
ul.groupuserstatus li.requesttojoin a {
line-height: 2.167em;
}
/* Groups > Group's Edit */
#editgroup fieldset tr.html {
background: #EEEEEE;
......@@ -3478,59 +3494,68 @@ ul.actionlist li {
}
ul.actionlist li.notbtn,
ul.actionlist li.nofriend {
padding: 5px 0 3px 0;
padding: 0 0 3px 0;
font-weight: bold;
}
ul.actionlist li.denyrequest a,
ul.actionlist li.editgroup a,
ul.actionlist li.friend a,
ul.actionlist li.messages a,
ul.actionlist li.removefriend a,
ul.actionlist li form input.submit {
/* default state */
ul.actionlist li form input.submit,
ul.actionlist li a {
border: 1px solid #DADADA;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
padding: 7px 5px 7px 25px;
display: block;
color: #333333;
text-decoration: none;
background-color: #F7F7F7;
background-position: 7px 50%;
background-repeat: no-repeat;
color: #333333;
}
ul.actionlist li.denyrequest a:hover,
ul.actionlist li.editgroup a:hover,
ul.actionlist li.friend a:hover,
ul.actionlist li.messages a:hover,
ul.actionlist li.removefriend a:hover,
ul.actionlist li form input.submit:hover {
ul.actionlist li form input.submit {
padding: 6px 5px 6px 23px;
cursor: pointer;
width: 100%;
text-align: left;
}
/* hover state */
ul.actionlist li form input.submit:hover,
ul.actionlist li a:hover {
background-color: #ffffff;
color: #000000;
}
ul.actionlist li.denyrequest a:active,
ul.actionlist li.editgroup a:active,
ul.actionlist li.friend a:active,
ul.actionlist li.messages a:active,
ul.actionlist li.removefriend a:active,
ul.actionlist li form input.submit:active {
/* focus state */
ul.actionlist li form input.submit:focus,
ul.actionlist li a:focus {
background-color: #ffffff;
outline: none;
}
/* active state */
ul.actionlist li form input.submit:active,
ul.actionlist li a:active {
background-color: #989898;
color: #FFFFFF;
opacity: 0.9;
border: 1px solid #e3e3e3;
}
/* except the member of group link */
ul.actionlist li.notbtn a {
font-weight: normal;
background: none;
border: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
padding: 0;
display: inline;
}
/* icons for buttons */
ul.actionlist li.approvefriend form input {
background-image: url(../images/approve_small.png);
}
ul.actionlist li.friend form input {
background-image: url(../images/friend_small.png);
}
ul.actionlist li form input.submit {
padding: 5px 5px 5px 23px;
cursor: pointer;
width: 100%;
text-align: left;
}
/* Groups > My/Find Friends > Deny friend page */
form#denyrequest {
padding: 5px;
......@@ -3956,7 +3981,7 @@ ul.searchtab li span.inactive {
font-weight: normal;
}
#results .tags {
margin: 3px 0;
margin: 10px 0 3px 0;
}
/* My tags page > Edit tags */
.edittags h3 {
......@@ -4040,7 +4065,6 @@ ul.searchtab li span.inactive {
position: absolute;
top: 5px;
right: 5px;
width: 24px;
}
.wallpost .userinfo {
margin: 3px 30px;
......
......@@ -6,7 +6,7 @@
<div class="postedon">{$result->ctime}</div>
<div class="detail">{$result->description|str_shorten_html:100|strip_tags|safe}</div>
{if $result->tags}
<div class="tags"><label>{str tag=tags}:</label> {list_tags tags=$result->tags owner=$owner}</div>
<div class="tags">{str tag=tags}: {list_tags tags=$result->tags owner=$owner}</div>
{/if}
</div>
</div>
......
......@@ -12,30 +12,25 @@
<p>{str tag=sitefontsdescription section=skin}</p>
{$form|safe}
{if $sitefonts}
<table id="fontlist" class="fullwidth listing">
<tbody>
<div id="fontlist" class="fullwidth listing">
{foreach from=$sitefonts item=font}
<tr class="{cycle values='r0,r1'}">
<td>
<div class="{cycle values='r0,r1'} listrow">
<h3 class="title">{$font.title}</h3>
<div style="font-family:'{$font.title|escape_css_string}';font-size:{$size}pt;line-height:{$size}pt;padding:3px 0;">
{if $preview == 10}{$font.title}{/if}