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)) {
+ tags(); ?>
+
+
+
+
+
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 @@
+
+
+
+