move WallabagBundle into Wallabag:CoreBundle

src/Wallabag/CoreBundle/Resources/config/routing.yml

@@ -0,0 +1,3 @@
+_wllbg:
+    resource: "@WallabagCoreBundle/Controller/EntryController.php"
+    type:     annotation

src/Wallabag/CoreBundle/Resources/config/services.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="wallabag_core.twig.wallabag" class="Wallabag\CoreBundle\Twig\Extension\WallabagExtension">
+            <tag name="twig.extension" />
+        </service>
+    </services>
+
+
+
+</container>
+
+

src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig

@@ -0,0 +1,47 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title "Unread" %}
+
+{% block menu %}
+    {% include "WallabagCoreBundle::_menu.html.twig" %}
+{% endblock %}
+
+{% block content %}
+    {% block pager %}
+    {% if entries is not empty %}
+        <div class="results">
+            <div class="nb-results">{{ entries.count }} {% trans %}entries{% endtrans %}</div>
+            <div class="pagination">
+                {% for p in range(1, entries.count) %}
+                    <li>
+                        <a href="{{ path(app.request.attributes.get('_route'), {'page': p}) }}">{{ p }}</a>
+                    </li>
+                {% endfor %}
+            </div>
+        </div>
+    {% endif %}
+    {% endblock %}
+
+    {% if entries is empty %}
+        <div class="messages warning"><p>{% trans %}No articles found.{% endtrans %}</p></div>
+    {% else %}
+        {% for entry in entries %}
+            <div id="entry-{{ entry.id|e }}" class="entrie">
+                <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2>
+                {% if entry.content| readingTime > 0 %}
+                    <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} {{ entry.content| readingTime }} min</span></div>
+                {% else %}
+                    <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} <small class="inferieur">&lt;</small> 1 min</span></div>
+                {% endif %}
+
+                <ul class="tools links">
+                    <li><a title="{% trans %}Toggle mark as read{% endtrans %}" class="tool icon-check icon {% if entry.isRead == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle mark as read{% endtrans %}</span></a></li>
+                    <li><a title="{% trans %}toggle favorite{% endtrans %}" class="tool icon-star icon {% if entry.isFav == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}toggle favorite{% endtrans %}</span></a></li>
+                    <li><a title="{% trans %}delete{% endtrans %}" class="tool delete icon-trash icon" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}delete{% endtrans %}</span></a></li>
+                    <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon-link icon"><span>{{ entry.url | e | domainName }}</span></a></li>
+                </ul>
+                <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
+            </div>
+        {% endfor %}
+    {% endif %}
+{% endblock %}

src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig

