helpers between reservables screens

app/assets/templates/admin/calendar/eventModal.html.erb

@@ -37,6 +37,9 @@
         <input type="checkbox" ng-click="toggleSelection(machine)" ng-model="selectedMachinesBinding[machine.id]"> {{machine.name}} <span class="text-xs">(id {{machine.id}})</span>
       </label>
     </div>
+    <div class="alert alert-info m-b-none text-xs wrapper-sm">
+      <i class="fa fa-lightbulb-o m-r" aria-hidden="true"></i> <a ui-sref="app.public.machines_list" ng-click="cancel()" translate> {{ 'app.admin.calendar.manage_machines' }}</a>
+    </div>
   </div>
 
   <div ng-show="availability.available_type == 'training'">
@@ -50,6 +53,9 @@
         </div>
       </div>
     </div>
+    <div class="alert alert-info m-b-none text-xs wrapper-sm m-t">
+      <i class="fa fa-lightbulb-o m-r" aria-hidden="true"></i> <a ui-sref="app.public.trainings_list" ng-click="cancel()" translate> {{ 'app.admin.calendar.manage_trainings' }}</a>
+    </div>
   </div>
 
   <div ng-show="availability.available_type == 'space'">
@@ -63,6 +69,9 @@
         </div>
       </div>
     </div>
+    <div class="alert alert-info m-b-none text-xs wrapper-sm m-t">
+      <i class="fa fa-lightbulb-o m-r" aria-hidden="true"></i> <a ui-sref="app.public.spaces_list" ng-click="cancel()" translate> {{ 'app.admin.calendar.manage_spaces' }}</a>
+    </div>
   </div>
 </div>
 <div class="modal-body" ng-show="step === 3">

app/assets/templates/admin/trainings/index.html.erb

@@ -5,12 +5,19 @@
         <a href="#" ng-click="backPrevLocation($event)"><i class="fa fa-long-arrow-left "></i></a>
       </section>
     </div>
-    <div class="col-xs-10 col-sm-10 col-md-8 b-l">
+    <div class="col-xs-10 col-sm-10 col-md-8 b-l b-r">
       <section class="heading-title">
         <h1 translate>{{ 'app.admin.trainings.trainings_monitoring' }}</h1>
       </section>
     </div>
 
+    <div class="col-md-3">
+      <section class="heading-actions wrapper">
+        <a role="button" ui-sref="app.admin.calendar" class="btn btn-lg btn-default rounded m-t-sm text-sm">
+          <i class="fa fa-calendar-check-o m-r" aria-hidden="true"></i><span translate>{{ 'app.admin.trainings.plan_session' }}</span>
+        </a>
+      </section>
+    </div>
   </div>
 </section>
 

app/assets/templates/machines/index.html.erb

@@ -13,7 +13,7 @@
 
     <div class="col-xs-12 col-sm-12 col-md-3 b-t hide-b-md" ng-if="isAuthorized('admin')">
       <section class="heading-actions wrapper">
-       <a class="btn btn-lg btn-warning bg-white b-2x rounded m-t-xs" ui-sref="app.admin.machines_new" role="button" translate>{{ 'app.public.machines_list.add_a_machine' }}</a>
+        <a class="btn btn-lg btn-warning bg-white b-2x rounded m-t-xs" ui-sref="app.admin.machines_new" role="button" translate>{{ 'app.public.machines_list.add_a_machine' }}</a>
       </section>
     </div>
   </div>
@@ -28,14 +28,21 @@
          ui-tour-scroll-parent-id="content-main"
          post-render="setupMachinesTour">
 
-    <div class="form-group row">
-      <div class="input-group col-md-3 m-l-lg m-b">
+  <div class="row">
+    <div class="col-md-3 form-group">
+      <div class="input-group m-l-lg m-b">
         <span class="input-group-addon"><i class="fa fa-filter"></i></span>
         <select ng-model="machineFiltering" class="form-control">
           <option ng-repeat="status in filterDisabled" value="{{status}}" translate>{{ 'app.public.machines_list.status_'+status }}</option>
         </select>
       </div>
     </div>
