From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Fri, 30 Dec 2016 12:50:44 +0000 (+0100)
Subject: Merge pull request #2725 from lapineige/master
X-Git-Tag: 2.2.0~3^2~12
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=339b1e689d96b433d88ca1ad2325031841ae450d;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2725 from lapineige/master

Share to Shaarli - Include tags
---

339b1e689d96b433d88ca1ad2325031841ae450d
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 2e9673d5,950b3909..8ac2bc0b
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@@ -11,7 -11,7 +11,7 @@@
          <div id="article_toolbar">
              <ul class="links">
                  <li class="topPosF"><a href="#top" title="{{ 'entry.view.left_menu.back_to_top'|trans }}" class="tool top icon icon-arrow-up-thick"><span>{{ 'entry.view.left_menu.set_as_read'|trans }}</span></a></li>
 -                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.domainName|removeWww }}</span></a></li>
 +                <li><a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link icon icon-link original"><span>{{ entry.domainName|removeWww }}</span></a></li>
                  <li><a title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" class="tool icon icon-reload" href="{{ path('reload_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span></a></li>
  
                  {% set markAsReadLabel = 'entry.view.left_menu.set_as_unread' %}
@@@ -19,8 -19,8 +19,8 @@@
                      {% set markAsReadLabel = 'entry.view.left_menu.set_as_read' %}
                  {% endif %}
  
 -                <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
 -                <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
 +                <li><a title="{{ markAsReadLabel|trans }}" class="tool icon icon-check {% if entry.isArchived == 0 %}archive-off{% else %}archive{% endif %} markasread" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{{ markAsReadLabel|trans }}</span></a></li>
 +                <li><a title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" class="tool icon icon-star {% if entry.isStarred == 0 %}fav-off{% else %}fav{% endif %} favorite" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span></a></li>
                  <li><a id="nav-btn-add-tag" class="tool icon icon-price-tags" title="{{ 'entry.view.left_menu.add_a_tag'|trans }}"><span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span></a></li>
                  <li><a title="{{ 'entry.view.left_menu.delete'|trans }}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{{ 'entry.view.left_menu.delete'|trans }}</span></a></li>
                  {% if craue_setting('share_public') %}
@@@ -29,9 -29,8 +29,9 @@@
                  {% endif %}
                  {% 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="Tweet"><span>Tweet</span></a></li>{% endif %}
                  {% 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="Email"><span>Email</span></a></li>{% endif %}
-                 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
+                 {% if craue_setting('share_shaarli') %}<li><a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank" class="tool icon-image icon-image--shaarli" title="shaarli"><span>shaarli</span></a></li>{% endif %}
                  {% if craue_setting('share_diaspora') %}<li><a href="{{ craue_setting('diaspora_url') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="diaspora"><span>diaspora</span></a></li>{% endif %}
 +                {% if craue_setting('share_unmark') %}<li><a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|url_encode}}&amp;v=6" target="_blank" class="tool unmark icon-image icon-image--unmark" title="unmark"><span>unmark.it</span></a></li>{% endif %}
                  {% if craue_setting('carrot') %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="carrot"><span>Carrot</span></a></li>{% endif %}
                  {% if craue_setting('show_printlink') %}<li><a title="{{ 'entry.view.left_menu.print'|trans }}" class="tool icon icon-print" href="javascript: window.print();"><span>{{ 'entry.view.left_menu.print'|trans }}</span></a></li>{% endif %}
                  {% if craue_setting('export_epub') %}<li><a href="?epub&amp;method=id&amp;value={{ entry.id }}" title="Generate ePub file">EPUB</a></li>{% endif %}
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 46f89e19,5635a01c..a99bc4ea
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@@ -46,14 -46,14 +46,14 @@@
          </li>
  
          <li class="bold border-bottom hide-on-med-and-down">
 -            <a class="waves-effect collapsible-header" href="{{ entry.url|e }}">
 +            <a class="waves-effect collapsible-header original" href="{{ entry.url|e }}" target="_blank">
                  <i class="material-icons small">link</i>
                  <span>{{ 'entry.view.left_menu.view_original_article'|trans }}</span>
              </a>
              <div class="collapsible-body"></div>
          </li>
  
 -        <li class="bold hide-on-med-and-down">
 +        <li class="bold">
              <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', { 'id': entry.id }) }}" id="reload">
                  <i class="material-icons small">autorenew</i>
                  <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span>
@@@ -67,7 -67,7 +67,7 @@@
          {% endif %}
  
          <li class="bold hide-on-med-and-down">
 -            <a class="waves-effect collapsible-header" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
 +            <a class="waves-effect collapsible-header markasread" title="{{ markAsReadLabel|trans }}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
                  <i class="material-icons small">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i>
                  <span>{{ markAsReadLabel|trans }}</span>
              </a>
@@@ -75,21 -75,21 +75,21 @@@
          </li>
  
          <li class="bold hide-on-med-and-down">
 -            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
 +            <a class="waves-effect collapsible-header favorite" title="{{ 'entry.view.left_menu.set_as_starred'|trans }}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
                  <i class="material-icons spall">{% if entry.isStarred == 0 %}star_outline{% else %}star{% endif %}</i>
                  <span>{{ 'entry.view.left_menu.set_as_starred'|trans }}</span>
              </a>
              <div class="collapsible-body"></div>
          </li>
 -        <li class="bold border-bottom hide-on-med-and-down">
 -            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
 +        <li class="bold border-bottom">
 +            <a class="waves-effect collapsible-header delete" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
                  <i class="material-icons small">delete</i>
                  <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
              </a>
              <div class="collapsible-body"></div>
          </li>
  
 -        <li class="bold border-bottom hide-on-med-and-down">
 +        <li class="bold border-bottom">
              <a class="waves-effect collapsible-header" id="nav-btn-add-tag">
                  <i class="material-icons small">label_outline</i>
                  <span>{{ 'entry.view.left_menu.add_a_tag'|trans }}</span>
@@@ -125,7 -125,7 +125,7 @@@
                      {% endif %}
                      {% if craue_setting('share_shaarli') %}
                          <li>
-                             <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank">
+                         <a href="{{ craue_setting('shaarli_url') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}&amp;tags={{ entry.tags|join(',')|url_encode }}" target="_blank">
                                  <i class="tool icon-image icon-image--shaarli" title="shaarli"></i>
                                  <span>shaarli</span>
                              </a>
@@@ -139,14 -139,6 +139,14 @@@
                              </a>
                          </li>
                      {% endif %}
 +                    {% if craue_setting('share_unmark') %}
 +                        <li>
 +                            <a href="{{ craue_setting('unmark_url') }}/mark/add?url={{ entry.url|url_encode }}&amp;title={{entry.title|url_encode}}&amp;v=6" target="_blank">
 +                                <i class="tool icon-image icon-image--unmark" title="unmark"></i>
 +                                <span>unmark.it</span>
 +                            </a>
 +                        </li>
 +                    {% endif %}
                      {% if craue_setting('carrot') %}
                          <li>
                              <a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="carrot">
@@@ -194,6 -186,14 +194,6 @@@
              </div>
          </li>
  
 -        <li class="bold hide-on-large-only">
 -            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.delete'|trans }}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
 -                <i class="material-icons small">delete</i>
 -                <span>{{ 'entry.view.left_menu.delete'|trans }}</span>
 -            </a>
 -            <div class="collapsible-body"></div>
 -        </li>
 -
          <li class="bold">
              <a class="waves-effect collapsible-header" href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.description'|trans }}">
                  <i class="material-icons small">error</i>
@@@ -214,7 -214,13 +214,7 @@@
          <aside>
              <ul class="tools">
                  <li>
 -                    {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
 -                    <i class="material-icons">timer</i>
 -                    {% if readingTime > 0 %}
 -                        {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
 -                    {% else %}
 -                        {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
 -                    {% endif %}
 +                    {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
                  </li>
                  <li>
                      <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
@@@ -251,17 -257,6 +251,17 @@@
          <article>
              {{ entry.content | raw }}
          </article>
 +
 +        <div class="fixed-action-btn horizontal click-to-toggle hide-on-large-only">
 +            <a class="btn-floating btn-large">
 +              <i class="material-icons">menu</i>
 +            </a>
 +            <ul>
 +              <li><a class="btn-floating" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">done</i></a></li>
 +              <li><a class="btn-floating" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">star_outline</i></a></li>
 +              <li><a class="btn-floating" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a></li>
 +            </ul>
 +        </div>
      </div>
  
  <script id="annotationroutes" type="application/json">