From ca008905b80fe6fd65f961aa0bc13ef4bce75533 Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Tue, 8 Nov 2016 05:31:55 +0300
Subject: [PATCH] layout fix

---
 trademark/templates/trademark/search_detail.html    | 7 ++++---
 trademark/templates/trademark/search_list_item.html | 4 +++-
 zsite/static/js/trademarks.js                       | 6 ------
 zsite/static/less/search.less                       | 9 ++++++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/trademark/templates/trademark/search_detail.html b/trademark/templates/trademark/search_detail.html
index 52996d3..264708a 100644
--- a/trademark/templates/trademark/search_detail.html
+++ b/trademark/templates/trademark/search_detail.html
@@ -8,11 +8,12 @@
     
 {% if identity.count > 0 %}
     <h1>Товарный знак «{{ keyword.request|title }}» зарегистрирован <nobr>{% if nice_busy.count == 45 %}во всех{% else %}в {{ nice_busy.count }}{% endif %} классах</nobr> товаров и услуг</h1>
-    <h2>{% if nice_busy.count == 45 %}Знак нельзя использовать на территории России{% endif %}</h2>
+    <h2>{% if nice_busy.count == 45 %}Скорее всего, вы не можете зарегистрировать этот знак{% endif %}</h2>
 
         <ul class="trademark-search-results list-inline list-unstyled">
         {% for tm in identity %}
         <li class="trademark-search-result-identity trademark-search-result" trademark-id='{{ tm.id }}'>
+            <a href='/ru/trademarks/online-search/trademark/{{ tm.id }}/'>
             <div class='trademark-search-result-image' style="background-image: url({{ tm.image_url }});">
             {% if not tm.image_url %}
             <h4>{{ tm.title|title }}</h4>
@@ -29,14 +30,14 @@
                 </span>
                 {% else %}
                     <span>{% for class in tm.nices.all %}
-                    <button class="btn btn-xs btn-default trademark-search-nice-button" ng-show="true" popover="{{class.description}}" popover-title="{{class.title}}" popover-trigger="mouseenter" popover-placement="bottom" class="btn btn-xs btn-default">{{ class.nice_id }}</button>
+                    <button class="btn btn-xs btn-default trademark-search-nice-button" ng-show="true" popover="{{class.description}}" popover-title="{{class.title}}" popover-trigger="mouseenter" popover-placement="bottom" class="btn btn-xs btn-default">{{ class.nice_id }}</button></span>
                     {% endfor %}
                 {% endif %}
                 
             {% else %}
                 <span>Зарегистрирован во всех классах</span>
             {% endif %}
-
+            </a>
             </li>
         {% endfor %}
         </ul>
diff --git a/trademark/templates/trademark/search_list_item.html b/trademark/templates/trademark/search_list_item.html
index 93361d4..c842bfa 100644
--- a/trademark/templates/trademark/search_list_item.html
+++ b/trademark/templates/trademark/search_list_item.html
@@ -1,8 +1,10 @@
-<li class="trademark-search-result-contains trademark-search-result" trademark-id='{{ tm.id }}'>
+<li class='trademark-search-result-contains'>
+<a href='/ru/trademarks/online-search/trademark/{{ tm.id }}/'>
 <div class='trademark-search-result-image' style="background-image: url({{ tm.image_url }});">
 {% if not tm.image_url %}
 <h4>{{ tm.title|title }}</h4>
 {% endif %}
 </div>
 <p>{{ tm.title|title }}</p>
+</a>
 </li>
\ No newline at end of file
diff --git a/zsite/static/js/trademarks.js b/zsite/static/js/trademarks.js
index fc914b9..94878b9 100644
--- a/zsite/static/js/trademarks.js
+++ b/zsite/static/js/trademarks.js
@@ -147,11 +147,5 @@ $(function(){
             });
         });
 
-        $('.trademark-search-result').click(function() {
-            var tm_id = $(this).attr('trademark-id');
-
-            document.location.href = '/ru/trademarks/online-search/trademark/' + tm_id + '/';
-        });
-
 
    });
\ No newline at end of file
diff --git a/zsite/static/less/search.less b/zsite/static/less/search.less
index e5c08c3..d29a29f 100644
--- a/zsite/static/less/search.less
+++ b/zsite/static/less/search.less
@@ -44,6 +44,14 @@
         padding: 3px;
         
         cursor: pointer;
+
+        a {
+            text-decoration: none;
+        }
+
+        .popover {
+            color: #000 !important;
+        }
         
         .trademark-search-result-image {
             background-position: center center;
@@ -61,7 +69,6 @@
         }
 
         .btn-xs {
-            margin-right: 5px;
             margin-top: 5px;
             font-size: 10px;
         }