From 7c06e21ec443a46bd78bc9e99d8284283ff85c59 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 24 Jan 2010 15:27:33 -0800
Subject: Refactor creating the user profile page content into the the event
 module.  The show_user_profile is used to provide content to the user profile
 page.  Add the list of the users comments to the profile page.

---
 modules/gallery/helpers/gallery_event.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 29940ac6..6b70513a 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -377,4 +377,22 @@ class gallery_event_Core {
       }
     }
   }
+
+  static function show_user_profile($data) {
+    $v = new View("user_profile_info.html");
+
+    $fields = array("name" => t("Name"), "locale" => t("Locale"), "email" => t("Email"),
+                    "full_name" => t("Full name"), "url" => "Web site");
+    if (!$data->display_all) {
+      $fields = array("name" => t("Name"), "full_name" => t("Full name"), "url" => "Web site");
+    }
+    $v->fields = array();
+    foreach ($fields as $field => $label) {
+      if (!empty($data->user->$field)) {
+        $v->fields[(string)$label->for_html()] = $data->user->$field;
+      }
+    }
+    $data->content[] = (object)array("title" => t("User information"), "view" => $v);
+
+  }
 }
-- 
cgit v1.2.3


From c9ea1a64de16af16180c106a3012919150d3cf60 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sun, 24 Jan 2010 15:40:56 -0800
Subject: Remove the one last remaining reference to "no_module_admin".

---
 modules/gallery/helpers/module.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index f680ff6a..95e426c4 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -98,7 +98,7 @@ class module_Core {
         $m->active = self::is_active($module_name);
         $m->code_version = $m->version;
         $m->version = self::get_version($module_name);
-        $m->locked = !empty($m->no_module_admin);
+        $m->locked = false;
       }
 
       // Lock certain modules
-- 
cgit v1.2.3


From 6023f2bb46598f9da096d63f7ab1dfb914eab6f7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Mon, 25 Jan 2010 08:10:28 -0800
Subject: Remove the return url and change the return button on the user
 profile page to use javascript to return to the previous page.

---
 modules/gallery/controllers/user_profile.php |  1 -
 modules/gallery/helpers/user_profile.php     |  3 +--
 modules/gallery/views/user_profile.html.php  | 10 ++++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/helpers')

diff --git a/modules/gallery/controllers/user_profile.php b/modules/gallery/controllers/user_profile.php
index 53c76a48..a0e6619e 100644
--- a/modules/gallery/controllers/user_profile.php
+++ b/modules/gallery/controllers/user_profile.php
@@ -33,7 +33,6 @@ class User_Profile_Controller extends Controller {
     $v->content->user = $user;
     $v->content->not_current = !$is_current_active;
     $v->content->editable = identity::is_writable() && $display_all;
-    $v->content->return = SafeString::of(Input::instance()->get("return"));
 
     $event_data = (object)array("user" => $user, "display_all" => $display_all, "content" => array());
     module::event("show_user_profile", $event_data);
diff --git a/modules/gallery/helpers/user_profile.php b/modules/gallery/helpers/user_profile.php
index 018e1bd1..95a994bc 100644
--- a/modules/gallery/helpers/user_profile.php
+++ b/modules/gallery/helpers/user_profile.php
@@ -24,8 +24,7 @@ class user_profile_Core {
    * @return url for the profile display
    */
   static function url($user_id) {
-    $return_url = urlencode(url::abs_current());
-    return url::site("user_profile/show/{$user_id}?return=$return_url");
+    return url::site("user_profile/show/{$user_id}");
   }
 
   static function get_contact_form($user) {
diff --git a/modules/gallery/views/user_profile.html.php b/modules/gallery/views/user_profile.html.php
index bcfa5346..708b1613 100644
--- a/modules/gallery/views/user_profile.html.php
+++ b/modules/gallery/views/user_profile.html.php
@@ -21,8 +21,14 @@
     border: none;
     padding: 0;
   }
-
 </style>
+<script>
+  $(document).ready(function() {
+    $("#g-profile-return").click(function(event) {
+      history.go(-1);
+    })
+  });
+</script>
 <div id="g-user-profile">
   <h1>
     <a href="#">
@@ -55,7 +61,7 @@
     </a>
     <? endif ?>
 
-    <a class="g-button ui-icon-right ui-state-default ui-corner-all" href="<?= $return->for_html_attr() ?>">
+    <a id="g-profile-return" class="g-button ui-icon-right ui-state-default ui-corner-all" href="#">
       <?= t("Return") ?>
     </a>
   </div>
-- 
cgit v1.2.3