@@ -0,0 +1,104 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{{ entry.title|raw }} ({{ entry.url | e | domainName }}){% endblock %}
+
+{% block menu %}
+    {% include "WallabagCoreBundle::_menu.html.twig" %}
+{% endblock %}
+
+{% block content %}
+    <div id="article_toolbar">
+        <ul class="links">
+            <li class="topPosF"><a href="#top" title="{% trans %}Back to top{% endtrans %}" class="tool top icon icon-arrow-up-thick"><span>{% trans %}Back to top{% endtrans %}</span></a></li>
+            <li><a href="{{ entry.url|e }}" target="_blank" title="{% trans %}original{% endtrans %} : {{ entry.title|e }}" class="tool link icon icon-link"><span>{{ entry.url | e | domainName }}</span></a></li>
+            <li><a title="{% trans %}Mark as read{% endtrans %}" class="tool icon icon-check {% if entry.isRead == 0 %}archive-off{% else %}archive{% endif %}" href="{{ path('archive_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle mark as read{% endtrans %}</span></a></li>
+            <li><a title="{% trans %}Favorite{% endtrans %}" class="tool icon icon-star {% if entry.isFav == 0 %}fav-off{% else %}fav{% endif %}" href="{{ path('star_entry', { 'id': entry.id }) }}"><span>{% trans %}Toggle favorite{% endtrans %}</span></a></li>
+            <li><a title="{% trans %}Delete{% endtrans %}" class="tool delete icon icon-trash" href="{{ path('delete_entry', { 'id': entry.id }) }}"><span>{% trans %}Delete{% endtrans %}</span></a></li>
+            {% if share_twitter %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans %}Tweet{% endtrans %}"><span>{% trans %}Tweet{% endtrans %}</span></a></li>{% endif %}
+            {% if share_mail %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans %}Email{% endtrans %}"><span>{% trans %}Email{% endtrans %}</span></a></li>{% endif %}
+            {% if share_shaarli %}<li><a href="{{ shaarli_url }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans %}shaarli{% endtrans %}"><span>{% trans %}shaarli{% endtrans %}</span></a></li>{% endif %}
+            {% if share_diaspora %}<li><a href="{{ diaspora_url }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans %}diaspora{% endtrans %}"><span>{% trans %}diaspora{% endtrans %}</span></a></li>{% endif %}
+            {#  {% if flattr %}{% if flattr.status == flattrable %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}"><span>{% trans %}flattr{% endtrans %}</span></a></li>{% elseif flattr.status == flattred %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr icon icon-flattr" target="_blank" title="{% trans %}flattr{% endtrans %}><span>{% trans %}flattr{% endtrans %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %} #}
+            {% if carrot %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon-image icon-image--carrot" target="_blank" title="{% trans %}carrot{% endtrans %}"><span>Carrot</span></a></li>{% endif %}
+            {% if show_printlink %}<li><a title="{% trans %}Print{% endtrans %}" class="tool icon icon-print" href="javascript: window.print();"><span>{% trans %}Print{% endtrans %}</span></a></li>{% endif %}
+            {% if export_epub %}<li><a href="?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
+            {% if export_mobi %}<li><a href="?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
+            {% if export_pdf %}<li><a href="?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}
+            <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans %}Does this article appear wrong?{% endtrans %}" class="tool bad-display icon icon-delete"><span>{% trans %}Does this article appear wrong?{% endtrans %}</span></a></li>
+        </ul>
+    </div>
+    <div id="article">
+        <header class="mbm">
+            <h1>{{ entry.title|raw }}</h1>
+        </header>
+        <aside class="tags">
+            tags: {# {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans %}Edit tags{% endtrans %}">✎</a> #}
+        </aside>
+        <article>
+            {{ entry.content | raw }}
+        </article>
+    </div>
+    <script src="{{ asset('themes/_global/js/restoreScroll.js')}}"></script>
+    <script type="text/javascript">
+        $(document).ready(function() {
+
+            // toggle read property of current article
+          /*  $('#markAsRead').click(function(){
+                $("body").css("cursor", "wait");
+                $.ajax( { url: '{{ path('archive_entry', { 'id': entry.id }) }}' }).done(
+                        function( data ) {
+                            if ( data == '1' ) {
+                                if ( $('#markAsRead').hasClass("archive-off") ) {
+                                    $('#markAsRead').removeClass("archive-off");
+                                    $('#markAsRead').addClass("archive");
+                                }
+                                else {
+                                    $('#markAsRead').removeClass("archive");
+                                    $('#markAsRead').addClass("archive-off");
+                                }
+                            }
+                            else {
+                                alert('Error! Pls check if you are logged in.');
+                            }
+                        });
+                $("body").css("cursor", "auto");
+            });*/
+
+            // toggle favorite property of current article
+          /*  $('#setFav').click(function(){
+                $("body").css("cursor", "wait");
+                $.ajax( { url: '{{ path('star_entry', { 'id': entry.id }) }}' }).done(
+                        function( data ) {
+                            if ( data == '1' ) {
+                                if ( $('#setFav').hasClass("fav-off") ) {
+                                    $('#setFav').removeClass("fav-off");
+                                    $('#setFav').addClass("fav");
+                                }
+                                else {
+                                    $('#setFav').removeClass("fav");
+                                    $('#setFav').addClass("fav-off");
+                                }
+                            }
+                            else {
+                                alert('Error! Pls check if you are logged in.');
+                            }
+                        });
+                $("body").css("cursor", "auto");
+            });*/
+
+            $(window).scroll(function(e){
+                var scrollTop = $(window).scrollTop();
+                var docHeight = $(document).height();
+                var scrollPercent = (scrollTop) / (docHeight);
+                var scrollPercentRounded = Math.round(scrollPercent*100)/100;
+                savePercent({{ entry.id|e }}, scrollPercentRounded);
+            });
+
+            retrievePercent({{ entry.id|e }});
+
+            $(window).resize(function(){
+                retrievePercent({{ entry.id|e }});
+            });
+        });
+    </script>
+{% endblock %}

src/Wallabag/CoreBundle/Resources/views/Entry/new.html.twig

@@ -0,0 +1,11 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}Save new entry{% endtrans %}{% endblock %}
+
+{% block menu %}
+    {% include "WallabagCoreBundle::_menu.html.twig" %}
+{% endblock %}
+
+{% block content %}
+    {{ form(form) }}
+{% endblock %}

src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig

@@ -0,0 +1,51 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}About{% endtrans %}{% endblock %}
+{% block menu %}
+{% include "WallabagCoreBundle::_menu.html.twig" %}
+{% endblock %}
+{% block content %}
+    <h2>{% trans %}About wallabag{% endtrans %}</h2>
+
+    <dl>
+        <dt>{% trans %}Project website{% endtrans %}</dt>
+        <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
+
+        <dt>{% trans %}Main developer{% endtrans %}</dt>
+        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://cdetc.fr">{% trans %}website{% endtrans %}</a></dd>
+
+        <dt>{% trans %}Contributors ♥:{% endtrans %}</dt>
+        <dd><a href="https://github.com/wallabag/wallabag/graphs/contributors">{% trans %}on Github{% endtrans %}</a></dd>
+
+        <dt>{% trans %}Bug reports{% endtrans %}</dt>
+        <dd><a href="https://support.wallabag.org">{% trans %}On our support website{% endtrans %}</a> {% trans %}or{% endtrans %} <a href="https://github.com/wallabag/wallabag/issues">{% trans %}on Github{% endtrans %}</a></dd>
+
+        <dt>{% trans %}License{% endtrans %}</dt>
+        <dd><a href="http://en.wikipedia.org/wiki/MIT_License">MIT</a></dd>
+
+        <dt>{% trans %}Version{% endtrans %}</dt>
+        <dd>{{ version }}</dd>
+    </dl>
+
+    <p>{% trans %}wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted.{% endtrans %}</p>
+
+    <h2>{% trans %}Getting help{% endtrans %}</h2>
+    
+    <dl>
+        <dt>{% trans %}Documentation{% endtrans %}</dt>
+        <dd><a href="https://doc.wallabag.org/">Online documentation</a></dd>
+        
+        <dt>{% trans %}Support{% endtrans %}</dt>
+        <dd><a href="http://support.wallabag.org/">http://support.wallabag.org/</a></dd>
+    </dl>
+
+    <h2>{% trans %}Helping wallabag{% endtrans %}</h2>
+
+    <p>{% trans %}wallabag is free and opensource. You can help us:{% endtrans %}</p>
+
+    <dl>
+        <dt><a href="{{ paypal_url }}">{% trans %}via Paypal{% endtrans %}</a></dt>
+
+        <dt><a href="{{ flattr_url }}">{% trans %}via Flattr{% endtrans %}</a></dt>
+    </dl>
+{% endblock %}

