From db787a3ab93da0c2141d33f3058f9dc2f34d6f2a Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 17 Dec 2010 20:36:36 +0000 Subject: reorganized the settings views and updated the pages to use new layout git-svn-id: http://code.elgg.org/elgg/trunk@7663 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/core/settings/account.php | 15 +++++++ .../core/settings/account/default_access.php | 29 ++++++++++++ views/default/core/settings/account/email.php | 25 +++++++++++ views/default/core/settings/account/language.php | 32 ++++++++++++++ views/default/core/settings/account/name.php | 15 +++++++ .../core/settings/account/notifications.php | 51 ++++++++++++++++++++++ views/default/core/settings/account/password.php | 42 ++++++++++++++++++ views/default/core/settings/statistics.php | 6 +++ .../core/settings/statistics/numentities.php | 47 ++++++++++++++++++++ views/default/core/settings/statistics/online.php | 28 ++++++++++++ views/default/core/settings/tools.php | 25 +++++++++++ views/default/core/settings/tools/plugin.php | 34 +++++++++++++++ views/default/forms/account/settings.php | 1 + views/default/page/elements/topbar.php | 2 +- views/default/user/settings/default_access.php | 29 ------------ views/default/user/settings/email.php | 25 ----------- views/default/user/settings/language.php | 32 -------------- views/default/user/settings/name.php | 15 ------- views/default/user/settings/password.php | 42 ------------------ views/default/usersettings/form.php | 10 ----- views/default/usersettings/main.php | 11 ----- views/default/usersettings/main_opt/plugins.php | 15 ------- views/default/usersettings/main_opt/statistics.php | 13 ------ views/default/usersettings/main_opt/user.php | 13 ------ views/default/usersettings/notifications.php | 51 ---------------------- views/default/usersettings/plugins.php | 25 ----------- views/default/usersettings/plugins_opt/plugin.php | 34 --------------- views/default/usersettings/statistics.php | 9 ---- .../usersettings/statistics_opt/numentities.php | 47 -------------------- .../default/usersettings/statistics_opt/online.php | 28 ------------ views/default/usersettings/user.php | 6 --- 31 files changed, 351 insertions(+), 406 deletions(-) create mode 100644 views/default/core/settings/account.php create mode 100644 views/default/core/settings/account/default_access.php create mode 100644 views/default/core/settings/account/email.php create mode 100644 views/default/core/settings/account/language.php create mode 100644 views/default/core/settings/account/name.php create mode 100644 views/default/core/settings/account/notifications.php create mode 100644 views/default/core/settings/account/password.php create mode 100644 views/default/core/settings/statistics.php create mode 100644 views/default/core/settings/statistics/numentities.php create mode 100644 views/default/core/settings/statistics/online.php create mode 100644 views/default/core/settings/tools.php create mode 100644 views/default/core/settings/tools/plugin.php create mode 100644 views/default/forms/account/settings.php delete mode 100644 views/default/user/settings/default_access.php delete mode 100644 views/default/user/settings/email.php delete mode 100644 views/default/user/settings/language.php delete mode 100644 views/default/user/settings/name.php delete mode 100644 views/default/user/settings/password.php delete mode 100644 views/default/usersettings/form.php delete mode 100644 views/default/usersettings/main.php delete mode 100644 views/default/usersettings/main_opt/plugins.php delete mode 100644 views/default/usersettings/main_opt/statistics.php delete mode 100644 views/default/usersettings/main_opt/user.php delete mode 100644 views/default/usersettings/notifications.php delete mode 100644 views/default/usersettings/plugins.php delete mode 100644 views/default/usersettings/plugins_opt/plugin.php delete mode 100644 views/default/usersettings/statistics.php delete mode 100644 views/default/usersettings/statistics_opt/numentities.php delete mode 100644 views/default/usersettings/statistics_opt/online.php delete mode 100644 views/default/usersettings/user.php (limited to 'views/default') diff --git a/views/default/core/settings/account.php b/views/default/core/settings/account.php new file mode 100644 index 000000000..86afb8ba1 --- /dev/null +++ b/views/default/core/settings/account.php @@ -0,0 +1,15 @@ +'; +$form_body .= '

'; +$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); +$form_body .= '

