From a78d6afeaafb372cb5d620db7361b8ad98f070dc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Aug 2015 19:58:23 +0200 Subject: Move baggy theme in its folder --- .../views/themes/baggy/Config/index.html.twig | 169 +++++++++++++++++++++ .../views/themes/baggy/Entry/edit.html.twig | 7 + .../views/themes/baggy/Entry/entries.html.twig | 48 ++++++ .../views/themes/baggy/Entry/entries.xml.twig | 34 +++++ .../views/themes/baggy/Entry/entry.html.twig | 104 +++++++++++++ .../views/themes/baggy/Entry/new.html.twig | 7 + .../views/themes/baggy/Entry/new_form.html.twig | 15 ++ .../themes/baggy/Mail/forgotPassword.txt.twig | 6 + .../themes/baggy/Security/checkEmail.html.twig | 17 +++ .../themes/baggy/Security/forgotPassword.html.twig | 31 ++++ .../views/themes/baggy/Security/login.html.twig | 39 +++++ .../views/themes/baggy/Security/reset.html.twig | 35 +++++ .../views/themes/baggy/Static/about.html.twig | 47 ++++++ .../views/themes/baggy/Static/howto.html.twig | 28 ++++ .../views/themes/baggy/Tag/new_form.html.twig | 15 ++ .../views/themes/baggy/Tag/tags.html.twig | 13 ++ 16 files changed, 615 insertions(+) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig create mode 100755 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') 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 new file mode 100644 index 00000000..c90bb2e3 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -0,0 +1,169 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Config{% endtrans %}{% endblock %} + +{% block content %} +

{% trans %}Wallabag configuration{% endtrans %}

+ +
+ {{ form_errors(form.config) }} + +
+
+ {{ form_label(form.config.theme) }} + {{ form_errors(form.config.theme) }} + {{ form_widget(form.config.theme) }} +
+
+ +
+
+ {{ form_label(form.config.items_per_page) }} + {{ form_errors(form.config.items_per_page) }} + {{ form_widget(form.config.items_per_page) }} +
+
+ +
+
+ {{ form_label(form.config.language) }} + {{ form_errors(form.config.language) }} + {{ form_widget(form.config.language) }} +
+
+ + {{ form_rest(form.config) }} +
+ +

{% trans %}RSS configuration{% endtrans %}

+ +
+ {{ form_errors(form.rss) }} + +
+
+ + {% if rss.token %} + {{ rss.token }} + {% else %} + No token + {% endif %} + – + Regenerate ? +
+
+ +
+
+ + {% if rss.token %} + + {% else %} + You need to generate a token first. + {% endif %} +
+
+ +
+
+ {{ form_label(form.rss.rss_limit) }} + {{ form_errors(form.rss.rss_limit) }} + {{ form_widget(form.rss.rss_limit) }} +
+
+ + {{ form_rest(form.rss) }} +
+ +

{% trans %}User information{% endtrans %}

+ +
+ {{ form_errors(form.user) }} + +
+
+ {{ form_label(form.user.name) }} + {{ form_errors(form.user.name) }} + {{ form_widget(form.user.name) }} +
+
+ +
+
+ {{ form_label(form.user.email) }} + {{ form_errors(form.user.email) }} + {{ form_widget(form.user.email) }} +
+
+ + {{ form_rest(form.user) }} +
+ +

{% trans %}Change your password{% endtrans %}

+ +
+ {{ form_errors(form.pwd) }} + +
+
+ {{ form_label(form.pwd.old_password) }} + {{ form_errors(form.pwd.old_password) }} + {{ form_widget(form.pwd.old_password) }} +
+
+ +
+
+ {{ form_label(form.pwd.new_password.first) }} + {{ form_errors(form.pwd.new_password.first) }} + {{ form_widget(form.pwd.new_password.first) }} +
+
+ +
+
+ {{ form_label(form.pwd.new_password.second) }} + {{ form_errors(form.pwd.new_password.second) }} + {{ form_widget(form.pwd.new_password.second) }} +
+
+ + {{ form_rest(form.pwd) }} +
+ +

