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/views/user_profile.html.php | 37 ++++++++++++-----------------
 1 file changed, 15 insertions(+), 22 deletions(-)

(limited to 'modules/gallery/views/user_profile.html.php')

diff --git a/modules/gallery/views/user_profile.html.php b/modules/gallery/views/user_profile.html.php
index e7ce56b3..bcfa5346 100644
--- a/modules/gallery/views/user_profile.html.php
+++ b/modules/gallery/views/user_profile.html.php
@@ -1,9 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <style>
-  #g-user-profile #g-profile-buttons {
-    bottom: 0;
-    position: absolute;
-    right: 0;
+  #g-user-profile div {
+    margin-top: 1em;
   }
 
   #g-user-profile fieldset {
@@ -25,30 +23,25 @@
   }
 
 </style>
-<script>
-  $("#g-user-profile").ready(function() {
-                                           //$("#g-profile-return").click(function(event) {
-    //  window.location = <?= $return->for_js() ?>;
-                                           //});
-  });
-</script>
-<div id="g-user-profile" style="height: <?= $height ?>px">
-  <h1 style="display: none"><?= t("%name Profile", array("name" => $user->display_name())) ?></h1>
+<div id="g-user-profile">
+  <h1>
+    <a href="#">
+      <img src="<?= $user->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+           alt="<?= html::clean_attribute($user->display_name()) ?>"
+           class="g-avatar" width="40" height="40" />
+    </a>
+    <?= t("%name Profile", array("name" => $user->display_name())) ?>
+  </h1>
+  <? foreach ($info_parts as $info): ?>
   <div>
     <fieldset>
-    <label><?= t("User information") ?></label>
+    <label><?= $info->title ?></label>
     <div>
-    <table>
-    <? foreach ($fields as $field => $value): ?>
-    <tr>
-      <td><?= $field ?></td>
-      <td><?= $value ?></td>
-    </tr>
-    <? endforeach ?>
-    </table>
+    <?= $info->view ?>
     </div>
     </fieldset>
   </div>
+  <? endforeach ?>
   <div id="g-profile-buttons" class="ui-helper-clearfix g-right">
     <? if (!$user->guest && $not_current && !empty($user->email)): ?>
     <a class="g-button ui-icon-right ui-state-default ui-corner-all g-dialog-link"
-- 
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/views/user_profile.html.php')

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