Merge branch 'MDL-59295-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 22:53:28 +0000 (00:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 22:53:28 +0000 (00:53 +0200)
1  2 
admin/tool/lp/templates/competency_rule_config.mustache

@@@ -60,7 -60,7 +60,7 @@@
          <div data-region="rule-base" class="form">
              <div data-region="rule-outcome" class="form-group">
                  <label>{{#str}}outcome, tool_lp{{/str}}</label>
-                 <select name="outcome" class="custom-select" ng-label="{{#str}}outcome, tool_lp{{/str}}">
+                 <select name="outcome" class="custom-select">
                      {{#outcomes}}
                      <option value="{{code}}" {{#selected}}selected{{/selected}}>{{name}}</option>
                      {{/outcomes}}
@@@ -68,7 -68,7 +68,7 @@@
              </div>
              <div data-region="rule-type" class="form-group">
                  <label>{{#str}}when, tool_lp{{/str}}</label>
-                 <select name="rule" class="custom-select" ng-label="{{#str}}when, tool_lp{{/str}}">
+                 <select name="rule" class="custom-select">
                      <option value="-1">{{#str}}choosedots{{/str}}</option>
                      {{#rules}}
                      <option value="{{type}}" {{#selected}}selected{{/selected}}>{{name}}</option>
          {{/config}}
      </div>
  
 -    <div data-region="footer" class="pull-xs-right">
 +    <div data-region="footer" class="pull-xs-right m-t-1">
          {{#config}}
          <input type="button" class="btn btn-primary" data-action="save" value="{{#str}}savechanges{{/str}}"/>
          {{/config}}
          <input type="button" class="btn btn-secondary" data-action="cancel" value="{{#str}}cancel{{/str}}"/>
      </div>
 +    <div class="clearfix"></div>
  </div>