diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-15 14:37:57 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-16 08:53:31 -0700 |
| commit | 00eacd659f27df9c13246c510057c4f42c8866a2 (patch) | |
| tree | 7f6201c54c0d7c1de2eeb337b3331d1864d30fb0 /modules/gallery/views | |
| parent | be6765336eb894535d62055fab577dfc951b6b6a (diff) | |
Start simplifying the interface by moving the static methods from user.php and group.php. Tried creating a identity helper, but the helper identity.php was confused with the library Identity.php. So got around this by making the methods on Identity static and calling the instance within the static methods. Also temporarily moved the user.php and group.php back into the user module.
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/kohana_error_page.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/login.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/login_ajax.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/maintenance.html.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php index 314a9923..bca29298 100644 --- a/modules/gallery/views/kohana_error_page.php +++ b/modules/gallery/views/kohana_error_page.php @@ -57,7 +57,7 @@ <title><?= t("Something went wrong!") ?></title> </head> <body> - <? try { $user = user::active(); } catch (Exception $e) { } ?> + <? try { $user = Identity::active(); } catch (Exception $e) { } ?> <? $admin = php_sapi_name() == "cli" || isset($user) && $user->admin ?> <div class="big_box" id="framework_error"> <h1> diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php index 2d8119d0..6695d564 100644 --- a/modules/gallery/views/login.html.php +++ b/modules/gallery/views/login.html.php @@ -8,7 +8,7 @@ </li> <? else: ?> <li class="first"> - <? if (user::is_writable()): ?> + <? if (Identity::is_writable()): ?> <?= t('Logged in as %name', array('name' => html::mark_clean( '<a href="' . url::site("form/edit/users/{$user->id}") . '" title="' . t("Edit Your Profile")->for_html_attr() . diff --git a/modules/gallery/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php index d71ca719..6ed40571 100644 --- a/modules/gallery/views/login_ajax.html.php +++ b/modules/gallery/views/login_ajax.html.php @@ -36,7 +36,7 @@ <li id="g-login-form"> <?= $form ?> </li> - <? if (user::is_writable()): ?> + <? if (Identity::is_writable()): ?> <li> <a href="#" id="g-password-reset" class="g-right g-txt-small"><?= t("Forgot Your Password?") ?></a> </li> diff --git a/modules/gallery/views/maintenance.html.php b/modules/gallery/views/maintenance.html.php index f80b6e7a..dc8925b4 100644 --- a/modules/gallery/views/maintenance.html.php +++ b/modules/gallery/views/maintenance.html.php @@ -43,7 +43,7 @@ <p> <?= t("This site is currently only accessible by site administrators.") ?> </p> - <?= user::get_login_form("login/auth_html") ?> + <?= Identity::get_login_form("login/auth_html") ?> </body> </html> |