From b17874a7d58e1ae853935a564b205566efd9ed74 Mon Sep 17 00:00:00 2001
From: Alexandr Danilov <bitbucket@modos189.ru>
Date: Thu, 6 Aug 2015 04:22:45 +0300
Subject: [PATCH] Many corrections material theme

---
 .../themes/material/Entry/edit.html.twig      | 44 ++++++++++++++
 .../themes/material/Entry/entries.html.twig   |  2 +-
 .../themes/material/Entry/entry.html.twig     | 46 +++++++++++++--
 .../views/themes/material/Entry/new.html.twig | 40 +++++++++++++
 .../material/Security/checkEmail.html.twig    | 27 +++++++++
 .../Security/forgotPassword.html.twig         | 56 ++++++++++++++++++
 .../themes/material/Security/login.html.twig  | 58 +++++++++++++++++++
 .../themes/material/Security/reset.html.twig  | 57 ++++++++++++++++++
 .../views/themes/material/base.html.twig      | 13 +++--
 .../views/themes/material/public/css/main.css | 29 ++++++----
 .../views/themes/material/public/js/init.js   |  4 +-
 11 files changed, 353 insertions(+), 23 deletions(-)
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
 create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
new file mode 100644
index 00000000..c002c4c3
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
@@ -0,0 +1,44 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}Edit an entry{% endtrans %}{% endblock %}
+
+{% block content %}
+
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+
+                <form name="entry" method="post" action="">
+                    <div class="card-content">
+
+                        {% if form_errors(form) %}
+                            <span class="black-text">{{ form_errors(form) }}</span>
+                        {% endif %}
+
+                        {% if form_errors(form.title) %}
+                            <span class="black-text">{{ form_errors(form.title) }}</span>
+                        {% endif %}
+
+                        <div class="input-field s12">
+                            {{ form_label(form.title) }}
+                            {{ form_widget(form.title) }}
+                        </div>
+
+                        <div class="input-field s12">
+                            {{ form_widget(form.is_public) }}
+                            {{ form_label(form.is_public) }}
+                        </div>
+                        <br>
+                        <button class="btn waves-effect waves-light" type="submit" name="entry[save]">
+                            {% trans %}Save{% endtrans %}
+                            <i class="mdi-content-send right"></i>
+                        </button>
+                    </div>
+                    <div class="hidden">{{ form_rest(form) }}</div>
+                </form>
+
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index f68eec12..5ef5125f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -21,7 +21,7 @@
     {% if entries is empty %}
         <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div>
     {% else %}
