From 417333356a9293ce0b927d5dd08a4820658bd915 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 23 Jan 2011 23:24:40 +0000 Subject: updated more of the admin backend to use new CSS/HTML git-svn-id: http://code.elgg.org/elgg/trunk@7920 36083f99-b078-4883-b0ff-0f9b5a30f544 --- languages/en.php | 4 +- mod/logbrowser/start.php | 2 - .../views/default/admin/utilities/logbrowser.php | 9 +- mod/logbrowser/views/default/logbrowser/css.php | 51 --- mod/logbrowser/views/default/logbrowser/form.php | 13 +- mod/logbrowser/views/default/logbrowser/table.php | 2 +- views/default/admin/appearance/menu_items.php | 77 +---- views/default/admin/appearance/profile_fields.php | 1 - views/default/admin/components/plugin_settings.php | 22 +- views/default/admin/overview/statistics.php | 4 +- views/default/admin/users/newest.php | 10 +- views/default/admin/users/online.php | 10 +- views/default/css/admin.php | 377 +++++++++++---------- views/default/forms/admin/menu/save.php | 100 ++++++ views/default/forms/profile/fields/add.php | 2 +- views/default/forms/useradd.php | 26 +- views/default/layout/shells/admin.php | 23 +- views/default/layout/shells/admin/menu.php | 2 +- 18 files changed, 390 insertions(+), 345 deletions(-) delete mode 100644 mod/logbrowser/views/default/logbrowser/css.php create mode 100644 views/default/forms/admin/menu/save.php diff --git a/languages/en.php b/languages/en.php index 277705444..bf3445273 100644 --- a/languages/en.php +++ b/languages/en.php @@ -370,7 +370,7 @@ $english = array( 'profile:editdefault:delete:success' => 'Default profile item deleted!', 'profile:defaultprofile:reset' => 'Default system profile reset', 'profile:resetdefault' => 'Reset default profile', - 'profile:explainchangefields' => 'You can replace the existing profile fields with your own using the form below.

Give the new profile field a label, for example, \'Favorite team\', then select the field type (eg. text, url, tags), and click the \'Add\' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label\'s text to make it editable.
At any time you can revert back to the default profile set up, but you will loose any information already entered into custom fields on profile pages.', + 'profile:explainchangefields' => "You can replace the existing profile fields with your own using the form below. \n\n Give the new profile field a label, for example, 'Favorite team', then select the field type (eg. text, url, tags), and click the 'Add' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label's text to make it editable. \n\n At any time you can revert back to the default profile set up, but you will loose any information already entered into custom fields on profile pages.", 'profile:editdefault:success' => 'Item successfully added to default profile', 'profile:editdefault:fail' => 'Default profile could not be saved', @@ -505,6 +505,8 @@ $english = array( 'admin:view_site' => 'View site', 'admin:loggedin' => 'Logged in as %s', + 'admin:menu' => 'Menu', + 'admin:configuration:success' => "Your settings have been saved.", 'admin:configuration:fail' => "Your settings could not be saved.", diff --git a/mod/logbrowser/start.php b/mod/logbrowser/start.php index 4e44cd0b8..dace1a68e 100644 --- a/mod/logbrowser/start.php +++ b/mod/logbrowser/start.php @@ -12,8 +12,6 @@ elgg_register_event_handler('init', 'system', 'logbrowser_init'); */ function logbrowser_init() { - elgg_extend_view('css/admin', 'logbrowser/css'); - elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'logbrowser_user_hover_menu'); elgg_add_admin_menu_item('logbrowser', elgg_echo('logbrowser'), 'utilities'); diff --git a/mod/logbrowser/views/default/admin/utilities/logbrowser.php b/mod/logbrowser/views/default/admin/utilities/logbrowser.php index 67fdaa553..dadc6cda3 100644 --- a/mod/logbrowser/views/default/admin/utilities/logbrowser.php +++ b/mod/logbrowser/views/default/admin/utilities/logbrowser.php @@ -7,7 +7,7 @@ * @package ElggLogBrowser */ -$limit = get_input('limit', 40); +$limit = get_input('limit', 20); $offset = get_input('offset'); $search_username = get_input('search_username'); @@ -54,11 +54,10 @@ $nav = elgg_view('navigation/pagination',array( // display admin body $body = <<<__HTML -$title $form -
- $nav $table $nav -
+$nav +$table +$nav __HTML; echo $body; diff --git a/mod/logbrowser/views/default/logbrowser/css.php b/mod/logbrowser/views/default/logbrowser/css.php deleted file mode 100644 index 5e2f4e168..000000000 --- a/mod/logbrowser/views/default/logbrowser/css.php +++ /dev/null @@ -1,51 +0,0 @@ - -#logbrowser_search_area { - margin-top:10px; - margin-bottom:10px; -} -#log_browser_search_form { - padding: 10px; - margin-bottom:10px; - background-color: #eeeeee; -} -.admin_settings.log_browser { - background-color: #eeeeee; - padding-top:7px; - padding-bottom:7px; -} -.log_entry { - margin: 5px; -} -.log_entry td, th { - padding: 4px 8px; - background: white; - border: 1px solid #cccccc; -} -.log_entry th { - background-color: #dddddd; -} -.log_entry .alt td { - background: #eeeeee; -} -.log_entry_time { - width: 210px; -} -.log_entry_user { - width: 120px; -} -.log_entry_guid { - width: 80px; -} -.log_entry_object { - width: 120px; -} -.log_entry_action { - width: 75px; -} \ No newline at end of file diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php index 7f52d04c9..dd2ae0f3c 100644 --- a/mod/logbrowser/views/default/logbrowser/form.php +++ b/mod/logbrowser/views/default/logbrowser/form.php @@ -6,7 +6,7 @@ */ ?> -
+
- +

