135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix improper use of bootstrap table class

Browse Source
This commit is contained in:
Oliver Gorwits
2013-05-11 16:51:28 +01:00
parent cd5b83f71e
commit dd6947f38d
16 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -25,6 +25,7 @@
* Partial Name in Port search now working * Partial Name in Port search now working
* Add unique constraints to topology table * Add unique constraints to topology table
* Handle whitespace ahead of OUI data * Handle whitespace ahead of OUI data
* Wasn't using Bootstrap table class properly
2.007000_001 - 2013-03-17 2.007000_001 - 2013-03-17

9
Netdisco/share/public/css/netdisco.css
View File

@@ -87,15 +87,18 @@ body {
.nd_editable-cell > .nd_editable-cell-content { .nd_editable-cell > .nd_editable-cell-content {
margin-left: 18px; margin-left: 18px;
} }
.table .nd_nudge-for-icon {
padding-left: 25px;
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* styles to position table cell content */ /* styles to position table cell content */
td { .table td {
vertical-align: baseline; vertical-align: baseline;
} }
.nd_center-cell { .table .nd_center-cell {
text-align: center; text-align: center;
} }
@@ -418,7 +421,7 @@ form .clearfix.success input {
#nd_legend i { #nd_legend i {
width: 9px; width: 9px;
} }
.table-bordered i { .table i {
width: 9px; width: 9px;
} }

2
Netdisco/share/views/ajax/admintask/jobqueue.tt
View File

@@ -1,4 +1,4 @@
<table class="table table-bordered table-condensed table-striped"> <table class="table table-bordered table-condensed">
<thead> <thead>
<tr> <tr>
<th class="nd_center-cell">Entered</th> <th class="nd_center-cell">Entered</th>

2
Netdisco/share/views/ajax/admintask/pseudodevice.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
<th class="nd_center-cell">Device Name</th> <th class="nd_center-cell">Device Name</th>

2
Netdisco/share/views/ajax/admintask/topology.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
<th class="nd_center-cell">Left Device</th> <th class="nd_center-cell">Left Device</th>

2
Netdisco/share/views/ajax/device/addresses.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-condensed table-striped">
<thead> <thead>
<tr> <tr>
<th>Address</th> <th>Address</th>

2
Netdisco/share/views/ajax/device/details.tt
View File

@@ -1,4 +1,4 @@
<table class="table-condensed table-striped"> <table class="table table-condensed table-striped">
</tbody> </tbody>
<tr> <tr>
<td>System Name</td> <td>System Name</td>

37
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
<th></th> <th></th>
@@ -6,7 +6,10 @@
[% NEXT IF item.name == 'c_admin' %] [% NEXT IF item.name == 'c_admin' %]
[% NEXT IF item.name == 'c_nodes' AND params.c_nodes AND params.c_neighbors %] [% NEXT IF item.name == 'c_nodes' AND params.c_nodes AND params.c_neighbors %]
[% NEXT UNLESS params.${item.name} %] [% NEXT UNLESS params.${item.name} %]
<th[% ' class="nd_center-cell"' IF NOT loop.first %]>[% item.label | html_entity %]</th> <th[% ' class="nd_nudge-for-icon"' IF
(vars.user.port_control AND params.c_admin AND (item.name == 'c_port' OR item.name == 'c_name')) %]>
[% item.label | html_entity %]
</th>
[% END %] [% END %]
</tr> </tr>
</thead> </thead>
@@ -50,32 +53,32 @@
[% END %] [% END %]
[% IF params.c_descr %] [% IF params.c_descr %]
<td nowrap class="nd_center-cell">[% row.descr | html_entity %]</td> <td nowrap>[% row.descr | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_type %] [% IF params.c_type %]
<td class="nd_center-cell">[% row.type | html_entity %]</td> <td>[% row.type | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_duplex %] [% IF params.c_duplex %]
<td class="nd_center-cell"> <td>
[% IF row.up == 'up' AND row.duplex %] [% IF row.up == 'up' AND row.duplex %]
[% row.duplex_admin | html_entity %] / [% row.duplex | html_entity %] [% row.duplex_admin.ucfirst | html_entity %] / [% row.duplex.ucfirst | html_entity %]
[% END %] [% END %]
</td> </td>
[% END %] [% END %]
[% IF params.c_lastchange %] [% IF params.c_lastchange %]
<td class="nd_center-cell">[% row.lastchange_stamp | html_entity %]</td> <td>[% row.lastchange_stamp | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_name %] [% IF params.c_name %]
[% IF vars.user.port_control AND params.c_admin %] [% IF vars.user.port_control AND params.c_admin %]
<td nowrap class="nd_center-cell nd_editable-cell" contenteditable="true" <td nowrap class="nd_editable-cell" contenteditable="true"
data-field="c_name" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]"> data-field="c_name" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
<i class="icon-edit nd_edit-icon"></i> <i class="icon-edit nd_edit-icon"></i>
[% ELSE %] [% ELSE %]
<td nowrap class="nd_center-cell"> <td nowrap>
[% END %] [% END %]
<div class="nd_editable-cell-content"> <div class="nd_editable-cell-content">
[% row.name | html_entity %] [% row.name | html_entity %]
@@ -84,20 +87,20 @@
[% END %] [% END %]
[% IF params.c_speed %] [% IF params.c_speed %]
<td class="nd_center-cell">[% row.speed | html_entity %]</td> <td>[% row.speed | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_mac %] [% IF params.c_mac %]
<td class="nd_center-cell">[% row.mac | html_entity %]</td> <td>[% row.mac | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_mtu %] [% IF params.c_mtu %]
<td class="nd_center-cell">[% row.mtu | html_entity %]</td> <td>[% row.mtu | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_vlan %] [% IF params.c_vlan %]
[% IF vars.user.port_control AND params.c_admin %] [% IF vars.user.port_control AND params.c_admin %]
<td class="nd_center-cell nd_editable-cell" contenteditable="true" <td class="nd_editable-cell" contenteditable="true"
data-field="c_vlan" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]"> data-field="c_vlan" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
<i class="icon-edit nd_edit-icon"></i> <i class="icon-edit nd_edit-icon"></i>
<div class="nd_editable-cell-content"> <div class="nd_editable-cell-content">
@@ -105,7 +108,7 @@
</div> </div>
</td> </td>
[% ELSE %] [% ELSE %]
<td class="nd_center-cell"> <td>
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% uri_for('/search') %]?tab=vlan&q=[% row.vlan | uri %]"> href="[% uri_for('/search') %]?tab=vlan&q=[% row.vlan | uri %]">
[% row.vlan | html_entity %]</a> [% row.vlan | html_entity %]</a>
@@ -215,12 +218,12 @@
[% END %] [% END %]
[% IF params.c_stp %] [% IF params.c_stp %]
<td class="nd_center-cell">[% row.stp | html_entity %]</td> <td>[% row.stp | html_entity %]</td>
[% END %] [% END %]
[% IF params.c_up %] [% IF params.c_up %]
<td class="nd_center-cell"> <td>
[% row.up_admin | html_entity %] / [% row.up | html_entity %] [% row.up_admin.ucfirst | html_entity %] / [% row.up.ucfirst | html_entity %]
</td> </td>
[% END %] [% END %]
</tr> </tr>

