From c1c23e20dba5d935b39cc7603e5c496560a2bac3 Mon Sep 17 00:00:00 2001 From: mensonge Date: Fri, 9 May 2008 07:29:50 +0000 Subject: [PATCH] Interface fix: enable sorting bookmarks asc or desc; improve navigation links git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@119 b3834d28-1941-0410-a4f8-b48e95affb8f --- index.php | 2 +- locales/fr_FR/LC_MESSAGES/messages.mo | Bin 19818 -> 20039 bytes locales/fr_FR/LC_MESSAGES/messages.po | 55 +++++++++++++++++++------- locales/messages.po | 43 ++++++++++++++------ templates/bookmarks.tpl.php | 11 ++++-- templates/sidebar.block.menu.php | 8 ++++ templates/sidebar.block.users.php | 3 +- 7 files changed, 91 insertions(+), 31 deletions(-) diff --git a/index.php b/index.php index 41b1a05..a4ce6a7 100644 --- a/index.php +++ b/index.php @@ -71,7 +71,7 @@ $tplVars['popCount'] = 30; $tplVars['sidebar_blocks'] = $GLOBALS["index_sidebar_blocks"]; $tplVars['range'] = 'all'; $tplVars['pagetitle'] = T_('Store, share and tag your favourite links'); -$tplVars['subtitle'] = T_('Recent Bookmarks'); +$tplVars['subtitle'] = T_('All Bookmarks'); $tplVars['bookmarkCount'] = $start + 1; $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, NULL, NULL, getSortOrder(), NULL, 0, $dtend); $tplVars['total'] = $bookmarks['total']; diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo index 384f10f2535a792ba44cfc6ea03114b918db41a2..56cfc7cf809f7b730979c77f976d3f01a559dd4d 100644 GIT binary patch delta 5304 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 delta 5110 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\n" "Language-Team: fr-FR \n" "MIME-Version: 1.0\n" @@ -226,8 +226,8 @@ msgid "Store, share and tag your favourite links" msgstr "Conservez, partagez et taggez vos liens favoris" #: ../../../index.php:74 -msgid "Recent Bookmarks" -msgstr "Signets récents" +msgid "All Bookmarks" +msgstr "Tous les signets" #: ../../../jsScuttle.php:22 #: ../../../templates/tag2tagadd.tpl.php:21 @@ -316,6 +316,7 @@ msgstr "Mot de passe oublié" #: ../../../populartags.php:49 #: ../../../templates/dynamictags.inc.php:101 #: ../../../templates/sidebar.block.common.php:9 +#: ../../../templates/sidebar.block.menu.php:68 #: ../../../templates/sidebar.block.popular.php:15 #: ../../../templates/sidebar.block.recent.php:30 #: ../../../templates/toolbar.inc.php:24 @@ -398,7 +399,7 @@ msgstr "Signets ajoutés récemment à %s" #: ../../../search.inc.php:13 #: ../../../search.inc.php:41 msgid "Search" -msgstr "Chercher" +msgstr "Chercher dans" #: ../../../search.inc.php:19 msgid "this user's bookmarks" @@ -692,12 +693,12 @@ msgstr "Suivant" msgid "Last" msgstr "Dernière" -#: ../../../templates/bookmarks.tpl.php:238 +#: ../../../templates/bookmarks.tpl.php:246 #, php-format msgid "Page %d of %d" msgstr "Page %d de %d" -#: ../../../templates/bookmarks.tpl.php:240 +#: ../../../templates/bookmarks.tpl.php:252 msgid "No bookmarks available" msgstr "Pas de signets disponibles." @@ -1004,16 +1005,29 @@ msgstr "Tags inclus dans le tag '%s'" #: ../../../templates/sidebar.block.menu.php:29 msgid "Menu Tags" -msgstr "Menu Tags" +msgstr "Tags Menu" -#: ../../../templates/sidebar.block.menu.php:60 +#: ../../../templates/sidebar.block.menu.php:62 msgid "See all your tags" msgstr "Voir tous vos tags" -#: ../../../templates/sidebar.block.menu.php:60 +#: ../../../templates/sidebar.block.menu.php:62 msgid "all your tags" msgstr "Tous vos tags" +#: ../../../templates/sidebar.block.menu.php:64 +msgid "See all tags from this user" +msgstr "Voir tous les tags de cet utilisateur" + +#: ../../../templates/sidebar.block.menu.php:64 +msgid "all tags from this user" +msgstr "tous les tags de cet utilisateur" + +#: ../../../templates/sidebar.block.menu.php:68 +#, fuzzy +msgid "See popular tags" +msgstr "Voir tous vos tags" + #: ../../../templates/sidebar.block.recent.php:15 msgid "Recent Tags" msgstr "Tags récents" @@ -1043,6 +1057,15 @@ msgstr "Derniers utilisateurs" msgid "bookmarks" msgstr "signets" +#: ../../../templates/sidebar.block.users.php:29 +#, fuzzy +msgid "See all users" +msgstr "Voir tous vos tags" + +#: ../../../templates/sidebar.block.users.php:29 +msgid "All users" +msgstr "Tous les utilisateurs" + #: ../../../templates/sidebar.block.watchstatus.php:10 msgid "Remove from Watchlist" msgstr "Enlever de la liste des consultés" @@ -1059,15 +1082,15 @@ msgstr "Editer un lien" msgid "Synonyms:" msgstr "Synonymes :" -#: ../../../templates/tag2tagadd.tpl.php:10 +#: ../../../templates/tag2tagadd.tpl.php:12 +msgid "Create new link:" +msgstr "Créer un nouveau lien" + +#: ../../../templates/tag2tagadd.tpl.php:19 #, php-format msgid "Note: include a tag into '%s' tag (e.g. %s>countries) display the tag into the menu box" msgstr "Note : inclure un 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:23 #: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" @@ -1127,6 +1150,8 @@ msgstr "Profil" msgid "created in" msgstr "Créé en " +#~ msgid "Recent Bookmarks" +#~ msgstr "Signets récents" #~ msgid "plus" #~ msgstr "plus" #~ msgid "" diff --git a/locales/messages.po b/locales/messages.po index d56bb44..4184184 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-24 09:43+0200\n" +"POT-Creation-Date: 2008-04-24 19:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -208,7 +208,7 @@ msgid "Store, share and tag your favourite links" msgstr "" #: ../../../index.php:74 -msgid "Recent Bookmarks" +msgid "All Bookmarks" msgstr "" #: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:21 @@ -298,6 +298,7 @@ msgstr "" #: ../../../populartags.php:49 ../../../templates/dynamictags.inc.php:101 #: ../../../templates/sidebar.block.common.php:9 +#: ../../../templates/sidebar.block.menu.php:68 #: ../../../templates/sidebar.block.popular.php:15 #: ../../../templates/sidebar.block.recent.php:30 #: ../../../templates/toolbar.inc.php:24 @@ -672,12 +673,12 @@ msgstr "" msgid "Last" msgstr "" -#: ../../../templates/bookmarks.tpl.php:238 +#: ../../../templates/bookmarks.tpl.php:246 #, php-format msgid "Page %d of %d" msgstr "" -#: ../../../templates/bookmarks.tpl.php:240 +#: ../../../templates/bookmarks.tpl.php:252 msgid "No bookmarks available" msgstr "" @@ -1000,14 +1001,26 @@ msgstr "" msgid "Menu Tags" msgstr "" -#: ../../../templates/sidebar.block.menu.php:60 +#: ../../../templates/sidebar.block.menu.php:62 msgid "See all your tags" msgstr "" -#: ../../../templates/sidebar.block.menu.php:60 +#: ../../../templates/sidebar.block.menu.php:62 msgid "all your tags" msgstr "" +#: ../../../templates/sidebar.block.menu.php:64 +msgid "See all tags from this user" +msgstr "" + +#: ../../../templates/sidebar.block.menu.php:64 +msgid "all tags from this user" +msgstr "" + +#: ../../../templates/sidebar.block.menu.php:68 +msgid "See popular tags" +msgstr "" + #: ../../../templates/sidebar.block.recent.php:15 msgid "Recent Tags" msgstr "" @@ -1037,6 +1050,14 @@ msgstr "" msgid "bookmarks" msgstr "" +#: ../../../templates/sidebar.block.users.php:29 +msgid "See all users" +msgstr "" + +#: ../../../templates/sidebar.block.users.php:29 +msgid "All users" +msgstr "" + #: ../../../templates/sidebar.block.watchstatus.php:10 msgid "Remove from Watchlist" msgstr "" @@ -1053,17 +1074,17 @@ msgstr "" msgid "Synonyms:" msgstr "" -#: ../../../templates/tag2tagadd.tpl.php:10 +#: ../../../templates/tag2tagadd.tpl.php:12 +msgid "Create new link:" +msgstr "" + +#: ../../../templates/tag2tagadd.tpl.php:19 #, 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:23 #: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" diff --git a/templates/bookmarks.tpl.php b/templates/bookmarks.tpl.php index 9277083..6a778bb 100644 --- a/templates/bookmarks.tpl.php +++ b/templates/bookmarks.tpl.php @@ -63,12 +63,17 @@ window.onload = playerLoad;

- - / - / + + / + / - + diff --git a/templates/sidebar.block.menu.php b/templates/sidebar.block.menu.php index de4f0f7..0c7087a 100644 --- a/templates/sidebar.block.menu.php +++ b/templates/sidebar.block.menu.php @@ -57,8 +57,16 @@ if (sizeof($menuTags) > 0 || ($userid != 0 && $userid === $logged_on_userid)) { getUser($userid); ?> +0): ?> +

→

+ +

→

+ + +

→

+ '.T_('bookmarks').')'; echo ''; } -echo '...'; +//echo '...'; ?> +

→