gl design changes actionbtn

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 342a308..aaf7c79 100644 (file)
--- 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 bbda57e..c2a3746 100644 (file)
--- 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 3d9dfa9..94e815a 100644 (file)
--- a/webapp/tmpl/block/dlgaction.tt
+++ b/webapp/tmpl/block/dlgaction.tt
@@ -4,7 +4,7 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlgaction').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="dlgaction_title"></h2>
     </header>
     <div class="container">
@@ -14,8 +14,8 @@
         [% fieldhidden("dlgparams","action",'','') %]
     </div>
     <footer>
-    <button class="button theme-light margin-right border" onclick="document.getElementById('dlgaction').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-    <button class="button red margin-right border" id="btnaction" onclick="action_confirmed();">Oui</button>  
+    <button class="button theme-light margin-right border" onclick="document.getElementById('dlgaction').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+    <button class="button actionbtn margin-right border" id="btnaction" onclick="action_confirmed();">Oui</button>  
     </footer>
   </div>
 </div>

diff --git a/webapp/tmpl/block/dlgdeleterow.tt b/webapp/tmpl/block/dlgdeleterow.tt
index 1a18542..9ea5b62 100644 (file)
--- a/webapp/tmpl/block/dlgdeleterow.tt
+++ b/webapp/tmpl/block/dlgdeleterow.tt
@@ -4,7 +4,7 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlgdeleterow').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="dlgdelete_title">Supprimer</h2>
     </header>
     <div class="container">
@@ -14,7 +14,7 @@
         [% fieldhidden("dlgdelrowid","delete",'','') %]
     </div>
     <footer>
-    <button class="button theme-light margin-right border" onclick="document.getElementById('dlgdeleterow').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
+    <button class="button theme-light margin-right border" onclick="document.getElementById('dlgdeleterow').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
     <button class="button red margin-right border" onclick="deleterow_confirmed();">Supprimer</button>  
     </footer>
   </div>

diff --git a/webapp/tmpl/block/dlgmessage.tt b/webapp/tmpl/block/dlgmessage.tt
index 2e0bb57..84aae52 100644 (file)
--- a/webapp/tmpl/block/dlgmessage.tt
+++ b/webapp/tmpl/block/dlgmessage.tt
@@ -3,14 +3,14 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlgmessage').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="dlgmessage_title"></h2>
     </header>
     <div class="container">
       <div id="dlgmessage_text"></div>
     </div>
     <footer>
-    <button class="button blue-grey margin-right border" onclick="document.getElementById('dlgmessage').style.display='none'; return false;">OK</button>  
+    <button class="button actionbtn margin-right border" onclick="document.getElementById('dlgmessage').style.display='none'; return false;">OK</button>  
     </footer>
   </div>
 </div>

diff --git a/webapp/tmpl/block/dlgreport.tt b/webapp/tmpl/block/dlgreport.tt
index 81af586..2a371b6 100644 (file)
--- a/webapp/tmpl/block/dlgreport.tt
+++ b/webapp/tmpl/block/dlgreport.tt
@@ -3,7 +3,7 @@
   <div class="modal-content animate-top card-4">
     <header>
     <span onclick="document.getElementById('dlgreport').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="dlgreport_title">Selectionner un modèle</h2>
     </header>
     <div class="container">
@@ -12,7 +12,7 @@
       </div>
     </div>
     <footer>
-    <button class="button theme-light margin-right border" onclick="document.getElementById('dlgreport').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
+    <button class="button theme-light margin-right border" onclick="document.getElementById('dlgreport').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
       
     </footer>
   </div>

diff --git a/webapp/tmpl/block/dlgstaffpayedhours.tt b/webapp/tmpl/block/dlgstaffpayedhours.tt
index 8bcdc25..8b256ae 100644 (file)
--- a/webapp/tmpl/block/dlgstaffpayedhours.tt
+++ b/webapp/tmpl/block/dlgstaffpayedhours.tt
@@ -2,7 +2,7 @@
     <div id="dlg_rppayedhours" class="modal">
       <div class="modal-content animate-top card-4">
         <header class="moduletoolbar">
-          <span onclick="document.getElementById('dlg_rppayedhours').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+          <span onclick="document.getElementById('dlg_rppayedhours').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
           <h2 id="dlg_rppayedhours">Heures Payés</h2>
         </header>
         <div class="container">
@@ -19,8 +19,8 @@
         </form>
       </div>
       <footer>
-        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_rppayedhours').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-        <button class="button blue-grey margin-right border" id="btn_savepayedhours" onclick="reportperiod.savepayedhours();return false;"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>
+        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_rppayedhours').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+        <button class="button actionbtn margin-right border" id="btn_savepayedhours" onclick="reportperiod.savepayedhours();return false;"><span class="icon icon-Save"></span>&nbsp;Sauvegarder</button>
       </footer>
     </div>
   </div>

diff --git a/webapp/tmpl/block/dlgstaffperioddays.tt b/webapp/tmpl/block/dlgstaffperioddays.tt
index 4f910b3..f543106 100644 (file)
--- a/webapp/tmpl/block/dlgstaffperioddays.tt
+++ b/webapp/tmpl/block/dlgstaffperioddays.tt
@@ -3,7 +3,7 @@
     <div id="dlg_staffreportperioddays" class="modal">
       <div class="modal-content animate-top card-4">
         <header>
