Updated Invite Friends mod to new ui.

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

4 files changed, 25 insertions, 40 deletions

diff --git a/mod/invitefriends/index.php b/mod/invitefriends/index.php
index 19471bbed..2a9aee790 100644
--- a/mod/invitefriends/index.php
+++ b/mod/invitefriends/index.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
 	 * Elgg invite page
 	 * 
@@ -18,7 +17,7 @@
 	set_page_owner($_SESSION['guid']);
 	
 	$body = elgg_view('invitefriends/form');
-	$body = elgg_view_layout('two_column_left_sidebar','',$body);
+	$body = elgg_view_layout('one_column_with_sidebar', $body);
 
 	page_draw(elgg_echo('friends:invite'),$body);
 	
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index 1228edd58..4e17a5d27 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -2,7 +2,7 @@
 <plugin_manifest>
         <field key="author" value="Curverider" />
         <field key="version" value="1.7" />
-        <field key="description" value="Friend invite page" />
+        <field key="description" value="Invite friends to Elgg network via email invites." />
         <field key="website" value="http://www.elgg.org/" />
         <field key="copyright" value="(C) Curverider 2008-2010" />
         <field key="licence" value="GNU Public License version 2" />
diff --git a/mod/invitefriends/start.php b/mod/invitefriends/start.php
index b7cd9868d..f2b532253 100644
--- a/mod/invitefriends/start.php
+++ b/mod/invitefriends/start.php
@@ -1,31 +1,25 @@
 <?php
+/**
+ * Elgg invite page
+ * 
+ * @package ElggFile
+ * @author Curverider Ltd
+ * @copyright Curverider Ltd 2008-2010
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @link http://elgg.org/
+ */
 
-	/**
-	 * Elgg invite page
-	 * 
-	 * @package ElggFile
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2010
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @link http://elgg.org/
-	 */
-
-	function invitefriends_pagesetup() {
-		
-		// Menu options
-			global $CONFIG;
-			if (get_context() == "friends" || 
-				get_context() == "friendsof" || 
-				get_context() == "collections") {
-					
-					add_submenu_item(elgg_echo('friends:invite'),$CONFIG->wwwroot."mod/invitefriends/",'invite');
-					
-				}
+function invitefriends_pagesetup() {
 		
+	// Menu options
+	global $CONFIG;
+	if (get_context() == "friends" || 
+		get_context() == "friendsof") {
+			add_submenu_item(elgg_echo('friends:invite'),$CONFIG->wwwroot."mod/invitefriends/",'invite');
+		}
 	}
 
 	global $CONFIG;
 	register_action('invitefriends/invite', false, $CONFIG->pluginspath . 'invitefriends/actions/invite.php');
 	register_elgg_event_handler('pagesetup','system','invitefriends_pagesetup',1000);
-
 ?>
\ No newline at end of file
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index 1e0d8e124..875287821 100644
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -10,24 +10,16 @@
 	 * @link http://elgg.org/
 	 */
 
-?>
 
-<div class="contentWrapper notitle">
-<p><label>
+echo "<h2>".elgg_echo('friends:invite')."</h2>";
+?>
+<p class="margin_top">
+<label>
 	<?php echo elgg_echo('invitefriends:introduction'); ?>
-</label>
-<textarea class="input_textarea" name="emails" ></textarea></p>
+<textarea class="input_textarea" name="emails" ></textarea></label></p>
 <p><label>
 	<?php echo elgg_echo('invitefriends:message'); ?>
-</label>
 <textarea class="input_textarea" name="emailmessage" ><?php
-
 	echo sprintf(elgg_echo('invitefriends:message:default'),$CONFIG->site->name);
-
-?></textarea></p>
-<?php
-
-	echo elgg_view('input/submit', array('value' => elgg_echo('send')));
-
-?>
-</div>
\ No newline at end of file
+?></textarea></label></p>
+<?php echo elgg_view('input/submit', array('value' => elgg_echo('send'))); ?>