ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bootstrap: fix display issues on alerts page 

also, make user settings gear buttons larger, for
consistency with other pages

test plan:
 - course settings/alerts
   - "Add Trigger", "Add Recipient" buttons should be vertically
     centered
   - should be a space between the radio buttons and the
     associated text
   - error balloons should disappear when you cancel out
     of editing
  - course settings/users
   - the gear icons should be sized correctly

fixes CNVS-4664

Change-Id: I213ed6f5eec3bd63e5b7399b6b86b8c30d98ec16
Reviewed-on: https://gerrit.instructure.com/18718
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Adam Phillipps <adam@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
This commit is contained in:
Jeremy Stanley 2013-03-18 15:34:25 -06:00
parent ce674b4e41
commit 4c355ae9d7
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/stylesheets/alerts.scss
View File

@ -36,6 +36,10 @@
float: right
}
}
.add_criteria_line select, .add_recipients_line select, .repetition_group input[type="text"] {
vertical-align: baseline;
}
}
.alert.blank {

4
app/views/alerts/_alert.html.erb
View File

@ -28,8 +28,8 @@
<div class="labelled_region">
<span class="alert-label"><%= before_label :repetition, "Repetition" %></span>
<div class="repetition_group">
<input type="radio" class="editing" name="repetition" value="none" checked="checked" id="repetition_none_<%= alert_counter %>" /><label for="repetition_none_<%= alert_counter %>" class="no_repetition"><%= t('no_repetition_description', "Do not re-send alert") %></label><br class="editing"/>
<input type="radio" class="editing" name="repetition" value="value" id="repetition_repetition_<%= alert_counter %>" /><label for="repetition_repetition_<%= alert_counter %>" class="repetition" style="display:none;"><%= t('repetition_description', "Re-send alert every %{count} days until resolved", :count => "<span class='displaying'></span><input type='text' name='alert[repetition]' class='editing' size='2' />".html_safe) %></label>
<input type="radio" class="editing" name="repetition" value="none" checked="checked" id="repetition_none_<%= alert_counter %>" /> <label for="repetition_none_<%= alert_counter %>" class="no_repetition"><%= t('no_repetition_description', "Do not re-send alert") %></label><br class="editing"/>
<input type="radio" class="editing" name="repetition" value="value" id="repetition_repetition_<%= alert_counter %>" /> <label for="repetition_repetition_<%= alert_counter %>" class="repetition" style="display:none;"><%= t('repetition_description', "Re-send alert every %{count} days until resolved", :count => "<span class='displaying'></span><input type='text' name='alert[repetition]' class='editing' size='2' />".html_safe) %></label>
</div>
</div>

2
app/views/jst/courses/settings/UserView.handlebars
View File

@ -1,5 +1,5 @@
<div class="admin-links">
<button class="al-trigger btn btn-mini">
<button class="al-trigger btn">
<i class="icon-settings"></i><i class="icon-mini-arrow-down"></i>
<span class="screenreader-only">{{#t "manage"}}Manage{{/t}}</span></button>
<ul class="al-options">

1
public/javascripts/alerts.js
View File

@ -215,6 +215,7 @@ define([
}
return false;
}).delegate('.cancel_button', 'click', function() {
$(this).parent().hideErrors();
var $alert = $(this).parents('.alert');
if($alert.hasClass('new')) {
$alert.slideUp(function() {