Merge pull request #132 from dgt41/templateJs

template.js
joomla · Nov 9, 2016 · bb1e977 · bb1e977
2 parents 912e34a + 65fe8ec
commit bb1e977
Show file tree

Hide file tree

Showing 2 changed files with 239 additions and 252 deletions.
diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -41,32 +41,19 @@
 }
 
 // Detecting Active Variables
-$option   = $input->get('option', '');
-$view     = $input->get('view', '');
-$layout   = $input->get('layout', '');
-$task     = $input->get('task', '');
-$itemid   = $input->get('Itemid', '');
-$sitename = htmlspecialchars($app->get('sitename', ''), ENT_QUOTES, 'UTF-8');
-$cpanel   = ($option === 'com_cpanel');
+$option      = $input->get('option', '');
+$view        = $input->get('view', '');
+$layout      = $input->get('layout', '');
+$task        = $input->get('task', '');
+$itemid      = $input->get('Itemid', '');
+$sitename    = htmlspecialchars($app->get('sitename', ''), ENT_QUOTES, 'UTF-8');
+$cpanel      = ($option === 'com_cpanel');
+$hidden      = JFactory::getApplication()->input->get('hidemainmenu');
+$showSubmenu = false;
+$logoLg      = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
+$logoSm      = $this->baseurl . '/templates/' . $this->template . '/images/logo-icon-only.png';
 
-$hidden = JFactory::getApplication()->input->get('hidemainmenu');
 
-$showSubmenu          = false;
-$this->submenumodules = JModuleHelper::getModules('submenu');
-
-foreach ($this->submenumodules as $submenumodule)
-{
-	$output = JModuleHelper::renderModule($submenumodule);
-
-	if (strlen($output))
-	{
-		$showSubmenu = true;
-		break;
-	}
-}
-
-$logoLg = $this->baseurl . '/templates/' . $this->template . '/images/logo.png';
-$logoSm = $this->baseurl . '/templates/' . $this->template . '/images/logo-icon-only.png';
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $this->language; ?>" dir="<?php echo $this->direction; ?>">
@@ -79,14 +66,14 @@
 <body class="admin <?php echo $option . ' view-' . $view . ' layout-' . $layout . ' task-' . $task . ' itemid-' . $itemid; ?>">
 
 	<?php // Wrapper ?>
-	<div id="wrapper" class="wrapper">
+	<div id="wrapper" class="wrapper closed">
 
 		<?php // Sidebar ?>
-		<div id="sidebar-wrapper" class="sidebar-wrapper">
-			<div id="main-brand-sm" class="main-brand hidden-xs-up">
+		<div id="sidebar-wrapper" class="sidebar-wrapper" <?php echo $hidden ? 'data-hidden="' . $hidden . '"' :''; ?>>
+			<div id="main-brand-sm" class="main-brand">
 				<img src="<?php echo $logoSm; ?>" class="logo" alt="<?php echo $sitename;?>" />
 			</div>
-			<div id="main-brand" class="main-brand">
+			<div id="main-brand" class="main-brand hidden-xs-up">
 				<img src="<?php echo $logoLg; ?>" class="logo" alt="<?php echo $sitename;?>" />
 			</div>
 			<jdoc:include type="modules" name="menu" style="none" />
@@ -124,7 +111,7 @@
 				<?php // Subheader ?>
 				<a class="btn btn-subhead hidden-md-up" data-toggle="collapse" data-target=".subhead-collapse"><?php echo JText::_('TPL_ATUM_TOOLBAR'); ?>
 					<span class="icon-wrench"></span></a>
-				<div class="subhead-collapse">
+				<div class="subhead-collapse"  style="margin: -18px -15px 0 -15px;" data-scroll="<?php echo $hidden; ?>">
 					<div id="subhead" class="subhead">
 						<div class="container-fluid">
 							<div id="container-collapse" class="container-collapse"></div>
@@ -138,7 +125,7 @@
 				</div>
 			<?php endif; ?>
 
-			<section id="content" class="content">
+			<section id="content" class="content" style="margin-top: 70px;">
 				<?php // Begin Content ?>
 				<jdoc:include type="modules" name="top" style="xhtml" />
 				<div class="row">