+    <div class="col-md-3 col-md-offset-6 m-t-n row-centered" ng-if="isAuthorized('admin')">
+      <a role="button" ui-sref="app.admin.calendar" class="btn btn-lg btn-default rounded m-t-sm text-sm">
+        <i class="fa fa-calendar-check-o m-r" aria-hidden="true"></i><span translate>{{ 'app.public.machines_list.new_availability' }}</span>
+      </a>
+    </div>
+  </div>
 
 
     <div class="col-xs-12 col-sm-6 col-lg-4 reservable-card" ng-class="{'disabled-reservable' : machine.disabled && machineFiltering === 'all'}" ng-repeat="machine in machines | filterDisabled:machineFiltering">

app/assets/templates/spaces/index.html.erb

@@ -28,12 +28,19 @@
          ui-tour-scroll-parent-id="content-main"
          post-render="setupSpacesTour">
 
-  <div class="form-group row">
-    <div class="input-group col-md-3 m-l-lg m-b">
-      <span class="input-group-addon"><i class="fa fa-filter"></i></span>
-      <select ng-model="spaceFiltering" class="form-control">
-        <option ng-repeat="status in filterDisabled" value="{{status}}" translate>{{ 'app.public.spaces_list.status_'+status }}</option>
-      </select>
+  <div class="row">
+    <div class="col-md-3 form-group">
+      <div class="input-group m-l-lg m-b">
+        <span class="input-group-addon"><i class="fa fa-filter"></i></span>
+        <select ng-model="spaceFiltering" class="form-control">
+          <option ng-repeat="status in filterDisabled" value="{{status}}" translate>{{ 'app.public.spaces_list.status_'+status }}</option>
+        </select>
+      </div>
+    </div>
+    <div class="col-md-3 col-md-offset-6 m-t-n row-centered" ng-if="isAuthorized('admin')">
+      <a role="button" ui-sref="app.admin.calendar" class="btn btn-lg btn-default rounded m-t-sm text-sm">
+        <i class="fa fa-calendar-check-o m-r" aria-hidden="true"></i><span translate>{{ 'app.public.spaces_list.new_availability' }}</span>
+      </a>
     </div>
   </div>
 

config/locales/app.admin.fr.yml

@@ -42,6 +42,9 @@ fr:
         select_some_machines: "Sélectionnez des machines"
         select_all: "Toutes"
         select_none: "Aucune"
+        manage_machines: "Cliquez-ici pour ajouter ou supprimer des machines."
+        manage_spaces: "Cliquez-ici pour ajouter ou supprimer des espaces."
+        manage_trainings: "Cliquez-ici pour ajouter ou supprimer des formations."
         number_of_tickets: "Nombre de places : "
         adjust_the_opening_hours: "Ajuster l'horaire"
         to_time: "à"  # eg. from 18:00 to 21:00
@@ -129,6 +132,7 @@ fr:
       trainings:
         # suivre et surveiller les formations
         trainings_monitoring: "Suivi formations"
+        plan_session: "Planifier une nouvelle session"
         trainings: "Formations"
         add_a_new_training: "Ajouter une nouvelle formation"
         name: "Nom"

config/locales/app.public.fr.yml

@@ -223,6 +223,7 @@ fr:
         # liste des machines
         the_fablab_s_machines: "Les machines du FabLab"
         add_a_machine: "Ajouter une machine"
+        new_availability: "Ouvrir des réservations"
         book: "Réserver"
         _or_the_: " ou la "
         status_enabled: "Actives"
@@ -365,6 +366,7 @@ fr:
       spaces_list:
         # liste des espaces
         the_spaces: "Les espaces"
+        new_availability: "Ouvrir des réservations"
         add_a_space: "Ajouter un espace"
         status_enabled: "Activés"
         status_disabled: "Désactivés"