roko.li/sharee.bike
4
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-05-17 14:26:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

example global.cfg minor change

Browse source
This commit is contained in:
ragu 2022-12-13 09:30:09 +01:00
parent a2c35b2b7e
commit d786a0f30e
4 changed files with 12 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copri4/main/external
View file

@ -1 +1 @@
/var/www/external
/var/www/copri4external

33
copri4/mkaccess2.sh → copri4/mkaccess.sh
View file

@ -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

16
copri4/shareeconf/examples/global.cfg
View file

@ -212,7 +212,7 @@
2 = "lesen & schreiben"
</permission>
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"
</copri_conf>
#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"
</shareeapp_conf>
#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"
</shareedms_conf>

11
copri4/shareedms-operator/src/Lib/Mlogic.pm
View file

@ -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 "</div>";
print "</div>";
}
@ -320,15 +320,6 @@ sub tplselect(){
#print Dumper($node_meta);
#exit;
print <<EOF
<script>
\$(function(){
\$('.autos').autosize({append: '\\n'});
});
</script>
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);