app/templates/inventory/attributes.html

 {% extends "base-fluid.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Attributes - CSEntry{% endblock %}
+{% block title %}Attributes{% endblock %}
 
 {% block main %}
   <ul class="nav nav-tabs">

app/templates/inventory/attributes_favorites.html

 {% extends "inventory/attributes.html" %}
 
-{% block title %}Attributes favorites - CSEntry{% endblock %}
+{% block title %}Attributes favorites{% endblock %}
 
 {% block attributes_main %}
   <table id="attributes_favorites_table" class="table table-bordered table-hover table-sm" cellspacing="0" width="100%">

app/templates/inventory/comment_item.html

 {% extends "inventory/view_item.html" %}
+{% from "_helpers.html" import item_comment_form %}
 
   {% block comment_item %}
-  <form id="CommentForm" method="POST">
-    {{ form.hidden_tag() }}
-    <div class="form-group">
-      {{ form.body.label() }}
-      {{ form.body(class_="form-control", rows=5, required=True) }}
-      <small class="form-text text-muted">Styling with Markdown is supported using
-        <a href="https://github.com/showdownjs/showdown/wiki/Showdown's-Markdown-syntax" target="_blank">Showdown</a>.
-        A preview is visible below.
-      </small>
-    </div>
-    <div class="card">
-      <div class="card-header">
-        Comment preview
-      </div>
-      <div class="card-body" id="commentLivePreview"></div>
-    </div>
-    <br>
-    <button type="submit" class="btn btn-primary">Submit</button>
-    <a class="btn btn-danger" href="{{ url_for('inventory.view_item', ics_id=item.ics_id) }}">Cancel</a>
-  </form>
+  {{ item_comment_form(form, item) }}
   {% endblock %}

app/templates/inventory/create_item.html

 {% extends "inventory/items.html" %}
 {% from "_helpers.html" import render_field, figure %}
 
-{% block title %}Register Item - CSEntry{% endblock %}
+{% block title %}Register Item{% endblock %}
 
 {% block items_main %}
   <div class="row">

app/templates/inventory/edit_comment.html

+{% extends "inventory/view_item.html" %}
+{% from "_helpers.html" import item_comment_form, item_comment %}
+
+  {% block comments %}
+  {% for comment in item.comments | sort(attribute='created_at') %}
+    {% if comment.id == comment_id %}
+      {{ item_comment_form(form, item) }}
+    {% else %}
+      {{ item_comment(comment) }}
+    {% endif %}
+  {% endfor %}
+  {% endblock %}
+
+  {% block comment_item %}
+  {% endblock %}

app/templates/inventory/edit_item.html

 {% extends "inventory/items.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Edit Item - CSEntry{% endblock %}
+{% block title %}Edit {{ form.ics_id.data }} item{% endblock %}
 
 {% block items_nav %}
     <li class="nav-item">

app/templates/inventory/items.html

 {% extends "base-fluid.html" %}
 {% from "_helpers.html" import is_active, waiting_for %}
 
-{% block title %}Items - CSEntry{% endblock %}
+{% block title %}Items{% endblock %}
 
 {% block main %}
   {{ waiting_for("Please wait while your file is being prepared...", "downloadExcelModal") }}
@@ -22,7 +22,6 @@
   <table id="items_table" class="table table-bordered table-hover table-sm" style="width:100%">
     <thead>
       <tr>
-        <th>Id</th>
         <th>ICS id</th>
         <th>Created</th>
         <th>Updated</th>

app/templates/inventory/scanner.html

 {% extends "base-fluid.html" %}
 {% from "_helpers.html" import figure %}
 
-{% block title %}Scanner - CSEntry{% endblock %}
+{% block title %}Scanner{% endblock %}
 
 {% block main %}
   <div class="col-md-8">

app/templates/inventory/view_item.html

 {% extends "inventory/items.html" %}
-{% from "_helpers.html" import link_to_item, link_to_items, format_datetime, link_to_host %}
+{% from "_helpers.html" import link_to_item, link_to_items, format_datetime, link_to_host, item_comment %}
 
-{% block title %}View Item - CSEntry{% endblock %}
+{% block title %}View {{ item.ics_id }} item{% endblock %}
 
 {% block items_nav %}
     <li class="nav-item">
@@ -62,14 +62,12 @@
   </dl>
 
   <h4>Comments</h4>
+  {% block comments %}
   {% for comment in item.comments | sort(attribute='created_at') %}
-  <div class="card border-light mb-3">
-    <div class="card-header">
-      {{ comment.user }} commented on {{ format_datetime(comment.created_at) }}
-    </div>
-    <div class="card-body item-comment">{{ comment.body }}</div>
-  </div>
+    {{ item_comment(comment) }}
   {% endfor %}
+  {% endblock %}
+
   {% block comment_item %}
   <a class="btn btn-primary" href="{{ url_for('inventory.comment_item', ics_id=item.ics_id) }}#body">Comment</a>
   {% endblock %}

app/templates/network/create_domain.html

 {% extends "network/domains.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Register Domain - CSEntry{% endblock %}
+{% block title %}Register Domain{% endblock %}
 
 {% block domains_main %}
   <form id="DomainForm" method="POST">

app/templates/network/create_group.html

 {% extends "network/groups.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Register Ansible group - CSEntry{% endblock %}
+{% block title %}Register Ansible group{% endblock %}
 
 {% block groups_main %}
   <form id="groupForm" method="POST">
@@ -9,8 +9,8 @@
     {{ render_field(form.name, class_="text-lowercase") }}
     {{ render_field(form.vars) }}
     {{ render_field(form.type) }}
-    {{ render_field(form.children, class_="selectpicker") }}
-    {{ render_field(form.hosts, class_="selectpicker") }}
+    {{ render_field(form.children, class_="selectize-default") }}
+    {{ render_field(form.hosts, class_="selectize-default") }}
     <div class="form-group row">
       <div class="col-sm-10">
         <button type="submit" class="btn btn-primary">Submit</button>

app/templates/network/create_host.html

 {% extends "network/hosts.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Register Host - CSEntry{% endblock %}
+{% block title %}Register Host{% endblock %}
 
 {% block hosts_main %}
   <form id="hostForm" method="POST">
     {{ form.hidden_tag() }}
-    {{ form.interface_name(type="hidden") }}
     {{ render_field(form.name, class_="text-lowercase") }}
-    {{ render_field(form.device_type_id) }}
+    {{ render_field(form.device_type_id, class_="selectize-default") }}
+    {{ render_field(form.is_ioc) }}
     {{ render_field(form.description) }}
-    {{ render_field(form.network_id) }}
+    {{ render_field(form.network_id, class_="selectize-default") }}
     {{ render_field(form.ip) }}
     {{ render_field(form.random_mac) }}
-    {{ render_field(form.mac_address) }}
+    {{ render_field(form.mac) }}
     {{ render_field(form.cnames_string) }}
-    {{ render_field(form.tags, class_="selectpicker") }}
     {{ render_field(form.ansible_vars) }}
-    {{ render_field(form.ansible_groups, class_="selectpicker") }}
+    {{ render_field(form.ansible_groups, class_="selectize-default") }}
     <div class="form-group row">
       <div class="col-sm-10">
         <button type="submit" class="btn btn-primary">Submit</button>

app/templates/network/create_interface.html

 {% extends "network/hosts.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Register Interface - CSEntry{% endblock %}
+{% block title %}Add Interface to {{ hostname }}{% endblock %}
 
 {% block hosts_nav %}
     <li class="nav-item">
@@ -21,12 +21,12 @@
     {{ form.hidden_tag() }}
     {{ render_field(form.host_id, disabled=True) }}
     {{ render_field(form.interface_name, class_="text-lowercase") }}
-    {{ render_field(form.network_id) }}
+    {{ render_field(form.interface_description) }}
+    {{ render_field(form.network_id, class_="selectize-default") }}
     {{ render_field(form.ip) }}
     {{ render_field(form.random_mac) }}
-    {{ render_field(form.mac_address) }}
+    {{ render_field(form.mac) }}
     {{ render_field(form.cnames_string) }}
-    {{ render_field(form.tags, class_="selectpicker") }}
     <div class="form-group row">
       <div class="col-sm-10">
         <button type="submit" class="btn btn-primary">Submit</button>

app/templates/network/create_network.html

 {% extends "network/networks.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Register Network - CSEntry{% endblock %}
+{% block title %}Register Network{% endblock %}
 
 {% block networks_main %}
   <form id="networkForm" method="POST">
@@ -14,8 +14,10 @@
     {{ render_field(form.address) }}
     {{ render_field(form.first_ip) }}
     {{ render_field(form.last_ip) }}
+    {{ render_field(form.gateway) }}
     {{ render_field(form.domain_id) }}
     {{ render_field(form.admin_only) }}
+    {{ render_field(form.sensitive) }}
     <div class="form-group row">
       <div class="col-sm-10">
         <button type="submit" class="btn btn-primary">Submit</button>

app/templates/network/create_scope.html

 {% extends "network/scopes.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Register Network Scope - CSEntry{% endblock %}
+{% block title %}Register Network Scope{% endblock %}
 
 {% block scopes_main %}
   <form id="scopeForm" method="POST">

app/templates/network/domains.html

 {% extends "base-fluid.html" %}
 {% from "_helpers.html" import is_active %}
 
-{% block title %}Domains - CSEntry{% endblock %}
+{% block title %}Domains{% endblock %}
 
 {% block main %}
   {% set path = request.path %}
@@ -24,6 +24,13 @@
         <th>Name</th>
       </tr>
     </thead>
+    <tbody>
+      {% for domain in domains %}
+        <tr>
+          <td>{{ domain.name }}</td>
+        </tr>
+      {% endfor %}
+    </tbody>
   </table>
   {%- endblock %}
 {%- endblock %}

app/templates/network/edit_group.html

 {% extends "network/groups.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Edit Ansible group - CSEntry{% endblock %}
+{% block title %}Edit {{ form.name.data }} Ansible group{% endblock %}
 
 {% block groups_nav %}
     <li class="nav-item">
@@ -18,8 +18,8 @@
     {{ render_field(form.name, class_="text-lowercase") }}
     {{ render_field(form.vars) }}
     {{ render_field(form.type) }}
-    {{ render_field(form.children, class_="selectpicker") }}
-    {{ render_field(form.hosts, class_="selectpicker") }}
+    {{ render_field(form.children, class_="selectize-default") }}
+    {{ render_field(form.hosts, class_="selectize-default") }}
     <div class="form-group row">
       <div class="col-sm-10">
         <button type="submit" class="btn btn-primary">Submit</button>

app/templates/network/edit_host.html

 {% extends "network/hosts.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Edit Host - CSEntry{% endblock %}
+{% block title %}Edit {{ form.name.data }} host{% endblock %}
 
 {% block hosts_nav %}
     <li class="nav-item">
@@ -19,10 +19,11 @@
   <form id="editHostForm" method="POST">
     {{ form.hidden_tag() }}
     {{ render_field(form.name, class_="text-lowercase") }}
-    {{ render_field(form.device_type_id) }}
+    {{ render_field(form.device_type_id, class_="selectize-default") }}
+    {{ render_field(form.is_ioc) }}
     {{ render_field(form.description) }}
     {{ render_field(form.ansible_vars) }}
-    {{ render_field(form.ansible_groups, class_="selectpicker") }}
+    {{ render_field(form.ansible_groups, class_="selectize-default") }}
     <div class="form-group row">
       <div class="col-sm-10">
         <button type="submit" class="btn btn-primary">Submit</button>

app/templates/network/edit_interface.html

 {% extends "network/hosts.html" %}
 {% from "_helpers.html" import render_field %}
 
-{% block title %}Edit Interface - CSEntry{% endblock %}
+{% block title %}Edit {{ form.interface_name.data }} interface{% endblock %}
 
 {% block hosts_nav %}
     <li class="nav-item">
@@ -24,11 +24,11 @@
     {{ form.hidden_tag() }}
     {{ render_field(form.host_id, disabled=True) }}
     {{ render_field(form.interface_name, class_="text-lowercase") }}
-    {{ render_field(form.network_id) }}
+    {{ render_field(form.interface_description) }}
+    {{ render_field(form.network_id, class_="selectize-default") }}
     {{ render_field(form.ip) }}
-    {{ render_field(form.mac_address) }}
+    {{ render_field(form.mac) }}
     {{ render_field(form.cnames_string) }}
-    {{ render_field(form.tags, class_="selectpicker") }}
     <div class="form-group row">
       <div class="col-sm-10">
         <button type="submit" class="btn btn-primary">Submit</button>

app/templates/network/edit_network.html

+{% extends "network/networks.html" %}
+{% from "_helpers.html" import render_field %}
+
+{% block title %}Edit {{ form.vlan_name.data }} network{% endblock %}
+
+{% block networks_nav %}
+    <li class="nav-item">
+      <a class="nav-link" href="{{ url_for('network.view_network', vlan_name=form.vlan_name.data) }}">View network</a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link active" href="{{ url_for('network.edit_network', vlan_name=form.vlan_name.data) }}">Edit network</a>
+    </li>
+{% endblock %}
+
+{% block networks_main %}
+  <form id="editNetworkForm" method="POST">
+    {{ form.hidden_tag() }}
+    {{ render_field(form.vlan_name) }}
+    {{ render_field(form.vlan_id) }}
+    {{ render_field(form.description) }}
+    {{ render_field(form.address) }}
+    {{ render_field(form.first_ip) }}
+    {{ render_field(form.last_ip) }}
+    {{ render_field(form.gateway) }}
+    {{ render_field(form.domain_id) }}
+    {{ render_field(form.admin_only) }}
+    {{ render_field(form.sensitive) }}
+    <div class="form-group row">
+      <div class="col-sm-10">
+        <button type="submit" class="btn btn-primary">Submit</button>
+      </div>
+    </div>
+  </form>
+{%- endblock %}