From 3476d694227b0fb6db8e3c45f55b912a358d1a6d Mon Sep 17 00:00:00 2001 From: mensonge Date: Fri, 14 Mar 2008 10:46:44 +0000 Subject: [PATCH] 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 --- locales/fr_FR/LC_MESSAGES/messages.mo | Bin 18840 -> 18918 bytes locales/fr_FR/LC_MESSAGES/messages.po | 32 ++++++++++--------- locales/messages.po | 28 ++++++++++------- templates/sidebar.block.tagactions.php | 2 ++ templates/tag2tagedit.tpl.php | 42 ++++++++++++------------- 5 files changed, 57 insertions(+), 47 deletions(-) diff --git a/locales/fr_FR/LC_MESSAGES/messages.mo b/locales/fr_FR/LC_MESSAGES/messages.mo index e6ab4aeaf9f9bcef6a7e863b3c70b346216e9079..2d4eba52d48d2dc3016d60cc3f6e57e417612591 100644 GIT binary patch delta 4748 zcmYk<3sjc%0mtz_SHTN+kW0Yp1xUduNH|KsJ1Qz#D(RSp4!NkP2sO3wdTC3SnfeY3 zD@#i^Tw)nk+GN#45EE=i9!-5Zekyd?C)GK0EbXdMJC0}L3(V8u?Cmo z61;>nFhANE=`K{q4xld{L;jgoK6IaRsG0r(gK6JAOvgf`4YR@eqO}>-;WO6jam@b+PI%FaRLnqiU;%3LEJm$W z1?s{lQ6sHKb?{ZxOdUq8c^j%D=TLj-Dr!c*LhYfu*n)oX&J481GyelP(Z&gFj;pA8 zV1hH1si<8$3bnZ=;54j3b@ViP#tN(Hq8N3-+o%Rlp*GJan2VQCH%c6A%sk9O-Ecb&!3NZg+mPip9jFf9K;7@Q zHIVhv`B?O&eUnTf2UGEWtUx`EJ5ihDG)~4ChMA3va5TPze)u_-<3;qr$*hY%PD3`l zc?4a!5*dTpf$DfOx_Ok%NebOJLOo^|Q8&7cWAHAfVh+92NGq%!J8Wn_n;a+fa*vqHhLNJPB6t zsq8a?QR8e>gWFM?Y9IE-Ce#w0wCDeUdd%*iMjo8*%y1H_1L??^j62(&C_~M_3VaH; zT0=98siwXQ)uBKZSnu}1s7;oOE}UrVOKg2PYKgX4_hSh4R#b;NkfnEd4EeH9vwH$vf6|JWu@#)Lv@hWs!`n)+?Ao zy*Itl%w?ckk4-KGHnb_gIk*Z0cvv} z#6@@<)o>isr~#ymX8!d&XK-RZW}$Ad10%2j>9jd)&tFIVz6;~<7OLS8UY|VDCLT3| zlTi&7;aFUZ({Vp)M*f4^3$eM(zt(U7FL?EI66%JtQ4NI|b8@v|&b0aI8gbvSaAR z6X=6E6P-04i|W`+&{atXpP%(1l~j4 zXn4N!DlS5uUx)P3yn(Z@3$^LSF@5@eIcf&>UZN@XGr|AOr!t1CGbYX9e>=uOt z{1$yNVTyBuL8t~YQB%DTHPuT|zuScVxEXc*b2thQqZc+19q&1Ge=gzk5P6xD5VhYu z`nf7_Y$bb0C)rKZ@ZZR3!hOw8$s=St(JbVV-;frf>FzoHOkrS81$U4^r15*_hUh;| zdUrodyzLh}(qxs7g8{`=IJ<+k!q5E|=k20^+?rp2ndVX}gPW;Fb@+k3;E&8K%oB^?XuAc6q)E>F+*C=@XJobQC$5I@AOEJMu6oC40$dB$ccnI%>(J?h=0} z@Ga7h{K}pakz^CutP00b@ZdxkNRE?bs&G^^Wrywdk1TO5 ztEgJ)s#)PGsajD}URv#{DJg4ekIoPC&dl&cq$Yc3j%*s88Wa$}IZYFBNQ RtE9H3y0rVJc_ZgV{U5WQ?o>=+se> zXjhn0nNgvZmV&9R)K<|J_&+t>9ByUi>(zRdwx-*(_4(fC;A_vzFYj|6?mf?We&;+7 zUI>P*4~98yeou|zI75=i`AB2>h8eT1v(6fm)iUF;CbN8!(0sG+-3&LH?No{OE`$t!>zy{^zLAhcT-( z^y2^=jj^~8bq~wXi`94wZb0tE>_Z>dH%Dpo<-|Gs0Y)UaUx>w2`iV$U%s6DmW->0p z0xZI#I2DI=bMJH&YGSqM!Oh4&vyC4brx{g|gBZj0%~={6_)DZ}<{EawSZ-4TB%!|e zL(~^_t`d9n{`Ag1hlFsshzLsV3I;r2g6zd+mv{ zs8W81+O3^#b~jZ5PNshsYNG2<6WM^8*k;s(8}09#QRB3rE_ezxvA<$Ieuf%9!s>g9YYLl$P3HT4pz;tdm6Bl9xZo^`1#15FqxYN>n0Gu33vtXdoJT%o%UsJ*lkwPy~bQh$}|I48W=hT(V-wRyfkUFct^iTQ4Gm%@*_ za4Kpo@3qcCm9`Y4a53t_kD?}0ja$Qv*^jH~7pGBwmFh~G`$Fl`->^#{hvMGV}N@;4cUKYBx*u4kq5*SVP~v#Xmq4ei&~@SQ3Jh) zDrFmv#FT;V1?QqR)l%$)t58d{)}G&oddv=^?)(!}g|DI};Nd;Zy_lO&eP;v>RbULR zz**Mw_z?Y)!S004qTcOSP@6241@DF3Q2h+lQ<7!P#~Au$sEIh}#~RcUZ9yvOnC&#; zII#zH=dGwOUcgwqV)YJj?<5g9Wm0fA7N92JPj@TP9Y@n2hdRF!HC`2_;B%-OX~sTU z)N?enhMuABU!^$Ig>z7k+jLZgg2S_5J*{9|@IzOh7#&k8qTy(8#se{jL+i?yf~8jYk;xTS*4kTOv=ngov%ZEp&k>l0d?Vbkw@4ZK`q^X zP#5x!;x8b^;}pzCRpe#VUO0$a!jDiBy{h-G28`rIuM5W^8{AC6?pT3wSclR08tOv( zQ3JGKS3GUce}%fxe^ECO&Q4Un6KaWKQ5Ecg`hLKnq0N(FPZVH)ehKP>HK-Rz18RT| zZT~oG;BQf-y@p8`l||XH59;&PsLHO#1l*1juo?Av$49-E(g>ht^aAqEF|VWU^c<>W zU)X-k7L$R0Z=;&-EOfhDDfyyO9UPwBZ7bAM09<4C$E9+=fZXaW`2BI(%>; zYVE&5t?@UgiG`1I|Fbz5b%A-Pr=$wCt2d%1bO?LmpHbsn#R|NJTH^BYdfd6v4jLNh z?|2J(?{eP*{gJtunV5_9s7?1z`}<_-s0!SJTB=2;i7rDuO=~a;>rfM@M=ezY-i$lZ zqdPrHLj#;dUEl($^sy7&Qujm;{dA1P5vT#OkynSAjbXT+==i`T^m9Hxw~=SbY@%Zj z(POW}d6FN`kuzii(S<)I?-1r;enIXf)#M(+#x|SD8>ByJKi;R&yS;;Jh^o2e|IVe- zR_UuqxO@K2&|kMjblxSr%0qv4SK}nYp1E;oEw!;=ymrK+Nx{1J*VeK$BQI_yhifL)1*>=v`*4!KlCVH4SrY`xX2XDI$7D{gJFA9f%$f z9ot>ZuXV@A=saalh~JPx+mE)cw2E4?kt`+)NGZu6I;N62BHF-zAo^3@k-S9OkH=~JoV-llvL|oH6Xb0&)SlaK{T0q6N60R6 zh-8t+$U&9*KJqhC6TBXi;OwJylnf_2rn{JOj3Td-Tr!VrBBw}zlo1_E$hc68hZ~zn zXA-pML_Aqeeya}0PV&1@i-PDO)-jQ6B@dES\n" "Language-Team: fr-FR \n" "MIME-Version: 1.0\n" @@ -232,7 +232,7 @@ msgstr "Signets récents" #: ../../../jsScuttle.php:22 #: ../../../templates/tag2tagadd.tpl.php:12 #: ../../../templates/tag2tagdelete.tpl.php:13 -#: ../../../templates/tag2tagedit.tpl.php:12 +#: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:35 #: ../../../templates/tagdelete.tpl.php:6 msgid "Are you sure?" @@ -240,14 +240,14 @@ msgstr "Etes-vous sûr ?" #: ../../../jsScuttle.php:22 #: ../../../templates/tag2tagdelete.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:37 +#: ../../../templates/tag2tagedit.tpl.php:16 #: ../../../templates/tagdelete.tpl.php:8 msgid "Yes" msgstr "Oui" #: ../../../jsScuttle.php:22 #: ../../../templates/tag2tagdelete.tpl.php:16 -#: ../../../templates/tag2tagedit.tpl.php:38 +#: ../../../templates/tag2tagedit.tpl.php:17 #: ../../../templates/tagdelete.tpl.php:9 msgid "No" msgstr "Non" @@ -467,7 +467,7 @@ msgid "Failed to update the tag common description" msgstr "Impossible de mettre à jour la description commune du tag" #: ../../../tagcommondescriptionedit.php:55 -#: ../../../templates/sidebar.block.tagactions.php:25 +#: ../../../templates/sidebar.block.tagactions.php:26 msgid "Edit Tag Common Description" msgstr "Editer la description commune du tag" @@ -480,7 +480,7 @@ msgid "Failed to delete the tag" msgstr "Impossible d'effacer le tag" #: ../../../tagdelete.php:44 -#: ../../../templates/sidebar.block.tagactions.php:22 +#: ../../../templates/sidebar.block.tagactions.php:23 msgid "Delete Tag" msgstr "Supprimer le tag" @@ -588,7 +588,7 @@ msgstr "Mettre à jour" #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 #: ../../../templates/tag2tagadd.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:15 +#: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagrename.tpl.php:25 msgid "Cancel" @@ -981,12 +981,16 @@ msgstr "Dernières recherches" msgid "Number of bookmarks for this query" 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 #, fuzzy msgid "Actions" 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 msgid "Last Users" msgstr "Derniers utilisateurs" @@ -1009,7 +1013,7 @@ msgid "Create new link:" msgstr "Créer un nouveau lien" #: ../../../templates/tag2tagadd.tpl.php:14 -#: ../../../templates/tag2tagedit.tpl.php:14 +#: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "Créer" @@ -1026,13 +1030,13 @@ msgid "No links" msgstr "Pas de liens" #: ../../../templates/tag2tagedit.tpl.php:6 -msgid "Create new link" -msgstr "Créer un nouveau lien" - -#: ../../../templates/tag2tagedit.tpl.php:27 msgid "Delete the link" msgstr "Supprimer le lien" +#: ../../../templates/tag2tagedit.tpl.php:29 +msgid "Create new link" +msgstr "Créer un nouveau lien" + #: ../../../templates/tagrename.tpl.php:12 msgid "Old" msgstr "Ancien" diff --git a/locales/messages.po b/locales/messages.po index 4a1c074..6d961f7 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-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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -213,20 +213,20 @@ msgstr "" #: ../../../jsScuttle.php:22 ../../../templates/tag2tagadd.tpl.php:12 #: ../../../templates/tag2tagdelete.tpl.php:13 -#: ../../../templates/tag2tagedit.tpl.php:12 +#: ../../../templates/tag2tagedit.tpl.php:14 #: ../../../templates/tag2tagedit.tpl.php:35 #: ../../../templates/tagdelete.tpl.php:6 msgid "Are you sure?" msgstr "" #: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:37 +#: ../../../templates/tag2tagedit.tpl.php:16 #: ../../../templates/tagdelete.tpl.php:8 msgid "Yes" msgstr "" #: ../../../jsScuttle.php:22 ../../../templates/tag2tagdelete.tpl.php:16 -#: ../../../templates/tag2tagedit.tpl.php:38 +#: ../../../templates/tag2tagedit.tpl.php:17 #: ../../../templates/tagdelete.tpl.php:9 msgid "No" msgstr "" @@ -442,7 +442,7 @@ msgid "Failed to update the tag common description" msgstr "" #: ../../../tagcommondescriptionedit.php:55 -#: ../../../templates/sidebar.block.tagactions.php:25 +#: ../../../templates/sidebar.block.tagactions.php:26 msgid "Edit Tag Common Description" msgstr "" @@ -455,7 +455,7 @@ msgid "Failed to delete the tag" msgstr "" #: ../../../tagdelete.php:44 -#: ../../../templates/sidebar.block.tagactions.php:22 +#: ../../../templates/sidebar.block.tagactions.php:23 msgid "Delete Tag" msgstr "" @@ -571,7 +571,7 @@ msgstr "" #: ../../../templates/bookmarkcommondescriptionedit.tpl.php:40 #: ../../../templates/tag2tagadd.tpl.php:15 -#: ../../../templates/tag2tagedit.tpl.php:15 +#: ../../../templates/tag2tagedit.tpl.php:38 #: ../../../templates/tagcommondescriptionedit.tpl.php:33 #: ../../../templates/tagrename.tpl.php:25 msgid "Cancel" @@ -978,11 +978,15 @@ msgstr "" msgid "Number of bookmarks for this query" msgstr "" -#: ../../../templates/sidebar.block.tagactions.php:17 +#: ../../../templates/sidebar.block.tagactions.php:18 #: ../../../templates/sidebar.block.watchstatus.php:17 msgid "Actions" msgstr "" +#: ../../../templates/sidebar.block.tagactions.php:28 +msgid "Create a link to another tag" +msgstr "" + #: ../../../templates/sidebar.block.users.php:14 msgid "Last Users" msgstr "" @@ -1005,7 +1009,7 @@ msgid "Create new link:" msgstr "" #: ../../../templates/tag2tagadd.tpl.php:14 -#: ../../../templates/tag2tagedit.tpl.php:14 +#: ../../../templates/tag2tagedit.tpl.php:37 msgid "Create" msgstr "" @@ -1022,11 +1026,11 @@ msgid "No links" msgstr "" #: ../../../templates/tag2tagedit.tpl.php:6 -msgid "Create new link" +msgid "Delete the link" msgstr "" -#: ../../../templates/tag2tagedit.tpl.php:27 -msgid "Delete the link" +#: ../../../templates/tag2tagedit.tpl.php:29 +msgid "Create new link" msgstr "" #: ../../../templates/tagrename.tpl.php:12 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); ?>

@@ -24,6 +25,7 @@ if ($userservice->isLoggedOn()) {
    • +
    • 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,27 +2,6 @@ $this->includeTemplate($GLOBALS['top_include']); ?> -
    -

    -

    - - - -

    - -

    - - -

    - - -
    - - -
    - -
    -

    +

    + + +

    + + +
    + + +
    + +
    + 0) { echo T_("Existing links:");