From 8e38935a0a84181fe2834da63d90b996da6e77cf Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Fri, 25 Mar 2016 09:17:08 +0200
Subject: [PATCH] 24.03.16  finish 1

---
 backend/views/layouts/main-sidebar.php  |  22 ++++------------------
 backend/views/layouts/main-sidebar1.php | 118 ----------------------------------------------------------------------------------------------------------------------
 2 files changed, 4 insertions(+), 136 deletions(-)
 delete mode 100644 backend/views/layouts/main-sidebar1.php

diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php
index 840cc2c..d73e76e 100644
--- a/backend/views/layouts/main-sidebar.php
+++ b/backend/views/layouts/main-sidebar.php
@@ -5,15 +5,6 @@ use yii\widgets\Menu;
     <!-- sidebar: style can be found in sidebar.less -->
     <section class="sidebar">
         <!-- Sidebar user panel -->
-        <div class="user-panel" style="min-height: 60px;">
-            <div class="pull-left image">
-                <!--img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image"-->
-            </div>
-            <div class="pull-left info">
-                <p>Alexander Pierce</p>
-                <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
-            </div>
-        </div>
         <!-- search form -->
         <form action="#" method="get" class="sidebar-form">
             <div class="input-group">
@@ -24,7 +15,7 @@ use yii\widgets\Menu;
               </span>
             </div>
         </form>
