Changeset 193

Timestamp:

01/23/09 21:56:15 (10 months ago)

Author:

cedenoj

Message:

fixes #2890 We now display a Home link in the top black menu bar that goes to /social. Also if the user is logged in, we display a link to 'my profile'. Also fixed the annoying 1px border in the login/logout link.

Files:

• elgg/trunk/lib/templates.php (modified) (3 diffs)
• elgg/trunk/mod/template/lib/default_template.php (modified) (2 diffs)
• elgg/trunk/mod/toolbar/css (modified) (1 diff)
• elgg/trunk/mod/toolbar/lib.php (modified) (1 diff)
• elgg/trunk/mod/toolbar/toolbar.inc (modified) (1 diff)

elgg/trunk/lib/templates.php

@@ -80 +80 @@
-    global $PAGE;
-    global $CFG;
+    global $USER;
-
-    if (!empty($PAGE->setupdone)) {
@@ -103 +104 @@
-                                  'html' => "<li><a href=\"" . $CFG->wwwroot . "_userdetails/\">" . __gettext("Settings") . "</a></li>");
-
-        $PAGE->menu_top[] = array(
-                                  'name' => 'logoff',
-                                  //'html' => a_href("{$CFG->wwwroot}login/logout.php",
-                                  //                 "Log off"));
-                                  'html' => "<li><a href=\"" . $CFG->wwwroot . "login/logout.php\">" . __gettext("Log off") . "</a></li>");
-
-        $PAGE->login[] = array(
-                                  'name' => 'logoff',
-                                  'html' => "<li><a href=\"" . $CFG->wwwroot . "login/logout.php\">" . __gettext("Log off") . "</a></li>");
+
+        $PAGE->myprofile[] = array(
+                                  'name' => 'myprofilelink',
+                                  'html' => "<a href=\"".$CFG->wwwroot . $USER->username . "/profile\">" . __gettext("My Profile") . "</a>");
-    } else {
-        $PAGE->login[] = array(
-                                  'name' => 'login',
-                                  'html' => "<li><a href=\"" . $CFG->wwwroot . "login/index.php\">" . __gettext("Log in") . "</a></li>");
+
+        $PAGE->myprofile[] = array(
+                                  'name' => 'myprofilelink',
+                                  'html' => "");
-    }
-
@@ -928 +931 @@
-            break;
-
+        case 'myprofile':
+                $result =  templates_draw(array(
+                                            'myprofileitems' => menu_join('', $PAGE->myprofile),
+                                            'context' => 'myprofile'
+                                            ));
+            break;
+
-        case "url":
-            $result =  url;

elgg/trunk/mod/template/lib/default_template.php

@@ -26 +26 @@
-                                                            '{{topmenu}}' => __gettext("Status menu"),
-                                                            '{{login}}' => __gettext("Login/Logout links"),
+                                                            '{{myprofile}}' => __gettext("My Profile links"),
-                                                            '{{mainbody}}' => __gettext("Main body"),
-                                                            '{{sidebar}}' => __gettext("Sidebar")
@@ -235 +236 @@
-
-    $template_definition[] = array(
+                                    'id' => 'myprofile',
+                                    'name' => __gettext("My Profile Link"),
+                                    'description' => __gettext("It displays a my profile link on the top black menu bar when the user is logged in."),
+                                    'glossary' => array(
+                                            '{{myprofileitems}}' =>  __gettext("The my profile link")
+                                            )
+                                    );
+
+    $template_definition[] = array(
-                                    'id' => 'login',
-                                    'name' => __gettext("Login/logout links shell"),
-                                    'description' => __gettext("It displays a login/logout link on the top black bar if the user is logged in."),
-
-
-
-
+
+
+
+
+
+
+
-
-    $template['login'] = <<< END

elgg/trunk/mod/toolbar/css

@@ -2 +2 @@
-#login_links {
- float:right;
+}
+#login_links li {
+border-right:0px;
-}
-#login_links a {

elgg/trunk/mod/toolbar/lib.php

@@ -35 +35 @@
-        $toolbar = str_replace("{{topmenu}}", templates_variables_substitute(array(array(),"topmenu")), $toolbar);
-        $toolbar = str_replace("{{login}}", templates_variables_substitute(array(array(),"login")), $toolbar);
+        $toolbar = str_replace("{{myprofile}}", templates_variables_substitute(array(array(),"myprofile")), $toolbar);
-        if (isloggedin()) {
-            $toolbar =  str_replace("{{usericon}}", "<a href=\"{$CFG->wwwroot}{$_SESSION['username']}\">" . user_icon_html($_SESSION['userid'], 50) . "</a>", $toolbar);

elgg/trunk/mod/toolbar/toolbar.inc

@@ -5 +5 @@
-<div id="topnav">
-    <ul>
-projects">Projects
-
+social">Home
+
-        <li class="rb"><a href="/social/mod/marketplace">Marketplace</a></li>
-        <li><a href="/request">Request a Project</a></li>