Removed unneeded div from around submenu lists.

git-svn-id: http://code.elgg.org/elgg/trunk@5373 36083f99-b078-4883-b0ff-0f9b5a30f544

9 files changed, 18 insertions, 20 deletions

diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php
index 74d69356b..1a6124dbd 100644
--- a/mod/blog/views/default/blog/sidebar_menu.php
+++ b/mod/blog/views/default/blog/sidebar_menu.php
@@ -37,6 +37,6 @@ if ($loggedin_user) {
 
 ?>
 
-<ul>
-<li>Drafts</li>
+<ul class="submenu">
+	<li><a href="">Drafts</a></li>
 </ul>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/side_menu.php b/mod/groups/views/default/groups/side_menu.php
index 67cea1634..a86cd8adb 100644
--- a/mod/groups/views/default/groups/side_menu.php
+++ b/mod/groups/views/default/groups/side_menu.php
@@ -1,8 +1,8 @@
-<div class="submenu page_navigation"><ul>
+<ul class="submenu page_navigation">
 <?php
 	if(isloggedin()){
 		echo "<li><a href=\"{$vars['url']}pg/groups/member/{$_SESSION['user']->username}\">". elgg_echo('groups:yours') ."</a></li>";
 		echo "<li><a href=\"{$vars['url']}pg/groups/invitations/{$_SESSION['user']->username}\">". elgg_echo('groups:invitations') ."</a></li>";
 	}
 ?>
-</ul></div>
\ No newline at end of file
+</ul>
\ No newline at end of file
diff --git a/mod/members/index.php b/mod/members/index.php
index 6df2ceeb1..2962f7768 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -27,11 +27,10 @@ $filter = get_input("filter", "newest");
 $tag = get_input('tag');
 
 // friends links
-$area1 = "<div class='submenu page_navigation'>";
-$area1 .= "<ul><li><a href=\"" . $CONFIG->wwwroot."pg/friends/" . page_owner_entity()->username . "\">". elgg_echo('friends') . "</a></li>";
+$area1 = "<ul class='submenu page_navigation'><li><a href=\"" . $CONFIG->wwwroot."pg/friends/" . page_owner_entity()->username . "\">". elgg_echo('friends') . "</a></li>";
 $area1 .= "<li><a href=\"" . $CONFIG->wwwroot."pg/friendsof/" . page_owner_entity()->username . "\">". elgg_echo('friends:of') . "</a></li>";
 $area1 .= "<li class='selected'><a href=\"" . $CONFIG->wwwroot."mod/members/index.php\">". elgg_echo('members:browse') . "</a></li>";
-$area1 .= "</ul></div>";
+$area1 .= "</ul>";
 
 //search members
 $area1 .= elgg_view("members/search");
diff --git a/mod/profile/views/default/profile/submenu.php b/mod/profile/views/default/profile/submenu.php
index 906200a00..682b910c2 100644
--- a/mod/profile/views/default/profile/submenu.php
+++ b/mod/profile/views/default/profile/submenu.php
@@ -15,7 +15,7 @@
 	 
 ?>
 
-<ul>
+<ul class="submenu profilelinks">
     <li><a href="<?php echo $CONFIG->wwwroot . "mod/profile/edit.php"; ?>"><?php echo elgg_echo('profile:details'); ?></a></li>
     <li><a href="<?php echo $CONFIG->wwwroot."mod/profile/editicon.php"; ?>"><?php echo elgg_echo('profile:editicon'); ?></a></li>
     <li><a href="<?php echo $CONFIG->wwwroot."pg/profile/" . $_SESSION['user']->username; ?>"><?php echo elgg_echo('profile:back'); ?></a></li>
diff --git a/mod/riverdashboard/views/default/riverdashboard/menu.php b/mod/riverdashboard/views/default/riverdashboard/menu.php
index 8a8964384..bfb0f4172 100644
--- a/mod/riverdashboard/views/default/riverdashboard/menu.php
+++ b/mod/riverdashboard/views/default/riverdashboard/menu.php
@@ -14,7 +14,7 @@ switch($vars['orient']) {
 					break;

 }

 ?>

-<div class="submenu"><ul>

+<ul class="submenu riverdashboard">

 <?php

 	if(isloggedin()){

 ?>

@@ -25,4 +25,4 @@ switch($vars['orient']) {
 <?php

 	}

 ?>

-</ul></div>
\ No newline at end of file
+</ul>
\ No newline at end of file
diff --git a/views/default/canvas_header/submenu_group.php b/views/default/canvas_header/submenu_group.php
index bf9fb6ab8..4b1b3fb66 100644
--- a/views/default/canvas_header/submenu_group.php
+++ b/views/default/canvas_header/submenu_group.php
@@ -14,7 +14,6 @@ if (isset($vars['group_name'])) {
 }
 
 if (isset($vars['submenu'])) {
-	$submenu = "<ul>" . $vars['submenu'] . "</ul>";
-	//echo "<div class=\"submenu_group\"><div class=\"submenu_group_{$groupname}\">{$submenu}</div></div>";
+	$submenu = "<ul class='submenu group'>" . $vars['submenu'] . "</ul>";
 	echo $submenu;
 }
\ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index f2a3bfc08..1d2eca907 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -659,16 +659,16 @@ h2 {
 /* ***************************************
 	SUBMENU
 *************************************** */
-.submenu ul {
+.submenu {
 	margin:0;
 	padding:0;
 	list-style: none;
 }
-.submenu ul li.selected a {
+.submenu li.selected a {
 	background: #4690D6;
 	color:white;
 }
-.submenu ul li a {
+.submenu li a {
 	display:block;
 	-webkit-border-radius: 8px; 
 	-moz-border-radius: 8px;
@@ -676,7 +676,7 @@ h2 {
 	margin:0 0 3px 0;
 	padding:2px 4px 2px 8px;
 }
-.submenu ul li a:hover {
+.submenu li a:hover {
 	background:#0054A7;
 	color:white;
 	text-decoration:none;
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 4689b5a54..a45fad826 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -60,7 +60,7 @@ if (isset($vars['content']))
 // Initialise the current tool/page submenu (plugins can add to the submenu)
 $submenu = get_submenu(); 
 if (!empty($submenu))
-	$contents .= "<div class='submenu page_navigation'>" . $submenu . "</div>"; 
+	$contents .= $submenu; 
 
 if (!empty($contents)) {
 	echo $contents;
diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php
index 5f8f7a762..c89371013 100644
--- a/views/default/page_elements/title.php
+++ b/views/default/page_elements/title.php
@@ -9,7 +9,7 @@ $page_owner_user = get_entity($page_owner);
 
 $submenu = get_submenu(); // elgg_view('canvas_header/submenu');
 if (!empty($submenu)) {
-	$submenu = "<ul>" . $submenu . "</ul>";
+	$submenu = "<ul class='submenu extended'>" . $submenu . "</ul>";
 }
 
 if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID())) {
@@ -21,7 +21,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['
 	}
 	if (!empty($submenu) && $vars['submenu'] == true) {
 		// plugins can extend this to add menu options
-		$display .= "<div class='submenu extended'>" . $submenu . "</div>";
+		$display .= $submenu;
 	}
 } else {
 	$info = "<h2>" . $vars['title'] . "</h2>";
@@ -32,7 +32,7 @@ if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['
 	}
 	if (!empty($submenu)  && $vars['submenu'] == true) {
 		// plugins can extend this to add menu options
-		$display .= "<div class='submenu extended'>" . $submenu . "</div>";
+		$display .= $submenu;
 	}
 }