projects / pot_lu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 902086b)
v202101181818 t1.1.5 1.1.5
authorKilian Saffran <ksaffran@dks.lu>
Mon, 18 Jan 2021 17:19:00 +0000 (18:19 +0100)
committerKilian Saffran <ksaffran@dks.lu>
Mon, 18 Jan 2021 17:19:00 +0000 (18:19 +0100)
app/tmpl/browser.tt patch | blob | history
app/tmpl/index.tt patch | blob | history
app/tmpl/module/admin/index.tt patch | blob | history
desktopapp/package.json patch | blob | history

diff --git a/app/tmpl/browser.tt b/app/tmpl/browser.tt
index e04f4b3..76e613d 100644 (file)
--- a/app/tmpl/browser.tt
+++ b/app/tmpl/browser.tt
@@ -1,78 +1,78 @@
-[% appversion = '0.9.9.6' %]
-[% minify = '' %]
-[% PROCESS "lang/${lang}.tt" %]
-<!DOCTYPE html>
-<html lang="[% lang %]">
-<head>
-
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
-  <title>POT - [% lbl.pot_long %] [% IF mode %][% " - ${mode}" %][% END %]</title>
-  <meta name="language" content="fr">
-    <meta name="robots" content="noindex,nofollow">
-    <link rel="apple-touch-icon" sizes="57x57" href="img/favicon/apple-icon-57x57.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="60x60" href="img/favicon/apple-icon-60x60.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="72x72" href="img/favicon/apple-icon-72x72.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="76x76" href="img/favicon/apple-icon-76x76.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="114x114" href="img/favicon/apple-icon-114x114.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="120x120" href="img/favicon/apple-icon-120x120.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="144x144" href="img/favicon/apple-icon-144x144.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="152x152" href="img/favicon/apple-icon-152x152.png?v=[% appversion %]">
-<link rel="apple-touch-icon" sizes="180x180" href="img/favicon/apple-icon-180x180.png?v=[% appversion %]">
-<link rel="icon" type="image/png" sizes="192x192"  href="img/favicon/android-icon-192x192.png?v=[% appversion %]">
-<link rel="icon" type="image/png" sizes="32x32" href="img/favicon/favicon-32x32.png?v=[% appversion %]">
-<link rel="icon" type="image/png" sizes="96x96" href="img/favicon/favicon-96x96.png?v=[% appversion %]">
-<link rel="icon" type="image/png" sizes="16x16" href="img/favicon/favicon-16x16.png?v=[% appversion %]">
-<link rel="stylesheet" href="[% abspath %][% staticpath %]css/theme[% minify %].css?v=[% appversion %]">
-<style>
-body, html {height: 100%}
-.bgimg {
-  background-image: url('[% abspath %][% staticpath %]img/potbg.jpg?v=[% appversion %]');
-  min-height: 100%;
-  background-position: center;
-  background-size: cover;
-} 
-</style>
-</head>
-<body>
-  
-  <div class="display-container DKS bgimg" style="padding-top: 100px; ">
-
-    <div class="row" >
-    <div class="col l4 m2 hide-small">&nbsp;
-    </div>
-    <div class="col l4 m8 s12 border round">  
-    <div class="container center white padding">
-        <img src="[% abspath %][% staticpath %]img/toplogo.png?v=[% appversion %]" style="height: 60px;" alt="logo">
-    </div>
-    <div class="container white" id="pnllogin" >
-      <div class="container">
-            <h4>Ihr Browser wird nicht unterstützt!</h4>
-            <h4>Votre Navigateur n'est pas supporté!</h4>
-      </div>
-      <div class="container padding">
-        <a class="text-black" href="https://www.plandutravail.lu/download/POT_Setup_64bit.exe">Download Windows Version</a>   
-      </div>
-      <div class="container padding">
-        <a class="text-black" href="https://www.plandutravail.lu/download/pot_setup.dmg">Download MacOS Version</a>
-      </div>
-    </div>
-  </div>
-  <div class="col l4 m2  hide-small">&nbsp;
-  </div>
-  </div>
-  <noscript>
-  <div class="row">
-    <div class="col l4 m2 hide-small">&nbsp;
-    </div>
-    <div class="col l4 m8 s12 border round white"> 
-      <div class="container text-red large">Javascript doit être activé pour travailler avec POT!</div>
-    </div>
-    <div class="col l4 m2  hide-small">&nbsp;
-    </div>
-  </div>
-  </noscript>
-  </div>
-</body>
-
+[% appversion = '0.9.9.6' %]\r
+[% minify = '' %]\r
+[% PROCESS "lang/${lang}.tt" %]\r
+<!DOCTYPE html>\r
+<html lang="[% lang %]">\r
+<head>\r
+\r
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\r
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">\r
+  <title>POT - [% lbl.pot_long %] [% IF mode %][% " - ${mode}" %][% END %]</title>\r
+  <meta name="language" content="fr">\r
+    <meta name="robots" content="noindex,nofollow">\r
+    <link rel="apple-touch-icon" sizes="57x57" href="img/favicon/apple-icon-57x57.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="60x60" href="img/favicon/apple-icon-60x60.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="72x72" href="img/favicon/apple-icon-72x72.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="76x76" href="img/favicon/apple-icon-76x76.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="114x114" href="img/favicon/apple-icon-114x114.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="120x120" href="img/favicon/apple-icon-120x120.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="144x144" href="img/favicon/apple-icon-144x144.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="152x152" href="img/favicon/apple-icon-152x152.png?v=[% appversion %]">\r
+<link rel="apple-touch-icon" sizes="180x180" href="img/favicon/apple-icon-180x180.png?v=[% appversion %]">\r
+<link rel="icon" type="image/png" sizes="192x192"  href="img/favicon/android-icon-192x192.png?v=[% appversion %]">\r
+<link rel="icon" type="image/png" sizes="32x32" href="img/favicon/favicon-32x32.png?v=[% appversion %]">\r
+<link rel="icon" type="image/png" sizes="96x96" href="img/favicon/favicon-96x96.png?v=[% appversion %]">\r
+<link rel="icon" type="image/png" sizes="16x16" href="img/favicon/favicon-16x16.png?v=[% appversion %]">\r
+<link rel="stylesheet" href="[% abspath %][% staticpath %]css/theme[% minify %].css?v=[% appversion %]">\r
+<style>\r
+body, html {height: 100%}\r
+.bgimg {\r
+  background-image: url('[% abspath %][% staticpath %]img/potbg.jpg?v=[% appversion %]');\r
+  min-height: 100%;\r
+  background-position: center;\r
+  background-size: cover;\r
+} \r
+</style>\r
+</head>\r
+<body>\r
+  \r
+  <div class="display-container DKS bgimg" style="padding-top: 100px; ">\r
+\r
+    <div class="row" >\r
+    <div class="col l4 m2 hide-small">&nbsp;\r
+    </div>\r
+    <div class="col l4 m8 s12 border round">  \r
+    <div class="container center white padding">\r
+        <img src="[% abspath %][% staticpath %]img/toplogo.png?v=[% appversion %]" style="height: 60px;" alt="logo">\r
+    </div>\r
+    <div class="container white" id="pnllogin" >\r
+      <div class="container">\r
+            <h4>Ihr Browser wird nicht unterstützt!</h4>\r
+            <h4>Votre Navigateur n'est pas supporté!</h4>\r
+      </div>\r
+      <div class="container padding">\r
+        <a class="text-black" href="https://www.plandutravail.lu/download/POT_Setup_64bit.exe">Download Windows Version</a>   \r
+      </div>\r
+      <div class="container padding">\r
+        <a class="text-black" href="https://www.plandutravail.lu/download/pot_setup.dmg">Download MacOS Version</a>\r
+      </div>\r
+    </div>\r
+  </div>\r
+  <div class="col l4 m2  hide-small">&nbsp;\r
+  </div>\r
+  </div>\r
+  <noscript>\r
+  <div class="row">\r
+    <div class="col l4 m2 hide-small">&nbsp;\r
+    </div>\r
+    <div class="col l4 m8 s12 border round white"> \r
+      <div class="container text-red large">Javascript doit être activé pour travailler avec POT!</div>\r
+    </div>\r
+    <div class="col l4 m2  hide-small">&nbsp;\r
+    </div>\r
+  </div>\r
+  </noscript>\r
+  </div>\r
+</body>\r
+\r
 </html>
