Просмотр исходного кода

Possibilité de marquer un article lu / favori même si une autre action de ce type est en attente (http) + ajustement css

Marien Fressinaud 12 лет назад
Родитель
Сommit
4bda1d75ae
2 измененных файлов с 13 добавлено и 17 удалено
  1. 2 15
      app/views/javascript/main.phtml
  2. 11 2
      public/theme/freshrss.css

+ 2 - 15
app/views/javascript/main.phtml

@@ -42,19 +42,14 @@ function toggleContent (new_active, old_active) {
 	<?php } ?>
 }
 
-var load = false;
 function mark_read (active, only_not_read) {
 	if (active[0] === undefined || (
-	    only_not_read === true && !active.hasClass("not_read")) ||
-	    load === true) {
+	    only_not_read === true && !active.hasClass("not_read"))) {
 		return false;
 	}
 
-	load = true;
-
 	url =  active.find ("a.read").attr ("href");
 	if (url === undefined) {
-		load = false;
 		return false;
 	}
 
@@ -71,22 +66,16 @@ function mark_read (active, only_not_read) {
 		} else {
 			active.addClass ("not_read");
 		}
-
-		load = false;
 	});
 }
 
 function mark_favorite (active) {
-	if (active[0] === undefined ||
-	    load === true) {
+	if (active[0] === undefined) {
 		return false;
 	}
 
-	load = true;
-
 	url =  active.find ("a.bookmark").attr ("href");
 	if (url === undefined) {
-		load = false;
 		return false;
 	}
 
@@ -103,8 +92,6 @@ function mark_favorite (active) {
 		} else {
 			active.addClass ("favorite");
 		}
-
-		load = false;
 	});
 }
 

+ 11 - 2
public/theme/freshrss.css

@@ -77,6 +77,7 @@
 	}
 
 .favicon {
+	height: 16px;
 	width: 16px;
 }
 
@@ -243,9 +244,12 @@
 			text-overflow: ellipsis;
 			line-height: 40px;
 		}
+			.flux_header .item.website .favicon {
+				padding: 12px;
+			}
 			.flux_header .item.website a {
 				display: block;
-				padding: 0 5px;
+				padding: 0;
 				height: 40px;
 			}
 		.flux_header .item.title {
@@ -473,9 +477,14 @@
 		display: none;
 	}
 	.flux_header .item.website {
-		width: 30px;
+		width: 40px;
 		text-align: center;
 	}
+
+	.content {
+		font-size: 120%;
+	}
+
 	.pagination .pager-previous, .pagination .pager-next {
 		width: 100px;
 	}