-        <ul class="row">
+        <ul class="row data">
             {% for entry in entries %}
                 <li id="entry-{{ entry.id|e }}" class="col l4 m6 s12">
                     <div class="card">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 3e161745..5d098232 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -3,8 +3,36 @@
 {% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
 
 {% block menu %}
+    <nav class="hide-on-large-only">
+        <div class="nav-wrapper cyan darken-1">
+            <ul>
+                <li>
+                    <a class="waves-effect" href="/">
+                        <i class="mdi-action-exit-to-app"></i>
+                    </a>
+                </li>
+            </ul>
+            <ul class="right">
+                <li>
+                    <a class="waves-effect" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
+                        <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
+                    </a>
+                </li>
+                <li>
+                    <a class="waves-effect" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
+                        <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
+                    </a>
+                </li>
+                <li>
+                    <a href="#" data-activates="slide-out" class="button-collapse right">
+                        <i class="mdi-navigation-menu"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </nav>
     <ul id="slide-out" class="collapsible side-nav fixed reader-mode" data-collapsible="accordion">
-        <li class="bold border-bottom">
+        <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" href="/">
                 <i class="mdi-action-exit-to-app small"></i>
                 <span>{% trans %}back{% endtrans %}</span>
@@ -12,7 +40,7 @@
             <div class="collapsible-body"></div>
         </li>
 
-        <li class="bold">
+        <li class="bold hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
                 <i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
                 <span>{% trans %}Toggle mark as read{% endtrans %}</span>
@@ -20,14 +48,14 @@
             <div class="collapsible-body"></div>
         </li>
 
-        <li class="bold">
+        <li class="bold hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
                 <i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
                 <span>{% trans %}Toggle favorite{% endtrans %}</span>
             </a>
             <div class="collapsible-body"></div>
         </li>
-        <li class="bold border-bottom">
+        <li class="bold border-bottom hide-on-med-and-down">
             <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
                 <i class="mdi-action-delete small"></i>
                 <span>{% trans %}Delete{% endtrans %}</span>
@@ -66,6 +94,14 @@
             </div>
         </li>
 
+        <li class="bold hide-on-large-only">
+            <a class="waves-effect collapsible-header" title="{% trans %}Delete{% endtrans %}" href="{{ path('delete_entry', { 'id': entry.id }) }}">
+                <i class="mdi-action-delete small"></i>
+                <span>{% trans %}Delete{% endtrans %}</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="{% trans %}Does this article appear wrong?{% endtrans %}">
                 <i class="mdi-alert-error small"></i>
@@ -86,7 +122,7 @@ main {
 {% block content %}
     <div id="article">
         <header class="mbm">
-            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit tags{% endtrans %}">✎</a></h1>
+            <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{% trans %}Edit title{% endtrans %}">✎</a></h1>
             <a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link"><span>{{ entry.url | e | domainName }}</span></a>
         </header>
         <aside class="tags">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
new file mode 100644
index 00000000..cac9a96b
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
@@ -0,0 +1,40 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel">
+
+                <form name="entry" method="post" action="">
+                    <div class="card-content">
+
+                        {% if form_errors(form) %}
+                            <span class="black-text">{{ form_errors(form) }}</span>
+                        {% endif %}
+
+                        {% if form_errors(form.url) %}
+                            <span class="black-text">{{ form_errors(form.url) }}</span>
+                        {% endif %}
+
+                        <div class="input-field s12">
+                            {{ form_label(form.url) }}
+                            {{ form_widget(form.url) }}
+                        </div>
+
+                        <button class="btn waves-effect waves-light" type="submit" name="entry[save]">
+                            {% trans %}Save{% endtrans %}
+                            <i class="mdi-content-send right"></i>
+                        </button>
+                    </div>
+                    <div class="hidden">{{ form_rest(form) }}</div>
+                </form>
+
+
+                {{ form(form) }}
+
+            </div>
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig
new file mode 100644
index 00000000..8f698e17
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/checkEmail.html.twig
@@ -0,0 +1,27 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+
+{% block content %}
+    <main class="valign-wrapper">
+        <div class="valign row">
+            <h1>{% trans %}Forgot password{% endtrans %}</h1>
+            <div class="card sw">
+                <div class="card-content">
+                    <span class="card-title black-text">
+                        <p>{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}</p>
+                    </span>
+                </div>
+            </div>
+        </div>
+    </main>
+    <style>
+    main {
+        padding: 0;
+    }
+    </style>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
new file mode 100644
index 00000000..7d7fea6f
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/forgotPassword.html.twig
@@ -0,0 +1,56 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+
+{% block content %}
+    <main class="valign-wrapper">
+        <div class="valign row">
+            <h1>{% trans %}Forgot password{% endtrans %}</h1>
+            <div class="card sw">
+                <form action="{{ path('forgot_password') }}" method="post" name="forgotPasswordform">
+                    <div class="card-content">
+
+                        <span class="card-title black-text"><p>{% trans %}Enter your email address below and we'll send you password reset instructions.{% endtrans %}</p></span>
+
+                        {% if form_errors(form) %}
+                            <span class="black-text">{{ form_errors(form) }}</span>
+                        {% endif %}
+
+                        {% for flashMessage in app.session.flashbag.get('notice') %}
+                            <span class="black-text"><p>{{ flashMessage }}</p></span>
+                        {% endfor %}
+
+                        {% if form_errors(form.email) %}
+                            <span class="black-text">{{ form_errors(form.email) }}</span>
+                        {% endif %}
+
+                        <div class="input-field s12">
+                            {{ form_label(form.email) }}
+                            {{ form_widget(form.email) }}
+                        </div>
+
+                    </div>
+                    <div class="card-action">
+                        <button class="btn waves-effect waves-light" type="submit" name="send">
+                            {% trans %}Send{% endtrans %}
+                            <i class="mdi-content-send right"></i>
+                        </button>
+                    </div>
+                    {{ form_rest(form) }}
+                </form>
+            </div>
+        </div>
+    </main>
+    <style>
+    main {
+        padding: 0;
+    }
+    </style>
+{% endblock %}
+
+{% block footer %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
new file mode 100644
index 00000000..8f60fbe2
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/login.html.twig
@@ -0,0 +1,58 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}login to your wallabag{% endtrans %}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+{% block messages %}{% endblock %}
+
+{% block content %}
+    <main class="valign-wrapper">
+        <div class="valign row">
+            <h1>{% trans %}Login to wallabag{% endtrans %}</h1>
+            <div class="card sw">
+                <form action="{{ path('login_check') }}" method="post" name="loginform">
+                    <div class="card-content">
+
+                        {% if error %}
+                            <span class="black-text">{{ error.message }}</span>
+                        {% endif %}
+
+                        {% for flashMessage in app.session.flashbag.get('notice') %}
+                            <span class="black-text"><p>{{ flashMessage }}</p></span>
+                        {% endfor %}
+
+                        <div class="input-field s12">
+                            <label for="username">{% trans %}Username{% endtrans %}</label>
+                            <input type="text" id="username" name="_username" value="{{ last_username }}" />
+                        </div>
+
+                        <div class="input-field s12">
+                            <label for="password">{% trans %}Password{% endtrans %}</label>
+                            <input type="password" id="password" name="_password" />
+                        </div>
+
+                    </div>
+                    <div class="card-action">
+                        <button class="btn waves-effect waves-light" type="submit" name="send">
+                            {% trans %}Login{% endtrans %}
+                            <i class="mdi-content-send right"></i>
+                        </button>
+                    </div>
+                </form>
+            </div>
+            <div class="center">
+                <a href="{{ path('forgot_password') }}">{% trans %}Forgot your password?{% endtrans %}</a>
+            </div>
+        </div>
+    </main>
+    <style>
+    main {
+        padding: 0;
+    }
+    </style>
+{% endblock %}
+
+{% block footer %}
+{% endblock %}
\ No newline at end of file
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig
new file mode 100644
index 00000000..09d0b634
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Security/reset.html.twig
@@ -0,0 +1,57 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}Change password{% endtrans %}{% endblock %}
+
+{% block body_class %}login{% endblock %}
+
+{% block menu %}{% endblock %}
+
+{% block content %}
+    <main class="valign-wrapper">
+        <div class="valign row">
+            <div class="card sw">
+                <form action="{{ path('forgot_password_reset', {'token': token}) }}" method="post" name="loginform">
+                    <div class="card-content">
+
+                        <span class="card-title black-text"><p>{% trans %}Change password{% endtrans %}</p></span>
+
+                        {% if form_errors(form) %}
+                            <span class="black-text">{{ form_errors(form) }}</span>
+                        {% endif %}
+
+                        {% if form_errors(form.new_password.first) %}
+                            <span class="black-text">{{ form_errors(form.new_password.first) }}</span>
+                        {% endif %}
+
+                        {% if form_errors(form.new_password.second) %}
+                            <span class="black-text">{{ form_errors(form.new_password.second) }}</span>
+                        {% endif %}
+
+                        <div class="input-field s12">
+                            {{ form_label(form.new_password.first) }}
+                            {{ form_widget(form.new_password.first) }}
+                        </div>
+
+                        <div class="input-field s12">
+                            {{ form_label(form.new_password.second) }}
+                            {{ form_widget(form.new_password.second) }}
+                        </div>
+
+                    </div>
+                    <div class="card-action">
+                        <button class="btn waves-effect waves-light" type="submit" name="send">
+                            {% trans %}Change password{% endtrans %}
+                            <i class="mdi-content-send right"></i>
+                        </button>
+                    </div>
+                    {{ form_rest(form) }}
+                </form>
+            </div>
+        </div>
+    </main>
+    <style>
+    main {
+        padding: 0;
+    }
+    </style>
+{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
index 247c871e..0c8a2a29 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
@@ -68,11 +68,14 @@
                                 </a>
                             </li>
                         {% endblock %}
-                        <li class="bold"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
-                        <li class="bold"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
-                        <li class="bold"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
-                        <li class="bold border-bottom"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
-                        <li class="bold"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
+
+                        {% set currentRoute = app.request.attributes.get('_route') %}
+
+                        <li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
+                        <li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
+                        <li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
+                        <li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
+                        <li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
                         <li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
                     </ul>
                     <div class="nav-wrapper nav-panels">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 49549edc..8ec83f89 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@ -128,7 +128,7 @@ main ul.row {
     padding: 0px 0.75rem;
 }
 
-main .card .card-content {
+.data .card .card-content {
     min-height: 25em;
 }
 
@@ -158,6 +158,12 @@ main .card .card-content {
     padding-bottom: 15px;
 }
 
+.card.sw {
+    max-width: 370px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 /* ==========================================================================
    4 = Article
    ========================================================================== */
@@ -194,6 +200,18 @@ main .card .card-content {
     header, main, footer {
       padding-left: 0;
     }
+    nav, main, footer {
+        padding-left: 0;
+    }
+    .pagination {
+        width: auto;
+    }
+    .reader-mode {
+        width: 240px !important;
+    }
+    .reader-mode span {
+        opacity: 1;
+    }
   }
 
 @media only screen and (min-width : 993px) and (max-width : 1180px) {
@@ -229,15 +247,6 @@ main .card .card-content {
     margin-left: 0; }
 }
 
-@media only screen and (max-width : 993px) {
-    nav, main, footer {
-        padding-left: 0;
-    }
-    .pagination {
-        width: auto;
-    }
-}
-
 @media only screen and (max-width : 350px) {
     .nb-results {
         display: none;
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 9847658e..b0f82c4b 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -15,14 +15,14 @@ $(document).ready(function(){
     $('#nav-btn-search').click(function(){
         $(".nav-panel-buttom").hide(100);
         $(".nav-panel-search").show(100);
-        $(".nav-panel-menu").hide(100);
+        $(".nav-panel-menu").addClass('hidden');
         return false;
     });
     $('.mdi-navigation-close').click(function(){
         $(".nav-panel-add").hide(100);
         $(".nav-panel-search").hide(100);
         $(".nav-panel-buttom").show(100);
-        $(".nav-panel-menu").show(100);
+        $(".nav-panel-menu").removeClass('hidden');
         return false;
     });
 });
\ No newline at end of file
-- 
2.41.0