From 63e767bd1897c669652b81abaa9b352f8210ca69 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 17 Aug 2016 10:10:23 +0200 Subject: [PATCH] refactored settings page --- app/assets/javascripts/router.coffee.erb | 36 +- .../templates/admin/settings/about.html | 35 ++ .../templates/admin/settings/general.html | 308 +++++++++++ .../templates/admin/settings/home_page.html | 29 ++ .../templates/admin/settings/index.html | 491 ------------------ .../templates/admin/settings/index.html.erb | 41 ++ .../admin/settings/reservations.html | 84 +++ .../components/jasny-bootstrap/Gruntfile.js | 4 +- 8 files changed, 517 insertions(+), 511 deletions(-) create mode 100644 app/assets/templates/admin/settings/about.html create mode 100644 app/assets/templates/admin/settings/general.html create mode 100644 app/assets/templates/admin/settings/home_page.html delete mode 100644 app/assets/templates/admin/settings/index.html create mode 100644 app/assets/templates/admin/settings/index.html.erb create mode 100644 app/assets/templates/admin/settings/reservations.html diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index 1dd4b362d..fcbc5a232 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -248,7 +248,7 @@ angular.module('application.router', ['ui.router']). url: '/projects?q&page&theme_id&component_id&machine_id&from&whole_network' views: 'main@': - templateUrl: '<%= asset_path "projects/index.html" %>' + templateUrl: '<%= asset_path "projects/index.html.erb" %>' controller: 'ProjectsController' resolve: themesPromise: ['Theme', (Theme)-> @@ -306,7 +306,7 @@ angular.module('application.router', ['ui.router']). url: '/machines' views: 'main@': - templateUrl: '<%= asset_path "machines/index.html" %>' + templateUrl: '<%= asset_path "machines/index.html.erb" %>' controller: 'MachinesController' resolve: machinesPromise: ['Machine', (Machine)-> @@ -387,7 +387,7 @@ angular.module('application.router', ['ui.router']). url: '/trainings' views: 'main@': - templateUrl: '<%= asset_path "trainings/index.html" %>' + templateUrl: '<%= asset_path "trainings/index.html.erb" %>' controller: 'TrainingsController' resolve: trainingsPromise: ['Training', (Training)-> @@ -452,7 +452,7 @@ angular.module('application.router', ['ui.router']). url: '/notifications' views: 'main@': - templateUrl: '<%= asset_path "notifications/index.html" %>' + templateUrl: '<%= asset_path "notifications/index.html.erb" %>' controller: 'NotificationsController' resolve: translations: [ 'Translations', (Translations) -> @@ -465,7 +465,7 @@ angular.module('application.router', ['ui.router']). abstract: Fablab.withoutPlans views: 'main@': - templateUrl: '<%= asset_path "plans/index.html" %>' + templateUrl: '<%= asset_path "plans/index.html.erb" %>' controller: 'PlansIndexController' resolve: subscriptionExplicationsPromise: ['Setting', (Setting)-> @@ -487,7 +487,7 @@ angular.module('application.router', ['ui.router']). url: '/events' views: 'main@': - templateUrl: '<%= asset_path "events/index.html" %>' + templateUrl: '<%= asset_path "events/index.html.erb" %>' controller: 'EventsController' resolve: categoriesPromise: ['Category', (Category) -> @@ -571,7 +571,7 @@ angular.module('application.router', ['ui.router']). url: '/admin/project_elements' views: 'main@': - templateUrl: '<%= asset_path "admin/project_elements/index.html" %>' + templateUrl: '<%= asset_path "admin/project_elements/index.html.erb" %>' controller: 'ProjectElementsController' resolve: componentsPromise: ['Component', (Component)-> @@ -592,7 +592,7 @@ angular.module('application.router', ['ui.router']). url: '/admin/trainings' views: 'main@': - templateUrl: '<%= asset_path "admin/trainings/index.html" %>' + templateUrl: '<%= asset_path "admin/trainings/index.html.erb" %>' controller: 'TrainingsAdminController' resolve: trainingsPromise: ['Training', (Training)-> @@ -638,7 +638,7 @@ angular.module('application.router', ['ui.router']). url: '/admin/events' views: 'main@': - templateUrl: '<%= asset_path "admin/events/index.html" %>' + templateUrl: '<%= asset_path "admin/events/index.html.erb" %>' controller: 'AdminEventsController' resolve: eventsPromise: ['Event', (Event)-> @@ -719,7 +719,7 @@ angular.module('application.router', ['ui.router']). url: '/admin/pricing' views: 'main@': - templateUrl: '<%= asset_path "admin/pricing/index.html" %>' + templateUrl: '<%= asset_path "admin/pricing/index.html.erb" %>' controller: 'EditPricingController' resolve: plans: ['Plan', (Plan) -> @@ -828,7 +828,7 @@ angular.module('application.router', ['ui.router']). url: '/admin/invoices' views: 'main@': - templateUrl: '<%= asset_path "admin/invoices/index.html" %>' + templateUrl: '<%= asset_path "admin/invoices/index.html.erb" %>' controller: 'InvoicesController' resolve: settings: ['Setting', (Setting)-> @@ -859,16 +859,16 @@ angular.module('application.router', ['ui.router']). url: '/admin/members' views: 'main@': - templateUrl: '<%= asset_path "admin/members/index.html" %>' + templateUrl: '<%= asset_path "admin/members/index.html.erb" %>' controller: 'AdminMembersController' 'groups@app.admin.members': - templateUrl: '<%= asset_path "admin/groups/index.html" %>' + templateUrl: '<%= asset_path "admin/groups/index.html.erb" %>' controller: 'GroupsController' 'tags@app.admin.members': - templateUrl: '<%= asset_path "admin/tags/index.html" %>' + templateUrl: '<%= asset_path "admin/tags/index.html.erb" %>' controller: 'TagsController' 'authentification@app.admin.members': - templateUrl: '<%= asset_path "admin/authentications/index.html" %>' + templateUrl: '<%= asset_path "admin/authentications/index.html.erb" %>' controller: 'AuthentificationController' resolve: membersPromise: ['Member', (Member)-> @@ -977,7 +977,7 @@ angular.module('application.router', ['ui.router']). url: '/admin/statistics' views: 'main@': - templateUrl: '<%= asset_path "admin/statistics/index.html" %>' + templateUrl: '<%= asset_path "admin/statistics/index.html.erb" %>' controller: 'StatisticsController' resolve: membersPromise: ['Member', (Member) -> @@ -1005,7 +1005,7 @@ angular.module('application.router', ['ui.router']). url: '/admin/settings' views: 'main@': - templateUrl: '<%= asset_path "admin/settings/index.html" %>' + templateUrl: '<%= asset_path "admin/settings/index.html.erb" %>' controller: 'SettingsController' resolve: settingsPromise: ['Setting', (Setting)-> @@ -1053,7 +1053,7 @@ angular.module('application.router', ['ui.router']). url: '/open_api_clients' views: 'main@': - templateUrl: '<%= asset_path "admin/open_api_clients/index.html" %>' + templateUrl: '<%= asset_path "admin/open_api_clients/index.html.erb" %>' controller: 'OpenAPIClientsController' resolve: clientsPromise: ['OpenAPIClient', (OpenAPIClient)-> diff --git a/app/assets/templates/admin/settings/about.html b/app/assets/templates/admin/settings/about.html new file mode 100644 index 000000000..9adf2b614 --- /dev/null +++ b/app/assets/templates/admin/settings/about.html @@ -0,0 +1,35 @@ +
+
+ +
+
+

+ {{ 'shift_enter_to_force_carriage_return' | translate }} + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ {{ 'shift_enter_to_force_carriage_return' | translate }} + +
+ +
+ +
+
\ No newline at end of file diff --git a/app/assets/templates/admin/settings/general.html b/app/assets/templates/admin/settings/general.html new file mode 100644 index 000000000..72b4337dc --- /dev/null +++ b/app/assets/templates/admin/settings/general.html @@ -0,0 +1,308 @@ +
+
+ {{ 'title' }} +
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+

{{ 'title_concordance' }}

+
+ + +
+ + +
+ +
+
+
+
+
+ +
+
+ {{ 'customize_information_messages' }} +
+
+ + +
+
+

{{ 'message_of_the_machine_booking_page' }}

+
+ +
+ +
+
+

{{ 'warning_message_of_the_training_booking_page'}}

+
+ +
+ +
+
+

{{ 'information_message_of_the_training_reservation_page'}}

+
+ +
+ +
+
+

{{ 'message_of_the_subscriptions_page' }}

+
+
+ +
+
+
+
+

{{ 'message_of_the_event_page_relative_to_the_reduced_rate_availability_conditions' }}

+
+
+ +
+
+ +
+
+ +
+
+ {{ 'legal_documents'}} +
+
+
+ {{ 'if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user' }} +
+
+
+ + + +
+
+
+ {{cgvFile.custom_asset_file_attributes.attachment}} +
+ + {{ 'browse' }} + {{ 'change' }} + + +
+
+ +
+
+
+
+ + + +
+
+
+ {{cguFile.custom_asset_file_attributes.attachment}} +
+ + {{ 'browse' }} + {{ 'change' }} + + +
+
+ +
+
+
+
+ +
+
+ {{ 'customize_the_graphics' }} +
+
+
+ {{ 'for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height' }}
+ {{ 'concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels' }}
+
+ {{ 'remember_to_refresh_the_page_for_the_changes_to_take_effect' }} +
+
+
+
+ + +

{{ 'logo_(white_background)' }}

+ + +
+
+
+
+ + +

{{ 'logo_(black_background)' }}

+ + +
+
+
+
+ + +

{{ 'favicon' }}

+
+ + + {{customFavicon.custom_asset_file_attributes.attachment}} +
+
+
+ {{ 'change_the_favicon' | translate }} + +
+
+
+
+ +
+
+
+
+
+

{{ 'main_colour' }}

+
+
+
+
+ +
+ +
+
+
+ +
+
+
+
+

{{ 'secondary_colour' }}

+
+
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+
+ + +

{{ 'background_picture_of_the_profile_banner' }}

+
+ + + {{profileImage.custom_asset_file_attributes.attachment}} +
+
+
+ {{ 'change_the_profile_banner' | translate }} + +
+
+
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/app/assets/templates/admin/settings/home_page.html b/app/assets/templates/admin/settings/home_page.html new file mode 100644 index 000000000..3f6ee30a1 --- /dev/null +++ b/app/assets/templates/admin/settings/home_page.html @@ -0,0 +1,29 @@ +
+
+
+
+

{{ 'news_of_the_home_page' }}

+
+ {{ 'leave_it_empty_to_not_bring_up_any_news_on_the_home_page' | translate }} + +
+
+

{{ 'twitter_stream' }}

+
+
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
\ No newline at end of file diff --git a/app/assets/templates/admin/settings/index.html b/app/assets/templates/admin/settings/index.html deleted file mode 100644 index 821060501..000000000 --- a/app/assets/templates/admin/settings/index.html +++ /dev/null @@ -1,491 +0,0 @@ -
-
-
-
- -
-
-
-
-

{{ 'customize_the_application' }}

-
-
- -
-
- -
-
- -
- - - -
-
- {{ 'title' }} -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-

{{ 'title_concordance' }}

-
- - -
- - -
- -
-
-
-
-
- -
-
- {{ 'customize_information_messages' }} -
-
- - -
-
-

{{ 'message_of_the_machine_booking_page' }}

-
- -
- -
-
-

{{ 'warning_message_of_the_training_booking_page'}}

-
- -
- -
-
-

{{ 'information_message_of_the_training_reservation_page'}}

-
- -
- -
-
-

{{ 'message_of_the_subscriptions_page' }}

-
-
- -
-
-
-
-

{{ 'message_of_the_event_page_relative_to_the_reduced_rate_availability_conditions' }}

-
-
- -
-
- -
-
- -
-
- {{ 'legal_documents'}} -
-
-
- {{ 'if_these_documents_are_not_filled_no_consent_about_them_will_be_asked_to_the_user' }} -
-
-
- - - -
-
-
- {{cgvFile.custom_asset_file_attributes.attachment}} -
- - {{ 'browse' }} - {{ 'change' }} - - -
-
- -
-
-
-
- - - -
-
-
- {{cguFile.custom_asset_file_attributes.attachment}} -
- - {{ 'browse' }} - {{ 'change' }} - - -
-
- -
-
-
-
- -
-
- {{ 'customize_the_graphics' }} -
-
-
- {{ 'for_an_optimal_rendering_the_logo_image_must_be_at_the_PNG_format_with_a_transparent_background_and_with_an_aspect_ratio_3.5_times_wider_than_the_height' }}
- {{ 'concerning_the_favicon_it_must_be_at_ICO_format_with_a_size_of_16x16_pixels' }}
-
- {{ 'remember_to_refresh_the_page_for_the_changes_to_take_effect' }} -
-
-
-
- - -

{{ 'logo_(white_background)' }}

- - -
-
-
-
- - -

{{ 'logo_(black_background)' }}

- - -
-
-
-
- - -

{{ 'favicon' }}

-
- - - {{customFavicon.custom_asset_file_attributes.attachment}} -
-
-
- {{ 'change_the_favicon' | translate }} - -
-
-
-
- -
-
-
-
-
-

{{ 'main_colour' }}

-
-
-
-
- -
- -
-
-
- -
-
-
-
-

{{ 'secondary_colour' }}

-
-
-
-
- -
- -
-
-
- -
-
-
-
-
-
-
- - -

{{ 'background_picture_of_the_profile_banner' }}

-
- - - {{profileImage.custom_asset_file_attributes.attachment}} -
-
-
- {{ 'change_the_profile_banner' | translate }} - -
-
-
-
- -
-
-
-
-
-
- - -
-
-
-
-

{{ 'news_of_the_home_page' }}

-
- {{ 'leave_it_empty_to_not_bring_up_any_news_on_the_home_page' | translate }} - -
-
-

{{ 'twitter_stream' }}

-
-
-
-
- -
- -
-
-
- -
-
-
-
-
-
-
- - -
-
- -
-
-

- {{ 'shift_enter_to_force_carriage_return' | translate }} - -
- -
- -
-
-
- -
- -
-
-
- -
- {{ 'shift_enter_to_force_carriage_return' | translate }} - -
- -
- -
-
-
- -
-
- {{ 'reservations_parameters' }} -
-
-
-
-

{{ 'confine_the_booking_agenda' }}

-
-

{{ 'opening_time' }}

- -
-
- -
-
-

{{ 'closing_time' }}

- -
-
- -
-
-
-

{{ 'ability_for_the_users_to_move_their_reservations' }}

-
- - - -
-
-
-
- -
-
-
- -
- -
-
- -
-
-
-

{{ 'ability_for_the_users_to_cancel_their_reservations' }}

-
- - - -
-
-
-
- -
-
-
- -
- -
-
- -
-
-
-
-
-
-
-
- -
-
diff --git a/app/assets/templates/admin/settings/index.html.erb b/app/assets/templates/admin/settings/index.html.erb new file mode 100644 index 000000000..aacf87196 --- /dev/null +++ b/app/assets/templates/admin/settings/index.html.erb @@ -0,0 +1,41 @@ +
+
+
+
+ +
+
+
+
+

{{ 'customize_the_application' }}

+
+
+ +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + + + +
+ +
+
diff --git a/app/assets/templates/admin/settings/reservations.html b/app/assets/templates/admin/settings/reservations.html new file mode 100644 index 000000000..1c94fdc91 --- /dev/null +++ b/app/assets/templates/admin/settings/reservations.html @@ -0,0 +1,84 @@ +
+
+ {{ 'reservations_parameters' }} +
+
+
+
+

{{ 'confine_the_booking_agenda' }}

+
+

{{ 'opening_time' }}

+ +
+
+ +
+
+

{{ 'closing_time' }}

+ +
+
+ +
+
+
+

{{ 'ability_for_the_users_to_move_their_reservations' }}

+
+ + + +
+
+
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+

{{ 'ability_for_the_users_to_cancel_their_reservations' }}

+
+ + + +
+
+
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/vendor/assets/components/jasny-bootstrap/Gruntfile.js b/vendor/assets/components/jasny-bootstrap/Gruntfile.js index df551fecf..264d1f480 100644 --- a/vendor/assets/components/jasny-bootstrap/Gruntfile.js +++ b/vendor/assets/components/jasny-bootstrap/Gruntfile.js @@ -234,7 +234,7 @@ module.exports = function (grunt) { options: { inject: 'js/tests/unit/phantom.js' }, - files: 'js/tests/index.html' + files: 'js/tests/index.html.erb' }, connect: { @@ -315,7 +315,7 @@ module.exports = function (grunt) { options: { build: process.env.TRAVIS_JOB_ID, concurrency: 10, - urls: ['http://127.0.0.1:3000/js/tests/index.html'], + urls: ['http://127.0.0.1:3000/js/tests/index.html.erb'], browsers: grunt.file.readYAML('test-infra/sauce_browsers.yml') } }