collapse user menu when inside one of the settings sections

diff --git a/core/css/styles.css b/core/css/styles.css
index 481443a19bdd0d28467bba6f8ce0df3182ac9e15..c2f4f8b55bde0e0306d3699a5e8163b3b69e9817 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -234,7 +234,10 @@ fieldset.warning legend { color:#b94a48 !important; }
 #expand:hover, #expand:focus, #expand:active { color:#fff; }
 #expand img { opacity:.7; margin-bottom:-2px; }
 #expand:hover img, #expand:focus img, #expand:active img { opacity:1; }
-#expanddiv { position:absolute; right:0; top:45px; background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68); z-index:76; }
+#expanddiv {
+       position:absolute; right:0; top:45px; z-index:76; display:none;
+       background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68);
+}
        #expanddiv a { display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; opacity:.7; }
        #expanddiv a img { margin-bottom:-3px; }
        #expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { opacity:1; }

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index de505486f7533c5a3ce16461158386b7a14640e8..2547278547fedc25080c7a00c42a897471a824d0 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -35,7 +35,7 @@
                                        <?php echo OCP\User::getDisplayName($user=null)?OCP\User::getDisplayName($user=null):(OC_User::getUser()?OC_User::getUser():'') ?>
                                        <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
                                </span>
-                               <div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
+                               <div id="expanddiv">
                                <?php foreach($_['settingsnavigation'] as $entry):?>
                                        <li>
                                                <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>