Skip to content

Commit

Permalink
Update error.php
Browse files Browse the repository at this point in the history
  • Loading branch information
@zero-24
zero-24 committed Jun 17, 2014
1 parent 5329a20 commit c150fdc
Showing 1 changed file with 46 additions and 72 deletions.
118 changes: 46 additions & 72 deletions administrator/templates/isis/error.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
// Getting params from template
$params = JFactory::getApplication()->getTemplate(true)->params;

$app = JFactory::getApplication();
$doc = JFactory::getDocument();
$lang = JFactory::getLanguage();
$this->language = $doc->language;
$app = JFactory::getApplication();
$doc = JFactory::getDocument();
$lang = JFactory::getLanguage();
$this->language = $doc->language;
$this->direction = $doc->direction;
$input = $app->input;
$user = JFactory::getUser();
$input = $app->input;
$user = JFactory::getUser();

// Detecting Active Variables
$option = $input->get('option', '');
$view = $input->get('view', '');
$layout = $input->get('layout', '');
$task = $input->get('task', '');
$itemid = $input->get('Itemid', '');
$sitename = $app->getCfg('sitename');
$sitename = $app->get('sitename');

$cpanel = ($option === 'com_cpanel');

Expand All @@ -49,12 +49,12 @@
}
else
{
$logo = $this->baseurl . "/templates/" . $this->template . "/images/logo.png";
$logo = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
}

// Template Parameters
$displayHeader = $params->get('displayHeader', '1');
$statusFixed = $params->get('statusFixed', '1');
$statusFixed = $params->get('statusFixed', '1');
$stickyToolbar = $params->get('stickyToolbar', '1');
?>
<!DOCTYPE html>
Expand All @@ -67,32 +67,21 @@
$debug = JFactory::getConfig()->get('debug_lang');
if ((defined('JDEBUG') && JDEBUG) || $debug) : ?>
<!-- Load additional CSS styles for debug mode-->
<link rel="stylesheet" href="<?php echo JUri::root() ?>/media/cms/css/debug.css" type="text/css" />
<link rel="stylesheet" href="<?php echo JUri::root(); ?>/media/cms/css/debug.css" type="text/css" />
<?php endif; ?>
<?php // If Right-to-Left ?>
<?php if ($this->direction == 'rtl') : ?>
<link rel="stylesheet" href="<?php echo JUri::root(); ?>/media/jui/css/bootstrap-rtl.css" type="text/css" />
<?php endif; ?>
<?php // Load specific language related CSS ?>
<?php $file = 'language/' . $lang->getTag() . '/' . $lang->getTag() . '.css'; ?>
<?php if (is_file($file)) : ?>
<link rel="stylesheet" href="<?php echo $file; ?>" type="text/css" />
<?php endif; ?>
<?php
// If Right-to-Left
if ($this->direction == 'rtl')
{
?>
<link rel="stylesheet" href="<?php echo JUri::root() ?>/media/jui/css/bootstrap-rtl.css" type="text/css" />
<?php
}
// Load specific language related CSS
$file = 'language/' . $lang->getTag() . '/' . $lang->getTag() . '.css';
if (is_file($file))
{
?>
<link rel="stylesheet" href="<?php echo $file;?>" type="text/css" />
<?php
}
?>
<link rel="stylesheet" href="<?php echo $this->baseurl; ?>/templates/<?php echo $this->template; ?>/css/template<?php echo ($this->direction == 'rtl' ? '-rtl' : ''); ?>.css" type="text/css" />
<link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template; ?>/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
<?php
// Template color
if ($params->get('templateColor'))
{
?>
<?php // Template color ?>
<?php if ($params->get('templateColor')) : ?>
<style type="text/css">
.navbar-inner, .navbar-inverse .navbar-inner, .nav-list > .active > a, .nav-list > .active > a:hover, .dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover, .navbar-inverse .nav li.dropdown.open > .dropdown-toggle, .navbar-inverse .nav li.dropdown.active > .dropdown-toggle, .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle
{
Expand All @@ -104,27 +93,18 @@
box-shadow: 0 1px 3px rgba(0, 0, 0, .25), inset 0 -1px 0 rgba(0, 0, 0, .1), inset 0 30px 10px rgba(0, 0, 0, .2);
}
</style>
<?php
}
?>
<?php
// Template header color
if ($params->get('headerColor'))
{
?>
<?php endif; ?>
<?php // Template header color ?>
<?php if ($params->get('headerColor')) : ?>
<style type="text/css">
.header
{
background: <?php echo $params->get('headerColor');?>;
}
</style>
<?php
}
?>

<?php
// Sidebar background color
if ($params->get('sidebarColor')) : ?>
<?php endif; ?>
<?php // Sidebar background color ?>
<?php if ($params->get('sidebarColor')) : ?>
<style type="text/css">
.nav-list > .active > a, .nav-list > .active > a:hover {
background: <?php echo $params->get('sidebarColor'); ?>;
Expand Down Expand Up @@ -162,17 +142,14 @@
<?php else : ?>
<div>
<?php endif; ?>
<?php
// Display menu modules
$this->menumodules = JModuleHelper::getModules('menu');
foreach ($this->menumodules as $menumodule)
{
$output = JModuleHelper::renderModule($menumodule, array('style' => 'none'));
$params = new JRegistry;
$params->loadString($menumodule->params);
echo $output;
}
?>
<?php // Display menu modules ?>
<?php $this->menumodules = JModuleHelper::getModules('menu'); ?>
<?php foreach ($this->menumodules as $menumodule) : ?>
<?php $output = JModuleHelper::renderModule($menumodule, array('style' => 'none')); ?>
<?php $params = new JRegistry; ?>
<?php $params->loadString($menumodule->params); ?>
<?php echo $output; ?>
<?php endforeach; ?>
<ul class="nav nav-user<?php echo ($this->direction == 'rtl') ? ' pull-left' : ' pull-right'; ?>">
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><span class="icon-cog"></span>
Expand Down Expand Up @@ -222,17 +199,14 @@
&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
</p>
</div>
<?php
// Display status modules
$this->statusmodules = JModuleHelper::getModules('status');
foreach ($this->statusmodules as $statusmodule)
{
$output = JModuleHelper::renderModule($statusmodule, array('style' => 'no'));
$params = new JRegistry;
$params->loadString($statusmodule->params);
echo $output;
}
?>
<?php // Display status modules ?>
<?php $this->statusmodules = JModuleHelper::getModules('status'); ?>
<?php foreach ($this->statusmodules as $statusmodule) : ?>
<?php $output = JModuleHelper::renderModule($statusmodule, array('style' => 'no')); ?>
<?php $params = new JRegistry; ?>
<?php $params->loadString($statusmodule->params); ?>
<?php echo $output; ?>
<?php endforeach; ?>
</div>
<div class="clearfix"></div>
</div>
Expand Down Expand Up @@ -261,9 +235,9 @@
<script>
(function($){
// fix sub nav on scroll
var $win = $(window)
, $nav = $('.subhead')
, navTop = $('.subhead').length && $('.subhead').offset().top - 40
var $win = $(window)
, $nav = $('.subhead')
, navTop = $('.subhead').length && $('.subhead').offset().top - 40
, isFixed = 0

processScroll()
Expand Down

0 comments on commit c150fdc

Please sign in to comment.