Git

git@phpmyadmin.net

23 participants
38397 discussions

[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

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

19 Aug '11

The branch, master has been updated via 3fe234a029308b370b014c755d60540cc553881d (commit) from 98e71f8805faef9787731c861543f07ff5529bda (commit) - Log ----------------------------------------------------------------- commit 3fe234a029308b370b014c755d60540cc553881d Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:55:19 2011 +0200 Move PMD help to documentation ----------------------------------------------------------------------- Summary of changes: Documentation.html | 8 ++++++++ pmd_general.php | 2 +- pmd_help.php | 27 --------------------------- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 pmd_help.php diff --git a/Documentation.html b/Documentation.html index 758a2bc..d7c76e1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -4409,6 +4409,14 @@ chmod o+rwx tmp </li> </ul> +<h4 id="faq6_31"> + <a href="#faq6_31">6.30 How do I create a relation in designer?</a></h4> + + <p>To select relation, click :</p> + + <img src="pmd/images/help_relation.png"></p> + <p>The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.</p> + <h3 id="faqproject">phpMyAdmin project</h3> <h4 id="faq7_1"> diff --git a/pmd_general.php b/pmd_general.php index 45b6955..3613f1f 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -79,7 +79,7 @@ echo $script_tabs . $script_contr . $script_display_field; /></a><a href="javascript:location.reload();" onmousedown="return false;" class="M_butt" target="_self" ><img title="<?php echo __('Reload'); ?>" src="pmd/images/reload.png" alt="" - /></a><a href="javascript:Help();" onmousedown="return false;" + /></a><a href="Documentation.html#faq6_31" target="documentation" class="M_butt" target="_self" ><img title="<?php echo __('Help'); ?>" src="pmd/images/help.png" alt="" /></a><img class="M_bord" src="pmd/images/bord.png" alt="" diff --git a/pmd_help.php b/pmd_help.php deleted file mode 100644 index f81df43..0000000 --- a/pmd_help.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * - * @package phpMyAdmin-Designer - */ - -/** - * - */ -require_once './libraries/pmd_common.php'; -?> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<link rel="stylesheet" type="text/css" href="./libraries/pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css"> -<title>Designer</title> -</head> - -<body> -<?php - echo '<p>' . __('To select relation, click :') . '<br />'; - echo '<img src="pmd/images/help_relation.png" border="1"></p>'; - echo '<p>' . __('The display column is shown in pink. To set/unset a column as the display column, click the "Choose column to display" icon, then click on the appropriate column name.') . '</p>'; -?> -</body> -</html> hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via 98e71f8805faef9787731c861543f07ff5529bda (commit) from cd69e5bdf2081561e5d8891d72820d16a4d99266 (commit) - Log ----------------------------------------------------------------- commit 98e71f8805faef9787731c861543f07ff5529bda Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:50:28 2011 +0200 First attempt to integrate designer into rest For now works only in pmahomme and needs lot of cleanups and fixes ----------------------------------------------------------------------- Summary of changes: pmd_general.php | 30 +-- themes/pmahomme/css/theme_right.css.php | 541 +++++++++++++++++++++++++++++++ 2 files changed, 552 insertions(+), 19 deletions(-) diff --git a/pmd_general.php b/pmd_general.php index d270cbd..45b6955 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -8,6 +8,8 @@ * */ require_once './libraries/pmd_common.php'; +require './libraries/db_common.inc.php'; +require './libraries/db_info.inc.php'; $tab_column = get_tab_info(); $script_tabs = get_script_tabs(); @@ -17,17 +19,6 @@ $tables_pk_or_unique_keys = get_pk_or_unique_keys(); $tables_all_keys = get_all_keys(); $hidden = "hidden"; -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link rel="icon" href="pmd/images/favicon.ico" type="image/x-icon" /> - <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" /> - <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" /> - <title>Designer</title> -<?php $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; @@ -125,10 +116,6 @@ echo $script_tabs . $script_contr . $script_display_field; title="<?php echo __('Move Menu'); ?>" /></a> </div> -<div id="osn_tab"> - <CANVAS id="canvas" width="100" height="100" onclick="Canvas_click(this)"></CANVAS> -</div> - <form action="" method="post" name="form1"> <div id="layer_menu" style="visibility:<?php echo $hidden ?>;"> <div align="center" style="padding-top:5px;"> @@ -166,8 +153,8 @@ for ($i = 0; $i < $name_cnt; $i++) { echo 'checked="checked"'; } ?> /></td> - <td class="Tabs" onmouseover="this.className='Tabs2'" - onmouseout="this.className='Tabs'" + <td class="pmd_Tabs" onmouseover="this.className='pmd_Tabs2'" + onmouseout="this.className='pmd_Tabs'" onclick="Select_tab('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME"][$i]; ?>');"> <?php echo $GLOBALS['PMD_OUT']["TABLE_NAME"][$i]; ?></td> </tr> @@ -185,6 +172,11 @@ for ($i = 0; $i < $name_cnt; $i++) { </div> </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++) { $t_n = $GLOBALS['PMD']["TABLE_NAME"][$i]; @@ -196,7 +188,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { <input name="t_v[<?php echo $t_n_url ?>]" type="hidden" id="t_v_<?php echo $t_n_url ?>_" /> <input name="t_h[<?php echo $t_n_url ?>]" type="hidden" id="t_h_<?php echo $t_n_url ?>_" /> -<table id="<?php echo $t_n_url ?>" cellpadding="0" cellspacing="0" class="tab" +<table id="<?php echo $t_n_url ?>" cellpadding="0" cellspacing="0" class="pmd_tab" style="position: absolute; left: <?php if (isset($tab_pos[$t_n])) echo $tab_pos[$t_n]["X"]; else echo rand(180, 800); ?>px; top: <?php if (isset($tab_pos[$t_n])) echo $tab_pos[$t_n]["Y"]; else echo rand(30, 500); ?>px; @@ -332,7 +324,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) { } ?> </form> -<div id="hint"></div> +<div id="pmd_hint"></div> <div id='layer_action' style="visibility:<?php echo $hidden ?>;">Load...</div> <table id="layer_new_relation" style="visibility:<?php echo $hidden ?>;" diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 25aeadc..fc04961 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -3019,3 +3019,544 @@ span.cm-number { .ui-timepicker-div dl dt{ height: 25px; } .ui-timepicker-div dl dd{ margin: -25px 0 10px 65px; } .ui-timepicker-div td { font-size: 90%; } + +/* Designer */ +.input_tab { + background-color: #A6C7E1; + color: #000000; +} + +#canvas { + background-color: #FFFFFF; + color: #000000; +} + +canvas.pmd { + display: inline-block; + overflow: hidden; + text-align: left; +} + +canvas.pmd * { + behavior: url(#default#VML); +} + +.pmd_tab { + background-color: #FFFFFF; + color: #000000; + border-collapse: collapse; + border: 1px solid #AAAAAA; + font-family: Tahoma, sans-serif; + font-size: 10px; + z-index: 1; + -moz-user-select: none; +} + +.tab_zag { + background-image: url(images/Header.png); + background-repeat: repeat-x; + text-align: center; + cursor: move; + padding: 1px; + font-weight: bold; +} + +.tab_zag_2 { + background-image: url(images/Header_Linked.png); + background-repeat: repeat-x; + text-align: center; + cursor: move; + padding: 1px; + font-weight: bold; +} + +.tab_field { + background: #FFFFFF; + color: #000000; + cursor: default; +} + +.tab_field_2 { + background-color: #CCFFCC; + color: #000000; + background-repeat: repeat-x; + cursor: default; +} + +.tab_field_3 { + background-color: #FFE6E6; /*#DDEEFF*/ + color: #000000; + cursor: default; +} + +#pmd_hint { + white-space: nowrap; + position: absolute; + background-color: #99FF99; + color: #000000; + left: 200px; + top: 50px; + z-index: 3; + border: #00CC66 solid 1px; + visibility: hidden; +} + +.scroll_tab { + overflow: auto; + width: 100%; + height: 500px; +} + +.pmd_Tabs { + cursor: default; + font-family: Tahoma, sans-serif; + font-size: 10px; + color: #0055bb; + white-space: nowrap; + text-decoration: none; + text-indent: 3px; + font-weight: bold; + margin-left: 2px; + text-align: left; + background-color: #FFFFFF; + background-image: url(images/left_panel_butt.png); + border: #CCCCCC solid 1px; +} + +.pmd_Tabs2 { + cursor: default; + font-family: Tahoma, sans-serif; + font-size: 10px; + color: #0055bb; + background: #FFEE99; + text-indent: 3px; + font-weight: bold; + white-space: nowrap; + text-decoration: none; + border: #9999FF solid 1px; + text-align: left; +} + +.owner { + font-family: Tahoma, sans-serif; + font-size: 9px; + font-weight: normal; +/* background-color: #ffffff;*/ + color: #888888; +} + +.option_tab { + padding-left: 2px; + padding-right: 2px; + width: 5px; +} + +.select_all { + vertical-align: top; + padding-left: 2px; + padding-right: 2px; + cursor: default; + width: 1px; + color: #000000; + background-image: url(images/Header.png); + background-repeat: repeat-x; +} + +.small_tab { + vertical-align: top; + background-color: #0064ea; + color: #FFFFFF; + background-image: url(images/small_tab.png); + cursor: default; + text-align: center; + font-weight: bold; + padding-left: 2px; + padding-right: 2px; + width: 1px; + text-decoration: none; +} + +.small_tab2 { + vertical-align: top; + color: #FFFFFF; + background-color: #FF9966; + cursor: default; + padding-left: 2px; + padding-right: 2px; + text-align: center; + font-weight: bold; + width: 1px; + text-decoration: none; +} + +.small_tab_pref { + background-image: url(images/Header.png); + background-repeat: repeat-x; + text-align: center; + width: 1px; +} + +.small_tab_pref2 { + vertical-align: top; + color: #FFFFFF; + background-color: #FF9966; + cursor: default; + text-align: center; + font-weight: bold; + width: 1px; + text-decoration: none; +} + +.butt { + border: #4477aa solid 1px; + font-size: 11px; + font-weight: bold; + height: 19px; + width: 70px; + background-color: #FFFFFF; + color: #000000; + vertical-align: baseline; +} + +.L_butt2_1 { + font-size: 12px; + padding: 1px; + text-decoration: none; + background-color: #ffffff; + color: #000000; + vertical-align: middle; + cursor: default; +} + +.L_butt2_2 { + font-size: 12px; + padding: 0; + border: #0099CC solid 1px; + background: #FFEE99; + text-decoration: none; + color: #000000; + cursor: default; +} + +/* ---------------------------------------------------------------------------*/ +.bor { + width: 10px; + height: 10px; +} + +.frams1 { + background: url(images/1.png) no-repeat right bottom; +} + +.frams2 { + background: url(images/2.png) no-repeat left bottom; +} + +.frams3 { + background: url(images/3.png) no-repeat left top; +} + +.frams4 { + background: url(images/4.png) no-repeat right top; +} + +.frams5 { + background: url(images/5.png) repeat-x center bottom; +} + +.frams6 { + background: url(images/6.png) repeat-y left; +} + +.frams7 { + background: url(images/7.png) repeat-x top; +} + +.frams8 { + background: url(images/8.png) repeat-y right; +} + +#osn_tab { + background-color: #FFFFFF; + color: #000000; + border: #A9A9A9 solid 1px; +} + +.header { + background-color: #EAEEF0; + color: #000000; + text-align: center; + font-weight: bold; + margin: 0; + padding: 0; + background-image: url(images/top_panel.png); + background-position: top; + background-repeat: repeat-x; + border-right: #999999 solid 1px; + border-left: #999999 solid 1px; + height: 28px; +} + +.header a { + display: block; + float: left; + margin: 3px 1px 4px 1px; + height: 20px; + border: 1px dotted #ffffff; +} + +.header .M_bord { + display: block; + float: left; + margin: 4px; + height: 20px; + width: 2px; +} + +.header a.first { + margin-right: 1em; +} + +.header a.last { + margin-left: 1em; +} + +a.M_butt_Selected_down_IE, +a.M_butt_Selected_down { + border: 1px solid #C0C0BB; + background-color: #99FF99; + color: #000000; +} + +a.M_butt_Selected_down_IE:hover, +a.M_butt_Selected_down:hover, +a.M_butt:hover { + border: 1px solid #0099CC; + background-color: #FFEE99; + color: #000000; +} + +#layer_menu { + clear: both; + float: left; + z-index: 1000; + background-color: #EAEEF0; + border: #999999 solid 1px; +} + +#layer_action { + position: absolute; + left: 638px; + top: 52px; + z-index: 1000; + background-color: #CCFF99; + padding: 3px; + border: #009933 solid 1px; + white-space: nowrap; + font-weight: bold; +} + +#layer_upd_relation { + position: absolute; + left: 637px; + top: 224px; + z-index: 1000; +} + +#layer_new_relation { + position: absolute; + left: 636px; + top: 85px; + z-index: 1000; + width: 153px; +} + +#pmd_optionse { + position: absolute; + left: 636px; + top: 85px; + z-index: 1000; + width: 153px; +} + +#layer_menu_sizer { + background-image: url(../../images/resize.png); + cursor: nw-resize; + width: 16px; + height: 16px; +} + +.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; +} + +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; +} + +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; +} + +a.active.trigger { +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; +} + +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; + float: left; + color : #333; + text-align: center; +} + +h2.tiger a { + background-image: url(images/Header.png); + text-align: center; + text-decoration: none; + color : #333; + display: block; +} + +h2.tiger a:hover { + color: #000; + background-image: url(images/Header_Linked.png); +} + +h2.active { + background-image: url(images/Header.png); + background-repeat: repeat-x; + padding: 1px; + background-position: left bottom; +} + +.toggle_container { + margin: 0 0 5px; + padding: 0; + border-top: 1px solid #d6d6d6; + background: #FFF ; + width: 250px; + overflow: hidden; + font-size: 1.2em; + clear: both; +} + +.toggle_container .block { + background-color: #DBE4E8; + padding:40 15 40 15px; /*--Padding of Container--*/ + border:1px solid #999; + color:#000; +} + +.history_table { + text-align: center; + background-color: #9999CC; +} + +.history_table2 { + text-align: center; + background-color: #DBE4E8; +} + +#filter { + display: none; + position: absolute; + top: 0%; + left: 0%; + width: 100%; + height: 100%; + background-color: #CCA; + z-index:10; + opacity:0.5; + filter: alpha(opacity=50); +} + +#box { + display: none; + position: absolute; + top: 20%; + left: 30%; + width: 500px; + height: 220px; + padding: 48px; + margin:0; + border: 1px solid black; + background-color: white; + z-index:101; + overflow: visible; +} + +#boxtitle { + position:absolute; + float:center; + top:0; + left:0; + width:593px; + height:20px; + padding:0; + padding-top:4px; + left-padding:8px; + margin:0; + border-bottom:4px solid #3CF; + background-color: #D0DCE0; //#09c; + color:black; + font-weight:bold; + padding-left: 2px; + font-family:"Times New Roman", Times, serif; + font-size:16px; + text-align:left; +} + +#tblfooter { + background-color: D3DCE3; + float: right; + padding-top:10px; + color: black; + font-weight: normal; +} + +input.btn { + color:#333; + background-color: #D0DCE0; +} hooks/post-receive -- phpMyAdmin

