Commit d5855d19 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes I3702d376,Ie444da9d into 17.10_STABLE

* changes:
  Bug 1769546: A few more changes to update raw_old theme for backported patches
  Bug 1769546: Needing to update raw_old theme for backported patches
parents f27ca900 1f9a4d86
......@@ -64,6 +64,10 @@
{$post->description|clean_html|safe}
</div>
{if $post->attachments}
{$post->attachments|safe}
{/if}
{if !$editing}
{if $post->commentcount != null}
<div class="comments clearfix">
......
......@@ -8,7 +8,17 @@
</div>
{/if}
{if !$blogs->data}
<p class="no-results">{str tag=youhavenoblogs section=artefact.blog}</p>
<p class="no-results">
{if $group}
{str tag=youhavenogroupblogs section=artefact.blog}
{elseif $institutionname == 'mahara'}
{str tag=youhavenositeblogs section=artefact.blog}
{elseif $institutionname}
{str tag=youhavenoinstitutionblogs section=artefact.blog}
{else}
{str tag=youhavenoblogs section=artefact.blog}
{/if}
</p>
{else}
<div class="rel view-container">
<div class="panel-items">
......
......@@ -82,6 +82,7 @@
{/if}
</td>
{if $admin}
<td class="right control-buttons">
<div class="btn-group">
<a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="btn btn-default btn-sm" title="{str tag=edit}">
......@@ -95,6 +96,7 @@
</a>
</div>
</td>
{/if}
</tr>
{/foreach}
<tbody>
......
......@@ -132,14 +132,14 @@
{str tag="updateselectedtopics" section="interaction.forum"}
</button>
</span>
{if $moderator}
{contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'}
{else}
{contextualhelp plugintype='interaction' pluginname='forum' section='update'}
{/if}
</div>
{/if}
<input type="hidden" name="sesskey" value="{$SESSKEY}">
{if $moderator}
{contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'}
{else}
{contextualhelp plugintype='interaction' pluginname='forum' section='update'}
{/if}
</form>
</div>
......
......@@ -15,7 +15,7 @@
<img src="{$record->icon}" alt="{$record->note}">
<h3 class="title list-group-item-heading text-inline">
{if $record->link}
<a href="{$WWWROOT}{$record->link}">
<a href="{$record->link}">
{$record->title|str_shorten_html:50:true|safe}
</a>
{else}
......
{if $item->access}
{strip}
{foreach from=$item->access item=row name=ags}
{if $row->accesstype == 'loggedin'}
{str tag="registeredusers" section="view"}
......@@ -25,4 +26,5 @@
{if $row->secreturls}{str tag=secreturls section=view} ({$row->secreturls}){/if}
{if !$dwoo.foreach.ags.last}, {/if}
{/foreach}
{/strip}
{/if}
......@@ -12,6 +12,13 @@
{/if}
{$suspendform2|safe}
</div>
{elseif $expired}
<div class="suspendederror admin-warning alert alert-warning">
<h3 class="title">{$expiredon}</h3>
<div class="detail">
{str tag=unexpiredesc section=admin}
</div>
</div>
{/if}
<div class="row">
<div class="col-md-9 main">
......
......@@ -15,7 +15,7 @@
</div>
{/if}
{if $subpagedata && $subpagedata.notvalid_errorstring}
<div class="alert alert-info postlist">{$subpagedata.notvalid_errorstring}</div>
<div class="alert alert-info postlist">{$subpagedata.notvalid_errorstring|safe}</div>
{elseif $subpagedata}
<div class="subpage panel-body row statistics">
{if $subpagedata.table.count == 0}
......
......@@ -3,7 +3,7 @@
href="{$WWWROOT}view/editlayout.php?id={$viewid}{if $new}&new=1{/if}"
title="{if $edittitle}{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}">
<span class="icon icon-lg icon-cogs"></span>
<span class="btn-title">{if $edittitle}{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}</span>
<span class="btn-title">{if ($edittitle || $canuseskins) }{str tag=settings section=view}{else}{str tag=editlayout section=view}{/if}</span>
</a>
<a class="btn btn-default editviews editcontent {if $selected == 'content'}active{/if}" href="{$WWWROOT}view/blocks.php?id={$viewid}{if $new}&new=1{/if}" title="{str tag=editcontent1 section=view}">
<span class="icon icon-lg icon-pencil" aria-hidden="true" role="presentation"></span>
......
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