Commit 8dc79e19 authored by Evonne Cheung's avatar Evonne Cheung Committed by Hugh Davenport
Browse files

interaction/forum: Theme update



Responsive theme

Bug #1041645

Change-Id: I74e6de26ddbbdb12271f061d35aa652cb7dee967
Signed-off-by: default avatarHugh Davenport <hugh@catalyst.net.nz>
parent bd0eed54
/**
* CSS rules for the forum interaction plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* Edit and Delete in list */
.btn-spacer a {
padding-left: 12px;
}
/* Forum list */
#forumslist th{
border-bottom: 1px solid #14436F;
}
/* Topic list */
#forumtopicstable th {
border-bottom: 1px solid #14436F;
}
/* topic types */
.stickytopic td {
background-color: #ceeafe;
}
/* admin & moderator */
.groupadmin {
color: #3366CC;
}
.moderator {
color: #993399;
}
/* Posts */
.forumpost {
background-color: #f4f7f9;
}
/**
* CSS rules for the forum interaction plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* Forum list */
#forumslist,
#forumslist th{
border-bottom: 1px solid #ccc;
}
/* Topic list */
#viewforum {
border: 1px solid #eee;
}
#forumtopicstable,
#forumtopicstable th {
border-bottom: 1px solid #ccc;
}
/* topic types */
.stickytopic td {
background-color: #fffcd8;
border-bottom: 1px solid #FFFFFF;
}
/* admin & moderator */
.groupadmin {
color: #3366CC;
}
.moderator {
color: #993399;
}
/* Posts */
.forumpost {
border: 3px solid #F3F7EC;
}
.forumsubject {
border-bottom: 0;
background: #e9f1dc;
}
.forumsubject h6, .forumsubject h6 a {
color: #1E6297;
}
.forumpostleft {
border-right: 1px solid #F3F7EC;
background: #F3F7EC;
}
.forumpostleft .posttime {
color: #888;
}
.forumpostleft .author p.poster {
color: #888;
}
.postbtns {
color: #d1d1d1;
}
.deletedpost {
color: #666666;
}
/**
* CSS rules for the forum interaction plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* Forum list */
#forumslist th{
border-bottom: 1px dotted #BEE3F1;
}
/* Topic list */
#forumtopicstable th {
border-bottom: 1px dotted #BEE3F1;
}
/* topic types */
.stickytopic td {
background-color: #10171A;
}
/* admin & moderator */
.groupadmin {
color: #3366CC;
}
.moderator {
color: #993399;
}
/* Posts */
.forumpost {
border: 0;
background-color: #10171A;
}
.forumsubject {
background: #0e0e0e;
border-bottom: 0;
}
.forumpostleft {
background-color: #000000;
border-right: 0;
}
.forumpostleft h5 {
color: #BEE3F1;
}
.posttime {
color: #BEE3F1;
}
.postedits {
padding: 10px;
background: #000;
}
#viewforum div.pagination {
background: none;
}
......@@ -4,7 +4,7 @@
{$editform|safe}
<h4>{str tag="replyto" section="interaction.forum"}</h4>
<div class="replyto"><h4>{str tag="replyto" section="interaction.forum"}</h4>
{include file="interaction:forum:simplepost.tpl" post=$parent groupadmins=$groupadmins}
</div>
{include file="footer.tpl"}
{include file="header.tpl"}
<h3>{str tag="nameplural" section=interaction.forum}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h3>
{if $admin}
<div id="forumbtns" class="rbuttons">
<div id="forumbtns">
<a href="{$WWWROOT}interaction/edit.php?group={$groupid}&amp;plugin=forum" class="btn newforum">{str tag="newforum" section=interaction.forum}</a>
</div>
{/if}
<h2>{str tag="nameplural" section=interaction.forum}{if $publicgroup}<a href="{$feedlink}"><img class="feedicon" src="{theme_url filename='images/rss.gif'}"></a>{/if}</h2>
{if $forums}
<div id="viewforum"><table id="forumslist" class="fullwidth nohead">
<tr>
<th>{str tag="name" section="interaction.forum"}</th>
<th class="center">{str tag="Topics" section="interaction.forum"}</th>
<th></th>
<th></th>
<th class="subscribeth"></th>
<th class="right btns2"></th>
</tr>
{foreach from=$forums item=forum}
<tr class="{cycle values='r0,r1'}">
......@@ -31,14 +30,12 @@
</div>
{/if}
</td>
<td class="center" width="15%">{$forum->topiccount}</td>
<td class="center">{$forum->topiccount}</td>
<td class="nowrap s subscribetd">{if $forum->subscribe}{$forum->subscribe|safe}{/if}</td>
<td class="right">
<td class="right btns2">
{if $admin}
<div class="btn-spacer s">
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-edit" title="{str tag=edit}"></a>
<a href="{$WWWROOT}interaction/delete.php?id={$forum->id}&amp;returnto=index" class="icon btn-big-del" title="{str tag=delete}"></a>
</div>
{/if}
</td>
</tr>
......
{if $post->deleted}
<h4 class="deletedpost">{str tag="postbyuserwasdeleted" section="interaction.forum" args=display_name($post->poster)}</h4>
<h5 class="deletedpost">{str tag="postbyuserwasdeleted" section="interaction.forum" args=display_name($post->poster)}</h5>
{else}
<div style="margin-left:auto; margin-right:0px; width:{$width}%">
{if $post->parent}
......@@ -8,9 +8,9 @@
{include file="interaction:forum:simplepost.tpl" post=$post groupadmins=$groupadmins nosubject=true}
{/if}
<div class="postbtns">
{if ($moderator || ($membership && !$closed)) && $ineditwindow}<span class="btn"><a href="{$WWWROOT}interaction/forum/editpost.php?parent={$post->id}" class="icon btn-reply">{str tag="Reply" section=interaction.forum}</a></span>{/if}
{if $post->canedit}<span class="btn"><a href="{$WWWROOT}interaction/forum/editpost.php?id={$post->id}" class="icon btn-edit"> {str tag="edit"}</a></span>{/if}
{if $moderator && $post->parent} <span class="btn"><a href="{$WWWROOT}interaction/forum/deletepost.php?id={$post->id}" class="icon btn-del"> {str tag="delete"}</a></span>{/if}
{if ($moderator || ($membership && !$closed)) && $ineditwindow}<a href="{$WWWROOT}interaction/forum/editpost.php?parent={$post->id}" class="btn"><span class="btn-reply">{str tag="Reply" section=interaction.forum}</span></a>{/if}
{if $post->canedit}<a href="{$WWWROOT}interaction/forum/editpost.php?id={$post->id}" class="btn"><span class="btn-edit">{str tag="edit"}</span></a>{/if}
{if $moderator && $post->parent} <a href="{$WWWROOT}interaction/forum/deletepost.php?id={$post->id}" class="btn"><span class="btn-del">{str tag="delete"}</span></a>{/if}
</div>
</div>
{/if}
......@@ -2,11 +2,6 @@
<table class="forumpost fullwidth">
{if $post->subject && !$nosubject}
<tr>
<td colspan="2" class="forumsubject"><h6>{if $post->id}<a href="#post{$post->id}">{$post->subject}</a>{else}{$post->subject}{/if}</h6></td>
</tr>
{/if}
<tr>
<td class="forumpostleft">
<div class="author">
......@@ -15,10 +10,13 @@
{if $post->postcount}<div class="postcount">{$post->postcount}</div>{/if}
</div>
</td>
<td class="postedits">
<div class="posttime">{$post->ctime}</div>{$post->body|clean_html|safe}
<td class="postedits">
{if $post->subject && !$nosubject}
<div class="forumsubject"><h5>{if $post->id}<a href="#post{$post->id}">{$post->subject}</a>{else}{$post->subject}{/if}</h5></div>
{/if}
<div class="posttime">{$post->ctime}</div>{$post->body|clean_html|safe}
{if $post->edit}
<h5>{str tag="editstothispost" section="interaction.forum"}</h5>
<div class="editstopost"><h5>{str tag="editstothispost" section="interaction.forum"}</h5>
<ul>
{foreach from=$post->edit item=edit}
<li>
......@@ -29,11 +27,11 @@
>
<img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$edit.editor}" alt="">
{$edit.editor|display_name}
</a>
{$edit.edittime}
</a> - <span class="posttime">{$edit.edittime}</span>
</li>
{/foreach}
</ul>
</div>
{/if}
</td>
</tr>
......
/**
* CSS rules for the forum interaction plugin
*
* Copyright (C) 2006-2009 Catalyst IT
* Copyright (C) 2006-2012 Catalyst IT
* This file is distributed under the same terms as Mahara itself
*/
/* top buttons */
#forumbtns {
right: 10px;
top: 10px;
* top: -30px;
* right: 0;
}
* html #forumbtns {
right: 30px;
line-height: 2em;
float: right;
}
#forumbtns a.btn {
* display: block;
* float: left;
display: block;
float: left;
}
#forumbtns .editforum {
font-weight: bold;
}
#subscribe_forum div.btn-subscribe input.submit {
* display: block;
* float: left;
* filter: none;
}
#subscribe_forum span.help a img {
* zoom: 1;
* display: block;
* float: left;
#subscribe_forum, #subscribe_forum div {
display: inline-block;
}
/* forum description */
#forumdescription {
margin: 5px 0;
clear: both;
}
/* Edit and Delete in list */
.btn-spacer a {
margin-left: 10px;
}
.btn-spacer a.btn-big-del {
margin-left: 3px;
margin: 0 0 10px 0;
}
/* Forum list */
#forumslist{
border-bottom: 1px solid #ccc;
}
#forumslist th{
border-bottom: 1px solid #ccc;
}
#forumslist table th,
#forumslist table td {
#forumslist .subscribetd table th, #forumslist .subscribetd table td {
background: none;
padding-top: 0;
border: 0;
......@@ -66,60 +38,33 @@
#forumslist td .inlinelist span {
font-weight: bold;
}
#forumslist td.right {
width: 60px;
}
/* Topic list */
#viewforum {
padding: 10px;
margin: 0;
border: 1px solid #eee;
}
#viewforum h3 {
font-size: 1.3333em;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
}
#viewforum .rbuttons {
right: 10px;
top: 10px;
* top: -30px;
* right: 0;
}
* html #viewforum .rbuttons {
right: 35px;
margin-top: -28px;
}
/* to get user picts to align with text */
.forumuser,
.inlinelist a img {
vertical-align: top;
.forumuser, .inlinelist a img {
vertical-align: middle;
}
/* topic types */
.stickytopic td {
background-color: #fffcd8;
border-bottom: 2px solid #fff;
.postertd a img {
vertical-align: middle;
}
#forumtopicstable h4 {
/* topic types */
#forumtopicstable h5 {
margin: 0;
}
#forumtopicstable td.narrow {
width: 15px;
}
@media screen and (-webkit-min-device-pixel-ratio:0){
#forumtopicstable td div.btn-spacer {
width: 50px;
text-align: right;
}
}
#forumtopicstable td br {
line-height: .3333em;
}
#forumtopicstable td.right {
width: 60px;
}
/* Forum Pagination */
#viewforum div.pagination {
background: #eee;
margin: 0;
padding: 5px 3px;
}
......@@ -130,6 +75,7 @@
/* Forum Action Selector */
.forumselectwrap {
padding: 10px 0 0 0;
font-size: 0.9167em;
}
/* Forum footer */
.forumfooter {
......@@ -141,65 +87,40 @@
padding: 5px;
margin: 5px 0;
}
.forummods .inlinelist {
vertical-align: middle;
}
.forummods a {
margin-right: 5px;
}
.groupadmin {
}
.moderator {
}
/* Posts */
.closed {
margin: 0 0 10px 0;
font-style: italic;
}
.forumpost {
border: 2px solid #eee;
clear: both;
}
.forumsubject {
border-bottom: 2px solid #eee;
background: #eee;
}
.forumsubject h6 {
margin: 0 !important;
}
.forumpostleft {
width: 160px;
border-right: 2px solid #eee;
text-align: center;
font-size: .9167em;
background: #eeeeee;
.forumsubject h5 {
margin: 0;
}
.postedits .posttime {
color: #888;
font-size: .9167em;
font-size: .9167em;
}
.forumpostleft .author img {
margin: 3px 5px 3px 3px;
margin: 3px 5px 3px 3px;
}
.forumpostleft .author .poster {
color: #888;
margin: 0;
margin: 0;
}
.forumpostleft .author .postcount {
font-weight: normal;
margin: 0;
color: #888;
margin: 0;
}
.postedits {
padding: 10px;
background: #FFF;
}
.postbtns {
font-size: .9167em;
text-align: right;
color: #d1d1d1;
margin: 5px 0 10px 0;
margin: 3px 0 10px 0;
}
.postbtns a {
text-decoration: none;
......@@ -209,15 +130,37 @@
margin-left: 0;
}
.deletedpost {
color: #666666;
margin-top: 0;
margin-top: 0;
font-style: italic;
font-weight: normal;
padding: 5px 10px;
}
.postreply {
padding: 0 0 0 10px;
}
.editstopost {
padding: 5px 10px;
}
.editstopost h5 {
margin: 0;
}
.editstopost ul {
list-style: none;
margin: 0;
padding: 0;
}
.editstopost ul li {
padding: 0;
margin: 0 0 3px 0;
}
.editstopost ul li a {
font-size: 0.9167em;
}
.editstopost ul li a img {
vertical-align: sub;
}
/* Post and topic editing*/
.timeleftnotice {
margin-top: 0.8em;
font-size: .9167em;
}
\ No newline at end of file
margin-top: 0.8em;
font-size: .9167em;
}
{include file="header.tpl"}
<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">
<div id="forumbtns">
{if $topic->canedit}
<a href="{$WWWROOT}interaction/forum/edittopic.php?id={$topic->id}" class="btn editforum">{str tag=edittopic section=interaction.forum}</a>
{if $moderator}
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}" class="btn">{str tag=deletetopic section=interaction.forum}</a>
<a href="{$WWWROOT}interaction/forum/deletetopic.php?id={$topic->id}" class="btn deletetopic">{str tag=deletetopic section=interaction.forum}</a>
{/if}
{/if}
{if !$topic->forumsubscribed}
......@@ -15,6 +13,8 @@
{/if}
</div>
{/if}
<h2>{str tag=nameplural section=interaction.forum} &gt; <a href="{$WWWROOT}interaction/forum/view.php?id={$topic->forumid}">{$topic->forumtitle}</a></h2>
<h3>{$topic->subject}</h3>
{if $topic->closed}
<div class="message closed">{str tag=topicisclosed section=interaction.forum}</div>
......
......@@ -4,7 +4,7 @@
{else}
<tr class="{cycle values='r0,r1'}">
{/if}
<td>
<td class="narrow center">
{if $topic->closed}<img src="{$closedicon}" alt="{str tag="Closed" section="interaction.forum"}">{/if}
{if $topic->subscribed}<img src="{$subscribedicon}" alt="{str tag="Subscribed" section="interaction.forum"}">{/if}
</td>
......@@ -13,27 +13,25 @@
<input type="checkbox" name="checked[{$topic->id}]" class="topic-checkbox">
{/if}
</td>
<td>
<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>
<td class="topic">
<h5><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}</h5>
<div class="s">{$topic->body|str_shorten_html:50:true:false|safe}</div>
</td>
<td class="s">
<td class="s postertd">
<a href="{profile_url($topic->poster)}"><img src="{$WWWROOT}thumb.php?type=profileicon&amp;maxsize=20&amp;id={$topic->poster}" alt=""></a>
<a href="{profile_url($topic->poster)}" class="forumuser{if in_array