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
This commit is contained in:
mensonge 2008-03-14 10:46:44 +00:00
parent 219888d489
commit 3476d69422
5 changed files with 57 additions and 47 deletions

View file

@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Scuttle\n" "Project-Id-Version: Scuttle\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-03-14 11:27+0100\n" "POT-Creation-Date: 2008-03-14 11:42+0100\n"
"PO-Revision-Date: 2008-03-14 11:29+0100\n" "PO-Revision-Date: 2008-03-14 11:43+0100\n"
"Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n" "Last-Translator: BenjaminHKB <benjamin.huynh-kim-bang@loria.fr>\n"
"Language-Team: fr-FR <toony.sf@chezouam.net>\n" "Language-Team: fr-FR <toony.sf@chezouam.net>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -232,7 +232,7 @@ msgstr "Signets récents"
#: ../../../jsScuttle.php:22 #: ../../../jsScuttle.php:22
#: ../../../templates/tag2tagadd.tpl.php:12 #: ../../../templates/tag2tagadd.tpl.php:12
#: ../../../templates/tag2tagdelete.tpl.php:13 #: ../../../templates/tag2tagdelete.tpl.php:13
#: ../../../templates/tag2tagedit.tpl.php:12 #: ../../../templates/tag2tagedit.tpl.php:14
#: ../../../templates/tag2tagedit.tpl.php:35 #: ../../../templates/tag2tagedit.tpl.php:35
#: ../../../templates/tagdelete.tpl.php:6 #: ../../../templates/tagdelete.tpl.php:6
msgid "Are you sure?" msgid "Are you sure?"
@ -240,14 +240,14 @@ msgstr "Etes-vous sûr ?"
#: ../../../jsScuttle.php:22 #: ../../../jsScuttle.php:22
#: ../../../templates/tag2tagdelete.tpl.php:15 #: ../../../templates/tag2tagdelete.tpl.php:15
#: ../../../templates/tag2tagedit.tpl.php:37 #: ../../../templates/tag2tagedit.tpl.php:16
#: ../../../templates/tagdelete.tpl.php:8 #: ../../../templates/tagdelete.tpl.php:8
msgid "Yes" msgid "Yes"
msgstr "Oui" msgstr "Oui"
#: ../../../jsScuttle.php:22 #: ../../../jsScuttle.php:22
#: ../../../templates/tag2tagdelete.tpl.php:16 #: ../../../templates/tag2tagdelete.tpl.php:16
#: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tag2tagedit.tpl.php:17
#: ../../../templates/tagdelete.tpl.php:9 #: ../../../templates/tagdelete.tpl.php:9
msgid "No" msgid "No"
msgstr "Non" msgstr "Non"
@ -467,7 +467,7 @@ msgid "Failed to update the tag common description"
msgstr "Impossible de mettre à jour la description commune du tag" msgstr "Impossible de mettre à jour la description commune du tag"
#: ../../../tagcommondescriptionedit.php:55 #: ../../../tagcommondescriptionedit.php:55
#: ../../../templates/sidebar.block.tagactions.php:25 #: ../../../templates/sidebar.block.tagactions.php:26
msgid "Edit Tag Common Description" msgid "Edit Tag Common Description"
msgstr "Editer la description commune du tag" msgstr "Editer la description commune du tag"
@ -480,7 +480,7 @@ msgid "Failed to delete the tag"
msgstr "Impossible d'effacer le tag" msgstr "Impossible d'effacer le tag"
#: ../../../tagdelete.php:44 #: ../../../tagdelete.php:44
#: ../../../templates/sidebar.block.tagactions.php:22 #: ../../../templates/sidebar.block.tagactions.php:23
msgid "Delete Tag" msgid "Delete Tag"
msgstr "Supprimer le tag" msgstr "Supprimer le tag"
@ -588,7 +588,7 @@ msgstr "Mettre à jour"
#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40
#: ../../../templates/tag2tagadd.tpl.php:15 #: ../../../templates/tag2tagadd.tpl.php:15
#: ../../../templates/tag2tagedit.tpl.php:15 #: ../../../templates/tag2tagedit.tpl.php:38
#: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagcommondescriptionedit.tpl.php:33
#: ../../../templates/tagrename.tpl.php:25 #: ../../../templates/tagrename.tpl.php:25
msgid "Cancel" msgid "Cancel"
@ -981,12 +981,16 @@ msgstr "Dernières recherches"
msgid "Number of bookmarks for this query" msgid "Number of bookmarks for this query"
msgstr "Nombre de signets pour cette recherche" msgstr "Nombre de signets pour cette recherche"
#: ../../../templates/sidebar.block.tagactions.php:17 #: ../../../templates/sidebar.block.tagactions.php:18
#: ../../../templates/sidebar.block.watchstatus.php:17 #: ../../../templates/sidebar.block.watchstatus.php:17
#, fuzzy #, fuzzy
msgid "Actions" msgid "Actions"
msgstr "Instructions" msgstr "Instructions"
#: ../../../templates/sidebar.block.tagactions.php:28
msgid "Create a link to another tag"
msgstr "Créer un lien vers un autre tag"
#: ../../../templates/sidebar.block.users.php:14 #: ../../../templates/sidebar.block.users.php:14
msgid "Last Users" msgid "Last Users"
msgstr "Derniers utilisateurs" msgstr "Derniers utilisateurs"
@ -1009,7 +1013,7 @@ msgid "Create new link:"
msgstr "Créer un nouveau lien" msgstr "Créer un nouveau lien"
#: ../../../templates/tag2tagadd.tpl.php:14 #: ../../../templates/tag2tagadd.tpl.php:14
#: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:37
msgid "Create" msgid "Create"
msgstr "Créer" msgstr "Créer"
@ -1026,13 +1030,13 @@ msgid "No links"
msgstr "Pas de liens" msgstr "Pas de liens"
#: ../../../templates/tag2tagedit.tpl.php:6 #: ../../../templates/tag2tagedit.tpl.php:6
msgid "Create new link"
msgstr "Créer un nouveau lien"
#: ../../../templates/tag2tagedit.tpl.php:27
msgid "Delete the link" msgid "Delete the link"
msgstr "Supprimer le lien" msgstr "Supprimer le lien"
#: ../../../templates/tag2tagedit.tpl.php:29
msgid "Create new link"
msgstr "Créer un nouveau lien"
#: ../../../templates/tagrename.tpl.php:12 #: ../../../templates/tagrename.tpl.php:12
msgid "Old" msgid "Old"
msgstr "Ancien" msgstr "Ancien"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-03-14 11:27+0100\n" "POT-Creation-Date: 2008-03-14 11:42+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -213,20 +213,20 @@ msgstr ""
#: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:12 #: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:12
#: ../../../templates/tag2tagdelete.tpl.php:13 #: ../../../templates/tag2tagdelete.tpl.php:13
#: ../../../templates/tag2tagedit.tpl.php:12 #: ../../../templates/tag2tagedit.tpl.php:14
#: ../../../templates/tag2tagedit.tpl.php:35 #: ../../../templates/tag2tagedit.tpl.php:35
#: ../../../templates/tagdelete.tpl.php:6 #: ../../../templates/tagdelete.tpl.php:6
msgid "Are you sure?" msgid "Are you sure?"
msgstr "" msgstr ""
#: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:15 #: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:15
#: ../../../templates/tag2tagedit.tpl.php:37 #: ../../../templates/tag2tagedit.tpl.php:16
#: ../../../templates/tagdelete.tpl.php:8 #: ../../../templates/tagdelete.tpl.php:8
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:16 #: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:16
#: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tag2tagedit.tpl.php:17
#: ../../../templates/tagdelete.tpl.php:9 #: ../../../templates/tagdelete.tpl.php:9
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -442,7 +442,7 @@ msgid "Failed to update the tag common description"
msgstr "" msgstr ""
#: ../../../tagcommondescriptionedit.php:55 #: ../../../tagcommondescriptionedit.php:55
#: ../../../templates/sidebar.block.tagactions.php:25 #: ../../../templates/sidebar.block.tagactions.php:26
msgid "Edit Tag Common Description" msgid "Edit Tag Common Description"
msgstr "" msgstr ""
@ -455,7 +455,7 @@ msgid "Failed to delete the tag"
msgstr "" msgstr ""
#: ../../../tagdelete.php:44 #: ../../../tagdelete.php:44
#: ../../../templates/sidebar.block.tagactions.php:22 #: ../../../templates/sidebar.block.tagactions.php:23
msgid "Delete Tag" msgid "Delete Tag"
msgstr "" msgstr ""
@ -571,7 +571,7 @@ msgstr ""
#: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40
#: ../../../templates/tag2tagadd.tpl.php:15 #: ../../../templates/tag2tagadd.tpl.php:15
#: ../../../templates/tag2tagedit.tpl.php:15 #: ../../../templates/tag2tagedit.tpl.php:38
#: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagcommondescriptionedit.tpl.php:33
#: ../../../templates/tagrename.tpl.php:25 #: ../../../templates/tagrename.tpl.php:25
msgid "Cancel" msgid "Cancel"
@ -978,11 +978,15 @@ msgstr ""
msgid "Number of bookmarks for this query" msgid "Number of bookmarks for this query"
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.tagactions.php:17 #: ../../../templates/sidebar.block.tagactions.php:18
#: ../../../templates/sidebar.block.watchstatus.php:17 #: ../../../templates/sidebar.block.watchstatus.php:17
msgid "Actions" msgid "Actions"
msgstr "" msgstr ""
#: ../../../templates/sidebar.block.tagactions.php:28
msgid "Create a link to another tag"
msgstr ""
#: ../../../templates/sidebar.block.users.php:14 #: ../../../templates/sidebar.block.users.php:14
msgid "Last Users" msgid "Last Users"
msgstr "" msgstr ""
@ -1005,7 +1009,7 @@ msgid "Create new link:"
msgstr "" msgstr ""
#: ../../../templates/tag2tagadd.tpl.php:14 #: ../../../templates/tag2tagadd.tpl.php:14
#: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:37
msgid "Create" msgid "Create"
msgstr "" msgstr ""
@ -1022,11 +1026,11 @@ msgid "No links"
msgstr "" msgstr ""
#: ../../../templates/tag2tagedit.tpl.php:6 #: ../../../templates/tag2tagedit.tpl.php:6
msgid "Create new link" msgid "Delete the link"
msgstr "" msgstr ""
#: ../../../templates/tag2tagedit.tpl.php:27 #: ../../../templates/tag2tagedit.tpl.php:29
msgid "Delete the link" msgid "Create new link"
msgstr "" msgstr ""
#: ../../../templates/tagrename.tpl.php:12 #: ../../../templates/tagrename.tpl.php:12

