github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-19 21:04:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move display_error_block() to footer.html

Browse source
This commit is contained in:
Flat 2016-07-02 20:19:26 +09:00
commit d1b1f97ff4
55 changed files with 78 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

30
web/inc/main.php
View file

@ -268,36 +268,6 @@ function send_email($to,$subject,$mailtext,$from) {
mail($to, $subject, $message, $header);
}
function display_error_block() {
if (!empty($_SESSION['error_msg'])) {
echo '
<div>
<script type="text/javascript">
$(function() {
$( "#dialog:ui-dialog" ).dialog( "destroy" );
$( "#dialog-message" ).dialog({
modal: true,
buttons: {
Ok: function() {
$( this ).dialog( "close" );
}
},
create:function () {
$(this).closest(".ui-dialog")
.find(".ui-button:first")
.addClass("submit");
}
});
});
</script>
<div id="dialog-message" title="">
<p>'. htmlentities($_SESSION['error_msg']) .'</p>
</div>
</div>'."\n";
unset($_SESSION['error_msg']);
}
}
function list_timezones() {
$tz = new DateTimeZone('HAST');
$timezone_offsets['HAST'] = $tz->getOffset(new DateTime);

1
web/list/user/index.php
View file

@ -13,7 +13,6 @@ if ($user == 'admin') {
}
$data = json_decode(implode('', $output), true);
$data = array_reverse($data,true);
display_error_block();
// Render page
render_page($user, $TAB, '*/list_user');

2
web/templates/admin/add_cron.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_db.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_dns.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_dns_rec.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_firewall.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_firewall_banlist.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_ip.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_mail.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_mail_acc.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_package.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/add_user.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>

2
web/templates/admin/add_web.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_backup_exclusions.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_cron.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_db.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_dns.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_dns_rec.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_firewall.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_ip.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_mail.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_mail_acc.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_package.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_server.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_user.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/edit_web.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/admin/generate_ssl.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

4
web/templates/admin/list_backup.html
View file

@ -32,11 +32,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_backup_detail.html
View file

@ -30,11 +30,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_backup_exclusions.html
View file

@ -29,11 +29,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_cron.html
View file

@ -51,11 +51,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_db.html
View file

@ -72,11 +72,7 @@
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_dns.html
View file

@ -42,11 +42,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_dns_rec.html
View file

@ -32,11 +32,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_firewall.html
View file

@ -45,11 +45,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_firewall_banlist.html
View file

@ -30,11 +30,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_ip.html
View file

@ -42,11 +42,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

3
web/templates/admin/list_log.html
View file

@ -14,9 +14,6 @@
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_mail.html
View file

@ -50,11 +50,7 @@
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_mail_acc.html
View file

@ -49,11 +49,7 @@
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_packages.html
View file

@ -37,11 +37,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_rrd.html
View file

@ -41,11 +41,7 @@
</tr>
</table>
</div -->
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

3
web/templates/admin/list_search.html
View file

@ -23,9 +23,6 @@
</table>
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>

3
web/templates/admin/list_services.html
View file

@ -36,9 +36,6 @@
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

2
web/templates/admin/list_ssl.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

4
web/templates/admin/list_stats.html
View file

@ -37,11 +37,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_updates.html
View file

@ -35,11 +35,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

4
web/templates/admin/list_user.html
View file

@ -54,11 +54,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

5
web/templates/admin/list_web.html
View file

@ -38,17 +38,14 @@
</select>
</div>
<input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
</div>
</td>
</tr>
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>
</div>
<div class="l-separator"></div>
<!-- /.l-separator -->

34
web/templates/footer.html
View file

@ -8,12 +8,44 @@
<script type="text/javascript" src="/js/templates.js?1446554103"></script>
<script src="/js/jquery.finder.js"></script>
<script>
$(document).ready(function(){ hover_menu(); });
$(function() {
hover_menu();
});
</script>
<?php
@include($JS_FILE);
?>
<?php
if (!empty($_SESSION['error_msg'])):
?>
<div>
<div id="dialog-message" title="">
<p><?=htmlentities($_SESSION['error_msg'])?></p>
</div>
<script>
$('#dialog:ui-dialog').dialog('destroy');
$('#dialog-message').dialog({
modal: true,
buttons: {
Ok: function() {
$(this).dialog('close');
}
},
create: function() {
$(this)
.closest('.ui-dialog')
.find('.ui-button:first')
.addClass('submit');
}
});
</script>
</div>
<?php
unset($_SESSION['error_msg']);
endif;
?>
<div title="Confirmation" class="confirmation-text-redirect hidden">
<p class="confirmation"><?=__('LEAVE_PAGE_CONFIRMATION')?></p>
</div>

2
web/templates/user/edit_dns.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

2
web/templates/user/edit_user.html
View file

@ -12,9 +12,7 @@
}
?>
</div>
</div>
<? display_error_block() ?>
</div>
<div class="l-separator"></div>

4
web/templates/user/list_user.html
View file

@ -52,11 +52,7 @@
</tr>
</table>
</div>
</div>
<? display_error_block(); ?>
<!-- /.l-sort -->
</div>

7
web/templates/user/list_web.html
View file

@ -36,19 +36,14 @@
</select>
</div>
<input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
</div>
</td>
</tr>
</table>
<!-- -->
</div>
</div>
<? display_error_block() ?>
<!-- /.l-sort -->
</div>
</div>
<div class="l-separator"></div>
<!-- /.l-separator -->