Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0ce70ebd7d
@ -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">
|
||||
|
||||
@ -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);
|
||||
@ -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) {
|
||||
@ -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;
|
||||
@ -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.display = 'block';
|
||||
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.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;
|
||||
@ -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) {
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
@ -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.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);
|
||||
}
|
||||
@ -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,20 +859,15 @@ 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';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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 =
|
||||
@ -884,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);
|
||||
}
|
||||
@ -913,15 +908,18 @@ 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';
|
||||
}
|
||||
*/
|
||||
|
||||
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';
|
||||
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";
|
||||
if (isIE) {
|
||||
@ -929,7 +927,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";
|
||||
}
|
||||
@ -955,16 +953,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.display = 'block';
|
||||
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.display = 'none';
|
||||
document.getElementById('display_field_button').className = 'M_butt';
|
||||
ON_display_field = 0;
|
||||
}
|
||||
@ -1021,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;
|
||||
@ -1029,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)
|
||||
@ -1136,8 +1134,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.display = 'block';
|
||||
return;
|
||||
}
|
||||
var p = document.getElementById('Query');
|
||||
@ -1168,8 +1166,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.display = 'block';
|
||||
return;
|
||||
}
|
||||
var p = document.getElementById('having');
|
||||
@ -1186,8 +1184,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.display = 'block';
|
||||
//output sum new objects created
|
||||
var existingDiv = document.getElementById('ab');
|
||||
existingDiv.innerHTML = display(init,history_array.length);
|
||||
|
||||
@ -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();
|
||||
@ -15,19 +17,7 @@ $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";
|
||||
|
||||
?>
|
||||
<!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'];
|
||||
@ -88,7 +78,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=""
|
||||
@ -125,12 +115,11 @@ 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 id="osn_tab">
|
||||
<canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas>
|
||||
</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">
|
||||
@ -166,8 +155,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 +174,8 @@ for ($i = 0; $i < $name_cnt; $i++) {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<?php
|
||||
for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
|
||||
$t_n = $GLOBALS['PMD']["TABLE_NAME"][$i];
|
||||
@ -196,7 +187,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;
|
||||
@ -246,7 +237,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++) {
|
||||
@ -332,10 +326,10 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
|
||||
}
|
||||
?>
|
||||
</form>
|
||||
<div id="hint"></div>
|
||||
<div id='layer_action' style="visibility:<?php echo $hidden ?>;">Load...</div>
|
||||
<div id="pmd_hint"></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>
|
||||
@ -386,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>
|
||||
@ -402,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>
|
||||
@ -423,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>
|
||||
@ -437,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>
|
||||
@ -559,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>
|
||||
@ -591,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>
|
||||
@ -607,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>
|
||||
@ -667,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>
|
||||
@ -683,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>
|
||||
@ -721,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>
|
||||
@ -737,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>
|
||||
@ -784,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>
|
||||
|
||||
27
pmd_help.php
27
pmd_help.php
@ -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>
|
||||
@ -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 {
|
||||
@ -3019,3 +3019,523 @@ 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;
|
||||
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;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.scroll_tab {
|
||||
overflow: auto;
|
||||
width: 100%;
|
||||
height: 500px;
|
||||
}
|
||||
|
||||
.pmd_Tabs {
|
||||
cursor: default;
|
||||
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;
|
||||
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-weight: normal;
|
||||
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-weight: bold;
|
||||
height: 19px;
|
||||
width: 70px;
|
||||
background-color: #FFFFFF;
|
||||
color: #000000;
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
.L_butt2_1 {
|
||||
padding: 1px;
|
||||
text-decoration: none;
|
||||
background-color: #ffffff;
|
||||
color: #000000;
|
||||
vertical-align: middle;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
.L_butt2_2 {
|
||||
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 {
|
||||
z-index: 1000;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
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;
|
||||
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;
|
||||
}
|
||||
|
||||
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;
|
||||
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;
|
||||
color:black;
|
||||
font-weight:bold;
|
||||
padding-left: 2px;
|
||||
text-align:left;
|
||||
}
|
||||
|
||||
#tblfooter {
|
||||
background-color: #D3DCE3;
|
||||
float: right;
|
||||
padding-top:10px;
|
||||
color: black;
|
||||
font-weight: normal;
|
||||
}
|
||||
|
||||
input.btn {
|
||||
color:#333;
|
||||
background-color: #D0DCE0;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user