mirror of
https://github.com/opensourcepos/opensourcepos.git
synced 2026-01-23 08:48:08 -05:00
Merge branch 'ci3' into bootstrapUI
This commit is contained in:
@@ -40,22 +40,9 @@
|
||||
<?php endif; ?>
|
||||
|
||||
<script type="text/javascript">
|
||||
function logout(logout)
|
||||
{
|
||||
logout = logout && <?php echo $backup_allowed;?>;
|
||||
if (logout && confirm("<?php echo $this->lang->line('config_logout'); ?>"))
|
||||
{
|
||||
window.location = "<?php echo site_url('config/backup_db'); ?>";
|
||||
}
|
||||
else
|
||||
{
|
||||
window.location = "<?php echo site_url('home/logout'); ?>";
|
||||
}
|
||||
}
|
||||
|
||||
// live clock
|
||||
|
||||
function clockTick(){
|
||||
function clockTick() {
|
||||
setInterval('updateClock();', 1000);
|
||||
}
|
||||
|
||||
@@ -103,7 +90,7 @@
|
||||
|
||||
<div id="menubar_footer">
|
||||
<?php echo $this->lang->line('common_welcome')." $user_info->first_name $user_info->last_name! | "; ?>
|
||||
<a href="javascript:logout(true);"><?php echo $this->lang->line("common_logout"); ?></a>
|
||||
<?php echo anchor("home/logout", $this->lang->line("common_logout")); ?>
|
||||
</div>
|
||||
|
||||
<div id="menubar_date">
|
||||
|
||||
Reference in New Issue
Block a user