Bug 1720269: old_raw patches for bugs: (reports)

Bug 1697248
Bug 1691910

behatnotneeded

Change-Id: Ia96e648726929d5d36cc5f006c03987bc8c60c5a

htdocs/theme/raw/templates/admin/users/useractivitystats.tpl

 {foreach from=$data item=item}
   <tr class="{cycle values='r0,r1'}">
     {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
-    {if $columns.firstname}<td><a href="{$item->profileurl}">{$item->firstname}</a></td>{/if}    
+    {if $columns.firstname}<td><a href="{$item->profileurl}">{$item->firstname}</a></td>{/if}  
     {if $columns.lastname}<td><a href="{$item->profileurl}">{$item->lastname}</a></td>{/if}
     {if $columns.displayname}<td><a href="{$item->profileurl}">{$item->displayname}</a></td>{/if}
     {if $columns.username}<td><a href="{$item->profileurl}">{$item->username}</a></td>{/if}

htdocs/theme/raw_old/sass/_custom.scss

@@ -505,3 +505,28 @@
 .accessurl-button {
     margin-bottom: 15px;
 }
+
+#reportconfigform {
+    fieldset {
+        margin-top: 10px;
+    }
+    .checkbox.form-group {
+        padding: 10px 0;
+    }
+}
+
+.reportsettings {
+    margin-top: -5px;
+}
+
+.statinfoblock {
+    width: 360px;
+
+    h3 {
+        margin-top: 0;
+    }
+
+    float: left;
+    margin-right: 15px;
+    padding: 5px;
+}

htdocs/theme/raw_old/sass/components/_btn.scss

@@ -376,3 +376,8 @@ td.action-list-copy {
 .btn-add-group {
     margin-top: 20px;
 }
+
+.reportsettings .btn.filter {
+    line-height: 1;
+    padding: 1px 4px;
+}

htdocs/theme/raw_old/sass/datepicker.scss

@@ -58,6 +58,9 @@
     font-weight: 700;
   }
 }
+.ui-datepicker.in-modal {
+  z-index: 1041 !important;
+}
 
 /* Styles for the new year prev/next css */
 

htdocs/theme/raw_old/sass/typography/_tables.scss

@@ -247,6 +247,7 @@ table.table tr {
 }
 
 // Unset border top on the first row of the table
+.table>tbody>tr:first-child>th,
 .table>tbody>tr:first-child>td {
     border-top-width: 0;
 }

htdocs/theme/raw_old/templates/admin/comparisonstats.tpl

 {foreach from=$data item=item key=key}
   <tr class="{cycle values='r0,r1'}">
