Merge branch 'master' of https://github.com/devcode-it/openstamanager
This commit is contained in:
commit
64fe9439c0
|
@ -88,6 +88,7 @@ database.sql
|
|||
VERSION
|
||||
REVISION
|
||||
.php_cs.cache
|
||||
manifest.json
|
||||
|
||||
/tests/_log/*
|
||||
/tests/_temp/*
|
||||
|
|
|
@ -880,3 +880,8 @@ input.small-width {
|
|||
max-width: 20px;
|
||||
max-height: 20px;
|
||||
}
|
||||
|
||||
.logo-image {
|
||||
max-width: 100px;
|
||||
max-height: 100px;
|
||||
}
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 55 KiB |
Binary file not shown.
Before Width: | Height: | Size: 23 KiB |
|
@ -30,7 +30,7 @@ function init() {
|
|||
// Aggiunta nell'URL del nome tab su cui tornare dopo il submit
|
||||
// Blocco del pulsante di submit dopo il primo submit
|
||||
$('form').on("submit", function(e) {
|
||||
if ($(this).parsley().validate() && e.result) {
|
||||
if ($(this).parsley().validate() && (e.result == undefined || e.result)) {
|
||||
$(this).submit(function () {
|
||||
return false;
|
||||
});
|
||||
|
|
|
@ -81,10 +81,10 @@ if (Auth::check()) {
|
|||
|
||||
</script>';
|
||||
|
||||
echo '
|
||||
<script>$(document).ready(init)</script>';
|
||||
}
|
||||
|
||||
echo '
|
||||
<script>$(document).ready(init)</script>';
|
||||
echo '
|
||||
</body>
|
||||
</html>';
|
||||
|
|
|
@ -162,6 +162,30 @@ $db_name = \'|database|\';
|
|||
}
|
||||
// Continua con l'esecuzione delle operazioni previste
|
||||
else {
|
||||
// Creazione manifest.json
|
||||
$manifest = '{
|
||||
"dir" : "ltr",
|
||||
"lang" : "it-IT",
|
||||
"name" : "OpenSTAManager",
|
||||
"scope" : "'.ROOTDIR.'",
|
||||
"display" : "fullscreen",
|
||||
"start_url" : "'.ROOTDIR.'",
|
||||
"short_name" : "OSM",
|
||||
"theme_color" : "transparent",
|
||||
"description" : "OpenSTAManager",
|
||||
"orientation" : "any",
|
||||
"background_color" : "transparent",
|
||||
"generated" : "true",
|
||||
"icons" : [
|
||||
{
|
||||
"src": "assets/dist/img/logo.png",
|
||||
"type": "image/png",
|
||||
"sizes": "512x512"
|
||||
}
|
||||
]
|
||||
}';
|
||||
file_put_contents('manifest.json', $manifest);
|
||||
|
||||
redirect(ROOTDIR.'/index.php');
|
||||
exit();
|
||||
}
|
||||
|
@ -286,7 +310,7 @@ if (empty($creation) && (!file_exists('config.inc.php') || !$valid_config)) {
|
|||
echo '
|
||||
<div class="box box-center-large box-warning">
|
||||
<div class="box-header with-border text-center">
|
||||
<img src="'.$img.'/logo.png" alt="'.tr('OSM Logo').'">
|
||||
<img src="'.$img.'/logo.png" class="logo-image" alt="'.tr('OSM Logo').'">
|
||||
<h3 class="box-title">'.tr('OpenSTAManager').'</h3>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -105,7 +105,7 @@ $img = App::getPaths()['img'];
|
|||
echo '
|
||||
<div class="box box-center-large box-warning">
|
||||
<div class="box-header with-border text-center">
|
||||
<img src="'.$img.'/logo.png" alt="'.tr('OSM Logo').'">
|
||||
<img src="'.$img.'/logo.png" class="logo-image" alt="'.tr('OSM Logo').'">
|
||||
<h3 class="box-title">'.tr('OpenSTAManager').'</h3>
|
||||
</div>
|
||||
|
||||
|
|
|
@ -21,6 +21,11 @@ echo '<!DOCTYPE html>
|
|||
|
||||
<link href="'.$paths['img'].'/favicon.png" rel="icon" type="image/x-icon" />';
|
||||
|
||||
if (file_exists(DOCROOT.'/manifest.json')){
|
||||
echo '
|
||||
<link rel="manifest" href="'.ROOTDIR.'/manifest.json">';
|
||||
}
|
||||
|
||||
// CSS
|
||||
foreach (App::getAssets()['css'] as $style) {
|
||||
echo '
|
||||
|
|
|
@ -129,7 +129,7 @@ if (!empty(flash()->getMessage('error'))) {
|
|||
echo '
|
||||
<form action="?op=login" method="post" class="login-box box" autocomplete="off" >
|
||||
<div class="box-header with-border text-center">
|
||||
<img src="'.App::getPaths()['img'].'/logo.png" alt="'.tr('OSM Logo').'">
|
||||
<img src="'.App::getPaths()['img'].'/logo.png" class="logo-image" alt="'.tr('OSM Logo').'">
|
||||
<h3 class="box-title">'.tr('OpenSTAManager').'</h3>
|
||||
</div>
|
||||
|
||||
|
|
2
info.php
2
info.php
|
@ -11,7 +11,7 @@ include_once App::filepath('include|custom|', 'top.php');
|
|||
echo '
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<img src="'.$paths['img'].'/logo.png" alt="'.tr('OSM Logo').'">
|
||||
<img src="'.$paths['img'].'/logo.png" class="logo-image" alt="'.tr('OSM Logo').'">
|
||||
<h3 class="box-title">'.tr('OpenSTAManager').'</h3>
|
||||
<div class="pull-right">
|
||||
<i class="fa fa-info"></i> '.tr('Informazioni').'
|
||||
|
|
Loading…
Reference in New Issue