-          <span onclick="document.getElementById('dlg_staffreportperioddays').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+          <span onclick="document.getElementById('dlg_staffreportperioddays').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
           <h2 id="dlg_staffreportperioddays_title">Editer Jour</h2>
         </header>
         <div class="container">
@@ -51,8 +51,8 @@
         </form>
       </div>
       <footer>
-        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_staffreportperioddays').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-        <button class="button blue-grey margin-right border" id="btn_saveday" onclick="staffperiodweeks.save();return false;"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>
+        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_staffreportperioddays').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+        <button class="button actionbtn margin-right border" id="btn_saveday" onclick="staffperiodweeks.save();return false;"><span class="icon icon-Save"></span>&nbsp;Sauvegarder</button>
       </footer>
     </div>
   </div>

diff --git a/webapp/tmpl/block/dlguploadfile.tt b/webapp/tmpl/block/dlguploadfile.tt
index 0ced383..532defb 100644 (file)
--- a/webapp/tmpl/block/dlguploadfile.tt
+++ b/webapp/tmpl/block/dlguploadfile.tt
@@ -3,7 +3,7 @@
   <div class="modal-content animate-top card-4">
     <header class="SubHeadTitle"> 
       <span onclick="document.getElementById('dlguploadfile').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="dlgpublish_title">Fichier eroplueden</h2>
     </header>
     <div class="container">
@@ -18,7 +18,7 @@
     <button class="button theme-light margin-right border" onclick="document.getElementById('dlguploadfile').style.display='none'; return false;">Oofbriechen</button>
  <div class="container right-align">
 
-        <button class="button blue-grey margin" onclick="savefileform('uploadfile');return false;">télécharger</button>
+        <button class="button actionbtn margin" onclick="savefileform('uploadfile');return false;">télécharger</button>
 
       </div>
     </footer>

diff --git a/webapp/tmpl/index.tt b/webapp/tmpl/index.tt
index abfd297..5edcc71 100644 (file)
--- a/webapp/tmpl/index.tt
+++ b/webapp/tmpl/index.tt
@@ -33,8 +33,9 @@
 <link rel="icon" type="image/png" sizes="16x16" href="[% abspath %][% staticpath %]img/favicon/favicon-16x16.png">
 
 <!-- <link rel="stylesheet" href="[% abspath %]css/w3pro.css?v=[% vstamp %]"> -->
-<link rel="stylesheet" href="[% abspath %][% staticpath %]css/theme.css?v=[% vstamp %]">
 <link rel="stylesheet" href="[% abspath %][% staticpath %]css/icons.css?v=[% vstamp %]">
+<link rel="stylesheet" href="[% abspath %][% staticpath %]css/theme.css?v=[% vstamp %]">
+
 <link rel="stylesheet" href="[% abspath %][% staticpath %]vendors/tabulator/css/tabulator_site.css?v=[% vstamp %]">
 <!-- <link rel="stylesheet" href="[% abspath %][% staticpath %]vendors/choices/choices.css?v=[% vstamp %]"> -->
 <link rel="stylesheet" href="[% abspath %][% staticpath %]vendors/slimselect/slimselect.css?v=[% vstamp %]">

diff --git a/webapp/tmpl/macro/fields.tt b/webapp/tmpl/macro/fields.tt
index 59addb0..52f8e7c 100644 (file)
--- a/webapp/tmpl/macro/fields.tt
+++ b/webapp/tmpl/macro/fields.tt
@@ -107,7 +107,7 @@
         <input type="time" class="input-append timefield data_[% table %] [% IF class %][% class %][% END %]"  id="[% column %]" name="[% table %]_[% column %]"  data-column="[% column %]"  data-table="[% table %]" data-id="" value="[% value %]" [% IF blurevent %]onblur="[% blurevent %]"[% END %]/>\r
     </div>\r
     <div class="cell" sytle="width: 20px;">\r
-        <a class="toolbarbtn text-red" style="padding: 4px 8px; border: 0;" onclick="document.getElementById('[% column %]').value='';document.getElementById('[% column %]')._flatpickr.clear();return false;"><span class="icon-remove" style="font-size: 10px;"></span></a>\r
+        <a class="toolbarbtn text-red" style="padding: 4px 8px; border: 0;" onclick="document.getElementById('[% column %]').value='';document.getElementById('[% column %]')._flatpickr.clear();return false;"><span class="icon icon-remove" style="font-size: 10px;"></span></a>\r
     </div>    \r
   [% END %]\r
   </div>\r

