From dbeadc1407293d0c7af36723db6fe5699890b845 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 22 Jul 2009 14:27:57 -0700
Subject: Use the Kohana cascading filesystem to locate resources loaded by the
 theme.  Because the theme comes first, this means that themes can override
 any module resources, at the cost that we no longer have namespacing for JS
 and CSS files.

The only file getting used outside of this model is
themes/default/screen.css which is used in the admin theme.  I fixed
that by copying screen.css into admin_default and renaming its
screen.css to admin_screen.css.  I also copied over all the images
that it was referencing.

Fixes tickets #48 and #539.

Theme API changes:
- theme_script(), theme_url() and theme_css() are no longer needed
- script(), url() and css() now refer to the first matching asset in
  the module load path, where gallery3/lib is at the end of the path
---
 modules/user/helpers/user_theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/user/helpers')

diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index ad9d4c63..c5351f8e 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -26,7 +26,7 @@ class user_theme_Core {
 
   static function admin_head($theme) {
     if (strpos(Router::$current_uri, "admin/users") !== false) {
-      $theme->script("lib/gallery.panel.js");
+      $theme->script("gallery.panel.js");
     }
   }
 }
-- 
cgit v1.2.3


From 1fbdf1a1e00a176686b051bb932d998ad683b2be Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 23 Jul 2009 10:33:04 -0700
Subject: Add form processing events:  user_add_form_admin            admin
 adding a user  user_edit_form_admin           admin editing a user 
 user_add_form_admin_completed  successfully added a user (admin) 
 user_edit_form                 user editing their own settings 
 user_edit_form_completed       successfully edited a user (admin and user
 editing own settings)

---
 modules/user/controllers/admin_users.php | 4 +++-
 modules/user/controllers/users.php       | 1 +
 modules/user/helpers/user.php            | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'modules/user/helpers')

diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index b5dc6cb5..0a0086ff 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -48,8 +48,10 @@ class Admin_Users_Controller extends Controller {
         $desired_locale = $form->add_user->locale->value;
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
       }
-
       $user->save();
+
+      module::event("user_add_form_admin_completed", $user, $form);
+
       message::success(t("Created user %user_name", array("user_name" => p::clean($user->name))));
       print json_encode(array("result" => "success"));
     } else {
diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 46f799c5..0bf2e81d 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -39,6 +39,7 @@ class Users_Controller extends REST_Controller {
         $user->locale = $desired_locale == "none" ? null : $desired_locale;
       }
       $user->save();
+      module::event("user_edit_form_completed", $user, $form);
 
       message::success(t("User information updated."));
       print json_encode(
diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 53e9052c..a153ab69 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -36,6 +36,8 @@ class user_Core {
     $group->input("url")->label(t("URL"))->id("gUrl")->value($user->url);
     $group->submit("")->value(t("Save"));
     $form->add_rules_from($user);
+
+    module::event("user_edit_form", $user);
     return $form;
   }
 
@@ -56,6 +58,8 @@ class user_Core {
     $group->submit("")->value(t("Modify User"));
     $form->add_rules_from($user);
     $form->edit_user->password->rules("-required");
+
+    module::event("user_edit_form_admin", $user);
     return $form;
   }
 
@@ -75,6 +79,8 @@ class user_Core {
     $group->submit("")->value(t("Add User"));
     $user = ORM::factory("user");
     $form->add_rules_from($user);
+
+    module::event("user_add_form_admin", $user);
     return $form;
   }
 
-- 
cgit v1.2.3