From 3008e36a3ec1b0998e44f2aba62435b54e2ac865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Fri, 23 Aug 2013 22:01:17 +0200
Subject: fix bug #162 links to firefox / chrome / android apps
---
tpl/config.twig | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
index 5324cda7..8851c3dc 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -11,11 +11,17 @@
{% endblock %}
{% block content %}
- {% trans "Bookmarklet" %}
- {% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.
- {% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}
- {% trans "poche it!" %}
+ {% trans "Poching a link" %}
+ You can poche a link by several methods: (?)
+
+
+
{% trans "Updating poche" %}
- {% trans "your version" %} : {{ constant('POCHE_VERSION') }}
--
cgit v1.2.3
From 8413a63f7d9df2695653ab2ef1d77927da6ddc55 Mon Sep 17 00:00:00 2001
From: Nicolas Frandeboeuf
Date: Fri, 23 Aug 2013 22:20:04 +0200
Subject: Clean markup in templates
---
tpl/config.twig | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
index 5324cda7..9f2fe5a4 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -14,15 +14,14 @@
{% trans "Bookmarklet" %}
{% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.
{% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}
- {% trans "poche it!" %}
+ {% trans "poche it!" %}
{% trans "Updating poche" %}
-
+
-
{% trans "Change your password" %}
{% endblock %}
{% block content %}
- {% trans "Bookmarklet" %}
- {% trans "Thanks to the bookmarklet, you will be able to easily add a link to your poche." %} {% trans "Have a look to this documentation:" %} inthepoche.com.
- {% trans "Drag & drop this link to your bookmarks bar and have fun with poche." %}
- {% trans "poche it!" %}
+ {% trans "Poching a link" %}
+ You can poche a link by several methods: (?)
+
{% trans "Updating poche" %}
--
cgit v1.2.3
From 0269cd821311500acffed61edb1bc168d3fb5ec8 Mon Sep 17 00:00:00 2001
From: nicofrand
Date: Fri, 23 Aug 2013 23:05:45 +0200
Subject: Add SHAARLI support to view template
---
tpl/config.twig | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tpl/config.twig
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
old mode 100644
new mode 100755
--
cgit v1.2.3
From fd99a8c02d7c625771656a5c5081560027d8e6e9 Mon Sep 17 00:00:00 2001
From: Nicolas Frandeboeuf
Date: Fri, 23 Aug 2013 23:09:43 +0200
Subject: Revert "Add SHAARLI support to view template"
This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8.
---
tpl/config.twig | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 tpl/config.twig
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
old mode 100755
new mode 100644
--
cgit v1.2.3
From db4767e22b9c130bdfe7102383d0f42a2eece490 Mon Sep 17 00:00:00 2001
From: EliasZ
Date: Sat, 24 Aug 2013 16:03:49 +0200
Subject: config template its import section reflects defines
---
tpl/config.twig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
index e8563721..89d5bf84 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -50,9 +50,9 @@
{% trans "Please execute the import script locally, it can take a very long time." %}
{% trans "More infos in the official doc:" %} inthepoche.com
{% trans "Export your poche datas" %}
--
cgit v1.2.3
From a4990dd294c08e40c86123605fbfbc78bc930a6e Mon Sep 17 00:00:00 2001
From: NumEricR
Date: Sun, 25 Aug 2013 16:40:12 +0200
Subject: Externalize bookmarklet style
---
tpl/config.twig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
index 89d5bf84..4c919221 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -17,7 +17,7 @@
- firefox: download the extension
- chrome: download the extension
- android: download the application
- - bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}
+ - bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}
{% trans "Updating poche" %}
--
cgit v1.2.3
From e6ba0359119e93f3659876a7b1a17294f2da2b0e Mon Sep 17 00:00:00 2001
From: NumEricR
Date: Sun, 25 Aug 2013 16:57:37 +0200
Subject: Add bookmarklet id in config page
---
tpl/config.twig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
index 4c919221..9517fc32 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -17,7 +17,7 @@
firefox: download the extension
chrome: download the extension
android: download the application
- bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}
+ bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %}
{% trans "Updating poche" %}
--
cgit v1.2.3
From fccd59e2e303cdbb45293365bf92921b831bf140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?=
Date: Sun, 25 Aug 2013 20:08:07 +0200
Subject: fix display message for import
---
tpl/config.twig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'tpl/config.twig')
diff --git a/tpl/config.twig b/tpl/config.twig
index 89d5bf84..b41cd306 100644
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@ -50,9 +50,9 @@
{% trans "Please execute the import script locally, it can take a very long time." %}
{% trans "More infos in the official doc:" %} inthepoche.com
{% trans "Export your poche datas" %}
--
cgit v1.2.3