'; + +echo elgg_view('input/form', array('action' => "action/usersettings/save", 'body' => $form_body)); diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php new file mode 100644 index 000000000..e7c280198 --- /dev/null +++ b/views/default/core/settings/account/default_access.php @@ -0,0 +1,29 @@ +allow_user_default_access) { + $user = elgg_get_page_owner(); + + if ($user) { + if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) { + $default_access = $vars['config']->default_access; + } +?> +
+

+

+ : + 'default_access', 'value' => $default_access)); + + ?> +

+
+ +
+

+

+ : + 'email', 'value' => $user->email)); + + ?> +

+
+ +
+

+

+ + : language; + if ($user->language) { + $value = $user->language; + } + + echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations())); + + ?> + +

+
+ 'name', 'value' => $user->name)); +echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid)); diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php new file mode 100644 index 000000000..afb142ebe --- /dev/null +++ b/views/default/core/settings/account/notifications.php @@ -0,0 +1,51 @@ + +
+

+ +

+ + + $v) { +?> + + + + + + +
: +$k) { + $val = "yes"; + } else { + $val = "no"; + } + + echo elgg_view('input/radio', array( + 'internalname' => "method[$k]", + 'value' => $val, + 'options' => array( + elgg_echo('option:yes') => 'yes', + elgg_echo('option:no') => 'no' + ), + )); + +?> +
+

\ No newline at end of file diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php new file mode 100644 index 000000000..0bd7f38f8 --- /dev/null +++ b/views/default/core/settings/account/password.php @@ -0,0 +1,42 @@ + +
+

+ + guid == get_loggedin_userid()) { + ?> +

+ : + 'current_password')); + ?> +

+ + +

+ : + 'password')); + ?> +

+ +

+ : 'password2')); + ?> +

+
+ +
+

+ + $entry) { + foreach ($entry as $a => $b) { + + //This function controls the alternating class + $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; + + if ($a == "__base__") { + $a = elgg_echo("item:{$k}"); + if (empty($a)) { + $a = $k; + } + } else { + $a = elgg_echo("item:{$k}:{$a}"); + if (empty($a)) { + $a = "$k $a"; + } + } + echo <<< END + + + + +END; + } + } + ?> +
{$a}:{$b}
+
+guid, "login", "", 'user', '', 1); + +if ($log) { + $logged_in = $log[0]->time_created; +} + +?> +
+

+ + + + + + +
name; ?>
email; ?>
time_created); ?>
+
\ No newline at end of file diff --git a/views/default/core/settings/tools.php b/views/default/core/settings/tools.php new file mode 100644 index 000000000..8f5ee4af6 --- /dev/null +++ b/views/default/core/settings/tools.php @@ -0,0 +1,25 @@ +".elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))).""; + +$limit = get_input('limit', 10); +$offset = get_input('offset', 0); + +// Get the installed plugins +$installed_plugins = $vars['installed_plugins']; +$count = count($installed_plugins); + +// Display list of plugins +$n = 0; +foreach ($installed_plugins as $plugin => $data) { + if (is_plugin_enabled($plugin)) { + echo elgg_view("core/settings/tools/plugin", array('plugin' => $plugin, 'details' => $data)); + } +} \ No newline at end of file diff --git a/views/default/core/settings/tools/plugin.php b/views/default/core/settings/tools/plugin.php new file mode 100644 index 000000000..981d8d937 --- /dev/null +++ b/views/default/core/settings/tools/plugin.php @@ -0,0 +1,34 @@ + +
+

+ +
+ $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?> +
+
+ elgg_get_site_url() . 'pg/settings/', + 'href' => elgg_get_site_url() . "pg/settings/user/{$user->username}", 'text' => '' . elgg_echo('settings'), 'class' => 'alt', )); diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php deleted file mode 100644 index e7c280198..000000000 --- a/views/default/user/settings/default_access.php +++ /dev/null @@ -1,29 +0,0 @@ -allow_user_default_access) { - $user = elgg_get_page_owner(); - - if ($user) { - if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) { - $default_access = $vars['config']->default_access; - } -?> -
-

-

- : - 'default_access', 'value' => $default_access)); - - ?> -

-
- -
-

-

- : - 'email', 'value' => $user->email)); - - ?> -

-
- -
-

-

