Commit bcf844ea authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1719216: Include collections in group participation reports"

parents a9ca9431 5d65907d
......@@ -40,8 +40,8 @@ $pagination = array(
'datatable' => 'sharedviewsreport',
'jsonscript' => 'group/participationsharedviews.json.php',
'setlimit' => true,
'resultcounttextsingular' => get_string('view', 'view'),
'resultcounttextplural' => get_string('views', 'view'),
'resultcounttextsingular' => get_string('portfolio', 'view'),
'resultcounttextplural' => get_string('portfolios', 'view'),
);
$sharedviews = View::render_participation_views($sharedviews, 'group/participationsharedviews.tpl', $pagination);
......@@ -54,8 +54,8 @@ $pagination = array(
'datatable' => 'groupviewsreport',
'jsonscript' => 'group/participationgroupviews.json.php',
'setlimit' => true,
'resultcounttextsingular' => get_string('view', 'view'),
'resultcounttextplural' => get_string('views', 'view'),
'resultcounttextsingular' => get_string('portfolio', 'view'),
'resultcounttextplural' => get_string('portfolios', 'view'),
);
$groupviews = View::render_participation_views($groupviews, 'group/participationgroupviews.tpl', $pagination);
......
......@@ -87,6 +87,8 @@ $string['views'] = 'pages';
$string['viewsandcollections'] = 'pages and collections';
$string['View'] = 'Page';
$string['Views'] = 'Pages';
$string['portfolio'] = 'portfolio';
$string['portfolios'] = 'portfolios';
$string['Viewscollections'] = 'Pages and collections';
$string['viewsubmittedtogroup'] = 'This page has been submitted to <a href="%s">%s</a>.';
$string['viewsubmittedtogroupon'] = 'This page was submitted to <a href="%s">%s</a> on %s.';
......@@ -106,8 +108,11 @@ $string['youhavenviews'] = array(
'You have %d pages.',
);
$string['viewsownedbygroup'] = 'Pages owned by this group';
$string['ownedbygroup'] = 'Owned by this group';
$string['nogroupviewsyet'] = 'There are no pages in this group yet';
$string['viewscollectionssharedtogroup'] = 'Pages and collections shared with this group';
$string['viewssharedtogroup'] = 'Pages shared with this group';
$string['sharedtogroup'] = 'Shared with this group';
$string['nosharedviewsyet'] = 'There are no pages shared with this group yet';
$string['viewssharedtogroupbyothers'] = 'Pages shared with this group by others';
$string['sharedviews'] = 'Shared pages';
......
This diff is collapsed.
{if count($items) > 0}
{foreach from=$items item=view}
<tr class="{cycle values='r0,r1'}">
<td class="sv"><a href="{$view->url}">{$view->title}</a></td>
<td class="sv"><a href="{$view->url}">{$view->title}</a>{if $view->collection} <span class="text-small text-midtone">({str tag='nviews' section='view' arg1=$view->viewcount})</span>{/if}</td>
<td class="mc"><label class="hidden">{str tag=membercommenters section=group}: </label>
<ul class="list-nested list-unstyled">
{foreach from=$view->comments key=commenter item=info}
......
{if $itemcount}
{foreach from=$items item=view}
<tr class="{cycle values='r0,r1'}">
<td class="sv"><a href="{$view->url}">{$view->title}</a></td>
<td class="sv"><a href="{$view->url}">{$view->title}</a>{if $view->collection} <span class="text-small text-midtone">({str tag='nviews' section='view' arg1=$view->viewcount})</span>{/if}</td>
<td class="sb"><label class="hidden">{str tag=sharedby section=view}: </label>
{if $view->owner}
<a href="{$WWWROOT}user/view.php?id={$view->owner}">{$view->owner|display_name:null:true}</a>
......
{include file="header.tpl"}
<h3>{str tag=viewssharedtogroup section=view}</h3>
<h3>{str tag=viewscollectionssharedtogroup section=view}</h3>
{if $sharedviews.count == '0'}
<p class="no-results">
{str tag=noviewssharedwithgroupyet section=group}
......@@ -9,7 +9,7 @@
<thead>
<tr>
<th class="sv {if $sort == title && $direction == asc}asc{elseif $sort == title}sorted{/if}">
<a href="{$baseurl}&sort=title{if $sort == title && $direction == asc}&direction=desc{/if}">{str tag=viewssharedtogroup section=view}</a>
<a href="{$baseurl}&sort=title{if $sort == title && $direction == asc}&direction=desc{/if}">{str tag=sharedtogroup section=view}</a>
</th>
<th class="sb {if $sort == owner && $direction == asc}asc{elseif $sort == owner}sorted{/if}">
<a href="{$baseurl}&sort=owner{if $sort == owner && $direction == asc}&direction=desc{/if}">{str tag=sharedby section=view}</a>
......@@ -45,7 +45,7 @@
<tr>
<th class="sv {if $sort == title && $direction == asc}asc{elseif $sort == title}sorted{/if}">
<a href="{$baseurl}&sort=title{if $sort == title && $direction == asc}&direction=desc{/if}">
{str tag=viewsownedbygroup section=view}
{str tag=ownedbygroup section=view}
</a>
</th>
<th class="mc {if $sort == membercommentcount && $direction == asc}asc{elseif $sort == membercommentcount}sorted{/if}">
......@@ -54,7 +54,7 @@
</a>
</th>
<th class="ec {if $sort == nonmembercommentcount && $direction == asc}asc{elseif $sort == nonmembercommentcount}sorted{/if}">
<a href="{$baseurl}&sort=ecomment{if $sort == nonmembercommentcount && $direction == asc}&direction=desc{/if}">{str tag=extcommenters section=group}
<a href="{$baseurl}&sort=nonmembercommentcount{if $sort == nonmembercommentcount && $direction == asc}&direction=desc{/if}">{str tag=extcommenters section=group}
</a>
</th>
</tr>
......
{if count($items) > 0}
{foreach from=$items item=view}
<tr class="{cycle values='r0,r1'}">
<td class="sv"><a href="{$view->url}">{$view->title}</a></td>
<td class="sv"><a href="{$view->url}">{$view->title}</a>{if $view->collection} <span class="text-small text-midtone">({str tag='nviews' section='view' arg1=$view->viewcount})</span>{/if}</td>
<td class="mc"><label class="hidden">{str tag=membercommenters section=group}: </label>
<ul class="list-nested list-unstyled">
{foreach from=$view->comments key=commenter item=info}
......
{if $itemcount}
{foreach from=$items item=view}
<tr class="{cycle values='r0,r1'}">
<td class="sv"><a href="{$view->url}">{$view->title}</a></td>
<td class="sv"><a href="{$view->url}">{$view->title}</a>{if $view->collection} <span class="text-small text-midtone">({str tag='nviews' section='view' arg1=$view->viewcount})</span>{/if}</td>
<td class="sb"><label class="hidden">{str tag=sharedby section=view}: </label>
{if $view->owner}
<a href="{$WWWROOT}user/view.php?id={$view->owner}">{$view->owner|display_name:null:true}</a>
......
{include file="header.tpl"}
<h3>{str tag=viewssharedtogroup section=view}</h3>
<h3>{str tag=viewscollectionssharedtogroup section=view}</h3>
{if $sharedviews.count == '0'}
<p class="no-results">
{str tag=noviewssharedwithgroupyet section=group}
......@@ -9,7 +9,7 @@
<thead>
<tr>
<th class="sv {if $sort == title && $direction == asc}asc{elseif $sort == title}sorted{/if}">
<a href="{$baseurl}&sort=title{if $sort == title && $direction == asc}&direction=desc{/if}">{str tag=viewssharedtogroup section=view}</a>
<a href="{$baseurl}&sort=title{if $sort == title && $direction == asc}&direction=desc{/if}">{str tag=sharedtogroup section=view}</a>
</th>
<th class="sb {if $sort == owner && $direction == asc}asc{elseif $sort == owner}sorted{/if}">
<a href="{$baseurl}&sort=owner{if $sort == owner && $direction == asc}&direction=desc{/if}">{str tag=sharedby section=view}</a>
......@@ -45,7 +45,7 @@
<tr>
<th class="sv {if $sort == title && $direction == asc}asc{elseif $sort == title}sorted{/if}">
<a href="{$baseurl}&sort=title{if $sort == title && $direction == asc}&direction=desc{/if}">
{str tag=viewsownedbygroup section=view}
{str tag=ownedbygroup section=view}
</a>
</th>
<th class="mc {if $sort == membercommentcount && $direction == asc}asc{elseif $sort == membercommentcount}sorted{/if}">
......@@ -54,7 +54,7 @@
</a>
</th>
<th class="ec {if $sort == nonmembercommentcount && $direction == asc}asc{elseif $sort == nonmembercommentcount}sorted{/if}">
<a href="{$baseurl}&sort=ecomment{if $sort == nonmembercommentcount && $direction == asc}&direction=desc{/if}">{str tag=extcommenters section=group}
<a href="{$baseurl}&sort=nonmembercommentcount{if $sort == nonmembercommentcount && $direction == asc}&direction=desc{/if}">{str tag=extcommenters section=group}
</a>
</th>
</tr>
......
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