aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-07 13:19:34 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-07 13:19:34 +0200
commit031df528b611a5c6639c0d86636633da098d8aa2 (patch)
tree3e301eb1292eedbee21dc119e3cc87eb9047e90b /themes
parent9d3b88b3796496b68e762d50904a7ab609edc9c3 (diff)
downloadwallabag-031df528b611a5c6639c0d86636633da098d8aa2.tar.gz
wallabag-031df528b611a5c6639c0d86636633da098d8aa2.tar.zst
wallabag-031df528b611a5c6639c0d86636633da098d8aa2.zip
bug fix #268: move POCHE_VERSION in index.php and change the name to avoid conflicts when updating
Diffstat (limited to 'themes')
-rw-r--r--themes/default/_footer.twig2
-rw-r--r--themes/default/config.twig4
2 files changed, 3 insertions, 3 deletions
diff --git a/themes/default/_footer.twig b/themes/default/_footer.twig
index 2b895854..06148a57 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://inthepoche.com">poche</a></p> 2 <p>{% trans "powered by" %} <a href="http://inthepoche.com">poche</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_VERSION')}}. {% 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 poche 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/config.twig b/themes/default/config.twig
index 0f1aea80..af8ff8ca 100644
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -5,7 +5,7 @@
5{% include '_menu.twig' %} 5{% include '_menu.twig' %}
6{% endblock %} 6{% endblock %}
7{% block content %} 7{% block content %}
8 <h2>{% trans "Poching a link" %}</h2> 8 <h2>{% trans "Poching a link" %}</h2>F
9 <p>{% trans "You can poche a link by several methods:" %} (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p> 9 <p>{% trans "You can poche a link by several methods:" %} (<a href="http://inthepoche.com/doc" title="{% trans "read the documentation" %}">?</a>)</p>
10 <ul> 10 <ul>
11 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li> 11 <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li>
@@ -23,7 +23,7 @@
23 23
24 <h2>{% trans "Updating poche" %}</h2> 24 <h2>{% trans "Updating poche" %}</h2>
25 <ul> 25 <ul>
26 <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li> 26 <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
27 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li> 27 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
28 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %} 28 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://inthepoche.com/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
29 </ul> 29 </ul>