- +

diff --git a/mod/logbrowser/views/default/logbrowser/table.php b/mod/logbrowser/views/default/logbrowser/table.php index 77de5dcaa..5db495fae 100644 --- a/mod/logbrowser/views/default/logbrowser/table.php +++ b/mod/logbrowser/views/default/logbrowser/table.php @@ -8,7 +8,7 @@ $log_entries = $vars['log_entries']; ?> - +
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php index eee5ef374..4e35e032f 100644 --- a/views/default/admin/appearance/menu_items.php +++ b/views/default/admin/appearance/menu_items.php @@ -6,80 +6,5 @@ * @subpackage Core */ -$builder = new ElggMenuBuilder('site'); -$menu = $builder->getMenu('name'); -$menu_items = $menu['default']; -$featured_menu_names = elgg_get_config('site_featured_menu_names'); - -$dropdown_values = array(); -foreach ($menu_items as $item) { - $dropdown_values[$item->getName()] = $item->getTitle(); -} -$dropdown_values[''] = elgg_echo('none'); - -echo "

".elgg_echo('admin:menu_items:configure')."

"; -echo "

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

"; -$form_body = ''; - -// @todo Could probably make this number configurable -for ($i=0; $i<6; $i++) { - if (array_key_exists($i, $featured_menu_names)) { - $current_value = $featured_menu_names[$i]; - } else { - $current_value = ''; - } - - $form_body .= elgg_view('input/pulldown', array( - 'options_values' => $dropdown_values, - 'internalname' => 'featured_menu_names[]', - 'value' => $current_value - )); -} - -// add arbitrary links -$form_body .= "

".elgg_echo('admin:add_menu_item')."

"; -$form_body .= elgg_view('output/longtext', array('value' => elgg_echo("admin:add_menu_item:description"))); - -$custom_items = elgg_get_config('site_custom_menu_items'); - -$name_str = elgg_echo('name'); -$url_str = elgg_echo('admin:plugins:label:website'); - -$form_body .= '
    '; - -if (is_array($custom_items)) { - foreach ($custom_items as $title => $url) { - $name_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_titles[]', - 'value' => $title - )); - - $url_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_urls[]', - 'value' => $url - )); - - $form_body .= "
  • $name_str: $name_input $url_str: $url_input $delete
    • "; - } -} - -$new = elgg_echo('new'); -$name_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_titles[]', -)); - -$url_input = elgg_view('input/text', array( - 'internalname' => 'custom_menu_urls[]', -)); - -$form_body .= "
  • $name_str: $name_input $url_str: $url_input
    • -
"; - -$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); - -echo elgg_view('input/form', array( - 'body' => $form_body, - 'action' => "action/admin/menu/save" -)); -echo "
"; \ No newline at end of file +echo elgg_view_form('admin/menu/save'); diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php index 66a9855bd..7077687cc 100644 --- a/views/default/admin/appearance/profile_fields.php +++ b/views/default/admin/appearance/profile_fields.php @@ -8,7 +8,6 @@ $list = elgg_view('admin/appearance/profile_fields/list'); $reset = elgg_view_form('profile/fields/reset', array(), array()); $body = <<<__HTML -$title $add $list
diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php index 785b5550d..0a4891145 100644 --- a/views/default/admin/components/plugin_settings.php +++ b/views/default/admin/components/plugin_settings.php @@ -11,9 +11,21 @@ $plugin_info = load_plugin_manifest($plugin); $form_body = elgg_view("settings/{$plugin}/edit", $vars); $form_body .= elgg_view('input/hidden', array('internalname' => 'plugin', 'value' => $plugin)); -$form_body .= "
" . elgg_view('input/submit', array('value' => elgg_echo('save'))); -$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'), 'class' => 'elgg-action-button disabled')); +$form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); +//$form_body .= elgg_view('input/reset', array('value' => elgg_echo('reset'))); -echo elgg_view_title($plugin_info['name']); - -echo elgg_view('input/form', array('body' => $form_body, 'internalid' => 'plugin_settings', 'action' => "action/plugins/settings/save")); \ No newline at end of file +?> +
+
+

+
+
+ $form_body, + 'internalid' => 'plugin_settings', + 'action' => "action/plugins/settings/save", + )); + ?> +
+
diff --git a/views/default/admin/overview/statistics.php b/views/default/admin/overview/statistics.php index f96b7e02e..52bd4ddb2 100644 --- a/views/default/admin/overview/statistics.php +++ b/views/default/admin/overview/statistics.php @@ -22,7 +22,7 @@ echo elgg_view('admin/statistics/extend');

-
+
@@ -46,7 +46,7 @@ $even_odd = "";

