mitri4
/
zuykov
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

template update

Browse Source
master
fefa4ka 11 years ago
parent 9689d4aeb8
commit 20657f89ab
10 changed files with 226 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      zsite/static/imgs/logo_footer_en.svg
  2. 14
      zsite/static/imgs/logo_footer_ru.svg
  3. 127
      zsite/static/less/main.less
  4. 9
      zsite/templates/aldryn_people/person_detail.html
  5. 41
      zsite/templates/base.html
  6. 13
      zsite/templates/feature.html
  7. 1
      zsite/templates/footer.html
  8. 26
      zsite/templates/menu.html
  9. 1
      zsite/templates/menu/sub_menu_title.html
  10. 18
      zsite/templates/sub_section.html

14
zsite/static/imgs/logo_footer_en.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB

14
zsite/static/imgs/logo_footer_ru.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

127
zsite/static/less/main.less
Unescape View File

@ -2,14 +2,40 @@
@import 'grid.less'; @import 'grid.less';
@import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic); @import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|Roboto+Slab:700,400&subset=cyrillic-ext,latin);
@import url(http://fonts.googleapis.com/css?family=Roboto+Slab);
@font-family-sans-serif: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; @font-family-sans-serif: "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif; @font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: 'Roboto Slab', Menlo, Monaco, Consolas, "Courier New", monospace; @font-family-monospace: 'Roboto Slab', Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif; @font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
// @font-size-h1: floor((@font-size-base * 2.6)); // ~36px
// @font-size-h2: floor((@font-size-base * 2.15)); // ~30px
@font-size-h1: ceil((@font-size-base * 1.7));// ~24px
@font-size-h2: @font-size-h1;
@font-size-h3: ceil((@font-size-base * 1.55)); // ~22px
@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
@font-size-h5: @font-size-base;
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
//** By default, this inherits from the `<body>`.
@headings-font-family: inherit;
@headings-font-weight: 500;
@headings-line-height: 1.1;
@headings-color: inherit;
h5 {
font-weight: 500;
}
.wrapper { .wrapper {
.make-row(); .make-row();
@ -17,6 +43,7 @@
margin-top: 10px; margin-top: 10px;
margin-bottom: -10px; margin-bottom: -10px;
} }
.header-logo { .header-logo {
.make-lg-column(8); .make-lg-column(8);
@ -64,6 +91,7 @@
button { button {
margin-bottom: 5px; margin-bottom: 5px;
margin-right: -5px;
} }
} }
@ -85,16 +113,103 @@
left: 0; left: 0;
} }
.menu-header { .header-menu-font {
font-family: 'Roboto Slab'; font-family: @font-family-monospace;
} }
.menu { .header-menu {
font-family: 'Roboto Slab';
font-size: 16px; font-size: 16px;
li { li {
margin-top: 1px; margin-top: 1px;
margin-right: 35px; margin-right: 35px;
font-weight: 400;
a {
text-decoration: underline;
}
}
span.active {
font-weight: 700;
}
}
footer {
.make-row();
margin-top: 10px;
margin-bottom: 5px;
opacity: 0.5;
font-size: 12px;
.background-line-pattern {
opacity: 0.13;
}
a {
color: #000000;
text-decoration: underline;
}
li.active {
a {
text-decoration: none;
}
}
.about {
.make-lg-column(2);
margin-top: -10px;
.copyright {
margin-top: 5px;
opacity: 0.7;
}
ul {
margin-top: 16px;
li {
line-height: 20px;
}
}
}
.menu {
.make-lg-column(4);
h5 {
margin-top: 6px;
margin-bottom: 18px;
}
li {
line-height: 20px;
}
}
.contacts {
.make-lg-column(2);
margin-top: 39px;
li {
margin-bottom: 10px;
}
}
}
.sub-content {
.make-row();
.menu {
.make-lg-column(2);
}
.content {
.make-lg-column(10);
} }
} }

9
zsite/templates/aldryn_people/person_detail.html
Unescape View File

@ -0,0 +1,9 @@
{% extends "base.html" %}
{% block content %}
<div class="plugin plugin-people">
<div class="people-detail">
{% include "aldryn_people/includes/people_item.html" with person=person %}
</div>
</div>
{% endblock content %}

41
zsite/templates/base.html
Unescape View File

