Interface design: help added to use relations between tags

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

4 files changed, 42 insertions, 17 deletions

diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo
index bcc2e56..ad1ca3a 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.mo
+++ b/locales/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/locales/fr_FR/LC_MESSAGES/messages.po
index cb23d23..cad1158 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/locales/fr_FR/LC_MESSAGES/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Scuttle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-17 10:03+0200\n"
-"PO-Revision-Date: 2008-04-17 10:06+0100\n"
+"POT-Creation-Date: 2008-04-17 11:29+0200\n"
+"PO-Revision-Date: 2008-04-17 11:29+0100\n"
 "Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n"
 "Language-Team: fr-FR <toony.sf@chezouam.net>\n"
 "MIME-Version: 1.0\n"
@@ -99,7 +99,7 @@ msgstr "Ajouter signet"
 msgid "You must be logged in before you can add bookmarks."
 msgstr "Vous devez être authentifié avant de pouvoir ajouter des signets."
 
-#: ../../../bookmarks.php:216
+#: ../../../bookmarks.php:218
 msgid "My Bookmarks"
 msgstr "Mes signets"
 
@@ -230,7 +230,7 @@ msgid "Recent Bookmarks"
 msgstr "Signets récents"
 
 #: ../../../jsScuttle.php:22
-#: ../../../templates/tag2tagadd.tpl.php:12
+#: ../../../templates/tag2tagadd.tpl.php:21
 #: ../../../templates/tag2tagdelete.tpl.php:13
 #: ../../../templates/tag2tagedit.tpl.php:14
 #: ../../../templates/tag2tagedit.tpl.php:35
@@ -591,7 +591,7 @@ msgid "Update"
 msgstr "Mettre à jour"
 
 #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40
-#: ../../../templates/tag2tagadd.tpl.php:15
+#: ../../../templates/tag2tagadd.tpl.php:24
 #: ../../../templates/tag2tagedit.tpl.php:38
 #: ../../../templates/tagcommondescriptionedit.tpl.php:33
 #: ../../../templates/tagrename.tpl.php:25
@@ -711,10 +711,12 @@ msgid "Comma-separated"
 msgstr "Séparés par des virgules"
 
 #: ../../../templates/editbookmark.tpl.php:50
+#: ../../../templates/tag2tagadd.tpl.php:9
 msgid "Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
 msgstr "Note: utiliser \">\" pour inclure un tag dans un autre. ex: europe>france>paris"
 
 #: ../../../templates/editbookmark.tpl.php:54
+#: ../../../templates/tag2tagadd.tpl.php:8
 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
 msgstr "Note : utiliser \"=\" pour rendre deux tags synonymes ex: europe=eu"
 
@@ -1041,22 +1043,27 @@ msgstr "Editer un lien"
 msgid "Synonyms:"
 msgstr "Synonymes :"
 
-#: ../../../templates/tag2tagadd.tpl.php:6
+#: ../../../templates/tag2tagadd.tpl.php:10
+#, php-format
+msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box"
+msgstr "Note inclure une tag dans le tag '%s' (e.g. %s>countries) affiche ce tag dans la boîte de menu"
+
+#: ../../../templates/tag2tagadd.tpl.php:13
 msgid "Create new link:"
 msgstr "Créer un nouveau lien"
 
-#: ../../../templates/tag2tagadd.tpl.php:14
+#: ../../../templates/tag2tagadd.tpl.php:23
 #: ../../../templates/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr "Créer"
 
-#: ../../../templates/tag2tagadd.tpl.php:26
+#: ../../../templates/tag2tagadd.tpl.php:35
 #: ../../../templates/tag2tagdelete.tpl.php:27
 #: ../../../templates/tag2tagedit.tpl.php:51
 msgid "Existing links:"
 msgstr "Liens existants :"
 
-#: ../../../templates/tag2tagadd.tpl.php:44
+#: ../../../templates/tag2tagadd.tpl.php:53
 #: ../../../templates/tag2tagdelete.tpl.php:45
 #: ../../../templates/tag2tagedit.tpl.php:69
 msgid "No links"
