Bladeren bron

Update panel shows latest version message as success (#1701)

show latest version message as success, FIXES #1586
Kevin Papst 8 jaren geleden
bovenliggende
commit
8abfe1cf28
2 gewijzigde bestanden met toevoegingen van 17 en 3 verwijderingen
  1. 2 2
      app/Controllers/updateController.php
  2. 15 1
      app/views/update/index.phtml

+ 2 - 2
app/Controllers/updateController.php

@@ -102,7 +102,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 				$version = 'git';
 			} else {
 				$this->view->message = array(
-					'status' => 'bad',
+					'status' => 'latest',
 					'title' => _t('gen.short.damn'),
 					'body' => _t('feedback.update.none')
 				);
@@ -138,7 +138,7 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			$status = $res_array[0];
 			if (strpos($status, 'UPDATE') !== 0) {
 				$this->view->message = array(
-					'status' => 'bad',
+					'status' => 'latest',
 					'title' => _t('gen.short.damn'),
 					'body' => _t('feedback.update.none')
 				);

+ 15 - 1
app/views/update/index.phtml

@@ -14,7 +14,21 @@
 	</p>
 
 	<?php if (!empty($this->message)) { ?>
-	<p class="alert <?php echo $this->message['status'] === 'bad' ? 'alert-error' : 'alert-warn'; ?>">
+	<?php
+		$class = 'alert-warn';
+		switch ($this->message['status']) {
+		case 'bad':
+			$class = 'alert-error';
+			break;
+		case 'latest':
+			$class = 'alert-success';
+			break;
+		default:
+			$class = 'alert-warn';
+			break;
+		}
+	?>
+	<p class="alert <?php echo $class; ?>">
 		<span class="alert-head"><?php echo $this->message['title']; ?></span>
 		<?php echo $this->message['body']; ?>
 	</p>