-
: - , -
+
$entry) { arsort($entry); diff --git a/views/default/admin/users/newest.php b/views/default/admin/users/newest.php index c224df215..25bd55cbc 100644 --- a/views/default/admin/users/newest.php +++ b/views/default/admin/users/newest.php @@ -8,7 +8,11 @@ $users = elgg_list_entities(array( ?> -
-

- +
+
+

+
+
+ +
diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php index aa3515948..328132a4c 100644 --- a/views/default/admin/users/online.php +++ b/views/default/admin/users/online.php @@ -3,7 +3,11 @@ $users_online = get_online_users(); ?> -
-

- +
+
+

+
+
+ +
diff --git a/views/default/css/admin.php b/views/default/css/admin.php index 66a6143f2..d92cf968c 100644 --- a/views/default/css/admin.php +++ b/views/default/css/admin.php @@ -84,9 +84,6 @@ q:before, q:after { blockquote, q { quotes: "" ""; } -a { - text-decoration: none; -} /* *************************************** BASICS @@ -101,7 +98,7 @@ body { h1, h2, h3, h4, h5, h6 { font-weight: bold; line-height: auto; - color:#666666; + color: #666666; } h1 { font-size: 1.8em; } h2 { font-size: 1.5em; line-height: 1.1em; } @@ -109,35 +106,44 @@ h3 { font-size: 1.2em; } h4 { font-size: 1.0em; } h5 { font-size: 0.9em; } h6 { font-size: 0.8em; } -a:hover, -a.selected { + +a { + color: #333333; +} +a:hover { color: black; text-decoration: underline; } pre, code { - background:#EBF5FF; + background: #EBF5FF; } blockquote { - background:#EBF5FF; + background: #EBF5FF; +} +p { + margin-bottom: 15px; } + table.mceLayout { width:100% !important; } -.clearfloat { clear:both; } +.clearfloat { + clear:both; +} /* Clearfix! */ .clearfix:after { - content:"."; - display:block; - height:0; - clear:both; - visibility:hidden; + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; } .elgg-body { width: auto; word-wrap: break-word; - overflow: hidden; + display: table-cell; } .elgg-body:after { display: block; @@ -177,6 +183,7 @@ table.mceLayout { } .elgg-site-title a { color: #dddddd; + text-decoration: none; } .elgg-site-title a:hover { color: white; @@ -223,6 +230,8 @@ table.mceLayout { border: 1px solid #cccccc; padding: 20px; position: relative; +} +.elgg-main > .elgg-inner { min-height: 400px; } .elgg-sidebar { @@ -230,6 +239,9 @@ table.mceLayout { float: right; margin-left: 30px; } +.elgg-main > .elgg-inner > .elgg-head { + margin-bottom: 10px; +} .elgg-main h2 { color: #333333; } @@ -241,6 +253,8 @@ table.mceLayout { display: block; padding: 5px; color: #333333; + cursor: pointer; + text-decoration: none; } .elgg-page-menu .elgg-menu-closed:before { content: "\25B8"; @@ -251,6 +265,7 @@ table.mceLayout { padding-right: 4px; } .elgg-page-menu a:hover { + color: black; text-decoration: none; } .elgg-page-menu li.selected > ul { @@ -297,51 +312,198 @@ table.mceLayout { width: 100%; border-top: 1px solid #cccccc; } +.elgg-table td, th { + background: white; + border: 1px solid #cccccc; +} +.elgg-table th { + background-color: #dddddd; +} +.elgg-table .alt td { + background: #eeeeee; +} .elgg-table td { + padding: 4px 8px; + border-bottom: 1px solid #cccccc; +} +.elgg-table-alt { + width: 100%; + border-top: 1px solid #cccccc; +} +.elgg-table-alt td { padding: 2px 4px 2px 4px; border-bottom: 1px solid #cccccc; } -.elgg-table td:first-child { +.elgg-table-alt td:first-child { width: 200px; } -.elgg-table tr:hover { +.elgg-table-alt tr:hover { background: #E4E4E4; } +/* *************************************** + LISTS AND IMAGE BLOCK +*************************************** */ +.elgg-image-block { + padding: 3px 0; +} +.elgg-image-block .elgg-image { + float: left; + margin-right: 5px; +} +.elgg-list-item { + margin: 3px; +} +.elgg-list-metadata { + float: right; + margin-left: 15px; + font-size: 90%; +} +.elgg-list-metadata > li { + float: left; + margin-left: 15px; +} +.elgg-list-metadata, .elgg-list-metadata a { + color: #aaaaaa; +} +.elgg-simple-list li { + margin-bottom: 5px; +} +/* *************************************** + FORMS AND INPUT +*************************************** */ +label { + font-weight: bold; + color:#333333; + font-size: 110%; +} +input { + font: 120% Arial, Helvetica, sans-serif; + padding: 5px; + border: 1px solid #cccccc; + color:#666666; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +input[type="submit"], .elgg-submit-button { + font-size: 14px; + font-weight: bold; + color: white; + text-decoration: none; + background-color: #333333; + border-color: #333333; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + width: auto; + padding: 2px 4px; + margin:10px 0 10px 0; + cursor: pointer; + outline: none; +} +input[type="submit"]:hover, .elgg-submit-button:hover { + color: white; + background-color: #000000; + text-decoration: none; +} +.elgg-submit-button { + padding: 4px 8px; +} +/* *************************************** + PAGINATION +*************************************** */ +.elgg-pagination { + margin: 10px 0; + display: block; + text-align: center; +} +.elgg-pagination li { + display: inline; + margin: 0 6px 0 0; + text-align: center; +} +.elgg-pagination a, .elgg-pagination span { + padding: 2px 6px; + color: #333333; + border: 1px solid #333333; + font-size: 12px; + text-decoration: none; +} +.elgg-pagination a:hover { + background: #333333; + color: white; + text-decoration: none; +} + +.elgg-pagination .inactive { + color: #CCCCCC; + border-color: #CCCCCC; +} + +.elgg-pagination .active { + color: #555555; + border-color: #555555; +} +.elgg-list-subtitle, .elgg-subtitle { + color: #666666; + font-size: 85%; + line-height: 1.2em; + font-style: italic; + margin-bottom: 5px; +} +.avatar_menu_button { + display: none; +} + +.elgg-user-icon { + position:relative; +} +.elgg-hover-menu { + display: none; +} +.elgg-user-icon.tiny, +img.tiny { + width:25px; + height:25px; + + -o-background-size: 25px; + -webkit-background-size: 25px; + -khtml-background-size: 25px; + -moz-background-size: 25px; +} +.elgg-user-icon.small, +img.small { + width:40px; + height:40px; + /* remove the border-radius if you don't want rounded avatars in supported browsers */ + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + -moz-background-clip: border; - - - - - -.admin_settings.users_online .profile_status { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - line-height:1.2em; + -o-background-size: 40px; + -webkit-background-size: 40px; + -khtml-background-size: 40px; + -moz-background-size: 40px; } -.admin_settings.users_online .profile_status span { - font-size:90%; - color:#666666; +img.large { + width:200px; + height:200px; } -.admin_settings.users_online p.owner_timestamp { - padding-left:3px; +img.medium { + width:100px; + height:100px; } - - - - /* .elgg-admin .elgg-page-footer { @@ -358,15 +520,6 @@ table.mceLayout { -.admin_settings h3 { - background:#999999; - color:white; - padding:5px; - margin-top:10px; - margin-bottom:10px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; -} .admin_settings label { color:#333333; font-size:100%; @@ -387,11 +540,13 @@ table.mceLayout { /* *************************************** GENERAL FORM ELEMENTS *************************************** */ + + /* default elgg core input field classes */ -.admin_area .input-text, -.admin_area .input-tags, -.admin_area .input-url, -.admin_area .input-textarea { +.input-text, +.input-tags, +.input-url, +.input-textarea { width:98%; } .admin_area .input-access { @@ -410,11 +565,6 @@ table.mceLayout { padding:0; border:none; } -.admin_area label { - font-weight: bold; - color:#333333; - font-size: 110%; -} .admin_area input { font: 120% Arial, Helvetica, sans-serif; padding: 5px; @@ -610,41 +760,6 @@ table.mceLayout { text-shadow:0 -1px 0 #999999; } - - -/* *************************************** - CONTENT HEADER -**************************************** */ -#content_header { - border-bottom:1px solid #CCCCCC; -} -#content_header:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -.content-header-title { - float:left; -} -.content-header-title { - margin-right:10px; - max-width: 530px; -} -.content-header-title h2 { - border:none; - margin-bottom:0; - padding-bottom:5px; -} -.content-header-options { - float:right; -} -.content-header-options .elgg-action-button { - float:right; - margin:0 0 5px 10px; -} - /* ECML */ .ecml_admin_table { width:100%; @@ -667,44 +782,6 @@ table.mceLayout { color: #555; } - - - - - - - -.admin_settings { - margin-bottom:20px; -} -.admin_settings table.styled { - width:100%; -} -.admin_settings table.styled { - border-top:1px solid #cccccc; -} -.admin_settings table.styled td { - padding:2px 4px 2px 4px; - border-bottom:1px solid #cccccc; -} -.admin_settings table.styled td.column-one { - width:200px; -} -.admin_settings table.styled tr:hover { - background: #E4E4E4; -} -.admin_settings.users_online .profile_status { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - line-height:1.2em; -} -.admin_settings.users_online .profile_status span { - font-size:90%; - color:#666666; -} -.admin_settings.users_online p.owner_timestamp { - padding-left:3px; -} .admin_plugin_reorder { float:right; width:200px; @@ -829,53 +906,7 @@ ul.admin_plugins { -moz-border-radius: 4px; } -/* *************************************** - ELGG TABBED PAGE NAVIGATION -*************************************** */ -.elgg-tabs { - margin-bottom:5px; - padding: 0; - border-bottom: 2px solid #cccccc; - display:table; - width:100%; -} -.elgg-tabs ul { - list-style: none; - padding: 0; - margin: 0; -} -.elgg-tabs li { - float: left; - border: 2px solid #cccccc; - border-bottom-width: 0; - background: #eeeeee; - margin: 0 0 0 10px; - -moz-border-radius-topleft:5px; - -moz-border-radius-topright:5px; - -webkit-border-top-left-radius:5px; - -webkit-border-top-right-radius:5px; -} -.elgg-tabs a { - text-decoration: none; - display: block; - padding:3px 10px 0 10px; - text-align: center; - height:21px; - color:#999999; -} -.elgg-tabs a:hover { - background: #dedede; - color:#4690D6; -} -.elgg-tabs .selected { - border-color: #cccccc; - background: white; -} -.elgg-tabs .selected a { - position: relative; - top: 2px; - background: white; -} + .add-user form { width:300px; } diff --git a/views/default/forms/admin/menu/save.php b/views/default/forms/admin/menu/save.php new file mode 100644 index 000000000..6c9cd9bd5 --- /dev/null +++ b/views/default/forms/admin/menu/save.php @@ -0,0 +1,100 @@ +menus['site']; +$builder = new ElggMenuBuilder($menu); +$menu = $builder->getMenu('name'); +$menu_items = $menu['default']; + +$featured_menu_names = elgg_get_config('site_featured_menu_names'); + +$dropdown_values = array(); +foreach ($menu_items as $item) { + $dropdown_values[$item->getName()] = $item->getTitle(); +} +$dropdown_values[''] = elgg_echo('none'); + +?> +
+
+

+
+
+ elgg_echo("admin:menu_items:description") +)); + +// @todo Could probably make this number configurable +for ($i=0; $i<6; $i++) { + if (array_key_exists($i, $featured_menu_names)) { + $current_value = $featured_menu_names[$i]; + } else { + $current_value = ''; + } + + echo elgg_view('input/pulldown', array( + 'options_values' => $dropdown_values, + 'internalname' => 'featured_menu_names[]', + 'value' => $current_value + )); +} +?> +
+
+ +
+
+

+
+
+ elgg_echo("admin:add_menu_item:description") +)); + +$custom_items = elgg_get_config('site_custom_menu_items'); + +$name_str = elgg_echo('name'); +$url_str = elgg_echo('admin:plugins:label:website'); + +echo '
    '; + +if (is_array($custom_items)) { + foreach ($custom_items as $title => $url) { + $name_input = elgg_view('input/text', array( + 'internalname' => 'custom_menu_titles[]', + 'value' => $title + )); + + $url_input = elgg_view('input/text', array( + 'internalname' => 'custom_menu_urls[]', + 'value' => $url + )); + + echo "
  • $name_str: $name_input $url_str: $url_input $delete
    • "; + } +} + +$new = elgg_echo('new'); +$name_input = elgg_view('input/text', array( + 'internalname' => 'custom_menu_titles[]', +)); + +$url_input = elgg_view('input/text', array( + 'internalname' => 'custom_menu_urls[]', +)); + +echo "
  • $name_str: $name_input $url_str: $url_input
    • +
"; + +?> +
+
+ elgg_echo('save'))); diff --git a/views/default/forms/profile/fields/add.php b/views/default/forms/profile/fields/add.php index 50d1600fd..de43b9ec9 100644 --- a/views/default/forms/profile/fields/add.php +++ b/views/default/forms/profile/fields/add.php @@ -25,5 +25,5 @@ $formbody = <<< END $submit_control

