diff --git a/app/assets/javascripts/controllers/machines.coffee.erb b/app/assets/javascripts/controllers/machines.coffee.erb
index bb211a876..fd3d0ed5e 100644
--- a/app/assets/javascripts/controllers/machines.coffee.erb
+++ b/app/assets/javascripts/controllers/machines.coffee.erb
@@ -274,8 +274,8 @@ Application.Controllers.controller "ShowMachineController", ['$scope', '$state',
 # This controller workflow is pretty similar to the trainings reservation controller.
 ##
 
-Application.Controllers.controller "ReserveMachineController", ["$scope", "$state", '$stateParams', "$uibModal", '_t', "moment", 'Machine', 'Auth', 'dialogs', '$timeout', 'Price', 'Member', 'Availability', 'Slot', 'Setting', 'CustomAsset',  'plansPromise', 'groupsPromise', 'growl', 'machinePromise', 'settingsPromise', 'Wallet', 'helpers', 'uiCalendarConfig', 'CalendarConfig',
-($scope, $state, $stateParams, $uibModal, _t, moment, Machine, Auth, dialogs, $timeout, Price, Member, Availability, Slot, Setting, CustomAsset, plansPromise, groupsPromise, growl, machinePromise, settingsPromise, Wallet, helpers, uiCalendarConfig, CalendarConfig) ->
+Application.Controllers.controller "ReserveMachineController", ["$scope", '$stateParams', '_t', "moment", 'Auth', '$timeout', 'Member', 'Availability', 'plansPromise', 'groupsPromise', 'machinePromise', 'settingsPromise', 'uiCalendarConfig', 'CalendarConfig',
+($scope, $stateParams, _t, moment, Auth, $timeout, Member, Availability, plansPromise, groupsPromise, machinePromise, settingsPromise, uiCalendarConfig, CalendarConfig) ->
 
 
 
diff --git a/app/assets/javascripts/controllers/trainings.coffee.erb b/app/assets/javascripts/controllers/trainings.coffee.erb
index cfd48f5b2..499445e78 100644
--- a/app/assets/javascripts/controllers/trainings.coffee.erb
+++ b/app/assets/javascripts/controllers/trainings.coffee.erb
@@ -77,8 +77,8 @@ Application.Controllers.controller "ShowTrainingController", ['$scope', '$state'
 # training can be reserved during the reservation process (the shopping cart may contains only one training and a subscription).
 ##
 
-Application.Controllers.controller "ReserveTrainingController", ["$scope", "$state", '$stateParams', '$filter', '$compile', "$uibModal", 'Auth', 'dialogs', '$timeout', 'Price', 'Availability', 'Slot', 'Member', 'Setting', 'CustomAsset', 'availabilityTrainingsPromise', 'plansPromise', 'groupsPromise', 'growl', 'settingsPromise', 'trainingPromise', '_t', 'Wallet', 'helpers', 'uiCalendarConfig', 'CalendarConfig'
-($scope, $state, $stateParams, $filter, $compile, $uibModal, Auth, dialogs, $timeout, Price, Availability, Slot, Member, Setting, CustomAsset, availabilityTrainingsPromise, plansPromise, groupsPromise, growl, settingsPromise, trainingPromise, _t, Wallet, helpers, uiCalendarConfig, CalendarConfig) ->
+Application.Controllers.controller "ReserveTrainingController", ["$scope", '$stateParams', 'Auth', '$timeout', 'Availability', 'Member', 'availabilityTrainingsPromise', 'plansPromise', 'groupsPromise', 'settingsPromise', 'trainingPromise', '_t', 'uiCalendarConfig', 'CalendarConfig'
+($scope, $stateParams, Auth, $timeout, Availability, Member, availabilityTrainingsPromise, plansPromise, groupsPromise, settingsPromise, trainingPromise, _t, uiCalendarConfig, CalendarConfig) ->
 
 
 
diff --git a/app/assets/templates/spaces/reserve.html.erb b/app/assets/templates/spaces/reserve.html.erb
new file mode 100644
index 000000000..8891842c9
--- /dev/null
+++ b/app/assets/templates/spaces/reserve.html.erb
@@ -0,0 +1,81 @@
+<section class="heading b-b">
+  <div class="row no-gutter">
+    <div class="col-xs-2 col-sm-2 col-md-1">
+      <section class="heading-btn">
+        <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 b-r-md">
+      <section class="heading-title">
+        <h1 ng-hide="training" translate>{{ 'trainings_planning' }}</h1>
+        <h1 ng-show="training"><span translate>{{ 'planning_of' }}</span> {{training.name}}</h1>
+      </section>
+    </div>
+    <div class="col-xs-12 col-sm-12 col-md-3 b-t hide-b-md">
+      <section class="heading-actions wrapper">
+        <a class="btn btn-lg btn-warning bg-white b-2x rounded m-t-xs"
+           ui-sref="app.logged.trainings_reserve({id:'all'})"
+           ng-show="training"
+           role="button"
+           translate>{{ 'all_trainings' }}</a>
+      </section>
+    </div>
+  </div>
+</section>
+
+
+<div class="row no-gutter training-reserve">
+  <div class="col-sm-12 col-md-12 col-lg-9">
+    <div ui-calendar="calendarConfig" ng-model="eventSources" calendar="calendar" class="wrapper-lg" ng-show="!plansAreShown"></div>
+    <ng-include ng-if="!fablabWithoutPlans" src="'<%= asset_path 'plans/_plan.html' %>'"></ng-include>
+  </div>
+
+
+  <div class="col-sm-12 col-md-12 col-lg-3">
+
+    <div ng-if="currentUser.role === 'admin'">
+      <select-member></select-member>
+    </div>
+
+
+
+    <cart slot="selectedEvent"
+          slot-selection-time="selectionTime"
+          events="events"
+          user="ctrl.member"
+          mode-plans="plansAreShown"
+          plan="selectedPlan"
+          plan-selection-time="planSelectionTime"
+          settings="settings"
+          on-slot-added-to-cart="markSlotAsAdded"
+          on-slot-removed-from-cart="markSlotAsRemoved"
+          on-slot-start-to-modify="markSlotAsModifying"
+          on-slot-modify-success="modifyTrainingSlot"
+          on-slot-modify-cancel="cancelModifyTrainingSlot"
+          on-slot-modify-unselect="changeModifyTrainingSlot"
+          on-slot-cancel-success="slotCancelled"
+          after-payment="afterPayment"
+          reservable-id="{{training.id}}"
+          reservable-type="Training"
+          reservable-name="{{training.name}}"
+          limit-to-one-slot="true"></cart>
+
+
+    <uib-alert type="info m">
+      <p class="text-sm font-bold">
+        <i class="fa fa-lightbulb-o"></i>
+        <span ng-bind-html="trainingInformationMessage"></span>
+      </p>
+    </uib-alert>
+
+    <uib-alert type="warning m">
+      <p class="text-sm">
+        <i class="fa fa-warning"></i>
+        <span ng-bind-html="trainingExplicationsAlert"></span>
+      </p>
+    </uib-alert>
+
+  </div>
+
+
+</div>