cosmetic changes

docs/wiki/foswiki/_list_patch

@@ -0,0 +1,90 @@
+#!/bin/bash
+
+mv IncludeBrasHeader.txt IncludeHeaderBras.txt
+sed -i 's/IncludeBrasHeader/IncludeHeaderBras/' *.txt
+
+mv IncludeBuildingHeader.txt IncludeHeaderBuilding.txt
+sed -i 's/IncludeBuildingHeader/IncludeHeaderBuilding/' *.txt
+
+mv IncludeClavHeader.txt IncludeHeaderClav.txt
+sed -i 's/IncludeClavHeader/IncludeHeaderClav/' *.txt
+
+mv IncludeDhcpPoolHeader.txt IncludeHeaderDhcpPool.txt
+sed -i 's/IncludeDhcpPoolHeader/IncludeHeaderDhcpPool/' *.txt
+
+mv IncludeGatewayHeader.txt IncludeHeaderGateway.txt
+sed -i 's/IncludeGatewayHeader/IncludeHeaderGateway/' *.txt
+
+mv IncludeNetDevHeader.txt IncludeHeaderNetDev.txt
+sed -i 's/IncludeNetDevHeader/IncludeHeaderNetDev/' *.txt
+
+mv IncludeRackHeader.txt IncludeHeaderRack.txt
+sed -i 's/IncludeRackHeader/IncludeHeaderRack/' *.txt
+
+mv IncludeRoomHeader.txt IncludeHeaderRoom.txt
+sed -i 's/IncludeRoomHeader/IncludeHeaderRoom/' *.txt
+
+mv IncludeRouterHeader.txt IncludeHeaderRouter.txt
+sed -i 's/IncludeRouterHeader/IncludeHeaderRouter/' *.txt
+
+mv IncludeServerHeader.txt IncludeHeaderServer.txt
+sed -i 's/IncludeServerHeader/IncludeHeaderServer/' *.txt
+
+mv IncludeSnmpPortHeader.txt IncludeHeaderSnmpPort.txt
+sed -i 's/IncludeSnmpPortHeader/IncludeHeaderSnmpPort/' *.txt
+
+mv IncludeSubnetHeader.txt IncludeHeaderSubnet.txt
+sed -i 's/IncludeSubnetHeader/IncludeHeaderSubnet/' *.txt
+
+mv IncludeSwitchHeader.txt IncludeHeaderSwitch.txt
+sed -i 's/IncludeSwitchHeader/IncludeHeaderSwitch/' *.txt
+
+mv IncludeUpsHeader.txt IncludeHeaderUps.txt
+sed -i 's/IncludeUpsHeader/IncludeHeaderUps/' *.txt
+
+mv IncludeShowAtss.txt IncludeFindAtss.txt
+mv IncludeShowAtssDisabled.txt IncludeFindAtssDisabled.txt
+sed -i 's/IncludeShowAtss/IncludeFindAtss/' *.txt
+
+mv IncludeShowAuth.txt IncludeFindAuth.txt
+mv IncludeShowAuthAll.txt IncludeFindAuthAll.txt
+sed -i 's/IncludeShowAuth/IncludeFindAuth/' *.txt
+
+mv IncludeShowCerts.txt IncludeFindCerts.txt
+sed -i 's/IncludeShowCerts/IncludeFindCerts/' *.txt
+
+mv IncludeShowPhones.txt IncludeFindPhones.txt
+mv IncludeShowPhonesDisabled.txt IncludeFindPhonesDisabled.txt
+sed -i 's/IncludeShowPhones/IncludeFindPhones/' *.txt
+
+mv IncludeShowServers.txt IncludeFindServers.txt
+sed -i 's/IncludeShowServers/IncludeFindServers/' *.txt
+
+mv IncludeShowServices.txt IncludeFindServices.txt
+sed -i 's/IncludeShowServices/IncludeFindServices/' *.txt
+
+mv IncludeShowSites.txt IncludeFindSites.txt
+sed -i 's/IncludeShowSites/IncludeFindSites/' *.txt
+
+mv IncludeShowVms.txt IncludeFindVms.txt
+sed -i 's/IncludeShowVms/IncludeFindVms/' *.txt
+
+mv IncludeShowVoipGates.txt IncludeFindVoipGates.txt
+sed -i 's/IncludeShowVoipGates/IncludeFindVoipGates/' *.txt
+
+mv IncludeShowVoipGatesDisabled.txt IncludeFindVoipGatesDisabled.txt
+sed -i 's/IncludeShowVoipGatesDisabled/IncludeFindVoipGatesDisabled/' *.txt
+
+mv IncludePhoneList.txt IncludeFindPhoneList.txt
+sed -i 's/IncludePhoneList/IncludeFindPhoneList/' *.txt
+
+mv IncludeCamList.txt IncludeFindCamList.txt
+sed -i 's/IncludeCamList/IncludeFindCamList/' *.txt
+
+mv IncludeATSPhoneList.txt IncludeFindATSPhoneList.txt
+sed -i 's/IncludeATSPhoneList/IncludeFindATSPhoneList/' *.txt
+
+mv IncludeWPapList.txt IncludeFindWPapList.txt
+sed -i 's/IncludeWPapList/IncludeFindWPapList/' *.txt
+
+exit

