Menu
▾
▴
[Nagios-checkins] SF.net SVN: nagios:[1873] nsti/trunk
|
From: <alb...@us...> - 2012-01-27 08:19:39
|
Revision: 1873
http://nagios.svn.sourceforge.net/nagios/?rev=1873&view=rev
Author: albinscott
Date: 2012-01-27 08:19:32 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
See changelog. Mostly minor CSS changes. Nothing huge in this. Also removed some debug info.
Modified Paths:
--------------
nsti/trunk/CHANGELOG
nsti/trunk/filters.php
nsti/trunk/include/classes/class.common.php
nsti/trunk/include/classes/class.filters.php
nsti/trunk/include/classes/class.index.php
nsti/trunk/include/classes/class.mysqlDB.php
nsti/trunk/include/css/nsti.css
nsti/trunk/include/defines/global.php
nsti/trunk/index.php
Modified: nsti/trunk/CHANGELOG
===================================================================
--- nsti/trunk/CHANGELOG 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/CHANGELOG 2012-01-27 08:19:32 UTC (rev 1873)
@@ -1,3 +1,12 @@
+RC1.3.1 - 1/27/2012
+
+- Implemented the following CSS changes:
+ Adjusted height on buttons
+ Centered filter buttons
+- Moved InfoBox's around on index.php
+- Fixed 'Reset All' so that it reset filters as well
+- Changed navigation arrows to be buttons instead of links
+
RC1.3 - 1/23/2012
- Added beta support for filters. Still a work in progress
Modified: nsti/trunk/filters.php
===================================================================
--- nsti/trunk/filters.php 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/filters.php 2012-01-27 08:19:32 UTC (rev 1873)
@@ -8,7 +8,7 @@
* @package Nagios_SNMP_Trap_Interface
* @author Nicholas Scott <ns...@na...>
* @license GNU - http://www.gnu.org/licenses/gpl-2.0.html
- * @version SVN: RC1.2
+ * @version SVN: RC1.4
* @link http://exchange.nagios.org/nagiostrapinterface
*
* This program is free software; you can redistribute it and/or modify
Modified: nsti/trunk/include/classes/class.common.php
===================================================================
--- nsti/trunk/include/classes/class.common.php 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/include/classes/class.common.php 2012-01-27 08:19:32 UTC (rev 1873)
@@ -346,7 +346,18 @@
*/
function readTraps() {
if (DEBUG&&DEBUGLEVEL&1) debug('Start method common::readTraps()');
- global $configINI, $hostname, $FRONTEND;
+ global $configINI, $hostname, $FRONTEND;
+ $passthese = array( 'trapSelect'
+ , 'severity'
+ , 'category'
+ , 'hostname'
+ , 'searchTrapoid'
+ , 'searchHostname'
+ , 'searchCategory'
+ , 'searchSeverity'
+ , 'searchMessage'
+ , 'state' );
+
$step = $_SESSION['perpage'];
if (!grab_request_var('site')){
$site = 0;
@@ -371,30 +382,32 @@
$count = sizeof($traps);
$type = (!grab_request_var('type')) ? 'all' : grab_request_var('type');
- //~ if (!isset(grab_request_var('type'))) {
- //~ $type = "all";
- //~ }
- //~ else {
- //~ $type = grab_request_var('type');
-
- $this->site[] = '<div id="navigation">';
- $this->site[] = ' <span id="leftarrow">';
+ $this->site[] = "<div id='navigation'>";
+ $this->site[] = " <span id='leftarrow'>";
+ $this->site[] = " <form id='navigation' method='post' action=''>";
+ // Use the previous defined $passthese array to send the strings
+ // on in a hidden form.
+ foreach($passthese as $value) {
+ $temp_value = grab_request_var($value);
+ $this->site[] = " <input type='hidden' name='{$value}' value='{$temp_value}' />";
+ }
if ($site != 0)
- $this->site[] = ' <a href="index.php?site='.($site-1).'&trapSelect='.grab_request_var('trapSelect').'&severity='.grab_request_var('severity').'&category='.rawurlencode(grab_request_var('category')).'&hostname='.grab_request_var('hostname').'&searchTrapoid='.grab_request_var('searchTrapoid').'&searchHostname='.grab_request_var('searchHostname').'&searchCategory='.grab_request_var('searchCategory').'&searchSeverity='.grab_request_var('searchSeverity').'&searchMessage='.grab_request_var('searchMessage').'&state='.grab_request_var('state').'"><img src="'.$configINI['global']['images'].$configINI['global']['iconStyle'].'/previous.png" /></a>';
+ $this->site[] = " <button name='site' value='".($site - 1)."' type='submit'><img src='./images/dropline/previous.png' /></button>";
else
- $this->site[] = ' <img src="'.$configINI['global']['images'].$configINI['global']['iconStyle'].'/previousgray.png" />';
- $this->site[] = ' </span>';
- $this->site[] = ' <span id="pageindex">';
- $this->site[] = ( $to < $total ) ? "<b>{$from} - {$to}</b>" : "<b>{$from} - {$total}</b>";
- $this->site[] = ' </span>';
- $this->site[] = ' <span id="rightarrow">';
+ $this->site[] = " <button disabled><img src='./images/dropline/previousgray.png' /></button>";
+ $this->site[] = " </span>";
+ $this->site[] = " <span id='pageindex'>";
+ $this->site[] = ( $to < $total ) ? "{$from} - {$to}" : "{$from} - {$total}";
+ $this->site[] = " </span>";
+ $this->site[] = " <span id='rightarrow'>";
if ($to < $total)
- $this->site[] = ' <a href="index.php?site='.($site+1).'&trapSelect='.grab_request_var('trapSelect').'&severity='.grab_request_var('severity').'&category='.rawurlencode(grab_request_var('category')).'&hostname='.grab_request_var('hostname').'&searchTrapoid='.grab_request_var('searchTrapoid').'&searchHostname='.grab_request_var('searchHostname').'&searchCategory='.grab_request_var('searchCategory').'&searchSeverity='.grab_request_var('searchSeverity').'&searchMessage='.grab_request_var('searchMessage').'&state='.grab_request_var('state').'"><img src="'.$configINI['global']['images'].$configINI['global']['iconStyle'].'/next.png" /></a>';
+ $this->site[] = " <button name='site' value='".($site + 1)."' type='submit'><img src='./images/dropline/next.png' /></button>";
else
- $this->site[] = ' <img src="'.$configINI['global']['images'].$configINI['global']['iconStyle'].'/nextgray.png" />';
- $this->site[] = ' </span>';
- $this->site[] = '</div>';
+ $this->site[] = " <button disabled><img src='./images/dropline/nextgray.png' /></button>";
+ $this->site[] = " </span>";
+ $this->site[] = " </form>";
+ $this->site[] = "</div>";
if (DEBUG&&DEBUGLEVEL&1) debug('End method common::readTraps(): Array(...)');
return($traps);
}
Modified: nsti/trunk/include/classes/class.filters.php
===================================================================
--- nsti/trunk/include/classes/class.filters.php 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/include/classes/class.filters.php 2012-01-27 08:19:32 UTC (rev 1873)
@@ -41,7 +41,6 @@
if (DEBUG&&DEBUGLEVEL&1) debug('Start method filters::__construct()');
// Load frontend's constructor
parent::__construct($configINI);
- // Draw index.php's logic
if (DEBUG&&DEBUGLEVEL&1) debug('End method filters::__construct()');
}
@@ -123,7 +122,8 @@
$this->site[] = " </tr>";
$this->site[] = " </thead>";
$this->site[] = " <tbody>";
- if(!$filters) $this->site[] = " <tr><td colspan=4>No Filters In Database</td></tr>";
+ if(!$filters)
+ $this->site[] = " <tr><td colspan=4>No Filters In Database</td></tr>";
else {
$rowcount = 0;
foreach($filters as $filter) {
@@ -151,25 +151,25 @@
function drawViewControls($filterid) {
if (DEBUG&&DEBUGLEVEL&1) debug('Start method filters::drawViewControls()');
$this->site[] = "<div class='controlpiece'>";
- $this->site[] = "<div class='controls delete'>";
+ $this->site[] = "<div class='fcontrols delete'>";
$this->site[] = "<form method='post' action='filters.php'>";
$this->site[] = " <input type='hidden' name='fid' value='{$filterid}' />";
$this->site[] = " <input type='hidden' name='mode' value='delete' />";
- $this->site[] = " <input type='image' src='images/webset/action_delete.png' />";
+ $this->site[] = " <input type='image' title='Delete Filter' src='images/webset/action_delete.png' />";
$this->site[] = "</form>";
$this->site[] = "</div>";
- $this->site[] = "<div class='controls viewfilter'>";
+ $this->site[] = "<div class='fcontrols viewfilter'>";
$this->site[] = "<form method='post' action='filters.php'>";
$this->site[] = " <input type='hidden' name='fid' value='{$filterid}' />";
$this->site[] = " <input type='hidden' name='mode' value='viewfilter' />";
- $this->site[] = " <input type='image' src='images/webset/search.png'>";
+ $this->site[] = " <input type='image' title='View Filter' src='images/webset/search.png'>";
$this->site[] = "</form>";
$this->site[] = "</div>";
- $this->site[] = "<div class='controls edit'>";
+ $this->site[] = "<div class='fcontrols edit'>";
$this->site[] = "<form method='post' action='filters.php'>";
$this->site[] = " <input type='hidden' name='fid' value='{$filterid}' />";
$this->site[] = " <input type='hidden' name='mode' value='edit' />";
- $this->site[] = " <input type='image' src='images/webset/application.png' />";
+ $this->site[] = " <input type='image' title='Edit Filter' src='images/webset/application.png' />";
$this->site[] = "</form>";
$this->site[] = "</div>";
$this->site[] = "</div>";
Modified: nsti/trunk/include/classes/class.index.php
===================================================================
--- nsti/trunk/include/classes/class.index.php 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/include/classes/class.index.php 2012-01-27 08:19:32 UTC (rev 1873)
@@ -53,9 +53,10 @@
*/
function constructorHeader() {
if (DEBUG&&DEBUGLEVEL&1) debug('Start method index::constructorHeader()');
+ $trapinfo = common::readTrapInfo();
$this->site[] = "<div id='header'>";
$this->createInfoBox(); // Current Trap Log Box
- $this->createOptBox(); // Trap Selection Box #trapselect
+ $this->createOptBox($trapinfo); // Trap Selection Box #trapselect
$this->site[] = "</div> <!-- closes header -->";
if (DEBUG&&DEBUGLEVEL&1) debug('End method index::constructorHeader()');
}
@@ -72,18 +73,6 @@
$trapInfo = common::readTrapInfo();
$this->site[] = "<div id='infobox'>";
$this->site[] = " <table class='OptionsTable'>";
- $this->site[] = " <thead>";
- $this->site[] = " <tr>";
- $this->site[] = " <td colspan='2'>{$languageXML['LANG']['HEADER']['INFOBOX']['CURRENTTRAPLOG']}</td>";
- $this->site[] = " </tr>";
- $this->site[] = " </thead>";
- $this->site[] = " <tbody>";
- $this->site[] = " <tr class='odd'>";
- $this->site[] = " <td class='left'>{$languageXML['LANG']['HEADER']['INFOBOX']['TOTALTRAPS']}</td>";
- $this->site[] = " <td class='right'>".database::countTraps()."</td>";
- $this->site[] = " </tr>";
- // Creates date box
- $this->createDateInfoBox($trapInfo);
// Create the filter section of the table
$this->createFilter();
$this->site[] = " </tbody>";
@@ -129,10 +118,10 @@
$rownum = !$rownum;
$this->site[] = "<tr class='{$rowclass}'>";
$this->site[] = " <td class='left'>{$name}</td>";
- $this->site[] = " <td class='right'>";
+ $this->site[] = " <td class='right filtertd'>";
$this->site[] = " <form method='post' action=''>";
$this->site[] = " <input type='hidden' name='remfilter' value='{$id}' />";
- $this->site[] = " <input type='image' src='./images/webset/action_remove.png' />";
+ $this->site[] = " <input type='image' class='nomargin' src='./images/webset/action_remove.png' />";
$this->site[] = " </form>";
$this->site[] = " </td>";
$this->site[] = "</tr>";
@@ -141,7 +130,7 @@
$this->createFilterSelectBox($applied_filters);
$this->createRadioBoolean();
$this->site[] = "<tr class='odd'>";
- $this->site[] = " <td class='left'><a href='./index.php'><b><i>{$languageXML['LANG']['HEADER']['FILTER']['RESET']}</i></b></a></td>";
+ $this->site[] = " <td class='left'><a href='./index.php?remfilter=all'><b><i>{$languageXML['LANG']['HEADER']['FILTER']['RESET']}</i></b></a></td>";
$this->site[] = "</tr>";
$this->site[] = "<!-- Closes filterbox -->";
if (DEBUG&&DEBUGLEVEL&1) debug('End method index::createFilter()');
@@ -199,7 +188,7 @@
$enable_form = ($all_filters) ? '' : 'disabled';
$this->site[] = "<tr class='odd'>";
$this->site[] = " <td class='left'>";
- $this->site[] = " <form method='post' action=''>";
+ $this->site[] = " <form method='post' action='./index.php'>";
$this->site[] = " <select name='addfilter' {$enable_form}>";
// If there are any filters left in $all_filters, draw them
if($all_filters)
@@ -259,62 +248,74 @@
* @author Michael Luebben <na...@na...>
* @author Nicholas Scott <ns...@na...>
*/
- function createOptBox() {
- if (DEBUG&&DEBUGLEVEL&1) debug('Start method index::createOptBox()');
- global $languageXML;
- $this->site[] = "<div id='trapselect'>";
- $this->site[] = " <table class='OptionsTable'>";
- $this->site[] = " <thead>";
- $this->site[] = " <tr>";
- $this->site[] = " <td colspan='5'>Trap Selection</td>";
- $this->site[] = " </tr>";
- $this->site[] = " </thead>";
- $this->site[] = " <form method='get' action='./index.php'>";
- $this->site[] = " <tr class='even'>";
- $this->site[] = " <td class='title'> {$languageXML['LANG']['HEADER']['OPTBOX']['SELECTTRAP']} :</td>";
- $this->site[] = " <td class='right'>";
- $this->site[] = " <select name='trapSelect'>";
- $this->site[] = " <option value='all' ".common::selected('all',grab_request_var('trapSelect'),'selected="selected"')." > {$languageXML['LANG']['HEADER']['OPTBOX']['SELECTTRAPVALUE']['TRAPACTUEL']}</option>";
- $this->site[] = " <option value='ARCHIVED' ".common::selected('ARCHIVED',grab_request_var('trapSelect'),"selected='selected'")." > {$languageXML["LANG"]["HEADER"]["OPTBOX"]["SELECTTRAPVALUE"]["TRAPARCHIVED"]}</option>";
- $this->site[] = " ". common::checkIfEnableUnknownTraps($this->configINI['global']['useUnknownTraps']);
- $this->site[] = " </select>";
- $this->site[] = " </td>";
- $this->site[] = " </tr>";
- $this->site[] = " <tr class='odd'>";
- $this->site[] = " <td>{$languageXML['LANG']['HEADER']['OPTBOX']['SEVERITYDETAIL']}:</td>";
- $this->site[] = " <td class='right'>";
- $this->site[] = " <select name='severity'>";
- $this->site[] = " <option value='' ".common::selected('',grab_request_var('severity'),"selected='selected'")." > {$languageXML["LANG"]["HEADER"]["OPTBOX"]["OPTION"]["VALUEALL"]}</option>";
- $this->site[] = " <option value='OK' ".common::selected('OK',grab_request_var('severity'),"selected='selected'")." >Traps OK</option>";
- $this->site[] = " <option value='WARNING' ".common::selected('WARNING',grab_request_var('severity'),"selected='selected'")." >Traps Warning</option>";
- $this->site[] = " <option value='CRITICAL' ".common::selected('CRITICAL',grab_request_var('severity'),"selected='selected'")." >Traps Critical</option>";
- $this->site[] = " </select>";
- $this->site[] = " </td>";
- $this->site[] = " </tr>";
- $this->site[] = " <tr class='even'>";
- $this->site[] = " <td>{$languageXML['LANG']['HEADER']['OPTBOX']['PERPAGE']}</td>";
- $this->site[] = " <td class='right'>";
- $this->site[] = " <select name='perpage'>";
- $this->site[] = " ".common::determinePageMenu();
- $this->site[] = " </select>";
- $this->site[] = " </td>";
- $this->site[] = " </tr>";
- $this->site[] = " <tr class='odd'>";
- $this->site[] = " ".common::createCategoryFilter();
- $this->site[] = " </tr>";
- $this->site[] = " <tr class='even'>";
- $this->site[] = " <td class='left'>{$languageXML['LANG']['HEADER']['OPTBOX']['OLDERENTRIESFIRST']}:</td>";
- $this->site[] = " <td class='right'><input type='checkbox' name='oldestfirst' ".common::selected('on',grab_request_var('oldestfirst'),"checked")." ></td>";
- $this->site[] = " </tr>";
- $this->site[] = " <tr class='odd'>";
- $this->site[] = " <td class='left'></td>";
- $this->site[] = " <td class='right'><input type='submit' value='{$languageXML['LANG']['HEADER']['OPTBOX']['UPDATEBUTTON']}' ></td>";
- $this->site[] = " <input type='hidden' name='hostname' value='".grab_request_var('hostname')."'>";
- $this->site[] = " </tr>";
- $this->site[] = " </form>";
- $this->site[] = " </table>";
- $this->site[] = "</div> <!-- closes trapselect -->";
- if (DEBUG&&DEBUGLEVEL&1) debug('End method index::createOptBox()');
+ function createOptBox($trapInfo) {
+ if (DEBUG&&DEBUGLEVEL&1) debug('Start method index::createOptBox()');
+ global $languageXML;
+ $this->site[] = "<div id='trapselect'>";
+ $this->site[] = " <table class='OptionsTable'>";
+ $this->createDateInfoBox($trapInfo);
+ $this->site[] = " <thead>";
+ $this->site[] = " <tr>";
+ $this->site[] = " <td colspan='2'>{$languageXML['LANG']['HEADER']['INFOBOX']['CURRENTTRAPLOG']}</td>";
+ $this->site[] = " </tr>";
+ $this->site[] = " </thead>";
+ $this->site[] = " <tbody>";
+ $this->site[] = " <tr class='odd'>";
+ $this->site[] = " <td class='left'>{$languageXML['LANG']['HEADER']['INFOBOX']['TOTALTRAPS']}</td>";
+ $this->site[] = " <td class='right'>".database::countTraps()."</td>";
+ $this->site[] = " </tr>";
+ $this->site[] = " </tbody>";
+ $this->site[] = " <thead>";
+ $this->site[] = " <tr>";
+ $this->site[] = " <td colspan='5'>Trap Selection</td>";
+ $this->site[] = " </tr>";
+ $this->site[] = " </thead>";
+ $this->site[] = " <form method='get' action='./index.php'>";
+ $this->site[] = " <tr class='even'>";
+ $this->site[] = " <td class='title'> {$languageXML['LANG']['HEADER']['OPTBOX']['SELECTTRAP']} :</td>";
+ $this->site[] = " <td class='right'>";
+ $this->site[] = " <select name='trapSelect'>";
+ $this->site[] = " <option value='all' ".common::selected('all',grab_request_var('trapSelect'),'selected="selected"')." > {$languageXML['LANG']['HEADER']['OPTBOX']['SELECTTRAPVALUE']['TRAPACTUEL']}</option>";
+ $this->site[] = " <option value='ARCHIVED' ".common::selected('ARCHIVED',grab_request_var('trapSelect'),"selected='selected'")." > {$languageXML["LANG"]["HEADER"]["OPTBOX"]["SELECTTRAPVALUE"]["TRAPARCHIVED"]}</option>";
+ $this->site[] = " ". common::checkIfEnableUnknownTraps($this->configINI['global']['useUnknownTraps']);
+ $this->site[] = " </select>";
+ $this->site[] = " </td>";
+ $this->site[] = " </tr>";
+ $this->site[] = " <tr class='odd'>";
+ $this->site[] = " <td>{$languageXML['LANG']['HEADER']['OPTBOX']['SEVERITYDETAIL']}:</td>";
+ $this->site[] = " <td class='right'>";
+ $this->site[] = " <select name='severity'>";
+ $this->site[] = " <option value='' ".common::selected('',grab_request_var('severity'),"selected='selected'")." > {$languageXML["LANG"]["HEADER"]["OPTBOX"]["OPTION"]["VALUEALL"]}</option>";
+ $this->site[] = " <option value='OK' ".common::selected('OK',grab_request_var('severity'),"selected='selected'")." >Traps OK</option>";
+ $this->site[] = " <option value='WARNING' ".common::selected('WARNING',grab_request_var('severity'),"selected='selected'")." >Traps Warning</option>";
+ $this->site[] = " <option value='CRITICAL' ".common::selected('CRITICAL',grab_request_var('severity'),"selected='selected'")." >Traps Critical</option>";
+ $this->site[] = " </select>";
+ $this->site[] = " </td>";
+ $this->site[] = " </tr>";
+ $this->site[] = " <tr class='even'>";
+ $this->site[] = " <td>{$languageXML['LANG']['HEADER']['OPTBOX']['PERPAGE']}</td>";
+ $this->site[] = " <td class='right'>";
+ $this->site[] = " <select name='perpage'>";
+ $this->site[] = " ".common::determinePageMenu();
+ $this->site[] = " </select>";
+ $this->site[] = " </td>";
+ $this->site[] = " </tr>";
+ $this->site[] = " <tr class='odd'>";
+ $this->site[] = " ".common::createCategoryFilter();
+ $this->site[] = " </tr>";
+ $this->site[] = " <tr class='even'>";
+ $this->site[] = " <td class='left'>{$languageXML['LANG']['HEADER']['OPTBOX']['OLDERENTRIESFIRST']}:</td>";
+ $this->site[] = " <td class='right'><input type='checkbox' name='oldestfirst' ".common::selected('on',grab_request_var('oldestfirst'),"checked")." ></td>";
+ $this->site[] = " </tr>";
+ $this->site[] = " <tr class='odd'>";
+ $this->site[] = " <td class='left'></td>";
+ $this->site[] = " <td class='right'><input type='submit' value='{$languageXML['LANG']['HEADER']['OPTBOX']['UPDATEBUTTON']}' ></td>";
+ $this->site[] = " <input type='hidden' name='hostname' value='".grab_request_var('hostname')."'>";
+ $this->site[] = " </tr>";
+ $this->site[] = " </form>";
+ $this->site[] = " </table>";
+ $this->site[] = "</div> <!-- closes trapselect -->";
+ if (DEBUG&&DEBUGLEVEL&1) debug('End method index::createOptBox()');
}
Modified: nsti/trunk/include/classes/class.mysqlDB.php
===================================================================
--- nsti/trunk/include/classes/class.mysqlDB.php 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/include/classes/class.mysqlDB.php 2012-01-27 08:19:32 UTC (rev 1873)
@@ -248,7 +248,7 @@
$flBegin = ($dbQuery) ? " AND " : "WHERE ";
$flQuery = ($ftQuery) ? $flBegin.implode($ftQuery," {$boolean} ") : "";
$totalQuery = $dbQuery.$flQuery;
- print $totalQuery;
+ //~ print $totalQuery;
// Set which trap must read first from database
$sort = (grab_request_var('oldestfirst') == "on") ? "ASC" : "DESC";
@@ -494,7 +494,7 @@
// Otherwise create a new bean and use that
else {
$newbean = R::graph($formarray);
- print $newbean;
+ //~ print $newbean;
R::store($newbean);
}
if (DEBUG&&DEBUGLEVEL&1) debug('End method database::saveForm()');
Modified: nsti/trunk/include/css/nsti.css
===================================================================
--- nsti/trunk/include/css/nsti.css 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/include/css/nsti.css 2012-01-27 08:19:32 UTC (rev 1873)
@@ -93,6 +93,14 @@
width:100%;
}
+input[value='Add']{
+ margin-top:-12px;
+ }
+
+button{
+ border:0px;
+ }
+
#navigation{
width:200px;
text-align:center;
@@ -109,7 +117,7 @@
#trapselect{
float:right;
- width:300px;
+ width:400px;
margin-left:5px;
display:block;
}
@@ -134,8 +142,14 @@
div.controlpiece{
margin:0 auto;
- width:80%;
+ width:65%;
+ margin-top:10px;
}
+
+div.fcontrols{
+ float:left;
+ padding:3px;
+ }
/* ******************** ----- Tables ---- ******************** */
@@ -145,6 +159,7 @@
}
table.OptionsTable{
+ width:100%;
border-style:double;
border-color:silver;
border-collapse:collapse;
Modified: nsti/trunk/include/defines/global.php
===================================================================
--- nsti/trunk/include/defines/global.php 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/include/defines/global.php 2012-01-27 08:19:32 UTC (rev 1873)
@@ -16,7 +16,7 @@
define('DEBUGLEVEL', 1);
define('DEBUGFILE', '/tmp/nsti-debug.log');
-define('CONST_VERSION', 'RC1.3');
+define('CONST_VERSION', 'RC1.3.1');
define('CONST_MAINCFG', './etc/config.ini');
define('RED', '#FF795F');
define('YELLOW','#FEFF5F');
Modified: nsti/trunk/index.php
===================================================================
--- nsti/trunk/index.php 2012-01-26 22:24:16 UTC (rev 1872)
+++ nsti/trunk/index.php 2012-01-27 08:19:32 UTC (rev 1873)
@@ -114,7 +114,11 @@
// Remove a filter given in POST
if (grab_request_var('remfilter')) {
$filter_id = grab_request_var('remfilter');
- unset($_SESSION['applied_filters'][$filter_id]);
+ if ($filter_id == 'all')
+ foreach($_SESSION['applied_filters'] as $key => $value)
+ unset($_SESSION['applied_filters'][$key]);
+ else
+ unset($_SESSION['applied_filters'][$filter_id]);
}
if (grab_request_var('boolean')) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|