From 1c1c1cf20be897c69ae177952ed51e555678e086 Mon Sep 17 00:00:00 2001 From: "kilian (dks-laptop)" Date: Wed, 20 Jan 2021 07:34:34 +0100 Subject: [PATCH] v202101200734 t1.1.8 --- app/static/css/theme.css | 46 +++++++++++++++++--- app/tmpl/block/dlgperiodvalidation.tt | 6 +-- app/tmpl/block/dlgstaffperioddays.tt | 20 ++++----- app/tmpl/index.tt | 2 +- app/tmpl/module/staff/dlg_addstaff.tt | 2 +- app/tmpl/module/staff/dlg_staffcontract.tt | 2 +- app/tmpl/module/staff/staff.js | 2 +- app/tmpl/module/workplans/dlg_workplanday.tt | 16 +++---- desktopapp/package.json | 2 +- 9 files changed, 66 insertions(+), 32 deletions(-) diff --git a/app/static/css/theme.css b/app/static/css/theme.css index 5e3bb04b..e999b13e 100644 --- a/app/static/css/theme.css +++ b/app/static/css/theme.css @@ -508,6 +508,7 @@ div.SubHeadTitle font-size: 16px; } + button.toolbarbtn { margin: 2px; @@ -515,7 +516,7 @@ button.toolbarbtn border-radius: 2px; border: 0.5px solid #c6c6c6!important; color: #fff; - font-size: 8pt!important; + } button.toolbarbtn:hover { @@ -532,8 +533,16 @@ button.toolbarbtn:focus border-color: #cccccc!important; } - -a.toolbarbtn +/* a.toolbarbtn +{ + border: 0.5px solid #c6c6c6; + background-color: rgba(0%,0%,0%,0); + color: #fff; + text-align: center; + text-decoration: unset; + font-size: 8pt!important; +} */ + a.toolbarbtn { border-radius: 2px; margin: 2px; @@ -543,7 +552,7 @@ a.toolbarbtn text-align: center; text-decoration: unset; font-size: 8pt!important; -} +} a.toolbarbtn:hover { background-color: #343434!important; @@ -831,14 +840,39 @@ span[class^="icon"]::after { white-space: pre; } -.inlinebtn { + + +a.inlinebtn { + border: 0.5px solid #c6c6c6; + /* background-color: rgba(0%,0%,0%,0); */ + color: red; + text-align: center; + text-decoration: unset; + font-size: 8pt!important; position: relative; height: 28px; margin-top: -28px; margin-left: -20px; padding: 4px 8px; border: 0!important; - float: right; + float: right; + +} + + +a.inlinebtn:hover +{ + background-color: #343434!important; + color: #fff; +} +a.inlinebtn:pressed +{ + background-color: #343434!important; + color: #fff; +} +a.inlinebtn:focus +{ + border-color: #cccccc!important; } #loader { diff --git a/app/tmpl/block/dlgperiodvalidation.tt b/app/tmpl/block/dlgperiodvalidation.tt index c62bb0cc..f850e2d7 100644 --- a/app/tmpl/block/dlgperiodvalidation.tt +++ b/app/tmpl/block/dlgperiodvalidation.tt @@ -29,7 +29,7 @@
- +
@@ -44,7 +44,7 @@
- +
@@ -59,7 +59,7 @@
- +
diff --git a/app/tmpl/block/dlgstaffperioddays.tt b/app/tmpl/block/dlgstaffperioddays.tt index 0f9072ce..4fa1a215 100644 --- a/app/tmpl/block/dlgstaffperioddays.tt +++ b/app/tmpl/block/dlgstaffperioddays.tt @@ -20,7 +20,7 @@
-
@@ -29,7 +29,7 @@
-
@@ -45,7 +45,7 @@
-
@@ -54,7 +54,7 @@
-
@@ -73,7 +73,7 @@
-
@@ -82,7 +82,7 @@
-
@@ -98,7 +98,7 @@
-
@@ -107,7 +107,7 @@
-
@@ -148,7 +148,7 @@
-
@@ -169,7 +169,7 @@
-
diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt index 7aa6c1a6..5939388a 100644 --- a/app/tmpl/index.tt +++ b/app/tmpl/index.tt @@ -1,4 +1,4 @@ -[% appversion='1.1.7' %] +[% appversion='1.1.8' %] [% minify = '' %] [% PROCESS "lang/${lang}.tt" %] diff --git a/app/tmpl/module/staff/dlg_addstaff.tt b/app/tmpl/module/staff/dlg_addstaff.tt index 0bcfe78d..b5c73139 100644 --- a/app/tmpl/module/staff/dlg_addstaff.tt +++ b/app/tmpl/module/staff/dlg_addstaff.tt @@ -43,7 +43,7 @@
+ "text" value="40:00">
diff --git a/app/tmpl/module/staff/dlg_staffcontract.tt b/app/tmpl/module/staff/dlg_staffcontract.tt index af7aae5c..98b49c9b 100644 --- a/app/tmpl/module/staff/dlg_staffcontract.tt +++ b/app/tmpl/module/staff/dlg_staffcontract.tt @@ -23,7 +23,7 @@
+ "text" value="">
diff --git a/app/tmpl/module/staff/staff.js b/app/tmpl/module/staff/staff.js index 28a14f26..8d1913bb 100644 --- a/app/tmpl/module/staff/staff.js +++ b/app/tmpl/module/staff/staff.js @@ -71,7 +71,7 @@ let staff ={ staff.initform(); staff.tbl = new Tabulator("#tbl_staff", { height: "calc(100vh - 56px)", - layout: "fitDataFill", + layout: "fitColumn", selectable: 1, groupBy:["groupname"], groupStartOpen:[true], diff --git a/app/tmpl/module/workplans/dlg_workplanday.tt b/app/tmpl/module/workplans/dlg_workplanday.tt index be51fe9d..47c27b12 100644 --- a/app/tmpl/module/workplans/dlg_workplanday.tt +++ b/app/tmpl/module/workplans/dlg_workplanday.tt @@ -20,7 +20,7 @@
- +
@@ -28,7 +28,7 @@
- +
@@ -52,14 +52,14 @@
- +
- +
@@ -90,14 +90,14 @@
- +
- +
@@ -112,14 +112,14 @@
- +
- +
diff --git a/desktopapp/package.json b/desktopapp/package.json index eef0ed42..db4a2316 100644 --- a/desktopapp/package.json +++ b/desktopapp/package.json @@ -1,6 +1,6 @@ { "name": "POT", - "version": "1.1.7", + "version": "1.1.8", "description": "plan d'organisation du travail", "main": "main.js", "scripts": { -- 2.39.5