docs/wiki/foswiki/data/IncludeAdd4Gmodem.txt

@@ -0,0 +1,10 @@
+<form name="new4G" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%INTURLENCODE{"%WEB%"}%/">
+   * Добавить 4G:
+     <input type="text" name="topic" value="Device" size="40" />
+     <input type="hidden" name="templatetopic" value="DefaultNetdeviceTemplate" />
+     <input type="hidden" name="onlywikiname" value="off" />
+     <input type="hidden" name="topicparent" value="%BASETOPIC%" />
+     <input type="hidden" name="formtemplate" value="FormNetDevice" />
+     <input type="hidden" name="DeviceType" value="4Gmodem" />
+     <input type="submit" value="Create" />
+</form>

docs/wiki/foswiki/data/IncludeAddAP.txt

@@ -4,7 +4,7 @@
      <input type="hidden" name="templatetopic" value="DefaultNetdeviceTemplate" />
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
-     <input type="hidden" name="formtemplate" value="FormAP" />
-     <input type="hidden" name="DeviceType" value="AP" />
+     <input type="hidden" name="formtemplate" value="FormNetDevice" />
+     <input type="hidden" name="DeviceType" value="4Gmodem" />
      <input type="submit" value="Create" />
 </form>

docs/wiki/foswiki/data/IncludeAddBras.txt

@@ -0,0 +1,9 @@
+<form name="newBras" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%INTURLENCODE{"%WEB%"}%/">
+   * Добавить BRAS:
+     <input type="text" name="topic" value="Bras" size="40" />
+     <input type="hidden" name="templatetopic" value="DefaultBrasTemplate" />
+     <input type="hidden" name="onlywikiname" value="off" />
+     <input type="hidden" name="topicparent" value="%BASETOPIC%" />
+     <input type="hidden" name="formtemplate" value="FormBras" />
+     <input type="submit" value="Create" />
+</form>

docs/wiki/foswiki/data/IncludeAddCoreRouter.txt

@@ -0,0 +1,10 @@
+<form name="newCoreRouter" action="%SCRIPTURLPATH%/edit%SCRIPTSUFFIX%/%INTURLENCODE{"%WEB%"}%/">
+   * Добавить Core-роутер:
+     <input type="text" name="topic" value="Router" size="40" />
+     <input type="hidden" name="templatetopic" value="DefaultRouterTemplate" />
+     <input type="hidden" name="onlywikiname" value="off" />
+     <input type="hidden" name="topicparent" value="%BASETOPIC%" />
+     <input type="hidden" name="formtemplate" value="FormCoreRouter" />
+     <input type="hidden" name="DeviceType" value="CoreRouter" />
+     <input type="submit" value="Create" />
+</form>

docs/wiki/foswiki/data/IncludeClavHeader.txt

@@ -1,32 +0,0 @@
----++ Список стоек
-
-%SEARCH{
-"Parent='%BASETOPIC%'"
-topic="Rack*"
-type="query"
-nosearch="on"
-nototal="on"
-header="|*Стойка*|*Description*|"
-format="| [[$topic][$formfield(Name)]] | $formfield(Description) |"
-}%
-
----++ Список оборудования
-
-%SEARCH{
-"Place='%BASETOPIC%' or Parent='%BASETOPIC%'"
-topic="*"
-excludetopic="Rack*"
-type="query"
-nosearch="on"
-nototal="on"
-header="|*Name*|*Место*|*Model*|*Description*|"
-format="| [[$topic][$formfield(DnsName)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
-order="formfield(Name)"
-}%
-
-%INCLUDE{IncludeImage}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddRack}%
-

