firewall_gui: format templates

6bb7fc58 · Bence Dányi · c0ac5297 · 6bb7fc58 · 6bb7fc58 · 6bb7fc58
Commit 6bb7fc58 authored May 07, 2013 by Bence Dányi
10 changed files
--- a/firewall_gui/static/partials/blacklist-list.html
+++ b/firewall_gui/static/partials/blacklist-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -24,9 +27,13 @@
    <th colspan="2">Típus</th>
  </tr>
  <tr ng-repeat="blacklist in getPage()">
-        <td><a href="#/blacklists/{{blacklist.id}}">{{blacklist.name}}</a></td>
+    <td>
+      <a href="#/blacklists/{{blacklist.id}}">{{blacklist.name}}</a>
+    </td>
    <td>{{blacklist.ipv4}}</td>
-        <td><a href="#/hosts/{{blacklist.host.id}}">{{blacklist.host.hostname}}</a></td>
+    <td>
+      <a href="#/hosts/{{blacklist.host.id}}">{{blacklist.host.hostname}}</a>
+    </td>
    <td>{{blacklist.reason}}</td>
    <td>{{blacklist.snort_message}}</td>
    <td>{{blacklist.type}}</td>

--- a/firewall_gui/static/partials/domain-list.html
+++ b/firewall_gui/static/partials/domain-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -22,7 +25,9 @@
    <th colspan="2">Tulajdonos</th>
  </tr>
  <tr ng-repeat="domain in getPage()">
-        <td><a href="#/domains/{{domain.id}}">{{domain.name}}</a></td>
+    <td>
+      <a href="#/domains/{{domain.id}}">{{domain.name}}</a>
+    </td>
    <td>{{domain.ttl}}</td>
    <td>{{domain.description}}</td>
    <td>{{domain.owner.name}}</td>

--- a/firewall_gui/static/partials/firewall-list.html
+++ b/firewall_gui/static/partials/firewall-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -20,7 +23,9 @@
    <th colspan="2">Tulajdonos</th>
  </tr>
  <tr ng-repeat="firewall in getPage()">
-        <td><a href="#/firewalls/{{firewall.id}}">{{firewall.name}}</a></td>
+    <td>
+      <a href="#/firewalls/{{firewall.id}}">{{firewall.name}}</a>
+    </td>
    <td>{{firewall.owner.name}}</td>
    <td>
      <a class="btn" href="#/firewalls/{{firewall.id}}/">Szerkesztés</a>

--- a/firewall_gui/static/partials/host-list.html
+++ b/firewall_gui/static/partials/host-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -25,7 +28,9 @@
  </tr>
  <tr ng-repeat="host in getPage()">
    <td>{{host.name}}</td>
-        <td><a href="#/hosts/{{host.vlan.id}}">{{host.vlan.name}}</a></td>
+    <td>
+      <a href="#/hosts/{{host.vlan.id}}">{{host.vlan.name}}</a>
+    </td>
    <td>{{host.ipv4}}</td>
    <td>
      <ul>

--- a/firewall_gui/static/partials/hostgroup-list.html
+++ b/firewall_gui/static/partials/hostgroup-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -21,7 +24,8 @@
    <th colspan="2">Leírás</th>
  </tr>
  <tr ng-repeat="group in getPage()">
-        <td><a href="#/hostgroups/{{group.id}}">{{group.name}}</td>
+    <td>
+      <a href="#/hostgroups/{{group.id}}">{{group.name}}</td>
      <td>{{group.owner.name}}</td>
      <td style="width: 200px;">{{group.description}}</td>
      <td>
@@ -29,4 +33,4 @@
        <a class="btn btn-danger" href="#/hostgroups/{{group.id}}/delete/">Törlés</a>
      </td>
    </tr>
-</table>
+  </table>
--- a/firewall_gui/static/partials/record-list.html
+++ b/firewall_gui/static/partials/record-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -26,10 +29,16 @@
    <th colspan="2">Tulajdonos</th>
  </tr>
  <tr ng-repeat="record in getPage()">
-        <td><a href="#/records/{{record.id}}">{{record.name}}</a></td>
+    <td>
+      <a href="#/records/{{record.id}}">{{record.name}}</a>
+    </td>
    <td>{{record.type}}</td>
-        <td><a href="#/domains/{{record.domain.id}}">{{record.domain.name}}</a></td>
+    <td>
-        <td><a href="#/hosts/{{record.host.id}}">{{record.host.name}}</a></td>
+      <a href="#/domains/{{record.domain.id}}">{{record.domain.name}}</a>
+    </td>
+    <td>
+      <a href="#/hosts/{{record.host.id}}">{{record.host.name}}</a>
+    </td>
    <td>{{record.address}}</td>
    <td>{{record.ttl}}</td>
    <td>{{record.owner.name}}</td>

