v20210119

diff --git a/app/lib/POT/User.pm b/app/lib/POT/User.pm
index 3a6662e..90be80d 100644 (file)
--- a/app/lib/POT/User.pm
+++ b/app/lib/POT/User.pm
@@ -69,7 +69,7 @@ sub getUserList(){
     $ugroups .= " and id_usergroup in ('".join("','",@{$id_usergroups})."') ";
   }
   my $ussql = "select * from (
-SELECT us.username,us.isblocked,us.surname,us.prename,us.id_company,us.id_usergroup,us.id,cp.company,cp.datasetname,grp.groupname,
+SELECT us.username,us.isblocked,us.surname,us.prename,us.id_company,us.id_usergroup,us.id,cp.company,cp.datasetname,grp.groupname,us.lang,
 case when us.id_usergroup = 'teamleader' then string_agg(stgrp.groupname,',') else null end  as staffgroups,
             json_array_elements_text(us.schemaaccess) AS xschema
            FROM public.users us join public.companies cp on (us.id_company=cp.id)
@@ -77,7 +77,7 @@ case when us.id_usergroup = 'teamleader' then string_agg(stgrp.groupname,',') el
            left join (select stu.id as id_user,stu.id_staffgroup,stg.groupname from ".$schema.".staffgroups stg
 join (select id,json_array_elements_text(id_staffgroups) as id_staffgroup from public.users) stu on (stu.id_staffgroup=stg.id)) stgrp on (us.id=stgrp.id_user)
           WHERE us.isdeleted IS null ".$ugroups." group by us.id,cp.id,grp.id
-          ) xus where xschema='".$schema."' group by xus.id,xus.username,xus.groupname,xus.isblocked,xus.surname,xus.prename,xus.id_company,xus.id_usergroup,xus.company,xus.datasetname,xus.xschema,xus.staffgroups;";
+          ) xus where xschema='".$schema."' group by xus.id,xus.username,xus.groupname,xus.isblocked,xus.surname,xus.prename,xus.id_company,xus.id_usergroup,xus.company,xus.datasetname,xus.xschema,xus.staffgroups,xus.lang;";
   return $self->{db}->querysorted($ussql);
 }
 

