From 4766f36a4d74924f21ff329c4318ce4e069ffa04 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 3 Mar 2010 17:53:05 +0000 Subject: Pulled in the interface changes. git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/account/forms/forgotten_password.php | 22 +- views/default/account/forms/login.php | 12 +- views/default/account/forms/register.php | 24 +- views/default/account/forms/useradd.php | 9 +- views/default/admin/main.php | 2 +- views/default/admin/main_opt/plugins.php | 2 +- views/default/admin/main_opt/site.php | 2 +- views/default/admin/main_opt/statistics.php | 2 +- views/default/admin/main_opt/user.php | 2 +- views/default/admin/plugins.php | 20 +- views/default/admin/plugins_opt/plugin.php | 6 +- views/default/admin/site.php | 6 +- views/default/admin/statistics_opt/basic.php | 4 +- views/default/admin/statistics_opt/numentities.php | 4 +- views/default/admin/statistics_opt/online.php | 22 +- views/default/admin/user.php | 11 +- views/default/admin/user_opt/adduser.php | 18 - views/default/admin/user_opt/search.php | 29 +- views/default/annotation/annotate.php | 59 +- views/default/annotation/generic_comment.php | 25 +- views/default/annotation/latest_comments.php | 39 + views/default/canvas/default.php | 9 +- views/default/canvas/layouts/one_column.php | 12 +- .../canvas/layouts/one_column_with_sidebar.php | 23 + .../canvas/layouts/two_column_left_sidebar.php | 30 - views/default/canvas/layouts/widgets.php | 224 +- views/default/canvas_header/submenu_group.php | 3 +- views/default/comments/forms/edit.php | 19 +- views/default/css.php | 3174 +++++++------------- views/default/css_ie.php | 27 + views/default/css_ie6.php | 27 + views/default/entities/entity_list.php | 1 - views/default/entities/entity_listing.php | 21 +- views/default/friends/picker.php | 2 - views/default/friends/river/create.php | 10 +- views/default/group/search/finishblurb.php | 40 +- views/default/group/search/startblurb.php | 32 +- views/default/input/access.php | 2 +- views/default/input/checkboxes.php | 2 +- views/default/input/email.php | 2 +- views/default/input/file.php | 2 +- views/default/input/longtext.php | 2 +- views/default/input/password.php | 2 +- views/default/input/plaintext.php | 2 +- views/default/input/pulldown.php | 2 +- views/default/input/radio.php | 2 +- views/default/input/tags.php | 2 +- views/default/input/text.php | 2 +- views/default/input/url.php | 2 +- views/default/js/initialise_elgg.php | 34 +- views/default/js/upload_js.php | 2 +- views/default/messages/errors/error.php | 6 +- views/default/messages/errors/list.php | 30 +- views/default/messages/messages/list.php | 29 +- views/default/messages/messages/message.php | 5 +- views/default/navigation/main_nav.php | 65 + views/default/navigation/pagination.php | 21 +- views/default/navigation/topbar_tools.php | 8 +- .../notifications/settings/usersettings.php | 4 +- views/default/output/confirmlink.php | 2 +- views/default/output/rss_view.php | 8 + views/default/output/tags.php | 13 +- views/default/output/url.php | 10 +- views/default/page_elements/breadcrumbs.php | 26 + views/default/page_elements/content_header.php | 71 + .../page_elements/content_header_member.php | 25 + views/default/page_elements/contentwrapper.php | 23 - views/default/page_elements/elgg_content.php | 9 + views/default/page_elements/elgg_footer.php | 30 + views/default/page_elements/elgg_header.php | 25 + views/default/page_elements/elgg_topbar.php | 96 +- views/default/page_elements/footer.php | 62 - views/default/page_elements/header.php | 89 - views/default/page_elements/header_contents.php | 22 - views/default/page_elements/html_begin.php | 89 + views/default/page_elements/html_end.php | 11 + views/default/page_elements/owner_block.php | 41 +- views/default/page_elements/spotlight.php | 57 - views/default/page_elements/title.php | 10 +- views/default/page_shells/default.php | 58 + views/default/pageshells/pageshell.php | 58 - views/default/river/item/list.php | 2 +- views/default/river/item/wrapper.php | 1 - views/default/settings/system.php | 27 +- views/default/spotlight/default.php | 1 - views/default/user/search/finishblurb.php | 40 +- views/default/user/search/startblurb.php | 38 +- views/default/user/settings/default_access.php | 3 +- views/default/user/settings/email.php | 3 +- views/default/user/settings/language.php | 3 +- views/default/user/settings/name.php | 35 +- views/default/user/settings/password.php | 3 +- views/default/usersettings/form.php | 4 +- views/default/usersettings/main.php | 2 +- views/default/usersettings/main_opt/plugins.php | 2 +- views/default/usersettings/main_opt/statistics.php | 2 +- views/default/usersettings/main_opt/user.php | 2 +- views/default/usersettings/plugins.php | 2 +- views/default/usersettings/plugins_opt/plugin.php | 8 +- .../usersettings/statistics_opt/numentities.php | 4 +- .../default/usersettings/statistics_opt/online.php | 4 +- 101 files changed, 2210 insertions(+), 3013 deletions(-) create mode 100755 views/default/annotation/latest_comments.php create mode 100644 views/default/canvas/layouts/one_column_with_sidebar.php delete mode 100644 views/default/canvas/layouts/two_column_left_sidebar.php create mode 100755 views/default/css_ie.php create mode 100755 views/default/css_ie6.php create mode 100755 views/default/navigation/main_nav.php create mode 100755 views/default/output/rss_view.php create mode 100755 views/default/page_elements/breadcrumbs.php create mode 100755 views/default/page_elements/content_header.php create mode 100755 views/default/page_elements/content_header_member.php delete mode 100644 views/default/page_elements/contentwrapper.php create mode 100755 views/default/page_elements/elgg_content.php create mode 100755 views/default/page_elements/elgg_footer.php create mode 100644 views/default/page_elements/elgg_header.php delete mode 100644 views/default/page_elements/footer.php delete mode 100644 views/default/page_elements/header.php delete mode 100644 views/default/page_elements/header_contents.php create mode 100644 views/default/page_elements/html_begin.php create mode 100644 views/default/page_elements/html_end.php delete mode 100644 views/default/page_elements/spotlight.php create mode 100644 views/default/page_shells/default.php delete mode 100644 views/default/pageshells/pageshell.php (limited to 'views') diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php index 5ffb1be1a..b360bcc63 100644 --- a/views/default/account/forms/forgotten_password.php +++ b/views/default/account/forms/forgotten_password.php @@ -15,11 +15,17 @@ $form_body .= elgg_view('input/captcha'); $form_body .= "

" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "

"; ?> -
- "{$vars['url']}action/user/requestnewpassword", - 'body' => $form_body) -); -?> -
\ No newline at end of file +
+
+

+ "{$vars['url']}action/user/requestnewpassword", + 'body' => $form_body) + ); + ?> +
+
+ \ No newline at end of file diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php index 394c1ea88..766b2ca28 100644 --- a/views/default/account/forms/login.php +++ b/views/default/account/forms/login.php @@ -10,16 +10,16 @@ global $CONFIG; -$form_body = "

"; +$form_body = ""; $form_body .= "
"; -$form_body .= "
"; +$form_body .= "
"; $form_body .= elgg_view('login/extend'); -$form_body .= elgg_view('input/submit', array('value' => elgg_echo('login'))) . "

"; -$form_body .= "

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

"; +$form_body .= "

"; $form_body .= (!isset($CONFIG->disable_registration) || !($CONFIG->disable_registration)) ? "" . elgg_echo('register') . " | " : ""; -$form_body .= "" . elgg_echo('user:password:lost') . "

"; +$form_body .= "" . elgg_echo('user:password:lost') . ""; $login_url = $vars['url']; if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { @@ -27,7 +27,7 @@ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) { } ?> -
+

$form_body, 'action' => "{$login_url}action/login")); diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php index 3e53b6f05..0265ce187 100644 --- a/views/default/account/forms/register.php +++ b/views/default/account/forms/register.php @@ -17,12 +17,12 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) { $admin_option = true; } -$form_body = "


"; +$form_body = "


"; -$form_body .= "
"; -$form_body .= "
"; -$form_body .= "
"; -$form_body .= "
"; +$form_body .= "
"; +$form_body .= "
"; +$form_body .= "
"; +$form_body .= "
"; // view to extend to add more fields to the registration form $form_body .= elgg_view('register/extend'); @@ -39,8 +39,12 @@ $form_body .= elgg_view('input/hidden', array('internalname' => 'invitecode', 'v $form_body .= elgg_view('input/hidden', array('internalname' => 'action', 'value' => 'register')); $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "

