Правка внешнего вида Каталога МКТУ

master
Alexander Kondratyev 9 years ago
parent c7629dd64d
commit bf24baa953
  1. 2
      trademark/models.py
  2. 2
      trademark/templates/trademark/nice_detail.html
  3. 2
      trademark/templates/trademark/nices_catalog.html
  4. 29
      zsite/static/less/nice.less

@ -95,7 +95,7 @@ class Nice(models.Model):
alphabet[letter][first_word] = ', '.join(set(words)) alphabet[letter][first_word] = ', '.join(set(words))
letter_items = alphabet[letter] letter_items = alphabet[letter]
alphabet[letter] = sorted(letter_items.items(), key=lambda x: type(x[1]), reverse=True) alphabet[letter] = sorted(letter_items.items(), key=lambda x: type(x[1]))
# alphabet[letter] = letter_items.items() # alphabet[letter] = letter_items.items()
print alphabet print alphabet

@ -7,7 +7,7 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<h1><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"> <ol class="list-unstyled list-inline breadcrumb" vocab="http://schema.org/" typeof="BreadcrumbList">
<li property="itemListElement" typeof="ListItem"> <li property="itemListElement" typeof="ListItem">

@ -44,7 +44,7 @@
<ul class="nice-classes-list list-unstyled list-inline"> <ul class="nice-classes-list list-unstyled list-inline">
{% for nice in nices %} {% for nice in nices %}
<li> <li>
<h4><i class="fa {{ nice.glyph }}" aria-hidden="true"></i> <a href="{% url 'trademark:nice-detail' pk=nice.id %}">Класс {{ nice.nice_id }}</a> <small>{{ nice.title }}</small></h4> <h4 class="nice-title"><i class="fa {{ nice.glyph }}" aria-hidden="true"></i> <a href="{% url 'trademark:nice-detail' pk=nice.id %}">Класс {{ nice.nice_id }}</a> <small>{{ nice.title }}</small></h4>
<p>{{ nice.description }}</p> <p>{{ nice.description }}</p>
<p>Примеры {% if nice.nice_id > 38 %}услуг{% else %}товаров{% endif %} из класса:</p> <p>Примеры {% if nice.nice_id > 38 %}услуг{% else %}товаров{% endif %} из класса:</p>
<ul class="nice-products-list list-inline"> <ul class="nice-products-list list-inline">

@ -77,6 +77,22 @@
} }
} }
} }
.nice-title {
i {
width: 25px;
vertical-align: middle;
text-align: right;
padding-right: 10px;
}
a {
margin-right: 10px;
margin-left: 5px;
}
}
.nice-landing { .nice-landing {
.trademark-search-block { .trademark-search-block {
h3 { h3 {
@ -93,19 +109,6 @@
h4 { h4 {
margin-left: -30px; margin-left: -30px;
a {
margin-right: 10px;
margin-left: 5px;
}
}
i {
width: 25px;
vertical-align: middle;
text-align: right;
padding-right: 10px;
} }
} }

Loading…
Cancel
Save