Git August 2011

git@phpmyadmin.net

8 participants
476 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15896-gd7e4004
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via d7e400416eda7ea663631ab19d8b1b59fbb1cd5d (commit) from 86dad703868c01089cfdceaaf3cc0a7e0bbdf10b (commit) - Log ----------------------------------------------------------------- commit d7e400416eda7ea663631ab19d8b1b59fbb1cd5d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:49:05 2011 +0200 Fix displaying of hint ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 6109d89..4fc6f43 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3096,7 +3096,7 @@ canvas.pmd * { top: 50px; z-index: 3; border: #00CC66 solid 1px; - visibility: hidden; + display: none; } .scroll_tab { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15895-g86dad70
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 86dad703868c01089cfdceaaf3cc0a7e0bbdf10b (commit) from 8214176078993523ff967538d9a4130fc68b637d (commit) - Log ----------------------------------------------------------------- commit 86dad703868c01089cfdceaaf3cc0a7e0bbdf10b Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:45:02 2011 +0200 Fix some display issues ----------------------------------------------------------------------- Summary of changes: js/pmd/move.js | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index 49be35c..6c3f56e 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -536,11 +536,11 @@ function Start_relation() document.getElementById('foreign_relation').style.display = ''; ON_relation = 1; document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectReferencedKey']; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; document.getElementById('rel_button').className = 'M_butt_Selected_down'; } else { document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('rel_button').className = 'M_butt'; click_field = 0; ON_relation = 0; @@ -551,7 +551,7 @@ function Click_field(T, f, PK) // table field { if (ON_relation) { if (!click_field) { - //.style.display=='none' .style.visibility = "hidden" + //.style.display=='none' .style.display = 'none' if (!PK) { alert(PMA_messages['strPleaseSelectPrimaryOrUniqueKey']); return;// 0; @@ -571,7 +571,7 @@ function Click_field(T, f, PK) // table field document.getElementById('layer_new_relation').style.left = left + 'px'; var top = Glob_Y - document.getElementById('layer_new_relation').offsetHeight + 40; document.getElementById('layer_new_relation').style.top = top + 'px'; - document.getElementById('layer_new_relation').style.visibility = "visible"; + document.getElementById('layer_new_relation').style.display = 'block'; link_relation += '&T2=' + T + '&F2=' + f; } } @@ -597,7 +597,7 @@ function Click_field(T, f, PK) // table field } ON_display_field = 0; document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('display_field_button').className = 'M_butt'; makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token); } @@ -954,7 +954,7 @@ function Start_display_field() if (!ON_display_field) { ON_display_field = 1; document.getElementById('pmd_hint').innerHTML = PMA_messages['strChangeDisplay']; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA if (isIE) { // correct for IE @@ -962,7 +962,7 @@ function Start_display_field() } } else { document.getElementById('pmd_hint').innerHTML = ""; - document.getElementById('pmd_hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').style.display = 'none'; document.getElementById('display_field_button').className = 'M_butt'; ON_display_field = 0; } @@ -1019,7 +1019,7 @@ function Click_option(id_this,column_name,table_name) document.getElementById(id_this).style.left = left + 'px'; // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10; document.getElementById(id_this).style.top = (screen.height / 4) + 'px'; - document.getElementById(id_this).style.visibility = "visible"; + document.getElementById(id_this).style.display = 'block'; document.getElementById('option_col_name').innerHTML = '<strong>' + PMA_messages['strAddOption'] +'"' +column_name+ '"</strong>'; col_name = column_name; tab_name = table_name; @@ -1027,7 +1027,7 @@ function Click_option(id_this,column_name,table_name) function Close_option() { - document.getElementById('pmd_optionse').style.visibility = "hidden"; + document.getElementById('pmd_optionse').style.display = 'none'; } function Select_all(id_this,owner) @@ -1135,7 +1135,7 @@ function add_object() if (rel.value != '--') { if (document.getElementById('Query').value == "") { document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; return; } var p = document.getElementById('Query'); @@ -1167,7 +1167,7 @@ function add_object() if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; return; } var p = document.getElementById('having'); @@ -1185,7 +1185,7 @@ function add_object() //make orderby } document.getElementById('pmd_hint').innerHTML = sum + "object created" ; - document.getElementById('pmd_hint').style.visibility = "visible"; + document.getElementById('pmd_hint').style.display = 'block'; //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15894-g8214176
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 8214176078993523ff967538d9a4130fc68b637d (commit) via aaf92da021e9ce68d91d023e407aa85a2378be96 (commit) via d77ee8191650ab47e5ddeffd4c81e51969da0aac (commit) from 1fa197752bea2661a25431c9d2d3eccaa72aedef (commit) - Log ----------------------------------------------------------------- commit 8214176078993523ff967538d9a4130fc68b637d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:42:33 2011 +0200 Remove tabs commit aaf92da021e9ce68d91d023e407aa85a2378be96 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:42:24 2011 +0200 Fix indentation commit d77ee8191650ab47e5ddeffd4c81e51969da0aac Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:41:44 2011 +0200 Fix syntax errors ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 74 +++++++++++++++--------------- 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index ae18677..6109d89 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1462,7 +1462,7 @@ div#queryAnalyzerDialog div.CodeMirror-scroll { } div#queryAnalyzerDialog div#queryProfiling { - height: 250px; + height: 250px; } div#queryAnalyzerDialog td.explain { @@ -1470,9 +1470,9 @@ div#queryAnalyzerDialog td.explain { } div#queryAnalyzerDialog table.queryNums { - display: none; - border:0; - text-align:left; + display: none; + border:0; + text-align:left; } .smallIndent { @@ -3375,49 +3375,49 @@ a.M_butt:hover { } .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; + 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(images/plus.png) 85% 55% no-repeat; -border:1px solid #444444; -display: block; + position: fixed; + text-decoration: none; + top: 60px; right: 0; + color:#fff; + padding: 10px 40px 10px 15px; + background:#333333 url(images/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(images/plus.png) 85% 55% no-repeat; -border:1px solid #999; -display: block; + position: fixed; + text-decoration: none; + top: 60px; right: 0; + color:#080808; + padding: 10px 40px 10px 15px; + background:#fff696 url(images/plus.png) 85% 55% no-repeat; + border:1px solid #999; + display: block; } a.active.trigger { -background:#222222 url(images/minus.png) 85% 55% no-repeat; -z-index:999; + background:#222222 url(images/minus.png) 85% 55% no-repeat; + z-index:999; } a.active.trigger:hover { -background:#fff696 url(images/minus.png) 85% 55% no-repeat; -z-index:999; + background:#fff696 url(images/minus.png) 85% 55% no-repeat; + z-index:999; } h2.tiger{ @@ -3520,7 +3520,7 @@ h2.active { left-padding:8px; margin:0; border-bottom:4px solid #3CF; - background-color: #D0DCE0; //#09c; + background-color: #D0DCE0; color:black; font-weight:bold; padding-left: 2px; @@ -3528,7 +3528,7 @@ h2.active { } #tblfooter { - background-color: D3DCE3; + background-color: #D3DCE3; float: right; padding-top:10px; color: black; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15891-g1fa1977
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 1fa197752bea2661a25431c9d2d3eccaa72aedef (commit) from fd13e7ad67215df22983942163cfff80712637a0 (commit) - Log ----------------------------------------------------------------- commit 1fa197752bea2661a25431c9d2d3eccaa72aedef Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:35:13 2011 +0200 Fixed displaying of table menu ----------------------------------------------------------------------- Summary of changes: js/pmd/move.js | 5 ++++- themes/pmahomme/css/theme_right.css.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index e41b107..49be35c 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -915,7 +915,10 @@ function General_scroll_end() function Show_left_menu(id_this) // max/min all tables { if (id_this.alt == "v") { - document.getElementById("layer_menu").style.top = document.getElementById('top_menu').offsetHeight + 'px'; + var pos = $("#top_menu").offset(); + var height = $("#top_menu").height(); + document.getElementById("layer_menu").style.top = (pos.top + height) + 'px'; + document.getElementById("layer_menu").style.left = pos.left + 'px'; document.getElementById("layer_menu").style.display = 'block'; id_this.alt = ">"; id_this.src = "pmd/images/uparrow2_m.png"; diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 0a47845..ae18677 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3325,9 +3325,9 @@ a.M_butt:hover { } #layer_menu { - clear: both; - float: left; z-index: 1000; + position: absolute; + left: 0; background-color: #EAEEF0; border: #999999 solid 1px; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15890-gfd13e7a
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via fd13e7ad67215df22983942163cfff80712637a0 (commit) via 1fdc278e023e2c64616986bf406020ed8f6a996a (commit) from 99e979b373f85a10988018cbe0dd320640510489 (commit) - Log ----------------------------------------------------------------- commit fd13e7ad67215df22983942163cfff80712637a0 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:25:08 2011 +0200 Use display = none instead of visibility to avoid off screen invisible elements commit 1fdc278e023e2c64616986bf406020ed8f6a996a Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:22:10 2011 +0200 Get rid of useless variable ----------------------------------------------------------------------- Summary of changes: js/pmd/move.js | 30 +++++++++++++++--------------- pmd_general.php | 31 +++++++++++++++---------------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index 6f30293..e41b107 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -113,7 +113,7 @@ function MouseDown(e) dx = offsetx - parseInt(cur_click.style.left); dy = offsety - parseInt(cur_click.style.top); //alert(" dx = " + dx + " dy = " +dy); - document.getElementById("canvas").style.visibility = 'hidden'; + document.getElementById("canvas").style.display = 'none'; /* var left = parseInt(cur_click.style.left); var top = parseInt(cur_click.style.top); @@ -173,7 +173,7 @@ function MouseMove(e) function MouseUp(e) { if (cur_click != null) { - document.getElementById("canvas").style.visibility = 'visible'; + document.getElementById("canvas").style.display = 'inline-block'; Re_load(); cur_click.style.zIndex = 1; cur_click = null; @@ -605,7 +605,7 @@ function Click_field(T, f, PK) // table field function New_relation() { - document.getElementById('layer_new_relation').style.visibility = 'hidden'; + document.getElementById('layer_new_relation').style.display = 'none'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value; link_relation += Get_url_pos(); @@ -776,14 +776,14 @@ function Canvas_click(id) document.getElementById('layer_upd_relation').style.left = left + 'px'; var top = Glob_Y - document.getElementById('layer_upd_relation').offsetHeight - 10; document.getElementById('layer_upd_relation').style.top = top + 'px'; - document.getElementById('layer_upd_relation').style.visibility = 'visible'; + document.getElementById('layer_upd_relation').style.display = 'block'; link_relation = 'T1=' + Key0 + '&F1=' + Key1 + '&T2=' + Key2 + '&F2=' + Key3 + '&K=' + Key; } } function Upd_relation() { - document.getElementById('layer_upd_relation').style.visibility = 'hidden'; + document.getElementById('layer_upd_relation').style.display = 'none'; link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0'; link_relation += Get_url_pos(); makeRequest('pmd_relation_upd.php', link_relation); @@ -792,9 +792,9 @@ function Upd_relation() function VisibleTab(id, t_n) { if (id.checked) { - document.getElementById(t_n).style.visibility = 'visible'; + document.getElementById(t_n).style.display = 'block'; } else { - document.getElementById(t_n).style.visibility = 'hidden'; + document.getElementById(t_n).style.display = 'none'; } Re_load(); } @@ -813,10 +813,10 @@ function Hide_tab_all(id_this) // max/min all tables if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') { if (id_this.alt == 'v') { E.elements[i].checked = true; - document.getElementById(E.elements[i].value).style.visibility = 'visible'; + document.getElementById(E.elements[i].value).style.display = 'block'; } else { E.elements[i].checked = false; - document.getElementById(E.elements[i].value).style.visibility = 'hidden'; + document.getElementById(E.elements[i].value).style.display = 'none'; } } } @@ -859,10 +859,10 @@ function No_have_constr(id_this) if (!in_array_k(E.elements[i].value, a)) if (id_this.alt == 'v') { E.elements[i].checked = true; - document.getElementById(E.elements[i].value).style.visibility = 'visible'; + document.getElementById(E.elements[i].value).style.display = 'block'; } else { E.elements[i].checked = false; - document.getElementById(E.elements[i].value).style.visibility = 'hidden'; + document.getElementById(E.elements[i].value).style.display = 'none'; } } } @@ -879,7 +879,7 @@ function General_scroll() { /* if (!document.getElementById('show_relation_olways').checked) { - document.getElementById("canvas").style.visibility = 'hidden'; + document.getElementById("canvas").style.display = 'none'; clearTimeout(timeoutID); timeoutID = setTimeout(General_scroll_end, 500); } @@ -908,7 +908,7 @@ function General_scroll_end() document.getElementById('layer_menu').style.left = document.body.scrollLeft; document.getElementById('layer_menu').style.top = document.body.scrollTop + document.getElementById('top_menu').offsetHeight; } - document.getElementById("canvas").style.visibility = 'visible'; + document.getElementById("canvas").style.display = 'block'; } */ @@ -916,7 +916,7 @@ function Show_left_menu(id_this) // max/min all tables { if (id_this.alt == "v") { document.getElementById("layer_menu").style.top = document.getElementById('top_menu').offsetHeight + 'px'; - document.getElementById("layer_menu").style.visibility = 'visible'; + document.getElementById("layer_menu").style.display = 'block'; id_this.alt = ">"; id_this.src = "pmd/images/uparrow2_m.png"; if (isIE) { @@ -924,7 +924,7 @@ function Show_left_menu(id_this) // max/min all tables } } else { document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll - document.getElementById("layer_menu").style.visibility = 'hidden'; + document.getElementById("layer_menu").style.display = 'none'; id_this.alt = "v"; id_this.src = "pmd/images/downarrow2_m.png"; } diff --git a/pmd_general.php b/pmd_general.php index 89a6d5c..cf8d842 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -17,7 +17,6 @@ $script_contr = get_script_contr(); $tab_pos = get_tab_pos(); $tables_pk_or_unique_keys = get_pk_or_unique_keys(); $tables_all_keys = get_all_keys(); -$hidden = "hidden"; $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { @@ -120,7 +119,7 @@ echo $script_tabs . $script_contr . $script_display_field; <div id="osn_tab"> <canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas> </div> -<div id="layer_menu" style="visibility:<?php echo $hidden ?>;"> +<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"> @@ -328,9 +327,9 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { ?> </form> <div id="pmd_hint"></div> -<div id='layer_action' style="visibility:<?php echo $hidden ?>;">Load...</div> +<div id='layer_action' style="display:none;">Load...</div> -<table id="layer_new_relation" style="visibility:<?php echo $hidden ?>;" +<table id="layer_new_relation" style="display:none;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> @@ -381,7 +380,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="<?php echo __('OK'); ?>" onclick="New_relation()" /> <input type="button" class="butt" name="Button" value="<?php echo __('Cancel'); ?>" - onclick="document.getElementById('layer_new_relation').style.visibility = 'hidden';" /> + onclick="document.getElementById('layer_new_relation').style.display = 'none';" /> </td> </tr> </tbody> @@ -397,7 +396,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tbody> </table> -<table id="layer_upd_relation" style="visibility:<?PHP echo $hidden ?>;" +<table id="layer_upd_relation" style="display:none;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> @@ -418,7 +417,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { onclick="Upd_relation()" value="<?php echo __('Delete'); ?>" /> <input type="button" class="butt" name="Button" value="<?php echo __('Cancel'); ?>" - onclick="document.getElementById('layer_upd_relation').style.visibility = 'hidden'; Re_load();" /> + onclick="document.getElementById('layer_upd_relation').style.display = 'none'; Re_load();" /> </td> </tr> </table></td> @@ -432,7 +431,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tbody> </table> -<table id="pmd_optionse" style="visibility:<?php echo $hidden ?>;" +<table id="pmd_optionse" style="display:none;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> @@ -554,7 +553,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tbody> </table> -<table id="query_rename_to" style="visibility:<?php echo $hidden ?>;" +<table id="query_rename_to" style="display:none;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> @@ -586,7 +585,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="<?php echo __('OK'); ?>" onclick="edit('Rename')" /> <input type="button" class="butt" name="Button" value="<?php echo __('Cancel'); ?>" - onclick="document.getElementById('query_rename_to').style.visibility = 'hidden';" /> + onclick="document.getElementById('query_rename_to').style.display = 'none';" /> </td> </tr> </tbody> @@ -602,7 +601,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tbody> </table> -<table id="query_having" style="visibility:<?php echo $hidden ?>;" +<table id="query_having" style="display:none;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> @@ -662,7 +661,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="<?php echo __('OK'); ?>" onclick="edit('Having')" /> <input type="button" class="butt" name="Button" value="<?php echo __('Cancel'); ?>" - onclick="document.getElementById('query_having').style.visibility = 'hidden';" /> + onclick="document.getElementById('query_having').style.display = 'none';" /> </td> </tr> </tbody> @@ -678,7 +677,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tbody> </table> -<table id="query_Aggregate" style="visibility:<?php echo $hidden ?>;" +<table id="query_Aggregate" style="display:none;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> @@ -716,7 +715,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="<?php echo __('OK'); ?>" onclick="edit('Aggregate')" /> <input type="button" class="butt" name="Button" value="<?php echo __('Cancel'); ?>" - onclick="document.getElementById('query_Aggregate').style.visibility = 'hidden';" /> + onclick="document.getElementById('query_Aggregate').style.display = 'none';" /> </td> </tr> </tbody> @@ -732,7 +731,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tbody> </table> -<table id="query_where" style="visibility:<?php echo $hidden ?>;" +<table id="query_where" style="display:none;" width="5%" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> @@ -779,7 +778,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { value="<?php echo __('OK'); ?>" onclick="edit('Where')" /> <input type="button" class="butt" name="Button" value="<?php echo __('Cancel'); ?>" - onclick="document.getElementById('query_where').style.visibility = 'hidden';" /> + onclick="document.getElementById('query_where').style.display = 'none';" /> </td> </tr> </tbody> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15888-g99e979b
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 99e979b373f85a10988018cbe0dd320640510489 (commit) from 9a0593ab2b76889665ceefa75214b37fc506bf8d (commit) - Log ----------------------------------------------------------------- commit 99e979b373f85a10988018cbe0dd320640510489 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:18:51 2011 +0200 Fix typo ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 3cf33df..89a6d5c 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -239,7 +239,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" <?php - if ( isset($tab_pos[$t_n]) && empty($tab_pos[$t_n]["V"]) { + if (isset($tab_pos[$t_n]) && empty($tab_pos[$t_n]["V"])) { echo 'style="display: none;"'; }?>> <?php hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15887-g9a0593a
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 9a0593ab2b76889665ceefa75214b37fc506bf8d (commit) from 12237ed84ff6549c6dbc1bc4640b320fd6184304 (commit) - Log ----------------------------------------------------------------- commit 9a0593ab2b76889665ceefa75214b37fc506bf8d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:18:05 2011 +0200 Fix expanding logic ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index bfb9818..3cf33df 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -238,7 +238,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { </tr> </thead> <tbody id="id_tbody_<?php echo $t_n_url ?>" - <?php if ( isset($tab_pos[$t_n])) echo 'style="display: none;"'; ?>> + <?php + if ( isset($tab_pos[$t_n]) && empty($tab_pos[$t_n]["V"]) { + echo 'style="display: none;"'; + }?>> <?php $display_field = PMA_getDisplayField($db, $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i]); for ($j = 0, $id_cnt = count($tab_column[$t_n]["COLUMN_ID"]); $j < $id_cnt; $j++) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15886-g12237ed
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 12237ed84ff6549c6dbc1bc4640b320fd6184304 (commit) via 88104eac669c8a5064179985bf41194f4e91c3f8 (commit) from 19dd8f292885ca6adc284b6c0977cb3ccfff20d3 (commit) - Log ----------------------------------------------------------------- commit 12237ed84ff6549c6dbc1bc4640b320fd6184304 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:10:49 2011 +0200 Remove no longer used Help funciton commit 88104eac669c8a5064179985bf41194f4e91c3f8 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:10:33 2011 +0200 Fix js to match changes ----------------------------------------------------------------------- Summary of changes: js/pmd/move.js | 45 ++++++++++++++++++++------------------------- 1 files changed, 20 insertions(+), 25 deletions(-) diff --git a/js/pmd/move.js b/js/pmd/move.js index eb2b246..6f30293 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -159,8 +159,8 @@ function MouseMove(e) } if (ON_relation || ON_display_field) { - document.getElementById('hint').style.left = (Glob_X + 20) + 'px'; - document.getElementById('hint').style.top = (Glob_Y + 20) + 'px'; + document.getElementById('pmd_hint').style.left = (Glob_X + 20) + 'px'; + document.getElementById('pmd_hint').style.top = (Glob_Y + 20) + 'px'; } if (layer_menu_cur_click) { @@ -225,7 +225,7 @@ function Main() Canvas_pos(); Small_tab_refresh(); Re_load(); - id_hint = document.getElementById('hint'); + id_hint = document.getElementById('pmd_hint'); if (isIE) { General_scroll(); } @@ -535,12 +535,12 @@ function Start_relation() if (!ON_relation) { document.getElementById('foreign_relation').style.display = ''; ON_relation = 1; - document.getElementById('hint').innerHTML = PMA_messages['strSelectReferencedKey']; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectReferencedKey']; + document.getElementById('pmd_hint').style.visibility = "visible"; document.getElementById('rel_button').className = 'M_butt_Selected_down'; } else { - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('rel_button').className = 'M_butt'; click_field = 0; ON_relation = 0; @@ -561,7 +561,7 @@ function Click_field(T, f, PK) // table field } click_field = 1; link_relation = "T1=" + T + "&F1=" + f; - document.getElementById('hint').innerHTML = PMA_messages['strSelectForeignKey']; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectForeignKey']; } else { Start_relation(); // hidden hint... if (j_tabs[db + '.' + T] != '1' || !PK) { @@ -596,8 +596,8 @@ function Click_field(T, f, PK) // table field display_field[T] = f; } ON_display_field = 0; - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('display_field_button').className = 'M_butt'; makeRequest('pmd_display_field.php', 'T=' + T + '&F=' + f + '&server=' + server + '&db=' + db + '&token=' + token); } @@ -868,11 +868,6 @@ function No_have_constr(id_this) } } -function Help() -{ - var WinHelp = window.open("pmd_help.php", "wind1", "top=200,left=400,width=300,height=200,resizable=yes,scrollbars=yes,menubar=no"); -} - function PDF_save() { // var WinPDF = @@ -955,16 +950,16 @@ function Start_display_field() } if (!ON_display_field) { ON_display_field = 1; - document.getElementById('hint').innerHTML = PMA_messages['strChangeDisplay']; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = PMA_messages['strChangeDisplay']; + document.getElementById('pmd_hint').style.visibility = "visible"; document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA if (isIE) { // correct for IE document.getElementById('display_field_button').className = 'M_butt_Selected_down_IE'; } } else { - document.getElementById('hint').innerHTML = ""; - document.getElementById('hint').style.visibility = "hidden"; + document.getElementById('pmd_hint').innerHTML = ""; + document.getElementById('pmd_hint').style.visibility = "hidden"; document.getElementById('display_field_button').className = 'M_butt'; ON_display_field = 0; } @@ -1136,8 +1131,8 @@ function add_object() var init = history_array.length; if (rel.value != '--') { if (document.getElementById('Query').value == "") { - document.getElementById('hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('pmd_hint').style.visibility = "visible"; return; } var p = document.getElementById('Query'); @@ -1168,8 +1163,8 @@ function add_object() } if (document.getElementById('h_rel_opt').value != '--') { if (document.getElementById('having').value == "") { - document.getElementById('hint').innerHTML = "value/subQuery is empty" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = "value/subQuery is empty" ; + document.getElementById('pmd_hint').style.visibility = "visible"; return; } var p = document.getElementById('having'); @@ -1186,8 +1181,8 @@ function add_object() document.getElementById('orderby').checked = false; //make orderby } - document.getElementById('hint').innerHTML = sum + "object created" ; - document.getElementById('hint').style.visibility = "visible"; + document.getElementById('pmd_hint').innerHTML = sum + "object created" ; + document.getElementById('pmd_hint').style.visibility = "visible"; //output sum new objects created var existingDiv = document.getElementById('ab'); existingDiv.innerHTML = display(init,history_array.length); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15884-g19dd8f2
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via 19dd8f292885ca6adc284b6c0977cb3ccfff20d3 (commit) from e443bdbd5a1618c3aad6040c6c71d9b365491ff4 (commit) - Log ----------------------------------------------------------------- commit 19dd8f292885ca6adc284b6c0977cb3ccfff20d3 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 13:04:08 2011 +0200 Make canvas aligned with tables ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index 3613f1f..bfb9818 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -117,6 +117,9 @@ echo $script_tabs . $script_contr . $script_display_field; </div> <form action="" method="post" name="form1"> +<div id="osn_tab"> + <canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas> +</div> <div id="layer_menu" style="visibility:<?php echo $hidden ?>;"> <div align="center" style="padding-top:5px;"> <a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));" @@ -173,9 +176,6 @@ for ($i = 0; $i < $name_cnt; $i++) { </div> </div> -<div id="osn_tab"> - <canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas> -</div> <?php for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15883-ge443bdb
by Michal Čihař 19 Aug '11

