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

fix angular-bootstrap-switch

Browse Source
This commit is contained in:
Sylvain 2020-10-05 17:22:59 +02:00
parent adb5620702
commit 512411eb04
6 changed files with 59 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/frontend/src/javascript/directives/settings/boolean-setting.js
View File

@ -20,8 +20,8 @@ Application.Directives.directive('booleanSetting', ['Setting', 'growl', '_t',
};
// default values for the switch labels
$scope.yesLabel = $scope.yesLabel || 'app.admin.settings.enabled';
$scope.noLabel = $scope.noLabel || 'app.admin.settings.disabled';
$scope.yesLabel = $scope.yesLabel || 'app.shared.buttons.yes';
$scope.noLabel = $scope.noLabel || 'app.shared.buttons.no';
/**
* Callback to save the setting value to the database

4
app/frontend/templates/admin/invoices/payment.html
View File

@ -11,7 +11,9 @@
label="app.admin.invoices.payment.enable_online_payment"
classes="m-l"
on-before-save="requireStripeKeys"
fa-icon="fa-font">
fa-icon="fa-font"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no">
</boolean-setting>
</div>
<div class="row m-t" ng-show="allSettings.online_payment_module === 'true'">

4
app/frontend/templates/admin/settings/privacy.html
View File

@ -41,7 +41,9 @@
<boolean-setting
name="fab_analytics"
settings="allSettings"
label="app.admin.settings.fab_analytics">
label="app.admin.settings.fab_analytics"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no">
</boolean-setting>
<p>
<span translate>{{ 'app.admin.settings.privacy.about_analytics' }}</span>

47
app/frontend/templates/admin/settings/reservations.html
View File

@ -45,7 +45,13 @@
<div class="row">
<h3 class="m-l m-t-lg" translate>{{ 'app.admin.settings.ability_for_the_users_to_move_their_reservations' }}</h3>
<div class="col-md-6">
<boolean-setting name="booking_move_enable" settings="allSettings" label="app.admin.settings.reservations_shifting" classes="m-l"></boolean-setting>
<boolean-setting name="booking_move_enable"
settings="allSettings"
label="app.admin.settings.reservations_shifting"
classes="m-l"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no">
</boolean-setting>
</div>
<div class="col-md-6" ng-show="allSettings.booking_move_enable === 'true'">
<number-setting name="booking_move_delay"
@ -61,7 +67,13 @@
<div class="row">
<h3 class="m-l m-t-lg" translate>{{ 'app.admin.settings.ability_for_the_users_to_cancel_their_reservations' }}</h3>
<div class="col-md-6">
<boolean-setting name="booking_cancel_enable" settings="allSettings" label="app.admin.settings.reservations_cancelling" classes="m-l"></boolean-setting>
<boolean-setting name="booking_cancel_enable"
settings="allSettings"
label="app.admin.settings.reservations_cancelling"
classes="m-l"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no">
</boolean-setting>
</div>
<div class="col-md-6" ng-show="allSettings.booking_cancel_enable === 'true'">
<number-setting name="booking_cancel_delay"
@ -77,7 +89,13 @@
<div class="section-separator"></div>
<div class="row">
<h3 class="m-l m-t-lg" translate>{{ 'app.admin.settings.book_overlapping_slots_info' }}</h3>
<boolean-setting name="book_overlapping_slots" settings="allSettings" label="app.admin.settings.allow_booking" classes="m-l"></boolean-setting>
<boolean-setting name="book_overlapping_slots"
settings="allSettings"
label="app.admin.settings.allow_booking"
classes="m-l"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no">
</boolean-setting>
</div>
<div class="section-separator"></div>
<div class="row">
@ -103,7 +121,13 @@
<div class="panel-body">
<div class="row">
<h3 class="m-l" translate>{{ 'app.admin.settings.notification_sending_before_the_reservation_occurs' }}</h3>
<boolean-setting name="reminder_enable" settings="allSettings" label="app.admin.settings.reservations_reminders" classes="m-l"></boolean-setting>
<boolean-setting name="reminder_enable"
settings="allSettings"
label="app.admin.settings.reservations_reminders"
classes="m-l"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no">
</boolean-setting>
</div>
<div class="row" ng-show="allSettings.reminder_enable === 'true'">
<number-setting name="reminder_delay"
@ -127,12 +151,23 @@
<div class="row">
<h3 class="m-l" translate>{{ 'app.admin.settings.display_machine_reservation_user_name' }}</h3>
<p class="alert alert-warning m-h-md" ng-bind-html="'app.admin.settings.display_name_info_html' | translate"></p>
<boolean-setting name="display_name_enable" settings="allSettings" label="app.admin.settings.display_name" classes="m-l"></boolean-setting>
<boolean-setting name="display_name_enable"
settings="allSettings"
label="app.admin.settings.display_name"
classes="m-l"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no">
</boolean-setting>
</div>
<div class="row">
<h3 class="m-l" translate>{{ 'app.admin.settings.events_in_the_calendar' }}</h3>
<p class="alert alert-warning m-h-md" translate>{{ 'app.admin.settings.events_in_calendar_info' }}</p>
<boolean-setting name="events_in_calendar" settings="allSettings" label="app.admin.settings.show_event" classes="m-l"></boolean-setting>
<boolean-setting name="events_in_calendar"
settings="allSettings"
label="app.admin.settings.show_event"
classes="m-l"
yes-label="app.shared.buttons.yes"
no-label="app.shared.buttons.no"></boolean-setting>
</div>
</div>
</div>

3
package.json
View File

@ -42,7 +42,7 @@
"angular-animate": "1.7",
"angular-aside": "1.3",
"angular-base64-upload": "^0.0.9",
"angular-bootstrap-switch": "0.5.2",
"angular-bootstrap-switch": "https://github.com/sleede/angular-bootstrap-switch.git#develop",
"angular-cookies": "1.7",
"angular-google-analytics": "1.1",
"angular-growl-v2": "https://github.com/JanStevens/angular-growl-2.git#0.7.9",
@ -67,7 +67,6 @@
"angular-unsavedchanges": "0.2",
"angular-xeditable": "0.10",
"bootstrap-sass": "3.4.1",
"bootstrap-switch": "^3.4.0",
"checklist-model": "0.2",
"codemirror": "^4.8.0",
"d3": "3.5",

36
yarn.lock
View File

@ -1230,15 +1230,14 @@ angular-base64-upload@^0.0.9:
version "1.4.1"
resolved "https://github.com/incuna/angular-bind-html-compile.git#7626140a0eb7c724dc5c1eb3f7715bf06adf4c2a"
angular-bootstrap-switch@0.5.2:
"angular-bootstrap-switch@https://github.com/sleede/angular-bootstrap-switch.git#develop":
version "0.5.2"
resolved "https://registry.yarnpkg.com/angular-bootstrap-switch/-/angular-bootstrap-switch-0.5.2.tgz#9469b7fc23bcb958d280edbf81692dfd1c6a9397"
integrity sha1-lGm3/CO8uVjSgO2/gWkt/Rxqk5c=
resolved "https://github.com/sleede/angular-bootstrap-switch.git#018296a9462baa6d89bb08c4ddb1d789e827998d"
dependencies:
angular ">=1.4.0"
bootstrap ">=2.3.2"
bootstrap-switch "3.3.2"
jquery ">=1.9.0"
angular ">=1.8.0"
bootstrap-sass ">=3.4.1"
bootstrap-switch "^3.4.0"
jquery ">=3.5.0"
angular-cookies@1.7:
version "1.7.9"
@ -1385,12 +1384,12 @@ angular-xeditable@0.10:
dependencies:
angular "~1.x"
angular@1.8, angular@>=1.4.0, angular@^1.0.8, angular@^1.7.9, angular@~1.x:
angular@1.8, angular@^1.0.8, angular@^1.7.9, angular@~1.x:
version "1.8.0"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.0.tgz#b1ec179887869215cab6dfd0df2e42caa65b1b51"
integrity sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg==
angular@>=1.5:
angular@>=1.5, angular@>=1.8.0:
version "1.8.1"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.8.1.tgz#5a9cd4a99a0a1c4aeeb913d9f4699e2458daf5c1"
integrity sha512-eiasF4uFXsmKD8qYpkKEi9rKVxMv0nIDZXsYrwzSbPIbjmTV05bx+18VDbRmMx7p+gL84T9Qw2NCpVe8w1QKHQ==
@ -1809,28 +1808,16 @@ boolbase@^1.0.0, boolbase@~1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
bootstrap-sass@3.4.1:
bootstrap-sass@3.4.1, bootstrap-sass@>=3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a"
integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA==
bootstrap-switch@3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.3.2.tgz#79ddb49fadc308fb731e257f95957af48996eea7"
integrity sha1-ed20n63DCPtzHiV/lZV69ImW7qc=
dependencies:
jquery ">=1.9.0"
bootstrap-switch@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.4.0.tgz#6bbb0445ad8b4264883d06366d48aad3c06988f4"
integrity sha512-P4Qdx7mLjqgilKQeeuDCf8AHWeO7992+NFfh0doAA/ExaJqr02QFHhq18GL8EYd2XRviJ16pUUyMRsfOVaPEVg==
bootstrap@>=2.3.2:
version "4.5.2"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz#a85c4eda59155f0d71186b6e6ad9b875813779ab"
integrity sha512-vlGn0bcySYl/iV+BGA544JkkZP5LB3jsmkeKLFQakCOwCM3AOk7VkldBz4jrzSe+Z0Ezn99NVXa1o45cQY4R6A==
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@ -4919,11 +4906,6 @@ jquery@>=1.8.0, jquery@>=3.5.0:
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
jquery@>=1.9.0:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
js-base64@^2.1.8:
version "2.6.4"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"