pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add tests

Browse Source 
and fix few mistakes
This commit is contained in:
Jeremy
2015-03-28 21:43:49 +01:00
parent 2385f891e5
commit 371ac69a6b
13 changed files with 533 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig
View File

@ -56,11 +56,15 @@
<fieldset class="w500p inline">
<div class="row">
<label>Rss links:</label>
<ul>
<li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
<li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
<li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
</ul>
{% if rss.token %}
<ul>
<li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li>
<li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li>
<li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li>
</ul>
{% else %}
<strong>You need to generate a token first.</strong>
{% endif %}
</div>
</fieldset>

6
src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig
View File

@ -17,11 +17,11 @@
<pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
<description>
<![CDATA[
{%- if entry.content| readingTime > 0 %}
{%- if entry.content| readingTime > 0 -%}
{% trans %}estimated reading time :{% endtrans %} {{ entry.content| readingTime }} min
{% else -%}
{%- else -%}
{% trans %}estimated reading time :{% endtrans %} &lt; 1 min
{% endif -%}
{%- endif %}
{{ entry.content -}}
]]>

24
src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
View File

@ -7,7 +7,7 @@
4 = Messages
5 = Article
6 = Media queries
========================================================================== */
html {
@ -42,17 +42,17 @@ body {
position: absolute;
top: 2em;
left: 50%;
margin-left: -55px;
margin-left: -55px;
}
/* ==========================================================================
1 = Style Guide
========================================================================== */
::selection {
color: #FFF;
::selection {
color: #FFF;
background-color: #000;
}
}
.desktopHide {
display: none;
@ -62,7 +62,7 @@ body {
position: fixed;
z-index: 20;
top: 0.4em;
left: 0.6em;
left: 0.6em;
}
h2, h3, h4 {
@ -89,7 +89,7 @@ form fieldset {
margin: 0;
}
form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
form input[type="text"], form input[type="number"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
border: 1px solid #999;
padding: 0.5em 1em;
min-width: 12em;
@ -149,7 +149,7 @@ form button, input[type="submit"] {
#bookmarklet {
cursor: move;
}
}
h2:after {
content: "";
@ -296,7 +296,7 @@ h2:after {
/* ==========================================================================
2 = Layout
========================================================================== */
#content {
margin-top: 5em;
min-height: 30em;
@ -653,7 +653,7 @@ a.add-to-wallabag-link-after:after {
/* ==========================================================================
3 = Pictos
========================================================================== */
@font-face {
font-family: 'icomoon';
src:url('../fonts/icomoon.eot?-s0mcsx');
@ -866,7 +866,7 @@ blockquote {
color: #FFF;
text-decoration: none;
}
#article_toolbar a:hover, #article_toolbar a:focus {
background-color: #999;
}
@ -1052,7 +1052,7 @@ pre code {
#article_toolbar a {
padding: 0.3em 0.4em 0.2em;
}
#display-mode {
display: none;
}