- - : language; - if ($user->language) { - $value = $user->language; - } - - echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations())); - - ?> - -

-
- 'name', 'value' => $user->name)); -echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid)); diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php deleted file mode 100644 index 0bd7f38f8..000000000 --- a/views/default/user/settings/password.php +++ /dev/null @@ -1,42 +0,0 @@ - -
-

- - guid == get_loggedin_userid()) { - ?> -

- : - 'current_password')); - ?> -

- - -

- : - 'password')); - ?> -

- -

- : 'password2')); - ?> -

-
-".elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit-button usersettings_save')); - -echo elgg_view('input/form', array('action' => "action/usersettings/save", 'body' => $form_body)); \ No newline at end of file diff --git a/views/default/usersettings/main.php b/views/default/usersettings/main.php deleted file mode 100644 index d1cf85448..000000000 --- a/views/default/usersettings/main.php +++ /dev/null @@ -1,11 +0,0 @@ - elgg_echo("usersettings:description"))); diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php deleted file mode 100644 index ab5743d36..000000000 --- a/views/default/usersettings/main_opt/plugins.php +++ /dev/null @@ -1,15 +0,0 @@ - -
-

-


- ">

-
\ No newline at end of file diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php deleted file mode 100644 index 0f3872143..000000000 --- a/views/default/usersettings/main_opt/statistics.php +++ /dev/null @@ -1,13 +0,0 @@ - -
-

-


- ">

-
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php deleted file mode 100644 index d9f2b5677..000000000 --- a/views/default/usersettings/main_opt/user.php +++ /dev/null @@ -1,13 +0,0 @@ - -
-

-


- ">

-
\ No newline at end of file diff --git a/views/default/usersettings/notifications.php b/views/default/usersettings/notifications.php deleted file mode 100644 index afb142ebe..000000000 --- a/views/default/usersettings/notifications.php +++ /dev/null @@ -1,51 +0,0 @@ - -
-

- -

- - - $v) { -?> - - - - - - -
: -$k) { - $val = "yes"; - } else { - $val = "no"; - } - - echo elgg_view('input/radio', array( - 'internalname' => "method[$k]", - 'value' => $val, - 'options' => array( - elgg_echo('option:yes') => 'yes', - elgg_echo('option:no') => 'no' - ), - )); - -?> -
-

\ No newline at end of file diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php deleted file mode 100644 index c4df9e26b..000000000 --- a/views/default/usersettings/plugins.php +++ /dev/null @@ -1,25 +0,0 @@ -".elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))).""; - -$limit = get_input('limit', 10); -$offset = get_input('offset', 0); - -// Get the installed plugins -$installed_plugins = $vars['installed_plugins']; -$count = count($installed_plugins); - -// Display list of plugins -$n = 0; -foreach ($installed_plugins as $plugin => $data) { - if (is_plugin_enabled($plugin)) { - echo elgg_view("usersettings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data)); - } -} \ No newline at end of file diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php deleted file mode 100644 index 981d8d937..000000000 --- a/views/default/usersettings/plugins_opt/plugin.php +++ /dev/null @@ -1,34 +0,0 @@ - -
-

- -
- $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?> -
-
- \ No newline at end of file diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php deleted file mode 100644 index 10d2b7c68..000000000 --- a/views/default/usersettings/statistics_opt/numentities.php +++ /dev/null @@ -1,47 +0,0 @@ - -
-

- - $entry) { - foreach ($entry as $a => $b) { - - //This function controls the alternating class - $even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; - - if ($a == "__base__") { - $a = elgg_echo("item:{$k}"); - if (empty($a)) { - $a = $k; - } - } else { - $a = elgg_echo("item:{$k}:{$a}"); - if (empty($a)) { - $a = "$k $a"; - } - } - echo <<< END - - - - -END; - } - } - ?> -
{$a}:{$b}
-
-guid, "login", "", 'user', '', 1); - -if ($log) { - $logged_in = $log[0]->time_created; -} - -?> -
-

- - - - - - -
name; ?>
email; ?>
time_created); ?>
-
\ No newline at end of file diff --git a/views/default/usersettings/user.php b/views/default/usersettings/user.php deleted file mode 100644 index c6a56a14e..000000000 --- a/views/default/usersettings/user.php +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file -- cgit v1.2.3