v20200401

diff --git a/backoffice/tmpl/module/companies/index.js b/OLD/companies/index.js
similarity index 100%
rename from backoffice/tmpl/module/companies/index.js
rename to OLD/companies/index.js

diff --git a/backoffice/tmpl/module/companies/index.tt b/OLD/companies/index.tt
similarity index 100%
rename from backoffice/tmpl/module/companies/index.tt
rename to OLD/companies/index.tt

diff --git a/backoffice/tmpl/module/companies/widgets/companies/companies.js b/OLD/companies/widgets/companies/companies.js
similarity index 100%
rename from backoffice/tmpl/module/companies/widgets/companies/companies.js
rename to OLD/companies/widgets/companies/companies.js

diff --git a/backoffice/tmpl/module/companies/widgets/companies/frm_companies.tt b/OLD/companies/widgets/companies/frm_companies.tt
similarity index 100%
rename from backoffice/tmpl/module/companies/widgets/companies/frm_companies.tt
rename to OLD/companies/widgets/companies/frm_companies.tt

diff --git a/backoffice/tmpl/module/companies/widgets/companies/tbar_companies.tt b/OLD/companies/widgets/companies/tbar_companies.tt
similarity index 100%
rename from backoffice/tmpl/module/companies/widgets/companies/tbar_companies.tt
rename to OLD/companies/widgets/companies/tbar_companies.tt

diff --git a/backoffice/tmpl/module/companies/widgets/companies/tbl_companies.tt b/OLD/companies/widgets/companies/tbl_companies.tt
similarity index 100%
rename from backoffice/tmpl/module/companies/widgets/companies/tbl_companies.tt
rename to OLD/companies/widgets/companies/tbl_companies.tt

diff --git a/backoffice/tmpl/module/dashboard/index.js b/OLD/dashboard/index.js
similarity index 100%
rename from backoffice/tmpl/module/dashboard/index.js
rename to OLD/dashboard/index.js

diff --git a/backoffice/tmpl/module/dashboard/index.tt b/OLD/dashboard/index.tt
similarity index 100%
rename from backoffice/tmpl/module/dashboard/index.tt
rename to OLD/dashboard/index.tt

diff --git a/backoffice/tmpl/module/planning/index.js b/OLD/planning/index.js
similarity index 100%
rename from backoffice/tmpl/module/planning/index.js
rename to OLD/planning/index.js

diff --git a/backoffice/tmpl/module/planning/index.tt b/OLD/planning/index.tt
similarity index 100%
rename from backoffice/tmpl/module/planning/index.tt
rename to OLD/planning/index.tt

diff --git a/backoffice/tmpl/module/planning/widgets/reportperiod/dlg_reportperiod.tt b/OLD/planning/widgets/reportperiod/dlg_reportperiod.tt
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/reportperiod/dlg_reportperiod.tt
rename to OLD/planning/widgets/reportperiod/dlg_reportperiod.tt

diff --git a/backoffice/tmpl/module/planning/widgets/reportperiod/reportperiod.js b/OLD/planning/widgets/reportperiod/reportperiod.js
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/reportperiod/reportperiod.js
rename to OLD/planning/widgets/reportperiod/reportperiod.js

diff --git a/backoffice/tmpl/module/planning/widgets/reportperiod/tbar_reportperiod.tt b/OLD/planning/widgets/reportperiod/tbar_reportperiod.tt
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/reportperiod/tbar_reportperiod.tt
rename to OLD/planning/widgets/reportperiod/tbar_reportperiod.tt

diff --git a/backoffice/tmpl/module/planning/widgets/reportperiod/tbl_reportperiod.tt b/OLD/planning/widgets/reportperiod/tbl_reportperiod.tt
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/reportperiod/tbl_reportperiod.tt
rename to OLD/planning/widgets/reportperiod/tbl_reportperiod.tt

diff --git a/backoffice/tmpl/module/planning/widgets/staffworkplan/frm_staffworkplan.tt b/OLD/planning/widgets/staffworkplan/frm_staffworkplan.tt
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/staffworkplan/frm_staffworkplan.tt
rename to OLD/planning/widgets/staffworkplan/frm_staffworkplan.tt

diff --git a/backoffice/tmpl/module/planning/widgets/staffworkplan/staffworkplan.js b/OLD/planning/widgets/staffworkplan/staffworkplan.js
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/staffworkplan/staffworkplan.js
rename to OLD/planning/widgets/staffworkplan/staffworkplan.js

