collections.html corrections

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

@@ -15,109 +15,97 @@
         </button>
       </div>
     </div>
+
     <!-- Grid -->
     <div class="col-xs-10">
+
+      <!-- student_collection -->
       <div id="student_collection"
         class="student-collection"
         ng-class="{ 'student-collection-loading': loadingPictos }"
         data-loading="{{ 'loading_pictos' | translate }}">
 
-        <!-- Grid pictos -->
-        <div
-          class="picto-grid"
-          ng-style="{ 'background-color': shadeColor(viewingGrid.color, 0.3) }">
-          <div
-            ng-repeat="studentPictoRow in mainGrid"
-            ng-init="rowIndex = $index"
-            class="picto-grid__row">
+        <!-- Picto grid -->
+        <div class="picto-grid" ng-style="{ 'background-color': shadeColor(viewingGrid.color, 0.3) }">
+
+          <!-- Picto loop -->
+          <div ng-repeat="studentPictoRow in mainGrid" ng-init="rowIndex = $index" class="picto-grid__row">
+
+            <!-- Picto object -->
             <div
-              ng-hide="studentData.attributes.size == 'large' && (rowIndex > 3 || colIndex > 7)"
+              id="student-picto-{{studentPicto.id || ('empty-' + colIndex + '-' + rowIndex)}}"
               class="picto pull-left"
               data-row="{{ rowIndex }}"
               data-column="{{ colIndex }}"
-              id="student-picto-{{
-                studentPicto.id ||
-                ('empty-' + colIndex + '-' + rowIndex)
-              }}"
               draggable droppable drop="handleDrop"
               popover="{{studentPicto != emptyStudentPicto ? studentPicto.attributes.expression : ''}}"
               popover-trigger="mouseenter"
               ng-init="colIndex = $index"
-              ng-repeat="studentPicto in studentPictoRow track by $index">
-              <!-- picto-legend -->
-              <div
-                class="picto-legend-normal"
-                ng-if="studentPicto.attributes.legend == 'normal'">
+              ng-repeat="studentPicto in studentPictoRow track by $index"
+              ng-hide="studentData.attributes.size == 'large' && (rowIndex > 3 || colIndex > 7)">
+              <!--./ Picto object -->
+
+              <!-- Picto-legend -->
+              <div class="picto-legend-normal" ng-if="studentPicto.attributes.legend == 'normal'">
                 {{ studentPicto.attributes.expression }}
               </div>
-              <div
-                class="picto-legend-full"
-                ng-if="studentPicto.attributes.legend == 'full'">
+              <div class="picto-legend-full" ng-if="studentPicto.attributes.legend == 'full'">
                 {{ studentPicto.attributes.expression }}
-              </div>
-              <!-- /.picto-legend  -->
-              <img
-                src="/app/img/redcross.png"
+              </div><!-- /. Picto-legend  -->
+
+              <!-- Red cross -->
+              <img src="/app/img/redcross.png"
+                ng-click="showGrid(studentPicto.id_child_grid,true)"
                 class="red-cross-visibility disabled"
-                ng-if="studentPicto.attributes.status == 'disabled'"/>
+                ng-if="studentPicto.attributes.status == 'disabled'">
+              <!--./ Red cross -->
 
-              <img
+              <!-- Picto -->
+              <img class="unselectable"
                 ng-click="showGrid(studentPicto.id_child_grid,true)"
                 ng-src="{{studentPicto.picto.uri}}"
-                class="unselectable"
-                ng-class="{
-                  'novisible': studentPicto.attributes.status == 'invisible',
-                  'deactivate': studentPicto.attributes.status == 'disabled'
-                }"
-                ng-style="{
-                  'background-color': studentPicto.attributes.color || '#ffffff'
-                }"/>
-
-              <div
-                  class="picto_options"
-                  ng-if="studentPicto == emptyStudentPicto">
-                  <a
-                    ng-click="open_add(rowIndex, colIndex, true)"
-                    class="picto_add"
-                    title="{{ 'add_picto' | translate}}">
+                ng-class="{ 'novisible': studentPicto.attributes.status == 'invisible', 'deactivate': studentPicto.attributes.status == 'disabled' }"
+                ng-style="{ 'background-color': studentPicto.attributes.color || '#ffffff' }">
+              <!--./ Picto -->
+
+              <!-- Picto options ADD PICTO -->
+              <div class="picto_options" ng-if="studentPicto == emptyStudentPicto">
+                  <a ng-click="open_add(rowIndex, colIndex, true)" class="picto_add" title="{{ 'add_picto' | translate}}">
                     <i class="color_green glyphicon glyphicon-plus-sign" aria-hidden="true"></i>
                   </a>
               </div>
-              <div
-                class="picto_options"
-                ng-if="studentPicto !== emptyStudentPicto">
-                <a
-                  ng-click="deletePicto(studentPicto)"
-                  class="picto_remove"
-                  title="{{ 'delete' | translate}}">
+              <!--./ Picto options ADD PICTO -->
+
+              <!-- Picto options -->
+              <div class="picto_options" ng-if="studentPicto !== emptyStudentPicto">
+                <a ng-click="deletePicto(studentPicto)" class="picto_remove" title="{{ 'delete' | translate}}">
                   <i class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></i>
                 </a>
                 <a ng-click="view_picto(studentPicto)" class="picto_ok" >
-                  <i ng-class="{
-                      color_green: studentPicto.attributes.status == 'invisible',
-                      color_black: studentPicto.attributes.status == 'enabled'
-                    }"
+                  <i ng-class="{ color_green: studentPicto.attributes.status == 'invisible', color_black: studentPicto.attributes.status == 'enabled' }"
                     class="glyphicon glyphicon-eye-open"
                     aria-hidden="true"
                     title="{{ studentPicto.attributes.status | translate}}">
                   </i>
                 </a>
-                <a
-                  class="picto_tags"
-                  ng-click="open_tags(studentPicto)">
+                <a class="picto_tags" ng-click="open_tags(studentPicto)">
                   <i class="glyphicon glyphicon-tags" aria-hidden="true"></i>
                 </a>
-                <a
-                  class="picto_config"
-                  ng-click="open_config(studentPicto)">
+                <a class="picto_config" ng-click="open_config(studentPicto)">
                   <i class="glyphicon glyphicon-cog" aria-hidden="true"></i>
                 </a>
               </div>
-            </div>
+              <!--./ Picto options -->
+
+            </div><!--/. Picto object -->
+
+            <!-- Clear floats-->
             <div class="clearfix"></div>
-          </div>
-        </div>
-      </div>
+            <!--./ Clear floats-->
+
+          </div><!--/. Picto loop -->
+        </div><!--/. Picto grid -->
+      </div><!--/. student_collection -->
     </div><!--/. col-xs-10 -->
 
     <div class="col-xs-2 text-center grid-panel">