diff --git a/webapp/tmpl/module/companies.tt b/webapp/tmpl/module/companies.tt
index b6b8cf0..0610d1b 100644 (file)
--- a/webapp/tmpl/module/companies.tt
+++ b/webapp/tmpl/module/companies.tt
@@ -1,17 +1,17 @@
 <div class="display-container">
   <div class="bar toolbar">
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon-back" style="font-size: 16px;"></span><br>
-    retour</a>
-    <div class="bar-item PageHeadTitle">
-      Entreprises
-    </div><button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon-staff" style="font-size: 16px;"></span><br>
-    Données de base</button> <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon-user" style="font-size: 16px;"></span><br>
-    Utilisateurs</button> [% IF (session.usergroup == 'admin') %] <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon-package" style="font-size: 16px;"></span><br>
-    Secteur</button> [% END %]
+    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>retour</a>
+    <div class="bar-item PageHeadTitle">Entreprises</div>
+    <button class="bar-item toolbarbtn" onclick="companies.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>Données de base</button> 
+    <button class="bar-item toolbarbtn" onclick="users.gettbldata();companies.setview('users');"><span class="icon icon-user" style="font-size: 16px;"></span>Utilisateurs</button> 
+    [% IF (session.usergroup == 'admin') %] 
+      <button class="bar-item toolbarbtn" onclick="worktimes.gettbldata();companies.setview('worktimes');"><span class="icon icon-package" style="font-size: 16px;"></span>Secteur</button> 
+    [% END %]
     <div class="toolbar" id="tbar_tbl_companies">
-      [% IF (session.usergroup == 'admin') %] <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon-remove text-red" style="font-size: 16px;"></span><br>
-      supprimer</button> <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon-plus" style="font-size: 16px;"><br>
-      ajouter</span> [% END %]</button>
+      [% IF (session.usergroup == 'admin') %] 
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>supprimer</button> 
+        <button class="bar-item toolbarbtn right" onclick="schemadataset.add();"><span class="icon icon-plus" style="font-size: 16px;"></span>ajouter</button>
+      [% END %]
     </div>
   </div>
 </div>
@@ -26,10 +26,10 @@
         <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">
             Configuration sectoriel POT
-          </div><button class="bar-item toolbarbtn right" id="btn_delete_staffcontract" onclick="worktimes.remove(); return false;"><span class="icon-remove text-red" style="font-size: 16px;"></span><br>
-          supprimer</button> <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon-edit" style="font-size: 16px;"><br>
-          éditer</span> <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon-plus" style="font-size: 16px;"><br>
-          ajouter</span></button></button>
+          </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>supprimer</button> 
+          <button class="bar-item toolbarbtn right" onclick="worktimes.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;">éditer</span></button>
+           <button class="bar-item toolbarbtn right" onclick="worktimes.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;">ajouter</span></button>
         </div>
         <div id="tbl_worktimes"></div>
       </div>
@@ -37,10 +37,10 @@
         <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">
             Utilisateurs
-          </div><button class="bar-item toolbarbtn right" id="btn_delete_staffcontract" onclick="users.remove(); return false;"><span class="icon-remove text-red" style="font-size: 16px;"></span><br>
-          supprimer</button> <button class="bar-item toolbarbtn right" onclick="users.edit(); return false;"><span class="icon-edit" style="font-size: 16px;"><br>
-          éditer</span> <button class="bar-item toolbarbtn right" onclick="users.add(); return false;"><span class="icon-plus" style="font-size: 16px;"><br>
-          ajouter</span></button></button>
+          </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>supprimer</button> 
+          <button class="bar-item toolbarbtn right" onclick="users.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;">éditer</span></button>
+          <button class="bar-item toolbarbtn right" onclick="users.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;">ajouter</span></button>
         </div>
         <div id="tbl_users"></div>
       </div>

diff --git a/webapp/tmpl/module/companies/dlg_dataset.tt b/webapp/tmpl/module/companies/dlg_dataset.tt
index e1a8d3e..2514722 100644 (file)
--- a/webapp/tmpl/module/companies/dlg_dataset.tt
+++ b/webapp/tmpl/module/companies/dlg_dataset.tt
@@ -2,7 +2,7 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlg_dataset').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2>DataSet</h2>
     </header>
     <div class="container">
@@ -29,8 +29,8 @@
     </div>
   </div>
   <footer>
-        <button class="button theme-light border right-align" onclick="document.getElementById('dlg_dataset').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-        <button class="button margin right-align" onclick="schemadataset.save();"><span class="icon-Save"></span>&nbsp;Ajouter</button>
+        <button class="button theme-light border right-align" onclick="document.getElementById('dlg_dataset').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+        <button class="button actionbtn margin right-align" onclick="schemadataset.save();"><span class="icon icon-Save"></span>&nbsp;Ajouter</button>
    </footer>
 </div>
 </div>
\ 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 c1e1512..0f7e75f 100644 (file)
--- a/webapp/tmpl/module/companies/dlg_staffgroups.tt
+++ b/webapp/tmpl/module/companies/dlg_staffgroups.tt
@@ -3,7 +3,7 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlg_staffgroups').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="">Département</h2>
     </header>
     <div class="container">
@@ -13,8 +13,8 @@
       </form>
     </div>
     <footer>
-    <button class="button margin-right border theme-light" onclick="document.getElementById('dlg_staffgroups').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>  
-    <button class="button margin-right border" onclick="staffgroups.save();"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>
+    <button class="button margin-right border theme-light" onclick="document.getElementById('dlg_staffgroups').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>  
+    <button class="button actionbtn margin-right border" onclick="staffgroups.save();"><span class="icon icon-Save"></span>&nbsp;Sauvegarder</button>
     </footer>
   </div>
 </div>
\ 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 a94bbdb..1818282 100644 (file)
--- a/webapp/tmpl/module/companies/dlg_users.tt
+++ b/webapp/tmpl/module/companies/dlg_users.tt
@@ -1,7 +1,7 @@
 <div class="modal" id="dlg_users">
   <div class="modal-content animate-top card-4">
     <header>
