From 24ffae5a8ec22c9c64a4dbbd5d8055cb0c0cdd2f Mon Sep 17 00:00:00 2001
From: Dmitry <nerosketch@gmail.com>
Date: Tue, 30 Aug 2016 21:10:50 +0000
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D1=85=D0=BB=D0=B5=D0=B1=D0=BD=D1=8B=D0=B5=20=D0=BA=D1=80=D0=BE?=
 =?UTF-8?q?=D1=88=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/accounts/acc_list.html    |  7 ++++++-
 templates/accounts/create_acc.html  |  7 ++++++-
 templates/accounts/ext.htm          | 14 ++++++++++----
 templates/accounts/group.html       |  9 +++++++++
 templates/accounts/group_list.html  |  9 +++++++++
 templates/accounts/settings/ext.htm |  8 +++++++-
 6 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/templates/accounts/acc_list.html b/templates/accounts/acc_list.html
index a943c5a..35a7006 100644
--- a/templates/accounts/acc_list.html
+++ b/templates/accounts/acc_list.html
@@ -1,8 +1,13 @@
 {% extends 'base.html' %}
 {% block main %}
 
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li class="active">Администраторы</li>
+</ol>
 
-<h3>Список чего-то</h3>
+
+<h3>Список аккаунтов администраторов</h3>
 <div class="table-responsive">
     <table class="table table-striped table-bordered">
         <thead>
diff --git a/templates/accounts/create_acc.html b/templates/accounts/create_acc.html
index e51e512..0ecafdf 100644
--- a/templates/accounts/create_acc.html
+++ b/templates/accounts/create_acc.html
@@ -1,6 +1,11 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% block main %}
 
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'accounts_list' %}">Администраторы</a></li>
+  <li class="active">Добавить</li>
+</ol>
 
 <div class="panel panel-default">
     <div class="panel-heading">
@@ -47,7 +52,7 @@
                         <label for="tel">Телефон</label>
                         <div class="input-group">
                             <span class="input-group-addon"><span class="glyphicon glyphicon-phone"></span></span>
-                            <input id="tel" type="tel" pattern="\+[7,8,9,3]\d{10,11}" name="telephone" placeholder="+[7,8,9,3] и 10,11 цифр" value="{{ newuser.telephone }}" class="form-control">
+                            <input id="tel" type="tel" pattern="\+[7,8,9,3]\d{10,11}" name="telephone" placeholder="+[7,8,9,3] и 10,11 цифр" value="{{ newuser.telephone }}" class="form-control" required>
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/templates/accounts/ext.htm b/templates/accounts/ext.htm
index a46a013..c132cb3 100644
--- a/templates/accounts/ext.htm
+++ b/templates/accounts/ext.htm
@@ -1,12 +1,18 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-
 {% block main %}
 
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'accounts_list' %}">Администраторы</a></li>
+  <li class="active">{{ userprofile.username }}</li>
+</ol>
+
+
     <div class="row">
         <div class="col-sm-3">
             <div class="thumbnail">
-                {% if user.avatar %}
-                    <img alt="ava" src="{{ user.avatar.min }}"/>
+                {% if userprofile.avatar %}
+                    <img alt="ava" src="{{ userprofile.avatar.min }}"/>
                 {% else %}
                     <img alt="ava" src="/static/img/user_ava.gif"/>
                 {% endif %}
@@ -18,7 +24,7 @@
         </div>
 
         <div class="col-sm-9">
-            <h3>{{ user.username|default:"&lt;Нет ника&gt;" }}</h3>
+            <h3>{{ userprofile.username|default:"&lt;Нет ника&gt;" }}</h3>
             <ul class="nav nav-tabs">
                 <li class="active">
                     <a href="#livetab_content" data-tab-remote="{% url 'other_profile' uid %}" role="tab" data-toggle="tab">
diff --git a/templates/accounts/group.html b/templates/accounts/group.html
index a5a748f..e4fec02 100644
--- a/templates/accounts/group.html
+++ b/templates/accounts/group.html
@@ -1,6 +1,15 @@
 {% extends 'base.html' %}
 {% block main %}
 
+
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'accounts_list' %}">Администраторы</a></li>
+  <li><a href="{% url 'profile_groups_list' %}">Группы</a></li>
+  <li class="active">{{ group.name }}</li>
+</ol>
+
+
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">Действующее распределение прав для группы <b>{{ group.name }}</b></h3>
diff --git a/templates/accounts/group_list.html b/templates/accounts/group_list.html
index f273a42..655a93e 100644
--- a/templates/accounts/group_list.html
+++ b/templates/accounts/group_list.html
@@ -1,6 +1,15 @@
 {% extends 'base.html' %}
 {% block main %}
 
+
+    <ol class="breadcrumb">
+      <li><span class="glyphicon glyphicon-home"></span></li>
+      <li><a href="{% url 'accounts_list' %}">Администраторы</a></li>
+      <li class="active">Группы</li>
+    </ol>
+
+
+
     <h3>Список групп администраторов</h3>
 
 
diff --git a/templates/accounts/settings/ext.htm b/templates/accounts/settings/ext.htm
index cca2ecd..ae7ccb7 100644
--- a/templates/accounts/settings/ext.htm
+++ b/templates/accounts/settings/ext.htm
@@ -1,7 +1,13 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
-
 {% block main %}
 
+<ol class="breadcrumb">
+  <li><span class="glyphicon glyphicon-home"></span></li>
+  <li><a href="{% url 'accounts_list' %}">Администраторы</a></li>
+  <li><a href="{% url 'profile'  %}">{{ user.username }}</a></li>
+  <li class="active">Настройки</li>
+</ol>
+
 <div class="row">
     <div class="col-sm-3">
         <form action="{% url 'settings_chava_link' %}" method="post" class="thumbnail" enctype="multipart/form-data">{% csrf_token %}