Merge pull request #1369 from wallabag/v2-bottombar

fix #1332: bottom bar to display message

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index d47a585c82fa8eca12f1a1a5aa6cc2e4024fc316..287c5fbb41efdb11b2432743ca7c8c35b0c667c2 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -57,7 +57,7 @@
 
 
                     <div id="set2" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.rss) }}>
+                        <form action="{{ path('config') }}#set2" method="post" {{ form_enctype(form.rss) }}>
                             {{ form_errors(form.rss) }}
 
                             <div class="row">
@@ -106,7 +106,7 @@
 
 
                     <div id="set3" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.user) }}>
+                        <form action="{{ path('config') }}#set3" method="post" {{ form_enctype(form.user) }}>
                             {{ form_errors(form.user) }}
 
                             <div class="row">
@@ -135,7 +135,7 @@
 
 
                     <div id="set4" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.pwd) }}>
+                        <form action="{{ path('config') }}#set4" method="post" {{ form_enctype(form.pwd) }}>
                             {{ form_errors(form.pwd) }}
 
                             <div class="row">
@@ -172,7 +172,7 @@
 
 
                     <div id="set5" class="col s12">
-                        <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_user) }}>
+                        <form action="{{ path('config') }}#set5" method="post" {{ form_enctype(form.new_user) }}>
                             {{ form_errors(form.new_user) }}
 
                             <div class="row">

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 67061e4c7441e03893d43c81fc7975959fd99c2d..bd64067c567de99ab798ea61e62ae402070de1c9 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -78,15 +78,13 @@
                 </div>
 
 
-                <div class="col s12">
-
-                    <label>{% trans %}Create at{% endtrans %}</label>
-
-                    <label>{% trans %}Domain name{% endtrans %}</label>
-                </div>
                 <div class="input-field col s6">
-                    {{ form_widget(form.domainName, {'type': 'text'}) }}
-                    <label for="entry_filter_domainName">{% trans %}www.website.com{% endtrans %}</label>
+                    {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }}
+                    <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label>
+                </div>
+
+                <div class="col s12">
+                    <label>{% trans %}Creation date{% endtrans %}</label>
                 </div>
 
                 <div class="input-field col s6">