moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 11:22:17 -05:00
Code Issues Releases Wiki Activity

Merge pull request #621 from wallabag/fix-613

Browse Source 
can't close search popup with the cross picture #613
This commit is contained in:
Nicolas Lœuillet 2014-04-08 21:59:40 +02:00
commit bf20b541ae
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
themes/baggy/_head.twig
View File

@ -12,4 +12,5 @@
<script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script> <script src="{{ poche_url }}themes/{{theme}}/js/jquery.cookie.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script> <script src="{{ poche_url }}themes/{{theme}}/js/init.js"></script>
<script src="{{ poche_url }}themes/default/js/saveLink.js"></script> <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
<script src="{{ poche_url }}themes/default/js/popupForm.js"></script>
<script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script> <script src="{{ poche_url }}themes/{{theme}}/js/closeMessage.js"></script>

22
themes/baggy/_search-form.twig
View File

@ -1,21 +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 type="text" name="search" />
<input id="submit-search" type="submit" value="{% trans "Search" %} !"></input> <input id="submit-search" type="submit" value="{% trans "Search" %} !"></input>
</form> </form>
</div> </div>
<script type="text/javascript">
$(document).ready(function() {
$("#search-form").hide();
$("#search").click(function(){
$("#search-form").toggle();
$("#search").toggleClass("current");
$("#search-arrow").toggleClass("arrow-down");
});
});
</script>

1
themes/default/_head.twig
View File

@ -11,3 +11,4 @@
<script src="{{ poche_url }}themes/default/js/autoClose.js"></script> <script src="{{ poche_url }}themes/default/js/autoClose.js"></script>
<script src="{{ poche_url }}themes/default/js/closeMessage.js"></script> <script src="{{ poche_url }}themes/default/js/closeMessage.js"></script>
<script src="{{ poche_url }}themes/default/js/saveLink.js"></script> <script src="{{ poche_url }}themes/default/js/saveLink.js"></script>
<script src="{{ poche_url }}themes/default/js/popupForm.js"></script>

20
themes/default/js/popupForm.js Normal file
View File

@ -0,0 +1,20 @@
$(document).ready(function() {
$("#search-form").hide();
function closeSearch() {
$("#search-form").toggle();
$("#search").toggleClass("current");
$("#search-arrow").toggleClass("arrow-down");
}
$("#search").click(function(){
closeSearch();
});
$("#search-form-close").click(function(){
closeSearch();
});
});