Ajout d'une page à propos + modifs designs

5 files changed, 75 insertions, 40 deletions

diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php
index b6a7de281..434a593e1 100755
--- a/app/controllers/indexController.php
+++ b/app/controllers/indexController.php
@@ -88,6 +88,10 @@ class indexController extends ActionController {
 		}
 	}
 
+	public function aboutAction () {
+		View::prependTitle ('À propos - ');
+	}
+
 	public function changeModeAction () {
 		$mode = Request::param ('mode');
 
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index 43728bc6c..2faa7b464 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -8,7 +8,9 @@
 			<a class="btn category<?php echo !$this->get ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index'); ?>">
 				<i class="icon all"></i>
 				Tous (<?php echo $this->nb_total; ?>)
+				<?php if ($this->nb_not_read > 0) { ?>
 				<span class="notRead"><?php echo $this->nb_not_read; ?> non lu<?php echo $this->nb_not_read > 1 ? 's' : ''; ?></span>
+				<?php } ?>
 			</a>
 		</li>
 
@@ -25,7 +27,9 @@
 		<li>
 			<a class="btn category<?php echo $this->get == $cat->id () ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'c_' . $cat->id ()); ?>">
 				<?php echo $cat->name (); ?>
+				<?php if ($catNotRead > 0) { ?>
 				<span class="notRead"><?php echo $catNotRead ?> non lu<?php echo $catNotRead > 1 ? 's' : ''; ?></span>
+				<?php } ?>
 			</a>
 
 			<?php if (!empty ($feeds)) { ?>
diff --git a/app/layout/header.phtml b/app/layout/header.phtml
index 811c2b4f1..1cc11c3f9 100644
--- a/app/layout/header.phtml
+++ b/app/layout/header.phtml
@@ -31,6 +31,7 @@
 			<a class="btn dropdown-toggle" href="#dropdown-configure"><i class="icon configure"></i></a>
 			<ul class="dropdown-menu">
 				<li class="dropdown-close"><a href="#close"><i class="icon close"></i></a></li>
+				<li class="dropdown-header">Configuration</li>
 				<li class="item"><a href="<?php echo _url ('configure', 'display'); ?>">Général et affichage</a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'categorize'); ?>">Catégories</a></li>
 				<li class="item"><a href="<?php echo _url ('configure', 'shortcut'); ?>">Raccourcis</a></li>
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
new file mode 100644
index 000000000..ab19fe18a
--- /dev/null
+++ b/app/views/index/about.phtml
@@ -0,0 +1,16 @@
+<div class="post content">
+	<h1>À propos de FreshRSS</h1>
+
+	<dl class="infos">
+		<dt>Url du projet</dt>
+		<dd><a href="https://github.com/marienfressinaud/FreshRSS">https://github.com/marienfressinaud/FreshRSS</a></dd>
+
+		<dt>Développeur principal</dt>
+		<dd><a href="mailto:contact@marienfressinaud.fr">Marien Fressinaud</a> - <a href="http://marienfressinaud.fr">site Internet</a></dd>
+
+		<dt>Pour les rapports de bugs</dt>
+		<dd><a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par mail</a></dd>
+	</dl>
+
+	<p>FreshRSS est un agrégateur de flux RSS à auto-héberger à l'image de <a href="http://rsslounge.aditu.de/">RSSLounge</a>, <a href="http://tt-rss.org/redmine/projects/tt-rss/wiki">TinyTinyRSS</a> ou <a href="http://projet.idleman.fr/leed/">Leed</a>. Il se veut léger et facile à prendre en main tout en étant un outil puissant et paramétrable. L'objectif étant d'offrir une alternative sérieuse au futur feu-Google Reader.</p>
+</div>
diff --git a/public/theme/base.css b/public/theme/base.css
index 01493d28c..2fdd591b9 100644
--- a/public/theme/base.css
+++ b/public/theme/base.css
@@ -18,10 +18,13 @@ a {
 	}
 
 /* LISTES */
-ul, ol {
+ul, ol, dl {
 	margin: 10px 0 10px 30px;
 	line-height: 190%;
 }
+	dd {
+		margin: 0 0 10px 30px;
+	}
 
 /* TITRES */
 h1, h2, h3 {
@@ -275,12 +278,18 @@ input {
 		text-align: left;
 		box-shadow: 3px 3px 3px #ddd;
 	}
+		.dropdown .dropdown-menu .dropdown-header {
+			display: block;
+			padding: 0 5px;
+			color: #888;
+			font-weight: bold;
+		}
 		.dropdown .dropdown-menu .item {
 			display: block;
 			height: 30px;
-			font-size: 14px;
+			padding: 0 25px;
+			font-size: 90%;
 			line-height: 30px;
-			padding: 0 10px;
 		}
 			.dropdown .dropdown-menu .item a {
 				display: block;
@@ -521,43 +530,6 @@ input {
 	.flux:hover {
 		background: #fff;
 	}
-	.flux .content {
-		max-width: 550px;
-		margin: 0 auto;
-		padding: 10px;
-		line-height: 170%;
-	}
-		.flux .content h1, .flux .content h2, .flux .content h3 {
-			margin: 20px 0 5px;
-		}
-		.flux .content p {
-			margin: 10px 0;
-		}
-		.flux .content img.big {
-			display: block;
-			margin: 10px 0;
-			width: 100%;
-			box-shadow: 0 0 5px #000;
-			border-radius: 5px;
-		}
-		.flux .content pre {
-			width: 90%;
-			margin: 10px auto;
-			padding: 10px;
-			overflow: auto;
-			background: #666;
-			border: 1px solid #000;
-			color: #fafafa;
-			border-radius: 5px;
-		}
-		.flux .content q, .flux .content blockquote {
-			display: block;
-			margin: 0;
-			padding: 10px 20px;
-			font-style: italic;
-			border-left: 4px solid #ccc;
-			color: #666;
-		}
 	.flux.active {
 		border-left: 10px solid #0062BE;
 		background: #fff;
@@ -658,6 +630,44 @@ input {
 						text-decoration: none;
 					}
 
+.content {
+	max-width: 550px;
+	margin: 0 auto;
+	padding: 10px;
+	line-height: 170%;
+}
+	.content h1, .content h2, .content h3 {
+		margin: 20px 0 5px;
+	}
+	.content p {
+		margin: 0 0 20px;
+	}
+	.content img.big {
+		display: block;
+		margin: 10px 0;
+		width: 100%;
+		box-shadow: 0 0 5px #000;
+		border-radius: 5px;
+	}
+	.content pre {
+		width: 90%;
+		margin: 10px auto;
+		padding: 10px;
+		overflow: auto;
+		background: #666;
+		border: 1px solid #000;
+		color: #fafafa;
+		border-radius: 5px;
+	}
+	.content q, .content blockquote {
+		display: block;
+		margin: 0;
+		padding: 10px 20px;
+		font-style: italic;
+		border-left: 4px solid #ccc;
+		color: #666;
+	}
+
 /*** PAGINATION ***/
 .pagination {
 	display: table;