From 83c6dbe1a760c03fd0622386694d089788e6fee6 Mon Sep 17 00:00:00 2001 From: Mike Ng Date: Fri, 15 Jun 2018 17:25:46 +0400 Subject: [PATCH] wip - refactor ui of push screen and dialogs --- .../Controller/Prod/LanguageController.php | 1 + .../www/common/images/icons/delete-black.png | Bin 0 -> 524 bytes .../www/common/images/icons/delete-white.png | Bin 0 -> 433 bytes templates/web/prod/User/Add.html.twig | 50 ++++++------------ templates/web/prod/actions/Push.html.twig | 25 ++++++--- templates/web/prod/templates/push.html.twig | 8 +-- 6 files changed, 38 insertions(+), 46 deletions(-) create mode 100644 resources/www/common/images/icons/delete-black.png create mode 100644 resources/www/common/images/icons/delete-white.png diff --git a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php index a29146cac7..5137d3f219 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/LanguageController.php @@ -153,6 +153,7 @@ class LanguageController 'title notice' => $translator->trans('prod:mapboxgl: title notice'), 'description notice' => $translator->trans('prod:mapboxgl: description notice'), 'title-map-dialog' => $translator->trans('prod:mapboxgl: title map dialog'), + 'create new user' => $translator->trans('prod:push: create new user'), ]); } } diff --git a/resources/www/common/images/icons/delete-black.png b/resources/www/common/images/icons/delete-black.png new file mode 100644 index 0000000000000000000000000000000000000000..b4a5e8004e3274f419a6db0665262a9a4763ab11 GIT binary patch literal 524 zcmV+n0`vWeP)Px$#z{m$R5%f>ls`)&Q53~}6C~P6NF!vMO)`ZkR8Sk&Laek=ixd{t+W7%2#KKl= z`~-rnHj0g~TUZDSR*DRX|0?Y)6bZzPzcb_xnS_L8@xjfx_uO;en|tR?`ubS;d_EL* zu0o-3+{ub@Dss+U%2|TgFdgI{^E;6p_o;YSMy2=QLlijo%cJ%Y8^ZR&FnsrvXBi>snu%J1cQx6W1G^uX2muBUo41XPX66YB!Gu_6_Gd#@s&t$QD`d` zmCNN+I-Q-fQyv#!9XOVcMrMz-U>i)ktGa$-=E`UpE9du>_$BC2zErg5Cp-wX$>9SKC$x;BmNVg z;yTUNZcj}1aHLg@NxDuF(Jn1cnNYqsi`%j5MhIt_$*>hP{aK6KvDZfJ+Me;ZZ4{rv z@D6oX_-xi|Kli O0000Px$Ye_^wR5%f>lD$epK@f%G4~URL>@0*}VPlg*Y_yS7vC$VuZ7J3%)E5Xgc?Ih{ z!W9%01S>%-{HrW&E^1@^&bS+PH+x0Ff$z@TGiT;zm(*&+kWd~E8iR3F%7h!bRI!7w z7x+$tIw^7Yp_HuA2lAs{h>b}ePcR3^P)dk{kv0q*L+zNyvJSIw1oxo0fh)Mvi%wZs zkvz~}B}Lytyp~AbR*piOU<&GLkf&XKkBm+%F(~?BQ$M_kuneoP;+jk319*dTnGPws za0Y2K5cW;PXs1XW=!LZObapD5c1k}KnY@_hUzu!(^>!a*e?N6<-CH4piR2lC3-SwD zx~Kn1r3L4X|3Fh?(&(&Vy^iIO*_7Wh58?4@7;UCEU#v~R(X?{da&k= zs-^k&G*>RdxCslvfNE*k_-Rpgpi2C=MWYXJ{u5B_j>L*W9&<92wb1OqEqpp-E~zI^ bCtUIcFRK;K(2=u#00000NkvXXu0mjfqZz!C literal 0 HcmV?d00001 diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig index f2cfa27b18..3dda889f64 100644 --- a/templates/web/prod/User/Add.html.twig +++ b/templates/web/prod/User/Add.html.twig @@ -4,57 +4,39 @@ + + + - - - - - - - - - - - - - - diff --git a/templates/web/prod/actions/Push.html.twig b/templates/web/prod/actions/Push.html.twig index e612dd31b8..9fea29dcf1 100644 --- a/templates/web/prod/actions/Push.html.twig +++ b/templates/web/prod/actions/Push.html.twig @@ -42,7 +42,8 @@ {% endif %}
    • @@ -50,11 +51,11 @@
    - {{ 'Lists' | trans }} + + {{ 'Lists' | trans }} @@ -147,8 +151,10 @@
    {% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::CANADMIN')) %} - {{ 'Add user' | trans }} + + + + {{ 'Add user' | trans }} {% endif %}
    @@ -192,6 +198,7 @@
    - + - + +
    +
    - + - +
    - + - +
    - - - -
    - - - -
    - - - -
    - - + + +
    +
    @@ -216,8 +223,10 @@
    -
    diff --git a/templates/web/prod/templates/push.html.twig b/templates/web/prod/templates/push.html.twig index 9e5521ac7a..13ed64b37a 100644 --- a/templates/web/prod/templates/push.html.twig +++ b/templates/web/prod/templates/push.html.twig @@ -143,12 +143,12 @@
    - - +
    - - +