[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19909-g55d72e8
Piotr Przybylski
crackpl at users.sourceforge.net
Sun Sep 25 17:36:59 CEST 2011
The branch, master has been updated
via 55d72e8c71e967d0bcba9069f2402a88882ee4c5 (commit)
via 29a41fc9916fae27d222c970b697474dcb1ce116 (commit)
via 0c2f7f16f52cd0e37687fac063ad36678657b070 (commit)
from 1c48e6a817746e4f37f1ec685850abdcbdf7b7ff (commit)
- Log -----------------------------------------------------------------
commit 55d72e8c71e967d0bcba9069f2402a88882ee4c5
Merge: 1c48e6a 29a41fc
Author: Piotr Przybylski <piotrprz at gmail.com>
Date: Sun Sep 25 17:35:07 2011 +0200
Merge branch 'QA_3_4'
Conflicts:
pmd_general.php
-----------------------------------------------------------------------
Summary of changes:
libraries/navigation_header.inc.php | 2 +-
pmd_general.php | 38 +++++++++++++++++-----------------
querywindow.php | 8 +++---
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php
index 7f7c530..ede5ef8 100644
--- a/libraries/navigation_header.inc.php
+++ b/libraries/navigation_header.inc.php
@@ -84,7 +84,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
}
echo '<a href="' . $anchor . '&no_js=true"'
.' title="' . __('Query window') . '"';
- echo ' onclick="javascript:if (window.parent.open_querywindow()) return false;"';
+ echo ' onclick="if (window.parent.open_querywindow()) return false;"';
echo '>' . $query_frame_link_text . '</a>' . "\n";
} // end if ($server != 0)
diff --git a/pmd_general.php b/pmd_general.php
index 3f59a4c..b455281 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -59,46 +59,46 @@ echo $script_tabs . $script_contr . $script_display_field;
<body onload="Main()" class="general_body" id="pmd_body">
<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">
+ <a href="#"
+ onclick="Show_left_menu(document.getElementById('key_Show_left_menu')); return false" class="M_butt first" target="_self">
<img id='key_Show_left_menu' title="<?php echo __('Show/Hide left menu'); ?>"
alt="v" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2_m.png" /></a>
- <a href="javascript:Save2();" onmousedown="return false;"
+ <a href="#" onclick="Save2(); return false"
class="M_butt" target="_self"
><img title="<?php echo __('Save position') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/save.png" alt=""
- /></a><a href="javascript:Start_table_new();" onmousedown="return false;"
+ /></a><a href="#" onclick="Start_table_new(); return false"
class="M_butt" target="_self"
><img title="<?php echo __('Create table')?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/table.png" alt=""
- /></a><a href="javascript:Start_relation();" onmousedown="return false;"
+ /></a><a href="#" onclick="Start_relation(); return false"
class="M_butt" id="rel_button" target="_self"
><img title="<?php echo __('Create relation') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/relation.png" alt=""
- /></a><a href="javascript:Start_display_field();" onmousedown="return false;"
+ /></a><a href="#" onclick="Start_display_field(); return false"
class="M_butt" id="display_field_button" target="_self"
><img title="<?php echo __('Choose column to display') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/display_field.png" alt=""
- /></a><a href="javascript:location.reload();" onmousedown="return false;"
+ /></a><a href="#" onclick="location.reload(); return false"
class="M_butt" target="_self"
><img title="<?php echo __('Reload'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/reload.png" alt=""
/></a><a href="Documentation.html#faq6_31" target="documentation"
class="M_butt" target="_self"
><img title="<?php echo __('Help'); ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/help.png" alt=""
/></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
- /><a href="javascript:Angular_direct();" onmousedown="return false;"
+ /><a href="#" onclick="Angular_direct(); return false"
class="M_butt" id="angular_direct_button" target="_self"
><img title="<?php echo __('Angular links') . ' / ' . __('Direct links'); ?>"
src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/ang_direct.png" alt=""
- /></a><a href="javascript:Grid();" onmousedown="return false;"
+ /></a><a href="#" onclick="Grid(); return false"
class="M_butt" id="grid_button" target="_self"
><img title="<?php echo __('Snap to grid') ?>" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/grid.png" alt=""
/></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
- /><a href="javascript:Small_tab_all(document.getElementById('key_SB_all'));"
- onmousedown="return false;" class="M_butt" target="_self"
+ /><a href="#"
+ onclick="Small_tab_all(document.getElementById('key_SB_all')); return false" class="M_butt" target="_self"
><img id='key_SB_all' title="<?php echo __('Small/Big All'); ?>" alt="v"
src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png"
- /></a><a href="javascript:Small_tab_invert();" onmousedown="return false;"
+ /></a><a href="#" onclick="Small_tab_invert(); return false"
class="M_butt" target="_self"
><img title="<?php echo __('Toggle small/big'); ?>" alt="key" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bottom.png"
/></a><img class="M_bord" src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/bord.png" alt=""
- /><a href="javascript:PDF_save();" onmousedown="return false;"
+ /><a href="#" onclick="PDF_save(); return false"
class="M_butt" target="_self"
><img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/pdf.png" alt="key" width="20" height="20"
title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a
@@ -109,8 +109,8 @@ echo $script_tabs . $script_contr . $script_display_field;
echo '<img src="'. $GLOBALS['pmaThemeImage'] . 'pmd/query_builder.png" alt="key" width="20" height="20" title="';
echo __('Build Query');
echo '"/></a>'; }?>
- <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));"
- onmousedown="return false;" class="M_butt last" target="_self">
+ <a href="#"
+ onclick="Top_menu_right(document.getElementById('key_Left_Right')); return false" class="M_butt last" target="_self">
<img src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/2rightarrow_m.png" id="key_Left_Right" alt=">"
title="<?php echo __('Move Menu'); ?>" /></a>
</div>
@@ -121,12 +121,12 @@ echo $script_tabs . $script_contr . $script_display_field;
</div>
<div id="layer_menu" style="display:none;">
<div align="center" style="padding-top:5px;">
- <a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));"
- onmousedown="return false;" class="M_butt" target="_self">
+ <a href="#"
+ onclick="Hide_tab_all(document.getElementById('key_HS_all')); return false" class="M_butt" target="_self">
<img title="<?php echo __('Hide/Show all'); ?>" alt="v"
src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow1.png" id='key_HS_all' /></a>
- <a href="javascript:No_have_constr(document.getElementById('key_HS'));"
- onmousedown="return false;" class="M_butt" target="_self">
+ <a href="#"
+ onclick="No_have_constr(document.getElementById('key_HS')); return false" class="M_butt" target="_self">
<img title="<?php echo __('Hide/Show Tables with no relation'); ?>" alt="v"
src="<?php echo $GLOBALS['pmaThemeImage'] ?>pmd/downarrow2.png" id='key_HS' /></a>
</div>
diff --git a/querywindow.php b/querywindow.php
index 7a9f83d..9cffbe6 100644
--- a/querywindow.php
+++ b/querywindow.php
@@ -63,23 +63,23 @@ if ($no_js) {
$tabs['sql']['icon'] = 'ic_b_sql';
$tabs['sql']['text'] = __('SQL');
$tabs['sql']['fragment'] = '#';
- $tabs['sql']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'sql\');return false;"';
+ $tabs['sql']['attr'] = 'onclick="PMA_querywindowCommit(\'sql\');return false;"';
$tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql');
$tabs['import']['icon'] = 'ic_b_import';
$tabs['import']['text'] = __('Import files');
$tabs['import']['fragment'] = '#';
- $tabs['import']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'files\');return false;"';
+ $tabs['import']['attr'] = 'onclick="PMA_querywindowCommit(\'files\');return false;"';
$tabs['import']['active'] = (bool) ($querydisplay_tab == 'files');
$tabs['history']['icon'] = 'ic_b_bookmark';
$tabs['history']['text'] = __('SQL history');
$tabs['history']['fragment'] = '#';
- $tabs['history']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'history\');return false;"';
+ $tabs['history']['attr'] = 'onclick="PMA_querywindowCommit(\'history\');return false;"';
$tabs['history']['active'] = (bool) ($querydisplay_tab == 'history');
if ($GLOBALS['cfg']['QueryWindowDefTab'] == 'full') {
$tabs['all']['text'] = __('All');
$tabs['all']['fragment'] = '#';
- $tabs['all']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'full\');return false;"';
+ $tabs['all']['attr'] = 'onclick="PMA_querywindowCommit(\'full\');return false;"';
$tabs['all']['active'] = (bool) ($querydisplay_tab == 'full');
}
}
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list