[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1-2933-g095e081

Thu Jun 2 15:17:40 CEST 2011

The branch, master has been updated
       via  095e0818b8d69722fceae3ad518b74d02b488ed0 (commit)
       via  3cb40926c04f11342b4f1f2a0ebccd1bd143e9bf (commit)
      from  796b81ac995182386ddcc86d872114bccdb569c6 (commit)


- Log -----------------------------------------------------------------
commit 095e0818b8d69722fceae3ad518b74d02b488ed0
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jun 2 15:17:27 2011 +0200

    Remove div which seems to be leftover from slider removal

commit 3cb40926c04f11342b4f1f2a0ebccd1bd143e9bf
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Jun 2 15:07:57 2011 +0200

    Remove other not needed files

-----------------------------------------------------------------------

Summary of changes:
 js/codemirror/mode/mysql/index.html |   68 -----------------------------------
 js/codemirror/mode/mysql/mysql.css  |   33 -----------------
 tbl_structure.php                   |    4 --
 3 files changed, 0 insertions(+), 105 deletions(-)
 delete mode 100644 js/codemirror/mode/mysql/index.html
 delete mode 100644 js/codemirror/mode/mysql/mysql.css

diff --git a/js/codemirror/mode/mysql/index.html b/js/codemirror/mode/mysql/index.html
deleted file mode 100644
index c9bb251..0000000
--- a/js/codemirror/mode/mysql/index.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>CodeMirror 2: MySQL mode</title>
-    <link rel="stylesheet" href="../../lib/codemirror.css">
-    <script src="../../lib/codemirror.js"></script>
-    <script src="mysql.js"></script>
-    <link rel="stylesheet" href="mysql.css">
-    <link rel="stylesheet" href="../../css/docs.css">
-    <style>.CodeMirror {border: 2px inset #dee;}</style>
-  </head>
-  <body>
-    <h1>CodeMirror 2: MySQL mode</h1>
-
-<form><textarea id="code" name="code">
--- MySQL Code Demo
-/*
-   based on PL/SQL, addapted to MySQL by Michal Cihar ( http://cihar.com/ )
-   June 2011
-*/
-
-CREATE FUNCTION inventory_in_stock(p_inventory_id INT) RETURNS BOOLEAN
-READS SQL DATA
-BEGIN
-    DECLARE v_rentals INT;
-    DECLARE v_out     INT;
-
-    #AN ITEM IS IN-STOCK IF THERE ARE EITHER NO ROWS IN THE rental TABLE
-    #FOR THE ITEM OR ALL ROWS HAVE return_date POPULATED
-
-    SELECT COUNT(*) INTO v_rentals
-    FROM rental
-    WHERE inventory_id = p_inventory_id;
-
-    IF v_rentals = 0 THEN
-      RETURN TRUE;
-    END IF;
-
-    SELECT COUNT(rental_id) INTO v_out
-    FROM inventory LEFT JOIN rental USING(inventory_id)
-    WHERE inventory.inventory_id = p_inventory_id
-    AND rental.return_date IS NULL;
-
-    IF v_out > 0 THEN
-      RETURN FALSE;
-    ELSE
-      RETURN TRUE;
-    END IF;
-END
---
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        indentUnit: 4,
-        mode: "text/x-mysql"
-      });
-    </script>
-
-    <p>
-        Simple mode that handles MySQL language.
-    </p>
-
-    <p><strong>MIME type defined:</strong> <code>text/x-mysql</code>
-    (MySQL code)
-</html>
diff --git a/js/codemirror/mode/mysql/mysql.css b/js/codemirror/mode/mysql/mysql.css
deleted file mode 100644
index a03411a..0000000
--- a/js/codemirror/mode/mysql/mysql.css
+++ /dev/null
@@ -1,33 +0,0 @@
-span.mysql-keyword {
-    color: blue;
-}
-span.mysql-var {
-    color: red;
-}
-span.mysql-comment {
-    color: #AA7700;
-}
-span.mysql-string {
-    color: green;
-}
-span.mysql-operator {
-    color: blue;
-}
-span.mysql-word {
-    color: black;
-}
-span.mysql-function {
-    color: darkorange;
-}
-span.mysql-sqlplus {
-    color: darkorange;
-}
-span.mysql-type {
-    color: purple;
-}
-span.mysql-separator {
-    color: #666666;
-}
-span.mysql-number {
-    color: darkcyan;
-}
diff --git a/tbl_structure.php b/tbl_structure.php
index e2a436d..4f91e16 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -706,7 +706,6 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' !=  $tbl_type) {
 // BEGIN - Calc Table Space
 // Get valid statistics whatever is the table type
 if ($cfg['ShowStats']) {
-    echo '<div id="tablestatistics">';
     if (empty($showtable)) {
         $showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true);
     }
@@ -925,9 +924,6 @@ if ($cfg['ShowStats']) {
     </tbody>
     </table>
 
-    <!-- close tablestatistics div -->
-    </div>
-
     <?php
 }
 // END - Calc Table Space


hooks/post-receive
-- 
phpMyAdmin