src/Wallabag/CoreBundle/Resources/views/_bookmarklet.html.twig

@@ -0,0 +1,3 @@
+        <script type="text/javascript">
+          top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>bag it!</title>"+'<link rel="icon" href="tpl/img/favicon.ico" />'+"</head>"+"<body>"+"<script>"+"window.onload=function(){"+"window.setTimeout(function(){"+"history.back();"+"},250);"+"};"+"</scr"+"ipt>"+"</body>"+"</html>"
+        </script>

src/Wallabag/CoreBundle/Resources/views/_footer.html.twig

@@ -0,0 +1,3 @@
+        <footer class="w600p center mt3 mb3 smaller txtright">
+            <p>{% trans %}powered by{% endtrans %} <a href="http://wallabag.org">wallabag</a></p>
+        </footer>

src/Wallabag/CoreBundle/Resources/views/_head.html.twig

@@ -0,0 +1,40 @@
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-152.png') }}" sizes="152x152">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-144.png') }}" sizes="144x144">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-120.png') }}" sizes="120x120">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-114.png') }}" sizes="114x114">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-76.png') }}" sizes="76x76">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-72.png') }}" sizes="72x72">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon-57.png') }}" sizes="57x57">
+
+        <link rel="apple-touch-icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
+        <link rel="icon" type="image/png" href="{{ asset('themes/_global/img/appicon/apple-touch-icon.png') }}">
+
+        <link rel="shortcut icon" type="image/x-icon" href="{{ asset('themes/_global/img/appicon/favicon.ico') }}">
+
+        <link rel="stylesheet" href="{{ asset('themes/baggy/css/ratatouille.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/baggy/css/font.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/baggy/css/main.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/baggy/css/messages.css') }}" media="all">
+        <link rel="stylesheet" href="{{ asset('themes/baggy/css/print.css') }}" media="print">
+
+        <script src="{{ asset('themes/_global/js/jquery-2.0.3.min.js') }}"></script>
+        <script src="{{ asset('themes/_global/js/autoClose.js') }}"></script>
+        <script src="{{ asset('themes/baggy/js/jquery.cookie.js') }}"></script>
+        <script src="{{ asset('themes/baggy/js/init.js') }}"></script>
+        <script src="{{ asset('themes/_global/js/saveLink.js') }}"></script>
+        <script src="{{ asset('themes/_global/js/popupForm.js') }}"></script>
+        <script src="{{ asset('themes/baggy/js/closeMessage.js') }}"></script>
+

