Finish up standardizing views/default/*

git-svn-id: http://code.elgg.org/elgg/trunk@3557 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 86 insertions, 101 deletions

diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/editwrapper.php
index 75e966028..8ed29dd59 100644
--- a/views/default/widgets/editwrapper.php
+++ b/views/default/widgets/editwrapper.php
@@ -1,37 +1,31 @@
 <?php
-
-	/**
-	 * Elgg edit widget layout
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
-
-	$guid = $vars['entity']->getGUID();
-
-	
-	$form_body = $vars['body'];
-	$form_body .= "<p><label>" . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $vars['entity']->access_id)) . "</label></p>";
-	$form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $guid)) . elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true')) . elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save'))) . "</p>";
-
-	echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => "{$vars['url']}action/widgets/save"))	
+/**
+ * Elgg edit widget layout
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$guid = $vars['entity']->getGUID();
+
+$form_body = $vars['body'];
+$form_body .= "<p><label>" . elgg_echo('access') . ": " . elgg_view('input/access', array('internalname' => 'params[access_id]','value' => $vars['entity']->access_id)) . "</label></p>";
+$form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $guid)) . elgg_view('input/hidden', array('internalname' => 'noforward', 'value' => 'true')) . elgg_view('input/submit', array('internalname' => "submit$guid", 'value' => elgg_echo('save'))) . "</p>";
+
+echo elgg_view('input/form', array('internalid' => "widgetform$guid", 'body' => $form_body, 'action' => "{$vars['url']}action/widgets/save"))
 ?>
-
-
 <script type="text/javascript">
 $(document).ready(function() {
 
 	$("#widgetform<?php echo $guid; ?>").submit(function () {
-	
+
 		$("#submit<?php echo $guid; ?>").attr("disabled","disabled");
 		$("#submit<?php echo $guid; ?>").attr("value","<?php echo elgg_echo("saving"); ?>");
 		$("#widgetcontent<?php echo $guid; ?>").html('<?php echo elgg_view('ajax/loader',array('slashes' => true)); ?>');
 		$("#widget<?php echo $guid; ?> .toggle_box_edit_panel").click();
-	
+
 		var variables = $("#widgetform<?php echo $guid; ?>").serialize();
 		$.post($("#widgetform<?php echo $guid; ?>").attr("action"),variables,function() {
 			$("#submit<?php echo $guid; ?>").attr("disabled","");
@@ -39,8 +33,8 @@ $(document).ready(function() {
 			$("#widgetcontent<?php echo $guid; ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo page_owner_entity()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
 		});
 		return false;
-	
+
 	});
 
-}); 
+});
 </script>
\ No newline at end of file
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index e7791bde9..eeb6d1cd1 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -1,35 +1,35 @@
 <?php
-
-	/**
-	 * Elgg widget wrapper
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-
-	 * @author Curverider Ltd
-
-	 * @link http://elgg.org/
-	 */
-
-	static $widgettypes;
-	
-	$callback = get_input('callback');
-	
-	if (!isset($widgettypes)) $widgettypes = get_widget_types();
-	
-	if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'widget') {
-		$handler = $vars['entity']->handler;
-		$title = $widgettypes[$vars['entity']->handler]->name;
-		if (!$title)
-			$title = $handler;
-	} else {
-		$handler = "error";
-		$title = elgg_echo("error"); 
+/**
+ * Elgg widget wrapper
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+static $widgettypes;
+
+$callback = get_input('callback');
+
+if (!isset($widgettypes)) {
+	$widgettypes = get_widget_types();
+}
+
+if ($vars['entity'] instanceof ElggObject && $vars['entity']->getSubtype() == 'widget') {
+	$handler = $vars['entity']->handler;
+	$title = $widgettypes[$vars['entity']->handler]->name;
+	if (!$title) {
+		$title = $handler;
 	}
-	
-	if ($callback != "true") {
-	
-?>
+} else {
+	$handler = "error";
+	$title = elgg_echo("error");
+}
+
+if ($callback != "true") {
+
+	?>
 
 	<div id="widget<?php echo $vars['entity']->getGUID(); ?>">
 	<div class="collapsable_box">
@@ -39,60 +39,53 @@
 	</div>
 	<?php
 
-		if ($vars['entity']->canEdit()) {
-	
-	?>
-	<div class="collapsable_box_editpanel"><?php 
-		
-		echo elgg_view('widgets/editwrapper', 
-						array(
-								'body' => elgg_view("widgets/{$handler}/edit",$vars),
-								'entity' => $vars['entity']
-							  )
-					   ); 
-		
-	?></div><!-- /collapsable_box_editpanel -->
-	<?php
+	if ($vars['entity']->canEdit()) {
+		?>
+		<div class="collapsable_box_editpanel"><?php
 
-		}
-	
-	?>
-	<div class="collapsable_box_content">
-		<?php 
+		echo elgg_view('widgets/editwrapper',
+		array(
+			'body' => elgg_view("widgets/{$handler}/edit",$vars),
+			'entity' => $vars['entity']
+			)
+		);
 
-		echo "<div id=\"widgetcontent{$vars['entity']->getGUID()}\">";
-		
-		
-	} else { // end if callback != "true"
+		?></div><!-- /collapsable_box_editpanel -->
+		<?php
+	}
 
-		if (elgg_view_exists("widgets/{$handler}/view"))
-			echo elgg_view("widgets/{$handler}/view",$vars);
-		else
-			echo elgg_echo('widgets:handlernotfound');
+	?>
+	<div class="collapsable_box_content">
+	<?php
 
-?>
+	echo "<div id=\"widgetcontent{$vars['entity']->getGUID()}\">";
+} else { // end if callback != "true"
+	if (elgg_view_exists("widgets/{$handler}/view")) {
+		echo elgg_view("widgets/{$handler}/view",$vars);
+	} else {
+		echo elgg_echo('widgets:handlernotfound');
+	}
 
-<script language="javascript">
- $(document).ready(function(){
-   	setup_avatar_menu();
- });
+	?>
 
-</script>
+	<script language="javascript">
+	$(document).ready(function(){
+		setup_avatar_menu();
+	});
 
+	</script>
+	<?php
+}
 
-<?php
-		
-	}
-		
-	if ($callback != "true") {
+if ($callback != "true") {
 		echo elgg_view('ajax/loader');
 		echo "</div>";
-		
+
 		?>
 	</div><!-- /.collapsable_box_content -->
-	</div><!-- /.collapsable_box -->	
+	</div><!-- /.collapsable_box -->
 	</div>
-	
+
 <script type="text/javascript">
 $(document).ready(function() {
 
@@ -105,9 +98,7 @@ $(document).ready(function() {
 
 });
 </script>
-	
-<?php
 
-	}
+<?php
 
-?>
\ No newline at end of file
+}
\ No newline at end of file