[Noalyss-commit] [noalyss] 03/08: Cosmetic change for the tabs

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit b48c28fceec1b32008f85d287f5672c392e022a8
Author: Dany De Bontridder <address@hidden>
Date:   Sat Mar 25 23:14:16 2017 +0100

    Cosmetic change for the tabs
---
 html/style-classic.css           | 9 +++++++--
 html/style-light.css             | 6 ++++++
 html/style-mandarine.css         | 8 ++++++--
 html/style-mobile.css            | 7 +++++++
 include/compta_fin_saldo.inc.php | 2 +-
 include/lib/ac_common.php        | 2 +-
 include/lib/user_menu.php        | 1 +
 include/param_pcmn.inc.php       | 4 ++--
 8 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/html/style-classic.css b/html/style-classic.css
index 961f1c7..2e5cdd8 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -1709,23 +1709,28 @@ li.tabs_selected {
     border-top-right-radius: 10px;
     border:1px #879ed4 solid;
     font-weight: bold;
+     float:left;
+    padding:5px;
     
 }
 li.tabs {
     display:inline;
     background-color: inherit;
     color:inherit;margin-left: 0px;
-    padding: 0px;
+    padding: 5px;
     border-top-left-radius: 10px;
     border-top-right-radius: 10px;
     border:1px #879ed4 solid;
+    float:left;
+    background: whitesmoke;
+    margin-top:2px;
 
 }
 li.tabs:hover {
     display:inline;
     background-color: lightblue;
     color:wheat;margin-left: 2px;
-    padding: 0px;
+    padding: 5px;
     border-top-left-radius: 10px;
     border-top-right-radius: 10px;
     border:1px #879ed4 solid;
diff --git a/html/style-light.css b/html/style-light.css
index 232dbcb..9aeb58b 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -1665,6 +1665,9 @@ li.tabs_selected {
     border-top-right-radius: 0px;
     border:1px #879ed4 solid;
     font-weight: bold;
+    float:left;
+    padding:5px;
+    
     
 }
 li.tabs {
@@ -1675,7 +1678,10 @@ li.tabs {
     border-top-left-radius: 0px;
     border-top-right-radius: 0px;
     border:1px #879ed4 solid;
+    float:left;
+    margin-top:2px;
 
+    padding: 5px;
 }
 li.tabs:hover {
     display:inline;
diff --git a/html/style-mandarine.css b/html/style-mandarine.css
index b502ecb..d9359c9 100644
--- a/html/style-mandarine.css
+++ b/html/style-mandarine.css
@@ -1652,18 +1652,22 @@ li.tabs_selected {
     margin-left: 5px;
     padding: 20px 15px 0px 15px;
     border:1px red solid;
+    float: left;
 }
 
 li.tabs,li.tabs:hover{
     display:inline;
-    margin-left: 5px;
+    margin-left: 2px;
     border-top-right-radius: 10px;
     padding: 15px 15px 0px 15px;
     border:1px red solid;
     color:rgb(165, 42, 42);
+    float: left;
+    background-color: #FFF1ED;
+    margin-top: 8px;
 }
 li.tabs {
-    background-color: inherit;
+    /*! background-color: inherit; */
 
 }
 li.tabs:hover {
diff --git a/html/style-mobile.css b/html/style-mobile.css
index 93ad5dc..aa916c0 100644
--- a/html/style-mobile.css
+++ b/html/style-mobile.css
@@ -998,6 +998,9 @@ div.topmenu td, td.mtitle {
   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#606c88', 
endColorstr='#3f4c6b', GradientType=0);
   /* IE6-9 */
 
+  border-right-width: 1px;
+  border-right-style: solid;
+  border-right-color: white;
 }
 div.menu2 td, div.menu2 td.mtitle {
   border-width: 4px;
@@ -1694,6 +1697,9 @@ li.tabs {
   margin-left: 2px;
   padding: 5px 5px 0px 5px;
   border: 1px grey solid;
+  float: left;
+  background-color: #f8f8ff;
+  margin-top: 8px;
 }
 li.tabs:hover {
   display: inline;
@@ -1721,6 +1727,7 @@ ul.tabs a:hover {
     padding: 8px 10px 10px 10px;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
+    float: left;
   }
   li.tabs, li.tabs:hover {
     padding: 10px 10px 0px 10px;
diff --git a/include/compta_fin_saldo.inc.php b/include/compta_fin_saldo.inc.php
index 378c347..0e1d9fa 100644
--- a/include/compta_fin_saldo.inc.php
+++ b/include/compta_fin_saldo.inc.php
@@ -36,7 +36,7 @@ require_once  
NOALYSS_INCLUDE.'/class/class_acc_parm_code.php';
     echo '<div class="content">';
     echo dossier::hidden();
     echo _('Cherche').' : '.HtmlInput::filter_table("fin_saldo_tb", '0,1,2,3', 
'1');
-    echo '<table class="sortable"  style="margin-left:10%;width:80%" 
class="result" id="fin_saldo_tb">';
+    echo '<table class="sortable"  style="margin-left:2%;width:96%" 
class="result" id="fin_saldo_tb">';
     echo tr(th('Quick Code',' class=" 
sorttable_sorted_reverse"',HtmlInput::infobulle(17).'<span 
id="sorttable_sortrevind">&nbsp;&blacktriangle;</span>')
             .th('Compte en banque',' style="text-align:left"')
             .th('Journal',' style="text-align:center"')
diff --git a/include/lib/ac_common.php b/include/lib/ac_common.php
index e4fbd33..15d63a8 100644
--- a/include/lib/ac_common.php
+++ b/include/lib/ac_common.php
@@ -325,7 +325,7 @@ function html_page_start($p_theme="", $p_script="", 
$p_script2="")
     echo '<script language="javascript" src="js/calendar.js"></script>
     <script type="text/javascript" src="js/lang/calendar-en.js"></script>
     <script language="javascript" src="js/calendar-setup.js"></script>
-    <LINK REL="stylesheet" type="text/css" href="./calendar-blue.css" 
media="screen">
+    <LINK REL="stylesheet" type="text/css" href="calendar-blue.css" 
media="screen">
     ';
     // language
     if (isset($_SESSION['g_lang']))
diff --git a/include/lib/user_menu.php b/include/lib/user_menu.php
index 0862b2e..b46f522 100644
--- a/include/lib/user_menu.php
+++ b/include/lib/user_menu.php
@@ -181,6 +181,7 @@ function menu_acc_plan($p_start=1)
     <li class="<?php echo $class[$idx];$idx++; ?>"><A HREF="<?php echo 
$base.'&p_start=8'.$str_dossier; ?>">8 <?php echo _('Hors 
Comptabilité')?></A></li>
     <li class="<?php echo $class[$idx];$idx++; ?>"><A HREF="<?php echo 
$base.'&p_start=9'.$str_dossier; ?>">9 <?php echo _('Hors 
Comptabilité')?></A></li>
     </ul>
+<div style="clear: both"></div>
 <?php
 }
 ?>
\ No newline at end of file
diff --git a/include/param_pcmn.inc.php b/include/param_pcmn.inc.php
index 519e9e2..65a132f 100644
--- a/include/param_pcmn.inc.php
+++ b/include/param_pcmn.inc.php
@@ -54,8 +54,8 @@ $g_start=HtmlInput::default_value_get('p_start',1);
 <DIV CLASS="myfieldset" style="width:auto">
 <?php
 $Ret=$cn->exec_sql("select 
pcm_val,pcm_lib,pcm_val_parent,pcm_type,array_to_string(array_agg(j_qcode) , 
',') as acode
-       from tmp_pcmn left join vw_poste_qcode on (j_poste=pcm_val) where 
substr(pcm_val::text,1,1)='".$g_start."'".
-               "  group by pcm_val,pcm_lib,pcm_val_parent, pcm_type  order by 
pcm_val::text");
+       from tmp_pcmn left join vw_poste_qcode on (j_poste=pcm_val) where 
substr(pcm_val::text,1,1)=$1 
+                 group by pcm_val,pcm_lib,pcm_val_parent, pcm_type  order by 
pcm_val::text",array($g_start));
 $MaxRow=Database::num_row($Ret);
 
 ?>