-        <!-- /.search form -->
+        <!-- /.search form  -->
         <?=
         Menu::widget([
             'options' => ['class' => 'sidebar-menu'],
@@ -32,16 +23,10 @@ use yii\widgets\Menu;
 
             'items' => [
                 ['label' => 'MAIN NAVIGATION', 'options'=>['class'=>'header']],
-                ['label' => "Блог", 'options'=>['class'=>'treeview'], 'url' => ['#'],
-                    'template'=>'<a href="{url}"> <i class="fa fa-dashboard"></i> <span>{label}</span> <i class="fa fa-angle-left pull-right"></i></a>',
-                    'items' => [
-                        ['label' => 'Просмотр', 'url' => ['blog/index']],
-                        ['label' => 'Создать', 'url' => ['blog/create']],
-                    ],
-                ],
-                ['label' => 'Заказы', 'url' => ['orders/index'], 'template'=>'<a href="{url}"> <i class="fa fa-dashboard"></i> <span>{label}</span></a>'],
+                ['label' => 'Заказы', 'url' => ['orders/index'], 'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-shopping-cart"></i> <span>{label}</span></a>'],
                 [
                     'label' => 'Products',
+                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-barcode"></i> <span>{label}</span></a>',
                     'url' => ['/product/manage'],
                     'items' => [
                         ['label' => 'Товары', 'url' => ['/product/manage']],
@@ -51,6 +36,7 @@ use yii\widgets\Menu;
                 ],
                 [
                     'label' => 'Характеристики',
+                    'template'=>'<a href="{url}"> <i class="glyphicon glyphicon-search"></i> <span>{label}</span></a>',
                     'url' => ['/rubrication/tax-group'],
                     'items' => [
                         ['label' => 'Характеристики', 'url' => ['/rubrication/tax-group']],
diff --git a/backend/views/layouts/main-sidebar1.php b/backend/views/layouts/main-sidebar1.php
deleted file mode 100644
index 675e21c..0000000
--- a/backend/views/layouts/main-sidebar1.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-use yii\widgets\Menu;
-?>
-<aside class="main-sidebar">
-    <!-- sidebar: style can be found in sidebar.less -->
-    <section class="sidebar">
-        <!-- Sidebar user panel -->
-        <div class="user-panel">
-            <div class="pull-left image">
-                <img src="/admin/images/img/user2-160x160.jpg" class="img-circle" alt="User Image" />
-            </div>
-            <div class="pull-left info">
-                <p>Alexander Pierce</p>
-                <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
-            </div>
-        </div>
-        <!-- search form -->
-        <form action="#" method="get" class="sidebar-form">
-            <div class="input-group">
-                <input type="text" name="q" class="form-control" placeholder="Search..." />
-                      <span class="input-group-btn">
-                        <button type="submit" name="search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i></button>
-                      </span>
-            </div>
-        </form>
-        <!-- /.search form -->
-        <!-- sidebar menu: : style can be found in sidebar.less -->
-        <?=
-        Menu::widget([
-            'options' => ['class' => 'sidebar-menu'],
-            'linkTemplate'=>'<a href="{url}"><i class="fa fa-th"></i>{label}</a>',
-            'submenuTemplate' => "\n<ul class='treeview-menu'>\n{items}\n</ul>\n",
-            'items' => [
-                ['label' => 'Главное меню', 'options'=>['class'=>'header']],
-                ['label' => 'Заказы', 'url' => ['cart/index']],
-                ['label' => "Загрузка файлов", 'options'=>['class'=>'treeview'], 'url' => ['#'],
-                    'items' => [
-                        ['label' => 'Кросс файлы', 'url' => ['crossing-upload/index']],
-                        ['label' => 'Группы RG', 'url' => ['rg-grup/index']],
-                        ['label' => "Прайс файлы", 'url' => ['#'], 'items' => [
-                            ['label' => 'Файлы на сервере', 'url' => ['parser/server-files']],
-                            ['label' => 'Загрузить файл на сервер', 'url' => ['parser/index', 'mode' => 1]],
-                            ['label' => 'Журнал загрузок', 'url' => ['log/index']],
-                            ['label' => 'Ручная загрузка', 'url' => ['parser/index']],
-                            ['label' => 'Проверка прайс файлов', 'url' => ['check-price/index']],
-                            ['label' => 'Управление префиксами', 'url' => ['importers-prefix/index']],
-                        ],
-                    ],
-                ],
-                ],
-                ['label' => 'Управление ролями', 'options'=>['class'=>'label_3'],'url' => ['#'], 'items' => [
-                    ['label' => 'Покупатели', 'url' => ['accounts/index']],
-                    ['label' => 'Поставщики', 'url' => ['importers/index']],
-                    ['label' => 'Администраторы', 'url' => ['user/index']],
-                    ['label' => 'Команда', 'url' => ['team/index']],
-                    ['label' => 'Группы команды', 'url' => ['team-group/index']],
-                ],
-                ],
-                ['label' => 'Ценообразование', 'options'=>['class'=>'label_4'], 'url' => ['#'], 'items' => [
-                    ['label' => 'Курс', 'url' => ['currency/index']],
-                    ['label' => 'Типы цен', 'url' => ['margins/index']],
-                    ['label' => 'Коэфициенты на поставщиков', 'url' => ['margins-importers/index']],
-                    ['label' => 'Коэфициенты на импорт поставщиков', 'url' => ['margins-importers-import/index']],
-                    ['label' => 'Коэфициенты на группы RG', 'url' => ['margins-groups/index']],
-                ],
-                ],
-                ['label' => 'Справочник', 'options'=>['class'=>'label_5'], 'url' => ['#'], 'items' => [
-                    ['label' => 'Замены брендов', 'url' => ['brands-replace/index']],
-                    ['label' => 'Карточки товаров', 'url' => ['details-description/index']],
-                    ['label' => 'Товары поставщиков', 'url' => ['details/index']],
-                    ['label' => 'Кроссы', 'url' => ['details-crosses/index']],
-                    ['label' => 'Бренды', 'url' => ['brands/index']],
-                    ['label' => 'Марки авто', 'url' => ['manufacturers/index']],
-                    ['label' => 'Статусы заказов', 'url' => ['currency/index']],
-                    ['label' => 'Типы доставок', 'url' => ['deliveries/index']],
-                    ['label' => 'Категории товаров', 'url' => ['currency/index']],
-                    ['label' => 'Vin коды', 'url' => ['currency/index']],
-                    ['label' => 'Запросы по номеру', 'url' => ['currency/index']],
-                    ['label' => 'Офисы', 'url' => ['offices/index']],
-                ],
-                ],
-                ['label' => 'Анализ', 'options'=>['class'=>'label_6'], 'url' => ['#'], 'items' => [
-                    ['label' => 'Бренды', 'url' => ['#']],
-                ],
-                ],
-                ['label' => 'Письма', 'options'=>['class'=>'label_7'], 'url' => ['#'], 'items' => [
-                    ['label' => 'Рассылка', 'url' => ['#']],
-                    ['label' => 'Рассылка Прайсов', 'url' => ['price-mailing/index']],
-                    ['label' => 'Сообщения об оплате', 'url' => ['pay-messages/index']],
-                    ['label' => 'Шаблоны писем', 'url' => ['emails/index']],
-                ],
-                ],
-                ['label' => 'Элементы сайта', 'options'=>['class'=>'label_8'], 'url' => ['#'], 'items' => [
-                    ['label' => 'Текстовые страницы', 'url' => ['page/index']],
-                    ['label' => 'Новости', 'url' => ['news/index']],
-                    ['label' => 'Слайдер', 'url' => ['slider/index']],
-                ],
-                ],
-                ['label' => 'Платежные системы', 'options'=>['class'=>'label_9'], 'url' => ['#'], 'items' => [
-                    ['label' => 'Описание систем', 'url' => ['settings-merchants-list/index']],
-                    ['label' => 'Хутки грош', 'url' => ['news/index']],
-                    ['label' => 'QIWI', 'url' => ['slider/index']],
-                    ['label' => 'ASSIST', 'url' => ['partners/index']],
-                    ['label' => 'iPay', 'url' => ['team/index']],
-                    ['label' => 'WEBPAY', 'url' => ['team-group/index']],
-                    ['label' => 'Деньги.Online', 'url' => ['team-group/index']],
-                    ['label' => 'ROBOKASSA', 'url' => ['team-group/index']],
-                    ['label' => 'MONEXY', 'url' => ['team-group/index']],
-                ],
-                ],
-
-            ],
-
-        ]);
-        ?>
-    </section>
-    <!-- /.sidebar -->
-</aside>
\ No newline at end of file
--
libgit2 0.21.4