The branch, master has been updated
via 3fe234a029308b370b014c755d60540cc553881d (commit)
from 98e71f8805faef9787731c861543f07ff5529bda (commit)
- Log -----------------------------------------------------------------
commit 3fe234a029308b370b014c755d60540cc553881d
Author: Michal Čihař <[email protected]>
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
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
