Skip to content

Commit

Permalink
1) Remove 'Default' everywhere
Browse files Browse the repository at this point in the history 
2) Remove colons at the end of filter names

git-svn-id: svn+ssh://repo.cacti.net/var/data/svnroot/cacti/cacti/branches/0.8.8@7644 860744bd-22fc-0310-8c96-e9fe5004b5ca
  • Loading branch information
@cigamit
cigamit committed Jan 1, 2015
1 parent e4eebf5 commit cc50b39
Show file tree
Hide file tree
Showing 24 changed files with 132 additions and 121 deletions.
4 changes: 2 additions & 2 deletions cdef.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,13 +490,13 @@ function cdef() {
<table cellpadding='2' cellspacing='0' border='0'>
<tr>
<td width='50'>
Search:
Search
</td>
<td>
<input id='filter' type='text' name='filter' size='25' value='<?php print htmlspecialchars(get_request_var_request('filter'));?>'>
</td>
<td>
CDEFs:
CDEFs
</td>
<td>
<select id='rows' name='rows' onChange='applyFilter()'>
Expand Down
4 changes: 2 additions & 2 deletions data_input.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,13 +521,13 @@ function data() {
<table cellpadding="2" cellspacing="0">
<tr class="noprint">
<td width="50">
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request('filter'));?>">
</td>
<td style='white-space:nowrap;'>
Input Methods:
Input Methods
</td>
<td>
<select id='rows' name="rows" onChange="applyFilter()">
Expand Down
4 changes: 2 additions & 2 deletions data_queries.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -817,13 +817,13 @@ function data_query() {
<table cellpadding="2" cellspacing="0">
<tr class="noprint">
<td width="50">
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request('filter'));?>">
</td>
<td style='white-space:nowrap;'>
Data Queries:
Data Queries
</td>
<td>
<select id='rows' name="rows" onChange="applyFilter()">
Expand Down
10 changes: 5 additions & 5 deletions data_sources.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@ function clearFilter() {
<table cellpadding="2" cellspacing="0" border="0">
<tr>
<td width="50">
Host:
Device
</td>
<td>
<select id='host_id' name="host_id" onChange="applyFilter()">
Expand All @@ -1155,7 +1155,7 @@ function clearFilter() {
</select>
</td>
<td width="50">
Template:
Template
</td>
<td>
<select id='template_id' name="template_id" onChange="applyFilter()">
Expand Down Expand Up @@ -1188,7 +1188,7 @@ function clearFilter() {
</tr>
<tr>
<td width="50">
Method:
Method
</td>
<td>
<select id='method_id' name="method_id" onChange="applyFilter()">
Expand All @@ -1212,7 +1212,7 @@ function clearFilter() {
</select>
</td>
<td style='white-space:nowrap;'>
Data Sources:
Data Sources
</td>
<td>
<select id='rows' name="rows" onChange="applyFilter()">
Expand All @@ -1230,7 +1230,7 @@ function clearFilter() {
<table cellpadding="2" cellspacing="0" border="0">
<tr>
<td width="50">
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request('filter'));?>">
Expand Down
4 changes: 2 additions & 2 deletions data_templates.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -663,13 +663,13 @@ function template() {
<table cellpadding="2" cellspacing="0">
<tr>
<td width="50">
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request('filter'));?>">
</td>
<td style='white-space: nowrap;'>
Data Templates:
Data Templates
</td>
<td>
<select id='rows' name="rows" onChange="applyFilter()">
Expand Down
4 changes: 2 additions & 2 deletions gprint_presets.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,13 @@ function gprint_presets() {
<table cellpadding='2' cellspacing='0' border='0'>
<tr>
<td width='50'>
Search:
Search
</td>
<td>
<input id='filter' type='text' name='filter' size='25' value='<?php print htmlspecialchars(get_request_var_request('filter'));?>'>
</td>
<td>
GPRINTs:
GPRINTs
</td>
<td>
<select id='rows' name='rows' onChange='applyFilter()'>
Expand Down
4 changes: 2 additions & 2 deletions graph_templates.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,13 +506,13 @@ function template() {
<table cellpadding="2" cellspacing="0" border="0">
<tr>
<td width="50">
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request("filter"));?>">
</td>
<td style='white-space:nowrap;'>
Graph Templates:
Graph Templates
</td>
<td>
<select id='rows' name="rows" onChange="applyFilter()">
Expand Down
13 changes: 5 additions & 8 deletions graph_view.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<table cellpadding='2' cellspacing='0'>
<tr class='noprint'>
<td width='55'>
Host:
Device
</td>
<td>
<select id='host_id' name='host_id' onChange='applyFilter()'>
Expand All @@ -264,7 +264,7 @@
</select>
</td>
<td>
Template:
Template
</td>
<td>
<select id='graph_template_id' name='graph_template_id' onChange='applyFilter()'>
Expand All @@ -282,11 +282,10 @@
</select>
</td>
<td>
Graphs:
Graphs
</td>
<td>
<select id='rows' name='rows' onChange='applyFilter()'>
<option value='-1'<?php if (get_request_var_request('rows') == '-1') {?> selected<?php }?>>Default</option>
<?php
if (sizeof($graphs_per_page) > 0) {
foreach ($graphs_per_page as $key => $value) {
Expand All @@ -297,11 +296,10 @@
</select>
</td>
<td>
Columns:
Columns
</td>
<td>
<select id='columns' name='columns' onChange='applyFilter()'>
<option value='-1'<?php if (get_request_var_request('columns') == '-1') {?> selected<?php }?>>Default</option>
<option value='1'<?php if (get_request_var_request('columns') == '1') {?> selected<?php }?>>1 Column</option>
<option value='2'<?php if (get_request_var_request('columns') == '2') {?> selected<?php }?>>2 Columns</option>
<option value='3'<?php if (get_request_var_request('columns') == '3') {?> selected<?php }?>>3 Columns</option>
Expand All @@ -316,7 +314,7 @@
<input id='thumbnails' type='checkbox' name='thumbnails' onClick='applyFilter()' <?php print (($_REQUEST['thumbnails'] == 'true') ? 'checked':'');?>>
</td>
<td>
Search:
Search
</td>
<td>
<input type='text' id='filter' name='filter' size='25' value='<?php print htmlspecialchars(get_request_var_request('filter'));?>'>
Expand Down Expand Up @@ -708,7 +706,6 @@ function clearTimespanFilter() {
</td>
<td>
<select id='rows' name='rows' onChange='applyFilter()'>
<option value='-1'<?php if (get_request_var_request('rows') == '-1') {?> selected<?php }?>>Default</option>
<?php
if (sizeof($item_rows) > 0) {
foreach ($item_rows as $key => $value) {
Expand Down
9 changes: 4 additions & 5 deletions graphs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ function clearFilter() {
<table cellpadding="2" cellspacing="0" border="0">
<tr>
<td width="50">
Host:
Device
</td>
<td>
<select id='host_id' name='host_id' onChange="applyFilter()">
Expand All @@ -1181,7 +1181,7 @@ function clearFilter() {
</select>
</td>
<td>
Template:
Template
</td>
<td>
<select id='template_id' name='template_id' onChange='applyFilter()'>
Expand All @@ -1206,17 +1206,16 @@ function clearFilter() {
</tr>
<tr>
<td width="50">
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request('filter'));?>">
</td>
<td>
Graphs:
Graphs
</td>
<td>
<select id='rows' name='rows' onChange='applyFilter()'>
<option value="-1"<?php if (get_request_var_request('rows') == '-1') {?> selected<?php }?>>Default</option>
<?php
if (sizeof($item_rows) > 0) {
foreach ($item_rows as $key => $value) {
Expand Down
8 changes: 4 additions & 4 deletions graphs_new.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ function applyGraphsNewFilterChange() {
<table width='100%' cellpadding='2' cellspacing='0' border='0' align='left'>
<tr>
<td width='55'>
Host:
Device
</td>
<td width='1'>
<select id='host_id' name='host_id' onChange='applyGraphsNewFilterChange()'>
Expand All @@ -447,7 +447,7 @@ function applyGraphsNewFilterChange() {
</select>
</td>
<td style='white-space:nowrap;' width='1'>
Graph Types:
Graph Types
</td>
<td width='1'>
<select id='graph_type' name='graph_type' onChange='applyGraphsNewFilterChange()'>
Expand Down Expand Up @@ -480,7 +480,7 @@ function applyGraphsNewFilterChange() {
</tr>
<tr>
<td width='55'>
Rows:
Rows
</td>
<td>
<select id='rows' name='rows' onChange='applyGraphsNewFilterChange()'>
Expand All @@ -497,7 +497,7 @@ function applyGraphsNewFilterChange() {
<?php if ($_REQUEST['graph_type'] > 0) {?>
<tr>
<td width='55'>
Search:
Search
</td>
<td>
<input id='filter' type='text' name='filter' size='25' value='<?php print htmlspecialchars(get_request_var_request('filter'));?>'>
Expand Down
9 changes: 4 additions & 5 deletions host.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ function clearFilter() {
<table cellpadding="2" cellspacing="0">
<tr>
<td width="50">
Type:
Template
</td>
<td>
<select id='host_template_id' name="host_template_id" onChange="applyFilter()">
Expand All @@ -1203,7 +1203,7 @@ function clearFilter() {
</select>
</td>
<td>
Status:
Status
</td>
<td>
<select id='host_status' name="host_status" onChange="applyFilter()">
Expand All @@ -1218,17 +1218,16 @@ function clearFilter() {
</select>
</td>
<td>
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request('filter'));?>" onChange='applyFilter()'>
</td>
<td>
Devices:
Devices
</td>
<td>
<select id='rows' name="rows" onChange="applyFilter()">
<option value="-1"<?php if (get_request_var_request('rows') == '-1') {?> selected<?php }?>>Default</option>
<?php
if (sizeof($item_rows) > 0) {
foreach ($item_rows as $key => $value) {
Expand Down
4 changes: 2 additions & 2 deletions host_templates.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,13 +446,13 @@ function template() {
<table cellpadding="2" cellspacing="0" border="0">
<tr>
<td width="50">
Search:
Search
</td>
<td>
<input id='filter' type="text" name="filter" size="25" value="<?php print htmlspecialchars(get_request_var_request('filter'));?>">
</td>
<td style='white-space:nowrap;'>
Host Templates:
Host Templates
</td>
<td>
<select id='rows' name="rows" onChange="applyFilter()">
Expand Down
10 changes: 10 additions & 0 deletions include/themes/classic/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,16 @@ legend {
height:8px;
}

.next {
padding-right:6px;
padding-left:6px;
}

.previous {
padding-right:6px;
padding-left:6px;
}

.cactiTableTitle {
background-color: #00438c;
}
Expand Down
10 changes: 10 additions & 0 deletions include/themes/modern/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,16 @@ legend {
height:8px;
}

.next {
padding-right:6px;
padding-left:6px;
}

.previous {
padding-right:6px;
padding-left:6px;
}

.cactiNavBarTop {
background: rgba(98,125,77,1);
background: -moz-linear-gradient(top, rgba(98,125,77,1) 0%, rgba(31,59,8,1) 100%);
Expand Down
Loading

0 comments on commit cc50b39

Please sign in to comment.