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

Bug 1720269: old_raw patches for bugs: (General)

Bug 1720264
Bug 1720235
Bug 1719736
Bug 1718821
Bug 1705126
Bug 1694908
Bug 1690687
Bug 1690232
Bug 1686843
Bug 1685041
Bug 1683561
Bug 1681987
Bug 1681934
Bug 1675223
Bug 1636064
Bug 1575512
Bug 1369569
Bug 692769

Also fixing up un-closed html tags in Bug 1701437 for raw and old raw

behatnotneeded

Change-Id: I8ac930ceebf78b4edad97289994318e7689a1e94
(cherry picked from commit 70ac7cec)
parent c575aa29
......@@ -3,7 +3,7 @@
<td class="sharedpages">
<h3 class="title"><a href="{$view.fullurl}">{$view.title|str_shorten_text:65:true}</a>{if $view.collid} ({str tag=nviews section=view arg1=$view.numpages}){/if}</h3>
{if $view.sharedby}
<div class="groupdate">
<div class="groupdate">
{if $view.group}
<a href="{$view.groupdata->homeurl}">{$view.sharedby}</a>
{elseif $view.owner}
......@@ -15,12 +15,14 @@
{else}
{$view.sharedby}
{/if}
<span class="postedon text-midtone"> - {if $view.mtime == $view.ctime}
<span class="postedon text-midtone"> - {if $view.mtime == $view.ctime}
{str tag=Created}
{else}
{str tag=Updated}
{/if}
{$view.mtime|strtotime|format_date:'strftimedate'}
{$view.mtime|strtotime|format_date:'strftimedate'}</span>
</div>
{/if}
<div class="detail">{$view.description|str_shorten_html:70:true|strip_tags|safe}</div>
{if $view.tags}<div class="tags"><strong>{str tag=tags}:</strong> {list_tags owner=$view.owner tags=$view.tags}</div>{/if}
</td>
......
......@@ -219,8 +219,12 @@ jQuery(function($) {
$('.block.collapse').on('click',function(e) {
var dialog = $('.modal-dialog'),
dialogParent = $(e.target).closest('.modal-dialog').length;
if(e.target !== dialog && !dialogParent){
// If we have a link to a comments dialog within a collapsible block
// We need to close all of them except for the one we just
// clicked for
var collapseModalTarget = $(e.target).data('target');
var wantedDialog = $(collapseModalTarget);
if (e.target !== dialog && !wantedDialog.length && !dialogParent) {
$(this).find('button.close').trigger('click');
}
});
......
......@@ -25,10 +25,12 @@
<td>{list_tags owner=$owner tags=$tags}</td>
</tr>
{/if}
{if $ownername}
<tr>
<th>{str tag=Owner section=artefact.file}:</th>
<td>{$ownername}</td>
</tr>
{/if}
<tr>
<th>{str tag=Created section=artefact.file}:</th>
<td>{$created}</td>
......
......@@ -100,7 +100,7 @@
</label>
<span id="{$prefix}_userfile_container">
<input type="file" class="file" {$accepts|safe} {if $capturedevice} capture="{$capturedevice}"{/if} id="{$prefix}_userfile" name="userfile[]" multiple size="20" />
<input type="file" class="file" {$accepts|safe} {if $capturedevice} capture="{$capturedevice}"{/if} id="{$prefix}_userfile" name="userfile[]" multiple size="20" />
</span>
<span id="{$prefix}_userfile_maxuploadsize" class="file-description">
......
{if $tabs.subtabs}
<div class="btn-group">
<div class="btn-group ownersubtab">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
{str tag=groups}
{str tag="tab$tabs.owner"}
<span class="icon icon-caret-down right" role="presentation" aria-hidden="true"></span>
</button>
<ul class="artefactchooser-subtabs dropdown-menu" role="menu">
{foreach from=$tabs.subtabs item=displayname key=ownerid name=subtab}
<li class="{if $tabs.ownerid == $ownerid}active {/if}{if !$dwoo.foreach.subtab.last} showrightborder{/if}">
<a class="changeowner" href="{$querybase}owner={$tabs.owner}&ownerid={$ownerid}">
<a class="changeowner" href="{$querybase|safe}owner={$tabs.owner}&ownerid={$ownerid}">
{$displayname}
</a>
</li>
{/foreach}
</ul>
<div class="artefactchooser-subtabs-selected">
<em class="js-dropdown-context text-midtone text-small">
{foreach from=$tabs.subtabs item=displayname key=ownerid name=subtab}
{if $tabs.ownerid == $ownerid}({$displayname}){/if}
{/foreach}
</em>
</div>
</div>
{/if}
<ul class="artefactchooser-tabs files nav nav-tabs" role="tablist">
{foreach from=$tabs.tabs item=displayname key=name}
<li{if $tabs.owner == $name} class="active"{/if}>
<a class="changeowner" href="{$querybase}owner={$name}" role="tab">
<a class="changeowner" href="{$querybase|safe}owner={$name}" role="tab">
{$displayname}
<span class="accessible-hidden sr-only">
({str tag=tab}
......
{if $hascontent}
<table class="resumecontactinfo fullwidth">
<table class="table resumecontactinfo profile-info">
{if $address}
<tr>
<th class="onethirdwidth">{str tag='address' section='artefact.internal'}</th>
<th>{str tag='address' section='artefact.internal'}</th>
<td>{$address|safe}</td>
</tr>
{/if}
{if $town}
<tr>
<th class="onethirdwidth">{str tag='town' section='artefact.internal'}</th>
<th>{str tag='town' section='artefact.internal'}</th>
<td>{$town|safe}</td>
</tr>
{/if}
{if $city}
<tr>
<th class="onethirdwidth">{str tag='city' section='artefact.internal'}</th>
<th>{str tag='city' section='artefact.internal'}</th>
<td>{$city|safe}</td>
</tr>
{/if}
{if $country}
<tr>
<th class="onethirdwidth">{str tag='country' section='artefact.internal'}</th>
<th>{str tag='country' section='artefact.internal'}</th>
<td>{$country|safe}</td>
</tr>
{/if}
{if $faxnumber}
<tr>
<th class="onethirdwidth">{str tag='faxnumber' section='artefact.internal'}</th>
<th>{str tag='faxnumber' section='artefact.internal'}</th>
<td>{$faxnumber|safe}</td>
</tr>
{/if}
{if $businessnumber}
<tr>
<th class="onethirdwidth">{str tag='businessnumber' section='artefact.internal'}</th>
<th>{str tag='businessnumber' section='artefact.internal'}</th>
<td>{$businessnumber|safe}</td>
</tr>
{/if}
{if $homenumber}
<tr>
<th class="onethirdwidth">{str tag='homenumber' section='artefact.internal'}</th>
<th>{str tag='homenumber' section='artefact.internal'}</th>
<td>{$homenumber|safe}</td>
</tr>
{/if}
{if $mobilenumber}
<tr>
<th class="onethirdwidth">{str tag='mobilenumber' section='artefact.internal'}</th>
<th>{str tag='mobilenumber' section='artefact.internal'}</th>
<td>{$mobilenumber|safe}</td>
</tr>
{/if}
......
<div class="panel-body flush">
<table class="resumepersonalinfo fullwidth panel-body flush">
<table class="table resumepersonalinfo profile-info">
{foreach from=$fields key='field' item='value'}
{if $value}
<tr>
<th class="onethirdwidth">{$field}</th>
<th>{$field}</th>
<td>{$value}</td>
</tr>
{/if}
......
......@@ -10,7 +10,7 @@
<span class="icon icon-chevron-down right collapse-indicator pull-right" role="presentation" aria-hidden="true"></span>
</a>
</h2>
<div class="panel-body collapse {if $.foreach.elements.first} in{/if}" id="{$element.name}_pseudofieldset">
<div class="panel-body table-responsive collapse {if $.foreach.elements.first} in{/if}" id="{$element.name}_pseudofieldset">
{foreach from=$element.elements item=item}
{$item.value|safe}
{/foreach}
......
......@@ -47,7 +47,8 @@
{/foreach}
</tr>
{foreach from=$standards key=sk item=standard}
<tr class="standard" data-standard="{$sk}" data-toggle="collapse" aria-expanded="true">
<tr class="standard{if $standard->settingstate == 'closed'} collapsed{/if}" data-standard="{$standard->id}" data-collection="{$collectionid}"
data-toggle="collapse" aria-expanded="{if $standard->settingstate == 'closed'}false{else}true{/if}">
<td colspan="{$viewcount + 2}">
<div class="shortname-container">
<span class="sr-only">{str tag="standardbegin" section="module.framework"}</span>
......@@ -75,7 +76,7 @@
{if $standard->options}
{foreach from=$standard->options key=ok item=option}
{if $option->children}
<tr class="matrixlevel{$option->level} examplefor{$sk}">
<tr class="matrixlevel{$option->level} examplefor{$standard->id}{if $standard->settingstate == 'closed'} hidden{/if}">
<td colspan="{$viewcount + 2}" class="code">
<div class="shortname-container">
<span class="sr-only">{str tag="headerrow" section="module.framework"}</span>
......@@ -96,7 +97,7 @@
</td>
</tr>
{else}
<tr class="matrixlevel{$option->level} examplefor{$sk}">
<tr class="matrixlevel{$option->level} examplefor{$standard->id}{if $standard->settingstate == 'closed'} hidden{/if}">
<td class="code">
<div class="shortname-container" tabindex="0">
<span class="sr-only">{str tag="headerrow" section="module.framework"}</span>
......
......@@ -6,11 +6,9 @@
<blti:launch_url>{$launchurl}</blti:launch_url>
<blti:extensions platform="canvas.instructure.com">
<lticm:property name="icon_url">{$sitelogo}</lticm:property>
<lticm:property name="link_text">{$sitename}</lticm:property>
<lticm:property name="privacy_level">public</lticm:property>
<lticm:property name="tool_id">mahara</lticm:property>
<lticm:options name="course_navigation">
<lticm:property name="text">{$sitename}</lticm:property>
<lticm:property name="default">enabled</lticm:property>
<lticm:property name="visibility">members</lticm:property>
<lticm:property name="enabled">true</lticm:property>
......
......@@ -56,8 +56,8 @@
, {$item->date}
</span>
</span>
<span class="icon icon-chevron-down collapse-indicator pull-right" role="presentation" aria-hidden="true"></span>
</span>
<span class="icon icon-chevron-down collapse-indicator pull-right" role="presentation" aria-hidden="true"></span>
</a>
</h4>
<div id="notification-{$item->id}" class="collapse">
......
......@@ -4,10 +4,10 @@
{str section='module.multirecipientnotification' tag='composemessage'}
</a>
<div id="notifications-page-header"/></div>
{include file="module:multirecipientnotification:indexsearch.tpl" searchdata=$searchdata boxtype=inbox}
{if $activitylist.count > 0}
<div id="notifications" class="notification-parent" data-requesturl="indexin.json.php">
<div id="notifications" class="notification-parent view-container" data-requesturl="indexin.json.php">
<div class="btn-group bulk-actions" role="group">
<label class="btn btn-default" for="selectall">
......@@ -70,7 +70,11 @@
{else}
<div class="notifications-empty" id="notifications">
<p class="no-results">
{str section='activity' tag='yourinboxisempty'}
{if $searchdata->searchtext}
{str section='activity' tag='noresultsfound'}
{else}
{str section='activity' tag='yourinboxisempty'}
{/if}
</p>
</div>
{/if}
......
......@@ -4,10 +4,10 @@
{str section='module.multirecipientnotification' tag='composemessage'}
</a>
<div id="notifications-page-header"/></div>
{include file="module:multirecipientnotification:indexsearch.tpl" searchdata=$searchdata boxtype=outbox}
{if $activitylist.count > 0}
<div id="notifications" class="notification-parent" data-requesturl="indexout.json.php">
<div id="notifications" class="notification-parent view-container" data-requesturl="indexout.json.php">
<div class="btn-group bulk-actions" role="group">
<label class="btn btn-default" for="selectall">
......@@ -68,7 +68,11 @@
{else}
<div class="notifications-empty" id="notifications">
<p class="no-results">
{str section='activity' tag='youroutboxisempty'}
{if $searchdata->searchtext}
{str section='activity' tag='noresultsfound'}
{else}
{str section='activity' tag='youroutboxisempty'}
{/if}
</p>
</div>
{/if}
......
<form action="{$boxtype}.php" method="post" class="pieform form-inline with-heading">
<div>
<label>{str section='module.multirecipientnotification' tag='labelsearch'}</label>
<input type="text" name="search" id="search" autofocus="autofocus" value="{$searchdata->searchtext}">
<input type="hidden" name="searcharea" value="All_data">
<button type="submit" name="buttonsubmit" class="btn-primary submitcancel submit btn">{str tag='go'}</button>
</div>
{if $searchdata->searchtext}
<div>
<div>
<span class="accessible-hidden">{str section='activity' tag='messagetype'}</span>
{if $searchdata->all_count > 0}
<a class="{if $searchdata->searcharea === 'All_data'}filtered{/if}" href="{$searchdata->searchurl}All_data">
{/if}
{str section='module.multirecipientnotification' tag='labelall'}{if $searchdata->all_count > 0} <span class="countresults">({$searchdata->all_count})</span>{/if}
{if $searchdata->all_count > 0}
</a>
{/if}
</div>
<div>
{if $searchdata->sender_count > 0}
<a class="{if $searchdata->searcharea === 'Sender'}filtered{/if}" href="{$searchdata->searchurl}Sender">
{/if}
{str section='module.multirecipientnotification' tag='fromuser'}{if $searchdata->sender_count > 0} <span class="countresults">({$searchdata->sender_count})</span>{/if}
{if $searchdata->sender_count > 0}
</a>
{/if}
</div>
<div>
{if $searchdata->sub_count > 0}
<a class="{if $searchdata->searcharea === 'Subject'}filtered{/if}" href="{$searchdata->searchurl}Subject">
{/if}
{str section='activity' tag='subject'}{if $searchdata->sub_count > 0} <span class="countresults"> ({$searchdata->sub_count})</span>{/if}
{if $searchdata->sub_count > 0}
</a>
{/if}
</div>
<div>
{if $searchdata->mes_count > 0}
<a class="countresults {if $searchdata->searcharea === 'Message'}filtered{/if}" href="{$searchdata->searchurl}Message">
{str section='module.multirecipientnotification' tag='labelmessage'} <span class="countresults">({$searchdata->mes_count})</span>
</a>
{/if}
</div>
<div>
{if $searchdata->recipient_count > 0}
<a class="{if $searchdata->searcharea === 'Recipient'}filtered{/if}" href="{$searchdata->searchurl}Recipient" class="btn">
{/if}
{str section='module.multirecipientnotification' tag='touser'} {if $searchdata->recipient_count > 0} <span class="countresults">({$searchdata->recipient_count})</span>{/if}
{if $searchdata->recipient_count > 0}
</a>
{/if}
</div>
</div>
{/if}
</form>
......@@ -530,3 +530,7 @@
margin-right: 15px;
padding: 5px;
}
.ownersubtab {
padding: 4px 0;
}
......@@ -74,6 +74,7 @@
padding: 0 8px;
line-height: 2em;
margin-top: 9px;
margin-bottom: 9px;
&:hover,
&:focus {
@include transition-duration(0.3s);
......@@ -81,7 +82,7 @@
color: $link-color;
}
}
&.active > a,
&.active > a,
&.active > button, {
color: $text-color;
background: #fff;
......
......@@ -18,4 +18,9 @@
.artefactchooser-search {
padding: 10px 0;
}
\ No newline at end of file
}
.artefactchooser-subtabs-selected {
display: inline-block;
padding: 7px;
}
......@@ -58,19 +58,4 @@
.feedcontent h6 {
font-size: $font-size-h3;
}
table {
border-spacing: 0;
border-color: $table-border-color;
border-width: 1px;
}
table,
table td {
border-style: solid;
}
table td {
padding:2px 5px;
}
}
......@@ -117,7 +117,6 @@
// this is a weird and somewhat broken case where form renderers are being use to render regular html
&.html form {
display: block;
.form-group,
.collapsible-group .panel.collapsible & .form-group {
border: 0;
padding: 0;
......@@ -203,6 +202,7 @@
display: block;
}
input[type=checkbox] {
top: 3px;
margin-left: 0;
}
&.stacked {
......
......@@ -16,6 +16,9 @@
text-overflow: ellipsis;
white-space: nowrap;
}
.tagexcluded {
background: #ffd9d9 !important;
}
}
.select2-search--inline {
......
......@@ -209,6 +209,9 @@ table.table tr {
float:left;
}
}
.with-selectall {
min-width: 110px;
}
}
.table > thead > tr.th-has-shared > th {
......@@ -263,3 +266,14 @@ table.table tr {
.table>thead>tr>th.groupshortname {
width: 20%;
}
.table.profile-info {
table-layout: fixed;
td,
th {
word-break: break-all;
}
>tbody>tr:first-child>td {
border-top-width: 1px;
}
}
......@@ -101,6 +101,7 @@
@import "../lib/draggable";
@import "../lib/graph";
@import "../lib/elasticsearch";
@import "../lib/print";
// Keep these files last to override all other style sheets
@import "../custom";
......
{include file="header.tpl"}
<form class="form-inline pieform form with-heading" action="{$WWWROOT}admin/groups/archive.php" method="post">
<form class="form-inline pieform form with-heading" action="{$WWWROOT}admin/groups/archives.php" method="post">
{if $search->sortby}
<input type="hidden" name="sortby" id="sortby" value="{$search->sortby}">
{/if}
......
......@@ -14,7 +14,7 @@
<th>{str section=admin tag=component}</th>
<th>{str section=admin tag=fromversion}</th>
<th>{str section=admin tag=toversion}</th>
<th id="msgscol">{str section=admin tag=information}</th>
<th id="msgscol">{str section=admin tag=Information}</th>
</tr>
</thead>
<tbody>
......
......@@ -24,7 +24,7 @@
<span class="subsection-heading">{$artefacttitle}</span>
{/if}
<span class="metadata">
| {$view->display_title()|safe}
| {$viewdisplaytitle|safe}
{if $hasfeed}
<a href="{$feedlink}">
<span class="icon-rss icon pull-right" role="presentation" aria-hidden="true"></span>
......@@ -51,9 +51,9 @@
{if $artefact}
{if $viewbeingwatched}
{str tag=removefromwatchlistartefact section=view arg1=$view->get('title')}
{str tag=removefromwatchlistartefact section=view arg1=$viewtitle}
{else}
{str tag=addtowatchlistartefact section=view arg1=$view->get('title')}
{str tag=addtowatchlistartefact section=view arg1=$viewtitle}
{/if}
{else}
{if $viewbeingwatched}
......
......@@ -27,6 +27,7 @@
},
processResults: function(data, page) {
return {
{{if $renderresult}}
results: jQuery.map(data.results, function(item) {
// sometimes text contains html that has to be renderered in the result list (e.g. user profile)
// we're assigning text to resultsText variable that get rendered in results, and
......@@ -36,6 +37,9 @@
text: jQuery('<div>').html(item.text).text()
})
}),
{{else}}
results: data.results,
{{/if}}
pagination: {
more: data.more
}
......@@ -53,6 +57,12 @@
},
{{$extraparams|safe}}
});
jQuery("#{{$id}}").on('select2:select', function(e) {
window.pageIsRendering = false;
});
jQuery("#{{$id}}").on('select2:unselect', function(e) {
window.pageIsRendering = false;
});
{{if !$inblockconfig}}
});
{{/if}}
......
......@@ -197,6 +197,16 @@ This button is used to show there are more options available. An example can be
```
</section>
<section data-markdown data-category="navigation">
### Main navigation
The Mahara navigation is displayed in collapsible format with drop-down menus. The navigation is
split up into main navigation, administration navigation and user navigation each having their own
icons and drop-down menus.
Please see <a class="follow" href="https://wiki.mahara.org/wiki/Customising/Themes/17.04">Mahara Wiki</a> for more
details on navigation styles.
</section>
<section data-markdown data-category="navigation">
### Pagination
The pagination has "Previous" and "Next" buttons.
......@@ -653,7 +663,6 @@ This is a normal table, e.g. found in a forum.
<p class="postdetail">
Item 2
</p>
</span>
</td>
<td class="text-center">Item 3</td>
</tr>
......@@ -1741,8 +1750,9 @@ Used as icon for a system notification.
});
// prevent example clicks going elsewhere
$j('[data-markdown] a').click(function(event) {
// prevent example clicks going elsewhere unless it is a link
// we do want a user to follow, eg help info
$j('[data-markdown] a:not(.follow)').click(function(event) {
event.preventDefault();
});
......
......@@ -20,12 +20,12 @@
{/if}
{if $accessgroup.startdate}
{if $accessgroup.stopdate}
<span class="date"> {$accessgroup.startdate|strtotime|format_date:'strfdaymonthyearshort'}&rarr;{$accessgroup.stopdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
<span class="date"> {$accessgroup.startdate|strtotime|format_date:'strftimedatetime'}&rarr;{$accessgroup.stopdate|strtotime|format_date:'strftimedatetime'}</span>
{else}
<span class="date"> {str tag=after} {$accessgroup.startdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
<span class="date"> {str tag=after} {$accessgroup.startdate|strtotime|format_date:'strftimedatetime'}</span>
{/if}
{elseif $accessgroup.stopdate}
<span class="date"> {str tag=before} {$accessgroup.stopdate|strtotime|format_date:'strfdaymonthyearshort'}</span>
<span class="date"> {str tag=before} {$accessgroup.stopdate|strtotime|format_date:'strftimedatetime'}</span>
{/if}{if !$dwoo.foreach.ags.last}, {/if}
{/strip}{/foreach}
{/if}
......
......@@ -144,11 +144,15 @@
</div>
{if $view.collid}
<div class="collection-list" title="{str tag='numviewsincollection' section='collection' arg1='$view.numviews'}" title="{str tag='numviewsincollection' section='collection' arg1='$view.numviews'}">
{assign var=fullnumviews value=$view.numviews}
{if $view.framework}
{assign var=fullnumviews value=$view.numviews + 1}
{/if}
<div class="collection-list" title="{str tag='numviewsincollection' section='collection' arg1='$fullnumviews'}">
{if $view.numviews > 0}
<a href="#" class="dropdown-toggle btn btn-link" data-toggle="dropdown" aria-expanded="false">
<span class="icon icon-chevron-down open-indicator" role="presentation" aria-hidden="true"></span>
<span class="page-count">{$view.numviews}</span>
<span class="page-count">{$fullnumviews}</span>
<span class="icon icon-file close-indicator" role="presentation" aria-hidden="true">
{if $view.numviews > 1}
<span class="collection-indicator few"></span>
......
......@@ -3,7 +3,7 @@
<td class="sharedpages">
<h3 class="title"><a href="{$view.fullurl}">{$view.title|str_shorten_text:65:true}</a>{if $view.collid} ({str tag=nviews section=view arg1=$view.numpages}){/if}</h3>
{if $view.sharedby}
<div class="groupdate">
<div class="groupdate">
{if $view.group}
<a href="{$view.groupdata->homeurl}">{$view.sharedby}</a>
{elseif $view.owner}
......@@ -15,13 +15,13 @@
{else}
{$view.sharedby}
{/if}
<span class="postedon text-midtone"> - {if $view.mtime == $view.ctime}
<span class="postedon text-midtone"> - {if $view.mtime == $view.ctime}
{str tag=Created}
{else}
{str tag=Updated}
{/if}
{$view.mtime|strtotime|format_date:'strftimedate'}
<div
{$view.mtime|strtotime|format_date:'strftimedate'}</span>
</div>
{/if}
<div class="detail">{$view.description|str_shorten_html:70:true|strip_tags|safe}</div>
{if $view.tags}<div class="tags"><strong>{str tag=tags}:</strong> {list_tags owner=$view.owner tags=$view.tags}</div>{/if}
......
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