@ -19,11 +19,7 @@
<div class="wrapper"> <div class="wrapper">
<div class="header-logo"> <div class="header-logo">
<a href="/"> <a href="/">
<img src=" <img src="{% with 'imgs/logo_'|add:request.LANGUAGE_CODE|add:'.svg' as image_static %}{% static image_static %}{% endwith %}">
{% with 'imgs/logo_'|add:request.LANGUAGE_CODE|add:'.svg' as image_static %}
{% static image_static %}
{% endwith %}
">
</a> </a>
<h5 class="slogan">{% trans 'Protection of intellectual property' %}</h5> <h5 class="slogan">{% trans 'Protection of intellectual property' %}</h5>
</div> </div>
@ -44,13 +40,44 @@
</div> </div>
</div> </div>
<h4 class="menu-header">{% trans 'Our Services' %}</h4> <h4 class="header-menu-font">{% trans 'Our Services' %}</h4>
<div class="background-line-pattern"></div> <div class="background-line-pattern"></div>
<ul class="list-unstyled list-inline menu"> <ul class="list-unstyled list-inline header-menu header-menu-font">
{% show_menu 0 1 100 100 "menu.html" %} {% show_menu 0 1 100 100 "menu.html" %}
</ul> </ul>
{% block content %}{% endblock content %} {% block content %}{% endblock content %}
<footer>
<div class="background-line-pattern"></div>
<div class="about">
<a href="/">
<img src="{% with 'imgs/logo_footer_'|add:request.LANGUAGE_CODE|add:'.svg' as image_static %}{% static image_static %}{% endwith %}">
</a>
<p class="copyright">© 2004—{% now "Y" %}</p>
<ul class="list-unstyled">
<li><a href="{% page_url "about" %}">{% page_attribute "page_title" "about" %}</a></li>
<li><a href="{% page_url "contacts" %}"><strong>{% page_attribute "page_title" "contacts" %}</a></strong></li>
<li>{% language_chooser 'language_chooser.html' %}</li>
</ul>
</div>
<div class="menu">
<h5>{% trans "— There is nothing impossible. Almost nothing" %}</h5>
<ul class="list-unstyled">
{% show_menu 0 1 100 100 "menu.html" %}
</ul>
</div>
<div class="contacts pull-right">
<ul class="list-unstyled">
<li>{% trans "Contact us:" %} <a href="mailto:info@zuykov.{% if current_language == "ru" %}ru{% else %}com{% endif %}">info@zuykov.{% if current_language == "ru" %}ru{% else %}com{% endif %}</a></li>
<li>{% trans "Groholskiy pereulok" %},<br/>
{% trans "dom 28" %}<br/>
{% trans "Moscow, Russia, 129090" %}
</li>
<li>+7 800 700-16-83</li>
</ul>
</div>
</footer>
</div> </div>
{% render_block "js" %} {% render_block "js" %}
</body> </body>

13
zsite/templates/feature.html
Unescape View File

@ -1,13 +0,0 @@
{% extends "base.html" %}
{% load cms_tags %}
{% block title %}{% page_attribute "page_title" %}{% endblock title %}
{% block content %}
<div class="jumbotron">
{% placeholder "feature" %}
</div>
<div>
{% placeholder "content" %}
</div>
{% endblock content %}

1
zsite/templates/footer.html
Unescape View File

@ -0,0 +1 @@
lalal

26
zsite/templates/menu.html
Unescape View File

@ -1,18 +1,20 @@
{% load i18n menu_tags cache %} {% load i18n menu_tags cache %}
{% for child in children %} {% for child in children %}
<li class="{% if child.ancestor %}ancestor{% endif %} <li>
{% if child.selected %} active{% endif %} {% if child.selected %}
{% if child.children %} dropdown{% endif %}"> <span class="active">{{ child.get_menu_title }}</span>
{% if child.children %}
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
{{ child.get_menu_title }} <span class="caret"></span>
</a>
<ul class="dropdown-menu">
{% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
</ul>
{% else %} {% else %}
<a href="{{ child.get_absolute_url }}"><span>{{ child.get_menu_title }}</span></a> {% if child.children %}
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
{{ child.get_menu_title }} <span class="caret"></span>
</a>
<ul class="dropdown-menu">
{% show_menu from_level to_level extra_inactive extra_active template "" "" child %}
</ul>
{% else %}
<a href="{{ child.get_absolute_url }}"><span>{{ child.get_menu_title }}</span></a>
{% endif %}
{% endif %} {% endif %}
</li> </li>
{% if class and forloop.last and not forloop.parentloop %}{% endif %} {% if class and forloop.last and not forloop.parentloop %}{% endif %}

1
zsite/templates/menu/sub_menu_title.html
Unescape View File

@ -0,0 +1 @@
{{ ancestors.1.title }}

18
zsite/templates/sub_section.html
Unescape View File

@ -0,0 +1,18 @@
{% extends "base.html" %}
{% load cms_tags i18n menu_tags %}
{% block title %}{% page_attribute "page_title" %}{% endblock title %}
{% block content %}
<div class="sub-content">
<div class="menu">
<h5>{% show_breadcrumb 0 "menu/sub_menu_title.html" 0 %}</h5>
<ul class="list-unstyled">
{% show_menu 1 0 100 100 'menu.html' %}
</ul>
</div>
<div class="content">
{% placeholder "content" %}
</div>
</div>
{% endblock content %}
Write Preview
Loading…
Cancel
Save