docs/wiki/foswiki/data/IncludeFindRackDevices.txt

@@ -0,0 +1,14 @@
+---++ Список оборудования в стойке
+
+%SEARCH{
+"Rack='%BASETOPIC%' or Parent='%BASETOPIC%' or Place='%BASETOPIC%'"
+topic="*"
+excludetopic="Rack*"
+type="query"
+nosearch="on"
+nototal="on"
+expandvariables="on"
+header="|*Name*|*Тип*|*Description*|"
+format="| [[$topic][$formfield(DnsName)]] | $formfield(DeviceType) | $formfield(Description) |"
+order="formfield(Name)"
+}%

docs/wiki/foswiki/data/IncludeFindRacks.txt

@@ -0,0 +1,12 @@
+---++ Список стоек
+
+%SEARCH{
+"Parent='%BASETOPIC%'"
+topic="Rack*"
+type="query"
+nosearch="on"
+nototal="on"
+header="|*Стойка*|*Description*|"
+format="| [[$topic][$formfield(Name)]] | $formfield(Description) |"
+}%
+

docs/wiki/foswiki/data/IncludeFindRoomDevices.txt

@@ -0,0 +1,13 @@
+---++ Список оборудования вне стоек
+
+%SEARCH{
+"Place='%BASETOPIC%' or Parent='%BASETOPIC%'"
+topic="*"
+excludetopic="Rack*"
+type="query"
+nosearch="on"
+nototal="on"
+header="|*Name*|*Место*|*Model*|*Description*|"
+format="| [[$topic][$formfield(DnsName)]] | $formfield(Rack) | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+order="formfield(Name)"
+}%

docs/wiki/foswiki/data/IncludeBuildingHeader.txt → docs/wiki/foswiki/data/IncludeFindRooms.txt

@@ -9,8 +9,3 @@ nototal="on"
 header="|*Клозет*|*Description*|"
 format="| [[$topic][$formfield(Name)]] | $formfield(Description) |"
 }%
-
----++ Добавить
-
-%INCLUDE{IncludeAddRoom}%
-

docs/wiki/foswiki/data/IncludeFindSubnets.txt

@@ -0,0 +1,3 @@
+---++ Терменируемые подсети
+
+%SEARCH{search="[^0-9a-zA-Z]%BASETOPIC%" topic="Subnet*" regex="on" multiple="on" nosearch="on" nototal="on" format=" * [[$topic][$formfield(Name)]] - $formfield(Description) <br>" }%

docs/wiki/foswiki/data/IncludeFindVlans.txt

@@ -0,0 +1,11 @@
+---++ Список вланов, терменируемых этим роутером
+
+%SEARCH{
+search="Parent='%BASETOPIC%'"
+topic="Vlan*"
+type="query"
+nosearch="on"
+nototal="on"
+header="| *Name* | *Tag* | *Description* | *Сеть* |"
+format="| [[$topic][$formfield(VlanName)]] | $formfield(Vlantag) | $formfield(Description) | $formfield(Subnet) |"
+}%

docs/wiki/foswiki/data/IncludeGatewayHeader.txt

@@ -1,31 +0,0 @@
----++ Терменируемые подсети
-
-%SEARCH{search="[^0-9a-zA-Z]%BASETOPIC%" topic="Subnet*" regex="on" multiple="on" nosearch="on" nototal="on" format=" * [[$topic][$formfield(Name)]] - $formfield(Description) <br>" }%
-
----++ Список вланов, терменируемых этим роутером
-
-%SEARCH{
-search="Parent='%BASETOPIC%'"
-topic="Vlan*"
-type="query"
-nosearch="on"
-nototal="on"
-header="| *Name* | *Tag* | *Description* | *Сеть* |"
-format="| [[$topic][$formfield(VlanName)]] | $formfield(Vlantag) | $formfield(Description) | $formfield(Subnet) |"
-}%
-
-%INCLUDE{IncludeSnmpPortHeader}%
-
-%INCLUDE{IncludeShowAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeAddVlan}%
-
-%INCLUDE{IncludeImage}%
-
-%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeHeaderBras.txt

