Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 13 insertions, 14 deletions

diff --git a/mod/logrotate/views/default/settings/logrotate/edit.php b/mod/logrotate/views/default/plugins/logrotate/settings.php
index 64c7bf743..bef8b308d 100644
--- a/mod/logrotate/views/default/settings/logrotate/edit.php
+++ b/mod/logrotate/views/default/plugins/logrotate/settings.php
@@ -6,19 +6,19 @@
  */
 
 $period = $vars['entity']->period;
-$time = $vars['entity']->time;
+$delete = $vars['entity']->delete;
 if (!$period) {
 	$period = 'monthly';
 }
 
-if (!$time) {
-	$time = 'monthly';
+if (!$delete) {
+	$delete = 'monthly';
 }		
 ?>
 <div>
-	<?php echo elgg_echo('logrotate:period'); ?>
-	
 	<?php
+
+		echo elgg_echo('logrotate:period') . ' ';
 		echo elgg_view('input/dropdown', array(
 			'name' => 'params[period]',
 			'options_values' => array(
@@ -26,23 +26,22 @@ if (!$time) {
 				'monthly' => elgg_echo('logrotate:monthly'),
 				'yearly' => elgg_echo('logrotate:yearly'),
 			),
-			'value' => $period
+			'value' => $period,
 		));
 	?>
-
-	<?php echo elgg_echo('</div><div>'); ?>
-
-	<?php echo elgg_echo('logrotate:date'); ?>
-	
+</div>
+<div>
 	<?php
-		echo elgg_view('input/pulldown', array(
-			'name' => 'params[time]',
+
+		echo elgg_echo('logrotate:delete') . ' ';
+		echo elgg_view('input/dropdown', array(
+			'name' => 'params[delete]',
 			'options_values' => array(
 				'weekly' => elgg_echo('logrotate:week'),
 				'monthly' => elgg_echo('logrotate:month'),
 				'yearly' => elgg_echo('logrotate:year'),
 			),
-			'value' => $time
+			'value' => $delete,
 		));
 	?>
 </div>