loose text strings cleaned up, extra container divs added

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

6 files changed, 11 insertions, 7 deletions

diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 4bec70b04..2841c9dfe 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -10,6 +10,7 @@
 	 */

 

 ?>

+<div class="contentWrapper">

 <form action="<?php echo $vars['url']; ?>action/groups/edit" enctype="multipart/form-data" method="post">

 

 	<p>

@@ -131,4 +132,5 @@
 			}

 		?>

 	</form>

+</div>

 </div>
\ No newline at end of file
diff --git a/mod/guidtool/views/default/forms/guidtool/format.php b/mod/guidtool/views/default/forms/guidtool/format.php
index 628bdc14e..2d3cfa976 100644
--- a/mod/guidtool/views/default/forms/guidtool/format.php
+++ b/mod/guidtool/views/default/forms/guidtool/format.php
@@ -23,7 +23,7 @@
 	
 ?>
 
-<div id="formatpicker">
+<div class="contentWrapper">
 	<form method="get">
 		<select name="format">
 		<?php
diff --git a/mod/guidtool/views/default/forms/guidtool/import.php b/mod/guidtool/views/default/forms/guidtool/import.php
index 939e839ba..717abe8d6 100644
--- a/mod/guidtool/views/default/forms/guidtool/import.php
+++ b/mod/guidtool/views/default/forms/guidtool/import.php
@@ -15,12 +15,12 @@
 	if (!$format) $format = 'opendd';
 	
 	
-	$formbody = "<p>" . sprintf(elgg_echo('guidtool:import:desc'), $format) . "</p>" .
+	$formbody = "<div class=\"contentWrapper\"><p>" . sprintf(elgg_echo('guidtool:import:desc'), $format) . "</p>" .
 	elgg_view('input/longtext', array('internalname' => 'data')) . elgg_view('input/submit', array('value' => elgg_echo("save")));
 ?>
 <div>
 <?php
 	echo elgg_view('input/form', array('body' => $formbody, 'action' => "{$CONFIG->url}action/import/$format"))
 ?>
-
+</div>
 </div>
\ No newline at end of file
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 079d0f672..767812759 100644
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -14,6 +14,6 @@
 	$form_body .= "<p><b>". elgg_echo('username') . "</b> " . elgg_view('input/text', array('internalname' => 'username')) . "</p>";
 	$form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "</p>";
 ?>
-<div id="forgotten_box">
+<div class="contentWrapper">
 	<?php echo elgg_view('input/form', array('action' => "{$vars['url']}actions/user/requestnewpassword", 'body' => $form_body)); ?>
 </div>
\ No newline at end of file
diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
index 5da1831e2..706d49967 100644
--- a/views/default/comments/forms/edit.php
+++ b/views/default/comments/forms/edit.php
@@ -14,9 +14,9 @@
 	 

 	 if (isset($vars['entity']) && isloggedin()) {

     	 

-		 $form_body = "<p><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>";

+		 $form_body = "<div class=\"contentWrapper\"><p><label>".elgg_echo("generic_comments:text")."<br />" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</label></p>";

 		 $form_body .= "<p>" . elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));

-		 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))) . "</p>";

+		 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("save"))) . "</p></div>";

 		 

 		 echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/comments/add"));

 

diff --git a/views/default/export/entity.php b/views/default/export/entity.php
index 851d04870..d35f0955f 100644
--- a/views/default/export/entity.php
+++ b/views/default/export/entity.php
@@ -20,6 +20,7 @@
 	
 	$exportable_values = $entity->getExportableValues();
 ?>
+<div class="contentWrapper">
 <div>
 	<?php
 		foreach ($entity as $k => $v)
@@ -86,4 +87,5 @@
 		}
 	?>
 </div>
-<?php } ?>
\ No newline at end of file
+<?php } ?>
+</div>
\ No newline at end of file