diff --git a/app/lib/dksconfig.pm b/app/lib/dksconfig.pm
index bc0e4a4..2086bf9 100644 (file)
--- a/app/lib/dksconfig.pm
+++ b/app/lib/dksconfig.pm
@@ -11,8 +11,8 @@ our @EXPORT_OK = qw($sitecfg);
 our $sitecfg ={
   cookiename => 'potlu',
   dbtype => 'PgPP',
-  #dsn => 'DBI:PgPP:dbname=potlu2_db;host=localhost',
-  dsn => 'DBI:PgPP:dbname=potlu2_db;host=sql12.your-server.de',
+  dsn => 'DBI:PgPP:dbname=potlu2_db;host=localhost',
+  #dsn => 'DBI:PgPP:dbname=potlu2_db;host=sql12.your-server.de',
   dbuser => 'potlu2_user',
   dbpassword => 'dMY8xGB6cBLzrDGE',
   page => 'index.tt',

diff --git a/app/lib/dksdb.pm b/app/lib/dksdb.pm
index 3ca21b2..0d40d53 100644 (file)
--- a/app/lib/dksdb.pm
+++ b/app/lib/dksdb.pm
@@ -20,7 +20,7 @@ sub new {
     my $class = shift;
     my $p = shift;
     my $self = bless {}, $class;
-    $self->{debug} = 0;
+    $self->{debug} = 1;
     $self->{dbh} = DBI->connect($p->{dsn},$p->{dbuser},$p->{dbpassword},{PrintError=>1,RaiseError=>1,AutoCommit=>1})  or return "query Connection Error!".$!;
     return $self;
 }

diff --git a/app/static/css/theme.css b/app/static/css/theme.css
index 08ba912..5e3bb04 100644 (file)
--- a/app/static/css/theme.css
+++ b/app/static/css/theme.css
@@ -39,13 +39,13 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .hoverable tbody tr:hover,.ul.hoverable li:hover{background-color:#ccc}.centered tr th,.centered tr td{text-align:center}
 .table td,.table th,.table-all td,.table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
 .table th:first-child,.table td:first-child,.table-all th:first-child,.table-all td:first-child{padding-left:16px}
-.btn,.button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
-.btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
+.btn,.button{border:none;display:inline-block;padding:4px 8px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
+.btn:hover{box-shadow:0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
 .btn,.button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
 .disabled,.btn:disabled,.button:disabled{cursor:not-allowed;background-color: #e6e6e6}.disabled *,:disabled *{pointer-events:none}
 .btn.disabled:hover,.btn:disabled:hover{box-shadow:none}
 .badge,.tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.badge{border-radius:50%}
-.ul{list-style-type:none;padding:0;margin:0}.ul li{padding:8px 16px;border-bottom:1px solid #ddd}.ul li:last-child{border-bottom:none}
+.ul{list-style-type:none;padding:0;margin:0}.ul li{padding:4px 8px;border-bottom:1px solid #ddd}.ul li:last-child{border-bottom:none}
 .tooltip,.display-container{position:relative}.tooltip .text{display:none}.tooltip:hover .text{display:inline-block}
 .ripple:active{opacity:0.5}.ripple{transition:opacity 0s}
 .input{padding:6px;display:block;border: 1px solid #ccc;width:100%;background-color: #fff; }/*#e8f0fe*/
@@ -59,15 +59,15 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .sidebar{height:100%;width:160px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
 .bar-block .dropdown-hover,.bar-block .dropdown-click{width:100%}
 .bar-block .dropdown-hover .dropdown-content,.bar-block .dropdown-click .dropdown-content{min-width:100%}
-.bar-block .dropdown-hover .button,.bar-block .dropdown-click .button{width:100%;text-align:left;padding:8px 16px}
+.bar-block .dropdown-hover .button,.bar-block .dropdown-click .button{width:100%;text-align:left;padding:4px 8px}
 .main,#main{transition:margin-left .4s}
 .modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
 .modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
 .bar{width:100%}.center .bar{display:inline-block;width:auto}
-.bar .bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0}
+.bar .bar-item{padding:4px 8px;float:left;width:auto;border:none;display:block;outline:0}
 .bar .dropdown-hover,.bar .dropdown-click{position:static;float:left}
 .bar .button{white-space:normal}
-.bar-block .bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0}
+.bar-block .bar-item{width:100%;display:block;padding:4px 8px;text-align:left;border:none;white-space:normal;float:none;outline:0}
 .bar-block.center .bar-item{text-align:center}.block{display:block;width:100%}
 .responsive{display:block;overflow-x:auto}
 .container:after,.container:before,.datapanel:after,.datapanel:before,.row:after,.row:before,.row-padding:after,.row-padding:before,
@@ -141,7 +141,7 @@ hr{border:0;border-top:1px solid #eee;margin:20px 0}
 .section,.code{margin-top:16px!important;margin-bottom:16px!important}
 .margin{margin:16px!important}.margin-top{margin-top:16px!important}.margin-bottom{margin-bottom:16px!important}
 .margin-left{margin-left:16px!important}.margin-right{margin-right:16px!important}
-.padding-small{padding:4px 8px!important}.padding{padding:8px 16px!important}.padding-large{padding:12px 24px!important}
+.padding-small{padding:4px 8px!important}.padding{padding:4px 8px!important}.padding-large{padding:12px 24px!important}
 .padding-16{padding-top:16px!important;padding-bottom:16px!important}.padding-24{padding-top:24px!important;padding-bottom:24px!important}
 .padding-32{padding-top:32px!important;padding-bottom:32px!important}.padding-48{padding-top:48px!important;padding-bottom:48px!important}
 .padding-64{padding-top:64px!important;padding-bottom:64px!important}
@@ -471,45 +471,6 @@ footer
        box-sizing: border-box;
 }
 
-
-div.group_container
-{
-       background-color: #e3e3e3;
-       border-top-color: rgba(80%,80%,80%,1);
-       border-right-color: rgba(80%,80%,80%,1);
-       border-bottom-color: rgba(80%,80%,80%,1);
-       border-left-color: rgba(80%,80%,80%,1);
-       border-top-style: solid;
-       border-right-style: solid;
-       border-bottom-style: solid;
-       border-left-style: solid;
-       border-top-width: 1pt;
-       border-right-width: 1pt;
-       border-bottom-width: 1pt;
-  border-left-width: 1pt;
-  padding-top: 4px;
-  padding-bottom: 8px;
-}
-
-/* Custom Styles */
-.ListView_Default
-{
-
-       background-color: rgba(0%,0%,0%,0);
-       border-top-style: none;
-       border-right-style: none;
-       border-bottom-style: none;
-       border-left-style: none;
-
-       color: #000;
-       text-align: left;
-       margin-top: 2pt;
-       margin-right: 2pt;
-       margin-bottom: 2pt;
-       margin-left: 2pt;
-}
-
-
 button.btnNavigation 
 {
 
@@ -525,44 +486,12 @@ button.btnNavigation
        padding-left: 0pt;
 }
 
-div.PageListHeader
-{
-       border-top-color: rgba(80%,80%,80%,1);
-       border-right-color: rgba(80%,80%,80%,1);
-       border-bottom-color: rgba(80%,80%,80%,1);
-       border-left-color: rgba(80%,80%,80%,1);
-       border-top-style: solid;
-       border-right-style: solid;
-       border-bottom-style: solid;
-       border-left-style: solid;
-       border-top-width: 1pt;
-       border-right-width: 1pt;
-       border-bottom-width: 1pt;
-       border-left-width: 1pt;
-       color: #fff;
-       -fm-text-vertical-align: center;
-}
-div.PageListHeader .inner_border
-{
-       padding-top: 5pt;
-       padding-right: 5pt;
-       padding-bottom: 5pt;
-       padding-left: 5pt;
-}
-
 .moduletoolbar
 {
   background-color: #293146;
   color: #fff;
 }
 
-div.BodySectionHeader
-{
-       font-family: -fm-font-family(Arial,Arial-BoldMT);
-       font-weight: bold;
-}
-
-
 div.PageHeadTitle
 {
        font-size: 18pt;
@@ -575,157 +504,108 @@ div.SubHeadTitle
        color: #fff;
 }
 
-div.SectionHeader
-{
-
-       background-color: rgba(22.3529%,26.6667%,38.4314%,1);
-
+.toolbarbtn > .icon {
+  font-size: 16px;
 }
 
 button.toolbarbtn
 {
-  border: 0.5px solid #c6c6c6;
-       background-color: rgba(0%,0%,0%,0);
+  margin: 2px;
+  background-color:#394462!important;
+  border-radius: 2px;
+  border: 0.5px solid #c6c6c6!important;
        color: #fff;
+       font-size: 8pt!important;
 }
 button.toolbarbtn:hover
 {
-
-       background-color: #343434;
+       background-color: #343434!important;
        color: #fff;
 }
 button.toolbarbtn:pressed
 {
-
-       background-color: rgba(20.3922%,20.3922%,20.3922%,1);
+       background-color: #343434!important;
        color: #fff;
 }
 button.toolbarbtn:focus
 {
-       border-top-color: rgba(80%,80%,80%,1);
-       border-right-color: rgba(80%,80%,80%,1);
-       border-bottom-color: rgba(80%,80%,80%,1);
-       border-left-color: rgba(80%,80%,80%,1);
+       border-color: #cccccc!important;
 }
 
 
 a.toolbarbtn
 {
-  border: 0.5px solid #c6c6c6;
-       background-color: rgba(0%,0%,0%,0);
+       border-radius: 2px;
+       margin: 2px;
+       background-color:#394462!important;
+  border: 0.5px solid #c6c6c6!important;
        color: #fff;
        text-align: center;
-       text-decoration: unset;
+  text-decoration: unset;
+  font-size: 8pt!important;
 }
 a.toolbarbtn:hover
 {
-
-       background-color: rgba(20.3922%,20.3922%,20.3922%,1);
+       background-color: #343434!important;
        color: #fff;
 }
 a.toolbarbtn:pressed
 {
-       background-color: rgba(20.3922%,20.3922%,20.3922%,1);
+       background-color: #343434!important;
        color: #fff;
 }
 a.toolbarbtn:focus
 {
-       border-top-color: rgba(80%,80%,80%,1);
-       border-right-color: rgba(80%,80%,80%,1);
-       border-bottom-color: rgba(80%,80%,80%,1);
-       border-left-color: rgba(80%,80%,80%,1);
+       border-color: #cccccc!important;
 }
 
 button.bodybtn
 {
+  border-radius: 2px;
   border: 0.5px solid #c6c6c6;
-
-       background-color: rgba(0%,0%,0%,0);
-
        color: #000;
 }
 button.bodybtn:hover
 {
-
-       background-color: rgba(20.3922%,20.3922%,20.3922%,1);
+       background-color: #343434;
        color: #fff;
 }
 button.bodybtn:pressed
 {
-
-       background-color: rgba(20.3922%,20.3922%,20.3922%,1);
+       background-color: #343434;
        color: #fff;
 }
 button.bodybtn:focus
 {
-       border-top-color: rgba(80%,80%,80%,1);
-       border-right-color: rgba(80%,80%,80%,1);
-       border-bottom-color: rgba(80%,80%,80%,1);
-       border-left-color: rgba(80%,80%,80%,1);
+       border-color: #cccccc;
 }
 
 
 a.bodybtn
 {
-  border: 0.5px solid #c6c6c6;
-
-       background-color: rgba(0%,0%,0%,0);
-
+  border-radius: 2px;
        color: #000;
        text-align: center;
        text-decoration: unset;
 }
 a.bodybtn:hover
 {
-
-       background-color: rgba(20.3922%,20.3922%,20.3922%,1);
+       background-color: #343434;
        color: #fff;
 }
 a.bodybtn:pressed
 {
-       background-color: rgba(20.3922%,20.3922%,20.3922%,1);
+       background-color: #343434;
        color: #fff;
 }
 a.bodybtn:focus
 {
-       border-top-color: rgba(80%,80%,80%,1);
-       border-right-color: rgba(80%,80%,80%,1);
-       border-bottom-color: rgba(80%,80%,80%,1);
-       border-left-color: rgba(80%,80%,80%,1);
-}
-
-
-div.ListView_Header
-{
-       border-top-color: rgba(80%,80%,80%,1);
-       border-right-color: rgba(80%,80%,80%,1);
-       border-bottom-color: rgba(80%,80%,80%,1);
-       border-left-color: rgba(80%,80%,80%,1);
-       border-top-style: solid;
-       border-right-style: solid;
-       border-bottom-style: solid;
-       border-left-style: solid;
-       border-top-width: 1pt;
-       border-right-width: 1pt;
-       border-bottom-width: 1pt;
-       border-left-width: 1pt;
-       font-weight: normal;
-       color: #fff;
-       -fm-text-vertical-align: center;
-}
-div.ListView_Header .inner_border
-{
-       padding-top: 2pt;
-       padding-right: 2pt;
-       padding-bottom: 2pt;
-       padding-left: 2pt;
+       border-color: #cccccc;
 }
 
 div.toolbar
 {
-
        background-color: rgba(32.1569%,38.8235%,55.6863%,1);
-
 }
 
 div.sectiontoolbar
@@ -736,20 +616,6 @@ div.sectiontoolbar
 
 }
 
-div.FooterLabel
-{
-       color: #fff;
-}
-
-button.Buttom_BodyNav:hover
-{
-
-       background-color: rgb(141, 141, 141);
-
-       /* color: #fff; */
-}
-
-
 ::-webkit-scrollbar {
 -webkit-appearance: none;
 width: 10px;
@@ -770,10 +636,6 @@ div.portaltextheader {
        border: 1px solid white;
 }
 
-
-
-
-
 select {
   /* -webkit-appearance: none; */
   display: block;
@@ -819,34 +681,6 @@ select:focus
 div.DataFooter{
        background: #384462;
 }
-.input-sum{padding:2px;display:block;border: 1px solid #ccc;width:100%;background-color: #4D4D4D; }  
-
-
-.currency-sum {padding:2px;display:block;border: 1px solid #ccc;width:100%;background-color: #4D4D4D;}
-
-.currency-sum,.currency-sum:read-only {
-  display: block;
-  color: #fff;
-  padding: 2px;
-  padding-right: 12px;
-  width: 100%;
-  max-width: 100%; 
-  box-sizing: border-box;
-  margin: 0;
-  border: 1px solid #ccc;
-  border-radius: unset;
-  -moz-appearance: none;
-  -webkit-appearance: none;
-  appearance: none;
-  background-color: #4D4D4D;
-  background-image: url('data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20width=%22225%22%20height=%22300%22%3E%3Cpath%20fill=%22white%22%20stroke=%22none%22%20d=%22m%20224.99996,16.22698%20-8.11342,36.41161%20q%20-24.14255,-19.78892%20-54.61741,-19.78892%20-41.3588,0%20-65.00658,23.74671%20-23.647774,23.7467%20-28.397115,53.23215%20l%20134.960355,0%20-5.14505,26.71508%20-132.981532,0%20-0.395848,7.71771%200.395848,18.20566%20127.242642,0%20-5.14505,26.71508%20-117.941954,0%20q%207.519719,40.17154%2032.552754,59.06997%2025.03303,18.89844%2056.49745,18.89844%2037.20302,0%2057.98149,-19.59107%20l%200,40.9631%20Q%20192.34828,300%20162.26913,300%2053.034301,300%2030.474864,189.18206%20l%20-30.474864,0%205.738751,-26.71508%2020.580475,0%20q%20-0.395708,-4.74934%20-0.395708,-17.80995%20l%200,-8.11342%20-25.923518,0%205.738751,-26.71508%2023.152999,0%20Q%2039.181988,55.21112%2076.583149,27.60556%20113.98417,0%20163.06069,0%20199.868,0%20224.99996,16.22698%20z%22%20/%3E%3C/svg%3E');
-  background-repeat: no-repeat, repeat;
-  background-position: right 2px top 50%, 0 0;
-  background-size: 9px auto, 100%;
-}
-
-
-
 
 /* input[type=date]::-webkit-inner-spin-button, 
 input[type=date]::-webkit-outer-spin-button { 
@@ -871,10 +705,6 @@ input
   display:block;
   border-radius: unset;
 }
-/* input:focus
-{
-       border: #0070cf;
-} */
 
 input:focus {
   border: 1px solid #3a6fc3;
@@ -891,12 +721,6 @@ input[type=number]::-webkit-outer-spin-button {
   -webkit-appearance: none; 
   margin: 0; 
 }
-/* input[type=checkbox]{
-  appearance: none;
-  display:inline-block;
-  font-size: 24px!important;
-  border: 1px solid green;
-} */
 
 input[class=currency] {
   padding: 2px;
@@ -972,21 +796,6 @@ input[type="checkbox"] {
   background:rgba(255,255,255,0.3);
  }
 
- 
- body.mceContentBody { 
-  background:#e8f0fe;
-  color:#000;
-}
-
-/* .mceContentBody { 
-  background: #e8f0fe;
-  color:#000;
-} */
-
-/* .tabulator-row-even {
-  background-color: #757575;
-} */
-
 :focus {
   outline: 1px solid #607d8b;
 }

diff --git a/app/tmpl/block/dlgstaffpointages.tt b/app/tmpl/block/dlgstaffpointages.tt
index b4742ea..97cc52d 100644 (file)
--- a/app/tmpl/block/dlgstaffpointages.tt
+++ b/app/tmpl/block/dlgstaffpointages.tt
@@ -6,9 +6,9 @@
       <div class="bar-item SubHeadTitle">
         [% lbl.edittimetracks %] / <span id="dlg_stafftimetracker_staffname"></span> - <span id="dlg_stafftimetracker_date"></span>
       </div>
-      <button class="bar-item toolbarbtn right" onclick="document.getElementById('dlg_stafftimetracker').style.display='none'; return false;"><span class="icon icon-remove" style="font-size: 16px;"></span>fermer</button>
-          <button class="bar-item toolbarbtn  right" onclick="staffperiodweeks.ttadd(); return false;"><span class="icon icon-edit" style="font-size: 16px;"><br/>[% lbl.add %]</button>
-          <button class="bar-item toolbarbtn right" onclick="staffperiodweeks.ttremove();"><span class="icon icon-trash text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button>
+      <button class="bar-item toolbarbtn right" onclick="document.getElementById('dlg_stafftimetracker').style.display='none'; return false;"><span class="icon icon-remove"></span>fermer</button>
+          <button class="bar-item toolbarbtn  right" onclick="staffperiodweeks.ttadd(); return false;"><span class="icon icon-edit"><br/>[% lbl.add %]</button>
+          <button class="bar-item toolbarbtn right" onclick="staffperiodweeks.ttremove();"><span class="icon icon-trash text-red"></span>[% lbl.delete %]</button>
       </div>
     </header>
     <div class="container" style=" padding: 0; height: 400px;">

diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt
index 2a26b59..7aa6c1a 100644 (file)
--- a/app/tmpl/index.tt
+++ b/app/tmpl/index.tt
@@ -1,4 +1,4 @@
-[% appversion='1.1.6' %]
+[% appversion='1.1.7' %]
 [% minify = '' %]
 [% PROCESS "lang/${lang}.tt" %]
 <!DOCTYPE html>

diff --git a/app/tmpl/module/admin/admin.tt b/app/tmpl/module/admin/admin.tt
index fd85e53..a605283 100644 (file)
--- a/app/tmpl/module/admin/admin.tt
+++ b/app/tmpl/module/admin/admin.tt
@@ -1,15 +1,15 @@
 
 <div class="display-container">
   <div class="bar toolbar">
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+    <a class="bar-item toolbarbtn" href="[% abspath %]admin/index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
     <div class="bar-item PageHeadTitle">[% lbl.companies %]</div>
     [% IF (session.usergroup == 'admin') %]
-    <button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>[% lbl.basedata %]</button> 
-    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user" style="font-size: 16px;"></span>[% lbl.users %]</button> 
-      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package" style="font-size: 16px;"></span>Secteur</button> 
+    <button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff"></span>[% lbl.basedata %]</button> 
+    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user"></span>[% lbl.users %]</button> 
+      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package"></span>Secteur</button> 
     <div class="toolbar" id="tbar_tbl_companies">
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus"></span>[% lbl.add %]</button>
     </div>
     [% END %]
   </div>
@@ -27,9 +27,9 @@
         <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">[% lbl.sectorconfigpot %]
           </div>
-          <button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>
+          <button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus"></span>[% lbl.add %]</button>
            
         </div>
         <div id="tbl_worktimes"></div>
@@ -37,9 +37,9 @@
       <div class="panel" id="pnl_users" style="display: none;">
         <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">[% lbl.users %]</div>
-          <button class="bar-item toolbarbtn right" id="btn_delete_staffcontract" onclick="users.remove(); return false;"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-          <button class="bar-item toolbarbtn right" onclick="users.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-          <button class="bar-item toolbarbtn right" onclick="users.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>
+          <button class="bar-item toolbarbtn right" id="btn_delete_staffcontract" onclick="users.remove(); return false;"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+          <button class="bar-item toolbarbtn right" onclick="users.edit(); return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+          <button class="bar-item toolbarbtn right" onclick="users.add(); return false;"><span class="icon icon-plus"></span>[% lbl.add %]</button>
           <button class="bar-item toolbarbtn right" id="btnchangepasswd" onclick="profile.showdlgnewpassword(true); return false;"><span class="icon icon-access"></span>[% lbl.newpassword %]</button>
           <button class="bar-item toolbarbtn right" id="btnnewpasswd" onclick="users.dlgchangelogin(); return false;"><span class="icon icon-user"></span>[% lbl.changelogin %]</button>
         </div>

diff --git a/app/tmpl/module/admin/adminvacancydays.tt b/app/tmpl/module/admin/adminvacancydays.tt
index 1cf1400..810bf55 100644 (file)
--- a/app/tmpl/module/admin/adminvacancydays.tt
+++ b/app/tmpl/module/admin/adminvacancydays.tt
@@ -1,15 +1,15 @@
 
 <div class="display-container">
   <div class="bar toolbar">
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
     <div class="bar-item PageHeadTitle">[% lbl.vacancydays %]</div>
     [% IF (session.usergroup == 'admin') %]
-    <!--<button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>[% lbl.basedata %]</button> 
-    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user" style="font-size: 16px;"></span>[% lbl.users %]</button> 
-      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package" style="font-size: 16px;"></span>Secteur</button> 
+    <!--<button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff"></span>[% lbl.basedata %]</button> 
+    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user"></span>[% lbl.users %]</button> 
+      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package"></span>Secteur</button> 
     <div class="toolbar" id="tbar_tbl_companies">
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus"></span>[% lbl.add %]</button>
     </div>-->
     [% END %]
   </div>
@@ -18,9 +18,9 @@
 <div class="display-container">
     <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">[% lbl.vacancydays %]</div>
-          <!--<button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>-->
+          <!--<button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus"></span>[% lbl.add %]</button>-->
            
         </div>
         <div id="tbl_vacancydays"></div>

diff --git a/app/tmpl/module/admin/adminvacancytypes.tt b/app/tmpl/module/admin/adminvacancytypes.tt
index d49537c..8a4601d 100644 (file)
--- a/app/tmpl/module/admin/adminvacancytypes.tt
+++ b/app/tmpl/module/admin/adminvacancytypes.tt
@@ -1,14 +1,15 @@
 <div class="display-container">
   <div class="bar toolbar">
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
     <div class="bar-item PageHeadTitle">[% lbl.vacancytypes %]</div>
     [% IF (session.usergroup == 'admin') %]
-    <!--<button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>[% lbl.basedata %]</button> 
-    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user" style="font-size: 16px;"></span>[% lbl.users %]</button> 
-      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package" style="font-size: 16px;"></span>Secteur</button> 
+    <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus"></span>[% lbl.add %]</button>
+    <!--<button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff"></span>[% lbl.basedata %]</button> 
+    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user"></span>[% lbl.users %]</button> 
+      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package"></span>Secteur</button> 
     <div class="toolbar" id="tbar_tbl_companies">
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+        
     </div>-->
     [% END %]
   </div>
@@ -17,13 +18,59 @@
 <div class="display-container">
     <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">[% lbl.vacancytypes %]</div>
-          <!--<button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>-->
+          <!--<button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus"></span>[% lbl.add %]</button>-->
            
         </div>
         <div id="tbl_vacancytypes"></div>
 </div>
-<script type="text/javascript" src="admin/vacancytypes[% minify%].js?v=[% appversion %]"></script>
+<div id="dlgvacancytype" class="modal">
+
+  <div class="modal-content animate-top card-4">
+    <header> 
+      <span onclick="document.getElementById('dlgvacancytype').style.display='none'; return false;" 
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
+      <h2 id="dlgvacancytype_title">Ajouter/éditer Congé Type</h2>
+    </header>
+    <div class="container">
+      <form id="frm_vacancytypes">
+        <input type="hidden" class="data_vacancytypes" id="vacancytypes_id" data-id="" data-column="id" data-table="vacancytypes" />
+          <div class="container">
+            <div class="cell-row">
+              <div class="cell" style="width: 40px;">
+                <input class="check data_vacancytypes" id="vacancytypes_isworktime" data-column="isworktime" data-table="vacancytypes" data-id="" value="" type="checkbox" />
+              </div>
+              <div class="cell"> est payé</div>
+            </div>
+          </div>
+          <div class="container">
+            <div class="cell-row">
+              <div class="cell" style="width: 40px;">
+                <input class="check data_vacancytypes" id="vacancytypes_isfreetime" data-column="isfreetime" data-table="vacancytypes" data-id="" value="" type="checkbox" />
+              </div>
+              <div class="cell"> ne doit pas être présent au travail</div>
+            </div>
+          </div>
+        <div class="container">
+          <label class="label" for="vacancytypes_vacancyname">Nom</label>
+          <input class="input border text data_vacancytypes" data-column="vacancyname" data-id="" data-table="vacancytypes" id="vacancytypes_vacancyname" type="text">
+        </div>
+        <div class="container">
+          <label class="label" for="vacancytypes_color">Couleur</label>
+          <input class="input border text data_vacancytypes" data-column="color" data-id="" data-table="vacancytypes" id="vacancytypes_color" type="text">
+        </div>
+        <div class="container">
+          <label class="label" for="vacancytypes_legend">legende</label>
+          <input class="input border text data_vacancytypes" data-column="legend" data-id="" data-table="vacancytypes" id="vacancytypes_legend" size="1" type="text">
+        </div>
+      </form>
+    </div>
+    <footer>
+    <button class="button actionbtn margin-right border" onclick="document.getElementById('dlgmessage').style.display='none'; return false;">[% lbl.ok %]</button>  
+    </footer>
+  </div>
+</div>
+<script type="text/javascript" src="vacancytypes[% minify%].js?v=[% appversion %]"></script>
 [% END %]
 

diff --git a/app/tmpl/module/admin/dlg_users.tt b/app/tmpl/module/admin/dlg_users.tt
index 9e96e30..443a8a0 100644 (file)
--- a/app/tmpl/module/admin/dlg_users.tt
+++ b/app/tmpl/module/admin/dlg_users.tt
@@ -9,63 +9,65 @@
       <form id="frm_users" name="frm_users">
         <input type="hidden" class="data_users" id="id_users" name="ident_users_id_users" value="" data-column="id" data-table="users">
         <div class="row">
-            <div class="cell" style="width: 300px;">
-              <input type="text" class="input  data_users" id="username" data-column="username"  data-table="users" data-id="" name="users_username" value=""/>
-        <label for="users_username" class="label">[% lbl.username %]</label>
-            </div>
+          <div class="container half">
+            <label for="users_username" class="label">[% lbl.username %]</label>
+            <input type="text" class="input  data_users" id="username" data-column="username"  data-table="users" data-id="" name="users_username" value=""/>
+          </div>
+          <div class="container quarter">
+            <label for="" class="label">&nbsp;</label>
             <div class="cell" style="margin-left: 10px;width: 50px;">
               <input class="check  data_users " id="isblocked" name="users_isblocked" data-column="isblocked"  data-table="users" data-id="" value="1" type="checkbox"  >
-              
             </div>
             <div class="cell" style="width: 120px;">[% lbl.accessblocked %]</div>
-         </div>   
+          </div>
+          <div class="container quarter">
+            <label for="users_lang" class="label ">[% lbl.language %]</label>
+            <select class="select data_users" id="lang" data-column="lang"  data-table="users" data-id="" value="" name="users_lang">
+              <option value="fr">français</option>
+              <option value="de">deutsch</option>
+            </select>
+          </div>
+        </div>   
         <div class="row">
-            <div class="cell" style="width: 250px;">
-              <input type="text" class="input  data_users  " id="surname" data-column="surname"  data-table="users" data-id="" name="users_surname" value=""   />
-        <label for="users_surname" class="label">[% lbl.name %]</label>
-            </div>
-            <div class="cell" style="width: 250px;">
-              <input type="text" class="input  data_users  " id="prename" data-column="prename"  data-table="users" data-id="" name="users_prename" value=""   />
-        <label for="users_prename" class="label">[% lbl.prename %]</label>
-            </div>
+          <div class="container half">
+            <label for="users_prename" class="label">[% lbl.prename %]</label>
+            <input type="text" class="input  data_users  " id="prename" data-column="prename"  data-table="users" data-id="" name="users_prename" value=""   />
+          </div>
+          <div class="container half">
+            <label for="users_surname" class="label">[% lbl.name %]</label>
+            <input type="text" class="input  data_users  " id="surname" data-column="surname"  data-table="users" data-id="" name="users_surname" value=""   />
           </div>
+        </div>
+        <div class="row" class="margin-top: 10px;">
+          <div class="bar moduletoolbar">
+            <div class="bar-item SubHeadTitle">[% lbl.useraccess %]</div>
+          </div>
+        </div>
         <div class="row">
-            <div class="bar moduletoolbar">
-              <div class="bar-item SubHeadTitle">
-                [% lbl.useraccess %]
-              </div>
-            </div>
+          <div class="container">
+            <label for="users_id_company" class="label ">[% lbl.company %]</label>
+            <select class="select data_users " id="id_company" data-column="id_company"  data-table="users" data-id="" value="" name="users_id_company"></select>
           </div>
-        <div class="row" style="margin-top: 5px;">
-            <div class="cell" style="width: 250px;">
-              <select class="select data_users " id="id_company" data-column="id_company"  data-table="users" data-id="" value="" name="users_id_company"  >
-        </select>
-        <label for="users_id_company" class="label ">[% lbl.company %]</label>
-            </div>
-            <div class="cell" style="width: 250px;">
-               <select class="select data_users " id="id_usergroup" data-column="id_usergroup"  data-table="users" data-id="" value="" name="users_id_usergroup"  >
-        </select>
-        <label for="users_id_usergroup" class="label ">[% lbl.staffgroupaccess %]</label>
-            </div>
-            </div>
-        <div class="row" style="margin-top: 5px;">
-            <div class="cell">
-              <select class="select data_users " id="schemaaccess" data-selected=""  data-column="schemaaccess"  data-table="users" data-id="" multiple value="" name="users_schemaaccess"  >
-        </select>
-        <label for="users_schemaaccess" class="label">[% lbl.datasetaccess %]</label>
-            </div>
+          <div class="container">
+            <label for="users_id_usergroup" class="label ">[% lbl.staffgroupaccess %]</label>
+            <select class="select data_users " id="id_usergroup" data-column="id_usergroup"  data-table="users" data-id="" value="" name="users_id_usergroup"></select>
           </div>
-          <div class="row" style="margin-top: 5px;">
-            <div class="cell">
-              <select class="select data_users " id="user_id_staffgroups" data-selected=""  data-column="id_staffgroups"  data-table="users" data-id="" multiple value="" name="users_id_staffgroups"  >
-        </select>
-        <label for="users_id_staffgroups" class="label">[% lbl.departmentaccess %]</label>
-            </div>
+        </div>
+        <div class="row">
+          <div class="container">
+            <label for="users_schemaaccess" class="label">[% lbl.datasetaccess %]</label>
+            <select class="select data_users " id="schemaaccess" data-selected=""  data-column="schemaaccess"  data-table="users" data-id="" multiple value="" name="users_schemaaccess"></select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="container">
+            <label for="users_id_staffgroups" class="label">[% lbl.departmentaccess %]</label>
+            <select class="select data_users " id="user_id_staffgroups" data-selected=""  data-column="id_staffgroups"  data-table="users" data-id="" multiple value="" name="users_id_staffgroups"></select>
           </div>
+        </div>
       </form>
     </div>
     <footer>
-      
       <button class="button margin-right border theme-light" onclick="document.getElementById('dlg_users').style.display='none'; return false;"><span class="icon icon-remove"></span>[% lbl.cancel %]</button> 
       <button class="button actionbtn margin-right border" onclick="users.validateform();"><span class="icon-Save"></span>[% lbl.save %]</button>
     </footer>

diff --git a/app/tmpl/module/admin/index.tt b/app/tmpl/module/admin/index.tt
index 5af04f2..bcfe205 100644 (file)
--- a/app/tmpl/module/admin/index.tt
+++ b/app/tmpl/module/admin/index.tt
@@ -1,7 +1,7 @@
 <div class="display-container" >\r
       \r
   <div class="bar border-bottom toolbar" id="toolbar">\r
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>\r
+    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>\r
       <div class="bar-item PageHeadTitle hide-small">[% lbl.administration %]</div>\r
       \r
       \r

diff --git a/app/tmpl/module/admin/sectors.tt b/app/tmpl/module/admin/sectors.tt
index c4d69c6..de0f6f1 100644 (file)
--- a/app/tmpl/module/admin/sectors.tt
+++ b/app/tmpl/module/admin/sectors.tt
@@ -1,15 +1,15 @@
 
 <div class="display-container">
   <div class="bar toolbar">
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
     <div class="bar-item PageHeadTitle">[% lbl.sectorconfig %]</div>
     [% IF (session.usergroup == 'admin') %]
-    <!--<button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>[% lbl.basedata %]</button> 
-    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user" style="font-size: 16px;"></span>[% lbl.users %]</button> 
-      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package" style="font-size: 16px;"></span>Secteur</button> 
+    <!--<button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff"></span>[% lbl.basedata %]</button> 
+    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user"></span>[% lbl.users %]</button> 
+      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package"></span>Secteur</button> 
     <div class="toolbar" id="tbar_tbl_companies">
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus"></span>[% lbl.add %]</button>
     </div>-->
     [% END %]
   </div>
@@ -20,9 +20,9 @@
           <div class="bar-item SubHeadTitle">
             [% lbl.sectorconfigpot %]
           </div>
-          <!--<button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button> 
-          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button>-->
+          <!--<button class="bar-item toolbarbtn right" onclick="worktimes.remove(); return false;" id="btn_delete_staffcontract"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button> 
+          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus"></span>[% lbl.add %]</button>-->
            
         </div>
         <div id="tbl_sectors"></div>

diff --git a/app/tmpl/module/admin/users.js b/app/tmpl/module/admin/users.js
index b4af9b3..db574aa 100644 (file)
--- a/app/tmpl/module/admin/users.js
+++ b/app/tmpl/module/admin/users.js
@@ -4,7 +4,7 @@ let users ={
   tbl: null,
   current_user: "[% session.id %]",
   edit: null, 
-  choices:{"schemaaccess":null,"user_id_staffgroups":null,"id_company":null,"id_usergroup":null},
+  choices:{"schemaaccess":null,"user_id_staffgroups":null,"id_company":null,"id_usergroup":null,"lang":null},
   initform: function(){
     users.choices["id_company"] = new SlimSelect({
       select: "#id_company",
@@ -14,7 +14,10 @@ let users ={
       select: "#id_usergroup",
       showSearch: false
     }); 
-
+    users.choices["lang"] = new SlimSelect({
+      select: "#lang",
+      showSearch: false
+    }); 
     users.choices["schemaaccess"] = new SlimSelect({
       select: "#schemaaccess",
       showSearch: false
@@ -41,7 +44,7 @@ let users ={
     {title:"[% lbl.username %]", field:"username"},
     {title:"[% lbl.usergroup %]", field:"groupname"},
     {title:"[% lbl.departmentaccess %]",field:"staffgroups"},
-    {title:"[% lbl.language %]",field:"language"},
+    {title:"[% lbl.language %]",field:"lang"},
     {title:"Bloqué", field:"isblocked",formatter:"tickCross",hozAlign:"center", 
      formatterParams:{allowEmpty:true,allowTruthy:true,tickElement:'<span style="color: red;">&#10004;</span>'}},
     ],

diff --git a/app/tmpl/module/admin/vacancytypes.js b/app/tmpl/module/admin/vacancytypes.js
index af9b562..fbc2282 100644 (file)
--- a/app/tmpl/module/admin/vacancytypes.js
+++ b/app/tmpl/module/admin/vacancytypes.js
@@ -24,7 +24,7 @@ let vacancytypes ={
       columns:[
         {title:"Type",field:"vacancytype",headerFilter:"input"},
         {title:"[% lbl.name %]",field:"vacancyname",headerFilter:"input"},
-        {title:"Couleur",field:"color"},
+        {title:"Couleur",field:"color",formatter:colorFormatter},
         {title:"Legende",field:"legend"}
       ]
     });
@@ -36,7 +36,7 @@ let vacancytypes ={
     });
   },
   add: function(){
-
+    postData("db.cgi",{"fn":""})
   },
   confirmremove: function(){
 
@@ -65,3 +65,10 @@ let vacancytypes ={
   },
 
 }
+
+let colorFormatter = function(cell, formatterParams){
+  if (cell.getValue() != "") {
+    cell.getElement().style.backgroundColor=cell.getValue();
+  }
+  return cell.getValue();
+};
\ No newline at end of file

diff --git a/app/tmpl/module/company.tt b/app/tmpl/module/company.tt
index ee2bce8..af903d2 100644 (file)
--- a/app/tmpl/module/company.tt
+++ b/app/tmpl/module/company.tt
@@ -1,9 +1,9 @@
 <div class="display-container">
   <div class="bar toolbar">
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
     <div class="bar-item PageHeadTitle">[% lbl.company %]</div>
-    <button class="bar-item toolbarbtn" onclick="company.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>[% lbl.basedata %]</button> 
-    <button class="bar-item toolbarbtn" onclick="users.gettbldata();company.setview('users');"><span class="icon icon-user" style="font-size: 16px;"></span>[% lbl.users %]</button> 
+    <button class="bar-item toolbarbtn" onclick="company.setview('basedata');"><span class="icon icon-staff"></span>[% lbl.basedata %]</button> 
+    <button class="bar-item toolbarbtn" onclick="users.gettbldata();company.setview('users');"><span class="icon icon-user"></span>[% lbl.users %]</button> 
   </div>
 </div>
 <div class="display-container">

diff --git a/app/tmpl/module/periods.tt b/app/tmpl/module/periods.tt
index d00c254..402cd87 100644 (file)
--- a/app/tmpl/module/periods.tt
+++ b/app/tmpl/module/periods.tt
@@ -2,20 +2,20 @@
 
 <div class="display-container">
     <div class="bar toolbar">
-     <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+     <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
       <div class="bar-item PageHeadTitle">[% lbl.refperiods %]</div>
       <div class="toolbar paneltoolbar" id="tlb_periods">
-      <button class="bar-item toolbarbtn  right" onclick="reportperiod.add();return false;"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button> 
-      <button class="bar-item toolbarbtn right" onclick="reportperiod.editplan();return false;"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-       <button class="bar-item toolbarbtn right" onclick="reportperiod.generatereport();return false;"><span class="icon icon-pdf" style="font-size: 16px;"></span>[% lbl.pdf %]</button>
+      <button class="bar-item toolbarbtn  right" onclick="reportperiod.add();return false;"><span class="icon icon-plus"></span>[% lbl.add %]</button> 
+      <button class="bar-item toolbarbtn right" onclick="reportperiod.editplan();return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+       <button class="bar-item toolbarbtn right" onclick="reportperiod.generatereport();return false;"><span class="icon icon-pdf"></span>[% lbl.pdf %]</button>
       [% IF session.usergroup == 'admin' %]
-      <button class="bar-item toolbarbtn right red" onclick="reportperiod.datarefresh();return false;"><span class="icon icon-datarefresh" style="font-size: 16px;"></span>actualiser</button>
+      <button class="bar-item toolbarbtn right red" onclick="reportperiod.datarefresh();return false;"><span class="icon icon-datarefresh"></span>actualiser</button>
       [% END %]
       [% IF session.usergroup != 'teamleader' %]
-      <button class="bar-item toolbarbtn right" onclick="periodvalidation.showdlg();return false;"><span class="icon icon-pay" style="font-size: 16px;"></span>[% lbl.finalstatement %]</button>
+      <button class="bar-item toolbarbtn right" onclick="periodvalidation.showdlg();return false;"><span class="icon icon-pay"></span>[% lbl.finalstatement %]</button>
       [% END %]
-  <!--<button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button>
-  <button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon icon-edit" style="font-size: 16px;">[% lbl.edit %]</button>-->
+  <!--<button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button>
+  <button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon icon-edit">[% lbl.edit %]</button>-->
     </div>
   </div>
 </div>
@@ -33,7 +33,7 @@
       </div>
       <div class="panel" id="pnl_staffperiodweeks" style="display: none;">
         <div class="bar moduletoolbar">
-          <button class="bar-item toolbarbtn" onclick="reportperiod.setview('periods'); return false;"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</button>
+          <button class="bar-item toolbarbtn" onclick="reportperiod.setview('periods'); return false;"><span class="icon icon-back"></span>[% lbl.back %]</button>
           <div class="bar-item SubHeadTitle" id="periodtitle" style="display: none;"></div>
           <div class="bar-item SubHeadTitle" id="stafftitle"></div>
           [% INCLUDE module/periods/tlb_staffperiodweeks.tt %]

diff --git a/app/tmpl/module/periods/tlb_staffperiodweeks.tt b/app/tmpl/module/periods/tlb_staffperiodweeks.tt
index 5a2dfca..4aaf37c 100644 (file)
--- a/app/tmpl/module/periods/tlb_staffperiodweeks.tt
+++ b/app/tmpl/module/periods/tlb_staffperiodweeks.tt
@@ -1,8 +1,8 @@
-<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edittimetracker(); return false;"><span class="icon icon-usertime" style="font-size: 16px;"></span>[% lbl.timetracks %]</button>
+<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edittimetracker(); return false;"><span class="icon icon-usertime"></span>[% lbl.timetracks %]</button>
 <span id="tbl_editweeks">
-<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.copy(); return false;"><span class="icon icon-copy" style="font-size: 16px;"></span>[% lbl.copy %]</button>
-<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.paste(); return false;"><span class="icon icon-paste" id="spwpasteval" style="font-size: 16px;"></span>[% lbl.paste %]</button>
-<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.clean(); return false;"><span class="icon icon-erase" style="font-size: 16px;"></span>[% lbl.clean %]</button>
-<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.replacedlg(); return false;"><span class="icon icon-replace" style="font-size: 16px;"></span>[% lbl.changetemplate %]</button>
+<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edit(); return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.copy(); return false;"><span class="icon icon-copy"></span>[% lbl.copy %]</button>
+<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.paste(); return false;"><span class="icon icon-paste" id="spwpasteval"></span>[% lbl.paste %]</button>
+<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.clean(); return false;"><span class="icon icon-erase"></span>[% lbl.clean %]</button>
+<button class="bar-item toolbarbtn right" onclick="staffperiodweeks.replacedlg(); return false;"><span class="icon icon-replace"></span>[% lbl.changetemplate %]</button>
 <span>

diff --git a/app/tmpl/module/staff.tt b/app/tmpl/module/staff.tt
index f72bdbf..098af96 100644 (file)
--- a/app/tmpl/module/staff.tt
+++ b/app/tmpl/module/staff.tt
@@ -1,15 +1,15 @@
 
 <div class="display-container">
   <div class="bar toolbar">
-   <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+   <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
     <div class="bar-item PageHeadTitle">[% lbl.staff %]</div>
-    <button class="bar-item toolbarbtn" onclick="staff.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>[% lbl.basedata %]</button>
-    <button class="bar-item toolbarbtn" onclick="staff.setview('periods');"><span class="icon icon-calendar" style="font-size: 16px;"></span>[% lbl.periods %]</button>
+    <button class="bar-item toolbarbtn" onclick="staff.setview('basedata');"><span class="icon icon-staff"></span>[% lbl.basedata %]</button>
+    <button class="bar-item toolbarbtn" onclick="staff.setview('periods');"><span class="icon icon-calendar"></span>[% lbl.periods %]</button>
     [% IF session.usergroup != 'teamleader' %]
     <div class="toolbar paneltoolbar" id="tlb_basedata">
-      <button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button>
-      <!--<button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon icon-edit" style="font-size: 16px;"><br/>[% lbl.edit %]</button>-->
-      <button class="bar-item toolbarbtn  right" onclick="staff.add();"><span class="icon icon-plus" style="font-size: 16px;"><br/>[% lbl.add %]</button> 
+      <button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button>
+      <!--<button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon icon-edit"><br/>[% lbl.edit %]</button>-->
+      <button class="bar-item toolbarbtn  right" onclick="staff.add();"><span class="icon icon-plus"></span>[% lbl.add %]</button> 
     </div>
     [% END %]
     <div class="toolbar paneltoolbar" id="tlb_periods">
@@ -28,15 +28,15 @@
 <div id="pnl_periods" class="panel" style="display: none;">
   <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">[% lbl.refperiods %]</div>
-          <button class="bar-item toolbarbtn  right" id="btnstaffeditperiod" onclick="staffperiods.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"><br/>[% lbl.edit %]</button>
-          <button class="bar-item toolbarbtn right" onclick="staffperiods.generatereport();"><span class="icon icon-pdf" style="font-size: 16px;"></span>[% lbl.pdf %]</button>
+          <button class="bar-item toolbarbtn  right" id="btnstaffeditperiod" onclick="staffperiods.edit(); return false;"><span class="icon icon-edit"><br/>[% lbl.edit %]</button>
+          <button class="bar-item toolbarbtn right" onclick="staffperiods.generatereport();"><span class="icon icon-pdf"></span>[% lbl.pdf %]</button>
         </div>
   <div id="tbl_staffperiods" ></div>
   <div id="tbl_spsplitted" style="display: none;"></div>
 </div>
 <div id="pnl_staffperiodweeks" class="panel" style="display: none;">
   <div class="bar moduletoolbar">
-          <button class="bar-item toolbarbtn" onclick="staff.setview('periods'); return false;"><span class="icon icon-back" style="font-size: 16px;"><br/>[% lbl.back %]</button>
+          <button class="bar-item toolbarbtn" onclick="staff.setview('periods'); return false;"><span class="icon icon-back"><br/>[% lbl.back %]</button>
           <div class="bar-item SubHeadTitle" id="periodtitle"></div>
           <div class="bar-item SubHeadTitle" id="stafftitle" style="display: none;"></div>
           [% INCLUDE module/periods/tlb_staffperiodweeks.tt %]

diff --git a/app/tmpl/module/staff/pnl_basedata.tt b/app/tmpl/module/staff/pnl_basedata.tt
index 9b1e459..fd22af9 100644 (file)
--- a/app/tmpl/module/staff/pnl_basedata.tt
+++ b/app/tmpl/module/staff/pnl_basedata.tt
@@ -105,12 +105,12 @@
 <div class="bar moduletoolbar">
     <div class="bar-item SubHeadTitle">[% lbl.contractdata %]</div>
     [% IF session.usergroup != 'teamleader' %]
-      <button class="bar-item toolbarbtn right" id="btn_delete_staffcontract" onclick="staffcontract.remove(); return false;"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button>
-      <button class="bar-item toolbarbtn  right" onclick="staffcontract.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"><br/>[% lbl.edit %]</button>
-      <button class="bar-item toolbarbtn right"  onclick="staffcontract.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;"><br/>[% lbl.add %]</button> 
+      <button class="bar-item toolbarbtn right" id="btn_delete_staffcontract" onclick="staffcontract.remove(); return false;"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button>
+      <button class="bar-item toolbarbtn  right" onclick="staffcontract.edit(); return false;"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+      <button class="bar-item toolbarbtn right"  onclick="staffcontract.add(); return false;"><span class="icon icon-plus"></span>[% lbl.add %]</button> 
       
       [% END %]
-      <button class="bar-item toolbarbtn right"  onclick="staffcontract.updateStaffContractDays(); return false;"><span class="icon icon-week" style="font-size: 16px;"><br/>[% lbl.renewperiods %]</button> 
+      <button class="bar-item toolbarbtn right"  onclick="staffcontract.updateStaffContractDays(); return false;"><span class="icon icon-week"></span>[% lbl.renewperiods %]</button> 
       </div>
      
         <div id="tbl_staffcontract" ></div>

diff --git a/app/tmpl/module/timetrackers.tt b/app/tmpl/module/timetrackers.tt
index 769c3a3..b182744 100644 (file)
--- a/app/tmpl/module/timetrackers.tt
+++ b/app/tmpl/module/timetrackers.tt
@@ -1,13 +1,13 @@
 <div class="display-container">\r
   <div class="bar toolbar">\r
-   <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>\r
+   <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>\r
     <div class="bar-item PageHeadTitle">[% lbl.timetrackers %]</div>\r
     [% IF session.usergroup == 'admin' %]\r
-      <button class="bar-item toolbarbtn  right" onclick="timetracker.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button>\r
+      <button class="bar-item toolbarbtn  right" onclick="timetracker.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button>\r
       \r
-      <button class="bar-item toolbarbtn  right" onclick="timertracker.add();"><span class="icon icon-plus" style="font-size: 16px;"><br/>[% lbl.add %]</button> \r
+      <button class="bar-item toolbarbtn  right" onclick="timertracker.add();"><span class="icon icon-plus"><br/>[% lbl.add %]</button> \r
     [% END %]\r
-    <!-- <button class="bar-item toolbarbtn  right" onclick="timertracker.edit();"><span class="icon icon-edit" style="font-size: 16px;"><br/>[% lbl.edit %]</button> -->\r
+    <!-- <button class="bar-item toolbarbtn  right" onclick="timertracker.edit();"><span class="icon icon-edit"><br/>[% lbl.edit %]</button> -->\r
   </div>\r
 </div>\r
 <div class="display-container">\r

diff --git a/app/tmpl/module/workplans.tt b/app/tmpl/module/workplans.tt
index dfa764a..d4647f1 100644 (file)
--- a/app/tmpl/module/workplans.tt
+++ b/app/tmpl/module/workplans.tt
@@ -1,12 +1,12 @@
 <div class="display-container">
 <div class="bar toolbar">
-      <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
+      <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back"></span>[% lbl.back %]</a>
       <div class="bar-item PageHeadTitle">[% lbl.weekytemplates %]</div>
       <div class="toolbar" id="tbar_tbl_workplans">
-  <button class="bar-item toolbarbtn right" onclick="workplans.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>[% lbl.delete %]</button>
-  <button class="bar-item toolbarbtn right" onclick="workplans.duplicate();"><span class="icon icon-duplicate" style="font-size: 16px;"></span>[% lbl.duplicate %]</button>
-  <button class="bar-item toolbarbtn right" onclick="workplans.add();"><span class="icon icon-plus" style="font-size: 16px;"></span>[% lbl.add %]</button> 
-  <button class="bar-item toolbarbtn right" onclick="workplans.rename();"><span class="icon icon-rename" style="font-size: 16px;"></span>[% lbl.rename %]</button> 
+  <button class="bar-item toolbarbtn right" onclick="workplans.remove();"><span class="icon icon-remove text-red"></span>[% lbl.delete %]</button>
+  <button class="bar-item toolbarbtn right" onclick="workplans.duplicate();"><span class="icon icon-duplicate"></span>[% lbl.duplicate %]</button>
+  <button class="bar-item toolbarbtn right" onclick="workplans.add();"><span class="icon icon-plus"></span>[% lbl.add %]</button> 
+  <button class="bar-item toolbarbtn right" onclick="workplans.rename();"><span class="icon icon-rename"></span>[% lbl.rename %]</button> 
 </div>
 <div class="toolbar" id="tbar_frm_staff" style="display: none;">
 </div>
@@ -22,9 +22,9 @@
       <div class="panel" id="pnl_workplans" style="display: none;">
         <div class="bar moduletoolbar">
           <div class="bar-item PageHeadTitle">[% lbl.template %]</div>
-            <button class="bar-item toolbarbtn right" onclick="workplans.edit();"><span class="icon icon-edit" style="font-size: 16px;"></span>[% lbl.edit %]</button>
-            <button class="bar-item toolbarbtn right" onclick="workplans.setcopyday();"><span class="icon icon-copy" style="font-size: 16px;"></span>[% lbl.copy %]</button>
-            <button class="bar-item toolbarbtn right" onclick="workplans.pasteday();"><span class="icon icon-paste" id="pasteday" style="font-size: 16px;"></span>[% lbl.paste %]</button>
+            <button class="bar-item toolbarbtn right" onclick="workplans.edit();"><span class="icon icon-edit"></span>[% lbl.edit %]</button>
+            <button class="bar-item toolbarbtn right" onclick="workplans.setcopyday();"><span class="icon icon-copy"></span>[% lbl.copy %]</button>
+            <button class="bar-item toolbarbtn right" onclick="workplans.pasteday();"><span class="icon icon-paste" id="pasteday"></span>[% lbl.paste %]</button>
         </div>
         <div id="tbl_workplandata"></div>
       </div>