Merge pull request #4 from mynetx/master

Updated German translation
phpmyadmin · Mar 12, 2012 · 0e337c0 · 0e337c0
2 parents ed8a498 + 211214d
commit 0e337c0
Show file tree

Hide file tree

Showing 8 changed files with 985 additions and 867 deletions.
diff --git a/db_operations.php b/db_operations.php
@@ -23,6 +23,18 @@
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
 $GLOBALS['js_include'][] = 'db_operations.js';
 
+/**
+ * Sets globals from $_REQUEST (we're using GET on ajax, POST otherwise)
+ */
+$request_params = array(
+    'drop_if_exists'
+);
+foreach ($request_params as $one_request_param) {
+    if (isset($_REQUEST[$one_request_param])) {
+        $GLOBALS[$one_request_param] = $_REQUEST[$one_request_param];
+    }
+}
+
 /**
  * Rename/move or copy database
  */

diff --git a/import_status.php b/import_status.php
@@ -8,6 +8,19 @@
 require_once './libraries/common.inc.php';
 require_once './libraries/display_import_ajax.lib.php';
 
+/**
+ * Sets globals from $_GET
+ */
+$get_params = array(
+    'message',
+    'id'
+);
+foreach ($get_params as $one_get_param) {
+    if (isset($_GET[$one_get_param])) {
+        $GLOBALS[$one_get_param] = $_GET[$one_get_param];
+    }
+}
+
 // AJAX requests can't be cached!
 PMA_no_cache_header();
 

diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -1130,7 +1130,7 @@ public function dataDictionaryDoc($alltables)
     {
         global $db, $pdf, $orientation, $paper;
         // TOC
-        $pdf->addpage($GLOBALS['orientation']);
+        $pdf->addpage($_POST['orientation']);
         $pdf->Cell(0, 9, __('Table of contents'), 1, 0, 'C');
         $pdf->Ln(15);
         $i = 1;
@@ -1175,7 +1175,7 @@ public function dataDictionaryDoc($alltables)
         foreach ($alltables as $table) {
             $z++;
             $pdf->SetAutoPageBreak(true, 15);
-            $pdf->addpage($GLOBALS['orientation']);
+            $pdf->addpage($_POST['orientation']);
             $pdf->Bookmark($table);
             $pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo());
             $pdf->PMA_links['RT'][$table]['-'] = $pdf->AddLink();

diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php
@@ -24,13 +24,13 @@
 
 body {
 <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
-    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+    font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
 <?php } ?>
-    background:         url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0% #f3f3f3;
-    border-right:       1px solid #aaa;
-    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-    margin:             0;
-    padding:            0;
+    background: url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0% #f3f3f3;
+    border-right: 1px solid #aaa;
+    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin: 0;
+    padding: 0;
 }
 
 a img {
@@ -40,37 +40,37 @@
 a:link,
 a:visited,
 a:active {
-    text-decoration:    none;
-    color:              #0000FF;
+    text-decoration: none;
+    color: #0000FF;
 }
 
 ul {
-    margin:0;
+    margin: 0;
 }
 
 form {
-    margin:             0;
-    padding:            0;
-    display:            inline;
+    margin: 0;
+    padding: 0;
+    display: inline;
 }
 
 select#select_server,
 select#lightm_db {
-    width:              100%;
+    width: 100%;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
    this breaks design */
 button {
-    display:            inline;
+    display: inline;
 }
 
 /******************************************************************************/
 /* classes */
 
 .navi_dbName {
-    font-weight:    bold;
-    color:          <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
+    font-weight: bold;
+    color: <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
 }
 
 /******************************************************************************/
@@ -92,14 +92,14 @@
 div#pmalogo,
 div#leftframelinks,
 div#databaseList {
-    text-align:         center;
-    margin:             5px 10px 0px 10px;
+    text-align: center;
+    margin: 5px 10px 0px 10px;
 }
 
 ul#databaseList {
-    margin: 0.8em 0px;
-    padding-bottom:     0.5em;
-    padding-<?php echo $left; ?>:     0.3em;
+    margin: .8em 0px;
+    padding-bottom: .5em;
+    padding-<?php echo $left; ?>: .3em;
     font-style: italic;
 }
 
@@ -117,14 +117,14 @@
 }
 
 div#navidbpageselector {
-    margin: 0.1em;
+    margin: .1em;
     text-align: center;
 }
 
 div#navidbpageselector a,
 div#navidbpageselector select{
     color: #333;
-    margin: 0.2em;
+    margin: .2em;
 }
 
 ul#databaseList ul {
@@ -149,15 +149,15 @@
 }
 
 div#leftframelinks .icon {
-    padding:            0;
-    margin:             0;
+    padding: 0;
+    margin: 0;
 }
 
 div#reloadlink a img,
 div#leftframelinks a img.icon {
-    margin:        0.3em;
-    margin-top:    0.7em;
-    border:        0;
+    margin: .3em;
+    margin-top: .7em;
+    border: 0;
 }
 
 div#leftframelinks a:hover img {
@@ -180,31 +180,31 @@
 
 div#left_tableList {margin:10px 10px 0 10px;}
 div#left_tableList ul {
-    list-style-type:    none;
+    list-style-type: none;
     list-style-position: outside;
-    margin:             0;
-    padding:            0;
+    margin: 0;
+    padding: 0;
 }
 
 div#left_tableList ul ul {
-    font-size:          100%;
+    font-size: 100%;
 }
 
 div#left_tableList a {
-    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-    text-decoration:    none;
+    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    text-decoration: none;
 }
 
 div#left_tableList a:hover {
-    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-    text-decoration:    underline;
+    background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    text-decoration: underline;
 }
 
 div#left_tableList li {
-    margin:             0;
-    padding:            2px 0;
-    white-space:        nowrap;
+    margin: 0;
+    padding: 2px 0;
+    white-space: nowrap;
 }
 
 #newtable {
@@ -234,12 +234,12 @@
 }
 
 select{
-    -moz-border-radius:2px 2px 2px 2px;
-    -moz-box-shadow:0 1px 2px #DDDDDD;
-    border:1px solid #aaa;
-    color:#333333;
-    padding:3px;
-    background:url(./themes/pmahomme/img/input_bg.gif);
+    -moz-border-radius: 2px 2px 2px 2px;
+    -moz-box-shadow: 0 1px 2px #DDDDDD;
+    border: 1px solid #aaa;
+    color: #333;
+    padding: 3px;
+    background: url(themes/pmahomme/img/input_bg.gif);
 }
 
 <?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
@@ -254,32 +254,32 @@
 <?php if ($GLOBALS['cfg']['LeftPointerEnable']) { ?>
 div#left_tableList > ul li:hover > a,
 div#left_tableList > ul li:hover {
-    background:         #e4e4e4;
-    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
+    background: #e4e4e4;
+    color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 <?php } ?>
 
 div#left_tableList img {
-    padding:            0;
-    vertical-align:     middle;
+    padding: 0;
+    vertical-align: middle;
 }
 
 div#left_tableList ul ul {
-    margin-<?php echo $left; ?>:        0;
-    padding-<?php echo $left; ?>:       0.1em;
-    border-<?php echo $left; ?>:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-    padding-bottom:     0.1em;
-    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin-<?php echo $left; ?>: 0;
+    padding-<?php echo $left; ?>: .1em;
+    border-<?php echo $left; ?>: .1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    padding-bottom: .1em;
+    border-bottom: .1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
 
 /* for the servers list in navi panel */
 #serverinfo .item {
-    white-space:        nowrap;
-    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    white-space: nowrap;
+    color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
 #serverinfo a:hover {
-    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
+    background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 #reloadlink {
     clear: both;
@@ -304,9 +304,9 @@
 
 #fast_filter {
     width: 85%;
-    padding: 0.1em;
+    padding: .1em;
 }
 
 #fast_filter.gray {
     color: gray;
-}
+}
diff --git a/themes/pmahomme/css/theme_print.css.php b/themes/pmahomme/css/theme_print.css.php
@@ -9,32 +9,30 @@
 ?>
 /* For printview */
 body, table, th, td {
-    color:             #000000;
-    background-color:  #ffffff;
+    color: #000;
+    background-color: #fff;
 }
 
 img {
     border: 0;
 }
 
 table, th, td {
-    border-width:      0.1em;
-    border-color:      #000000;
-    border-style:      solid;
+    border: .1em solid #000;
 }
 
 table {
-    border-collapse:   collapse;
-    border-spacing:    0;
+    border-collapse: collapse;
+    border-spacing: 0;
 }
 
 th, td {
-    padding:           0.2em;
+    padding: .2em;
 }
 
 th {
-    font-weight:       bold;
-    background-color:  #e5e5e5;
+    font-weight: bold;
+    background-color: #e5e5e5;
 }
 
 .hide {