aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/admin/appearance/menu_items.php77
-rw-r--r--views/default/admin/appearance/profile_fields.php1
-rw-r--r--views/default/admin/components/plugin_settings.php22
-rw-r--r--views/default/admin/overview/statistics.php4
-rw-r--r--views/default/admin/users/newest.php10
-rw-r--r--views/default/admin/users/online.php10
-rw-r--r--views/default/css/admin.php377
-rw-r--r--views/default/forms/admin/menu/save.php100
-rw-r--r--views/default/forms/profile/fields/add.php2
-rw-r--r--views/default/forms/useradd.php26
-rw-r--r--views/default/layout/shells/admin.php23
-rw-r--r--views/default/layout/shells/admin/menu.php2
12 files changed, 372 insertions, 282 deletions
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 "<div class='admin_settings menuitems'><h3>".elgg_echo('admin:menu_items:configure')."</h3>";
-echo "<p class='margin-top'>".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."</p>";
-$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 .= "<h3>".elgg_echo('admin:add_menu_item')."</h3>";
-$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 .= '<ul class="custom_menuitems">';
-
-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 .= "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input $delete</li>";
- }
-}
-
-$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 .= "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input</li>
-</ul>";
-
-$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 "</div>"; \ 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
<div class="default_profile_reset">
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 .= "<div class='divider'></div>" . 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
+?>
+<div class="elgg-module elgg-inline-module">
+ <div class="elgg-head">
+ <h3><?php echo $plugin_info['name']; ?></h3>
+ </div>
+ <div class="elgg-body">
+ <?php
+ echo elgg_view('input/form', array(
+ 'body' => $form_body,
+ 'internalid' => 'plugin_settings',
+ 'action' => "action/plugins/settings/save",
+ ));
+ ?>
+ </div>
+</div>
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');
<h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
</div>
<div class="elgg-body">
- <table class="elgg-table">
+ <table class="elgg-table-alt">
<tr class="odd">
<td><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
<td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td>
@@ -46,7 +46,7 @@ $even_odd = "";
<h3><?php echo elgg_echo('admin:statistics:label:numentities'); ?></h3>
</div>
<div class="elgg-body">
- <table class="elgg-table">
+ <table class="elgg-table-alt">
<?php
foreach ($entity_stats as $k => $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(
?>
-<div class="admin_settings members-list users_online">
- <h3><?php echo elgg_echo('admin:users:newest'); ?></h3>
- <?php echo $users; ?>
+<div class="elgg-module elgg-inline-module">
+ <div class="elgg-head">
+ <h3><?php echo elgg_echo('admin:users:newest'); ?></h3>
+ </div>
+ <div class="elgg-body">
+ <?php echo $users; ?>
+ </div>
</div>
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();
?>
-<div class="admin_settings members-list users_online">
- <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
- <?php echo $users_online; ?>
+<div class="elgg-module elgg-inline-module">
+ <div class="elgg-head">
+ <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
+ </div>
+ <div class="elgg-body">
+ <?php echo $users_online; ?>
+ </div>
</div>
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;
+}
+<?php //@todo use "disabled" on the li ?>
+.elgg-pagination .inactive {
+ color: #CCCCCC;
+ border-color: #CCCCCC;
+}
+<?php //@todo Choose b/w elgg-state-active or elgg-state-selected ?>
+.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;
+}
+<?php // @todo clean up and figure out what admin css needs ?>
+.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 {
<?php //@todo convert to new style ?>
-.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 @@
+<?php
+/**
+ * Form body for setting up site menu
+ */
+
+// get site menu items
+global $CONFIG;
+$menu = $CONFIG->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');
+
+?>
+<div class="elgg-module elgg-inline-module">
+ <div class="elgg-head">
+ <h3><?php echo elgg_echo('admin:menu_items:configure'); ?></h3>
+ </div>
+ <div class="elgg-body">
+<?php
+echo elgg_view('output/longtext', array(
+ 'value' => 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
+ ));
+}
+?>
+ </div>
+</div>
+
+<div class="elgg-module elgg-inline-module">
+ <div class="elgg-head">
+ <h3><?php echo elgg_echo('admin:add_menu_item'); ?></h3>
+ </div>
+ <div class="elgg-body">
+<?php
+echo 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');
+
+echo '<ul class="elgg-simple-list">';
+
+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 "<li>$name_str: $name_input $url_str: $url_input $delete</li>";
+ }
+}
+
+$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 "<li class='custom_menuitem'>$name_str: $name_input $url_str: $url_input</li>
+</ul>";
+
+?>
+ </div>
+</div>
+<?php
+
+echo elgg_view('input/submit', array('value' => 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</p>
END;
-echo "<p class='margin-top'>" . elgg_echo('profile:explainchangefields') . "</p>";
+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 = "<p><label>" . elgg_echo('name') . "<br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</label></p>";
-$form_body .= "<p><label>" . elgg_echo('username') . "<br />" . elgg_view('input/text' , array('internalname' => 'username')) . "</label></p>";
-$form_body .= "<p><label>" . elgg_echo('email') . "<br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</label></p>";
-$form_body .= "<p><label>" . elgg_echo('password') . "<br />" . elgg_view('input/password' , array('internalname' => 'password')) . "</label></p>";
-$form_body .= "<p><label>" . elgg_echo('passwordagain') . "<br />" . elgg_view('input/password' , array('internalname' => 'password2')) . "</label></p>";
+$form_body = "<p><label>" . elgg_echo('name') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'name')) . "</p>";
+$form_body .= "<p><label>" . elgg_echo('username') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'username')) . "</p>";
+$form_body .= "<p><label>" . elgg_echo('email') . "</label><br />" . elgg_view('input/text' , array('internalname' => 'email')) . "</p>";
+$form_body .= "<p><label>" . elgg_echo('password') . "</label><br />" . elgg_view('input/password' , array('internalname' => 'password')) . "</p>";
+$form_body .= "<p><label>" . elgg_echo('passwordagain') . "</label><br />" . elgg_view('input/password' , array('internalname' => 'password2')) . "</p>";
$form_body .= "<p>";
if ($admin_option) {
$form_body .= elgg_view('input/checkboxes', array('internalname' => "admin", 'options' => array(elgg_echo('admin_option'))));
+ $form_body .= '</p><p>';
}
$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
?>
-<div class="admin_settings add-user">
- <h3><?php echo elgg_echo('adduser'); ?></h3>
- <?php echo elgg_view('input/form', array('action' => "action/useradd", 'body' => $form_body)) ?>
+<div class="elgg-module elgg-inline-module">
+ <div class="elgg-head">
+ <h3><?php echo elgg_echo('adduser'); ?></h3>
+ </div>
+ <div class="elgg-body">
+ <?php
+ echo elgg_view('input/form', array(
+ 'action' => "action/useradd",
+ 'body' => $form_body,
+ ));
+ ?>
+ </div>
</div> \ 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(
?>
</div>
<div class="elgg-main elgg-body">
- <?php
- if (isset($vars['title'])) {
- echo elgg_view_title($vars['title']);
- }
-
- if (isset($vars['content'])) {
- echo $vars['content'];
- }
- ?>
+ <div class="elgg-inner">
+ <div class="elgg-head">
+ <?php
+ if (isset($vars['title'])) {
+ echo elgg_view_title($vars['title']);
+ }
+ ?>
+ </div>
+ <?php
+ if (isset($vars['content'])) {
+ echo $vars['content'];
+ }
+ ?>
+ </div>
</div>
</div>
<div class="elgg-page-footer"></div> \ 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',
));
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 09:15:39 +0000