# HG changeset patch
# User cavaliet
# Date 1372237960 -7200
# Node ID a6777893243da0df657af81790a525dfa3aee99c
# Parent  52e64297d27a08775ab335745859c9b32e76882f
debug search form and css and fragment buttons

diff -r 52e64297d27a -r a6777893243d src/egonomy/__init__.py
--- a/src/egonomy/__init__.py	Wed Jun 26 09:56:46 2013 +0200
+++ b/src/egonomy/__init__.py	Wed Jun 26 11:12:40 2013 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 6, 0, "final", 1)
+VERSION = (0, 6, 1, "final", 1)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 52e64297d27a -r a6777893243d src/egonomy/templates/egonomy_all_fragments.html
--- a/src/egonomy/templates/egonomy_all_fragments.html	Wed Jun 26 09:56:46 2013 +0200
+++ b/src/egonomy/templates/egonomy_all_fragments.html	Wed Jun 26 11:12:40 2013 +0200
@@ -6,6 +6,14 @@
 
 {% block title %}{% trans "All fragments" %}{% endblock %}
 
+{% block css_page %}
+<style>
+.bar-tools:first-child {
+    background-position: bottom center;
+}
+</style>
+{% endblock %}
+
 {% block content %}
             <div class="bar-tools clearfix">
                 <h3>
diff -r 52e64297d27a -r a6777893243d src/egonomy/templates/egonomy_all_pictures.html
--- a/src/egonomy/templates/egonomy_all_pictures.html	Wed Jun 26 09:56:46 2013 +0200
+++ b/src/egonomy/templates/egonomy_all_pictures.html	Wed Jun 26 11:12:40 2013 +0200
@@ -6,6 +6,14 @@
 
 {% block title %}{% trans "All pictures" %}{% endblock %}
 
+{% block css_page %}
+<style>
+.bar-tools:first-child {
+    background-position: bottom center;
+}
+</style>
+{% endblock %}
+
 {% block content %}
             <div class="bar-tools clearfix">
                 <h3>
diff -r 52e64297d27a -r a6777893243d src/egonomy/templates/egonomy_create_fragment.html
--- a/src/egonomy/templates/egonomy_create_fragment.html	Wed Jun 26 09:56:46 2013 +0200
+++ b/src/egonomy/templates/egonomy_create_fragment.html	Wed Jun 26 11:12:40 2013 +0200
@@ -18,8 +18,10 @@
                     <li><a class="go-to mosaic" href="#"></a></li>
                     <li><a class="go-to search" href="#"></a></li>
                 </ul>
-                <!--ul class="clearfix">
-                    <li>
+                <ul class="clearfix">
+                    <li><a title="{% trans 'Erase the drawing' %}" href="#" class="clear-fragment">&times;</a></li>
+                    <li><a title="{% trans 'Back to the original drawing' %}" href="#" class="reset-fragment">↺</a></li>
+                    <!--li>
                         <a class="icon plus" href="#">Ajouter à ma collection</a>
                     </li>
                     <li>
@@ -28,15 +30,13 @@
                                 <input class="search-form" id="id_search" type="text" placeholder="Romantisme noir">
                             </p>
                         </form>
-                    </li>
-                </ul-->
+                    </li-->
+                </ul>
             </div>
             <article class="edition">
                 <form action="{% url 'save_fragment' %}" method="POST">
                 <div class="slideshow box-edition">
                     <div class="image-wrap">
-                        <a href="#" class="head-button clear-fragment" title="{% trans 'Erase the drawing' %}">&times;</a>
-                        <a href="#" class="head-button reset-fragment" title="{% trans 'Back to the original drawing' %}">&#8634;</a>
                         <div class="center-image">
                             <div class="image-and-fragment">
                               {% with img.info.image_file as image %}
diff -r 52e64297d27a -r a6777893243d src/egonomy/templates/egonomy_home.html
--- a/src/egonomy/templates/egonomy_home.html	Wed Jun 26 09:56:46 2013 +0200
+++ b/src/egonomy/templates/egonomy_home.html	Wed Jun 26 11:12:40 2013 +0200
@@ -5,6 +5,14 @@
 
 {% block title %}{% trans "Home" %}{% endblock %}
 
+{% block css_page %}
+<style>
+.bar-tools:first-child {
+    background-position: bottom center;
+}
+</style>
+{% endblock %}
+
 {% block content %}
             <div class="bar-tools clearfix">
                 <h3>{% trans "Last annotated pictures" %}</h3>
diff -r 52e64297d27a -r a6777893243d src/egonomy/templates/egonomy_newbase.html
--- a/src/egonomy/templates/egonomy_newbase.html	Wed Jun 26 09:56:46 2013 +0200
+++ b/src/egonomy/templates/egonomy_newbase.html	Wed Jun 26 11:12:40 2013 +0200
@@ -28,11 +28,11 @@
             <div class="col-right">
                 <ul class="head-login clearfix">
                     <li>
-                        <form action="{% if search_fragment %}{% url 'all_fragments' %}{% else %}{% url 'all_pictures' %}{% endif %}" method="GET">
+                        <form id="search-form" action="{% if search_fragment %}{% url 'all_fragments' %}{% else %}{% url 'all_pictures' %}{% endif %}" method="GET">
                             <p>
-			                    <input type="text" placeholder="{% trans 'Search' %}" id="id_search" name="search"/>
+			                    <input id="search-field" type="text" placeholder="{% trans 'Search' %}" id="id_search" name="search"/>
 			                    <label class="styled-select">
-				                    <select>
+				                    <select id="search-type">
 				                        <option value="{% url 'all_pictures' %}"{% if not search_fragment %} selected{% endif %}>Images</option>
 				                        <option value="{% url 'all_fragments' %}"{% if search_fragment %} selected{% endif %}>Fragments</option>
 				                    </select>
@@ -87,10 +87,10 @@
 	    {% block js_page %}
 	    <script type="text/javascript">
 		$(function() {
-		    $(".search-type").change(function() {
-		        $(".search-form").attr("action", $(this).val());
-		        if ($(".search-field").val()) {
-		            $(".search-form").submit();
+		    $("#search-type").change(function() {
+		        $("#search-form").attr("action", $(this).val());
+		        if ($("#search-field").val()) {
+		            $("#search-form").submit();
 		        }
 		    });
 		});