diff --git a/copri4/main/external b/copri4/main/external index fa6f135..8e3e74e 120000 --- a/copri4/main/external +++ b/copri4/main/external @@ -1 +1 @@ -/var/www/external \ No newline at end of file +/var/www/copri4external \ No newline at end of file diff --git a/copri4/mkaccess2.sh b/copri4/mkaccess.sh similarity index 65% rename from copri4/mkaccess2.sh rename to copri4/mkaccess.sh index 0bc1582..bc83c32 100755 --- a/copri4/mkaccess2.sh +++ b/copri4/mkaccess.sh @@ -6,7 +6,7 @@ echo "YOur working directory:"; pwd -echo "" +echo "Set up file access rights. Please also check if it meets your needs" chgrp -R www-data * chmod go-w * @@ -35,35 +35,6 @@ for i in $(find . -type d -and -name cronjobs); do chmod -R g-w $i/*;done for i in $(find . -type d -and -name cronjobs); do chmod -R o+r $i/*;done for i in $(find . -type d -and -name cronjobs); do chown -R root:root $i/*;done -#do it only once on migration -if [ 1 == 2 ] -then - -#delete jquery and bootstrap links -for i in $(find . -type l -and -name 'jquery*'); do rm $i;done -for i in $(find . -type l -and -name 'bootstrap*'); do rm $i;done - -mkdir -p /var/www/external -mv /etc/shareeconf/bootstrap-5.1.3-dist /var/www/external/. -mv /etc/shareeconf/bootstrap-5.0.2-dist /var/www/external/. -mv /etc/shareeconf/bootstrap-icons-1.8.1 /var/www/external/. -mv /etc/shareeconf/jquery-3.3.1.min.js /var/www/external/. -mv /etc/shareeconf/jquery-ui-1.12.1 /var/www/external/. - -#make new links for external bibliothecs -ln -s main/external /var/www/external +echo "... done" -#linking operators to main/external -for i in $(find . -type d -and -name 'shareedms-*') - do ln -s ../main/external $i/external -done -for i in $(find . -type d -and -name 'shareeapp-*') - do ln -s ../main/external $i/external -done -for i in $(find . -type d -and -name 'shareeweb-*') - do ln -s ../main/external $i/external -done - -fi -#end diff --git a/copri4/shareeconf/examples/global.cfg b/copri4/shareeconf/examples/global.cfg index 613aac1..551771c 100755 --- a/copri4/shareeconf/examples/global.cfg +++ b/copri4/shareeconf/examples/global.cfg @@ -212,7 +212,7 @@ 2 = "lesen & schreiben" jsscript = "js/mobile_script.js" - style_bootstrap_icons = "external/bootstrap-icons-1.8.1/font/bootstrap-icons.css" + style_bootstrap_icons = "external/bootstrap-icons-1.10.2/bootstrap-icons.css" #sharee WebApp sepcific para @@ -229,8 +229,8 @@ local_style = "css/local_style2022-03-20.css" jquery = "" - js_bootstrap = "external/bootstrap-5.1.3-dist/js/bootstrap.min.js" - style_bootstrap = "external/bootstrap-5.1.3-dist/css/bootstrap.css" + js_bootstrap = "external/bootstrap-5.2.3-dist/js/bootstrap.bundle.min.js" + style_bootstrap = "external/bootstrap-5.2.3-dist/css/bootstrap.css" #sharee DMS/COPRI specific para @@ -255,11 +255,11 @@ order_state = "|angerufen|eMail gesendet|in Arbeit|cronjob fail" local_style = "css/local_style20221205.css" - jquery = "external/jquery-3.3.1.min.js" - jquery_ui = "external/jquery-ui-1.12.1/jquery-ui.min.js" - style_jquery_ui = "external/jquery-ui-1.12.1/jquery-ui.min.css" - js_bootstrap = "external/bootstrap-5.0.2-dist/js/bootstrap.min.js" - style_bootstrap = "external/bootstrap-5.0.2-dist/css/bootstrap.min.css" + jquery = "external/jquery-3.6.1.min.js" + jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.js" + style_jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.css" + js_bootstrap = "external/bootstrap-5.2.3-dist/js/bootstrap.bundle.min.js" + style_bootstrap = "external/bootstrap-5.2.3-dist/css/bootstrap.min.css" mod_active = "Waren|Faktura|Karte|Kunden|Mietjournal|Alarmjournal|Einstellung" modes = "login|logout|logout_sharee|user|manager|supervisor|admin|maintainer" diff --git a/copri4/shareedms-operator/src/Lib/Mlogic.pm b/copri4/shareedms-operator/src/Lib/Mlogic.pm index 0597ea3..1e8debb 100755 --- a/copri4/shareedms-operator/src/Lib/Mlogic.pm +++ b/copri4/shareedms-operator/src/Lib/Mlogic.pm @@ -92,7 +92,7 @@ sub tpl(){ } print $q->div({-id=>'Headerlogin'},"$users_sharee->{txt08} ", $q->span({-id=>"owner", -style=>"color:silver"}, "($users_dms->{u_id})")),"\n"; - print $q->div({-id=>'Headerlogin'},$q->a({-href=>"logout"},$q->img({-style=>'padding:0px 10px;',-src=>"$varenv->{metahost}/img/logout.svg"}))),"\n"; + print $q->div({-id=>'Headerlogin'},$q->a({-href=>"logout",-title=>'logout'},$q->span({-class=>"bi bi-door-open", -style=>'font-size:1em;color:white;padding-right:1em;'}))),"\n"; print ""; print ""; } @@ -320,15 +320,6 @@ sub tplselect(){ #print Dumper($node_meta); #exit; -print < - \$(function(){ - \$('.autos').autosize({append: '\\n'}); - }); - -EOF -; - if($node_meta->{tpl_id} =~ /195|199/ && $node_meta->{ct_table} eq "contentuser"){ require "Tpl/SubListe.pm"; $return = &SubListe::tpl($node_meta,$users_dms,$mode,$return);