rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00
Code Issues Releases Activity

improved space reservation optional explication message

Browse Source
This commit is contained in:
Sylvain 2017-03-01 11:47:20 +01:00
parent d450301934
commit b48451f9f8
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/templates/spaces/reserve.html.erb
View File

@ -48,7 +48,7 @@
reservable-name="{{space.name}}"></cart>
<uib-alert type="warning m">
<uib-alert type="warning m" ng-show="spaceExplicationsAlert">
<p class="text-sm">
<i class="fa fa-warning"></i>
<span ng-bind-html="spaceExplicationsAlert"></span>

2
config/locales/app.admin.en.yml
View File

@ -585,6 +585,8 @@ en:
training_explications_alert: "explanation message on the training reservation page"
training_information_message: "information message on the machine reservation page"
subscription_explications_alert: "explanation message on the subscription page"
event_explications_alert: "explanation message on the event reservation page"
space_explications_alert: "explanation message on the space reservation page"
main_color: "main colour"
secondary_color: "secondary colour"
home_blogpost: "homepage's brief"

2
config/locales/app.admin.fr.yml
View File

@ -585,6 +585,8 @@ fr:
training_explications_alert: "l'explication sur la page de réservation d'une formation"
training_information_message: "l'information sur la page de réservation d'une formation"
subscription_explications_alert: "l'explication sur la page de souscription à un abonnement"
event_explications_alert: "l'explication sur la page de réservation d'un évènement"
space_explications_alert: "l'explication sur la page de réservation d'un espace"
main_color: "la couleur principale"
secondary_color: "la couleur secondaire"
home_blogpost: "la brève de la page d'accueil"

8
db/schema.rb
View File

@ -542,11 +542,11 @@ ActiveRecord::Schema.define(version: 20170227114634) do
t.datetime "created_at"
t.datetime "updated_at"
t.integer "availability_id"
t.boolean "destroying", default: false
t.boolean "offered"
t.datetime "canceled_at"
t.datetime "ex_end_at"
t.datetime "ex_start_at"
t.datetime "ex_end_at"
t.datetime "canceled_at"
t.boolean "offered", default: false
t.boolean "destroying", default: false
end
add_index "slots", ["availability_id"], name: "index_slots_on_availability_id", using: :btree