Début fix bug #22 : possibilité d'ajouter des notes à des articles et les mettre ou non en public

2 files changed, 78 insertions, 7 deletions

diff --git a/app/views/entry/note.phtml b/app/views/entry/note.phtml
new file mode 100644
index 000000000..fe330f9b4
--- /dev/null
+++ b/app/views/entry/note.phtml
@@ -0,0 +1,63 @@
+<?php $this->partial ('aside_flux'); ?>
+
+<div class="post">
+	<form method="post" action="<?php echo _url ('entry', 'note', 'id', $this->entry->id ()); ?>">
+		<legend>Note</legend>
+
+		<div class="form-group">
+			<label class="group-name" for="note">Ajouter une note</label>
+			<div class="group-controls">
+				<textarea rows="5" cols="80" name="note" id="note"><?php echo $this->entry->notes (); ?></textarea>
+			</div>
+		</div>
+		<div class="form-group">
+			<label class="group-name" for="public_note">Article public ?</label>
+			<div class="group-controls">
+				<label class="checkbox" for="public">
+					<input type="checkbox" name="public" id="public" value="yes"<?php echo $this->entry->isPublic () ? ' checked="checked"' : ''; ?> /> Oui
+				</label>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important">Sauvegarder</button>
+				<button type="reset" class="btn">Annuler</button>
+			</div>
+		</div>
+
+		<legend>Article</legend>
+
+		<div class="form-group">
+			<label class="group-name">Titre</label>
+			<div class="group-controls">
+				<span class="control"><a href="<?php echo $this->entry->link (); ?>"><?php echo $this->entry->title (); ?></a></span>
+			</div>
+		</div>
+
+		<?php
+		$author = $this->entry->author ();
+		if ($author) { ?>
+		<div class="form-group">
+			<label class="group-name">Auteur</label>
+			<div class="group-controls">
+				<span class="control"><?php echo $author; ?></span>
+			</div>
+		</div>
+		<?php } ?>
+
+		<div class="form-group">
+			<label class="group-name">Date de publication</label>
+			<div class="group-controls">
+				<span class="control"><?php echo $this->entry->date (); ?></span>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<label class="group-name">Article</label>
+			<div class="group-controls">
+				<span class="control"><?php echo $this->entry->content (); ?></span>
+			</div>
+		</div>
+	</form>
+</div>
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 0db9dac5b..a7ed174c2 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -26,21 +26,29 @@ if (isset ($this->entryPaginator)) {
 
 	<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
 		<ul class="flux_header">
+			<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
 			<li class="item manage">
-				<?php if (!login_is_conf ($this->conf) || is_logged ()) { ?>
 				<?php if (!$item->isRead ()) { ?>
-				<a class="read" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('id' => $item->id (), 'is_read' => 1))); ?>">&nbsp;</a><!--
+				<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 1); ?>">&nbsp;</a>
 				<?php } else { ?>
-				<a class="read" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'read', 'params' => array ('id' => $item->id (), 'is_read' => 0))); ?>">&nbsp;</a><!--
+				<a class="read" href="<?php echo _url ('entry', 'read', 'id', $item->id (), 'is_read', 0); ?>">&nbsp;</a>
 				<?php } ?>
 
 				<?php if (!$item->isFavorite ()) { ?>
-				--><a class="bookmark" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'bookmark', 'params' => array ('id' => $item->id (), 'is_favorite' => 1))); ?>">&nbsp;</a>
+				<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 1); ?>">&nbsp;</a>
 				<?php } else { ?>
-				--><a class="bookmark" href="<?php echo Url::display (array ('c' => 'entry', 'a' => 'bookmark', 'params' => array ('id' => $item->id (), 'is_favorite' => 0))); ?>">&nbsp;</a>
-				<?php } ?>
+				<a class="bookmark" href="<?php echo _url ('entry', 'bookmark', 'id', $item->id (), 'is_favorite', 0); ?>">&nbsp;</a>
 				<?php } ?>
+
+				<a class="note" href="<?php echo _url ('entry', 'note', 'id', $item->id ()); ?>">
+					<?php if ($item->notes () != '') { ?>
+					<i class="icon i_note"></i>
+					<?php } else { ?>
+					<i class="icon i_note_empty"></i>
+					<?php } ?>
+				</a>
 			</li>
+			<?php } ?>
 			<?php $feed = $item->feed (true); ?>
 			<li class="item website"><a target="_blank" href="<?php echo $feed->website (); ?>"><img src="http://www.google.com/s2/favicons?domain=<?php echo get_domain ($feed->website ()); ?>" alt="" /><span> <?php echo $feed->name (); ?></span></a></li>
 			<li class="item title"><h1><?php echo $item->title (); ?></h1></li>
@@ -62,7 +70,7 @@ if (isset ($this->entryPaginator)) {
 <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>
+	<a class="print_all" href="<?php echo _url ('index', 'changeMode', 'mode', 'all'); ?>">Afficher tous les articles ?</a>
 	<?php }	?>
 </div>
 <?php } ?>