@@ -0,0 +1,5 @@
+%INCLUDE{IncludeNetDevCommon}%
+
+%INCLUDE{IncludeHeaderSnmpPort}%
+
+%INCLUDE{IncludeFindAuth}%

docs/wiki/foswiki/data/IncludeHeaderBuilding.txt

@@ -0,0 +1,7 @@
+
+%INCLUDE{IncludeFindRooms}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddRoom}%
+

docs/wiki/foswiki/data/IncludeHeaderClav.txt

@@ -0,0 +1,15 @@
+%INCLUDE{IncludeFindRacks}%
+
+%INCLUDE{IncludeFindRoomDevices}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddRack}%
+
+%INCLUDE{IncludeAddHardware}%
+%INCLUDE{IncludeAddSwitch}%
+%INCLUDE{IncludeAddRouter}%
+%INCLUDE{IncludeAddGateway}%
+%INCLUDE{IncludeAddUps}%
+
+%INCLUDE{IncludeImage}%

docs/wiki/foswiki/data/IncludeDhcpPoolHeader.txt → docs/wiki/foswiki/data/IncludeHeaderDhcpPool.txt

@@ -7,7 +7,7 @@ $(function() {
 $("#container0").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
 {
 name: 'DATABASE_SQL',
-description: "stat",
+description: "rstat",
 sql: "SELECT subnet, CONCAT('Начало пула: ',INET_NTOA(dhcp_start)) as start_ip, CONCAT('Конец пула: ',INET_NTOA(dhcp_stop)) as stop_ip, CONCAT('Шлюз: ',INET_NTOA(gateway)) as gate, CONCAT('Аренда, минут: ',dhcp_lease_time) as lease_time FROM subnets WHERE subnet='%FORMFIELD{"Subnet" topic="%FORMFIELD{"Subnet" topic="%BASETOPIC%"}%"}%' LIMIT 1",
 format: "  * $start_ip<br>  * $stop_ip<br>  * $gate<br>  * $lease_time<br>",
 topic: '%BASEWEB%.%BASETOPIC%',

docs/wiki/foswiki/data/IncludeHeaderGateway.txt

@@ -0,0 +1,22 @@
+%INCLUDE{IncludeFindSubnets}%
+
+%INCLUDE{IncludeFindServices}%
+
+%INCLUDE{IncludeFindVlans}%
+
+%INCLUDE{IncludeHeaderSnmpPort}%
+
+%INCLUDE{IncludeFindAuth}%
+
+
+---++ Добавить
+
+%INCLUDE{IncludeAddService}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeAddVlan}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeNetDevHeader.txt → docs/wiki/foswiki/data/IncludeHeaderNetDev.txt

@@ -1,6 +1,6 @@
 %INCLUDE{IncludeNetDevCommon}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 
 ---++ Добавить
 

docs/wiki/foswiki/data/IncludeHeaderRack.txt

@@ -0,0 +1,15 @@
+%INCLUDE{IncludeFindRackDevices}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddHardware}%
+%INCLUDE{IncludeAddSwitch}%
+%INCLUDE{IncludeAddRouter}%
+%INCLUDE{IncludeAddGateway}%
+%INCLUDE{IncludeAddUps}%
+
+
+
+
+
+

docs/wiki/foswiki/data/IncludeHeaderRoom.txt

@@ -0,0 +1,15 @@
+%INCLUDE{IncludeFindRacks}%
+
+%INCLUDE{IncludeFindRoomDevices}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddRack}%
+
+%INCLUDE{IncludeAddHardware}%
+%INCLUDE{IncludeAddSwitch}%
+%INCLUDE{IncludeAddRouter}%
+%INCLUDE{IncludeAddGateway}%
+%INCLUDE{IncludeAddUps}%
+
+%INCLUDE{IncludeImage}%

docs/wiki/foswiki/data/IncludeHeaderRouter.txt

