From 61ad84e217b0a1bae8d607a1504c4b477d976ac5 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Sat, 24 Sep 2011 16:08:04 -0400
Subject: Refs #3864 updated the two form bodies for edit profile fields

---
 views/default/admin/appearance/profile_fields.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'views/default/admin/appearance/profile_fields.php')

diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 7077687cc..8371ce83c 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -10,9 +10,7 @@ $reset = elgg_view_form('profile/fields/reset', array(), array());
 $body = <<<__HTML
 $add
 $list
-<div class="default_profile_reset">
-	$reset
-</div>
+$reset
 __HTML;
 
 echo $body;
-- 
cgit v1.2.3


From 9fa1a7b0b1dd363d16784707bcbb9c3e7c85966f Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Tue, 1 Nov 2011 21:34:31 -0400
Subject: Fixes #3672 added class for settings forms in admin area

---
 .../views/default/admin/developers/settings.php    |  2 +-
 .../admin/develop_utilities/diagnostics.php        |  4 +--
 .../views/default/admin/appearance/expages.php     |  2 +-
 mod/externalpages/views/default/expages/menu.php   | 31 +---------------------
 views/default/admin/appearance/menu_items.php      |  2 +-
 views/default/admin/appearance/profile_fields.php  |  2 +-
 views/default/admin/plugin_settings.php            |  2 +-
 views/default/admin/settings/advanced.php          |  2 +-
 views/default/admin/settings/basic.php             |  2 +-
 views/default/css/admin.php                        |  2 +-
 10 files changed, 11 insertions(+), 40 deletions(-)

(limited to 'views/default/admin/appearance/profile_fields.php')

diff --git a/mod/developers/views/default/admin/developers/settings.php b/mod/developers/views/default/admin/developers/settings.php
index 287f4d99e..dcc0a3e4f 100644
--- a/mod/developers/views/default/admin/developers/settings.php
+++ b/mod/developers/views/default/admin/developers/settings.php
@@ -58,6 +58,6 @@ $data = array(
 	),
 );
 
-$form_vars = array('id' => 'developer-settings-form');
+$form_vars = array('id' => 'developer-settings-form', 'class' => 'elgg-form-settings');
 $body_vars = array('data' => $data);
 echo elgg_view_form('developers/settings', $form_vars, $body_vars);
diff --git a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
index 02151174c..89e235279 100644
--- a/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
@@ -34,5 +34,5 @@ if (elgg_get_config('debug')) {
 }
 
 // display admin body
-echo elgg_view_module('inline', $diagnostics_title, $diagnostics);
-echo elgg_view_module('inline', $unit_tests_title, $unit_tests);
+echo elgg_view_module('inline', $diagnostics_title, $diagnostics, array('class' => 'elgg-form-settings'));
+echo elgg_view_module('inline', $unit_tests_title, $unit_tests, array('class' => 'elgg-form-settings'));
diff --git a/mod/externalpages/views/default/admin/appearance/expages.php b/mod/externalpages/views/default/admin/appearance/expages.php
index b30765089..6a5a521a5 100644
--- a/mod/externalpages/views/default/admin/appearance/expages.php
+++ b/mod/externalpages/views/default/admin/appearance/expages.php
@@ -7,4 +7,4 @@ $type = get_input('type', 'about');
 
 echo elgg_view('expages/menu', array('type' => $type));
 
-echo elgg_view_form('expages/edit', array(), array('type' => $type));
+echo elgg_view_form('expages/edit', array('class' => 'elgg-form-settings'), array('type' => $type));
diff --git a/mod/externalpages/views/default/expages/menu.php b/mod/externalpages/views/default/expages/menu.php
index 846db076f..6ed521629 100644
--- a/mod/externalpages/views/default/expages/menu.php
+++ b/mod/externalpages/views/default/expages/menu.php
@@ -20,33 +20,4 @@ foreach ($pages as $page) {
 	);
 }
 
