From b46a4194c77a43ced0b37c63cbf7764cadcd2557 Mon Sep 17 00:00:00 2001
From: Alexander Kondratyev <alex@nder.work>
Date: Fri, 24 Mar 2017 15:44:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BB=D0=B8=D0=BD?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=D0=B0=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3=20=D0=9C=D0=9A=D0=A2=D0=A3=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0=20+=20?=
 =?UTF-8?q?=D0=97=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trademark/models.py                                | 1 -
 trademark/templates/trademark/nice_block_busy.html | 2 +-
 trademark/templates/trademark/nice_detail.html     | 6 +++++-
 trademark/templates/trademark/nices_catalog.html   | 3 +++
 trademark/templates/trademark/product_detail.html  | 1 +
 trademark/templates/trademark/search_detail.html   | 2 +-
 zsite/static/less/nice.less                        | 3 +--
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/trademark/models.py b/trademark/models.py
index ca24615..52c732a 100644
--- a/trademark/models.py
+++ b/trademark/models.py
@@ -98,7 +98,6 @@ class Nice(models.Model):
             alphabet[letter] = sorted(letter_items.items(), key=lambda x: type(x[1]))
             # alphabet[letter] = letter_items.items()
 
-        print alphabet
         return sorted(alphabet.items())
 
 
diff --git a/trademark/templates/trademark/nice_block_busy.html b/trademark/templates/trademark/nice_block_busy.html
index cc1c51c..e5e9dcc 100644
--- a/trademark/templates/trademark/nice_block_busy.html
+++ b/trademark/templates/trademark/nice_block_busy.html
@@ -5,7 +5,7 @@
     <ul class="list-unstyled load-more-results" list-type="nices">
         {% for nice in nice_busy %}
             {% if products_busy|getitem:nice.nice_id|length > 1 %}
-            <li class="trademark-search-nice-busy-product load-more-result c{{ nice.nice_id }}"><button class="btn btn-xs btn-default" popover="{% if nice.description %}{{ nice.description }}{% else %}{{ nice.title }}{% endif %}" popover-title="{{ nice.title }}" popover-trigger="mouseenter" popover-placement="right">{{ nice.nice_id }} класс</button>  <button class="btn btn-xs btn-default trademark-search-show-products" product-id="{{ nice.nice_id }}">{{ products_busy|getitem:nice.nice_id|length }} категорий <span class="caret"> </span></button> {{ nice.title }}</li>
+            <li class="trademark-search-nice-busy-product load-more-result c{{ nice.nice_id }}"><a href="{% url 'trademark:nice-detail' pk=nice.id %}" class="btn btn-xs btn-default" popover="{% if nice.description %}{{ nice.description }}{% else %}{{ nice.title }}{% endif %}" popover-title="{{ nice.title }}" popover-trigger="mouseenter" popover-placement="right">{{ nice.nice_id }} класс</a>  <button class="btn btn-xs btn-default trademark-search-show-products" product-id="{{ nice.nice_id }}">{{ products_busy|getitem:nice.nice_id|length }} категорий <span class="caret"> </span></button> {{ nice.title }}</li>
                 <ul class="trademark-search-nice-busy-products row" style="display: none;" product-id="{{ nice.nice_id }}">{% for product in products_busy|getitem:nice.nice_id %}<li class="col-xs-6">{{ product.title }}</li>{% endfor %}</ul>
              {% else %}
                 <li class="trademark-search-nice-busy-product load-more-result"><button class="btn btn-xs btn-default" popover="{% if nice.description %}{{ nice.description }}{% else %}{{ nice.title }}{% endif %}" popover-title="{{ nice.title }}" popover-trigger="mouseenter" popover-placement="right">{{ nice.nice_id }} класс</button> {{ products_busy|getitem:nice.nice_id|first }}</li>
