Merge remote-tracking branch 'origin/master'

js/makegrid.js

@@ -654,7 +654,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.isCellEditActive = false;
             g.currentEditCell = null;
             // destroy datepicker in edit area, if exist
-            $(g.cEdit).find('.hasDatepicker').datepicker('destroy');
+            var $dp = $(g.cEdit).find('.hasDatepicker');
+            if ($dp.length > 0) {
+                $dp.datepicker('destroy');
+                // change the cursor in edit box back to normal
+                // (the cursor become a hand pointer when we add datepicker)
+                $(g.cEdit).find('.edit_box').css('cursor', 'inherit');
+            }
         },
 
         /**
@@ -785,11 +791,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     g.lastXHR = $.post('sql.php', post_params, function(data) {
                         g.lastXHR = null;
                         $editArea.removeClass('edit_area_loading');
-                        // save original_data
-                        var value = $(data.dropdown).val();
-                        $td.data('original_data', value);
-                        // update the text input field, in case where the "Relational display column" is checked
-                        $(g.cEdit).find('.edit_box').val(value);
+                        if ($(data.dropdown).is('select')) {
+                            // save original_data
+                            var value = $(data.dropdown).val();
+                            $td.data('original_data', value);
+                            // update the text input field, in case where the "Relational display column" is checked
+                            $(g.cEdit).find('.edit_box').val(value);
+                        }
 
                         $editArea.append(data.dropdown);
                         $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
@@ -942,6 +950,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         }
                     });
                     
+                    // cancel any click on the datepicker element
+                    $editArea.find('> *').click(function(e) {
+                        e.stopPropagation();
+                    });
+                    
                     // force to restore modified $input_field value after adding datepicker
                     // (after adding a datepicker, the input field doesn't display the time anymore, only the date)
                     if (!is_null) {
@@ -1572,9 +1585,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     e.preventDefault();
                 }
             });
-            $(g.cEdit).find('.edit_area').click(function(e) {
-                e.stopPropagation();
-            });
             $('html').click(function(e) {
                 // hide edit cell if the click is not from g.cEdit
                 if ($(e.target).parents().index(g.cEdit) == -1) {

libraries/common.lib.php

@@ -97,11 +97,11 @@ function PMA_getIcon($icon, $alternate = '', $force_text = false, $noSprite = fa
     if ($include_icon) {
         if ($noSprite) {
             $button .= '<img src="' . $GLOBALS['pmaThemeImage'] . $icon . '"'
-                    . ' class="icon" width="16" height="16" />';
+                . ' class="icon" width="16" height="16" />';
         } else {
-            $button .= '<img src="themes/dot.gif"'
-                . ' title="' . $alternate . '" alt="' . $alternate . '"'
-                . ' class="icon ic_' . str_replace(array('.gif','.png'), '', $icon) . '" />';
+            $button .= '<img src="themes/dot.gif"' . ' title="'
+                . $alternate . '" alt="' . $alternate . '"' . ' class="icon ic_'
+                . str_replace(array('.gif','.png'), '', $icon) . '" />';
         }
     }
 
@@ -386,15 +386,21 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
         if (defined('PMA_MYSQL_INT_VERSION')) {
             if (PMA_MYSQL_INT_VERSION >= 50500) {
                 $mysql = '5.5';
-                /* l10n: Language to use for MySQL 5.5 documentation, please use only languages which do exist in official documentation.  */
+                /* l10n: Language to use for MySQL 5.5 documentation, please
+                 * use only languages which do exist in official documentation.
+                 */
                 $lang = _pgettext('MySQL 5.5 documentation language', 'en');
             } else if (PMA_MYSQL_INT_VERSION >= 50100) {
                 $mysql = '5.1';
-                /* l10n: Language to use for MySQL 5.1 documentation, please use only languages which do exist in official documentation.  */
+                /* l10n: Language to use for MySQL 5.1 documentation, please
+                 * use only languages which do exist in official documentation.
+                 */
                 $lang = _pgettext('MySQL 5.1 documentation language', 'en');
             } else {
                 $mysql = '5.0';
-                /* l10n: Language to use for MySQL 5.0 documentation, please use only languages which do exist in official documentation. */
+                /* l10n: Language to use for MySQL 5.0 documentation, please use
+                 * only languages which do exist in official documentation.
+                 */
                 $lang = _pgettext('MySQL 5.0 documentation language', 'en');
             }
         }
@@ -409,9 +415,11 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
     if ($just_open) {
         return $open_link;
     } elseif ($big_icon) {
-        return $open_link . '<img class="icon ic_b_sqlhelp" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return $open_link . '<img class="icon ic_b_sqlhelp" src="themes/dot.gif" alt="'
+            . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } elseif ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        return $open_link . '<img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return $open_link . '<img class="icon ic_b_help_s" src="themes/dot.gif" alt="'
+            . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } else {
         return '[' . $open_link . __('Documentation') . '</a>]';
     }
@@ -430,9 +438,12 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
 function PMA_showDocu($anchor)
 {
     if ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        return '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return '<a href="Documentation.html#' . $anchor . '" target="documentation">'
+            . '<img class="icon ic_b_help_s" src="themes/dot.gif" alt="'
+            . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } else {
-        return '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . __('Documentation') . '</a>]';
+        return '[<a href="Documentation.html#' . $anchor . '" target="documentation">'
+        . __('Documentation') . '</a>]';
     }
 } // end of the 'PMA_showDocu()' function
 
@@ -450,7 +461,9 @@ function PMA_showPHPDocu($target)
     $url = PMA_getPHPDocLink($target);
 
     if ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        return '<a href="' . $url . '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+        return '<a href="' . $url . '" target="documentation">'
