Continuation du design : amélioration nav-list + ajout nav-head (avec gestion de la connexion) + début formulaires

2 files changed, 21 insertions, 14 deletions

diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 5e27aa01a..d90f48240 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -20,11 +20,14 @@
 	
 		<label>Vue par défaut</label>
 		<div class="radio_group">
-			<input type="radio" name="default_view" id="radio_all" value="all"<?php echo $this->conf->defaultView () == 'all' ? ' checked="checked"' : ''; ?> />
-			<label for="radio_all">Tout afficher</label>
-			<br />
-			<input type="radio" name="default_view" id="radio_not_read" value="not_read"<?php echo $this->conf->defaultView () == 'not_read' ? ' checked="checked"' : ''; ?> />
-			<label for="radio_not_read">Afficher les non lus</label>
+			<label for="radio_all">
+				<input type="radio" name="default_view" id="radio_all" value="all"<?php echo $this->conf->defaultView () == 'all' ? ' checked="checked"' : ''; ?> />
+				Tout afficher
+			</label>
+			<label for="radio_not_read">
+				<input type="radio" name="default_view" id="radio_not_read" value="not_read"<?php echo $this->conf->defaultView () == 'not_read' ? ' checked="checked"' : ''; ?> />
+				Afficher les non lus
+			</label>
 		</div>
 	
 		<label for="sort_order">Ordre de tri</label>
@@ -35,11 +38,14 @@
 	
 		<label>Afficher les articles dépliés par défaut</label>
 		<div class="radio_group">
-			<input type="radio" name="display_posts" id="radio_yes" value="yes"<?php echo $this->conf->displayPosts () == 'yes' ? ' checked="checked"' : ''; ?> />
-			<label for="radio_yes">Oui</label>
-			<br />
-			<input type="radio" name="display_posts" id="radio_no" value="no"<?php echo $this->conf->displayPosts () == 'no' ? ' checked="checked"' : ''; ?> />
-			<label for="radio_no">Non<noscript> - <strong>nécessite que javascript soit activé</strong></noscript></label>
+			<label for="radio_yes">
+				<input type="radio" name="display_posts" id="radio_yes" value="yes"<?php echo $this->conf->displayPosts () == 'yes' ? ' checked="checked"' : ''; ?> />
+				Oui
+			</label>
+			<label for="radio_no">
+				<input type="radio" name="display_posts" id="radio_no" value="no"<?php echo $this->conf->displayPosts () == 'no' ? ' checked="checked"' : ''; ?> />
+				Non<noscript> - <strong>nécessite que javascript soit activé</strong></noscript>
+			</label>
 		</div>
 	
 		<button class="btn btn-important">Valider</button>
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 3e49ece99..dc1d7ff96 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -1,7 +1,7 @@
 <?php $this->partial ('aside_feed'); ?>
 
 <?php if ($this->flux) { ?>
-<form method="post" action="">
+<form method="post" action="<?php echo _url ('configure', 'feed', 'id', $this->flux->id ()); ?>">
 	<h1><?php echo $this->flux->name (); ?></h1>
 	<?php echo $this->flux->description (); ?>
 	
@@ -15,9 +15,10 @@
 	<label>Ranger dans une catégorie</label>
 	<div class="radio_group">
 		<?php foreach ($this->categories as $cat) { ?>
-		<input type="radio" name="category" id="cat_<?php echo $cat->id (); ?>" value="<?php echo $cat->id (); ?>"<?php echo $cat->id () == $this->flux->category () ? ' checked="checked"' : ''; ?> />
-		<label for="cat_<?php echo $cat->id (); ?>"><?php echo $cat->name (); ?></label>
-		<br />
+		<label for="cat_<?php echo $cat->id (); ?>">
+			<input type="radio" name="category" id="cat_<?php echo $cat->id (); ?>" value="<?php echo $cat->id (); ?>"<?php echo $cat->id () == $this->flux->category () ? ' checked="checked"' : ''; ?> />
+			<?php echo $cat->name (); ?>
+		</label>
 		<?php } ?>
 	</div>