From: kilian (ksmachome) Date: Wed, 1 Apr 2020 06:50:04 +0000 (+0200) Subject: v20200401 X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=2b12b001175ef4d90c4b372d11c4a6b4511c20bb;p=saffran_lu.git 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 new mode 100755 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 --- 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 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 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 index 0000000..89fa509 --- /dev/null +++ b/backoffice/img/icons/arrow_toright.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/backoffice/img/icons/back.svg b/backoffice/img/icons/back.svg new file mode 100755 index 0000000..6ef61e6 --- /dev/null +++ b/backoffice/img/icons/back.svg @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/backoffice/js/app.js b/backoffice/js/app.js index 278638e..c4e34e1 100644 --- a/backoffice/js/app.js +++ b/backoffice/js/app.js @@ -11,7 +11,8 @@ var app = { // } }, loadpage: function(data){ - document.getElementById("mainapp").innerHTML = data; + document.getElementById("mainapp").innerHTML = data; + }, // sidebarclick: function(modulepage, modulename) { // admin.loadpage(modulepage, modulename); @@ -40,6 +41,7 @@ function reload_page() { location.href = location.href; } + // function closeSidebar(){ // document.getElementById("sidebar").style.display = "none"; // document.getElementById("main").style.margin = "0 0 0 0"; diff --git a/backoffice/sessionlog.txt b/backoffice/sessionlog.txt index 6ffad5c..ef490ec 100644 --- 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 --- a/backoffice/tmpl/module/articles.tt +++ b/backoffice/tmpl/module/articles.tt @@ -1,3 +1,12 @@
-

Artikel / News

+
+
+
+
Artikel
+ + + +
+
+
\ No newline at end of file diff --git a/backoffice/tmpl/module/calendar.tt b/backoffice/tmpl/module/calendar.tt index 3e8ffce..4293acc 100644 --- a/backoffice/tmpl/module/calendar.tt +++ b/backoffice/tmpl/module/calendar.tt @@ -1,3 +1,12 @@
-

Kalender

+
+
+
+
Kalender
+ + + +
+
+
\ No newline at end of file diff --git a/backoffice/tmpl/module/media.tt b/backoffice/tmpl/module/media.tt index d63310e..c2e0156 100644 --- a/backoffice/tmpl/module/media.tt +++ b/backoffice/tmpl/module/media.tt @@ -1,3 +1,11 @@
-

media

+
+
+
+
Media
+ + +
+
+
\ No newline at end of file diff --git a/backoffice/tmpl/module/settings.tt b/backoffice/tmpl/module/settings.tt index 699aaf4..14fee07 100644 --- a/backoffice/tmpl/module/settings.tt +++ b/backoffice/tmpl/module/settings.tt @@ -1,3 +1,9 @@
-

Einstellungen

+
+
+ + + +
+
\ 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 --- a/backoffice/tmpl/module/profile.tt +++ b/backoffice/tmpl/module/settings/profile.tt @@ -1,5 +1,15 @@ [% PROCESS macro/fields.tt %] +
+
+
+
+ +
Profil
+
+
+
+

Profile

@@ -39,6 +49,11 @@
+ diff --git a/backoffice/tmpl/module/settings/site.tt b/backoffice/tmpl/module/settings/site.tt new file mode 100644 index 0000000..2b8ceca --- /dev/null +++ b/backoffice/tmpl/module/settings/site.tt @@ -0,0 +1,10 @@ +
+
+
+
+ +
Webseite
+
+
+
+
\ 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 index 0000000..3eb0082 --- /dev/null +++ b/backoffice/tmpl/module/settings/users.tt @@ -0,0 +1,14 @@ +
+
+
+
+ +
Benutzer
+ + + +
+
+
+
+ diff --git a/backoffice/tmpl/module/users.tt b/backoffice/tmpl/module/users.tt deleted file mode 100644 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) %] -
-
- - - - - - - - - - - -
-
-[% END %] -[% #inputdisabled = 'readonly' %] -[% #IF (session.usergroups.search('fld') == 1) %] -[% #inputdisabled = '' %] -[% #END %] -
-
-
-
- × -

Benotzer Accès

-
-
- [% fieldeditbox("surname","display","Nom",'w3-half','readonly','') %] - [% fieldeditbox("prename","display","Prénom",'w3-half','readonly','') %] -
- [% fieldhidden("id","users","ident",'') %] - [% fieldmultiselectbox("usergroup_ids","useringroups","Accès",'','','') %] -
-
-
- - - -
-
-
-
-
-
- × -

Benotzer E-Mail

-
-
-
- [% fieldeditbox("surname","display","Nom",'w3-half','readonly','') %] - [% fieldeditbox("prename","display","Prénom",'w3-half','readonly','') %] -
- [% fieldhidden("id","users","ident",'') %] - [% fieldeditbox("username","users","Login / E-Mail",'','','') %] - [% fieldcheckbox("blocked","users","compte blocké",'','','1') %] -
-
-
- - - -
-
-
-
-
-
- × -

Donnée de l'utilsateur

-
-
-
- [% 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','','','','') %] -
-
-
- - - [% formdlgsavebutton('members','sauvegarder','closedlgmembers();') %] -
-
-
-[% #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 --- a/backoffice/tmpl/module/webpages.tt +++ b/backoffice/tmpl/module/webpages.tt @@ -1,3 +1,12 @@
-

Webseiten

+
+
+
+
Webseiten
+ + + +
+
+
\ No newline at end of file diff --git a/backoffice/tmpl/skeleton/index.tt b/backoffice/tmpl/skeleton/index.tt index ca9891b..b6d7df0 100644 --- a/backoffice/tmpl/skeleton/index.tt +++ b/backoffice/tmpl/skeleton/index.tt @@ -31,18 +31,19 @@ -
+
Website Admin
- - - + + +
diff --git a/backoffice/tmpl/skeleton/login.tt b/backoffice/tmpl/skeleton/login.tt index 2dafff5..e18ee82 100644 --- a/backoffice/tmpl/skeleton/login.tt +++ b/backoffice/tmpl/skeleton/login.tt @@ -1,7 +1,33 @@ -[% INCLUDE block/head.tt %] + + + [% sitename %] - [% pagename %] + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/arrow_toright.svg b/img/arrow_toright.svg index dd63a46..89fa509 100755 --- a/img/arrow_toright.svg +++ b/img/arrow_toright.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + \ No newline at end of file