{% trans %}Add a user{% endtrans %}

+ +
+ {{ form_errors(form.new_user) }} + +
+
+ {{ form_label(form.new_user.username) }} + {{ form_errors(form.new_user.username) }} + {{ form_widget(form.new_user.username) }} +
+
+ +
+
+ {{ form_label(form.new_user.password) }} + {{ form_errors(form.new_user.password) }} + {{ form_widget(form.new_user.password) }} +
+
+ +
+
+ {{ form_label(form.new_user.email) }} + {{ form_errors(form.new_user.email) }} + {{ form_widget(form.new_user.email) }} +
+
+ + {{ form_rest(form.new_user) }} +
+{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig new file mode 100644 index 00000000..0d4d5ad2 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/edit.html.twig @@ -0,0 +1,7 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Edit an entry{% endtrans %}{% endblock %} + +{% block content %} + {{ form(form) }} +{% endblock %} 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 new file mode 100644 index 00000000..0d295431 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -0,0 +1,48 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title "Unread" %} + +{% block content %} + {% block pager %} + {% if entries is not empty %} +
+
{{ entries.count }} {% trans %}entries{% endtrans %}
+ +
+ {% endif %} + {% endblock %} + + {% if entries is empty %} +

{% trans %}No articles found.{% endtrans %}

+ {% else %} +
{{ form_rest(form) }}
+ {% for entry in entries %} +
+

{{ entry.title|raw }}

+ {% if entry.readingTime > 0 %} +
{% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min
+ {% else %} +
{% trans %}estimated reading time :{% endtrans %} < 1 min
+ {% endif %} + + + {% if entry.previewPicture is null %} +

{{ entry.content|striptags|slice(0, 300) }}…

+ {% else %} + {{ entry.title|raw }} + {% endif %} +
+ {% endfor %} + {% endif %} +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig new file mode 100644 index 00000000..a39a8dc3 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.xml.twig @@ -0,0 +1,34 @@ + + + + wallabag — {{type}} feed + {{ url('unread') }} + {{ "now"|date('D, d M Y H:i:s') }} + wallabag + wallabag {{type}} elements + + {% for entry in entries %} + + + <![CDATA[{{ entry.title }}]]> + wallabag + {{ url('view', { 'id': entry.id }) }} + {{ url('view', { 'id': entry.id }) }} + {{ entry.createdAt|date('D, d M Y H:i:s') }} + + 0 -%} + {% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min + {%- else -%} + {% trans %}estimated reading time :{% endtrans %} < 1 min + {%- endif %} + + {{ entry.content|raw -}} + ]]> + + + + {% endfor %} + + + diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig new file mode 100644 index 00000000..f58d0399 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -0,0 +1,104 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{{ entry.title|raw }} ({{ entry.domainName }}){% endblock %} + +{% block content %} +
+ +
+
+
+

{{ entry.title|raw }} ✎

+
+ + {% if entry.previewPicture is not null %} +
{{ entry.title|raw }}
+ {% endif %} +
+ {{ entry.content | raw }} +
+
+ + +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig new file mode 100644 index 00000000..95ed0785 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new.html.twig @@ -0,0 +1,7 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %} + +{% block content %} + {{ render(controller( "WallabagCoreBundle:Entry:addEntryForm" )) }} +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig new file mode 100644 index 00000000..d182d552 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/new_form.html.twig @@ -0,0 +1,15 @@ +
+ + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} + + {% if form_errors(form.url) %} + {{ form_errors(form.url) }} + {% endif %} + + {{ form_label(form.url) }} + {{ form_widget(form.url) }} + + +
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig new file mode 100644 index 00000000..631bcb88 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Mail/forgotPassword.txt.twig @@ -0,0 +1,6 @@ +Hello {{username}}! + +To reset your password - please visit {{confirmationUrl}} + +Regards, +Wallabag bot diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig new file mode 100644 index 00000000..056d65b5 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/checkEmail.html.twig @@ -0,0 +1,17 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} + +{% block content %} +
+
+

