issue #883

sails/src/assets/scripts/modules/common/views/cropimg.html

@@ -25,9 +25,7 @@
             <img ng-src="{{ croppedDataUrl }}" />
             <img ng-src="{{ croppedDataUrl }}" />
           </div>
           </div>
           <div class="form-group">
           <div class="form-group">
-            <button class="btn btn-default" ng-click="crop(croppedDataUrl, picFile.name)" ng-model="picFile" accept="image/*">
-              <span class="glyphicon glyphicon-upload"></span> {{ 'upload_image' | translate }}
-            </button>
+
           </div>
           </div>
           <div class="form-group">
           <div class="form-group">
             <span class="progress" ng-show="progress > 0">
             <span class="progress" ng-show="progress > 0">
@@ -40,6 +38,11 @@
   </div> <!-- /modal-body -->
   </div> <!-- /modal-body -->
 
 
   <div class="modal-footer">
   <div class="modal-footer">
-      <button class="btn btn-primary" ng-click="cancel()">{{ 'close' | translate }}</button>
+    <button class="btn btn-danger" ng-click="cancel()">
+      <i class="fa fa-times-circle" aria-hidden="true"></i> Cancelar
+    </button>
+    <button class="btn btn-success" ng-click="crop(croppedDataUrl, picFile.name)" ng-model="picFile" accept="image/*">
+      <i class="fa fa-upload" aria-hidden="true"></i> {{ 'upload_image' | translate }}
+    </button>
   </div>
   </div>
 </div>
 </div>

sails/src/assets/scripts/modules/student/views/pictoexp.html

@@ -6,11 +6,11 @@
         <h4 class="modal-title" id="myModalLabel" translate>add_expression</h4>
         <h4 class="modal-title" id="myModalLabel" translate>add_expression</h4>
     </div>
     </div>
     <div class="modal-body">
     <div class="modal-body">
- 
+
       <form ng-submit="save()">
       <form ng-submit="save()">
         <div id="add_label" class="input-group">
         <div id="add_label" class="input-group">
           <span class="input-group-addon glyphicon glyphicon-comment" aria-hidden="true"></span>
           <span class="input-group-addon glyphicon glyphicon-comment" aria-hidden="true"></span>
-          <input type="text" class="form-control" ng-model="expression" />
+          <input type="text" class="form-control" ng-model="expression" autofocus/>
            <span class="input-group-btn">
            <span class="input-group-btn">
             <button class="btn btn-success" type="submit" translate>save</button>
             <button class="btn btn-success" type="submit" translate>save</button>
           </span>
           </span>
@@ -19,4 +19,4 @@
 
 
     </div>
     </div>
     <!-- End modal-body -->
     <!-- End modal-body -->
-</div>
+</div>
\ No newline at end of file