diff options
| author | Zog | 2018-01-24 10:00:05 +0100 |
|---|---|---|
| committer | Zog | 2018-01-24 10:00:05 +0100 |
| commit | d5eb3d0d736a4a196b8c36d5aeb30e5ef8db8034 (patch) | |
| tree | d6e79d595d3bf6239b2890c91cea6da66b71911f | |
| parent | 2699a454f1b262339983cf608571be4ad7bb46ff (diff) | |
| download | chouette-core-d5eb3d0d736a4a196b8c36d5aeb30e5ef8db8034.tar.bz2 | |
- Add a default value for the config
- Add a cancel button to dismiss the modal
| -rw-r--r-- | app/views/shared/_development_toolbar.html.slim | 4 | ||||
| -rw-r--r-- | config/application.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/shared/_development_toolbar.html.slim b/app/views/shared/_development_toolbar.html.slim index b51bb3de6..4ad69f7ad 100644 --- a/app/views/shared/_development_toolbar.html.slim +++ b/app/views/shared/_development_toolbar.html.slim @@ -38,7 +38,9 @@ = hidden_field_tag "permissions[#{permission}]", false, id: "" = check_box_tag "permissions[#{permission}]", true, current_user.has_permission?(permission) = label :permissions, permission, permission.split('.').last - .modal-footer= submit_tag t("actions.submit"), class: 'btn btn-primary' + .modal-footer + button.btn.btn-link type='button' data-dismiss='modal' #{t('cancel')} + = submit_tag t("actions.submit"), class: 'btn btn-primary' - content_for :javascript do coffee: diff --git a/config/application.rb b/config/application.rb index bda582610..8da6a7428 100644 --- a/config/application.rb +++ b/config/application.rb @@ -39,6 +39,8 @@ module ChouetteIhm 'FeatureChecker::NotAuthorizedError' => :unauthorized ) + config.development_toolbar = false + unless Rails.env.production? # Work around sprockets+teaspoon mismatch: Rails.application.config.assets.precompile += %w(spec_helper.js) |