From e036de6ceab5f57b0f502b8400ab05e32e96562b Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 12 Feb 2011 16:40:05 +0000
Subject: updated the plugins that have already been updated to 1.8 html/css to
 use divs rather than p tags in forms

git-svn-id: http://code.elgg.org/elgg/trunk@8163 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../forms/notificationsettings/groupsave.php       | 43 ++++++++++------------
 .../default/forms/notificationsettings/save.php    |  3 ++
 .../notifications/subscriptions/collections.php    |  2 +-
 .../notifications/subscriptions/personal.php       |  2 +-
 4 files changed, 24 insertions(+), 26 deletions(-)

(limited to 'mod/notifications')

diff --git a/mod/notifications/views/default/forms/notificationsettings/groupsave.php b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
index 632e34a54..a38fe48d0 100644
--- a/mod/notifications/views/default/forms/notificationsettings/groupsave.php
+++ b/mod/notifications/views/default/forms/notificationsettings/groupsave.php
@@ -6,7 +6,7 @@
  */
 
 global $NOTIFICATION_HANDLERS;
-foreach($NOTIFICATION_HANDLERS as $method => $foo) {
+foreach ($NOTIFICATION_HANDLERS as $method => $foo) {
 	$subsbig[$method] = elgg_get_entities_from_relationship(array('relationship' => 'notify' . $method, 'relationship_guid' => elgg_get_logged_in_user_guid(), 'types' => 'group', 'limit' => 99999));
 	$tmparray = array();
 	if ($subsbig[$method]) {
@@ -24,22 +24,19 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 	<?php
 		echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
 	?>
-	
-	<p>
+		<div>
 		<?php
-
 			echo elgg_echo('notifications:subscriptions:groups:description');
-		
 		?>
-	</p>
+		</div>
 <?php
 
 if (isset($vars['groups']) && !empty($vars['groups'])) {
 
 ?>
-	<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
-		<tr>
-			<td>&nbsp;</td>
+		<table id="notificationstable" cellspacing="0" cellpadding="4" width="100%">
+			<tr>
+				<td>&nbsp;</td>
 <?php
 
 	$i = 0; 
@@ -48,13 +45,13 @@ if (isset($vars['groups']) && !empty($vars['groups'])) {
 			echo "<td class='spacercolumn'>&nbsp;</td>";
 		}
 ?>
-			<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
+				<td class="<?php echo $method; ?>togglefield"><?php echo elgg_echo('notification:method:'.$method); ?></td>
 <?php
 		$i++;
 	}
 ?>
-			<td>&nbsp;</td>
-		</tr>
+				<td>&nbsp;</td>
+			</tr>
 <?php
 	foreach($vars['groups'] as $group) {
 		
@@ -79,24 +76,22 @@ END;
 		}
 	
 ?>
-		<tr>
-			<td class="namefield">
-				<p>
+			<tr>
+				<td class="namefield">
+					<div>
 					<?php echo $group->name; ?>
-				</p>
-			</td>
-<?php
-		echo $fields;
-?>
-			<td>&nbsp;</td>
-		</tr>
+					</div>
+				</td>
+				<?php echo $fields; ?>
+				<td>&nbsp;</td>
+			</tr>
 <?php
 	}
 ?>
-	</table>
+		</table>
 <?php
 }
 ?>
-	<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
+		<input type="submit" value="<?php echo elgg_echo('save'); ?>" />
 	</div>
 </div>
diff --git a/mod/notifications/views/default/forms/notificationsettings/save.php b/mod/notifications/views/default/forms/notificationsettings/save.php
index ec0c9c701..0306080b8 100644
--- a/mod/notifications/views/default/forms/notificationsettings/save.php
+++ b/mod/notifications/views/default/forms/notificationsettings/save.php
@@ -1,4 +1,7 @@
 <?php
+/**
+ * Personal notifications form body
+ */
 
 echo elgg_view('notifications/subscriptions/personal');
 echo elgg_view('notifications/subscriptions/collections');
diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index 8daae6f4f..28d9fb5b8 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -22,7 +22,7 @@
 <p class="margin-none">
 	<?php echo elgg_echo('notifications:subscriptions:friends:description'); ?>
 </p>
-<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
+<table id="notificationstable" cellspacing="0" cellpadding="4" width="100%">
 	<tr>
 		<td>&nbsp;</td>
 <?php
diff --git a/mod/notifications/views/default/notifications/subscriptions/personal.php b/mod/notifications/views/default/notifications/subscriptions/personal.php
index e75bda758..7dac908fc 100644
--- a/mod/notifications/views/default/notifications/subscriptions/personal.php
+++ b/mod/notifications/views/default/notifications/subscriptions/personal.php
@@ -11,7 +11,7 @@ global $NOTIFICATION_HANDLERS;
 		</h3>
 	</div>
 </div>
-<table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
+<table id="notificationstable" cellspacing="0" cellpadding="4" width="100%">
 	<tr>
 		<td>&nbsp;</td>
 <?php
-- 
cgit v1.2.3