-      <span class="button toolbarbtn display-topright" onclick="document.getElementById('dlg_users').style.display='none'; return false;"><span class="icon-remove" style="font-size: 18px;"></span></span>
+      <span class="button toolbarbtn display-topright" onclick="document.getElementById('dlg_users').style.display='none'; return false;"><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2>
         Utilisateur
       </h2>
@@ -47,9 +47,9 @@
       </form>
     </div>
     <footer>
-      <button class="button orange border" id="btnnewpasswd" onclick="users.sendnewpassword(); return false;">Envoyer mot de passe</button> <button class="button margin-right border theme-light" onclick=
-      "document.getElementById('dlg_users').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button> <button class="button blue-grey margin-right border" onclick="users.validateform();"><span class=
-      "icon-Save"></span>&nbsp;Sauvegarder</button>
+      <button class="button orange border" id="btnnewpasswd" onclick="users.sendnewpassword(); return false;">Envoyer mot de passe</button> 
+      <button class="button margin-right border theme-light" onclick="document.getElementById('dlg_users').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button> 
+      <button class="button actionbtn margin-right border" onclick="users.validateform();"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>
     </footer>
   </div>
 </div>

diff --git a/webapp/tmpl/module/companies/dlg_worktimes.tt b/webapp/tmpl/module/companies/dlg_worktimes.tt
index 59dc3a9..15e3778 100644 (file)
--- a/webapp/tmpl/module/companies/dlg_worktimes.tt
+++ b/webapp/tmpl/module/companies/dlg_worktimes.tt
@@ -1,7 +1,7 @@
 <div class="modal" id="dlg_worktimes">
   <div class="modal-content animate-top card-4">
     <header>
-      <span class="button toolbarbtn display-topright" onclick="document.getElementById('dlg_worktimes').style.display='none'; return false;"><span class="icon-remove" style="font-size: 18px;"></span></span>
+      <span class="button toolbarbtn display-topright" onclick="document.getElementById('dlg_worktimes').style.display='none'; return false;"><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="">
         Configuration Heures Sectoriel
       </h2>
@@ -24,8 +24,8 @@
       </form>
     </div>
     <footer>
-      <button class="button margin-right border theme-light" onclick="document.getElementById('dlg_worktimes').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button> <button class="button margin-right border"
-      onclick="worktimes.save();"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>
+      <button class="button margin-right border theme-light" onclick="document.getElementById('dlg_worktimes').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button> 
+      <button class="button  actionbtn margin-right border" onclick="worktimes.save();"><span class="icon icon-Save"></span>&nbsp;Sauvegarder</button>
     </footer>
   </div>
 </div>

diff --git a/webapp/tmpl/module/companies/pnl_basedata.tt b/webapp/tmpl/module/companies/pnl_basedata.tt
index 24d76cf..11d23ae 100644 (file)
--- a/webapp/tmpl/module/companies/pnl_basedata.tt
+++ b/webapp/tmpl/module/companies/pnl_basedata.tt
@@ -84,9 +84,9 @@
       <div class="bar moduletoolbar">
         <div class="bar-item SubHeadTitle">
           Départements
-        </div><button class="bar-item toolbarbtn right" id="btn_delete_staffgroup" onclick="staffgroups.remove(); return false;"><span class="icon-remove text-red" style="font-size: 12px;"></span><br>
-        Supprimer</button> <button class="bar-item toolbarbtn right" onclick="staffgroups.edit(); return false;"><span class="icon-edit" style="font-size: 12px;"></span><br>
-        éditer</button> <button class="bar-item toolbarbtn right" onclick="staffgroups.add(); return false;"><span class="icon-plus" style="font-size: 12px;"></span><br>
+        </div><button class="bar-item toolbarbtn right" id="btn_delete_staffgroup" onclick="staffgroups.remove(); return false;"><span class="icon icon-remove text-red" style="font-size: 12px;"></span>
+        Supprimer</button> <button class="bar-item toolbarbtn right" onclick="staffgroups.edit(); return false;"><span class="icon icon-edit" style="font-size: 12px;"></span>
+        éditer</button> <button class="bar-item toolbarbtn right" onclick="staffgroups.add(); return false;"><span class="icon icon-plus" style="font-size: 12px;"></span>
         ajouter</button>
       </div>
       <div id="tbl_staffgroups"></div>

diff --git a/webapp/tmpl/module/index.tt b/webapp/tmpl/module/index.tt
index 93577b3..fdcdf3b 100644 (file)
--- a/webapp/tmpl/module/index.tt
+++ b/webapp/tmpl/module/index.tt
@@ -5,7 +5,7 @@
   <div class="bar border-bottom toolbar" id="toolbar">
       <div class="bar-item"><img style="height: 40px;" src="[% abspath %][% staticpath %]img/potlogowhite.svg"> </div>
       <div class="bar-item PageHeadTitle hide-small">POT - Plan d'orgatisation du travail</div>
-      <button class="bar-item toolbarbtn  right" onclick="app.logout();"><span class="icon-logout" style="font-size: 22px;"></span><br/>Logout</button> 
+      <button class="bar-item toolbarbtn  right" onclick="app.logout();"><span class="icon icon-logout" style="font-size: 22px;"></span>Logout</button> 
     </div>
   <!-- <span class="bar-item right" id="modulename" style="display: none;"></span> -->
 </div>