19 Aug '11

The branch, master has been updated via e443bdbd5a1618c3aad6040c6c71d9b365491ff4 (commit) from 3fe234a029308b370b014c755d60540cc553881d (commit) - Log ----------------------------------------------------------------- commit e443bdbd5a1618c3aad6040c6c71d9b365491ff4 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:59:46 2011 +0200 Remove explicit font definitions ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index fc04961..0a47845 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3046,8 +3046,6 @@ canvas.pmd * { color: #000000; border-collapse: collapse; border: 1px solid #AAAAAA; - font-family: Tahoma, sans-serif; - font-size: 10px; z-index: 1; -moz-user-select: none; } @@ -3109,8 +3107,6 @@ canvas.pmd * { .pmd_Tabs { cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; color: #0055bb; white-space: nowrap; text-decoration: none; @@ -3125,8 +3121,6 @@ canvas.pmd * { .pmd_Tabs2 { cursor: default; - font-family: Tahoma, sans-serif; - font-size: 10px; color: #0055bb; background: #FFEE99; text-indent: 3px; @@ -3138,10 +3132,7 @@ canvas.pmd * { } .owner { - font-family: Tahoma, sans-serif; - font-size: 9px; font-weight: normal; -/* background-color: #ffffff;*/ color: #888888; } @@ -3209,7 +3200,6 @@ canvas.pmd * { .butt { border: #4477aa solid 1px; - font-size: 11px; font-weight: bold; height: 19px; width: 70px; @@ -3219,7 +3209,6 @@ canvas.pmd * { } .L_butt2_1 { - font-size: 12px; padding: 1px; text-decoration: none; background-color: #ffffff; @@ -3229,7 +3218,6 @@ canvas.pmd * { } .L_butt2_2 { - font-size: 12px; padding: 0; border: #0099CC solid 1px; background: #FFEE99; @@ -3404,11 +3392,8 @@ a.trigger{ position: fixed; text-decoration: none; top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; color:#fff; padding: 10px 40px 10px 15px; -font-weight: 700; background:#333333 url(images/plus.png) 85% 55% no-repeat; border:1px solid #444444; display: block; @@ -3418,11 +3403,8 @@ a.trigger:hover{ position: fixed; text-decoration: none; top: 60px; right: 0; -font-size: 16px; -font-family: verdana, helvetica, arial, sans-serif; color:#080808; padding: 10px 40px 10px 15px; -font-weight: 700; background:#fff696 url(images/plus.png) 85% 55% no-repeat; border:1px solid #999; display: block; @@ -3442,7 +3424,6 @@ h2.tiger{ background-repeat: repeat-x; padding: 1px; font-weight: bold; - font-size:14px; padding: 50 20 50 20px; margin: 0 0 5px 0; width: 250px; @@ -3543,8 +3524,6 @@ h2.active { color:black; font-weight:bold; padding-left: 2px; - font-family:"Times New Roman", Times, serif; - font-size:16px; text-align:left; } hooks/post-receive -- phpMyAdmin

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git August 2011