persistent modals persist interface hotfix

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

@@ -8,7 +8,7 @@
     <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>
 
-    <hr>
+    <hr 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')">
@@ -22,7 +22,8 @@
   </div>
 
   <div class="modal-body">
-    <div ng-show="source == 'symbolstx' && !onlyOwn" class="panel panel-default" id="bread_and_categories">
+
+    <div id="bread_and_categories" ng-show="source == 'symbolstx' && !onlyOwn" class="panel panel-default">
       <div class="panel-heading">
         <div class="pull-left" ng-repeat="b in breadcrumbs">
           <a ng-click="open_category_from_bc(b.id)">
@@ -38,62 +39,72 @@
           </div>
         </div>
       </div>
-    </div>
+    </div><!-- /bread_and_categories -->
 
     <div>
       <alert ng-show="alert.show" ng-model="alert" type="{{alert.type}}" close="closeAlert()">{{alert.msg | translate}}</alert>
     </div>
 
-    <div id="collections" class="col-md-12 category-collection"
-    ng-class="{ 'category-collection-loading': loadingCatPictos }"
-    data-loading="{{ 'loading_pictos' | translate }}">
-      <form ng-submit="search()" ng-show="!onlyOwn">
-        <div class="input-group" id="search_pictos_box">
-          <input type="text" class="form-control" placeholder="{{ 'filter' | translate }}"
-          id="srch_term_picto" name="srch_term_picto" ng-model="srch_term_picto">
-          <span class="input-group-btn">
-            <button type="submit" class="btn btn-primary">
-              <i class="fa fa-search" aria-hidden="true"> {{ 'search' | translate }}</i>
-            </button>
-          </span>
-        </div>
-      </form>
-      <div ng-show="source == 'ownpictos'" class="input-group">
-        <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 }}
-        </label>
-      </div>
-      <!-- Galería de pictos -->
-      <div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()"
-        infinite-scroll-container="'#collections'">
-        <div
-          class="picto_peq pull-left"
-          ng-repeat="p in pictos" >
-          <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}}">
-              <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
-            </a>
+    <div class="row">
+
+      <div id="collections" class="col-md-12 category-collection"
+      ng-class="{ 'category-collection-loading': loadingCatPictos }"
+      data-loading="{{ 'loading_pictos' | translate }}">
+
+        <form ng-submit="search()" ng-show="!onlyOwn">
+          <div class="input-group" id="search_pictos_box">
+            <input type="text" class="form-control" placeholder="{{ 'filter' | translate }}"
+            id="srch_term_picto" name="srch_term_picto" ng-model="srch_term_picto">
+            <span class="input-group-btn">
+              <button type="submit" class="btn btn-default">
+                <i class="fa fa-search" aria-hidden="true"></i>
+              </button>
+            </span>
           </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>
+        </form>
+
+        <div ng-show="source == 'ownpictos'" class="input-group">
+          <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 }}
+          </button>
+        </div>
+
+        <!-- Galería de pictos -->
+        <div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()"
+          infinite-scroll-container="'#collections'">
+          <div
+            class="picto_peq pull-left"
+            ng-repeat="p in pictos" >
+            <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}}">
+                <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
               </a>
-            </a>
+            </div>
+            <div class="picto_options" ng-show="!onlyOwn">
+              <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>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="clearfix"></div>
-    </div>
+
+        <div class="clearfix"></div>
+
+      </div><!-- /collections -->
+
+    </div><!-- /row -->
 
   </div> <!-- /modal-body -->
 
   <div class="modal-footer">
       <button class="btn btn-primary" ng-click="cancel()">{{ 'close' | translate }}</button>
   </div>
+
 </div>