\ No newline at end of file
diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt
index 6d4d39f..6b564e1 100644 (file)
--- a/app/tmpl/index.tt
+++ b/app/tmpl/index.tt
@@ -1,4 +1,4 @@
-[% appversion='1.1.3beta1' %]
+[% appversion='1.1.5' %]
 [% minify = '' %]
 [% PROCESS "lang/${lang}.tt" %]
 <!DOCTYPE html>
diff --git a/app/tmpl/module/admin/index.tt b/app/tmpl/module/admin/index.tt
index 88668bd..5af04f2 100644 (file)
--- a/app/tmpl/module/admin/index.tt
+++ b/app/tmpl/module/admin/index.tt
@@ -1,28 +1,28 @@
-<div class="display-container" >
-      
-  <div class="bar border-bottom toolbar" id="toolbar">
-    <a class="bar-item toolbarbtn" href="[% abspath %]index.html"><span class="icon icon-back" style="font-size: 16px;"></span>[% lbl.back %]</a>
-      <div class="bar-item PageHeadTitle hide-small">[% lbl.administration %]</div>
-      
-      
-      
-    </div>
-  <!-- <span class="bar-item right" id="modulename" style="display: none;"></span> -->
-</div>
-<div class="display-container" style="height: calc(100vh-100px);">
-  [% IF (session.usergroup == 'admin') %]
-  <div class="card" style="margin-top: 10px;">
-    <header class="container moduletoolbar red">
-      <h3>[% lbl.administration %]</h3>
-    </header>
-    <div class="bar">
-      <a class="bar-item bodybtn" href="[% abspath %]admin/admin.html"><span class="icon icon-apps" style="font-size: 24px;"/></span>[% lbl.companies %]</a>
-      <a class="bar-item bodybtn" href="[% abspath %]admin/sectors.html"><span class="icon icon-sector" style="font-size: 24px;"/></span>[% lbl.sectors %]</a>
-      <a class="bar-item bodybtn" href="[% abspath %]admin/adminvacancydays.html"><span class="icon icon-vacancydays" style="font-size: 24px;"/></span>[% lbl.vacancydays %]</a>
-      <a class="bar-item bodybtn" href="[% abspath %]admin/adminvacancytypes.html"><span class="icon icon-category" style="font-size: 24px;"/></span>[% lbl.vacancytypes %]</a>
-    </div>
-  </div>
-  [% END %]
-</div>
-
-
+<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
+      <div class="bar-item PageHeadTitle hide-small">[% lbl.administration %]</div>\r
+      \r
+      \r
+      \r
+    </div>\r
+  <!-- <span class="bar-item right" id="modulename" style="display: none;"></span> -->\r
+</div>\r
+<div class="display-container" style="height: calc(100vh-100px);">\r
+  [% IF (session.usergroup == 'admin') %]\r
+  <div class="card" style="margin-top: 10px;">\r
+    <header class="container moduletoolbar red">\r
+      <h3>[% lbl.administration %]</h3>\r
+    </header>\r
+    <div class="bar">\r
+      <a class="bar-item bodybtn" href="[% abspath %]admin/admin.html"><span class="icon icon-apps" style="font-size: 24px;"/></span>[% lbl.companies %]</a>\r
+      <a class="bar-item bodybtn" href="[% abspath %]admin/sectors.html"><span class="icon icon-sector" style="font-size: 24px;"/></span>[% lbl.sectors %]</a>\r
+      <a class="bar-item bodybtn" href="[% abspath %]admin/adminvacancydays.html"><span class="icon icon-vacancydays" style="font-size: 24px;"/></span>[% lbl.vacancydays %]</a>\r
+      <a class="bar-item bodybtn" href="[% abspath %]admin/adminvacancytypes.html"><span class="icon icon-category" style="font-size: 24px;"/></span>[% lbl.vacancytypes %]</a>\r
+    </div>\r
+  </div>\r
+  [% END %]\r
+</div>\r
+\r
+\r
diff --git a/desktopapp/package.json b/desktopapp/package.json
index 0e41f8d..9e1bc00 100644 (file)
--- a/desktopapp/package.json
+++ b/desktopapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "POT",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "plan d'organisation du travail",
   "main": "main.js",
   "scripts": {
Unnamed repository; edit this file 'description' to name the repository.