Merge pull request #633 from edx/ammar/tnl72

TNL-72 & TNL-62 & TNL-811

openassessment/templates/openassessmentblock/edit/oa_edit_criterion.html

@@ -3,7 +3,10 @@
 <li class="openassessment_criterion is-collapsible" data-criterion="{{ criterion_name }}">
     <div class="openassessment_criterion_header view-outline">
         <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>
+        <div class="openassessment_criterion_header_title_box">
+            <h6 class="openassessment_criterion_header_title">{% trans "Criterion" %}</h6>
+            <p class="openassessment_criterion_guide">{% trans "You cannot delete a criterion after the assignment has been released." %}</p>
+        </div>
         <div class="openassessment_criterion_remove_button"><h2>{% trans "Remove" %}</h2></div>
     </div>
     <div class="openassessment_criterion_body wrapper-comp-settings">
@@ -61,4 +64,4 @@
         </div>
     </div>
 </li>
-{% endspaceless %}
+{% endspaceless %}
\ No newline at end of file

openassessment/templates/openassessmentblock/oa_base.html

@@ -23,7 +23,6 @@
             <div class="wrapper-openassessment__message">
                 {% block message %}
                 <div id="openassessment__message" class="openassessment__message message">
-                    <h3 class="message__title">Instructions</h3>
                     <div class="message__content">
                         <p>{% trans "This assignment has several steps. In the first step, you'll provide a response to the question. The other steps appear below the Your Response field." %}</p>
                     </div>

openassessment/xblock/static/sass/oa/utilities/_developer.scss

@@ -530,15 +530,22 @@
           }
         }
 
+        .openassessment_criterion_header_title_box {
+            float: left;
+            width: 80%;
+            display: inline-block;
+        }
+
         .openassessment_criterion_header_title {
           text-transform: uppercase;
-          width: 50%;
-          display: inline-block;
-          float: left;
           cursor: default;
           padding-top: 2px;
         }
 
+        .openassessment_criterion_guide {
+            @extend %t-small;
+        }
+
         .openassessment_criterion_header_remove {
           @extend .openassessment_rubric_remove_button;
         }
@@ -1105,26 +1112,6 @@
     }
   }
 
-  @include media($bp-m) {
-    @include span-columns(4 of 4);
-  }
-
-  @include media($bp-ds) {
-    @include span-columns(6 of 6);
-  }
-
-  @include media($bp-dm) {
-    @include span-columns(12 of 12);
-  }
-
-  @include media($bp-dl) {
-    @include span-columns(12 of 12);
-  }
-
-  @include media($bp-dx) {
-    @include span-columns(12 of 12);
-  }
-
   .step__label, .grade__value {
     display: inline-block;
     vertical-align: middle;