Amélioration design navigation en liste + diverses ajouts design

9 files changed, 47 insertions, 54 deletions

diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 225026810..cc81479e9 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,17 +1,16 @@
-<div class="aside">
-	<ul>
-		<li><h2>Configuration</h2></li>
-		<li <?php echo Request::actionName () == 'display' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a>
-		</li>
-		<li <?php echo Request::actionName () == 'categorize' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a>
-		</li>
-		<li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a>
-		</li>
-		<li <?php echo Request::actionName () == 'importExport' ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport')); ?>">Import / Export OPML</a>
-		</li>
-	</ul>
+<div class="nav nav-list aside">
+	<li class="nav-header">Configuration</li>
+
+	<li <?php echo Request::actionName () == 'display' ? 'class="active"' : ''; ?>>
+		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'display')); ?>">Général et affichage</a>
+	</li>
+	<li <?php echo Request::actionName () == 'categorize' ? 'class="active"' : ''; ?>>
+		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'categorize')); ?>">Catégories</a>
+	</li>
+	<li <?php echo Request::actionName () == 'shortcut' ? 'class="active"' : ''; ?>>
+		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'shortcut')); ?>">Raccourcis</a>
+	</li>
+	<li <?php echo Request::actionName () == 'importExport' ? 'class="active"' : ''; ?>>
+		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport')); ?>">Import / Export OPML</a>
+	</li>
 </div>
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 98a82d6a7..a45c64e18 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -1,20 +1,18 @@
-<div class="aside">
-	<ul>
-		<li><h2>Vox flux RSS</h2></li>
-		<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
-		<li><form id="add_rss" method="post" action="<?php echo Url::display (array ('c' => 'feed', 'a' => 'add')); ?>">
-			<input type="url" name="url_rss" placeholder="Ajouter un flux RSS" />
-			<input type="submit" value="+" />
-		</form></li>
-		<?php } ?>
-		<?php if (!empty ($this->feeds)) { ?>
-		<?php foreach ($this->feeds as $feed) { ?>
-		<li <?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? 'class="active"' : ''; ?>>
-			<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $feed->id ()))); ?>"><?php echo $feed->name (); ?></a>
-		</li>
-		<?php } ?>
-		<?php } else { ?>
-		<li class="disable"><span>Aucun flux</span></li>
-		<?php } ?>
-	</ul>
-</div>
+<ul class="nav nav-list aside">
+	<li class="nav-header">Vos flux RSS</li>
+
+	<?php if (!empty ($this->feeds)) { ?>
+	<?php foreach ($this->feeds as $feed) { ?>
+	<li <?php echo ($this->flux && $this->flux->id () == $feed->id ()) ? 'class="active"' : ''; ?>>
+		<a href="<?php echo Url::display (array ('c' => 'configure', 'a' => 'feed', 'params' => array ('id' => $feed->id ()))); ?>"><?php echo $feed->name (); ?></a>
+	</li>
+	<?php } ?>
+	<?php } else { ?>
+	<li class="disable">Aucun flux</li>
+	<?php } ?>
+
+	<li><form id="add_rss" method="post" action="<?php echo Url::display (array ('c' => 'feed', 'a' => 'add')); ?>">
+		<input type="url" name="url_rss" placeholder="Ajouter un flux RSS" />
+		<input type="submit" value="+" />
+	</form></li>
+</ul>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index f1f14cfc0..916b03331 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,4 +1,4 @@
-<div class="aside">
+<div class="aside aside_flux">
 	<?php if (isset ($this->cat_aside)) { ?>
 	<ul class="categories">
 		<li><a class="btn btn-important" href="<?php echo _url ('configure', 'feed'); ?>">Gestion des abonnements</a></li>
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 3e6bbdc47..567859ea5 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -13,6 +13,6 @@
 		<label for="new_category">Ajouter une catégorie</label>
 		<input type="text" id="new_category" name="new_category" placeholder="Nouvelle catégorie" />
 	
-		<input type="submit" value="Valider" />
+		<button class="btn btn-important">Sauvegarder</button>
 	</form>
 </div>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 188499a61..5e27aa01a 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -42,6 +42,6 @@
 			<label for="radio_no">Non<noscript> - <strong>nécessite que javascript soit activé</strong></noscript></label>
 		</div>
 	
-		<input type="submit" value="Valider" />
+		<button class="btn btn-important">Valider</button>
 	</form>
 </div>
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 53b4d7939..3e49ece99 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -21,11 +21,11 @@
 		<?php } ?>
 	</div>
 	
-	<input type="submit" value="Valider" />
+	<button class="btn btn-important">Valider</button>
 	<?php } ?>
 	
-	<button formaction="<?php echo Url::display (array ('c' => 'feed', 'a' => 'delete', 'params' => array ('id' => $this->flux->id ()))); ?>">Supprimer</button>
+	<button class="btn" formaction="<?php echo Url::display (array ('c' => 'feed', 'a' => 'delete', 'params' => array ('id' => $this->flux->id ()))); ?>">Supprimer</button>
 </form>
 <?php } else { ?>
-<div class="nothing">Aucun flux sélectionné</div>
+<div class="alert"><span class="alert-head">Aucun flux sélectionné.</span> Pensez à en ajouter !</div>
 <?php } ?>
diff --git a/app/views/configure/importExport.phtml b/app/views/configure/importExport.phtml
index ff5f7ca5a..d7a84df78 100644
--- a/app/views/configure/importExport.phtml
+++ b/app/views/configure/importExport.phtml
@@ -16,12 +16,12 @@
 <div>
 	<form method="post" action="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'import'))); ?>" enctype="multipart/form-data">
 		<h1>Exporter au format OPML</h1>
-		<button formaction="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'export'))); ?>">Exporter</button>
+		<button class="btn btn-important" formaction="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'export'))); ?>">Exporter</button>
 	
 		<h1>Importer au format OPML</h1>
 		<label for="file">Fichier</label>
 		<input type="file" name="file" id="file" />
-		<input type="submit" value="Charger" />
+		<button class="btn btn-important">Importer</button>
 	</form>
 </div>
 <?php } ?>
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index 4058f6bca..dd29b5f99 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -40,6 +40,6 @@
 		<input type="text" id="prev_page" name="shortcuts[prev_page]" list="keys" value="<?php echo $s['prev_page']; ?>" />
 		<p>+ <code>shift</code> pour passer à la première page</p>
 	
-		<input type="submit" value="Valider" />
+		<button class="btn btn-important">Sauvegarder</button>
 	</form>
 </div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 22cc84828..995e6738a 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -52,14 +52,10 @@
 	<?php $this->entryPaginator->render ('pagination.phtml', 'page'); ?>
 </div>
 <?php } else { ?>
-<div class="table">
-	<div class="nothing">
-		<p>
-			Il n'y a aucun flux à afficher.
-		<?php if (Session::param ('mode', 'all') == 'not_read') { ?>
-		<a class="print_all" href="<?php echo Url::display (array ('a' => 'changeMode', 'params' => array ('mode' => 'all'))); ?>">Afficher tous les articles ?</a>
-		<?php }	?>
-		</p>
-	</div>
+<div class="alert">
+	<span class="alert-head">Il n'y a aucun flux à afficher.</span>
+	<?php if (Session::param ('mode', 'all') == 'not_read') { ?>
+	<a class="print_all" href="<?php echo Url::display (array ('a' => 'changeMode', 'params' => array ('mode' => 'all'))); ?>">Afficher tous les articles ?</a>
+	<?php }	?>
 </div>
 <?php } ?>