Skip to content

Commit

Permalink
# [joomla#29144] error.php for Isis and Protostar Templates. Thanks …
Browse files Browse the repository at this point in the history 
…Kyle
  • Loading branch information
@kyleledbetter @infograf768
kyleledbetter authored and infograf768 committed Sep 13, 2012
1 parent 469e5e0 commit a56719a
Show file tree
Hide file tree
Showing 7 changed files with 494 additions and 4 deletions.
4 changes: 3 additions & 1 deletion administrator/templates/isis/component.php
View file
Expand Up @@ -13,6 +13,8 @@
$app = JFactory::getApplication();
$doc = JFactory::getDocument();
$lang = JFactory::getLanguage();
$this->language = $doc->language;
$this->direction = $doc->direction;

// Add JavaScript Frameworks
JHtml::_('bootstrap.framework');
Expand All @@ -34,7 +36,7 @@

?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" >
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<jdoc:include type="head" />
</head>
Expand Down
275 changes: 275 additions & 0 deletions administrator/templates/isis/error.php
View file
@@ -0,0 +1,275 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage Templates.isis
* @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
* @since 3.0
*/

defined('_JEXEC') or die;

// Getting params from template
$params = JFactory::getApplication()->getTemplate(true)->params;

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

// Add JavaScript Frameworks
JHtml::_('bootstrap.framework');
JHtml::_('jquery.ui');

// 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');

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

$showSubmenu = false;
$this->submenumodules = JModuleHelper::getModules('submenu');
foreach ($this->submenumodules as $submenumodule)
{
$output = JModuleHelper::renderModule($submenumodule);
if (strlen($output))
{
$showSubmenu = true;
break;
}
}

// Logo file
if ($params->get('logoFile'))
{
$logo = JURI::root() . $params->get('logoFile');
}
else
{
$logo = $this->baseurl . "/templates/" . $this->template . "/images/logo.png";
}
?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><?php echo $this->title; ?> <?php echo $this->error->getMessage();?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="language" content="<?php echo $this->language; ?>" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template; ?>/css/template.css" type="text/css" />
<?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
}
// Use of Google Font
if ($params->get('googleFont'))
{
?>
<link href='http://fonts.googleapis.com/css?family=<?php echo $params->get('googleFontName');?>' rel='stylesheet' type='text/css'>
<?php
}
?>

<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'))
{
?>
<style type="text/css">
.header, .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
{
background: <?php echo $params->get('templateColor');?>;
}
.navbar-inner, .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{
-moz-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);
-webkit-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);
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
}
?>
<script src="<?php echo JURI::root() ?>/media/jui/js/jquery.min.js" type="text/javascript"></script>
<script src="<?php echo JURI::root() ?>/media/jui/js/jquery-noconflict.js" type="text/javascript"></script>
<script src="<?php echo JURI::root() ?>/media/jui/js/bootstrap.min.js" type="text/javascript"></script>
</head>

