RFE#701 - Print View using CSS - Rewrite

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

2 files changed, 14 insertions, 511 deletions

diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php
index 78aa366879..d4cde9043a 100644
--- a/test/classes/PMA_DisplayResults_test.php
+++ b/test/classes/PMA_DisplayResults_test.php
@@ -499,7 +499,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 array('`new`.`id`' => '= 1'),
                 '[%_PMA_CHECKBOX_DIR_%]',
                 'odd',
-                '<td class="odd" class="center"><input type'
+                '<td class="odd" class="center print_ignore"><input type'
                 . '="checkbox" id="id_rows_to_delete0[%_PMA_CHECKBOX_DIR_%]" name='
                 . '"rows_to_delete[0]" class="multi_checkbox checkall" value="%60'
                 . 'new%60.%60id%60+%3D+1"  /><input type="hidden" class="condition_'
@@ -560,7 +560,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '"Edit" class="icon ic_b_edit" /> Edit</span>',
                 '`customer`.`id` = 1',
                 '%60customer%60.%60id%60+%3D+1',
-                '<td class="odd edit_row_anchor center"  >'
+                '<td class="odd edit_row_anchor center print_ignore"  >'
                 . '<span class="nowrap">' . "\n"
                 . '<a href="tbl_change.php?db=Data&amp;table=customer&amp;where_'
                 . 'clause=%60customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
@@ -623,7 +623,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 '`customer`.`id` = 1',
                 '%60customer%60.%60id%60+%3D+1',
                 'odd',
-                '<td class="odd center"  ><span class='
+                '<td class="odd center print_ignore"  ><span class='
                 . '"nowrap">' . "\n"
                 . '<a href="tbl_change.php?db=Data&amp;table=customer&amp;where_'
                 . 'clause=%60customer%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
@@ -688,7 +688,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
                 'DELETE FROM `Data`.`customer` WHERE `customer`.`id` = 1',
                 'odd',
-                '<td class="odd center"  >' . "\n"
+                '<td class="odd center print_ignore"  >' . "\n"
                 . '<a href="sql.php?db=Data&amp;table=customer&amp;sql_query=DELETE'
                 . '+FROM+%60Data%60.%60customer%60+WHERE+%60customer%60.%60id%60+%3D'
                 . '+1&amp;message_to_show=The+row+has+been+deleted&amp;goto=sql.php'
@@ -783,11 +783,11 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
                 . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
                 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
-                '<td  class="center"><input type="checkbox" id="id_rows_to_delete0_'
+                '<td  class="center print_ignore"><input type="checkbox" id="id_rows_to_delete0_'
                 . 'left" name="rows_to_delete[0]" class="multi_checkbox checkall" '
                 . 'value="%60new%60.%60id%60+%3D+1"  /><input type="hidden" class='
                 . '"condition_array" value="{&quot;`new`.`id`&quot;:&quot;= 1&quot;'
-                . '}" />    </td><td class="edit_row_anchor center"  ><span class='
+                . '}" />    </td><td class="edit_row_anchor center print_ignore"  ><span class='
                 . '"nowrap">' . "\n"
                 . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_'
                 . 'clause=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;'
@@ -796,7 +796,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '<span class="nowrap"><img src="themes/dot.gif" title="Edit" '
                 . 'alt="Edit" class="icon ic_b_edit" /> Edit</span></a>' . "\n"
                 . '<input type="hidden" class="where_clause" value ="%60new%60.%60'
-                . 'id%60+%3D+1" /></span></td><td class="center"  ><span class'
+                . 'id%60+%3D+1" /></span></td><td class="center print_ignore"  ><span class'
                 . '="nowrap">' . "\n"
                 . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_clause'
                 . '=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
@@ -805,7 +805,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
                 . 'class="icon ic_b_insrow" /> Copy</span></a>' . "\n"
                 . '<input type="hidden" class="where_clause" value="%60new%60.%60id'
-                . '%60+%3D+1" /></span></td><td class="center"  >' . "\n"
+                . '%60+%3D+1" /></span></td><td class="center print_ignore"  >' . "\n"
                 . '<a href="sql.php?db=data&amp;table=new&amp;sql_query=DELETE+'
                 . 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;'
                 . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3F'