+            . '<img class="icon ic_b_help_s" src="themes/dot.gif" alt="'
+            . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
     } else {
         return '[<a href="' . $url . '" target="documentation">' . __('Documentation') . '</a>]';
     }
@@ -559,7 +572,8 @@ $is_modify_link = true, $back_url = '', $exit = true)
         // ---
         // modified to show the help on sql errors
         $error_msg_output .= '    <p><strong>' . __('SQL query') . ':</strong>' . "\n";
-        if (strstr(strtolower($formatted_sql), 'select')) { // please show me help to the error on select
+        if (strstr(strtolower($formatted_sql), 'select')) {
+            // please show me help to the error on select
             $error_msg_output .= PMA_showMySQLDocu('SQL-Syntax', 'SELECT');
         }
         if ($is_modify_link) {
@@ -588,8 +602,12 @@ $is_modify_link = true, $back_url = '', $exit = true)
             .'    </p>' . "\n";
     } // end if
 
-    if (!empty($error_message)) {
-        $error_message = preg_replace("@((\015\012)|(\015)|(\012)){3,}@", "\n\n", $error_message);
+    if (! empty($error_message)) {
+        $error_message = preg_replace(
+            "@((\015\012)|(\015)|(\012)){3,}@",
+            "\n\n",
+            $error_message
+        );
     }
     // modified to show the help on error-returns
     // (now error-messages-server)
@@ -600,7 +618,8 @@ $is_modify_link = true, $back_url = '', $exit = true)
             . '</p>' . "\n";
 
     // The error message will be displayed within a CODE segment.
-    // To preserve original formatting, but allow wordwrapping, we do a couple of replacements
+    // To preserve original formatting, but allow wordwrapping,
+    // we do a couple of replacements
 
     // Replace all non-single blanks with their HTML-counterpart
     $error_message = str_replace('  ', '&nbsp;&nbsp;', $error_message);
@@ -928,7 +947,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         echo "\n";
         echo '<script type="text/javascript">' . "\n";
         echo '//<![CDATA[' . "\n";
-        echo "if (window.parent.updateTableTitle) window.parent.updateTableTitle('" . $uni_tbl . "', '" . PMA_jsFormat($tooltip, false) . "');" . "\n";
+        echo "if (window.parent.updateTableTitle) window.parent.updateTableTitle('"
+            . $uni_tbl . "', '" . PMA_jsFormat($tooltip, false) . "');" . "\n";
         echo '//]]>' . "\n";
         echo '</script>' . "\n";
     } // end if ... elseif
@@ -947,7 +967,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
 
     // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
     // check for it's presence before using it
