From a1abec1d617c9330d9c06bda2f462d213f013f53 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 16 Oct 2009 20:54:48 +0000
Subject: Finish up standardizing views/default/*

git-svn-id: http://code.elgg.org/elgg/trunk@3557 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/usersettings/form.php                | 13 +++-
 views/default/usersettings/main.php                | 23 +++---
 views/default/usersettings/main_opt/plugins.php    | 20 ++---
 views/default/usersettings/main_opt/statistics.php | 16 ++--
 views/default/usersettings/main_opt/user.php       | 16 ++--
 views/default/usersettings/plugins.php             | 52 ++++++-------
 views/default/usersettings/plugins_opt/plugin.php  | 49 ++++++------
 views/default/usersettings/statistics.php          | 16 ++--
 .../usersettings/statistics_opt/numentities.php    | 86 +++++++++++-----------
 .../default/usersettings/statistics_opt/online.php | 35 ++++-----
 views/default/usersettings/user.php                |  7 +-
 11 files changed, 169 insertions(+), 164 deletions(-)

(limited to 'views/default/usersettings')

diff --git a/views/default/usersettings/form.php b/views/default/usersettings/form.php
index 0d7be712e..2d4a7cb80 100644
--- a/views/default/usersettings/form.php
+++ b/views/default/usersettings/form.php
@@ -1,7 +1,12 @@
 <?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	$form_body = "<div class=\"contentWrapper user_settings\">" . elgg_view("usersettings/user") . " ";
-	$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('save'))) . "</p></div>";
+$form_body = "<div class=\"contentWrapper user_settings\">" . 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
+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/main.php b/views/default/usersettings/main.php
index 9a7afbf51..6d96076f8 100644
--- a/views/default/usersettings/main.php
+++ b/views/default/usersettings/main.php
@@ -1,14 +1,13 @@
 <?php
-	/**
-	 * Elgg user main settings page.
-	 * Functions for adding and manipulating options on the user settings panel.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd 
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg user main settings page.
+ * Functions for adding and manipulating options on the user settings panel.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	// Description of what's going on
-		echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>";
-?>
\ No newline at end of file
+// Description of what's going on
+echo "<p>" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:description"))) . "</p>";
diff --git a/views/default/usersettings/main_opt/plugins.php b/views/default/usersettings/main_opt/plugins.php
index a6b51fa64..210096e92 100644
--- a/views/default/usersettings/main_opt/plugins.php
+++ b/views/default/usersettings/main_opt/plugins.php
@@ -1,17 +1,17 @@
 <?php
-	/**
-	 * Elgg plugin sub-component on the main menu.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg plugin sub-component on the main menu.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	global $CONFIG;
+global $CONFIG;
 ?>
 <div class="admin-menu-option">
 	<h2><?php echo elgg_echo('usersettings:plugins'); ?> </h2>
 	<p><?php echo elgg_echo('usersettings:plugins:opt:description'); ?><br />
-	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p> 
+	<a href="<?php echo $CONFIG->wwwroot . "pg/settings/plugins/"; ?>"><?php echo elgg_echo('usersettings:plugins:opt:linktext'); ?></a></p>
 </div>
\ No newline at end of file
diff --git a/views/default/usersettings/main_opt/statistics.php b/views/default/usersettings/main_opt/statistics.php
index 4a9131d0c..ca9d2d2bb 100644
--- a/views/default/usersettings/main_opt/statistics.php
+++ b/views/default/usersettings/main_opt/statistics.php
@@ -1,12 +1,12 @@
 <?php
-	/**
-	 * Elgg satistics sub-component on the main menu.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg satistics sub-component on the main menu.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 ?>
 <div class="admin-menu-option">
 	<h2><?php echo elgg_echo('usersettings:statistics'); ?> </h2>
diff --git a/views/default/usersettings/main_opt/user.php b/views/default/usersettings/main_opt/user.php
index d3298cd2e..92b09cae0 100644
--- a/views/default/usersettings/main_opt/user.php
+++ b/views/default/usersettings/main_opt/user.php
@@ -1,12 +1,12 @@
 <?php
-	/**
-	 * Elgg user sub-component on the main menu.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg user sub-component on the main menu.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 ?>
 <div class="admin-menu-option">
 	<h2><?php echo elgg_echo('usersettings:user'); ?> </h2>
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index af4f4bb36..95a856850 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -1,31 +1,27 @@
 <?php
-	/**
-	 * Elgg plugin specific user settings.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd 
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg plugin specific user settings.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	// Description of what's going on
-		echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>";
+// Description of what's going on
+echo "<div class=\"contentWrapper\">" . elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description"))) . "</div>";
 
-		$limit = get_input('limit', 10);
-		$offset = get_input('offset', 0);
-		
-	// Get the installed plugins
-		$installed_plugins = $vars['installed_plugins'];
-		$count = count($installed_plugins);
-		
-	// Display list of plugins
-		$n = 0;
-		foreach ($installed_plugins as $plugin => $data)
-		{
-			if (is_plugin_enabled($plugin))
-				echo elgg_view("usersettings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data));
-			
-		}
-		
-	
-?>
\ No newline at end of file
+$limit = get_input('limit', 10);
+$offset = get_input('offset', 0);
+
+// Get the installed plugins
+$installed_plugins = $vars['installed_plugins'];
+$count = count($installed_plugins);
+
+// Display list of plugins
+$n = 0;
+foreach ($installed_plugins as $plugin => $data) {
+	if (is_plugin_enabled($plugin)) {
+		echo elgg_view("usersettings/plugins_opt/plugin", array('plugin' => $plugin, 'details' => $data));
+	}
+}
\ No newline at end of file
diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php
index a7935f2ee..c27212887 100644
--- a/views/default/usersettings/plugins_opt/plugin.php
+++ b/views/default/usersettings/plugins_opt/plugin.php
@@ -1,33 +1,36 @@
 <?php
-	/**
-	 * Elgg plugin manifest class
-	 * 
-	 * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin
-	 * settings.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg plugin manifest class
+ *
+ * This file renders a plugin for the admin screen, including active/deactive, manifest details & display plugin
+ * settings.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
 
-	$plugin = $vars['plugin'];
-	$details = $vars['details'];
-	
-	$active = $details['active'];
-	$manifest = $details['manifest'];
-	
-	$user_guid = $details['user_guid'];
-	if ($user_guid) $user_guid = $_SESSION['user']->guid;
-	
-	if (elgg_view("usersettings/{$plugin}/edit")) { 
+$plugin = $vars['plugin'];
+$details = $vars['details'];
+
+$active = $details['active'];
+$manifest = $details['manifest'];
+
+$user_guid = $details['user_guid'];
+if ($user_guid) {
+	$user_guid = $_SESSION['user']->guid;
+}
+
+if (elgg_view("usersettings/{$plugin}/edit")) {
 ?>
 <div class="contentWrapper">
 	<h3 class="settings"><?php echo elgg_echo($plugin); ?></h3>
-	
+
 	<div id="<?php echo $plugin; ?>_settings">
 		<?php echo elgg_view("object/plugin", array('plugin' => $plugin, 'entity' => find_plugin_usersettings($plugin, $user_guid), 'prefix' => 'user')) ?>
 	</div>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php
+}
\ No newline at end of file
diff --git a/views/default/usersettings/statistics.php b/views/default/usersettings/statistics.php
index f01ac524d..728abf37c 100644
--- a/views/default/usersettings/statistics.php
+++ b/views/default/usersettings/statistics.php
@@ -1,11 +1,11 @@
 <?php
-	/**
-	 * Elgg settings specific user settings.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd 
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg settings specific user settings.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
 ?>
\ No newline at end of file
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
index ffc6b3280..cf1d8598b 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -1,53 +1,49 @@
 <?php
-	/**
-	 * Elgg statistics screen
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
+/**
+ * Elgg statistics screen
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 
-	 * @author Curverider Ltd
+// Get entity statistics
+$entity_stats = get_entity_statistics($_SESSION['user']->guid);
 
-	 * @link http://elgg.org/
-	 */
-
-	
-	// Get entity statistics
-	$entity_stats = get_entity_statistics($_SESSION['user']->guid);
-	
-	if ($entity_stats)
-	{
+if ($entity_stats) {
 ?>
 <div class="usersettings_statistics">
-    <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
-    <table>
-        <?php
-            foreach ($entity_stats as $k => $entry)
-            {
-                foreach ($entry as $a => $b)
-                {
-                    
-                    //This function controls the alternating class
-                	$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+	<h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
+	<table>
+		<?php
+			foreach ($entity_stats as $k => $entry) {
+				foreach ($entry as $a => $b) {
+
+					//This function controls the alternating class
+					$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 
-                    if ($a == "__base__") {
-                        $a = elgg_echo("item:{$k}");
-                        if (empty($a))
-                        	$a = $k;
-                	} else {
-                    		$a = elgg_echo("item:{$k}:{$a}");
-                    		if (empty($a)) {
-								$a = "$k $a";
-                    		}
-                    	 }
-                    echo <<< END
-                        <tr class="{$even_odd}">
-                            <td class="column_one"><b>{$a}:</b></td>
-                            <td>{$b}</td>
-                        </tr>
+					if ($a == "__base__") {
+						$a = elgg_echo("item:{$k}");
+						if (empty($a)) {
+							$a = $k;
+						}
+					} else {
+						$a = elgg_echo("item:{$k}:{$a}");
+						if (empty($a)) {
+							$a = "$k $a";
+						}
+					}
+					echo <<< END
+						<tr class="{$even_odd}">
+							<td class="column_one"><b>{$a}:</b></td>
+							<td>{$b}</td>
+						</tr>
 END;
-                }
-            }
-        ?>
-    </table>
+				}
+			}
+		?>
+	</table>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php
+}
\ No newline at end of file
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php
index f364e6cab..2ea9bef28 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/usersettings/statistics_opt/online.php
@@ -1,25 +1,26 @@
 <?php
-	/**
-	 * Elgg statistics screen showing online users.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @author Curverider Ltd
-	 * @link http://elgg.org/
-	 */
+/**
+ * Elgg statistics screen showing online users.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$user = $_SESSION['user'];
+
+$logged_in = 0;
+$log = get_system_log($_SESSION['user']->guid, "login", "", 'user', '', 1);
+
+if ($log) {
+	$logged_in=$log[0]->time_created;
+}
 
-	$user = $_SESSION['user'];
-	
-	$logged_in = 0;
-	$log = get_system_log($_SESSION['user']->guid, "login", "", 'user', '', 1);
-	
-	if ($log)
-		$logged_in=$log[0]->time_created;
-	
 ?>
 <div class="usersettings_statistics">
 	<h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
-	
+
 	<table>
 		<tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
 		<tr class="even"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
diff --git a/views/default/usersettings/user.php b/views/default/usersettings/user.php
index 15c5adc7f..e48ee6ecc 100644
--- a/views/default/usersettings/user.php
+++ b/views/default/usersettings/user.php
@@ -1,3 +1,8 @@
 <?php
-
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
 ?>
\ No newline at end of file
-- 
cgit v1.2.3