Merge branch 'master' of git@github.com:gallery/gallery3

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();
     }

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);

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;
 }

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"],

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">