2
Netdisco/share/views/ajax/report/duplexmismatch.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-condensed table-striped">
<thead> <thead>
<tr> <tr>
<th class="nd_center-cell">Left Device</th> <th class="nd_center-cell">Left Device</th>

2
Netdisco/share/views/ajax/search/device.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-condensed table-striped">
<thead> <thead>
<tr> <tr>
<th>Device</th> <th>Device</th>

2
Netdisco/share/views/ajax/search/node_by_ip.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>MAC</th> <th>MAC</th>

2
Netdisco/share/views/ajax/search/node_by_mac.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>MAC</th> <th>MAC</th>

2
Netdisco/share/views/ajax/search/port.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-condensed table-striped">
<thead> <thead>
<tr> <tr>
<th>Description</th> <th>Description</th>

2
Netdisco/share/views/ajax/search/vlan.tt
View File

@@ -1,4 +1,4 @@
<table class="table-bordered table-condensed table-striped"> <table class="table table-bordered table-condensed table-striped">
<thead> <thead>
<tr> <tr>
<th>Vlan</th> <th>Vlan</th>

4
Netdisco/share/views/inventory.tt
View File

@@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="span6"> <div class="span6">
<h3 class="nd_inventory-table-head">By Platform</h3> <h3 class="nd_inventory-table-head">By Platform</h3>
<table class="table table-condensed"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th>Vendor</th> <th>Vendor</th>
@@ -33,7 +33,7 @@
</div> </div>
<div class="span6"> <div class="span6">
<h3 class="nd_inventory-table-head">By Software Release</h3> <h3 class="nd_inventory-table-head">By Software Release</h3>
<table class="table table-condensed"> <table class="table table-condensed table-hover">
<thead> <thead>
<tr> <tr>
<th>OS</th> <th>OS</th>

1
TODO
View File

@@ -1,7 +1,6 @@
FRONTEND FRONTEND
======== ========
* view job queue
* view logs with colour * view logs with colour
* moar reports * moar reports