Commit 0c52251e by gradyward

Narrowed the scope of selection for delete button selection.

Fixed TIM-650
parent 87294f38
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="openassessment_criterion_header view-outline"> <div class="openassessment_criterion_header view-outline">
<a class="action expand-collapse collapse"><i class="icon-caret-down ui-toggle-expansion"></i></a> <a class="action expand-collapse collapse"><i class="icon-caret-down ui-toggle-expansion"></i></a>
<h6 class="openassessment_criterion_header_title">{% trans "Criterion" %}</h6> <h6 class="openassessment_criterion_header_title">{% trans "Criterion" %}</h6>
<div class="openassessment_rubric_remove_button"><h2>{% trans "Remove" %}</h2></div> <div class="openassessment_criterion_remove_button"><h2>{% trans "Remove" %}</h2></div>
</div> </div>
<div class="openassessment_criterion_body wrapper-comp-settings"> <div class="openassessment_criterion_body wrapper-comp-settings">
<ul class="list-input settings-list openassessment_criterion_basic_editor"> <ul class="list-input settings-list openassessment_criterion_basic_editor">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<li class="openassessment_criterion_option"> <li class="openassessment_criterion_option">
<div class="openassessment_option_header"> <div class="openassessment_option_header">
<span class="openassessment_option_header_title">{% trans "Option" %}</span> <span class="openassessment_option_header_title">{% trans "Option" %}</span>
<div class="openassessment_rubric_remove_button"> <div class="openassessment_criterion_option_remove_button">
<h2>{% trans "Remove" %}</h2> <h2>{% trans "Remove" %}</h2>
</div> </div>
</div> </div>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -93,7 +93,7 @@ OpenAssessment.Container.prototype = { ...@@ -93,7 +93,7 @@ OpenAssessment.Container.prototype = {
// Since we just added the new element to the container, // Since we just added the new element to the container,
// it should be the last one. // it should be the last one.
var container = this; var container = this;
var containerItem = $("." + this.containerItemClass, this.containerElement).last() var containerItem = $("." + this.containerItemClass, this.containerElement).last();
containerItem.find('.' + this.removeButtonClass) containerItem.find('.' + this.removeButtonClass)
.click(function(eventData) { container.remove(eventData.target); } ); .click(function(eventData) { container.remove(eventData.target); } );
......
...@@ -57,7 +57,7 @@ OpenAssessment.RubricCriterion = function(element) { ...@@ -57,7 +57,7 @@ OpenAssessment.RubricCriterion = function(element) {
containerElement: $(".openassessment_criterion_option_list", this.element).get(0), containerElement: $(".openassessment_criterion_option_list", this.element).get(0),
templateElement: $("#openassessment_option_template").get(0), templateElement: $("#openassessment_option_template").get(0),
addButtonElement: $(".openassessment_criterion_add_option", this.element).get(0), addButtonElement: $(".openassessment_criterion_add_option", this.element).get(0),
removeButtonClass: "openassessment_rubric_remove_button", removeButtonClass: "openassessment_criterion_option_remove_button",
containerItemClass: "openassessment_criterion_option", containerItemClass: "openassessment_criterion_option",
} }
); );
......
...@@ -8,7 +8,7 @@ OpenAssessment.EditRubricView = function(element) { ...@@ -8,7 +8,7 @@ OpenAssessment.EditRubricView = function(element) {
containerElement: $("#openassessment_criterion_list", this.element).get(0), containerElement: $("#openassessment_criterion_list", this.element).get(0),
templateElement: $("#openassessment_criterion_template", this.element).get(0), templateElement: $("#openassessment_criterion_template", this.element).get(0),
addButtonElement: $("#openassessment_rubric_add_criterion", this.element).get(0), addButtonElement: $("#openassessment_rubric_add_criterion", this.element).get(0),
removeButtonClass: "openassessment_rubric_remove_button", removeButtonClass: "openassessment_criterion_remove_button",
containerItemClass: "openassessment_criterion", containerItemClass: "openassessment_criterion",
} }
); );
......
...@@ -390,6 +390,10 @@ ...@@ -390,6 +390,10 @@
.openassessment_criterion { .openassessment_criterion {
padding-bottom: 10px; padding-bottom: 10px;
.openassessment_criterion_remove_button{
@extend .openassessment_rubric_remove_button;
}
.openassessment_criterion_header { .openassessment_criterion_header {
margin: 10px; margin: 10px;
padding: 5px; padding: 5px;
...@@ -501,6 +505,10 @@ ...@@ -501,6 +505,10 @@
.openassessment_criterion_option{ .openassessment_criterion_option{
padding: 5px; padding: 5px;
.openassessment_criterion_option_remove_button{
@extend .openassessment_rubric_remove_button;
}
.openassessment_option_header{ .openassessment_option_header{
background-color: $edx-gray-l2; background-color: $edx-gray-l2;
padding: 5px 5px 5px 10px; padding: 5px 5px 5px 10px;
......
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