From 2a5a3098018ca6f5a765a35c2dc9c66f277fad2e Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 8 Oct 2009 22:48:31 -0700
Subject: Apply commit 80bb78fa to the nightwind theme

---
 themes/night_wind/css/fix-ie.css       |  2 +-
 themes/night_wind/css/screen.css       | 15 +--------------
 themes/night_wind/views/photo.html.php |  2 +-
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/themes/night_wind/css/fix-ie.css b/themes/night_wind/css/fix-ie.css
index be6e22be..60abc08d 100644
--- a/themes/night_wind/css/fix-ie.css
+++ b/themes/night_wind/css/fix-ie.css
@@ -19,7 +19,7 @@ input.submit {
   width: 110px;
 }
 
-#g-dialog a.g-cancel {
+#g-dialog .g-cancel {
   display: inline-block !important;
   float: none !important;
 }
diff --git a/themes/night_wind/css/screen.css b/themes/night_wind/css/screen.css
index 8b01fac5..6bb0e368 100644
--- a/themes/night_wind/css/screen.css
+++ b/themes/night_wind/css/screen.css
@@ -234,18 +234,6 @@ li.g-error select {
   margin-top: 1em;
 }
 
-/* Status messages ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-form .g-error,
-.g-pager .g-info {
-  background-color: #000 !important;
-}
-
-.g-pager .g-info {
-  background-image: none !important;
-  padding: 0 !important;
-}
-
 /* Inline layout (forms, lists) ~~~~~~~~~~ */
 
 .g-short-form li {
@@ -408,7 +396,7 @@ form .g-error,
 
 #g-content #g-item .g-fullsize-link img {
   display: block;
-  margin: 1em auto !important;
+  margin: 1em auto;
 }
 
 #g-content #g-comments {
@@ -916,7 +904,6 @@ form .g-error,
 }
 
 .rtl .g-left,
-.rtl #g-dialog .g-cancel,
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
diff --git a/themes/night_wind/views/photo.html.php b/themes/night_wind/views/photo.html.php
index 2520cb0c..c9c30017 100644
--- a/themes/night_wind/views/photo.html.php
+++ b/themes/night_wind/views/photo.html.php
@@ -15,7 +15,7 @@
 <div id="g-item">
   <?= $theme->photo_top() ?>
 
-  <ul class="g-pager">
+  <ul class="g-pager g-clearfix">
     <li>
       <? if ($previous_item): ?>
       <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
-- 
cgit v1.2.3


From f67bfd099296602f60d48914ae4b09d65b0ad8d3 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 7 Oct 2009 20:26:26 -0700
Subject: Change the users.php controller so its no longer restful.  The
 problem with our approach to restfulness is that it assumes that the resource
 will be found in the gallery database.  It may well be there, but in the case
 of using plugable drivers for users management, there are no guarantees that
 it is in our database or it could be in a ldap directory.  So it was just
 easier to remove the restfulness and just call user::lookup instead. (cherry
 picked from commit b3211cb2a8282556d410c91771baeb764d47ed10)

---
 modules/user/controllers/users.php | 9 +++++----
 modules/user/helpers/user.php      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 4ad704f0..07c5a457 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class Users_Controller extends REST_Controller {
-  protected $resource_type = "user";
+class Users_Controller extends Controller {
+  public function update($id) {
+    $user = user::lookup($id);
 
-  public function _update($user) {
     if ($user->guest || $user->id != user::active()->id) {
       access::forbidden();
     }
@@ -57,7 +57,8 @@ class Users_Controller extends REST_Controller {
     }
   }
 
-  public function _form_edit($user) {
+  public function form_edit($id) {
+    $user = user::lookup($id);
     if ($user->guest || $user->id != user::active()->id) {
       access::forbidden();
     }
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 6ae9203d..432994d6 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -25,7 +25,7 @@
  */
 class user_Core {
   static function get_edit_form($user) {
-    $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "g-edit-user-form"));
+    $form = new Forge("users/update/$user->id", "", "post", array("id" => "g-edit-user-form"));
     $form->set_attr("class", "g-narrow");
     $group = $form->group("edit_user")->label(t("Edit User: %name", array("name" => $user->name)));
     $group->input("full_name")->label(t("Full Name"))->id("g-fullname")->value($user->full_name);
-- 
cgit v1.2.3