From f6f03bf098a70c8ba24ac2bb7e1d02fe0e7c58c1 Mon Sep 17 00:00:00 2001
From: Michael RICOIS <mricois@scores-decisions.com>
Date: Thu, 17 Nov 2016 12:44:52 +0100
Subject: [PATCH] Simplification du theme : retrait du footer

---
 application/configs/menu.help.php             | 15 +++++++++
 application/layouts/default/header.phtml      |  4 ++-
 application/layouts/default/layout.phtml      |  7 ++--
 .../help/controllers/IndexController.php      |  1 +
 .../views/default/scripts/index/about.phtml   | 32 +++++++++++++++++++
 .../Application/Controller/Plugin/Menu.php    | 29 +++++++++++------
 public/themes/default/scripts/script.js       | 10 ++++++
 7 files changed, 83 insertions(+), 15 deletions(-)
 create mode 100644 application/configs/menu.help.php
 create mode 100644 application/modules/help/views/default/scripts/index/about.phtml

diff --git a/application/configs/menu.help.php b/application/configs/menu.help.php
new file mode 100644
index 000000000..7073fc3d3
--- /dev/null
+++ b/application/configs/menu.help.php
@@ -0,0 +1,15 @@
+<?php
+return array(
+    array(
+        'label' => "Index",
+        'module' => 'help',
+        'controller' => 'index',
+        'action' => 'index',
+    ),
+	array(
+		'label' => "A propos",
+		'module' => 'help',
+		'controller' => 'index',
+		'action' => 'about',
+	),
+);
\ No newline at end of file
diff --git a/application/layouts/default/header.phtml b/application/layouts/default/header.phtml
index e782ff1fc..0907d869e 100644
--- a/application/layouts/default/header.phtml
+++ b/application/layouts/default/header.phtml
@@ -27,7 +27,7 @@
     	<ul class="dropdown-menu">
     	<?php if ($this->PrintHtml) {?>
     	<li><a title="Impression" target="_blank" onclick="myFunction()">
-    			<span class="glyphicon glyphicon-print" aria-hidden="true"></span> Papier</a></li> 
+    			<span class="glyphicon glyphicon-print" aria-hidden="true"></span> Papier</a></li>
 
 		<?php }?>
     	<?php if ($this->PrintPdf) {?>
@@ -107,6 +107,8 @@
                 'default', true)?>">Nouveautés</a></li>
 			<li><a href="<?=$this->url(array('module'=>'help', 'controller'=>'index', 'action'=>'index'),
                 'default', true)?>">Aide</a></li>
+			<li><a href="<?=$this->url(array('module'=>'help', 'controller'=>'index', 'action'=>'about'),
+                'default', true)?>">A propos</a></li>
             <li role="separator" class="divider"></li>
             <li><a href="<?=$this->url(array('module'=>'user', 'controller'=>'order', 'action'=>'index'),
                 'default', true)?>">Commandes</a></li>
diff --git a/application/layouts/default/layout.phtml b/application/layouts/default/layout.phtml
index dd7bd5728..09aacfd01 100644
--- a/application/layouts/default/layout.phtml
+++ b/application/layouts/default/layout.phtml
@@ -10,12 +10,9 @@
 	<div id="wrap">
 		<?php echo $this->render('header.phtml')?>
 		<div id="page-wrap">
-			<?php echo $this->layout()->content?>	    	
+			<?php echo $this->layout()->content?>
     	</div>
-    	<div id="footer">
-			<?php echo $this->render('footer.phtml'); ?>
-		</div>
- 	</div>	
+ 	</div>
 	<?php echo $this->inlineScript(); ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/application/modules/help/controllers/IndexController.php b/application/modules/help/controllers/IndexController.php
index 51789d8dd..254765fe2 100644
--- a/application/modules/help/controllers/IndexController.php
+++ b/application/modules/help/controllers/IndexController.php
@@ -11,4 +11,5 @@ class Help_IndexController extends Zend_Controller_Action
 
     public function indexAction(){}
 
+    public function aboutAction(){}
 }
