Commit 4245c555 authored by Naomi Guyer's avatar Naomi Guyer Committed by Aaron Wells
Browse files

BUG - general styling fixes

Bug 1465107: Use Bootstrap CSS Framework

Change-Id: I754032b3288bf5ed743756019e6c1ff6d4c729bf
parent e0d6f1c6
<h3>{str tag=youraverageuser section=admin}</h3>
<ul>
<li>{$data.strmaxfriends|safe}</li>
<li>{$data.strmaxviews|safe}</li>
<li>{$data.strmaxgroups|safe}</li>
<li>{$data.strmaxquotaused|safe}</li>
<ul class="list-group unstyled pull-left">
<li class="list-group-item">{$data.strmaxfriends|safe}</li>
<li class="list-group-item">{$data.strmaxviews|safe}</li>
<li class="list-group-item">{$data.strmaxgroups|safe}</li>
<li class="list-group-item">{$data.strmaxquotaused|safe}</li>
</ul>
{if $data.institutions}
<img src="{$data.institutions}" alt="" />
<img src="{$data.institutions}" alt="" class="pull-right" />
{/if}
{if $viewcount == 0}
<p>{str tag=noviews section=view}</p>
<p class="lead small-text">{str tag=noviews section=view}</p>
{/if}
{if $blocktypecounts}
<p>{str tag=blockcountsbytype section=admin}:
<ul>
<h4>{str tag=blockcountsbytype section=admin}: </h4>
{if $viewtypes}
<img src="{$viewtypes}" alt="" class="pull-right" />
{/if}
<ul class="list-group unstyled pull-left">
{foreach from=$blocktypecounts item=item}
<li>{str tag=title section=blocktype.$item->langsection}: {$item->blocks}</li>
<li class="list-group-item">{str tag=title section=blocktype.$item->langsection}: {$item->blocks}</li>
{/foreach}
</ul>
</p>
{/if}
{if $viewtypes}
<img src="{$viewtypes}" alt="" />
{/if}
{$text|clean_html|safe}
{if $artefact->get('tags')}
<div class="tags">{str tag=tags}: {list_tags owner=$artefact->get('owner') tags=$artefact->get('tags')}</div>
{/if}
{if $addannotationscript}
<script type="text/javascript" src="{$addannotationscript}"></script>
{/if}
{if $annotationfeedbackcount || $annotationfeedbackcount == 0}
{$annotationfeedback|safe}
{/if}
<div id="annotationfeedbackview_{$blockid}">
<div class="annotationfeedback">
{if $annotationfeedbackcount > 0}
{if !$editing}
<a class="annotationfeedbacklink" id="annotation_feedback_link_{$blockid}" href="{$artefacturl}">
{/if}
{str tag=Annotationfeedback section=artefact.annotation} ({$annotationfeedbackcount})
{if !$editing}</a>{/if}
{else}
{if $allowfeedback}
<span id='annotation_feedback_link_{$blockid}' class="noannotationfeedback">{str tag=Annotationfeedback section=artefact.annotation} ({$annotationfeedbackcount})</span>
{/if}
{/if}
{if $allowfeedback && !$editing}
<a id="add_annotation_feedback_link_{$blockid}" class="placeannotationfeedback bar-before" href="">{str tag=placeannotationfeedback section=artefact.annotation}</a>
{$addannotationfeedbackform|safe}
<script type="text/javascript">
var annotationfeedbacklinkinblock = true;
</script>
{/if}
</div>
{if !$editing}
<div class="annotationfeedbacktablewrapper">
<div id="annotationfeedbacktable_{$blockid}" class="annotationfeedbacktable">
{$annotationfeedback->tablerows|safe}
</div>
</div>
{/if}
</div>
\ No newline at end of file
{foreach from=$data item=item}
<div class="{cycle name=rows values='r0,r1'}{if $item->highlight} highlight{/if}{if $item->makepublicform} private{/if}">
<div class="commentleft">
{if $item->author}
<a href="{$item->author->profileurl}">
<img src="{profile_icon_url user=$item->author maxheight=40 maxwidth=40}" valign="middle" alt="{str tag=profileimagetext arg1=$item->author|display_default_name}">
</a>
{else}
<img src="{profile_icon_url user=null maxheight=20 maxwidth=20}" valign="middle" alt="{str tag=profileimagetextanonymous}">
{/if}
</div>
<div class="commentrightwrap">
<div class="fr">
{if $item->makepublicform}<div class="makepublicbtn">{$item->makepublicform|safe}</div>{/if}
{if $item->canedit}
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/annotation/edit.php">
<input type="hidden" name="id" value="{$item->id}">
<input type="hidden" name="viewid" value="{$viewid}">
<input type="image" src="{theme_image_url filename="btn_edit"}" title="{str tag=edit}">
</form>
{/if}
{if $item->deleteform}{$item->deleteform|safe}{/if}
</div>
{if $item->author}
<div class="author">
<a href="{$item->author->profileurl}" class="username">{$item->author|display_name}</a>
<span class="postedon"> - {$item->date} {if $item->updated}[{str tag=Updated}: {$item->updated}]{/if}</span>
</div>
{else}
<div class="author">{$item->authorname}<span class="postedon"> - {$item->date}</span></div>
{/if}
{if $item->deletedmessage}
<div class="deleteddetails">{$item->deletedmessage}</div>
{else}
<div class="detail">{$item->description|safe|clean_html}</div>
{if $item->attachmessage}<div class="attachmessage">{$item->attachmessage}</div>{/if}
{if $item->pubmessage}<div class="privatemessage">{$item->pubmessage}</div>{/if}
{if $item->makepublicrequested}
<div class="requestmessage">{str tag=youhaverequestedpublic section=artefact.annotation}</div>
{/if}
{/if}
</div>
<div class="cb"></div>
</div>
{/foreach}
{include file="header.tpl"}
<p>{$strdescription}</p>
{$form|safe}
{include file="footer.tpl"}
{if count($entryannotations)}
<div class="section fullwidth">
<h2>{str tag=Annotation section=artefact.annotation}</h2>
</div>
{foreach from=$entryannotations item=annotation}
<div class="{cycle name=rows values='r0,r1'} listrow">
<div id="entryannotation" class="indent1">
<div class="importcolumn importcolumn1">
<h3 class="title">
{if $annotation.description}<a class="annotationtitle hidden" href="" id="{$annotation.id}">{/if}
{$annotation.title|str_shorten_text:80:true}
{if $annotation.description}</a>{/if}
</h3>
<div id="{$annotation.id}_desc" class="detail">{$annotation.description|clean_html|safe}</div>
{if $annotation.tags}
<div class="tags">
<strong>{str tag=tags}:</strong> {list_tags owner=0 tags=$annotation.tags}
</div>
{/if}
<div class="annotationfeedback">
<strong>{str tag=Annotationfeedback section=artefact.annotation}:</strong> <a class="showannotationfeedback" href="" id="{$annotation.id}">{str tag=nannotationfeedback section=artefact.annotation arg1=count($annotation.annotationfeedback)}</a>
</div>
</div>
<div class="importcolumn importcolumn2">
{if $annotation.duplicateditem}
<div class="duplicatedannotation">
<strong>{str tag=duplicatedannotation section=artefact.annotation}:</strong> <a class="showduplicatedannotation" href="" id="{$annotation.duplicateditem.id}">{$annotation.duplicateditem.title|str_shorten_text:80:true}</a>
<div id="{$annotation.duplicateditem.id}_duplicatedannotation" class="detail hidden">{$annotation.duplicateditem.html|clean_html|safe}</div>
</div>
{/if}
{if $annotation.existingitems}
<div class="existingannotations">
<strong>{str tag=existingannotation section=artefact.annotation}:</strong>
{foreach from=$annotation.existingitems item=existingitem}
<a class="showexistingannotation" href="" id="{$existingitem.id}">{$existingitem.title|str_shorten_text:80:true}</a><br>
<div id="{$existingitem.id}_existingannotation" class="detail hidden">{$existingitem.html|clean_html|safe}</div>
{/foreach}
</div>
{/if}
</div>
<div class="importcolumn importcolumn3">
{foreach from=$displaydecisions key=opt item=displayopt}
{if !$annotation.disabled[$opt]}
<input id="decision_{$annotation.id}_{$opt}" class="annotationdecision" id="{$annotation.id}" type="radio" name="decision_{$annotation.id}" value="{$opt}"{if $annotation.decision == $opt} checked="checked"{/if}>
<label for="decision_{$annotation.id}_{$opt}">{$displayopt}<span class="accessible-hidden">({$annotation.title})</span></label><br>
{/if}
{/foreach}
</div>
<div class="cb"></div>
</div>
<div id="{$annotation.id}_annotationfeedback" class="indent2 hidden">
{foreach from=$annotation.annotationfeedback item=feedback}
<div id="annotationfeedbacktitle_{$feedback.id}" class="{cycle name=rows values='r0,r1'} listrow {if $feedback.private}private{else}public{/if}">
<div class="importcolumn importcolumn1">
<h4 class="title">
{if $feedback.description}<a class="annotationfeedbacktitle" href="" id="{$feedback.id}">{/if}
{$feedback.title|str_shorten_text:80:true}
{if $feedback.description}</a>{/if}
</h4>
<div id="{$feedback.id}_desc" class="detail hidden">
{$feedback.description|clean_html|safe}
</div>
<span id="annotationfeedbackstatus{$feedback.id}" class="annotationfeedbackstatus">
{if $feedback.private}
{str tag=private section=artefact.annotation}
{else}
{str tag=public section=artefact.annotation}
{/if}
</span>
<div id="annotationfeedbackdetails_{$feedback.id}" class="annotationfeedbackdetails">
{str tag=enteredon section=artefact.annotation} {$feedback.ctime}
</div>
</div>
<div class="importcolumn importcolumn2">
{if $feedback.duplicateditem}
<div class="duplicatedannotationfeedback">
<strong>{str tag=duplicatedannotationfeedback section=artefact.annotation}:</strong> <a class="showduplicatedannotationfeedback" href="" id="{$feedback.duplicateditem.id}">{$feedback.duplicateditem.title|str_shorten_text:80:true}</a>
<div id="{$feedback.duplicateditem.id}_duplicatedannotationfeedback" class="detail hidden">{$feedback.duplicateditem.html|clean_html|safe}</div>
</div>
{/if}
{if $feedback.existingitems}
<div class="existingannotationfeedback">
<strong>{str tag=existingannotationfeedback section=artefact.annotation}:</strong>
{foreach from=$feedback.existingitems item=existingitem}
<a class="showexistingannotationfeedback" href="" id="{$existingitem.id}">{$existingitem.title|str_shorten_text:80:true}</a><br>
<div id="{$existingitem.id}_existingannotationfeedback" class="detail hidden">{$existingitem.html|clean_html|safe}</div>
{/foreach}
</div>
{/if}
</div>
<div class="importcolumn importcolumn3">
{foreach from=$displaydecisions key=opt item=displayopt}
{if !$feedback.disabled[$opt]}
<input id="decision_{$feedback.id}_{$opt}" class="annotationfeedbackdecision" type="radio" name="decision_{$feedback.id}" value="{$opt}"{if $feedback.decision == $opt} checked="checked"{/if}>
<label for="decision_{$feedback.id}_{$opt}">{$displayopt}<span class="accessible-hidden">({$feedback.title})</span></label><br>
{/if}
{/foreach}
</div>
<div class="cb"></div>
</div>
{/foreach}
</div>
<div class="cb"></div>
</div>
{/foreach}
<script type="application/javascript">
jQuery(function() {
jQuery("a.showduplicatedannotation").click(function(e) {
e.preventDefault();
jQuery("#" + this.id + "_duplicatedannotation").toggleClass("hidden");
});
jQuery("a.showexistingannotation").click(function(e) {
e.preventDefault();
jQuery("#" + this.id + "_existingbannotation").toggleClass("hidden");
});
jQuery("a.showduplicatedannotationfeedback").click(function(e) {
e.preventDefault();
jQuery("#" + this.id + "_duplicatedannotationfeedback").toggleClass("hidden");
});
jQuery("a.showexistingannotationfeedback").click(function(e) {
e.preventDefault();
jQuery("#" + this.id + "_existingannotationfeedback").toggleClass("hidden");
});
jQuery("a.showannotationfeedback").click(function(e) {
e.preventDefault();
jQuery("#" + this.id + "_annotationfeedback").toggleClass("hidden");
});
jQuery("input.annotationdecision").change(function(e) {
e.preventDefault();
if (this.value == '1') {
// The import decision for the annotation is IGNORE
// Set decision for its annotationfeedback to be IGNORE as well
jQuery("#" + this.id + "_annotationfeedback input.annotationfeedbackdecision[value=1]").prop('checked', true);
}
});
});
</script>
{/if}
{$html|safe}
{if $commentcount || $commentcount === '0'}
{$comments|safe}
{/if}
\ No newline at end of file
{if ($editing)}
<div class="shortcut nojs-hidden-block">
<div{if (count($blogs) == 1)} class="hidden"{/if}>
<label class="text" for="blogselect_{$blockid}">{str tag='shortcutaddpost' section='artefact.blog'}</label>
<select id="blogselect_{$blockid}" class="select">
{foreach from=$blogs item=blog}
<option value="{$blog->id}"> {$blog->title} </option>
{/foreach}
</select>
<a class="btn btnshortcut">{str tag='shortcutgo' section='artefact.blog'}</a>
</div>
<a class="btn btnshortcut{if (count($blogs) != 1)} hidden{/if}">{str tag='shortcutnewentry' section='artefact.blog'}</a>
</div>
{/if}
<ul class="recentblogpost">
{foreach from=$mostrecent item=post}
<li>
<strong><a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&amp;view={$view}">{$post->title}</a></strong>
{str tag='postedin' section='blocktype.blog/recentposts'}
<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&amp;view={$view}">{$post->parenttitle}</a>
{str tag='postedon' section='blocktype.blog/recentposts'}
<span>{$post->displaydate}</span>
</li>
{/foreach}
</ul>
{if ($editing)}
<div class="shortcut nojs-hidden-block">
<div{if (count($blogs) == 1)} class="hidden"{/if}>
<label class="text">{str tag='shortcutaddpost' section='artefact.blog'}</label>
<select id="blogselect_{$blockid}" class="select">{foreach from=$blogs item=blog}<option value="{$blog->id}"> {$blog->title} </option>{/foreach}</select>
<input class="select" type="hidden" value="{$tagselect}">
<a class="btn btnshortcut">{str tag='shortcutgo' section='artefact.blog'}</a>
</div>
<a class="btn btnshortcut {if (count($blogs) != 1)} hidden{/if}">{str tag='shortcutnewentry' section='artefact.blog'}</a>
</div>
{/if}
<p>{$blockheading|safe}</p>
{if $configerror}{$configerror}
{elseif $badtag && $badnotag}{str tag='notagsboth' section='blocktype.blog/taggedposts' arg1=$badtag arg2=$badnotag}
{elseif $badtag}{str tag='notags' section='blocktype.blog/taggedposts' arg1=$badtag}
{elseif $full}
<div id="blogdescription">
<div id="postlist_{$blockid}" class="postlist fullwidth">
{foreach from=$results item=post}
<div class="post">
{$post->html|safe}
{if $post->commentcount != null}
<div class="comments">
{if $post->commentcount > 0}
{if !$editing}<a id="block_0{$post->id}{$blockid}" class="commentlink" href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&view={$view}">{/if}
{str tag=Comments section=artefact.comment} ({$post->commentcount})
{if !$editing}</a>{/if}
{else}
{if $post->allowcomments}
<span class="nocomments">{str tag=Comments section=artefact.comment} ({$post->commentcount})</span>
{/if}
{/if}
{if $post->allowcomments && !$editing}
<a class="addcomment bar-before" href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&view={$view}">{str tag=addcomment section=artefact.comment}</a>
{/if}
</div>
<div class="feedbacktablewrapper">
<div id="feedbacktable_0{$post->id}{$blockid}" class="feedbacktable">
{$post->comments->tablerows|safe}
</div>
</div>
{/if}
</div>
{/foreach}
</div>
</div>
{else}<ul class="taggedposts">{foreach from=$results item=post}
<li>
<strong><a href="{$WWWROOT}artefact/artefact.php?artefact={$post->id}&view={$view}">{$post->title}</a></strong>
{str tag='postedin' section='blocktype.blog/taggedposts'}
{if $viewowner}{$post->parenttitle}
{else}<a href="{$WWWROOT}artefact/artefact.php?artefact={$post->parent}&view={$view}">{$post->parenttitle}</a>{/if}
<span class="postdetails">{str tag='postedon' section='blocktype.blog/taggedposts'} {$post->displaydate}</span>
</li>
{/foreach}</ul>
{/if}
{include file="export:html:header.tpl"}
{$rendered_blog|safe}
{include file="export:html:footer.tpl"}
<p>{$stryouhaveblogs}</p>
{if $blogs}
<ul>
{foreach from=$blogs item=blog}
<li><a href="{$blog.link}">{$blog.title}</a></li>
{/foreach}
</ul>
{/if}
/**
* CSS rules for the blog artefact plugin
*
* @author Catalyst IT Ltd
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL version 3 or later
* @copyright For copyright information on Mahara, please see the README file distributed with this software.
* This file is distributed under the same terms as Mahara itself
*/
/* Blog list */
/*#bloglist #blogdesc p {
margin: 5px 0;
}
#bloglist .buttonscell form,
#postlist form {
display: inline;
vertical-align: top;
margin: 0 0 0 5px;
}
#bloglist .buttonscell form div,
#postlist form div {
display: inline;
vertical-align: top;
}*/
/* Post list */
/*#blogdescription {
margin: 0 0 10px 0;
}
#postlist {
margin: 10px 0 0 0;
}
#postlist .poststatus {
vertical-align: top;
}
#postlist input.publish {
vertical-align: top;
}
#postlist .published,
#postlist .draft {
padding: 10px;
margin: 20px 0;
}
.attachments input.unselect {
font-size: .9167em;
}*/
/* Insert Image Dialog */
#img_src[disabled=""] {
background-color: #F0F0EE;
}
\ No newline at end of file
<tr>
<td class="iconcell" rowspan="2">
{$formcontrols|safe}
</td>
<th><label for="{$elementname}_{$artefact->id}">{if $artefact->blog}{$artefact->blog}: {/if}{$artefact->title}{if $artefact->draft} [{str tag=draft section=artefact.blog}]{/if}</label></th>
</tr>
<tr>
<td>{if $artefact->description}{$artefact->description|clean_html|safe}{/if}</td>
</tr>
\ No newline at end of file
<?xml version="1.0"?>
<feed xmlns="http://www.w3.org/2005/Atom">
<title>{$feed.title}</title>
<id>{$feed.id}</id>
<link href="{$feed.link}" />
<link rel="self" type="application/atom+xml" href="{$feed.selflink}" />
<subtitle type="html"><![CDATA[ {$feed.description|clean_html|safe} ]]></subtitle>
<logo>{$feed.logo}</logo>
<icon>{$feed.icon}</icon>
<generator uri="{$feed.generator.uri}" version="{$feed.generator.version}">
{$feed.generator.text}
</generator>
<author>
<name>{$feed.author.name}</name>
{if $feed.author.uri}
<uri>{$feed.author.uri}</uri>
{/if}
</author>
<updated>{$feed.updated}</updated>
<rights type="html"><![CDATA[ {$feed.rights} ]]></rights>
{foreach from=$posts item=post}
<entry>
<title>{$post.title}</title>
<id>{$post.id}</id>
<link href="{$post.link}" />
<content type="html"><![CDATA[ {$post.description|clean_html|safe} ]]></content>
<author>
<name>{$feed.author.name}</name>
</author>
<updated>{$post.mtime}</updated>
<rights type="html"><![CDATA[ {$feed.rights} ]]></rights>
{foreach from=$post.attachments item=attachlink}
<link rel="enclosure" title="{$attachlink.title}" href="{$attachlink.link}" />
{/foreach}
</entry>
{/foreach}
</feed>
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