Use much shorter class names for CSS. Some were potentially used on hundreds or thous...

diff --git a/connections.php b/connections.php
index 3a2a0556c97a02d584a81c25d705948842ed945f..0cdd5de4279c7e87fa804a9521633e07450a26e3 100644 (file)
--- a/connections.php
+++ b/connections.php
@@ -58,22 +58,22 @@ while ($row = pg_fetch_assoc($res)) {
        $subpanel = $panel . "row" . $rownum++;
 
 
-       $list .= "      <li class=\"double\"><a href=\"#" . $subpanel . "\">PID: <span class=\"coloredValue\">" . www_clean($row['procpid']) . "</span> Source: <span class=\"coloredValue\">" . www_clean($row['client_addr']) . ":" . www_clean($row['client_port']) . "</span><br />User: <span class=\"coloredValue\">" . www_clean($row['usename']) . "</span> DB: <span class=\"coloredValue\">" . www_clean($row['datname']) . "</span></a></li>\n";
+       $list .= "      <li class=\"d\"><a href=\"#" . $subpanel . "\">PID: <span class=\"cv\">" . www_clean($row['procpid']) . "</span> Source: <span class=\"cv\">" . www_clean($row['client_addr']) . ":" . www_clean($row['client_port']) . "</span><br />User: <span class=\"cv\">" . www_clean($row['usename']) . "</span> DB: <span class=\"cv\">" . www_clean($row['datname']) . "</span></a></li>\n";
 
        $divs .= "<div id=\"" . $subpanel . "\" class=\"panel\" title=\"Connection\">";
-       $divs .= "<div class=\"dialogHeader\">$message2</div>";
-       $divs .= "<h2>Process ID</h2><div class=\"valueBox\">" . www_clean($row['procpid']) . "</div>";
-       $divs .= "<h2>Source address</h2><div class=\"valueBox\">" . www_clean($row['client_addr']) . "</div>";
-       $divs .= "<h2>Source port</h2><div class=\"valueBox\">" . www_clean($row['port']) . "</div>";
-       $divs .= "<h2>Database</h2><div class=\"valueBox\">" . www_clean($row['datname']) . "</div>";
-       $divs .= "<h2>Username</h2><div class=\"valueBox\">" . www_clean($row['usename']) . "</div>";
-       $divs .= "<h2>Connection start</h2><div class=\"valueBox\">" . www_clean($row['backend_start']) . "</div>";
+       $divs .= "<div class=\"dh\">$message2</div>";
+       $divs .= "<h2>Process ID</h2><div class=\"vb\">" . www_clean($row['procpid']) . "</div>";
+       $divs .= "<h2>Source address</h2><div class=\"vb\">" . www_clean($row['client_addr']) . "</div>";
+       $divs .= "<h2>Source port</h2><div class=\"vb\">" . www_clean($row['port']) . "</div>";
+       $divs .= "<h2>Database</h2><div class=\"vb\">" . www_clean($row['datname']) . "</div>";
+       $divs .= "<h2>Username</h2><div class=\"vb\">" . www_clean($row['usename']) . "</div>";
+       $divs .= "<h2>Connection start</h2><div class=\"vb\">" . www_clean($row['backend_start']) . "</div>";
 
        if (array_key_exists("xact_start", $row))
-               $divs .= "<h2>Transaction start</h2><div class=\"valueBox\">" . www_clean($row['xact_start']) . "</div>";
+               $divs .= "<h2>Transaction start</h2><div class=\"vb\">" . www_clean($row['xact_start']) . "</div>";
 
-       $divs .= "<h2>Query start</h2><div class=\"valueBox\">" . www_clean($row['query_start']) . "</div>";
-       $divs .= "<h2>Current query</h2><div class=\"valueBox\">" . www_clean($row['current_query']) . "</div>";
+       $divs .= "<h2>Query start</h2><div class=\"vb\">" . www_clean($row['query_start']) . "</div>";
+       $divs .= "<h2>Current query</h2><div class=\"vb\">" . www_clean($row['current_query']) . "</div>";
        $divs .= "</div>";
 }
 