\ No newline at end of file
diff --git a/application/modules/help/views/default/scripts/index/about.phtml b/application/modules/help/views/default/scripts/index/about.phtml
new file mode 100644
index 000000000..6616b6808
--- /dev/null
+++ b/application/modules/help/views/default/scripts/index/about.phtml
@@ -0,0 +1,32 @@
+<div id="content">
+
+<div class="page-header">
+	<h1>A propos</h1>
+</div>
+
+<div class="panel panel-default">
+<div class="panel-heading">
+	<h3 class="panel-title">Mentions Légales</h3>
+</div>
+<ul class="list-group">
+    <li class="list-group-item"><a href="#">Consulter les mentions légales</a></li>
+    <li class="list-group-item">
+        <p class="text-muted credit">&copy;  2006-<?php echo date('Y')?>
+        <a href="http://www.scores-decisions.com">Scores &amp; Décisions SAS</a> -
+        <?=$this->translate("Tous droits r&eacute;serv&eacute;s")?>
+    </li>
+  </ul>
+</div>
+
+
+<div class="panel panel-default">
+<div class="panel-heading">
+	<h3 class="panel-title">Application</h3>
+</div>
+<ul class="list-group">
+    <li class="list-group-item">Version : 2.9.0-dev</li>
+    <li class="list-group-item">Date de mise à jour : 0000-00-00</li>
+  </ul>
+</div>
+
+</div>
\ No newline at end of file
diff --git a/library/Application/Controller/Plugin/Menu.php b/library/Application/Controller/Plugin/Menu.php
index 3788d0cf5..260ff8114 100644
--- a/library/Application/Controller/Plugin/Menu.php
+++ b/library/Application/Controller/Plugin/Menu.php
@@ -6,7 +6,7 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract
      * @var Zend_Navigation_Container
      */
 	protected $container;
-    
+
     /**
      * Créer le menu en fonction des besoins et des paramètres en entrée
      * @param Zend_Controller_Request_Abstract $request
@@ -91,7 +91,7 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract
                         $view->MenuLabel = 'Informations légales';
                         $config = include APPLICATION_PATH . '/configs/menu.legal.php';
                         $this->container = new Zend_Navigation($config);
-                        $this->setPageParams($request);                        
+                        $this->setPageParams($request);
                         $view->navigation($this->container);
                         $view->headLink()
                             ->appendStylesheet('/libs/metisMenu/metisMenu.min.css', 'all');
@@ -101,22 +101,33 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract
 					case 'input':
                         $view = $layout->getView();
                         $view->MenuAdvanced = true;
-                       // $view->MenuLabel = 'Informations légales';
+                        // $view->MenuLabel = 'Informations légales';
                         $config = include APPLICATION_PATH . '/configs/menu.input.php';
                         $this->container = new Zend_Navigation($config);
                         $this->setPageParams($request);
                         $view->navigation($this->container);
                         $view->headLink()
-                        ->appendStylesheet('/libs/metisMenu/metisMenu.min.css', 'all');
+                            ->appendStylesheet('/libs/metisMenu/metisMenu.min.css', 'all');
                         $view->headScript()
-                        ->appendFile('/libs/metisMenu/metisMenu.min.js', 'text/javascript');
+                            ->appendFile('/libs/metisMenu/metisMenu.min.js', 'text/javascript');
                         break;
-                        
+					case 'help':
+					    $view = $layout->getView();
+					    $view->MenuAdvanced = true;
+					    $view->MenuLabel = 'Aide';
+					    $config = include APPLICATION_PATH . '/configs/menu.help.php';
+					    $this->container = new Zend_Navigation($config);
+					    $view->navigation($this->container);
+					    $view->headLink()
+					       ->appendStylesheet('/libs/metisMenu/metisMenu.min.css', 'all');
+					    $view->headScript()
+					       ->appendFile('/libs/metisMenu/metisMenu.min.js', 'text/javascript');
+					    break;
                     default:
                     	// Menu Default
                     	// --- Affichage page error
                     	// --- Affichage page 404
-                    	
+
                         // --- Override SIRET to complete with zero by left
                         $siret = $request->getParam('siret');
                         if ( intval($siret)>100 ) {
@@ -128,7 +139,7 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract
                         $menu = $computeMenu->getMenu();
                         $view = $layout->getView();
                         $view->navigation($menu);
-                        
+
                         // --- Identifiant Menu
                         $view->menuId = $computeMenu->getIdMenu($controller, $action);
 
@@ -173,7 +184,7 @@ class Application_Controller_Plugin_Menu extends Zend_Controller_Plugin_Abstract
 
 	    Zend_Registry::get('firebug')->info('PLUGIN MENU - END');
 	}
-	
+
 	/**
 	 * Set specific page params
 	 * @param Zend_Controller_Request_Abstract $request
diff --git a/public/themes/default/scripts/script.js b/public/themes/default/scripts/script.js
index 766563b62..406c09d71 100644
--- a/public/themes/default/scripts/script.js
+++ b/public/themes/default/scripts/script.js
@@ -2,6 +2,16 @@
 //$.fn.bootstrapBtn = bootstrapButton;
 $(function(){
 	$('ul#side-menu').metisMenu();
+	$(window).bind("load resize", function() {
+        topOffset = 52;
+        height = ((this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height) - 1;
+        height = height - topOffset;
+        if (height < 1) height = 1;
+        if (height > topOffset) {
+            $("#page-wrap").css("min-height", (height) + "px");
+        }
+    });
+	
 	$('img.flag').on('click', function() {
 		var url = window.location.href;
 		$.post('/user/lang', {lang: $(this).attr('id')}, function(data){