diff --git a/locales/messages.po b/locales/messages.po
index 3628932..e932292 100644
--- a/locales/messages.po
+++ b/locales/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-17 10:03+0200\n"
+"POT-Creation-Date: 2008-04-17 11:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,7 +86,7 @@ msgstr ""
 msgid "You must be logged in before you can add bookmarks."
 msgstr ""
 
-#: ../../../bookmarks.php:216
+#: ../../../bookmarks.php:218
 msgid "My Bookmarks"
 msgstr ""
 
@@ -211,7 +211,7 @@ msgstr ""
 msgid "Recent Bookmarks"
 msgstr ""
 
-#: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:12
+#: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:21
 #: ../../../templates/tag2tagdelete.tpl.php:13
 #: ../../../templates/tag2tagedit.tpl.php:14
 #: ../../../templates/tag2tagedit.tpl.php:35
@@ -573,7 +573,7 @@ msgid "Update"
 msgstr ""
 
 #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40
-#: ../../../templates/tag2tagadd.tpl.php:15
+#: ../../../templates/tag2tagadd.tpl.php:24
 #: ../../../templates/tag2tagedit.tpl.php:38
 #: ../../../templates/tagcommondescriptionedit.tpl.php:33
 #: ../../../templates/tagrename.tpl.php:25
@@ -692,11 +692,13 @@ msgid "Comma-separated"
 msgstr ""
 
 #: ../../../templates/editbookmark.tpl.php:50
+#: ../../../templates/tag2tagadd.tpl.php:9
 msgid ""
 "Note: use \">\" to include one tag in another. e.g.: europe>france>paris"
 msgstr ""
 
 #: ../../../templates/editbookmark.tpl.php:54
+#: ../../../templates/tag2tagadd.tpl.php:8
 msgid "Note: use \"=\" to make synonym two tags. e.g.: france=frenchcountry"
 msgstr ""
 
@@ -1036,22 +1038,29 @@ msgstr ""
 msgid "Synonyms:"
 msgstr ""
 
-#: ../../../templates/tag2tagadd.tpl.php:6
+#: ../../../templates/tag2tagadd.tpl.php:10
+#, php-format
+msgid ""
+"Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into "
+"the menu box"
+msgstr ""
+
+#: ../../../templates/tag2tagadd.tpl.php:13
 msgid "Create new link:"
 msgstr ""
 
-#: ../../../templates/tag2tagadd.tpl.php:14
+#: ../../../templates/tag2tagadd.tpl.php:23
 #: ../../../templates/tag2tagedit.tpl.php:37
 msgid "Create"
 msgstr ""
 
-#: ../../../templates/tag2tagadd.tpl.php:26
+#: ../../../templates/tag2tagadd.tpl.php:35
 #: ../../../templates/tag2tagdelete.tpl.php:27
 #: ../../../templates/tag2tagedit.tpl.php:51
 msgid "Existing links:"
 msgstr ""
 
-#: ../../../templates/tag2tagadd.tpl.php:44
+#: ../../../templates/tag2tagadd.tpl.php:53
 #: ../../../templates/tag2tagdelete.tpl.php:45
 #: ../../../templates/tag2tagedit.tpl.php:69
 msgid "No links"
diff --git a/templates/tag2tagadd.tpl.php b/templates/tag2tagadd.tpl.php
index cb86a37..84ee31a 100644
--- a/templates/tag2tagadd.tpl.php
+++ b/templates/tag2tagadd.tpl.php
@@ -3,12 +3,21 @@ $this->includeTemplate($GLOBALS['top_include']);
 ?>
 
 <form action="<?= $formaction ?>" method="post">
+
+<p align=right" style="float:right">
+<small style="text-align:right"><?php echo T_('Note: use "=" to make synonym two tags. e.g.: france=frenchcountry')?></small><br/>
+<small style="text-align:right"><?php echo T_('Note: use ">" to include one tag in another. e.g.: europe>france>paris')?></small><br/>
+<small style="text-align:right"><?php echo sprintf(T_('Note: include a tag into \'%s\' tag (e.g. %s>countries) display the tag into the menu box'), $GLOBALS['menuTag'], $GLOBALS['menuTag'])?></small>
+</p>
+
 <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" />
 </p>
+
+
 <!--p><?php echo T_('Are you sure?'); ?></p-->
 <p>
     <input type="submit" name="confirm" value="<?php echo T_('Create'); ?>" />