Commit 912600e1 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic
Browse files

Bug 1720269: old_raw patches for bugs: (groups)

Bug 1714830
Bug 1696696
Bug 1681952
Bug 1666685

behatnotneeded

Change-Id: I4ffbabb28cc00451760134b478758a5c20b86819
parent 5f0016db
......@@ -22,6 +22,7 @@
</a>
</div>
{if $blog->canedit}
<div class="panel-footer has-form">
<a href="{$WWWROOT}artefact/blog/post.php?blog={$blog->id}" class="btn btn-default btn-sm">
<span class="icon icon-plus icon-lg left" role="presentation" aria-hidden="true"></span>
......@@ -40,5 +41,6 @@
{/if}
</div>
</div>
{/if}
</div>
{/foreach}
{include file="header.tpl"}
{if !$group || $canedit}
<div class="btn-top-right btn-group btn-group-top">
<a class="btn btn-default settings" href="{$WWWROOT}artefact/blog/new/index.php{if $institutionname}?institution={$institutionname}{/if}{if $group}?group={$group}{/if}">
<span class="icon icon-lg icon-plus left" role="presentation" aria-hidden="true"></span>
{str section="artefact.blog" tag="addblog"}
</a>
</div>
{/if}
{if !$blogs->data}
<p class="no-results">{str tag=youhavenoblogs section=artefact.blog}</p>
{else}
......
......@@ -14,7 +14,7 @@
{/if}
</span>
{if !$post->locked}
{if !$post->locked && $post->canedit}
<span id="changepoststatus{$post->id}" class="changepoststatus text-inline">
{$post->changepoststatus|safe}
</span>
......@@ -25,7 +25,7 @@
<span class="icon icon-lock left" role="presentation" aria-hidden="true"></span>
{str tag=submittedforassessment section=view}
</span>
{else}
{elseif $post->canedit}
<div class="btn-group postcontrols">
<form name="edit_{$post->id}" action="{$WWWROOT}artefact/blog/post.php" class="form-as-button pull-left">
<input type="hidden" name="id" value="{$post->id}">
......
{include file="header.tpl"}
{if $canedit}
<div class="btn-top-right btn-group btn-group-top">
<a class="btn btn-default addpost" href="{$WWWROOT}artefact/blog/post.php?blog={$blog->get('id')}">
<span class="icon icon-lg icon-plus left" role="presentation" aria-hidden="true"></span>
......@@ -11,6 +12,7 @@
</a>
{/if}
</div>
{/if}
<div id="myblogs" class="myblogs view-container">
<p id="blogdescription">
{clean_html($blog->get('description'))|safe}
......
......@@ -119,6 +119,28 @@
<hr />
{/if}
{if $nosubmissions}
<h4 class="title list-group-item-heading">
{str tag="nosubmissionsfrom" section="view"}:
</h4>
<ul id="nosubmissionslist" class="list-group grouppages">
{$nosubmissions.tablerows|safe}
</ul>
{if $nosubmissions.pagination}
<div id="nosubmissions_page_container" class="hidden pagination-container">
{$nosubmissions.pagination|safe}
</div>
{/if}
{if $nosubmissions.pagination_js}
<script>
jQuery(function($) {literal}{{/literal}
{$nosubmissions.pagination_js|safe}
$('#nosubmissions_page_container').removeClass('hidden');
{literal}}{/literal});
</script>
{/if}
<hr />
{/if}
{if $mysubmitted || $group_view_submission_form}
<h4 class="title list-group-item-heading">
......
......@@ -6,6 +6,7 @@
<div class="clearfix">
<h5 class="pull-left list-group-item-heading">
{$view.title}
<span class="text-small text-midtone">{if $view.collid}({str tag=nviews section=view arg1=$view.numpages}){/if}</span>
<br>
<span class="postedon text-small text-midtone">
{if $view.mtime == $view.ctime}
......
{foreach from=$items item=item}
<li class="list-group-item text-midtone">
<a href="{$item->url}" class="outer-link">
<span class="sr-only">{$item->displayname}</span>
</a>
<h5 class="text-inline">{$item->displayname}</h5>
</li>
{/foreach}
......@@ -497,6 +497,11 @@
padding-bottom: 3px;
}
.forassessment label {
display: inline-block !important;
margin-top: -25px;
}
.accessurl-button {
margin-bottom: 15px;
}
......@@ -3,7 +3,16 @@
<div class="panel panel-default {if $view.submittedto} panel-warning {/if}
{if $view.template == $sitetemplate} site-template{/if}">
<h3 class="panel-heading has-link">
<a class="title-link title" href="{if $view.numviews > 0}{$view.fullurl}{else}{$WWWROOT}collection/views.php?id={$view.collid}{/if}" title="{$view.displaytitle}">
<a class="title-link title"
href="
{if $view.template == $sitetemplate}
{$WWWROOT}view/blocks.php?id={$view.id}
{elseif isset($view.numviews) && $view.numviews == 0}
{$WWWROOT}collection/views.php?id={$view.collid}
{else}
{$view.fullurl}
{/if}"
title="{$view.displaytitle}">
{$view.displaytitle}
</a>
</h3>
......
Supports Markdown
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