aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-04-07 14:10:08 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-04-07 14:10:08 +0200
commit6a986910b6d69e8420e8cbf78b3d3c2cf55ac9f0 (patch)
tree6c50f0b2729aca1d0a0af4d5ac62e4b67f4ad89f /src
parent9479ae834c2953f2c46e1484a6ef28e0d2e0cb09 (diff)
parent8687bcd0c9c0d3279cddc05d29a22dcf88ce48c0 (diff)
downloadwallabag-6a986910b6d69e8420e8cbf78b3d3c2cf55ac9f0.tar.gz
wallabag-6a986910b6d69e8420e8cbf78b3d3c2cf55ac9f0.tar.zst
wallabag-6a986910b6d69e8420e8cbf78b3d3c2cf55ac9f0.zip
Merge pull request #1868 from wallabag/v2-tagrule-baggy
Remove keyboard shortcut and add tagging rule panel in baggy
Diffstat (limited to 'src')
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js13
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig91
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig136
3 files changed, 156 insertions, 84 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js
index a7acd84c..34e934cc 100755
--- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js
+++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/js/saveLink.js
@@ -79,19 +79,6 @@ $.fn.ready(function() {
79 }); 79 });
80 80
81 /* ========================================================================== 81 /* ==========================================================================
82 Keyboard gestion
83 ========================================================================== */
84
85 $(window).keydown(function(e){
86 if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || (e.keyCode == 27 && $bagitForm.is(':visible') ) ) {
87 $bagit.removeClass("current");
88 $("#bagit-arrow").removeClass("arrow-down");
89 toggleSaveLinkForm();
90 return false;
91 }
92 });
93
94 /* ==========================================================================
95 Process all links inside an article 82 Process all links inside an article
96 ========================================================================== */ 83 ========================================================================== */
97 84
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 89e6e076..0798962c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -49,7 +49,7 @@
49 49
50 <h2>{{ 'config.tab_menu.rss'|trans }}</h2> 50 <h2>{{ 'config.tab_menu.rss'|trans }}</h2>
51 51
52 {{ form_start(form.rss) }} 52 {{ form_start(form.rss) }}
53 {{ form_errors(form.rss) }} 53 {{ form_errors(form.rss) }}
54 54
55 <div class="row"> 55 <div class="row">
@@ -169,7 +169,7 @@
169 {{ form_rest(form.pwd) }} 169 {{ form_rest(form.pwd) }}
170 </form> 170 </form>
171 171
172 <h2>{{ 'config.tab_menu.rules'|trans }}}</h2> 172 <h2>{{ 'config.tab_menu.rules'|trans }}</h2>
173 173
174 <ul> 174 <ul>
175 {% for tagging_rule in app.user.config.taggingRules %} 175 {% for tagging_rule in app.user.config.taggingRules %}
@@ -183,7 +183,7 @@
183 {% endfor %} 183 {% endfor %}
184 </ul> 184 </ul>
185 185
186 {{ form_start(form.new_tagging_rule) }} 186 {{ form_start(form.new_tagging_rule) }}
187 {{ form_errors(form.new_tagging_rule) }} 187 {{ form_errors(form.new_tagging_rule) }}
188 188
189 <fieldset class="w500p inline"> 189 <fieldset class="w500p inline">
@@ -205,6 +205,91 @@
205 {{ form_rest(form.new_tagging_rule) }} 205 {{ form_rest(form.new_tagging_rule) }}
206 </form> 206 </form>
207 207
208 <div class="row">
209 <div class="input-field col s12">
210 <h3>{{ 'config.form_rules.faq.title'|trans }}</h3>
211
212 <h4>{{ 'config.form_rules.faq.tagging_rules_definition_title'|trans }}</h4>
213 <p class="help">{{ 'config.form_rules.faq.tagging_rules_definition_description'|trans|raw }}</p>
214
215 <h4>{{ 'config.form_rules.faq.how_to_use_them_title'|trans }}</h4>
216 <p class="help">{{ 'config.form_rules.faq.how_to_use_them_description'|trans|raw }}</p>
217
218 <h4>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h4>
219 <p class="help">
220 {{ 'config.form_rules.faq.variables_available_description'|trans }}
221 </p>
222
223 <table class="bordered">
224 <thead>
225 <tr>
226 <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
227 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
228 <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
229 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
230 </tr>
231 </thead>
232
233 <tbody>
234 <tr>
235 <td>title</td>
236 <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
237 <td>&lt;=</td>
238 <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
239 </tr>
240 <tr>
241 <td>url</td>
242 <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
243 <td>&lt;</td>
244 <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
245 </tr>
246 <tr>
247 <td>isArchived</td>
248 <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
249 <td>=&gt;</td>
250 <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
251 </tr>
252 <tr>
253 <td>isStarred</td>
254 <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
255 <td>&gt;</td>
256 <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
257 </tr>
258 <tr>
259 <td>content</td>
260 <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
261 <td>=</td>
262 <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
263 </tr>
264 <tr>
265 <td>language</td>
266 <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
267 <td>!=</td>
268 <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
269 </tr>
270 <tr>
271 <td>mimetype</td>
272 <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
273 <td>OR</td>
274 <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
275 </tr>
276 <tr>
277 <td>readingTime</td>
278 <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
279 <td>AND</td>
280 <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
281 </tr>
282 <tr>
283 <td>domainName</td>
284 <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
285 <td>matches</td>
286 <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
287 </tr>
288 </tbody>
289 </table>
290 </div>
291 </div>
292
208 {% if is_granted('ROLE_SUPER_ADMIN') %} 293 {% if is_granted('ROLE_SUPER_ADMIN') %}
209 <h2>{{ 'config.tab_menu.new_user'|trans }}</h2> 294 <h2>{{ 'config.tab_menu.new_user'|trans }}</h2>
210 295
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 3343a1d2..5b94f01c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -250,75 +250,75 @@
250 <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5> 250 <h5>{{ 'config.form_rules.faq.variables_available_title'|trans }}</h5>
251 <p class="help"> 251 <p class="help">
252 {{ 'config.form_rules.faq.variables_available_description'|trans }} 252 {{ 'config.form_rules.faq.variables_available_description'|trans }}
253
254 <table class="bordered">
255 <thead>
256 <tr>
257 <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
258 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
259 <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
260 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
261 </tr>
262 </thead>
263
264 <tbody>
265 <tr>
266 <td>title</td>
267 <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
268 <td>&lt;=</td>
269 <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
270 </tr>
271 <tr>
272 <td>url</td>
273 <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
274 <td>&lt;</td>
275 <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
276 </tr>
277 <tr>
278 <td>isArchived</td>
279 <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
280 <td>=&gt;</td>
281 <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
282 </tr>
283 <tr>
284 <td>isStarred</td>
285 <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
286 <td>&gt;</td>
287 <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
288 </tr>
289 <tr>
290 <td>content</td>
291 <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
292 <td>=</td>
293 <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
294 </tr>
295 <tr>
296 <td>language</td>
297 <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
298 <td>!=</td>
299 <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
300 </tr>
301 <tr>
302 <td>mimetype</td>
303 <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
304 <td>OR</td>
305 <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
306 </tr>
307 <tr>
308 <td>readingTime</td>
309 <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
310 <td>AND</td>
311 <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
312 </tr>
313 <tr>
314 <td>domainName</td>
315 <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
316 <td>matches</td>
317 <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
318 </tr>
319 </tbody>
320 </table>
321 </p> 253 </p>
254
255 <table class="bordered">
256 <thead>
257 <tr>
258 <th>{{ 'config.form_rules.faq.variable_description.label'|trans }}</th>
259 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
260 <th>{{ 'config.form_rules.faq.operator_description.label'|trans }}</th>
261 <th>{{ 'config.form_rules.faq.meaning'|trans }}</th>
262 </tr>
263 </thead>
264
265 <tbody>
266 <tr>
267 <td>title</td>
268 <td>{{ 'config.form_rules.faq.variable_description.title'|trans }}</td>
269 <td>&lt;=</td>
270 <td>{{ 'config.form_rules.faq.operator_description.less_than'|trans }}</td>
271 </tr>
272 <tr>
273 <td>url</td>
274 <td>{{ 'config.form_rules.faq.variable_description.url'|trans }}</td>
275 <td>&lt;</td>
276 <td>{{ 'config.form_rules.faq.operator_description.strictly_less_than'|trans }}</td>
277 </tr>
278 <tr>
279 <td>isArchived</td>
280 <td>{{ 'config.form_rules.faq.variable_description.isArchived'|trans }}</td>
281 <td>=&gt;</td>
282 <td>{{ 'config.form_rules.faq.operator_description.greater_than'|trans }}</td>
283 </tr>
284 <tr>
285 <td>isStarred</td>
286 <td>{{ 'config.form_rules.faq.variable_description.isStarred'|trans }}</td>
287 <td>&gt;</td>
288 <td>{{ 'config.form_rules.faq.operator_description.strictly_greater_than'|trans }}</td>
289 </tr>
290 <tr>
291 <td>content</td>
292 <td>{{ 'config.form_rules.faq.variable_description.content'|trans }}</td>
293 <td>=</td>
294 <td>{{ 'config.form_rules.faq.operator_description.equal_to'|trans }}</td>
295 </tr>
296 <tr>
297 <td>language</td>
298 <td>{{ 'config.form_rules.faq.variable_description.language'|trans }}</td>
299 <td>!=</td>
300 <td>{{ 'config.form_rules.faq.operator_description.not_equal_to'|trans }}</td>
301 </tr>
302 <tr>
303 <td>mimetype</td>
304 <td>{{ 'config.form_rules.faq.variable_description.mimetype'|trans }}</td>
305 <td>OR</td>
306 <td>{{ 'config.form_rules.faq.operator_description.or'|trans }}</td>
307 </tr>
308 <tr>
309 <td>readingTime</td>
310 <td>{{ 'config.form_rules.faq.variable_description.readingTime'|trans }}</td>
311 <td>AND</td>
312 <td>{{ 'config.form_rules.faq.operator_description.and'|trans }}</td>
313 </tr>
314 <tr>
315 <td>domainName</td>
316 <td>{{ 'config.form_rules.faq.variable_description.domainName'|trans }}</td>
317 <td>matches</td>
318 <td>{{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}</td>
319 </tr>
320 </tbody>
321 </table>
322 </div> 322 </div>
323 </div> 323 </div>
324 </div> 324 </div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 22:10:11 +0000