"; ?> - -
-

- "{$vars['url']}action/register", 'body' => $form_body)) ?> -
\ No newline at end of file +
+
+

+ "{$vars['url']}action/register", 'body' => $form_body)) ?> +
+
+ \ No newline at end of file diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php index 09b4c4718..734854d08 100644 --- a/views/default/account/forms/useradd.php +++ b/views/default/account/forms/useradd.php @@ -13,10 +13,9 @@ if (($_SESSION['user']->admin) && ($vars['show_admin'])) { $admin_option = true; } -$form_body = "

"; - -$form_body .= "

"; +$form_body = "

"; $form_body .= "

"; +$form_body .= "

"; $form_body .= "

"; $form_body .= "

"; @@ -27,7 +26,7 @@ if ($admin_option) { $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "

"; ?> -
-

+
+

"{$vars['url']}action/useradd", 'body' => $form_body)) ?>
\ No newline at end of file diff --git a/views/default/admin/main.php b/views/default/admin/main.php index fc143244d..e345f56d6 100644 --- a/views/default/admin/main.php +++ b/views/default/admin/main.php @@ -9,4 +9,4 @@ */ // Description of what's going on -echo "

" . elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))) . "

"; +echo elgg_view('output/longtext', array('value' => elgg_echo("admin:description"))); diff --git a/views/default/admin/main_opt/plugins.php b/views/default/admin/main_opt/plugins.php index b1e2f0078..b8ae611d3 100644 --- a/views/default/admin/main_opt/plugins.php +++ b/views/default/admin/main_opt/plugins.php @@ -10,7 +10,7 @@ global $CONFIG; ?> -
+


">

diff --git a/views/default/admin/main_opt/site.php b/views/default/admin/main_opt/site.php index 7c34015ba..e21dcc3fe 100644 --- a/views/default/admin/main_opt/site.php +++ b/views/default/admin/main_opt/site.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -
+


">

diff --git a/views/default/admin/main_opt/statistics.php b/views/default/admin/main_opt/statistics.php index fec4c3f20..5b063b82e 100644 --- a/views/default/admin/main_opt/statistics.php +++ b/views/default/admin/main_opt/statistics.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -
+


">

diff --git a/views/default/admin/main_opt/user.php b/views/default/admin/main_opt/user.php index e82f97625..f1dc28e5e 100644 --- a/views/default/admin/main_opt/user.php +++ b/views/default/admin/main_opt/user.php @@ -8,7 +8,7 @@ * @link http://elgg.org/ */ ?> -
+


">

diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php index f73530f44..70e5d2683 100644 --- a/views/default/admin/plugins.php +++ b/views/default/admin/plugins.php @@ -15,7 +15,7 @@ $token = generate_action_token($ts); // Description of what's going on $buttons = " url}action/admin/plugins/enableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('enableall')." url}action/admin/plugins/disableall?__elgg_token=$token&__elgg_ts=$ts\">".elgg_echo('disableall')." "; -echo "
" . $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))) . "
"; +echo $buttons . elgg_view('output/longtext', array('value' => elgg_echo("admin:plugins:description"))); $limit = get_input('limit', 10); $offset = get_input('offset', 0); @@ -33,20 +33,6 @@ foreach($plugin_list as $key => $foo) { // Display list of plugins $n = 0; foreach ($installed_plugins as $plugin => $data) { - //if (($n>=$offset) && ($n < $offset+$limit)) - echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list))); - + echo elgg_view("admin/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data, 'maxorder' => $max, 'order' => array_search($plugin, $plugin_list))); $n++; -} - -// Diplay nav -/* -if ($count) -{ - echo elgg_view('navigation/pagination',array( - 'baseurl' => $_SERVER['REQUEST_URI'], - 'offset' => $offset, - 'count' => $count, - )); -} -*/ \ No newline at end of file +} \ No newline at end of file diff --git a/views/default/admin/plugins_opt/plugin.php b/views/default/admin/plugins_opt/plugin.php index 33718f2ac..d813b8c01 100644 --- a/views/default/admin/plugins_opt/plugin.php +++ b/views/default/admin/plugins_opt/plugin.php @@ -26,7 +26,7 @@ if ($manifest['elgg_version']) { $ts = time(); $token = generate_action_token($ts); ?> -
"> +
">
10) { @@ -56,7 +56,7 @@ $token = generate_action_token($ts);

[]

-
+