15 files changed, 37 insertions, 55 deletions

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 0079b228..206d5aae 100644
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -2,7 +2,6 @@
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
         <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
-        <link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
@@ -10,4 +9,4 @@
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
         <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
         <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
\ No newline at end of file
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig
index 3e7a2cbf..e9cd9d4a 100644
--- a/themes/baggy/_menu.twig
+++ b/themes/baggy/_menu.twig
@@ -4,6 +4,9 @@
                 <li><a href="./?view=fav" {% if view == 'fav' %}class="current"{% endif %}>{% trans "favorites" %}</a></li>
                 <li><a href="./?view=archive" {% if view == 'archive' %}class="current"{% endif %}>{% trans "archive" %}</a></li>
                 <li><a href="./?view=tags" {% if view == 'tags' %}class="current"{% endif %}>{% trans "tags" %}</a></li>
+                <li><a href="javascript: void(null);" id="pocheit">{% trans "save a link" %}</a></li>
                 <li><a href="./?view=config" {% if view == 'config' %}class="current"{% endif %}>{% trans "config" %}</a></li>
                 <li><a class="icon icon-power" href="./?logout" title="{% trans "logout" %}">{% trans "logout" %}</a></li>
-            </ul>
\ No newline at end of file
+            </ul>
+
+            {% include '_pocheit-form.twig' %}
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 598409b9..b37ac115 100644
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -14,8 +14,8 @@
                 <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
                 <li>
                     <form method="get" action="index.php">
-                        <label class="addurl" for="plainurl">{% trans "By filling this field" %}:</label>
-                        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+                        <label class="addurl" for="config_plainurl">{% trans "By filling this field" %}:</label>
+                        <input required placeholder="example.com/article" class="addurl" id="config_plainurl" name="plainurl" type="url" />
                         <input type="submit" value="{% trans "bag it!" %}" />
                     </form>
                 </li>
@@ -69,7 +69,7 @@
                         <label class="col w150p" for="language">{% trans "Language:" %}</label>
                         <select class="col" id="language" name="language">
                             {% for language in languages %}
-                            <option value="{{ language.name }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
+                            <option value="{{ language.value }}" {{ language.current ? 'selected' : '' }}>{{ language.name }}</option>
                             {% endfor %}
                         </select>
                     </div>
diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index e69de29b..7c02a16f 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'PT Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff');
+}
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 45211a87..3e128b08 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -254,6 +254,7 @@ footer {
   color: #999;
   font-size: 0.8em;
   font-style: italic;
+  z-index: 20;
 }
 
 footer a {
@@ -473,11 +474,11 @@ footer a {
    
 @font-face {
   font-family: 'icomoon';
-  src:url('../font/icomoon.eot?-s0mcsx');
-  src:url('../font/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
-    url('../font/icomoon.woff?-s0mcsx') format('woff'),
-    url('../font/icomoon.ttf?-s0mcsx') format('truetype'),
-    url('../font/icomoon.svg?-s0mcsx#icomoon') format('svg');
+  src:url('../fonts/icomoon.eot?-s0mcsx');
+  src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
+    url('../fonts/icomoon.woff?-s0mcsx') format('woff'),
+    url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'),
+    url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -563,7 +564,8 @@ footer a {
    ========================================================================== */
 
 .messages {
-  text-align: center;
+  text-align: left;
+  margin-top: 1em;
 }
 
 .messages > * { display: inline-block;}
@@ -818,4 +820,4 @@ blockquote {
   #article_toolbar a {
     padding: 0.3em 0.4em 0.2em;
   }
-}
\ No newline at end of file
+}
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 0cd89a9e..42da70b3 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,19 +1,19 @@
-.messages.error {
+.messages.error.install {
     border: 1px solid #c42608;
     color: #c00 !important;
     background: #fff0ef;
     text-align: left;
 }
 
-.messages.notice {
+.messages.notice.install {
     border: 1px solid #ebcd41;
     color: #000;
     background: #fffcd3;
     text-align: left;
 }
 
-.messages.success {
+.messages.success.install {
     border: 1px solid #6dc70c;
-    background: #e0fbcc;
+    background: #e0fbcc !important;
     text-align: left;
 }
\ No newline at end of file
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index 9f11a2c3..9e9012ee 100644
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -4,6 +4,9 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
+<div id="article">
+  <h2>{{ entry.title|raw }}</21>
+</div>
 {% if tags is empty %}
 <div class="notags">no tags</div>
 {% endif %}
@@ -11,10 +14,10 @@
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag">
-    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
-    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />
+    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
     <input type="submit" value="Tag" />
+    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
 </form>
 <a class="icon icon-reply return" href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
 {% endblock %}
diff --git a/themes/baggy/font/icomoon.eot b/themes/baggy/fonts/icomoon.eot
index 02f53b36..02f53b36 100755
--- a/themes/baggy/font/icomoon.eot
+++ b/themes/baggy/fonts/icomoon.eot
diff --git a/themes/baggy/font/icomoon.svg b/themes/baggy/fonts/icomoon.svg
index d9c35b98..d9c35b98 100755
--- a/themes/baggy/font/icomoon.svg
+++ b/themes/baggy/fonts/icomoon.svg
diff --git a/themes/baggy/font/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf
index 3860dd04..3860dd04 100755
--- a/themes/baggy/font/icomoon.ttf
+++ b/themes/baggy/fonts/icomoon.ttf
diff --git a/themes/baggy/font/icomoon.woff b/themes/baggy/fonts/icomoon.woff
index c3a91ed7..c3a91ed7 100755
--- a/themes/baggy/font/icomoon.woff
+++ b/themes/baggy/fonts/icomoon.woff
diff --git a/themes/baggy/fonts/ptsans.woff b/themes/baggy/fonts/ptsans.woff
new file mode 100644
index 00000000..cf7c62e1
--- /dev/null
+++ b/themes/baggy/fonts/ptsans.woff
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index 33afdbbd..4f9db063 100644
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -12,6 +12,9 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block content %}
+            {% if tag %}
+                <h3>{% trans "Tag" %}: <b>{{ tag.value }}</b></h3>
+            {% endif %}
             {% if entries is empty %}
             <div class="messages warning"><p>{% trans "No articles found." %}</p></div>
             {% else %}
@@ -40,7 +43,7 @@
                     </ul>
                     <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
                 </div>
-            
+
                 {% endfor %}
             </div>
             {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig
index e4751a41..645db376 100644
--- a/themes/baggy/login.twig
+++ b/themes/baggy/login.twig
@@ -24,7 +24,7 @@
                                                 </div>
                                         </div>
                                         <div class="row mts txtcenter">
-                                                <button class="bouton" type="submit" tabindex="4">{% trans "Login" %}</button>
+                                                <button class="bouton" type="submit" tabindex="4">{% trans "Sign in" %}</button>
                                         </div>
                 </fieldset>
                 <input type="hidden" name="returnurl" value="{{ referer }}">
diff --git a/themes/baggy/tag.twig b/themes/baggy/tag.twig
deleted file mode 100644
index 141ac909..00000000
--- a/themes/baggy/tag.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}tag {% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block content %}
-    <h3>{% trans "Tag" %} {{ tag.value }}</h3>
-    {% if entries is empty %}
-    <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
-    {% else %}
-        {% block pager %}
-            {% if nb_results > 1 %}
-        <div class="results">
-            <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
-                {{ page_links | raw }}
-        </div>
-            {% endif %}
-        {% endblock %}
-    <div class="list-entries">    
-        {% for entry in entries %}
-            <div id="entry-{{ entry.id|e }}" class="entrie">
-                <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
-                 <ul class="tools links">
-                    <li><a title="{% trans "Toggle mark as read" %}" class="tool icon-check icon {% if entry.is_read == 0 %}archive-off{% else %}archive{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "Toggle mark as read" %}</span></a></li>
-                    <li><a title="{% trans "toggle favorite" %}" class="tool icon-star icon {% if entry.is_fav == 0 %}fav-off{% else %}fav{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
-                    <li><a title="{% trans "delete" %}" class="tool delete icon-trash icon" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-                    <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | getDomain }}</span></a></li>
-                </ul>
-                <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
-            </div>
-        {% endfor %}
-    </div>
-    {% endif %}
-{% endblock %}
\ No newline at end of file