This commit is contained in:
Jeremy
2015-01-31 19:09:34 +01:00
parent 1990517b22
commit 7df80cb32c
47 changed files with 153 additions and 183 deletions

View File

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

View File

@ -1,4 +1,4 @@
entries:
type: rest
resource: "WallabagCoreBundle:WallabagRest"
name_prefix: api_
name_prefix: api_

View File

@ -25,5 +25,3 @@
</services>
</container>

View File

@ -101,4 +101,4 @@
});
});
</script>
{% endblock %}
{% endblock %}

View File

@ -8,4 +8,4 @@
{% block content %}
{{ form(form) }}
{% endblock %}
{% endblock %}

View File

@ -30,11 +30,11 @@
<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>

View File

@ -1,3 +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>
</script>

View File

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

View File

@ -37,4 +37,3 @@
<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>

View File

@ -12,4 +12,3 @@
<li><a href={{ path('about') }}>{% trans %}about{% endtrans %}</a></li>
<li><a class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
</ul>

View File

@ -160,7 +160,7 @@
</div>
</fieldset>
</form>
<h2>{% trans "Delete account" %}</h2>
{% if not only_user %}<form method="post" action="?deluser">
<p>{% trans "You can delete your account by entering your password and validating." %}<br /><b>{% trans "Be careful, data will be erased forever (that is a very long time)." %}</b></p>

View File

@ -28,4 +28,4 @@
</div>
{% include '_footer.twig' %}
</body>
</html>
</html>

View File

@ -17,7 +17,7 @@
<input class="col" type="password" id="password" name="password" placeholder="{% trans "Password" %}" tabindex="2" {% if constant('MODE_DEMO') == 1 %}value="poche"{% endif %} />
</div>
<div class="row">
<div class="col">
<input type="checkbox" id="longlastingsession" name="longlastingsession" tabindex="3" /> <label for="longlastingsession">{% trans "Stay signed in" %}</label><br />
<small class="inbl">{% trans "(Do not check on public computers)" %}</small>

View File

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

View File

@ -1,4 +1,4 @@
<footer class="w600p center mt3 mb3 smaller txtright">
<p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
{% if constant('DEBUG_POCHE') == 1 %}<p><strong>{% trans "debug mode is on so cache is off." %} {% trans "your wallabag version:" %}{{constant('WALLABAG')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
</footer>
</footer>

View File

@ -2,7 +2,7 @@
<!--
$(document).ready(function() {
$("body").css("cursor", "wait");
setTimeout(function(){
window.location = './?import';
}, {{ import.delay }} );

View File

@ -11,4 +11,3 @@
</ul>
{% include '_pocheit-form.twig' %}
{% include '_search-form.twig' %}

View File

@ -1 +1 @@
{{ messages | raw }}
{{ messages | raw }}

View File

@ -1,4 +1,4 @@
<div id="search-form" class="messages info">
<div id="search-form" class="messages info">
<form method="get" action="index.php">
<p>
<input type="hidden" name="view" value="search"></input>

View File

@ -70,5 +70,5 @@
<dt>PHPePub</dt>
<dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd>
</dl>
</dl>
{% endblock %}

View File

@ -45,7 +45,7 @@
{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}
</p>
{% endif %}
<h2>{% trans "Change your theme" %}</h2>
<form method="post" action="?updatetheme" name="changethemeform">
<fieldset class="w500p inline">

View File

@ -1 +1 @@
{{ export }}
{{ export }}

View File

@ -28,4 +28,4 @@
</div>
{% include '_footer.twig' %}
</body>
</html>
</html>

View File

@ -15,4 +15,4 @@
{% endfor %}
</div>
{% endblock %}
{% endblock %}

View File

@ -42,7 +42,7 @@
<script src="{{ poche_url }}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");
@ -50,11 +50,11 @@
function( data ) {
if ( data == '1' ) {
if ( $('#markAsRead').hasClass("archive-off") ) {
$('#markAsRead').removeClass("archive-off");
$('#markAsRead').removeClass("archive-off");
$('#markAsRead').addClass("archive");
}
else {
$('#markAsRead').removeClass("archive");
$('#markAsRead').removeClass("archive");
$('#markAsRead').addClass("archive-off");
}
}
@ -64,7 +64,7 @@
});
$("body").css("cursor", "auto");
});
// toggle favorite property of current article
$('#setFav').click(function(){
$("body").css("cursor", "wait");
@ -72,11 +72,11 @@
function( data ) {
if ( data == '1' ) {
if ( $('#setFav').hasClass("fav-off") ) {
$('#setFav').removeClass("fav-off");
$('#setFav').removeClass("fav-off");
$('#setFav').addClass("fav");
}
else {
$('#setFav').removeClass("fav");
$('#setFav').removeClass("fav");
$('#setFav').addClass("fav-off");
}
}
@ -86,8 +86,8 @@
});
$("body").css("cursor", "auto");
});
// set percent of read on startup
// set percent of read on startup
if ( $(document).height() <= $(window).innerHeight() ) {
pp = 100;
}
@ -95,7 +95,7 @@
pp = 0;
}
$('#readLeftPercent').text( pp + '%' );
$(window).scroll(function(e){
var scrollTop = $(window).scrollTop();
@ -103,7 +103,7 @@
var scrollPercent = (scrollTop) / (docHeight);
var scrollPercentRounded = Math.round(scrollPercent*100)/100;
savePercent({{ entry.id|e }}, scrollPercentRounded);
// change percent of read on scroll
pp = Math.round(scrollTop * 100 / ( docHeight - $(window).innerHeight() ));
$('#readLeftPercent').text( pp + '%' );

View File

@ -23,4 +23,4 @@
</div>
{% include "WallabagCoreBundle::_footer.html.twig" %}
</body>
</html>
</html>

View File

@ -30,4 +30,4 @@
</div>
{% include "WallabagCoreBundle::_footer.html.twig" %}
</body>
</html>
</html>