1 0

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

19 Aug '11

The branch, master has been updated via cd69e5bdf2081561e5d8891d72820d16a4d99266 (commit) via a1c5e7f67a4577bc4ac9a90cd8f7e6c581f12ce5 (commit) from 7b54504cc0981821619ffd3f0759766448e6b879 (commit) - Log ----------------------------------------------------------------- commit cd69e5bdf2081561e5d8891d72820d16a4d99266 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:25:47 2011 +0200 Include missing database tabs commit a1c5e7f67a4577bc4ac9a90cd8f7e6c581f12ce5 Author: Michal Čihař <michal(a)cihar.com> Date: Fri Aug 19 12:21:55 2011 +0200 Move library to libraries ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 3 ++- pmd_common.php => libraries/pmd_common.php | 0 pmd_display_field.php | 2 +- pmd_general.php | 2 +- pmd_help.php | 2 +- pmd_pdf.php | 2 +- pmd_relation_new.php | 2 +- pmd_relation_upd.php | 2 +- pmd_save_pos.php | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) rename pmd_common.php => libraries/pmd_common.php (100%) diff --git a/db_datadict.php b/db_datadict.php index fca38b7..89b2bc5 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -11,7 +11,8 @@ require_once './libraries/common.inc.php'; if (! isset($selected_tbl)) { - require_once './libraries/header.inc.php'; + require './libraries/db_common.inc.php'; + require './libraries/db_info.inc.php'; } diff --git a/pmd_common.php b/libraries/pmd_common.php similarity index 100% rename from pmd_common.php rename to libraries/pmd_common.php diff --git a/pmd_display_field.php b/pmd_display_field.php index 0e51cd7..9f82912 100644 --- a/pmd_display_field.php +++ b/pmd_display_field.php @@ -7,7 +7,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $table = $T; diff --git a/pmd_general.php b/pmd_general.php index be504ac..d270cbd 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -7,7 +7,7 @@ /** * */ -require_once "./pmd_common.php"; +require_once './libraries/pmd_common.php'; $tab_column = get_tab_info(); $script_tabs = get_script_tabs(); diff --git a/pmd_help.php b/pmd_help.php index f653b14..f81df43 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -8,7 +8,7 @@ /** * */ -require_once 'pmd_common.php'; +require_once './libraries/pmd_common.php'; ?> <html> <head> diff --git a/pmd_pdf.php b/pmd_pdf.php index adf5fac..2afe131 100644 --- a/pmd_pdf.php +++ b/pmd_pdf.php @@ -5,7 +5,7 @@ * @package phpMyAdmin-Designer */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; /** * If called directly from the designer, first save the positions diff --git a/pmd_relation_new.php b/pmd_relation_new.php index a104cc1..fbd6246 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $die_save_pos = 0; include_once 'pmd_save_pos.php'; extract($_POST, EXTR_SKIP); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 58c9135..7151cf7 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; extract($_POST, EXTR_SKIP); extract($_GET, EXTR_SKIP); $die_save_pos = 0; diff --git a/pmd_save_pos.php b/pmd_save_pos.php index c487ddb..1a071af 100644 --- a/pmd_save_pos.php +++ b/pmd_save_pos.php @@ -8,7 +8,7 @@ /** * */ -include_once 'pmd_common.php'; +include_once './libraries/pmd_common.php'; $cfgRelation = PMA_getRelationsParam(); hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git