-    echo '<div id="result_query" align="' . ( isset($GLOBALS['cell_align_left']) ? $GLOBALS['cell_align_left'] : '' ) . '">' . "\n";
+    echo '<div id="result_query" align="'
+        . ( isset($GLOBALS['cell_align_left']) ? $GLOBALS['cell_align_left'] : '' )
+        . '">' . "\n";
 
     if ($message instanceof PMA_Message) {
         if (isset($GLOBALS['special_message'])) {
@@ -986,7 +1008,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
             // when the query is large (for example an INSERT of binary
             // data), the parser chokes; so avoid parsing the query
             $query_too_big = true;
-            $shortened_query_base = nl2br(htmlspecialchars(substr($sql_query, 0, $cfg['MaxCharactersInDisplayedSQL']) . '[...]'));
+            $shortened_query_base = nl2br(
+                htmlspecialchars(
+                    substr($sql_query, 0, $cfg['MaxCharactersInDisplayedSQL']) . '[...]'
+                )
+            );
         } elseif (! empty($GLOBALS['parsed_sql'])
          && $query_base == $GLOBALS['parsed_sql']['raw']) {
             // (here, use "! empty" because when deleting a bookmark,
@@ -1109,7 +1135,8 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         // to edit it (unless it's enormous, see PMA_linkOrButton() )
         if (! empty($cfg['SQLQuery']['Edit'])) {
             if ($cfg['EditInWindow'] == true) {
-                $onclick = 'window.parent.focus_querywindow(\'' . PMA_jsFormat($sql_query, false) . '\'); return false;';
+                $onclick = 'window.parent.focus_querywindow(\''
+                    . PMA_jsFormat($sql_query, false) . '\'); return false;';
             } else {
                 $onclick = '';
             }
@@ -1205,14 +1232,18 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         if (empty($refresh_link) || ! PMA_profilingSupported()) {
             echo '<form action="sql.php" method="post">';
             echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']);
-            echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />';
+            echo '<input type="hidden" name="sql_query" value="'
+                . htmlspecialchars($sql_query) . '" />';
             echo '</form>';
         }
 
         // in the tools div, only display the Inline link when not in ajax
         // mode because 1) it currently does not work and 2) we would
         // have two similar mechanisms on the page for the same goal
-        if ($is_select || $GLOBALS['is_ajax_request'] === false && ! $query_too_big) {
+        if ($is_select
+            || $GLOBALS['is_ajax_request'] === false
+            && ! $query_too_big
+        ) {
             // see in js/functions.js the jQuery code attached to id inline_edit
             // document.write conflicts with jQuery, hence used $().append()
             echo "<script type=\"text/javascript\">\n" .
@@ -1236,7 +1267,9 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
     // If we are in an Ajax request, we have most probably been called in
     // PMA_ajaxResponse().  Hence, collect the buffer contents and return it
     // to PMA_ajaxResponse(), which will encode it for JSON.
-    if ( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
+    if ($GLOBALS['is_ajax_request'] == true
+        && ! isset($GLOBALS['buffer_message'])
+    ) {
         $buffer_contents =  ob_get_contents();
         ob_end_clean();
         return $buffer_contents;
@@ -1393,7 +1426,8 @@ function PMA_localizeNumber($value)
  *
  * @access  public
  */
-function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0, $only_down = false, $noTrailingZero = true)
+function PMA_formatNumber($value, $digits_left = 3, $digits_right = 0,
+$only_down = false, $noTrailingZero = true)
 {
     if ($value==0) {
         return '0';
@@ -1555,7 +1589,9 @@ function PMA_localisedDate($timestamp = -1, $format = '')
         __('Sat'));
 
     if ($format == '') {
-        /* l10n: See http://www.php.net/manual/en/function.strftime.php to define the format string */
+        /* l10n: See http://www.php.net/manual/en/function.strftime.php
+         * to define the format string
+         */
         $format = __('%B %d, %Y at %I:%M %p');
     }
 
@@ -1563,8 +1599,16 @@ function PMA_localisedDate($timestamp = -1, $format = '')
         $timestamp = time();
     }
 
-    $date = preg_replace('@%[aA]@', $day_of_week[(int)strftime('%w', $timestamp)], $format);
-    $date = preg_replace('@%[bB]@', $month[(int)strftime('%m', $timestamp)-1], $date);
+    $date = preg_replace(
+        '@%[aA]@',
+        $day_of_week[(int)strftime('%w', $timestamp)],
+        $format
+    );
+    $date = preg_replace(
+        '@%[bB]@',
+        $month[(int)strftime('%m', $timestamp)-1],
+        $date
+    );
 
     return strftime($date, $timestamp);
 } // end of the 'PMA_localisedDate()' function
@@ -1617,7 +1661,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='')
         $tab['attr'] .= ' title="' . htmlspecialchars($tab['warning']) . '"';
     }
 
-    // If there are any tab specific URL parameters, merge those with the general URL parameters
+    // If there are any tab specific URL parameters, merge those with
+    // the general URL parameters
     if (! empty($tab['url_params']) && is_array($tab['url_params'])) {
         $url_params = array_merge($url_params, $tab['url_params']);
     }
@@ -1628,8 +1673,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='')
         $tab['link'] = $tab['link'] . PMA_generate_common_url($url_params);
         if (! empty($tab['args'])) {
             foreach ($tab['args'] as $param => $value) {
-                $tab['link'] .= PMA_get_arg_separator('html') . urlencode($param) . '='
-                    . urlencode($value);
+                $tab['link'] .= PMA_get_arg_separator('html') . urlencode($param)
+                    . '=' . urlencode($value);
             }
         }
     }
@@ -1686,8 +1731,7 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='')
 function PMA_generate_html_tabs($tabs, $url_params, $base_dir='')
 {
     $tag_id = 'topmenu';
-    $tab_navigation =
-         '<div id="' . htmlentities($tag_id) . 'container">' . "\n"
+    $tab_navigation = '<div id="' . htmlentities($tag_id) . 'container">' . "\n"
         .'<ul id="' . htmlentities($tag_id) . '">' . "\n";
 
     foreach ($tabs as $tab) {
@@ -1756,7 +1800,11 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
         && (!$strip_img || $GLOBALS['cfg']['PropertiesIconic'] === true)
         && strip_tags($message)==$message
     ) {
-        $displayed_message = '<span>' . htmlspecialchars(preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)) . '</span>';
+        $displayed_message = '<span>'
+        . htmlspecialchars(
+            preg_replace('/^.*\salt="([^"]*)".*$/si', '\1', $message)
+        )
+        . '</span>';
     }
 
     // Suhosin: Check that each query parameter is not above maximum
@@ -1876,7 +1924,10 @@ function PMA_timespanFormat($seconds)
     if ($days > 0 || $hours > 0 || $minutes > 0) {
         $seconds -= $minutes * 60;
     }
