From 298ac1ba7a19ce4dadbd7d6bf857dbb1fc61aaa9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 9 Dec 2016 16:23:11 -0500 Subject: [PATCH] Widened page layout; improved mobile rendering --- netbox/project-static/css/base.css | 11 ++- netbox/templates/circuits/circuit.html | 6 +- netbox/templates/circuits/provider.html | 6 +- netbox/templates/dcim/device.html | 5 +- netbox/templates/dcim/inc/_device_header.html | 5 +- netbox/templates/dcim/rack.html | 6 +- netbox/templates/dcim/site.html | 6 +- netbox/templates/home.html | 14 +-- netbox/templates/ipam/aggregate.html | 6 +- netbox/templates/ipam/inc/prefix_header.html | 5 +- netbox/templates/ipam/ipaddress.html | 6 +- netbox/templates/ipam/prefix.html | 1 - netbox/templates/ipam/vlan.html | 6 +- netbox/templates/ipam/vrf.html | 6 +- netbox/templates/paginator.html | 10 +- netbox/templates/secrets/secret.html | 2 +- netbox/templates/tenancy/tenant.html | 6 +- netbox/templates/users/_user.html | 22 +++++ netbox/templates/users/change_password.html | 58 ++++------- netbox/templates/users/inc/profile_nav.html | 6 -- netbox/templates/users/profile.html | 40 +++----- netbox/templates/users/recent_activity.html | 45 ++++----- netbox/templates/users/userkey.html | 71 ++++++-------- netbox/templates/users/userkey_edit.html | 95 ++++++++----------- netbox/templates/utilities/obj_table.html | 1 + netbox/users/views.py | 7 +- 26 files changed, 205 insertions(+), 247 deletions(-) create mode 100644 netbox/templates/users/_user.html delete mode 100644 netbox/templates/users/inc/profile_nav.html diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index ff9eb98c1..8503f465e 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -13,7 +13,7 @@ body { } .container { width: auto; - max-width: 1340px; + max-width: 1600px; } .wrapper { min-height: 100%; @@ -35,7 +35,8 @@ footer p { margin: 20px 0; } -@media (max-width: 1200px) { +/* Collapse the nav menu on displays less than 1200px wide */ +@media (max-width: 1199px) { .navbar-header { float: none; } @@ -58,7 +59,7 @@ footer p { max-height: none; } .navbar-nav { - float: none!important; + float: none !important; margin-top: 7.5px; } .navbar-nav>li { @@ -90,8 +91,12 @@ tfoot td { } /* Paginator */ +div.paginator { + margin-bottom: 20px; +} nav ul.pagination { margin-top: 0; + margin-bottom: 8px !important; } /* Racks */ diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 5b9f8381f..1c2df3680 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -5,14 +5,14 @@ {% block content %}
-
+
  1. Circuits
  2. {{ circuit.provider }}
  3. {{ circuit.cid }}
-
+
@@ -40,6 +40,7 @@ {% endif %}

{{ circuit.provider }} - {{ circuit.cid }}

+{% include 'inc/created_updated.html' with obj=circuit %}
@@ -107,7 +108,6 @@ {% with circuit.get_custom_fields as custom_fields %} {% include 'inc/custom_fields_panel.html' %} {% endwith %} - {% include 'inc/created_updated.html' with obj=circuit %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index c59858626..d7f945ab2 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -6,13 +6,13 @@ {% block content %}
-
+
  1. Providers
  2. {{ provider }}
-
+
@@ -46,6 +46,7 @@ {% endif %}

{{ provider }}

+{% include 'inc/created_updated.html' with obj=provider %}
@@ -120,7 +121,6 @@ {% endif %}
- {% include 'inc/created_updated.html' with obj=provider %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 785938970..f3158b98c 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -8,7 +8,7 @@ {% block content %} {% include 'dcim/inc/_device_header.html' with active_tab='info' %}
-
+
Device @@ -301,9 +301,8 @@
None found
{% endif %}
- {% include 'inc/created_updated.html' with obj=device %}
-
+
{% if device_bays or device.device_type.is_parent_device %} {% if perms.dcim.delete_devicebay %} diff --git a/netbox/templates/dcim/inc/_device_header.html b/netbox/templates/dcim/inc/_device_header.html index 7b0b69d61..74b453e1d 100644 --- a/netbox/templates/dcim/inc/_device_header.html +++ b/netbox/templates/dcim/inc/_device_header.html @@ -1,5 +1,5 @@
-
+
{% if device.rack %}
  1. {{ device.rack.site }}
    2. @@ -13,7 +13,7 @@
{% endif %}
-
+
@@ -41,6 +41,7 @@ {% endif %}

{{ device }}

+{% include 'inc/created_updated.html' with obj=device %}
    diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index f2bafe43b..6d6fe0020 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -6,14 +6,14 @@ {% block content %}
    -
    +
    1. Racks
    2. {{ rack.site }}
    3. {{ rack }}
    -
    +
    @@ -53,6 +53,7 @@ {% endif %}

    Rack {{ rack.name }}

    +{% include 'inc/created_updated.html' with obj=rack %}
    @@ -188,7 +189,6 @@ {% endif %}
    - {% include 'inc/created_updated.html' with obj=rack %}
    diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index ccf2c9673..3cf9e9f43 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -7,13 +7,13 @@ {% block content %}
    -
    +
    1. Sites
    2. {{ site }}
    -
    +
    @@ -47,6 +47,7 @@ {% endif %}

    {{ site.name }}

    +{% include 'inc/created_updated.html' with obj=site %}
    @@ -126,7 +127,6 @@ {% endif %}
    - {% include 'inc/created_updated.html' with obj=site %}
    diff --git a/netbox/templates/home.html b/netbox/templates/home.html index f502bfa11..043526332 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -3,7 +3,7 @@ {% block content %}
    -
    +
    @@ -17,7 +17,7 @@

    -
    +
    @@ -31,7 +31,7 @@

    -
    +
    @@ -45,7 +45,7 @@

    -
    +
    @@ -61,7 +61,7 @@
    -
    +
    Organization @@ -106,7 +106,7 @@
    -
    +
    IPAM @@ -157,7 +157,7 @@
    -
    +
    {% if perms.secrets %}
    diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index d95494c67..b15c18808 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -5,14 +5,14 @@ {% block content %}
    -
    +
    1. Aggregates
    2. {{ aggregate.rir }}
    3. {{ aggregate }}
    -
    +
    @@ -40,6 +40,7 @@ {% endif %}

    {{ aggregate }}

    +{% include 'inc/created_updated.html' with obj=aggregate %}
    @@ -79,7 +80,6 @@
    - {% include 'inc/created_updated.html' with obj=aggregate %}
    {% with aggregate.get_custom_fields as custom_fields %} diff --git a/netbox/templates/ipam/inc/prefix_header.html b/netbox/templates/ipam/inc/prefix_header.html index 105c41a0f..6deb10e57 100644 --- a/netbox/templates/ipam/inc/prefix_header.html +++ b/netbox/templates/ipam/inc/prefix_header.html @@ -1,5 +1,5 @@
    -
    +
    1. Prefixes
      2. {% if prefix.vrf %} @@ -8,7 +8,7 @@
    2. {{ prefix }}
    -
    +
    @@ -42,6 +42,7 @@ {% endif %}

    {{ prefix }}

    +{% include 'inc/created_updated.html' with obj=prefix %}
      diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index 3135b60be..a998f3238 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -5,7 +5,7 @@ {% block content %}
      -
      +
      1. IP Addresses
        2. {% if ipaddress.vrf %} @@ -14,7 +14,7 @@
      2. {{ ipaddress }}
      -
      +
      @@ -42,6 +42,7 @@ {% endif %}

      {{ ipaddress }}

      +{% include 'inc/created_updated.html' with obj=ipaddress %}
      @@ -136,7 +137,6 @@ {% with ipaddress.get_custom_fields as custom_fields %} {% include 'inc/custom_fields_panel.html' %} {% endwith %} - {% include 'inc/created_updated.html' with obj=ipaddress %}
      {% with heading='Parent Prefixes' %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 89f06bb47..e8ce68090 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -104,7 +104,6 @@ {% with prefix.get_custom_fields as custom_fields %} {% include 'inc/custom_fields_panel.html' %} {% endwith %} - {% include 'inc/created_updated.html' with obj=prefix %}
      diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index f25de0295..e8f645e46 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -5,7 +5,7 @@ {% block content %}
      -
      +
      1. VLANs
      2. {{ vlan.site }}
        3. @@ -15,7 +15,7 @@
      3. {{ vlan.name }} ({{ vlan.vid }})
      -
      +
      @@ -43,6 +43,7 @@ {% endif %}

      VLAN {{ vlan.display_name }}

      +{% include 'inc/created_updated.html' with obj=vlan %}
      @@ -113,7 +114,6 @@ {% with vlan.get_custom_fields as custom_fields %} {% include 'inc/custom_fields_panel.html' %} {% endwith %} - {% include 'inc/created_updated.html' with obj=vlan %}
      diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index dc8903418..f301e617b 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -5,13 +5,13 @@ {% block content %}
      -
      +
      1. VRFs
      2. {{ vrf }}
      -
      +
      @@ -39,6 +39,7 @@ {% endif %}

      {{ vrf }}

      +{% include 'inc/created_updated.html' with obj=vrf %}
      @@ -85,7 +86,6 @@ {% with vrf.get_custom_fields as custom_fields %} {% include 'inc/custom_fields_panel.html' %} {% endwith %} - {% include 'inc/created_updated.html' with obj=vrf %}
      diff --git a/netbox/templates/paginator.html b/netbox/templates/paginator.html index ea9bcd9dd..8fd5d8d5d 100644 --- a/netbox/templates/paginator.html +++ b/netbox/templates/paginator.html @@ -2,11 +2,10 @@ {# Custom pagination controls to render nicely with Bootstrap CSS. smart_pages requires EnhancedPaginator. #} -
      -
      +
      {% if table.paginator.num_pages > 1 %} {% endif %} -
      -
      +
      Showing {{ table.page.start_index }}-{{ table.page.end_index }} of {{ total }} {% if total == 1 %} {{ table.data.verbose_name }} @@ -32,4 +30,4 @@ {{ table.data.verbose_name_plural }} {% endif %}
      -
      \ No newline at end of file +
      diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html index 98007c2b9..391bc8868 100644 --- a/netbox/templates/secrets/secret.html +++ b/netbox/templates/secrets/secret.html @@ -29,6 +29,7 @@ {% endif %}

      {{ secret }}

      +{% include 'inc/created_updated.html' with obj=secret %}
      @@ -58,7 +59,6 @@
      - {% include 'inc/created_updated.html' with obj=secret %}
      {% if secret|decryptable_by:request.user %} diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index a1c9f0992..e241d1e57 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -5,7 +5,7 @@ {% block content %}
      -
      +
      1. Tenants
        2. {% if tenant.group %} @@ -14,7 +14,7 @@
      2. {{ tenant }}
      -
      +
      @@ -42,6 +42,7 @@ {% endif %}

      {{ tenant }}

      +{% include 'inc/created_updated.html' with obj=tenant %}
      @@ -86,7 +87,6 @@ {% endif %}
      - {% include 'inc/created_updated.html' with obj=tenant %}
      diff --git a/netbox/templates/users/_user.html b/netbox/templates/users/_user.html new file mode 100644 index 000000000..01978a59e --- /dev/null +++ b/netbox/templates/users/_user.html @@ -0,0 +1,22 @@ +{% extends '_base.html' %} + +{% block content %} +
      +
      +

      {% block title %}{% endblock %}

      +
      +
      +
      +
      + +
      +
      + {% block usercontent %}{% endblock %} +
      +
      +{% endblock %} diff --git a/netbox/templates/users/change_password.html b/netbox/templates/users/change_password.html index c8670faff..80528c981 100644 --- a/netbox/templates/users/change_password.html +++ b/netbox/templates/users/change_password.html @@ -1,46 +1,30 @@ -{% extends '_base.html' %} +{% extends 'users/_user.html' %} {% load form_helpers %} {% block title %}Change Password{% endblock %} -{% block content %} -
      -
      -

      Change Password

      -
      -
      -
      -
      - {% include 'users/inc/profile_nav.html' with active_tab="change_password" %} -
      -
      - - {% csrf_token %} - {% if form.non_field_errors %} -
      -
      Errors
      -
      - {{ form.non_field_errors }} -
      -
      - {% endif %} -
      -
      Password
      +{% block usercontent %} + + {% csrf_token %} + {% if form.non_field_errors %} +
      +
      Errors
      - {% render_field form.old_password %} - {% render_field form.new_password1 %} - {% render_field form.new_password2 %} + {{ form.non_field_errors }}
      -
      -
      -
      - - Cancel -
      -
      + {% endif %} +
      +
      Password
      +
      + {% render_field form.old_password %} + {% render_field form.new_password1 %} + {% render_field form.new_password2 %}
      - -
      -
      +
      +
      + + Cancel +
      + {% endblock %} diff --git a/netbox/templates/users/inc/profile_nav.html b/netbox/templates/users/inc/profile_nav.html deleted file mode 100644 index c5b1791bb..000000000 --- a/netbox/templates/users/inc/profile_nav.html +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/netbox/templates/users/profile.html b/netbox/templates/users/profile.html index 0c1d8ab71..7e7697991 100644 --- a/netbox/templates/users/profile.html +++ b/netbox/templates/users/profile.html @@ -1,31 +1,19 @@ -{% extends '_base.html' %} +{% extends 'users/_user.html' %} {% load helpers %} {% block title %}User Profile{% endblock %} -{% block content %} -
      -
      -

      User Profile

      -
      -
      -
      -
      - {% include 'users/inc/profile_nav.html' with active_tab="profile" %} -
      -
      - User login -
      {{ request.user.username }}
      - Full name -
      {{ request.user.first_name }} {{ request.user.last_name }}
      - Email -
      {{ request.user.email }}
      - Registered -
      {{ request.user.date_joined }}
      - Groups -
      {{ request.user.groups.all|join:', ' }}
      - Admin access -
      {{ request.user.is_staff|yesno|capfirst }}
      -
      -
      +{% block usercontent %} + User login +
      {{ request.user.username }}
      + Full name +
      {{ request.user.first_name }} {{ request.user.last_name }}
      + Email +
      {{ request.user.email }}
      + Registered +
      {{ request.user.date_joined }}
      + Groups +
      {{ request.user.groups.all|join:', ' }}
      + Admin access +
      {{ request.user.is_staff|yesno|capfirst }}
      {% endblock %} diff --git a/netbox/templates/users/recent_activity.html b/netbox/templates/users/recent_activity.html index 76f4ae2f4..92933d78b 100644 --- a/netbox/templates/users/recent_activity.html +++ b/netbox/templates/users/recent_activity.html @@ -1,35 +1,22 @@ -{% extends '_base.html' %} -{% load form_helpers %} +{% extends 'users/_user.html' %} {% block title %}Recent Activity{% endblock %} -{% block content %} -
      -
      -

      Recent Activity

      -
      -
      -
      -
      - {% include 'users/inc/profile_nav.html' with active_tab="recent_activity" %} -
      -
      - - +{% block usercontent %} +
      + + + + + + + + {% for action in recent_activity %} - - + + - - - {% for action in recent_activity %} - - - - - {% endfor %} - -
      TimeAction
      TimeAction{{ action.time|date:'SHORT_DATETIME_FORMAT' }}{{ action.icon }} {{ action.message|safe }}
      {{ action.time|date:'SHORT_DATETIME_FORMAT' }}{{ action.icon }} {{ action.message|safe }}
      -
      -
      + {% endfor %} + + {% endblock %} diff --git a/netbox/templates/users/userkey.html b/netbox/templates/users/userkey.html index 6318377c6..08c519c2d 100644 --- a/netbox/templates/users/userkey.html +++ b/netbox/templates/users/userkey.html @@ -1,46 +1,33 @@ -{% extends '_base.html' %} -{% load form_helpers %} +{% extends 'users/_user.html' %} {% block title %}User Key{% endblock %} -{% block content %} -
      -
      -

      User Key

      -
      -
      -
      -
      - {% include 'users/inc/profile_nav.html' with active_tab="userkey" %} -
      -
      - {% if userkey %} -

      - Your user key is: - {% if userkey.is_active %} - Active - {% else %} - Inactive - {% endif %} -

      -

      Your public key is below.

      - 
      {{ userkey.public_key }}
      -
      - - - Edit user key - -
      - {% include 'inc/created_updated.html' with obj=userkey %} - {% else %} -

      You don't have a user key on file.

      -

      - - - Create a User Key - -

      - {% endif %} -
      -
      +{% block usercontent %} + {% if userkey %} +

      + Your user key is: + {% if userkey.is_active %} + Active + {% else %} + Inactive + {% endif %} +

      +

      Your public key is below.

      + 
      {{ userkey.public_key }}
      +
      + + + Edit user key + +
      + {% include 'inc/created_updated.html' with obj=userkey %} + {% else %} +

      You don't have a user key on file.

      +

      + + + Create a User Key + +

      + {% endif %} {% endblock %} diff --git a/netbox/templates/users/userkey_edit.html b/netbox/templates/users/userkey_edit.html index 81b13800f..550ade4c2 100644 --- a/netbox/templates/users/userkey_edit.html +++ b/netbox/templates/users/userkey_edit.html @@ -1,71 +1,58 @@ -{% extends '_base.html' %} +{% extends 'users/_user.html' %} {% load static from staticfiles %} {% load form_helpers %} {% block title %}User Key{% endblock %} -{% block content %} -
      -
      -

      User Key

      -
      -
      -
      -
      - {% include 'users/inc/profile_nav.html' with active_tab="userkey" %} -
      -
      - {% if userkey.is_active %} - - {% endif %} -
      - {% csrf_token %} +{% block usercontent %} + {% if userkey.is_active %} + + {% endif %} + + {% csrf_token %} +
      + {% render_field form.public_key %} +
      +
      - {% render_field form.public_key %} +
      + +
      +
      + + Cancel +
      -
      -
      -
      - +
      + +