aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-10 02:28:53 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-10 02:28:53 +0100
commit1394c0bd64ad99e8f9fc094bb535ae5b3f5e24f1 (patch)
treedb41425bb5b484706acf634d81b693fb5afc002a
parent2e4e94a7a420790cd05250e4191bd0e60f81f788 (diff)
downloadwallabag-1394c0bd64ad99e8f9fc094bb535ae5b3f5e24f1.tar.gz
wallabag-1394c0bd64ad99e8f9fc094bb535ae5b3f5e24f1.tar.zst
wallabag-1394c0bd64ad99e8f9fc094bb535ae5b3f5e24f1.zip
great improvements to tagging when saving a link system <3
-rwxr-xr-xthemes/_global/js/saveLink.js3
-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
6 files changed, 22 insertions, 2 deletions
diff --git a/themes/_global/js/saveLink.js b/themes/_global/js/saveLink.js
index 9f66b73f..b7dd7a34 100755
--- a/themes/_global/js/saveLink.js
+++ b/themes/_global/js/saveLink.js
@@ -82,6 +82,9 @@ $("#tags2add").hide();
82 82
83$('#showtaginput').click(function(){ 83$('#showtaginput').click(function(){
84 $('#tags2add').toggle(); 84 $('#tags2add').toggle();
85 $('#plainurl').toggle();
86 $('#showtaginput').toggleClass('icon-tags');
87 $('#showtaginput').toggleClass('icon-check');
85}); 88});
86 89
87 90
diff --git a/themes/baggy/_pocheit-form.twig b/themes/baggy/_pocheit-form.twig
index bc439134..85d33873 100755
--- a/themes/baggy/_pocheit-form.twig
+++ b/themes/baggy/_pocheit-form.twig
@@ -4,7 +4,9 @@
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 <span id="showtaginput">Add tags</span> 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>
8 <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/> 10 <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
9 <span id="add-link-result"></span> 11 <span id="add-link-result"></span>
10 <input type="submit" value="{% trans "save link!" %}" /> 12 <input type="submit" value="{% trans "save link!" %}" />
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 f4518fce..71991341 100755
--- a/themes/default/_pocheit-form.twig
+++ b/themes/default/_pocheit-form.twig
@@ -2,7 +2,9 @@
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 <span id="showtaginput">Add tags</span> 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>
6 <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/> 8 <input placeholder="tags, with commas" class="addurl" id="tags2add" name="tags" type="text"/>
7 <input type="submit" value="{% trans "save link!" %}" /> 9 <input type="submit" value="{% trans "save link!" %}" />
8 <div id="add-link-result"></div> 10 <div id="add-link-result"></div>
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