-    return sprintf(__('%s days, %s hours, %s minutes and %s seconds'), (string)$days, (string)$hours, (string)$minutes, (string)$seconds);
+    return sprintf(
+        __('%s days, %s hours, %s minutes and %s seconds'),
+        (string)$days, (string)$hours, (string)$minutes, (string)$seconds
+    );
 }
 
 /**
@@ -2088,7 +2139,9 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
                     // this blob won't be part of the final condition
                     $con_val = null;
                 }
-            } elseif (in_array($meta->type, PMA_getGISDatatypes()) && ! empty($row[$i])) {
+            } elseif (in_array($meta->type, PMA_getGISDatatypes())
+                && ! empty($row[$i])
+            ) {
                 // do not build a too big condition
                 if (strlen($row[$i]) < 5000) {
                     $condition .= '=0x' . bin2hex($row[$i]) . ' AND';
@@ -2274,7 +2327,8 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
             . ' value="' . (($i - 1) * $rows) . '">' . $i . '</option>' . "\n";
     }
 
-    $gotopage .= ' </select><noscript><input type="submit" value="' . __('Go') . '" /></noscript>';
+    $gotopage .= ' </select><noscript><input type="submit" value="'
+        . __('Go') . '" /></noscript>';
 
     return $gotopage;
 } // end function
@@ -2298,7 +2352,9 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
 {
 
     if ($max_count < $count) {
-        echo 'frame_navigation' == $frame ? '<div id="navidbpageselector">' . "\n" : '';
+        echo 'frame_navigation' == $frame
+            ? '<div id="navidbpageselector">' . "\n"
+            : '';
         echo __('Page number:');
         echo 'frame_navigation' == $frame ? '<br />' : ' ';
 
@@ -2318,12 +2374,12 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
             } // end if... else...
             $_url_params['pos'] = 0;
             echo '<a' . $title1 . ' href="' . $script
-                . PMA_generate_common_url($_url_params) . '" target="' . $frame . '">'
-                . $caption1 . '</a>';
+                . PMA_generate_common_url($_url_params) . '" target="'
+                . $frame . '">' . $caption1 . '</a>';
             $_url_params['pos'] = $pos - $max_count;
             echo '<a' . $title2 . ' href="' . $script
-                . PMA_generate_common_url($_url_params) . '" target="' . $frame . '">'
-                . $caption2 . '</a>';
+                . PMA_generate_common_url($_url_params) . '" target="'
+                . $frame . '">' . $caption2 . '</a>';
         }
 
         echo "\n", '<form action="./', basename($script), '" method="post" target="', $frame, '">', "\n";
@@ -2349,15 +2405,15 @@ function PMA_listNavigator($count, $pos, $_url_params, $script, $frame, $max_cou
             } // end if... else...
             $_url_params['pos'] = $pos + $max_count;
             echo '<a' . $title3 . ' href="' . $script
-                . PMA_generate_common_url($_url_params) . '" target="' . $frame . '">'
-                . $caption3 . '</a>';
+                . PMA_generate_common_url($_url_params) . '" target="'
+                . $frame . '">' . $caption3 . '</a>';
             $_url_params['pos'] = floor($count / $max_count) * $max_count;
             if ($_url_params['pos'] == $count) {
                 $_url_params['pos'] = $count - $max_count;
             }
             echo '<a' . $title4 . ' href="' . $script
-                . PMA_generate_common_url($_url_params) . '" target="' . $frame . '">'
-                . $caption4 . '</a>';
+                . PMA_generate_common_url($_url_params) . '" target="'
+                . $frame . '">' . $caption4 . '</a>';
         }
         echo "\n";
         if ('frame_navigation' == $frame) {
@@ -2407,9 +2463,13 @@ function PMA_getDbLink($database = null)
         $database = PMA_unescape_mysql_wildcards($database);
     }
 
-    return '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?' . PMA_generate_common_url($database) . '"'
-        . ' title="' . sprintf(__('Jump to database &quot;%s&quot;.'), htmlspecialchars($database)) . '">'
-        . htmlspecialchars($database) . '</a>';
+    return '<a href="' . $GLOBALS['cfg']['DefaultTabDatabase'] . '?'
+        . PMA_generate_common_url($database) . '" title="'
+        . sprintf(
+            __('Jump to database &quot;%s&quot;.'),
+            htmlspecialchars($database)
+        )
+        . '">' . htmlspecialchars($database) . '</a>';
 }
 
 /**
@@ -2424,7 +2484,13 @@ function PMA_getDbLink($database = null)
 function PMA_externalBug($functionality, $component, $minimum_version, $bugref)
 {
     if ($component == 'mysql' && PMA_MYSQL_INT_VERSION < $minimum_version) {
-        echo PMA_showHint(sprintf(__('The %s functionality is affected by a known bug, see %s'), $functionality, PMA_linkURL('http://bugs.mysql.com/') . $bugref));
+        echo PMA_showHint(
+            sprintf(
+                __('The %s functionality is affected by a known bug, see %s'),
+                $functionality,
+                PMA_linkURL('http://bugs.mysql.com/') . $bugref
+            )
+        );
     }
 }
 
@@ -2441,7 +2507,10 @@ function PMA_externalBug($functionality, $component, $minimum_version, $bugref)
 function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick)
 {
 
-    echo '<input type="checkbox" name="' . $html_field_name . '" id="' . $html_field_name . '"' . ($checked ? ' checked="checked"' : '') . ($onclick ? ' class="autosubmit"' : '') . ' /><label for="' . $html_field_name . '">' . $label . '</label>';
+    echo '<input type="checkbox" name="' . $html_field_name . '" id="'
+        . $html_field_name . '"' . ($checked ? ' checked="checked"' : '')
+        . ($onclick ? ' class="autosubmit"' : '') . ' /><label for="'
+        . $html_field_name . '">' . $label . '</label>';
 }
 
 /**
@@ -2456,19 +2525,23 @@ function PMA_display_html_checkbox($html_field_name, $label, $checked, $onclick)
  *
  * @return the HTML for the tadio buttons
  */