-echo elgg_view('navigation/tabs', array('tabs' => $tabs));
-
-return true;
-
-/**
- * Tab navigation
- *
- * @uses string $vars['type'] horizontal || vertical - Defaults to horizontal
- * @uses string $vars['class'] Additional class to add to ul
- * @uses array $vars['tabs'] A multi-dimensional array of tab entries in the format array(
- * 	'title' => string, // Title of link
- * 	'url' => string, // URL for the link
- * 	'class' => string  // Class of the li element
- * 	'id' => string, // ID of the li element
- * 	'selected' => bool // if this li element is currently selected
- * 	'url_class' => string, // Class to pass to the link
- * 	'url_id' => string, // ID to pass to the link
- * )
- */
-
-?>
-
-<div id="elgg_horizontal_tabbed_nav">
-<ul>
-	<li <?php if($type == 'front') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>front"><?php echo elgg_echo('expages:frontpage'); ?></a></li>
-	<li <?php if($type == 'about') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>about"><?php echo elgg_echo('expages:about'); ?></a></li>
-	<li <?php if($type == 'terms') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>terms"><?php echo elgg_echo('expages:terms'); ?></a></li>
-	<li <?php if($type == 'privacy') echo "class = 'selected'"; ?>><a href="<?php echo $url; ?>privacy"><?php echo elgg_echo('expages:privacy'); ?></a></li>
-</ul>
-</div>
\ No newline at end of file
+echo elgg_view('navigation/tabs', array('tabs' => $tabs, 'class' => 'elgg-form-settings'));
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index 4e35e032f..1d5c95cf9 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -7,4 +7,4 @@
  */
 
 
-echo elgg_view_form('admin/menu/save');
+echo elgg_view_form('admin/menu/save', array('class' => 'elgg-form-settings'));
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index 8371ce83c..91d14b874 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
@@ -3,7 +3,7 @@
  * Admin area: edit default profile fields
  */
 
-$add = elgg_view_form('profile/fields/add', array(), array());
+$add = elgg_view_form('profile/fields/add', array('class' => 'elgg-form-settings'), array());
 $list = elgg_view('admin/appearance/profile_fields/list');
 $reset = elgg_view_form('profile/fields/reset', array(), array());
 
diff --git a/views/default/admin/plugin_settings.php b/views/default/admin/plugin_settings.php
index c75492270..1c6e9e206 100644
--- a/views/default/admin/plugin_settings.php
+++ b/views/default/admin/plugin_settings.php
@@ -19,7 +19,7 @@ $settings = false;
 if (elgg_view_exists("settings/$plugin_id/edit") || elgg_view_exists("plugins/$plugin_id/settings")) {
 	$title = $plugin->getManifest()->getName();
 
-	$params = array('id' => "$plugin_id-settings");
+	$params = array('id' => "$plugin_id-settings", 'class' => 'elgg-form-settings');
 	$body = elgg_view_form("plugins/settings/save", $params, $vars);
 
 	echo elgg_view_module('info', $title, $body);
diff --git a/views/default/admin/settings/advanced.php b/views/default/admin/settings/advanced.php
index 12e4303e7..a262740f2 100644
--- a/views/default/admin/settings/advanced.php
+++ b/views/default/admin/settings/advanced.php
@@ -6,4 +6,4 @@
  * @subpackage Core
  */
 
-echo elgg_view_form('admin/site/update_advanced');
+echo elgg_view_form('admin/site/update_advanced', array('class' => 'elgg-form-settings'));
diff --git a/views/default/admin/settings/basic.php b/views/default/admin/settings/basic.php
index 3b8f4f183..9334ba81b 100644
--- a/views/default/admin/settings/basic.php
+++ b/views/default/admin/settings/basic.php
@@ -6,4 +6,4 @@
  * @subpackage Core
  */
 
-echo elgg_view_form('admin/site/update_basic');
+echo elgg_view_form('admin/site/update_basic', array('class' => 'elgg-form-settings'));
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 73996a199..160a2a3e4 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -512,7 +512,7 @@ a.elgg-button {
 }
 
 .elgg-form-settings {
-	max-width: 600px;
+	max-width: 800px;
 }
 
 /* **************************************
-- 
cgit v1.2.3