@@ -15,8 +15,8 @@
       <h3>Modules</h3>
     </header>
       <div class="bar">
-        <a class="bar-item bodybtn" href="[% abspath %]periods.html"><span class="icon-calendar" style="font-size: 24px;"/></span><br>Pérides de références</a>
-        <a class="bar-item bodybtn" href="[% abspath %]staff.html"><span class="icon-group" style="font-size: 24px;"/></span><br/>Salariés</a>
+        <a class="bar-item bodybtn" href="[% abspath %]periods.html"><span class="icon icon-calendar" style="font-size: 24px;"/></span>Pérides de références</a>
+        <a class="bar-item bodybtn" href="[% abspath %]staff.html"><span class="icon icon-group" style="font-size: 24px;"/></span>Salariés</a>
       </div>
   </div>
   <div class="card" style="margin-top: 10px;">
@@ -24,8 +24,8 @@
       <h3>Configuration</h3>
     </header>
     <div class="bar">
-      <a class="bar-item bodybtn" href="[% abspath %]companies.html"><span class="icon-shop" style="font-size: 24px;"/></span><br>Entreprises</a>
-      <a class="bar-item bodybtn" href="[% abspath %]workplans.html"><span class="icon-template" style="font-size: 24px;"/></span><br/>Modèles</a>
+      <a class="bar-item bodybtn" href="[% abspath %]companies.html"><span class="icon icon-shop" style="font-size: 24px;"/></span>Entreprises</a>
+      <a class="bar-item bodybtn" href="[% abspath %]workplans.html"><span class="icon icon-template" style="font-size: 24px;"/></span>Modèles</a>
     </div>
   </div>
   <div class="card"  style="margin-top: 10px;">
@@ -33,7 +33,7 @@
       <h3>Profile</h3>
     </header>
     <div class="bar">
-      <a class="bar-item bodybtn" href="[% abspath %]profile.html"><span class="icon-key" style="font-size: 24px;"/></span><br>Changer mot de passe</a>
+      <a class="bar-item bodybtn" href="[% abspath %]profile.html"><span class="icon icon-key" style="font-size: 24px;"/></span>Changer mot de passe</a>
       <div class="bar-item">[% fieldselectbox("current_schemata","session","DataSet",'','',session.sessiondata.schemata,'','') %]</div>
     </div>
   </div>

diff --git a/webapp/tmpl/module/login/register.tt b/webapp/tmpl/module/login/register.tt
index 7cd58b7..65d739c 100644 (file)
--- a/webapp/tmpl/module/login/register.tt
+++ b/webapp/tmpl/module/login/register.tt
@@ -35,14 +35,14 @@
 
     <header> 
       <span onclick="document.getElementById('dlgcgu').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h2 id="dlgpublish_title">Conditions générales d'utilisation du site solana-architecture.lu</h2>
     </header>
     <div class="container">
       [% INCLUDE block/cgu.tt %]
     </div>
     <footer>
-    <button class="button theme-light margin-right border" onclick="document.getElementById('dlgcgu').style.display='none'; return false;">OK</button>
+    <button class="button  actionbtn margin-right border" onclick="document.getElementById('dlgcgu').style.display='none'; return false;">OK</button>
       
     </footer>
   </div>

diff --git a/webapp/tmpl/module/periods.tt b/webapp/tmpl/module/periods.tt
index 67ab8b2..21db8cf 100644 (file)
--- 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'} ] %]
 <div class="display-container">
     <div class="bar toolbar">
-     <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon-back" style="font-size: 16px;"></span><br/>retour</a>
+     <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>retour</a>
       <div class="bar-item PageHeadTitle">Périodes de références</div>
       <div class="toolbar paneltoolbar" id="tlb_periods">
-      <button class="bar-item toolbarbtn  right" onclick="reportperiod.add();"><span class="icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
-      <button class="bar-item toolbarbtn right" onclick="reportperiod.editplan();"><span class="icon-edit" style="font-size: 16px;"><br/>éditer</button>
-       <button class="bar-item toolbarbtn right" onclick="reportperiod.generatereport();"><span class="icon-pdf" style="font-size: 16px;"><br/>PDF</button>
-      <button class="bar-item toolbarbtn right" onclick="reportperiod.datarefresh();"><span class="icon-datarefresh" style="font-size: 16px;"><br/>actualiser</button>
-      <button class="bar-item toolbarbtn right" onclick="reportperiod.showdlgpayedhours();"><span class="icon-pay" style="font-size: 16px;"><br/>heures payées</button>
-  <!--<button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon-remove text-red" style="font-size: 16px;"></span><br/>supprimer</button>
-  <button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon-edit" style="font-size: 16px;"><br/>éditer</button>-->
+      <button class="bar-item toolbarbtn  right" onclick="reportperiod.add();"><span class="icon icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
+      <button class="bar-item toolbarbtn right" onclick="reportperiod.editplan();"><span class="icon icon-edit" style="font-size: 16px;"><br/>éditer</button>
+       <button class="bar-item toolbarbtn right" onclick="reportperiod.generatereport();"><span class="icon icon-pdf" style="font-size: 16px;"><br/>PDF</button>
+      <button class="bar-item toolbarbtn right" onclick="reportperiod.datarefresh();"><span class="icon icon-datarefresh" style="font-size: 16px;"><br/>actualiser</button>
+      <button class="bar-item toolbarbtn right" onclick="reportperiod.showdlgpayedhours();"><span class="icon icon-pay" style="font-size: 16px;"><br/>heures payées</button>
+  <!--<button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>supprimer</button>
+  <button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon icon-edit" style="font-size: 16px;"><br/>éditer</button>-->
     </div>
   </div>
 </div>