src/Wallabag/CoreBundle/Resources/views/_menu.html.twig

@@ -0,0 +1,15 @@
+            <button id="menu" class="icon icon-menu desktopHide"><span>Menu</span></button>
+            <ul id="links" class="links">
+                <li><a href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
+                <li><a href="{{ path('starred') }}">{% trans %}favorites{% endtrans %}</a></li>
+                <li><a href="{{ path('archive') }}"}>{% trans %}archive{% endtrans %}</a></li>
+                <li><a href="?view=tags">{% trans %}tags{% endtrans %}</a></li>
+                <li><a href="{{ path('new_entry') }}">{% trans %}save a link{% endtrans %}</a></li>
+                <li style="position: relative;"><a href="javascript: void(null);" id="search">{% trans %}search{% endtrans %}</a>
+                    {% include "WallabagCoreBundle::_search_form.html.twig" %}
+                </li>
+                <li><a href="?view=config">{% trans %}config{% endtrans %}</a></li>
+                <li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li>
+                <li><a class="icon icon-power" href="?logout" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
+            </ul>
+

src/Wallabag/CoreBundle/Resources/views/_save_form.html.twig

@@ -0,0 +1,10 @@
+<div id="bagit-form" class="messages info popup-form">
+    <form method="get" action="index.php" target="_blank" id="bagit-form-form">
+        <h2>{% trans %}Save a link{% endtrans %}</h2>
+        <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
+        <input type="hidden" name="autoclose" value="1" />
+        <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
+        <span id="add-link-result"></span>
+        <input type="submit" value="{% trans %}save link!"{% endtrans %} />
+    </form>
+</div>

src/Wallabag/CoreBundle/Resources/views/_search_form.html.twig

@@ -0,0 +1,9 @@
+<div id="search-form" class="messages info popup-form">
+<form method="get" action="index.php">
+	<h2>{% trans %}Search{% endtrans %}</h2>
+        <a href="javascript: void(null);" id="search-form-close" class="close-button--popup close-button">&times;</a>
+        <input type="hidden" name="view" value="search"></input>
+        <input required placeholder="{% trans %}Enter your search here{% endtrans %}" type="text" name="search" id="searchfield"><br>
+        <input id="submit-search" type="submit" value="{% trans %}Search{% endtrans %}"></input>
+</form>
+</div>

src/Wallabag/CoreBundle/Resources/views/_top.html.twig

@@ -0,0 +1,5 @@
+        <header class="w600p center mbm">
+            <h1>
+                {% block logo %}<img width="100" height="100" src="{{ asset('themes/baggy/img/logo-w.png') }}" alt="wallabag logo" />{% endblock %}
+            </h1>
+        </header>

src/Wallabag/CoreBundle/Resources/views/layout.html.twig

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="en"><![endif]-->
+<!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
+<!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
+<!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
+<html lang="en">
+<head>
+    <meta name="viewport" content="initial-scale=1.0">
+    <meta charset="utf-8">
+    <!--[if IE]>
+    <meta http-equiv="X-UA-Compatible" content="IE=10">
+    <![endif]-->
+    <title>{% block title %}{% endblock %} - wallabag</title>
+    {% include "WallabagCoreBundle::_head.html.twig" %}
+    {% include "WallabagCoreBundle::_bookmarklet.html.twig" %}
+</head>
+<body>
+{% include "WallabagCoreBundle::_top.html.twig" %}
+<div id="main">
+    {% block menu %}{% endblock %}
+    {% block precontent %}{% endblock %}
+    {% for flashMessage in app.session.flashbag.get('notice') %}
+        <div class="flash-notice">
+            {{ flashMessage }}
+        </div>
+    {% endfor %}
+    <div id="content" class="w600p center">
+        {% block content %}{% endblock %}
+    </div>
+</div>
+{% include "WallabagCoreBundle::_footer.html.twig" %}
+</body>
+</html>