diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources')
3 files changed, 24 insertions, 20 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig index b134b6ca..f2a98dfb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig | |||
@@ -56,11 +56,15 @@ | |||
56 | <fieldset class="w500p inline"> | 56 | <fieldset class="w500p inline"> |
57 | <div class="row"> | 57 | <div class="row"> |
58 | <label>Rss links:</label> | 58 | <label>Rss links:</label> |
59 | <ul> | 59 | {% if rss.token %} |
60 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li> | 60 | <ul> |
61 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li> | 61 | <li><a href="{{ path('unread_rss', {'username': rss.username, 'token': rss.token}) }}">unread</a></li> |
62 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li> | 62 | <li><a href="{{ path('starred_rss', {'username': rss.username, 'token': rss.token}) }}">fav</a></li> |
63 | </ul> | 63 | <li><a href="{{ path('archive_rss', {'username': rss.username, 'token': rss.token}) }}">archives</a></li> |
64 | </ul> | ||
65 | {% else %} | ||
66 | <strong>You need to generate a token first.</strong> | ||
67 | {% endif %} | ||
64 | </div> | 68 | </div> |
65 | </fieldset> | 69 | </fieldset> |
66 | 70 | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig index 6eebc80d..f1039f5d 100644 --- a/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig | |||
@@ -17,11 +17,11 @@ | |||
17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> | 17 | <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate> |
18 | <description> | 18 | <description> |
19 | <![CDATA[ | 19 | <![CDATA[ |
20 | {%- if entry.content| readingTime > 0 %} | 20 | {%- if entry.content| readingTime > 0 -%} |
21 | {% trans %}estimated reading time :{% endtrans %} {{ entry.content| readingTime }} min | 21 | {% trans %}estimated reading time :{% endtrans %} {{ entry.content| readingTime }} min |
22 | {% else -%} | 22 | {%- else -%} |
23 | {% trans %}estimated reading time :{% endtrans %} < 1 min | 23 | {% trans %}estimated reading time :{% endtrans %} < 1 min |
24 | {% endif -%} | 24 | {%- endif %} |
25 | 25 | ||
26 | {{ entry.content -}} | 26 | {{ entry.content -}} |
27 | ]]> | 27 | ]]> |
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 1df82910..ff1a36a1 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 | |||
@@ -7,7 +7,7 @@ | |||
7 | 4 = Messages | 7 | 4 = Messages |
8 | 5 = Article | 8 | 5 = Article |
9 | 6 = Media queries | 9 | 6 = Media queries |
10 | 10 | ||
11 | ========================================================================== */ | 11 | ========================================================================== */ |
12 | 12 | ||
13 | html { | 13 | html { |
@@ -42,17 +42,17 @@ body { | |||
42 | position: absolute; | 42 | position: absolute; |
43 | top: 2em; | 43 | top: 2em; |
44 | left: 50%; | 44 | left: 50%; |
45 | margin-left: -55px; | 45 | margin-left: -55px; |
46 | } | 46 | } |
47 | 47 | ||
48 | /* ========================================================================== | 48 | /* ========================================================================== |
49 | 1 = Style Guide | 49 | 1 = Style Guide |
50 | ========================================================================== */ | 50 | ========================================================================== */ |
51 | 51 | ||
52 | ::selection { | 52 | ::selection { |
53 | color: #FFF; | 53 | color: #FFF; |
54 | background-color: #000; | 54 | background-color: #000; |
55 | } | 55 | } |
56 | 56 | ||
57 | .desktopHide { | 57 | .desktopHide { |
58 | display: none; | 58 | display: none; |
@@ -62,7 +62,7 @@ body { | |||
62 | position: fixed; | 62 | position: fixed; |
63 | z-index: 20; | 63 | z-index: 20; |
64 | top: 0.4em; | 64 | top: 0.4em; |
65 | left: 0.6em; | 65 | left: 0.6em; |
66 | } | 66 | } |
67 | 67 | ||
68 | h2, h3, h4 { | 68 | h2, h3, h4 { |
@@ -89,7 +89,7 @@ form fieldset { | |||
89 | margin: 0; | 89 | margin: 0; |
90 | } | 90 | } |
91 | 91 | ||
92 | form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] { | 92 | form input[type="text"], form input[type="number"], select, form input[type="password"], form input[type="url"], form input[type="email"] { |
93 | border: 1px solid #999; | 93 | border: 1px solid #999; |
94 | padding: 0.5em 1em; | 94 | padding: 0.5em 1em; |
95 | min-width: 12em; | 95 | min-width: 12em; |
@@ -149,7 +149,7 @@ form button, input[type="submit"] { | |||
149 | 149 | ||
150 | #bookmarklet { | 150 | #bookmarklet { |
151 | cursor: move; | 151 | cursor: move; |
152 | } | 152 | } |
153 | 153 | ||
154 | h2:after { | 154 | h2:after { |
155 | content: ""; | 155 | content: ""; |
@@ -296,7 +296,7 @@ h2:after { | |||
296 | /* ========================================================================== | 296 | /* ========================================================================== |
297 | 2 = Layout | 297 | 2 = Layout |
298 | ========================================================================== */ | 298 | ========================================================================== */ |
299 | 299 | ||
300 | #content { | 300 | #content { |
301 | margin-top: 5em; | 301 | margin-top: 5em; |
302 | min-height: 30em; | 302 | min-height: 30em; |
@@ -653,7 +653,7 @@ a.add-to-wallabag-link-after:after { | |||
653 | /* ========================================================================== | 653 | /* ========================================================================== |
654 | 3 = Pictos | 654 | 3 = Pictos |
655 | ========================================================================== */ | 655 | ========================================================================== */ |
656 | 656 | ||
657 | @font-face { | 657 | @font-face { |
658 | font-family: 'icomoon'; | 658 | font-family: 'icomoon'; |
659 | src:url('../fonts/icomoon.eot?-s0mcsx'); | 659 | src:url('../fonts/icomoon.eot?-s0mcsx'); |
@@ -866,7 +866,7 @@ blockquote { | |||
866 | color: #FFF; | 866 | color: #FFF; |
867 | text-decoration: none; | 867 | text-decoration: none; |
868 | } | 868 | } |
869 | 869 | ||
870 | #article_toolbar a:hover, #article_toolbar a:focus { | 870 | #article_toolbar a:hover, #article_toolbar a:focus { |
871 | background-color: #999; | 871 | background-color: #999; |
872 | } | 872 | } |
@@ -1052,7 +1052,7 @@ pre code { | |||
1052 | #article_toolbar a { | 1052 | #article_toolbar a { |
1053 | padding: 0.3em 0.4em 0.2em; | 1053 | padding: 0.3em 0.4em 0.2em; |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | #display-mode { | 1056 | #display-mode { |
1057 | display: none; | 1057 | display: none; |
1058 | } | 1058 | } |