From 12d3552fe61d7d26817f6644d8cd90e72307a0e6 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Apr 2013 19:54:56 +0200
Subject: Corrige soucis #41 : ajout d'images png en fallback des images SVG +
 petite modif pour annuler l'attribut height sur les images

---
 public/theme/icons/add.png         | Bin 0 -> 246 bytes
 public/theme/icons/all.png         | Bin 0 -> 223 bytes
 public/theme/icons/category.png    | Bin 0 -> 294 bytes
 public/theme/icons/close.png       | Bin 0 -> 405 bytes
 public/theme/icons/configure.png   | Bin 0 -> 526 bytes
 public/theme/icons/down.png        | Bin 0 -> 460 bytes
 public/theme/icons/help.png        | Bin 0 -> 687 bytes
 public/theme/icons/link.png        | Bin 0 -> 719 bytes
 public/theme/icons/login.png       | Bin 0 -> 333 bytes
 public/theme/icons/logout.png      | Bin 0 -> 339 bytes
 public/theme/icons/non-starred.png | Bin 0 -> 600 bytes
 public/theme/icons/note.png        | Bin 0 -> 427 bytes
 public/theme/icons/note_empty.png  | Bin 0 -> 517 bytes
 public/theme/icons/read.png        | Bin 0 -> 656 bytes
 public/theme/icons/refresh.png     | Bin 0 -> 577 bytes
 public/theme/icons/rss.png         | Bin 0 -> 483 bytes
 public/theme/icons/search.png      | Bin 0 -> 571 bytes
 public/theme/icons/share.png       | Bin 0 -> 541 bytes
 public/theme/icons/starred.png     | Bin 0 -> 528 bytes
 public/theme/icons/unread.png      | Bin 0 -> 434 bytes
 public/theme/icons/up.png          | Bin 0 -> 411 bytes
 21 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 public/theme/icons/add.png
 create mode 100644 public/theme/icons/all.png
 create mode 100644 public/theme/icons/category.png
 create mode 100644 public/theme/icons/close.png
 create mode 100644 public/theme/icons/configure.png
 create mode 100644 public/theme/icons/down.png
 create mode 100644 public/theme/icons/help.png
 create mode 100644 public/theme/icons/link.png
 create mode 100644 public/theme/icons/login.png
 create mode 100644 public/theme/icons/logout.png
 create mode 100644 public/theme/icons/non-starred.png
 create mode 100644 public/theme/icons/note.png
 create mode 100644 public/theme/icons/note_empty.png
 create mode 100644 public/theme/icons/read.png
 create mode 100644 public/theme/icons/refresh.png
 create mode 100644 public/theme/icons/rss.png
 create mode 100644 public/theme/icons/search.png
 create mode 100644 public/theme/icons/share.png
 create mode 100644 public/theme/icons/starred.png
 create mode 100644 public/theme/icons/unread.png
 create mode 100644 public/theme/icons/up.png

(limited to 'public/theme/icons')

diff --git a/public/theme/icons/add.png b/public/theme/icons/add.png
new file mode 100644
index 000000000..90cdf4830
Binary files /dev/null and b/public/theme/icons/add.png differ
diff --git a/public/theme/icons/all.png b/public/theme/icons/all.png
new file mode 100644
index 000000000..b0dbe5483
Binary files /dev/null and b/public/theme/icons/all.png differ
diff --git a/public/theme/icons/category.png b/public/theme/icons/category.png
new file mode 100644
index 000000000..e3a9bf34b
Binary files /dev/null and b/public/theme/icons/category.png differ
diff --git a/public/theme/icons/close.png b/public/theme/icons/close.png
new file mode 100644
index 000000000..452f1d1cf
Binary files /dev/null and b/public/theme/icons/close.png differ
diff --git a/public/theme/icons/configure.png b/public/theme/icons/configure.png
new file mode 100644
index 000000000..8c6fb531c
Binary files /dev/null and b/public/theme/icons/configure.png differ
diff --git a/public/theme/icons/down.png b/public/theme/icons/down.png
new file mode 100644
index 000000000..5a647245f
Binary files /dev/null and b/public/theme/icons/down.png differ
diff --git a/public/theme/icons/help.png b/public/theme/icons/help.png
new file mode 100644
index 000000000..aa63c5411
Binary files /dev/null and b/public/theme/icons/help.png differ
diff --git a/public/theme/icons/link.png b/public/theme/icons/link.png
new file mode 100644
index 000000000..de2b187d7
Binary files /dev/null and b/public/theme/icons/link.png differ
diff --git a/public/theme/icons/login.png b/public/theme/icons/login.png
new file mode 100644
index 000000000..cebe0cf7d
Binary files /dev/null and b/public/theme/icons/login.png differ
diff --git a/public/theme/icons/logout.png b/public/theme/icons/logout.png
new file mode 100644
index 000000000..49255fccd
Binary files /dev/null and b/public/theme/icons/logout.png differ
diff --git a/public/theme/icons/non-starred.png b/public/theme/icons/non-starred.png
new file mode 100644
index 000000000..4aafb6d8a
Binary files /dev/null and b/public/theme/icons/non-starred.png differ
diff --git a/public/theme/icons/note.png b/public/theme/icons/note.png
new file mode 100644
index 000000000..d819ebd02
Binary files /dev/null and b/public/theme/icons/note.png differ
diff --git a/public/theme/icons/note_empty.png b/public/theme/icons/note_empty.png
new file mode 100644
index 000000000..c26ad2b16
Binary files /dev/null and b/public/theme/icons/note_empty.png differ
diff --git a/public/theme/icons/read.png b/public/theme/icons/read.png
new file mode 100644
index 000000000..a402689c7
Binary files /dev/null and b/public/theme/icons/read.png differ
diff --git a/public/theme/icons/refresh.png b/public/theme/icons/refresh.png
new file mode 100644
index 000000000..dba399981
Binary files /dev/null and b/public/theme/icons/refresh.png differ
diff --git a/public/theme/icons/rss.png b/public/theme/icons/rss.png
new file mode 100644
index 000000000..c20455af0
Binary files /dev/null and b/public/theme/icons/rss.png differ
diff --git a/public/theme/icons/search.png b/public/theme/icons/search.png
new file mode 100644
index 000000000..48e7373c4
Binary files /dev/null and b/public/theme/icons/search.png differ
diff --git a/public/theme/icons/share.png b/public/theme/icons/share.png
new file mode 100644
index 000000000..74c4c5dda
Binary files /dev/null and b/public/theme/icons/share.png differ
diff --git a/public/theme/icons/starred.png b/public/theme/icons/starred.png
new file mode 100644
index 000000000..a6c076358
Binary files /dev/null and b/public/theme/icons/starred.png differ
diff --git a/public/theme/icons/unread.png b/public/theme/icons/unread.png
new file mode 100644
index 000000000..ab6e3fb39
Binary files /dev/null and b/public/theme/icons/unread.png differ
diff --git a/public/theme/icons/up.png b/public/theme/icons/up.png
new file mode 100644
index 000000000..8bfc2fb13
Binary files /dev/null and b/public/theme/icons/up.png differ
-- 
cgit v1.2.3


