aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xinstall/index.php3
-rwxr-xr-xthemes/_global/js/saveLink.js10
-rwxr-xr-xthemes/baggy/_pocheit-form.twig4
-rwxr-xr-xthemes/baggy/css/main.css3
-rwxr-xr-xthemes/default/_pocheit-form.twig4
-rwxr-xr-xthemes/default/css/style-default.css10
-rw-r--r--themes/default/img/default/tags.pngbin0 -> 332 bytes
7 files changed, 33 insertions, 1 deletions
diff --git a/install/index.php b/install/index.php
index bd9e502d..0d3977bb 100755
--- a/install/index.php
+++ b/install/index.php
@@ -11,6 +11,8 @@
11$errors = array(); 11$errors = array();
12$successes = array(); 12$successes = array();
13 13
14$final = false;
15
14require_once('install_functions.php'); 16require_once('install_functions.php');
15 17
16if (isset($_GET['clean'])) { 18if (isset($_GET['clean'])) {
@@ -49,7 +51,6 @@ else if (isset($_POST['install'])) {
49 $errors[] = 'You must install twig before.'; 51 $errors[] = 'You must install twig before.';
50 } else { 52 } else {
51 $continue = true; 53 $continue = true;
52 $final = false;
53 $salt = generate_salt(); 54 $salt = generate_salt();
54 $content = file_get_contents('inc/poche/config.inc.default.php'); 55 $content = file_get_contents('inc/poche/config.inc.default.php');
55 56
diff --git a/themes/_global/js/saveLink.js b/themes/_global/js/saveLink.js
index a7acd84c..b7dd7a34 100755
--- a/themes/_global/js/saveLink.js
+++ b/themes/_global/js/saveLink.js
@@ -4,6 +4,8 @@ $.fn.ready(function() {
4 $bagitForm = $('#bagit-form'), 4 $bagitForm = $('#bagit-form'),
5 $bagitFormForm = $('#bagit-form-form'); 5 $bagitFormForm = $('#bagit-form-form');
6 6
7$("#tags2add").hide();
8
7 /* ========================================================================== 9 /* ==========================================================================
8 bag it link and close button 10 bag it link and close button
9 ========================================================================== */ 11 ========================================================================== */
@@ -78,6 +80,14 @@ $.fn.ready(function() {
78 event.preventDefault(); 80 event.preventDefault();
79 }); 81 });
80 82
83$('#showtaginput').click(function(){
84 $('#tags2add').toggle();
85 $('#plainurl').toggle();
86 $('#showtaginput').toggleClass('icon-tags');
87 $('#showtaginput').toggleClass('icon-check');
88});
89
90
81 /* ========================================================================== 91 /* ==========================================================================
82 Keyboard gestion 92 Keyboard gestion
83 ========================================================================== */ 93 ========================================================================== */
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index bf2ae903..85d33873 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -4,6 +4,10 @@
4 <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a> 4 <a href="javascript: void(null);" id="bagit-form-close" class="close-button--popup close-button">&times;</a>
5 <input type="hidden" name="autoclose" value="1" /> 5 <input type="hidden" name="autoclose" value="1" />
6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> 6 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
7 <div style="display:inline-block;cursor: pointer;" title="{% trans "Edit tags" %}" id="showtaginput" class="tool icon icon-tags">
8 <span>Add tags</span>
9 </div>
10 <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
7 <span id="add-link-result"></span> 11 <span id="add-link-result"></span>
8 <input type="submit" value="{% trans "save link!" %}" /> 12 <input type="submit" value="{% trans "save link!" %}" />
9 </form> 13 </form>
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 54622cfc..b93a78b8 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -745,6 +745,9 @@ a.add-to-wallabag-link-after:after {
745.icon-evernote:before { 745.icon-evernote:before {
746 content: "\e603"; 746 content: "\e603";
747} 747}
748.icon-tags:before {
749 content: "\e936";
750}
748 751
749 752
750/* .icon-image class, for image-based icons 753/* .icon-image class, for image-based icons
diff --git a/themes/default/_pocheit-form.twig b/themes/default/_pocheit-form.twig
index 8c982db0..71991341 100755
--- a/themes/default/_pocheit-form.twig
+++ b/themes/default/_pocheit-form.twig
@@ -2,6 +2,10 @@
2 <a href="javascript: void(null);" id="bagit-form-close">&nbsp;</a> 2 <a href="javascript: void(null);" id="bagit-form-close">&nbsp;</a>
3 <form method="get" action="index.php" id="bagit-form-form"> 3 <form method="get" action="index.php" id="bagit-form-form">
4 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" /> 4 <input required placeholder="example.com/article" class="addurl" id="plainurl" name="plainurl" type="url" />
5 <div style="display:inline-block;cursor: pointer;" title="{% trans "Edit tags" %}" id="showtaginput" class="edit-tags">
6 <span id="showtaginput">Add tags</span>
7 </div>
8 <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
5 <input type="submit" value="{% trans "save link!" %}" /> 9 <input type="submit" value="{% trans "save link!" %}" />
6 <div id="add-link-result"></div> 10 <div id="add-link-result"></div>
7 </form> 11 </form>
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 39a4df90..da8703f2 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -75,3 +75,13 @@ a.print span {
75a.reload span { 75a.reload span {
76 background-image: url('../img/default/reload.png'); 76 background-image: url('../img/default/reload.png');
77} 77}
78.edit-tags span {
79 background-image: url('../img/default/tags.png');
80 display: inline-block;
81 width: 16px;
82 height: 16px;
83 /* Hide textual content */
84 overflow: hidden;
85 text-align: left;
86 text-indent: -9999px;
87}
diff --git a/themes/default/img/default/tags.png b/themes/default/img/default/tags.png
new file mode 100644
index 00000000..3714203e
--- /dev/null
+++ b/themes/default/img/default/tags.png
Binary files differ