From dec715e5d811dcc2286814135f34007b03051f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 19 Mar 2014 18:59:36 +0100 Subject: [PATCH] Replace tabs with spaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/display_import.lib.php | 138 +++++++++++++-------------- libraries/server_user_groups.lib.php | 4 +- themes/pmahomme/css/jqplot.css.php | 16 ++-- 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 97e9afd1f9..8cad22f659 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -471,101 +471,101 @@ function PMA_getHtmlForImportWithPlugin($upload_id) $html .= 'var perform_upload = function () { '; $html .= 'new $.getJSON( '; - $html .= ' "' . $ajax_url . '", '; - $html .= ' {}, '; - $html .= ' function(response) { '; - $html .= ' finished = response.finished; '; - $html .= ' percent = response.percent; '; - $html .= ' total = response.total; '; - $html .= ' complete = response.complete; '; + $html .= ' "' . $ajax_url . '", '; + $html .= ' {}, '; + $html .= ' function(response) { '; + $html .= ' finished = response.finished; '; + $html .= ' percent = response.percent; '; + $html .= ' total = response.total; '; + $html .= ' complete = response.complete; '; - $html .= ' if (total==0 && complete==0 && percent==0) { '; + $html .= ' if (total==0 && complete==0 && percent==0) { '; $img_tag = 'ajax clock ' . $promot_str . '\'); '; - $html .= ' $("#upload_form_status").css("display", "none"); '; - $html .= ' } else { '; - $html .= ' var now = new Date(); '; - $html .= ' now = Date.UTC( '; - $html .= ' now.getFullYear(), now.getMonth(), now.getDate(), '; - $html .= ' now.getHours(), now.getMinutes(), now.getSeconds()) '; - $html .= ' + now.getMilliseconds() - 1000; '; - $html .= ' var statustext = $.sprintf("' . $statustext_str . '", '; - $html .= ' formatBytes(complete, 1, PMA_messages.strDecimalSeparator), '; - $html .= ' formatBytes(total, 1, PMA_messages.strDecimalSeparator) '; - $html .= ' ); '; + $html .= ' $("#upload_form_status").css("display", "none"); '; + $html .= ' } else { '; + $html .= ' var now = new Date(); '; + $html .= ' now = Date.UTC( '; + $html .= ' now.getFullYear(), now.getMonth(), now.getDate(), '; + $html .= ' now.getHours(), now.getMinutes(), now.getSeconds()) '; + $html .= ' + now.getMilliseconds() - 1000; '; + $html .= ' var statustext = $.sprintf("' . $statustext_str . '", '; + $html .= ' formatBytes(complete, 1, PMA_messages.strDecimalSeparator), '; + $html .= ' formatBytes(total, 1, PMA_messages.strDecimalSeparator) '; + $html .= ' ); '; - $html .= ' if ($("#importmain").is(":visible")) { '; + $html .= ' if ($("#importmain").is(":visible")) { '; // show progress UI - $html .= ' $("#importmain").hide(); '; - $html .= ' $("#import_form_status") '; - $html .= ' .html(\'
' + $html .= ' $("#importmain").hide(); '; + $html .= ' $("#import_form_status") '; + $html .= ' .html(\'
' . '
' . '
' . '
' . 'ajax clock ' . $upload_str . '
\') '; - $html .= ' .show(); '; - $html .= ' import_start = now; '; - $html .= ' } '; - $html .= ' else if (percent > 9 || complete > 2000000) { '; + $html .= ' .show(); '; + $html .= ' import_start = now; '; + $html .= ' } '; + $html .= ' else if (percent > 9 || complete > 2000000) { '; // calculate estimated time - $html .= ' var used_time = now - import_start; '; - $html .= ' var seconds = ' + $html .= ' var used_time = now - import_start; '; + $html .= ' var seconds = ' . 'parseInt(((total - complete) / complete) * used_time / 1000); '; - $html .= ' var speed = $.sprintf("' . $second_str . '"'; - $html .= ' , formatBytes(complete / used_time * 1000, 1,' + $html .= ' var speed = $.sprintf("' . $second_str . '"'; + $html .= ' , formatBytes(complete / used_time * 1000, 1,' . ' PMA_messages.strDecimalSeparator)); '; - $html .= ' var minutes = parseInt(seconds / 60); '; - $html .= ' seconds %= 60; '; - $html .= ' var estimated_time; '; - $html .= ' if (minutes > 0) { '; - $html .= ' estimated_time = "' . $remaining_min . '"'; - $html .= ' .replace("%MIN", minutes).replace("%SEC", seconds); '; - $html .= ' } '; - $html .= ' else { '; - $html .= ' estimated_time = "' . $remaining_second . '"'; - $html .= ' .replace("%SEC", seconds); '; - $html .= ' } '; + $html .= ' var minutes = parseInt(seconds / 60); '; + $html .= ' seconds %= 60; '; + $html .= ' var estimated_time; '; + $html .= ' if (minutes > 0) { '; + $html .= ' estimated_time = "' . $remaining_min . '"'; + $html .= ' .replace("%MIN", minutes).replace("%SEC", seconds); '; + $html .= ' } '; + $html .= ' else { '; + $html .= ' estimated_time = "' . $remaining_second . '"'; + $html .= ' .replace("%SEC", seconds); '; + $html .= ' } '; - $html .= ' statustext += "
" + speed + "

" ' + $html .= ' statustext += "
" + speed + "

" ' . '+ estimated_time; '; - $html .= ' } '; + $html .= ' } '; - $html .= ' var percent_str = Math.round(percent) + "%"; '; - $html .= ' $("#status").animate({width: percent_str}, 150); '; - $html .= ' $(".percentage").text(percent_str); '; + $html .= ' var percent_str = Math.round(percent) + "%"; '; + $html .= ' $("#status").animate({width: percent_str}, 150); '; + $html .= ' $(".percentage").text(percent_str); '; // show percent in window title - $html .= ' if (original_title !== false) { '; - $html .= ' parent.document.title = percent_str + " - " + original_title; '; - $html .= ' } '; - $html .= ' else { '; - $html .= ' document.title = percent_str + " - " + original_title; '; - $html .= ' } '; - $html .= ' $("#statustext").html(statustext); '; - $html .= ' } '; + $html .= ' if (original_title !== false) { '; + $html .= ' parent.document.title = percent_str + " - " + original_title; '; + $html .= ' } '; + $html .= ' else { '; + $html .= ' document.title = percent_str + " - " + original_title; '; + $html .= ' } '; + $html .= ' $("#statustext").html(statustext); '; + $html .= ' } '; - $html .= ' if (finished == true) { '; - $html .= ' if (original_title !== false) { '; - $html .= ' parent.document.title = original_title; '; - $html .= ' } '; - $html .= ' else { '; - $html .= ' document.title = original_title; '; - $html .= ' } '; - $html .= ' $("#importmain").hide(); '; + $html .= ' if (finished == true) { '; + $html .= ' if (original_title !== false) { '; + $html .= ' parent.document.title = original_title; '; + $html .= ' } '; + $html .= ' else { '; + $html .= ' document.title = original_title; '; + $html .= ' } '; + $html .= ' $("#importmain").hide(); '; // loads the message, either success or mysql error - $html .= ' $("#import_form_status") '; - $html .= ' .html(\'ajax clock ' . $processed_str . '\')'; - $html .= ' .show(); '; - $html .= ' $("#import_form_status").load("import_status.php?' + $html .= ' .show(); '; + $html .= ' $("#import_form_status").load("import_status.php?' . 'message=true&' . $import_url . '"); '; - $html .= ' PMA_reloadNavigation(); '; + $html .= ' PMA_reloadNavigation(); '; // if finished $html .= ' } '; diff --git a/libraries/server_user_groups.lib.php b/libraries/server_user_groups.lib.php index 2a88f162a0..2e3f9fc8bc 100644 --- a/libraries/server_user_groups.lib.php +++ b/libraries/server_user_groups.lib.php @@ -240,7 +240,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null) $allowedTabs = array( 'server' => array(), 'db' => array(), - 'table' => array() + 'table' => array() ); if ($userGroup != null) { $groupTable = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) @@ -352,4 +352,4 @@ function PMA_editUserGroup($userGroup, $new = false) $sql_query .= ";"; PMA_queryAsControlUser($sql_query, true); } -?> \ No newline at end of file +?> diff --git a/themes/pmahomme/css/jqplot.css.php b/themes/pmahomme/css/jqplot.css.php index e167c9fc86..b445927625 100644 --- a/themes/pmahomme/css/jqplot.css.php +++ b/themes/pmahomme/css/jqplot.css.php @@ -80,12 +80,12 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { } .jqplot-yaxis-tick.jqplot-breakTick { - : -20px; - margin-: 0px; - padding:1px 5px 1px; -/* background-color: white;*/ - z-index: 2; - font-size: 1.5em; + : -20px; + margin-: 0px; + padding:1px 5px 1px; +/* background-color: white;*/ + z-index: 2; + font-size: 1.5em; } .jqplot-y2axis-tick, .jqplot-y3axis-tick, .jqplot-y4axis-tick, .jqplot-y5axis-tick, .jqplot-y6axis-tick, .jqplot-y7axis-tick, .jqplot-y8axis-tick, .jqplot-y9axis-tick { @@ -272,6 +272,6 @@ div.jqplot-bubble-label.jqplot-bubble-label-highlight { } div.jqplot-noData-container { - text-align: center; - background-color: rgba(96%, 96%, 96%, 0.3); + text-align: center; + background-color: rgba(96%, 96%, 96%, 0.3); }