@@ -28,10 +28,10 @@
       </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-back" style="font-size: 16px;"><br/>retour</button>
+          <button class="bar-item toolbarbtn" onclick="reportperiod.setview('periods'); return false;"><span class="icon icon-back" style="font-size: 16px;"><br/>retour</button>
           <div class="bar-item SubHeadTitle" id="periodtitle" style="display: none;"></div>
           <div class="bar-item SubHeadTitle" id="stafftitle"></div>
-          <button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edit(); return false;"><span class="icon-edit" style="font-size: 16px;"><br/>editer</button>
+          <button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"><br/>editer</button>
         </div>
       <div id="tbl_staffperiodweeks" ></div>
       </div>

diff --git a/webapp/tmpl/module/profile.tt b/webapp/tmpl/module/profile.tt
index cb1a1f2..b2d0ce3 100644 (file)
--- a/webapp/tmpl/module/profile.tt
+++ b/webapp/tmpl/module/profile.tt
@@ -4,7 +4,7 @@
 [% user = quserdata.get_all() %]\r
 <div class="display-container">\r
     <div class="bar toolbar">\r
-     <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon-back" style="font-size: 16px;"></span><br/>retour</a>\r
+     <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>retour</a>\r
       <div class="bar-item PageHeadTitle">Profile</div>\r
   </div>\r
 </div>\r
@@ -52,7 +52,7 @@
           [% fieldeditbox('phone','users','Téléphone','','') %]\r
       </div>\r
         <div class="container right-align">\r
-        <button class="button blue-grey margin" id="btnsave_users" onclick="form.saveform('users');return false;"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>\r
+        <button class="button blue-grey margin" id="btnsave_users" onclick="form.saveform('users');return false;"><span class="icon icon-Save"></span>&nbsp;Sauvegarder</button>\r
         </div>\r
        \r
           </div>\r

diff --git a/webapp/tmpl/module/profile/dlgpassword.tt b/webapp/tmpl/module/profile/dlgpassword.tt
index 48f51ce..b01db7c 100644 (file)
--- a/webapp/tmpl/module/profile/dlgpassword.tt
+++ b/webapp/tmpl/module/profile/dlgpassword.tt
@@ -3,7 +3,7 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlgpassword').style.display='none'; return false;" 
-      class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+      class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h3>changement mot de passe</h3>
     </header>
     <div class="container">
@@ -27,8 +27,8 @@
       </div>     
     </div>
     <footer>
-       <button class="button theme-light margin-right border" onclick="document.getElementById('dlgpassword').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-      <button class="button blue-grey margin-right border" onclick="savepassword();return false;">changer mot de passe</button>
+       <button class="button theme-light margin-right border" onclick="document.getElementById('dlgpassword').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+      <button class="button actionbtn margin-right border" onclick="savepassword();return false;">changer mot de passe</button>
     </footer>
   </div>
 </div>

diff --git a/webapp/tmpl/module/profile/dlgusername.tt b/webapp/tmpl/module/profile/dlgusername.tt
index 016377e..8c2dcc7 100644 (file)
--- a/webapp/tmpl/module/profile/dlgusername.tt
+++ b/webapp/tmpl/module/profile/dlgusername.tt
@@ -3,7 +3,7 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlgusername').style.display='none'; return false;" 
-      class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+      class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h3>Changement de l'email resp.  login</h3>
     </header>
     <div class="container">
@@ -17,9 +17,9 @@
       </div>     
       </div>
     <footer>
-      <button class="button theme-light margin-right border" onclick="document.getElementById('dlgusername').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-      <button class="button theme-l2  margin-right border" id="btncheck" onclick="checkemail();return false;">envoyer</button>
-      <button class="button theme-l2 align-right border" id="btnvalidate" style="display:none;" onclick="saveemail();return false;">valider</button>
+      <button class="button theme-light margin-right border" onclick="document.getElementById('dlgusername').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+      <button class="button  actionbtn  margin-right border" id="btncheck" onclick="checkemail();return false;">envoyer</button>
+      <button class="button  actionbtn align-right border" id="btnvalidate" style="display:none;" onclick="saveemail();return false;">valider</button>
     </footer>
   </div>  
 </div>

diff --git a/webapp/tmpl/module/staff.tt b/webapp/tmpl/module/staff.tt
index 2f9d1df..5790811 100644 (file)
--- a/webapp/tmpl/module/staff.tt
+++ b/webapp/tmpl/module/staff.tt
@@ -1,14 +1,14 @@
 [% PROCESS macro/fields.tt %]
 <div class="display-container">
   <div class="bar toolbar">
-   <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon-back" style="font-size: 16px;"></span><br/>retour</a>
+   <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>retour</a>
     <div class="bar-item PageHeadTitle">Salariés</div>
