Commit 7adb6e3b authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Robert Lyon

Bug 1815829: Move page/collection title outside main content

and move page action buttons (edit, copy, etc)
outside main content too

the collection/page heading is now place inside a div container
with class .pageheader for styling
and the action buttons are placed inside a div container with
class .pageactions

moved profile page/SmartEvidence matrix title outside
page content

behatnotneeded

Change-Id: If79a6c0b6ac8234586f13df855eeebe8f64f1f4c
parent e5c87ab2
......@@ -874,6 +874,7 @@ $string['filter'] = 'Filter';
$string['expand'] = 'Expand';
$string['collapse'] = 'Collapse';
$string['more...'] = 'More...';
$string['moreoptions'] = 'More options';
$string['moreoptionsfor'] = 'More options for "%s"';
$string['details'] = 'details';
$string['nohelpfound'] = 'There was no help found for this item.';
......
{include file="header.tpl"}
{if $collection}
{include file=collectionnav.tpl}
{/if}
<h1 id="viewh1" class="page-header">
<span class="section-heading">{$name}</span>
</h1>
<div class="with-heading text-small">
{include file=author.tpl}
</div>
{include file="header.tpl" headertype="matrix"}
<p>{$description|clean_html|safe}</p>
<p>{str tag="addpages" section="module.framework"}</p>
......
......@@ -114,6 +114,15 @@
</div>
</header>
{if $headertype == "page"}
{include file="header/pageactions.tpl"}
{include file="header/pageheader.tpl"}
{else if $headertype == "profile"}
{include file="header/profileheader.tpl"}
{else if $headertype == "matrix"}
{include file="header/matrixheader.tpl"}
{/if}
<div class="container main-content">
<div class="row">
<main id="main" class="{if $SIDEBARS}{if $SIDEBLOCKS.right}col-lg-9 {else}col-lg-9 order-md-2 {/if}{else}col-md-12{/if} main">
......
{if $collection}
{include file=collectionnav.tpl}
{/if}
<h1 id="viewh1" class="page-header">
<span class="section-heading">{$name}</span>
</h1>
<div class="with-heading text-small">
{include file=author.tpl}
</div>
<div class="pageactions">
<div class="btn-group btn-group-top">
{if $editurl}{strip}
<a title="{str tag=editthisview section=view}" href="{$editurl}" class="btn btn-secondary">
<span class="icon icon-pencil icon-lg left" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=editthisview section=view}</span>
</a>
{/strip}{/if}
{if $mnethost}
<a href="{$mnethost.url}" class="btn btn-secondary">
<span class="icon icon-long-arrow-right icon-lg left" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=backto arg1=$mnethost.name}</span>
</a>
{/if}
<button type="button" class="btn btn-secondary dropdown-toggle" title="{str tag='moreoptions'}" data-toggle="dropdown" aria-expanded="false">
<span class="icon icon-ellipsis-h icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag="more..."}</span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
{if $copyurl}{strip}
<li class="dropdown-item">
{if $downloadurl}
<a id="downloadview-button" title="{str tag=copythisview section=view}" href="{$downloadurl}">
{else}
<a id="copyview-button" title="{str tag=copythisview section=view}" href="{$copyurl}">
{/if}
<span class="icon icon-files-o icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=copy section=mahara}
</a>
</li>
{/strip}{/if}
<li class="dropdown-item">
<a title="{str tag=print section=view}" id="print_link" href="#" onclick="window.print(); return false;">
<span class="icon icon-print left" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag=print section=view}</span>
</a>
</li>
{if $LOGGEDIN}
{if !$userisowner}
<li class="dropdown-item">
<a id="toggle_watchlist_link" class="watchlist" href="">
{if $viewbeingwatched}
<span class="icon icon-eye-slash left" role="presentation" aria-hidden="true"></span>
{str tag=removefromwatchlist section=view}
{else}
<span class="icon icon-eye left" role="presentation" aria-hidden="true"></span>
{str tag=addtowatchlist section=view}
{/if}
</a>
</li>
<li class="dropdown-item">
{if $objector}
<span class="nolink">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=objectionablematerialreported}
</span>
{else}
<a id="objection_link" href="#" data-toggle="modal" data-target="#report-form">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=reportobjectionablematerial}
</a>
{/if}
</li>
{/if}
{if $userisowner && $objectedpage}
<li>
<a id="review_link" href="#" data-toggle="modal" data-target="#review-form">
<span class="icon icon-lg icon-flag text-success left" role="presentation" aria-hidden="true"></span>
{str tag=objectionreview}
</a>
</li>
{/if}
{if $userisowner || $canremove}
<li class="dropdown-item">
<a href="{$WWWROOT}view/delete.php?id={$viewid}" title="{str tag=deletethisview section=view}">
<span class="icon icon-lg icon-trash text-danger" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str(tag=deletespecific arg1=$maintitle)|escape:html|safe}</span>
{str tag=deletethisview section=view}
</a>
</li>
{/if}
{/if}
{if $versionurl}
<li>
<a href="{$versionurl}">
<span class="icon icon-code-fork icon-lg left" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str(tag=timelinespecific section=view arg1=$maintitle)|escape:html|safe}</span>
{str tag=timeline section=view}
</a>
</li>
{/if}
{if $userisowner}
<li>
<a href="{$createversionurl}">
<span class="icon icon-save icon-lg left" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str(tag=savetimelinespecific section=view arg1=$maintitle)|escape:html|safe}</span>
{str tag=savetimeline section=view}
</a>
</li>
{/if}
</ul>
</div>
</div>
<div class="pageheader">
<div class="container main-content">
<div class="row">
<div id="main" class="col-md-12 main">
<div id="content" class="main-column{if $selected == 'content'} editcontent{/if}">
<div id="main-column-container">
{if $collection}
{include file=collectionnav.tpl}
{/if}
{if $notrudeform}
<div class="alert alert-danger">
{$notrudeform|safe}
</div>
{elseif $objector}
<div class="alert alert-danger">{str tag=objectionablematerialreported}</div>
{/if}
{if $userisowner && $objectedpage}
<div class="alert alert-danger">
{if $objectionreplied}
{str tag=objectionablematerialreportreplied}
{else}
{str tag=objectionablematerialreportedowner}
<br><br>
{str tag=objectionablematerialreportedreply}
{/if}
<div class="form-group">
<a id="review_link" class="btn btn-secondary" href="#" data-toggle="modal" data-target="#review-form">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=objectionreview}
</a>
</div>
</div>
{/if}
{if $maintitle}
<h1 id="viewh1" class="page-header">
{if $title}
<span class="subsection-heading">{$title|safe}</span>
{else}
<span class="section-heading">{$maintitle|safe}</span>
{/if}
</h1>
{/if}
<div class="btn-group-top-below">
{if $toolbarhtml}
{$toolbarhtml|safe}
{/if}
</div>
<div class="with-heading text-small">
{include file=author.tpl}
{if $alltags}
<div class="tags">
<strong>{str tag=tags}:</strong>
{list_tags owner=$owner tags=$alltags view=$viewid}
{if $moretags}
<a href="#" class="moretags">
<span class="icon icon-ellipsis-h" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag="more..."}</span>
</a>
{/if}
</div>
{/if}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{if $relationship == 'pending'}
<div class="expose">
<div class="row">
<div class="col-md-4 offset-md-4">
<div class="attentionmessage card bg-warning">
<h3 class="card-header">{str tag='whymakemeyourfriend' section='group'}</h3>
<p class="card-body">{$message}</p>
<div class="has-form text-small card-footer btn-toggle">
<div class="btn">
<span class="icon icon-check icon-lg text-success left" role="presentation" aria-hidden="true"></span>
{$acceptform|safe}
</div>
<a class="btn" id="approve_deny_friendrequest_deny" href="{$WWWROOT}user/denyrequest.php?id={$USERID}&returnto=view">
<span class="icon icon-ban left icon-lg text-danger" role="presentation" aria-hidden="true"></span>
<span class="link-unstyled">{str tag='denyrequest' section='group'}</span>
</a>
</div>
</div>
</div>
</div>
</div>
{/if}
<h1 id="viewh1" class="user-icon-name page-header">
<span class="user-icon float-left">
<img src="{profile_icon_url user=$user maxwidth=50 maxheight=50}" alt="{str tag=profileimagetext arg1=$user|display_default_name}" />
</span>
{if $pageheadinghtml}
<span>{$pageheadinghtml|safe}</span>
{/if}
</h1>
<div class="btn-group btn-group-top">
{if $ownprofile}
<a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn btn-secondary">
<span class="icon-pencil icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=editthisview section=view}
</a>
{/if}
{if $loginas}
<a href="{$WWWROOT}admin/users/changeuser.php?id={$USERID}" class="btn-login btn btn-secondary">
<span class="icon-user-secret icon icon-lg left" role="presentation" aria-hidden="true"></span>
{$loginas}
</a>
{if $USER->get('admin')}
<a href="{$WWWROOT}admin/users/edit.php?id={$USERID}" class="btn-edit btn btn-secondary">
<span class="icon-cogs icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=accountsettings section=admin}
</a>
{/if}
{/if}
{if $canmessage}
<a href="{$WWWROOT}{if $mrmoduleactive}module/multirecipientnotification{else}user{/if}/sendmessage.php?id={$USERID}&amp;returnto=view" class="btn-message btn btn-secondary">
<span class="icon-envelope icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag='sendmessage' section='group'}
</a>
{/if}
{if $relationship == 'existingfriend'}
<a href="{$WWWROOT}user/removefriend.php?id={$USERID}&amp;returnto=view" class="btn-del btn btn-secondary">
<span class="icon-user-times icon icon-lg left text-danger" role="presentation" aria-hidden="true"></span>
{str tag='removefromfriendslist' section='group'}
</a>
{elseif $relationship == 'none' && $friendscontrol == 'auto'}
{$newfriendform|safe}
{elseif $relationship == 'none' && $friendscontrol == 'auth'}
<a href="{$WWWROOT}user/requestfriendship.php?id={$USERID}&amp;returnto=view" class="btn-friend btn btn-secondary">
<span class="icon-user-plus icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag='requestfriendship' section='group'}
</a>
{/if}
</div>
{if $inviteform || $addform}
{if $inviteform}
{$inviteform|safe}
{/if}
{if $addform}
{$addform|safe}
{/if}
{/if}
<div class="userdetail view-container">
{if $institutions}
<p class="lead text-small">
<span class="icon icon-lg icon-university left" role="presentation" aria-hidden="true"></span>
{$institutions|safe}
</p>
{/if}
{if $invitedlist}
<p class="lead text-small">
<span class="icon icon-lg icon-users left" role="presentation" aria-hidden="true"></span>
{str tag=groupinvitesfrom section=group}
{$invitedlist}
</p>
{/if}
{if $requestedlist}
<p class="lead text-small">
<span class="icon icon-lg icon-users left" role="presentation" aria-hidden="true"></span>
{str tag=requestedmembershipin section=group}
{$requestedlist}
</p>
{/if}
</div>
{include file="header.tpl"}
{if $relationship == 'pending'}
</div>
</div>
</div>
</div>
</div>
<div class="expose">
<div class="row">
<div class="col-md-4 offset-md-4">
<div class="attentionmessage card bg-warning">
<h3 class="card-header">{str tag='whymakemeyourfriend' section='group'}</h3>
<p class="card-body">{$message}</p>
<div class="has-form text-small card-footer btn-toggle">
<div class="btn">
<span class="icon icon-check icon-lg text-success left" role="presentation" aria-hidden="true"></span>
{$acceptform|safe}
</div>
<a class="btn" id="approve_deny_friendrequest_deny" href="{$WWWROOT}user/denyrequest.php?id={$USERID}&returnto=view">
<span class="icon icon-ban left icon-lg text-danger" role="presentation" aria-hidden="true"></span>
<span class="link-unstyled">{str tag='denyrequest' section='group'}</span>
</a>
</div>
</div>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="{if $SIDEBARS}{if $SIDEBLOCKS.right}col-lg-9 {else}col-lg-9 order-md-2 {/if}{else}col-lg-12{/if} main">
<div class="main-column{if $selected == 'content'} editcontent{/if}">
<div>
{/if}
<h1 id="viewh1" class="user-icon-name page-header">
<span class="user-icon float-left">
<img src="{profile_icon_url user=$user maxwidth=50 maxheight=50}" alt="{str tag=profileimagetext arg1=$user|display_default_name}" />
</span>
{if $pageheadinghtml}
<span>{$pageheadinghtml|safe}</span>
{/if}
</h1>
<div class="btn-group btn-group-top">
{if $ownprofile}
<a title="{str tag=editthisview section=view}" href="{$WWWROOT}view/blocks.php?profile=1" class="btn btn-secondary">
<span class="icon-pencil icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=editthisview section=view}
</a>
{/if}
{if $loginas}
<a href="{$WWWROOT}admin/users/changeuser.php?id={$USERID}" class="btn-login btn btn-secondary">
<span class="icon-user-secret icon icon-lg left" role="presentation" aria-hidden="true"></span>
{$loginas}
</a>
{if $USER->get('admin')}
<a href="{$WWWROOT}admin/users/edit.php?id={$USERID}" class="btn-edit btn btn-secondary">
<span class="icon-cogs icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=accountsettings section=admin}
</a>
{/if}
{/if}
{if $canmessage}
<a href="{$WWWROOT}{if $mrmoduleactive}module/multirecipientnotification{else}user{/if}/sendmessage.php?id={$USERID}&amp;returnto=view" class="btn-message btn btn-secondary">
<span class="icon-envelope icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag='sendmessage' section='group'}
</a>
{/if}
{if $relationship == 'existingfriend'}
<a href="{$WWWROOT}user/removefriend.php?id={$USERID}&amp;returnto=view" class="btn-del btn btn-secondary">
<span class="icon-user-times icon icon-lg left text-danger" role="presentation" aria-hidden="true"></span>
{str tag='removefromfriendslist' section='group'}
</a>
{elseif $relationship == 'none' && $friendscontrol == 'auto'}
{$newfriendform|safe}
{elseif $relationship == 'none' && $friendscontrol == 'auth'}
<a href="{$WWWROOT}user/requestfriendship.php?id={$USERID}&amp;returnto=view" class="btn-friend btn btn-secondary">
<span class="icon-user-plus icon icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag='requestfriendship' section='group'}
</a>
{/if}
</div>
{if $inviteform || $addform}
{if $inviteform}
{$inviteform|safe}
{/if}
{if $addform}
{$addform|safe}
{/if}
{/if}
<div class="userdetail view-container">
{if $institutions}
<p class="lead text-small">
<span class="icon icon-lg icon-university left" role="presentation" aria-hidden="true"></span>
{$institutions|safe}
</p>
{/if}
{if $invitedlist}
<p class="lead text-small">
<span class="icon icon-lg icon-users left" role="presentation" aria-hidden="true"></span>
{str tag=groupinvitesfrom section=group}
{$invitedlist}
</p>
{/if}
{if $requestedlist}
<p class="lead text-small">
<span class="icon icon-lg icon-users left" role="presentation" aria-hidden="true"></span>
{str tag=requestedmembershipin section=group}
{$requestedlist}
</p>
{/if}
</div>
{include file="header.tpl" headertype="profile"}
<div id="view" class="view-container">
<div id="bottom-pane" class="user-page-content">
......
{include file="header.tpl"}
{if $collection}
{include file=collectionnav.tpl}
{/if}
{if $notrudeform}
<div class="alert alert-danger">
{$notrudeform|safe}
</div>
{elseif $objector}
<div class="alert alert-danger">{str tag=objectionablematerialreported}</div>
{/if}
{if $userisowner && $objectedpage}
<div class="alert alert-danger">
{if $objectionreplied}
{str tag=objectionablematerialreportreplied}
{else}
{str tag=objectionablematerialreportedowner}
<br><br>
{str tag=objectionablematerialreportedreply}
{/if}
<div class="form-group">
<a id="review_link" class="btn btn-secondary" href="#" data-toggle="modal" data-target="#review-form">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=objectionreview}
</a>
</div>
</div>
{/if}
{if $maintitle}
<h1 id="viewh1" class="page-header">
{if $title}
<span class="subsection-heading">{$title|safe}</span>
{else}
<span class="section-heading">{$maintitle|safe}</span>
{/if}
</h1>
{/if}
<div class="btn-group btn-group-top">
{if $editurl}{strip}
<a title="{str tag=editthisview section=view}" href="{$editurl}" class="btn btn-secondary">
<span class="icon icon-pencil icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=editthisview section=view}
</a>
{/strip}{/if}
{if $copyurl}{strip}
{if $downloadurl}
<a id="downloadview-button" title="{str tag=copythisview section=view}" href="{$downloadurl}" class="btn btn-secondary">
{else}
<a id="copyview-button" title="{str tag=copythisview section=view}" href="{$copyurl}" class="btn btn-secondary">
{/if}
<span class="icon icon-files-o icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=copy section=mahara}
</a>
{/strip}{/if}
{if $mnethost}
<a href="{$mnethost.url}" class="btn btn-secondary">
<span class="icon icon-long-arrow-right icon-lg left" role="presentation" aria-hidden="true"></span>
{str tag=backto arg1=$mnethost.name}
</a>
{/if}
<button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
<span class="icon icon-ellipsis-h icon-lg" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag="more..."}</span>
</button>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<li class="dropdown-item">
<a title="{str tag=print section=view}" id="print_link" href="#" onclick="window.print(); return false;">
<span class="icon icon-print left" role="presentation" aria-hidden="true"></span>
{str tag=print section=view}
</a>
</li>
{if $LOGGEDIN}
{if !$userisowner}
<li class="dropdown-item">
<a id="toggle_watchlist_link" class="watchlist" href="">
{if $viewbeingwatched}
<span class="icon icon-eye-slash left" role="presentation" aria-hidden="true"></span>
{str tag=removefromwatchlist section=view}
{else}
<span class="icon icon-eye left" role="presentation" aria-hidden="true"></span>
{str tag=addtowatchlist section=view}
{/if}
</a>
</li>
<li class="dropdown-item">
{if $objector}
<span class="nolink">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=objectionablematerialreported}
</span>
{else}
<a id="objection_link" href="#" data-toggle="modal" data-target="#report-form">
<span class="icon icon-lg icon-flag text-danger left" role="presentation" aria-hidden="true"></span>
{str tag=reportobjectionablematerial}
</a>
{/if}
</li>
{/if}
{if $userisowner && $objectedpage}
<li>
<a id="review_link" href="#" data-toggle="modal" data-target="#review-form">
<span class="icon icon-lg icon-flag text-success left" role="presentation" aria-hidden="true"></span>
{str tag=objectionreview}
</a>
</li>
{/if}
{if $userisowner || $canremove}
<li class="dropdown-item">
<a href="{$WWWROOT}view/delete.php?id={$viewid}" title="{str tag=deletethisview section=view}">
<span class="icon icon-lg icon-trash text-danger" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str(tag=deletespecific arg1=$maintitle)|escape:html|safe}</span>
{str tag=deletethisview section=view}
</a>
</li>
{/if}
{/if}
{if $versionurl}
<li>
<a href="{$versionurl}">
<span class="icon icon-code-fork icon-lg left" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str(tag=timelinespecific section=view arg1=$maintitle)|escape:html|safe}</span>
{str tag=timeline section=view}
</a>
</li>
{/if}
{if $userisowner}
<li>
<a href="{$createversionurl}">
<span class="icon icon-save icon-lg left" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str(tag=savetimelinespecific section=view arg1=$maintitle)|escape:html|safe}</span>
{str tag=savetimeline section=view}
</a>
</li>
{/if}
</ul>
</div>
<div class="btn-group-top-below">
{if $toolbarhtml}
{$toolbarhtml|safe}
{/if}
</div>
<div class="with-heading text-small">
{include file=author.tpl}
{if $alltags}
<div class="tags">
<strong>{str tag=tags}:</strong>
{list_tags owner=$owner tags=$alltags view=$viewid}
{if $moretags}
<a href="#" class="moretags">
<span class="icon icon-ellipsis-h" role="presentation" aria-hidden="true"></span>
<span class="sr-only">{str tag="more..."}</span>
</a>
{/if}
</div>
{/if}
</div>
{include file="header.tpl" headertype="page"}