--- a/firewall_gui/static/partials/rule-list.html
+++ b/firewall_gui/static/partials/rule-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -26,8 +29,12 @@
  <tr ng-repeat="rule in getPage()">
    <td>{{rule.direction}}</td>
    <td>{{rule.proto}}</td>
-        <td><a href="#/{{rule.target.type}}s/{{rule.target.id}}">{{rule.target.name}}</a></td>
+    <td>
-        <td><a href="#/vlangroups/{{rule.foreignNetwork.id}}">{{rule.foreignNetwork.name}}</a></td>
+      <a href="#/{{rule.target.type}}s/{{rule.target.id}}">{{rule.target.name}}</a>
+    </td>
+    <td>
+      <a href="#/vlangroups/{{rule.foreignNetwork.id}}">{{rule.foreignNetwork.name}}</a>
+    </td>
    <td>{{rule.owner.name}}</td>
    <td>{{rule.description}}</td>
    <td>

--- a/firewall_gui/static/partials/vlan-list.html
+++ b/firewall_gui/static/partials/vlan-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -25,11 +28,15 @@
  </tr>
  <tr ng-repeat="vlan in getPage()">
    <td>{{vlan.vid}}</td>
-        <td><a href="#/vlans/{{vlan.id}}">{{vlan.name}}</a></td>
+    <td>
+      <a href="#/vlans/{{vlan.id}}">{{vlan.name}}</a>
+    </td>
    <td>{{vlan.ipv4}}</td>
    <td>{{vlan.ipv6}}</td>
    <td style="width: 200px;">{{vlan.description}}</td>
-        <td><a href="#/vlans/{{vlan.domain.id}}">{{vlan.domain.name}}</a></td>
+    <td>
+      <a href="#/vlans/{{vlan.domain.id}}">{{vlan.domain.name}}</a>
+    </td>
    <td>
      <a class="btn" href="#/vlans/{{vlan.id}}/">Szerkesztés</a>
      <a class="btn btn-danger" href="#/vlans/{{vlan.id}}/delete/">Törlés</a>

--- a/firewall_gui/static/partials/vlangroup-edit.html
+++ b/firewall_gui/static/partials/vlangroup-edit.html
@@ -42,7 +42,7 @@
    <div class="control-group">
      <label class="control-label" for="vlangroups">Vlans</label>
      <div class="controls">
-        <div class="well">
+        <div class="well well-small">
          <span class="label label-info" ng-repeat="vlan in entity.vlans">
            <a href="#/vlans/{{vlan.id}}">{{vlan.name}}</a>
            <a href><i class="icon-remove"></i></a>

--- a/firewall_gui/static/partials/vlangroup-list.html
+++ b/firewall_gui/static/partials/vlangroup-list.html
@@ -2,16 +2,19 @@
  <div class="navbar-inner">
    <div class="pagination pull-left">
      <ul>
-                <li ng-click="prevPage()" ng-class="{disabled: page == 1}"><a href>Előző</a></li>
+        <li ng-click="prevPage()" ng-class="{disabled: page == 1}">
+          <a href>Előző</a>
+        </li>
        <li ng-repeat="_page in pages" ng-click="setPage(_page)" ng-class="{active: _page == page}">
          <a href>{{_page}}</a>
        </li>
-                <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}"><a href>Next</a></li>
+        <li ng-click="nextPage()" ng-class="{disabled: page == pages.length}">
+          <a href>Next</a>
+        </li>
      </ul>
    </div>
    <form class="navbar-search" style="margin: 20px">
-            <input type="text" class="search-query" placeholder="Search" ng-model="query">
+      <input type="text" class="search-query" placeholder="Search" ng-model="query"></form>
-        </form>
  </div>
 </div>
 <table class="table table-striped">
@@ -22,11 +25,15 @@
    <th colspan="2">Tulajdonos</th>
  </tr>
  <tr ng-repeat="group in getPage()">
-        <td><a href="#/vlangroups/{{group.id}}">{{group.name}}</a></td>
    <td>
+      <a href="#/vlangroups/{{group.id}}">{{group.name}}</a>
+    </td>
+    <td>
+      <div class="well well-small">
        <span class="label label-info" ng-repeat="vlan in group.vlans">
          <a href="#/vlans/{{vlan.id}}">{{vlan.name}}</a>
        </span>
+      </div>
    </td>
    <td style="width: 200px;">{{group.description}}</td>
    <td>{{group.owner.name}}</td>