From 7cb92db256c81a9ebc9ecfb5feef41c8a599909c Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 27 Jul 2020 17:11:31 +0400 Subject: [PATCH 01/92] PHRAS-3189 add admin expose menu --- resources/www/admin/images/toolbox-solid.svg | 1 + templates/web/admin/tree.html.twig | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 resources/www/admin/images/toolbox-solid.svg diff --git a/resources/www/admin/images/toolbox-solid.svg b/resources/www/admin/images/toolbox-solid.svg new file mode 100644 index 0000000000..43b38bbf75 --- /dev/null +++ b/resources/www/admin/images/toolbox-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig index ca9991b2a9..0bf77c769d 100644 --- a/templates/web/admin/tree.html.twig +++ b/templates/web/admin/tree.html.twig @@ -22,6 +22,12 @@ {% trans %}Setup{% endtrans %} +
  • + + + {% trans %}Phraseanet setting (beta){% endtrans %} + +
  • From 206f1f5941e57004d9b8992dc24e4b15cad42bee Mon Sep 17 00:00:00 2001 From: aynsix Date: Tue, 28 Jul 2020 10:50:46 +0300 Subject: [PATCH 02/92] initiate phraseanet service admin --- .../Phrasea/Application/RouteLoader.php | 2 + .../ControllerProviderServiceProvider.php | 2 + .../Controller/PSAdminController.php | 15 +++++ .../Provider/PSAdminServiceprovider.php | 59 +++++++++++++++++++ .../admin/phraseanet-service/index.html.twig | 1 + templates/web/admin/tree.html.twig | 2 +- 6 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php create mode 100644 lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceprovider.php create mode 100644 templates/web/admin/phraseanet-service/index.html.twig diff --git a/lib/Alchemy/Phrasea/Application/RouteLoader.php b/lib/Alchemy/Phrasea/Application/RouteLoader.php index fc1b25e042..eec7700d3e 100644 --- a/lib/Alchemy/Phrasea/Application/RouteLoader.php +++ b/lib/Alchemy/Phrasea/Application/RouteLoader.php @@ -5,6 +5,7 @@ namespace Alchemy\Phrasea\Application; use Alchemy\EmbedProvider\EmbedServiceProvider; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\ControllerProvider as Providers; +use Alchemy\Phrasea\PhraseanetService\Provider\PSAdminServiceprovider; use Alchemy\Phrasea\Report\ControllerProvider\ProdReportControllerProvider; use Alchemy\Phrasea\WorkerManager\Provider\ControllerServiceProvider as WorkerManagerProvider; use Assert\Assertion; @@ -30,6 +31,7 @@ class RouteLoader '/admin/subdefs' => Providers\Admin\Subdefs::class, '/admin/task-manager' => Providers\Admin\TaskManager::class, '/admin/worker-manager' => WorkerManagerProvider::class, + '/admin/phraseanet-service' => PSAdminServiceprovider::class, '/admin/users' => Providers\Admin\Users::class, '/client/' => Providers\Client\Root::class, '/datafiles' => Providers\Datafiles::class, diff --git a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php index 39e59ed7fd..d72cbb2b5f 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php @@ -3,6 +3,7 @@ namespace Alchemy\Phrasea\ControllerProvider; use Alchemy\EmbedProvider\EmbedServiceProvider; +use Alchemy\Phrasea\PhraseanetService\Provider\PSAdminServiceprovider; use Silex\Application; use Silex\ServiceProviderInterface; @@ -55,6 +56,7 @@ class ControllerProviderServiceProvider implements ServiceProviderInterface Admin\Subdefs::class => [], Admin\TaskManager::class => [], \Alchemy\Phrasea\WorkerManager\Provider\ControllerServiceProvider::class => [], + PSAdminServiceprovider::class => [], Admin\Users::class => [], Client\Root::class => [], Datafiles::class => [], diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php new file mode 100644 index 0000000000..3358a9d275 --- /dev/null +++ b/lib/Alchemy/Phrasea/PhraseanetService/Controller/PSAdminController.php @@ -0,0 +1,15 @@ +render('admin/phraseanet-service/index.html.twig'); + } + +} diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceprovider.php b/lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceprovider.php new file mode 100644 index 0000000000..a66211260e --- /dev/null +++ b/lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceprovider.php @@ -0,0 +1,59 @@ +share(function (PhraseaApplication $app) { + return new PSAdminController($app); + }); + } + + /** + * Returns routes to connect to the given application. + * + * @param Application $app An Application instance + * + * @return ControllerCollection A ControllerCollection instance + */ + public function connect(Application $app) + { + $controllers = $this->createAuthenticatedCollection($app); + + $controllers->match('/', 'controller.ps.admin:indexAction') + ->method('GET') + ->bind('ps_admin'); + + return $controllers; + } + + /** + * Bootstraps the application. + * + * This method is called after all services are registered + * and should be used for "dynamic" configuration (whenever + * a service must be requested). + */ + public function boot(Application $app) + { + + } +} diff --git a/templates/web/admin/phraseanet-service/index.html.twig b/templates/web/admin/phraseanet-service/index.html.twig new file mode 100644 index 0000000000..7064fd290e --- /dev/null +++ b/templates/web/admin/phraseanet-service/index.html.twig @@ -0,0 +1 @@ +

    Phraseanet Service setting

    \ No newline at end of file diff --git a/templates/web/admin/tree.html.twig b/templates/web/admin/tree.html.twig index 0bf77c769d..1efce56f1c 100644 --- a/templates/web/admin/tree.html.twig +++ b/templates/web/admin/tree.html.twig @@ -23,7 +23,7 @@
  • - + {% trans %}Phraseanet setting (beta){% endtrans %} From dde70b2e21f94df5f9522e8b56902377eda5896f Mon Sep 17 00:00:00 2001 From: aynsix Date: Tue, 28 Jul 2020 10:55:21 +0300 Subject: [PATCH 03/92] fix class name --- lib/Alchemy/Phrasea/Application/RouteLoader.php | 4 ++-- .../ControllerProvider/ControllerProviderServiceProvider.php | 4 ++-- ...{PSAdminServiceprovider.php => PSAdminServiceProvider.php} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename lib/Alchemy/Phrasea/PhraseanetService/Provider/{PSAdminServiceprovider.php => PSAdminServiceProvider.php} (96%) diff --git a/lib/Alchemy/Phrasea/Application/RouteLoader.php b/lib/Alchemy/Phrasea/Application/RouteLoader.php index eec7700d3e..8259bfae2d 100644 --- a/lib/Alchemy/Phrasea/Application/RouteLoader.php +++ b/lib/Alchemy/Phrasea/Application/RouteLoader.php @@ -5,7 +5,7 @@ namespace Alchemy\Phrasea\Application; use Alchemy\EmbedProvider\EmbedServiceProvider; use Alchemy\Phrasea\Application; use Alchemy\Phrasea\ControllerProvider as Providers; -use Alchemy\Phrasea\PhraseanetService\Provider\PSAdminServiceprovider; +use Alchemy\Phrasea\PhraseanetService\Provider\PSAdminServiceProvider; use Alchemy\Phrasea\Report\ControllerProvider\ProdReportControllerProvider; use Alchemy\Phrasea\WorkerManager\Provider\ControllerServiceProvider as WorkerManagerProvider; use Assert\Assertion; @@ -31,7 +31,7 @@ class RouteLoader '/admin/subdefs' => Providers\Admin\Subdefs::class, '/admin/task-manager' => Providers\Admin\TaskManager::class, '/admin/worker-manager' => WorkerManagerProvider::class, - '/admin/phraseanet-service' => PSAdminServiceprovider::class, + '/admin/phraseanet-service' => PSAdminServiceProvider::class, '/admin/users' => Providers\Admin\Users::class, '/client/' => Providers\Client\Root::class, '/datafiles' => Providers\Datafiles::class, diff --git a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php index d72cbb2b5f..ffb2bc3bbd 100644 --- a/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php +++ b/lib/Alchemy/Phrasea/ControllerProvider/ControllerProviderServiceProvider.php @@ -3,7 +3,7 @@ namespace Alchemy\Phrasea\ControllerProvider; use Alchemy\EmbedProvider\EmbedServiceProvider; -use Alchemy\Phrasea\PhraseanetService\Provider\PSAdminServiceprovider; +use Alchemy\Phrasea\PhraseanetService\Provider\PSAdminServiceProvider; use Silex\Application; use Silex\ServiceProviderInterface; @@ -56,7 +56,7 @@ class ControllerProviderServiceProvider implements ServiceProviderInterface Admin\Subdefs::class => [], Admin\TaskManager::class => [], \Alchemy\Phrasea\WorkerManager\Provider\ControllerServiceProvider::class => [], - PSAdminServiceprovider::class => [], + PSAdminServiceProvider::class => [], Admin\Users::class => [], Client\Root::class => [], Datafiles::class => [], diff --git a/lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceprovider.php b/lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceProvider.php similarity index 96% rename from lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceprovider.php rename to lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceProvider.php index a66211260e..671254ec79 100644 --- a/lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceprovider.php +++ b/lib/Alchemy/Phrasea/PhraseanetService/Provider/PSAdminServiceProvider.php @@ -10,7 +10,7 @@ use Silex\ControllerCollection; use Silex\ControllerProviderInterface; use Silex\ServiceProviderInterface; -class PSAdminServiceprovider implements ControllerProviderInterface, ServiceProviderInterface +class PSAdminServiceProvider implements ControllerProviderInterface, ServiceProviderInterface { use ControllerProviderTrait; From ebd5414add82feb537aaeaa8909c0629ec73af5b Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 29 Jul 2020 15:27:20 +0400 Subject: [PATCH 04/92] PHRAS-3189: Admin expose : add template --- resources/www/admin/styles/main.scss | 39 +++++++ .../admin/phraseanet-service/expose.html.twig | 105 ++++++++++++++++++ .../admin/phraseanet-service/index.html.twig | 42 ++++++- 3 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 templates/web/admin/phraseanet-service/expose.html.twig diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index b7487def52..38519267be 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -955,6 +955,45 @@ span.simplecolorpicker.picker { margin-right: 15px; } } + +/**Phraseanet service setting**/ + +.phraseanet-service-setting-tabs { + &.ui-widget-content { + border: 0; + background: none; + } + .ui-tabs-active { + background: #9EA09D!important; + .ui-tabs-anchor { + color: #fff; + } + } +} +/***Expose tab*****/ +.expose_block { + border: 1px solid #ddd; + padding: 15px; + margin-bottom: 20px; + + input[type=radio], input[type=checkbox]{ + float: left; + margin-right: 10px; + } +} +.expose-save-btn { + float: right; + +} +.btn.btn-primary.btn-green { + background: #5cb85c; +} + +.expose_name { + border: 2px solid; + margin-left: 13px; +} + @import './databases'; @import './fields'; @import './tables'; diff --git a/templates/web/admin/phraseanet-service/expose.html.twig b/templates/web/admin/phraseanet-service/expose.html.twig new file mode 100644 index 0000000000..9b5a087d92 --- /dev/null +++ b/templates/web/admin/phraseanet-service/expose.html.twig @@ -0,0 +1,105 @@ +

    {{ 'admin:phrasea-service-setting:tab:expose:: Expose setting' | trans }}

    +
    +
    +
    + +
    +
    + +
    +
    +

    {{ 'admin:phrasea-service-setting:tab:expose:: Name' | trans }}

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

    {{ 'admin:phrasea-service-setting:tab:expose:: Name' | trans }} + : {{ 'admin:phrasea-service-setting:tab:expose:: Internal expose' | trans }}

    +
    +
    + +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    + + +
    +
    + diff --git a/templates/web/admin/phraseanet-service/index.html.twig b/templates/web/admin/phraseanet-service/index.html.twig index 7064fd290e..3fdf34dc60 100644 --- a/templates/web/admin/phraseanet-service/index.html.twig +++ b/templates/web/admin/phraseanet-service/index.html.twig @@ -1 +1,41 @@ -

    Phraseanet Service setting

    \ No newline at end of file +

    {{ 'admin:phrasea-service-setting:tab-title:: Page title' | trans }}

    + + + +{% block javascript %} + +{% endblock %} \ No newline at end of file From df66b7c72045464b1311f4a5f143da8e3d0ecb63 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Wed, 29 Jul 2020 17:00:10 +0400 Subject: [PATCH 05/92] PHRAS-3189 front admin expose --- resources/www/admin/styles/main.scss | 4 +-- .../admin/phraseanet-service/expose.html.twig | 35 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 38519267be..b4335a143f 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -975,8 +975,8 @@ span.simplecolorpicker.picker { border: 1px solid #ddd; padding: 15px; margin-bottom: 20px; - - input[type=radio], input[type=checkbox]{ + max-width: 700px; + input[type=radio], input[type=checkbox], .pull-left-btn { float: left; margin-right: 10px; } diff --git a/templates/web/admin/phraseanet-service/expose.html.twig b/templates/web/admin/phraseanet-service/expose.html.twig index 9b5a087d92..20b90263a2 100644 --- a/templates/web/admin/phraseanet-service/expose.html.twig +++ b/templates/web/admin/phraseanet-service/expose.html.twig @@ -2,11 +2,11 @@
    - +
    @@ -44,17 +44,14 @@
    -
    + {{ 'admin:phrasea-service-setting:tab:expose:: add Mapping' | trans }}
    -
    + {{ 'admin:phrasea-service-setting:tab:expose:: add user' | trans }}
    - - @@ -63,8 +60,8 @@
    + type="checkbox" class="auth_connection" name="auth_connection_internal" value="0">

    {{ 'admin:phrasea-service-setting:tab:expose:: Name' | trans }} @@ -89,17 +86,19 @@

    -
    + {{ 'admin:phrasea-service-setting:tab:expose:: add Mapping' | trans }}
    -
    + {{ 'admin:phrasea-service-setting:tab:expose:: add user' | trans }}
    - - +
    +
    +
    +
    From 58d374fc8105ff44ec01a1636f719521683532b4 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 30 Jul 2020 12:46:30 +0400 Subject: [PATCH 06/92] PHRAS-3189 Admin template --- resources/www/admin/styles/main.scss | 42 +++- .../admin/phraseanet-service/expose.html.twig | 195 +++++++++--------- 2 files changed, 134 insertions(+), 103 deletions(-) diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index b4335a143f..4ac4afda70 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -969,27 +969,49 @@ span.simplecolorpicker.picker { color: #fff; } } -} -/***Expose tab*****/ -.expose_block { - border: 1px solid #ddd; - padding: 15px; - margin-bottom: 20px; - max-width: 700px; input[type=radio], input[type=checkbox], .pull-left-btn { float: left; margin-right: 10px; } } +/***Expose tab*****/ +#expose { + max-width: 992px; +} +.expose-block { + border: 2px solid #ddd; + padding: 15px; + margin-bottom: 20px; + margin-top: 15px; +} .expose-save-btn { float: right; - + width: 350px; + max-width: 100%; } -.btn.btn-primary.btn-green { +.btn.btn-green { background: #5cb85c; } +.btn.btn-red { + background: #da4f49; +} +.btn.btn-grey { + background: #aaa8a5; +} +input[type=button], input[type=submit] { + &.delete-expose { + width: 100%; + } + &.save-expose { + width: 49%; + float: right; + } + &.test-connection { + width: 49%; + } +} -.expose_name { +.expose-name { border: 2px solid; margin-left: 13px; } diff --git a/templates/web/admin/phraseanet-service/expose.html.twig b/templates/web/admin/phraseanet-service/expose.html.twig index 20b90263a2..892835800d 100644 --- a/templates/web/admin/phraseanet-service/expose.html.twig +++ b/templates/web/admin/phraseanet-service/expose.html.twig @@ -1,104 +1,113 @@

    {{ 'admin:phrasea-service-setting:tab:expose:: Expose setting' | trans }}

    -
    -
    -
    - -
    -
    - -
    -
    -

    {{ 'admin:phrasea-service-setting:tab:expose:: Name' | trans }}

    + - -
    -
    - -
    - -
    -
    -

    {{ 'admin:phrasea-service-setting:tab:expose:: Name' | trans }} - : {{ 'admin:phrasea-service-setting:tab:expose:: Internal expose' | trans }}

    + +
    +
    +

    {{ 'admin:phrasea-service-setting:tab:expose:: Name' | trans }}

    +
    +
    +
    +
    -
    -
    -
    -
    +
    +
    +
    -
    -
    -
    +
    +
    +
    +
    +
    +
    -
    -
    - {{ 'admin:phrasea-service-setting:tab:expose:: add Mapping' | trans }}
    -
    -
    -
    - {{ 'admin:phrasea-service-setting:tab:expose:: add user' | trans }}
    -
    -
    -
    -
    -
    +
    +
    + {{ 'admin:phrasea-service-setting:tab:expose:: add Mapping' | trans }}
    +
    +
    +
    + {{ 'admin:phrasea-service-setting:tab:expose:: add user' | trans }}
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +{% block javascript %} + +{% endblock %} From 5df99d26be732126d852116dca00c940946f2e83 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Thu, 30 Jul 2020 18:38:51 +0400 Subject: [PATCH 07/92] PHRAS-3188 --- .../prod/skins/ui-components/_workzone.scss | 11 ++++++++ templates/web/prod/index.html.twig | 28 +++++++++++++++++-- templates/web/prod/tab_headers.html.twig | 2 +- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/resources/www/prod/skins/ui-components/_workzone.scss b/resources/www/prod/skins/ui-components/_workzone.scss index bf4fbf092c..75331fab90 100644 --- a/resources/www/prod/skins/ui-components/_workzone.scss +++ b/resources/www/prod/skins/ui-components/_workzone.scss @@ -75,6 +75,14 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default; border-radius: 0; margin: 0; box-sizing: border-box; + &.expose_li { + height: 44px; + &.ui-state-active { + a { + border-bottom: 3px solid #076882; + } + } + } &.proposals_WZ { &.ui-state-active { a { @@ -135,6 +143,9 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default; bottom: 0; right: 0; } + #baskets_wrapper.ui-tabs-panel { + top: 88px; + } } ul.prod-icon-menu { diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig index 8c45efc30b..4c572bcf40 100644 --- a/templates/web/prod/index.html.twig +++ b/templates/web/prod/index.html.twig @@ -182,10 +182,32 @@ {% block tabs_panel %}
    {% include 'prod/tab_headers.html.twig' %} -
    + {% import 'prod/WorkZone/Macros.html.twig' as WorkZoneMacros %} - {{WorkZoneMacros.make_bloc(app, WorkZone)}} -
    + {% set expose_activate = 'true' %} + {% if expose_activate == 'true' %} + {% block tab_headers_wrapper %} +
    +
    + +
    +
    + {{WorkZoneMacros.make_bloc(app, WorkZone)}} +
    +
    Expose
    +
    +
    +
    + {% endblock %} + {% else %} +
    + {{WorkZoneMacros.make_bloc(app, WorkZone)}} +
    + {% endif %} + {% if GV_thesaurus %}
    diff --git a/templates/web/prod/tab_headers.html.twig b/templates/web/prod/tab_headers.html.twig index c93d5fbd66..1b01ffa98a 100644 --- a/templates/web/prod/tab_headers.html.twig +++ b/templates/web/prod/tab_headers.html.twig @@ -17,7 +17,7 @@
    • {% endif %}
  • - +
    ▼
     From 86d6989c5186b485bc1ef86235675fe67919223b Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 31 Jul 2020 12:09:26 +0400 Subject: [PATCH 08/92] PHRAS-3188 --- resources/www/prod/skins/ui-components/_workzone.scss | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/resources/www/prod/skins/ui-components/_workzone.scss b/resources/www/prod/skins/ui-components/_workzone.scss index 75331fab90..bf4fbf092c 100644 --- a/resources/www/prod/skins/ui-components/_workzone.scss +++ b/resources/www/prod/skins/ui-components/_workzone.scss @@ -75,14 +75,6 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default; border-radius: 0; margin: 0; box-sizing: border-box; - &.expose_li { - height: 44px; - &.ui-state-active { - a { - border-bottom: 3px solid #076882; - } - } - } &.proposals_WZ { &.ui-state-active { a { @@ -143,9 +135,6 @@ $workzoneTabDisabledTextColor: $mediumTextActiveColor !default; bottom: 0; right: 0; } - #baskets_wrapper.ui-tabs-panel { - top: 88px; - } } ul.prod-icon-menu { From a7855247b2c52a603a407c4a8d19e25f60135b73 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Fri, 31 Jul 2020 15:21:20 +0400 Subject: [PATCH 09/92] PHRAS-3189 template --- resources/www/admin/styles/main.scss | 179 +++++++++++++----- .../admin/phraseanet-service/expose.html.twig | 49 +++-- templates/web/admin/tree.html.twig | 2 +- 3 files changed, 163 insertions(+), 67 deletions(-) diff --git a/resources/www/admin/styles/main.scss b/resources/www/admin/styles/main.scss index 4ac4afda70..c35760e880 100644 --- a/resources/www/admin/styles/main.scss +++ b/resources/www/admin/styles/main.scss @@ -1,6 +1,6 @@ @import '../../_shared/styles/variables'; - -@import '../../vendors/jquery-treeview/jquery.treeview'; // to inline import css file, don't put extension +@import '../../vendors/jquery-treeview/jquery.treeview'; +// to inline import css file, don't put extension @import '../../../../node_modules/blueimp-file-upload/css/jquery.fileupload-ui'; // to inline import css file, don't put extension @import '../../vendors/jquery-contextmenu/styles/jquery.contextmenu'; @@ -25,85 +25,102 @@ body { font-size: $mediumFontSize; overflow-y: auto; } + .clear { clear: both; } + h1 { font-weight: bold; font-size: 24px; text-align: left; margin: 10px 0; } + h2 { font-weight: bold; font-size: 18px; text-align: left; margin: 7px 0; } + h3 { font-weight: bold; font-size: 14px; text-align: left; margin: 4px 0; } + h4 { font-weight: bold; font-size: 12px; text-align: left; margin: 2px 0; } + a { color: #333333; text-decoration: underline; cursor: pointer; } + a:hover { color: #0088cc; text-decoration: underline; cursor: pointer; } + blockquote { margin: 20px 15px; padding: 10px; border: 1px dotted #000000; background-color: #f2f2f2; } + img { vertical-align: middle; } + input, textarea, .uneditable-input { margin: 0; padding: 4px; } + select { margin: 0; padding: 5px 4px; *padding: 4px; } + .help-block, .help-inline { color: #666666; } + li.selected, div.selected { background-color: #aaa8a5; color: #ffffff; } + li.selected a, div.selected a { background-color: #aaa8a5; color: #ffffff; } + .treeview ul { background-color: transparent; } + #right-ajax.loading { background-image: url('#{$iconsPath}loaderFFF.gif'); background-repeat: no-repeat; background-position: center center; } + div.finder div.content div.title { margin-top: -2px; position: relative; @@ -115,13 +132,12 @@ div.finder div.content div.title { //setting .dumpfield { - margin-top:10px; + margin-top: 10px; width: 400px; } /******* MAIN MENU ************************************************************/ - $mainMenuBackgroundColor: #ffe000; $mainMenuLinkColor: #333333; $mainMenuLinkHoverColor: #000000; @@ -139,50 +155,63 @@ $mainMenuLinkBackgroundHoverColor: transparent; background-color: #f2f0e9; overflow: auto; } + #FNDR { overflow: auto; } + #FNDR li.selected { background-color: #aaa8a5; color: #ffffff; } + #FNDR a { text-decoration: none; img { width: 16px; } } + #FNDR a:hover { text-decoration: none; } + #FNDR a span { text-decoration: underline; } + #FNDR a span:hover { text-decoration: underline; } + /******* USERS ****************************************************************/ .admin_head_opts { margin: 5px 0 10px 0; } + .admin_head_opts span { margin: 0 10px; } + .admin_head_opts a { margin: 0 5px; } + #users_page_form p { margin: 5px 5px 10px; } + #users_page_form .input-mini { width: 30px; } + #users_check_uncheck div { padding: 5px 10px; background-color: #cccccc; color: #000000; cursor: pointer; } + #users_check_uncheck div.hovered { padding: 5px 10px; background-color: #4d4d4d; @@ -193,6 +222,7 @@ $mainMenuLinkBackgroundHoverColor: transparent; color: #afafaf; cursor: pointer; } + .users_check_line_wrap { position: absolute; div { @@ -244,6 +274,7 @@ div.switch_right { height: 12px; margin: 0 auto; } + div.switch_quota.mixed, div.switch_masks.mixed, div.switch_time.mixed, @@ -252,6 +283,7 @@ div.switch_right.mixed { background-repeat: no-repeat; background-position: center center; } + div.switch_quota.checked, div.switch_masks.checked, div.switch_time.checked, @@ -260,6 +292,7 @@ div.switch_right.checked { background-repeat: no-repeat; background-position: center center; } + div.switch_quota.unchecked, div.switch_masks.unchecked, div.switch_time.unchecked, @@ -268,6 +301,7 @@ div.switch_right.unchecked { background-repeat: no-repeat; background-position: center center; } + .ui-datepicker { z-index: 1500; } @@ -409,60 +443,74 @@ div.switch_right.unchecked { .board_section { margin: 0 0 30px; } + .board_section div[class="section"] { height: auto; } + .board_section div[class="section"] h2 { line-height: 24px; } + .board_section div[class="section"] ul.setup { border: 1px solid #cccccc; list-style-type: none; } + .board_section div[class="section"] ul.setup li { padding: 2px 5px 2px 30px; background-repeat: no-repeat; background-position: 5px center; } + .board_section div[class="section"] ul.setup li.good-enough { background-image: url('#{$iconsPath}ok.png'); } + .board_section div[class="section"] ul.setup li.non-blocker { background-image: url('#{$iconsPath}alert.png'); } + .board_section div[class="section"] ul.setup li.blocker { background-image: url('#{$iconsPath}delete.png'); background-size: 16px; } + .board_section div[class="section"] ul.setup li:hover { background-color: #f2f0e9; } + /******* PUBLICATIONS *********************************************************/ #pub_icon { width: 42px; height: 42px; float: left; } + #pub_icon .thumb_wrapper { width: 32px; height: 32px; margin: 5px auto; } + #pub_icon .thumb_wrapper img { width: 32px; height: 32px; } + #pub_fileupload { height: 42px; line-height: 42px; margin-left: 47px; } + /******* GLOBAL VALUES FORM ***************************************************/ #GV_form .error, #GV_form .NEW { color: #ff0000; font-weight: bold; } + #GV_form .section { padding-bottom: 10px; } @@ -499,10 +547,12 @@ div.switch_right.unchecked { #admin_setup_registry .control-label { min-width: 260px; } + #admin_setup_registry .form-horizontal .controls, #admin_setup_registry .form-horizontal .help-message { margin-left: 300px; } -.alert .close{ + +.alert .close { text-decoration: none; } @@ -880,10 +930,10 @@ span.simplecolorpicker.picker { } .help-trigger { - display:inline-block; - cursor:pointer; + display: inline-block; + cursor: pointer; padding: 0 4px; - border:none; + border: none; margin-left: -12px; } @@ -912,6 +962,7 @@ span.simplecolorpicker.picker { background: #4e4e4e; padding: 30px 20px; } + .phraseanet_about_bottom { padding: 25px 20px; min-height: 150px; @@ -919,13 +970,14 @@ span.simplecolorpicker.picker { a { font-family: Roboto; line-height: 1.2; - font-size: 15px!important; + font-size: 15px !important; font-weight: 500; - color: #000000!important; + color: #000000 !important; text-decoration: underline; } } + .phraseanet_gpl { img { position: absolute; @@ -943,12 +995,15 @@ span.simplecolorpicker.picker { } } + .ui-icon, .ui-widget-content .ui-icon { - background-image: url(/assets/vendors/jquery-ui/images/ui-lightness/ui-icons_222222_256x240.png)!important; + background-image: url(/assets/vendors/jquery-ui/images/ui-lightness/ui-icons_222222_256x240.png) !important; } + .ui-dialog-titlebar-close { text-indent: -9999999px; } + .worker-info-block { .btn-primary { min-width: 161px; @@ -964,7 +1019,7 @@ span.simplecolorpicker.picker { background: none; } .ui-tabs-active { - background: #9EA09D!important; + background: #9EA09D !important; .ui-tabs-anchor { color: #fff; } @@ -974,46 +1029,74 @@ span.simplecolorpicker.picker { margin-right: 10px; } } + /***Expose tab*****/ #expose { max-width: 992px; -} -.expose-block { - border: 2px solid #ddd; - padding: 15px; - margin-bottom: 20px; - margin-top: 15px; -} -.expose-save-btn { - float: right; - width: 350px; - max-width: 100%; -} -.btn.btn-green { - background: #5cb85c; -} -.btn.btn-red { - background: #da4f49; -} -.btn.btn-grey { - background: #aaa8a5; -} -input[type=button], input[type=submit] { - &.delete-expose { - width: 100%; - } - &.save-expose { - width: 49%; - float: right; - } - &.test-connection { - width: 49%; - } -} -.expose-name { - border: 2px solid; - margin-left: 13px; + .expose-block { + border: 2px solid #ddd; + padding: 15px; + margin-bottom: 10px; + margin-top: 10px; + width: 100%; + display: inline-block; + } + .expose-delete-btn { + float: right; + display: inline-block; + } + .expose-save-btn { + float: right; + max-width: 100%; + display: inline-block; + margin-top: 20px; + } + .btn-primary { + background: #3b99fc; + } + .btn.btn-green { + background: #5cb85c; + } + .btn.btn-red { + background: #da4f49; + } + .btn.btn-grey { + background: #aaa8a5; + } + input[type=button], input[type=submit] { + &.delete-expose { + width: 225px; + } + &.save-expose { + float: right; + } + &.test-connection { + margin-right: 20px; + margin-bottom: 15px; + } + } + .expose-name { + border: 2px solid !important; + margin-left: 13px; + padding: 7px 14px !important; + font-size: 16px !important; + font-weight: bold; + } + #add-new-expose { + margin: 20px auto 0; + } + + .expose-config-block { + margin-bottom: 25px; + } + + .expose-config-block > div { + margin-bottom: 10px; + max-width: 100%; + width: 493px; + text-align: center; + } } @import './databases'; diff --git a/templates/web/admin/phraseanet-service/expose.html.twig b/templates/web/admin/phraseanet-service/expose.html.twig index 892835800d..0bc4b66c8c 100644 --- a/templates/web/admin/phraseanet-service/expose.html.twig +++ b/templates/web/admin/phraseanet-service/expose.html.twig @@ -2,24 +2,27 @@