Minor fixes on menu

diff --git a/galette/templates/default/page.tpl b/galette/templates/default/page.tpl
index 4fc4b7368b6d10dcf6a61c6f6e5a80c7c0dbbfe2..e067e8a2e7161ed4cc86b4d3f8fcf976f6cb6c70 100644 (file)
--- a/galette/templates/default/page.tpl
+++ b/galette/templates/default/page.tpl
@@ -84,7 +84,7 @@ We have to use a template file, so Smarty will do its work (like replacing varia
             <li{if $cur_route eq "configureDynamicFields" or $cur_route eq 'editDynamicField' or $cur_route eq 'addDynamicField'} class="selected"{/if}><a href="{path_for name="configureDynamicFields"}" title="{_T string="Manage additional fields for various forms"}">{_T string="Dynamic fields"}</a></li>
             <li{if $cur_route eq "dynamicTranslations"} class="selected"{/if}><a href="{path_for name="dynamicTranslations"}" title="{_T string="Translate additionnals fields labels"}">{_T string="Translate labels"}</a></li>
             <li{if $cur_route eq "entitleds" and $cur_subroute eq "status"} class="selected"{/if}><a href="{path_for name="entitleds" data=["class" => "status"]}" title="{_T string="Manage statuses"}">{_T string="Manage statuses"}</a></li>
-            <li{if $cur_route eq "entitleds" and $cur_subroute eq "contributions-types"} class="selected"{/if}><a href="{path_for name="entitleds" data=["class" => "contributions-types"]}" title="{_T string="Manage contributions types"}">{_T string="Contributions types"}</a></li>
+            <li{if ($cur_route eq "entitleds" or $cur_route eq "editEntitled") and $cur_subroute eq "contributions-types"} class="selected"{/if}><a href="{path_for name="entitleds" data=["class" => "contributions-types"]}" title="{_T string="Manage contributions types"}">{_T string="Contributions types"}</a></li>
             <li{if $cur_route eq "texts"} class="selected"{/if}><a href="{path_for name="texts"}" title="{_T string="Manage emails texts and subjects"}">{_T string="Emails content"}</a></li>
             <li{if $cur_route eq "titles"} class="selected"{/if}><a href="{path_for name="titles"}" title="{_T string="Manage titles"}">{_T string="Titles"}</a></li>
             <li{if $cur_route eq "pdfModels"} class="selected"{/if}><a href="{path_for name="pdfModels"}" title="{_T string="Manage PDF models"}">{_T string="PDF models"}</a></li>

diff --git a/galette/webroot/js/common.js b/galette/webroot/js/common.js
index 0731952926e70caa9a368b82fa50040c3535fed6..759395e2af799674abf492cde5516299b5ff6dd4 100644 (file)
--- a/galette/webroot/js/common.js
+++ b/galette/webroot/js/common.js
@@ -222,7 +222,6 @@ $(function() {
             }
         }
     });
-    $('.selected').addClass('ui-state-disabled');
 
     if ( $('#back2top').length > 0 ) {
         if (!$('#wrapper').scrollTop() && !$('html').scrollTop() ) {

diff --git a/galette/webroot/themes/default/galette.css b/galette/webroot/themes/default/galette.css
index 5722765a181959fa3d8c65abf309175de7bcc8a8..4fcc930047c157915b94a61252dfc3dae9e20d2b 100644 (file)
--- a/galette/webroot/themes/default/galette.css
+++ b/galette/webroot/themes/default/galette.css
@@ -247,6 +247,10 @@ nav a{
     background-color: #DDDDFF;
     text-decoration:underline;
 }
+.selected {
+    opacity: .35;
+    background-image: none;
+}
 #menu li.selected a{
     background-color: #DDDDFF;
 }