@@ -859,7 +859,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
                 . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
                 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
-                '<td class="center"  >' . "\n"
+                '<td class="center print_ignore"  >' . "\n"
                 . '<a href="sql.php?db=data&amp;table=new&amp;sql_query=DELETE+'
                 . 'FROM+%60data%60.%60new%60+WHERE+%60new%60.%60id%60+%3D+1&amp;'
                 . 'message_to_show=The+row+has+been+deleted&amp;goto=sql.php%3Fdb'
@@ -870,7 +870,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '_row requireConfirm"><span class="nowrap"><img src="themes/dot.gif" title='
                 . '"Delete" alt="Delete" class="icon ic_b_drop" /> Delete</span></a>'
                 . "\n" . '<div class="hide">DELETE FROM `data`.`new` WHERE `new`.'
-                . '`id` = 1</div></td><td class="center"  ><span class="nowrap">'
+                . '`id` = 1</div></td><td class="center print_ignore"  ><span class="nowrap">'
                 . "\n" . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_'
                 . 'clause=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_'
                 . 'query=SELECT+%2A+FROM+%60new%60&amp;goto=sql.php&amp;default_'
@@ -878,7 +878,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . 'class="nowrap"><img src="themes/dot.gif" title="Copy" alt="Copy" '
                 . 'class="icon ic_b_insrow" /> Copy</span></a>' . "\n"
                 . '<input type="hidden" class="where_clause" value="%60new%60.%60id'
-                . '%60+%3D+1" /></span></td><td class="edit_row_anchor center"  >'
+                . '%60+%3D+1" /></span></td><td class="edit_row_anchor center print_ignore"  >'
                 . '<span class="nowrap">' . "\n"
                 . '<a href="tbl_change.php?db=data&amp;table=new&amp;where_clause'
                 . '=%60new%60.%60id%60+%3D+1&amp;clause_is_unique=1&amp;sql_query='
@@ -887,7 +887,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '"nowrap"><img src="themes/dot.gif" title="Edit" alt="Edit" class'
                 . '="icon ic_b_edit" /> Edit</span></a>' . "\n"
                 . '<input type="hidden" class="where_clause" value ="%60new%60.%60'
-                . 'id%60+%3D+1" /></span></td><td  class="center"><input type='
+                . 'id%60+%3D+1" /></span></td><td  class="center print_ignore"><input type='
                 . '"checkbox" id="id_rows_to_delete0_right" name="rows_to_delete'
                 . '[0]" class="multi_checkbox checkall" value="%60new%60.%60id%60'
                 . '+%3D+1"  /><input type="hidden" class="condition_array" value="'
@@ -933,7 +933,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
                 . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
                 'DELETE FROM `data`.`new` WHERE `new`.`id` = 1',
-                '<td  class="center"><input type="checkbox" id="id_rows_to_'
+                '<td  class="center print_ignore"><input type="checkbox" id="id_rows_to_'
                 . 'delete0_left" name="rows_to_delete[0]" class="multi_checkbox '
                 . 'checkall" value="%60new%60.%60id%60+%3D+1"  /><input type='
                 . '"hidden" class="condition_array" value="{&quot;`new`.`id`&quot;:'
@@ -1033,7 +1033,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 '<span class="nowrap"><img src="themes/dot.gif" title="Delete" '
                 . 'alt="Delete" class="icon ic_b_drop" /> Delete</span>',
                 null,
-                '<td  class="center"><input type="checkbox" id="id_rows_to_'
+                '<td  class="center print_ignore"><input type="checkbox" id="id_rows_to_'
                 . 'delete0_left" name="rows_to_delete[0]" class="multi_checkbox '
                 . 'checkall" value="%60new%60.%60id%60+%3D+1"  /><input type='
                 . '"hidden" class="condition_array" value="{&quot;`new`.`id`&quot;:'
