bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-26 05:40:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved policy apply feature

Browse Source
This commit is contained in:
SJ 2013-04-17 21:45:02 +02:00
parent b92431b0e1
commit caeb050af3
6 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webui/controller/policy/apply.php
View File

@ -23,12 +23,13 @@ class ControllerPolicyApply extends Controller {
system('sudo -n /etc/init.d/rc.piler reload', $val); system('sudo -n /etc/init.d/rc.piler reload', $val);
if($val === 0) { if($val === 0) {
print $lang->data['text_applied']; $this->data['x'] = $lang->data['text_applied'];
} else { } else {
print $lang->data['text_install_sudo_apply']; $this->data['x'] = $lang->data['text_install_sudo_apply'];
} }
$this->render();
} }
} }

3
webui/view/theme/default/templates/policy/archiving.tpl
View File

@ -107,6 +107,5 @@
<div> <div>
<p><input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /></p> <input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /> <span id="applyChangesOutput"></span>
<span id="applyChangesOutput"></span>
</div> </div>

3
webui/view/theme/default/templates/policy/retention.tpl
View File

@ -112,7 +112,6 @@
<div> <div>
<p><input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /></p> <input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /> <span id="applyChangesOutput"></span>
<span id="applyChangesOutput"></span>
</div> </div>

14
webui/view/theme/orig/templates/policy/apply.tpl
View File

@ -0,0 +1,14 @@
<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header">
<h3 id="myModalLabel"><?php print $x; ?></h3>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">OK</button>
</div>
</div>
<script>
$('#myModal').modal('show');
</script>

5
webui/view/theme/orig/templates/policy/archiving.tpl
View File

@ -104,8 +104,7 @@
<?php } ?> <?php } ?>
<div> <div class="top20px">
<p><input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /></p> <input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /> <span id="applyChangesOutput"></span>
<span id="applyChangesOutput"></span>
</div> </div>

5
webui/view/theme/orig/templates/policy/retention.tpl
View File

@ -111,9 +111,8 @@
<div> <div class="top20px">
<p><input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /></p> <input type="button" class="btn btn-danger" onclick="Piler.reload_piler();" value="<?php print $text_apply_changes; ?>" /> <span id="applyChangesOutput"></span>
<span id="applyChangesOutput"></span>
</div> </div>