Git January 2011

git@phpmyadmin.net

5 participants
154 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1317-g5464b54
by Marc Delisle 22 Jan '11

22 Jan '11

The branch, master has been updated via 5464b54e17015ed4ca8c015597e4760a538dd866 (commit) from 3a739c1beec1d300bf0d54d8b7f3136f1775fcee (commit) - Log ----------------------------------------------------------------- commit 5464b54e17015ed4ca8c015597e4760a538dd866 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 22 09:50:12 2011 -0500 Start implementing conditional Ajax (in results page) ----------------------------------------------------------------------- Summary of changes: js/sql.js | 28 ++++++++++++++++++---------- libraries/common.lib.php | 7 +++++-- libraries/config.default.php | 7 +++++++ libraries/display_tbl.lib.php | 4 ++-- sql.php | 12 ++++++++---- 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/js/sql.js b/js/sql.js index 43b3af7..e83cee8 100644 --- a/js/sql.js +++ b/js/sql.js @@ -172,11 +172,11 @@ $(document).ready(function() { /** * Trigger the appendAnchor event to prepare the first table for inline edit - * + * (see $GLOBALS['cfg']['AjaxEnable']) * @memberOf jQuery * @name sqlqueryresults_trigger */ - $("#sqlqueryresults").trigger('appendAnchor'); + $("#sqlqueryresults.ajax").trigger('appendAnchor'); /** * Append the "Show/Hide query box" message to the query input form @@ -264,11 +264,12 @@ $(document).ready(function() { /** * Paginate when we click any of the navigation buttons + * (only if the element has the ajax class, see $cfg['AjaxEnable']) * @memberOf jQuery * @name paginate_nav_button_click * @uses PMA_ajaxShowMessage() */ - $("input[name=navig]").live('click', function(event) { + $("input[name=navig].ajax").live('click', function(event) { /** @lends jQuery */ event.preventDefault(); @@ -293,15 +294,22 @@ $(document).ready(function() { * @name paginate_dropdown_change */ $("#pageselector").live('change', function(event) { - event.preventDefault(); - - PMA_ajaxShowMessage(); var $the_form = $(this).parent("form"); - $.post($the_form.attr('action'), $the_form.serialize() + '&ajax_request=true', function(data) { - $("#sqlqueryresults").html(data); - $("#sqlqueryresults").trigger('appendAnchor'); - }) // end $.post() + // see $cfg['AjaxEnable'] + if ($(this).hasClass('ajax')) { + event.preventDefault(); + + PMA_ajaxShowMessage(); + + $.post($the_form.attr('action'), $the_form.serialize() + '&ajax_request=true', function(data) { + $("#sqlqueryresults").html(data); + $("#sqlqueryresults").trigger('appendAnchor'); + }) // end $.post() + } else { + $the_form.submit(); + } + })// end Paginate results with Page Selector /** diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 3976431..711627f 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2201,8 +2201,11 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1, $pageNowMinusRange = ($pageNow - $range); $pageNowPlusRange = ($pageNow + $range); - $gotopage = $prompt - . ' <select id="pageselector" name="pos" >' . "\n"; + $gotopage = $prompt . ' <select id="pageselector" '; + if ($GLOBALS['cfg']['AjaxEnable']) { + $gotopage .= ' class="ajax"'; + } + $gotopage .= ' name="pos" >' . "\n"; if ($nbTotalPage < $showAll) { $pages = range(1, $nbTotalPage); } else { diff --git a/libraries/config.default.php b/libraries/config.default.php index 028c14b..a544caf 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -488,6 +488,13 @@ $cfg['ServerDefault'] = 1; * Other core phpMyAdmin settings */ /** + * whether Ajax behavior is active + * + * @global boolean $cfg['AjaxEnable'] + */ +$cfg['AjaxEnable'] = true; + +/** * maximum number of db's displayed in left frame and database list * * @global integer $cfg['MaxDbList'] diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 53c610b..c2c8518 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -228,7 +228,7 @@ function PMA_displayTableNavigationOneButton($caption, $title, $pos, $html_sql_q <input type="hidden" name="pos" value="<?php echo $pos; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> <?php echo $input_for_real_end; ?> - <input type="submit" name="navig" value="<?php echo $caption_output; ?>"<?php echo $title_output . $onclick; ?> /> + <input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : '' ); ?> value="<?php echo $caption_output; ?>"<?php echo $title_output . $onclick; ?> /> </form> </td> <?php @@ -303,7 +303,7 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="sql_query" value="<?php echo $html_sql_query; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> - <input type="submit" name="navig" value="<?php echo __('Show'); ?> :" /> + <input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> <input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" /> <?php echo __('row(s) starting from row #') . "\n"; ?> <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /> diff --git a/sql.php b/sql.php index fa07398..8a05298 100644 --- a/sql.php +++ b/sql.php @@ -730,7 +730,7 @@ if (0 == $num_rows || $is_affected) { else { //If we are retrieving the full value of a truncated field or the original // value of a transformed field, show it here and exit - if( $GLOBALS['inline_edit'] == true) { + if( $GLOBALS['inline_edit'] == true && $GLOBALS['cfg']['AjaxEnable']) { $row = PMA_DBI_fetch_row($result); $extra_data = array(); $extra_data['value'] = $row[0]; @@ -750,7 +750,7 @@ else { unset($message); - if( $GLOBALS['is_ajax_request'] != true) { + if( ! $GLOBALS['is_ajax_request'] || ! $GLOBALS['cfg']['AjaxEnable']) { if (strlen($table)) { require './libraries/tbl_common.php'; $url_query .= '&goto=tbl_sql.php&back=tbl_sql.php'; @@ -781,9 +781,13 @@ else { $fields_cnt = count($fields_meta); } - if( $GLOBALS['is_ajax_request'] != true ) { + if( ! $GLOBALS['is_ajax_request']) { //begin the sqlqueryresults div here. container div - echo '<div id="sqlqueryresults">'; + echo '<div id="sqlqueryresults"'; + if ($GLOBALS['cfg']['AjaxEnable']) { + echo ' class="ajax"'; + } + echo '>'; } // Display previous update query (from tbl_replace) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1316-g3a739c1
by Marc Delisle 22 Jan '11

22 Jan '11

The branch, master has been updated via 3a739c1beec1d300bf0d54d8b7f3136f1775fcee (commit) from 8fd3359cf9866b03714808cf1af31112e261925f (commit) - Log ----------------------------------------------------------------- commit 3a739c1beec1d300bf0d54d8b7f3136f1775fcee Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Jan 22 08:10:10 2011 -0500 Force a smaller height to improve the chance to see the bottom of the popup (for easier horizontal scrolling) ----------------------------------------------------------------------- Summary of changes: js/functions.js | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 6559b34..782c725 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1689,6 +1689,7 @@ $(document).ready(function() { .append(data) .dialog({ title: PMA_messages['strCreateTable'], + height: 600, width: 900, open: PMA_verifyTypeOfAllColumns, buttons : button_options hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1315-g8fd3359
by Madhura Jayaratne 21 Jan '11

21 Jan '11

The branch, master has been updated via 8fd3359cf9866b03714808cf1af31112e261925f (commit) from 3081456e1fe037d75f74ab6a72131ea139d21b47 (commit) - Log ----------------------------------------------------------------- commit 8fd3359cf9866b03714808cf1af31112e261925f Author: madhuracj <madhura.cj(a)gmail.com> Date: Fri Jan 21 18:53:27 2011 +0530 Code formatting. ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 0d7e935..7e7de87 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -18,7 +18,7 @@ require_once './libraries/tcpdf/tcpdf.php'; /** * Extends the "TCPDF" class and helps * in developing the structure of PDF Schema Export - * + * * @name PMA_PDF * @copyright * @license @@ -435,8 +435,8 @@ class PMA_PDF extends TCPDF /** * Table preferences/statistics - * - * This class preserves the table co-ordinates,fields + * + * This class preserves the table co-ordinates,fields * and helps in drawing/generating the Tables in PDF document. * * @name Table_Stats @@ -444,7 +444,7 @@ class PMA_PDF extends TCPDF * @license * @see PMA_PDF */ -class Table_Stats +class Table_Stats { /** * Defines properties @@ -646,9 +646,9 @@ class Table_Stats /** * Relation preferences/statistics - * + * * This class fetches the table master and foreign fields positions - * and helps in generating the Table references and then connects + * and helps in generating the Table references and then connects * master table's master field to foreign table's foreign key * in PDF document. * @@ -657,7 +657,7 @@ class Table_Stats * @license * @see PMA_PDF::SetDrawColor,PMA_PDF::PMA_PDF_setLineWidthScale,PMA_PDF::PMA_PDF_lineScale */ -class Relation_Stats +class Relation_Stats { /** * Defines properties @@ -923,7 +923,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } // end while } // end if } // end while - + if ($seen_a_relation) { $this->_drawRelations($this->showColor); } @@ -979,8 +979,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _strokeGrid() { - global $pdf, $with_doc;; - + global $pdf, $with_doc; + $gridSize = 10; $labelHeight = 4; $labelWidth = 5; @@ -1041,7 +1041,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } /** - * Ouputs the PDF document to a file + * Ouputs the PDF document to a file * or sends the output to browser * * @global object The current PDF document @@ -1333,7 +1333,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } // end while $pdf->SetFont('', '', 14); PMA_DBI_free_result($result); - } //end each + } //end each } } ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1314-g3081456
by Madhura Jayaratne 21 Jan '11

21 Jan '11

The branch, master has been updated via 3081456e1fe037d75f74ab6a72131ea139d21b47 (commit) from 39d56d6f653ceb3edd60692dc8b0c30b8a3bc8c9 (commit) - Log ----------------------------------------------------------------- commit 3081456e1fe037d75f74ab6a72131ea139d21b47 Author: madhuracj <madhura.cj(a)gmail.com> Date: Fri Jan 21 18:32:55 2011 +0530 bug #3163331 [pdf] Grid not adjusted to paper size and orientation ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 42 ++++++++++++------------ 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 5b8e517..0d7e935 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -381,14 +381,6 @@ class PMA_PDF extends TCPDF $this->Ln($h); } - function CheckPageBreak($h) - { - // if height h overflows, manual page break - if ($this->GetY() + $h > $this->PageBreakTrigger) { - $this->AddPage($this->CurOrientation); - } - } - function NbLines($w, $txt) { // compute number of lines used by a multicell of width w @@ -987,26 +979,34 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ private function _strokeGrid() { - global $pdf; + global $pdf, $with_doc;; + + $gridSize = 10; + $labelHeight = 4; + $labelWidth = 5; + if ($with_doc) { + $topSpace = 6; + $bottomSpace = 15; + } $pdf->SetMargins(0, 0); $pdf->SetDrawColor(200, 200, 200); // Draws horizontal lines - for ($l = 0; $l < 21; $l++) { - $pdf->line(0, $l * 10, $pdf->getW(), $l * 10); + for ($l = 0; $l <= intval(($pdf->getH() - $topSpace - $bottomSpace) / $gridSize); $l++) { + $pdf->line(0, $l * $gridSize + $topSpace, $pdf->getW(), $l * $gridSize + $topSpace); // Avoid duplicates - if ($l > 0) { - $pdf->SetXY(0, $l * 10); - $label = (string) sprintf('%.0f', ($l * 10 - $this->topMargin) * $this->scale + $this->_yMin); - $pdf->Cell(5, 5, ' ' . $label); + if ($l > 0 && $l <= intval(($pdf->getH() - $topSpace - $bottomSpace - $labelHeight) / $gridSize)) { + $pdf->SetXY(0, $l * $gridSize + $topSpace); + $label = (string) sprintf('%.0f', ($l * $gridSize + $topSpace - $this->topMargin) * $this->scale + $this->_yMin); + $pdf->Cell($labelWidth, $labelHeight, ' ' . $label); } // end if } // end for // Draws vertical lines - for ($j = 0; $j < 30 ;$j++) { - $pdf->line($j * 10, 0, $j * 10, $pdf->getH()); - $pdf->SetXY($j * 10, 0); - $label = (string) sprintf('%.0f', ($j * 10 - $this->leftMargin) * $this->scale + $this->_xMin); - $pdf->Cell(5, 7, $label); + for ($j = 0; $j <= intval($pdf->getW() / $gridSize); $j++) { + $pdf->line($j * $gridSize, $topSpace, $j * $gridSize, $pdf->getH() - $bottomSpace); + $pdf->SetXY($j * $gridSize, $topSpace); + $label = (string) sprintf('%.0f', ($j * $gridSize - $this->leftMargin) * $this->scale + $this->_xMin); + $pdf->Cell($labelWidth, $labelHeight, $label); } } @@ -1111,7 +1111,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $z = 0; foreach ($alltables as $table) { $z++; - $pdf->SetAutoPageBreak(true); + $pdf->SetAutoPageBreak(true); $pdf->addpage($GLOBALS['orientation']); $pdf->Bookmark($table); $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo()) ; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1313-g39d56d6
by Michal Čihař 21 Jan '11

21 Jan '11

The branch, master has been updated via 39d56d6f653ceb3edd60692dc8b0c30b8a3bc8c9 (commit) via 4ac0ce5634b933496b6d1905b00bb235cca88b39 (commit) via 97bcdbdb964df221682f2da570438fb90be9d213 (commit) via c62850c255f10357980e9ab318b09a75115f0b84 (commit) via 72a31ce3df62737b408295b5877534dc07f274f8 (commit) via bd7068b23da7a611440c3302de88aa19c5d1f7ec (commit) via 158b0e4022b416bb8ee8661cc7aeddb95a1043c3 (commit) via eb956a4ee8906b1bdcb4f6e6e44306dfe24b3b77 (commit) via 9b77776f6807ea7121569acdbe759a6c67091912 (commit) via 635cb2f7e8af46e7b5e502d3baa166d4a17a2524 (commit) via cd3bf040eb63d6d4d695e763e2c898fd1f273453 (commit) via 0d93b00ab8ecf72c2a62082cda7a955929331842 (commit) from 983a8403c8804ae2acf0dd2bd179118707b6a54d (commit) - Log ----------------------------------------------------------------- commit 39d56d6f653ceb3edd60692dc8b0c30b8a3bc8c9 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:07:13 2011 +0200 Translation update done using Pootle. commit 4ac0ce5634b933496b6d1905b00bb235cca88b39 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:07:04 2011 +0200 Translation update done using Pootle. commit 97bcdbdb964df221682f2da570438fb90be9d213 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:06:12 2011 +0200 Translation update done using Pootle. commit c62850c255f10357980e9ab318b09a75115f0b84 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:05:36 2011 +0200 Translation update done using Pootle. commit 72a31ce3df62737b408295b5877534dc07f274f8 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:05:32 2011 +0200 Translation update done using Pootle. commit bd7068b23da7a611440c3302de88aa19c5d1f7ec Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:05:13 2011 +0200 Translation update done using Pootle. commit 158b0e4022b416bb8ee8661cc7aeddb95a1043c3 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:04:25 2011 +0200 Translation update done using Pootle. commit eb956a4ee8906b1bdcb4f6e6e44306dfe24b3b77 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:04:16 2011 +0200 Translation update done using Pootle. commit 9b77776f6807ea7121569acdbe759a6c67091912 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:04:06 2011 +0200 Translation update done using Pootle. commit 635cb2f7e8af46e7b5e502d3baa166d4a17a2524 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:03:58 2011 +0200 Translation update done using Pootle. commit cd3bf040eb63d6d4d695e763e2c898fd1f273453 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:03:37 2011 +0200 Translation update done using Pootle. commit 0d93b00ab8ecf72c2a62082cda7a955929331842 Author: ch <ch(a)rech.co> Date: Fri Jan 21 12:02:52 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/de.po | 62 ++++++++++++++------------------------------------------------ 1 files changed, 14 insertions(+), 48 deletions(-) diff --git a/po/de.po b/po/de.po index 22e4e2a..ca1672e 100644 --- a/po/de.po +++ b/po/de.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2010-09-16 12:10+0200\n" -"Last-Translator: <sven-cihar.com(a)incase.de>\n" +"PO-Revision-Date: 2011-01-21 12:07+0200\n" +"Last-Translator: <ch(a)rech.co>\n" "Language-Team: german <de(a)li.org>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -96,13 +96,12 @@ msgstr "Diesen Wert verwenden" #: bs_disp_as_mime_type.php:29 bs_play_media.php:35 #: libraries/blobstreaming.lib.php:331 msgid "No blob streaming server configured!" -msgstr "" +msgstr "Kein BLOB-Streaming-Server konfiguriert!" #: bs_disp_as_mime_type.php:35 -#, fuzzy #| msgid "Failed to write file to disk." msgid "Failed to fetch headers" -msgstr "Datei konnte gespeichert werden." +msgstr "Abrufen des Headers fehlgeschlagen." #: bs_disp_as_mime_type.php:41 msgid "Failed to open remote URL" @@ -412,11 +411,11 @@ msgstr "Bitte wählen Sie mindestens eine anzuzeigende Spalte" #: db_qbe.php:182 msgid "Switch to" -msgstr "" +msgstr "Wechseln zu" #: db_qbe.php:186 msgid "visual builder" -msgstr "" +msgstr "Visueller Builder" #: db_qbe.php:219 libraries/db_structure.lib.php:95 #: libraries/display_tbl.lib.php:860 @@ -469,10 +468,9 @@ msgid "Modify" msgstr "Verändern" #: db_qbe.php:603 -#, fuzzy #| msgid "Add/Delete Criteria Row" msgid "Add/Delete criteria rows" -msgstr "Zeilen hinzufügen/entfernen" +msgstr "Kriterienzeilen hinzufügen/entfernen" #: db_qbe.php:615 msgid "Add/Delete columns" @@ -550,10 +548,10 @@ msgid "Delete" msgstr "Löschen" #: db_search.php:260 -#, fuzzy, php-format +#, php-format, fuzzy #| msgid "Delete tracking data for this table" msgid "Delete the matches for the %s table?" -msgstr "Lösche die Verlaufsdaten für diese Tabelle" +msgstr "Treffer für Tabelle %s löschen?" #: db_search.php:273 #, php-format @@ -810,15 +808,16 @@ msgstr "Werte für die Spalte \"%s\"" #: enum_editor.php:22 libraries/tbl_properties.inc.php:795 msgid "Enter each value in a separate field." -msgstr "" +msgstr "Jeden Wert in ein eigenes Feld eingeben." #: enum_editor.php:57 +#, fuzzy msgid "+ Restart insertion and add a new value" -msgstr "" +msgstr "+ Eingabe wiederholen und neuen Wert hinzufügen" #: enum_editor.php:67 msgid "Output" -msgstr "" +msgstr "Ausgabe" #: enum_editor.php:68 msgid "Copy and paste the joined values into the \"Length/Values\" field" @@ -10477,36 +10476,3 @@ msgstr "View umbenennen in" #~ msgid "Stop" #~ msgstr "Stop" - -#, fuzzy -#~| msgid "Display databases in a tree" -#~ msgid "Display table filter" -#~ msgstr "Datenbanken als Baum anzeigen" - -#~ msgid "" -#~ "The additional features for working with linked tables have been " -#~ "deactivated. To find out why click %shere%s." -#~ msgstr "" -#~ "Die zusätzlichen Funktionen für verknüpfte Tabellen wurden automatisch " -#~ "deaktiviert. Klicken Sie %shier%s um herauszufinden warum." - -#~ msgid "Ignore duplicate rows" -#~ msgstr "Ignoriere doppelte Zeilen" - -#~ msgid "Execute bookmarked query" -#~ msgstr "Gespeicherte SQL-Anfrage ausführen" - -#~ msgid "No tables" -#~ msgstr "keine Tabellen" - -#, fuzzy -#~| msgid "CSV" -#~ msgid "SVG" -#~ msgstr "CSV" - -#~ msgid "" -#~ "This [a@?page=form&formset=features#tab_Security]option[/a] should be " -#~ "enabled if your web server supports it" -#~ msgstr "" -#~ "Falls vom Server unterstützt, sollte diese [a@?page=form&" -#~ "formset=features#tab_Security]Option[/a] aktiviert werden" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] Planet phpMyAdmin branch, master, updated. 77dcabdb5ea9b3961de22644df597e7867f0305e
by Michal Čihař 21 Jan '11

21 Jan '11

The branch, master has been updated via 77dcabdb5ea9b3961de22644df597e7867f0305e (commit) from d5ff86632074d668d57316853afa05bed86e7e60 (commit) - Log ----------------------------------------------------------------- commit 77dcabdb5ea9b3961de22644df597e7867f0305e Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jan 21 09:12:22 2011 +0100 Include only phpmyadmin tagged posts. I feel like I'm spamming too much :-) ----------------------------------------------------------------------- Summary of changes: planet.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/planet.ini b/planet.ini index 87fe322..e11faca 100644 --- a/planet.ini +++ b/planet.ini @@ -22,7 +22,7 @@ log_level = DEBUG # Subscription configuration -[http://blog.cihar.com/rss.xml] +[http://blog.cihar.com/archives/phpmyadmin/index-atom.xml] name = Michal Čihař [http://ankitgupt.wordpress.com/feed/] hooks/post-receive -- Planet phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. e8063b247a83a464d53c9bc47360869eb1d01c12
by Michal Čihař 21 Jan '11

21 Jan '11

The branch, master has been updated via e8063b247a83a464d53c9bc47360869eb1d01c12 (commit) from 7fa9f0342e0a05e83e17f3a080bba08ad441d4da (commit) - Log ----------------------------------------------------------------- commit e8063b247a83a464d53c9bc47360869eb1d01c12 Author: joe.bruss <joe.bruss(a)live.fr> Date: Fri Jan 21 03:44:55 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0cd28cc..a73d887 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-11 15:11+0100\n" -"PO-Revision-Date: 2011-01-06 10:49+0200\n" -"Last-Translator: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr>\n" +"PO-Revision-Date: 2011-01-21 03:44+0200\n" +"Last-Translator: <joe.bruss(a)live.fr>\n" "Language-Team: none\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -9946,6 +9946,7 @@ msgstr "" "affichées), si je clique sur Modifier, je ne peux pas être " "sûr que je modifie la bonne ligne.</a>" +# Important. Assurez-vous que votre table a une clef primaire. phpMyAdmin en a besoin quand vous Editer et Supprimer des liens. #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3389 msgid "" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1301-g983a840
by Michal Čihař 21 Jan '11

21 Jan '11

The branch, master has been updated via 983a8403c8804ae2acf0dd2bd179118707b6a54d (commit) via 7a1bae544c48162ecd2d32294edcd6d09add4cb4 (commit) via 178a773c6db8e7b8079c66df82a4df3db17d5716 (commit) via 2d50f7993a9417c797fbaf17cee1024e7f9e99d7 (commit) via e594503ee0a851a9de8d7be6145caf2bd3ec70cb (commit) via f19538d91fa1cf3a7e2b330c947f50e79ef4a12c (commit) via 50c267080fc418e86bc47d3e10799583cc5f8006 (commit) via cbed715699147a3bde66d3290f6b4ee19e22420d (commit) via 1ce6a00260b806ce3f23f247f7af022b280f9d22 (commit) via 5bf74b7daa9d98064d8e51de871612b806944df3 (commit) via 6b7f861ce1368c964e5121dc374f71db7c871ee7 (commit) via 567d0e05536719f004178b1b21fd52a5fb4c601b (commit) via 4af2acdd138fb95a569ca10f71d151e4e09b17b8 (commit) via 343b87cc6d6da4565bc60ac3b32bdeebae9815c0 (commit) via db29aac93a6c42d111dfbb05484f24dee49cb62c (commit) via 5272b710522c8c831af3cccb897370f4a6e742c1 (commit) via 44a33415a33d62c841adf67c33938376f47cd43e (commit) via 50c9a8de713342e07836a5c3f04618221fe17185 (commit) via f9c65c67f9d2b609b1c95da9ed8c36ac5bb39199 (commit) via 24118ff50d2653a63136196021e131f065df4c41 (commit) via 65cbb90eee500e21c2356848b267009db87865b3 (commit) via 5900706ae7f9832bd4ebac91a36fc4a753a36d6f (commit) via 7f4cd021732524e8c1fe96fe7b43cdaf6045b52b (commit) via 204d9b8f4f8ae9c16cc5995e9cac492872fd1fcb (commit) via f072a8fe0129a2ed4a099d976b061735aab9394a (commit) via 248bb3f265ae224a705950d9e49c99b3f29b8f62 (commit) via 6b939bae63b214c2c3f3a39a8f88aad405bb9fda (commit) via f163777cc8c83a70694af68b32ef20b988f307bc (commit) via 5efda01d1f32598c28999d2916fb3276a39ab1d7 (commit) via 321b0ab6f00d93b6886127466674b8da9e6bb1b2 (commit) from bb0229fc07e40347d02b26ad84399ac6cd91354f (commit) - Log ----------------------------------------------------------------- commit 983a8403c8804ae2acf0dd2bd179118707b6a54d Merge: 7a1bae544c48162ecd2d32294edcd6d09add4cb4 bb0229fc07e40347d02b26ad84399ac6cd91354f Author: Pootle server <pootle(a)cihar.com> Date: Fri Jan 21 04:40:33 2011 +0100 Merge remote branch 'origin/master' commit 7a1bae544c48162ecd2d32294edcd6d09add4cb4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:40:53 2011 +0200 Translation update done using Pootle. commit 178a773c6db8e7b8079c66df82a4df3db17d5716 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:39:07 2011 +0200 Translation update done using Pootle. commit 2d50f7993a9417c797fbaf17cee1024e7f9e99d7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:38:29 2011 +0200 Translation update done using Pootle. commit e594503ee0a851a9de8d7be6145caf2bd3ec70cb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:38:08 2011 +0200 Translation update done using Pootle. commit f19538d91fa1cf3a7e2b330c947f50e79ef4a12c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:37:10 2011 +0200 Translation update done using Pootle. commit 50c267080fc418e86bc47d3e10799583cc5f8006 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:36:53 2011 +0200 Translation update done using Pootle. commit cbed715699147a3bde66d3290f6b4ee19e22420d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:34:21 2011 +0200 Translation update done using Pootle. commit 1ce6a00260b806ce3f23f247f7af022b280f9d22 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:30:26 2011 +0200 Translation update done using Pootle. commit 5bf74b7daa9d98064d8e51de871612b806944df3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:27:53 2011 +0200 Translation update done using Pootle. commit 6b7f861ce1368c964e5121dc374f71db7c871ee7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:27:37 2011 +0200 Translation update done using Pootle. commit 567d0e05536719f004178b1b21fd52a5fb4c601b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:27:03 2011 +0200 Translation update done using Pootle. commit 4af2acdd138fb95a569ca10f71d151e4e09b17b8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:24:43 2011 +0200 Translation update done using Pootle. commit 343b87cc6d6da4565bc60ac3b32bdeebae9815c0 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:22:12 2011 +0200 Translation update done using Pootle. commit db29aac93a6c42d111dfbb05484f24dee49cb62c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:17:27 2011 +0200 Translation update done using Pootle. commit 5272b710522c8c831af3cccb897370f4a6e742c1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:16:53 2011 +0200 Translation update done using Pootle. commit 44a33415a33d62c841adf67c33938376f47cd43e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:16:44 2011 +0200 Translation update done using Pootle. commit 50c9a8de713342e07836a5c3f04618221fe17185 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:16:24 2011 +0200 Translation update done using Pootle. commit f9c65c67f9d2b609b1c95da9ed8c36ac5bb39199 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:15:48 2011 +0200 Translation update done using Pootle. commit 24118ff50d2653a63136196021e131f065df4c41 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:15:26 2011 +0200 Translation update done using Pootle. commit 65cbb90eee500e21c2356848b267009db87865b3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:14:59 2011 +0200 Translation update done using Pootle. commit 5900706ae7f9832bd4ebac91a36fc4a753a36d6f Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:14:34 2011 +0200 Translation update done using Pootle. commit 7f4cd021732524e8c1fe96fe7b43cdaf6045b52b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:12:27 2011 +0200 Translation update done using Pootle. commit 204d9b8f4f8ae9c16cc5995e9cac492872fd1fcb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:11:13 2011 +0200 Translation update done using Pootle. commit f072a8fe0129a2ed4a099d976b061735aab9394a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:10:50 2011 +0200 Translation update done using Pootle. commit 248bb3f265ae224a705950d9e49c99b3f29b8f62 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:10:15 2011 +0200 Translation update done using Pootle. commit 6b939bae63b214c2c3f3a39a8f88aad405bb9fda Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:08:44 2011 +0200 Translation update done using Pootle. commit f163777cc8c83a70694af68b32ef20b988f307bc Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Thu Jan 20 22:07:44 2011 +0200 Translation update done using Pootle. commit 5efda01d1f32598c28999d2916fb3276a39ab1d7 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jan 20 03:47:01 2011 +0200 Translation update done using Pootle. commit 321b0ab6f00d93b6886127466674b8da9e6bb1b2 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Thu Jan 20 03:43:10 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 57 +++++++++++++++++++++++++++------------------------------ po/zh_CN.po | 9 ++++----- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/po/ru.po b/po/ru.po index e7c1a98..2c0a6d0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2011-01-17 21:41+0200\n" +"PO-Revision-Date: 2011-01-20 22:40+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" "Language: ru\n" @@ -4327,46 +4327,49 @@ msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Размер текстового поля в режиме редактирования (в столбцах); данное значение " +"будет приоритетным для текстовых полей SQL запроса (*2) и для окна запроса " +"(*1.25)" #: libraries/config/messages.inc.php:474 -#, fuzzy #| msgid "CHAR textarea columns" msgid "Textarea columns" -msgstr "Ширина textarea для CHAR" +msgstr "Столбцов в текстовом поле" #: libraries/config/messages.inc.php:475 msgid "" "Textarea size (rows) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" msgstr "" +"Размер текстового поля в режиме редактирования (в строках); данное значение " +"будет приоритетным для текстовых полей SQL запроса (*2) и для окна запроса " +"(*1.25)" #: libraries/config/messages.inc.php:476 -#, fuzzy #| msgid "CHAR textarea rows" msgid "Textarea rows" -msgstr "Высота textarea для CHAR" +msgstr "Строк в текстовом поле" #: libraries/config/messages.inc.php:477 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "Заголовок окна браузера при выборе базы данных" #: libraries/config/messages.inc.php:479 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "Заголовок окна браузера по умолчанию" #: libraries/config/messages.inc.php:480 -#, fuzzy #| msgid "Default table tab" msgid "Default title" -msgstr "Вкладка по умолчанию для таблицы" +msgstr "Заголовок по умолчанию" #: libraries/config/messages.inc.php:481 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "Заголовок окна браузера при выборе сервера" #: libraries/config/messages.inc.php:483 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "Заголовок окна браузера при выборе таблицы" #: libraries/config/messages.inc.php:485 msgid "" @@ -4407,10 +4410,12 @@ msgid "" "When disabled, users cannot set any of the options below, regardless of the " "checkbox on the right" msgstr "" +"При отключении, пользователи не смогут установить никакие из указанных ниже " +"параметров, вне зависимости от галочки справа от них" #: libraries/config/messages.inc.php:492 msgid "Enable the Developer tab in settings" -msgstr "" +msgstr "Включение вкладки разработчика в настройках" #: libraries/config/messages.inc.php:493 msgid "" @@ -4443,28 +4448,24 @@ msgid "ZIP" msgstr "ZIP" #: libraries/config/setup.forms.php:41 -#, fuzzy #| msgid "Host authentication order" msgid "Config authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация через конфигурационный файл" #: libraries/config/setup.forms.php:45 -#, fuzzy #| msgid "Host authentication order" msgid "Cookie authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация с помощью cookie" #: libraries/config/setup.forms.php:48 -#, fuzzy #| msgid "Host authentication order" msgid "HTTP authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация с помощью HTTP" #: libraries/config/setup.forms.php:51 -#, fuzzy #| msgid "Host authentication order" msgid "Signon authentication" -msgstr "Порядок хостов для идентификации" +msgstr "Авторизация с помощью Signon" #: libraries/config/setup.forms.php:238 #: libraries/config/user_preferences.forms.php:142 libraries/import/ldi.php:34 @@ -4495,14 +4496,13 @@ msgstr "Open Document Spreadsheet" #: libraries/config/setup.forms.php:260 #: libraries/config/user_preferences.forms.php:163 msgid "Quick" -msgstr "" +msgstr "Быстро" #: libraries/config/setup.forms.php:264 #: libraries/config/user_preferences.forms.php:167 -#, fuzzy #| msgid "Custom color" msgid "Custom" -msgstr "Выбрать цвет" +msgstr "Обычно" #: libraries/config/setup.forms.php:285 #: libraries/config/user_preferences.forms.php:187 @@ -4566,7 +4566,7 @@ msgstr "Некорректно введен IP адрес: %s" #: libraries/core.lib.php:262 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "Расширение %s не найдено. Пожалуйста, проверьте ваши настройки PHP." #: libraries/db_events.inc.php:14 libraries/db_events.inc.php:16 #: libraries/export/sql.php:481 @@ -4658,10 +4658,9 @@ msgid "Password Hashing" msgstr "Хеширование пароля" #: libraries/display_change_password.lib.php:65 -#, fuzzy #| msgid "MySQL 4.0 compatible" msgid "MySQL 4.0 compatible" -msgstr "MySQL 4.0 совместимо" +msgstr "Совместимо с MySQL 4.0" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 @@ -4683,10 +4682,9 @@ msgid "Create table on database %s" msgstr "Создать новую таблицу в базе данных %s" #: libraries/display_create_table.lib.php:55 -#, fuzzy #| msgid "Number of fields" msgid "Number of columns" -msgstr "Количество полей" +msgstr "Количество столбцов" #: libraries/display_export.lib.php:35 msgid "Could not load export plugins, please check your installation!" @@ -4695,10 +4693,9 @@ msgstr "" "установленной копии phpMyAdmin." #: libraries/display_export.lib.php:87 -#, fuzzy #| msgid "Allows locking tables for the current thread." msgid "Exporting databases from the current server" -msgstr "Разрешает блокировку таблиц для текущего потока" +msgstr "Экспорт баз данных с текущего сервера" #: libraries/display_export.lib.php:89 #, fuzzy, php-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 057073e..f6c22fc 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-01-07 07:51-0500\n" -"PO-Revision-Date: 2010-12-30 05:04+0200\n" +"PO-Revision-Date: 2011-01-20 03:47+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.5\n" @@ -4453,10 +4453,9 @@ msgid "bzipped" msgstr "bzip 压缩" #: libraries/display_export.lib.php:326 -#, fuzzy #| msgid "Save output to a file" msgid "View output as text" -msgstr "保存为文件" +msgstr "直接显示为文本" #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 @@ -4471,7 +4470,7 @@ msgstr "格式特定选项：" msgid "" "Scroll down to fill in the options for the selected format and ignore the " "options for other formats." -msgstr "" +msgstr "请下拉至所选格式并设置选项，其它格式请忽略。" #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 89a6183f2bdb7c1e7df9d6d0ad215ca35e3b7a78
by Michal Čihař 21 Jan '11

21 Jan '11

The branch, master has been updated via 89a6183f2bdb7c1e7df9d6d0ad215ca35e3b7a78 (commit) from d122c9e628999df1f30e607d497d10ecda94e4fc (commit) - Log ----------------------------------------------------------------- commit 89a6183f2bdb7c1e7df9d6d0ad215ca35e3b7a78 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Jan 21 08:23:04 2011 +0100 Switch to other mirror ----------------------------------------------------------------------- Summary of changes: render.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/render.py b/render.py index b3d24ec..187341d 100755 --- a/render.py +++ b/render.py @@ -475,7 +475,7 @@ class SFGenerator: 'size_k' : int(size) / 1024, 'size_m' : int(size) / (1024 * 1024), 'humansize' : fmt_bytes(size), - 'url' : 'http://dl2.cihar.com/phpMyAdmin/master/%s' % name, + 'url' : 'http://dl.cihar.com/phpMyAdmin/master/%s' % name, 'md5' : md5s[name], }) self.data['release_vcs'] = vcs hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1271-gbb0229f
by Madhura Jayaratne 21 Jan '11

21 Jan '11

The branch, master has been updated via bb0229fc07e40347d02b26ad84399ac6cd91354f (commit) from 09707e067762971183543ad71fbc03458c650209 (commit) - Log ----------------------------------------------------------------- commit bb0229fc07e40347d02b26ad84399ac6cd91354f Author: madhuracj <madhura.cj(a)gmail.com> Date: Fri Jan 21 09:00:01 2011 +0530 Schema export to PDF functionality made compatible with TCPDF 5.9 ----------------------------------------------------------------------- Summary of changes: libraries/schema/Pdf_Relation_Schema.class.php | 32 +++++++++--------------- 1 files changed, 12 insertions(+), 20 deletions(-) diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index 7763701..5b8e517 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -41,14 +41,14 @@ class PMA_PDF extends TCPDF var $Alias = array(); var $widths; - public function getFh() + public function getH() { - return $this->fh; + return $this->h; } - public function getFw() + public function getW() { - return $this->fw; + return $this->w; } public function setCMargin($c_margin) @@ -343,15 +343,6 @@ class PMA_PDF extends TCPDF $this->_putbookmarks(); } - function _putcatalog() - { - parent::_putcatalog(); - if (count($this->Outlines) > 0) { - $this->_out('/Outlines ' . $this->def_outlines . ' 0 R'); - $this->_out('/PageMode /UseOutlines'); - } - } - function SetWidths($w) { // column widths @@ -862,7 +853,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $this->setExportType($_POST['export_type']); // Initializes a new document - $pdf = new PMA_PDF('L', 'mm', $this->paper); + $pdf = new PMA_PDF($this->orientation, 'mm', $this->paper); $pdf->SetTitle(sprintf(__('Schema of the %s database - Page %s'), $GLOBALS['db'], $this->pageNumber)); $pdf->setCMargin(0); $pdf->Open(); @@ -908,8 +899,8 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema // Defines the scale factor $this->scale = ceil( max( - ($this->_xMax - $this->_xMin) / ($pdf->getFh() - $this->rightMargin - $this->leftMargin), - ($this->_yMax - $this->_yMin) / ($pdf->getFw() - $this->topMargin - $this->bottomMargin)) + ($this->_xMax - $this->_xMin) / ($pdf->getW() - $this->rightMargin - $this->leftMargin), + ($this->_yMax - $this->_yMin) / ($pdf->getH() - $this->topMargin - $this->bottomMargin)) * 100) / 100; $pdf->PMA_PDF_setScale($this->scale, $this->_xMin, $this->_yMin, $this->leftMargin, $this->topMargin); @@ -1002,7 +993,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetDrawColor(200, 200, 200); // Draws horizontal lines for ($l = 0; $l < 21; $l++) { - $pdf->line(0, $l * 10, $pdf->getFh(), $l * 10); + $pdf->line(0, $l * 10, $pdf->getW(), $l * 10); // Avoid duplicates if ($l > 0) { $pdf->SetXY(0, $l * 10); @@ -1012,7 +1003,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } // end for // Draws vertical lines for ($j = 0; $j < 30 ;$j++) { - $pdf->line($j * 10, 0, $j * 10, $pdf->getFw()); + $pdf->line($j * 10, 0, $j * 10, $pdf->getH()); $pdf->SetXY($j * 10, 0); $label = (string) sprintf('%.0f', ($j * 10 - $this->leftMargin) * $this->scale + $this->_xMin); $pdf->Cell(5, 7, $label); @@ -1114,12 +1105,13 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema } $pdf->PMA_links['RT']['-'] = $pdf->AddLink(); $pdf->SetX(10); - $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['doc'][$lasttable]['-']); + $pdf->Cell(0, 6, __('Page number:') . ' {' . sprintf("%02d", $i + 1) . '}', 0, 0, 'R', 0, $pdf->PMA_links['RT']['-']); $pdf->SetX(10); - $pdf->Cell(0, 6, $i + 1 . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); + $pdf->Cell(0, 6, $i . ' ' . __('Relational schema'), 0, 1, 'L', 0, $pdf->PMA_links['RT']['-']); $z = 0; foreach ($alltables as $table) { $z++; + $pdf->SetAutoPageBreak(true); $pdf->addpage($GLOBALS['orientation']); $pdf->Bookmark($table); $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo()) ; hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git January 2011