Commit ec377090 authored by Evonne Cheung's avatar Evonne Cheung Committed by Richard Mansfield
Browse files
parent cecc06c0
......@@ -2,9 +2,9 @@
<h2>{$artefacttitle|safe}</h2>
{/if}
{$description|clean_html|safe}
{if $tags}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$owner tags=$tags}</div>{/if}
<div id="blogdescription">{$description|clean_html|safe}
{if $tags}<p class="tags s"><label>{str tag=tags}:</label> {list_tags owner=$owner tags=$tags}</p>{/if}
</div>
<table id="postlist_{$blockid}" class="postlist">
<tbody>
{$posts.tablerows|safe}
......
{**
* This template displays a blog post.
*}
<div>
<div id="blogpost">
{if $artefacttitle}<h3>{$artefacttitle|safe}</h3>{/if}
<div>{$artefactdescription|clean_html|safe}</div>
{$artefactdescription|clean_html|safe}
{if isset($attachments)}
<table class="cb attachments fullwidth">
<tbody>
......
......@@ -8,7 +8,7 @@
<a class="btn" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">{str section="artefact.blog" tag="addpost"}</a>
</div>
<div id="blogdescription"><p>{clean_html($blog->get('description'))|safe}</p>
<div id="blogdescription">{clean_html($blog->get('description'))|safe}
{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}
......
......@@ -2,10 +2,10 @@
<tr>
<td>
<h3><a href="{$WWWROOT}view/artefact.php?artefact={$post->id}&view={$options.viewid}">{$post->title}</a></h3>
<div>{$post->description|clean_html|safe}</div>
<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>
{/if}
<p class="tags s"><label>{str tag=tags}:</label> {list_tags owner=$post->owner tags=$post->tags}</p>
{/if}</div>
{if $post->files}
<table class="cb attachments fullwidth">
<tbody>
......
......@@ -1599,7 +1599,7 @@ class ArtefactTypeImage extends ArtefactTypeFile {
return array('html' => $smarty->fetch('artefact:file:image_render_self.tpl'), 'javascript' => '');
}
$result = parent::render_self($options);
$result['html'] = '<div class="fr filedata-icon" style="text-align: center;"><h4>'
$result['html'] = '<div class="fl filedata-icon"><h4>'
. get_string('Preview', 'artefact.file') . '</h4><a href="'
. hsc($url) . '"><img src="' . hsc($downloadpath) . '&maxwidth=400&maxheight=180'
. '" alt=""></a></div>' . $result['html'];
......
<div>
<div class="fl filedata-icon"><a href="{$downloadpath}"><img src="{$iconpath}" alt="{$description}"></a></div>
<h4><a href="{$downloadpath}">{$title}</a></h4>
<h4><div class="fl filedata-thumb"><a href="{$downloadpath}"><img src="{$iconpath}" alt="{$description}"></a></div> <a href="{$downloadpath}">{$title}</a></h4>
</div>
<table class="filedata">
......
<div>
{if !$simpledisplay}<h3>{$title}</h3>{/if}
<div>{$description}</div>
<p>{$description}</p>
{if $tags}<div class="tags"><label>{str tag=tags}:</label> {list_tags owner=$owner tags=$tags}</div>{/if}
<div>
<div id="commentfiles">
{if (isset($children))}
<h3>{str tag=contents section=artefact.file}:</h3>
<table class="fullwidth">
......
......@@ -5,9 +5,7 @@
{foreach from=$items item=i}
<tr class="{cycle values='r0,r1'}">
<td class="icon-container">
<div class="icon">
<img src="{theme_url filename=cat('images/' $i->type '.gif')}" />
</div>
</td>
<td>
{if $i->message}
......@@ -26,6 +24,7 @@
</table>
{if $desiredtypes}
<a class="morelink" href="{$WWWROOT}account/activity?type={$desiredtypes}">{str tag=More section=blocktype.inbox} &raquo;</a>
<div class="cb"></div>
{/if}
<script>
{literal}
......
......@@ -5,7 +5,7 @@
<td class="{cycle values='r0,r1'}">
<h4><a href="{$WWWROOT}group/view.php?id={$item->id}">{$item->name}</a> - {$item->roledisplay}</h4>
{if $item->description}
{$item->description|str_shorten_html:100:true|safe}
<div class="details">{$item->description|str_shorten_html:100:true|safe}</div>
{/if}
</td>
</tr>
......
......@@ -5,7 +5,7 @@
<td><h4><a href="{$WWWROOT}view/view.php?id={$view.id}">{$view.title}</a></h4>
<div class="details">{$view.shortdescription|safe|clean_html}</div></td>
{if $view.sharedby}
<td>
<td class="right">
{if $view.group && $loggedin}
<a href="{$WWWROOT}group/view.php?id={$view.group}" class="s">{$view.sharedby}</a>
{elseif $view.owner && $loggedin}
......
{if $foruminfo}
<table class="fullwidth">
<table class="fullwidth" id="latestforumposts">
{foreach from=$foruminfo item=postinfo}
<tr class="{cycle values='r0,r1'}">
<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 class="valign s center"><a href="{$WWWROOT}user/view.php?id={$postinfo->poster}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=16&amp;id={$postinfo->poster}" alt=""><br />{$postinfo->poster|display_name|escape}</a>
</td>
</tr>
{/foreach}
......
......@@ -5,8 +5,7 @@
<tr class="{cycle values='r0,r1'}">
<td><strong><a href="{$WWWROOT}interaction/forum/topic.php?id={$postinfo->topic}#post{$postinfo->id}">{$postinfo->topicname}</a></strong><br />
<div class="s">{$postinfo->body|str_shorten_html:100:true|safe}</div></td>
<td class="valign s"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$postinfo->poster}" alt="">
<a href="{$WWWROOT}user/view.php?id={$postinfo->poster}">{$postinfo->poster|display_name|escape}</a></td>
<td class="valign s center"><a href="{$WWWROOT}user/view.php?id={$postinfo->poster}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$postinfo->poster}" alt=""><br />{$postinfo->poster|display_name|escape}</a></td>
</tr>
{/foreach}
</table>
......
<div id="wall" class="wall">
{if $wallmessage}
<p>{$wallmessage}</p>
<p class="message">{$wallmessage}</p>
{/if}
{if $wallposts}
{foreach from=$wallposts item=wallpost}
......
......@@ -353,6 +353,10 @@ div.grippie {
background: #eee;
border-right: 4px solid #FFF;
}
.memberssearch .membershiptypes {
margin-right: 20px;
display: inline;
}
.memberssearch form, .memberssearch form div {
display: inline;
}
......@@ -521,6 +525,8 @@ div.btn-del input.submit, input.submit.btn-del, div.btn-add input.submit, input.
right: 0;
top: 0;
line-height: 2.1em;
* width: 1;
* overflow: visible;
}
.viewheader .rbuttons {
line-height: 1.8em;
......@@ -699,19 +705,32 @@ a.btn-big-del {
background: url(../images/icon-collection.gif) no-repeat left 1px;
padding-left: 15px;
}
tr.expandable-head,
tr.expandable-head td {
border-bottom: 0;
}
tr.expandable-body td {
padding-left: 10px;
font-size: .9167em;
padding-top: 0;
padding-left: 17px;
}
td.toggle.expandable {
width: 1em;
height: 1em;
td.expandable {
width: 10px;
height: 10px;
padding-left: 16px;
background: url(../images/icon_fieldset_left.gif) 2px center no-repeat;
cursor: pointer;
background-image: url(../images/icon_fieldset_left.gif);
background-repeat: no-repeat;
background-position: 3px 6px;
}
td.toggle.expandable.expanded {
background: url(../images/icon_fieldset_down.gif) 2px center no-repeat;
td.expanded {
width: 10px;
height: 10px;
padding-left: 16px;
cursor: pointer;
background-image: url(../images/icon_fieldset_down.gif);
background-repeat: no-repeat;
background-position: 3px 6px;
}
div.pagetabs {
top: 10px !important;
......@@ -752,7 +771,7 @@ div.rbuttons .small-logo {
padding: 0;
}
.viewheadertop .links {
padding: 3px 0 0 5px;
padding: 3px 0 3px 5px;
font-size: .9167em;
}
.viewheadertop .links a {
......@@ -987,7 +1006,7 @@ ul.in-page-tabs li.fr {
padding: 0;
}
.main-column ul li {
margin: 0 0 3px 15px;
margin: 0 0 3px 20px;
}
/* system messages between nav and main content */
#messages {
......@@ -1431,7 +1450,7 @@ table.attachments {
.attachments tbody th {
text-align: left;
background-color: #ddd;
padding: 3px 5px;
padding: 0 5px;
border: 0;
color: #333 !important;
}
......
......@@ -201,7 +201,7 @@ body:last-child:not(:root:root) .newblockhere {
}
/** viewing artefact */
#view .filedata-icon.fr {
#view .filedata-icon {
background: #F6F6F6;
border: 1px solid #CCCCCC;
}
......@@ -232,9 +232,22 @@ body:last-child:not(:root:root) .newblockhere {
* html .viewlist {
width: 98%;
}
.viewlist h4 {
margin-bottom: 0;
}
#userviewstable .details,
.viewlist .details {
line-height: 1.4em;
line-height: 1.3333em;
padding-top: 3px;
font-size: .9167em;
}
#usergroupstable h4 {
margin-bottom: 0;
}
#usergroupstable .details {
line-height: 1.3333em;
padding-top: 3px;
font-size: .9167em;
}
......
......@@ -3,15 +3,17 @@
<div>{$instructions|clean_html|safe}</div>
<div class="memberssearch">
{if $membershiptypes}
<div class="membershiptypes">
{foreach from=$membershiptypes item=item implode="&nbsp;|&nbsp;"}
{if $item.link}
<strong><a href="{$item.link}">{$item.name}</a></strong>
<strong><a href="{$item.link}">{$item.name}</a></strong>
{else}
<strong>{$item.name}</strong>
{/if}
{/foreach}<br />
{/foreach}
</div>
{/if}
<strong>{str tag=search}:</strong> {$form|safe}
<label>{str tag=search}:</label> {$form|safe}
</div>
<div class="cb"></div>
{if $membershiptype}<h3>{str tag=pendingmembers section=group}</h3>{/if}
......
......@@ -30,8 +30,7 @@
</div>
{if $viewthemes}
<div id="middle-pane">
<div class="center">
<div id="middle-pane" class="center">
<label for="viewtheme-select">{str tag=theme}: </label>
<select id="viewtheme-select" name="viewtheme">
<option value="">{str tag=choosetheme}</option>
......
......@@ -21,7 +21,7 @@
</div>
{/if}
<p id="view-description">{$viewdescription|clean_html|safe}</p>
<div id="view-description">{$viewdescription|clean_html|safe}</div>
<div id="view" class="cb">
<div id="bottom-pane">
......
......@@ -25,7 +25,7 @@
}
/* just the bottom pane when not editing */
#bottom-pane {
margin: 5px 0;
margin: 0 0 5px 0;
}
/********************** Top pane of Edit View *************************/
#page {
......@@ -328,7 +328,7 @@ html>body #column-container {
/* Wall */
.blockinstance-content #wall {
margin: 5px 0;
margin: 10px 0 3px 0;
}
/* Image Blockinstance */
......@@ -379,10 +379,11 @@ html>body #column-container {
.postlist td h3 a {
text-decoration: none;
}
.blockinstance-content div.tags {
.blockinstance-content .tags {
font-size: .9167em;
line-height: 1.5em;
padding-top: 3px;
padding-bottom: 3px;
margin-bottom: 0 !important;
}
.blockinstance-content div.artefacts {
font-size: .9167em;
......@@ -405,8 +406,16 @@ html>body #column-container {
margin: 5px 0 0 0 !important;
border: 0 !important;
}
.postlist td div p {
margin: 0 0 10px 0 !important;
#blogpost .tags {
font-size: .9167em;
padding-top: 3px;
padding-bottom: 3px;
margin-bottom: 0 !important;
}
#blogpost .postdetails {
padding: 3px 3px 10px 3px !important;
font-size: .9167em;
line-height: 1.1667em;
}
/* group homepage */
......@@ -417,7 +426,7 @@ html>body #column-container {
margin: 0;
}
.grouphomepage .bt-groupviews .groupviewsection {
margin: 5px 0;
margin: 5px 0 10px 0;
}
/* Slideshow */
......@@ -528,6 +537,9 @@ ul.artefactchooser-subtabs li.current a:active {
.maharatable tbody td {
padding: 0 0 5px 0;
}
.maharatable .filebrowser tbody td {
padding: 3px 5px;
}
.maharatable tbody td.errmsg {
padding: 3px 5px 3px 24px;
}
......@@ -632,7 +644,7 @@ ul.artefactchooser-subtabs li.current a:active {
}
#view-description {
margin: 10px 0;
margin: 0 0 20px 0;
padding: 0;
}
......@@ -802,22 +814,24 @@ div.colnav-extra {
}
/** viewing artefact */
#view .filedata-icon.fr {
#view .filedata-icon {
padding: 5px 10px 10px 10px;
margin: 0 0 10px 0;
margin: 0 15px 10px 0;
text-align: center;
}
#view .filedata-icon h4 {
font-size: .9167em;
margin: 0;
}
#view .filedata-icon.fl {
margin: 3px 0 0 0;
#view .filedata-thumb {
margin: 0;
}
#view table.filedata th {
padding: 0 5px 0 0;
padding: 3px 5px 3px 0;
line-height: 1.3333em;
}
#view table.filedata td {
padding: 0 5px;
padding: 3px 5px;
}
......@@ -890,6 +904,9 @@ table td div.plan_completed {
#userview {
border-bottom: 1px dotted #d1d1d1;
}
#latestforumposts td h4 {
margin-bottom: 0;
}
table.resumecomposite {
width: 100%;
......@@ -900,4 +917,21 @@ table.resumecomposite {
.filedownload-item {
margin-bottom: 5px;
}
.filedownload-item h4 {
margin-bottom: 0 !important;
}
#blogdescription {
margin: 0 0 10px 0;
}
#blogdescription p {
margin: 0;
}
td.icon-container {
vertical-align: top;
width: 16px;
* width: 25px;
}
\ No newline at end of file
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