Browse Source

Довел до ума отчет.

master
Mikhail Grebenkin 7 years ago
parent
commit
62f5f5cc37
3 changed files with 39 additions and 32 deletions
  1. +29
    -22
      .idea/workspace.xml
  2. +7
    -7
      hosts.tpl
  3. +3
    -3
      main.tpl

+ 29
- 22
.idea/workspace.xml View File

@ -5,7 +5,6 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/hosts.tpl" afterPath="$PROJECT_DIR$/hosts.tpl" />
<change beforePath="$PROJECT_DIR$/main.tpl" afterPath="$PROJECT_DIR$/main.tpl" />
<change beforePath="$PROJECT_DIR$/web-leases.py" afterPath="$PROJECT_DIR$/web-leases.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@ -16,7 +15,7 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="kea_hosts_generane.py" pinned="false" current-in-tab="false">
<file leaf-file-name="kea_hosts_generane.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/kea_hosts_generane.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
@ -26,10 +25,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="web-leases.py" pinned="false" current-in-tab="true">
<file leaf-file-name="web-leases.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/web-leases.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343">
<state relative-caret-position="1728">
<caret line="97" column="17" lean-forward="false" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="17" />
<folding />
</state>
@ -39,8 +38,8 @@
<file leaf-file-name="hosts.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/hosts.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="61" lean-forward="false" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />
<state relative-caret-position="361">
<caret line="26" column="34" lean-forward="false" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
<folding />
</state>
</provider>
@ -49,8 +48,8 @@
<file leaf-file-name="main.tpl" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="79" lean-forward="false" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
<state relative-caret-position="144">
<caret line="8" column="16" lean-forward="true" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
<folding />
</state>
</provider>
@ -70,9 +69,9 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/kea_hosts_generane.py" />
<option value="$PROJECT_DIR$/web-leases.py" />
<option value="$PROJECT_DIR$/main.tpl" />
<option value="$PROJECT_DIR$/hosts.tpl" />
<option value="$PROJECT_DIR$/web-leases.py" />
</list>
</option>
</component>
@ -215,7 +214,14 @@
<option name="project" value="LOCAL" />
<updated>1513189330196</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="мелкие косметические изменения">
<created>1513189694157</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1513189694157</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="ToolWindowManager">
@ -248,7 +254,8 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="Поправил пару косяков. Ничего важного." />
<MESSAGE value="добавлен отчет, поменял команду перезагрузки на корректную." />
<option name="LAST_COMMIT_MESSAGE" value="добавлен отчет, поменял команду перезагрузки на корректную." />
<MESSAGE value="мелкие косметические изменения" />
<option name="LAST_COMMIT_MESSAGE" value="мелкие косметические изменения" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -384,34 +391,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/kea_hosts_generane.py">
<entry file="file://$PROJECT_DIR$/main.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="72" column="27" lean-forward="false" selection-start-line="72" selection-start-column="27" selection-end-line="72" selection-end-column="27" />
<state relative-caret-position="144">
<caret line="8" column="16" lean-forward="true" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/hosts.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="61" lean-forward="false" selection-start-line="6" selection-start-column="61" selection-end-line="6" selection-end-column="61" />
<state relative-caret-position="361">
<caret line="26" column="34" lean-forward="false" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/main.tpl">
<entry file="file://$PROJECT_DIR$/web-leases.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="6" column="79" lean-forward="false" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
<state relative-caret-position="1728">
<caret line="97" column="17" lean-forward="false" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/web-leases.py">
<entry file="file://$PROJECT_DIR$/kea_hosts_generane.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343">
<caret line="97" column="17" lean-forward="false" selection-start-line="97" selection-start-column="17" selection-end-line="97" selection-end-column="17" />
<state relative-caret-position="180">
<caret line="72" column="27" lean-forward="false" selection-start-line="72" selection-start-column="27" selection-end-line="72" selection-end-column="27" />
<folding />
</state>
</provider>


+ 7
- 7
hosts.tpl View File

@ -4,11 +4,11 @@
</head>
<html>
<body>
<a href="/hosts/">отчет по занятым хостам в фиксированном адресном пространстве</a>
<h1>Leases report</h1>
<a href="/">отчет по занятым хостам в динамическом адресном пространстве</a>
<h1>Статические адреса</h1>
<br /><br />
<table border="1">
<caption>Таблица аренды адресов</caption>
<caption>Таблица аренды статических адресов </caption>
<tr>
<th>IP адрес</th>
<th>Имя хоста</th>
@ -21,11 +21,11 @@
<td>
%if i == '-':
<font size="5" color="red" face="Arial">-</font>
%end
%if i == '+':
%elif i == '+':
<font size="5" color="green" face="Arial">+</font>
%end
%if not i == '+' and not i == '-':
%elif '10.' in i:
<a target="_blank" href="http://{{i}}">{{i}}</a>
%else:
{{i}}
%end
</td>


+ 3
- 3
main.tpl View File

@ -4,11 +4,11 @@
</head>
<html>
<body>
<a href="/hosts/">отчет по занятым хостам в свободном адресном пространстве</a>
<h1>Leases report</h1>
<a href="/hosts/">отчет по хостам в статическом адресном пространстве</a>
<h1>Динамические адреса</h1>
<br /><br />
<table border="1">
<caption>Таблица аренды адресов</caption>
<caption>Таблица аренды динамических адресов</caption>
<tr>
<th>Дата истечения</th>
<th>IP адрес</th>


Loading…
Cancel
Save

Powered by TurnKey Linux.