NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #596 from digitalocean/bugfix-591

Browse Source 
Fixes #591: Correct display of device type component creation buttons
This commit is contained in:
Jeremy Stretch 2016-10-04 10:22:04 -04:00 committed by GitHub
commit 7055292803
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/netbox/settings.py
View File

@ -12,7 +12,7 @@ except ImportError:
"the documentation.") "the documentation.")
VERSION = '1.6.2' VERSION = '1.6.2-r1'
# Import local configuration # Import local configuration
for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']: for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']:

19
netbox/templates/dcim/inc/devicetype_component_table.html
View File

@ -15,19 +15,20 @@
{% endif %} {% endif %}
</div> </div>
{% render_table table 'table.html' %} {% render_table table 'table.html' %}
{% if table.rows %} <div class="panel-footer">
<div class="panel-footer"> {% if table.rows %}
<button type="submit" class="btn btn-xs btn-danger"> <button type="submit" class="btn btn-xs btn-danger">
<span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete Selected <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete Selected
</button> </button>
<div class="pull-right"> {% endif %}
<a href="{% url add_url pk=devicetype.pk %}{{ add_url_extra }}" class="btn btn-primary btn-xs"> <div class="pull-right">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> <a href="{% url add_url pk=devicetype.pk %}{{ add_url_extra }}" class="btn btn-primary btn-xs">
Add {{ title }} <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
</a> Add {{ title }}
</div> </a>
</div> </div>
{% endif %} <div class="clearfix"></div>
</div>
</div> </div>
</form> </form>
{% else %} {% else %}