finished phototag search page

diff --git a/languages/en.php b/languages/en.php
index fca507407ab0fafdb13bb4b0839a20c83f058e6d..4802308ff572f4436c322097fe47dd0792a04cd0 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -103,6 +103,7 @@
                        'tidypics:actiondelete' => 'Delete',\r
                        'tidypics:actioncancel' => 'Cancel',\r
                        'tidypics:inthisphoto' => 'In this photo',\r
+                       'tidypics:usertag' => "Photos tagged with user %s",\r
                        'tidypics:phototagging:success' => 'Photo tag was successfully added',\r
                        'tidypics:phototagging:error' => 'Unexpected error occurred during tagging',\r
                        'tidypics:deletetag:success' => 'Selected tags were successfully deleted',\r

diff --git a/search.php b/search.php
index 2899d2c3f32032c6036e1637ed6c64eeeb4e048e..b7b67295d1a7b0ae13c7a759170eb05ba3ddc9cc 100644 (file)
--- a/search.php
+++ b/search.php
@@ -2,22 +2,41 @@
 \r
        include_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");\r
        \r
-       // Set context\r
        set_context('search');\r
        \r
        // Get user guid\r
        $guid = get_input('guid');\r
        \r
        $user = get_entity($guid);\r
-//     if ($user)\r
-//             $user->name;\r
+\r
+       if ($user)\r
+               $title = sprintf(elgg_echo('tidypics:usertag'), $user->name);\r
+       else\r
+               $title = "User does not exist";\r
                \r
-       $title = $user->name;\r
        \r
        \r
+       // create main column\r
        $body = elgg_view_title($title); \r
        $body .= list_entities_from_relationship('phototag', $guid, false, 'object', 'image'); \r
+\r
+       // Set up submenus\r
+       if (isloggedin()) {\r
+               add_submenu_item(       elgg_echo("album:yours"), \r
+                                                       $CONFIG->wwwroot . "pg/photos/owned/" . $_SESSION['user']->username, \r
+                                                       'tidypics-b' );\r
+       }\r
+       add_submenu_item(       elgg_echo('album:all'), \r
+                                               $CONFIG->wwwroot . "pg/photos/world/", \r
+                                               'tidypics-z');\r
+       add_submenu_item(       elgg_echo('tidypics:mostrecent'),\r
+                                               $CONFIG->wwwroot . 'pg/photos/mostrecent',\r
+                                               'tidypics-z');\r
+\r
+       \r
+       \r
        $body = elgg_view_layout('two_column_left_sidebar','',$body);\r
+       \r
 \r
        page_draw($title,$body);\r
 \r

diff --git a/start.php b/start.php
index 6318a3da1d6e3d744e9d87348aef89ca9675a07f..dec7e36ede8aed09e523b86037b18fdaeb862e18 100644 (file)
--- a/start.php
+++ b/start.php
@@ -149,7 +149,7 @@
                                                                        'tidypics');\r
                        }\r
                        \r
-                       add_submenu_item(       sprintf(elgg_echo('album:all'),$page_owner->name), \r
+                       add_submenu_item(       elgg_echo('album:all'), \r
                                                                $CONFIG->wwwroot . "pg/photos/world/", \r
                                                                'tidypics-z');\r
                        add_submenu_item(       elgg_echo('tidypics:mostrecent'),\r