From 8c72acbacb8fd4da39d505e8ac52e7e0cceed418 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 13 Mar 2013 19:09:29 +0100
Subject: Suppression code HTML inutile + amélioration CSS + restructuration du
 layout + correction bug mise à jour d'articles lorsqu'on visualise une
 catégorie
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/layout/aside.phtml           | 46 ----------------------------------------
 app/layout/aside_configure.phtml | 17 +++++++++++++++
 app/layout/aside_feed.phtml      | 20 +++++++++++++++++
 app/layout/aside_flux.phtml      | 46 ++++++++++++++++++++++++++++++++++++++++
 app/layout/configure_aside.phtml | 17 ---------------
 app/layout/layout.phtml          |  8 +------
 6 files changed, 84 insertions(+), 70 deletions(-)
 delete mode 100644 app/layout/aside.phtml
 create mode 100644 app/layout/aside_configure.phtml
 create mode 100644 app/layout/aside_feed.phtml
 create mode 100644 app/layout/aside_flux.phtml
 delete mode 100644 app/layout/configure_aside.phtml

(limited to 'app/layout')

diff --git a/app/layout/aside.phtml b/app/layout/aside.phtml
deleted file mode 100644
index f1f14cfc0..000000000
--- a/app/layout/aside.phtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<div class="aside">
-	<?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>
-
-		<li class="all">
-			<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; ?>)
-				<span class="notRead"><?php echo $this->nb_not_read; ?> non lu<?php echo $this->nb_not_read > 1 ? 's' : ''; ?></span>
-			</a>
-		</li>
-
-		<li class="favorites">
-			<a class="btn category<?php echo $this->get == 'favoris' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'favoris'); ?>">
-				<i class="icon bookmark"></i>
-				Favoris (<?php echo $this->nb_favorites; ?>)
-			</a>
-		</li>
-
-		<?php foreach ($this->cat_aside as $cat) { ?>
-		<?php $feeds = $cat->feeds (); $catNotRead = $cat->nbNotRead (); ?>
-		<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 (); ?>
-				<span class="notRead"><?php echo $catNotRead ?> non lu<?php echo $catNotRead > 1 ? 's' : ''; ?></span>
-			</a>
-
-			<?php if (!empty ($feeds)) { ?>
-			<ul class="feeds">
-				<?php foreach ($feeds as $feed) { ?>
-				<li>
-					<img src="http://www.google.com/s2/favicons?domain=<?php echo get_domain ($feed->website ()); ?>" alt="" />
-					<a class="feed" href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>">
-						<?php echo $feed->name(); ?>
-						<!--<span>X non lu</span>-->
-					</a>
-				</li>
-				<?php } ?>
-			</ul>
-			<?php } ?>
-		</li>
-		<?php } ?>
-	</ul>
-	<?php } ?>
-</div>
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
new file mode 100644
index 000000000..225026810
--- /dev/null
+++ b/app/layout/aside_configure.phtml
@@ -0,0 +1,17 @@
+<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>
diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
new file mode 100644
index 000000000..98a82d6a7
--- /dev/null
+++ b/app/layout/aside_feed.phtml
@@ -0,0 +1,20 @@
+<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>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
new file mode 100644
index 000000000..f1f14cfc0
--- /dev/null
+++ b/app/layout/aside_flux.phtml
@@ -0,0 +1,46 @@
+<div class="aside">
+	<?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>
+
+		<li class="all">
+			<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; ?>)
+				<span class="notRead"><?php echo $this->nb_not_read; ?> non lu<?php echo $this->nb_not_read > 1 ? 's' : ''; ?></span>
+			</a>
+		</li>
+
+		<li class="favorites">
+			<a class="btn category<?php echo $this->get == 'favoris' ? ' active' : ''; ?>" href="<?php echo _url ('index', 'index', 'get', 'favoris'); ?>">
+				<i class="icon bookmark"></i>
+				Favoris (<?php echo $this->nb_favorites; ?>)
+			</a>
+		</li>
+
+		<?php foreach ($this->cat_aside as $cat) { ?>
+		<?php $feeds = $cat->feeds (); $catNotRead = $cat->nbNotRead (); ?>
+		<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 (); ?>
+				<span class="notRead"><?php echo $catNotRead ?> non lu<?php echo $catNotRead > 1 ? 's' : ''; ?></span>
+			</a>
+
+			<?php if (!empty ($feeds)) { ?>
+			<ul class="feeds">
+				<?php foreach ($feeds as $feed) { ?>
+				<li>
+					<img src="http://www.google.com/s2/favicons?domain=<?php echo get_domain ($feed->website ()); ?>" alt="" />
+					<a class="feed" href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>">
+						<?php echo $feed->name(); ?>
+						<!--<span>X non lu</span>-->
+					</a>
+				</li>
+				<?php } ?>
+			</ul>
+			<?php } ?>
+		</li>
+		<?php } ?>
+	</ul>
+	<?php } ?>
+</div>
diff --git a/app/layout/configure_aside.phtml b/app/layout/configure_aside.phtml
deleted file mode 100644
index 26a111045..000000000
--- a/app/layout/configure_aside.phtml
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="aside">
-	<ul id="menu">
-		<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>
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml
index 4adcbef45..5cc128fc8 100644
--- a/app/layout/layout.phtml
+++ b/app/layout/layout.phtml
@@ -11,13 +11,7 @@
 <?php $this->partial ('header'); ?>
 
 <div id="global">
-	<?php if (Request::controllerName () != 'configure') { ?>
-	<?php $this->partial ('aside'); ?>
-	<?php } ?>
-	
-	<div id="main">
-		<?php $this->render (); ?>
-	</div>
+	<?php $this->render (); ?>
 </div>
 
 <?php $this->partial ('persona'); ?>
-- 
cgit v1.2.3