working on addpicto modal

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

@@ -9,23 +9,54 @@
     <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 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')">
-          <span class="glyphicon glyphicon-th"></span> SymbolStix
-      </button>
-      <button class="btn btn-default" btn-radio="'ownpictos'" ng-model="source" ng-click="load_own_pictos()">
-        <span class="glyphicon glyphicon-picture"></span> {{ 'own_pictos' | translate }}
-      </button>
-    </div>
-
   </div><!-- /modal-header -->
   </div><!-- /modal-header -->
 
 
-  <div class="modal-body">
+  <!-- Modal body from collections (NOT onlyOwn) -->
+  <div class="modal-body" ng-show="!onlyOwn">
+
+    <div class="row">
+
+      <div class="col-xs-5">
+        <div class="btn-group">
+          <button class="btn btn-default" btn-radio="'symbolstx'" ng-model="source" ng-click="open_category_from_bc('0')">
+              <span class="glyphicon glyphicon-th"></span> SymbolStix
+          </button>
+          <button class="btn btn-default" btn-radio="'ownpictos'" ng-model="source" ng-click="load_own_pictos()">
+            <span class="glyphicon glyphicon-picture"></span> {{ 'own_pictos' | translate }}
+          </button>
+        </div>
+      </div>
+
+      <!-- Add new image -->
+      <div class="col-xs-2">
+        <div ng-show="source == 'ownpictos'" class="input-group">
+          <button class="btn btn-success" ngf-select ng-model="picFile" accept="image/*" ngf-change="addOwnPicto()">
+            <i class="fa fa-folder-open" aria-hidden="true"></i> {{ 'new_img' | translate }}
+          </button>
+        </div>
+      </div>
+
+      <!-- Filter form -->
+      <div class="col-xs-5">
+        <form ng-submit="search()">
+          <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>
+        </form>
+      </div>
+
+    </div>
+
+    <hr>
 
 
     <!-- Bread and categories -->
     <!-- Bread and categories -->
-    <div id="bread_and_categories" ng-show="source == 'symbolstx' && !onlyOwn" class="panel panel-default">
+    <div id="bread_and_categories" ng-show="source == 'symbolstx'" class="panel panel-default">
       <div class="panel-heading">
       <div class="panel-heading">
         <div class="pull-left" ng-repeat="b in breadcrumbs">
         <div class="pull-left" ng-repeat="b in breadcrumbs">
           <a ng-click="open_category_from_bc(b.id)">
           <a ng-click="open_category_from_bc(b.id)">
@@ -43,6 +74,7 @@
       </div>
       </div>
     </div><!-- /bread_and_categories -->
     </div><!-- /bread_and_categories -->
 
 
+    <!-- Alert element -->
     <div>
     <div>
       <alert ng-show="alert.show" ng-model="alert" type="{{alert.type}}" close="closeAlert()">{{alert.msg | translate}}</alert>
       <alert ng-show="alert.show" ng-model="alert" type="{{alert.type}}" close="closeAlert()">{{alert.msg | translate}}</alert>
     </div>
     </div>
@@ -55,26 +87,6 @@
       ng-class="{ 'category-collection-loading': loadingCatPictos }"
       ng-class="{ 'category-collection-loading': loadingCatPictos }"
       data-loading="{{ 'loading_pictos' | translate }}">
       data-loading="{{ 'loading_pictos' | translate }}">
 
 
-        <!-- Filter form -->
-        <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>
-        </form>
-
-        <!-- Add new image -->
-        <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>
-
         <!-- Picto galery -->
         <!-- Picto galery -->
         <div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()" infinite-scroll-container="'#collections'">
         <div id="clearfix-infiniteScroll-parent" infinite-scroll="scroll()" infinite-scroll-container="'#collections'">