Changeset 217

Timestamp:

02/17/09 16:36:34 (9 months ago)

Author:

cedenoj

Message:

refs #3138 Taking care of links in main top black bar and mainnav in elgg
Submitting this patch again since I had committed into a branch before

Files:

• elgg/trunk/lib/templates.php (modified) (2 diffs)
• elgg/trunk/mod/admin/lib.php (modified) (1 diff)
• elgg/trunk/mod/blog/lib.php (modified) (2 diffs)
• elgg/trunk/mod/browser/lib.php (modified) (1 diff)
• elgg/trunk/mod/community/lib.php (modified) (1 diff)
• elgg/trunk/mod/file/lib.php (modified) (1 diff)
• elgg/trunk/mod/friend/lib.php (modified) (1 diff)
• elgg/trunk/mod/profile/lib.php (modified) (1 diff)
• elgg/trunk/mod/search/lib.php (modified) (1 diff)
• elgg/trunk/mod/toolbar/css (modified) (1 diff)
• elgg/trunk/mod/toolbar/toolbar.inc (modified) (1 diff)

elgg/trunk/lib/templates.php

@@ -102 +102 @@
-        $PAGE->menu[] = array(
-                                  'name' => 'userdetails',
+                                  'order' => 9,
-                                  'html' => "<li><a href=\"" . $CFG->wwwroot . "_userdetails/\">" . __gettext("Settings") . "</a></li>");
-
@@ -133 +134 @@
-        }
-    }
+
+    // sort the links in the mainnav
+    $sorted_items = array();;
+    foreach ($PAGE->menu as $menu_item) {
+        $sorted_items[$menu_item['order']] = $menu_item;
+    }
+    ksort($sorted_items);
+    $PAGE->menu = $sorted_items;
-}
-

elgg/trunk/mod/admin/lib.php

@@ -11 +11 @@
-    if (isadmin()) {
-        $PAGE->menu[] = array( 'name' => 'admin',
-
+
+
-    }
-

elgg/trunk/mod/blog/lib.php

@@ -62 +62 @@
-      $PAGE->menu[]= array (
-        'name' => 'weblog',
+        'order' => 6,
-        'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/weblog\" class=\"selected\" >" . __gettext("Blog") . '</a></li>');
-
@@ -67 +68 @@
-      $PAGE->menu[]= array (
-        'name' => 'weblog',
+        'order' => 6,
-        'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/weblog\" >" . __gettext("Blog") . '</a></li>');
-    };

elgg/trunk/mod/browser/lib.php

@@ -9 +9 @@
-        $page_owner = $profile_id;
-    
-        $PAGE->menu[] = array( 'name' => 'browse',
-                                    'html' => '<li><a href="' . $CFG->wwwroot .'mod/browser/">' . __gettext("Browse") . '</a></li>');
-    }
-

elgg/trunk/mod/community/lib.php

@@ -37 +37 @@
-
-    if (isloggedin()) {
-
-
+
-            $PAGE->menu[] = array( 'name' => 'community',
-
-
-
-
-
+
+
+
+
+
+
-        }
-    }

elgg/trunk/mod/file/lib.php

@@ -16 +16 @@
-        if (defined("context") && context == "files" && $page_owner == $_SESSION['userid']) {
-            $PAGE->menu[] = array( 'name' => 'files',
+                                   'order' => 7,
-                                   'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/files/\" class=\"selected\" >" .__gettext("Files").'</a></li>');
-        } else {
-            $PAGE->menu[] = array( 'name' => 'files',
+                                   'order' => 7,
-                                   'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/files/\" >" .__gettext("Files").'</a></li>');
-        }

elgg/trunk/mod/friend/lib.php

@@ -19 +19 @@
-
-            $PAGE->menu[] = array( 'name' => 'friends',
+                                   'order' => 3,
-                                   'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/friends/\" class=\"selected\" >" .__gettext("Friends").'</a></li>');
-            } else {
-                $PAGE->menu[] = array( 'name' => 'friends',
+                                       'order' => 3,
-                                       'html' => "<li><a href=\"{$CFG->wwwroot}{$_SESSION['username']}/friends/\" >" .__gettext("Friends").'</a></li>');
-            }

elgg/trunk/mod/profile/lib.php

@@ -14 +14 @@
-                        $PAGE->menu[] = array (
-                                'name' => 'profile',
+                'order' => 2,
-                                'html' => '<li><a href="' . $CFG->wwwroot . $_SESSION['username'] . '/profile/" class="selected">' . __gettext("Profile") . '</a></li>');
-                } else {
-                        $PAGE->menu[] = array (
-                                'name' => 'profile',
+                'order' => 2,
-                                'html' => '<li><a href="' . $CFG->wwwroot . $_SESSION['username'] . '/profile/">' . __gettext("Profile") . '</a></li>');
-                }

elgg/trunk/mod/search/lib.php

@@ -15 +15 @@
-
-    $PAGE->menu[] = array( 'name' => 'tag_cloud',
+        'order' => 8,
-        'html' => '<li><a href="' . $CFG->wwwroot .'search/tags.php">' . __gettext("Tag Cloud") . '</a></li>');
-

elgg/trunk/mod/toolbar/css

@@ -8 +8 @@
-#login_links a {
- color:#ee9944 !important;
+ font-size:12px;
-}
-#login_links a:hover {

elgg/trunk/mod/toolbar/toolbar.inc

@@ -6 +6 @@
-    <ul>
-        <li class="rb"><a href="/social">Home</a></li>
+{{myprofile}}
+        <li class="rb"><a href="/social/mod/browser/index.php?display=users">People</a></li>
+        <li class="rb"><a href="/social/mod/browser/index.php?display=communities">Communities</a></li>
-        <li class="rb"><a href="/projects">Projects</a></li>
-        <li class="rb"><a href="/social/mod/browser/index.php?display=communities">Communities</a></li>
-        <li class="rb"><a href="/social/mod/browser/index.php?display=users">People</a></li>
-{{myprofile}}
-        <li class="rb"><a href="/social/mod/marketplace">Marketplace</a></li>
-        <li><a href="/request">Request a Project</a></li>