diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2012-10-24 18:22:40 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2012-10-24 18:22:40 +0200 |
| commit | 4924f4c6d6d03d39471de363b8d368c8edad8f3d (patch) | |
| tree | f91684622068e2baddbd12b7f20a7d712e095676 | |
| parent | 2b3a08e3dd5bf936d6d76a5f5282933e3ca6aeea (diff) | |
Correction bugs + amélioration design
| -rwxr-xr-x | app/controllers/entryController.php | 2 | ||||
| -rw-r--r-- | app/views/configure/importExport.phtml | 2 | ||||
| -rw-r--r-- | lib/lib_rss.php | 6 | ||||
| -rw-r--r-- | public/theme/base.css | 22 |
4 files changed, 20 insertions, 12 deletions
diff --git a/app/controllers/entryController.php b/app/controllers/entryController.php index 753994a2b..f9275593f 100755 --- a/app/controllers/entryController.php +++ b/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); } } diff --git a/app/views/configure/importExport.phtml b/app/views/configure/importExport.phtml index add78d1e1..c8ee6b7f1 100644 --- a/app/views/configure/importExport.phtml +++ b/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> diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 7d01a4a0f..2a8921da0 100644 --- a/lib/lib_rss.php +++ b/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); diff --git a/public/theme/base.css b/public/theme/base.css index f15c51826..0e26a9166 100644 --- a/public/theme/base.css +++ b/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; |