r2842 - import two icons from pgAdmin III
authorDenis Ovsienko <infrastation@yandex.ru>
Thu, 11 Jun 2009 13:50:08 +0000 (13:50 +0000)
committerDenis Ovsienko <infrastation@yandex.ru>
Thu, 11 Jun 2009 13:50:08 +0000 (13:50 +0000)
 - renderCellFilterPortlet(): use new icons

COPYING
inc/interface.php
pix/pgadmin3-viewdata.png [new file with mode: 0644]
pix/pgadmin3-viewfiltereddata.png [new file with mode: 0644]

diff --git a/COPYING b/COPYING
index 34e06f6274b89916413c001e1f9ddfe1f9619aa4..f757be22685f4e30c9fbde0b0336e5b23d29e4a6 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -85,3 +85,8 @@ RackTables uses icons from The Crystal Project by Everaldo Coelho and other
 contributors (http://www.everaldo.com/crystal/). The Crystal Project is
 released under GNU LGPL.
 
+----------------------8<----------------------8<----------------------
+
+RackTables uses icons from pgAdmin III, which is copyright 2002-2009,
+The pgAdmin Development Team. pgAdmin is released under the BSD license.
+
index b67ea5cbf608db4de36c31ae7ac95887a8cd8a43..4aa5d79fab3cc49cb18597cedb36a0082af6834d 100644 (file)
@@ -141,9 +141,6 @@ $image['CREATE']['height'] = 32;
 $image['DENIED']['path'] = 'pix/tango-dialog-error-big.png';
 $image['DENIED']['width'] = 32;
 $image['DENIED']['height'] = 32;
-$image['apply']['path'] = 'pix/tango-emblem-system.png';
-$image['apply']['width'] = 16;
-$image['apply']['height'] = 16;
 $image['node-collapsed']['path'] = 'pix/node-collapsed.png';
 $image['node-collapsed']['width'] = 16;
 $image['node-collapsed']['height'] = 16;
@@ -192,6 +189,12 @@ $image['NET']['height'] = 32;
 $image['USER']['path'] = 'pix/crystal-edit-user-32x32.png';
 $image['USER']['width'] = 32;
 $image['USER']['height'] = 32;
+$image['setfilter']['path'] = 'pix/pgadmin3-viewfiltereddata.png';
+$image['setfilter']['width'] = 32;
+$image['setfilter']['height'] = 32;
+$image['resetfilter']['path'] = 'pix/pgadmin3-viewdata.png';
+$image['resetfilter']['width'] = 32;
+$image['resetfilter']['height'] = 32;
 
 // This may be populated later onsite, report rendering function will use it.
 // See the $systemreport for structure.
@@ -4934,20 +4937,20 @@ function renderCellFilterPortlet ($preselect, $realm, $bypass_name = '', $bypass
                echo $hr;
                $hr = $ruler;
                // "apply"
-               echo '<tr><td>';
+               echo '<tr><td class=tdleft>';
                echo "<input type=hidden name=page value=${pageno}>\n";
                echo "<input type=hidden name=tab value=${tabno}>\n";
                if ($bypass_name != '')
                        echo "<input type=hidden name=${bypass_name} value='${bypass_value}'>\n";
-               printImageHREF ('apply', 'Apply filter', TRUE);
-               echo "</form></td><td>";
+               printImageHREF ('setfilter', 'set filter', TRUE);
+               echo "</form></td><td class=tdright>";
                // "reset"
                echo "<form method=get>\n";
                echo "<input type=hidden name=page value=${pageno}>\n";
                echo "<input type=hidden name=tab value=${tabno}>\n";
                if ($bypass_name != '')
                        echo "<input type=hidden name=${bypass_name} value='${bypass_value}'>\n";
-               printImageHREF ('clear', 'reset', TRUE);
+               printImageHREF ('resetfilter', 'reset filter', TRUE);
                echo '</form></td></tr>';
        }
        echo '</table>';
diff --git a/pix/pgadmin3-viewdata.png b/pix/pgadmin3-viewdata.png
new file mode 100644 (file)
index 0000000..2edcbfa
Binary files /dev/null and b/pix/pgadmin3-viewdata.png differ
diff --git a/pix/pgadmin3-viewfiltereddata.png b/pix/pgadmin3-viewfiltereddata.png
new file mode 100644 (file)
index 0000000..8ab27fa
Binary files /dev/null and b/pix/pgadmin3-viewfiltereddata.png differ