aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-08-25 23:24:24 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2015-09-13 14:56:34 +0200
commit5def3f5862c4c8cc3faa19cd79a3746570064790 (patch)
treeac891192a07a11e2d3a8842576a70a53fc34e771
parent71e51207ce7a33fc773e8b95a21f11679b9a9f3a (diff)
downloadwallabag-5def3f5862c4c8cc3faa19cd79a3746570064790.tar.gz
wallabag-5def3f5862c4c8cc3faa19cd79a3746570064790.tar.zst
wallabag-5def3f5862c4c8cc3faa19cd79a3746570064790.zip
Filters view on side for baggy
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig75
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css29
2 files changed, 88 insertions, 16 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 28bf0ab9..26cafc42 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -20,15 +20,6 @@
20 </div> 20 </div>
21 {% endblock %} 21 {% endblock %}
22 22
23 <div id="filter-form" class="messages info popup-form">
24 <form method="get" action="{{ path('all') }}">
25 <h2>{% trans %}Filter{% endtrans %}</h2>
26 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
27 {{ form_rest(form) }}
28 <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filter{% endtrans %}</button>
29 </form>
30 </div>
31
32 {% if entries is empty %} 23 {% if entries is empty %}
33 <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div> 24 <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div>
34 {% else %} 25 {% else %}
@@ -55,4 +46,70 @@
55 </div> 46 </div>
56 {% endfor %} 47 {% endfor %}
57 {% endif %} 48 {% endif %}
49
50 <aside id="filter-form" class="">
51 <form method="get" action="{{ path('all') }}">
52 <h2>{% trans %}Filters{% endtrans %}</h2>
53 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
54
55 <div id="filter-status" class="filter-group">
56 <div class="">
57 <label>{% trans %}Status{% endtrans %}</label>
58 </div>
59 <div class="input-field">
60 {{ form_widget(form.isArchived) }}
61 <label for="entry_filter_isArchived">{% trans %}Archived{% endtrans %}</label>
62 </div>
63
64 <div class="input-field">
65 {{ form_widget(form.isStarred) }}
66 <label for="entry_filter_isStarred">{% trans %}Starred{% endtrans %}</label>
67 </div>
68 </div>
69 <div id="filter-reading-time" class="filter-group">
70 <div class="">
71 <label>{% trans %}Reading time in minutes{% endtrans %}</label>
72 </div>
73 <div class="input-field ">
74 <label for="entry_filter_readingTime_left_number">{% trans %}from{% endtrans %}</label>
75 {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
76 </div>
77 <div class="input-field ">
78 <label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
79 {{ form_widget(form.readingTime.right_number, {'type': 'number'}) }}
80 </div>
81 </div>
82
83 <div id="filter-domain-name" class="filter-group">
84 <label for="entry_filter_domainName">{% trans %}Domain name{% endtrans %}</label>
85 <div class="input-field ">
86 {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }}
87 </div>
88 </div>
89
90 <div id="filter-creation-date" class="filter-group">
91 <div class="">
92 <label>{% trans %}Creation date{% endtrans %}</label>
93 </div>
94 <div class="input-field ">
95 <label for="entry_filter_createdAt_left_date" class="active">{% trans %}from{% endtrans %}</label>
96 {{ form_widget(form.createdAt.left_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.left_date.vars.value} }) }}
97 </div>
98 <div class="input-field ">
99 <label for="entry_filter_createdAt_right_date" class="active">{% trans %}to{% endtrans %}</label>
100 {{ form_widget(form.createdAt.right_date, {'type': 'date', 'attr': {'class': 'datepicker', 'data-value': form.createdAt.right_date.vars.value} }) }}
101 </div>
102 </div>
103 <div id="filter-buttons" class="filter-group">
104
105 <div class="">
106 <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a>
107 </div>
108
109 <button class="btn waves-effect waves-light" type="submit" id="submit-filter" value="filter">{% trans %}Filters{% endtrans %}</button>
110
111 </div>
112 </form>
113 </aside>
114
58{% endblock %} 115{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index dee307f3..16ff2fe2 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
@@ -940,16 +940,31 @@ pre code {
940} 940}
941 941
942#filter-form { 942#filter-form {
943 margin-top: 30px !important; 943 position: fixed;
944 width: 500px; 944 width: 15%;
945 height: 370px; 945 height: 100%;
946 right: 5em; 946 top: 0;
947 left: inherit; 947 right: 0;
948 background-color: #FFF;
949 padding: 15px;
950 padding-right: 30px;
951 padding-top: 30px;
952
953 z-index: 12;
954
955 /*transition-property: transform;
956 transition-duration: 0.3s;
957 transition-delay: 0.3s;
958
959 transform: translate3d(100%, 0, 0);*/
948} 960}
949 961
950#filter-form form { 962#filter-form form {
951 width: 500px; 963
952 height: 370px; 964}
965
966#filter-form form .filter-group {
967 margin: 5px;
953} 968}
954 969
955 970