Skip to content

Commit

Permalink
installer: improved init. (config check) - added detect and break-out…
Browse files Browse the repository at this point in the history
… when loaded into pre-existing backend
  • Loading branch information
kstenschke committed Jul 15, 2015
1 parent 7fc7336 commit 685f22c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 8 additions & 4 deletions install/views/check_config.php
@@ -1,4 +1,3 @@

<div class="block">
<ul id="nav">

Expand All @@ -19,12 +18,10 @@

<h2><?php echo lang('title_system_check') ?></h2>


<?php if(isset($message)) :?>
<p class="<?php echo $message_type ?>"><?php echo $message ?></p>
<?php endif ;?>


<!-- PHP Version -->
<ul class="check">
<li class="<?php if($php_version) :?>ok<?php else :?>fail<?php endif ;?>"><?php echo lang('php_version')?> (<b><?php echo phpversion() ?></b>)</li>
Expand Down Expand Up @@ -56,4 +53,11 @@
<button type="button" class="button yes right" onclick="javascript:location.href='?step=database&lang=<?php echo $lang ?>';"><?php echo lang('button_next_step') ?></button>
<?php endif ;?>
</div>
</div>
</div>

<script type="text/javascript">
// Detect re-installation (installer loaded into content-div of backend)
if( document.getElementById('sideColumn') ) {
window.location.href = '../'; // reload one level up
}
</script>
4 changes: 0 additions & 4 deletions themes/admin/javascript/mochaui/init.js
Expand Up @@ -88,11 +88,8 @@ Ionize.initializeDesktop = function(){
}
});


};



// Initialize MochaUI when the DOM is ready
window.addEvent('load', function()
{
Expand All @@ -107,4 +104,3 @@ window.addEvent('load', function()
// document.addEvent('click', function(){$$('.btn-group').removeClass('open')});

});

0 comments on commit 685f22c

Please sign in to comment.