From a6982216253d1356621916bb2b7734320fedec0d Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Apr 2013 22:14:49 +0200
Subject: Fix issue #55 : affichage des tags associés aux articles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/Entry.php        |   3 +-
 app/views/index/index.phtml |  18 ++++++
 public/theme/global.css     |   4 ++
 public/theme/icons/tag.png  | Bin 0 -> 196 bytes
 public/theme/icons/tag.svg  | 134 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 public/theme/icons/tag.png
 create mode 100644 public/theme/icons/tag.svg

(limited to 'public/theme/icons')

diff --git a/app/models/Entry.php b/app/models/Entry.php
index 230b457bf..3daec5aa9 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -216,7 +216,7 @@ class Entry extends Model {
 
 class EntryDAO extends Model_pdo {
 	public function addEntry ($valuesTmp) {
-		$sql = 'INSERT INTO entry(id, guid, title, author, content, link, date, is_read, is_favorite, is_public, id_feed, lastUpdate) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+		$sql = 'INSERT INTO entry(id, guid, title, author, content, link, date, is_read, is_favorite, is_public, id_feed, lastUpdate, tags) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
 		$stm = $this->bd->prepare ($sql);
 
 		$values = array (
@@ -232,6 +232,7 @@ class EntryDAO extends Model_pdo {
 			$valuesTmp['is_public'],
 			$valuesTmp['id_feed'],
 			$valuesTmp['lastUpdate'],
+			$valuesTmp['tags'],
 		);
 
 		if ($stm && $stm->execute ($values)) {
diff --git a/app/views/index/index.phtml b/app/views/index/index.phtml
index 6889a8b51..ff7325996 100644
--- a/app/views/index/index.phtml
+++ b/app/views/index/index.phtml
@@ -89,6 +89,24 @@ if (isset ($this->entryPaginator)) {
 						</ul>
 					</div>
 				</li>
+				<?php $tags = $item->tags(); ?>
+				<?php if(!empty($tags)) { ?>
+				<li class="item">
+					<div class="dropdown">
+						<div id="dropdown-tags-<?php echo $item->id ();?>" class="dropdown-target"></div>
+						<i class="icon i_tag"></i> <a class="dropdown-toggle" href="#dropdown-tags-<?php echo $item->id ();?>">Tags</a>
+
+						<ul class="dropdown-menu">
+							<li class="dropdown-close"><a href="#close"><i class="icon i_close"></i></a></li>
+
+							<li class="dropdown-header">Tags associés</li>
+							<?php foreach($tags as $tag) { ?>
+							<li class="item"><span><?php echo $tag; ?></span></li>
+							<?php } ?>
+						</ul>
+					</div>
+				</li>
+				<?php } ?>
 			</ul>
 		</div>
 	</div>
diff --git a/public/theme/global.css b/public/theme/global.css
index 84fbca3cb..d619c4e99 100644
--- a/public/theme/global.css
+++ b/public/theme/global.css
@@ -511,3 +511,7 @@ input, select, textarea {
 		background-image: url("icons/share.png");
 		background-image: url("icons/share.svg");
 	}
+	.icon.i_tag {
+		background-image: url("icons/tag.png");
+		background-image: url("icons/tag.svg");
+	}
diff --git a/public/theme/icons/tag.png b/public/theme/icons/tag.png
new file mode 100644
index 000000000..cb1a13833
Binary files /dev/null and b/public/theme/icons/tag.png differ
diff --git a/public/theme/icons/tag.svg b/public/theme/icons/tag.svg
new file mode 100644
index 000000000..688aca7a4
--- /dev/null
+++ b/public/theme/icons/tag.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="tag.svg"
+   height="16"
+   id="svg7384"
+   inkscape:version="0.48.4 r9939"
+   version="1.1"
+   width="16">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-paths="false"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="63.620645"
+     inkscape:cy="27.761176"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#555753"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="709"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1366"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="4">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-141.0002,-807)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-141.0002,-807)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 149.0002,809 0,13 4,-4 4,4 c 0.0525,-6.84943 -0.0285,-10.58353 0,-13 z"
+       id="path12292"
+       sodipodi:nodetypes="cccccc"
+       style="fill:#bebebe;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
-- 
cgit v1.2.3