<body class="admin <?php echo $option . " view-" . $view . " layout-" . $layout . " task-" . $task . " ";?>" data-spy="scroll" data-target=".subhead" data-offset="87">
<!-- Top Navigation -->
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
<?php if ($params->get('admin_menus') != '0') : ?>
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<?php endif; ?>
<a class="brand" href="<?php echo JURI::root(); ?>" title="<?php echo JText::_('JGLOBAL_PREVIEW');?> <?php echo $sitename; ?>" target="_blank"><?php echo JHtml::_('string.truncate', $sitename, 14, false, false);?> <i class="icon-out-2 small"></i></a>
<?php if ($params->get('admin_menus') != '0') : ?>
<div class="nav-collapse">
<?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;
}
?>
<ul class="<?php if ($this->direction == 'rtl') : ?>nav<?php else : ?>nav pull-right<?php endif; ?>">
<li class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown" href="#"><?php echo $user->username; ?> <b class="caret"></b></a>
<ul class="dropdown-menu">
<li class=""><a href="index.php?option=com_admin&task=profile.edit&id=<?php echo $user->id;?>"><?php echo JText::_('TPL_ISIS_EDIT_ACCOUNT');?></a></li>
<li class="divider"></li>
<li class=""><a href="<?php echo JRoute::_('index.php?option=com_login&task=logout&'. JSession::getFormToken() .'=1');?>"><?php echo JText::_('TPL_ISIS_LOGOUT');?></a></li>
</ul>
</li>
</ul>
</div>
<!--/.nav-collapse -->
</div>
</div>
</nav>
<!-- Header -->
<header class="header">
<div class="container-fluid">
<div class="row-fluid">
<div class="span2 container-logo">
<a class="logo" href="<?php echo $this->baseurl; ?>"><img src="<?php echo $logo;?>" alt="<?php echo $sitename; ?>" /></a>
</div>
<div class="span10">
<h1 class="page-title"><?php echo JText::_('ERROR'); ?></h1>
</div>
</div>
</div>
</header>
<div class="subhead-spacer" style="margin-bottom: 20px"></div>
<!-- container-fluid -->
<div class="container-fluid container-main">
<section id="content">
<!-- Begin Content -->
<div class="row-fluid">
<div class="span12">
<!-- Begin Content -->
<h1 class="page-header"><?php echo JText::_('JERROR_AN_ERROR_HAS_OCCURRED'); ?></h1>
<blockquote>
<span class="label label-inverse"><?php echo $this->error->getCode(); ?></span> <?php echo $this->error->getMessage();?>
</blockquote>
<p><a href="<?php echo $this->baseurl; ?>" class="btn"><i class="icon-dashboard"></i> <?php echo JText::_('JGLOBAL_TPL_CPANEL_LINK_TEXT'); ?></a></p>
<!-- End Content -->
</div>
</div>
<!-- End Content -->
</section>
<hr />
</div>
<!-- Begin Status Module -->
<div id="status" class="navbar navbar-fixed-bottom hidden-phone">
<div class="btn-toolbar">
<div class="btn-group pull-right">
<p>&copy; <?php echo $sitename; ?> <?php echo date('Y');?></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;
}
?>
</div>
</div>
<!-- End Status Module -->
<script>
(function($){
$('*[rel=tooltip]').tooltip()
$('*[rel=popover]').popover({
trigger: 'hover'
})

// fix sub nav on scroll
var $win = $(window)
, $nav = $('.subhead')
, navTop = $('.subhead').length && $('.subhead').offset().top - 40
, isFixed = 0

processScroll()

// hack sad times - holdover until rewrite for 2.1
$nav.on('click', function () {
if (!isFixed) setTimeout(function () { $win.scrollTop($win.scrollTop() - 47) }, 10)
})

$win.on('scroll', processScroll)

function processScroll() {
var i, scrollTop = $win.scrollTop()
if (scrollTop >= navTop && !isFixed) {
isFixed = 1
$nav.addClass('subhead-fixed')
} else if (scrollTop <= navTop && isFixed) {
isFixed = 0
$nav.removeClass('subhead-fixed')
}
}

// Turn radios into btn-group
$('.radio.btn-group label').addClass('btn');
$(".btn-group label:not(.active)").click(function() {
var label = $(this);
var input = $('#' + label.attr('for'));

if (!input.prop('checked')) {
label.closest('.btn-group').find("label").removeClass('active btn-success btn-danger btn-primary');
if(input.val()== '') {
label.addClass('active btn-primary');
} else if(input.val()==0) {
label.addClass('active btn-danger');
} else {
label.addClass('active btn-success');
}
input.prop('checked', true);
}
});
$(".btn-group input[checked=checked]").each(function() {
if($(this).val()== '') {
$("label[for=" + $(this).attr('id') + "]").addClass('active btn-primary');
} else if($(this).val()==0) {
$("label[for=" + $(this).attr('id') + "]").addClass('active btn-danger');
} else {
$("label[for=" + $(this).attr('id') + "]").addClass('active btn-success');
}
});
})(jQuery);
</script>
</body>
</html>
4 changes: 3 additions & 1 deletion administrator/templates/isis/index.php
View file
Expand Up @@ -12,6 +12,8 @@
$app = JFactory::getApplication();
$doc = JFactory::getDocument();
$lang = JFactory::getLanguage();
$this->language = $doc->language;
$this->direction = $doc->direction;
$input = $app->input;
$user = JFactory::getUser();

Expand Down Expand Up @@ -68,7 +70,7 @@
}
?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" >
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<jdoc:include type="head" />
Expand Down
3 changes: 3 additions & 0 deletions installation/CHANGELOG
View file
Expand Up @@ -26,6 +26,9 @@ $ -> Language fix or change
- -> Removed
! -> Note

13-Sept-2012 Jean-Marie Simonet
# [#29144] error.php for Isis and Protostar Templates. Thanks Kyle

11-Sept-2012 Jean-Marie Simonet
# Installation languages alpha ordering broken on hosts. Adding method. Thanks Dennis

Expand Down
7 changes: 6 additions & 1 deletion templates/protostar/component.php
View file
Expand Up @@ -8,9 +8,14 @@
*/

defined('_JEXEC') or die;

$app = JFactory::getApplication();
$doc = JFactory::getDocument();
$this->language = $doc->language;
$this->direction = $doc->direction;
?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" >
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $this->language; ?>" lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
<head>
<jdoc:include type="head" />
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template ?>/css/template.css" type="text/css" />
Expand Down

0 comments on commit a56719a

Please sign in to comment.