diff --git a/test/libraries/PMA_tbl_printview_test.php b/test/libraries/PMA_tbl_printview_test.php
deleted file mode 100644
index 3db524559a..0000000000
--- a/test/libraries/PMA_tbl_printview_test.php
+++ /dev/null
@@ -1,497 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Tests for libraries/tbl_printview.lib.php
- *
- * @package PhpMyAdmin-test
- */
-
-/*
- * Include to test.
- */
-require_once 'libraries/tbl_printview.lib.php';
-require_once 'libraries/Util.class.php';
-require_once 'libraries/database_interface.inc.php';
-require_once 'libraries/php-gettext/gettext.inc';
-require_once 'libraries/relation.lib.php';
-require_once 'libraries/url_generating.lib.php';
-require_once 'libraries/Tracker.class.php';
-require_once 'libraries/transformations.lib.php';
-require_once 'libraries/Message.class.php';
-require_once 'libraries/Table.class.php';
-require_once 'libraries/js_escape.lib.php';
-require_once 'libraries/sqlparser.lib.php';
-require_once 'libraries/Index.class.php';
-
-/**
- * Tests for libraries/tbl_printview.lib.php
- *
- * @package PhpMyAdmin-test
- */
-class PMA_TblPrintViewTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * Setup function for test cases
-     *
-     * @access protected
-     * @return void
-     */
-    protected function setUp()
-    {
-        /**
-         * SET these to avoid undefined index error
-         */
-        $GLOBALS['server'] = 1;
-        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
-        $GLOBALS['cfg']['LimitChars'] = 100;
-        $_SESSION['relation'][$GLOBALS['server']] = array(
-            'table_coords' => "table_name",
-            'displaywork' => 'displaywork',
-            'db' => "information_schema",
-            'table_info' => 'table_info',
-            'column_info' => 'column_info',
-            'relwork' => 'relwork',
-            'relation' => 'relation',
-            'commwork' => 'commwork',
-            'bookmarkwork' => 'bookmarkwork',
-        );
-
-        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $fetchResult = array(
-            'column1' => array('mimetype' => 'value1', 'transformation'=> 'pdf'),
-            'column2' => array('mimetype' => 'value2', 'transformation'=> 'xml'),
-        );
-
-        $dbi->expects($this->any())->method('fetchResult')
-            ->will($this->returnValue($fetchResult));
-
-        $dbi->expects($this->any())->method('getTableIndexes')
-            ->will($this->returnValue(array()));
-
-        $GLOBALS['dbi'] = $dbi;
-    }
-
-    /**
-     * Tests for PMA_getHtmlForTablesInfo() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForTablesInfo()
-    {
-        $the_tables = array("PMA_table1", "PMA_table2");
-
-        $html = PMA_getHtmlForTablesInfo($the_tables);
-
-        $this->assertContains(
-            __('Showing tables:'),
-            $html
-        );
-        $this->assertContains(
-            "`PMA_table1`, `PMA_table2`",
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForPrintViewFooter() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForPrintViewFooter()
-    {
-        $html = PMA_getHtmlForPrintViewFooter();
-
-        $this->assertContains(
-            '<input type="button" class="button" id="print" value="Print" />',
-            $html
-        );
-        $this->assertContains(
-            "PMA_disable_floating_menubar",
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForRowStatistics() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForRowStatistics()
-    {
-        $showtable = array(
-            'Row_format' => "Fixed",
-            'Rows' => 10,
-            'Avg_row_length' => 123,
-            'Data_length' => 345,
-            'Auto_increment' => 1234,
-            'Create_time' => "today",
-            'Update_time' => "time2",
-            'Check_time' => "yesterday",
-        );
-        $cell_align_left = "cell_align_left";
-        $avg_size = 12;
-        $avg_unit = 45;
-        $mergetable = false;
-
-        $html = PMA_getHtmlForRowStatistics(
-            $showtable, $cell_align_left, $avg_size, $avg_unit, $mergetable
-        );
-
-        $this->assertContains(
-            __('Row Statistics:'),
-            $html
-        );
-
-        //validation 1 : Row_format
-        $this->assertContains(
-            __('Format'),
-            $html
-        );
-        $this->assertContains(
-            $cell_align_left,
-            $html
-        );
-        //$showtable['Row_format'] == 'Fixed'
-        $this->assertContains(
-            __('static'),
-            $html
-        );
-
-        //validation 2 : Avg_row_length
-        $length = PMA_Util::formatNumber(
-            $showtable['Avg_row_length'], 0
-        );
-        $this->assertContains(
-            $length,
-            $html
-        );
-        $this->assertContains(
-            __('Row size'),
-            $html
-        );
-        $this->assertContains(
-            $avg_size . ' ' . $avg_unit,
-            $html
-        );
-
-        //validation 3 : Auto_increment
-        $average = PMA_Util::formatNumber(
-            $showtable['Auto_increment'], 0
-        );
-        $this->assertContains(
-            $average,
-            $html
-        );
-        $this->assertContains(
-            __('Next autoindex'),
-            $html
-        );
-
-        //validation 4 : Create_time
-        $time = PMA_Util::localisedDate(
-            strtotime($showtable['Create_time'])
-        );
-        $this->assertContains(
-            __('Creation'),
-            $html
-        );
-        $this->assertContains(
-            $time,
-            $html
-        );
-
-        //validation 5 : Update_time
-        $time = PMA_Util::localisedDate(
-            strtotime($showtable['Update_time'])
-        );
-        $this->assertContains(
-            __('Last update'),
-            $html
-        );
-        $this->assertContains(
-            $time,
-            $html
-        );
-
-        //validation 6 : Check_time
-        $time = PMA_Util::localisedDate(
-            strtotime($showtable['Check_time'])
-        );
-        $this->assertContains(
-            __('Last check'),
-            $html
-        );
-        $this->assertContains(
-            $time,
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForSpaceUsage() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForSpaceUsage()
-    {
-        $data_size = '10';
-        $data_unit = '11';
-        $index_size = '12';
-        $index_unit = '13';
-        $free_size = '14';
-        $free_unit = '15';
-        $effect_size = '16';
-        $effect_unit = '17';
-        $tot_size = '18';
-        $tot_unit = '19';
-        $mergetable = false;
-
-        $html = PMA_getHtmlForSpaceUsage(
-            $data_size, $data_unit, $index_size, $index_unit,
-            $free_size, $free_unit, $effect_size, $effect_unit,
-            $tot_size, $tot_unit, $mergetable
-        );
-
-        //validation 1 : title
-        $this->assertContains(
-            __('Space usage:'),
-            $html
-        );
-
-        //validation 2 : $data_size & $data_unit
-        $this->assertContains(
-            $data_size,
-            $html
-        );
-        $this->assertContains(
-            $data_unit,
-            $html
-        );
-
-        //validation 3 : $index_size & $index_unit
-        $this->assertContains(
-            $index_size,
-            $html
-        );
-        $this->assertContains(
-            $index_unit,
-            $html
-        );
-
-        //validation 4 : Overhead
-        $this->assertContains(
-            __('Overhead'),
-            $html
-        );
-        $this->assertContains(
-            $free_size,
-            $html
-        );
-        $this->assertContains(
-            $free_unit,
-            $html
-        );
-
-        //validation 5 : Effective
-        $this->assertContains(
-            __('Effective'),
-            $html
-        );
-        $this->assertContains(
-            $effect_size,
-            $html
-        );
-        $this->assertContains(
-            $effect_unit,
-            $html
-        );
-
-        //validation 6 : $tot_size & $tot_unit
-        $this->assertContains(
-            $tot_size,
-            $html
-        );
-        $this->assertContains(
-            $tot_unit,
-            $html
-        );
-
-    }
-
-    /**
-     * Tests for PMA_getHtmlForSpaceUsageAndRowStatistics() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForSpaceUsageAndRowStatistics()
-    {
-        $showtable = array(
-            'Row_format' => "Fixed",
-            'Rows' => 10,
-            'Avg_row_length' => 123,
-            'Data_length' => 345,
-            'Auto_increment' => 1234,
-            'Create_time' => "today",
-            'Update_time' => "time2",
-            'Check_time' => "yesterday",
-            'Data_length' => 10,
-            'Index_length' => 12334,
-            'Data_length' => 4567,
-            'Data_free' => 3456,
-            'Check_time' => 1234,
-        );
-        $db = "pma_db";
-        $table = "pma_table";
-        $cell_align_left = "cell_align_left";
-
-        $html = PMA_getHtmlForSpaceUsageAndRowStatistics(
-            $showtable, $db, $table, $cell_align_left
-        );
-
-        //validation 1 : $data_size, $data_unit
-        list($data_size, $data_unit) = PMA_Util::formatByteDown(
-            $showtable['Data_length']
-        );
-        $this->assertContains(
-            $data_size,
-            $html
-        );
-        $this->assertContains(
-            $data_unit,
-            $html
-        );
-
-        //validation 2 : $data_size, $data_unit
-        list($index_size, $index_unit)
-            = PMA_Util::formatByteDown(
-                $showtable['Index_length']
-            );
-        $this->assertContains(
-            $index_size,
-            $html
-        );
-        $this->assertContains(
-            $index_unit,
-            $html
-        );
-
-        //validation 3 : $free_size, $free_unit
-        list($free_size, $free_unit)
-            = PMA_Util::formatByteDown(
-                $showtable['Data_free']
-            );
-        $this->assertContains(
-            $free_size,
-            $html
-        );
-        $this->assertContains(
-            $free_unit,
-            $html
-        );
-
-        //validation 4 : $effect_size, $effect_unit
-        list($effect_size, $effect_unit)
-            = PMA_Util::formatByteDown(
-                $showtable['Data_length'] + $showtable['Index_length']
-                - $showtable['Data_free']
-            );
-        $this->assertContains(
-            $effect_size,
-            $html
-        );
-        $this->assertContains(
-            $effect_unit,
-            $html
-        );
-
-        //validation 5 : $effect_size, $effect_unit
-        list($tot_size, $tot_unit) = PMA_Util::formatByteDown(
-            $showtable['Data_length'] + $showtable['Index_length']
-        );
-        $this->assertContains(
-            $tot_size,
-            $html
-        );
-        $this->assertContains(
-            $tot_unit,
-            $html
-        );
-    }
-
-    /**
-     * Tests for PMA_getHtmlForPrintViewColumns() method.
-     *
-     * @return void
-     * @test
-     */
-    public function testPMAGetHtmlForPrintViewColumns()
-    {
-        $columns = array(
-            array(
-                "Type" => "Type1",
-                "Default" => "Default1",
-                "Null" => "Null1",
-                "Field" => "Field1",
-            )
-        );
-        $analyzed_sql = array(
-            array(
-                'create_table_fields' => array(
-                     "Field1" => array(
-                         "type" => "TIMESTAMP",
-                         "timestamp_not_null" => true
-                     )
-                 )
-            )
-        );
-        $have_rel = false;
-        $res_rel = array();
-        $db = "pma_db";
-        $table = "pma_table";
-        $cfgRelation = array('mimework' => true);
-
-        $html = PMA_getHtmlForPrintViewColumns(
-            false, $columns, $analyzed_sql, $have_rel,
-            $res_rel, $db, $table, $cfgRelation
-        );
-
-        //validation 1 : $row
-        $row = $columns[0];
-        $this->assertContains(
-            htmlspecialchars($row['Default']),
-            $html
-        );
-        $this->assertContains(
-            htmlspecialchars($row['Field']),
-            $html
-        );
-
-        //validation 2 : $field_name
-        $field_name = htmlspecialchars($row['Field']);
-        $comments = PMA_getComments($db, $table);
-        $this->assertContains(
-            $field_name,
-            $html
-        );
-
-        //validation 3 : $extracted_columnspec
-        $extracted_columnspec = PMA_Util::extractColumnSpec($row['Type']);
-        $type = $extracted_columnspec['print_type'];
-        $attribute = $extracted_columnspec['attribute'];
-        $this->assertContains(
-            $type,
-            $html
-        );
-    }
-}
-
-?>