-    <button class="bar-item toolbarbtn" onclick="staff.setview('basedata');"><span class="icon-staff" style="font-size: 16px;"></span><br/>Données de base</button>
-    <button class="bar-item toolbarbtn" onclick="staff.setview('periods');"><span class="icon-calendar" style="font-size: 16px;"></span><br/>Périodes</button>
+    <button class="bar-item toolbarbtn" onclick="staff.setview('basedata');"><span class="icon icon-staff" style="font-size: 16px;"></span>Données de base</button>
+    <button class="bar-item toolbarbtn" onclick="staff.setview('periods');"><span class="icon icon-calendar" style="font-size: 16px;"></span>Périodes</button>
     <div class="toolbar paneltoolbar" id="tlb_basedata">
-      <button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon-remove text-red" style="font-size: 16px;"></span><br/>supprimer</button>
-      <!-- <button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon-edit" style="font-size: 16px;"><br/>éditer</button> -->
-      <button class="bar-item toolbarbtn  right" onclick="staff.add();"><span class="icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
+      <button class="bar-item toolbarbtn  right" onclick="staff.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>supprimer</button>
+      <!-- <button class="bar-item toolbarbtn  right" onclick="staff.edit();"><span class="icon icon-edit" style="font-size: 16px;"><br/>éditer</button> -->
+      <button class="bar-item toolbarbtn  right" onclick="staff.add();"><span class="icon icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
     </div>
     <div class="toolbar paneltoolbar" id="tlb_periods">
     </div>
@@ -94,9 +94,9 @@
 
 <div class="bar moduletoolbar">
     <div class="bar-item SubHeadTitle">Données contractuelles</div>
-      <button class="bar-item toolbarbtn right" id="btn_delete_staffcontract" onclick="staffcontract.remove(); return false;"><span class="icon-remove text-red" style="font-size: 16px;"></span><br/>supprimer</button>
-      <button class="bar-item toolbarbtn  right" onclick="staffcontract.edit(); return false;"><span class="icon-edit" style="font-size: 16px;"><br/>éditer</button>
-      <button class="bar-item toolbarbtn right"  onclick="staffcontract.add(); return false;"><span class="icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
+      <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>supprimer</button>
+      <button class="bar-item toolbarbtn  right" onclick="staffcontract.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"><br/>éditer</button>
+      <button class="bar-item toolbarbtn right"  onclick="staffcontract.add(); return false;"><span class="icon icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
       </div>
      
         <div id="tbl_staffcontract" ></div>
@@ -104,16 +104,16 @@
 <div id="pnl_periods" class="panel" style="display: none;">
   <div class="bar moduletoolbar">
           <div class="bar-item SubHeadTitle">Périodes de Références</div>
-          <button class="bar-item toolbarbtn  right" onclick="staffperiods.edit(); return false;"><span class="icon-edit" style="font-size: 16px;"><br/>éditer</button>
+          <button class="bar-item toolbarbtn  right" onclick="staffperiods.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"><br/>éditer</button>
         </div>
   <div id="tbl_staffperiods" ></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-back" style="font-size: 16px;"><br/>retour</button>
+          <button class="bar-item toolbarbtn" onclick="staff.setview('periods'); return false;"><span class="icon icon-back" style="font-size: 16px;"><br/>retour</button>
           <div class="bar-item SubHeadTitle" id="periodtitle"></div>
           <div class="bar-item SubHeadTitle" id="stafftitle" style="display: none;"></div>
-          <button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edit(); return false;"><span class="icon-edit" style="font-size: 16px;"><br/>editer</button>
+          <button class="bar-item toolbarbtn right" onclick="staffperiodweeks.edit(); return false;"><span class="icon icon-edit" style="font-size: 16px;"><br/>editer</button>
         </div>
   <div id="tbl_staffperiodweeks" ></div>
 </div>
@@ -127,7 +127,7 @@
   <div class="modal-content animate-top card-4">
     <header> 
       <span onclick="document.getElementById('dlg_staffcontract').style.display='none'; return false;" 
-       class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+       class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
       <h3 id="dlgstaffcontract_title">Données contractuelles</h3>
     </header>
     <div class="container">
@@ -150,8 +150,8 @@
         </form>
     </div>
     <footer>
-    <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_staffcontract').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-    <button class="button margin-right border" onclick="staffcontract.save();"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>  
+    <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_staffcontract').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+    <button class="button actionbtn margin-right border" onclick="staffcontract.save();"><span class="icon icon-Save"></span>&nbsp;Sauvegarder</button>  
     </footer>
   </div>
 </div>

diff --git a/webapp/tmpl/module/workplans.tt b/webapp/tmpl/module/workplans.tt
index c4d62c8..7541ab1 100644 (file)
--- a/webapp/tmpl/module/workplans.tt
+++ b/webapp/tmpl/module/workplans.tt
@@ -2,13 +2,13 @@
 
 <div class="display-container">
 <div class="bar toolbar">
-      <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon-back" style="font-size: 16px;"></span><br/>retour</a>
+      <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>retour</a>
       <div class="bar-item PageHeadTitle">Plans de travail (modèles)</div>
       <div class="toolbar" id="tbar_tbl_workplans">