diff --git a/backoffice/tmpl/module/planning/widgets/staffworkplan/tbar_staffworkplan.tt b/OLD/planning/widgets/staffworkplan/tbar_staffworkplan.tt
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/staffworkplan/tbar_staffworkplan.tt
rename to OLD/planning/widgets/staffworkplan/tbar_staffworkplan.tt

diff --git a/backoffice/tmpl/module/planning/widgets/staffworkplan/tbl_staffworkplan.tt b/OLD/planning/widgets/staffworkplan/tbl_staffworkplan.tt
similarity index 100%
rename from backoffice/tmpl/module/planning/widgets/staffworkplan/tbl_staffworkplan.tt
rename to OLD/planning/widgets/staffworkplan/tbl_staffworkplan.tt

diff --git a/backoffice/tmpl/module/profile/index.js b/OLD/profile/index.js
similarity index 100%
rename from backoffice/tmpl/module/profile/index.js
rename to OLD/profile/index.js

diff --git a/backoffice/tmpl/module/sites/index.js b/OLD/sites/index.js
similarity index 100%
rename from backoffice/tmpl/module/sites/index.js
rename to OLD/sites/index.js

diff --git a/backoffice/tmpl/module/sites/index.tt b/OLD/sites/index.tt
similarity index 100%
rename from backoffice/tmpl/module/sites/index.tt
rename to OLD/sites/index.tt

diff --git a/backoffice/tmpl/module/staff/index.js b/OLD/staff/index.js
similarity index 100%
rename from backoffice/tmpl/module/staff/index.js
rename to OLD/staff/index.js

diff --git a/backoffice/tmpl/module/staff/index.tt b/OLD/staff/index.tt
similarity index 100%
rename from backoffice/tmpl/module/staff/index.tt
rename to OLD/staff/index.tt

diff --git a/backoffice/tmpl/module/timetrackers/index.js b/OLD/timetrackers/index.js
similarity index 100%
rename from backoffice/tmpl/module/timetrackers/index.js
rename to OLD/timetrackers/index.js

diff --git a/backoffice/tmpl/module/timetrackers/index.tt b/OLD/timetrackers/index.tt
similarity index 100%
rename from backoffice/tmpl/module/timetrackers/index.tt
rename to OLD/timetrackers/index.tt

diff --git a/backoffice/tmpl/module/users/index.js b/OLD/users/index.js
similarity index 100%
rename from backoffice/tmpl/module/users/index.js
rename to OLD/users/index.js

diff --git a/backoffice/tmpl/module/workplans/index.js b/OLD/workplans/index.js
similarity index 100%
rename from backoffice/tmpl/module/workplans/index.js
rename to OLD/workplans/index.js

diff --git a/backoffice/tmpl/module/workplans/index.tt b/OLD/workplans/index.tt
similarity index 100%
rename from backoffice/tmpl/module/workplans/index.tt
rename to OLD/workplans/index.tt

