From b83773f77ebc55f0aacfacde7e287453847e4fe3 Mon Sep 17 00:00:00 2001 From: kilian Date: Thu, 16 Jul 2020 15:24:30 +0200 Subject: [PATCH] gl design changes actionbtn --- .vscode/settings.json | 5 ++- webapp/static/css/theme.css | 14 ++++--- webapp/tmpl/block/dlgaction.tt | 6 +-- webapp/tmpl/block/dlgdeleterow.tt | 4 +- webapp/tmpl/block/dlgmessage.tt | 4 +- webapp/tmpl/block/dlgreport.tt | 4 +- webapp/tmpl/block/dlgstaffpayedhours.tt | 6 +-- webapp/tmpl/block/dlgstaffperioddays.tt | 6 +-- webapp/tmpl/block/dlguploadfile.tt | 4 +- webapp/tmpl/index.tt | 3 +- webapp/tmpl/macro/fields.tt | 2 +- webapp/tmpl/module/companies.tt | 38 +++++++++---------- webapp/tmpl/module/companies/dlg_dataset.tt | 6 +-- .../tmpl/module/companies/dlg_staffgroups.tt | 6 +-- webapp/tmpl/module/companies/dlg_users.tt | 8 ++-- webapp/tmpl/module/companies/dlg_worktimes.tt | 6 +-- webapp/tmpl/module/companies/pnl_basedata.tt | 6 +-- webapp/tmpl/module/index.tt | 12 +++--- webapp/tmpl/module/login/register.tt | 4 +- webapp/tmpl/module/periods.tt | 20 +++++----- webapp/tmpl/module/profile.tt | 4 +- webapp/tmpl/module/profile/dlgpassword.tt | 6 +-- webapp/tmpl/module/profile/dlgusername.tt | 8 ++-- webapp/tmpl/module/staff.tt | 30 +++++++-------- webapp/tmpl/module/workplans.tt | 14 +++---- webapp/tmpl/module/workplans/dlg_workplan.tt | 6 +-- .../tmpl/module/workplans/dlg_workplanday.tt | 6 +-- 27 files changed, 122 insertions(+), 116 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 342a308f..aaf7c790 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,11 +6,12 @@ "indent-attributes": false, "tab-size":2, "indent":true, - "show-body-only":false, + "show-body-only":true, "fix-uri": false, "newline":"LF", "drop-empty-elements": false, - "hide-comments": true, + "hide-comments": false, + "literal-attributes": "yes", }, "git.ignoreLimitWarning": true diff --git a/webapp/static/css/theme.css b/webapp/static/css/theme.css index bbda57e4..c2a37465 100644 --- a/webapp/static/css/theme.css +++ b/webapp/static/css/theme.css @@ -379,7 +379,10 @@ header } - +.actionbtn { + background-color: #293146; + color: #fff; +} ::-webkit-input-placeholder { @@ -585,9 +588,7 @@ div.SectionHeader button.toolbarbtn { border: 0.5px solid #c6c6c6; - background-color: rgba(0%,0%,0%,0); - color: #fff; } button.toolbarbtn:hover @@ -614,9 +615,7 @@ button.toolbarbtn:focus a.toolbarbtn { border: 0.5px solid #c6c6c6; - background-color: rgba(0%,0%,0%,0); - color: #fff; text-align: center; text-decoration: unset; @@ -1021,3 +1020,8 @@ input[type="checkbox"] { content:"";display:table;clear:both } +span[class^="icon"]::after { + content: "\A"; + white-space: pre; +} + diff --git a/webapp/tmpl/block/dlgaction.tt b/webapp/tmpl/block/dlgaction.tt index 3d9dfa95..94e815a4 100644 --- a/webapp/tmpl/block/dlgaction.tt +++ b/webapp/tmpl/block/dlgaction.tt @@ -4,7 +4,7 @@
+ class="button toolbarbtn display-topright" >

@@ -14,8 +14,8 @@ [% fieldhidden("dlgparams","action",'','') %]
- - + +
diff --git a/webapp/tmpl/block/dlgdeleterow.tt b/webapp/tmpl/block/dlgdeleterow.tt index 1a185422..9ea5b629 100644 --- a/webapp/tmpl/block/dlgdeleterow.tt +++ b/webapp/tmpl/block/dlgdeleterow.tt @@ -4,7 +4,7 @@
+ class="button toolbarbtn display-topright" >

Supprimer

@@ -14,7 +14,7 @@ [% fieldhidden("dlgdelrowid","delete",'','') %]
- +
diff --git a/webapp/tmpl/block/dlgmessage.tt b/webapp/tmpl/block/dlgmessage.tt index 2e0bb57a..84aae526 100644 --- a/webapp/tmpl/block/dlgmessage.tt +++ b/webapp/tmpl/block/dlgmessage.tt @@ -3,14 +3,14 @@
+ class="button toolbarbtn display-topright" >

- +
diff --git a/webapp/tmpl/block/dlgreport.tt b/webapp/tmpl/block/dlgreport.tt index 81af586a..2a371b61 100644 --- a/webapp/tmpl/block/dlgreport.tt +++ b/webapp/tmpl/block/dlgreport.tt @@ -3,7 +3,7 @@
+ class="button toolbarbtn display-topright" >

Selectionner un modèle

@@ -12,7 +12,7 @@
diff --git a/webapp/tmpl/block/dlgstaffpayedhours.tt b/webapp/tmpl/block/dlgstaffpayedhours.tt index 8bcdc257..8b256ae2 100644 --- a/webapp/tmpl/block/dlgstaffpayedhours.tt +++ b/webapp/tmpl/block/dlgstaffpayedhours.tt @@ -2,7 +2,7 @@ diff --git a/webapp/tmpl/block/dlgstaffperioddays.tt b/webapp/tmpl/block/dlgstaffperioddays.tt index 4f910b36..f543106a 100644 --- a/webapp/tmpl/block/dlgstaffperioddays.tt +++ b/webapp/tmpl/block/dlgstaffperioddays.tt @@ -3,7 +3,7 @@ diff --git a/webapp/tmpl/block/dlguploadfile.tt b/webapp/tmpl/block/dlguploadfile.tt index 0ced3839..532defb9 100644 --- a/webapp/tmpl/block/dlguploadfile.tt +++ b/webapp/tmpl/block/dlguploadfile.tt @@ -3,7 +3,7 @@
+ class="button toolbarbtn display-topright" >

Fichier eroplueden

@@ -18,7 +18,7 @@
- +
diff --git a/webapp/tmpl/index.tt b/webapp/tmpl/index.tt index abfd297c..5edcc711 100644 --- a/webapp/tmpl/index.tt +++ b/webapp/tmpl/index.tt @@ -33,8 +33,9 @@ - + + diff --git a/webapp/tmpl/macro/fields.tt b/webapp/tmpl/macro/fields.tt index 59addb07..52f8e7c1 100644 --- a/webapp/tmpl/macro/fields.tt +++ b/webapp/tmpl/macro/fields.tt @@ -107,7 +107,7 @@
- +
[% END %]
diff --git a/webapp/tmpl/module/companies.tt b/webapp/tmpl/module/companies.tt index b6b8cf05..0610d1b0 100644 --- a/webapp/tmpl/module/companies.tt +++ b/webapp/tmpl/module/companies.tt @@ -1,17 +1,17 @@
-
- retour -
- Entreprises -
[% IF (session.usergroup == 'admin') %] [% END %] + retour +
Entreprises
+ + + [% IF (session.usergroup == 'admin') %] + + [% END %]
- [% IF (session.usergroup == 'admin') %] + [% IF (session.usergroup == 'admin') %] + + + [% END %]
@@ -26,10 +26,10 @@
Configuration sectoriel POT -
+
+ + +
@@ -37,10 +37,10 @@
Utilisateurs -
+
+ + +
diff --git a/webapp/tmpl/module/companies/dlg_dataset.tt b/webapp/tmpl/module/companies/dlg_dataset.tt index e1a8d3ef..2514722f 100644 --- a/webapp/tmpl/module/companies/dlg_dataset.tt +++ b/webapp/tmpl/module/companies/dlg_dataset.tt @@ -2,7 +2,7 @@
+ class="button toolbarbtn display-topright" >

DataSet

@@ -29,8 +29,8 @@
\ No newline at end of file diff --git a/webapp/tmpl/module/companies/dlg_staffgroups.tt b/webapp/tmpl/module/companies/dlg_staffgroups.tt index c1e15123..0f7e75f8 100644 --- a/webapp/tmpl/module/companies/dlg_staffgroups.tt +++ b/webapp/tmpl/module/companies/dlg_staffgroups.tt @@ -3,7 +3,7 @@
+ class="button toolbarbtn display-topright" >

Département

@@ -13,8 +13,8 @@
- - + +
\ No newline at end of file diff --git a/webapp/tmpl/module/companies/dlg_users.tt b/webapp/tmpl/module/companies/dlg_users.tt index a94bbdb5..18182828 100644 --- a/webapp/tmpl/module/companies/dlg_users.tt +++ b/webapp/tmpl/module/companies/dlg_users.tt @@ -1,7 +1,7 @@ diff --git a/webapp/tmpl/module/companies/dlg_worktimes.tt b/webapp/tmpl/module/companies/dlg_worktimes.tt index 59dc3a95..15e37782 100644 --- a/webapp/tmpl/module/companies/dlg_worktimes.tt +++ b/webapp/tmpl/module/companies/dlg_worktimes.tt @@ -1,7 +1,7 @@ diff --git a/webapp/tmpl/module/companies/pnl_basedata.tt b/webapp/tmpl/module/companies/pnl_basedata.tt index 24d76cf9..11d23aea 100644 --- a/webapp/tmpl/module/companies/pnl_basedata.tt +++ b/webapp/tmpl/module/companies/pnl_basedata.tt @@ -84,9 +84,9 @@
Départements -
diff --git a/webapp/tmpl/module/index.tt b/webapp/tmpl/module/index.tt index 93577b30..fdcdf3bb 100644 --- a/webapp/tmpl/module/index.tt +++ b/webapp/tmpl/module/index.tt @@ -5,7 +5,7 @@
POT - Plan d'orgatisation du travail
- +
@@ -15,8 +15,8 @@

Modules

-
Pérides de références -
Salariés + Pérides de références + Salariés
@@ -24,8 +24,8 @@

Configuration

-
Entreprises -
Modèles + Entreprises + Modèles
@@ -33,7 +33,7 @@

Profile

-
Changer mot de passe + Changer mot de passe
[% fieldselectbox("current_schemata","session","DataSet",'','',session.sessiondata.schemata,'','') %]
diff --git a/webapp/tmpl/module/login/register.tt b/webapp/tmpl/module/login/register.tt index 7cd58b78..65d739c2 100644 --- a/webapp/tmpl/module/login/register.tt +++ b/webapp/tmpl/module/login/register.tt @@ -35,14 +35,14 @@
+ class="button toolbarbtn display-topright" >

Conditions générales d'utilisation du site solana-architecture.lu

[% INCLUDE block/cgu.tt %]
diff --git a/webapp/tmpl/module/periods.tt b/webapp/tmpl/module/periods.tt index 67ab8b29..21db8cf1 100644 --- a/webapp/tmpl/module/periods.tt +++ b/webapp/tmpl/module/periods.tt @@ -2,16 +2,16 @@ [% #wd = [ {'wd' => 'mon' ,'day' => 'Lundi'}, {'wd' => 'tue','day' => 'Mardi'}, {'wd' => 'wed','day' => 'Mercredi'}, {'wd' => 'thu','day' => 'Jeudi'}, {'wd' => 'fri','day' => 'Vendredi'}, {'wd' => 'sat' ,'day' => 'Samedi'},{'wd' => 'sun','day' =>'Dimanche'} ] %]
-
retour + retour
Périodes de références
- - - - - - + + + + + +
@@ -28,10 +28,10 @@ diff --git a/webapp/tmpl/module/profile.tt b/webapp/tmpl/module/profile.tt index cb1a1f29..b2d0ce37 100644 --- a/webapp/tmpl/module/profile.tt +++ b/webapp/tmpl/module/profile.tt @@ -4,7 +4,7 @@ [% user = quserdata.get_all() %]
-
retour + retour
Profile
@@ -52,7 +52,7 @@ [% fieldeditbox('phone','users','Téléphone','','') %]
- +
diff --git a/webapp/tmpl/module/profile/dlgpassword.tt b/webapp/tmpl/module/profile/dlgpassword.tt index 48f51ce1..b01db7c1 100644 --- a/webapp/tmpl/module/profile/dlgpassword.tt +++ b/webapp/tmpl/module/profile/dlgpassword.tt @@ -3,7 +3,7 @@
+ class="button toolbarbtn display-topright" >

changement mot de passe

@@ -27,8 +27,8 @@
diff --git a/webapp/tmpl/module/profile/dlgusername.tt b/webapp/tmpl/module/profile/dlgusername.tt index 016377ee..8c2dcc72 100644 --- a/webapp/tmpl/module/profile/dlgusername.tt +++ b/webapp/tmpl/module/profile/dlgusername.tt @@ -3,7 +3,7 @@
+ class="button toolbarbtn display-topright" >

Changement de l'email resp. login

@@ -17,9 +17,9 @@
diff --git a/webapp/tmpl/module/staff.tt b/webapp/tmpl/module/staff.tt index 2f9d1df0..5790811d 100644 --- a/webapp/tmpl/module/staff.tt +++ b/webapp/tmpl/module/staff.tt @@ -1,14 +1,14 @@ [% PROCESS macro/fields.tt %]
-
retour + retour
Salariés
- - + +
- - - + + +
@@ -94,9 +94,9 @@
Données contractuelles
- - - + + +
@@ -104,16 +104,16 @@ @@ -127,7 +127,7 @@
+ class="button toolbarbtn display-topright" >

Données contractuelles

@@ -150,8 +150,8 @@
- - + +
diff --git a/webapp/tmpl/module/workplans.tt b/webapp/tmpl/module/workplans.tt index c4d62c83..7541ab11 100644 --- a/webapp/tmpl/module/workplans.tt +++ b/webapp/tmpl/module/workplans.tt @@ -2,13 +2,13 @@
-
retour + retour
Plans de travail (modèles)
- + - - + +
@@ -24,9 +24,9 @@ diff --git a/webapp/tmpl/module/workplans/dlg_workplan.tt b/webapp/tmpl/module/workplans/dlg_workplan.tt index b0c6c34e..dc550e0f 100644 --- a/webapp/tmpl/module/workplans/dlg_workplan.tt +++ b/webapp/tmpl/module/workplans/dlg_workplan.tt @@ -2,7 +2,7 @@ diff --git a/webapp/tmpl/module/workplans/dlg_workplanday.tt b/webapp/tmpl/module/workplans/dlg_workplanday.tt index 170cf687..5eb534f7 100644 --- a/webapp/tmpl/module/workplans/dlg_workplanday.tt +++ b/webapp/tmpl/module/workplans/dlg_workplanday.tt @@ -2,7 +2,7 @@ -- 2.39.5