]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of git://github.com/mariroz/wallabag into mariroz-dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Mon, 3 Feb 2014 10:56:01 +0000 (11:56 +0100)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Mon, 3 Feb 2014 10:56:01 +0000 (11:56 +0100)
themes/courgette/_bookmarklet.twig [deleted file]
themes/courgette/_footer.twig [deleted file]
themes/courgette/_messages.twig [deleted file]
themes/courgette/config.twig
themes/courgette/export.twig [deleted file]
themes/courgette/install.twig [deleted file]

diff --git a/themes/courgette/_bookmarklet.twig b/themes/courgette/_bookmarklet.twig
deleted file mode 100755 (executable)
index 2e3071a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-        <script type="text/javascript">
-          top["bookmarklet-url@wallabag.org"]=""+"<!DOCTYPE html>"+"<html>"+"<head>"+"<title>poche 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>"
-        </script>
\ No newline at end of file
diff --git a/themes/courgette/_footer.twig b/themes/courgette/_footer.twig
deleted file mode 100755 (executable)
index cce31f3..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-        <footer class="w600p center mt3 mb3 smaller txtright">
-            <p>{% trans "powered by" %} <a href="http://wallabag.org">wallabag</a></p>
-            {% 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 %}
-        </footer>
\ No newline at end of file
diff --git a/themes/courgette/_messages.twig b/themes/courgette/_messages.twig
deleted file mode 100755 (executable)
index 679aa09..0000000
+++ /dev/null
@@ -1 +0,0 @@
-                {{ messages | raw }}
\ No newline at end of file
index 3ab1d92f4a250006e837fd670ac2e851b5157a78..26da7289b23910b6c81ce2be36a549e9a4aa6618 100755 (executable)
@@ -24,7 +24,7 @@
 
             <h2>{% trans "Updating poche" %}</h2>
             <ul>
-                <li>{% trans "your version" %} : <strong>{{ constant('POCHE_VERSION') }}</strong></li>
+                <li>{% trans "your version" %} : <strong>{{ constant('POCHE') }}</strong></li>
                 <li>{% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}<strong><a href="http://wallabag.org/">{% trans "a more recent stable version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>
                 {% if constant('DEBUG_POCHE') == 1 %}<li>{% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}<strong><a href="http://wallabag.org/">{% trans "a more recent development version is available." %}</a></strong>{% else %}{% trans "you are up to date." %}{% endif %}</li>{% endif %}
             </ul>
diff --git a/themes/courgette/export.twig b/themes/courgette/export.twig
deleted file mode 100755 (executable)
index 4adb954..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{{ export }}
\ No newline at end of file
diff --git a/themes/courgette/install.twig b/themes/courgette/install.twig
deleted file mode 100755 (executable)
index 20d15f1..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}{% trans "installation" %}{% endblock %}
-{% block content %}
-        <form method="post" action="?install" name="loginform">
-            <fieldset class="w500p center">
-                <h2 class="mbs txtcenter">{% trans "install your wallabag" %}</h2>
-                <p>
-                    {% trans "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to <a href='http://doc.wallabag.org'>read the documentation on wallabag website</a>." %}
-                </p>
-                <p class="row">
-                    <label class="col w150p" for="login">{% trans "Login" %}</label>
-                    <input class="col" type="text" id="login" name="login" placeholder="Login" tabindex="1" autofocus />
-                </p>
-                <p class="row">
-                    <label class="col w150p" for="password">{% trans "Password" %}</label>
-                    <input class="col" type="password" id="password" name="password" placeholder="Password" tabindex="2">
-                </p>
-                <p class="row">
-                    <label class="col w150p" for="password_repeat">{% trans "Repeat your password" %}</label>
-                    <input class="col" type="password" id="password_repeat" name="password_repeat" placeholder="Password" tabindex="3">
-                </p>
-                <p class="row mts txtcenter">
-                    <button class="bouton" type="submit" tabindex="4">{% trans "Install" %}</button>
-                </p>
-            </fieldset>
-            <input type="hidden" name="token" value="{{ token }}">
-        </form>
-{% endblock %}
\ No newline at end of file