END; -echo "

" . elgg_echo('profile:explainchangefields') . "

"; +echo autop(elgg_echo('profile:explainchangefields')); echo $formbody; diff --git a/views/default/forms/useradd.php b/views/default/forms/useradd.php index 7c1969f1b..8ed0fc2cc 100644 --- a/views/default/forms/useradd.php +++ b/views/default/forms/useradd.php @@ -11,21 +11,31 @@ if ((get_loggedin_user()->isAdmin()) && ($vars['show_admin'])) { $admin_option = true; } -$form_body = "

"; -$form_body .= "

"; -$form_body .= "

"; -$form_body .= "

"; -$form_body .= "

"; +$form_body = "


" . elgg_view('input/text' , array('internalname' => 'name')) . "

"; +$form_body .= "


" . elgg_view('input/text' , array('internalname' => 'username')) . "

"; +$form_body .= "


" . elgg_view('input/text' , array('internalname' => 'email')) . "

"; +$form_body .= "


" . elgg_view('input/password' , array('internalname' => 'password')) . "

"; +$form_body .= "


" . elgg_view('input/password' , array('internalname' => 'password2')) . "

"; $form_body .= "

"; if ($admin_option) { $form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option')))); + $form_body .= '

'; } $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "

"; ?> -
-

- "action/useradd", 'body' => $form_body)) ?> +
+
+

+
+
+ "action/useradd", + 'body' => $form_body, + )); + ?> +
\ No newline at end of file diff --git a/views/default/layout/shells/admin.php b/views/default/layout/shells/admin.php index efbe547d1..0d0fd2c3f 100644 --- a/views/default/layout/shells/admin.php +++ b/views/default/layout/shells/admin.php @@ -46,15 +46,20 @@ $logout = elgg_view('output/url', array( ?>
- +
+
+ +
+ +
\ No newline at end of file diff --git a/views/default/layout/shells/admin/menu.php b/views/default/layout/shells/admin/menu.php index 82dd90ab0..2f1a6bebb 100644 --- a/views/default/layout/shells/admin/menu.php +++ b/views/default/layout/shells/admin/menu.php @@ -6,7 +6,7 @@ $content = elgg_view_menu('page', array('sort_by' => 'name')); echo elgg_view('layout/objects/module', array( - 'title' => elgg_echo('menu'), + 'title' => elgg_echo('admin:menu'), 'body' => $content, 'class' => 'elgg-main-module', )); -- cgit v1.2.3