Commit 119598f1 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic

Bug 1684267: Adding changes of old raw lost in merge

behatnotneeded

Change-Id: Ia8cb67a9b92304970f4011771314745ad953a96f
parent 7dbc6870
<div class="blog">
{if $alldraftposts}
{str tag='alldraftposts' section='artefact.blog'}
{/if}
{if ($editing && $canaddpost)}
<a class="panel-footer" href="{$WWWROOT}artefact/blog/post.php?blog={$blogid}">
<span class="icon icon-plus text-success left" role="presentation" aria-hidden="true"></span>
......
{**
* This template displays a blog post.
*}
{if $published}
<div id="blogpost-{$postid}" class="panel-body flush">
{if $artefacttitle && $simpledisplay}
<h3 class="title">
<h2 class="title">
{$artefacttitle|safe}
</h3>
</h2>
{/if}
<div class="postdetails metadata">
......@@ -40,7 +40,7 @@
{if isset($attachments)}
<div class="has-attachment panel panel-default collapsible">
<h5 class="panel-heading">
<h3 class="panel-heading">
<a class="text-left collapsed" aria-expanded="false" href="#blog-attach-{$postid}" data-toggle="collapse">
<span class="icon left icon-paperclip" role="presentation" aria-hidden="true"></span>
......@@ -48,7 +48,7 @@
<span class="metadata">({$attachments|count})</span>
<span class="icon icon-chevron-down pull-right collapse-indicator" role="presentation" aria-hidden="true"></span>
</a>
</h5>
</h3>
<!-- Attachment list with view and download link -->
<div id="blog-attach-{$postid}" class="collapse">
<ul class="list-unstyled list-group">
......@@ -83,3 +83,8 @@
</div>
{/if}
</div>
{else}
<div>
{$notpublishedblogpost|safe}
</div>
{/if}
{if $artefacttype == 'image' || $artefacttype == 'profileicon'}
<h3 class="title">
<h2 class="title">
{str tag=Preview section=artefact.file}
</h3>
</h2>
<div class="filedata-icon">
<a href="{$downloadpath}">
<img src="{$downloadpath}&maxwidth=400&maxheight=180" alt="">
......
......@@ -76,19 +76,19 @@
<span class="state-label on" role="presentation" aria-hidden="true" tabindex="-1">{str tag=switchbox.on section=pieforms}</span>
<span class="state-label off" role="presentation" aria-hidden="true" tabindex="-1">{str tag=switchbox.off section=pieforms}<span>
</label>
</div>
</div>
<script type="application/javascript">Switchbox.computeWidth("{$prefix}_edit_allowcomments");</script>
</div>
<div>
<div class="submitcancel form-group">
<input type="submit" class="submit btn btn-primary" name="{$prefix}_update[{$fileinfo->id}]" id="{$prefix}_edit_artefact" value="{str tag=savechanges section=artefact.file}" />
<input type="submit" class="cancel" name="{$prefix}_canceledit" id="{$prefix}_edit_cancel" value="{str tag=cancel}" />
<script type="application/javascript">Switchbox.computeWidth("{$prefix}_edit_allowcomments");</script>
</div>
<div>
<div id="{$prefix}_edit_messages">
<div class="submitcancel form-group">
<input type="submit" class="submit btn btn-primary" name="{$prefix}_update[{$fileinfo->id}]" id="{$prefix}_edit_artefact" value="{str tag=savechanges section=artefact.file}" />
<input type="submit" class="cancel" name="{$prefix}_canceledit" id="{$prefix}_edit_cancel" value="{str tag=cancel}" />
</div>
<div>
<div id="{$prefix}_edit_messages">
</div>
</div>
</div>
</div>
</td>
</tr>
......@@ -64,7 +64,7 @@
<input type="hidden" name="{$prefix}_uploadnumber" id="{$prefix}_uploadnumber" value="1"/>
<input type="hidden" name="MAX_FILE_SIZE" value="{$phpmaxfilesize}" />
<div id="{$prefix}_upload_messages"></div>
<h3 class="title">{str tag='uploadfile' section='artefact.file'}</h3>
<h2 class="title">{str tag='uploadfile' section='artefact.file'}</h2>
<div class="row">
{if $config.uploadagreement || $licenseform}
......@@ -100,7 +100,7 @@
</label>
<span id="{$prefix}_userfile_container">
<input type="file" class="file" {$accepts|safe} 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">
......@@ -108,7 +108,7 @@
</span>
{if $config.uploadagreement}
<script>setNodeAttribute('{$prefix}_userfile', 'disabled', true);</script>
<script>jQuery('#{$prefix}_userfile').prop('disabled', true);</script>
{/if}
</div>
......
......@@ -119,7 +119,7 @@
<span class="dull text-muted">{str tag=Submitted section=view}</span>
{elseif !$file->isparent}
{if !isset($file->can_edit) || $file->can_edit !== 0}
<button name="{$prefix}_edit[{$file->id}]" class="btn btn-default btn-xs" title="{str tag=edit}">
<button name="{$prefix}_edit[{$file->id}]" class="btn btn-default btn-xs editable" title="{str tag=edit}">
<span class="icon icon-pencil icon-lg" role="presentation" aria-hidden="true"></span>
{if $file->artefacttype == 'folder'}
<span class="sr-only">{str tag=editfolderspecific section=artefact.file arg1=$displaytitle|escape:html|safe}</span>
......
......@@ -32,7 +32,7 @@
<input type="hidden" name="sesskey" value="{$USER->get('sesskey')}">
</form>
<h3>{str tag="uploadprofileicon" section="artefact.file"}</h3>
<h2>{str tag="uploadprofileicon" section="artefact.file"}</h2>
<p class="lead">
{str tag="profileiconsiconsizenotice" section="artefact.file" args=$imagemaxdimensions}
</p>
......
......@@ -79,7 +79,7 @@
<div id="book-content-{$row->id}{if $artefactid}-{$artefactid}{/if}" class="collapse resume-content">
{if $row->description}
<p class="content-text">
{$row->description}
{$row->description|safe}
</p>
{/if}
......
......@@ -80,7 +80,7 @@
<div id="certification-content-{$row->id}{if $artefactid}-{$artefactid}{/if}" class="collapse resume-content">
{if $row->description}
<p class="content-text">
{$row->description}
{$row->description|safe}
</p>
{/if}
......
......@@ -80,7 +80,7 @@
<div id="education-content-{$row->id}{if $artefactid}-{$artefactid}{/if}" class="collapse resume-content">
{if $row->qualdescription}
<p class="content-text">
{$row->qualdescription}
{$row->qualdescription|safe}
</p>
{/if}
......
......@@ -79,7 +79,7 @@
<div id="employment-content-{$row->id}{if $artefactid}-{$artefactid}{/if}" class="collapse resume-content">
{if $row->positiondescription}
<p class="content-text">
{$row->positiondescription}
{$row->positiondescription|safe}
</p>
{/if}
......
......@@ -83,7 +83,7 @@
<div id="membership-content-{$row->id}{if $artefactid}-{$artefactid}{/if}" class="collapse resume-content">
{if $row->description}
<p class="content-text">
{$row->description}
{$row->description|safe}
</p>
{/if}
......
......@@ -6,7 +6,7 @@
<h5 class="text-inline">{$item.name|str_shorten_text:60:true}</h5>
<span class="owner metadata inner-link text-small">
{str tag=by section=view}
<a href="{$item.ownerurl}" class="text-success text-small">
<a href="{$item.ownerurl}" class="text-link text-small">
{$item.ownername}
</a>
</span>
......
......@@ -49,6 +49,6 @@
</div>
{else}
<div class="panel-body">
<p class="lead text-small">{str tag=noviews section=view}</p>
<p class="lead text-small">{str tag=noviews1 section=view}</p>
</div>
{/if}
......@@ -12,5 +12,5 @@
{/foreach}
</ul>
{else}
<p>{str tag=youhavenoviews section=view}</p>
<p>{str tag=youhavenoviews1 section=view}</p>
{/if}
<div class="alert alert-default">
{if $header}<h3>{$header}</h3>{/if}
<p>{$notice|safe}</p>
</div>
<table class="table fullwidth table-padded">
<tbody>
<thead>
<tr>
<th>{str tag="configstep" section="module.lti"}</th>
<th>{str tag="configstepstatus" section="module.lti"}</th>
</tr>
</thead>
{foreach from=$statuslist item=item}
<tr>
<td>
<h3 class="title">
{$item.name}
</h3>
</td>
<td>
{if $item.status}
<span class="icon icon-check text-success" title="{str tag="readylabel" section="module.lti"}" role="presentation" aria-hidden="true"></span>
{else}
<span class="icon icon-exclamation-triangle" title="{str tag="notreadylabel" section="module.lti"}" role="presentation" aria-hidden="true"></span>
{/if}
</td>
</tr>
{/foreach}
</tbody>
</table>
<script type="text/javascript">
if (typeof module_lti_reload_page === "undefined") {
function module_lti_reload_page() {
window.location.reload(true);
}
}
</script>
<cartridge_basiclti_link xmlns="http://www.imsglobal.org/xsd/imslticc_v1p0" xmlns:blti="http://www.imsglobal.org/xsd/imsbasiclti_v1p0" xmlns:lticm="http://www.imsglobal.org/xsd/imslticm_v1p0" xmlns:lticp="http://www.imsglobal.org/xsd/imslticp_v1p0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.imsglobal.org/xsd/imslticc_v1p0 http://www.imsglobal.org/xsd/lti/ltiv1p0/imslticc_v1p0.xsd http://www.imsglobal.org/xsd/imsbasiclti_v1p0 http://www.imsglobal.org/xsd/lti/ltiv1p0/imsbasiclti_v1p0p1.xsd http://www.imsglobal.org/xsd/imslticm_v1p0 http://www.imsglobal.org/xsd/lti/ltiv1p0/imslticm_v1p0.xsd http://www.imsglobal.org/xsd/imslticp_v1p0 http://www.imsglobal.org/xsd/lti/ltiv1p0/imslticp_v1p0.xsd">
<blti:title>{$sitename}</blti:title>
<blti:description>
{$description}
</blti:description>
<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>
<lticm:property name="windowTarget">_blank</lticm:property>
<lticm:options name="custom_fields">
<lticm:property name="wsfunction">module_lti_launch</lticm:property>
</lticm:options>
</lticm:options>
</blti:extensions>
</cartridge_basiclti_link>
......@@ -57,7 +57,7 @@
</span>
</span>
</span>
<span class="icon icon-chevron-down collapse-indicator pull-right" role="presentation" aria-hidden="true"></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">
......
......@@ -9,7 +9,7 @@
<div id="notifications" class="notification-parent" data-requesturl="indexin.json.php">
<div class="btn-group pull-left bulk-actions" role="group">
<div class="btn-group bulk-actions" role="group">
<label class="btn btn-default" for="selectall">
<input type="checkbox" name="selectall" id="selectall" data-togglecheckbox="tocheck">
<span class="sr-only">{str section='activity' tag='selectall'}</span>
......@@ -34,7 +34,7 @@
</a>
</div>
</div>
<form method="post" class="form-inline form-select-filter pieform form-as-button pull-right">
<form method="post" class="form-inline form-select-filter pieform form-as-button">
<div class="form-group">
<label class="sr-only" for="notifications_type">{str section='activity' tag='type'}:</label>
<div class="input-group select-group">
......
......@@ -9,7 +9,7 @@
<div id="notifications" class="notification-parent" data-requesturl="indexout.json.php">
<div class="btn-group pull-left bulk-actions" role="group">
<div class="btn-group bulk-actions" role="group">
<label class="btn btn-default" for="selectall">
<input type="checkbox" name="selectall" id="selectall" data-togglecheckbox="tocheck">
<span class="sr-only">{str section='activity' tag='selectall'}</span>
......@@ -32,7 +32,7 @@
</a>
</div>
</div>
<form method="post" class="form-inline form-select-filter pieform pull-right">
<form method="post" class="form-inline form-select-filter pieform">
<div class="form-group">
<label for="notifications_type" class="sr-only">{str section='activity' tag='type'}:</label>
<div class="input-group select-group">
......
......@@ -50,12 +50,12 @@
.layoutthumb {
rect.layout1 {
fill: darken($panel-default-heading-bg, 10%);
stroke: #ccc;
stroke: $panel-default-border;
}
rect.layout0 {
fill: darken($panel-default-heading-bg, 15%);
stroke: #ccc;
stroke: $panel-default-border;
}
svg {
......@@ -204,10 +204,6 @@
}
}
.form-group .select2-container .select2-selection .select2-search input[type=search] {
width: 100% !important;
}
.progress-bar {
position: relative;
&.small-progress span {
......@@ -310,7 +306,6 @@
// Editgroup membership modal
// see editgroupmemship.tpl
.editgroup-container {
border-bottom: 1px solid #f9f9f9;
padding-bottom: 20px;
margin-bottom: 20px;
&:last-child {
......@@ -343,7 +338,7 @@
position: relative;
top: -3px;
margin-left: 3px;
color: #888;
color: $gray-light;
}
.asc > a::after {
content: '\f0dd';
......@@ -356,7 +351,7 @@
}
.containobjectionable {
background-color: #FEE7E7;
background-color: $state-danger-bg;
}
.permissions-table {
......@@ -408,7 +403,7 @@
// Remove the link colour from a comment that has an attachement
@media (min-width: 992px) {
.viewfooter .comment-item .comment-attachment .panel.collapsible h4 a.collapsed {
color: #333;
color: $text-color;
}
}
......@@ -451,6 +446,14 @@
width: 90%;
}
.authInstance .authitem {
padding:5px;
&.inactive {
background: $state-warning-bg;
color: $state-warning-text;
}
}
.btn-search.btn.btn-primary.admin-groups.button.btn {
margin-left: -13px;
margin-top: 2px;
......@@ -474,6 +477,13 @@
}
}
// fix responsive layout for pages and collections grid where sidebar overlaps
.grouppageswrap.view-container:after {
clear: both;
content: "";
display: table;
}
.notification-parent .bulk-actions label.btn-default {
padding-bottom: 3px;
}
......@@ -71,12 +71,12 @@
display: inline-block;
}
&:hover {
color: #222;
color: $gray-darker;
background: $gray-lighter;
text-decoration: none;
.icon {
color: #777;
color: $gray-light;
}
}
}
......@@ -201,9 +201,9 @@ td.action-list-copy {
border-top-left-radius: 0;
border-top-right-radius: 0;
border-top: 0;
background: rgba(#ccc, 0.8);
background: lighten($btn-default-bg, 0.8);
&:hover {
background: rgba(#ddd, 1);
background: rgba($btn-default-bg, 1);
}
}
}
......@@ -269,14 +269,14 @@ td.action-list-copy {
}
&.last {
border-bottom-radius: 3px;
background-color: #F9F9F9
background-color: $btn-default-bg;
}
}
// To override btn-primary colour
.btn-primary {
color: $gray-dark;
background: darken($brand-default, 10%);
border-color: #adadad;
border-color: $btn-default-border;
}
}
label {
......
......@@ -3,9 +3,6 @@
margin: 0 auto;
.item {
display: block;
// &.inline {
// display: block;
// }
}
&.carousel-ready {
......@@ -56,7 +53,7 @@
a {
display: block;
padding: 3px;
color: #000;
color: $text-color;
opacity: .5;
&:hover,
&:focus {
......
......@@ -11,11 +11,11 @@
.cell {
min-width: 0;
float: left;
background-color: #f2f2f2;
border: 1px solid #ccc;
background-color: $gray-lighter;
border: 1px solid darken($gray-lighter, 5%);
margin: 2% 2% 0 0;
&.active {
background-color: darken(#f2f2f2, 10%);
background-color: darken($gray-lighter, 10%);
}
input {
display: inline;
......
......@@ -26,16 +26,16 @@
font-size: 1.2em;
cursor: pointer;
&.begun {
color: #5b9aa9;
color: $assessment-begun-color;
}
&.incomplete {
color: $brand-danger;
color: $assessment-incomplete-color;
}
&.partial {
color: $brand-warning;
color: $assessment-partial-color;
}
&.completed {
color: $brand-success;
color: $assessment-completed-color;
}
&.dot {
font-size: 0.8em;
......@@ -126,20 +126,20 @@
}
}
.assessment {
color: #333;
color: $gray-dark;
.assessmentfeedback {
&.begun {
color: #5b9aa9;
color: $assessment-begun-color;
}
&.incomplete {
color: $brand-danger;
color: $assessment-incomplete-color;
}
&.partial {
color: $brand-warning;
color: $assessment-partial-color;
}
&.completed {
color: $brand-success;
color: $assessment-completed-color;
}
}
}
......@@ -19,7 +19,7 @@
//dash
.collapse-indicator {
color: #aaa;
color: $navbar-default-link-color;
font-size: 13px;
display: block;
transition-duration: 0.3s;
......@@ -30,11 +30,11 @@
font-size: 11px;
}
.collapsed & {
color: #aaa;
color: $navbar-default-link-color;
}
a:hover &,
a:focus & {
color: #555;
color: $navbar-default-link-hover-color;
}
.collapsed ~ & {
transform: rotate(180deg);
......@@ -46,12 +46,12 @@
a[data-toggle="collapse"] {
&:hover .collapse-indicator,
&:focus .collapse-indicator{
color: #555;
color: $navbar-default-link-hover-color;
}
.collapse-indicator {
transform: rotate(-180deg);
transition-duration: 0.3s;
color: #aaa;
color: $navbar-default-link-color;
margin-top: 5px;
line-height: 13px;
height: auto;
......@@ -79,13 +79,13 @@ a[data-toggle="collapse"] {
[data-toggle="collapse"].outer-link {
&.collapsed {
~ .collapse-indicator {
color: #aaa;
color: $navbar-default-link-color;</