diff --git a/administrator/templates/isis/component.php b/administrator/templates/isis/component.php index 79e8cb9ecc008..2eaa0d77092d1 100644 --- a/administrator/templates/isis/component.php +++ b/administrator/templates/isis/component.php @@ -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'); @@ -34,7 +36,7 @@ ?> - + diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php new file mode 100644 index 0000000000000..5be2c23968109 --- /dev/null +++ b/administrator/templates/isis/error.php @@ -0,0 +1,275 @@ +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"; +} +?> + + + + + <?php echo $this->title; ?> <?php echo $this->error->getMessage();?> + + + + + direction == 'rtl') + { + ?> + + getTag() . '/' . $lang->getTag() . '.css'; + if (is_file($file)) + { + ?> + + get('googleFont')) + { + ?> + ' rel='stylesheet' type='text/css'> + + + + get('templateColor')) + { + ?> + + + + + + + +" data-spy="scroll" data-target=".subhead" data-offset="87"> + + + +
+
+
+ +
+

+
+
+
+
+
+ +
+
+ +
+
+ +

+
+ error->getCode(); ?> error->getMessage();?> +
+

+ +
+
+ +
+
+
+ + + + + + diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php index c1cb646b968d0..8335c97ee88eb 100644 --- a/administrator/templates/isis/index.php +++ b/administrator/templates/isis/index.php @@ -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(); @@ -68,7 +70,7 @@ } ?> - + diff --git a/installation/CHANGELOG b/installation/CHANGELOG index 9a9a58018f26d..2b6d5d6405024 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -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 diff --git a/templates/protostar/component.php b/templates/protostar/component.php index a2abba66644f2..73b5c1d6b41df 100644 --- a/templates/protostar/component.php +++ b/templates/protostar/component.php @@ -8,9 +8,14 @@ */ defined('_JEXEC') or die; + +$app = JFactory::getApplication(); +$doc = JFactory::getDocument(); +$this->language = $doc->language; +$this->direction = $doc->direction; ?> - + diff --git a/templates/protostar/error.php b/templates/protostar/error.php new file mode 100644 index 0000000000000..5b0990e17f5e9 --- /dev/null +++ b/templates/protostar/error.php @@ -0,0 +1,201 @@ +getTemplate(true)->params; + +$app = JFactory::getApplication(); +$doc = JFactory::getDocument(); +$this->language = $doc->language; +$this->direction = $doc->direction; + +// Detecting Active Variables +$option = $app->input->getCmd('option', ''); +$view = $app->input->getCmd('view', ''); +$layout = $app->input->getCmd('layout', ''); +$task = $app->input->getCmd('task', ''); +$itemid = $app->input->getCmd('Itemid', ''); +$sitename = $app->getCfg('sitename'); + +if($task == "edit" || $layout == "form" ) +{ + $fullWidth = 1; +} +else +{ + $fullWidth = 0; +} + +// Add JavaScript Frameworks +JHtml::_('bootstrap.framework'); + +// Add current user information +$user = JFactory::getUser(); + + +// Logo file +if ($params->get('logoFile')) +{ + $logo = JURI::root() . $params->get('logoFile'); +} +else +{ + $logo = $this->baseurl . "/templates/" . $this->template . "/images/logo.png"; +} +?> + + + + <?php echo $this->title; ?> <?php echo $this->error->getMessage();?> + + + + + direction == 'rtl') + { + ?> + + get('googleFont')) + { + ?> + ' rel='stylesheet' type='text/css'> + + + get('templateColor')) + { + ?> + + + + + get('fluidContainer')) { echo "fluid"; } ?>"> + + +
+
"> + +
+
+ + <?php echo $sitename; ?> + +
+ searchmodules = JModuleHelper::getModules('position-0'); + foreach ($this->searchmodules as $searchmodule) { + $output = JModuleHelper::renderModule($searchmodule, array('style' => 'none')); + $params = new JRegistry; + $params->loadString($searchmodule->params); + echo $output; + } + ?> +
+
+
+
+
+ navmodules = JModuleHelper::getModules('position-1'); + foreach ($this->navmodules as $navmodule) { + $output = JModuleHelper::renderModule($navmodule, array('style' => 'none')); + $params = new JRegistry; + $params->loadString($navmodule->params); + echo $output; + } + ?> +
+ + +
+
+ +

+
+
+
+

+

+
    +
    • +
    • +
    • +
    • +
+
+
+

+

+ +

+

+
+
+
+

+
+ error->getCode(); ?> error->getMessage();?> +
+
+ +
+
+
+
+ +
+
"> +
+ +

Back to top

+

©

+
+
+ + + diff --git a/templates/protostar/index.php b/templates/protostar/index.php index 2620a659de293..fece22e40b872 100644 --- a/templates/protostar/index.php +++ b/templates/protostar/index.php @@ -11,6 +11,8 @@ $app = JFactory::getApplication(); $doc = JFactory::getDocument(); +$this->language = $doc->language; +$this->direction = $doc->direction; // Detecting Active Variables $option = $app->input->getCmd('option', ''); @@ -73,7 +75,7 @@ } ?> - +