diff --git a/backoffice/api/page.cgi b/backoffice/api/page.cgi
old mode 100644 (file)
new mode 100755 (executable)
index efbdf41..10a045d
--- a/backoffice/api/page.cgi
+++ b/backoffice/api/page.cgi
@@ -23,10 +23,10 @@ foreach my $pe (@params){
 print $cgi->header(-type=>"text/html", -charset => "utf-8");
 my $html->{result} = ();
 $p->{sid} = $cgi->cookie($sitecfg->{cookiename});
-print Dumper($p);
+#print Dumper($p);
 my $se = session->new();
 my $sess = $se->getsession($p->{sid});
-print Dumper($sess);
+#print Dumper($sess);
 if ($sess == undef){
   $html->{error} = "No Authorisation";
   print JSON::PP::encode_json($html);

diff --git a/backoffice/css/dkstheme.css b/backoffice/css/dkstheme.css
index 427029f..789922a 100644 (file)
--- a/backoffice/css/dkstheme.css
+++ b/backoffice/css/dkstheme.css
@@ -1,6 +1,9 @@
-html,body {
+html {
        background-color: #52638e;
 }
+body {
+       background-color: #fff;
+}
 button
 {
        background-image: none;
@@ -77,7 +80,7 @@ button:focus .icon
        -fm-icon-color: rgba(100%,100%,100%,1);
 }
 
-body
+/* body
 {
        background-color: rgba(100%,100%,100%,1);
        box-sizing: border-box;
@@ -89,7 +92,7 @@ body:checked
        background-image: none;
        background-color: rgba(57.2549%,61.9608%,75.2941%,1);
        border-image-source: none;
-}
+} */
 
 pop_up
 {

diff --git a/backoffice/data/sessions/6Vyc0ggMdqK27PYqkScIQ2yWzW33TcpTWHPoI6e12.txt b/backoffice/data/sessions/6Vyc0ggMdqK27PYqkScIQ2yWzW33TcpTWHPoI6e12.txt
new file mode 100644 (file)
index 0000000..7f374f7
--- /dev/null
+++ b/backoffice/data/sessions/6Vyc0ggMdqK27PYqkScIQ2yWzW33TcpTWHPoI6e12.txt
@@ -0,0 +1 @@
+kilian
\ No newline at end of file

diff --git a/backoffice/data/sessions/ubpbTZ1F5OdK7fUW6lnqbwH5yBX2RCNltmYgk461W.txt b/backoffice/data/sessions/ubpbTZ1F5OdK7fUW6lnqbwH5yBX2RCNltmYgk461W.txt
new file mode 100644 (file)
index 0000000..7f374f7
--- /dev/null
+++ b/backoffice/data/sessions/ubpbTZ1F5OdK7fUW6lnqbwH5yBX2RCNltmYgk461W.txt
@@ -0,0 +1 @@
+kilian
\ No newline at end of file

diff --git a/backoffice/img/icons/arrow_toright.svg b/backoffice/img/icons/arrow_toright.svg
new file mode 100755 (executable)
index 0000000..89fa509
--- /dev/null
+++ b/backoffice/img/icons/arrow_toright.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?> \r
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" \r
+        x="0px" y="0px" width="50px" height="50px" viewBox="0 0 516.99 319"> \r
+<path fill="#fff" d="M306.57026832772,54.0654773731367L306.57026832772,125.392267229094 34.4076439685887,125.392267229094 34.4076439685887,193.584367753996 306.57026832772,193.584367753996 306.57026832772,264.930513383879 468.37754982186,159.507112504973z M272.162645036704,0L516.994981462485,159.507112504973 272.162645036704,318.996004106535 272.162645036704,215.979417802824 0,215.979417802824 0,103.016572954191 272.162645036704,103.016572954191z"/> \r
+</svg>
\ No newline at end of file

diff --git a/backoffice/img/icons/back.svg b/backoffice/img/icons/back.svg
new file mode 100755 (executable)
index 0000000..6ef61e6
--- /dev/null
+++ b/backoffice/img/icons/back.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?> \r
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" \r
+        x="0px" y="0px" width="50px" height="50px" viewBox="0 0 284.92 471.83"> \r
+<path fill="#fff" d="M210.0732883782,0L284.924011644801,84.1795578002929 151.372742113551,234.311782836914 284.059540209254,388.581604003906 210.03486674734,471.831024169922 0,236.170654296875z"/> \r
+</svg>
\ No newline at end of file

diff --git a/backoffice/js/app.js b/backoffice/js/app.js
index 278638e..c4e34e1 100644 (file)
--- a/backoffice/js/app.js
+++ b/backoffice/js/app.js
@@ -11,7 +11,8 @@ var app = {
         // }\r
     },\r
     loadpage: function(data){\r
-        document.getElementById("mainapp").innerHTML = data;  \r
+        document.getElementById("mainapp").innerHTML = data;\r
+        \r
     },\r
     // sidebarclick: function(modulepage, modulename) {\r
     //     admin.loadpage(modulepage, modulename);\r
@@ -40,6 +41,7 @@ function reload_page() {
     location.href = location.href;\r
 }\r
 \r
+\r
 // function closeSidebar(){\r
 //   document.getElementById("sidebar").style.display = "none";\r
 //   document.getElementById("main").style.margin = "0 0 0 0";\r

diff --git a/backoffice/sessionlog.txt b/backoffice/sessionlog.txt
index 6ffad5c..ef490ec 100644 (file)
--- a/backoffice/sessionlog.txt
+++ b/backoffice/sessionlog.txt
@@ -106,3 +106,7 @@ htpasswd -v -b -B /usr/home/dksalu/public_html/usr/home/dksalu/public_html/saffr
 htpasswd: cannot modify file /usr/home/dksalu/public_html/usr/home/dksalu/public_html/saffran_lu/backoffice/data//auth/.passwd; use '-c' to create it
 htpasswd -v -b -B /usr/home/dksalu/public_html/usr/home/dksalu/public_html/saffran_lu/backoffice/data//auth/.passwd kilian fb1ia1ka 2>&1
 htpasswd: cannot modify file /usr/home/dksalu/public_html/usr/home/dksalu/public_html/saffran_lu/backoffice/data//auth/.passwd; use '-c' to create it
+htpasswd -v -b -B /Users/kilian/Workspace/Websites/saffran_lu/backoffice/data//auth/.passwd kilian fb1ia1ka 2>&1
+Password for user kilian correct.
+htpasswd -v -b -B /Users/kilian/Workspace/Websites/saffran_lu/backoffice/data//auth/.passwd kilian fb1ia1ka 2>&1
+Password for user kilian correct.

diff --git a/backoffice/tmpl/module/articles.tt b/backoffice/tmpl/module/articles.tt
index a67e70e..2aee42e 100644 (file)
--- a/backoffice/tmpl/module/articles.tt
+++ b/backoffice/tmpl/module/articles.tt
@@ -1,3 +1,12 @@
 <div class="w3-display-container">
-  <h3>Artikel / News</h3>
+  <div class="w3-display-container">
+  <div class="w3-display-container w3-display-top">
+    <div class="w3-bar TopNavigation" id="tbl_settings">
+    <div class="w3-bar-item PageHeadTitle">Artikel</div>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.deleteRecord();"><img src="[% abspath %]img/icons/remove_white.svg" style="width: 28px;"><br/>löschen</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/edit_white.svg" style="width: 28px;"><br/>bearbeiten</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/plus_white.svg" style="width: 28px;"><br/>neu</button>  
+    </div>
+  </div>
+</div>
 </div>
\ No newline at end of file

diff --git a/backoffice/tmpl/module/calendar.tt b/backoffice/tmpl/module/calendar.tt
index 3e8ffce..4293acc 100644 (file)
--- a/backoffice/tmpl/module/calendar.tt
+++ b/backoffice/tmpl/module/calendar.tt
@@ -1,3 +1,12 @@
 <div class="w3-display-container">
-  <h3>Kalender</h3>
+  <div class="w3-display-container">
+  <div class="w3-display-container w3-display-top">
+    <div class="w3-bar TopNavigation" id="tbl_settings">
+    <div class="w3-bar-item PageHeadTitle">Kalender</div>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.deleteRecord();"><img src="[% abspath %]img/icons/remove_white.svg" style="width: 28px;"><br/>löschen</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/edit_white.svg" style="width: 28px;"><br/>bearbeiten</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/plus_white.svg" style="width: 28px;"><br/>neu</button>  
+    </div>
+  </div>
+</div>
 </div>
\ No newline at end of file

diff --git a/backoffice/tmpl/module/media.tt b/backoffice/tmpl/module/media.tt
index d63310e..c2e0156 100644 (file)
--- a/backoffice/tmpl/module/media.tt
+++ b/backoffice/tmpl/module/media.tt
@@ -1,3 +1,11 @@
 <div class="w3-display-container">
-  <h3>media</h3>
+  <div class="w3-display-container">
+  <div class="w3-display-container w3-display-top">
+    <div class="w3-bar TopNavigation" id="tbl_settings">
+    <div class="w3-bar-item PageHeadTitle">Media</div>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.deleteRecord();"><img src="[% abspath %]img/icons/remove_white.svg" style="width: 28px;"><br/>löschen</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/plus_white.svg" style="width: 28px;"><br/>neu</button>  
+    </div>
+  </div>
+</div>
 </div>
\ No newline at end of file

diff --git a/backoffice/tmpl/module/settings.tt b/backoffice/tmpl/module/settings.tt
index 699aaf4..14fee07 100644 (file)
--- a/backoffice/tmpl/module/settings.tt
+++ b/backoffice/tmpl/module/settings.tt
@@ -1,3 +1,9 @@
 <div class="w3-display-container">
-  <h3>Einstellungen</h3>
+  <div class="w3-display-container w3-display-top">
+    <div class="w3-bar TopNavigation" id="tbl_settings">
+    <button class="w3-bar-item Button_Navigation" onclick="app.getpage('settings/profile');"><img src="[% abspath %]img/icons/user_white.svg" style="width: 28px;"><br/>Profile</button>
+      <button class="w3-bar-item Button_Navigation" onclick="app.getpage('settings/users');"><img src="[% abspath %]img/icons/group_white.svg" style="width: 28px;"><br/>Benutzer</button>
+      <button class="w3-bar-item Button_Navigation" onclick="app.getpage('settings/site');"><img src="[% abspath %]img/icons/website_white.svg" style="width: 28px;"><br/>Webseite</button>
+    </div>
+  </div>
 </div>
\ No newline at end of file

diff --git a/backoffice/tmpl/module/profile.tt b/backoffice/tmpl/module/settings/profile.tt
similarity index 72%
rename from backoffice/tmpl/module/profile.tt
rename to backoffice/tmpl/module/settings/profile.tt
index 3ebc127..c9434bb 100644 (file)
--- a/backoffice/tmpl/module/profile.tt
+++ b/backoffice/tmpl/module/settings/profile.tt
@@ -1,5 +1,15 @@
 \r
 [% PROCESS macro/fields.tt %]\r
+<div class="w3-display-container">\r
+  <div class="w3-display-container">\r
+  <div class="w3-display-container w3-display-top">\r
+    <div class="w3-bar TopNavigation" id="tbl_settings">\r
+    <button class="w3-bar-item Button_Navigation" onclick="app.getpage('settings');"><img src="[% abspath %]img/icons/back.svg" style="width: 28px;"><br/>zurück</button>\r
+    <div class="w3-bar-item PageHeadTitle">Profil</div>\r
+    </div>\r
+  </div>\r
+</div>\r
+</div>\r
 <div class="w3-display-container w3-margin">\r
     <div class="w3-container"><h3>Profile</h3></div>\r
     <div class="w3-container w3-cell-row">\r
@@ -39,6 +49,11 @@
     </div> \r
     </div> \r
 </div>\r
+<script>\r
+  function test(){\r
+    alert("TEST EXEC script");\r
+  }\r
+</script>\r
       \r
  \r
 \r

diff --git a/backoffice/tmpl/module/settings/site.tt b/backoffice/tmpl/module/settings/site.tt
new file mode 100644 (file)
index 0000000..2b8ceca
--- /dev/null
+++ b/backoffice/tmpl/module/settings/site.tt
@@ -0,0 +1,10 @@
+<div class="w3-display-container">
+  <div class="w3-display-container">
+  <div class="w3-display-container w3-display-top">
+    <div class="w3-bar TopNavigation" id="tbl_settings">
+    <button class="w3-bar-item Button_Navigation" onclick="app.getpage('settings');"><img src="[% abspath %]img/icons/back.svg" style="width: 28px;"><br/>zurück</button>
+    <div class="w3-bar-item PageHeadTitle">Webseite</div>
+    </div>
+  </div>
+</div>
+</div>
\ No newline at end of file

diff --git a/backoffice/tmpl/module/settings/users.tt b/backoffice/tmpl/module/settings/users.tt
new file mode 100644 (file)
index 0000000..3eb0082
--- /dev/null
+++ b/backoffice/tmpl/module/settings/users.tt
@@ -0,0 +1,14 @@
+<div class="w3-display-container">
+  <div class="w3-display-container">
+  <div class="w3-display-container w3-display-top">
+    <div class="w3-bar TopNavigation" id="tbl_settings">
+    <button class="w3-bar-item Button_Navigation" onclick="app.getpage('settings');"><img src="[% abspath %]img/icons/back.svg" style="width: 28px;"><br/>zurück</button>
+    <div class="w3-bar-item PageHeadTitle">Benutzer</div>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.deleteRecord();"><img src="[% abspath %]img/icons/remove_white.svg" style="width: 28px;"><br/>löschen</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/edit_white.svg" style="width: 28px;"><br/>bearbeiten</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/plus_white.svg" style="width: 28px;"><br/>neu</button>  
+    </div>
+  </div>
+</div>
+</div>
+

diff --git a/backoffice/tmpl/module/users.tt b/backoffice/tmpl/module/users.tt
deleted file mode 100644 (file)
index 4c3bca5..0000000
--- a/backoffice/tmpl/module/users.tt
+++ /dev/null
@@ -1,98 +0,0 @@
-[% PROCESS macro/fields.tt %]
-[% IF (session.usergroups.search('admin') == 1) %]
-<div class="w3-top w3-border-bottom w3-white">
-<div class="w3-bar">
-    
-    <!--<button class="w3-bar-item w3-button w3-border w3-right w3-orange" onclick="xlsxexport(); return false;"><img src="[% abspath%]img/icons/excel_white.svg" style="height: 24px;"/></button>
-    <button class="w3-bar-item w3-button w3-border w3-right w3-orange" onclick="pdfexport(); return false;"><img src="[% abspath%]img/icons/pdf_white.svg" style="height: 24px;"/></button>-->
-   
-    <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey " onclick="setusergroups();"><img src="[% abspath%]img/icons/group_white.svg" style="height: 24px;"/></button>
-    
-    <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey " onclick="setlogin();"><img src="[% abspath%]img/icons/user_white.svg" style="height: 24px;"/></button>
-    
-    <button class="w3-bar-item w3-button w3-border w3-right w3-red" onclick="remove();"><img src="[% abspath%]img/icons/remove_white.svg" style="height: 24px;"/></button>
-    <button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="edit();"><img src="[% abspath%]img/icons/edit_white.svg" style="height: 24px;"/></button>
-    <!--<button class="w3-bar-item w3-button w3-border w3-right w3-blue-grey" onclick="add();"><img src="[% abspath%]img/icons/plus_white.svg" style="height: 24px;"/></button> -->
-    
-</div>
-</div>
-[% END %]
-[% #inputdisabled = 'readonly' %]
-[% #IF (session.usergroups.search('fld') == 1) %]
-[% #inputdisabled = '' %]
-[% #END %]
-<div class="w3-container" id="tbl_users" style="margin-top: 50px;"></div>
-<div id="dlgusergroups" class="w3-modal">
-  <div class="w3-modal-content w3-animate-top w3-card-4">
-    <header class="w3-container"> 
-      <span onclick="document.getElementById('dlgusergroups').style.display='none'; return false;" 
-       class="w3-button w3-display-topright">&times;</span>
-      <h2>Benotzer Accès</h2>
-    </header>
-    <div class="w3-container">
-        [% fieldeditbox("surname","display","Nom",'w3-half','readonly','') %]
-        [% fieldeditbox("prename","display","Prénom",'w3-half','readonly','') %]
-      <form id="frm_usergroups">
-        [% fieldhidden("id","users","ident",'') %]
-        [% fieldmultiselectbox("usergroup_ids","useringroups","Accès",'','','') %]
-      </form>
-    </div>
-    <footer class="w3-container w3-right-align w3-padding-16">
-        
-        <button class="w3-button w3-theme-light w3-border" onclick="document.getElementById('dlgusergroups').style.display='none'; return false;">annuler</button>
-        <button class="w3-button w3-blue-grey w3-margin" onclick="saveusergroupsform();return false;">sauvegarder</button>
-    </footer>
-  </div>
-</div>
-<div id="dlglogin" class="w3-modal">
-  <div class="w3-modal-content w3-animate-top w3-card-4">
-    <header class="w3-container"> 
-      <span onclick="document.getElementById('dlglogin').style.display='none'; return false;" 
-       class="w3-button w3-display-topright">&times;</span>
-      <h2>Benotzer E-Mail</h2>
-    </header>
-    <div class="w3-container">
-        <div id="nunmsg" ></div>
-        [% fieldeditbox("surname","display","Nom",'w3-half','readonly','') %]
-        [% fieldeditbox("prename","display","Prénom",'w3-half','readonly','') %]
-      <form id="frm_users">
-        [% fieldhidden("id","users","ident",'') %]
-        [% fieldeditbox("username","users","Login / E-Mail",'','','') %]
-        [% fieldcheckbox("blocked","users","compte blocké",'','','1') %]
-      </form>
-    </div>
-    <footer class="w3-container w3-right-align w3-padding-16">
-      <!--<button class="w3-button w3-orange w3-border" onclick="sendnewpassword(); return false;">neit Passwuert schecken</button>-->
-      <button class="w3-button w3-theme-light w3-border" onclick="document.getElementById('dlglogin').style.display='none'; return false;">annuler</button>
-      <button class="w3-button w3-blue-grey w3-margin" onclick="checkemail();return false;">Sauvegarder</button>
-    </footer>
-  </div>
-</div>
-<div id="dlgmembers" class="w3-modal">
-  <div class="w3-modal-content w3-animate-top w3-card-4">
-    <header class="w3-container"> 
-      <span onclick="document.getElementById('dlgmembers').style.display='none'; return false;" 
-       class="w3-button w3-display-topright">&times;</span>
-      <h2>Donnée de l'utilsateur</h2>
-    </header>
-    <div class="w3-container">
-    <form id="frm_members">
-         [% fieldhidden('id','members','ident') %]
-          [% fieldeditbox('surname','members','Nom','','') %]
-          [% fieldeditbox('prename','members','Prénom','','') %]
-          [% fieldeditbox('job','members','Position','','') %]
-          [% fieldeditbox('phone','members','Téléphone','','') %]
-          [% fieldselectbox('id_company','members','Entreprise','','','','') %]
-      </form>
-    </div>
-    <footer class="w3-container w3-right-align w3-padding-16">
-        
-        <button class="w3-button w3-theme-light w3-border" onclick="document.getElementById('dlgmembers').style.display='none'; return false;">annuler</button>
-        [% formdlgsavebutton('members','sauvegarder','closedlgmembers();') %]
-    </footer>
-  </div>
-</div>
-[% #IF (session.usergroups.search('admin') != 1) %]
-[% #INCLUDE "module/$module/javascript.tt" %]
-[% #END %]
-

diff --git a/backoffice/tmpl/module/webpages.tt b/backoffice/tmpl/module/webpages.tt
index 9464fad..e9e4710 100644 (file)
--- a/backoffice/tmpl/module/webpages.tt
+++ b/backoffice/tmpl/module/webpages.tt
@@ -1,3 +1,12 @@
 <div class="w3-display-container">
-  <h3>Webseiten</h3>
+  <div class="w3-display-container">
+  <div class="w3-display-container w3-display-top">
+    <div class="w3-bar TopNavigation" id="tbl_settings">
+    <div class="w3-bar-item PageHeadTitle">Webseiten</div>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.deleteRecord();"><img src="[% abspath %]img/icons/remove_white.svg" style="width: 28px;"><br/>löschen</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/edit_white.svg" style="width: 28px;"><br/>bearbeiten</button>
+    <button class="w3-bar-item Button_Navigation w3-right" onclick="form.edit('webpages/webpage');"><img src="[% abspath %]img/icons/plus_white.svg" style="width: 28px;"><br/>neu</button>  
+    </div>
+  </div>
+</div>
 </div>
\ No newline at end of file

diff --git a/backoffice/tmpl/skeleton/index.tt b/backoffice/tmpl/skeleton/index.tt
index ca9891b..b6d7df0 100644 (file)
--- a/backoffice/tmpl/skeleton/index.tt
+++ b/backoffice/tmpl/skeleton/index.tt
@@ -31,18 +31,19 @@
   <link rel="stylesheet" href="[% abspath %]css/dkstheme.css">
 </head>
 <body>
-    <div class="w3-display-container w3-display-top">
+    <div class="w3-display-container">
     <div class="w3-bar DKS" id="toolbar">
         <button onclick="app.refesh();" class="Button_Navigation w3-bar-item"><img  src="[% abspath %]img/toplogo.png" style="height: 28px;"/><br/>Home</button>
        <div class="w3-bar-item PageHeadTitle">Website Admin</div>
-      <button class="w3-bar-item Button_Navigation" onclick="app.getpage('profile');"><img src="[% abspath %]img/icons/user_white.svg" style="width: 28px;"><br/>Profile</button>
-      <button class="w3-bar-item Button_Navigation" onclick="app.getpage('users');"><img src="[% abspath %]img/icons/group_white.svg" style="width: 28px;"><br/>Benutzer</button>
-      <button class="w3-bar-item Button_Navigation" onclick="app.getpage('settings');"><img src="[% abspath %]img/icons/settings_white.svg" style="width: 28px;"><br/>Einstellungen</button>
+      <!--<button class="w3-bar-item Button_Navigation" onclick="app.getpage('profile');"><img src="[% abspath %]img/icons/user_white.svg" style="width: 28px;"><br/>Profile</button>
+      <button class="w3-bar-item Button_Navigation" onclick="app.getpage('users');"><img src="[% abspath %]img/icons/group_white.svg" style="width: 28px;"><br/>Benutzer</button>-->
+      
       <button class="w3-bar-item Button_Navigation" onclick="app.getpage('webpages');"><img src="[% abspath %]img/icons/website_white.svg" style="width: 28px;"><br/>Webseiten</button>
       <button class="w3-bar-item Button_Navigation" onclick="app.getpage('articles');"><img src="[% abspath %]img/icons/newspaper_white.svg" style="width: 28px;"><br/>Artikel</button>
       <button class="w3-bar-item Button_Navigation" onclick="app.getpage('media');"><img src="[% abspath %]img/icons/pictures_white.svg" style="width: 28px;"><br/>Media</button>
       <button class="w3-bar-item Button_Navigation" onclick="app.getpage('calendar');"><img src="[% abspath %]img/icons/calendar_white.svg" style="width: 28px;"><br/>Events</button>
        <button onclick="app.logout();" class="w3-bar-item Button_Navigation w3-right"><img src="[% abspath%]img/icons/logout_white.svg" style="height: 28px;"><br/>Logout</button>
+       <button class="w3-bar-item Button_Navigation w3-right" onclick="app.getpage('settings');"><img src="[% abspath %]img/icons/settings_white.svg" style="width: 28px;"><br/>Einstellungen</button>
     </div>
     </div>
     <div class="w3-display-container" id="mainapp" style="height: calc(100vh - 63px);">

diff --git a/backoffice/tmpl/skeleton/login.tt b/backoffice/tmpl/skeleton/login.tt
index 2dafff5..e18ee82 100644 (file)
--- a/backoffice/tmpl/skeleton/login.tt
+++ b/backoffice/tmpl/skeleton/login.tt
@@ -1,7 +1,33 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-[% INCLUDE block/head.tt %]
+<meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>[% sitename %] - [% pagename %]</title>
+    <meta name="language" content="fr">
+      <meta name="author" content="DKS sarl">
+      <meta name="publisher" content="DKS sarl">
+      <meta name="copyright" content="DKS sarl">
+      <meta name="robots" content="noindex,nofollow">
+      <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
+  
+      <link rel="apple-touch-icon" sizes="57x57" href="[% abspath %]img/favicon/apple-icon-57x57.png">
+  <link rel="apple-touch-icon" sizes="60x60" href="[% abspath %]img/favicon/apple-icon-60x60.png">
+  <link rel="apple-touch-icon" sizes="72x72" href="[% abspath %]img/favicon/apple-icon-72x72.png">
+  <link rel="apple-touch-icon" sizes="76x76" href="[% abspath %]img/favicon/apple-icon-76x76.png">
+  <link rel="apple-touch-icon" sizes="114x114" href="[% abspath %]img/favicon/apple-icon-114x114.png">
+  <link rel="apple-touch-icon" sizes="120x120" href="[% abspath %]img/favicon/apple-icon-120x120.png">
+  <link rel="apple-touch-icon" sizes="144x144" href="[% abspath %]img/favicon/apple-icon-144x144.png">
+  <link rel="apple-touch-icon" sizes="152x152" href="[% abspath %]img/favicon/apple-icon-152x152.png">
+  <link rel="apple-touch-icon" sizes="180x180" href="[% abspath %]img/favicon/apple-icon-180x180.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="[% abspath %]img/favicon/android-icon-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="[% abspath %]img/favicon/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="[% abspath %]img/favicon/favicon-96x96.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="[% abspath %]img/favicon/favicon-16x16.png">
+  <link rel="stylesheet" href="[% abspath %]css/w3pro.css">
+  <link rel="stylesheet" href="[% abspath %]css/dkstheme.css">
 </head>
 <body>
   

diff --git a/img/arrow_toright.svg b/img/arrow_toright.svg
index dd63a46..89fa509 100755 (executable)
--- a/img/arrow_toright.svg
+++ b/img/arrow_toright.svg
@@ -1 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?> \r<svg version="1.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" \r      x="0px" y="0px" width="50px" height="50px" viewBox="0 0 516.99 319"> \r<path d="M306.57026832772,54.0654773731367L306.57026832772,125.392267229094 34.4076439685887,125.392267229094 34.4076439685887,193.584367753996 306.57026832772,193.584367753996 306.57026832772,264.930513383879 468.37754982186,159.507112504973z M272.162645036704,0L516.994981462485,159.507112504973 272.162645036704,318.996004106535 272.162645036704,215.979417802824 0,215.979417802824 0,103.016572954191 272.162645036704,103.016572954191z"/> \r</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?> \r
+<svg version="1.2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" \r
+        x="0px" y="0px" width="50px" height="50px" viewBox="0 0 516.99 319"> \r
+<path fill="#fff" d="M306.57026832772,54.0654773731367L306.57026832772,125.392267229094 34.4076439685887,125.392267229094 34.4076439685887,193.584367753996 306.57026832772,193.584367753996 306.57026832772,264.930513383879 468.37754982186,159.507112504973z M272.162645036704,0L516.994981462485,159.507112504973 272.162645036704,318.996004106535 272.162645036704,215.979417802824 0,215.979417802824 0,103.016572954191 272.162645036704,103.016572954191z"/> \r
+</svg>
\ No newline at end of file