aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2014-02-13 19:49:25 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2014-02-13 19:49:25 +0100
commit5e98c2183ae824ab6a1dd2dc22f8619a0d718977 (patch)
tree24ab567d403c967a8b33de8750053abeeca0125a /themes/default
parent38dafee05d52948fba4a06066d7b0343c8e3de9d (diff)
parent9f3148fec787a51f837549907130e8ec980a0547 (diff)
downloadwallabag-5e98c2183ae824ab6a1dd2dc22f8619a0d718977.tar.gz
wallabag-5e98c2183ae824ab6a1dd2dc22f8619a0d718977.tar.zst
wallabag-5e98c2183ae824ab6a1dd2dc22f8619a0d718977.zip
Merge pull request #450 from wallabag/dev1.5.0
1.5.0
Diffstat (limited to 'themes/default')
-rw-r--r--themes/default/_footer.twig2
-rw-r--r--themes/default/_head.twig21
-rw-r--r--themes/default/js/closeMessage.js17
-rw-r--r--themes/default/view.twig2
4 files changed, 30 insertions, 12 deletions
diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig
index f837ae38..3057cb75 100644
--- a/themes/default/_footer.twig
+++ b/themes/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 poche version:" %}{{constant('POCHE')}}. {% 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('POCHE')}}. {% trans "storage:" %} {{constant('STORAGE')}}</strong></p>{% endif %}
4 </footer> \ No newline at end of file 4 </footer> \ No newline at end of file
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 577cc693..f310e420 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -1,11 +1,12 @@
1 <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/favicon.ico" /> 1 <link rel="shortcut icon" type="image/x-icon" href="{{ poche_url }}/themes/default/img/favicon.ico" />
2 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/apple-touch-icon-144x144-precomposed.png"> 2 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/default/img/apple-touch-icon-144x144-precomposed.png">
3 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/apple-touch-icon-72x72-precomposed.png"> 3 <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/default/img/apple-touch-icon-72x72-precomposed.png">
4 <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/img/apple-touch-icon-precomposed.png"> 4 <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/default/img/apple-touch-icon-precomposed.png">
5 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/knacss.css" media="all"> 5 <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/knacss.css" media="all">
6 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/style.css" media="all"> 6 <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/style.css" media="all">
7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> 7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all"> 8 <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/messages.css" media="all">
9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/default/css/print.css" media="print">
10 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script> 10 <script src="{{ poche_url }}/themes/default/js/jquery-2.0.3.min.js"></script>
11 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/autoClose.js"></script> \ No newline at end of file 11 <script src="{{ poche_url }}/themes/default/js/autoClose.js"></script>
12 <script src="{{ poche_url }}/themes/default/js/closeMessage.js"></script> \ No newline at end of file
diff --git a/themes/default/js/closeMessage.js b/themes/default/js/closeMessage.js
new file mode 100644
index 00000000..b57fe4a8
--- /dev/null
+++ b/themes/default/js/closeMessage.js
@@ -0,0 +1,17 @@
1$(function(){
2 //---------------------------------------------------------------------------
3 // Show the close icon when the user hover over a message
4 //---------------------------------------------------------------------------
5 $('.messages').on('mouseenter', function(){
6 $(this).find('a.closeMessage').stop(true, true).show();
7 }).on('mouseleave', function(){
8 $(this).find('a.closeMessage').stop(true, true).hide();
9 });
10 //---------------------------------------------------------------------------
11 // Close the message box when the user clicks the close icon
12 //---------------------------------------------------------------------------
13 $('a.closeMessage').on('click', function(){
14 $(this).parents('div.messages').slideUp(300, function(){ $(this).remove(); });
15 return false;
16 });
17}); \ No newline at end of file
diff --git a/themes/default/view.twig b/themes/default/view.twig
index d09977a8..9858996f 100644
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -21,7 +21,7 @@
21 <h1>{{ entry.title|raw }}</h1> 21 <h1>{{ entry.title|raw }}</h1>
22 </header> 22 </header>
23 <aside class="tags"> 23 <aside class="tags">
24 tags: {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a> 24 {% trans "tags:" %} {% for tag in tags %}<a href="./?view=tag&amp;id={{ tag.id }}">{{ tag.value }}</a> {% endfor %}<a href="./?view=edit-tags&amp;id={{ entry.id|e }}" title="{% trans "Edit tags" %}">✎</a>
25 </aside> 25 </aside>
26 <article> 26 <article>
27 {{ content | raw }} 27 {{ content | raw }}