Interface design: improve tag2tag link edition (add item in Actions menu and improve tag2tagedit page)

git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@81 b3834d28-1941-0410-a4f8-b48e95affb8f

2 files changed, 16 insertions, 14 deletions

diff --git a/templates/sidebar.block.tagactions.php b/templates/sidebar.block.tagactions.php
index a19db0b..907a61d 100644
--- a/templates/sidebar.block.tagactions.php
+++ b/templates/sidebar.block.tagactions.php
@@ -12,6 +12,7 @@ if ($userservice->isLoggedOn()) {
         $renamelink = createURL('tagrename', $currenttag);
         $deletelink = createURL('tagdelete', $currenttag);
         $commondesclink = createURL('tagcommondescriptionedit', $currenttag);
+        $addtag2taglinklink = createURL('tag2tagadd', $currenttag);
 ?>
 
 <h2><?php echo T_('Actions'); ?></h2>
@@ -24,6 +25,7 @@ if ($userservice->isLoggedOn()) {
         <?php if ($GLOBALS['enableCommonTagDescription']): ?>
         <li><a href="<?php echo $commondesclink; ?>"><?php echo T_('Edit Tag Common Description') ?></a></li>
 	<?php endif; ?>
+        <li><a href="<?php echo $addtag2taglinklink; ?>"><?php echo T_('Create a link to another tag') ?></a></li>
     </ul>
 </div>
 
diff --git a/templates/tag2tagedit.tpl.php b/templates/tag2tagedit.tpl.php
index 4e5850b..740a654 100644
--- a/templates/tag2tagedit.tpl.php
+++ b/templates/tag2tagedit.tpl.php
@@ -2,17 +2,19 @@
 $this->includeTemplate($GLOBALS['top_include']);
 ?>
 
-<form action="<?= $formaddaction ?>" method="post">
-<p><?php echo T_('Create new link')?></p>
+<form action="<?= $formdeleteaction ?>" method="post">
+<p><?php echo T_('Delete the link')?></p>
+<!--input type="hidden" name="tag1" value="<?php echo $tag1 ?>" />
+<input type="hidden" name="tag2" value="<?php echo $tag2 ?>" /-->
 <p>
 <input type="text" name="tag1" value="<?php echo $tag1 ?>"/>
 <input type="text" name="linkType" value=">" size="1" maxlength="1"/>
-<input type="text" name="tag2" />
+<input type="text" name="tag2" value="<?php echo $tag2 ?>"/>
 </p>
-<!--p><?php echo T_('Are you sure?'); ?></p-->
+<p><?php echo T_('Are you sure?'); ?></p>
 <p>
-    <input type="submit" name="confirm" value="<?php echo T_('Create'); ?>" />
-    <input type="submit" name="cancel" value="<?php echo T_('Cancel'); ?>" />
+    <input type="submit" name="confirm" value="<?php echo T_('Yes'); ?>" />
+    <input type="submit" name="cancel" value="<?php echo T_('No'); ?>" />
 </p>
 
 <?php if (isset($referrer)): ?>
@@ -23,19 +25,17 @@ $this->includeTemplate($GLOBALS['top_include']);
 
 <hr />
 
-<form action="<?= $formdeleteaction ?>" method="post">
-<p><?php echo T_('Delete the link')?></p>
-<!--input type="hidden" name="tag1" value="<?php echo $tag1 ?>" />
-<input type="hidden" name="tag2" value="<?php echo $tag2 ?>" /-->
+<form action="<?= $formaddaction ?>" method="post">
+<p><?php echo T_('Create new link')?></p>
 <p>
 <input type="text" name="tag1" value="<?php echo $tag1 ?>"/>
 <input type="text" name="linkType" value=">" size="1" maxlength="1"/>
-<input type="text" name="tag2" value="<?php echo $tag2 ?>"/>
+<input type="text" name="tag2" />
 </p>
-<p><?php echo T_('Are you sure?'); ?></p>
+<!--p><?php echo T_('Are you sure?'); ?></p-->
 <p>
-    <input type="submit" name="confirm" value="<?php echo T_('Yes'); ?>" />
-    <input type="submit" name="cancel" value="<?php echo T_('No'); ?>" />
+    <input type="submit" name="confirm" value="<?php echo T_('Create'); ?>" />
+    <input type="submit" name="cancel" value="<?php echo T_('Cancel'); ?>" />
 </p>
 
 <?php if (isset($referrer)): ?>