2 files changed, 24 insertions, 7 deletions

diff --git a/web/kbn_templates/index.j2 b/web/kbn_templates/index.j2
index c356326..cdf3026 100644
--- a/web/kbn_templates/index.j2
+++ b/web/kbn_templates/index.j2
@@ -28,12 +28,29 @@
         <li class="list-group-item"><a href="/sensors.cgi">Датчики</a> (<a href="{{ sensors_grafana_url }}">Grafana</a>)</li>
     </ul>
 
-    <h6 class="mt-4"><a href="/cams/"><b>Все камеры</b></a> (<a href="/cams/?high=1">HQ</a>)</h6>
-    <ul class="list-group list-group-flush">
-        {% for id, name in cameras %}
-        <li class="list-group-item"><a href="/cams/{{ id }}/">{{ name }}</a> (<a href="/cams/{{ id }}/?high=1">HQ</a>)</li>
+    <nav class="mt-4">
+        <div class="nav nav-tabs" id="nav-tab">
+            <button class="nav-link active" type="button" id="cam_zones_btn" data-id="zones">По зонам</button>
+            <button class="nav-link" type="button" id="cam_all_btn" data-id="all">Все камеры</button>
+        </div>
+    </nav>
+
+    <div class="camzones" id="cam_zones">
+        {% for zone in camzones %}
+            <a href="/cams.cgi?zone={{ zone }}" class="camzone">
+                <div class="camzone_text">{{ zone|lang('ipcam_zones') }}</div>
+            </a>
         {% endfor %}
-        <li class="list-group-item"><a href="/cams/stat/">Статистика</a></li>
+    </div>
+    <ul class="list-group list-group-flush" id="cam_all" style="display: none">
+        {% for id in allcams %}
+            <li class="list-group-item"><a href="/cams.cgi?id={{ id }}">{{ id|lang('ipcam') }}</a></li>
+        {% endfor %}
+{#        <li class="list-group-item"><a href="/cams/stat/">Статистика</a></li>#}
     </ul>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block js %}
+indexInit();
+{% endblock %}
diff --git a/web/kbn_templates/modems.j2 b/web/kbn_templates/modems.j2
index 06339f8..9defec3 100644
--- a/web/kbn_templates/modems.j2
+++ b/web/kbn_templates/modems.j2
@@ -12,5 +12,5 @@
 {% endblock %}
 
 {% block js %}
-ModemStatus.init({{ modems.getkeys()|tojson }});
+ModemStatus.init({{ modems.keys()|tojson }});
 {% endblock %}