From ad3db6e6facd26a83c2f87e217fe26b9565ba126 Mon Sep 17 00:00:00 2001
From: Dany De Bontridder <danydb@noalyss.eu>
Date: Mon, 12 Feb 2018 20:22:04 +0100
Subject: [PATCH] Esthetic : menu administration

---
 include/admin_repo.inc.php                 | 17 ++++----
 include/audit_log.php                      |  2 +-
 include/class/Package_Repository.class.php | 46 ++++++++++++++++++++++
 include/dossier.inc.php                    |  2 +-
 include/lib/user_menu.php                  |  2 +-
 include/modele.inc.php                     |  2 +-
 include/restore.inc.php                    |  2 +-
 include/user.inc.php                       |  2 +-
 8 files changed, 59 insertions(+), 16 deletions(-)
 create mode 100644 include/class/Package_Repository.class.php

diff --git a/include/admin_repo.inc.php b/include/admin_repo.inc.php
index a5aedd0f0..353617b26 100644
--- a/include/admin_repo.inc.php
+++ b/include/admin_repo.inc.php
@@ -46,7 +46,7 @@ if ($User->admin != 1)
     echo _("Vous n'êtes pas administateur");
     echo "</h2>";
     $reconnect=http_build_query(array("reconnect"=>1,"backurl"=>"admin-noalyss.php?action=upgrade"));
-    echo '<a href="index.php?'.$reconnect.'">';
+    echo '<a href="'.NOALYSS_URL.'/index.php?'.$reconnect.'">';
     echo _("Connectez-vous comme administrateur");
     echo '</a>';
     html_page_stop();
@@ -59,7 +59,7 @@ if ( $action== 'backup') {
         require_once NOALYSS_INCLUDE."/backup.inc.php";
         exit();
 }
-html_page_start();
+html_page_start($_SESSION['g_theme']);
 load_all_script();
 echo '<H2 class="info"> '._('Administration').'</H2>';
 echo '<div class="topmenu">';
@@ -191,19 +191,16 @@ hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #0
     echo $html->saveHTML();
     
 }
+//------------------------------------------------------------------------------
+// Upgrade
+//------------------------------------------------------------------------------
 if ( $action == "upgrade" ) {
-?>    
-    <form method="get" id="frm_upg_all" onsubmit="return confirm_box('frm_upg_all','<?php echo _('Confirmez')?>')">
-    <input type="hidden" name="sb" value="upg_all">
-    <input type="hidden" name="action" value="upgrade">
-    <input type="submit" class="button" name="submit_upg_all" id="submit_upg_all" value="<?php echo _('Tout mettre à jour')?>">
-</form>
-<?php
+   
+    
     require_once NOALYSS_INCLUDE."/upgrade.inc.php";
 }
 ?>
 </DIV>
 <?php
-
 html_page_stop();
 ?>
diff --git a/include/audit_log.php b/include/audit_log.php
index a9a93f0b9..7a7f071ec 100644
--- a/include/audit_log.php
+++ b/include/audit_log.php
@@ -24,7 +24,7 @@
  */
 if ( !defined ('ALLOWED')) die('Forbidden');
 ?>
-<DIV class="content" style="width:80%;margin-left:10%">
+<DIV class="content">
 <span class="notice">Liste limitée aux 100 dernières connexions</span>
 <?php
 
diff --git a/include/class/Package_Repository.class.php b/include/class/Package_Repository.class.php
new file mode 100644
index 000000000..af84b72da
--- /dev/null
+++ b/include/class/Package_Repository.class.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ *   This file is part of NOALYSS.
+ *
+ *   PhpCompta is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   PhpCompta is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with PhpCompta; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+// Copyright (2018) Author Dany De Bontridder <dany@alchimerys.be>
+
+/**
+ * @file
+ * @brief contains the class Package_Repository
+ */
+class Package_Repository
+{
+    private $content;
+    function __construct()
+    {
+        $this->content=@file_get_content(NOALYSS_PACKAGE."/web.xml");
+    }
+    function get_noalyss_info()
+    {
+        
+    }
+    function get_plugin_info()
+    {
+        
+    }
+    function get_template_info()
+    {
+        
+    }
+    
+}
\ No newline at end of file
diff --git a/include/dossier.inc.php b/include/dossier.inc.php
index 4b0865185..25d865934 100644
--- a/include/dossier.inc.php
+++ b/include/dossier.inc.php
@@ -45,7 +45,7 @@ if ( isset ($_POST['upd']) && isNumber($dossier_id) == 1 && $dossier_id != -1)
     $dos->set_parameter("max_email", $max_email);
     $dos->save();
 }
-echo '<div class="content" style="width:80%;margin-left:10%">';
+echo '<div class="content">';
 /*
  *  check and add an new folder
  */
diff --git a/include/lib/user_menu.php b/include/lib/user_menu.php
index b37d630c4..f38b032bc 100644
--- a/include/lib/user_menu.php
+++ b/include/lib/user_menu.php
@@ -145,7 +145,7 @@ function MenuAdmin()
                 );
 
 	}
-    $menu=ShowItem($item,'H',"mtitle","mtitle",$def,' style="width:80%;margin-left:10%" ');
+    $menu=ShowItem($item,'H',"mtitle","mtitle",$def);
     return $menu;
 }
 
diff --git a/include/modele.inc.php b/include/modele.inc.php
index aa8002a04..5998b636b 100644
--- a/include/modele.inc.php
+++ b/include/modele.inc.php
@@ -254,7 +254,7 @@ $Res = $cn->exec_sql("select mod_id,mod_name,mod_desc from
                    modeledef $sql_order");
 
 $count = Database::num_row($Res);
-echo '<div class="content" style="width:80%;margin-left:10%">';
+echo '<div class="content">';
 echo "<H2>"._('Modèles')."</H2>";
 if ($sa == 'list')
 {
diff --git a/include/restore.inc.php b/include/restore.inc.php
index 941cfc180..2dd3e0489 100644
--- a/include/restore.inc.php
+++ b/include/restore.inc.php
@@ -72,7 +72,7 @@ if ( isset ($_REQUEST['sa'] ))
     // Restore a folder (dossier)
     if ( $_REQUEST['t']=='d')
     {
-        echo '<div class="content" style="width:80%;margin-left:10%">';
+        echo '<div class="content">';
 
         $cn=new Database();
         $id=$cn->get_next_seq('dossier_id');
diff --git a/include/user.inc.php b/include/user.inc.php
index 1d1c97aa9..3148f2f55 100644
--- a/include/user.inc.php
+++ b/include/user.inc.php
@@ -29,7 +29,7 @@ if ( !defined ('ALLOWED')) die('Forbidden');
 require_once NOALYSS_INCLUDE.'/lib/sort_table.class.php';
 require_once NOALYSS_INCLUDE.'/lib/http_input.class.php';
 $http=new HttpInput();
-echo '<div class="content" style="width:80%;margin-left:10%">';
+echo '<div class="content" >';
 /******************************************************/
 // Add user
 /******************************************************/