-    <td><a href="users/statistics.php?institution={$item->name}&type=registration">{$item->displayname}</a></td>
-    <td><a href="users/statistics.php?institution={$item->name}&type=historical&field=count_members">{$item->count_members}</td>
-    <td><a href="users/statistics.php?institution={$item->name}&type=historical&field=count_views">{$item->count_views}</td>
-    <td><a href="users/statistics.php?institution={$item->name}&type=historical&field=count_blocks">{$item->count_blocks}</td>
-    <td><a href="users/statistics.php?institution={$item->name}&type=historical&field=count_artefacts">{$item->count_artefacts}</td>
-    <td><a href="users/statistics.php?institution={$item->name}&type=historical&field=count_interaction_forum_post">{$item->count_interaction_forum_post}</td>
+    {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
+    {if $columns.institution}<td><a href="{$WWWROOT}institution/index.php?institution={$item->name}">{$item->displayname}</a></td>{/if}
+    {if $columns.members}<td>{$item->count_members}</td>{/if}
+    {if $columns.views}<td>{$item->count_views}</td>{/if}
+    {if $columns.blocks}<td>{$item->count_blocks}</td>{/if}
+    {if $columns.artefacts}<td>{$item->count_artefacts}</td>{/if}
+    {if $columns.posts}<td>{$item->count_interaction_forum_post}</td>{/if}
   </tr>
 {/foreach}
-

htdocs/theme/raw_old/templates/admin/contentstats.tpl

 {foreach from=$data item=item key=key}
   <tr class="{cycle values='r0,r1'}">
-    <td>{$offset + $dwoo.foreach.default.iteration}</td>
-    <td><a href="statistics.php?{if $institution}institution={$institution}&{/if}type=historical&field={$item->field}">{str tag=$item->field section=statistics}</a></td>
-    <td>{$item->modified}</td>
-    <td class="center">{$item->value}</td>
+    {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
+    {if $columns.name}<td><a href="statistics.php?{if $institution}institution={$institution}&{/if}type=content&subtype=historical&field={$item->field}">{str tag=$item->field section=statistics}</a></td>{/if}
+    {if $columns.modified}<td>{$item->modified}</td>{/if}
+    {if $columns.total}<td class="center">{$item->value}</td>{/if}
   </tr>
 {/foreach}
-

htdocs/theme/raw_old/templates/admin/groupstats.tpl

 {foreach from=$data item=item key=key}
   <tr class="{cycle values='r0,r1'}">
-    <td>{$offset + $dwoo.foreach.default.iteration}</td>
-    <td><a href="{$item->homeurl}">{$item->name}</a></td>
-    <td class="center">{$item->members}</td>
-    <td class="center">{$item->views}</td>
-    <td class="center">{$item->forums}</td>
-    <td class="center">{$item->posts}</td>
+    {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
+    {if $columns.id}<td>{$item->id}</td>{/if}
+    {if $columns.group}<td><a href="{$item->homeurl}">{$item->name}</a></td>{/if}
+    {if $columns.members}<td class="center">{$item->members}</td>{/if}
+    {if $columns.views}<td class="center">{$item->views}</td>{/if}
+    {if $columns.groupcomments}<td class="center">{$item->groupcomments}</td>{/if}
+    {if $columns.sharedviews}<td class="center">{$item->sharedviews}</td>{/if}
+    {if $columns.sharedcomments}<td class="center">{$item->sharedcomments}</td>{/if}
+    {if $columns.forums}<td class="center">{$item->forums}</td>{/if}
+    {if $columns.posts}<td class="center">{$item->posts}</td>{/if}
   </tr>
 {/foreach}

htdocs/theme/raw_old/templates/admin/groupstatssummary.tpl

 {if !$grouptypecounts}
 <p class="lead text-small">{str tag=nogroups section=group}</p>
 {else}
-
-{if $groupgraph}
-    <div id="site-stats-graph" class="site-stats-graph panel-body pull-right">
-        <canvas class="graphcanvas" id="sitestatsgroupgraph"></canvas>
-        <script type="application/javascript">
-        {literal}
-            jQuery(function() {
-                fetch_graph_data({'id':'sitestatsgroupgraph','type':'doughnut','graph':'group_type_graph_render'});
-            });
-        {/literal}
-        </script>
-    </div>
-{/if}
 <div>
-<h4>{str tag=groupcountsbytype section=admin}:</h4>
-
-    <ul>
+<h4>{str tag=groupcountsbytype section=admin}</h4>
+    <ul class="list-group list-group-lite unstyled">
     {foreach from=$grouptypecounts item=item}
-      <li class="">{str tag=name section=grouptype.$item->grouptype}: {$item->groups}</li>
+      <li class="list-group-item">{str tag=name section=grouptype.$item->grouptype}: {$item->groups}</li>
     {/foreach}
     </ul>
 </div>
 <div>
-<h4>{str tag=groupcountsbyjointype section=admin}:</h4>
-    <ul>
+<h4>{str tag=groupcountsbyjointype section=admin}</h4>
+    <ul class="list-group list-group-lite unstyled">
     {foreach from=$jointypecounts item=item}
-      <li>{str tag=membershiptype.$item->jointype section=group}: {$item->groups}</li>
+      <li class="list-group-item">{str tag=membershiptype.$item->jointype section=group}: {$item->groups}</li>
     {/foreach}
     </ul>
 </div>
-
+    {if $groupgraph}
+    <h4>{str tag=groupsbytype section=statistics}</h4>
+    <div class="panel-body">
+        <canvas class="graphcanvas" id="sitestatsgroupgraph"></canvas>
+        <script type="application/javascript">
+        {literal}
+            jQuery(function() {
+                fetch_graph_data({'id':'sitestatsgroupgraph','type':'doughnut','graph':'group_type_graph_render'});
+            });
+        {/literal}
+        </script>
+    </div>
+    {/if}
 {/if}

htdocs/theme/raw_old/templates/admin/index.tpl

@@ -87,9 +87,9 @@
     {if $sitedata}
 
         <div class="panel panel-info site-stats">
-            <h3 class="panel-heading">{$sitedata.name}: {str tag=siteinformation section=admin} <span class="icon icon-area-chart pull-right" role="presentation" aria-hidden="true"></span></h3>
-            {include file='admin/stats.tpl' full=0}
-            <a class="panel-footer text-small" href="{$WWWROOT}admin/statistics.php">{str tag=viewfullsitestatistics section=admin} <span class="icon icon-arrow-circle-right pull-right" role="presentation" aria-hidden="true"></span></a>
+            <h3 class="panel-heading">{$sitedata.displayname}: {str tag=siteinformation section=admin} <span class="icon icon-area-chart pull-right" role="presentation" aria-hidden="true"></span></h3>
+            {include file='admin/users/stats.tpl' institutiondata=$sitedata showall='_all' fromindex='1'}
+            <a class="panel-footer text-small" href="{$WWWROOT}admin/users/statistics.php?type=information&subtype=information">{str tag=viewfullsitestatistics section=admin} <span class="icon icon-arrow-circle-right pull-right" role="presentation" aria-hidden="true"></span></a>
         </div>
 
     {/if}

htdocs/theme/raw_old/templates/admin/institutionuserstatssummary.tpl

-<h3>{str tag=youraverageuser section=admin}</h3>
+<h4>{str tag=youraverageuser section=admin}</h4>
 <ul class="list-group list-group-lite unstyled">
     <li class="list-group-item">{$data.strmaxfriends|safe}</li>
     <li class="list-group-item">{$data.strmaxviews|safe}</li>
@@ -6,8 +6,9 @@
     <li class="list-group-item">{$data.strmaxquotaused|safe}</li>
 </ul>
 {if $data}
-    <div id="site-stats-graph">
-        <canvas class="graphcanvas" id="sitestatsusersgraph" width="300" height="300"></canvas>
+    <h4>{str tag=usersbytype section=statistics}</h4>
+    <div class="panel-body">
+        <canvas class="graphcanvas" id="sitestatsusersgraph" width="300" height="200"></canvas>
         <script type="application/javascript">
         {literal}
         jQuery(function() {

htdocs/theme/raw_old/templates/admin/institutionviewstatssummary.tpl

@@ -2,16 +2,17 @@
 <p>{str tag=noviews1 section=view}</p>
 {/if}
 {if $blocktypecounts}
-<p>{str tag=blockcountsbytype section=admin}:
-<ul>
-{foreach from=$blocktypecounts item=item}
-  <li>{str tag=title section=blocktype.$item->langsection}: {$item->blocks}</li>
-{/foreach}
-</ul>
-</p>
+    <h4>{str tag=blockcountsbytype section=admin}</h4>
+    <ul class="list-group list-group-lite unstyled">
+    {foreach from=$blocktypecounts item=item}
+        <li class="list-group-item">{str tag=title section=blocktype.$item->langsection}: {$item->blocks}</li>
+    {/foreach}
+    </ul>
+    </p>
 {/if}
 {if $viewtypes}
-    <div id="site-stats-graph" class="site-stats-graph">
+    <h4>{str tag=viewsbytype section=admin}</h4>
+    <div class="panel-body">
         <canvas class="graphcanvas" id="sitestatsviewtypesgraph" width="300" height="200"></canvas>
         <script type="application/javascript">
         {literal}

htdocs/theme/raw_old/templates/admin/statistics.tpl

-{include file='header.tpl'}
-
-{if $sitedata}
-    <div id="site-stats-wrap" class="panel-items js-masonry" data-masonry-options='{ "itemSelector": ".panel" }'>
-        <div class="panel panel-info">
-            <h3 class="panel-heading">{$sitedata.name}: {str tag=siteinformation section=admin} <span class="icon icon-info pull-right" role="presentation" aria-hidden="true"></span></h3>
-            {include file='admin/stats.tpl' cron=1}
-        </div>
-
-
-        <div class="panel panel-default double">
-            <div class="panel-heading">
-                <ul class="nav nav-pills">
-                    {foreach from=$subpages item=subpage}
-                        <li{if $subpage == $type} class="active"{/if}>
-                            <a {if $subpage == $type}class="current-tab" {/if}href="{$WWWROOT}admin/statistics.php?type={$subpage}">{str tag=$subpage}<span class="accessible-hidden sr-only">({str tag=tab}{if $subpage == $type} {str tag=selected}{/if})</span></a>
-                        </li>
-                    {/foreach}
-                </ul>
-            </div>
-
-            <div class="subpage panel-body row" id="site-stats-wrap2">
-                <div id="statistics_table_container" class="col-md-12">
-                    <h3>{$subpagedata.tabletitle}{if $subpagedata.help}{$subpagedata.help|safe}{/if}</h3>
-                    {if $subpagedata.tablesubtitle}<div class="small">{$subpagedata.tablesubtitle}</div>{/if}
-                {if $subpagedata.table.count == 0}{else}
-                    <div class="table-responsive">
-                        <table id="statistics_table" class="table table-striped fullwidth">
-                            <thead>
-                                <tr>
-                                    {foreach from=$subpagedata.tableheadings item=heading}
-                                    <th{if $heading.class} class="{$heading.class}"{/if}>{if $heading.link}<a href="{$heading.link}">{/if}{$heading.name}{if $heading.link}</a>{/if}</th>
-                                    {/foreach}
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {$subpagedata.table.tablerows|safe}
-                            </tbody>
-                        </table>
-                    </div>
-                        {$subpagedata.table.pagination|safe}
-                {/if}
-                </div>
-                {if $subpagedata.summary}
-                    <div class="col-md-12 image-right">
-                        {$subpagedata.summary|safe}
-                    </div>
-                {/if}
-            </div>
-
-            {if $subpagedata.table.csv}
-                <a href="{$WWWROOT}download.php" class="panel-footer"><span class="icon icon-table" role="presentation" aria-hidden="true"></span> {str tag=exportstatsascsv section=admin}</a>
-            {/if}
-        </div>
-
-    </div>
-{/if}
-
-
-{include file='footer.tpl'}

htdocs/theme/raw_old/templates/admin/stats.tpl

-{if $sitedata.weekly}
-    <div id="site-stats-graph" class="panel-body site-stats-graph">
-    <canvas class="graphcanvas" id="sitestatsgraph"></canvas>
-    <script type="application/javascript">
-    {literal}
-    jQuery(function() {
-        fetch_graph_data({'id':'sitestatsgraph','type':'line','graph':'graph_site_data_weekly'});
-    });
-    {/literal}
-    </script>
-    </div>
-{/if}
-  <table class="table">
-    <tr>
-        <th>{str tag=siteinstalled section=admin}</th>
-        <td>{$sitedata.installdate}</td>
-    </tr>
-
-    {if $sitedata.users}
-    <tr>
-        <th>{str tag=users}</th>
-        <td>
-            {$sitedata.users}
-            <small>{str tag=activeusers section=admin}: {$sitedata.usersloggedin}</small>
-        </td>
-    </tr>
-    {/if}
-    {if $sitedata.groups}
-    <tr>
-        <th>{str tag=groups}</th>
-        <td>{$sitedata.groups}
-            <small>{$sitedata.strgroupmemberaverage}</small>
-        </td>
-    </tr>
-    {/if}
-    {if $sitedata.views}
-    <tr>
-        <th>{str tag=Views section=view}</th>
-        <td>
-            {$sitedata.views}
-            <small>{$sitedata.strviewsperuser}</small>
-        </td>
-    </tr>
-    {/if}
-    <tr>
-        <th>{str tag=databasesize section=admin}</th>
-        <td>{$sitedata.dbsize|display_size}</td>
-    </tr>
-    {if $sitedata.diskusage}
-    <tr>
-        <th>{str tag=diskusage section=admin}</th>
-        <td>{$sitedata.diskusage|display_size}</td>
-    </tr>
-    {/if}
-    <tr>
-        <th>{str tag=maharaversion section=admin}</th>
-        <td>{$sitedata.release}{if $sitedata.strlatestversion} ({$sitedata.strlatestversion|clean_html|safe}){/if}</td>
-    </tr>
-    <tr>
-        <th>{str tag=Cron section=admin}</th>
-        <td>{if $sitedata.cronrunning}{str tag=runningnormally section=admin}{else}
-                {if $sitedata.siteclosedbyadmin}
-                    {str tag=cronnotrunningsiteclosed1 section=admin}
-                {else}
-                    {str tag=cronnotrunning2 section=admin}
-                {/if}
-            {/if}</td>
-    </tr>
-  </table>

htdocs/theme/raw_old/templates/admin/userloginsummary.tpl

 {if $data}
     {foreach from=$data item=institution}
-        <tr>
-            <td><a href="{$WWWROOT}institution/index.php?institution={$institution->name}">{$institution->displayname}</a></td>
-            <td>{$institution->count_logins}</td>
-            <td>{$institution->count_active}</td>
-        </tr>
+    <tr class="{cycle values='r0,r1'}">
+        {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
+        {if $columns.institution}<td><a href="{$WWWROOT}institution/index.php?institution={$institution->name}">{$institution->displayname}</a></td>{/if}
+        {if $columns.logins}<td>{$institution->count_logins}</td>{/if}
+        {if $columns.activeusers}<td>{$institution->count_active}</td>{/if}
+    </tr>
     {/foreach}
 {/if}

htdocs/theme/raw_old/templates/admin/users/accesslistitem.tpl

-{if $item.access}<div>{$item.access}</div>{/if}
-{foreach from=$item.accessgroups item=accessgroup name=ags}{strip}
-  {if $accessgroup.accesstype == 'loggedin'}
-    {str tag="registeredusers" section="view"}
-  {elseif $accessgroup.accesstype == 'public'}
-    {str tag="public" section="view"}
-  {elseif $accessgroup.accesstype == 'friends'}
-    {str tag="friends" section="view"}
-  {elseif $accessgroup.accesstype == 'group'}
-    <a href="{$WWWROOT}group/view.php?id={$accessgroup.id}">{$accessgroup.name}</a>{if $accessgroup.role} ({$accessgroup.roledisplay}){/if}
-  {elseif $accessgroup.accesstype == 'institution'}
-    <a href="{$WWWROOT}institution/index.php?institution={$accessgroup.id}">{$accessgroup.id|institution_display_name}</a>
-  {elseif $accessgroup.accesstype == 'user'}
-    <a href="{$WWWROOT}user/view.php?id={$accessgroup.id}">{$accessgroup.id|display_name:null:true:true}</a>
-  {/if}
-  {if $accessgroup.startdate}
-    {if $accessgroup.stopdate}
-      <span class="date"> {$accessgroup.startdate|strtotime|format_date:'strfdaymonthyearshort'}&rarr;{$accessgroup.stopdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
-    {else}
-      <span class="date"> {str tag=after} {$accessgroup.startdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
-    {/if}
-  {elseif $accessgroup.stopdate}
-    <span class="date"> {str tag=before} {$accessgroup.stopdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
-  {/if}{if !$dwoo.foreach.ags.last}, {/if}
-{/strip}{/foreach}
-{if $item.template}<div>{str tag=thisviewmaybecopied section=view}</div>{/if}
-{if $item.secreturls}<div>{str tag=secreturls section=view} ({$item.secreturls})</div>{/if}
+{if $item->access}
+    {foreach from=$item->access item=row name=ags}
+        {if $row->accesstype == 'loggedin'}
+            {str tag="registeredusers" section="view"}
+        {elseif $row->accesstype == 'public'}
+            {str tag="public" section="view"}
+        {elseif $row->accesstype == 'friends'}
+            {str tag="friends" section="view"}
+        {elseif $row->group}
+            <a href="{$WWWROOT}group/view.php?id={$row->group}">{$row->group|group_display_name}</a>{if $row->role} ({$row->group|group_display_role:$row->role}){/if}
+        {elseif $row->institution}
+            <a href="{$WWWROOT}institution/index.php?institution={$row->institution}">{$row->institution|institution_display_name}</a>
+        {elseif $row->usr}
+            <a href="{$WWWROOT}user/view.php?id={$row->usr}">{$row->usr|display_name:null:true:true}</a>
+        {/if}
+        {if $row->startdate}
+            {if $row->stopdate}
+                <span class="date"> {$row->startdate|strtotime|format_date:'strfdaymonthyearshort'}&rarr;{$row->stopdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
+            {else}
+                <span class="date"> {str tag=after} {$row->startdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
+            {/if}
+        {elseif $row->stopdate}
+            <span class="date"> {str tag=before} {$row->stopdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
+        {/if}
+        {if $row->secreturls}{str tag=secreturls section=view} ({$row->secreturls}){/if}
+        {if !$dwoo.foreach.ags.last}, {/if}
+    {/foreach}
+{/if}

htdocs/theme/raw_old/templates/admin/users/accesslists.tpl

-<div class="table-responsive">
-  <table class="fullwidth table">
-    <thead>
-      <tr>
-        <th>{str tag=Owner section=view}</th>
-        <th>{str tag=View section=view}/{str tag=Collection section=collection}</th>
-        <th>{str tag=accesslist section=view}</th>
-      </tr>
-    </thead>
-    <tbody>
-    {foreach from=$users item=user}
-      {if !$user->views && !$user->collections}
-      <tr class="{cycle values='r0,r1'}">
-        <td><a href="{profile_url($user)}">{$user|display_name:null:true:true}</a></td>
-        <td colspan=3>{str tag=noviews1 section=view}</td>
-      </tr>
-      {else}
-        {foreach from=$user->views item=item}
-      <tr class="{cycle values='r0,r1'}">
-        <td><a href="{profile_url($user)}">{$user|display_name:null:true:true}</a></td>
-        <td><a href="{$item.url}">{$item.name|str_shorten_text:50:true}</a></td>
-        <td>{include file="admin/users/accesslistitem.tpl" item=$item}</td>
-      </tr>
-        {/foreach}
-        {foreach from=$user->collections item=item}
-      <tr class="{cycle values='r0,r1'}">
-        <td><a href="{profile_url($user)}">{$user|display_name:null:true:true}</a></td>
-        <td><a href="{$item.views[$item.viewid].url}">{$item.name|str_shorten_text:40:true}</a> ({str tag=nviews section=view arg1=count($item.views)})</td>
-        <td>{include file="admin/users/accesslistitem.tpl" item=$item}</td>
-      </tr>
-        {/foreach}
-      {/if}
-    {/foreach}
-    </tbody>
-  </table>
-</div>
+{foreach from=$data item=item}
+  <tr class="{cycle values='r0,r1'}">
+    {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
+    {if $columns.owner}<td><a href="{$item->userurl}">{$item->displayname}</a></td>{/if}
+    {if $columns.views}<td>
+        {if $item->views > 0}<a href="{$WWWROOT}view/view.php?id={$item->viewid}">{/if}
+        {$item->title}
+        {if $item->views > 0}</a>{/if}
+        </td>{/if}
+    {if $columns.numviews}<td>{$item->views}</td>{/if}
+    {if $columns.accessrules}<td>{include file="admin/users/accesslistitem.tpl" item=$item}</td>{/if}
+  </tr>
+{/foreach}

htdocs/theme/raw_old/templates/admin/users/collaborationstats.tpl

+{foreach from=$data item=item}
+  <tr class="{cycle values='r0,r1'}">
+    {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
+    {if $columns.date}<td>{$item->date}</td>{/if}
+    {if $columns.comments}<td>{$item->comments}</td>{/if}
+    {if $columns.annotations}<td>{$item->annotations}</td>{/if}
+    {if $columns.usershare}<td>{$item->usershare}</td>{/if}
+    {if $columns.groupshare}<td>{$item->groupshare}</td>{/if}
+    {if $columns.institutionshare}<td>{$item->institutionshare}</td>{/if}
+    {if $columns.loggedinshare}<td>{$item->loggedinshare}</td>{/if}
+    {if $columns.publicshare}<td>{$item->publicshare}</td>{/if}
+    {if $columns.secretshare}<td>{$item->secretshare}</td>{/if}
+    {if $columns.friendshare}<td>{$item->friendshare}</td>{/if}
+  </tr>
+{/foreach}

htdocs/theme/raw_old/templates/admin/users/loginaslog.tpl

-{if $note}
-    <p class="alert alert-warning">{$note|safe}</p>
-{/if}
-
-{if $log}
-<div class="table-responsive">
-    <table class="fullwidth table">
-    <thead>
-        <tr>
-            <th>{str tag=masqueradee section=admin}</th>
-            <th>{str tag=masqueradereason section=admin}</th>
-            <th>{str tag=masquerader section=admin}</th>
-            <th>{str tag=masqueradetime section=admin}</th>
-        </tr>
-    </thead>
-    <tbody>
-    {foreach from=$log item=l}
-        <tr class="{cycle values='r0,r1'}">
-            <td><a href="{profile_url($l->usr)}">{$l->usrname}</a></td>
-            <td>{$l->data->reason}</a></td>
-            <td><a href="{profile_url($l->realusr)}">{$l->realusrname}</a></td>
-            <td>{$l->data->when}</a></td>
-        </tr>
-    {/foreach}
-    </tbody>
-</table>
-</div>
-{else}
-<div class="panel-body">
-    <p class="no-results">{str tag=nomasquerades section=admin}</p>
-</div>
-{/if}
-
+{foreach from=$data item=item}
+  <tr class="{cycle values='r0,r1'}">
+    {if $columns.rownum}<td>{$offset + $dwoo.foreach.default.iteration}</td>{/if}
+    {if $columns.user}<td><a href="{$item->userurl}">{$item->user}</a></td>{/if}
+    {if $columns.reason}<td>{$item->reason}</td>{/if}
+    {if $columns.masquerader}<td><a href="{$item->masqueraderurl}">{$item->masquerader}</a></td>{/if}
+    {if $columns.date}<td>{$item->date}</td>{/if}
+  </tr>