Merge pull request #1319 from wallabag/v2-form-header

add new post form in material header

10 files changed, 66 insertions, 52 deletions

diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 8894690c..6944a686 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -18,11 +18,11 @@ class EntryController extends Controller
     /**
      * @param Request $request
      *
-     * @Route("/new", name="new_entry")
+     * @Route("/new-entry", name="new_entry")
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function addEntryAction(Request $request)
+    public function addEntryFormAction(Request $request)
     {
         $entry = new Entry($this->getUser());
 
@@ -48,12 +48,24 @@ class EntryController extends Controller
             return $this->redirect($this->generateUrl('homepage'));
         }
 
-        return $this->render('WallabagCoreBundle:Entry:new.html.twig', array(
+        return $this->render('WallabagCoreBundle:Entry:new_form.html.twig', array(
             'form' => $form->createView(),
         ));
     }
 
     /**
+     * @param Request $request
+     *
+     * @Route("/new", name="new")
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function addEntryAction(Request $request)
+    {
+        return $this->render('WallabagCoreBundle:Entry:new.html.twig');
+    }
+
+    /**
      * Edit an entry content.
      *
      * @param Request $request
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
index b11512a4..95ed0785 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig
@@ -3,5 +3,5 @@
 {% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
 
 {% block content %}
-    {{ form(form) }}
+    {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig
new file mode 100644
index 00000000..d182d552
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/Entry/new_form.html.twig
@@ -0,0 +1,15 @@
+<form name="entry" method="post" action="{{ path('new_entry')}}">
+
+        {% 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 %}
+
+        {{ form_label(form.url) }}
+        {{ form_widget(form.url) }}
+
+    <div class="hidden">{{ form_rest(form) }}</div>
+</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig
index c69c03c3..58cb316b 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig
@@ -7,7 +7,7 @@
 
     <p>{% trans %}There are several ways to save an article:{% endtrans %}</p>
     <ul>
-        <li><a href="{{ path('new_entry') }}">{% trans %}Thanks to this form{% endtrans %}</a></li>
+        <li><a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a></li>
     </ul>
     <h3>{% trans %}Browser Addons{% endtrans %}</h3>
     <ul>
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 162fb463..c381a08c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -72,7 +72,7 @@
                     <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
                     <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
                     <li><a href="{{ path ('tag') }}">{% trans %}tags{% endtrans %}</a></li>
-                    <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
+                    <li><a href="{{ path('new') }}">{% trans %}save a link{% endtrans %}</a></li>
                     <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
                         <div id="search-form" class="messages info popup-form">
                             <form method="get" action="index.php">
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
index cac9a96b..95ed0785 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new.html.twig
@@ -3,38 +3,5 @@
 {% 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>
+    {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }}
 {% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
new file mode 100644
index 00000000..1a3ab86d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/new_form.html.twig
@@ -0,0 +1,14 @@
+<form name="entry" method="post" action="{{ path('new_entry')}}">
+
+        {% 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 %}
+
+        {{ form_widget(form.url) }}
+
+    <div class="hidden">{{ form_rest(form) }}</div>
+</form>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
index a0a02cc8..6f98ba99 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/howto.html.twig
@@ -20,7 +20,7 @@
 
 
                     <div id="set1" class="col s12">
-                        <a href="{{ path('new_entry') }}">{% trans %}Thanks to this form{% endtrans %}</a>
+                        <a href="{{ path('new') }}">{% trans %}Thanks to this form{% endtrans %}</a>
                     </div>
 
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 2b32c2f9..5a1f7001 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -58,7 +58,7 @@
             </div>
             <div class="input-field nav-panel-buttom">
                 <ul>
-                    <li class="bold"><a class="waves-effect" href="{{ path('new_entry') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
+                    <li class="bold"><a class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"><i class="mdi-content-add"></i></a></li>
                     <li><a class="waves-effect" href="javascript: void(null);" id="nav-btn-search"><i class="mdi-action-search"></i></a>
                 </ul>
             </div>
@@ -69,6 +69,11 @@
                     <i class="mdi-navigation-close"></i>
                 </div>
             </form>
+            <div class="input-field nav-panel-add" style="display: none">
+                {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }}
+                <label for="add"><i class="mdi-content-add"></i></label>
+                <i class="mdi-navigation-close"></i>
+            </div>
             <!--<form name="entry" method="post" action="{{ path('new_entry') }}">
                 <div class="input-field nav-panel-add" style="display: none">
                     <input id="add entry_url" name="entry[url]" type="search" required placeholder="{% trans %}Enter your link here{% endtrans %}">
@@ -113,4 +118,4 @@
             </div>
         </div>
     </footer>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
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 fdfda380..9341cb5a 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
@@ -6,15 +6,16 @@ $(document).ready(function(){
         accordion : false
     });
 
-    //$('#nav-btn-add').click(function(){
-    //    $(".nav-panel-buttom").hide(100);
-    //    $(".nav-panel-add").show(100);
-    //    $(".nav-panel-menu").hide(100);
-    //    $(".nav-panels .action").hide(100);
-    //    $(".nav-panel-menu").addClass('hidden');
-    //    $(".nav-panels").css('background', 'white');
-    //    return false;
-    //});
+    $('#nav-btn-add').click(function(){
+       $(".nav-panel-buttom").hide(100);
+       $(".nav-panel-add").show(100);
+       $(".nav-panel-menu").hide(100);
+       $(".nav-panels .action").hide(100);
+       $(".nav-panel-menu").addClass('hidden');
+       $(".nav-panels").css('background', 'white');
+       $("#entry_url").focus();
+       return false;
+    });
     $('#nav-btn-search').click(function(){
         $(".nav-panel-buttom").hide(100);
         $(".nav-panel-search").show(100);