diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/default')
12 files changed, 20 insertions, 21 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig b/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig index 61996353..c7e2f66e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/_bookmarklet.twig | |||
@@ -1,3 +1,3 @@ | |||
1 | <script type="text/javascript"> | 1 | <script type="text/javascript"> |
2 | 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>" | 2 | 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>" |
3 | </script> \ No newline at end of file | 3 | </script> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig b/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig index 213a4aca..25539f6b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/_footer.twig | |||
@@ -1,4 +1,4 @@ | |||
1 | <footer class="w600p center mt3 mb3 smaller txtright"> | 1 | <footer class="w600p center mt3 mb3 smaller txtright"> |
2 | <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p> | 2 | <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p> |
3 | {% 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 %} | 3 | {% 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 %} |
4 | </footer> \ No newline at end of file | 4 | </footer> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig b/src/Wallabag/CoreBundle/Resources/views/default/_import.twig index c59b7a15..63a2d3e2 100755 --- a/src/Wallabag/CoreBundle/Resources/views/default/_import.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/_import.twig | |||
@@ -2,7 +2,7 @@ | |||
2 | <!-- | 2 | <!-- |
3 | $(document).ready(function() { | 3 | $(document).ready(function() { |
4 | $("body").css("cursor", "wait"); | 4 | $("body").css("cursor", "wait"); |
5 | 5 | ||
6 | setTimeout(function(){ | 6 | setTimeout(function(){ |
7 | window.location = './?import'; | 7 | window.location = './?import'; |
8 | }, {{ import.delay }} ); | 8 | }, {{ import.delay }} ); |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig b/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig index eedf84f1..83fa3717 100644 --- a/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/_menu.twig | |||
@@ -11,4 +11,3 @@ | |||
11 | </ul> | 11 | </ul> |
12 | {% include '_pocheit-form.twig' %} | 12 | {% include '_pocheit-form.twig' %} |
13 | {% include '_search-form.twig' %} | 13 | {% include '_search-form.twig' %} |
14 | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig b/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig index 679aa098..b8481494 100644 --- a/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/_messages.twig | |||
@@ -1 +1 @@ | |||
{{ messages | raw }} \ No newline at end of file | {{ messages | raw }} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig b/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig index 0cf6097a..70f97356 100755 --- a/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/_search-form.twig | |||
@@ -1,4 +1,4 @@ | |||
1 | <div id="search-form" class="messages info"> | 1 | <div id="search-form" class="messages info"> |
2 | <form method="get" action="index.php"> | 2 | <form method="get" action="index.php"> |
3 | <p> | 3 | <p> |
4 | <input type="hidden" name="view" value="search"></input> | 4 | <input type="hidden" name="view" value="search"></input> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/about.twig b/src/Wallabag/CoreBundle/Resources/views/default/about.twig index 50ffd8ef..7ddb19d6 100755 --- a/src/Wallabag/CoreBundle/Resources/views/default/about.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/about.twig | |||
@@ -70,5 +70,5 @@ | |||
70 | 70 | ||
71 | <dt>PHPePub</dt> | 71 | <dt>PHPePub</dt> |
72 | <dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd> | 72 | <dd><a href="https://github.com/Grandt/PHPePub/">https://github.com/Grandt/PHPePub/</a></dd> |
73 | </dl> | 73 | </dl> |
74 | {% endblock %} | 74 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/config.twig b/src/Wallabag/CoreBundle/Resources/views/default/config.twig index b7d91937..6769da74 100755 --- a/src/Wallabag/CoreBundle/Resources/views/default/config.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/config.twig | |||
@@ -45,7 +45,7 @@ | |||
45 | {% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %} | 45 | {% trans "You can regenerate your token: <a href='?feed&action=generate'>generate!</a>." %} |
46 | </p> | 46 | </p> |
47 | {% endif %} | 47 | {% endif %} |
48 | 48 | ||
49 | <h2>{% trans "Change your theme" %}</h2> | 49 | <h2>{% trans "Change your theme" %}</h2> |
50 | <form method="post" action="?updatetheme" name="changethemeform"> | 50 | <form method="post" action="?updatetheme" name="changethemeform"> |
51 | <fieldset class="w500p inline"> | 51 | <fieldset class="w500p inline"> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/export.twig b/src/Wallabag/CoreBundle/Resources/views/default/export.twig index 4adb9540..18a98a87 100644 --- a/src/Wallabag/CoreBundle/Resources/views/default/export.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/export.twig | |||
@@ -1 +1 @@ | |||
{{ export }} \ No newline at end of file | {{ export }} | ||
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig b/src/Wallabag/CoreBundle/Resources/views/default/layout.twig index dfebc3ea..d32395a2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/default/layout.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/layout.twig | |||
@@ -28,4 +28,4 @@ | |||
28 | </div> | 28 | </div> |
29 | {% include '_footer.twig' %} | 29 | {% include '_footer.twig' %} |
30 | </body> | 30 | </body> |
31 | </html> \ No newline at end of file | 31 | </html> |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig b/src/Wallabag/CoreBundle/Resources/views/default/tags.twig index e5be748e..47359ed1 100755 --- a/src/Wallabag/CoreBundle/Resources/views/default/tags.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/tags.twig | |||
@@ -15,4 +15,4 @@ | |||
15 | 15 | ||
16 | {% endfor %} | 16 | {% endfor %} |
17 | </div> | 17 | </div> |
18 | {% endblock %} \ No newline at end of file | 18 | {% endblock %} |
diff --git a/src/Wallabag/CoreBundle/Resources/views/default/view.twig b/src/Wallabag/CoreBundle/Resources/views/default/view.twig index 8f3a26c3..154de1e4 100755 --- a/src/Wallabag/CoreBundle/Resources/views/default/view.twig +++ b/src/Wallabag/CoreBundle/Resources/views/default/view.twig | |||
@@ -42,7 +42,7 @@ | |||
42 | <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script> | 42 | <script src="{{ poche_url }}themes/_global/js/restoreScroll.js"></script> |
43 | <script type="text/javascript"> | 43 | <script type="text/javascript"> |
44 | $(document).ready(function() { | 44 | $(document).ready(function() { |
45 | 45 | ||
46 | // toggle read property of current article | 46 | // toggle read property of current article |
47 | $('#markAsRead').click(function(){ | 47 | $('#markAsRead').click(function(){ |
48 | $("body").css("cursor", "wait"); | 48 | $("body").css("cursor", "wait"); |
@@ -50,11 +50,11 @@ | |||
50 | function( data ) { | 50 | function( data ) { |
51 | if ( data == '1' ) { | 51 | if ( data == '1' ) { |
52 | if ( $('#markAsRead').hasClass("archive-off") ) { | 52 | if ( $('#markAsRead').hasClass("archive-off") ) { |
53 | $('#markAsRead').removeClass("archive-off"); | 53 | $('#markAsRead').removeClass("archive-off"); |
54 | $('#markAsRead').addClass("archive"); | 54 | $('#markAsRead').addClass("archive"); |
55 | } | 55 | } |
56 | else { | 56 | else { |
57 | $('#markAsRead').removeClass("archive"); | 57 | $('#markAsRead').removeClass("archive"); |
58 | $('#markAsRead').addClass("archive-off"); | 58 | $('#markAsRead').addClass("archive-off"); |
59 | } | 59 | } |
60 | } | 60 | } |
@@ -64,7 +64,7 @@ | |||
64 | }); | 64 | }); |
65 | $("body").css("cursor", "auto"); | 65 | $("body").css("cursor", "auto"); |
66 | }); | 66 | }); |
67 | 67 | ||
68 | // toggle favorite property of current article | 68 | // toggle favorite property of current article |
69 | $('#setFav').click(function(){ | 69 | $('#setFav').click(function(){ |
70 | $("body").css("cursor", "wait"); | 70 | $("body").css("cursor", "wait"); |
@@ -72,11 +72,11 @@ | |||
72 | function( data ) { | 72 | function( data ) { |
73 | if ( data == '1' ) { | 73 | if ( data == '1' ) { |
74 | if ( $('#setFav').hasClass("fav-off") ) { | 74 | if ( $('#setFav').hasClass("fav-off") ) { |
75 | $('#setFav').removeClass("fav-off"); | 75 | $('#setFav').removeClass("fav-off"); |
76 | $('#setFav').addClass("fav"); | 76 | $('#setFav').addClass("fav"); |
77 | } | 77 | } |
78 | else { | 78 | else { |
79 | $('#setFav').removeClass("fav"); | 79 | $('#setFav').removeClass("fav"); |
80 | $('#setFav').addClass("fav-off"); | 80 | $('#setFav').addClass("fav-off"); |
81 | } | 81 | } |
82 | } | 82 | } |
@@ -86,8 +86,8 @@ | |||
86 | }); | 86 | }); |
87 | $("body").css("cursor", "auto"); | 87 | $("body").css("cursor", "auto"); |
88 | }); | 88 | }); |
89 | 89 | ||
90 | // set percent of read on startup | 90 | // set percent of read on startup |
91 | if ( $(document).height() <= $(window).innerHeight() ) { | 91 | if ( $(document).height() <= $(window).innerHeight() ) { |
92 | pp = 100; | 92 | pp = 100; |
93 | } | 93 | } |
@@ -95,7 +95,7 @@ | |||
95 | pp = 0; | 95 | pp = 0; |
96 | } | 96 | } |
97 | $('#readLeftPercent').text( pp + '%' ); | 97 | $('#readLeftPercent').text( pp + '%' ); |
98 | 98 | ||
99 | 99 | ||
100 | $(window).scroll(function(e){ | 100 | $(window).scroll(function(e){ |
101 | var scrollTop = $(window).scrollTop(); | 101 | var scrollTop = $(window).scrollTop(); |
@@ -103,7 +103,7 @@ | |||
103 | var scrollPercent = (scrollTop) / (docHeight); | 103 | var scrollPercent = (scrollTop) / (docHeight); |
104 | var scrollPercentRounded = Math.round(scrollPercent*100)/100; | 104 | var scrollPercentRounded = Math.round(scrollPercent*100)/100; |
105 | savePercent({{ entry.id|e }}, scrollPercentRounded); | 105 | savePercent({{ entry.id|e }}, scrollPercentRounded); |
106 | 106 | ||
107 | // change percent of read on scroll | 107 | // change percent of read on scroll |
108 | pp = Math.round(scrollTop * 100 / ( docHeight - $(window).innerHeight() )); | 108 | pp = Math.round(scrollTop * 100 / ( docHeight - $(window).innerHeight() )); |
109 | $('#readLeftPercent').text( pp + '%' ); | 109 | $('#readLeftPercent').text( pp + '%' ); |