Kaynağa Gözat

Correction bugs + amélioration design

Marien Fressinaud 13 yıl önce
ebeveyn
işleme
4924f4c6d6

+ 1 - 1
app/controllers/entryController.php

@@ -32,7 +32,7 @@ class entryController extends ActionController {
 		if ($id == false) {
 			$entryDAO->updateEntries ($values);
 		} else {
-			$entryDAO->updateEntry ($entry->id (), $values);
+			$entryDAO->updateEntry ($id, $values);
 		}
 	}
 	

+ 1 - 1
app/views/configure/importExport.phtml

@@ -1,5 +1,5 @@
 <?php if ($this->req == 'export') { ?>
-<?xml version="1.0" encoding="UTF-8" ?>
+<?php echo '<?xml version="1.0" encoding="UTF-8" ?>'; // résout bug sur certain serveur ?>
 <!-- Generated by <?php echo Configuration::title (); ?> -->
 <opml version="2.0">
 	<head>

+ 5 - 1
lib/lib_rss.php

@@ -79,7 +79,7 @@ function opml_export ($cats) {
 		$txt .= '<outline text="' . $cat['name'] . '">' . "\n";
 		
 		foreach ($cat['feeds'] as $feed) {
-			$txt .= "\t" . '<outline text="' . $feed->name () . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" />' . "\n";
+			$txt .= "\t" . '<outline text="' . cleanText ($feed->name ()) . '" type="rss" xmlUrl="' . $feed->url () . '" htmlUrl="' . $feed->website () . '" />' . "\n";
 		}
 		
 		$txt .= '</outline>' . "\n";
@@ -88,6 +88,10 @@ function opml_export ($cats) {
 	return $txt;
 }
 
+function cleanText ($text) {
+	return preg_replace ('/&[\w]+;/', '', $text);
+}
+
 function opml_import ($xml) {
 	$opml = @simplexml_load_string ($xml);
 

+ 13 - 9
public/theme/base.css

@@ -122,7 +122,7 @@ form {
 				}
 					.aside li a:hover, .aside li span:hover {
 						text-decoration: none;
-						background: #fafafa;
+						background: #f0f0f0;
 					}
 					.aside li.disable span {
 						background: #fff;
@@ -184,7 +184,7 @@ form {
 				color: #0062BE;
 			}
 				.aside #flux_menu a:hover {
-					background: #fafafa;
+					background: #f0f0f0;
 				}
 	#main {
 		display: table-cell;
@@ -274,6 +274,12 @@ form {
 		.post.flux .content {
 			padding: 10px 20px;
 		}
+			.post.flux .content h1, .post.flux .content h2, .post.flux .content h3 {
+				margin: 20px 0;
+			}
+			.post.flux .content p {
+				margin: 20px 0;
+			}
 			.post.flux .content img {
 				border-radius: 5px;
 			}
@@ -287,15 +293,13 @@ form {
 				color: #fafafa;
 				border-radius: 5px;
 			}
-			.post.flux .content q {
+			.post.flux .content q, .post.flux .content blockquote {
 				display: block;
-				width: 90%;
-				margin: 10px auto;
-				padding: 10px;
+				margin: 10px 0;
+				padding: 0 20px;
 				font-style: italic;
-				border-left: 15px solid #ccc;
-				color: #669;
-				border-radius: 5px 0 0 5px;
+				border-left: 2px solid #ccc;
+				color: #666;
 			}
 		.post.flux.not_read {
 			border-left: 5px solid #FF5300;