aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 10:11:52 +0000
committerpete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-12 10:11:52 +0000
commit4c7837dafcf4b1c68c011f178315f38285aa0030 (patch)
tree2641ad0ddfbf134d8ebac031cd719b9207382c69 /views
parent12c2361b2bf7eb15f79bcfa288da8d3a253c07fc (diff)
downloadelgg-4c7837dafcf4b1c68c011f178315f38285aa0030.tar.gz
elgg-4c7837dafcf4b1c68c011f178315f38285aa0030.tar.bz2
Removed unneeded div from around submenu lists.
git-svn-id: http://code.elgg.org/elgg/trunk@5373 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/canvas_header/submenu_group.php3
-rw-r--r--views/default/css.php8
-rw-r--r--views/default/page_elements/owner_block.php2
-rw-r--r--views/default/page_elements/title.php6
4 files changed, 9 insertions, 10 deletions
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;
}
}