Commit a1d3a1dc authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1720269: old_raw patches for bugs: (General)"

parents ece1c516 70ac7cec
......@@ -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 {
......
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