-  <button class="bar-item toolbarbtn  right" onclick="workplans.remove();"><span class="icon-remove text-red" style="font-size: 16px;"></span><br/>supprimer</button>
+  <button class="bar-item toolbarbtn  right" onclick="workplans.remove();"><span class="icon icon-remove text-red" style="font-size: 16px;"></span>supprimer</button>
   <!--  -->
-  <button class="bar-item toolbarbtn  right" onclick="workplans.add();"><span class="icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
-  <button class="bar-item toolbarbtn right" onclick="workplans.rename();"><span class="icon-rename" style="font-size: 16px;"><br/>renomer</button> 
+  <button class="bar-item toolbarbtn  right" onclick="workplans.add();"><span class="icon icon-plus" style="font-size: 16px;"><br/>ajouter</button> 
+  <button class="bar-item toolbarbtn right" onclick="workplans.rename();"><span class="icon icon-rename" style="font-size: 16px;"><br/>renomer</button> 
 </div>
 <div class="toolbar" id="tbar_frm_staff" style="display: none;">
 </div>
@@ -24,9 +24,9 @@
       <div class="panel" id="pnl_workplans" style="display: none;">
         <div class="bar moduletoolbar">
           <div class="bar-item PageHeadTitle">Modèle</div>
-          <button class="bar-item toolbarbtn  right" onclick="workplans.addweek();"><span class="icon-plus" style="font-size: 16px;"><br/>ajouter semaine</button>
-          <button class="bar-item toolbarbtn right" onclick="workplans.removeweek();"><span class="icon-remove text-red" style="font-size: 16px;"><br/>supprimer semaine</button>
-          <button class="bar-item toolbarbtn  right" onclick="workplans.edit();"><span class="icon-edit" style="font-size: 16px;"><br/>éditer</button>
+          <button class="bar-item toolbarbtn  right" onclick="workplans.addweek();"><span class="icon icon-plus" style="font-size: 16px;"><br/>ajouter semaine</button>
+          <button class="bar-item toolbarbtn right" onclick="workplans.removeweek();"><span class="icon icon-remove text-red" style="font-size: 16px;"><br/>supprimer semaine</button>
+          <button class="bar-item toolbarbtn  right" onclick="workplans.edit();"><span class="icon icon-edit" style="font-size: 16px;"><br/>éditer</button>
         </div>
         <div id="tbl_workplandata"></div>
       </div>

diff --git a/webapp/tmpl/module/workplans/dlg_workplan.tt b/webapp/tmpl/module/workplans/dlg_workplan.tt
index b0c6c34..dc550e0 100644 (file)
--- a/webapp/tmpl/module/workplans/dlg_workplan.tt
+++ b/webapp/tmpl/module/workplans/dlg_workplan.tt
@@ -2,7 +2,7 @@
     <div id="dlg_workplans" class="modal">
       <div class="modal-content animate-top card-4">
         <header>
-          <span onclick="document.getElementById('dlg_workplans').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+          <span onclick="document.getElementById('dlg_workplans').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
           <h2 id="dlg_workplan_title">Modèle</h2>
         </header>
         <div class="container">
@@ -19,8 +19,8 @@
         </form>
       </div>
       <footer>
-        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_workplans').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-        <button class="button blue-grey margin-right border" id="btn_saveworkplan" onclick="workplans.saveworkplan();return false;"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>
+        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_workplans').style.display='none'; return false;"><span class="icon icon-remove"></span>&nbsp;Annuler</button>
+        <button class="button actionbtn margin-right border" id="btn_saveworkplan" onclick="workplans.saveworkplan();return false;"><span class="icon icon-Save"></span>&nbsp;Sauvegarder</button>
       </footer>
     </div>
   </div>

diff --git a/webapp/tmpl/module/workplans/dlg_workplanday.tt b/webapp/tmpl/module/workplans/dlg_workplanday.tt
index 170cf68..5eb534f 100644 (file)
--- a/webapp/tmpl/module/workplans/dlg_workplanday.tt
+++ b/webapp/tmpl/module/workplans/dlg_workplanday.tt
@@ -2,7 +2,7 @@
     <div id="dlg_workplanday" class="modal">
       <div class="modal-content animate-top card-4">
         <header>
-          <span onclick="document.getElementById('dlg_workplanday').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon-remove" style="font-size: 18px;"></span></span>
+          <span onclick="document.getElementById('dlg_workplanday').style.display='none'; return false;" class="button toolbarbtn display-topright" ><span class="icon icon-remove" style="font-size: 18px;"></span></span>
           <h2 id="dlg_workplanday_title">Editer Jour</h2>
         </header>
         <div class="container">
@@ -35,8 +35,8 @@
         </form>
       </div>
       <footer>
-        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_workplanday').style.display='none'; return false;"><span class="icon-remove"></span>&nbsp;Annuler</button>
-        <button class="button blue-grey margin-right border" id="btn_saveday" onclick="workplans.save();return false;"><span class="icon-Save"></span>&nbsp;Sauvegarder</button>
+        <button class="button theme-light margin-right border" onclick="document.getElementById('dlg_workplanday').style.display='none'; return false;"><span class="icon icon-remove"></span>Annuler</button>
+        <button class="button actionbtn margin-right border" id="btn_saveday" onclick="workplans.save();return false;"><span class="icon icon-Save"></span>Sauvegarder</button>
       </footer>
     </div>
   </div>