View file

@ -12,6 +12,7 @@ if ($userservice->isLoggedOn()) {
$renamelink = createURL('tagrename', $currenttag); $renamelink = createURL('tagrename', $currenttag);
$deletelink = createURL('tagdelete', $currenttag); $deletelink = createURL('tagdelete', $currenttag);
$commondesclink = createURL('tagcommondescriptionedit', $currenttag); $commondesclink = createURL('tagcommondescriptionedit', $currenttag);
$addtag2taglinklink = createURL('tag2tagadd', $currenttag);
?> ?>
<h2><?php echo T_('Actions'); ?></h2> <h2><?php echo T_('Actions'); ?></h2>
@ -24,6 +25,7 @@ if ($userservice->isLoggedOn()) {
<?php if ($GLOBALS['enableCommonTagDescription']): ?> <?php if ($GLOBALS['enableCommonTagDescription']): ?>
<li><a href="<?php echo $commondesclink; ?>"><?php echo T_('Edit Tag Common Description') ?></a></li> <li><a href="<?php echo $commondesclink; ?>"><?php echo T_('Edit Tag Common Description') ?></a></li>
<?php endif; ?> <?php endif; ?>
<li><a href="<?php echo $addtag2taglinklink; ?>"><?php echo T_('Create a link to another tag') ?></a></li>
</ul> </ul>
</div> </div>

View file

@ -2,27 +2,6 @@
$this->includeTemplate($GLOBALS['top_include']); $this->includeTemplate($GLOBALS['top_include']);
?> ?>
<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" />
</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'); ?>" />
</p>
<?php if (isset($referrer)): ?>
<div><input type="hidden" name="referrer" value="<?php echo $referrer; ?>" /></div>
<?php endif; ?>
</form>
<hr />
<form action="<?= $formdeleteaction ?>" method="post"> <form action="<?= $formdeleteaction ?>" method="post">
<p><?php echo T_('Delete the link')?></p> <p><?php echo T_('Delete the link')?></p>
<!--input type="hidden" name="tag1" value="<?php echo $tag1 ?>" /> <!--input type="hidden" name="tag1" value="<?php echo $tag1 ?>" />
@ -46,6 +25,27 @@ $this->includeTemplate($GLOBALS['top_include']);
<hr /> <hr />
<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" />
</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'); ?>" />
</p>
<?php if (isset($referrer)): ?>
<div><input type="hidden" name="referrer" value="<?php echo $referrer; ?>" /></div>
<?php endif; ?>
</form>
<hr />
<?php <?php
if(count($links)>0) { if(count($links)>0) {
echo T_("Existing links:"); echo T_("Existing links:");