From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Tue, 23 Aug 2016 15:24:46 +0000 (+0200)
Subject: Merge pull request #2230 from modos189/issue_2055
X-Git-Tag: 2.0.8~10
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;ds=inline;h=2f9927404d620f719d4b30d9205ff43c0238e6a1;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2230 from modos189/issue_2055

Cut entries title in card view: continued
---

2f9927404d620f719d4b30d9205ff43c0238e6a1
diff --combined src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
index b4e082d3,f0beab98..eb4eebd8
--- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css
@@@ -285,6 -285,12 +285,12 @@@ main ul.row 
  
  .card .card-content .card-title {
      line-height: 32px;
+     max-height: 64px;
+     display: block;
+ }
+ 
+ .card .card-content i.right, .card .card-reveal i.right {
+     margin-left: 0;
  }
  
  .card .card-content .estimatedTime {
@@@ -345,8 -351,7 +351,8 @@@
      max-width: 40em;
  }
  
 -#article img {
 +#article img,
 +#article figure {
      max-width: 100%;
      height: auto;
  }
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index c8e4a533,5f49062f..2110b889
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@@ -35,7 -35,7 +35,7 @@@
                                  <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i>
                              {% endif %}
  
-                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
+                             <span class="card-title dot-ellipsis"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span>
  
                              <div class="estimatedTime grey-text">
                                  <span class="tool reading-time">
@@@ -77,7 -77,7 +77,7 @@@
                          <ul class="tools links right">
                              <li>
                                  <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text {% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"></a>
 -                                <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a>
 +                                <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text {% if entry.isStarred == 0 %}mdi-toggle-star-outline{% else %}mdi-toggle-star{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"></a>
                                  <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete mdi-action-delete " href="{{ path('delete_entry', { 'id': entry.id }) }}"></a>
                              </li>
                          </ul>
@@@ -126,11 -126,6 +126,11 @@@
                      {{ form_label(form.isStarred) }}
                  </div>
  
 +                <div class="input-field col s6 with-checkbox">
 +                    {{ form_widget(form.isUnread) }}
 +                    {{ form_label(form.isUnread) }}
 +                </div>
 +
                  <div class="col s12">
                      <label>{{ 'entry.filters.preview_picture_help'|trans }}</label>
                  </div>
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index a5c16792,630cbd66..0573e8e5
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@@ -11,6 -11,7 +11,7 @@@
  {% block scripts %}
      {{ parent() }}
  
+     <script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script>
      <script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
      <script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
  {% endblock %}
@@@ -122,5 -123,45 +123,5 @@@
  {% endblock %}
  
  {% block footer %}
 -    <footer class="page-footer cyan darken-2">
 -        <div class="container">
 -            <div class="row">
 -                <div class="col l6 s12">
 -                    <h5 class="white-text">{{ 'footer.wallabag.elsewhere'|trans }}</h5>
 -                    <p class="grey-text text-lighten-4">
 -                        <a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="Android">
 -                            <span class="icon-android"></span>
 -                        </a>
 -                        <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS">
 -                            <span class="icon-apple"></span>
 -                        </a>
 -                        <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag/" title="Firefox">
 -                            <span class="icon-firefox"></span>
 -                        </a>
 -                        <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome">
 -                            <span class="icon-chrome"></span>
 -                        </a>
 -                    </p>
 -                </div>
 -                <div class="col l4 offset-l2 s12">
 -                    <h5 class="white-text">{{ 'footer.wallabag.social'|trans }}</h5>
 -                    <a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp" title="Twitter">
 -                        <span class="icon-twitter"></span>
 -                    </a>
 -                    <a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts" title="Google+">
 -                        <span class="icon-google-plus2"></span>
 -                    </a>
 -                    <a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag" title="Facebook">
 -                        <span class="icon-facebook2"></span>
 -                    </a>
 -                </div>
 -            </div>
 -        </div>
 -        <div class="footer-copyright">
 -            <div class="container">
 -                <p>{{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
 -                <a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans }}</a>
 -            </div>
 -        </div>
 -    </footer>
 +    {{ render(controller("WallabagCoreBundle:Footer:index")) }}
  {% endblock %}