diff --git a/css/iui-ext.css b/css/iui-ext.css
index e844927aaa1d12416641ee33956fb0c374497a14..2ba8b7ffec8e86a0ae2c351116f07a0ce8f563ab 100644 (file)
--- a/css/iui-ext.css
+++ b/css/iui-ext.css
@@ -4,7 +4,7 @@ h2 {
 }
 
 /* A box for displaying values */
-.valueBox {
+.vb {
        position: relative;
        margin: 0 0 10px 0;
        padding: 7px 10px 7px 10px;
@@ -16,25 +16,25 @@ h2 {
 }
 
 /* Smaller li's for double-lined display */
-li.double {
+li.d {
        font-size: 14px !important; 
        font-weight: normal !important;
 }
 
 /* Notes for li's */
-span.note {
+span.n {
        font-size: 14px !important;
        font-weight: normal !important;
        color: gray !important;
 }
 
 /* Colored values */
-.coloredValue {
+.cv {
        color: #333399;
 }
 
 /* A group header on a dialogue */
-.dialogHeader {
+.dh {
        position: relative;
        display: block;
        width: 100%;
@@ -53,7 +53,7 @@ span.note {
 }
 
 /* li image */
-.menuImage {
+.mi {
        margin-top: -4px; 
        padding-right: 5px;
        float: left;

diff --git a/gucs.php b/gucs.php
index af2c8a4ac0afc66195073fdf46ec3937a2025eb2..f7c44e94c5966636600f62d5c66a0070a28a9cbc 100644 (file)
--- a/gucs.php
+++ b/gucs.php
@@ -45,7 +45,7 @@ for ($x=0; $x < $rows; $x++) {
        $guc_name = www_clean(pg_fetch_result($res, $x, "name"));
        $guc_value = www_clean(pg_fetch_result($res, $x, "setting"));
 
-       $gucs .= "<h2>" . $guc_name . "</h2><div class=\"valueBox\">" . $guc_value . "</div>";
+       $gucs .= "<h2>" . $guc_name . "</h2><div class=\"vb\">" . $guc_value . "</div>";
 }
 
 pg_free_result($res);
@@ -55,7 +55,7 @@ $message = "Server: " . $servers[$server]["description"];
 // Echo the HTML snippet
 $text = <<<EOT
 <div id="$panel" class="panel" title="GUCs">
-<div class="dialogHeader">$message</div>
+<div class="dh">$message</div>
 $gucs
 </div>
 EOT;

diff --git a/index.php b/index.php
index e37b9f56fc7116d927b2495fef0cb17c22c18673..ce617f6726f73389acf984994859171eab971bdd 100644 (file)
--- a/index.php
+++ b/index.php
@@ -20,25 +20,25 @@ foreach ($servers as $key=>$server) {
 
                // Get the image if there is one
                if (array_key_exists("icon", $server) && $server["icon"] != "")
-                       $icon = "<img src=\"" .  $server["icon"] . "\" class=\"menuImage\">";
+                       $icon = "<img src=\"" .  $server["icon"] . "\" class=\"mi\">";
 
                // Connect the database
                $db = @pg_connect($server["connstr"]);          
 
                // Can we connect?
                if ($db === false) {
-                       $svrlist .= "<li>" . $icon . "<s>" . $server["description"] . "</s><br /><span class=\"note\">" . html_entity_decode($php_errormsg, ENT_QUOTES) . "</span></li>";
+                       $svrlist .= "<li>" . $icon . "<s>" . $server["description"] . "</s><br /><span class=\"n\">" . html_entity_decode($php_errormsg, ENT_QUOTES) . "</span></li>";
                } else {
                        // Valid server version?
                        $res = @pg_query($db, "SHOW server_version_num;");
                        if (@pg_fetch_result($res, 0, 0) < 80200) {
-                               $svrlist .= "<li>" . $icon . "<s>" . $server["description"] . "</s><br /><span class=\"note\">Server version is less than 8.2</span></li>";
+                               $svrlist .= "<li>" . $icon . "<s>" . $server["description"] . "</s><br /><span class=\"n\">Server version is less than 8.2</span></li>";
                        } else {
                                // Have we got superuser privs?
                                @pg_free_result($res);
                                $res = @pg_query($db, "SELECT usesuper FROM pg_shadow WHERE usename = current_user;");
                                if (pg_fetch_result($res, 0, 0) != "t") {
-                                       $svrlist .= "<li>" . $icon . "<s>" . $server["description"] . "</s><br /><span class=\"note\">The connecting user is not a superuser</span></li>";
+                                       $svrlist .= "<li>" . $icon . "<s>" . $server["description"] . "</s><br /><span class=\"n\">The connecting user is not a superuser</span></li>";
                                } else {
                                        // Looks good - let's go!
                                        $svrlist .= "<li>" . $icon . "<a href=\"server.php?s=" . $key . "\">" . $server["description"] . "</a></li>";
@@ -75,7 +75,7 @@ $text = <<<EOT
 <ul id="servers" title="$APP_NAME" selected="true"> 
 <li class="group">$message</li>
 $svrlist
-<li class="double"><a href="#about">About</a></li>
+<li class="d"><a href="#about">About</a></li>
 </ul>
 <div id="about" class="panel" title="About">
 <h2>$APP_NAME v$APP_VERSION</h2>

diff --git a/info.php b/info.php
index e0b3b6e9bc4c5fd1cb5485dbbdbcf9497b48cd38..40c66ec3b81bf9a44ef845cc36b225f9deaa99a3 100644 (file)
--- a/info.php
+++ b/info.php
@@ -57,14 +57,14 @@ $message = "Server: " . $servers[$server]["description"];
 // Echo the HTML snippet
 $text = <<<EOT
 <div id="$panel" class="panel" title="Info">
-<div class="dialogHeader">$message</div>
-<h2>Server version</h2><div class="valueBox">$version</div>
-<h2>Server host</h2><div class="valueBox">$host</div>
-<h2>Server port</h2><div class="valueBox">$port</div>
-<h2>Active connections</h2><div class="valueBox">$connections</div>
-<h2>Current database</h2><div class="valueBox">$database</div>
-<h2>Current username</h2><div class="valueBox">$username</div>
-<h2>Current backend PID</h2><div class="valueBox">$pid</div>
+<div class="dh">$message</div>
+<h2>Server version</h2><div class="vb">$version</div>
+<h2>Server host</h2><div class="vb">$host</div>
+<h2>Server port</h2><div class="vb">$port</div>
+<h2>Active connections</h2><div class="vb">$connections</div>
+<h2>Current database</h2><div class="vb">$database</div>
+<h2>Current username</h2><div class="vb">$username</div>
+<h2>Current backend PID</h2><div class="vb">$pid</div>
 </div>
 EOT;
 

diff --git a/locks.php b/locks.php
index 62bcdb826229ee400ee8bcae5839f87da237e6af..fa8d2db9e23e540be046189efbe0a0cd9e8fcc5e 100644 (file)
--- a/locks.php
+++ b/locks.php
@@ -97,21 +97,21 @@ while ($row = pg_fetch_assoc($res)) {
        // Set the sub-panel ID
        $subpanel = $panel . "row" . $rownum++;
 
-       $list .= "      <li class=\"double\"><a href=\"#" . $subpanel . "\">Class: <span class=\"coloredValue\">" . www_clean($row['class']) . "</span><br />Mode: <span class=\"coloredValue\">" . www_clean($row['mode']) . "</span><br /></span> DB: <span class=\"coloredValue\">" . www_clean($row['dbname']) . "</span></a></li>\n";
+       $list .= "      <li class=\"d\"><a href=\"#" . $subpanel . "\">Class: <span class=\"cv\">" . www_clean($row['class']) . "</span><br />Mode: <span class=\"cv\">" . www_clean($row['mode']) . "</span><br /></span> DB: <span class=\"cv\">" . www_clean($row['dbname']) . "</span></a></li>\n";
 
        $divs .= "<div id=\"" . $subpanel . "\" class=\"panel\" title=\"Lock\">";
-       $divs .= "<div class=\"dialogHeader\">$message2</div>";
-       $divs .= "<h2>PID</h2><div class=\"valueBox\">" . www_clean($row['pid']) . "</div>";
-       $divs .= "<h2>Database</h2><div class=\"valueBox\">" . www_clean($row['dbname']) . "</div>";
-       $divs .= "<h2>Class</h2><div class=\"valueBox\">" . www_clean($row['class']) . "</div>";
-       $divs .= "<h2>Username</h2><div class=\"valueBox\">" . www_clean($row['user']) . "</div>";
+       $divs .= "<div class=\"dh\">$message2</div>";
+       $divs .= "<h2>PID</h2><div class=\"vb\">" . www_clean($row['pid']) . "</div>";
+       $divs .= "<h2>Database</h2><div class=\"vb\">" . www_clean($row['dbname']) . "</div>";
+       $divs .= "<h2>Class</h2><div class=\"vb\">" . www_clean($row['class']) . "</div>";
+       $divs .= "<h2>Username</h2><div class=\"vb\">" . www_clean($row['user']) . "</div>";
        if ($version >= 80300)
-               $divs .= "<h2>Virtual XID</h2><div class=\"valueBox\">" . www_clean($row['virtualxid']) . "</div>";
-       $divs .= "<h2>Transaction</h2><div class=\"valueBox\">" . www_clean($row['transaction']) . "</div>";
-       $divs .= "<h2>Mode</h2><div class=\"valueBox\">" . www_clean($row['mode']) . "</div>";
-       $divs .= "<h2>Granted?</h2><div class=\"valueBox\">" . ($row['granted'] == "t" ? "Yes" : "No") . "</div>";
-       $divs .= "<h2>Query</h2><div class=\"valueBox\">" . www_clean($row['current_query']) . "</div>";
-       $divs .= "<h2>Query start</h2><div class=\"valueBox\">" . www_clean($row['query_start']) . "</div>";
+               $divs .= "<h2>Virtual XID</h2><div class=\"vb\">" . www_clean($row['virtualxid']) . "</div>";
+       $divs .= "<h2>Transaction</h2><div class=\"vb\">" . www_clean($row['transaction']) . "</div>";
+       $divs .= "<h2>Mode</h2><div class=\"vb\">" . www_clean($row['mode']) . "</div>";
+       $divs .= "<h2>Granted?</h2><div class=\"vb\">" . ($row['granted'] == "t" ? "Yes" : "No") . "</div>";
+       $divs .= "<h2>Query</h2><div class=\"vb\">" . www_clean($row['current_query']) . "</div>";
+       $divs .= "<h2>Query start</h2><div class=\"vb\">" . www_clean($row['query_start']) . "</div>";
        $divs .= "</div>";
 }
 

diff --git a/query.php b/query.php
index 13f955891c37e42364aed22b71d4b5397b4be683..64b385f80f88b4f164410eb8bf6112c0f9462854 100644 (file)
--- a/query.php
+++ b/query.php
@@ -51,11 +51,11 @@ while ($row = pg_fetch_assoc($res)) {
         // Generate a query ID to stop queries stomping on each other
        $id = md5(uniqid(rand(), true));
        
-       $list .= "<li><img src=\"images/database.png\" class=\"menuImage\"><a href=\"#" . $subpanel . "\">" . www_clean($row['datname']) . "</a></li>";
+       $list .= "<li><img src=\"images/database.png\" class=\"mi\"><a href=\"#" . $subpanel . "\">" . www_clean($row['datname']) . "</a></li>";
 
        $divs .= "<div id=\"$subpanel\" class=\"panel\" title=\"Query tool\">";
        $divs .= "<form class=\"panel\" action=\"results.php?s=" . $server . "&d=" . www_clean($row['datname']) . "&i=" . $id . "\" method=\"POST\" selected=\"true\">";
-       $divs .= "<div class=\"dialogHeader\">Database: " . www_clean($row['datname']) . "</div>";
+       $divs .= "<div class=\"dh\">Database: " . www_clean($row['datname']) . "</div>";
        $divs .= "<h2>SQL query</h2>";
        $divs .= "<fieldset>";
        $divs .= "<div class=\"row\">";

diff --git a/results.php b/results.php
index 4f1d900a6cd0f0f4ef906b7953d0715d5149646d..3330fb16dd2568a84e7787b5b2d99d13f8e7e622 100644 (file)
--- a/results.php
+++ b/results.php
@@ -144,15 +144,15 @@ function get_block($offset, $id)
        for ($x = $offset; $x < $last_row; $x++) {
 
                // Build the row preview list.
-               $data .= "<li class=\"double\"><a href=\"results.php?i=" . $id . "&r=" . $x . "\">";
+               $data .= "<li class=\"d\"><a href=\"results.php?i=" . $id . "&r=" . $x . "\">";
 
-               $data .= $_SESSION[$id]['columns'][0] . ": <span class=\"coloredValue\">" . www_clean(truncate_title($_SESSION[$id]['rows'][$x][0])) . "</span>";
+               $data .= $_SESSION[$id]['columns'][0] . ": <span class=\"cv\">" . www_clean(truncate_title($_SESSION[$id]['rows'][$x][0])) . "</span>";
 
                if ($_SESSION[$id]['column_count'] >= 2)
-                       $data .= "<br />" . $_SESSION[$id]['columns'][1] . ": <span class=\"coloredValue\">" . www_clean(truncate_title($_SESSION[$id]['rows'][$x][1])) . "</span>";
+                       $data .= "<br />" . $_SESSION[$id]['columns'][1] . ": <span class=\"cv\">" . www_clean(truncate_title($_SESSION[$id]['rows'][$x][1])) . "</span>";
 
                if ($_SESSION[$id]['column_count'] >= 3)
-                       $data .= "<br />" . $_SESSION[$id]['columns'][2] . ": <span class=\"coloredValue\">" . www_clean(truncate_title($_SESSION[$id]['rows'][$x][2])) . "</span>";
+                       $data .= "<br />" . $_SESSION[$id]['columns'][2] . ": <span class=\"cv\">" . www_clean(truncate_title($_SESSION[$id]['rows'][$x][2])) . "</span>";
 
                $data .= "</a></li>";
        }
@@ -185,10 +185,10 @@ function get_row($row, $id)
 
        // Build the panel for this row
        $data .= "<div class=\"panel\" title=\"Query row\">";
-       $data .= "<div class=\"dialogHeader\">Row: " . ($row + 1) . "</div>";
+       $data .= "<div class=\"dh\">Row: " . ($row + 1) . "</div>";
 
        for ($col = 0; $col < $_SESSION[$id]['column_count']; $col++) {
-               $data .= "<h2>" . $_SESSION[$id]['columns'][$col] . "</h2><div class=\"valueBox\">" . www_clean(truncate_value($_SESSION[$id]['rows'][$row][$col])) . "</div>";
+               $data .= "<h2>" . $_SESSION[$id]['columns'][$col] . "</h2><div class=\"vb\">" . www_clean(truncate_value($_SESSION[$id]['rows'][$row][$col])) . "</div>";
        }
 
        $data .= "</div>";

diff --git a/server.php b/server.php
index f5094c6db30b59fdfa9f5fa581137b76321435fc..c5e2827372f7177c9680e46cda367a18d862bd8b 100644 (file)
--- a/server.php
+++ b/server.php
@@ -28,12 +28,12 @@ $description = $servers[$server]["description"];
 $text = <<<EOT
 <ul id="server$server" title="Tools"> 
 <li class="group">Server: $description</li>
-<li><img src="images/info.png" class="menuImage"><a href="info.php?s=$server">Info</a></li>
-<li><img src="images/connections.png" class="menuImage"><a href="connections.php?s=$server">Connections</a></li>
-<li><img src="images/gucs.png" class="menuImage"><a href="gucs.php?s=$server">GUCs</a></li>
-<li><img src="images/locks.png" class="menuImage"><a href="locks.php?s=$server">Locks</a></li>
-<li><img src="images/transactions.png" class="menuImage"><a href="transactions.php?s=$server">Prepared transactions</a></li>
-<li><img src="images/query.png" class="menuImage"><a href="query.php?s=$server">SQL query</a></li>
+<li><img src="images/info.png" class="mi"><a href="info.php?s=$server">Info</a></li>
+<li><img src="images/connections.png" class="mi"><a href="connections.php?s=$server">Connections</a></li>
+<li><img src="images/gucs.png" class="mi"><a href="gucs.php?s=$server">GUCs</a></li>
+<li><img src="images/locks.png" class="mi"><a href="locks.php?s=$server">Locks</a></li>
+<li><img src="images/transactions.png" class="mi"><a href="transactions.php?s=$server">Prepared transactions</a></li>
+<li><img src="images/query.png" class="mi"><a href="query.php?s=$server">SQL query</a></li>
 </ul>
 EOT;
 

diff --git a/transactions.php b/transactions.php
index c7ce4a2105b73b22a22d6bd28dbe138f62d6ecdd..c155caffa9b8558b7b4c3a2732ff392ed11bd6ec 100644 (file)
--- a/transactions.php
+++ b/transactions.php
@@ -57,15 +57,15 @@ while ($row = pg_fetch_assoc($res)) {
        // Set the sub-panel ID
        $subpanel = $panel . "row" . $rownum++;
 
-       $list .= "      <li class=\"double\"><a href=\"#" . $subpanel . "\">XID: <span class=\"coloredValue\">" . www_clean($row['transaction']) . "</span><br />User: <span class=\"coloredValue\">" . www_clean($row['owner']) . "</span> DB: <span class=\"coloredValue\">" . www_clean($row['database']) . "</span></a></li>";
+       $list .= "      <li class=\"d\"><a href=\"#" . $subpanel . "\">XID: <span class=\"cv\">" . www_clean($row['transaction']) . "</span><br />User: <span class=\"cv\">" . www_clean($row['owner']) . "</span> DB: <span class=\"cv\">" . www_clean($row['database']) . "</span></a></li>";
 
        $divs .= "<div id=\"" . $subpanel . "\" class=\"panel\" title=\"Transaction\">";
-       $divs .= "<div class=\"dialogHeader\">$message2</div>";
-       $divs .= "<h2>XID</h2><div class=\"valueBox\">" . www_clean($row['transaction']) . "</div>";
-       $divs .= "<h2>Global ID</h2><div class=\"valueBox\">" . www_clean($row['gid']) . "</div>";
-       $divs .= "<h2>Time</h2><div class=\"valueBox\">" . www_clean($row['prepared']) . "</div>";
-       $divs .= "<h2>Owner</h2><div class=\"valueBox\">" . www_clean($row['owner']) . "</div>";
-       $divs .= "<h2>Database</h2><div class=\"valueBox\">" . www_clean($row['database']) . "</div>";
+       $divs .= "<div class=\"dh\">$message2</div>";
+       $divs .= "<h2>XID</h2><div class=\"vb\">" . www_clean($row['transaction']) . "</div>";
+       $divs .= "<h2>Global ID</h2><div class=\"vb\">" . www_clean($row['gid']) . "</div>";
+       $divs .= "<h2>Time</h2><div class=\"vb\">" . www_clean($row['prepared']) . "</div>";
+       $divs .= "<h2>Owner</h2><div class=\"vb\">" . www_clean($row['owner']) . "</div>";
+       $divs .= "<h2>Database</h2><div class=\"vb\">" . www_clean($row['database']) . "</div>";
        $divs .= "</div>";
 }