Перелинкова на каталог МКТУ из результатов поиска + Заголовки

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())
 
 

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>

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">

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">

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">

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 %}
 

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;
     }