minor errors fixed

sails/src/assets/scripts/modules/student/controllers/addpicto.js

@@ -328,7 +328,11 @@ dashboardControllers.controller('AddPictoCtrl', function (
   //
   //
   // Search srch_term_picto in owned or public pictos
   // Search srch_term_picto in owned or public pictos
   //
   //
-  $scope.search = function(){
+  $scope.search = function() {
+
+    if ($scope.onlyOwn)
+      return;
+
     $scope.page=1; // Reset pagination
     $scope.page=1; // Reset pagination
     var length = $scope.srch_term_picto == undefined ? 0 : $scope.srch_term_picto.length;
     var length = $scope.srch_term_picto == undefined ? 0 : $scope.srch_term_picto.length;
     if(length <2){ //Check the word length
     if(length <2){ //Check the word length

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

@@ -7,8 +7,7 @@
     </button>
     </button>
     <h4 class="modal-title" id="myModalLabel" translate ng-show="!onlyOwn">add_picto</h4>
     <h4 class="modal-title" id="myModalLabel" translate ng-show="!onlyOwn">add_picto</h4>
     <h4 class="modal-title" id="myModalLabel" translate ng-show="onlyOwn">own_pictos</h4>
     <h4 class="modal-title" id="myModalLabel" translate ng-show="onlyOwn">own_pictos</h4>
-
-    <hr>
+    <hr ng-show="!onlyOwn">
 
 
     <div class="btn-group" ng-show="!onlyOwn">
     <div class="btn-group" ng-show="!onlyOwn">
       <button class="btn btn-default" btn-radio="'symbolstx'" ng-model="source" ng-click="open_category_from_bc('0')">
       <button class="btn btn-default" btn-radio="'symbolstx'" ng-model="source" ng-click="open_category_from_bc('0')">
@@ -18,7 +17,6 @@
         <span class="glyphicon glyphicon-picture"></span> {{ 'own_pictos' | translate }}
         <span class="glyphicon glyphicon-picture"></span> {{ 'own_pictos' | translate }}
       </button>
       </button>
     </div>
     </div>
-
   </div>
   </div>
 
 
   <div class="modal-body">
   <div class="modal-body">
@@ -53,7 +51,7 @@
           id="srch_term_picto" name="srch_term_picto" ng-model="srch_term_picto">
           id="srch_term_picto" name="srch_term_picto" ng-model="srch_term_picto">
           <span class="input-group-btn">
           <span class="input-group-btn">
             <button type="submit" class="btn btn-primary">
             <button type="submit" class="btn btn-primary">
-              <i class="fa fa-search" aria-hidden="true"> {{ 'search' | translate }}</i>
+              <i class="fa fa-search" aria-hidden="true"></i> {{ 'search' | translate }}
             </button>
             </button>
           </span>
           </span>
         </div>
         </div>
@@ -61,7 +59,7 @@
       <div ng-show="source == 'ownpictos'" class="input-group">
       <div ng-show="source == 'ownpictos'" class="input-group">
         <button class="btn btn-success" ngf-select ng-model="picFile" accept="image/*" ngf-change="addOwnPicto()">
         <button class="btn btn-success" ngf-select ng-model="picFile" accept="image/*" ngf-change="addOwnPicto()">
           <span class="glyphicon glyphicon-folder-open"></span> {{ 'new_img' | translate }}
           <span class="glyphicon glyphicon-folder-open"></span> {{ 'new_img' | translate }}
-        </label>
+        </button>
       </div>
       </div>
       <!-- Galería de pictos -->
       <!-- Galería de pictos -->
       <div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()"
       <div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()"
@@ -70,20 +68,16 @@
           class="picto_peq pull-left"
           class="picto_peq pull-left"
           ng-repeat="p in pictos" >
           ng-repeat="p in pictos" >
           <img ng-src="{{p.uri}}" popover="{{p.expressions[0].text}}" popover-trigger="mouseenter"   />
           <img ng-src="{{p.uri}}" popover="{{p.expressions[0].text}}" popover-trigger="mouseenter"   />
-          <!-- Options to remove picto (Only for own pictos) -->
-          <div class="picto_options" ng-show="source == 'ownpictos'">
-            <a ng-click="remove_own_picto(p.id)" class="picto_remove" title="{{ 'delete' | translate}}">
+          <div class="picto_options">
+            <!-- Options to remove picto (Only for own pictos) -->
+            <a ng-click="remove_own_picto(p.id)" class="picto_remove" title="{{ 'delete' | translate}}" ng-show="source == 'ownpictos'">
               <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
               <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
             </a>
             </a>
-          </div>
-          <div class="picto_options">
-            <a ng-click="remove_own_picto(p.id)" class="picto_remove" title="{{ 'delete' | translate}}">
-              <a
-                ng-click="close(p.id)"
-                class="picto_add"
-                title="{{ 'add_picto' | translate}}">
-                <i class="color_green glyphicon glyphicon-plus-sign" aria-hidden="true"></i>
-              </a>
+            <a ng-show="!onlyOwn"
+              ng-click="close(p.id)"
+              class="picto_add"
+              title="{{ 'add_picto' | translate}}">
+              <span class="color_green glyphicon glyphicon-plus-sign" aria-hidden="true"></span>
             </a>
             </a>
           </div>
           </div>
         </div>
         </div>