mirror of
https://github.com/wallabag/wallabag.git
synced 2025-01-11 01:15:26 +00:00
Merge remote-tracking branch 'origin/master' into 2.1
This commit is contained in:
commit
cdd3010b47
13 changed files with 192 additions and 6 deletions
|
@ -62,6 +62,7 @@ matrix:
|
||||||
env: DB=sqlite ASSETS=build
|
env: DB=sqlite ASSETS=build
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- php: hhvm-3.12
|
- php: hhvm-3.12
|
||||||
|
- php: 7.1
|
||||||
- php: nightly
|
- php: nightly
|
||||||
|
|
||||||
# exclude v1 branches
|
# exclude v1 branches
|
||||||
|
|
|
@ -91,6 +91,7 @@ body {
|
||||||
|
|
||||||
body.login main {
|
body.login main {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
min-height: 100vh;
|
||||||
}
|
}
|
||||||
|
|
||||||
.border-bottom {
|
.border-bottom {
|
||||||
|
@ -256,6 +257,10 @@ nav input {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input-field.nav-panel-add, .input-field.nav-panel-add form {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
/* ==========================================================================
|
/* ==========================================================================
|
||||||
2 = Side-nav
|
2 = Side-nav
|
||||||
========================================================================== */
|
========================================================================== */
|
||||||
|
@ -342,6 +347,12 @@ main ul.row {
|
||||||
|
|
||||||
.card .card-content .card-title {
|
.card .card-content .card-title {
|
||||||
line-height: 32px;
|
line-height: 32px;
|
||||||
|
max-height: 64px;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card .card-content i.right, .card .card-reveal i.right {
|
||||||
|
margin-left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.card .card-entry-labels {
|
.card .card-entry-labels {
|
||||||
|
|
55
docs/de/conf.py
Normal file
55
docs/de/conf.py
Normal file
|
@ -0,0 +1,55 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# wallabag documentation build configuration file, created by
|
||||||
|
# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
|
||||||
|
|
||||||
|
import sys
|
||||||
|
import os
|
||||||
|
|
||||||
|
extensions = []
|
||||||
|
templates_path = ['_templates']
|
||||||
|
source_suffix = '.rst'
|
||||||
|
master_doc = 'index'
|
||||||
|
project = u'wallabag-fr'
|
||||||
|
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
|
||||||
|
version = '2.0.0'
|
||||||
|
release = version
|
||||||
|
exclude_patterns = ['_build']
|
||||||
|
pygments_style = 'sphinx'
|
||||||
|
html_theme = 'default'
|
||||||
|
html_static_path = ['_static']
|
||||||
|
htmlhelp_basename = 'wallabagdedoc'
|
||||||
|
|
||||||
|
latex_elements = {
|
||||||
|
}
|
||||||
|
|
||||||
|
latex_documents = [
|
||||||
|
('index', 'wallabag-de.tex', u'wallabag Documentation',
|
||||||
|
u'Nicolas Lœuillet', 'manual'),
|
||||||
|
]
|
||||||
|
|
||||||
|
man_pages = [
|
||||||
|
('index', 'wallabagde', u'wallabag Documentation',
|
||||||
|
[u'Nicolas Lœuillet'], 1)
|
||||||
|
]
|
||||||
|
|
||||||
|
texinfo_documents = [
|
||||||
|
('index', 'wallabag', u'wallabag Documentation',
|
||||||
|
u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
|
||||||
|
'Miscellaneous'),
|
||||||
|
]
|
||||||
|
|
||||||
|
##### Guzzle sphinx theme
|
||||||
|
|
||||||
|
import guzzle_sphinx_theme
|
||||||
|
html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
|
||||||
|
html_theme_path = guzzle_sphinx_theme.html_theme_path()
|
||||||
|
html_theme = 'guzzle_sphinx_theme'
|
||||||
|
|
||||||
|
# Custom sidebar templates, maps document names to template names.
|
||||||
|
html_sidebars = {
|
||||||
|
'**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
|
||||||
|
}
|
||||||
|
|
||||||
|
# Register the theme as an extension to generate a sitemap.xml
|
||||||
|
extensions.append("guzzle_sphinx_theme")
|
2
docs/de/requirements.txt
Normal file
2
docs/de/requirements.txt
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
Sphinx>=1.3.0,<1.4.0
|
||||||
|
guzzle_sphinx_theme>=0.7.0,<0.8.0
|
|
@ -12,7 +12,7 @@ Das kann verschiedene Ursachen haben:
|
||||||
Wie kann ich helfen das zu beheben?
|
Wie kann ich helfen das zu beheben?
|
||||||
-----------------------------------
|
-----------------------------------
|
||||||
|
|
||||||
- `indem du uns eine Mail mit der URL des Artikels sendest <mailto:hello\@wallabag.org>`_
|
- `indem du uns eine Mail mit der URL des Artikels sendest <mailto:hello@wallabag.org>`_
|
||||||
- indem du versuchst das Laden des Artikels durch Erstellen einer Datei für den Artikel
|
- indem du versuchst das Laden des Artikels durch Erstellen einer Datei für den Artikel
|
||||||
selbst zu beheben
|
selbst zu beheben
|
||||||
Du kannst `dieses Tool <http://siteconfig.fivefilters.org/>`__ nutzen.
|
Du kannst `dieses Tool <http://siteconfig.fivefilters.org/>`__ nutzen.
|
||||||
|
|
|
@ -12,7 +12,7 @@ There may be several reasons:
|
||||||
How can I help to fix that?
|
How can I help to fix that?
|
||||||
---------------------------
|
---------------------------
|
||||||
|
|
||||||
- `by sending us an email with the article's URL <mailto:hello\@wallabag.org>`_
|
- `by sending us an email with the article's URL <mailto:hello@wallabag.org>`_
|
||||||
- by trying to fix this article by yourself :) by creating a file for the article.
|
- by trying to fix this article by yourself :) by creating a file for the article.
|
||||||
You can use `this tool <http://siteconfig.fivefilters.org/>`__.
|
You can use `this tool <http://siteconfig.fivefilters.org/>`__.
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ Il peut y avoir plusieurs raisons :
|
||||||
Comment puis-je aider pour réparer ça ?
|
Comment puis-je aider pour réparer ça ?
|
||||||
---------------------------------------
|
---------------------------------------
|
||||||
|
|
||||||
- `en nous envoyant un email avec l'URL de l'article <mailto:hello\@wallabag.org>`_
|
- `en nous envoyant un email avec l'URL de l'article <mailto:hello@wallabag.org>`_
|
||||||
- en essayant de réparer cet article par vous-même :) en créant un fichier pour l'article.
|
- en essayant de réparer cet article par vous-même :) en créant un fichier pour l'article.
|
||||||
Vous pouvez utiliser `cet outil <http://siteconfig.fivefilters.org/>`__.
|
Vous pouvez utiliser `cet outil <http://siteconfig.fivefilters.org/>`__.
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,103 @@
|
||||||
|
/*
|
||||||
|
* jQuery tinydot 0.2.0
|
||||||
|
*
|
||||||
|
* Copyright (c) Alexander Danilov
|
||||||
|
* modos189.ru
|
||||||
|
*
|
||||||
|
* Plugin website:
|
||||||
|
* tinydot.modos189.ru
|
||||||
|
*
|
||||||
|
* Licensed under the MIT license.
|
||||||
|
* http://en.wikipedia.org/wiki/MIT_License
|
||||||
|
*/
|
||||||
|
|
||||||
|
(function( $, undef )
|
||||||
|
{
|
||||||
|
if ( $.fn.tinydot )
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$.fn.tinydot = function( o ) {
|
||||||
|
|
||||||
|
var $dot = this;
|
||||||
|
$dot.child = getChildOrDie($dot);
|
||||||
|
$dot.orgContent = $($dot.child).html();
|
||||||
|
ellipsis( $dot );
|
||||||
|
|
||||||
|
$dot.watch = function()
|
||||||
|
{
|
||||||
|
$(window).on('resize', function(){
|
||||||
|
if ( watchInt )
|
||||||
|
{
|
||||||
|
clearInterval( watchInt );
|
||||||
|
}
|
||||||
|
watchInt = setTimeout(
|
||||||
|
function()
|
||||||
|
{
|
||||||
|
reinitialize($dot);
|
||||||
|
}, 100
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
return $dot;
|
||||||
|
};
|
||||||
|
|
||||||
|
var opts = $.extend( true, {}, $.fn.tinydot.defaults, o ),
|
||||||
|
watchInt = null;
|
||||||
|
|
||||||
|
if ( opts.watch )
|
||||||
|
{
|
||||||
|
$dot.watch();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// public
|
||||||
|
$.fn.tinydot.defaults = {
|
||||||
|
'watch' : false
|
||||||
|
};
|
||||||
|
|
||||||
|
function getChildOrDie( $elem )
|
||||||
|
{
|
||||||
|
var childrens = $elem.children();
|
||||||
|
if (childrens.length == 0) {
|
||||||
|
// create children
|
||||||
|
var data = $($elem).html();
|
||||||
|
$elem.html('');
|
||||||
|
$elem.append('<span />');
|
||||||
|
return $elem.children('span').html(data);
|
||||||
|
} else {
|
||||||
|
return childrens[0];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function reinitialize( $elem )
|
||||||
|
{
|
||||||
|
$($elem.child).html($elem.orgContent);
|
||||||
|
ellipsis( $elem );
|
||||||
|
}
|
||||||
|
|
||||||
|
function ellipsis( $elem ) {
|
||||||
|
var divh=$($elem).height();
|
||||||
|
while ($($elem.child).outerHeight()>divh) {
|
||||||
|
$($elem.child).html(function (index, html) {
|
||||||
|
return html.replace(/\W*\s(\S)*$/, '...');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
})( jQuery );
|
||||||
|
|
||||||
|
jQuery(document).ready(function($) {
|
||||||
|
//We only invoke jQuery.tinydot on elements that have dot-ellipsis class
|
||||||
|
$(".dot-ellipsis").each(function(){
|
||||||
|
//Checking if update on window resize required
|
||||||
|
var watch_window=$(this).hasClass("dot-resize-update");
|
||||||
|
|
||||||
|
//Invoking jQuery.tinydot
|
||||||
|
var x = new Object();
|
||||||
|
if (watch_window)
|
||||||
|
x.watch='window';
|
||||||
|
$(this).tinydot(x);
|
||||||
|
});
|
||||||
|
});
|
1
src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js
vendored
Normal file
1
src/Wallabag/CoreBundle/Resources/public/themes/material/js/jquery.tinydot.min.js
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
!function(a,b){function c(b){var c=b.children();if(0==c.length){var d=a(b).html();return b.html(""),b.append("<span />"),b.children("span").html(d)}return c[0]}function d(b){a(b.child).html(b.orgContent),e(b)}function e(b){for(var c=a(b).height();a(b.child).outerHeight()>c;)a(b.child).html(function(a,b){return b.replace(/\W*\s(\S)*$/,"...")})}a.fn.tinydot||(a.fn.tinydot=function(b){var f=this;f.child=c(f),f.orgContent=a(f.child).html(),e(f),f.watch=function(){return a(window).on("resize",function(){h&&clearInterval(h),h=setTimeout(function(){d(f)},100)}),f};var g=a.extend(!0,{},a.fn.tinydot.defaults,b),h=null;g.watch&&f.watch()},a.fn.tinydot.defaults={watch:!1})}(jQuery),jQuery(document).ready(function(a){a(".dot-ellipsis").each(function(){var b=a(this).hasClass("dot-resize-update"),c=new Object;b&&(c.watch="window"),a(this).tinydot(c)})});
|
|
@ -29,7 +29,7 @@
|
||||||
<i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
|
<i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|striptags }}">{{ entry.title|striptags|raw }}</a></span>
|
<span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span>
|
||||||
|
|
||||||
<div class="estimatedTime grey-text">
|
<div class="estimatedTime grey-text">
|
||||||
<span class="tool reading-time">
|
<span class="tool reading-time">
|
||||||
|
|
|
@ -7,7 +7,9 @@
|
||||||
|
|
||||||
{% block scripts %}
|
{% block scripts %}
|
||||||
{{ parent() }}
|
{{ parent() }}
|
||||||
<script src="{{ asset('bundles/wallabagcore/themes/material/js/material.min.js') }}"></script>
|
<script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script>
|
||||||
|
<script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
|
||||||
|
<script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
# Two factor mail
|
||||||
|
auth_code:
|
||||||
|
on: 'sus'
|
||||||
|
mailer:
|
||||||
|
subject: "Còdi d'autentificacion wallabag"
|
||||||
|
body:
|
||||||
|
hello: "Bonjorn %user%,"
|
||||||
|
first_para: "Estant qu'avètz activat la dobla autentificacion sus vòtre compte wallabag e que venètz de vos conectar dempuèi un novèl aparelh (ordinador, mobil, etc.) vos mandem un còdi per validar la connexion."
|
||||||
|
second_para: "Vaquí lo còdi a dintrar :"
|
||||||
|
support: "S'avètz un problèma de connexion, dobtetz pas a contacter l'assisténcia : "
|
||||||
|
signature: "La còla de wallabag"
|
|
@ -41,7 +41,7 @@
|
||||||
<i class="material-icons right">send</i>
|
<i class="material-icons right">send</i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="center">
|
<div class="row center">
|
||||||
<a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a>
|
<a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
Loading…
Reference in a new issue