aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-02-15 19:22:13 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-02-15 19:22:13 +0100
commit559cd55bc8011b11706c1ffc5c0563b6f2f39491 (patch)
tree56b23b1c3b2ea96e5aaa03988d93b40947198b9f /src/Wallabag
parent4ead9c648f34f49d2d1249413694e6a57f33ef04 (diff)
parenta8d5f8971eec8e84d80da1cf0834445f3874b2e4 (diff)
downloadwallabag-559cd55bc8011b11706c1ffc5c0563b6f2f39491.tar.gz
wallabag-559cd55bc8011b11706c1ffc5c0563b6f2f39491.tar.zst
wallabag-559cd55bc8011b11706c1ffc5c0563b6f2f39491.zip
Merge pull request #1672 from wallabag/v2-improve-baggy-theme
improve baggy theme (add new tag panel)
Diffstat (limited to 'src/Wallabag')
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css12
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js12
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig21
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig8
4 files changed, 38 insertions, 15 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
index 62f2964c..1cb2ddf3 100755
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css
@@ -298,7 +298,7 @@ h2:after {
298 ========================================================================== */ 298 ========================================================================== */
299 299
300#content { 300#content {
301 margin-top: 5em; 301 margin-top: 2em;
302 min-height: 30em; 302 min-height: 30em;
303} 303}
304 304
@@ -884,9 +884,13 @@ blockquote {
884 text-decoration: none; 884 text-decoration: none;
885} 885}
886 886
887 #article_toolbar a:hover, #article_toolbar a:focus { 887#article_toolbar a:hover, #article_toolbar a:focus {
888 background-color: #999; 888 background-color: #999;
889 } 889}
890
891#nav-btn-add-tag {
892 cursor: pointer;
893}
890 894
891.shaarli:before { 895.shaarli:before {
892 content: "*"; 896 content: "*";
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js
index 74cbae68..9bdc6f21 100755
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/init.js
@@ -48,4 +48,16 @@ $.fn.ready(function() {
48 $listmode.addClass("tablemode"); 48 $listmode.addClass("tablemode");
49 } 49 }
50 50
51 /* ==========================================================================
52 Add tag panel
53 ========================================================================== */
54
55
56 $('#nav-btn-add-tag').on('click', function(){
57 $(".nav-panel-add-tag").toggle(100);
58 $(".nav-panel-menu").addClass('hidden');
59 $("#tag_label").focus();
60 return false;
61 });
62
51}); 63});
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 27a88287..32dc0859 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -3,13 +3,19 @@
3{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %} 3{% block title %}{{ entry.title|raw }} ({{ entry.domainName|removeWww }}){% endblock %}
4 4
5{% block content %} 5{% block content %}
6 <div id="article_toolbar"> 6 <div id="article">
7 <header class="mbm">
8 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1>
9 </header>
10
11 <div id="article_toolbar">
7 <ul class="links"> 12 <ul class="links">
8 <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li> 13 <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li>
9 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li> 14 <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
10 <li><a title="{% trans %}Reload content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Reload content{% endtrans %}</span></a></li> 15 <li><a title="{% trans %}Reload content{% endtrans %}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{% trans %}Reload content{% endtrans %}</span></a></li>
11 <li><a title="{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span></a></li> 16 <li><a title="{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% if entry.isArchived == 0 %}{% trans %}Mark as read{% endtrans %}{% else %}{% trans %}Mark as unread{% endtrans %}{% endif %}</span></a></li>
12 <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li> 17 <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li>
18 <li><a id="nav-btn-add-tag" title="{% trans %}Add a tag{% endtrans %}"><span>{% trans %}Tag{% endtrans %}</span></a></li>
13 <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li> 19 <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li>
14 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans %}Tweet{% endtrans %}"><span>{% trans %}Tweet{% endtrans %}</span></a></li>{% endif %} 20 {% if craue_setting('share_twitter') %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans %}Tweet{% endtrans %}"><span>{% trans %}Tweet{% endtrans %}</span></a></li>{% endif %}
15 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"><span>{% trans %}Email{% endtrans %}</span></a></li>{% endif %} 21 {% if craue_setting('share_mail') %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"><span>{% trans %}Email{% endtrans %}</span></a></li>{% endif %}
@@ -23,13 +29,14 @@
23 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li> 29 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li>
24 </ul> 30 </ul>
25 </div> 31 </div>
26 <div id="article"> 32
27 <header class="mbm">
28 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1>
29 </header>
30 <aside class="tags"> 33 <aside class="tags">
31 {% for tag in entry.tags %}<span class="mdi-action-label-outline">{{ tag.label }}</span>{% endfor %} 34 {% for tag in entry.tags %}
32 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} 35 <span class="mdi-action-label-outline">{{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i>✘</i></a>
36 {% endfor %}
37 <div class="input-field nav-panel-add-tag" style="display: none">
38 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
39 </div>
33 </aside> 40 </aside>
34 {% if entry.previewPicture is not null %} 41 {% if entry.previewPicture is not null %}
35 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> 42 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index b630070c..84604762 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -35,8 +35,8 @@
35 <ul id="links" class="links"> 35 <ul id="links" class="links">
36 <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li> 36 <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
37 <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li> 37 <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
38 <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li> 38 <li><a href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
39 <li><a href="{{ path('all') }}"}>{% trans %}all{% endtrans %}</a></li> 39 <li><a href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li>
40 <li><a href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li> 40 <li><a href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
41 <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li> 41 <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li>
42 <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a> 42 <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
@@ -44,9 +44,9 @@
44 <form method="get" action="index.php"> 44 <form method="get" action="index.php">
45 <h2>{% trans %}Search{% endtrans %}</h2> 45 <h2>{% trans %}Search{% endtrans %}</h2>
46 <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a> 46 <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
47 <input type="hidden" name="view" value="search"></input> 47 <input type="hidden" name="view" value="search">
48 <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br> 48 <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
49 <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input> 49 <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}">
50 </form> 50 </form>
51 </div> 51 </div>
52 </li> 52 </li>