mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-28 22:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #854 from wallabag/saveclick2search

Browse source 
Saveclick2search (fix for #831)
This commit is contained in:
Nicolas Lœuillet 2014-10-04 20:13:10 +02:00
commit 29e95769b5
8 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
View file

Binary file not shown.

7
locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
View file

@ -1,6 +1,6 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: wallabag\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-02-25 15:17+0300\n" "POT-Creation-Date: 2014-02-25 15:17+0300\n"
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
@ -10,7 +10,7 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.4\n" "X-Generator: Poedit 1.6.9\n"
"X-Poedit-Basepath: .\n" "X-Poedit-Basepath: .\n"
msgid "wallabag, a read it later open source system" msgid "wallabag, a read it later open source system"
@ -568,6 +568,9 @@ msgstr ""
"To completely remove wallabag, delete the wallabag folder on your web server " "To completely remove wallabag, delete the wallabag folder on your web server "
"(and eventual databases)." "(and eventual databases)."
msgid "Enter your search here"
msgstr "Enter your search here"
#~ msgid "poche it!" #~ msgid "poche it!"
#~ msgstr "poche it!" #~ msgstr "poche it!"

BIN
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
View file

Binary file not shown.

2
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
View file

@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-SourceCharset: UTF-8\n"
"X-Generator: Poedit 1.6.4\n" "X-Generator: Poedit 1.6.9\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
msgid "wallabag, a read it later open source system" msgid "wallabag, a read it later open source system"

2
themes/baggy/_search-form.twig
View file

@ -1,7 +1,7 @@
<div id="search-form" class="messages info"> <div id="search-form" class="messages info">
<form method="get" action="index.php"> <form method="get" action="index.php">
<input type="hidden" name="view" value="search"></input> <input type="hidden" name="view" value="search"></input>
<label><a href="javascript: void(null);" id="search-form-close">X</a>{% trans "Search" %}</label> : <input type="text" name="search" /> <label><a href="javascript: void(null);" id="search-form-close">X</a>{% trans "Search" %}</label> : <input required placeholder="{% trans "Enter your search here" %}" type="text" name="search" id="searchfield" />
<input id="submit-search" type="submit" value="{% trans "Search" %} !"></input> <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
</form> </form>
</div> </div>

2
themes/default/_search-form.twig
View file

@ -2,7 +2,7 @@
<form method="get" action="index.php"> <form method="get" action="index.php">
<p> <p>
<input type="hidden" name="view" value="search"></input> <input type="hidden" name="view" value="search"></input>
<label>{% trans "Search" %}</label> : <input type="text" placeholder="{% trans "Enter your search here" %}" name="search" /> <label>{% trans "Search" %}</label> : <input type="text" required placeholder="{% trans "Enter your search here" %}" name="search" id="searchfield" />
<input type="submit" value="{% trans "Search" %} !"></input> <input type="submit" value="{% trans "Search" %} !"></input>
</p> </p>
</form> </form>

5
themes/default/css/messages.css
View file

@ -8,6 +8,11 @@
border-radius: 4px; border-radius: 4px;
} }
/* Search form message needs a little more width, depending on translations */
#search-form {
width: 420px;
}
.messages a.closeMessage { .messages a.closeMessage {
display: none; display: none;
float: right; float: right;

1
themes/default/js/popupForm.js
View file

@ -10,6 +10,7 @@ $(document).ready(function() {
$("#search").click(function(){ $("#search").click(function(){
closeSearch(); closeSearch();
$('#searchfield').focus();
}); });
$("#search-form-close").click(function(){ $("#search-form-close").click(function(){