NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Prettied things up a bit

Browse Source
This commit is contained in:
Jeremy Stretch 2017-03-29 16:45:25 -04:00
parent a5dc91c175
commit 66615f1a96
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/netbox/views.py
View File

@ -199,7 +199,6 @@ class SearchView(View):
}) })
class APIRootView(APIView): class APIRootView(APIView):
_ignore_model_permissions = True _ignore_model_permissions = True
exclude_from_schema = True exclude_from_schema = True

3
netbox/project-static/css/base.css
View File

@ -92,6 +92,9 @@ tfoot td {
table.attr-table td:nth-child(1) { table.attr-table td:nth-child(1) {
width: 25%; width: 25%;
} }
.table-headings th {
background-color: #f5f5f5;
}
/* Paginator */ /* Paginator */
div.paginator { div.paginator {

5
netbox/templates/panel_table.html
View File

@ -20,6 +20,7 @@
{% endblock %} {% endblock %}
{% block pagination %} {% block pagination %}
{% include 'paginator.html' %} {% if not hide_paginator %}
{% include 'paginator.html' %}
{% endif %}
{% endblock pagination %} {% endblock pagination %}

14
netbox/templates/search.html
View File

@ -1,4 +1,5 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load helpers %}
{% load form_helpers %} {% load form_helpers %}
{% block title %}Search{% endblock %} {% block title %}Search{% endblock %}
@ -10,12 +11,12 @@
<div class="row"> <div class="row">
<div class="col-md-10"> <div class="col-md-10">
{% for obj_type in results %} {% for obj_type in results %}
<h3 id="{{ obj_type.name }}">{{ obj_type.name }}</h3> <h3 id="{{ obj_type.name|lower }}">{{ obj_type.name|bettertitle }}</h3>
{% include 'table.html' with table=obj_type.table hide_paginator=True %} {% include 'panel_table.html' with table=obj_type.table hide_paginator=True %}
{% if obj_type.table.page.has_next %} {% if obj_type.table.page.has_next %}
<a href="{{ obj_type.url }}" class="btn btn-primary pull-right"> <a href="{{ obj_type.url }}" class="btn btn-primary pull-right">
<span class="fa fa-search" aria-hidden="true"></span> <span class="fa fa-arrow-right" aria-hidden="true"></span>
All {{ obj_type.table.page.paginator.count }} results See all {{ obj_type.table.page.paginator.count }} results
</a> </a>
{% endif %} {% endif %}
<div class="clearfix"></div> <div class="clearfix"></div>
@ -28,8 +29,8 @@
</div> </div>
<div class="list-group"> <div class="list-group">
{% for obj_type in results %} {% for obj_type in results %}
<a href="#{{ obj_type.name }}" class="list-group-item"> <a href="#{{ obj_type.name|lower }}" class="list-group-item">
{{ obj_type.name }} {{ obj_type.name|bettertitle }}
<span class="badge">{{ obj_type.table.page.paginator.count }}</span> <span class="badge">{{ obj_type.table.page.paginator.count }}</span>
</a> </a>
{% endfor %} {% endfor %}
@ -41,7 +42,6 @@
<h3 class="text-muted text-center">No results found</h3> <h3 class="text-muted text-center">No results found</h3>
{% endif %} {% endif %}
{% else %} {% else %}
{# Larger search form #}
<div class="row" style="margin-top: 150px;"> <div class="row" style="margin-top: 150px;">
<div class="col-sm-4 col-sm-offset-4"> <div class="col-sm-4 col-sm-offset-4">
<form action="{% url 'search' %}" method="get" class="form form-horizontal"> <form action="{% url 'search' %}" method="get" class="form form-horizontal">

2
netbox/utilities/tables.py
View File

@ -26,7 +26,7 @@ class SearchTable(tables.Table):
""" """
class Meta: class Meta:
attrs = { attrs = {
'class': 'table table-hover', 'class': 'table table-hover table-headings',
} }
orderable = False orderable = False

7
netbox/utilities/templatetags/helpers.py
View File

@ -51,6 +51,13 @@ def startswith(value, arg):
""" """
return str(value).startswith(arg) return str(value).startswith(arg)
@register.filter()
def bettertitle(value):
"""
Alternative to the builtin title(); uppercases words without replacing letters that are already uppercase.
"""
return ' '.join([w[0].upper() + w[1:] for w in value.split()])
# #
# Tags # Tags