diff --git a/trademark/templates/trademark/nice_detail.html b/trademark/templates/trademark/nice_detail.html
index 128ca0a..98c0b9b 100644
--- a/trademark/templates/trademark/nice_detail.html
+++ b/trademark/templates/trademark/nice_detail.html
@@ -1,13 +1,15 @@
 {% extends "trademark/base.html" %}
 {% load i18n menu_tags cms_tags %}
 
+{% block title %}Класс {{ nice.nice_id }} — {{ nice.title }} — Каталог МКТУ{% endblock %}
+
 {% block trademark_content %}
 <div class="nice-landing nice-detail">
 
 <div class="row">
     <div class="col-xs-12 col-sm-8">
 
-    <h1 class="nice-title"><i class="fa {{ nice.glyph }}" aria-hidden="true"></i> <strong>Класс {{ nice.nice_id }}</strong> <small>{{ nice.title }}</small></h1>
+    <h1 class="nice-title"><i class="fa {{ nice.glyph }}" aria-hidden="true"></i><strong>Класс {{ nice.nice_id }}</strong><small>{{ nice.title }}</small></h1>
 
     <ol class="list-unstyled list-inline breadcrumb" vocab="http://schema.org/" typeof="BreadcrumbList">
         <li property="itemListElement" typeof="ListItem">
@@ -30,6 +32,8 @@
 
     <p>{{ nice.description }}</p>
 
+    <p>Каждый товарный знак регистрируется в отношении определённых товаров и услуг, распределенных по классам. Всего таких классов на сегодняшний день 45 (34 — товаров и 11 — услуг), они установлены Международной классификацией товаров и услуг для регистрации знаков (МКТУ).</p>
+
     </div>
     <div class="col-xs-12 col-sm-4 no-print">
         <div class="trademark-search-block">
diff --git a/trademark/templates/trademark/nices_catalog.html b/trademark/templates/trademark/nices_catalog.html
index f894b45..99076fe 100644
--- a/trademark/templates/trademark/nices_catalog.html
+++ b/trademark/templates/trademark/nices_catalog.html
@@ -1,6 +1,9 @@
 {% extends "trademark/base.html" %}
 {% load i18n menu_tags cms_tags cache %}
 
+{% block title %}Каталог МКТУ — Международной классификацией товаров и услуг{% endblock %}
+
+
 {% block trademark_content %}
 
 <div class="nice-landing">
diff --git a/trademark/templates/trademark/product_detail.html b/trademark/templates/trademark/product_detail.html
index 16baf0e..82a7439 100644
--- a/trademark/templates/trademark/product_detail.html
+++ b/trademark/templates/trademark/product_detail.html
@@ -1,5 +1,6 @@
 {% extends "trademark/base.html" %}
 {% load i18n menu_tags cms_tags %}
+{% block title %}{{ product.title }} — Класс {{ nice.nice_id }} — Каталог МКТУ{% endblock %}
 
 {% block trademark_content %}
 <div class="nice-landing">
diff --git a/trademark/templates/trademark/search_detail.html b/trademark/templates/trademark/search_detail.html
index 442dd45..3084bb8 100644
--- a/trademark/templates/trademark/search_detail.html
+++ b/trademark/templates/trademark/search_detail.html
@@ -48,7 +48,7 @@
                 </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="right" class="btn btn-xs btn-default">{{ class.nice_id }}</button></span>
+                    <a href="{% url 'trademark:nice-detail' pk=class.id %}" 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="right" class="btn btn-xs btn-default">{{ class.nice_id }}</a></span>
                     {% endfor %}
                 {% endif %}
 
diff --git a/zsite/static/less/nice.less b/zsite/static/less/nice.less
index 1c7c25e..3d7559e 100644
--- a/zsite/static/less/nice.less
+++ b/zsite/static/less/nice.less
@@ -80,14 +80,13 @@
 
 .nice-title {
     i {
-        width: 25px;
         vertical-align: middle;
         text-align: right;
 
         padding-right: 10px;
     }
 
-    a {
+    a, strong {
         margin-right: 10px;
         margin-left: 5px;
     }