-function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '', $line_break = true, $escape_label = true, $class='')
+function PMA_display_html_radio($html_field_name, $choices, $checked_choice = '',
+$line_break = true, $escape_label = true, $class='')
 {
     foreach ($choices as $choice_value => $choice_label) {
         if (! empty($class)) {
             echo '<div class="' . $class . '">';
         }
         $html_field_id = $html_field_name . '_' . $choice_value;
-        echo '<input type="radio" name="' . $html_field_name . '" id="' . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
+        echo '<input type="radio" name="' . $html_field_name . '" id="'
+            . $html_field_id . '" value="' . htmlspecialchars($choice_value) . '"';
         if ($choice_value == $checked_choice) {
             echo ' checked="checked"';
         }
         echo ' />' . "\n";
-        echo '<label for="' . $html_field_id . '">' . ($escape_label ? htmlspecialchars($choice_label)  : $choice_label) . '</label>';
+        echo '<label for="' . $html_field_id . '">'
+            . ($escape_label ? htmlspecialchars($choice_label)  : $choice_label)
+            . '</label>';
         if ($line_break) {
             echo '<br />';
         }
@@ -2494,7 +2567,8 @@ function PMA_display_html_radio($html_field_name, $choices, $checked_choice = ''
  */
 function PMA_generate_html_dropdown($select_name, $choices, $active_choice, $id)
 {
-    $result = '<select name="' . htmlspecialchars($select_name) . '" id="' . htmlspecialchars($id) . '">';
+    $result = '<select name="' . htmlspecialchars($select_name) . '" id="'
+        . htmlspecialchars($id) . '">';
     foreach ($choices as $one_choice_value => $one_choice_label) {
         $result .= '<option value="' . htmlspecialchars($one_choice_value) . '"';
         if ($one_choice_value == $active_choice) {
@@ -2617,6 +2691,8 @@ function PMA_toggleButton($action, $select_name, $options, $callback)
 
 /**
  * Clears cache content which needs to be refreshed on user change.
+ *
+ * @return nothing
  */
 function PMA_clearUserCache()
 {
@@ -2681,6 +2757,8 @@ function PMA_cacheSet($var, $val = null, $server = 0)
  *
  * @param string   $var    variable name
  * @param int|true $server server
+ *
+ * @return nothing
  */
 function PMA_cacheUnset($var, $server = 0)
 {
@@ -2696,7 +2774,7 @@ function PMA_cacheUnset($var, $server = 0)
  * function because in PHP, decbin() supports only 32 bits
  *
  * @param numeric $value  coming from a BIT field
- * @param integer $length
+ * @param integer $length length
  *
  * @return  string  the printable value
  */
@@ -2747,7 +2825,13 @@ function PMA_extractFieldSpec($fieldspec)
 {
     $first_bracket_pos = strpos($fieldspec, '(');
     if ($first_bracket_pos) {
-        $spec_in_brackets = chop(substr($fieldspec, $first_bracket_pos + 1, (strrpos($fieldspec, ')') - $first_bracket_pos - 1)));
+        $spec_in_brackets = chop(
+            substr(
+                $fieldspec,
+                $first_bracket_pos + 1,
+                (strrpos($fieldspec, ')') - $first_bracket_pos - 1)
+            )
+        );
         // convert to lowercase just to be sure
         $type = strtolower(chop(substr($fieldspec, 0, $first_bracket_pos)));
     } else {
@@ -2774,24 +2858,30 @@ function PMA_extractFieldSpec($fieldspec)
                     $in_string = true;
                     $working = "";
                 } else {
-                    // Otherwise, it may be either an end of a string, or a 'double quote' which can be handled as-is
+                    // Otherwise, it may be either an end of a string,
+                    // or a 'double quote' which can be handled as-is
                     // Check out the next character (if possible)
                     $has_next = isset($fieldspec[$index + 1]);
                     $next = $has_next ? $fieldspec[$index + 1] : null;
 
-                    // If we have reached the end of our 'working' string (because there are no more chars, or the next char is not another quote)
+                    //If we have reached the end of our 'working' string (because
+                    //there are no more chars,or the next char is not another quote)
                     if (! $has_next || $next != "'") {
                         $enum_set_values[] = $working;
                         $in_string = false;
 
                     } elseif ($next == "'") {
-                        // Otherwise, this is a 'double quote', and can be added to the working string
+                        // Otherwise, this is a 'double quote',
+                        // and can be added to the working string
                         $working .= "'";
                         // Skip the next char; we already know what it is
                         $index++;
                     }
                 }
-            } elseif ('\\' == $char && isset($fieldspec[$index + 1]) && "'" == $fieldspec[$index + 1]) {
+            } elseif ('\\' == $char
+                && isset($fieldspec[$index + 1])
+                && "'" == $fieldspec[$index + 1]
+            ) {
                 // escaping of a quote?
                 $working .= "'";
                 $index++;
@@ -2973,7 +3063,9 @@ function PMA_expandUserString($string, $escape = null, $updates = array())
     $vars['http_host'] = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
     $vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
     $vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose'];
-    $vars['server_verbose_or_name'] = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'];
+    $vars['server_verbose_or_name'] = ! empty($GLOBALS['cfg']['Server']['verbose'])
+        ? $GLOBALS['cfg']['Server']['verbose']
+        : $GLOBALS['cfg']['Server']['host'];
     $vars['database'] = $GLOBALS['db'];
     $vars['table'] = $GLOBALS['table'];
     $vars['phpmyadmin_version'] = 'phpMyAdmin ' . PMA_VERSION;
@@ -3116,11 +3208,21 @@ function PMA_selectUploadFile($import_list, $uploaddir)
         }
         $extensions .= $val['extension'];
     }
-    $matcher = '@\.(' . $extensions . ')(\.(' . PMA_supportedDecompressions() . '))?$@';
+    $matcher = '@\.(' . $extensions . ')(\.('
+        . PMA_supportedDecompressions() . '))?$@';
 
-    $files = PMA_getFileSelectOptions(PMA_userDir($uploaddir), $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : '');
+    $active = (isset($timeout_passed) && $timeout_passed && isset($local_import_file))
+        ? $local_import_file
+        : '';
+    $files = PMA_getFileSelectOptions(
+        PMA_userDir($uploaddir),
+        $matcher,
+        $active
+    );
     if ($files === false) {
-        PMA_Message::error(__('The directory you set for upload work cannot be reached'))->display();
+        PMA_Message::error(
+            __('The directory you set for upload work cannot be reached')
+        )->display();
     } elseif (!empty($files)) {
         echo "\n";
         echo '    <select style="margin: 5px" size="1" name="local_import_file" id="select_local_import_file">' . "\n";
@@ -3245,15 +3347,16 @@ function PMA_unsupportedDatatypes()
  */
 function PMA_getGISDatatypes($upper_case = false)
 {
-    $gis_data_types = array('geometry',
-                            'point',
-                            'linestring',
-                            'polygon',
-                            'multipoint',
-                            'multilinestring',
-                            'multipolygon',
-                            'geometrycollection'
-                      );
+    $gis_data_types = array(
+        'geometry',
+        'point',
+        'linestring',
+        'polygon',
+        'multipoint',
+        'multilinestring',
+        'multipolygon',
+        'geometrycollection'
+    );
     if ($upper_case) {
         for ($i = 0; $i < count($gis_data_types); $i++) {
             $gis_data_types[$i] = strtoupper($gis_data_types[$i]);
@@ -3273,7 +3376,8 @@ function PMA_getGISDatatypes($upper_case = false)
 function PMA_createGISData($gis_string)
 {
     $gis_string =  trim($gis_string);
-    $geom_types = '(POINT|MULTIPOINT|LINESTRING|MULTILINESTRING|POLYGON|MULTIPOLYGON|GEOMETRYCOLLECTION)';
+    $geom_types = '(POINT|MULTIPOINT|LINESTRING|MULTILINESTRING|'
+        . 'POLYGON|MULTIPOLYGON|GEOMETRYCOLLECTION)';
     if (preg_match("/^'" . $geom_types . "\(.*\)',[0-9]*$/i", $gis_string)) {
         return 'GeomFromText(' . $gis_string . ')';
     } elseif (preg_match("/^" . $geom_types . "\(.*\)$/i", $gis_string)) {
@@ -3413,8 +3517,8 @@ function PMA_getFunctionsForField($field, $insert_mode)
 
     $selected = '';
     // Find the current type in the RestrictColumnTypes. Will result in 'FUNC_CHAR'
-    // or something similar. Then directly look up the entry in the RestrictFunctions array,
-    // which will then reveal the available dropdown options
+    // or something similar. Then directly look up the entry in the
+    // RestrictFunctions array, which'll then reveal the available dropdown options
     if (isset($cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])])
         && isset($cfg['RestrictFunctions'][$cfg['RestrictColumnTypes'][strtoupper($field['True_Type'])]])
     ) {
@@ -3471,10 +3575,12 @@ function PMA_getFunctionsForField($field, $insert_mode)
     // yet.
     $cnt_functions = count($cfg['Functions']);
     for ($j = 0; $j < $cnt_functions; $j++) {
-        if (! isset($dropdown_built[$cfg['Functions'][$j]]) || $dropdown_built[$cfg['Functions'][$j]] != 'true') {
+        if (! isset($dropdown_built[$cfg['Functions'][$j]])
+            || $dropdown_built[$cfg['Functions'][$j]] != 'true'
+        ) {
             // Is current function defined as default?
             $selected = ($field['first_timestamp'] && $cfg['Functions'][$j] == $cfg['DefaultFunctions']['first_timestamp'])
-                        || (!$field['first_timestamp'] && $cfg['Functions'][$j] == $default_function)
+                        || (! $field['first_timestamp'] && $cfg['Functions'][$j] == $default_function)
                       ? ' selected="selected"'
                       : '';
             if ($op_spacing_needed == true) {
@@ -3484,7 +3590,8 @@ function PMA_getFunctionsForField($field, $insert_mode)
             }
 
             $retval .= '                ';
-            $retval .= '<option' . $selected . '>' . $cfg['Functions'][$j] . '</option>' . "\n";
+            $retval .= '<option' . $selected . '>' . $cfg['Functions'][$j]
+                . '</option>' . "\n";
         }
     } // end for
 

pmd_general.php

@@ -58,7 +58,7 @@ echo $script_tabs . $script_contr . $script_display_field;
 </head>
 <body onload="Main()" class="general_body" id="pmd_body">
 
-<div class="header" id="top_menu">
+<div class="pmd_header" id="top_menu">
         <a href="javascript:Show_left_menu(document.getElementById('key_Show_left_menu'));"
             onmousedown="return false;" class="M_butt first" target="_self">
             <img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>"
@@ -281,12 +281,12 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         <?php
         if (isset($tables_pk_or_unique_keys[$t_n.".".$tab_column[$t_n]["COLUMN_NAME"][$j]])) {
             ?>
-                <img src="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'];?>/images/FieldKey_small.png"
+                <img src="<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/FieldKey_small.png"
                     alt="*" />
             <?php
         } else {
             ?>
-                    <img src="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE']?>/images/Field_small<?php
+                    <img src="<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Field_small<?php
             if (strstr($tab_column[$t_n]["TYPE"][$j],'char')
              || strstr($tab_column[$t_n]["TYPE"][$j],'text')) {
                 echo '_char';

tbl_zoom_select.php

@@ -369,8 +369,10 @@ if(isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null' &
 	$row['where_clause'] = $uniqueCondition[0];
 	if($dataLabel == $inputs[0] || $dataLabel == $inputs[1])
             $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]);
-	else
+	else if($dataLabel)
             $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]);
+	else
+            $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => '', 'where_clause' => $uniqueCondition[0]);
     }
 
 ?>

themes/original/css/theme_right.css.php

@@ -2570,7 +2570,7 @@ span.cm-number {
 }
 
 .saving_edited_data {
-    background: url(./themes/pmahomme/img/ajax_clock_small.gif) no-repeat left;
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>ajax_clock_small.gif) no-repeat left;
     padding-left: 20px;
 }
 
@@ -2580,3 +2580,523 @@ span.cm-number {
 .ui-timepicker-div dl dt { height: 25px; }
 .ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }
 .ui-timepicker-div td { font-size: 90%; }
+
+/* Designer */
+.input_tab {
+    background-color: #A6C7E1;
+    color: #000000;
+}
+
+#canvas {
+    background-color: #FFFFFF;
+    color: #000000;
+}
+
+canvas.pmd {
+    display: inline-block;
+    overflow: hidden;
+    text-align: left;
+}
+
+canvas.pmd * {
+    behavior: url(#default#VML);
+}
+
+.pmd_tab {
+    background-color: #FFFFFF;
+    color: #000000;
+    border-collapse: collapse;
+    border: 1px solid #AAAAAA;
+    z-index: 1;
+    -moz-user-select: none;
+}
+
+.tab_zag {
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-repeat: repeat-x;
+    text-align: center;
+    cursor: move;
+    padding: 1px;
+    font-weight: bold;
+}
+
+.tab_zag_2 {
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header_Linked.png);
+    background-repeat: repeat-x;
+    text-align: center;
+    cursor: move;
+    padding: 1px;
+    font-weight: bold;
+}
+
+.tab_field {
+    background: #FFFFFF;
+    color: #000000;
+    cursor: default;
+}
+
+.tab_field_2 {
+    background-color: #CCFFCC;
+    color: #000000;
+    background-repeat: repeat-x;
+    cursor: default;
+}
+
+.tab_field_3 {
+    background-color: #FFE6E6; /*#DDEEFF*/
+    color: #000000;
+    cursor: default;
+}
+
+#pmd_hint {
+    white-space: nowrap;
+    position: absolute;
+    background-color: #99FF99;
+    color: #000000;
+    left: 200px;
+    top: 50px;
+    z-index: 3;
+    border: #00CC66 solid 1px;
+    display: none;
+}
+
+.scroll_tab {
+    overflow: auto;
+    width: 100%;
+    height: 500px;
+}
+
+.pmd_Tabs {
+    cursor: default;
+    color: #0055bb;
+    white-space: nowrap;
+    text-decoration: none;
+    text-indent: 3px;
+    font-weight: bold;
+    margin-left: 2px;
+    text-align: left;
+    background-color: #FFFFFF;
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/left_panel_butt.png);
+    border: #CCCCCC solid 1px;
+}
+
+.pmd_Tabs2 {
+    cursor: default;
+    color: #0055bb;
+    background: #FFEE99;
+    text-indent: 3px;
+    font-weight: bold;
+    white-space: nowrap;
+    text-decoration: none;
+    border: #9999FF solid 1px;
+    text-align: left;
+}
+
+.owner {
+    font-weight: normal;
+    color: #888888;
+}
+
+.option_tab {
+    padding-left: 2px;
+    padding-right: 2px;
+    width: 5px;
+}
+
+.select_all {
+    vertical-align: top;
+    padding-left: 2px;
+    padding-right: 2px;
+    cursor: default;
+    width: 1px;
+    color: #000000;
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-repeat: repeat-x;
+}
+
+.small_tab {
+    vertical-align: top;
+    background-color: #0064ea;
+    color: #FFFFFF;
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/small_tab.png);
+    cursor: default;
+    text-align: center;
+    font-weight: bold;
+    padding-left: 2px;
+    padding-right: 2px;
+    width: 1px;
+    text-decoration: none;
+}
+
+.small_tab2 {
+    vertical-align: top;
+    color: #FFFFFF;
+    background-color: #FF9966;
+    cursor: default;
+    padding-left: 2px;
+    padding-right: 2px;
+    text-align: center;
+    font-weight: bold;
+    width: 1px;
+    text-decoration: none;
+}
+
+.small_tab_pref {
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-repeat: repeat-x;
+    text-align: center;
+    width: 1px;
+}
+
+.small_tab_pref2 {
+    vertical-align: top;
+    color: #FFFFFF;
+    background-color: #FF9966;
+    cursor: default;
+    text-align: center;
+    font-weight: bold;
+    width: 1px;
+    text-decoration: none;
+}
+
+.butt {
+    border: #4477aa solid 1px;
+    font-weight: bold;
+    height: 19px;
+    width: 70px;
+    background-color: #FFFFFF;
+    color: #000000;
+    vertical-align: baseline;
+}
+
+.L_butt2_1 {
+    padding: 1px;
+    text-decoration: none;
+    background-color: #ffffff;
+    color: #000000;
+    vertical-align: middle;
+    cursor: default;
+}
+
+.L_butt2_2 {
+    padding: 0;
+    border: #0099CC solid 1px;
+    background: #FFEE99;
+    text-decoration: none;
+    color: #000000;
+    cursor: default;
+}
+
+/* ---------------------------------------------------------------------------*/
+.bor {
+    width: 10px;
+    height: 10px;
+}
+
+.frams1 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/1.png) no-repeat right bottom;
+}
+
+.frams2 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/2.png) no-repeat left bottom;
+}
+
+.frams3 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/3.png) no-repeat left top;
+}
+
+.frams4 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/4.png) no-repeat right top;
+}
+
+.frams5 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/5.png) repeat-x center bottom;
+}
+
+.frams6 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/6.png) repeat-y left;
+}
+
+.frams7 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/7.png) repeat-x top;
+}
+
+.frams8 {
+    background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/8.png) repeat-y right;
+}
+
+#osn_tab {
+    background-color: #FFFFFF;
+    color: #000000;
+    border: #A9A9A9 solid 1px;
+}
+
+.pmd_header {
+    background-color: #EAEEF0;
+    color: #000000;
+    text-align: center;
+    font-weight: bold;
+    margin: 0;
+    padding: 0;
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/top_panel.png);
+    background-position: top;
+    background-repeat: repeat-x;
+    border-right: #999999 solid 1px;
+    border-left: #999999 solid 1px;
+    height: 28px;
+}
+
+.pmd_header a {
+    display: block;
+    float: left;
+    margin: 3px 1px 4px 1px;
+    height: 20px;
+    border: 1px dotted #ffffff;
+}
+
+.pmd_header .M_bord {
+    display: block;
+    float: left;
+    margin: 4px;
+    height: 20px;
+    width: 2px;
+}
+
+.pmd_header a.first {
+    margin-right: 1em;
+}
+
+.pmd_header a.last {
+    margin-left: 1em;
+}
+
+a.M_butt_Selected_down_IE,
+a.M_butt_Selected_down {
+    border: 1px solid #C0C0BB;
+    background-color: #99FF99;
+    color: #000000;
+}
+
+a.M_butt_Selected_down_IE:hover,
+a.M_butt_Selected_down:hover,
+a.M_butt:hover {
+    border: 1px solid #0099CC;
+    background-color: #FFEE99;
+    color: #000000;
+}
+
+#layer_menu {
+    z-index: 1000;
+    position: absolute;
+    left: 0;
+    background-color: #EAEEF0;
+    border: #999999 solid 1px;
+}
+
+#layer_action {
+    position: absolute;
+    left: 638px;
+    top: 52px;
+    z-index: 1000;
+    background-color: #CCFF99;
+    padding: 3px;
+    border: #009933 solid 1px;
+    white-space: nowrap;
+    font-weight: bold;
+}
+
+#layer_upd_relation {
+    position: absolute;
+    left: 637px;
+    top: 224px;
+    z-index: 1000;
+}
+
+#layer_new_relation {
+    position: absolute;
+    left: 636px;
+    top: 85px;
+    z-index: 1000;
+    width: 153px;
+}
+
+#pmd_optionse {
+    position: absolute;
+    left: 636px;
+    top: 85px;
+    z-index: 1000;
+    width: 153px;
+}
+
+#layer_menu_sizer {
+    background-image: url(../../images/resize.png);
+    cursor: nw-resize;
+    width: 16px;
+    height: 16px;
+}
+
+.panel {
+    position: fixed;
+    top: 50px;
+    right: 0;
+    display: none;
+    background: #FFF;
+    border:1px solid #F5F5F5;
+    width: 350 px;
+    height: auto;
+    padding: 30px 170px 30px 30px;
+    color:#FFF;
+    z-index:99;
+}
+
+a.trigger{
+    position: fixed;
+    text-decoration: none;
+    top: 60px; right: 0;
+    color:#fff;
+    padding: 10px 40px 10px 15px;
+    background:#333333 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+    border:1px solid #444444;
+    display: block;
+}
+
+a.trigger:hover{
+    position: fixed;
+    text-decoration: none;
+    top: 60px; right: 0;
+    color:#080808;
+    padding: 10px 40px 10px 15px;
+    background:#fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+    border:1px solid #999;
+    display: block;
+}
+
+a.active.trigger {
+    background:#222222 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+    z-index:999;
+}
+
+a.active.trigger:hover {
+    background:#fff696 url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+    z-index:999;
+}
+
+h2.tiger{
+    background-repeat: repeat-x;
+    padding: 1px;
+    font-weight: bold;
+    padding: 50 20 50 20px;
+    margin: 0 0 5px 0;
+    width: 250px;
+    float: left;
+    color : #333;
+    text-align: center;
+}
+
+h2.tiger a {
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    text-align: center;
+    text-decoration: none;
+    color : #333;
+    display: block;
+}
+
+h2.tiger a:hover {
+    color: #000;
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header_Linked.png);
+}
+
+h2.active {
+    background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>pmd/Header.png);
+    background-repeat: repeat-x;
+    padding: 1px;
+    background-position: left bottom;
+}
+
+.toggle_container {
+    margin: 0 0 5px;
+    padding: 0;
+    border-top: 1px solid #d6d6d6;
+    background: #FFF ;
+    width: 250px;
+    overflow: hidden;
+    font-size: 1.2em;
+    clear: both;
+}
+
+.toggle_container .block {
+    background-color: #DBE4E8;
+    padding:40 15 40 15px; /*--Padding of Container--*/
+    border:1px solid #999;
+    color:#000;
+}
+
+.history_table {
+    text-align: center;
+    background-color: #9999CC;
+}
+
+.history_table2 {
+    text-align: center;
+    background-color: #DBE4E8;
+}
+
+#filter {
+    display: none;
+    position: absolute;
+    top: 0%;
+    left: 0%;
+    width: 100%;
+    height: 100%;
+    background-color: #CCA;
+    z-index:10;
+    opacity:0.5;
+    filter: alpha(opacity=50);
+}
+
+#box {
+    display: none;
+    position: absolute;
+    top: 20%;
+    left: 30%;
+    width: 500px;
+    height: 220px;
+    padding: 48px;
+    margin:0;
+    border: 1px solid black;
+    background-color: white;
+    z-index:101;
+    overflow: visible;
+}
+
+#boxtitle {
+    position:absolute;
+    float:center;
+    top:0;
+    left:0;
+    width:593px;
+    height:20px;
+    padding:0;
+    padding-top:4px;
+    left-padding:8px;
+    margin:0;
+    border-bottom:4px solid #3CF;
+    background-color: #D0DCE0;
+    color:black;
+    font-weight:bold;
+    padding-left: 2px;
+    text-align:left;
+}
+
+#tblfooter {
+    background-color: #D3DCE3;
+    float: right;
+    padding-top:10px;
+    color: black;
+    font-weight: normal;
+}
+
+input.btn {
+    color:#333;
+    background-color: #D0DCE0;
+}