From 2af513f0ad0e6b692e95bf9f0ec1ba9dc4501ed0 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 27 Apr 2011 19:47:24 +0000
Subject: Fixes #3253. Merged in Shashank's patch.

git-svn-id: http://code.elgg.org/elgg/trunk@9033 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 .../views/default/settings/logrotate/edit.php      | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'mod/logrotate/views')

diff --git a/mod/logrotate/views/default/settings/logrotate/edit.php b/mod/logrotate/views/default/settings/logrotate/edit.php
index c73bec52c..206051780 100644
--- a/mod/logrotate/views/default/settings/logrotate/edit.php
+++ b/mod/logrotate/views/default/settings/logrotate/edit.php
@@ -6,10 +6,14 @@
  */
 
 $period = $vars['entity']->period;
+$time = $vars['entity']->time;
 if (!$period) {
 	$period = 'monthly';
 }
-		
+
+if (!$time) {
+	$time = 'monthly';
+}		
 ?>
 <p>
 	<?php echo elgg_echo('logrotate:period'); ?>
@@ -25,4 +29,20 @@ if (!$period) {
 			'value' => $period
 		));
 	?>
+
+	<?php echo elgg_echo('<br>'); ?>
+
+	<?php echo elgg_echo('logrotate:date'); ?>
+	
+	<?php
+		echo elgg_view('input/pulldown', array(
+			'internalname' => 'params[time]',
+			'options_values' => array(
+				'weekly' => elgg_echo('logrotate:week'),
+				'monthly' => elgg_echo('logrotate:month'),
+				'yearly' => elgg_echo('logrotate:year'),
+			),
+			'value' => $time
+		));
+	?>
 </p>
-- 
cgit v1.2.3


From 27c507aa645114acd38e3b05e31ffd2c27e242e8 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 11 Jun 2011 13:24:47 +0000
Subject: Refs #2032 changed <p> to <div> for plugin settings

git-svn-id: http://code.elgg.org/elgg/trunk@9168 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/categories/views/default/settings/categories/edit.php        | 9 +++++----
 .../views/default/settings/garbagecollector/edit.php             | 6 +++---
 mod/logrotate/views/default/settings/logrotate/edit.php          | 6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'mod/logrotate/views')

diff --git a/mod/categories/views/default/settings/categories/edit.php b/mod/categories/views/default/settings/categories/edit.php
index 583292e72..3802da95a 100644
--- a/mod/categories/views/default/settings/categories/edit.php
+++ b/mod/categories/views/default/settings/categories/edit.php
@@ -14,8 +14,9 @@ if (empty($categories)) {
 }
 
 ?>
-<p>
-	<?php echo elgg_echo('categories:explanation'); ?>
-</p>
+<div>
+	<p><?php echo elgg_echo('categories:explanation'); ?></p>
 <?php
-echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+	echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+?>
+</div>
\ No newline at end of file
diff --git a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php b/mod/garbagecollector/views/default/settings/garbagecollector/edit.php
index a0f9677a0..3ade780f9 100644
--- a/mod/garbagecollector/views/default/settings/garbagecollector/edit.php
+++ b/mod/garbagecollector/views/default/settings/garbagecollector/edit.php
@@ -9,9 +9,9 @@ $period = $vars['entity']->period;
 if (!$period) {
 	$period = 'monthly';
 }
-		
+
 ?>
-<p>
+<div>
 	<?php echo elgg_echo('garbagecollector:period'); ?>
 	
 	<?php
@@ -25,4 +25,4 @@ if (!$period) {
 			'value' => $period
 		));
 	?>
-</p>
+</div>
diff --git a/mod/logrotate/views/default/settings/logrotate/edit.php b/mod/logrotate/views/default/settings/logrotate/edit.php
index 206051780..32d59faa5 100644
--- a/mod/logrotate/views/default/settings/logrotate/edit.php
+++ b/mod/logrotate/views/default/settings/logrotate/edit.php
@@ -15,7 +15,7 @@ if (!$time) {
 	$time = 'monthly';
 }		
 ?>
-<p>
+<div>
 	<?php echo elgg_echo('logrotate:period'); ?>
 	
 	<?php
@@ -30,7 +30,7 @@ if (!$time) {
 		));
 	?>
 
-	<?php echo elgg_echo('<br>'); ?>
+	<?php echo elgg_echo('</div><div>'); ?>
 
 	<?php echo elgg_echo('logrotate:date'); ?>
 	
@@ -45,4 +45,4 @@ if (!$time) {
 			'value' => $time
 		));
 	?>
-</p>
+</div>
-- 
cgit v1.2.3