{% trans %}Forgot password{% endtrans %}

+ +

{{ 'An email has been sent to %email%. It contains a link you must click to reset your password.'|trans({'%email%': email}) }}

+
+
+{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig new file mode 100644 index 00000000..4476ea7b --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/forgotPassword.html.twig @@ -0,0 +1,31 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Forgot password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} + +{% block content %} +
+
+

{% trans %}Forgot password{% endtrans %}

+ + {{ form_errors(form) }} + +

Enter your email address below and we'll send you password reset instructions.

+ +
+ {{ form_label(form.email) }} + {{ form_errors(form.email) }} + {{ form_widget(form.email) }} +
+ +
+ +
+
+ + {{ form_rest(form) }} +
+{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig new file mode 100644 index 00000000..5437d20c --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/login.html.twig @@ -0,0 +1,39 @@ +{% 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 %} +
+
+

{% trans %}Login to wallabag{% endtrans %}

+ {% if error %} +
{{ error.message }}
+ {% endif %} + + {% for flashMessage in app.session.flashbag.get('notice') %} +

{{ flashMessage }}

+ {% endfor %} + +
+ + +
+ +
+ + +
+ +
+ + + Forgot your password? +
+
+
+{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig new file mode 100644 index 00000000..fda88af2 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Security/reset.html.twig @@ -0,0 +1,35 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Change password{% endtrans %}{% endblock %} + +{% block body_class %}login{% endblock %} + +{% block menu %}{% endblock %} + +{% block content %} +
+
+

{% trans %}Change password{% endtrans %}

+ + {{ form_errors(form) }} + +
+ {{ form_label(form.new_password.first) }} + {{ form_errors(form.new_password.first) }} + {{ form_widget(form.new_password.first) }} +
+ +
+ {{ form_label(form.new_password.second) }} + {{ form_errors(form.new_password.second) }} + {{ form_widget(form.new_password.second) }} +
+ +
+ +
+
+ + {{ form_rest(form) }} +
+{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig new file mode 100755 index 00000000..311b5067 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig @@ -0,0 +1,47 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}About{% endtrans %}{% endblock %} + +{% block content %} +

{% trans %}Who is behind wallabag{% endtrans %}

+ +
+
{% trans %}Developed by{% endtrans %}
+
Nicolas Lœuillet — {% trans %}website{% endtrans %}
+
Thomas Citharel — {% trans %}website{% endtrans %}
+
Jérémy Benoist — {% trans %}website{% endtrans %}
+ +
{% trans %}And many others contributors ♥{% endtrans %} {% trans %}on Github{% endtrans %}
+ +
{% trans %}Project website{% endtrans %}
+
https://www.wallabag.org
+ +
{% trans %}License{% endtrans %}: MIT
+ +
{% trans %}Version{% endtrans %}: {{ version }}
+
+ +

{% trans %}Getting help{% endtrans %}

+ +
+
{% trans %}Documentation{% endtrans %}
+
english
+
français
+
deutsch
+ +
{% trans %}Bug reports{% endtrans %}
+
{% trans %}On our support website{% endtrans %} {% trans %}or{% endtrans %} {% trans %}on Github{% endtrans %}
+
+ +

{% trans %}Helping wallabag{% endtrans %}

+ +

{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}

+ +
+
{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}
+
by contributing to the project: an issue lists all our needs
+
{% trans %}via Paypal{% endtrans %}
+ +
{% trans %}via Flattr{% endtrans %}
+
+{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig new file mode 100644 index 00000000..58cb316b --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/howto.html.twig @@ -0,0 +1,28 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title %}{% trans %}Howto{% endtrans %}{% endblock %} + +{% block content %} +

{% trans %}Howto{% endtrans %}

+ +

{% trans %}There are several ways to save an article:{% endtrans %}

+ +

{% trans %}Browser Addons{% endtrans %}

+ +

{% trans %}Mobile Apps{% endtrans %}

+ +

{% trans %}Bookmarklet{% endtrans %}

+

+ {% trans %}Drag & drop this link to your bookmarks bar:{% endtrans %} {% trans %}bag it!{% endtrans %} +

+ +{% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig new file mode 100644 index 00000000..0b5a530d --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/new_form.html.twig @@ -0,0 +1,15 @@ +
+ + {% if form_errors(form) %} + {{ form_errors(form) }} + {% endif %} + + {% if form_errors(form.label) %} + {{ form_errors(form.label) }} + {% endif %} + + {{ form_widget(form.label, { 'attr': {'autocomplete': 'off'} }) }} + {{ form_widget(form.save, { 'attr': {'class': 'btn waves-effect waves-light'}, 'label': 'add tag' }) }} + + +
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig new file mode 100644 index 00000000..c2a461b8 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Tag/tags.html.twig @@ -0,0 +1,13 @@ +{% extends "WallabagCoreBundle::layout.html.twig" %} + +{% block title "Tags" %} + +{% block content %} + {% if tags is empty %} +

{% trans %}No tags found.{% endtrans %}

+ {% else %} + {% for tag in tags %} + {{tag.label}} + {% endfor %} + {% endif %} +{% endblock %} -- cgit v1.2.3 From 89ee994f772554b035e8033ee49c389f0f7786ba Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Aug 2015 20:15:57 +0200 Subject: Remove some global assets Some global assets where dedicated to baggy Remove some non-used css --- .../Resources/views/themes/baggy/layout.html.twig | 4 + .../views/themes/baggy/public/js/autoClose.js | 6 ++ .../themes/baggy/public/js/autoCompleteTags.js | 47 +++++++++ .../views/themes/baggy/public/js/closeMessage.js | 17 ++++ .../views/themes/baggy/public/js/popupForm.js | 72 ++++++++++++++ .../views/themes/baggy/public/js/saveLink.js | 109 +++++++++++++++++++++ 6 files changed, 255 insertions(+) create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoClose.js create mode 100755 src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoCompleteTags.js create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js create mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js create mode 100755 src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/saveLink.js (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index dffea036..229c5a34 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -14,4 +14,8 @@ {{ parent() }} + + + + {% endblock %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoClose.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoClose.js new file mode 100644 index 00000000..e9145b7e --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoClose.js @@ -0,0 +1,6 @@ +$(document).ready(function() { + current_url = window.location.href + if (current_url.match("&closewin=true")) { + window.close(); + } +}); diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoCompleteTags.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoCompleteTags.js new file mode 100755 index 00000000..90bc982c --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/autoCompleteTags.js @@ -0,0 +1,47 @@ +jQuery(function($) { + + function split( val ) { + return val.split( /,\s*/ ); + } + function extractLast( term ) { + return split( term ).pop(); + } + + + $("#value").bind("keydown", function(event) { + if (event.keyCode === $.ui.keyCode.TAB && $(this).data("ui-autocomplete").menu.active) { + event.preventDefault(); + } + }).autocomplete({ + source : function(request, response) { + $.getJSON("./?view=tags", { + term : extractLast(request.term), + //id: $(':hidden#entry_id').val() + }, response); + }, + search : function() { + // custom minLength + var term = extractLast(this.value); + if (term.length < 1) { + return false; + } + }, + focus : function() { + // prevent value inserted on focus + return false; + }, + select : function(event, ui) { + var terms = split(this.value); + // remove the current input + terms.pop(); + // add the selected item + terms.push(ui.item.value); + // add placeholder to get the comma-and-space at the end + terms.push(""); + this.value = terms.join(", "); + return false; + } + }); + + +}); diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js new file mode 100644 index 00000000..527719d5 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/closeMessage.js @@ -0,0 +1,17 @@ +$(function(){ + //--------------------------------------------------------------------------- + // Show the close icon when the user hover over a message + //--------------------------------------------------------------------------- + // $('.messages').on('mouseenter', function(){ + // $(this).find('a.closeMessage').stop(true, true).show(); + // }).on('mouseleave', function(){ + // $(this).find('a.closeMessage').stop(true, true).hide(); + // }); + //--------------------------------------------------------------------------- + // Close the message box when the user clicks the close icon + //--------------------------------------------------------------------------- + $('a.closeMessage').on('click', function(){ + $(this).parents('div.messages').slideUp(300, function(){ $(this).remove(); }); + return false; + }); +}); \ No newline at end of file diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js new file mode 100644 index 00000000..d233e600 --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js @@ -0,0 +1,72 @@ +$(document).ready(function() { + + $("#search-form").hide(); + $("#bagit-form").hide(); + + //--------------------------------------------------------------------------- + // Toggle the "Search" popup in the sidebar + //--------------------------------------------------------------------------- + function toggleSearch() { + $("#search-form").toggle(); + $("#search").toggleClass("current"); + $("#search").toggleClass("active-current"); + $("#search-arrow").toggleClass("arrow-down"); + if ($("#search").hasClass("current")) { + $("#content").addClass("opacity03"); + } else { + $("#content").removeClass("opacity03"); + } + } + + //--------------------------------------------------------------------------- + // Toggle the "Save a Link" popup in the sidebar + //--------------------------------------------------------------------------- + function toggleBagit() { + $("#bagit-form").toggle(); + $("#bagit").toggleClass("current"); + $("#bagit").toggleClass("active-current"); + $("#bagit-arrow").toggleClass("arrow-down"); + if ($("#bagit").hasClass("current")) { + $("#content").addClass("opacity03"); + } else { + $("#content").removeClass("opacity03"); + } + } + + //--------------------------------------------------------------------------- + // Close all #links popups in the sidebar + //--------------------------------------------------------------------------- + function closePopups() { + $("#links .messages").hide(); + $("#links > li > a").removeClass("active-current"); + $("#links > li > a").removeClass("current"); + $("[id$=-arrow]").removeClass("arrow-down"); + $("#content").removeClass("opacity03"); + } + + $("#search").click(function(){ + closePopups(); + toggleSearch(); + $("#searchfield").focus(); + }); + + $("#bagit").click(function(){ + closePopups(); + toggleBagit(); + $("#plainurl").focus(); + }); + + $("#search-form-close").click(function(){ + toggleSearch(); + }); + + $("#bagit-form-close").click(function(){ + toggleBagit(); + }); + + // $("#").click(function(){ + // toggleSearch(); + // }); + + +}); diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/saveLink.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/saveLink.js new file mode 100755 index 00000000..a7acd84c --- /dev/null +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/saveLink.js @@ -0,0 +1,109 @@ +$.fn.ready(function() { + + var $bagit = $('#bagit'), + $bagitForm = $('#bagit-form'), + $bagitFormForm = $('#bagit-form-form'); + + /* ========================================================================== + bag it link and close button + ========================================================================== */ + + function toggleSaveLinkForm(url, event) { + $("#add-link-result").empty(); + + $bagit.toggleClass("active-current"); + + //only if bag-it link is not presented on page + if ( $bagit.length === 0 ) { + if ( event !== 'undefined' && event ) { + $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200}); + } + else { + $bagitForm.css( {position:"relative", top:"auto", left:"auto"}); + } + } + + if ($("#search-form").length != 0) { + $("#search").removeClass("current"); + $("#search-arrow").removeClass("arrow-down"); + $("#search-form").hide(); + } + $bagitForm.toggle(); + $('#content').toggleClass("opacity03"); + if (url !== 'undefined' && url) { + $('#plainurl').val(url); + } + $('#plainurl').focus(); + } + + //--------------------------------------------------------------------------- + // These two functions are now taken care of in popupForm.js + //--------------------------------------------------------------------------- + + // $bagit.click(function(){ + // $bagit.toggleClass("current"); + // $("#bagit-arrow").toggleClass("arrow-down"); + // toggleSaveLinkForm(); + // }); + + // $("#bagit-form-close").click(function(){ + // $bagit.removeClass("current"); + // $("#bagit-arrow").removeClass("arrow-down"); + // toggleSaveLinkForm(); + // }); + + + //send "bag it link" form request via ajax + $bagitFormForm.submit( function(event) { + $("body").css("cursor", "wait"); + $("#add-link-result").empty(); + + $.ajax({ + type: $bagitFormForm.attr('method'), + url: $bagitFormForm.attr('action'), + data: $bagitFormForm.serialize(), + success: function(data) { + $('#add-link-result').html("Done!"); + $('#plainurl').val(''); + $('#plainurl').blur(''); + $("body").css("cursor", "auto"); + //setTimeout( function() { toggleSaveLinkForm(); }, 1000); //close form after 1000 delay + }, + error: function(data) { + $('#add-link-result').html("Failed!"); + $("body").css("cursor", "auto"); + } + }); + + event.preventDefault(); + }); + + /* ========================================================================== + Keyboard gestion + ========================================================================== */ + + $(window).keydown(function(e){ + if ( ( e.target.tagName.toLowerCase() !== 'input' && e.keyCode == 83 ) || (e.keyCode == 27 && $bagitForm.is(':visible') ) ) { + $bagit.removeClass("current"); + $("#bagit-arrow").removeClass("arrow-down"); + toggleSaveLinkForm(); + return false; + } + }); + + /* ========================================================================== + Process all links inside an article + ========================================================================== */ + + $("article a[href^='http']").after(function() { + return " "; + }); + + $(".add-to-wallabag-link-after").click(function(event){ + toggleSaveLinkForm($(this).attr('href'), event); + event.preventDefault(); + }); + +}); + + -- cgit v1.2.3 From 19c283140ef7f489c67d7debe4dd431e7cfefd4b Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Aug 2015 20:43:02 +0200 Subject: Cleanup base layout --- .../Resources/views/themes/baggy/layout.html.twig | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig index 229c5a34..3d573eaa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig @@ -19,3 +19,54 @@ {% endblock %} + +{% block header %} +
+

+ {% block logo %} + wallabag logo + {% endblock %} +

+
+{% endblock %} + +{% block menu %} + + +{% endblock %} + +{% block messages %} + {% for flashMessage in app.session.flashbag.get('notice') %} +
+ × +

{{ flashMessage }}

+
+ {% endfor %} +{% endblock %} + +{% block footer %} +
+

{% trans %}powered by{% endtrans %} wallabag

+
+{% endblock %} -- cgit v1.2.3 From d2fcbf5d846eabb89714f4c59ff6729e2666a948 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 24 Aug 2015 20:43:29 +0200 Subject: Handle filter form using some JS Instead of displaying an ugly form --- .../views/themes/baggy/Entry/entries.html.twig | 28 +++++++++++++++------- .../views/themes/baggy/public/css/main.css | 13 ++++++++++ .../views/themes/baggy/public/js/popupForm.js | 23 +++++++++++++----- 3 files changed, 49 insertions(+), 15 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') 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 0d295431..28bf0ab9 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 @@ -4,24 +4,34 @@ {% block content %} {% block pager %} - {% if entries is not empty %}
{{ entries.count }} {% trans %}entries{% endtrans %}
- - {% endif %} {% endblock %} + + {% if entries is empty %}

{% trans %}No articles found.{% endtrans %}

{% else %} -
{{ form_rest(form) }}
{% for entry in entries %}

{{ entry.title|raw }}

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 72a7b205..dee307f3 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 @@ -939,6 +939,19 @@ pre code { font-size: 0.96em; } +#filter-form { + margin-top: 30px !important; + width: 500px; + height: 370px; + right: 5em; + left: inherit; +} + +#filter-form form { + width: 500px; + height: 370px; +} + /* ========================================================================== 6 = Media Queries diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js index d233e600..b933acd1 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/js/popupForm.js @@ -2,6 +2,7 @@ $(document).ready(function() { $("#search-form").hide(); $("#bagit-form").hide(); + $("#filter-form").hide(); //--------------------------------------------------------------------------- // Toggle the "Search" popup in the sidebar @@ -18,6 +19,13 @@ $(document).ready(function() { } } + //--------------------------------------------------------------------------- + // Toggle the "Filter" popup on entries list + //--------------------------------------------------------------------------- + function toggleFilter() { + $("#filter-form").toggle(); + } + //--------------------------------------------------------------------------- // Toggle the "Save a Link" popup in the sidebar //--------------------------------------------------------------------------- @@ -50,6 +58,11 @@ $(document).ready(function() { $("#searchfield").focus(); }); + $("#filter").click(function(){ + closePopups(); + toggleFilter(); + }); + $("#bagit").click(function(){ closePopups(); toggleBagit(); @@ -60,13 +73,11 @@ $(document).ready(function() { toggleSearch(); }); + $("#filter-form-close").click(function(){ + toggleFilter(); + }); + $("#bagit-form-close").click(function(){ toggleBagit(); }); - - // $("#").click(function(){ - // toggleSearch(); - // }); - - }); -- cgit v1.2.3 From 5def3f5862c4c8cc3faa19cd79a3746570064790 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 25 Aug 2015 23:24:24 +0200 Subject: Filters view on side for baggy --- .../views/themes/baggy/Entry/entries.html.twig | 75 +++++++++++++++++++--- .../views/themes/baggy/public/css/main.css | 29 +++++++-- 2 files changed, 88 insertions(+), 16 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') 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 @@
{% endblock %} - - {% if entries is empty %}

{% trans %}No articles found.{% endtrans %}

{% else %} @@ -55,4 +46,70 @@
{% endfor %} {% endif %} + + + {% 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 { } #filter-form { - margin-top: 30px !important; - width: 500px; - height: 370px; - right: 5em; - left: inherit; + position: fixed; + width: 15%; + height: 100%; + top: 0; + right: 0; + background-color: #FFF; + padding: 15px; + padding-right: 30px; + padding-top: 30px; + + z-index: 12; + + /*transition-property: transform; + transition-duration: 0.3s; + transition-delay: 0.3s; + + transform: translate3d(100%, 0, 0);*/ } #filter-form form { - width: 500px; - height: 370px; + +} + +#filter-form form .filter-group { + margin: 5px; } -- cgit v1.2.3 From 5e98404dfb701ca6653241496205f828952540db Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 13 Sep 2015 15:17:58 +0200 Subject: Re-add preview picture on baggy Which should has been removed on merge --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') 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 26cafc42..176290e4 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 @@ -65,6 +65,11 @@ {{ form_widget(form.isStarred) }} + +
+ {{ form_widget(form.previewPicture) }} + +
@@ -72,7 +77,7 @@
- {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }} + {{ form_widget(form.readingTime.left_number, {'type': 'number'}) }}
-- cgit v1.2.3 From 1a5f7e2d88284419654057fda71e2b0be9b5439a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 13 Sep 2015 19:53:09 +0200 Subject: A little more width for filter view --- .../CoreBundle/Resources/views/themes/baggy/public/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/baggy') 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 16ff2fe2..950d8b0e 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 @@ -941,7 +941,7 @@ pre code { #filter-form { position: fixed; - width: 15%; + width: 20%; height: 100%; top: 0; right: 0; -- cgit v1.2.3