aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mod/apiadmin/views/default/apiadmin/forms/add_key.php2
-rw-r--r--mod/apiadmin/views/default/object/api_key.php2
-rw-r--r--mod/diagnostics/index.php3
-rw-r--r--mod/diagnostics/views/default/diagnostics/forms/download.php5
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/form.php14
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/groupsform.php6
-rw-r--r--mod/profile/views/default/profile/edit.php5
-rw-r--r--mod/profile/views/default/profile/editdefaultprofile.php5
-rw-r--r--mod/profile/views/default/profile/editicon.php2
-rw-r--r--mod/reportedcontent/views/default/reportedcontent/form.php5
-rw-r--r--mod/reportedcontent/views/default/reportedcontent/listing.php6
-rw-r--r--views/default/admin/plugins.php16
-rw-r--r--views/default/admin/site.php4
-rw-r--r--views/default/admin/statistics.php8
-rw-r--r--views/default/admin/user.php2
-rw-r--r--views/default/usersettings/form.php4
-rw-r--r--views/default/usersettings/plugins.php2
17 files changed, 48 insertions, 43 deletions
diff --git a/mod/apiadmin/views/default/apiadmin/forms/add_key.php b/mod/apiadmin/views/default/apiadmin/forms/add_key.php
index d45ab64c1..005b1e27b 100644
--- a/mod/apiadmin/views/default/apiadmin/forms/add_key.php
+++ b/mod/apiadmin/views/default/apiadmin/forms/add_key.php
@@ -4,7 +4,7 @@
$gen_control = elgg_view('input/submit', array('value' => elgg_echo('apiadmin:generate')));
$form_body = <<< END
- <div>
+ <div class="contentWrapper">
<p>$ref_label: $ref_control $gen_control</p>
</div>
END;
diff --git a/mod/apiadmin/views/default/object/api_key.php b/mod/apiadmin/views/default/object/api_key.php
index 137cc9777..77ea9007f 100644
--- a/mod/apiadmin/views/default/object/api_key.php
+++ b/mod/apiadmin/views/default/object/api_key.php
@@ -19,7 +19,7 @@
$token = generate_action_token($ts);
- $info = "<div><p><b>{$entity->title}</b> <a href=\"{$CONFIG->url}actions/apiadmin/revokekey?keyid={$entity->guid}&__elgg_token=$token&__elgg_ts=$ts\">$revoke_label</a></p></div>";
+ $info = "<div class=\"contentWrapper\"><p><b>{$entity->title}</b> <a href=\"{$CONFIG->url}actions/apiadmin/revokekey?keyid={$entity->guid}&__elgg_token=$token&__elgg_ts=$ts\">$revoke_label</a></p></div>";
$info .= "<div><p><b>$public_label:</b> {$entity->public}<br />";
if (isadminloggedin()) {
// Only show secret portion to admins
diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index a1e261320..b9aa2e309 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -18,10 +18,11 @@
$title = elgg_view_title(elgg_echo('diagnostics'));
+ $body .= "<div class=\"contentWrapper\">";
$body .= elgg_echo('diagnostics:description');
$body .= elgg_view('diagnostics/forms/download');
-
+ $body .= "</div>";
page_draw(elgg_echo('diagnostics'),elgg_view_layout("two_column_left_sidebar", '', $title . $body));
diff --git a/mod/diagnostics/views/default/diagnostics/forms/download.php b/mod/diagnostics/views/default/diagnostics/forms/download.php
index 2046128f4..d521db8be 100644
--- a/mod/diagnostics/views/default/diagnostics/forms/download.php
+++ b/mod/diagnostics/views/default/diagnostics/forms/download.php
@@ -8,8 +8,7 @@
* @copyright Curverider Ltd 2008-2009
* @link http://elgg.com/
*/
-
- $form_body = elgg_view('input/submit', array('value' => elgg_echo('diagnostics:download')));
- echo elgg_view('input/form', array('body' => $form_body, 'action' => $CONFIG->url . "actions/diagnostics/download"))
+ $form_body = elgg_view('input/submit', array('value' => elgg_echo('diagnostics:download')));
+ echo elgg_view('input/form', array('body' => $form_body, 'action' => $CONFIG->url . "actions/diagnostics/download"));
?> \ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index ccae930fc..07e5287fd 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -13,23 +13,23 @@
// Echo title
echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings'));
-
- echo elgg_view('subscriptions/form/additions',$vars);
+
+ echo elgg_view('subscriptions/form/additions',$vars);
// Display a description
-?>
-<div class="settings_form">
+?>
+<div class="contentWrapper">
<div class="notification_methods">
<?php
echo elgg_view('input/form',array(
- 'body' => elgg_view('notifications/subscriptions/personal') .
- elgg_view('notifications/subscriptions/collections') .
+ 'body' => elgg_view('notifications/subscriptions/personal') .
+ elgg_view('notifications/subscriptions/collections') .
elgg_view('notifications/subscriptions/forminternals'),
'method' => 'post',
'action' => $vars['url'] . 'action/notificationsettings/save',
));
?>
-</div>
+</div>
</div> \ No newline at end of file
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index 56d90c6d1..1303e224f 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -11,14 +11,14 @@
}
?>
-
-<div class="settings_form">
+<?php echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups')); ?>
+<div class="contentWrapper">
<div class="notification_methods">
<?php
echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
?>
- <?php echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups')); ?>
+
<p>
<?php
diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php
index baa843c8e..7b1f9540a 100644
--- a/mod/profile/views/default/profile/edit.php
+++ b/mod/profile/views/default/profile/edit.php
@@ -14,7 +14,7 @@
*/
?>
-
+<div class="contentWrapper">
<form action="<?php echo $vars['url']; ?>action/profile/edit" method="post">
<?php
@@ -63,4 +63,5 @@
<input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
</p>
-</form> \ No newline at end of file
+</form>
+</div> \ No newline at end of file
diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php
index 9b20b02d3..64f8f1074 100644
--- a/mod/profile/views/default/profile/editdefaultprofile.php
+++ b/mod/profile/views/default/profile/editdefaultprofile.php
@@ -24,12 +24,11 @@
$submit_control = elgg_view('input/submit', array('internalname' => elgg_echo('save'), 'value' => elgg_echo('save')));
$formbody = <<< END
- <div>
<p>$label_text: $label_control
$type_text: $type_control
$submit_control</p>
- </div>
END;
-
+ echo "<div class=\"contentWrapper\">";
echo elgg_view('input/form', array('body' => $formbody, 'action' => $vars['url'] . 'actions/profile/editdefault'));
+ echo "</div>";
?> \ No newline at end of file
diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php
index eb368ee98..bb0eb9a13 100644
--- a/mod/profile/views/default/profile/editicon.php
+++ b/mod/profile/views/default/profile/editicon.php
@@ -15,6 +15,7 @@
?>
<!-- grab the required js for icon cropping -->
+<div class="contentWrapper">
<script type="text/javascript" src="<?php echo $vars['url']; ?>mod/profile/views/default/js/jquery.imgareaselect-0.4.2.js"></script>
<p><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
@@ -132,3 +133,4 @@
</div>
<div class="clearfloat"></div>
+</div>
diff --git a/mod/reportedcontent/views/default/reportedcontent/form.php b/mod/reportedcontent/views/default/reportedcontent/form.php
index ed4833f6e..29dd02f0e 100644
--- a/mod/reportedcontent/views/default/reportedcontent/form.php
+++ b/mod/reportedcontent/views/default/reportedcontent/form.php
@@ -22,7 +22,7 @@
$owner = $vars['user'];
?>
-
+<div class="contentWrapper">
<form action="<?php echo $vars['url']; ?>action/reportedcontent/add" method="post">
<p>
@@ -68,4 +68,5 @@
<input type="submit" value="<?php echo elgg_echo('reportedcontent:report'); ?>" />
</p>
- </form> \ No newline at end of file
+ </form>
+</div> \ No newline at end of file
diff --git a/mod/reportedcontent/views/default/reportedcontent/listing.php b/mod/reportedcontent/views/default/reportedcontent/listing.php
index 2a00e698b..57628ba19 100644
--- a/mod/reportedcontent/views/default/reportedcontent/listing.php
+++ b/mod/reportedcontent/views/default/reportedcontent/listing.php
@@ -1,5 +1,8 @@
+
<?php
+ echo "<div class=\"contentWrapper\">";
+
if($vars['entity']){
foreach($vars['entity'] as $report){
@@ -15,7 +18,6 @@
$reportedcontent_background = "active_report";
}
-
echo "<div class=\"reportedcontent_content {$reportedcontent_background}\">";
echo "<p class=\"reportedcontent_detail\">";
if($report->state != 'archived')
@@ -33,5 +35,5 @@
}
}
-
+ echo "</div>";
?> \ No newline at end of file
diff --git a/views/default/admin/plugins.php b/views/default/admin/plugins.php
index fc044f128..fb319d436 100644
--- a/views/default/admin/plugins.php
+++ b/views/default/admin/plugins.php
@@ -12,7 +12,7 @@
*/
// Description of what's going on
- echo "<p>" . autop(elgg_echo("admin:plugins:description")) . "</p>";
+ echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . autop(elgg_echo("admin:plugins:description")) . "</span></div>";
$limit = get_input('limit', 10);
$offset = get_input('offset', 0);
@@ -21,11 +21,11 @@
// Get the installed plugins
$installed_plugins = $vars['installed_plugins'];
$count = count($installed_plugins);
-
- $plugin_list = get_plugin_list();
- $max = 0;
- foreach($plugin_list as $key => $foo)
- if ($key > $max) $max = $key;
+
+ $plugin_list = get_plugin_list();
+ $max = 0;
+ foreach($plugin_list as $key => $foo)
+ if ($key > $max) $max = $key;
// Display list of plugins
$n = 0;
@@ -37,7 +37,7 @@
$n++;
}
- // Diplay nav
+ // Diplay nav
/*
if ($count)
{
@@ -46,6 +46,6 @@
'offset' => $offset,
'count' => $count,
));
- }
+ }
*/
?> \ No newline at end of file
diff --git a/views/default/admin/site.php b/views/default/admin/site.php
index 080a35b9d..020b72b59 100644
--- a/views/default/admin/site.php
+++ b/views/default/admin/site.php
@@ -14,7 +14,9 @@
global $CONFIG;
// Description of what's going on
- echo "<p>" . autop(elgg_echo("admin:site:description")) . "</p>";
+ echo "<div class=\"contentWrapper\">" . autop(elgg_echo("admin:site:description")) . " ";
echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
+
+ echo "</div>";
?> \ No newline at end of file
diff --git a/views/default/admin/statistics.php b/views/default/admin/statistics.php
index 75ece8eb1..7bc3bca6e 100644
--- a/views/default/admin/statistics.php
+++ b/views/default/admin/statistics.php
@@ -11,12 +11,10 @@
*/
global $CONFIG;
-
- // echo "<p>" . autop(elgg_echo("admin:statistics:description")) . "</p>";
-
+
?>
- <!-- <p>
+ <div class="contentWrapper"><span class="contentIntro">
<?php echo elgg_echo('admin:statistics:description'); ?>
<a href="http://elgg.com/"><?php echo elgg_echo('learnmore'); ?></a>
- </p> --> \ No newline at end of file
+ </span></div> \ No newline at end of file
diff --git a/views/default/admin/user.php b/views/default/admin/user.php
index 75bc74b82..a648789aa 100644
--- a/views/default/admin/user.php
+++ b/views/default/admin/user.php
@@ -12,7 +12,7 @@
*/
// Description of what's going on
- echo "<p>" . autop(elgg_echo("admin:user:description")) . "</p>";
+ echo "<div class=\"contentWrapper\"><span class=\"contentIntro\">" . autop(elgg_echo("admin:user:description")) . "</span></div>";
echo elgg_view("admin/user_opt/adduser");
diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index 509146162..0d47355af 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -1,7 +1,7 @@
<?php
- $form_body = "<div class=\"settings_form\">" . elgg_view("usersettings/user") . "</div>";
- $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p>";
+ $form_body = "<div class=\"contentWrapper\">" . elgg_view("usersettings/user") . " ";
+ $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p></div>";
echo elgg_view('input/form', array('action' => "{$vars['url']}action/usersettings/save", 'body' => $form_body));
?> \ No newline at end of file
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index 52fb6b80d..6573766f7 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -11,7 +11,7 @@
*/
// Description of what's going on
- echo "<p>" . autop(elgg_echo("usersettings:plugins:description")) . "</p>";
+ echo "<div class=\"contentWrapper\">" . autop(elgg_echo("usersettings:plugins:description")) . "</div>";
$limit = get_input('limit', 10);
$offset = get_input('offset', 0);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 23:54:59 +0000