add sharix-logo

sharix_admin/templates/sharix_admin/base_admin.html

@@ -3,412 +3,417 @@
 {% load static %}
 
 {% block content %}
+
 <div id="loader-wrapper">
   <div id="loader"></div>
 </div>
 
 <div class="content p-4 mx-auto d-flex flex-column justify-content-between">
-  <nav id="menu-bar">
-    <button class="bg-white border box-shadow rounded mb-2 px-4 py-1" onclick="menuBarSwitch()">
-        <img id="menu-bar-img-arrow" src="{% static 'sharix_admin/img/menu/arrow-right.svg' %}">
-    </button>
-
-    <ul class="d-flex flex-column nav nav-pills rounded box-shadow border p-2 bg-white">
-      <li class="nav-item">
-        <a href="{% url "sharix_admin:main" %}" class="nav-link {% if current_page == "main" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "main" %}
-                  {% static 'sharix_admin/img/menu/house_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/house.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Главная</span>
-          </div>
-        </a>
-      </li>
-      <li class="nav-item">
-        <a href="{% url 'tickets:ticket_list_list' %}" class="nav-link {% if current_page == "tickets" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "tickets" %}
-                  {% static 'sharix_admin/img/menu/tickets_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/tickets.svg' %}
-                {% endif %}"> 
-            <span class="menu-bar-label">Заявки</span>
-          </div>
-        </a>
-      </li>
-      <li class="nav-item">
-        <a href="http://study.reversea.net/" class="nav-link {% if current_page == "education" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "education" %}
-                  {% static 'sharix_admin/img/menu/education_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/education.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Курсы</span>
-          </div>
-        </a>
-      </li>
-
-      <!-- STAFF MENU-->
-      <!-- METASERVICE ADMIN OPEN SPECIFIC MENU -->
-
-      {% if "METASERVICE-ADMIN" in user_groups %}
-
-      <li class="nav-item">
-        <a href="{% url 'sharix_admin:service_categories' %}" class="nav-link {% if current_page == "service_categories" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "service_categories" %}
-                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Категории услуг</span>
-          </div>
-        </a>
-      </li>
-
-      <li class="nav-item">
-        <a href="{% url 'sharix_admin:service_category/add/' %}" class="nav-link {% if current_page == "service_category/add/" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "service_category/add/" %}
-                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Добавить категорию услуг</span>
-          </div>
-        </a>
-      </li>
-
-      <!-- TODO - add metaservice supervisor to viewers -->
-      <li class="nav-item">
-        <a href="{% url 'sharix_admin:service_tariffs' %}" class="nav-link {% if current_page == "service_tariffs" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "service_tariffs" %}
-                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Тарифы услуг</span>
-          </div>
-        </a>
-      </li>
-
-      <!-- TODO - add metaservice supervisor to viewers maybe without duplication -->
-      <li class="nav-item">
-        <a href="{% url "sharix_admin:partners" %}" class="nav-link {% if current_page == "partners" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "partners" %}
-                  {% static 'sharix_admin/img/menu/people_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/people.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Партнеры</span>
-          </div>
-        </a>
-      </li>
-
-            <!-- TODO: Управление правами ADD ALSO CHECK FOR SUPERVISOR-->
-        <a href="{% url 'sharix_admin:access_control' %}" class="nav-link {% if current_page == "access_control" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "access_control" %}
-                  {% static 'sharix_admin/img/menu/hdd-network_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/hdd-network.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Управление правами</span>
-          </div>
-        </a>
-      </li>
+    <nav id="menu-bar">
+      <button class="bg-white border box-shadow rounded mb-2 px-4 py-1" onclick="menuBarSwitch()">
+          <img id="menu-bar-img-arrow" src="{% static 'sharix_admin/img/menu/arrow-right.svg' %}">
+      </button>
 
-      {% endif %}
+      <ul class="d-flex flex-column nav nav-pills rounded box-shadow border p-2 bg-white">
+        <li class="nav-item">
+          <a href="{% url "sharix_admin:main" %}" class="nav-link {% if current_page == "main" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "main" %}
+                    {% static 'sharix_admin/img/menu/house_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/house.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Главная</span>
+            </div>
+          </a>
+        </li>
+        <li class="nav-item">
+          <a href="{% url 'tickets:ticket_list_list' %}" class="nav-link {% if current_page == "tickets" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "tickets" %}
+                    {% static 'sharix_admin/img/menu/tickets_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/tickets.svg' %}
+                  {% endif %}"> 
+              <span class="menu-bar-label">Заявки</span>
+            </div>
+          </a>
+        </li>
+        <li class="nav-item">
+          <a href="http://study.reversea.net/" class="nav-link {% if current_page == "education" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "education" %}
+                    {% static 'sharix_admin/img/menu/education_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/education.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Курсы</span>
+            </div>
+          </a>
+        </li>
 
+        <!-- STAFF MENU-->
+        <!-- METASERVICE ADMIN OPEN SPECIFIC MENU -->
 
-      <!-- METASERVICE SUPERVISOR MENU BLOCK -->
-      {% if "METASERVICE-SUPERVISOR" in user_groups %}
-      <li class="nav-item">
-        <a href="{% url "sharix_admin:partners" %}" class="nav-link {% if current_page == "partners" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "partners" %}
-                  {% static 'sharix_admin/img/menu/people_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/people.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Партнеры</span>
-          </div>
-        </a>
-      </li>
-
-      <li class="nav-item">
-        <a href="{% url "sharix_admin:resources" %}" class="nav-link {% if current_page == "resources" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "resources" %}
-                  {% static 'sharix_admin/img/menu/people_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/people.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Ресурсы</span>
-          </div>
-        </a>
-      </li>
-
-      <li class="nav-item">
-        <a href="{% url "sharix_admin:providers" %}" class="nav-link {% if current_page == "providers" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "providers" %}
-                  {% static 'sharix_admin/img/menu/people_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/people.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Исполнители</span>
-          </div>
-        </a>
-      </li>
-
-      <!-- PARTNER-ADMIN menu block TODO - add customization to list views -->
-
-      <li class="nav-item">
-        <a href="{% url "sharix_admin:resources" %}" class="nav-link {% if current_page == "resources" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "resources" %}
-                  {% static 'sharix_admin/img/menu/people_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/people.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Мои Ресурсы</span>
-          </div>
-        </a>
-      </li>
-
-       <li class="nav-item">
-        <a href="{% url 'sharix_admin:resource/add/' %}" class="nav-link {% if current_page == "resource/add/" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "resource/add/" %}
-                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Добавить ресурс</span>
-          </div>
-        </a>
-      </li>
-
-       <li class="nav-item">
-        <a href="{% url "sharix_admin:providers" %}" class="nav-link {% if current_page == "providers" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "providers" %}
-                  {% static 'sharix_admin/img/menu/people_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/people.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Мои Исполнители</span>
-          </div>
-        </a>
-      </li>
+        {% if "METASERVICE-ADMIN" in user_groups %}
 
-      
-      {% endif %}
+        <li class="nav-item">
+          <a href="{% url 'sharix_admin:service_categories' %}" class="nav-link {% if current_page == "service_categories" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "service_categories" %}
+                    {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/briefcase.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Категории услуг</span>
+            </div>
+          </a>
+        </li>
 
+        <li class="nav-item">
+          <a href="{% url 'sharix_admin:service_category/add/' %}" class="nav-link {% if current_page == "service_category/add/" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "service_category/add/" %}
+                    {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/briefcase.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Добавить категорию услуг</span>
+            </div>
+          </a>
+        </li>
 
-      <!-- COOPERATE BLOCK -->
-      {% if not "PARTNER-ADMIN" in user_groups %}
+        <!-- TODO - add metaservice supervisor to viewers -->
         <li class="nav-item">
-          <a href="{% url "sharix_admin:cooperate_request" %}" class="nav-link {% if current_page == "cooperate_request" %}active rounded{% endif %}">
+          <a href="{% url 'sharix_admin:service_tariffs' %}" class="nav-link {% if current_page == "service_tariffs" %}active rounded{% endif %}">
             <div class="link d-flex align-items-center">
               <img
                 class="nav-img"
                 src="
-                  {% if current_page == "cooperate_request" %}
-                    {% static 'sharix_admin/img/menu/handshake_w.svg' %}
+                  {% if current_page == "service_tariffs" %}
+                    {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
                   {% else %}
-                    {% static 'sharix_admin/img/menu/handshake.svg' %}
+                    {% static 'sharix_admin/img/menu/briefcase.svg' %}
                   {% endif %}">
-              <span class="menu-bar-label">Стать партнером</span>
+              <span class="menu-bar-label">Тарифы услуг</span>
+            </div>
+          </a>
+        </li>
+
+        <!-- TODO - add metaservice supervisor to viewers maybe without duplication -->
+        <li class="nav-item">
+          <a href="{% url "sharix_admin:partners" %}" class="nav-link {% if current_page == "partners" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "partners" %}
+                    {% static 'sharix_admin/img/menu/people_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/people.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Партнеры</span>
+            </div>
+          </a>
+        </li>
+
+              <!-- TODO: Управление правами ADD ALSO CHECK FOR SUPERVISOR-->
+          <a href="{% url 'sharix_admin:access_control' %}" class="nav-link {% if current_page == "access_control" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "access_control" %}
+                    {% static 'sharix_admin/img/menu/hdd-network_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/hdd-network.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Управление правами</span>
+            </div>
+          </a>
+        </li>
+
+        {% endif %}
+
+
+        <!-- METASERVICE SUPERVISOR MENU BLOCK -->
+        {% if "METASERVICE-SUPERVISOR" in user_groups %}
+        <li class="nav-item">
+          <a href="{% url "sharix_admin:partners" %}" class="nav-link {% if current_page == "partners" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "partners" %}
+                    {% static 'sharix_admin/img/menu/people_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/people.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Партнеры</span>
+            </div>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="{% url "sharix_admin:resources" %}" class="nav-link {% if current_page == "resources" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "resources" %}
+                    {% static 'sharix_admin/img/menu/people_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/people.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Ресурсы</span>
+            </div>
+          </a>
+        </li>
+
+        <li class="nav-item">
+          <a href="{% url "sharix_admin:providers" %}" class="nav-link {% if current_page == "providers" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "providers" %}
+                    {% static 'sharix_admin/img/menu/people_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/people.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Исполнители</span>
+            </div>
+          </a>
+        </li>
+
+        <!-- PARTNER-ADMIN menu block TODO - add customization to list views -->
+
+        <li class="nav-item">
+          <a href="{% url "sharix_admin:resources" %}" class="nav-link {% if current_page == "resources" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "resources" %}
+                    {% static 'sharix_admin/img/menu/people_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/people.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Мои Ресурсы</span>
             </div>
           </a>
         </li>
-      {% endif %}
 
         <li class="nav-item">
-          <a href="{% url "sharix_admin:job_request_metaservice" %}" class="nav-link {% if current_page == "job_request_metaservice" %}active rounded{% endif %}">
+          <a href="{% url 'sharix_admin:resource/add/' %}" class="nav-link {% if current_page == "resource/add/" %}active rounded{% endif %}">
             <div class="link d-flex align-items-center">
               <img
                 class="nav-img"
                 src="
-                  {% if current_page == "job_request_metaservice" %}
-                    {% static 'sharix_admin/img/menu/handshake_w.svg' %}
+                  {% if current_page == "resource/add/" %}
+                    {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
                   {% else %}
-                    {% static 'sharix_admin/img/menu/handshake.svg' %}
+                    {% static 'sharix_admin/img/menu/briefcase.svg' %}
                   {% endif %}">
-              <span class="menu-bar-label">Работа в Сервисе</span>
+              <span class="menu-bar-label">Добавить ресурс</span>
             </div>
           </a>
         </li>
-      {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:user_information' %}" class="nav-link {% if current_page == "none" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "none" %}
-                  {% static 'sharix_admin/img/menu/hdd-network_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/hdd-network.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Управление правами</span>
-          </div>
-        </a>
-      </li> {% endcomment %}
-
-      {% comment %}
-      <li class="nav-item">
-        <a href="{% url 'sharix_admin:service_category' %}" class="nav-link {% if current_page == "service_category" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "service_category" %}
-                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Услуги сервиса</span>
-          </div>
-        </a>
-      </li> {% endcomment %}
-      {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:transactions' %}" class="nav-link {% if current_page == "transactions" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "transactions" %}
-                  {% static 'sharix_admin/img/menu/clock-history_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/clock-history.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">История заказов</span>
-          </div>
-        </a>
-      </li> {% endcomment %}
-      {% if "PARTNER-ADMIN" in user_groups %}
+
         <li class="nav-item">
-          <a href="{% url 'sharix_admin:partner_detail_my' %}" class="nav-link {% if current_page == 'partner' %}active rounded{% endif %}">
+          <a href="{% url "sharix_admin:providers" %}" class="nav-link {% if current_page == "providers" %}active rounded{% endif %}">
             <div class="link d-flex align-items-center">
               <img
                 class="nav-img"
                 src="
-                  {% if current_page == 'partner' %}
+                  {% if current_page == "providers" %}
+                    {% static 'sharix_admin/img/menu/people_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/people.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Мои Исполнители</span>
+            </div>
+          </a>
+        </li>
+
+        
+        {% endif %}
+
+
+        <!-- COOPERATE BLOCK -->
+        {% if not "PARTNER-ADMIN" in user_groups %}
+          <li class="nav-item">
+            <a href="{% url "sharix_admin:cooperate_request" %}" class="nav-link {% if current_page == "cooperate_request" %}active rounded{% endif %}">
+              <div class="link d-flex align-items-center">
+                <img
+                  class="nav-img"
+                  src="
+                    {% if current_page == "cooperate_request" %}
+                      {% static 'sharix_admin/img/menu/handshake_w.svg' %}
+                    {% else %}
+                      {% static 'sharix_admin/img/menu/handshake.svg' %}
+                    {% endif %}">
+                <span class="menu-bar-label">Стать партнером</span>
+              </div>
+            </a>
+          </li>
+        {% endif %}
+
+          <li class="nav-item">
+            <a href="{% url "sharix_admin:job_request_metaservice" %}" class="nav-link {% if current_page == "job_request_metaservice" %}active rounded{% endif %}">
+              <div class="link d-flex align-items-center">
+                <img
+                  class="nav-img"
+                  src="
+                    {% if current_page == "job_request_metaservice" %}
+                      {% static 'sharix_admin/img/menu/handshake_w.svg' %}
+                    {% else %}
+                      {% static 'sharix_admin/img/menu/handshake.svg' %}
+                    {% endif %}">
+                <span class="menu-bar-label">Работа в Сервисе</span>
+              </div>
+            </a>
+          </li>
+        {% comment %} <li class="nav-item">
+          <a href="{% url 'sharix_admin:user_information' %}" class="nav-link {% if current_page == "none" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "none" %}
+                    {% static 'sharix_admin/img/menu/hdd-network_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/hdd-network.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Управление правами</span>
+            </div>
+          </a>
+        </li> {% endcomment %}
+
+        {% comment %}
+        <li class="nav-item">
+          <a href="{% url 'sharix_admin:service_category' %}" class="nav-link {% if current_page == "service_category" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "service_category" %}
+                    {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/briefcase.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Услуги сервиса</span>
+            </div>
+          </a>
+        </li> {% endcomment %}
+        {% comment %} <li class="nav-item">
+          <a href="{% url 'sharix_admin:transactions' %}" class="nav-link {% if current_page == "transactions" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "transactions" %}
+                    {% static 'sharix_admin/img/menu/clock-history_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/clock-history.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">История заказов</span>
+            </div>
+          </a>
+        </li> {% endcomment %}
+        {% if "PARTNER-ADMIN" in user_groups %}
+          <li class="nav-item">
+            <a href="{% url 'sharix_admin:partner_detail_my' %}" class="nav-link {% if current_page == 'partner' %}active rounded{% endif %}">
+              <div class="link d-flex align-items-center">
+                <img
+                  class="nav-img"
+                  src="
+                    {% if current_page == 'partner' %}
+                      {% static 'sharix_admin/img/menu/person_w.svg' %}
+                    {% else %}
+                      {% static 'sharix_admin/img/menu/person.svg' %}
+                    {% endif %}">
+                <span class="menu-bar-label">О партнере</span>
+              </div>
+            </a>
+          </li>
+        {% endif %}
+        {% comment %} <li class="nav-item">
+          <a href="{% url 'sharix_admin:service_information-add' %}" class="nav-link {% if current_page == "service_info" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "service_info" %}
                     {% static 'sharix_admin/img/menu/person_w.svg' %}
                   {% else %}
                     {% static 'sharix_admin/img/menu/person.svg' %}
                   {% endif %}">
-              <span class="menu-bar-label">О партнере</span>
+              <span class="menu-bar-label">Информация о сервисе</span>
+            </div>
+          </a>
+        </li> {% endcomment %}
+        {% comment %} <li class="nav-item">
+          <a href="{% url 'sharix_admin:payment' %}" class="nav-link {% if current_page == "payment" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "payment" %}
+                    {% static 'sharix_admin/img/menu/credit-card_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/credit-card.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Реквизиты</span>
+            </div>
+          </a>
+        </li> {% endcomment %}
+
+
+        <!-- Converse integration -->
+        <li class="nav-item">
+          <a href="{% url 'sharix_admin:support_chat' %}" class="nav-link {% if current_page == "support_chat" %}active rounded{% endif %}">
+            <div class="link d-flex align-items-center">
+              <img
+                class="nav-img"
+                src="
+                  {% if current_page == "support_chat" %}
+                    {% static 'sharix_admin/img/menu/tickets_w.svg' %}
+                  {% else %}
+                    {% static 'sharix_admin/img/menu/tickets.svg' %}
+                  {% endif %}">
+              <span class="menu-bar-label">Чат с техподдержкой</span>
             </div>
           </a>
         </li>
-      {% endif %}
-      {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:service_information-add' %}" class="nav-link {% if current_page == "service_info" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "service_info" %}
-                  {% static 'sharix_admin/img/menu/person_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/person.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Информация о сервисе</span>
-          </div>
-        </a>
-      </li> {% endcomment %}
-      {% comment %} <li class="nav-item">
-        <a href="{% url 'sharix_admin:payment' %}" class="nav-link {% if current_page == "payment" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "payment" %}
-                  {% static 'sharix_admin/img/menu/credit-card_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/credit-card.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Реквизиты</span>
-          </div>
-        </a>
-      </li> {% endcomment %}
-
-
-      <!-- Converse integration -->
-      <li class="nav-item">
-        <a href="{% url 'sharix_admin:support_chat' %}" class="nav-link {% if current_page == "support_chat" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "support_chat" %}
-                  {% static 'sharix_admin/img/menu/tickets_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/tickets.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Чат с техподдержкой</span>
-          </div>
-        </a>
-      </li>
 
+        
+        {% include 'webservice_running/metaservice_menu.html' %}
       
-      {% include 'webservice_running/metaservice_menu.html' %}
-     
 
-    </ul>
-  </nav>
+      </ul>
+    </nav>
 
   <div id="user-workspace" class="p-5 border rounded box-shadow">
+    <div class="mb-4" style="margin-top: -30px;">
+      <img src="{% static 'sharix_admin/img/shariX_emblem.svg' %}" alt="Logo" style="max-width: 300px; max-height: 400px;">
+    </div>
+
       <h1>{{ title }}</h1>
       {% if messages %}
         {% for message in messages %}

sharix_admin/templates/sharix_admin/order_local.html

@@ -5,7 +5,32 @@
 {% block view %}
 {% block contenthome %}
     <h1>{{ title }}</h1>
-    
-    
+    {% if object_list %}
+        <div class="mb-3 d-flex justify-content-between align-items-center">
+            <form method="get" action="" class="d-flex align-items-center">
+                <input type="text" name="q" class="form-control" placeholder="Поиск" value="{{ request.GET.q }}" style="width: 300px; height: 38px;">
+                <button type="submit" class="btn btn-primary ms-2" style="height: 38px;">Поиск</button>
+            </form>
+            <a href="{% url 'sharix_admin:order_local/add/' %}" class="btn btn-primary" style="height: 38px;">Добавить заказ</a>
+        </div>
+        {% render_table table 'table table-striped table-bordered' %}
+    {% elif order %}
+        <div class="card">
+            <div class="card-body">
+                <h5 class="card-title">{{ order.title }}</h5>
+                <p class="card-text">Статус: {{ order.status }}</p>
+                <p class="card-text">Дата создания: {{ order.time_created|date:'d.m.Y H:i' }}</p>
+                <a href="{% url 'sharix_admin:order_local/edit' order.pk %}" class="btn btn-primary">Редактировать</a>
+                <a href="{% url 'sharix_admin:orders_local' %}" class="btn btn-secondary">Назад</a>
+            </div>
+        </div>
+    {% else %}
+        <form method="post" action="">
+            {% csrf_token %}
+            {{ form.as_p }}
+            <button type="submit" class="btn btn-primary">Сохранить</button>
+            <a href="{% url 'sharix_admin:orders_local' %}" class="btn btn-secondary">Отмена</a>
+        </form>
+    {% endif %}
 {% endblock contenthome %}
 {% endblock view %}

sharix_admin/templates/sharix_admin/resource_list.html

@@ -27,7 +27,7 @@
       <a href="{% url 'sharix_admin:resource/add/' %}" class="btn btn-primary" style="height: 38px;">Добавить ресурс</a>
     </div>
 
-    <div class="container text-center mt-2">
+    <div class="mb-3 justify-content-between align-items-center">
       {% render_table table %}
     </div>