Revert "Reapply our changes to the actionable plugin"

This reverts commit d76d987.
AyudaEcuador · Apr 26, 2016 · 41341e4 · 41341e4
1 parent b5a7405
commit 41341e4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/plugins/actionable/hooks/actionable.php b/plugins/actionable/hooks/actionable.php
@@ -15,7 +15,14 @@
 class actionable {
 
 	private $media_filter;
-	private $media_values;
+
+	private static $media_values = array(
+		101 => 'All',
+		102 => 'Actionable',
+		103 => 'Urgent',
+		104 => 'Action taken',
+		105 => 'Closed'
+	);
 
 	/**
 	 * Registers the main event add method
@@ -27,13 +34,7 @@ public function __construct()
 		$this->action_taken = "";
 		$this->action_summary = "";
 		$this->action_closed = "";
-		$this->media_values = array(
-			101 => Kohana::lang('ui_main.all'),
-			102 => Kohana::lang('actionable.actionable'),
-			103 => Kohana::lang('actionable.urgent'),
-			104 => Kohana::lang('actionable.action_taken'),
-			105 => Kohana::lang('actionable.action_closed')
-		);
+
 		// Hook into routing
 		Event::add('system.pre_controller', array($this, 'add'));
 	}
@@ -259,7 +260,7 @@ public function _feed_rss()
 	public function _map_main_filters()
 	{
 		echo '</div><h3>'.Kohana::lang('actionable.actionable').'</h3><ul>';
-		foreach ($this->media_values as $k => $val) {
+		foreach (self::$media_values as $k => $val) {
 			echo "<li><a id=\"media_$k\" href=\"#\"><span>$val</span></a></li>";
 		}
 		echo '</ul><div>';
@@ -582,7 +583,7 @@ private function _check_media_type()
 					$this->media_filter = explode(',',$this->media_filter);
 				}
 				// Keep only the
-				$this->media_filter = array_intersect(array_keys($this->media_values), $this->media_filter);
+				$this->media_filter = array_intersect(array_keys(self::$media_values), $this->media_filter);
 			}
 		}
 
@@ -597,4 +598,4 @@ private function _check_media_type()
 
 }
 
-new actionable;
+new actionable;
diff --git a/plugins/actionable/i18n/es_AR/actionable.php b/plugins/actionable/i18n/es_AR/actionable.php
@@ -8,7 +8,6 @@
 		'action_summary_description' => 'Ha sido tomada alguna acción? Resumir la acción tomada o requerida',
 		'summary' => 'Resumen',
 		'action_needed' => 'Acción necesaria',
-		'action_urgent' => 'Es necesario actuar urgentemente',
-		'action_closed' => 'Cerrado'
+		'action_urgent' => 'Es necesario actuar urgentemente'
 	);
 ?>
diff --git a/plugins/actionable/views/admin/actionable.php b/plugins/actionable/views/admin/actionable.php
@@ -216,7 +216,9 @@
 												<li class="none-separator"><?php echo Kohana::lang('ui_main.location');?>: 
 													<strong><?php echo $incident->location_name; ?></strong>, <strong><?php echo $country_name; ?></strong>
 												</li>
-												<li><?php echo Kohana::lang('ui_main.submitted_by', array($submit_by, $submit_mode));?></li>
+												<li><?php echo Kohana::lang('ui_main.submitted_by');?> 
+													<strong><?php echo $submit_by; ?></strong> via <strong><?php echo $submit_mode; ?></strong>
+												</li>
 											</ul>
 											<ul class="links">
 												<li class="none-separator"><?php echo Kohana::lang('ui_main.categories');?>: