[Noalyss-commit] [noalyss] 04/04: Task #1208 - CFGPRO : couleur et doublons #1208 : color and duplicate

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit aa59894a4a09014ff15c5cedf8e762d498df8e6f
Author: Dany De Bontridder <address@hidden>
Date:   Thu Nov 5 17:36:18 2015 +0100

    Task #1208 - CFGPRO : couleur et doublons
    #1208 : color and duplicate
---
 html/js/scripts.js                                |    1 +
 html/style-classic.css                            |    8 ++++++++
 html/style-light.css                              |    8 ++++++++
 html/style-mandarine.css                          |   10 +++++++++-
 html/style-mobile.css                             |    7 +++++++
 include/profile.inc.php                           |    4 ++--
 include/template/profile_menu_display_module.php  |    2 +-
 include/template/profile_menu_display_submenu.php |    3 ++-
 8 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index a07b10e..b451cfe 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -1502,6 +1502,7 @@ function 
display_sub_menu(p_dossier,p_profile,p_dep,p_level)
                 if ( $('menu_table').rows.length > p_level ) {
                     $('menu_table').rows[1].remove();
                 }
+                $('sub'+p_dep).addClassName("selectedmenu");
                 var new_row = document.createElement('TR');
                 new_row.innerHTML = req.responseText;
                 $('menu_table').appendChild(new_row);
diff --git a/html/style-classic.css b/html/style-classic.css
index 437cf8a..99a6ab8 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -2103,3 +2103,11 @@ button.cancel {
 .queue{
        display:none;
 }
+/*
+ * Menu selected when configuring the profile
+ */
+
+td.selectedmenu {
+ background-color: beige;   
+ font-weight: bolder;
+}
\ No newline at end of file
diff --git a/html/style-light.css b/html/style-light.css
index d93a92f..2ab329e 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -2090,3 +2090,11 @@ button.cancel {
 .queue{
        display:none;
 }
+
+/*
+ * Menu selected when configuring the profile
+ */
+
+td.selectedmenu {
+    
+}
\ No newline at end of file
diff --git a/html/style-mandarine.css b/html/style-mandarine.css
index 74eb6ea..1b66ab3 100644
--- a/html/style-mandarine.css
+++ b/html/style-mandarine.css
@@ -1779,7 +1779,7 @@ div.content a.tinybutton{
     margin: 1px 2px 1px 2px;
     border-width: 1px;
     border-style: solid;
-    border-color: blue;
+    
     border-radius: 2px; 
     display : inline;
 }
@@ -2089,4 +2089,12 @@ div.autocomplete_fixed ul li {
     margin:0px;
     padding:0px;
     cursor:pointer;
+}
+
+/*
+ * Menu selected when configuring the profile
+ */
+
+td.selectedmenu {
+    background-color: #FDF5E6;
 }
\ No newline at end of file
diff --git a/html/style-mobile.css b/html/style-mobile.css
index 008a3a8..c53de97 100644
--- a/html/style-mobile.css
+++ b/html/style-mobile.css
@@ -2034,3 +2034,10 @@ button.cancel {
 .queue{
        display:none;
 }
+/*
+ * Menu selected when configuring the profile
+ */
+
+td.selectedmenu {
+    
+}
\ No newline at end of file
diff --git a/include/profile.inc.php b/include/profile.inc.php
index 5e98120..6e3e71e 100644
--- a/include/profile.inc.php
+++ b/include/profile.inc.php
@@ -449,10 +449,10 @@ $dep=HtmlInput::default_value_post("dep", 0);
 <script>
     var selected_menu="<?php echo $dep;?>";
     function menu_select(rowid) {
-        $('sub'+rowid).addClassName("selectedcell");
+        $('sub'+rowid).addClassName("selectedmenu");
         if ( selected_menu != "0" && rowid != selected_menu ) {
             if ( $('sub'+selected_menu) ) {
-                $('sub'+selected_menu).removeClassName("selectedcell");
+                $('sub'+selected_menu).removeClassName("selectedmenu");
             }
         }
         selected_menu=rowid;
diff --git a/include/template/profile_menu_display_module.php 
b/include/template/profile_menu_display_module.php
index 27a058e..099bbf8 100644
--- a/include/template/profile_menu_display_module.php
+++ b/include/template/profile_menu_display_module.php
@@ -61,7 +61,7 @@
                    }
                    ?>
                <td class="<?php echo $style?>" id="sub<?php echo 
$row['pm_id']?>">
-                        <?php echo 
HtmlInput::anchor(gettext($row['me_menu']),'',sprintf(" onclick =\"mod_menu 
(%d,%d) \" ",Dossier::id(),$row['pm_id']),' class="line" ')?>
+                        <?php echo HtmlInput::anchor($row['me_code']." 
".gettext($row['me_menu']),'',sprintf(" onclick =\"mod_menu (%d,%d) \" 
",Dossier::id(),$row['pm_id']),' class="line" ')?>
                         <span>
                             <?php echo HtmlInput::anchor(SMALLX, "", 
                                     sprintf (" onclick = 
\"remove_sub_menu(%d,%d)\"", Dossier::id(),$row['pm_id']),
diff --git a/include/template/profile_menu_display_submenu.php 
b/include/template/profile_menu_display_submenu.php
index c5ac5ff..ce69633 100644
--- a/include/template/profile_menu_display_submenu.php
+++ b/include/template/profile_menu_display_submenu.php
@@ -47,7 +47,8 @@
             }
         ?>
         <?php 
-            echo HtmlInput::anchor(gettext($a_module[$i]['me_menu']),'',
+            echo HtmlInput::anchor($a_module[$i]['me_code']. " ".
+                    gettext($a_module[$i]['me_menu']),'',
                    sprintf(" onclick =\"mod_menu (%d,%d) \" 
",Dossier::id(),$a_module[$i]['pm_id']),
                    ' class="line" ')?>
         <span>