loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Migliorie minori

This commit is contained in:
Luca 2019-05-16 19:36:57 +02:00
parent 960f70baed
commit 680540ab57
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/my_impianti/plugins/my_impianti.componenti.php
View File

@ -95,7 +95,7 @@ $cmp = \Util\Ini::getList($docroot.'/files/my_impianti/', $id_list);
echo ' echo '
<div class="row"> <div class="row">
<div class="col-md-4 col-md-push-6"> <div class="col-md-9">
<select class="superselect" id="filename" name="filename">'; <select class="superselect" id="filename" name="filename">';
if (count($cmp) > 0) { if (count($cmp) > 0) {
@ -114,7 +114,7 @@ echo '
</select> </select>
</div> </div>
<div class="col-md-2 col-md-push-6">'; <div class="col-md-3">';
echo " echo "
<a class=\"btn btn-primary btn-block\" id=\"addta\" href=\"javascript:;\" onclick=\"if ( $('#filename').val()!='0' ){ redirect('".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record."&op=linkcomponente&backto=record-edit&filename='+$('#filename').val() + '&hash=tab_".$id_plugin."');}else{ alert('".tr('Seleziona prima un componente')."'); $('#filename').focus(); }\"><i class='fa fa-plus'></i> ".tr('Aggiungi').'</a>'; <a class=\"btn btn-primary btn-block\" id=\"addta\" href=\"javascript:;\" onclick=\"if ( $('#filename').val()!='0' ){ redirect('".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record."&op=linkcomponente&backto=record-edit&filename='+$('#filename').val() + '&hash=tab_".$id_plugin."');}else{ alert('".tr('Seleziona prima un componente')."'); $('#filename').focus(); }\"><i class='fa fa-plus'></i> ".tr('Aggiungi').'</a>';
echo ' echo '
@ -253,23 +253,21 @@ if (!empty($rs2)) {
// Pulsante Salva/Elimina // Pulsante Salva/Elimina
echo ' echo '
<div class="col-md-12"> <div class="col-md-12">
<a class="btn btn-danger ask" data-backto="record-edit" data-op="unlinkcomponente" data-id="'.$rs2[$j]['id'].'"><i class="fa fa-trash"></i> '.tr('Elimina').'</a>';
<button type="submit" class="btn btn-success"><i class="fa fa-check"></i> '.tr('Salva modifiche').'</button>';
// Sostituisci componente con un altro dello stesso tipo, posso sostituire solo i componenti installati // Sostituisci componente con un altro dello stesso tipo, posso sostituire solo i componenti installati
if (empty($rs2[$j]['data_sostituzione'])) { if (empty($rs2[$j]['data_sostituzione'])) {
echo " echo "
<button class=\"btn btn-warning\" onclick=\"if( confirm('".tr('Vuoi sostituire questo componente con un altro dello stesso tipo?')."') ){ location.href='".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'&op=sostituiscicomponente&backto=record-edit&filename='.$filename.'&id='.$rs2[$j]['id']."'; }\"><i class='fa fa-refresh'></i> ".tr('Sostituisci questo componente').'</button>'; <button class=\"btn btn-warning\" onclick=\"if(confirm('".tr('Vuoi sostituire questo componente con un altro dello stesso tipo?')."')){ location.href='".$rootdir.'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'&op=sostituiscicomponente&backto=record-edit&filename='.$filename.'&id='.$rs2[$j]['id']."'; }else{ return false} \"><i class='fa fa-refresh'></i> ".tr('Sostituisci questo componente').'</button>';
} else { } else {
echo ' echo '
<button class="btn btn-warning disabled" disabled>'.tr('Componente già sostituito').'</button>'; <button class="btn btn-warning disabled" disabled>'.tr('Componente già sostituito').'</button>';
} }
echo ' echo '
<a class="btn btn-danger ask" data-backto="record-edit" data-op="unlinkcomponente" data-id="'.$rs2[$j]['id'].'"> <button type="submit" class="btn btn-success pull-right"><i class="fa fa-check"></i> '.tr('Salva modifiche').'</button>';
<i class="fa fa-trash"></i> '.tr('Elimina').'
</a>';
echo ' echo '
</div> </div>

8
modules/my_impianti/plugins/my_impianti.interventi.php
View File

@ -180,11 +180,11 @@ echo '
</div> </div>
</div> </div>
<br><br> <br><br>
<button type="submit" class="btn btn-success" '.$disabled.'><i class="fa fa-check"></i> '.tr('Salva impianti').'</button>
<button type="submit" class="btn btn-success" '.$disabled.'><i class="fa fa-check"></i> '.tr('Salva impianti').'</button></a>
<button type="button" class="btn btn-primary" onclick="launch_modal(\''.tr('Aggiungi impianto').'\', \''.$rootdir.'/modules/my_impianti/add.php?id_module=30&source=Attività&plugin=1\',1);"><i class="fa fa-plus"></i> '.tr('Aggiungi impianti').'</button></a> <button type="button" class="btn btn-primary" data-toggle="modal" data-title="'.tr('Aggiungi impianto').'" data-href="'.$rootdir.'/modules/my_impianti/add.php?id_module='.Modules::get('MyImpianti')['id'].'&id_record='.$id_record.'&source=Attività&plugin=1"><i class="fa fa-plus"></i> '.tr('Aggiungi impianto').'</button>
</form>'; </form>';
echo ' echo '
</div> </div>
</div>'; </div>';

2
src/Util/Ini.php
View File

@ -90,7 +90,7 @@ class Ini
$files = glob(realpath($dir).'/*.ini'); $files = glob(realpath($dir).'/*.ini');
foreach ($files as $file) { foreach ($files as $file) {
if (!in_array(basename($file), $exclude)) { if (!in_array(basename($file), $exclude)) {
$results[] = [basename($file), self::getValue(self::readFile($file), 'Nome')]; $results[] = [basename($file), self::getValue(self::readFile($file), 'Nome').' ('.basename($file).')'];
} }
} }