aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-25 11:52:43 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-25 11:52:43 +0000
commit4f7d11dfa52cbdaaba9e269fb6e2ba4ed3355dcb (patch)
tree65ebe5ce176a76d7f1855b0ee57e2cd6854668a3 /views/default
parentcb4dd43dd5ead9bd48df91051dcb753eaac992ff (diff)
downloadelgg-4f7d11dfa52cbdaaba9e269fb6e2ba4ed3355dcb.tar.gz
elgg-4f7d11dfa52cbdaaba9e269fb6e2ba4ed3355dcb.tar.bz2
tools menu item fixed and jquery animation added
git-svn-id: https://code.elgg.org/elgg/trunk@1528 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/navigation/topbar_tools.php33
-rw-r--r--views/default/page_elements/elgg_topbar.php15
2 files changed, 39 insertions, 9 deletions
diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index eb8bbf652..f4893f7d4 100644
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -22,6 +22,7 @@
?>
<style type="text/css">
+
#tools_menu, #tools_menu ul{
margin:0;
padding:0;
@@ -31,7 +32,10 @@
list-style-position:outside;
/*position:relative;
line-height:1.5em;*/
-
+}
+
+#tools_menu {
+ margin:0pt 15px 0pt 5px;
}
#tools_menu a {
@@ -39,7 +43,6 @@
padding:3px;
color:white;
text-decoration:none;
-
}
#tools_menu a:hover {
@@ -60,6 +63,8 @@
top:24px;
border-top:1px solid #333;
border-bottom:1px solid #333;
+
+ width:134px;
}
#tools_menu ul a {
@@ -117,4 +122,26 @@
}
-?> \ No newline at end of file
+?>
+
+<script type="text/javascript">
+function tools_menu(){
+$(" #tools_menu ul ").css({display: "none"}); // opera + ie fix
+$(" #tools_menu li").hover(function(){
+ $(this).find('ul:first').css("display", "none");
+ $(this).find('ul:first').slideDown("fast");
+ $(this).parent().parent().parent().find("#tools_menu a").addClass('tools_menu_on');
+
+ },function(){
+ $(this).find('ul:first').slideUp("fast");
+ $(this).parent().parent().parent().find("#tools_menu a").removeClass('tools_menu_on');
+ });
+}
+
+
+
+ $(document).ready(function(){
+ tools_menu();
+});
+</script>
+
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 23ec5b310..87e5aa782 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -30,12 +30,15 @@
<div class="toolbarlinks">
<a href="<?php echo $_SESSION['user']->getURL(); ?>" class="pagelinks"><?php echo elgg_echo('profile'); ?></a> <!-- class="loggedinuser" <?php echo $_SESSION['user']->username; ?></a> -->
<a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a>
-
+ </div>
<?php
echo elgg_view("navigation/topbar_tools");
- ?>
+ ?>
+
+
+ <div class="toolbarlinks">
<?php
//allow people to extend this top menu
echo elgg_view('elgg_topbar/extend', $vars);
@@ -57,11 +60,9 @@
}
?>
-
-
-
-
</div>
+
+
</div>
@@ -80,11 +81,13 @@
<!-- elgg user settings panel -->
+<!--
<div id="elgg_topbar_panel">
<p>user settings here</p>
</div>
+-->
<!-- /#elgg_topbar_panel -->
<div style="clear:both;"></div>