@@ -0,0 +1,23 @@
+%INCLUDE{IncludeFindSubnets}%
+
+%INCLUDE{IncludeFindServices}%
+
+%INCLUDE{IncludeFindVlans}%
+
+%INCLUDE{IncludeHeaderSnmpPort}%
+
+%INCLUDE{IncludeFindAuth}%
+
+---++ Добавить
+
+%INCLUDE{IncludeAddService}%
+
+%INCLUDE{IncludeAddCert}%
+
+%INCLUDE{IncludeAddAuth}%
+
+%INCLUDE{IncludeAddAcl}%
+
+%INCLUDE{IncludeAddVlan}%
+
+%INCLUDE{IncludeWorkflow}%

docs/wiki/foswiki/data/IncludeSnmpPortHeader.txt → docs/wiki/foswiki/data/IncludeHeaderSnmpPort.txt

@@ -29,5 +29,3 @@ $(function() {
   );
 });
 </script>
-
-%INCLUDE{IncludeNetDevCommon}%

docs/wiki/foswiki/data/IncludeSubnetHeader.txt → docs/wiki/foswiki/data/IncludeHeaderSubnet.txt

@@ -3,6 +3,7 @@
 %SEARCH{
 "DeviceSubnet='%BASETOPIC%'"
 type="query"
+web="Sovtest,Internet"
 nosearch="on"
 nototal="on"
 pager="on"
@@ -21,7 +22,7 @@ $(function() {
 $("#container0").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
 {
 name: 'DATABASE_SQL',
-description: "stat",
+description: "rstat",
 sql: "SELECT subnet, CONCAT('Первый адрес: ',INET_NTOA(ip_int_start+1)) as start, CONCAT('Последний адрес: ',INET_NTOA(ip_int_stop-1)) as stop, CONCAT('Начало dhcp пула: ',INET_NTOA(dhcp_start)) as start_ip, CONCAT('Конец dhcp пула: ',INET_NTOA(dhcp_stop)) as stop_ip, CONCAT('Шлюз: ',INET_NTOA(gateway)) as gate FROM subnets WHERE subnet='%FORMFIELD{"Subnet" topic="%BASETOPIC%"}%' LIMIT 1",
 format: "  * $start<br>  * $stop<br>  * $gate<br>  * $start_ip<br>  * $stop_ip<br>",
 topic: '%BASEWEB%.%BASETOPIC%',
@@ -40,7 +41,7 @@ $(function() {
 $("#container1").load("%SCRIPTURLPATH{"rest"}%/RenderPlugin/tag",
 {
 name: 'DATABASE_SQL',
-description: 'stat',
+description: 'rstat',
 sql: "SELECT User_auth.ip, User_auth.mac, User_list.login, User_auth.comments, User_auth.dns_name, User_auth.dhcp_hostname, User_auth.last_found FROM User_auth, User_list WHERE (User_auth.ip_int BETWEEN (SELECT ip_int_start FROM subnets WHERE subnet='%FORMFIELD{"Subnet" topic="%BASETOPIC%"}%') AND (SELECT ip_int_stop FROM subnets WHERE subnet='%FORMFIELD{"Subnet" topic="%BASETOPIC%"}%')) and User_auth.user_id = User_list.id AND User_auth.deleted =0 ORDER BY ip_int",
 header: '|*Юзер*|*IP*|*MAC*|*DNS Name*|*DHCP hostname*| *Последняя активность   * | *Комментарий*|',
 format: '|$login | $ip | $mac | $dns_name | $dhcp_hostname | $last_found | $comments |',

docs/wiki/foswiki/data/IncludeSwitchHeader.txt → docs/wiki/foswiki/data/IncludeHeaderSwitch.txt

@@ -7,7 +7,7 @@ type="query"
 nosearch="on"
 nototal="on"
 header="|*Port*|*Name*|*Model*|*Description*|"
-format="| [[$topic][$formfield(ParentPort)]] | $formfield(Name)  | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
+format="| [[$topic][$formfield(ParentPort)]] | [[$topic][$formfield(Name)]]  | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
 order="formfield(ParentPort)"
 }%
 

docs/wiki/foswiki/data/IncludeRackHeader.txt

@@ -1,29 +0,0 @@
----++ Список оборудования в стойке
-
-|*Name*|*Тип*|*Description*|
-%SEARCH{
-"Rack=~'%BASETOPIC%' or Parent=~'%BASETOPIC%' or Place=~'%BASETOPIC%'"
-topic="*"
-excludetopic="Rack*"
-type="query"
-nosearch="on"
-nototal="on"
-expandvariables="on"
-noheader="on"
-format="| [[$web.$topic][$formfield(Name)]] | $formfield(DeviceType) | $formfield(Description) |"
-order="formfield(Name)"
-}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddHardware}%
-%INCLUDE{IncludeAddSwitch}%
-%INCLUDE{IncludeAddRouter}%
-%INCLUDE{IncludeAddGateway}%
-%INCLUDE{IncludeAddUps}%
-
-
-
-
-
-

docs/wiki/foswiki/data/IncludeRoomHeader.txt

@@ -1,38 +0,0 @@
----++ Список стоек
-
-%SEARCH{
-"Parent='%BASETOPIC%'"
-topic="Rack*"
-type="query"
-nosearch="on"
-nototal="on"
-header="|*Стойка*|*Description*|"
-format="| [[$topic][$formfield(Name)]] | $formfield(Description) |"
-}%
-
----++ Список оборудования в комнате вне стоек/ящиков
-
-|*Name*|*Model*|*Description*|
-%SEARCH{
-"(Place=~'%BASETOPIC%' or Parent=~'%BASETOPIC%') and not Rack"
-topic="*"
-excludetopic="Rack*"
-type="query"
-nosearch="on"
-nototal="on"
-noheader="on"
-format="| [[$web.$topic][$topic]] | $formfield(Vendor) $formfield(DeviceModel) | $formfield(Description) |"
-order="formfield(Name)"
-}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddRack}%
-
-%INCLUDE{IncludeAddHardware}%
-%INCLUDE{IncludeAddSwitch}%
-%INCLUDE{IncludeAddRouter}%
-%INCLUDE{IncludeAddGateway}%
-%INCLUDE{IncludeAddUps}%
-
-%INCLUDE{IncludeImage}%

docs/wiki/foswiki/data/IncludeRouterHeader.txt

@@ -1,36 +0,0 @@
----++ Терменируемые подсети
-
-%SEARCH{search="[^0-9a-zA-Z]%BASETOPIC%" topic="Subnet*" regex="on" multiple="on" nosearch="on" nototal="on" format=" * [[$topic][$formfield(Name)]] - $formfield(Description) <br>" }%
-
----++ Список вланов, терменируемых этим роутером
-
-%SEARCH{
-search="Parent='%BASETOPIC%'"
-topic="Vlan*"
-type="query"
-nosearch="on"
-nototal="on"
-header="| *Name* | *Tag* | *Description* | *Сеть* |"
-format="| [[$topic][$formfield(VlanName)]] | $formfield(Vlantag) | $formfield(Description) | $formfield(Subnet) |"
-}%
-
-%INCLUDE{IncludeSnmpPortHeader}%
-
-%INCLUDE{IncludeShowAuth}%
-
----++ Добавить
-
-%INCLUDE{IncludeAddService}%
-
-%INCLUDE{IncludeAddCert}%
-
-%INCLUDE{IncludeAddAuth}%
-
-%INCLUDE{IncludeAddAcl}%
-
-%INCLUDE{IncludeAddVlan}%
-
-%INCLUDE{IncludeWorkflow}%
-
----++ Фото
-%IMAGEGALLERY{size="large" topic="%BASETOPIC%" warn="no"}%

docs/wiki/foswiki/data/IncludeSelectATS.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="DeviceATS*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%
+, %SEARCH{"\.*" scope="topic" topic="DeviceATS*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectBuilding.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Building*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%
+, %SEARCH{"\.*" web="Sovtest" scope="topic" topic="Building*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="$web.$topic"}%

docs/wiki/foswiki/data/IncludeSelectCluster.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Cluster*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%
+, %SEARCH{"\.*" web="Sovtest" scope="topic" topic="Cluster*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectClusterHardware.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Cluster*,Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%
+, %SEARCH{"\.*" scope="topic" topic="Sovtest.Cluster*,Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="formfield(Name)"}%

docs/wiki/foswiki/data/IncludeSelectDeviceParent.txt

@@ -1 +1 @@
- , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% 
+ , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}% 

docs/wiki/foswiki/data/IncludeSelectDeviceType.txt

@@ -1,7 +1,8 @@
+4Gmodem,
 AP,
 ATS,
-AirConditioning,
 Computer,
+CoreRouter,
 CPO,
 Gateway,
 Hardware,

docs/wiki/foswiki/data/IncludeSelectDhcpPool.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="DhcpPool*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%
+, %SEARCH{"\.*" scope="topic" topic="DhcpPool*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectDnsZone.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Dns*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%
+, %SEARCH{"\.*" scope="topic" topic="Dns*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectDomain.txt

@@ -1 +1 @@
- , %SEARCH{search="\.*" scope="topic" topic="Domain*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%
+ , %SEARCH{search="\.*" scope="topic" topic="Domain*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectHardware.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%
+, %SEARCH{"\.*" scope="topic" topic="Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectKvmHostParent.txt

@@ -3,19 +3,20 @@
 type="query"
 nosearch="on"
 nototal="on"
-format="$topic"
+format="$web.$topic"
 separator=", "
 order="formfield(Name)"
 }%
 , %SEARCH{
 "\.*"
 scope="topic"
+web="Sovtest"
 topic="Cluster*"
 nototal="on"
 nosummary="on"
 nosearch="on"
 regex="on"
-format="$topic"
+format="$web.$topic"
 separator=", "
 order="formfield(Name)"
-}%
+}%

docs/wiki/foswiki/data/IncludeSelectNetHost.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Ups*,Device*,Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%
+, %SEARCH{"\.*" scope="topic" topic="Ups*,Device*,Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectNetParent.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%
+, %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectPlace.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Parent)"}%
+, %SEARCH{"\.*" web="Sovtest" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$web.$topic" separator=", " order="$web.$topic"}%

docs/wiki/foswiki/data/IncludeSelectRack.txt

@@ -1 +1 @@
-, %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}%
+, %SEARCH{scope="topic" web="Sovtest" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$web.$topic" separator=", " order="formfield(Parent)"}%

docs/wiki/foswiki/data/IncludeSelectRoom.txt

@@ -1 +1 @@
-, %SEARCH{scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}%
+, %SEARCH{scope="topic" web="Sovtest" topic="Room*" nototal="on" nosummary="on" nosearch="on" type="query" format="$web.$topic" separator=", " order="formfield(Parent)"}%

docs/wiki/foswiki/data/IncludeSelectServer.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="Vmware*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%
+, %SEARCH{"\.*" scope="topic" topic="Vmware*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeSelectServiceType.txt

@@ -16,6 +16,7 @@ HTTP,
 IMAP,
 IsIs,
 Kannel,
+Keepalived,
 Ldap,
 MongoDB,
 MySQL,

docs/wiki/foswiki/data/IncludeSelectVoipGate.txt

@@ -1 +1 @@
-, %SEARCH{"\.*" scope="topic" topic="DeviceVoipGate*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%
+, %SEARCH{"\.*" scope="topic" topic="DeviceVoipGate*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="topic"}%

docs/wiki/foswiki/data/IncludeShowServer.txt

@@ -1,7 +1,7 @@
-%INCLUDE{IncludeShowServices}%
+%INCLUDE{IncludeFindServices}%
 
-%INCLUDE{IncludeShowSites}%
+%INCLUDE{IncludeFindSites}%
 
-%INCLUDE{IncludeShowCerts}%
+%INCLUDE{IncludeFindCerts}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%

docs/wiki/foswiki/data/IncludeShowVirtualServer.txt

@@ -1,8 +1,8 @@
-%INCLUDE{IncludeShowServices}%
+%INCLUDE{IncludeFindServices}%
 
-%INCLUDE{IncludeShowSites}%
+%INCLUDE{IncludeFindSites}%
 
-%INCLUDE{IncludeShowCerts}%
+%INCLUDE{IncludeFindCerts}%
 
-%INCLUDE{IncludeShowAuth}%
+%INCLUDE{IncludeFindAuth}%
 

docs/wiki/foswiki/data/IncludeWorkflow.txt

@@ -1,3 +1,5 @@
 ---++ Работа
 
 %COMMENT{type="workflow" target="%BASETOPIC%"}%
+
+%INCLUDE{IncludeImage}%