From: <chi...@us...> - 2011-04-23 14:58:08
|
Revision: 34099 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34099&view=rev Author: chibaguy Date: 2011-04-23 14:58:00 +0000 (Sat, 23 Apr 2011) Log Message: ----------- [FIX] Make install page fixed-width; change divs esp. header-related from id to class to facilitate overriding properties when necessary, and make related changes in stylesheets. Modified Paths: -------------- branches/7.x/styles/abse.css branches/7.x/styles/arcturus/options/simple.css branches/7.x/styles/arcturus.css branches/7.x/styles/business.css branches/7.x/styles/coelesce.css branches/7.x/styles/darkroom.css branches/7.x/styles/eatlon/options/teal.css branches/7.x/styles/eatlon.css branches/7.x/styles/feb12.css branches/7.x/styles/fivealive/options/akebi.css branches/7.x/styles/fivealive/options/grape.css branches/7.x/styles/fivealive/options/kiwi.css branches/7.x/styles/fivealive/options/lemon.css branches/7.x/styles/fivealive/options/orange.css branches/7.x/styles/fivealive/options/watermelon.css branches/7.x/styles/fivealive.css branches/7.x/styles/jqui/options/trontastic.css branches/7.x/styles/jqui.css branches/7.x/styles/layout/layout.css branches/7.x/styles/ohia/ie6.css branches/7.x/styles/ohia.css branches/7.x/styles/snow.css branches/7.x/styles/strasa/options/cool.css branches/7.x/styles/strasa/options/mono.css branches/7.x/styles/strasa.css branches/7.x/styles/tikinewt.css branches/7.x/styles/twist/ie6.css branches/7.x/styles/twist.css branches/7.x/templates/styles/mobile/tiki.tpl branches/7.x/templates/styles/mobile/tiki_full.tpl branches/7.x/templates/tiki-install.tpl branches/7.x/templates/tiki.tpl branches/7.x/tiki-install.php Modified: branches/7.x/styles/abse.css =================================================================== --- branches/7.x/styles/abse.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/abse.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -230,7 +230,7 @@ padding: 0; } -#header { +.header { background: transparent; padding-top: 0} @@ -266,7 +266,7 @@ font-size: 1em; padding-left: 3em} -#header .box-login_box, +.header .box-login_box, #topbar_modules .box-search { float: right; margin-right: 10px; Modified: branches/7.x/styles/arcturus/options/simple.css =================================================================== --- branches/7.x/styles/arcturus/options/simple.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/arcturus/options/simple.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -56,7 +56,7 @@ border: 1px solid #6699cc; } -#header, +.header, #c1c2, #c1c2 #wrapper, #c1c2 #wrapper #col1, Modified: branches/7.x/styles/arcturus.css =================================================================== --- branches/7.x/styles/arcturus.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/arcturus.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -194,7 +194,7 @@ margin-top: 10px; } -#header .box-login_box { +.header .box-login_box { float: right; margin-right: 10px; } @@ -231,7 +231,7 @@ z-index: 1; } -#header { +.header { margin: 0; } Modified: branches/7.x/styles/business.css =================================================================== --- branches/7.x/styles/business.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/business.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -182,18 +182,18 @@ padding: 0; } -#header { +.header { position: relative; } -#header_fixedwidth { +.header_fixedwidth { background: #003371 url(business/header.png) repeat-x bottom; color: #91bef5; padding: 0; } -#header a, -#header a:visited { +.header a, +.header a:visited { color: #91bef5; } @@ -299,7 +299,7 @@ .cssmenu_horiz a:hover, .cssmenu_vert a:hover, -#header .cssmenu_horiz li ul li a:hover { +.header .cssmenu_horiz li ul li a:hover { text-decoration: underline; color: #0082e0; } Modified: branches/7.x/styles/coelesce.css =================================================================== --- branches/7.x/styles/coelesce.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/coelesce.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -264,7 +264,7 @@ } /* Site Header & Identity */ -#header_container { +.header_container { background: url(coelesce/pagebg.jpg) repeat-x 0 100%; } @@ -547,8 +547,8 @@ color: #5a7ea2; } -#header .cssmenu_horiz li a:link, -#header .cssmenu_horiz li a:visited { +.header .cssmenu_horiz li a:link, +.header .cssmenu_horiz li a:visited { text-decoration: none; background: inherit; color: #cfe3fb; Modified: branches/7.x/styles/darkroom.css =================================================================== --- branches/7.x/styles/darkroom.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/darkroom.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -303,7 +303,7 @@ } /* Site Header & Identity */ -#header_container { +.header_container { padding-top: 2px; text-align: left; background: #0c0c0c; Modified: branches/7.x/styles/eatlon/options/teal.css =================================================================== --- branches/7.x/styles/eatlon/options/teal.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/eatlon/options/teal.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -55,7 +55,7 @@ min-height: 450px/*; height: auto !important*/} -#header_fixedwidth { +.header_fixedwidth { text-align: left; height: 190px; background: #fff url(teal/head_bg.gif); Modified: branches/7.x/styles/eatlon.css =================================================================== --- branches/7.x/styles/eatlon.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/eatlon.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -54,7 +54,7 @@ margin-bottom: 0; } -#header_container .fixedwidth { +.header_container .fixedwidth { text-align: left; height: 126px; background: #fff url(eatlon/head_bg.gif) repeat-x 0 0; Modified: branches/7.x/styles/feb12.css =================================================================== --- branches/7.x/styles/feb12.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/feb12.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -183,7 +183,7 @@ font-size: 1.24em; } -#header { +.header { text-align: left; } @@ -240,7 +240,7 @@ } /* Site Header & Identity */ -/*#header_fixedwidth { +/*.header_fixedwidth { margin: 0; }*/ @@ -250,7 +250,7 @@ padding: 0; } -#header_container { +.header_container { background: url(feb12/header.jpg) repeat-x bottom; } Modified: branches/7.x/styles/fivealive/options/akebi.css =================================================================== --- branches/7.x/styles/fivealive/options/akebi.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/fivealive/options/akebi.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -30,11 +30,11 @@ background: #18a3bb; } -#header_outer { +.header_outer { background: url(akebi/siteheadertile.jpg) 0 0 no-repeat; } -#header { +.header { background: url(akebi/siteheader.png) -250px 0 no-repeat; } @@ -102,8 +102,8 @@ .cssmenu_vert li ul a, .cssmenu_horiz li ul a, -#header .cssmenu_horiz li ul a, -#header .cssmenu_horiz li:hover ul a, +.header .cssmenu_horiz li ul a, +.header .cssmenu_horiz li:hover ul a, #topbar_modules .cssmenu_horiz li ul a, #topbar_modules .cssmenu_horiz li:hover ul a { background: #005064; @@ -111,19 +111,19 @@ .cssmenu_vert li ul a:hover, .cssmenu_horiz li ul a:hover, -#header .cssmenu_horiz li ul a:hover, +.header .cssmenu_horiz li ul a:hover, #topbar_modules .cssmenu_horiz li ul a:hover { background: #14a1bb; } -#header .cssmenu_horiz li.selected a, +.header .cssmenu_horiz li.selected a, #topbar_modules .cssmenu_horiz li.selected a, .cssmenu_horiz li.selected a, .cssmenu_vert li.selected a { color: #b4f3fb; } -#header .cssmenu_horiz li.selected li a, +.header .cssmenu_horiz li.selected li a, #topbar_modules .cssmenu_horiz li.selected li a, .cssmenu_horiz li.selected li a, .cssmenu_vert li.selected li a { Modified: branches/7.x/styles/fivealive/options/grape.css =================================================================== --- branches/7.x/styles/fivealive/options/grape.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/fivealive/options/grape.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -30,11 +30,11 @@ background: #a82a76; } -#header_outer { +.header_outer { background: url(grape/siteheadertile.png) 0 0 no-repeat; } -#header { +.header { background: url(grape/siteheader.png) -250px 0 no-repeat; } @@ -105,26 +105,26 @@ .cssmenu_vert li ul a, .cssmenu_horiz li ul a, -#header .cssmenu_horiz li ul a, -#header .cssmenu_horiz li:hover ul a { +.header .cssmenu_horiz li ul a, +.header .cssmenu_horiz li:hover ul a { background: #3b284a; } .cssmenu_vert li ul a:hover, .cssmenu_horiz li ul a:hover, -#header .cssmenu_horiz li ul a:hover, +.header .cssmenu_horiz li ul a:hover, #topbar_modules .cssmenu_horiz li ul a:hover { background: #972269; } -#header .cssmenu_horiz li.selected a, +.header .cssmenu_horiz li.selected a, #topbar_modules .cssmenu_horiz li.selected li a, .cssmenu_horiz li.selected a, .cssmenu_vert li.selected a { color: #da65ab; } -#header .cssmenu_horiz li.selected li a, +.header .cssmenu_horiz li.selected li a, #topbar_modules .cssmenu_horiz li.selected li a, .cssmenu_horiz li.selected li a, .cssmenu_vert li.selected li a { Modified: branches/7.x/styles/fivealive/options/kiwi.css =================================================================== --- branches/7.x/styles/fivealive/options/kiwi.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/fivealive/options/kiwi.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -30,11 +30,11 @@ background: #bcb923; } -#header_outer { +.header_outer { background: url(kiwi/siteheadertile.png) 0 0 no-repeat; } -#header { +.header { background: url(kiwi/siteheader.png) -250px 0 no-repeat; } @@ -104,8 +104,8 @@ .cssmenu_vert li ul a, .cssmenu_horiz li ul a, -#header .cssmenu_horiz li ul a, -#header .cssmenu_horiz li:hover ul a, +.header .cssmenu_horiz li ul a, +.header .cssmenu_horiz li:hover ul a, #topbar_modules .cssmenu_horiz li ul a, #topbar_modules .cssmenu_horiz li:hover ul a { background: #658838; @@ -113,19 +113,19 @@ .cssmenu_vert li ul a:hover, .cssmenu_horiz li ul a:hover, -#header .cssmenu_horiz li ul a:hover, +.header .cssmenu_horiz li ul a:hover, #topbar_modules .cssmenu_horiz li ul a:hover { background: #e1d518; } -#header .cssmenu_horiz li.selected a, +.header .cssmenu_horiz li.selected a, #topbar_modules .cssmenu_horiz li.selected a, .cssmenu_horiz li.selected a, .cssmenu_vert li.selected a { color: #f0e884; } -#header .cssmenu_horiz li.selected li a, +.header .cssmenu_horiz li.selected li a, #topbar_modules .cssmenu_horiz li.selected li a, .cssmenu_horiz li.selected li a, .cssmenu_vert li.selected li a { Modified: branches/7.x/styles/fivealive/options/lemon.css =================================================================== --- branches/7.x/styles/fivealive/options/lemon.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/fivealive/options/lemon.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -29,11 +29,11 @@ background: #ffc506; } -#header_outer { +.header_outer { background: url(lemon/siteheadertile.png) 0 0 no-repeat; } -#header { +.header { background: url(lemon/siteheader.png) -250px 0 no-repeat; } @@ -104,8 +104,8 @@ .cssmenu_vert li ul a, .cssmenu_horiz li ul a, -#header .cssmenu_horiz li ul a, -#header .cssmenu_horiz li:hover ul a, +.header .cssmenu_horiz li ul a, +.header .cssmenu_horiz li:hover ul a, #topbar_modules .cssmenu_horiz li ul a, #topbar_modules .cssmenu_horiz li:hover ul a { background: #c75a29; @@ -113,19 +113,19 @@ .cssmenu_vert li ul a:hover, .cssmenu_horiz li ul a:hover, -#header .cssmenu_horiz li ul a:hover, +.header .cssmenu_horiz li ul a:hover, #topbar_modules .cssmenu_horiz li ul a:hover { background: #f68c1a; } -#header .cssmenu_horiz li.selected a, +.header .cssmenu_horiz li.selected a, #topbar_modules .cssmenu_horiz li.selected a, .cssmenu_horiz li.selected a, .cssmenu_vert li.selected a { color: #fcebbc; } -#header .cssmenu_horiz li.selected li a, +.header .cssmenu_horiz li.selected li a, #topbar_modules .cssmenu_horiz li.selected li a, .cssmenu_horiz li.selected li a, .cssmenu_vert li.selected li a { Modified: branches/7.x/styles/fivealive/options/orange.css =================================================================== --- branches/7.x/styles/fivealive/options/orange.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/fivealive/options/orange.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -29,11 +29,11 @@ color: #e7713e; } -#header_outer { +.header_outer { background: url(orange/siteheadertile.png) 0 0 no-repeat; } -#header { +.header { background: url(orange/siteheader.png) -250px 0 no-repeat; } @@ -102,8 +102,8 @@ .cssmenu_vert li ul a, .cssmenu_horiz li ul a, -#header .cssmenu_horiz li ul a, -#header .cssmenu_horiz li:hover ul a, +.header .cssmenu_horiz li ul a, +.header .cssmenu_horiz li:hover ul a, #topbar_modules .cssmenu_horiz li ul a, #topbar_modules .cssmenu_horiz li:hover ul a { background: #c44a23; @@ -111,19 +111,19 @@ .cssmenu_vert li ul a:hover, .cssmenu_horiz li ul a:hover, -#header .cssmenu_horiz li ul a:hover, +.header .cssmenu_horiz li ul a:hover, #topbar_modules .cssmenu_horiz li ul a:hover { background: #e35c29; } -#header .cssmenu_horiz li.selected a, +.header .cssmenu_horiz li.selected a, #topbar_modules .cssmenu_horiz li.selected a, .cssmenu_horiz li.selected a, .cssmenu_vert li.selected a { color: #e88357; } -#header .cssmenu_horiz li.selected li a, +.header .cssmenu_horiz li.selected li a, #topbar_modules .cssmenu_horiz li.selected li a, .cssmenu_horiz li.selected li a, .cssmenu_vert li.selected li a { Modified: branches/7.x/styles/fivealive/options/watermelon.css =================================================================== --- branches/7.x/styles/fivealive/options/watermelon.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/fivealive/options/watermelon.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -30,11 +30,11 @@ color: #c31e3b; } -#header_outer { +.header_outer { background: url(watermelon/siteheadertile.png) 0 0 no-repeat; } -#header { +.header { background: url(watermelon/siteheader.png) -250px 0 no-repeat; } @@ -103,8 +103,8 @@ .cssmenu_vert li ul a, .cssmenu_horiz li ul a, -#header .cssmenu_horiz li ul a, -#header .cssmenu_horiz li:hover ul a, +.header .cssmenu_horiz li ul a, +.header .cssmenu_horiz li:hover ul a, #topbar_modules .cssmenu_horiz li ul a, #topbar_modules .cssmenu_horiz li:hover ul a { background: #8c1832; @@ -112,19 +112,19 @@ .cssmenu_vert li ul a:hover, .cssmenu_horiz li ul a:hover, -#header .cssmenu_horiz li ul a:hover, +.header .cssmenu_horiz li ul a:hover, #topbar_modules .cssmenu_horiz li ul a:hover { background: #fb999e; } -#header .cssmenu_horiz li.selected a, +.header .cssmenu_horiz li.selected a, #topbar_modules .cssmenu_horiz li.selected a, .cssmenu_horiz li.selected a, .cssmenu_vert li.selected a { color: #e22848; } -#header .cssmenu_horiz li.selected li a, +.header .cssmenu_horiz li.selected li a, #topbar_modules .cssmenu_horiz li.selected li a, .cssmenu_horiz li.selected li a, .cssmenu_vert li.selected li a { Modified: branches/7.x/styles/fivealive.css =================================================================== --- branches/7.x/styles/fivealive.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/fivealive.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -47,22 +47,22 @@ margin: 0 auto; } -#header_outer { /* whole width div containing the header strip */ +.header_outer { /* whole width div containing the header strip */ background: url(fivealive/options/blueberry/headertile.png) 0 0 no-repeat; /* height: 220px;*/ } -#header_container { /* 2nd whole width div for background image tricks */ +.header_container { /* 2nd whole width div for background image tricks */ background: url(fivealive/header_left.png) 0 100% no-repeat; } /* keep header content in page center (override layout.css)*/ -#header_container .fixedwidth { +.header_container .fixedwidth { margin-left: auto; } -#header { /* inner <header> element that gets .fixedwidth class applied */ +.header { /* inner <header> element that gets .fixedwidth class applied */ background: url(fivealive/options/blueberry/siteheader.jpg) 0 0 no-repeat; /* height: 220px;*/ } @@ -415,11 +415,11 @@ /***** Site Header & Identity *****/ -#header-top { +/*#header-top { min-height: 170px; position: relative; background: url(fivealive/options/blueberry/siteheader.jpg) no-repeat; -} +}*/ #top_modules .box-quickadmin { position: absolute; @@ -710,7 +710,7 @@ color: #fff; } -#header #secondary_site_menu .cssmenu_horiz li a { +.header #secondary_site_menu .cssmenu_horiz li a { font-weight: 400; padding: 8px .7em; } Modified: branches/7.x/styles/jqui/options/trontastic.css =================================================================== --- branches/7.x/styles/jqui/options/trontastic.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/jqui/options/trontastic.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -58,7 +58,7 @@ color: #000; } -#header { +.header { background: #c6e99c; } #tiki-top { Modified: branches/7.x/styles/jqui.css =================================================================== --- branches/7.x/styles/jqui.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/jqui.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -171,12 +171,12 @@ /***** Site Header & Identity *****/ -#header { +.header { min-height: 100%; height: 100% !important; } -#header_fixedwidth { +.header_fixedwidth { height: auto; } Modified: branches/7.x/styles/layout/layout.css =================================================================== --- branches/7.x/styles/layout/layout.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/layout/layout.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -48,10 +48,11 @@ margin-bottom: 5px; } -/* avoid table-like height properties in #header_fixedwidth */ -#header_container .fixedwidth { +/* avoid table-like height properties in .header_fixedwidth */ +.header_container .fixedwidth { display: block; - width: 100%; + width: auto; + margin-left: 0; /* so header contents stay left rather than centered when wide middle content extends page to the right. */ } body.fixed_width .fixedwidth .fixedwidth { @@ -62,11 +63,6 @@ height: auto; } -/* so header contents stay left rather than centered when wide middle content extends page to the right. */ -#header_container .fixedwidth { - margin-left: 0; -} - .fullscreen #c1c2 #wrapper #col1.marginleft { margin-left: 30px; } Modified: branches/7.x/styles/ohia/ie6.css =================================================================== --- branches/7.x/styles/ohia/ie6.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/ohia/ie6.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -4,7 +4,7 @@ body {font-size: 11px !important} -#header {height: 122px} +.header {height: 122px} #footer {height: 90px} .wikitopline select {font-size: .9em} Modified: branches/7.x/styles/ohia.css =================================================================== --- branches/7.x/styles/ohia.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/ohia.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -317,13 +317,13 @@ } /* ul ul top compensation for padding */ -#header .cssmenu_horiz li:hover ul, -#header .cssmenu_horiz li.sfHover ul { +.header .cssmenu_horiz li:hover ul, +.header .cssmenu_horiz li.sfHover ul { top: 2.25em; } -#header .cssmenu_horiz li li:hover ul, -#header .cssmenu_horiz li li.sfHover ul { +.header .cssmenu_horiz li li:hover ul, +.header .cssmenu_horiz li li.sfHover ul { top: 0; } Modified: branches/7.x/styles/snow.css =================================================================== --- branches/7.x/styles/snow.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/snow.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -20,7 +20,7 @@ /***** Layout (overrides layout.css; also styling of page layout divs) *****/ -#header {text-align: left} +.header {text-align: left} #middle {text-align: left} #c1c2 { @@ -229,8 +229,8 @@ font-size: 1.6em; margin-left: 20px} -#header a, -#header a:visited { +.header a, +.header a:visited { color: #714952; text-decoration: none} Modified: branches/7.x/styles/strasa/options/cool.css =================================================================== --- branches/7.x/styles/strasa/options/cool.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/strasa/options/cool.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -160,7 +160,7 @@ /*** Error page ***/ /* Site Header & Identity */ -#header_fixedwidth { +.header_fixedwidth { background: #f5f5f5 url(cool/headerbg.jpg) repeat-x 0 100%; } @@ -244,20 +244,20 @@ .cssmenu_vert li ul li, .cssmenu_horiz li ul li, -#header .cssmenu_horiz li ul li { +.header .cssmenu_horiz li ul li { border: 1px solid #aaa; background: #f5f5f5; border-top: 0; margin-bottom: -1px; } -#header .cssmenu_horiz li:hover { +.header .cssmenu_horiz li:hover { background: #cce5ff; } .cssmenu_horiz li ul li:first-child, .cssmenu_vert li ul li:first-child, -#header .cssmenu_horiz li ul li:first-child { +.header .cssmenu_horiz li ul li:first-child { border-top: 1px solid #aaa; } @@ -290,24 +290,24 @@ color: #000000; } -#header .cssmenu_horiz a, -#header .cssmenu_horiz a:visited { +.header .cssmenu_horiz a, +.header .cssmenu_horiz a:visited { color: #1E7EA6; border: none; } -#header .cssmenu_horiz a:hover { +.header .cssmenu_horiz a:hover { color: #1E7EA6; background: #cce5ff; border: none; } /* special arrows and arrow top padding */ -#header .cssmenu_horiz li a .sf-sub-indicator { +.header .cssmenu_horiz li a .sf-sub-indicator { background: url(../arrows-467aa7.png) no-repeat 0 -100px; } -#header .cssmenu_horiz li ul li a .sf-sub-indicator { +.header .cssmenu_horiz li ul li a .sf-sub-indicator { background-position: -10px 0; } Modified: branches/7.x/styles/strasa/options/mono.css =================================================================== --- branches/7.x/styles/strasa/options/mono.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/strasa/options/mono.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -166,7 +166,7 @@ } /* Site Header & Identity */ -#header_fixedwidth { +.header_fixedwidth { color: #fff; background: #444 url(mono/headerbg.jpg) repeat-x 0 100%; @@ -258,7 +258,7 @@ border-top: 1px solid #233039; } -#header .cssmenu_horiz li:hover { +.header .cssmenu_horiz li:hover { background: #212121; } @@ -290,31 +290,31 @@ color: #000000; } -#header .cssmenu_horiz a, -#header .cssmenu_horiz a:visited { +.header .cssmenu_horiz a, +.header .cssmenu_horiz a:visited { background: none; border: none; color: #fff; padding: 3px 5px 6px } -#header .cssmenu_horiz a:hover { +.header .cssmenu_horiz a:hover { background: #000; border: none; color: #fff; } -#header .cssmenu_horiz li ul li { +.header .cssmenu_horiz li ul li { border: 1px solid #a9a9a9; background: #4c4c4c; } -#header .cssmenu_horiz li ul li:first-child, +.header .cssmenu_horiz li ul li:first-child, .cssmenu_vert li ul li:first-child { border-top: 1px solid #a9a9a9; } -#header .cssmenu_horiz li ul li a:hover { +.header .cssmenu_horiz li ul li a:hover { background: #000; } @@ -330,11 +330,11 @@ background: url(mono/arrows-000000.png) no-repeat 0 0; } -#header .cssmenu_horiz li a .sf-sub-indicator { +.header .cssmenu_horiz li a .sf-sub-indicator { background: url(../../../lib/jquery/superfish/images/arrows-ffffff.png) no-repeat -10px -100px; } -#header .cssmenu_horiz li ul li a .sf-sub-indicator { +.header .cssmenu_horiz li ul li a .sf-sub-indicator { background: url(../../../lib/jquery/superfish/images/arrows-ffffff.png) no-repeat 0 0; } Modified: branches/7.x/styles/strasa.css =================================================================== --- branches/7.x/styles/strasa.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/strasa.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -185,12 +185,12 @@ width: 110px; } -#header .box-search { +.header .box-search { position: absolute; top: 45px; right: 20px; } -#header .box-search input.ac_input { +.header .box-search input.ac_input { background: #E7F8FD; border: 1px solid #3CF; color: #517298; @@ -407,7 +407,7 @@ padding: 0; } -#header_container { +.header_container { color: #fff; background: #214d68 url(strasa/headerbg.jpg) repeat-x 0 100%; } @@ -656,7 +656,7 @@ border-top: 1px solid #233039; } -#header .cssmenu_horiz li:hover { +.header .cssmenu_horiz li:hover { background: #1b3a50; } @@ -736,8 +736,8 @@ text-align: left; } -#header .cssmenu_horiz a, -#header .cssmenu_horiz a:visited { +.header .cssmenu_horiz a, +.header .cssmenu_horiz a:visited { padding: 3px 3px 6px 3px; text-decoration: none; font: normal 1em Verdana, Helvetica, Arial, Sans-Serif; @@ -749,11 +749,11 @@ text-align: center; } -#header .cssmenu_horiz li.menuSection a { +.header .cssmenu_horiz li.menuSection a { padding-right: 2em; } -#header .cssmenu_horiz a:hover { +/header .cssmenu_horiz a:hover { text-decoration: none; background: url(strasa/headermenuitem-hover.png) bottom center repeat-x; border-color: #336699; @@ -762,26 +762,26 @@ color: #fff; } -#header .cssmenu_horiz li ul li a, -#header .cssmenu_horiz li ul li a:link, -#header .cssmenu_horiz li ul li a:visited, -#header .cssmenu_horiz li ul li a:hover { +.header .cssmenu_horiz li ul li a, +.header .cssmenu_horiz li ul li a:link, +.header .cssmenu_horiz li ul li a:visited, +.header .cssmenu_horiz li ul li a:hover { text-align: left; border: 0; } -#header .cssmenu_horiz li ul li a:hover { +.header .cssmenu_horiz li ul li a:hover { background: none; } -#header .cssmenu_horiz li ul li { +.header .cssmenu_horiz li ul li { border: 1px solid #08698f; background: #1b3a50; border-top: 0; margin-bottom: -1px } -#header .cssmenu_horiz li ul li:first-child, +.header .cssmenu_horiz li ul li:first-child, .cssmenu_vert li ul li:first-child { border-top: 1px solid #08698f; } Modified: branches/7.x/styles/tikinewt.css =================================================================== --- branches/7.x/styles/tikinewt.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/tikinewt.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -271,12 +271,12 @@ } /***** Site Header & Identity *****/ -#header { +.header { background: #e9ecef; } -#header a, -#header a:visited { +.header a, +.header a:visited { text-decoration: none; } Modified: branches/7.x/styles/twist/ie6.css =================================================================== --- branches/7.x/styles/twist/ie6.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/twist/ie6.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -13,7 +13,7 @@ background: #1b5880 url(twist/header.jpg) -30px 0 no-repeat} td#main-header, -#header {height: 108px;} +.header {height: 108px;} #header-top {height: 82px} #sitetitles { Modified: branches/7.x/styles/twist.css =================================================================== --- branches/7.x/styles/twist.css 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/styles/twist.css 2011-04-23 14:58:00 UTC (rev 34099) @@ -188,20 +188,20 @@ select[name="theme"] {width: 125px} /***** Site Header & Identity *****/ -#header_fixedwidth { +.header_fixedwidth { background: url(twist/header.jpg) no-repeat 100% 100%; color: #fff; } -#header { +.header { background: url(twist/header.jpg) no-repeat 0 100%; margin-right: 22px; padding-left: 30px; width: inherit; } -#header a, -#header a:visited {color: #fff} +.header a, +.header a:visited {color: #fff} #top_modules { min-height: 82px; Modified: branches/7.x/templates/styles/mobile/tiki.tpl =================================================================== --- branches/7.x/templates/styles/mobile/tiki.tpl 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/templates/styles/mobile/tiki.tpl 2011-04-23 14:58:00 UTC (rev 34099) @@ -34,10 +34,10 @@ {if ($prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y')} {if $prefs.module_zones_top eq 'fixed' or ($prefs.module_zones_top ne 'n' && $top_modules|@count > 0)} {if $prefs.feature_layoutshadows eq 'y'}<div id="header-shadow">{eval var=$prefs.header_shadow_start}{/if} - <div id="header_outer" data-role="header" data-theme="{$prefs.mobile_theme_header}"> - <div id="header_container"> - <div id="header_fixedwidth"> - <header class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> + <div class="header_outer" data-role="header" data-theme="{$prefs.mobile_theme_header}"> + <div class="header_container"> + <div class="header_fixedwidth"> + <header class="header clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="content clearfix modules" id="top_modules"> {section name=homeix loop=$top_modules} {$top_modules[homeix].data} Modified: branches/7.x/templates/styles/mobile/tiki_full.tpl =================================================================== --- branches/7.x/templates/styles/mobile/tiki_full.tpl 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/templates/styles/mobile/tiki_full.tpl 2011-04-23 14:58:00 UTC (rev 34099) @@ -16,10 +16,10 @@ {include file='tiki-ajax_header.tpl'} {/if*} <div id="main" data-role="page"> - <div id="header_outer" data-role="header" data-theme="{$prefs.mobile_theme_header}"> - <div id="header_container"> - <div id="header_fixedwidth"> - <header class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> + <div class="header_outer" data-role="header" data-theme="{$prefs.mobile_theme_header}"> + <div class="header_container"> + <div class="header_fixedwidth"> + <header class="header clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="content clearfix modules" id="top_modules"> {section name=homeix loop=$top_modules} {$top_modules[homeix].data} Modified: branches/7.x/templates/tiki-install.tpl =================================================================== --- branches/7.x/templates/tiki-install.tpl 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/templates/tiki-install.tpl 2011-04-23 14:58:00 UTC (rev 34099) @@ -1,20 +1,22 @@ -<div id="outer_wrapper"> - <div id="header_outer"> - <div id="header_container"> - <header id="header"> - <div id="header_fixedwidth" class="clearfix fixedwidth"> - <div class="content clearfix modules" id="top_modules"> - <div id="sitelogo" style="padding-left:0; padding-top: 0px"><h1 style="margin: 0"><img style="border:none;vertical-align:middle" alt="{tr}Tiki Wiki CMS Groupware{/tr}" src="{if isset($ie6)}img/tiki/tikisitelogo.gif{else}img/tiki/Tiki_WCG.png{/if}" /> - <span style="vertical-align:middle; margin-left: 120px; color: #fff; padding-top: 30px;">{tr}Tiki installer{/tr} {$tiki_version_name} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/Installation" target="help"><img style="border:0" src='pics/icons/help.png' alt="{tr}Help{/tr}" /></a></span></h1> - </div> +<div id="fixedwidth" class="fixedwidth"> {* enables fixed-width layouts *} + <div class="header_outer"> + <div class="header_container"> + <div class="header_fixedwidth fixedwidth"> + <header class="header" id="header"> + <div class="content clearfix modules" id="top_modules" > + <div id="sitelogo" style="padding-left:0; padding-top: 0px"><h1 style="margin: 0"><img style="border:none;vertical-align:middle" alt="{tr}Tiki Wiki CMS Groupware{/tr}" src="{if isset($ie6)}img/tiki/tikisitelogo.gif{else}img/tiki/Tiki_WCG.png{/if}" /> + <span style="vertical-align:middle; margin-left: 120px; color: #fff; padding-top: 30px;">{tr}Tiki installer{/tr} {$tiki_version_name} <a title="{tr}Help{/tr}" href="http://doc.tiki.org/Installation" target="help"><img style="border:0" src='pics/icons/help.png' alt="{tr}Help{/tr}" /></a></span></h1> + </div> <div id="tiki-top" style="position: absolute; top: 168px;"></div> {* added for background image consistency *} </div> </div> </header> </div> </div> + </div> <div class="middle_outer"> -<div id="middle" class="clearfix" style="padding-top: 55px"> +<div class="fixedwidth"> +<div id="middle" class="clearfix fixedwidth" style="padding-top: 55px"> <div id="c1c2" class="clearfix"> <div id="wrapper" class="clearfix"> <div id="col1" class="marginleft"> @@ -737,6 +739,7 @@ </div> </div> </div> + </div> </div> <footer id="footer"> <div class="footer_liner"> @@ -747,4 +750,5 @@ </footer> </div>{* -- END of main -- *} - </div> {* -- END of puterwrapper -- *} + </div> {* -- END of outerwrapper -- *} +</div> {* -- END of fixedwidth -- *} Modified: branches/7.x/templates/tiki.tpl =================================================================== --- branches/7.x/templates/tiki.tpl 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/templates/tiki.tpl 2011-04-23 14:58:00 UTC (rev 34099) @@ -34,10 +34,10 @@ {if ($prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y') } {if $prefs.module_zones_top eq 'fixed' or ($prefs.module_zones_top ne 'n' && $top_modules|@count > 0)} {if $prefs.feature_layoutshadows eq 'y'}<div id="header-shadow">{eval var=$prefs.header_shadow_start}{/if} - <div id="header_outer"> - <div id="header_container"> - <div id="header_fixedwidth" class="fixedwidth"> - <header class="clearfix" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> + <div class="header_outer"> + <div class="header_container"> + <div class="fixedwidth header_fixedwidth"> + <header class="clearfix header" id="header"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> <div class="content clearfix modules" id="top_modules"> {section name=homeix loop=$top_modules} {$top_modules[homeix].data} @@ -52,7 +52,7 @@ {/if} <div class="middle_outer"> {if $prefs.feature_layoutshadows eq 'y'}<div id="middle-shadow">{eval var=$prefs.middle_shadow_start}{/if} - <div class="clearfix fixedwidth" id="middle"> + <div class="clearfix fixedwidth middle" id="middle"> <div class="content clearfix modules" id="topbar_modules"> {section name=homeix loop=$topbar_modules} {$topbar_modules[homeix].data} @@ -159,7 +159,7 @@ {if $prefs.feature_fullscreen != 'y' or $smarty.session.fullscreen != 'y'} {if $prefs.module_zones_bottom eq 'fixed' or ($prefs.module_zones_bottom ne 'n' && $bottom_modules|@count > 0)} {if $prefs.feature_layoutshadows eq 'y'}<div id="footer-shadow">{eval var=$prefs.footer_shadow_start}{/if} - <footer id="footer"> + <footer class="footer" id="footer"> <div class="footer_liner"> <div class="fixedwidth footerbgtrap"> <div id="bottom_modules" class="content modules"{if $prefs.feature_bidi eq 'y'} dir="rtl"{/if}> Modified: branches/7.x/tiki-install.php =================================================================== --- branches/7.x/tiki-install.php 2011-04-23 12:42:50 UTC (rev 34098) +++ branches/7.x/tiki-install.php 2011-04-23 14:58:00 UTC (rev 34099) @@ -98,13 +98,12 @@ <title>$title</title> </head> <body class="tiki_wiki fixed_width"> - <div id="fixedwidth"> - <div id="outer_wrapper"> - <div id="header_outer"> - <div id="header_container"> - <header id="header"> - <div id="header_fixedwidth" class="clearfix fixedwidth"> - <div class="content clearfix modules" id="top_modules"> + <div id="fixedwidth" class="fixedwidth"> + <div class="header_outer"> + <div class="header_container"> + <div class="clearfix fixedwidth header_fixedwidth"> + <header id="header" class="header"> + <div class="content clearfix modules" id="top_modules" style="display: table; width: 990px;"> <div id="sitelogo"> <img alt="Site Logo" src="img/tiki/Tiki_WCG.png" /> </div> @@ -112,20 +111,19 @@ <h1 style="color: #fff; text-shadow: 3px 2px 0 #781437; margin: 0; padding: 0; line-height: 1.6;">$title</h1> </div> </div> - </div> - </header> + </header> + </div> </div> </div> <div class="middle_outer"> - <div id="middle" > + <div id="middle" class="fixedwidth"> <div id="tiki-top"></div> <div id="tiki-center" style="display: table; width: 990px; text-align: center;"> $content </div> </div> - </div> </div><!-- - <footer id="footer" style="margin-top: 50px;"> + <footer id="footer" class="footer" style="margin-top: 50px;"> <div class="footer_liner"> <div class="footerbgtrap fixedwidth" style="padding: 10px 0;"> <a href="http://tiki.org" target="_blank" title="Powered by Tiki Wiki CMS Groupware"><img src="img/tiki/tikibutton.png" alt="Powered by Tiki Wiki CMS Groupware" /></a> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rob...@us...> - 2011-04-25 13:55:30
|
Revision: 34111 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34111&view=rev Author: robertplummer Date: 2011-04-25 13:55:24 +0000 (Mon, 25 Apr 2011) Log Message: ----------- [MOD] Added files so that sheet menus can be translated Modified Paths: -------------- branches/7.x/templates/tiki-view_sheets.tpl branches/7.x/tiki-view_sheets.php Added Paths: ----------- branches/7.x/templates/tiki-view_sheets_menu.tpl Modified: branches/7.x/templates/tiki-view_sheets.tpl =================================================================== --- branches/7.x/templates/tiki-view_sheets.tpl 2011-04-25 13:54:41 UTC (rev 34110) +++ branches/7.x/templates/tiki-view_sheets.tpl 2011-04-25 13:55:24 UTC (rev 34111) @@ -74,6 +74,10 @@ <div style="text-align: left;">{toolbars area_id="jSheetControls_formula_0"}</div> </div> +<div id="sheetMenu" style="display: none;"> + {$menu} +</div> + <div class="switchSheet" style="display: none;" title="{tr}What would you like to add?{/tr}"> <input class="newSpreadsheet" type="button" value="{tr}New spreadsheet{/tr}" style="width: 100%;" /><br /> <input class="addSpreadsheet" type="button" value="{tr}Existing spreadsheet{/tr}" style="width: 100%;" /><br /> Added: branches/7.x/templates/tiki-view_sheets_menu.tpl =================================================================== --- branches/7.x/templates/tiki-view_sheets_menu.tpl (rev 0) +++ branches/7.x/templates/tiki-view_sheets_menu.tpl 2011-04-25 13:55:24 UTC (rev 34111) @@ -0,0 +1,120 @@ +<ul> + <li> + <a href="#">{tr}Edit{/tr}</a> + <ul> + <li> + <a href="#">{tr}Cell{/tr}</a> + <ul> + <li><a onclick="sheetInstance.setCellRef(); return false;">{tr}Set Reference{/tr}</a></li> + </ul> + </li> + <li> + <a menu="menuEditRow_menuInstance">{tr}Row{/tr}</a> + <ul> + <li><a onclick="sheetInstance.merge(); return false;">{tr}Merge{/tr}</a></li> + <li><a onclick="sheetInstance.unmerge(); return false;">{tr}Un-Merge{/tr}</a></li> + <li><a onclick="sheetInstance.controlFactory.addRow(null, null, ':last'); return false;" title="{tr}Adds an additional row to bottom of the spreadsheet.{/tr}">{tr}Add Row{/tr}</a></li> + <li><a onclick="sheetInstance.controlFactory.addRowMulti(); return false;" title="{tr}Adds an additional rows to bottom of the spreadsheet.{/tr}">{tr}Add Multi-Rows{/tr}</a></li> + <li><a onclick="sheetInstance.deleteRow(); return false;" title="{tr}Delets the current row thats highlighted.{/tr}">{tr}Delete Row{/tr}</a></li> + <li><a onclick="sheetInstance.controlFactory.addRow(null, true); return false;" title="{tr}Inserts an additional row after currently selected row.{/tr}">{tr}Insert Row Before{/tr}</a></li> + <li><a onclick="sheetInstance.controlFactory.addRow(); return false;" title="{tr}Inserts an additional row after currently selected row.{/tr}">{tr}Insert Row After{/tr}</a></li> + <!--<li><a onclick="sheetInstance.toggleHide.rowAll();" title="{tr}Unhides all the hidden rows.{/tr}">{tr}Show All{/tr}</a></li> + <li><a onclick="sheetInstance.toggleHide.row();" title="{tr}Hides or shows the currently selected row.{/tr}">{tr}Toggle Hide Row{/tr}</a></li>--> + </ul> + </li> + <li> + <a menu="menuEditColumn_menuInstance">{tr}Column{/tr}</a> + <ul> + <li><a onclick="sheetInstance.controlFactory.addColumn(null, null, ':last'); return false;" title="{tr}Adds an additional column to the right of the spreadsheet.{/tr}">{tr}Add Column{/tr}</a></li> + <li><a onclick="sheetInstance.controlFactory.addColumnMulti(); return false;" title="{tr}Adds an additional columns to the right of the spreadsheet.{/tr}">{tr}Add Multi-Columns{/tr}</a></li> + <li><a onclick="sheetInstance.deleteColumn(); return false;" title="{tr}Deletes the current column thats highlighted.{/tr}">{tr}Delete Column{/tr}</a></li> + <li><a onclick="sheetInstance.controlFactory.addColumn(null, true); return false;" title="{tr}Inserts an additional column after currently selected column.{/tr}">{tr}Insert Column Before{/tr}</a></li> + <li><a onclick="sheetInstance.controlFactory.addColumn(); return false;" title="{tr}Inserts an additional column after currently selected column.{/tr}">{tr}Insert Column After{/tr}</a></li> + <li><a onclick="sheetInstance.fillUpOrDown(); return false;" title="{tr}Fill down current cell value.{/tr}">{tr}Fill Down{/tr}</a></li> + <li><a onclick="sheetInstance.fillUpOrDown(true); return false;" title="{tr}Fill up current cell value.{/tr}">{tr}Fill Up{/tr}</a></li> + <!--<li><a onclick="sheetInstance.toggleHide.columnAll();" title="{tr}Unhides all the hidden columns.{/tr}">{tr}Show All{/tr}</a></li> + <li><a onclick="sheetInstance.toggleHide.column();" title="{tr}Hides or shows the currently selected column.{/tr}">{tr}Toggle Hide Column{/tr}</a></li>--> + </ul> + </li> + <li> + <a menu="menuEditSheet_menuInstance">{tr}Sheet{/tr}</a> + <ul> + <li><a onclick="sheetInstance.addSheet(); return false;" title="{tr}Add new spreadsheet.{/tr}">{tr}Add Spreadsheet{/tr}</a></li> + <li><a onclick="sheetInstance.deleteSheet(); return false;" title="{tr}Delete the current spreadsheet.{/tr}">{tr}Delete Spreadsheet{/tr}</a></li> + <li><a onclick="sheetInstance.calc(sheetInstance.obj.tableBody()); return false;" title="{tr}Recompiles the current sheet{/tr}">{tr}Refresh Calculations{/tr}</a></li> + <li><a onclick="sheetInstance.sheetTitle(); return false;" title="{tr}Change the title of the sheet.{/tr}">{tr}Title{/tr}</a></li> + </ul> + </li> + <li><a onclick="sheetInstance.cellFind(); return false;">{tr}Find{/tr}</a></li> + <li><a onclick="sheetInstance.getTdRange(null, sheetInstance.obj.formula().val()); return false;">{tr}Get Cell Range{/tr}</a></li> + <li> + <a href="#">{tr}Wrap Cell Range{/tr}</a> + <ul> + <li><a onclick="sheetInstance.getTdRange(null, sheetInstance.obj.formula().val(), 'SUM'); return false;" title="{tr}Wrap with SUM{/tr}">SUM()</a></li> + <li><a onclick="sheetInstance.getTdRange(null, sheetInstance.obj.formula().val(), 'CEILING'); return false;" title="{tr}Wrap with CEILING{/tr}">CEILING()</a></li> + <li><a onclick="sheetInstance.getTdRange(null, sheetInstance.obj.formula().val(), 'COUNT'); return false;" title="{tr}Wrap with COUNT{/tr}">COUNT()</a></li> + <li><a onclick="sheetInstance.getTdRange(null, sheetInstance.obj.formula().val(), 'MAX'); return false;" title="{tr}Wrap with MAX{/tr}">MAX()</a></li> + <li><a onclick="sheetInstance.getTdRange(null, sheetInstance.obj.formula().val(), 'MIN'); return false;" title="{tr}Wrap with MIN{/tr}">MIN()</a></li> + </ul> + </li> + <li><a onclick="sheetInstance.cellUndoable.undoOrRedo(true); return false;">{tr}Undo{/tr}</a></li> + <li><a onclick="sheetInstance.cellUndoable.undoOrRedo(); return false;">{tr}Redo{/tr}</a></li> + <li><a onclick="sheetInstance.toggleState(); return false;">{tr}Toggle State{/tr}</a></li> + </ul> + </li> + <li> + <a href="#">View</a> + <ul> + <li> + <a menu="menuViewFunctionReference_menuInstance">{tr}Function Reference{/tr}</a> + <ul> + <li><a>{tr}Usage Example: =SUM(SUM(A1:B1) + SUM(D7)){/tr}</a></li> + <li><a>{tr}=(TRUE(N(A1)) || FALSE(N(B1))){/tr}</a></li> + <li><a title="{tr}Returns the absolute value of a number{/tr}">ABS()</a></li> + <li><a title="{tr}Returns a rounded number{/tr}">AVG(), AVERAGE()</a></li> + <li><a title="{tr}Returns a number rounded up based on a multiple of significance{/tr}">CEILING()</a></li> + <li><a title="{tr}Counts the number of cells that contain a value{/tr}">COUNT()</a></li> + <li><a title="{tr}Counts full days from a specific date - format(YYYY,MM,DD){/tr}">DAYSFROM()</a></li> + <li><a title="{tr}Converts a number to text, using a currency format - options(number, decimals, symbol){/tr}">DOLLAR()</a></li> + <li><a title="{tr}Returns a logical value of FALSE{/tr}">FALSE()</a></li> + <li><a title="{tr}Returns a text representation of a number rounded to a specified number of decimal places - options(number, decimals, useCommas){/tr}">FIXED()</a></li> + <li><a title="{tr}Returns a number rounded down based on a multiple of significance{/tr}">FLOOR()</a></li> + <li><a title="{tr}Returns the integer portion of a number{/tr}">INT()</a></li> + <li><a title="{tr}Returns the largest value from the numbers provided{/tr}">MAX()</a></li> + <li><a title="{tr}Returns the smallest value from the numbers provided{/tr}">MIN()</a></li> + <li><a title="{tr}Converts a value to a number{/tr}">N()</a></li> + <li><a title="{tr}Gets full date of today{/tr}">NOW()</a></li> + <li><a title="{tr}Returns the mathematical constant called pi, which is 3.14159265358979{/tr}">PI()</a></li> + <li><a title="{tr}Returns the result of a number raised to a given power{/tr}">POWER(x, y)</a></li> + <li><a title="{tr}Returns a random number that is greater than or equal to 0 and less than 1{/tr}">RAND(), RND()</a></li> + <li><a title="{tr}Returns a number rounded to a specified number of digits{/tr}">ROUND()</a></li> + <li><a title="{tr}Returns all of the values in each of the specified cells and added together{/tr}">SUM()</a></li> + <li><a title="{tr}Gets full date of today{/tr}">TODAY()</a></li> + <li><a title="{tr}Returns a logical value of TRUE{/tr}">TRUE()</a></li> + <li><a title="{tr}Converts a text value that represents a number to a number{/tr}">VALUE()</a></li> + </ul> + </li> + <li><a onclick="sheetInstance.toggleFullScreen();">{tr}Toggle Full Screen{/tr}</a></li> + </ul> + </li> + <li> + <a href="#">Style</a> + <ul> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleBold'); return false;">{tr}Bold{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleItalics'); return false;">{tr}Italics{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleUnderline', 'styleLineThrough'); return false;">{tr}Underline{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleLineThrough', 'styleUnderline'); return false;">{tr}Strikethrough{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleLeft', 'styleCenter styleRight'); return false;">{tr}Left{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleCenter', 'styleLeft styleRight'); return false;">{tr}Center{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleRight', 'styleLeft styleCenter'); return false;">{tr}Right{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleUpper', 'styleCapital styleLower'); return false;">{tr}Uppercase{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleCapital', 'styleUpper styleLower'); return false;">{tr}Capitalize{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleLower', 'styleCapital styleUpper'); return false;">{tr}Lowercase{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleTop', 'styleMiddle styleBottom'); return false;">{tr}Top{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleMiddle', 'styleTop styleBottom'); return false;">{tr}Middle{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.cellStyleToggle('styleBottom', 'styleTop styleMiddle'); return false;">{tr}Bottom{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.fontReSize('up'); return false;">{tr}Font Size +{/tr}</a></li> + <li><a class="cellStyleToggle" onclick="sheetInstance.fontReSize('down'); return false;">{tr}Font Size -{/tr}</a></li> + </ul> + </li> +</ul> Modified: branches/7.x/tiki-view_sheets.php =================================================================== --- branches/7.x/tiki-view_sheets.php 2011-04-25 13:54:41 UTC (rev 34110) +++ branches/7.x/tiki-view_sheets.php 2011-04-25 13:55:24 UTC (rev 34111) @@ -177,11 +177,13 @@ } $smarty->assign('grid_content', $tableHtml); +$smarty->assign('menu', $smarty->fetch('tiki-view_sheets_menu.tpl')); $sheetlib->setup_jquery_sheet(); $headerlib->add_jq_onready(' $.sheet.tikiOptions = $.extend($.sheet.tikiOptions, { - editable: ("'. $_REQUEST['parse'] .'" == "edit" ? true : false) + editable: ("'. $_REQUEST['parse'] .'" == "edit" ? true : false), + menu: $("#sheetMenu").html() }); var tikiSheet = $("div.tiki_sheet").sheet($.sheet.tikiOptions); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2011-04-25 20:23:20
|
Revision: 34121 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34121&view=rev Author: sylvieg Date: 2011-04-25 20:23:14 +0000 (Mon, 25 Apr 2011) Log Message: ----------- [FIX]registration: fix 27388/fill up the user tracker item if multiple groups choice with different trackers Modified Paths: -------------- branches/7.x/lib/wiki-plugins/wikiplugin_tracker.php branches/7.x/templates/register-groupchoice.tpl Added Paths: ----------- branches/7.x/group_tracker_ajax.php Added: branches/7.x/group_tracker_ajax.php =================================================================== --- branches/7.x/group_tracker_ajax.php (rev 0) +++ branches/7.x/group_tracker_ajax.php 2011-04-25 20:23:14 UTC (rev 34121) @@ -0,0 +1,20 @@ +<?php +// (c) Copyright 2002-2011 by authors of the Tiki Wiki CMS Groupware Project +// +// All Rights Reserved. See copyright.txt for details and a complete list of authors. +// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details. +// $Id: list-tracker_field_values_ajax.php 33195 2011-03-02 17:43:40Z changi67 $ +require_once('tiki-setup.php'); +include_once ('lib/wiki-plugins/wikiplugin_tracker.php'); +$json_data = array(); +$re = $userlib->get_group_info(isset($_REQUEST['chosenGroup']) ? $_REQUEST['chosenGroup'] : 'Registered'); +if (!empty($re['usersTrackerId']) && !empty($re['registrationUsersFieldIds'])) { + $json_data['res'] = wikiplugin_tracker('', array('trackerId' => $re['usersTrackerId'], 'fields' => $re['registrationUsersFieldIds'], 'showdesc' => 'y', 'showmandatory' => 'y', 'embedded' => 'y', 'action' => tra('Register'), 'registration' => 'n', 'formtag'=>'n')); +} else { + $json_data['res'] = $_REQUEST['chosenGroup']; + $json_data['debug'] = $re; +} + +header( 'Content-Type: application/json' ); + +$access->output_serialized($json_data); Modified: branches/7.x/lib/wiki-plugins/wikiplugin_tracker.php =================================================================== --- branches/7.x/lib/wiki-plugins/wikiplugin_tracker.php 2011-04-25 18:36:58 UTC (rev 34120) +++ branches/7.x/lib/wiki-plugins/wikiplugin_tracker.php 2011-04-25 20:23:14 UTC (rev 34121) @@ -1053,9 +1053,9 @@ } if ($params['formtag'] == 'y') { $back .= '<form name="editItemForm' . $iTRACKER . '" id="editItemForm' . $iTRACKER . '" enctype="multipart/form-data" method="post"'.(isset($target)?' target="'.$target.'"':'').' action="'. $_SERVER['REQUEST_URI'] .'"><input type="hidden" name="trackit" value="'.$trackerId.'" />'; - $back .= '<input type="hidden" name="iTRACKER" value="'.$iTRACKER.'" />'; $back .= '<input type="hidden" name="refresh" value="1" />'; } + $back .= '<input type="hidden" name="iTRACKER" value="'.$iTRACKER.'" />'; if (isset($_REQUEST['page'])) $back.= '<input type="hidden" name="page" value="'.$_REQUEST["page"].'" />'; // for registration @@ -1294,7 +1294,7 @@ include_once('lib/smarty_tiki/function.trackerheader.php'); $back .= smarty_function_trackerheader(array('level'=>-1, 'title'=>'', 'inTable' =>(empty($tpl) && empty($wiki))?'wikiplugin_tracker':'' ), $smarty); - if ($prefs['feature_antibot'] == 'y' && empty($user)) { + if ($prefs['feature_antibot'] == 'y' && empty($user) && $formtag != 'n') { // in_tracker session var checking is for tiki-register.php $smarty->assign('showmandatory', $showmandatory); $smarty->assign('antibot_table', empty($wiki) && empty($tpl)?'n': 'y'); Modified: branches/7.x/templates/register-groupchoice.tpl =================================================================== --- branches/7.x/templates/register-groupchoice.tpl 2011-04-25 18:36:58 UTC (rev 34120) +++ branches/7.x/templates/register-groupchoice.tpl 2011-04-25 20:23:14 UTC (rev 34121) @@ -19,6 +19,15 @@ {/if} {else} {* Groups *} + {jq} + $("input[name='chosenGroup']").change(function() { + var gr = $("input[name='chosenGroup']:checked").val(); + $.getJSON('group_tracker_ajax.php',{chosenGroup:gr}, function(data) { + //console.debug(data); + $("#registerTracker").html(data['res']); + }); + }); + {/jq} {if isset($theChoiceGroup)} <input type="hidden" name="chosenGroup" value="{$theChoiceGroup|escape}" /> {elseif isset($listgroups)} @@ -41,5 +50,6 @@ {/foreach} </td> </tr> + <tr><td colspan="2"><div id="registerTracker"></div></td></tr> {/if} {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-04-26 11:52:53
|
Revision: 34127 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34127&view=rev Author: jonnybradley Date: 2011-04-26 11:52:47 +0000 (Tue, 26 Apr 2011) Log Message: ----------- [FIX] trackers: User Selector - fixes for non admin with option 1 or 2 Modified Paths: -------------- branches/7.x/lib/core/Tracker/Field/UserSelector.php branches/7.x/templates/tiki-view_tracker.tpl Modified: branches/7.x/lib/core/Tracker/Field/UserSelector.php =================================================================== --- branches/7.x/lib/core/Tracker/Field/UserSelector.php 2011-04-26 11:36:15 UTC (rev 34126) +++ branches/7.x/lib/core/Tracker/Field/UserSelector.php 2011-04-26 11:52:47 UTC (rev 34127) @@ -36,7 +36,7 @@ if ($this->getOption(0) == 2) { $data['value'] = $user; } elseif ($this->getOption(0) == 1) { - if ($this->getTrackerDefinition()->getConfiguration('userCanTakeOwnership') == 'y' && !$this->getValue()) { + if (!$this->getItemId() || ($this->getTrackerDefinition()->getConfiguration('userCanTakeOwnership') == 'y' && !$this->getValue())) { $data['value'] = $user; // the user appropiate the item } else { $data['value'] = $this->getValue(); @@ -47,7 +47,7 @@ } } } else { - $data['value'] = $this->getValue(); + $data['value'] = $this->getValue(false); } return $data; @@ -58,7 +58,10 @@ global $tiki_p_admin_trackers, $user; $smarty = TikiLib::lib('smarty'); - $value = $this->getConfiguration('value', $user); + $value = $this->getConfiguration('value'); + if ($value === false) { + $value = $user; + } if ($this->getOption(0) == 0 || $tiki_p_admin_trackers === 'y') { require_once $smarty->_get_plugin_filepath('function', 'user_selector'); @@ -70,15 +73,19 @@ ), $smarty); } else { require_once $smarty->_get_plugin_filepath('modifier', 'username'); - return smarty_modifier_username( $value ) . '<input type="hidden" name="' . $this->getInsertId() . '">'; + return smarty_modifier_username( $value ) . '<input type="hidden" name="' . $this->getInsertId() . '" value="' . $value . '">'; } } function renderInnerOutput($context = array()) { $value = $this->getConfiguration('value'); - require_once TikiLib::lib('smarty')->_get_plugin_filepath('modifier', 'username'); - return smarty_modifier_username( $value ); + if (empty($value)) { + return ''; + } else { + require_once TikiLib::lib('smarty')->_get_plugin_filepath('modifier', 'username'); + return smarty_modifier_username( $value ); + } } } Modified: branches/7.x/templates/tiki-view_tracker.tpl =================================================================== --- branches/7.x/templates/tiki-view_tracker.tpl 2011-04-26 11:36:15 UTC (rev 34126) +++ branches/7.x/templates/tiki-view_tracker.tpl 2011-04-26 11:52:47 UTC (rev 34127) @@ -206,7 +206,6 @@ {foreach from=$fields key=ix item=field_value} {if $field_value.isHidden eq 'n' or $field_value.isHidden eq 'c' or $tiki_p_admin_trackers eq 'y'} {if $field_value.type ne 'x' and $field_value.type ne 'l' and $field_value.type ne 'q' and - (($field_value.type ne 'u' and $field_value.type ne 'g') or !$field_value.options_array[0] or $tiki_p_admin_trackers eq 'y') and (empty($field_value.visibleBy) or in_array($default_group, $field_value.visibleBy) or $tiki_p_admin_trackers eq 'y') and (empty($field_value.editableBy) or in_array($default_group, $field_value.editableBy) or $tiki_p_admin_trackers eq 'y') and ($field_value.type ne 'A' or $tiki_p_attach_trackers eq 'y') and $field_value.type ne 'N' and $field_value.type ne '*' and This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-04-27 10:41:16
|
Revision: 34144 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34144&view=rev Author: jonnybradley Date: 2011-04-27 10:41:09 +0000 (Wed, 27 Apr 2011) Log Message: ----------- [FIX] blogs: Preview blog heading (thanks rodrigo, ages ago) Modified Paths: -------------- branches/7.x/templates/tiki-edit_blog.tpl branches/7.x/tiki-edit_blog.php Modified: branches/7.x/templates/tiki-edit_blog.tpl =================================================================== --- branches/7.x/templates/tiki-edit_blog.tpl 2011-04-27 10:02:54 UTC (rev 34143) +++ branches/7.x/templates/tiki-edit_blog.tpl 2011-04-27 10:41:09 UTC (rev 34144) @@ -146,11 +146,11 @@ </td> </tr> - {if strlen($heading) > 0 and $blogId > 0} + {if strlen($heading) > 0 and $show_blog_heading_preview eq 'y'} <tr class="editblogform"> <td colspan="2"> {button href="#" _flip_id='blog_heading_preview' _class='link' _text="{tr}Heading preview{/tr}" _flip_default_open='n'} - <div id="blog_heading_preview" style="display: {if isset($smarty.session.tiki_cookie_jar.show_blog_heading_preview) and $smarty.session.tiki_cookie_jar.show_blog_heading_preview eq 'y'}block{else}none{/if};"> + <div id="blog_heading_preview" style="display: {if $show_blog_heading_preview eq 'y'}block{else}none{/if};"> {eval var=$heading} </div> </td> Modified: branches/7.x/tiki-edit_blog.php =================================================================== --- branches/7.x/tiki-edit_blog.php 2011-04-27 10:02:54 UTC (rev 34143) +++ branches/7.x/tiki-edit_blog.php 2011-04-27 10:41:09 UTC (rev 34144) @@ -128,7 +128,7 @@ if (isset($_REQUEST["save"]) && $prefs['feature_categories'] == 'y' && $prefs['feature_blog_mandatory_category'] >=0 && (empty($_REQUEST['cat_categories']) || count($_REQUEST['cat_categories']) <= 0)) { $category_needed = true; $smarty->assign('category_needed', 'y'); -} elseif (isset($_REQUEST["save"])) { +} elseif (isset($_REQUEST["save"]) || isset($_REQUEST['preview'])) { check_ticket('edit-blog'); if (isset($_REQUEST["public"]) && $_REQUEST["public"] == 'on') { $public = 'y'; @@ -150,21 +150,23 @@ $add_date = isset($_REQUEST['add_date']) ? 'y' : 'n'; $alwaysOwner = isset($_REQUEST['alwaysOwner']) ? 'y' : 'n'; - $bid = $bloglib->replace_blog($_REQUEST["title"], - $_REQUEST["description"], $_REQUEST["creator"], $public, - $_REQUEST["maxPosts"], $_REQUEST["blogId"], - $heading, $use_title, $use_title_in_post, $use_description, $use_breadcrumbs, $use_author, $add_date, $use_find, - $allow_comments, $show_avatar, $alwaysOwner, $post_heading, $show_related, $related_max, $use_excerpt); + if (isset($_REQUEST["save"])) { + $bid = $bloglib->replace_blog($_REQUEST["title"], + $_REQUEST["description"], $_REQUEST["creator"], $public, + $_REQUEST["maxPosts"], $_REQUEST["blogId"], + $heading, $use_title, $use_title_in_post, $use_description, $use_breadcrumbs, $use_author, $add_date, $use_find, + $allow_comments, $show_avatar, $alwaysOwner, $post_heading, $show_related, $related_max, $use_excerpt); - $cat_type = 'blog'; - $cat_objid = $bid; - $cat_desc = substr($_REQUEST["description"], 0, 200); - $cat_name = $_REQUEST["title"]; - $cat_href = "tiki-view_blog.php?blogId=" . $cat_objid; - include_once ("categorize.php"); + $cat_type = 'blog'; + $cat_objid = $bid; + $cat_desc = substr($_REQUEST["description"], 0, 200); + $cat_name = $_REQUEST["title"]; + $cat_href = "tiki-view_blog.php?blogId=" . $cat_objid; + include_once ("categorize.php"); - header ("location: tiki-list_blogs.php?blogId=$bid"); - die; + header ("location: tiki-list_blogs.php?blogId=$bid"); + die; + } } if (isset($_REQUEST['preview']) || $category_needed) { @@ -188,9 +190,35 @@ $smarty->assign('heading', $heading); $smarty->assign('creator', $_REQUEST["creator"]); + $smarty->assign('blog_data', array( + 'title' => $_REQUEST["title"], + 'description' => $_REQUEST["description"], + 'creator' => $_REQUEST["creator"], + 'public' => $public, + 'maxPosts' => $_REQUEST["maxPosts"], + 'blogId' => $_REQUEST["blogId"], + 'heading' => $heading, + 'use_title' => $use_title, + 'use_title_in_post' => $use_title_in_post, + 'use_description' => $use_description, + 'use_breadcrumbs' => $use_breadcrumbs, + 'use_author' => $use_author, + 'add_date' => $add_date, + 'use_find' => $use_find, + 'allow_comments' => $allow_comments, + 'show_avatar' => $show_avatar, + 'always_owner' => $alwaysOwner, + 'post_heading' => $post_heading, + 'show_related' => $show_related, + 'related_max' => $related_max, + 'use_excerpt' => $use_excerpt + )); + // display heading preview - $_SESSION['tiki_cookie_jar']['show_blog_heading_preview'] = 'y'; + $smarty->assign('show_blog_heading_preview', 'y'); $cookietab = 2; +} else { + $smarty->assign('show_blog_heading_preview', 'n'); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2011-04-27 18:01:55
|
Revision: 34158 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34158&view=rev Author: lphuberdeau Date: 2011-04-27 18:01:48 +0000 (Wed, 27 Apr 2011) Log Message: ----------- [FIX] Tracker history did not process the values before attempting to render Modified Paths: -------------- branches/7.x/lib/smarty_tiki/function.trackeroutput.php branches/7.x/templates/tiki-tracker_view_history.tpl Modified: branches/7.x/lib/smarty_tiki/function.trackeroutput.php =================================================================== --- branches/7.x/lib/smarty_tiki/function.trackeroutput.php 2011-04-27 18:00:57 UTC (rev 34157) +++ branches/7.x/lib/smarty_tiki/function.trackeroutput.php 2011-04-27 18:01:48 UTC (rev 34158) @@ -17,8 +17,14 @@ $field = $params['field']; $item = isset($params['item']) ? $params['item'] : array(); + $item[$field['fieldId']] = $field['value']; $handler = $trklib->get_field_handler($field, $item); + if (isset($params['process']) && $params['process'] == 'y') { + $field = array_merge($field, $handler->getFieldData($field)); + $handler = $trklib->get_field_handler($field, $item); + } + if ($handler) { $context = $params; unset($context['item']); Modified: branches/7.x/templates/tiki-tracker_view_history.tpl =================================================================== --- branches/7.x/templates/tiki-tracker_view_history.tpl 2011-04-27 18:00:57 UTC (rev 34157) +++ branches/7.x/templates/tiki-tracker_view_history.tpl 2011-04-27 18:01:48 UTC (rev 34158) @@ -36,8 +36,8 @@ <td class="text"> {if $fieldId eq -1}_{tr}Status{/tr}_{else}{$field_option[$fieldId].name}{/if} </td> - <td class="text">{assign var='field_value.value' value=$hist.value}{trackeroutput field=$field_value list_mode=n item=$item_info history=y}</td> - <td class="text">{assign var='field_value.value' value=$hist.new}{trackeroutput field=$field_value list_mode=n item=$item_info history=y}</td> + <td class="text">{assign var='field_value.value' value=$hist.value}{trackeroutput field=$field_value list_mode=n item=$item_info history=y process=y}</td> + <td class="text">{assign var='field_value.value' value=$hist.new}{trackeroutput field=$field_value list_mode=n item=$item_info history=y process=y}</td> {if $prefs.feature_multilingual eq 'y'} <td class="text">{$hist.lang|escape}</td> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2011-04-29 12:48:28
|
Revision: 34172 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34172&view=rev Author: lphuberdeau Date: 2011-04-29 12:48:22 +0000 (Fri, 29 Apr 2011) Log Message: ----------- [FIX]?\194?\160Tabs plugin would not handle HTML correctly because of multiple parse passes, fixing mishandling of html decode in plugin execute Modified Paths: -------------- branches/7.x/lib/tikilib.php branches/7.x/lib/wiki-plugins/wikiplugin_code.php branches/7.x/lib/wiki-plugins/wikiplugin_tabs.php branches/7.x/templates/trackerinput/dropdown.tpl branches/7.x/templates/wiki-plugins/wikiplugin_tabs.tpl Modified: branches/7.x/lib/tikilib.php =================================================================== --- branches/7.x/lib/tikilib.php 2011-04-28 18:07:45 UTC (rev 34171) +++ branches/7.x/lib/tikilib.php 2011-04-29 12:48:22 UTC (rev 34172) @@ -4795,7 +4795,7 @@ $func_name = 'wikiplugin_' . $name; if( ! $validationPerformed ) { - $this->plugin_apply_filters( $name, $data, $args ); + $this->plugin_apply_filters( $name, $data, $args, $parseOptions ); } if( function_exists( $func_name ) ) { @@ -4891,7 +4891,7 @@ return $ret; } - private function plugin_apply_filters( $name, & $data, & $args ) { + private function plugin_apply_filters( $name, & $data, & $args, $parseOptions ) { $info = $this->plugin_info( $name ); $default = TikiFilter::get( isset( $info['defaultfilter'] ) ? $info['defaultfilter'] : 'xss'); @@ -4900,6 +4900,10 @@ $data = $this->htmldecode($data); $data = $filter->filter($data); + if (! $options['is_html']) { + $data = str_replace(array('<', '>'), array('<', '>'), $data); + } + // Make sure all arguments are declared $params = $info['params']; Modified: branches/7.x/lib/wiki-plugins/wikiplugin_code.php =================================================================== --- branches/7.x/lib/wiki-plugins/wikiplugin_code.php 2011-04-28 18:07:45 UTC (rev 34171) +++ branches/7.x/lib/wiki-plugins/wikiplugin_code.php 2011-04-29 12:48:22 UTC (rev 34172) @@ -102,6 +102,7 @@ extract($params, EXTR_SKIP); $code = trim($data); + $code = str_replace('<x>', '', $code); $parse_wiki = ( isset($wiki) && $wiki == 1 ); $escape_html = ( ! isset($ishtml) || $ishtml != 1 ); Modified: branches/7.x/lib/wiki-plugins/wikiplugin_tabs.php =================================================================== --- branches/7.x/lib/wiki-plugins/wikiplugin_tabs.php 2011-04-28 18:07:45 UTC (rev 34171) +++ branches/7.x/lib/wiki-plugins/wikiplugin_tabs.php 2011-04-29 12:48:22 UTC (rev 34172) @@ -44,15 +44,8 @@ } else { return "''".tra("No tab title specified. At least one has to be set to make the tabs appear.")."''"; } - $data = $tikilib->parse_data($data); if (!empty($data)) { $tabData = explode('/////', $data); - foreach ($tabData as &$d) { - if (strpos( $d, '</p>') === 0) { - $d = substr( 4, $d); - } - $d = '~np~' . $tikilib->parse_data($d) . '~/np~'; - } } $smarty->assign( 'tabsetname', $tabsetname ); Modified: branches/7.x/templates/trackerinput/dropdown.tpl =================================================================== --- branches/7.x/templates/trackerinput/dropdown.tpl 2011-04-28 18:07:45 UTC (rev 34171) +++ branches/7.x/templates/trackerinput/dropdown.tpl 2011-04-29 12:48:22 UTC (rev 34172) @@ -35,4 +35,4 @@ {/if} {/if} -{/strip} \ No newline at end of file +{/strip} Modified: branches/7.x/templates/wiki-plugins/wikiplugin_tabs.tpl =================================================================== --- branches/7.x/templates/wiki-plugins/wikiplugin_tabs.tpl 2011-04-28 18:07:45 UTC (rev 34171) +++ branches/7.x/templates/wiki-plugins/wikiplugin_tabs.tpl 2011-04-29 12:48:22 UTC (rev 34172) @@ -1,4 +1,4 @@ {* smarty template for tabs wiki plugin *} -{tabset name=$tabsetname|escape} - {section name=ix loop=$tabs}{tab name=$tabs[ix]|escape}{$tabcontent[ix]}{/tab}{/section} -{/tabset} +~np~{tabset name=$tabsetname|escape} + {section name=ix loop=$tabs}{tab name=$tabs[ix]|escape}~/np~{$tabcontent[ix]}~np~{/tab}{/section} +{/tabset}~/np~ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sam...@us...> - 2011-05-02 14:28:00
|
Revision: 34204 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34204&view=rev Author: sampaioprimo Date: 2011-05-02 14:27:51 +0000 (Mon, 02 May 2011) Log Message: ----------- backporting translations done on i18n.tiki.org Modified Paths: -------------- branches/7.x/lang/de/language.php branches/7.x/lang/fr/language.php Property Changed: ---------------- branches/7.x/ Property changes on: branches/7.x ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33677,33681,33708-33712,33851-33853,33873,33956-33957,33959-33961,34050,34052,34102-34104 + /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33677,33681,33708-33712,33851-33853,33873,33956-33957,33959-33961,34050,34052,34102-34104,34202-34203 Modified: branches/7.x/lang/de/language.php =================================================================== --- branches/7.x/lang/de/language.php 2011-05-02 14:19:42 UTC (rev 34203) +++ branches/7.x/lang/de/language.php 2011-05-02 14:27:51 UTC (rev 34204) @@ -2610,26 +2610,26 @@ // ### start of untranslated words // ### uncomment value pairs as you translate -// "An exception occurred" => "An exception occurred", +"An exception occurred" => "Eine Ausnahme ist aufgetreten", // "Item \"%0\" NOT imported (there was already a item with the same name)" => "Item \"%0\" NOT imported (there was already a item with the same name)", // "Page \"%0\" sucessfully imported" => "Page \"%0\" sucessfully imported", // "Post \"%0\" sucessfully imported" => "Post \"%0\" sucessfully imported", // "Found %0 posts, %1 pages, %2 tags and %3 categories. Inserting them into Tiki" => "Found %0 posts, %1 pages, %2 tags and %3 categories. Inserting them into Tiki", // "Suggest .htaccess rules to redirect from old WP URLs to new Tiki URLs (experimental)" => "Suggest .htaccess rules to redirect from old WP URLs to new Tiki URLs (experimental)", -// "Page \"%0\" successfully extracted" => "Page \"%0\" successfully extracted", +"Page \"%0\" successfully extracted" => "Seite \"%0\" erfolgreich extrahiert", // "Post \"%0\" successfully extracted" => "Post \"%0\" successfully extracted", -// "Attachment %0 successfully imported" => "Attachment %0 successfully imported", +"Attachment %0 successfully imported" => "Anhang %0 erfolgreich importiert", // "Unable to download attachment %0. Error message was: %1 %2" => "Unable to download attachment %0. Error message was: %1 %2", -// "%0 attachments imported and %1 errors" => "%0 attachments imported and %1 errors", +"%0 attachments imported and %1 errors" => "%0 Anhänge importiert und %1 Fehler", // "Page %0 sucessfully imported" => "Page %0 sucessfully imported", // "Page %0 NOT imported (there was already a page with the same name)" => "Page %0 NOT imported (there was already a page with the same name)", -// "%0 pages parsed. Starting to insert those pages into Tiki" => "%0 pages parsed. Starting to insert those pages into Tiki", +"%0 pages parsed. Starting to insert those pages into Tiki" => "%0 Seiten geparst. Beginne damit, die Seiten in Tiki einzufügen", // "Error while parsing revision %0 of the page \"%1\". Or there is a problem on the page syntax or on the Text_Wiki parser (the parser used by the importer)" => "Error while parsing revision %0 of the page \"%1\". Or there is a problem on the page syntax or on the Text_Wiki parser (the parser used by the importer)", -// "Page \"%0\" successfully parsed with %1 revisions (from a total of %2 revisions)" => "Page \"%0\" successfully parsed with %1 revisions (from a total of %2 revisions)", -// "Page \"%0\" is NOT going to be imported. It was not possible to parse any of the page revisions" => "Page \"%0\" is NOT going to be imported. It was not possible to parse any of the page revisions", +"Page \"%0\" successfully parsed with %1 revisions (from a total of %2 revisions)" => "Seite \"%0\" erfolgreich mit %1 Revisionen geparst (total %2 Revisionen)", +"Page \"%0\" is NOT going to be imported. It was not possible to parse any of the page revisions" => "Seite %0 wird NICHT importiert. Es war nicht möglich irgendeine der Seitenrevisionen zu parsen", // "Mediawiki XML file version %0 is not supported" => "Mediawiki XML file version %0 is not supported", -// "ABORTING: destination directory for attachments (%0) does no exist. Fix the problem or try to import without the attachments" => "ABORTING: destination directory for attachments (%0) does no exist. Fix the problem or try to import without the attachments", -// "ABORTING: destination directory for attachments (%0) is not writable. Fix the problem or try to import without attachments" => "ABORTING: destination directory for attachments (%0) is not writable. Fix the problem or try to import without attachments", +"ABORTING: destination directory for attachments (%0) does no exist. Fix the problem or try to import without the attachments" => "ABBRUCH: Zielverzeichnis für Anhänge (%0) existiert nicht. Behebe das Problem oder fahre ohne den Import der Anhänge fort", +"ABORTING: destination directory for attachments (%0) is not writable. Fix the problem or try to import without attachments" => "ABBRUCH: Zielverzeichnis für Anhänge (%0) ist nicht beschreibbar. Behebe das Problem oder fahre ohne den Import der Anhänge fort", // "NOT importing file %0 as there is already a file with the same name in the destination directory (%1)" => "NOT importing file %0 as there is already a file with the same name in the destination directory (%1)", // "File %0 successfully imported" => "File %0 successfully imported", // "Unable to download file %0. File not found" => "Unable to download file %0. File not found", @@ -2663,7 +2663,7 @@ // "(Leave this empty if the group name is already given in the user attribute)" => "(Leave this empty if the group name is already given in the user attribute)", // "Corresponding user attribute in 1st directory" => "Corresponding user attribute in 1st directory", // "Enter a year or use +/- N to specify a year relative to the current year" => "Enter a year or use +/- N to specify a year relative to the current year", -// "Choose a smaller number for less noise and easier reading" => "Choose a smaller number for less noise and easier reading", +"Choose a smaller number for less noise and easier reading" => "Wähle eine geringere Zahl für die Störung um die Leesbarkeit zu erhöhen", // "Permits to show alternate content depending on category of current object" => "Permits to show alternate content depending on category of current object", // "Limits the visibility of objects to those in these categories. Used mainly for creating workspaces from perspectives" => "Limits the visibility of objects to those in these categories. Used mainly for creating workspaces from perspectives", // "Force certain categories to be present. If none of the categories in a given set are provided, assign a category by default" => "Force certain categories to be present. If none of the categories in a given set are provided, assign a category by default", @@ -2746,7 +2746,7 @@ // "Maximum for select how much time the share page can be consult" => "Maximum for select how much time the share page can be consult", // "Expose a JSON shipping rate estimation service. Accounts from providers may be required (FedEx, UPS, ...)" => "Expose a JSON shipping rate estimation service. Accounts from providers may be required (FedEx, UPS, ...)", // "Site Terminal" => "Site Terminal", -// "Allows to direct users to a specific perspective depending on the origin IP address. Can be used inside intranets to use different configurations for users depending on their departements or discriminate people in web contexts. Unspecified IPs will fall back to default behavior, including multi-domain handling. Manually selected perspectives take precedence over this" => "Allows to direct users to a specific perspective depending on the origin IP address. Can be used inside intranets to use different configurations for users depending on their departements or discriminate people in web contexts. Unspecified IPs will fall back to default behavior, including multi-domain handling. Manually selected perspectives take precedence over this", +"Allows to direct users to a specific perspective depending on the origin IP address. Can be used inside intranets to use different configurations for users depending on their departements or discriminate people in web contexts. Unspecified IPs will fall back to default behavior, including multi-domain handling. Manually selected perspectives take precedence over this" => "Erlaubt es, Benutzer abhängig von der original IP-Adresse in eine bestimmte Perspektive weiterzuleiten. Kann innerhalb von Intranets benutzt werden, um verschiedene Konfigurationen für Benutzer in Abhängigkeit ihrer Abteilung zu benutzen oder um Personen im Web auszuschließen. Unspezifische IPs werden standardmäßig behandelt, einschließlich der Multi-Domänen-Behandlung. Manuell gewählte Perspektiven haben vor dieser Regelung Vorrang", // "Site Terminal Configuration" => "Site Terminal Configuration", // "Provides the mapping from subnets to perspective" => "Provides the mapping from subnets to perspective", // "One per line. Network prefix in CIDR notation (address/mask size), separated by comma with the perspective ID" => "One per line. Network prefix in CIDR notation (address/mask size), separated by comma with the perspective ID", @@ -2798,7 +2798,7 @@ // "Shared key for authenticating Flash Media Encoder" => "Shared key for authenticating Flash Media Encoder", // "Inline plugin %0" => "Inline plugin %0", // "This also allows a mixture of wiki and html. Only some wiki syntax is parsed, such as plugins (not inline character styles etc)" => "This also allows a mixture of wiki and html. Only some wiki syntax is parsed, such as plugins (not inline character styles etc)", -// "Zotero Reference Style" => "Zotero Reference Style", +"Zotero Reference Style" => "Zotero-Referenzstil", // "Use an alternate Zotero reference style when formatting the references. The reference formats must be installed on the Zotero server" => "Use an alternate Zotero reference style when formatting the references. The reference formats must be installed on the Zotero server", // "Preference set" => "Preference set", // "Group changed (or modified)" => "Group changed (or modified)", @@ -2808,10 +2808,10 @@ // "Invalid revote period" => "Invalid revote period", // "Expecting \"keep\" to be \"latest\" or \"oldest\"" => "Expecting \"keep\" to be \"latest\" or \"oldest\"", // "Unknown variables referenced: %0" => "Unknown variables referenced: %0", -// "This invitation does not exist or is deprecated or wrong email" => "This invitation does not exist or is deprecated or wrong email", +"This invitation does not exist or is deprecated or wrong email" => "Diese Einladung existiert nicht oder ist abgelaufen oder die Emailadresse ist falsch", // "added the \".\$change['data']['objectType']).\" <a href=\"\$tikiUrl/\".\$change['data']['objectUrl'].\"\">\".\$change['data']['objectName'].\"</a> \".tra(\"to the category" => "added the \".\$change['data']['objectType']).\" <a href=\"\$tikiUrl/\".\$change['data']['objectUrl'].\"\">\".\$change['data']['objectName'].\"</a> \".tra(\"to the category", // "Search index could not be updated. The site is misconfigured. Contact an administrator" => "Search index could not be updated. The site is misconfigured. Contact an administrator", -// "blog post" => "blog post", +"blog post" => "Blogeintrag", // "forum post" => "forum post", // "Handling actions of plugin \"%s\" failed" => "Handling actions of plugin \"%s\" failed", // "Smarty block.display.php: Missing error param" => "Smarty block.display.php: Missing error param", @@ -2820,7 +2820,7 @@ // "You are attempting to display a gallery that is not a valid attachment gallery" => "You are attempting to display a gallery that is not a valid attachment gallery", // "Error(s)" => "Error(s)", // "Currency in payment (%0) does not match the currency for that registry (%1)" => "Currency in payment (%0) does not match the currency for that registry (%1)", -// "This invoice does not exist or is in limited access" => "This invoice does not exist or is in limited access", +"This invoice does not exist or is in limited access" => "Diese Rechnung existiert nicht oder ist Zugriffsbeschränkt", // "Preference name not specified" => "Preference name not specified", // "No object information provided for rating" => "No object information provided for rating", // "Number of items in _checkboxColumnIndex doesn not match items in _checkbox" => "Number of items in _checkboxColumnIndex doesn not match items in _checkbox", @@ -2859,13 +2859,13 @@ // "Amount of new product to exchange for" => "Amount of new product to exchange for", // "Should normally be set to the amount of products in the order being exchanged" => "Should normally be set to the amount of products in the order being exchanged", // "Please enter your shopper information first" => "Please enter your shopper information first", -// "Your free order of %0 (%1) has been processed. An email has been sent to you for your records" => "Your free order of %0 (%1) has been processed. An email has been sent to you for your records", -// "Your free order of %0 (%1) has been processed" => "Your free order of %0 (%1) has been processed", +"Your free order of %0 (%1) has been processed. An email has been sent to you for your records" => "Deine kostenlose Bestellung von %0 (%1) wurde bearbeitet. Eine Bestätigungsemail wurde Dir zugesandt", +"Your free order of %0 (%1) has been processed" => "Deine kostenlose Bestellung von %0 (%1) wurde bearbeitet", // "Invalid gift certificate: " => "Invalid gift certificate: ", // "Identifies the attachment to link to by the order of the attachment in the list of attachments to a page instead of by file name or ID. \n\t\t\t\t\t\t\t\t\t\tEither name, file, id or num can be used to identify a single attachment" => "Identifies the attachment to link to by the order of the attachment in the list of attachments to a page instead of by file name or ID. \n\t\t\t\t\t\t\t\t\t\tEither name, file, id or num can be used to identify a single attachment", // "Identifies the attachment to link to by id number instead of by file name or order number. Either name, file, id or num can be used to identify a single attachment" => "Identifies the attachment to link to by id number instead of by file name or order number. Either name, file, id or num can be used to identify a single attachment", // "The alt text that pops up on mouseover will include the number of downloads of the attachment at the end when set to 1 (Yes)" => "The alt text that pops up on mouseover will include the number of downloads of the attachment at the end when set to 1 (Yes)", -// "A file type icon is displayed in front of the attachment link when this is set to 1" => "A file type icon is displayed in front of the attachment link when this is set to 1", +"A file type icon is displayed in front of the attachment link when this is set to 1" => "Ein Dateitypsymbol wird vor dem Link zum Anhang angezeigt, wenn hier eine 1 eingetragen wird", // "The wiki page the avatar will link to. If empty and the user\\'s information is public, \n\t\t\t\t\t\t\t\t\t\tthen the avatar will link automatically the that user\\'s user information page" => "The wiki page the avatar will link to. If empty and the user\\'s information is public, \n\t\t\t\t\t\t\t\t\t\tthen the avatar will link automatically the that user\\'s user information page", // "Include Self" => "Include Self", // "With or without self-link (default is without)" => "With or without self-link (default is without)", @@ -2888,22 +2888,22 @@ // "All user prefs sessions" => "All user prefs sessions", // "Price to execute the datachannel (%0)" => "Price to execute the datachannel (%0)", // "Be careful, if debug is on, the page will not be refreshed and previous modules can be obsolete (not on by default)" => "Be careful, if debug is on, the page will not be refreshed and previous modules can be obsolete (not on by default)", -// "Multiple Values" => "Multiple Values", +"Multiple Values" => "Multiple Werte", // "Accept arrays of multiple values in the POST. e.g. itemId[]=42&itemId=43 etc. (multiple values not accepted by default)" => "Accept arrays of multiple values in the POST. e.g. itemId[]=42&itemId=43 etc. (multiple values not accepted by default)", -// "report definition" => "report definition", +"report definition" => "Berichtsdefinition", // "Full DSN" => "Full DSN", // "Display the parsed report definition (not displayed by default)" => "Display the parsed report definition (not displayed by default)", -// "Missing db or dsn parameter" => "Missing db or dsn parameter", +"Missing db or dsn parameter" => "Fehlender DB oder DSN Parameter", // "No DSN connection string found" => "No DSN connection string found", // "Teletype" => "Teletype", -// "Create a link that shows/hides initially hidden content" => "Create a link that shows/hides initially hidden content", +"Create a link that shows/hides initially hidden content" => "Erstelle einen LInk, der anfänglich versteckten Inhalt anzeigt/verbirgt", // "Wiki syntax containing the content that can be hidden or shown" => "Wiki syntax containing the content that can be hidden or shown", // "Label for link that shows and hides the content when clicked" => "Label for link that shows and hides the content when clicked", -// "Arrow icon showing that content can be hidden or shown" => "Arrow icon showing that content can be hidden or shown", +"Arrow icon showing that content can be hidden or shown" => "Pfeilsymbol, welches anzeigt, dass Inhalte versteckt bzw. angezeigt werden können", // "Show Speed" => "Show Speed", -// "Speed of animation in milliseconds when showing content (200 is fast and 600 is slow. 1000 equals 1 second)" => "Speed of animation in milliseconds when showing content (200 is fast and 600 is slow. 1000 equals 1 second)", +"Speed of animation in milliseconds when showing content (200 is fast and 600 is slow. 1000 equals 1 second)" => "Geschwindigkeit in Millisekunden für das Anzeigen von Inhalten (200 ist schnell, 600 ist langsam. 1000 entspricht 1 Sekunde)", // "Hide Speed" => "Hide Speed", -// "Speed of animation in milliseconds when hiding content (200 is fast and 600 is slow. 1000 equals 1 second)" => "Speed of animation in milliseconds when hiding content (200 is fast and 600 is slow. 1000 equals 1 second)", +"Speed of animation in milliseconds when hiding content (200 is fast and 600 is slow. 1000 equals 1 second)" => "Geschwindigkeit in Millisekunden für das Ausblenden von Inhalten (200 ist schnell, 600 ist langsam. 1000 entspricht 1 Sekunde)", // "Show objects with names or descriptions similar to the text entered here" => "Show objects with names or descriptions similar to the text entered here", // "Broaden" => "Broaden", // "Header Level" => "Header Level", @@ -2961,11 +2961,11 @@ // "Set to table to show results in a table (not shown in a table by default)" => "Set to table to show results in a table (not shown in a table by default)", // "Make the listed names links to various types of user information" => "Make the listed names links to various types of user information", // "Exclude certain test or admin names from the list" => "Exclude certain test or admin names from the list", -// "Name or number to call or chat with" => "Name or number to call or chat with", +"Name or number to call or chat with" => "Name oder Nummer der/die angerufen oder mit dem gechattet werden soll", // "Set whether to call or chat. Default is chat" => "Set whether to call or chat. Default is chat", // "Call" => "Call", // "do not forget to check the tools / options/ privacy / allow my status to be show on the web" => "do not forget to check the tools / options/ privacy / allow my status to be show on the web", -// "click to" => "click to", +"click to" => "klicke auf", // "Tiki jQuery UI Theme" => "Tiki jQuery UI Theme", // "PCRE-compliant regular expression pattern to find the parts you want changed" => "PCRE-compliant regular expression pattern to find the parts you want changed", // "PCRE-compliant regular expression replacement syntax showing what the content should be changed to" => "PCRE-compliant regular expression replacement syntax showing what the content should be changed to", @@ -2996,15 +2996,15 @@ // "Use content of the tpl file as template to display the item" => "Use content of the tpl file as template to display the item", // "Use content of the wiki page as template to display the item. The page should have the permission tiki_p_use_as_template set, and that page should be only open for edition to fully trusted users such as other site admins" => "Use content of the wiki page as template to display the item. The page should have the permission tiki_p_use_as_template set, and that page should be only open for edition to fully trusted users such as other site admins", // "View User" => "View User", -// "Will display the items of the specified user" => "Will display the items of the specified user", +"Will display the items of the specified user" => "Zeigt die Objekte des angegebenen Benutzers", // "To restrict the list to these item IDs" => "To restrict the list to these item IDs", // "Ignore the itemId url parameter when filtering list (not ignored by default)" => "Ignore the itemId url parameter when filtering list (not ignored by default)", // "Smarty left delimiter for Latex generation" => "Smarty left delimiter for Latex generation", -// "Right Deliminator" => "Right Deliminator", +"Right Deliminator" => "Rechte Begrenzung", // "Smarty right delimiter for Latex generation" => "Smarty right delimiter for Latex generation", // "List Mode" => "List Mode", // "Set output format. Yes (y) displays tracker list view with truncated values (default); \n\t\t\t\t\t\t\t\t\t\tNo (n) displays in tracker item view; Comma Separated Values (csv) outpits without any HTML formatting" => "Set output format. Yes (y) displays tracker list view with truncated values (default); \n\t\t\t\t\t\t\t\t\t\tNo (n) displays in tracker item view; Comma Separated Values (csv) outpits without any HTML formatting", -// "Compute" => "Compute", +"Compute" => "Bereche", // "Sum or average all the values of a field and displays it at the bottom of the table" => "Sum or average all the values of a field and displays it at the bottom of the table", // "fieldId" => "fieldId", // "Show nothing if no items found (the table header and a \\'No records found\\' message is shown by default)" => "Show nothing if no items found (the table header and a \\'No records found\\' message is shown by default)", @@ -3091,20 +3091,20 @@ // "Copy the prefix from the chat embed, e.g. Name-of-Brand-" => "Copy the prefix from the chat embed, e.g. Name-of-Brand-", // "Locale" => "Locale", // "Locale specified in viewer embed, default is en_US" => "Locale specified in viewer embed, default is en_US", -// "More than one channel found for specified criteria. Please be more specific" => "More than one channel found for specified criteria. Please be more specific", +"More than one channel found for specified criteria. Please be more specific" => "Zu den angegebenen Kriterien wurde mehr als ein Kanal gefunden. Bitte grenze die Auswahl ein", // "No videoId specified for archive" => "No videoId specified for archive", // "Template to apply to the data provided. Template format uses smarty templating engine using double brackets as delimiter. Output must provide wiki syntax. Body can be sent to a parameter instead by using the bodyname parameter" => "Template to apply to the data provided. Template format uses smarty templating engine using double brackets as delimiter. Output must provide wiki syntax. Body can be sent to a parameter instead by using the bodyname parameter", // "Registered service name" => "Registered service name", // "For use with registered services, name of the template to be used to display the service output. This parameter will be ignored if a body is provided" => "For use with registered services, name of the template to be used to display the service output. This parameter will be ignored if a body is provided", // "Name of the argument to send the body as for services with complex input. Named service required for this to be useful" => "Name of the argument to send the body as for services with complex input. Named service required for this to be useful", // "Parameters formated like an query : param1=value1¶m2=value2" => "Parameters formated like an query : param1=value1¶m2=value2", -// "Missing parameters" => "Missing parameters", +"Missing parameters" => "Fehlende Parameter", // "Reference Key" => "Reference Key", // "Unique reference for the group associated to the site. Can be retrieved from the Zotero Bibliography module" => "Unique reference for the group associated to the site. Can be retrieved from the Zotero Bibliography module", // "Reference Tag" => "Reference Tag", // "Uses the first result using the specified tag. Useful when the tag mechanism is coerced into creating unique human memorizable keys" => "Uses the first result using the specified tag. Useful when the tag mechanism is coerced into creating unique human memorizable keys", // "Append a note to the reference for additional information, like page numbers or other sub-references" => "Append a note to the reference for additional information, like page numbers or other sub-references", -// "Zotero Reference List" => "Zotero Reference List", +"Zotero Reference List" => "Zotero-Referenzliste", // "Produces the complete reference list from the Zotero server" => "Produces the complete reference list from the Zotero server", // "Provide the list of references with a given tag" => "Provide the list of references with a given tag", // "No results obtained. The Zotero citation server may be down" => "No results obtained. The Zotero citation server may be down", @@ -3167,7 +3167,7 @@ // "If set to \"y\", only displays topics" => "If set to \"y\", only displays topics", // "List of forum IDs" => "List of forum IDs", // "Post only from this forum" => "Post only from this forum", -// "If set to \"y\", show post date directly instead of as tooltip" => "If set to \"y\", show post date directly instead of as tooltip", +"If set to \"y\", show post date directly instead of as tooltip" => "Wenn \"Y\" (ja) eingetragen wird, dann wird das Post-Datum direkt und nicht als Tooltip angezeigt", // "If set to \"y\", show post author directly instead of as tooltip" => "If set to \"y\", show post author directly instead of as tooltip", // "Enables temporarily changing one\\'s group memberships to see how users in fewer groups experience the site" => "Enables temporarily changing one\\'s group memberships to see how users in fewer groups experience the site", // "If set to \"y\", user names are displayed in the module box" => "If set to \"y\", user names are displayed in the module box", @@ -3191,8 +3191,8 @@ // "If set to \"y\", it will hide date" => "If set to \"y\", it will hide date", // "File galleries IDs" => "File galleries IDs", // "List of IDs of file galleries of type \"Podcast (Audio)\". Identifiers are separated by a colon (\":\"). If none, all file galleries will be scanned" => "List of IDs of file galleries of type \"Podcast (Audio)\". Identifiers are separated by a colon (\":\"). If none, all file galleries will be scanned", -// "Bottom Link URL" => "Bottom Link URL", -// "Bottom Link URL Text" => "Bottom Link URL Text", +"Bottom Link URL" => "URL für Link am Ende", +"Bottom Link URL Text" => "Text für URL-Link am Ende", // "Text for link if Bottom Link URL is set. Default is \"More Podcasts\"" => "Text for link if Bottom Link URL is set. Default is \"More Podcasts\"", // "Display description of podcast below player if \"y\", and on title mouseover if \"n\". Default is \"y\"" => "Display description of podcast below player if \"y\", and on title mouseover if \"n\". Default is \"y\"", // "Tracker identifier" => "Tracker identifier", @@ -3219,7 +3219,7 @@ // "List by month" => "List by month", // "Type of objects to consider" => "Type of objects to consider", // "Possible values: wiki (Wiki pages), blog (blog posts), article (articles)" => "Possible values: wiki (Wiki pages), blog (blog posts), article (articles)", -// "Object language filter" => "Object language filter", +"Object language filter" => "Objektsprachenfilter", // "If set to a RFC1766 language tag, restricts the objects considered to those in the specified language" => "If set to a RFC1766 language tag, restricts the objects considered to those in the specified language", // "Shows theme credits (contents of credits.tpl)" => "Shows theme credits (contents of credits.tpl)", // "If set to a template identifier, the specified template is used for creating new Wiki pages" => "If set to a template identifier, the specified template is used for creating new Wiki pages", @@ -3258,7 +3258,7 @@ // "Size of the Search Filter dropdown list" => "Size of the Search Filter dropdown list", // "Edit Template identifier" => "Edit Template identifier", // "If set to a category identifier, pages created through the module are automatically categorized in the specified category" => "If set to a category identifier, pages created through the module are automatically categorized in the specified category", -// "Compact mode" => "Compact mode", +"Compact mode" => "Kompaktmodus", // "Makes the three buttons only appear on mouse-over" => "Makes the three buttons only appear on mouse-over", // "If set, send the form to the given location (relative to Tiki's root) for processing" => "If set, send the form to the given location (relative to Tiki's root) for processing", // "Optional heading to display at the top of the module's content" => "Optional heading to display at the top of the module's content", @@ -3267,7 +3267,7 @@ // "Show trackers" => "Show trackers", // "Unless set to \"ignore\", the module changes the reference point in time from the user\\'s last login date and time to a day where users browse to using the calendar" => "Unless set to \"ignore\", the module changes the reference point in time from the user\\'s last login date and time to a day where users browse to using the calendar", // "If set to \"y\", use jQuery to show the result" => "If set to \"y\", use jQuery to show the result", -// "Changes how the list of languages is displayed. Possible values are droplist, flags and words. Defaults to droplist" => "Changes how the list of languages is displayed. Possible values are droplist, flags and words. Defaults to droplist", +"Changes how the list of languages is displayed. Possible values are droplist, flags and words. Defaults to droplist" => "Ändere die Listenansicht für Sprachen. Möglich sind Ausklappliste, Flaggen, Worte. Standard ist Ausklappliste", // "Changes the default displayed prefix from \\\"Site Language:\\\"" => "Changes the default displayed prefix from \\\"Site Language:\\\"", // "Support for multilingual terminology" => "Support for multilingual terminology", // "Defaults to \\'Term\\'" => "Defaults to \\'Term\\'", @@ -3278,7 +3278,7 @@ // "tiki domain redirects" => "tiki domain redirects", // "groups are emulated" => "groups are emulated", // "feature wiki" => "feature wiki", -// "default wiki diff style" => "default wiki diff style", +"default wiki diff style" => "Standard Wiki-Unterschieds-Stil", // "feature backlinks" => "feature backlinks", // "backlinks name len" => "backlinks name len", // "feature dump" => "feature dump", @@ -3428,164 +3428,164 @@ // "wiki mandatory edit summary" => "wiki mandatory edit summary", // "flaggedrev approval" => "flaggedrev approval", // "flaggedrev approval categories" => "flaggedrev approval categories", -// "wikiplugin addtocart" => "wikiplugin addtocart", -// "wikiplugin addtogooglecal" => "wikiplugin addtogooglecal", -// "wikiplugin agentinfo" => "wikiplugin agentinfo", -// "wikiplugin alink" => "wikiplugin alink", -// "wikiplugin aname" => "wikiplugin aname", -// "wikiplugin annotation" => "wikiplugin annotation", -// "wikiplugin archivebuilder" => "wikiplugin archivebuilder", -// "wikiplugin article" => "wikiplugin article", -// "wikiplugin articles" => "wikiplugin articles", -// "wikiplugin attach" => "wikiplugin attach", -// "wikiplugin attributes" => "wikiplugin attributes", -// "wikiplugin author" => "wikiplugin author", -// "wikiplugin avatar" => "wikiplugin avatar", -// "wikiplugin back" => "wikiplugin back", -// "wikiplugin backlinks" => "wikiplugin backlinks", -// "wikiplugin banner" => "wikiplugin banner", -// "wikiplugin bigbluebutton" => "wikiplugin bigbluebutton", -// "wikiplugin bliptv" => "wikiplugin bliptv", -// "wikiplugin bloglist" => "wikiplugin bloglist", -// "wikiplugin box" => "wikiplugin box", -// "wikiplugin button" => "wikiplugin button", -// "wikiplugin calendar" => "wikiplugin calendar", -// "wikiplugin category" => "wikiplugin category", -// "wikiplugin catorphans" => "wikiplugin catorphans", -// "wikiplugin cclite" => "wikiplugin cclite", -// "wikiplugin catpath" => "wikiplugin catpath", -// "wikiplugin center" => "wikiplugin center", -// "wikiplugin chart" => "wikiplugin chart", -// "wikiplugin code" => "wikiplugin code", -// "wikiplugin colorbox" => "wikiplugin colorbox", -// "wikiplugin content" => "wikiplugin content", -// "wikiplugin cookie" => "wikiplugin cookie", -// "wikiplugin copyright" => "wikiplugin copyright", -// "wikiplugin countdown" => "wikiplugin countdown", -// "wikiplugin datachannel" => "wikiplugin datachannel", -// "wikiplugin dbreport" => "wikiplugin dbreport", -// "wikiplugin div" => "wikiplugin div", +"wikiplugin addtocart" => "Wikiplugin Zum Einkaufswagen hinzufügen", +"wikiplugin addtogooglecal" => "Wikiplugin Zum GoogleKalender hinzufügen", +"wikiplugin agentinfo" => "Wikiplugin Agent-Informationen", +"wikiplugin alink" => "Wikiplugin ALINK", +"wikiplugin aname" => "Wikiplugin ANAME", +"wikiplugin annotation" => "Wikiplugin Anmerkung", +"wikiplugin archivebuilder" => "Wikiplugin Archiverstellung", +"wikiplugin article" => "Wikiplugin Artikel (ez)", +"wikiplugin articles" => "Wikiplugin Artikel (pl)", +"wikiplugin attach" => "Wikiplugin Anhang", +"wikiplugin attributes" => "Wikiplugin Attribute", +"wikiplugin author" => "Wikiplugin Author", +"wikiplugin avatar" => "Wikiplugin Avatar", +"wikiplugin back" => "Wikiplugin Zurück", +"wikiplugin backlinks" => "Wikiplugin Backlinks", +"wikiplugin banner" => "Wikiplugin Banner", +"wikiplugin bigbluebutton" => "Wikiplugin BigBlueButton", +"wikiplugin bliptv" => "Wikiplugin BlipTV", +"wikiplugin bloglist" => "Wikiplugin Blogliste", +"wikiplugin box" => "Wikiplugin Box", +"wikiplugin button" => "Wikiplugin Schaltfläche", +"wikiplugin calendar" => "Wikiplugin Kalender", +"wikiplugin category" => "Wikiplugin Kategorie", +"wikiplugin catorphans" => "Wikiplugin Verwaiste Kategorien", +"wikiplugin cclite" => "Wikiplugin CCLite", +"wikiplugin catpath" => "Wikiplugin Kategorienpfad", +"wikiplugin center" => "Wikiplugin Zentrieren", +"wikiplugin chart" => "Wikiplugin Diagramm", +"wikiplugin code" => "Wikiplugin Code", +"wikiplugin colorbox" => "Wikiplugin Colorbox", +"wikiplugin content" => "Wikiplugin Inhalt", +"wikiplugin cookie" => "Wikiplugin Cookie", +"wikiplugin copyright" => "Wikiplugin Copyright", +"wikiplugin countdown" => "Wikiplugin Coutdown", +"wikiplugin datachannel" => "Wikiplugin Datenkanal", +"wikiplugin dbreport" => "Wikiplugin Datenbankbericht", +"wikiplugin div" => "Wikiplugin DIV", // "wikiplugin dl" => "wikiplugin dl", -// "wikiplugin draw" => "wikiplugin draw", -// "wikiplugin equation" => "wikiplugin equation", -// "wikiplugin events" => "wikiplugin events", -// "wikiplugin fade" => "wikiplugin fade", -// "wikiplugin fancylist" => "wikiplugin fancylist", -// "wikiplugin fancytable" => "wikiplugin fancytable", -// "wikiplugin file" => "wikiplugin file", -// "wikiplugin files" => "wikiplugin files", -// "wikiplugin flash" => "wikiplugin flash", -// "wikiplugin footnote" => "wikiplugin footnote", -// "wikiplugin footnotearea" => "wikiplugin footnotearea", +"wikiplugin draw" => "Wikiplugin Zeichnen", +"wikiplugin equation" => "Wikiplugin Gleichung", +"wikiplugin events" => "Wikiplugin Ereignisse", +"wikiplugin fade" => "Wikiplugin Ausblenden", +"wikiplugin fancylist" => "Wikiplugin Formatierte Liste", +"wikiplugin fancytable" => "Wikiplugin Formatierte Tabelle", +"wikiplugin file" => "Wikiplugin Datei", +"wikiplugin files" => "Wikiplugin Dateien", +"wikiplugin flash" => "Wikiplugin Flash", +"wikiplugin footnote" => "Wikiplugin Fußnote", +"wikiplugin footnotearea" => "Wikiplugin Fußnotenbereich", // "wikiplugin freetagged" => "wikiplugin freetagged", -// "wikiplugin ftp" => "wikiplugin ftp", +"wikiplugin ftp" => "Wikiplugin FTP", // "wikiplugin gauge" => "wikiplugin gauge", -// "wikiplugin getaccesstoken" => "wikiplugin getaccesstoken", -// "wikiplugin googleanalytics" => "wikiplugin googleanalytics", -// "wikiplugin googledoc" => "wikiplugin googledoc", -// "wikiplugin googlemap" => "wikiplugin googlemap", -// "wikiplugin group" => "wikiplugin group", -// "wikiplugin groupexpiry" => "wikiplugin groupexpiry", -// "wikiplugin grouplist" => "wikiplugin grouplist", +"wikiplugin getaccesstoken" => "Wikiplugin Erhalte Zugriffs-Token", +"wikiplugin googleanalytics" => "Wikiplugin GoogleAnalytics", +"wikiplugin googledoc" => "Wikiplugin GoogleDokument", +"wikiplugin googlemap" => "Wikiplugin GoogleMap", +"wikiplugin group" => "Wikiplugin Gruppe", +"wikiplugin groupexpiry" => "Wikiplugin Gruppenablauf", +"wikiplugin grouplist" => "Wikiplugin Gruppenliste", // "wikiplugin groupmailcore" => "wikiplugin groupmailcore", -// "wikiplugin groupstat" => "wikiplugin groupstat", -// "wikiplugin html" => "wikiplugin html", -// "wikiplugin iframe" => "wikiplugin iframe", -// "wikiplugin img" => "wikiplugin img", -// "wikiplugin image" => "wikiplugin image", -// "wikiplugin include" => "wikiplugin include", -// "wikiplugin randominclude" => "wikiplugin randominclude", -// "wikiplugin invite" => "wikiplugin invite", -// "wikiplugin jabber" => "wikiplugin jabber", -// "wikiplugin js" => "wikiplugin js", -// "wikiplugin jq" => "wikiplugin jq", -// "wikiplugin lang" => "wikiplugin lang", -// "wikiplugin lastmod" => "wikiplugin lastmod", -// "wikiplugin list" => "wikiplugin list", -// "wikiplugin listpages" => "wikiplugin listpages", -// "wikiplugin lsdir" => "wikiplugin lsdir", -// "wikiplugin mail" => "wikiplugin mail", -// "wikiplugin map" => "wikiplugin map", +"wikiplugin groupstat" => "Wikiplugin Gruppenstatistik", +"wikiplugin html" => "Wikiplugin HTML", +"wikiplugin iframe" => "Wikiplugin IFRAME", +"wikiplugin img" => "Wikiplugin Bild (img)", +"wikiplugin image" => "Wikiplugin Bild (image)", +"wikiplugin include" => "Wikiplugin Einbinden", +"wikiplugin randominclude" => "Wikiplugin Zufälliges Einbinden", +"wikiplugin invite" => "Wikiplugin Einladen", +"wikiplugin jabber" => "Wikiplugin Jabber", +"wikiplugin js" => "Wikiplugin JS", +"wikiplugin jq" => "Wikiplugin JQ", +"wikiplugin lang" => "Wikiplugin Sprache", +"wikiplugin lastmod" => "Wikiplugin Zuletzt verändert", +"wikiplugin list" => "Wikiplugin Liste", +"wikiplugin listpages" => "Wikiplugin Seiten auflisten", +"wikiplugin lsdir" => "Wikiplugin Verzeichnis auflisten", +"wikiplugin mail" => "Wikiplugin Email", +"wikiplugin map" => "Wikiplugin Karte", // "wikiplugin mcalendar" => "wikiplugin mcalendar", -// "wikiplugin mediaplayer" => "wikiplugin mediaplayer", -// "wikiplugin memberlist" => "wikiplugin memberlist", -// "wikiplugin memberpayment" => "wikiplugin memberpayment", -// "wikiplugin miniquiz" => "wikiplugin miniquiz", -// "wikiplugin module" => "wikiplugin module", +"wikiplugin mediaplayer" => "Wikiplugin Medienplayer", +"wikiplugin memberlist" => "Wikiplugin Mitgliederliste", +"wikiplugin memberpayment" => "Wikiplugin Mitgliederbezahlung", +"wikiplugin miniquiz" => "Wikiplugin Miniquiz", +"wikiplugin module" => "Wikiplugin Module", // "wikiplugin mono" => "wikiplugin mono", -// "wikiplugin mouseover" => "wikiplugin mouseover", +"wikiplugin mouseover" => "Wikiplugin Mouseover", // "wikiplugin mwtable" => "wikiplugin mwtable", -// "wikiplugin myspace" => "wikiplugin myspace", -// "wikiplugin objecthits" => "wikiplugin objecthits", -// "wikiplugin param" => "wikiplugin param", -// "wikiplugin payment" => "wikiplugin payment", -// "wikiplugin perm" => "wikiplugin perm", -// "wikiplugin picture" => "wikiplugin picture", -// "wikiplugin pluginmanager" => "wikiplugin pluginmanager", -// "wikiplugin poll" => "wikiplugin poll", -// "wikiplugin profile" => "wikiplugin profile", -// "wikiplugin proposal" => "wikiplugin proposal", -// "wikiplugin quote" => "wikiplugin quote", +"wikiplugin myspace" => "Wikiplugin MySpace", +"wikiplugin objecthits" => "Wikiplugin Objekttreffer", +"wikiplugin param" => "Wikiplugin Parameter", +"wikiplugin payment" => "Wikiplugin Bezahlung", +"wikiplugin perm" => "Wikiplugin Berechtigungen", +"wikiplugin picture" => "Wikiplugin Bild", +"wikiplugin pluginmanager" => "Wikiplugin Pluginverwaltung", +"wikiplugin poll" => "Wikiplugin Abstimmung", +"wikiplugin profile" => "Wikiplugin Profile", +"wikiplugin proposal" => "Wikiplugin Vorschlag", +"wikiplugin quote" => "Wikiplugin Zitat", // "wikiplugin rcontent" => "wikiplugin rcontent", -// "wikiplugin realnamelist" => "wikiplugin realnamelist", -// "wikiplugin redirect" => "wikiplugin redirect", -// "wikiplugin regex" => "wikiplugin regex", -// "wikiplugin remarksbox" => "wikiplugin remarksbox", -// "wikiplugin rss" => "wikiplugin rss", -// "wikiplugin scroll" => "wikiplugin scroll", -// "wikiplugin sf" => "wikiplugin sf", -// "wikiplugin share" => "wikiplugin share", -// "wikiplugin sharethis" => "wikiplugin sharethis", -// "wikiplugin sheet" => "wikiplugin sheet", -// "wikiplugin slideshow" => "wikiplugin slideshow", -// "wikiplugin showpages" => "wikiplugin showpages", -// "wikiplugin skype" => "wikiplugin skype", -// "wikiplugin smarty" => "wikiplugin smarty", -// "wikiplugin snarf" => "wikiplugin snarf", -// "wikiplugin snarf cache" => "wikiplugin snarf cache", -// "wikiplugin sort" => "wikiplugin sort", -// "wikiplugin split" => "wikiplugin split", -// "wikiplugin sql" => "wikiplugin sql", -// "wikiplugin stat" => "wikiplugin stat", -// "wikiplugin sub" => "wikiplugin sub", -// "wikiplugin subscribegroup" => "wikiplugin subscribegroup", -// "wikiplugin subscribegroups" => "wikiplugin subscribegroups", -// "wikiplugin subscribenewsletter" => "wikiplugin subscribenewsletter", -// "wikiplugin sup" => "wikiplugin sup", -// "wikiplugin survey" => "wikiplugin survey", -// "wikiplugin tag" => "wikiplugin tag", -// "wikiplugin tabs" => "wikiplugin tabs", -// "wikiplugin thumb" => "wikiplugin thumb", -// "wikiplugin titlesearch" => "wikiplugin titlesearch", -// "wikiplugin toc" => "wikiplugin toc", -// "wikiplugin topfriends" => "wikiplugin topfriends", -// "wikiplugin trackercomments" => "wikiplugin trackercomments", -// "wikiplugin trackerfilter" => "wikiplugin trackerfilter", -// "wikiplugin trackeritemfield" => "wikiplugin trackeritemfield", -// "wikiplugin trackerlist" => "wikiplugin trackerlist", -// "wikiplugin trackertimeline" => "wikiplugin trackertimeline", -// "wikiplugin tracker" => "wikiplugin tracker", -// "wikiplugin trackerprefill" => "wikiplugin trackerprefill", -// "wikiplugin trackerstat" => "wikiplugin trackerstat", +"wikiplugin realnamelist" => "Wikiplugin Echtnamenliste", +"wikiplugin redirect" => "Wikiplugin Weiterleiten", +"wikiplugin regex" => "Wikiplugin Regulärer Ausdruck (regex)", +"wikiplugin remarksbox" => "Wikiplugin Anmerkungsbox", +"wikiplugin rss" => "Wikiplugin RSS", +"wikiplugin scroll" => "Wikiplugin Scrollen", +"wikiplugin sf" => "Wikiplugin SF", +"wikiplugin share" => "Wikiplugin Share", +"wikiplugin sharethis" => "Wikiplugin ShareThis", +"wikiplugin sheet" => "Wikiplugin Tabellenkalkulation", +"wikiplugin slideshow" => "Wikiplugin Diashow", +"wikiplugin showpages" => "Wikiplugin Zeige Seiten", +"wikiplugin skype" => "Wikiplugin Skype", +"wikiplugin smarty" => "Wikiplugin Smarty", +"wikiplugin snarf" => "Wikiplugin Snarf (Inhalt stehlen)", +"wikiplugin snarf cache" => "Wikiplugin Snarf Cache", +"wikiplugin sort" => "Wikiplugin Sortieren", +"wikiplugin split" => "Wikiplugin Splitten", +"wikiplugin sql" => "Wikiplugin SQL", +"wikiplugin stat" => "Wikiplugin Statistik", +"wikiplugin sub" => "Wikiplugin Text-tiefgestellt", +"wikiplugin subscribegroup" => "Wikiplugin Eintrag Gruppe", +"wikiplugin subscribegroups" => "Wikiplugin Eintrag Gruppen", +"wikiplugin subscribenewsletter" => "Wikiplugin Newsletter abonnieren", +"wikiplugin sup" => "Wikiplugin Text-hochgestellt", +"wikiplugin survey" => "Wikiplugin Umfrage", +"wikiplugin tag" => "Wikiplugin Tag", +"wikiplugin tabs" => "Wikiplugin Tabs", +"wikiplugin thumb" => "Wikiplugin Vorschaubild", +"wikiplugin titlesearch" => "Wikiplugin Titelsuche", +"wikiplugin toc" => "Wikiplugin Inhaltsverzeichnis", +"wikiplugin topfriends" => "Wikiplugin Beste Freunde", +"wikiplugin trackercomments" => "Wikiplugin Trackerkommentare", +"wikiplugin trackerfilter" => "Wikiplugin Trackerfilter", +"wikiplugin trackeritemfield" => "Wikiplugin Trackerobjektfeld", +"wikiplugin trackerlist" => "Wikiplugin Trackerliste", +"wikiplugin trackertimeline" => "Wikiplugin Trackerzeitleiste", +"wikiplugin tracker" => "Wikiplugin Tracker", +"wikiplugin trackerprefill" => "Wikiplugin Trackervprfüllung", +"wikiplugin trackerstat" => "Wikiplugin Trackerstatistik", // "wikiplugin trackerif" => "wikiplugin trackerif", -// "wikiplugin trade" => "wikiplugin trade", -// "wikiplugin transclude" => "wikiplugin transclude", -// "wikiplugin translated" => "wikiplugin translated", -// "wikiplugin tr" => "wikiplugin tr", -// "wikiplugin twitter" => "wikiplugin twitter", -// "wikiplugin usercount" => "wikiplugin usercount", -// "wikiplugin userlink" => "wikiplugin userlink", -// "wikiplugin userlist" => "wikiplugin userlist", -// "wikiplugin userpref" => "wikiplugin userpref", -// "wikiplugin versions" => "wikiplugin versions", -// "wikiplugin vimeo" => "wikiplugin vimeo", -// "wikiplugin vote" => "wikiplugin vote", -// "wikiplugin watershed" => "wikiplugin watershed", -// "wikiplugin wantedpages" => "wikiplugin wantedpages", -// "wikiplugin webservice" => "wikiplugin webservice", -// "wikiplugin youtube" => "wikiplugin youtube", -// "wikiplugin zotero" => "wikiplugin zotero", -// "wikiplugin zoterolist" => "wikiplugin zoterolist", +"wikiplugin trade" => "Wikiplugin Handeln", +"wikiplugin transclude" => "Wikiplugin Transklusion", +"wikiplugin translated" => "Wikiplugin Übersetzt", +"wikiplugin tr" => "Wikiplugin TR", +"wikiplugin twitter" => "Wikiplugin Twitter", +"wikiplugin usercount" => "Wikiplugin Benutzerzähler", +"wikiplugin userlink" => "Wikiplugin Benutzerlink", +"wikiplugin userlist" => "Wikiplugin Benutzerliste", +"wikiplugin userpref" => "Wikiplugin Benutzereinstellungen", +"wikiplugin versions" => "Wikiplugin Versionen", +"wikiplugin vimeo" => "Wikiplugin Vimeo", +"wikiplugin vote" => "Wikiplugin Abstimmung", +"wikiplugin watershed" => "Wikiplugin Watershed", +"wikiplugin wantedpages" => "Wikiplugin Gewünschte Seiten", +"wikiplugin webservice" => "Wikiplugin Webdienst", +"wikiplugin youtube" => "Wikiplugin Youtube", +"wikiplugin zotero" => "Wikiplugin Zotero", +"wikiplugin zoterolist" => "Wikiplugin Zotero-Liste", // "wikiplugininline addtocart" => "wikiplugininline addtocart", // "wikiplugininline addtogooglecal" => "wikiplugininline addtogooglecal", // "wikiplugininline agentinfo" => "wikiplugininline agentinfo", @@ -3759,26 +3759,26 @@ // "wiki 3d feed animation interval" => "wiki 3d feed animation interval", // "wiki 3d existing page color" => "wiki 3d existing page color", // "wiki 3d missing page color" => "wiki 3d missing page color", -// "blog list order" => "blog list order", +"blog list order" => "Bloglistensortierung", // "home blog" => "home blog", // "feature blog rankings" => "feature blog rankings", -// "blog comments default ordering" => "blog comments default ordering", -// "blog comments per page" => "blog comments per page", +"blog comments default ordering" => "Standardsortierung Blogkommentare", +"blog comments per page" => "Blogkommentare pro Seite", // "feature blogposts comments" => "feature blogposts comments", -// "blog list user" => "blog list user", -// "blog list title" => "blog list title", +"blog list user" => "Bloglistenbenutzer", +"blog list title" => "Bloglistentitel", // "blog list title len" => "blog list title len", -// "blog list description" => "blog list description", -// "blog list created" => "blog list created", -// "blog list lastmodif" => "blog list lastmodif", -// "blog list posts" => "blog list posts", -// "blog list visits" => "blog list visits", -// "blog list activity" => "blog list activity", +"blog list description" => "Bloglistenbeschreibung", +"blog list created" => "Blogliste erstellt", +"blog list lastmodif" => "Blogliste zuletzt verändert", +"blog list posts" => "Bloglisteneinträge", +"blog list visits" => "Bloglistenbesuche", +"blog list activity" => "Bloglistenaktivität", // "feature blog mandatory category" => "feature blog mandatory category", // "feature blog heading" => "feature blog heading", // "feature blog edit publish date" => "feature blog edit publish date", // "feature blog sharethis" => "feature blog sharethis", -// "blog sharethis publisher" => "blog sharethis publisher", +"blog sharethis publisher" => "Blog ShareThis-Veröffentlicher", // "feature file galleries" => "feature file galleries", // "home file gallery" => "home file gallery", // "fgal root id" => "fgal root id", @@ -3947,15 +3947,15 @@ // "art trailer pos" => "art trailer pos", // "art header text pos" => "art header text pos", // "feature article comments" => "feature article comments", -// "article comments default ordering" => "article comments default ordering", -// "article comments per page" => "article comments per page", -// "article paginate" => "article paginate", -// "article user rating" => "article user rating", -// "article user rating options" => "article user rating options", -// "article image size x" => "article image size x", -// "article image size y" => "article image size y", +"article comments default ordering" => "Standardsortierung der Artikelkommentare", +"article comments per page" => "Artikelkommentare pro Seite", +"article paginate" => "Artikelpaginierung", +"article user rating" => "Artikel Benutzerbewertung", +"article user rating options" => "Optionen Artikel Benutzerbewertung", +"article image size x" => "Artikel Bildgröße X", +"article image size y" => "Artikel Bildgröße Y", // "article custom attributes" => "article custom attributes", -// "article sharethis publisher" => "article sharethis publisher", +"article sharethis publisher" => "Artikel ShareThis-Veröffentlicher", // "feature cms templates" => "feature cms templates", // "cms bot bar" => "cms bot bar", // "cms left column" => "cms left column", @@ -4020,16 +4020,16 @@ // "feature community list distance" => "feature community list distance", // "feature community friends permission" => "feature community friends permission", // "feature community friends permission dep" => "feature community friends permission dep", -// "change language" => "change language", -// "change theme" => "change theme", +"change language" => "ändere Sprache", +"change theme" => "ändere Theme", // "login is email" => "login is email", // "login is email obscure" => "login is email obscure", // "validateUsers" => "validateUsers", // "validateEmail" => "validateEmail", // "forgotPass" => "forgotPass", -// "change password" => "change password", -// "available languages" => "available languages", -// "available styles" => "available styles", +"change password" => "ändere Passwort", +"available languages" => "verfügbare Sprachen", +"available styles" => "verfügbare Stile", // "lowercase username" => "lowercase username", // "username pattern" => "username pattern", // "max username length" => "max username length", @@ -4148,15 +4148,15 @@ // "directory country flag" => "directory country flag", // "feature default calendars" => "feature default calendars", // "calendar sticky popup" => "calendar sticky popup", -// "default calendars" => "default calendars", -// "calendar view mode" => "calendar view mode", +"default calendars" => "Standardkalender", +"calendar view mode" => "Kalenderansichtsmodus", // "calendar view tab" => "calendar view tab", -// "calendar firstDayofWeek" => "calendar firstDayofWeek", -// "calendar timespan" => "calendar timespan", +"calendar firstDayofWeek" => "Erster Tag der Woche für Kalender", +"calendar timespan" => "Kalenderzeitspanne", // "feature jscalendar" => "feature jscalendar", // "feature action calendar" => "feature action calendar", -// "calendar start year" => "calendar start year", -// "calendar end year" => "calendar end year", +"calendar start year" => "Jahr für Kalenderanfang", +"calendar end year" => "Jahr für Kalenderende", // "calendar list begins focus" => "calendar list begins focus", // "feature cal manual time" => "feature cal manual time", // "calendar view days" => "calendar view days", @@ -4274,10 +4274,10 @@ // "feed wiki showAuthor" => "feed wiki showAuthor", // "feed wiki title" => "feed wiki title", // "max rss mapfiles" => "max rss mapfiles", -// "rss mapfiles" => "rss mapfiles", +"rss mapfiles" => "RSS Kartendateien", // "title rss mapfiles" => "title rss mapfiles", // "map path" => "map path", -// "default map" => "default map", +"default map" => "Standardkarte", // "map help" => "map help", // "map comments" => "map comments", // "gdaltindex" => "gdaltindex", @@ -4295,8 +4295,8 @@ // "syncUsersWithDirectory" => "syncUsersWithDirectory", // "useRegisterPasscode" => "useRegisterPasscode", // "registerPasscode" => "registerPasscode", -// "rememberme" => "rememberme", -// "remembertime" => "remembertime", +"rememberme" => "angemeldet bleiben", +"remembertime" => "Zeit für angemeldet bleiben", // "feature clear passwords" => "feature clear passwords", // "feature crypt passwords" => "feature crypt passwords", // "feature challenge" => "feature challenge", @@ -4385,9 +4385,9 @@ // "register url" => "register url", // "error url" => "error url", // "highlight group" => "highlight group", -// "cookie path" => "cookie path", -// "cookie domain" => "cookie domain", -// "cookie name" => "cookie name", +"cookie path" => "Cookioe-Pfad", +"cookie domain" => "Cookie-Domäne", +"cookie name" => "Cookie-Name", // "user tracker infos" => "user tracker infos", // "desactive login autocomplete" => "desactive login autocomplete", // "permission denied login box" => "permission denied login box", @@ -4412,19 +4412,19 @@ // "feature categoryobjects" => "feature categoryobjects", // "feature categorypath" => "feature categorypath", // "categorypath excluded" => "categorypath excluded", -// "categories used in tpl" => "categories used in tpl", -// "category jail" => "category jail", +"categories used in tpl" => "in TPL benutze Kategorien", +"category jail" => "Kategoriegefängnis", // "category defaults" => "category defaults", -// "category i18n sync" => "category i18n sync", -// "category i18n synced" => "category i18n synced", -// "category i18n unsynced" => "category i18n unsynced", +"category i18n sync" => "Kategorie i18n Synchronisierung", +"category i18n synced" => "Kategorie i18n synchronisiert", +"category i18n unsynced" => "Kategorie i18n unsynchronisiert", // "category autogeocode within" => "category autogeocode within", // "category autogeocode replace" => "category autogeocode replace", // "category autogeocode fudge" => "category autogeocode fudge", // "expanded category jail" => "expanded category jail", // "expanded category jail key" => "expanded category jail key", // "ws container" => "ws container", -// "category morelikethis algorithm" => "category morelikethis algorithm", +"category morelikethis algorithm" => "Ähnlichkeitsalgorithmus für Kategorien", // "category morelikethis mincommon" => "category morelikethis mincommon", // "feature filegals manager" => "feature filegals manager", // "feature contact" => "feature contact", @@ -4440,7 +4440,7 @@ // "feature urgent translation master only" => "feature urgent translation master only", // "feature translation incomplete notice" => "feature translation incomplete notice", // "lang use db" => "lang use db", -// "restrict language" => "restrict language", +"restrict language" => "beschränke Sprache", // "feature babelfish" => "feature babelfish", // "feature babelfish logo" => "feature babelfish logo", // "quantify changes" => "quantify changes", @@ -4509,7 +4509,7 @@ // "middle shadow start" => "middle shadow start", // "middle shadow end" => "middle shadow end", // "feature theme generator" => "feature theme generator", -// "themegenerator theme" => "themegenerator theme", +"themegenerator theme" => "Theme für Themegenerator", // "feature mods provider" => "feature mods provider", // "mods dir" => "mods dir", // "mods server" => "mods server", @@ -4542,7 +4542,7 @@ // "pagination fastmove links" => "pagination fastmove links", // "direct pagination max middle links" => "direct pagination max middle links", // "direct pagination max ending links" => "direct pagination max ending links", -// "wikiplugin kaltura" => "wikiplugin kaltura", +"wikiplugin kaltura" => "Wikiplugin Kaltura", // "wikiplugininline kaltura" => "wikiplugininline kaltura", // "default kaltura editor" => "default kaltura editor", // "partnerId" => "partnerId", @@ -4555,8 +4555,8 @@ // "kaeUIConf" => "kaeUIConf", // "kuser" => "kuser", // "kServiceUrl" => "kServiceUrl", -// "bigbluebutton server location" => "bigbluebutton server location", -// "bigbluebutton server salt" => "bigbluebutton server salt", +"bigbluebutton server location" => "BigBlueButton Serverort", +"bigbluebutton server salt" => "BigBlueButton Server-Salt", // "shipping service" => "shipping service", // "shipping fedex enable" => "shipping fedex enable", // "shipping fedex key" => "shipping fedex key", @@ -4570,19 +4570,19 @@ // "recaptcha enabled" => "recaptcha enabled", // "recaptcha pubkey" => "recaptcha pubkey", // "recaptcha privkey" => "recaptcha privkey", -// "captcha wordLen" => "captcha wordLen", -// "captcha width" => "captcha width", -// "captcha noise" => "captcha noise", +"captcha wordLen" => "CAPTCHA Wortlänge", +"captcha width" => "CAPTCHA-Breite", +"captcha noise" => "CAPTCHA-Störung", // "anonCanEdit" => "anonCanEdit", // "cacheimages" => "cacheimages", // "cachepages" => "cachepages", // "count admin pvs" => "count admin pvs", -// "default mail charset" => "default mail charset", +"default mail charset" => "Standard Emailzeichensatz", // "smarty security" => "smarty security", // "smarty compilation" => "smarty compilation", // "feature htmlpurifier output" => "feature htmlpurifier output", // "feature ajax" => "feature ajax", -// "ajax autosave" => "ajax autosave... [truncated message content] |
From: <jon...@us...> - 2011-05-09 14:25:16
|
Revision: 34318 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34318&view=rev Author: jonnybradley Date: 2011-05-09 14:25:07 +0000 (Mon, 09 May 2011) Log Message: ----------- [FIX] trackers: Hopefully fix confusion with File (attachment) fields and "item" attachments (thanks marclaporte) Modified Paths: -------------- branches/7.x/lib/core/Tracker/Field/File.php branches/7.x/styles/layout/layout.css branches/7.x/templates/trackerinput/file.tpl Modified: branches/7.x/lib/core/Tracker/Field/File.php =================================================================== --- branches/7.x/lib/core/Tracker/Field/File.php 2011-05-09 14:24:05 UTC (rev 34317) +++ branches/7.x/lib/core/Tracker/Field/File.php 2011-05-09 14:25:07 UTC (rev 34318) @@ -17,7 +17,7 @@ { $ins_id = $this->getInsertId(); - if (isset($_FILES[$ins_id]) && is_uploaded_file($_FILES[$ins_id]['tmp_name'])) { + if (!empty($requestData) && isset($_FILES[$ins_id]) && is_uploaded_file($_FILES[$ins_id]['tmp_name'])) { $data['old_value'] = $this->getValue(); $data['value'] = file_get_contents($_FILES[$ins_id]['tmp_name']); $data['file_type'] = $_FILES[$ins_id]['type']; @@ -25,6 +25,10 @@ $data['file_name'] = $_FILES[$ins_id]['name']; } else { $data = array('value' => $this->getValue()); + if (!empty($data['value']) && (int) $data['value'] > 0) { + $attachment = TikiLib::lib('trk')->get_item_attachment($data['value']); + $data['filename'] = $attachment['filename']; + } } return $data; } @@ -35,35 +39,33 @@ } function renderInnerOutput( $context ) { - - $list = TikiLib::lib('trk')->list_item_attachments($this->getItemId(), 0, -1, 'attId_asc'); - - if ($context['list_mode'] === 'csv') { - return explode('%%%', $list); // should something to do with export_attachment() happen here? - } - $smarty = TikiLib::lib('smarty'); - require_once $smarty->_get_plugin_filepath('block', 'self_link'); - require_once $smarty->_get_plugin_filepath('function', 'icon'); - - - if (empty($list['data'])) { + + $att_id = $this->getValue(); + + if (empty($att_id)) { return ''; } else { - $ul = '<ul class="attachmentlist">'; - foreach ( $list['data'] as $item ) { - $ul .= '<li>' . smarty_block_self_link(array( - 'script' => 'tiki-download_item_attachment.php', - 'attId' => $item['attId'], - 'title' => tra('Download'), - ), - smarty_function_icon(array('_id' => 'disk', 'alt' => tra('Download')), $smarty) . ' ' . - $item['filename'], - $smarty) . - '</li>'; + + if ($context['list_mode'] === 'csv') { + global $base_url; + return $base_url . 'tiki-download_item_attachment.php?attId=' . $att_id; // should something to do with export_attachment() happen here? } - $ul .= '</ul>'; - return $ul; + + $attachment = TikiLib::lib('trk')->get_item_attachment($att_id); + + $smarty = TikiLib::lib('smarty'); + require_once $smarty->_get_plugin_filepath('block', 'self_link'); + require_once $smarty->_get_plugin_filepath('function', 'icon'); + + $link = smarty_block_self_link(array( + '_script' => 'tiki-download_item_attachment.php', + 'attId' => $att_id, + ), + smarty_function_icon(array('_id' => 'disk', 'alt' => tra('Download')), $smarty) . ' ' . + $attachment['filename'], + $smarty); } + return $link; } } Modified: branches/7.x/styles/layout/layout.css =================================================================== --- branches/7.x/styles/layout/layout.css 2011-05-09 14:24:05 UTC (rev 34317) +++ branches/7.x/styles/layout/layout.css 2011-05-09 14:25:07 UTC (rev 34318) @@ -1627,10 +1627,6 @@ height: 15px; } -.attachmentlist { - list-style: none; -} - /* also for categorize.tpl */ .multiselect { vertical-align: middle; Modified: branches/7.x/templates/trackerinput/file.tpl =================================================================== --- branches/7.x/templates/trackerinput/file.tpl 2011-05-09 14:24:05 UTC (rev 34317) +++ branches/7.x/templates/trackerinput/file.tpl 2011-05-09 14:25:07 UTC (rev 34318) @@ -5,8 +5,10 @@ {/if} {if $field.value ne ''} <br /> - {$field.info.filename} - <a href="tiki-download_item_attachment.php?attId={$field.value}" title="{tr}Download{/tr}">{icon _id='disk' alt="{tr}Download{/tr}"}</a> + <a href="tiki-download_item_attachment.php?attId={$field.value}" title="{tr}Download{/tr}"> + {$field.filename} + {icon _id='disk' alt="{tr}Download{/tr}"} + </a> {if ($tiki_p_admin_trackers eq 'y' or $field.info.user eq $user) and $field.isMandatory ne 'y'} <a href="{$smarty.server.PHP_SELF}?{query removeattach=$field.value}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a> {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-05-09 15:54:49
|
Revision: 34322 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34322&view=rev Author: jonnybradley Date: 2011-05-09 15:54:42 +0000 (Mon, 09 May 2011) Log Message: ----------- [MOD] modules: Add a show/hide hidden modules button to avoid interface chaos and unusability when module visibility is used extensively, as seen on themes.t.o Modified Paths: -------------- branches/7.x/lib/modules/modlib.php branches/7.x/templates/tiki-admin_modules.tpl branches/7.x/tiki-admin_modules.php Modified: branches/7.x/lib/modules/modlib.php =================================================================== --- branches/7.x/lib/modules/modlib.php 2011-05-09 15:26:58 UTC (rev 34321) +++ branches/7.x/lib/modules/modlib.php 2011-05-09 15:54:42 UTC (rev 34322) @@ -298,7 +298,7 @@ foreach( $list as & $partial ) { $partial = array_map( array( $this, 'augment_module_parameters' ), $partial ); - if (!$this->is_admin_mode()) { + if (!$this->is_admin_mode() || empty($_REQUEST['show_hidden_modules'])) { $partial = array_values( array_filter( $partial, array( $this, 'filter_active_module' ) ) ); } } Modified: branches/7.x/templates/tiki-admin_modules.tpl =================================================================== --- branches/7.x/templates/tiki-admin_modules.tpl 2011-05-09 15:26:58 UTC (rev 34321) +++ branches/7.x/templates/tiki-admin_modules.tpl 2011-05-09 15:54:42 UTC (rev 34322) @@ -6,6 +6,11 @@ {if $tiki_p_edit_menu eq 'y'} {button href="tiki-admin_menus.php" _text="{tr}Admin Menus{/tr}"} {/if} + {if empty($smarty.request.show_hidden_modules)} + {button show_hidden_modules="y" _text="{tr}Show hidden modules{/tr}"} + {else} + {button show_hidden_modules="" _text="{tr}Hide hidden modules{/tr}"} + {/if} {button save_modules="y" _text="{tr}Save{/tr}" _style="display:none;" _id="save_modules" _ajax="n"} </div> Modified: branches/7.x/tiki-admin_modules.php =================================================================== --- branches/7.x/tiki-admin_modules.php 2011-05-09 15:26:58 UTC (rev 34321) +++ branches/7.x/tiki-admin_modules.php 2011-05-09 15:54:42 UTC (rev 34322) @@ -34,7 +34,7 @@ $smarty->assign('wysiwyg', 'y'); } $access->check_permission(array('tiki_p_admin_modules')); -$auto_query_args = array(); +$auto_query_args = array('show_hidden_modules'); $access->check_feature( array('feature_jquery_ui') ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pk...@us...> - 2011-05-10 05:13:15
|
Revision: 34335 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34335&view=rev Author: pkdille Date: 2011-05-10 05:13:09 +0000 (Tue, 10 May 2011) Log Message: ----------- Un-duplicate some style definitions Modified Paths: -------------- branches/7.x/css/ie7.css branches/7.x/styles/abse.css Modified: branches/7.x/css/ie7.css =================================================================== --- branches/7.x/css/ie7.css 2011-05-10 04:25:03 UTC (rev 34334) +++ branches/7.x/css/ie7.css 2011-05-10 05:13:09 UTC (rev 34335) @@ -54,6 +54,7 @@ h3.box-title { z-index: 2; + line-height: 1; } .cssmenu_vert ul li { @@ -68,8 +69,3 @@ #middle { display: table; } - -h3.box-title { - line-height: 1; -} - Modified: branches/7.x/styles/abse.css =================================================================== --- branches/7.x/styles/abse.css 2011-05-10 04:25:03 UTC (rev 34334) +++ branches/7.x/styles/abse.css 2011-05-10 05:13:09 UTC (rev 34335) @@ -257,14 +257,10 @@ #sitesubtitle {font-size: 1.6em} #topbar_modules .box-search { - float: right; - margin-right: 10px; - font-size: 90%; -} - -#topbar_modules .box-search { float: none; position: absolute; + font-size: 90%; + margin-right: 10px; right: 10px; top: 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lph...@us...> - 2011-05-10 17:50:05
|
Revision: 34366 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34366&view=rev Author: lphuberdeau Date: 2011-05-10 17:49:57 +0000 (Tue, 10 May 2011) Log Message: ----------- [FIX] Date for RSS feeds not displaying correctly Modified Paths: -------------- branches/7.x/lib/wiki-plugins/wikiplugin_rss.php branches/7.x/templates/wiki-plugins/wikiplugin_rss.tpl Modified: branches/7.x/lib/wiki-plugins/wikiplugin_rss.php =================================================================== --- branches/7.x/lib/wiki-plugins/wikiplugin_rss.php 2011-05-10 17:42:48 UTC (rev 34365) +++ branches/7.x/lib/wiki-plugins/wikiplugin_rss.php 2011-05-10 17:49:57 UTC (rev 34366) @@ -99,7 +99,7 @@ 'desc' => 0, 'author' => 0, 'icon' => '', - 'showtitle' => 1, + 'showtitle' => 1, ), $params ); if ( ! isset( $params['id'] ) ) { Modified: branches/7.x/templates/wiki-plugins/wikiplugin_rss.tpl =================================================================== --- branches/7.x/templates/wiki-plugins/wikiplugin_rss.tpl 2011-05-10 17:42:48 UTC (rev 34365) +++ branches/7.x/templates/wiki-plugins/wikiplugin_rss.tpl 2011-05-10 17:49:57 UTC (rev 34366) @@ -11,12 +11,12 @@ <li class="rssitem"> <a target="_blank" href="{$item.url|escape}">{$item.title|escape}</a> - {if $item.author and $showauthor and $item.pubDate and $showdate} - ({$item.author|escape}, <span class="rssdate">{$item.pubDate|escape}</span>) + {if $item.author and $showauthor and $item.publication_date and $showdate} + ({$item.author|escape}, <span class="rssdate">{$item.publication_date|tiki_short_date}</span>) {elseif $item.author and $showauthor} ({$item.author|escape}) - {elseif $item.pubDate and $showdate} - (<span class="rssdate">{$item.pubDate|escape}</span>) + {elseif $item.publication_date and $showdate} + (<span class="rssdate">{$item.publication_date|tiki_short_date}</span>) {/if} {if $item.description && $showdesc} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sam...@us...> - 2011-05-10 21:24:04
|
Revision: 34372 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34372&view=rev Author: sampaioprimo Date: 2011-05-10 21:23:55 +0000 (Tue, 10 May 2011) Log Message: ----------- backporting translations done on i18n.tiki.org Modified Paths: -------------- branches/7.x/lang/de/language.php branches/7.x/lang/fr/language.php branches/7.x/lang/hu/language.php Property Changed: ---------------- branches/7.x/ Property changes on: branches/7.x ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33677,33681,33708-33712,33851-33853,33873,33956-33957,33959-33961,34050,34052,34102-34104,34202-34203 + /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33677,33681,33708-33712,33851-33853,33873,33956-33957,33959-33961,34050,34052,34102-34104,34202-34203,34369-34371 Modified: branches/7.x/lang/de/language.php =================================================================== --- branches/7.x/lang/de/language.php 2011-05-10 20:52:20 UTC (rev 34371) +++ branches/7.x/lang/de/language.php 2011-05-10 21:23:55 UTC (rev 34372) @@ -1884,7 +1884,7 @@ "Public users not logged" => "Öffentliche Benutzer, die nicht eingeloggt sind.", "registered</span>" => "registriert</span>", "Shoutbox Words Verwaltung" => "Verwaltung Shoutboxwörter", -"Show user's real name instead of login in autocomplete selector in messaging feature" => "Zeige den Echtnamen des Benutzrs anstelle seines Loginnamen im Autovervollständigenfeld in der Nachrichtenfunktion", +"Show user's real name instead of login in autocomplete selector in messaging feature" => "Zeige den Echtnamen des Benutzers anstelle seines Loginnamen im Autovervollständigenfeld in der Nachrichtenfunktion", "Show user's real name instead of login in autocomplete selector in trackers feature" => "Zeige bei Trackern in Autovervollständigenfeldern den Echtnamen des Benutzers anstelle seines Logins an", "Suchmaschinen-freundliche URLs" => "Suchmaschinenfreundliche URLs", "Svenska" => "Schwedisch", @@ -2157,7 +2157,7 @@ "To use <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">phplayersmenu</a>, you can use one of the three following syntaxes" => "Um <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">phplayersmenu</a> zu nutzen, kannst Du eine der drei folgenden Syntaxe nutzen", "This will work well (or not!) depending on your theme. To learn more about <a target=\"tikihelp\" href=\"http://themes.tiki.org\">themes</a>" => "Dies funktioniert gut (oder auch nicht!), abhängig von Deinem Theme. Lerne mehr über <a target=\"tikihelp\" href=\"http://themes.tiki.org\">Themes</a>", "PHP Layers menus" => "PHP Layers Menüs", -"To use a <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">PHP Layers menu</a>, use one of these syntaxes (Note: PHP Layers menus are being replaced by CSS menus and may have only basic styling in newer themes.)" => "Um <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">PHP Layers Menü</a> zu nutzen, benutze einer der drei Syntaxe (Hinweis: PHP Layers Menüs werden durch CSS Menüs ersetzt und haben ggf. nur ein rudimentäres Design in neueren Themes.)", +"To use a <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">PHP Layers menu</a>, use one of these syntaxes (Note: PHP Layers menus are being replaced by CSS menus and may have only basic styling in newer themes.)" => "Um <a target=\"tikihelp\" href=\"http://phplayersmenu.sourceforge.net/\">PHP Layers Menü</a> zu nutzen, benutze einer der drei Syntaxe (Hinweis: PHP Layers Menüs werden durch CSS Menüs ersetzt und haben ggfs. nur ein rudimentäres Design in neueren Themes.)", "Multi-lingual" => "vielsprachig", "Field is hidden" => "Feld ist versteckt", "Visible by" => "Sichtbar für", @@ -2406,7 +2406,7 @@ "For development purposes, it's better to display errors for all users. However, in production settings, they should only be displayed to administrators." => "Zu Entwicklerzwecken. Es ist besser Fehler allen Benutzern anzuzeigen. In Produktivumgebungen, sollten die Fehler aber nur Administratoren angezeigt werden.", "Label visible in the browser's title bar on all pages. Also appears in search engines." => "Bezeichnung in der Browsertitelzeile auf aööen Seiten. Erscheint auch so in Suchmaschinen.", "Use the 12-hour clock (with AM and PM) for time selectors used in some edit windows \r\n\t\t\t\t\t\t\t\t\tto set the time for publishing new or edited blog posts, articles, etc." => "Benutze 12-Stunden-Uhr (mit AM und PM) für in einigen Bearbeitungsbereichen benutzte Zeitauswahl um die Zeit für Veröffentlichung neuer oder bearbeiteter Blogeinträge, Artikel, etc anzugeben", -"Use user's real name instead of login in autocomplete selector in messaging feature" => "Benutze den Echtnamen des Benutzrs anstelle seines Loginnamen im Autovervollständigenfeld in der Nachrichtenfunktion", +"Use user's real name instead of login in autocomplete selector in messaging feature" => "Benutze den Echtnamen des Benutzers anstelle seines Loginnamen im Autovervollständigenfeld in der Nachrichtenfunktion", "Webservice-Registrierung" => "Webdienstregistrierung", "Alphanumeric code requierd to complete the registration" => "Alphanumerischer Code um die Registrierung abzuschließen", "Create / Edit Calendar" => "Erstelle / bearbeite Kalender", @@ -2643,7 +2643,7 @@ // "Connection to cclite server %0 failed for %1<br />\"%2\"" => "Connection to cclite server %0 failed for %1<br />\"%2\"", // "Tiki credits payment done on %0 for \$amount (using \$creditType)" => "Tiki credits payment done on %0 for \$amount (using \$creditType)", // "Saves your edits as you go along enabling you to recover your work after an \"interruption\". Also enables \"Live\" preview and is required for wysiwyg plugin processing" => "Saves your edits as you go along enabling you to recover your work after an \"interruption\". Also enables \"Live\" preview and is required for wysiwyg plugin processing", -// "Multiple authentication backends are supported by Tikiwiki. The default value is to use the internal user database" => "Multiple authentication backends are supported by Tikiwiki. The default value is to use the internal user database", +"Multiple authentication backends are supported by Tikiwiki. The default value is to use the internal user database" => "Tiki unterstützt verschiedene Authentifizierungsmethoden. Standardmäßig wird die interne Benutzerdatenbank benutzt", // "Default: Anonymous Bind" => "Default: Anonymous Bind", // "Full: userattr=username,UserDN,BaseDN" => "Full: userattr=username,UserDN,BaseDN", // "OpenLDAP: cn=username,BaseDN" => "OpenLDAP: cn=username,BaseDN", @@ -2770,10 +2770,10 @@ // "When enabled, feature checks and permission checks will be skipped" => "When enabled, feature checks and permission checks will be skipped", // "Use the 12-hour clock (with AM and PM) for time selectors used in some edit windows \n\t\t\t\t\t\t\t\t\tto set the time for publishing new or edited blog posts, articles, etc" => "Use the 12-hour clock (with AM and PM) for time selectors used in some edit windows \n\t\t\t\t\t\t\t\t\tto set the time for publishing new or edited blog posts, articles, etc", // "Use new diff any version interface" => "Use new diff any version interface", -// "There must be a tracker to store info of each channel you create" => "There must be a tracker to store info of each channel you create", +"There must be a tracker to store info of each channel you create" => "Es muss ein Tracker zum Speichern der Informationen aller von Dir erstellter Kanaäle existieren", // "The Channel tracker must have a text field for the Watershed BrandId" => "The Channel tracker must have a text field for the Watershed BrandId", // "The Channel tracker must have a text field for the Watershed ChannelCode" => "The Channel tracker must have a text field for the Watershed ChannelCode", -// "There must be a tracker to store Archive info" => "There must be a tracker to store Archive info", +"There must be a tracker to store Archive info" => "Es muss ein Tracker zum Speichern der Archivinformationen existieren", // "The Archive tracker must have a text field for the videoId of each archive" => "The Archive tracker must have a text field for the videoId of each archive", // "Field ID of BrandId for Archive" => "Field ID of BrandId for Archive", // "The Archive tracker must have a text field for the BrandId of each archive" => "The Archive tracker must have a text field for the BrandId of each archive", @@ -2810,7 +2810,7 @@ // "Unknown variables referenced: %0" => "Unknown variables referenced: %0", "This invitation does not exist or is deprecated or wrong email" => "Diese Einladung existiert nicht oder ist abgelaufen oder die Emailadresse ist falsch", // "added the \".\$change['data']['objectType']).\" <a href=\"\$tikiUrl/\".\$change['data']['objectUrl'].\"\">\".\$change['data']['objectName'].\"</a> \".tra(\"to the category" => "added the \".\$change['data']['objectType']).\" <a href=\"\$tikiUrl/\".\$change['data']['objectUrl'].\"\">\".\$change['data']['objectName'].\"</a> \".tra(\"to the category", -// "Search index could not be updated. The site is misconfigured. Contact an administrator" => "Search index could not be updated. The site is misconfigured. Contact an administrator", +"Search index could not be updated. The site is misconfigured. Contact an administrator" => "Der Suchindex konnte nicht aktualisiert werden. Die Site ist fehlerhaft konfiguriert. Kontaktiere eine Administrator", "blog post" => "Blogeintrag", // "forum post" => "forum post", // "Handling actions of plugin \"%s\" failed" => "Handling actions of plugin \"%s\" failed", @@ -4888,9 +4888,9 @@ // "setting will override your selection of specific groups" => "setting will override your selection of specific groups", // "Params: specific params to the module and/or general params ('lang', 'flip', 'title', 'decorations', 'section', 'overflow', 'page', 'nobox', 'bgcolor', 'color', 'theme', 'notitle', 'nopage'). Separator between params:'&'. E.g. maxlen=15&nonums=y" => "Params: specific params to the module and/or general params ('lang', 'flip', 'title', 'decorations', 'section', 'overflow', 'page', 'nobox', 'bgcolor', 'color', 'theme', 'notitle', 'nopage'). Separator between params:'&'. E.g. maxlen=15&nonums=y", // "The documents are returned sorted on relevance depending on order, proximity, frequency of terms. " => "The documents are returned sorted on relevance depending on order, proximity, frequency of terms. ", -// "Other objects of the category can be reached by the following links" => "Other objects of the category can be reached by the following links", +"Other objects of the category can be reached by the following links" => "Weitere Objekte dieser Kategorie können durch nachstehende Links erreicht werden", // "{\$t}" => "{\$t}", -// " Active option \"show objects of the same category\" shows above all links to others objects of the sames categories than the current object" => " Active option \"show objects of the same category\" shows above all links to others objects of the sames categories than the current object", +" Active option \"show objects of the same category\" shows above all links to others objects of the sames categories than the current object" => " Die aktivierte Option \"Zeige Kategorieobjekte\" zeigt unterhalb alle Links der gleichen Kategorie bis auf das jetzige Objekt", // "The built query was likely" => "The built query was likely", // "Stacktrace" => "Stacktrace", // "Wiki markup to enter when image selected from \"file gallery manager\"" => "Wiki markup to enter when image selected from \"file gallery manager\"", @@ -4978,7 +4978,7 @@ // "Toggle Visible" => "Toggle Visible", // "no default" => "no default", // "Paste or type wiki markup and YAML (with or without the {literal}{CODE}{/literal} tags) into the text area below" => "Paste or type wiki markup and YAML (with or without the {literal}{CODE}{/literal} tags) into the text area below", -// "MySQL Search (legacy)" => "MySQL Search (legacy)", +"MySQL Search (legacy)" => "MySQL Suche (Vorgänger)", // "Meta-tags" => "Meta-tags", // "If you don't want to limit, an input will be display else it wille be a select" => "If you don't want to limit, an input will be display else it wille be a select", // "Inline (No Plugin Edit UI)" => "Inline (No Plugin Edit UI)", @@ -5030,7 +5030,7 @@ // "Trackers Outbound Emails" => "Trackers Outbound Emails", // "Forums Outbound Emails" => "Forums Outbound Emails", // "Set User ID (suid) files" => "Set User ID (suid) files", -// "World writable files or directories" => "World writable files or directories", +"World writable files or directories" => "Globalbeschreibbare Dateien oder Verzeichnisse", // "Strange Inodes (not file, not link, not directory)" => "Strange Inodes (not file, not link, not directory)", // "Suid files are not part of tiki and there is no need for suid files in a webspace. Sometimes intruders that gain elevated privileges leave suid files to \"keep the door open\"" => "Suid files are not part of tiki and there is no need for suid files in a webspace. Sometimes intruders that gain elevated privileges leave suid files to \"keep the door open\"", // "In some environments where you cannot get root or have no other possibilities, it is unavoidable to let your webserver write to some tiki directories like \"templates_c\" or \"temp\". In any other case this is not needed. A bug in a script or other users could easily put malicious scripts on your webspace or upload illegal content" => "In some environments where you cannot get root or have no other possibilities, it is unavoidable to let your webserver write to some tiki directories like \"templates_c\" or \"temp\". In any other case this is not needed. A bug in a script or other users could easily put malicious scripts on your webspace or upload illegal content", @@ -5080,7 +5080,7 @@ // "Perform action with selected" => "Perform action with selected", // "in current directory category" => "in current directory category", // "Tracker Items Export" => "Tracker Items Export", -// "Tracker Items Dump" => "Tracker Items Dump", +"Tracker Items Dump" => "Abzug Trackereinträge", // "Pending requests" => "Pending requests", // "Global default" => "Global default", // "Bounding box" => "Bounding box", @@ -5137,7 +5137,7 @@ // "Subscription failed" => "Subscription failed", "Object Watches" => "Objektbeobachtungen", "Changes to groups watching" => "Ändert die beobachtenden Gruppen", -// "These changes to group watches" => "These changes to group watches", +"These changes to group watches" => "Dies wechselt zur Gruppenbeobachtung", // "were made to these descendants" => "were made to these descendants", // "Groups watching" => "Groups watching", // "{\$objectType|escape}" => "{\$objectType|escape}", @@ -5184,7 +5184,7 @@ // "Pause" => "Pause", // "Toggle Loop" => "Toggle Loop", "Change Theme" => "Ändere Theme", -// "You will be redirected to the home page shortly" => "You will be redirected to the home page shortly", +"You will be redirected to the home page shortly" => "Du wirst gleich auf die Startseite weitergeleitet", // "to go to the home page immediately" => "to go to the home page immediately", // "Please provide local account information" => "Please provide local account information", // "Do you already have a local account for this site? Login to link to it using the following form instead" => "Do you already have a local account for this site? Login to link to it using the following form instead", @@ -6398,7 +6398,7 @@ "A user deletes an article" => "Benutzer löscht einen Artikel", "An article is submitted, edited, deleted or commented on." => "Ein Artikel wurde eingereicht, bearbeitet, gelöscht oder kommentiert.", "A wiki page is created, deleted or edited, except for minor changes." => "Eine Wiki Seite wurde erstellt, gelöscht oder bearbeitet - mit Ausnahme von geringfügigen Änderungen.", -"A wiki page is created, deleted or edited, even for minor changes." => "Eine Wiki Seite wurde erstellt, gelöscht oder bearbeitet (auch ggf. nur geringfügig)", +"A wiki page is created, deleted or edited, even for minor changes." => "Eine Wiki Seite wurde erstellt, gelöscht oder bearbeitet (auch ggfs. nur geringfügig)", "A comment in a wiki page is posted or edited" => "Kommentar zu einer Wikiseite wird erstellt oder geändert", "A comment in an article is posted or edited" => "Ein Kommentar wurde zu einem Artikel abgegeben oder bearbeitet", "Token is called" => "Token wurde aufgerufen", @@ -6763,7 +6763,7 @@ "Quick Permission Assignment" => "Schnell Rechte zuweisen", "Quickperms allow to define classes of privileges and grant them to roles on objects" => "Schnelle Rechte erlauben Klassen mit Rechten zu definieren und Objekten zu gewähren", "HTML Purifier" => "HTML Reiniger", -"If you are trying to use HTML in your pages and it gets stripped out, you should make sure your HTML is valid or de-activate this feature." => "Wenn Du HTML in Deinen Seiten benutzt und es wird ausgefiltert, solltest Du prüfen, ob es sich um gültigen HTML-Code handelt. Alternativ kann diese Fuktion deaktiviert werden.", +"If you are trying to use HTML in your pages and it gets stripped out, you should make sure your HTML is valid or de-activate this feature." => "Wenn Du HTML in Deinen Seiten benutzt und es wird ausgefiltert, solltest Du prüfen, ob es sich um gültigen HTML-Code handelt. Alternativ kann diese Funktion deaktiviert werden.", "Morcego 3D browser" => "Morcego-3D-Browser", "Visualize relationships between wiki pages, in a 3D applet" => "Visualisiert Verbindungen zwischen Tikiseiten in einer 3D-Anwendung", "Allows several Tiki sites (slaves) to get authentication from a master Tiki site" => "Erlaubt es verschiedenen Tiki Sites (untergeordneten Sites) ihre Authentifikation von der Hauptseite zu erhalten", @@ -7460,7 +7460,7 @@ "This may impact performance" => "Das kann die Performance negativ beeinträchtigen", "Use email as username" => "Benutze Email als Benutzername", "Instead of creating new usernames, use the user\\'s email address for authentication" => "Anstelle neue Benutzernamen zu erstellen, benutze die Emailadresse des Benutzers zur Authentifizierung", -"Obscure email when using email as username if possible (coverage will not be complete)" => "Verdecke Emailadresse, wenn der Benutzername gleich der Emailadresse ist (wenn möglich). Die Verdeckung ist ggf. nicht vollständig", +"Obscure email when using email as username if possible (coverage will not be complete)" => "Verdecke Emailadresse, wenn der Benutzername gleich der Emailadresse ist (wenn möglich). Die Verdeckung ist ggfs. nicht vollständig", "This will attempt as much as possible to hide the email, showing the realname or the truncated email instead" => "Hierdurch wird versucht, so viel wie möglich von der Emailadresse zu verstecken und nur den Echtnamen oder die Email abgeschnitten anzuzeigen", "Long date format" => "Langes Datumsformat", "Long time format" => "Langes Zeitformat", @@ -7577,7 +7577,7 @@ "Used to switch between the paypal sandbox, used for testing and development and the live environment" => "Benutzt um zwischen der Paypal-Sandbox (Testen und entwickeln) und der Echtumgebung umzuschalten", "Production" => "Produktion", "Paypal Instant Payment Notification (IPN)" => "Paypal Instant Payment Notification (IPN, Benachrichtigung bei sofortiger Zahlung)", -"Enable IPN for automatic payment completion. When enabled, Paypal will ping back the site when a payment is confirmed. The payment will then be entered automatically. This may not be possible if the server is not on a public server" => "Aktiviere IPN für automatischen Zahlungsabschluss. Wenn aktviiert, Paypal pingt die Site zurück, wenn eine Bezahlung bestätigt wurde. Die Bezahlung wird dann automatisch eingetragen. Dies kann ggf. nciht möglich sein, wenn es sich nicht um einen öffentlichen Server handelt", +"Enable IPN for automatic payment completion. When enabled, Paypal will ping back the site when a payment is confirmed. The payment will then be entered automatically. This may not be possible if the server is not on a public server" => "Aktiviere IPN für automatischen Zahlungsabschluss. Wenn aktiviert, Paypal pingt die Site zurück, wenn eine Bezahlung bestätigt wurde. Die Bezahlung wird dann automatisch eingetragen. Dies kann ggfs. nicht möglich sein, wenn es sich nicht um einen öffentlichen Server handelt", "Currency" => "Währung", "Currency used when entering payments" => "Zu benutzende Währung, wenn Bezahlungen eingegeben werden", "Default acceptable payment delay" => "Standard für akzeptierbare Zahlungsverzögerung", @@ -7765,7 +7765,7 @@ "Compress CSS files by removing additional spaces and grouping multiple files into one. Changes to CSS files will require cache to be cleared. Uses http://code.google.com/p/minify/" => "Komprimiere CSS-Dateien durch Entfernung von Leerräumen und Gruppierung multipler Dateien in eine. Änderungen an den CSS-Dateien erfordern, den Cache zu löschen. Benutzt http://code.google.com/p/minify/", "Minify CSS into a single file" => "Verkleinere CSS in eine einzelne Datei", "In addition to reducing the size of the CSS, reduce the number of included files" => "Um zusätzlich die Größe des CSS zu reduzieren, verringere die Anzahl der einzubindenden Dateien", -"This setting may not work out of the box for all styles. import needs to use @import url(\"...\") and not @import \"...\"" => "Diese Einstellung kann ggf. nicht ohne weiteres für alle Stile funktionieren. Import muss @import url(\"...\") und nicht @import \"...\" benutzen", +"This setting may not work out of the box for all styles. import needs to use @import url(\"...\") and not @import \"...\"" => "Diese Einstellung kann ggfs. nicht ohne weiteres für alle Stile funktionieren. Import muss @import url(\"...\") und nicht @import \"...\" benutzen", "Skip date for same day" => "Datum bei Anzeige für den heutigen Tag weglassen", "When displaying short date and time, skip date for today. Only time will be displayed" => "Wenn das kurze Datums- und Zeitformat genutzt wird, lasse das Datum für heute weg. Nur die Zeit wird angezeigt", "Cache-Control header" => "Kopf Cache-Kontrolle", @@ -8257,7 +8257,7 @@ "No rows found" => "Keine Zeilen gefunden", "Toggle sections" => "Auswahl umschalten", "Show only selected" => "Zeige nur Ausgewählte", -"You might want to also set the tiki_p_modify_object_categories permission under the tiki section" => "Du solltest ggf. auch das Recht tiki_p_modify_object_categories im Abschnitt Tiki setzen", +"You might want to also set the tiki_p_modify_object_categories permission under the tiki section" => "Du solltest ggfs. auch das Recht tiki_p_modify_object_categories im Abschnitt Tiki setzen", "second" => "Sekunde", "years" => "Jahre", "months" => "Monate", @@ -9717,7 +9717,7 @@ "Labels for the values to be collected" => "Bezeichnungen für die zu sammelnden Werte", "Labels of the values to be collected separated by " => "Bezeichnungen der zu sammelnden Werte, getrennt durch ", "Show even if logged in" => "Zeige auch, wenn angemeldet", -"Normally this is used for anonymous users but sometimes may be used when logged in also" => "Normalerweise wird dies für anonyme Benutzer verwendet, wird ggf. aber auch benötigt, wenn angemeldet", +"Normally this is used for anonymous users but sometimes may be used when logged in also" => "Normalerweise wird dies für anonyme Benutzer verwendet, wird ggfs. aber auch benötigt, wenn angemeldet", "Please fill in all fields" => "Bitte fülle alle Felder aus", "Show Pages" => "Seite anzeigen", "Find pages by searching within page names" => "Finde Seiten durch Suchen in den Seitennamen", @@ -11190,7 +11190,7 @@ "objects that include the term <strong>forum</strong>" => "Objekte, die den Ausdruck <strong>Forum</strong> enthalten", "Requiring terms" => "Zwingende Begriffe", "Add a plus sign ( + ) before a term to indicate that the term <em>must</em> appear in results." => "Füge ein Pluszeichen ( + ) vor einem Begriff ein, um anzuzeigen, dass der Begriff im Suchergebnis enthalten sein <em>muss</em>.", -"Example: <strong>+wiki forum</strong> will find objects containing at least <strong>wiki</strong>. Objects with both terms and many occurences of the terms will appear first." => "Beispiel: <strong>+Wiki Forum</strong> findet Objekte, die mindestens <strong>Wiki</strong> enthalten. Objekte, die beide Begriffe und ggf. diese auch mehrfach entahlten, werden zuerst erscheinen.", +"Example: <strong>+wiki forum</strong> will find objects containing at least <strong>wiki</strong>. Objects with both terms and many occurences of the terms will appear first." => "Beispiel: <strong>+Wiki Forum</strong> findet Objekte, die mindestens <strong>Wiki</strong> enthalten. Objekte, die beide Begriffe und ggfs. diese auch mehrfach entahlten, werden zuerst erscheinen.", "Excluding terms" => "Begriffe ausschließen", "Add a minus sign ( - ) before a term to indicate that the term <em>must not</em> appear in the results." => "Füge ein Minuszeichen ( - ) vor einen Suchbegriff ein, damit der Suchbegriff <em>nicht</em> in den gefundenen Ergebnissen enthalten ist.", "To reduce a term's value without completely excluding it, <a href=\"#reducing\" title=\"{tr}Reducing a term's value" => "Um den Wert eines Begriffs zu reduzieren ohne in vollständig auszuschließen, <a href=\"#reducing\" title=\"{tr}Wert eines Suchbegriffs verringern", @@ -12592,7 +12592,7 @@ "Email to send a test mail" => "Emailadresse für die Testmail", "Sessions" => "Sitzungen", "Advanced configuration warning" => "Warnung zur erweiterten Konfiguration", -"Note that storing session data in the database is an advanced systems administration option, and is for admins who have comprehensive access and understanding of the database, in order to deal with any unexpected effects." => "Beachte bitte, dass das Speichern von Sitzungsdaten in der Datenbank eine fortgeschrittene Funktion ist. Sie ist nur für Systemadministratoren gedacht, die vollen Zugriff auf und ein entsprechendes Verständnis für die Datenbank haben um ggf. mit unerwarteten Effekten umgehen zu können.", +"Note that storing session data in the database is an advanced systems administration option, and is for admins who have comprehensive access and understanding of the database, in order to deal with any unexpected effects." => "Beachte bitte, dass das Speichern von Sitzungsdaten in der Datenbank eine fortgeschrittene Funktion ist. Sie ist nur für Systemadministratoren gedacht, die vollen Zugriff auf und ein entsprechendes Verständnis für die Datenbank haben um ggfs. mit unerwarteten Effekten umgehen zu können.", "Changing this feature will immediately log you out when you save this preference." => "Ändern und Speichern dieses Werts hat eine umgehende Abmeldung zur Folge.", "Contact" => "Kontakt", "Miscellaneous" => "Verschiedenes", @@ -12727,7 +12727,7 @@ "<em>%0</em> should not be disabled due to authentication on XCache" => "<em>%0</em> sollte nicht deaktiviert sein aufgrund der Authentifizierung bei XCache", "Bytecode cache is not used. Using a bytecode cache (APC, XCache) is highly recommended for production environments" => "Bytecode-Cache wird nicht benutzt. Die Benutzung des Bytecode-Cache (APC, XCache) ist für den Einsatz in Produktivumgebungen sehr zu empfehlen", "Major slow down" => "Besondere Verlangsamer", -"These are reported to slow down Tiki. If you have a high-volume site, you may want to deactivate them" => "Von diesen Funktionen wird berichtet, dass sie Tiki verlangsamen können. Wenn Du eine Site mit hohem Datenvolumen hast, solltest Du diese Funktionen ggf. deaktivieren", +"These are reported to slow down Tiki. If you have a high-volume site, you may want to deactivate them" => "Von diesen Funktionen wird berichtet, dass sie Tiki verlangsamen können. Wenn Du eine Site mit hohem Datenvolumen hast, solltest Du diese Funktionen ggfs. deaktivieren", "Many search options impact performance. Please see <a href=\"tiki-admin.php?page=search\">Search admin panel</a>." => "Viele Suchoptionen haben einen negativen Einfluss auf die Performance. Siehe hierzu <a href=\"tiki-admin.php?page=search\">Suchoptionen</a>.", "To add/remove polls, look for \"Polls\" under \"Admin\" on the application menu, or" => "Umfragen hinzufügen/löschen über Menüpunkt 'Abstimmungen' unter 'Verwalten' im Hauptmenü oder", "Loading profile" => "Lade Profil", @@ -12795,7 +12795,7 @@ "Please also see:" => "Bitte siehe auch:", "HTTPS (SSL) and other login preferences" => "HTTPS (SSL) und andere Logineinstellungen", "CSRF Security" => "CSRF Sicherheit", -"Use these options to protect against cross-site request forgeries (CSRF)" => "Benutze diese Optionen, um Dich vor cross-site request forgeries (CSRF) zu schützenUse these options to protect against cross-site request forgeries (CSRF)", +"Use these options to protect against cross-site request forgeries (CSRF)" => "Benutze diese Optionen, um Dich vor cross-site request forgeries (CSRF) zu schützen.", "Spam protection" => "Spam Schutz", "Search results" => "Suchergebnisse", "Clipperz online password management" => "Clipperz Online Passwortmanager", @@ -13311,8 +13311,8 @@ "Destroy the structure and remove the pages" => "Struktur und Seiten entfernen", "Note that the following pages are also part of another structure. Make sure that access permissions (if any) do not conflict" => "Beachte, dass die folgenden SeitenTeil einer anderen Struktur sind. Stelle sicher, dass es keine Konflikte mit den Zugriffsrechten (wenn existent) gibt", "The following pages have automatically been categorized with the same categories as the structure" => "Die folgenden Seiten wurden automatisch mit der gleichen Kategorie kategorisiert wie die Struktur", -"The following pages have categories but the structure has none. You may wish to uncategorize them to be consistent" => "Die folgenden Seiten haben Kategorieren, aber die Struktur hat keine. Du solltest die Kategorieren ggf. entfernen um Inkonsistenzen zu vermeiden", -"The following pages are in categories that the structure is not in. You may wish to recategorize them in order to be consistent" => "Die folgenden Seiten haben Kategorien, die der Struktur aber nicht zugeordnet ist. Du solltest ggf. die Kategorien angleichen, um Inkonstenzen zu vermeiden", +"The following pages have categories but the structure has none. You may wish to uncategorize them to be consistent" => "Die folgenden Seiten haben Kategorieren, aber die Struktur hat keine. Du solltest die Kategorieren ggfs. entfernen um Inkonsistenzen zu vermeiden", +"The following pages are in categories that the structure is not in. You may wish to recategorize them in order to be consistent" => "Die folgenden Seiten haben Kategorien, die der Struktur aber nicht zugeordnet ist. Du solltest ggfs. die Kategorien angleichen, um Inkonstenzen zu vermeiden", "Edit structure" => "Struktur bearbeiten", "View structure" => "Struktur ansehen", "Export Pages" => "Seiten exportieren", @@ -13864,7 +13864,7 @@ "Copy page" => "Kopiere Seite", "Invalid page name" => "Ungültiger Seitenname", "The page name specified contains unallowed characters. It will not be possible to save the page until those are removed: <strong>%0</strong>" => "Der angegebene Seitenname enthält ungültige Zeichen. Ein Speichern der Seite ist nicht möglich, bevor diese nicht entfernt werden: <strong>%0</strong>", -"The page name specified contains characters that may render the page hard to access. You may want to consider removing those: <strong>%0</strong>" => "Der angegebene Seitenname enthält Zeichen, die den Zugriff auf die Seite erschweren können. You solltest diese ggf. entfernen: <strong>%0</strong>", +"The page name specified contains characters that may render the page hard to access. You may want to consider removing those: <strong>%0</strong>" => "Der angegebene Seitenname enthält Zeichen, die den Zugriff auf die Seite erschweren können. Du solltest diese ggfs. entfernen: <strong>%0</strong>", "Use this name anyway" => "Benutze diesen Namen trotzdem", "Quick Create Multilanguage Pages" => "Schnell mehrsprachige Seiten erstellen", "Following pages were created, as translations of each other" => "Die folgenden Seiten wurden als Übersetzung voneinander erstellt", @@ -13882,7 +13882,7 @@ "Please contact the Site Administrator" => "Bitte kontaktieren sie den Administrator der Site.", "<a href=\"tiki-directory_admin_categories.php\">Add a directory category now</a>" => "<a href=\"tiki-directory_admin_categories.php\">Füge jetzt eine Verzeichniskategorie hinzu</a>", "Site added" => "Link hinzugefügt", -"The following site was added, but may require validation by the admin before appearing on the lists." => "Der folgende Link wurde hinzugefügt, muss aber ggf. durch einen Admin geprüft werden, bevor er in der Liste erscheint.", +"The following site was added, but may require validation by the admin before appearing on the lists." => "Der folgende Link wurde hinzugefügt, muss aber ggfs. durch einen Admin geprüft werden, bevor er in der Liste erscheint.", "Edit a site" => "Eine Site bearbeiten", "Add a Site" => "Link hinzufügen", "Directory Categories" => "Verzeichniskategorien", @@ -14141,7 +14141,7 @@ "Export languages" => "Sprachen exportieren", "No translations in the database available to export. First translate strings using interactive translation or \"Edit languages\" tab" => "Keine Übersetzungen für den Export in der Datenbank vorhanden. Zuerst müssen Texte mittels interaktiver Übersetzung oder dem \"Sprachen bearbeiten\" Tab übersetzt werden", "Select the language to Export:" => "Wähle die zu exportierende Sprache aus:", -"If you click \"Download database translations\", you will download a file with all the translations in the database." => "Wenn Du auf \"Download database translations\" klickst, erhälst Du eine Datei mit allen Überetzungen in der Datenbank.", +"If you click \"Download database translations\", you will download a file with all the translations in the database." => "Wenn Du auf \"Lade die Datenbankübersetzungen herunter\" klickst, erhälst Du eine Datei mit allen Überetzungen in der Datenbank.", "If you click \"Write to language.php\", the translations in the database will be merged with the other translations in language.php. Note that after writing translations to language.php they are removed from the database." => "Wenn Du auf \"Schreibe in die Datei language.php\" klickst, wird die Übersetzung in der Datenbank zu den anderen Übersetzungen in der Datei language.php hinzugefügt. Beachte, dass die Übersetzungen hiernach aus der Datenbank gelöscht werden.", "To be able to write your translations back to language.php make sure that the web server has write permission in the lang/ directory" => "Um Deine Übersetzungen in die language.php Datei schreiben zu können, stelle sicher, dass der Webserver Schreibrechte in das lang/-Verzeichnis hat", "Download database translations" => "Lade die Datenbankübersetzungen herunter", @@ -14334,7 +14334,7 @@ "These fields" => "diese Felder", "Number of records" => "Anzahl der Einträge", "Zip export with attachments" => "Zip Export mit Anhängen", -"Dump All Tracker Items" => "Erstelle Dump von allen Trackereinträgen", +"Dump All Tracker Items" => "Erstelle Abzug von allen Trackereinträgen", "items" => "Einträge", "Dump" => "Datenbankabzug", "Admin FAQ" => "FAQ verwalten", @@ -14569,7 +14569,7 @@ "More information" => "Weitere >Informationen", "Install & Upgrade" => "Installation & Aktualisierung", "Install" => "Installieren", -"Failed to set max_execution_time for PHP. You may experience problems when creating/upgrading the database using this installer on a slow system. This can manifest itself by a blank page" => "Die Einstellung max_execution_time konnte für PHP nicht gesetzt werden. Du kannst ggf. Probleme haben, wenn Du die Datenbank mit diesem Installer auf einem langsamen System erstellst/aktualisierst. Dies kann dazu führen, dass leere Seiten angezeigt werden", +"Failed to set max_execution_time for PHP. You may experience problems when creating/upgrading the database using this installer on a slow system. This can manifest itself by a blank page" => "Die Einstellung max_execution_time konnte für PHP nicht gesetzt werden. Du kannst ggfs. Probleme haben, wenn Du die Datenbank mit diesem Installer auf einem langsamen System erstellst/aktualisierst. Dies kann dazu führen, dass leere Seiten angezeigt werden", "This install will populate (or upgrade) the database" => "Diese Installation führt zum Bestücken oder Aktualisieren der Datenbank", "If you want to upgrade from a previous Tiki release, ensure that you have read and understood the <a href=\"http://doc.tiki.org/Upgrade\" target=\"_blank\">Upgrade instructions</a>" => "Bevor Du Deine Tikiinstallation aktualisierst, lies bitte die <a href=\"http://doc.tiki.org/Upgrade\" target=\"_blank\">Upgradeanweisungen</a>", "A new install will populate the database" => "Eine neue Installation wird in die Datenbank vorgenommen", @@ -14582,7 +14582,7 @@ "Reinstall the database" => "Datenbank neu installieren", "Reinstall" => "Neu Installieren", "Warning: Category Permissions Will Not Be Upgraded" => "Warnung: Kategorienrechte werden nicht aktualisiert", -"Category permissions have been revamped since version 3. If you have been using category permissions, note that they may not work properly after upgrading to version 4 onwards, and it will be necessary to reconfigure them" => "Kategorieberechtigungen wurden seit der Version 3 umgestaltet. Wenn Du bisher Kategorieberechtigungen genutzt hast, beachte, dass diese nach der Aktualisierung zur Version 4 oder höher ggf. nicht mehr richtig funktionieren und neu konfiguriert werden müssen", +"Category permissions have been revamped since version 3. If you have been using category permissions, note that they may not work properly after upgrading to version 4 onwards, and it will be necessary to reconfigure them" => "Kategorieberechtigungen wurden seit der Version 3 umgestaltet. Wenn Du bisher Kategorieberechtigungen genutzt hast, beachte, dass diese nach der Aktualisierung zur Version 4 oder höher ggfs. nicht mehr richtig funktionieren und neu konfiguriert werden müssen", "Automatically upgrade your existing database to v" => "Automatische Aktualisierung Deiner existierenden Datenbank zu v", "This site has an admin account configured" => "Auf dieser Site ist ein Administratorkonto konfiguriert", "Please log in with your admin password to continue" => "Bitte melde Dich mit Deinem Administratorpasswort an, um fortzufahren", @@ -15405,7 +15405,7 @@ "Please wait a moment.." => "Bitte warte einen Moment..", "Upload interface is taking a long time to load or the load has failed" => "Hochlade-Interface braucht sehr lang zu laden oder das Laden ist fehlgeschlagen", "Please make sure that the Flash Plugin is enabled and that a working version of the Adobe Flash Player is installed" => "Stelle bitte sicher, dass das Flash Plugin aktiviert und eine funktionierende Version des Adobe Flash Player installiert ist", -"We are sorry: Upload interface could not load. You may need to install or upgrade Flash Player" => "Entschuldigung, aber das Hochlade-Interface kann nicht geladen werden. Du musst ggf. den Flash Player aktualisieren oder installieren", +"We are sorry: Upload interface could not load. You may need to install or upgrade Flash Player" => "Entschuldigung, aber das Hochlade-Interface kann nicht geladen werden. Du musst ggfs. den FlashPlayer aktualisieren oder installieren", "Visit the Adobe Website to get the Flash Player" => "Besuche die Adobe Website um den Flash Player zu erhalten", "Unzip zip files" => "Zipdateien entpacken", "File can be deleted after" => "Datei kann danach gelöscht werden", @@ -15840,7 +15840,7 @@ "Toggle display" => "Anzeige umschalten", "Page last modified on %0 by %1" => "Seite zuletzt geändert: am %0 von <span class='link'><span class='link'>%1</span></span>", "Created by %0" => "Erstellt von %0", -"Last Modification: %0 by %1" => "Letzte Änderung: Mittwoch 24 . November, 2010 08:41:45 UTC durch <span class='link'>gta74</span>", +"Last Modification: %0 by %1" => "Letzte Änderung: %0 by %1", "Creator & Last Editor" => "Ersteller & letzter Bearbeiter", "as Creator & Last Editor" => "als Ersteller & letzter Bearbeiter", "no (disabled)" => "keine (deaktiviert)", @@ -16554,4 +16554,5 @@ "Jump to forum:" => "Springe zu Forum:", "Memory usage:" => "Speicherverbrauch:", "Are you sure you want to delete menu id:" => "Bist Du sicher, dass Du das Menü mit folgender ID löschen willst:", +"To configure the toolbars on the various text editing areas select the section, and optionally check the comments checkbox, you want to edit and drag the icons from the left hand box to the toolbars on the right.<br />Drag icons back from the toolbar rows onto the full list to remove them.<br />Icons with <strong>bold</strong> labels are for wiki text areas, those that are <em>italic</em> are for WYSIWYG mode, and those that are <strong><em>bold and italic</em></strong> are for both.<br />To save the current set use the dropdown (and optionally check the comments checkbox) at the bottom of the page to set where you want these toolbars to appear, and click Save." => "Um die Toolbars in den verschiedenen Bereichen, in denen Text bearbeitet werden kann, zu verändern, wähle zuerst den Bereich und ggf. auch den Bereich Kommentare. Einzelne Icons können von den Listen in die Toolbars gezogen werden (drag & drop).<br /> Um ein Incon von den Toolbars wieder zu entfernen, muss man es nur in dei Liste zurückziehen.<br /> Icons mit <strong>fetter</strong> Bezeichnung sind für Wiki Textbereiche. <em>Kursive</em> sind für den WYSIWYG Editor und diejenigen, die sowohl <strong><em>fett und kursiv</em></strong> sind, sind für beide Bereiche.<br /> Zum Abspeichern der Toolbars wähle den Ansichtsmodus (oben), klicke auf Kommentare (wenn gewünscht) und klicke auf Speichern.", "###end###"=>"###end###"); Modified: branches/7.x/lang/fr/language.php =================================================================== --- branches/7.x/lang/fr/language.php 2011-05-10 20:52:20 UTC (rev 34371) +++ branches/7.x/lang/fr/language.php 2011-05-10 21:23:55 UTC (rev 34372) @@ -93,7 +93,7 @@ "(standard)" => "(standard)", "(unchanged)" => "(sans changement)", "-1 for never" => "-1 pour jamais", -"... but need admin validation" => "... Mais a besoin d'une validation de l'administrateur", +"... but need admin validation" => "... mais a besoin d'une validation de l'administrateur", "/" => "/", "0 for no refresh" => "0 pour ne pas rafraîchir", "0|1, display the parsed report definition" => "0|1, afficher la définition de rapport analysé", @@ -146,7 +146,7 @@ "aid?" => "aide ?", "Allocating too little memory will cause TikiWiki to display blank pages" => "Une trop faible allocation de mémoire provoque l'affichage de pages blanches", "Allow to manage thread defaults in each forum configuration" => "Permettre de configurer les paramètres par défaut des articles dans chaque configuation de forum", -"Allows to set tags on pages and various objects within the website and generate tag cloud navigation patterns" => "Allows to set tags on pages and various objects within the website and generate tag cloud navigation patterns", +"Allows to set tags on pages and various objects within the website and generate tag cloud navigation patterns" => "Permet de définir les mots-clés sur les pages et objets divers au sein du site et de générer des schémas de navigation nuage de tags", "Also available here" => "Disponible aussi là", "Alternate text that displays when image does not load" => "Texte à afficher lorsque l'image n'est pas chargée", "Alternate text to display if impossible to load the image" => "Texte alternatif à afficher si le chargement de l'image est impossible", @@ -168,7 +168,7 @@ "Assigning permissions for <b>all children</b> is recommended for best performance." => "Attribuer les permissions à <b>tous les enfants</b> est recommandé pour une meilleure performance.", "Assignments" => "Devoirs", "Aug" => "août", -"Authentication error; not a valid OpenID" => "Erreur d'authentification; identifiant OpenID invalide", +"Authentication error; not a valid OpenID" => "Erreur d'authentification ; identifiant OpenID invalide", "Author, if different from the Creator" => "Auteur, si différent du créateur", "Autovalidate suggestions" => "Validation automatique des suggestions", "Available languages (Ctrl+Click to select multiple languages)" => "Langues disponibles (faire Ctrl+Clic pour sélectionner plusieurs langues)", @@ -177,7 +177,7 @@ "being run" => "en cours d'exécution", "Below" => "Dessous", "Best Position" => "Meilleure position", -"Blog activity measurement can be more or less accurate" => "Blog activity measurement can be more or less accurate", +"Blog activity measurement can be more or less accurate" => "La mesure de l'activité du blogue peut être plus ou moins précise", "Blog comments settings" => "Configuration des commentaires de blogues", "Blog features" => "Fonctionnalités des blogues", "Blog level comments" => "Commentaires au niveau blogue", @@ -1277,7 +1277,7 @@ "Templates compiler" => "Compiler les gabarits", "Test mode" => "Mode Test", "Text Area" => "Zone de texte", -"Text displayed on the mouseover. The body contains the text of the page" => "Text displayed on the mouseover. The body contains the text of the page", +"Text displayed on the mouseover. The body contains the text of the page" => "Texte affiché lors du survol de souris. Le corps contient le texte de la page", "Text options: 1,size,prepend,append,max with size in chars, prepend will be displayed before the field append will be displayed just after, max is the maximum number of characters that can be saved, and initial 1 to make that next text field or checkbox is in same row. If you indicate only 1 it means next field is in same row too." => "Champ texte : 1, taille, préfixe, suffixe, max. - avec taille en caractères, le préfixe et le suffixe entourent le champ, max est le nombre maximal de caractères qui sera sauvegardé, et le 1 initial indique que la prochaine colonne doit se trouver sur la même rangée. Si vous indiquez seulement le 1, le champ suivant est dans la même rangée aussi.", "text, bold" => "texte, gras", "text, italic" => "texte, italique", @@ -1291,7 +1291,7 @@ "The \"Snarf Wikiplugin\" is installed. It can be used by wiki editors to include pages from the local network and via regex replacement create any html." => "Le plugiciel \"Snarf\" est installé. Il peut être utilisé par les éditeurs Wiki pour inclure des pages du réseau local et via le remplacement regexp créer n'importe quel page html.", "The article language to list" => "Langue de l'article à lire", "The article number that the list should start with" => "Le numéro d'article qui devrait être le premier de la liste", -"The character, by which ignored patterns are separated" => "The character, by which ignored patterns are separated", +"The character, by which ignored patterns are separated" => "Le caractère par lequel les patterns ignorés sont séparés", "The character, by which ignored patterns are separated.<br />" => "Le caractère par lequel les patterns ignorés sont séparés.<br />", "The connection was OK" => "Connexion réussie", "The copyright management feature is not enabled." => "La fonctionnalité copyright n'est pas activée.", @@ -1406,7 +1406,7 @@ "To learn more about the <a class=\"rbox-link\" target=\"tikihelp\" href=\"http://workflow.tiki.org\">Galaxia workflow engine</a>" => "Pour apprendre plus le <a class=\"rbox-link\" target=\"tikihelp\" href=\"http://workflow.tiki.org\">workflow Galaxia</a>", "To learn more, visit: <a href=\"http://www.tiki.org\" title=\"The Tikiwiki Community\" target=\"_blank\">http://www.tiki.org</a>" => "Pour en savoir plus, visitez: <a href=\"http://www.tiki.org\" title=\"The Tikiwiki Community\" target=\"_blank\">http://www.tiki.org</a>", "to register" => "Enregistrer", -"To run this installer in your language, use <strong>tiki-install.php?lang=XX</strong> where <strong>XX</strong> is the two-letter code for your language" => "To run this installer in your languagPour installez en francais, utilisez <strong>tiki-install.php?lang=fr</strong>", +"To run this installer in your language, use <strong>tiki-install.php?lang=XX</strong> where <strong>XX</strong> is the two-letter code for your language" => "Pour installer en francais, utilisez <strong>tiki-install.php?lang=fr</strong>", "To secure your Tiki installation - and if you are using Apache web server - you should rename the <span style=\"font-weight: bold\">_htaccess</span> file to <span style=\"font-weight: bold\">.htaccess</span> (this file is in the main directory)" => "Pour sécuriser votre installation de Tiki - et si vous utilisez le serveur web Apache - vous devriez renommer le fichier <span style=\"font-weight: bold\">_htaccess</span> en <span style=\"font-weight: bold\">.htaccess</span> (ce fichier est placé dans le répertoire principal)", "To submit a feature request or to report a bug" => "To submit a feature request or to report a bug", "To submit your site to TikiWiki.org" => "To submit your site to TikiWiki.org", @@ -1863,7 +1863,7 @@ "\$feature_label" => "\$feature_label", "Use different URL as home page" => "Utiliser une page différente pour la page d'accueil", "Can receive tasks from other users" => "Peut se voir affecter des tâches par d'autres utilisateurs", -"Can admin any mypage" => "Droit d'administrer les mespages", +"Can admin any mypage" => "Droit d'administrer toute page personnelle", "Can administer paymenrs" => "Peut administrer les paiements", "Can assign perms to mypage" => "Droit d'assigner des permissions aux mespages", "Can edit any mypage" => "Droit d'édition de toutes les mespages", @@ -2162,7 +2162,7 @@ "This search feature and the <a href=\"tiki-edit_perspective.php\">perspectives GUI</a> need <a href=\"http://dev.tiki.org/Dynamic+Preferences\">dev.tiki.org/Dynamic+Preferences</a>. If you search for something and it's not appearing, please help improve keywords/descriptions" => "Cette recherche de fonctionnalités ainsi que <a href=\"tiki-edit_perspective.php\">l'interface des prespectives</a> ont besoin d'une page <a href=\"http://dev.tiki.org/Dynamic+Preferences\">http://dev.tiki.org/Dynamic+Preferences</a>. Si votre recherche est infructueuse, aidez nous à améliorer les descriptions et les mots clef des préférences", "Parse wiki syntax within the code snippet" => "Interpréter la syntaxe wiki à l'intèrieur des bouts de code", "Parse wiki syntax within the html code" => "Interpréter la syntaxe wiki à l'intérieur du code HTML", -"Admin Posts" => "Administrer les messages", +"Admin Posts" => "Administrer les Publications", "feature sitemycode" => "feature sitemycode", "sitemycode publish" => "sitemycode publish", "feature sitesearch" => "feature sitesearch", @@ -2322,15 +2322,15 @@ "Added since the beginning of the day" => "Ajouté depuis le début du jour", "Added(a) or viewed(v) since the beginning of the day" => "Ajouté (a) ou vu (v) depuis le début du jour", "Added last 7 days" => "Ajouté depuis 7 jours", -"Added(a) or viewed(v) last 7 days" => "Ajouté(a) ou vu(v) depuis 7 jours", +"Added(a) or viewed(v) last 7 days" => "Ajouté (a) ou vu (v) depuis 7 jours", "Added since the beginning of the week" => "Ajouté depuis le début de la semaine", "Added(a) or viewed(v) since the beginning of the week" => "Ajouté (a) ou vu (v) depuis le début de la semaine", "Added last month" => "Ajouté depuis 1 mois", -"Added(a) or viewed(v) last month" => "Ajouté(a) ou vu(v) depuis 1 mois", +"Added(a) or viewed(v) last month" => "Ajouté (a) ou vu (v) depuis 1 mois", "Added since the beginning of the month" => "Ajouté depuis le début du mois", "Added(a) or viewed(v) since the beginning of the month" => "Ajouté (a) ou vu (v) depuis le début du mois", "Added last year" => "Ajouté depuis 1 an", -"Added(a) or viewed(v) last year" => "Ajouté(a) ou vu(v) depuis 1 an", +"Added(a) or viewed(v) last year" => "Ajouté (a) ou vu (v) depuis 1 an", "Added since the beginning of the year" => "Ajouté depuis le début de l'année", "Added(a) or viewed(v) since the beginning of the year" => "Ajouté (a) ou vu (v) depuis le début de l'année", "Login SSO" => "Connexion SSO", @@ -2385,9 +2385,9 @@ "Indicate various debug-related information in the footer of the site (Execution time, Memory usage, etc.)" => "Affiche diverses informations de déboggage dans le pied de page du site (temps d'exécution, utilisation mémoire, etc.)", "Bottom bar (RSS)" => "Barre du bas (RSS)", "Download your draft" => "Télécharger votre brouillon", -"Add a Powered by Tiki link on your site's footer" => "Ajouter un lien Powered by Tiki dans le footer de votre site", +"Add a Powered by Tiki link on your site's footer" => "Ajouter un lien Powered by Tiki dans le pied de votre site", "File galleries" => "Galeries de fichiers", -"Alphanumeric code requierd to complete the registration" => "Code alphanumérique demandé pour compléter l'enregistrement", +"Alphanumeric code requierd to complete the registration" => "Code alphanumérique requis pour compléter l'enregistrement", "Use generally only for development, or during the start of an application, not in production because these warnings can be, folowing options used, to emails text as well, and visible to the users" => "A n\\'utiliser générallement que pendant un developpement ou lors du démarrage d'une application, pas en production, parce que, suivant les options choisies, ces informations peuvent être affichées dans le texte des e-mails", "Refresh mode" => "Mode de rafraichissement", "Use 0 for no refresh" => "Utiliser 0 pour désactiver le rafraichissement", @@ -2600,7 +2600,7 @@ "Task is not accepted/rejected by other user" => "Cette tâche est en attente de refus/acceptation par d'autres utilisateurs", "Move into Trash" => "Mettre dans la corbeille", "%m/%d/%Y [%H:%M]" => "%d/%m/%Y [%H:%M]", -"A user edited an article" => "Un utilisateur a édité un article", +"A user edited an article" => "Un utilisateur a modifié un article", "A user deleted an article" => "Un utilisateur a supprimé un article", "A user created a wiki page in a language" => "Un utilisateur a créé une page wiki dans une langue", "No topics yet" => "Aucun sujet pour l'instant", @@ -2608,7 +2608,7 @@ "Google Maps is not enabled." => "Google Maps n'est pas activée.", "Save the page as a draft." => "Enregistrer la page comme brouillon.", "Save Draft" => "Enregistrer brouillon", -"Any wiki page is changed" => "Une page Wiki est changée", +"Any wiki page is changed" => "Toute page wiki est changée", "Any wiki page is changed, even minor changes" => "Une page Wiki est modifiée, même si les modifications sont mineures", "PHP error" => "Erreur PHP", "Could not read file %s." => "Impossible de lire le fichier %s.", @@ -2872,9 +2872,9 @@ // "Tiki Connect" => "Tiki Connect", // "Connect your Tiki with the community by sending anonymised statistical data to tiki.org" => "Connect your Tiki with the community by sending anonymised statistical data to tiki.org", // "How often to send information (in hours)" => "How often to send information (in hours)", -// "weekly" => "weekly", +"weekly" => "par semaine", // "Tiki Connect Server URL" => "Tiki Connect Server URL", -// "Where to send the information" => "Where to send the information", +"Where to send the information" => "Où envoyer l'information", // "Clear to initiate immediate send" => "Clear to initiate immediate send", // "Send site information" => "Send site information", // "Additionally send keywords, location etc to tiki.org so you can connect with Tikis near you" => "Additionally send keywords, location etc to tiki.org so you can connect with Tikis near you", @@ -3062,7 +3062,7 @@ // "Dice roll performed on every request. When successful, will recalculate a certain number of votes" => "Dice roll performed on every request. When successful, will recalculate a certain number of votes", // "Use ReCaptcha, a specialized captcha service, instead of default CAPTCHA" => "Use ReCaptcha, a specialized captcha service, instead of default CAPTCHA", // "Parse the results" => "Parse the results", -// "When object filter is not on, limit to search one type of object" => "When object filter is not on, limit to search one type of object", +"When object filter is not on, limit to search one type of object" => "Quand le filtre d'objet n'est pas actif, limiter la recherche à un type d'objet", "Autocomplete on page names" => "Auto-complétion sur les noms de page", // "Protect all sessions" => "Protect all sessions", // "Always redirect to HTTPS to prevent session hijack through network sniffing" => "Always redirect to HTTPS to prevent session hijack through network sniffing", @@ -3201,7 +3201,7 @@ // "blog post" => "blog post", // "forum post" => "forum post", // "trackeritem" => "trackeritem", -// "has accessed the following shared content" => "has accessed the following shared content", +"has accessed the following shared content" => "A accédé au contenu partagé suivant", // "Handling actions of plugin \"%s\" failed" => "Handling actions of plugin \"%s\" failed", // "Last shoutbox messages" => "Last shoutbox messages", // "Tiki RSS feed for shoutbox messages" => "Tiki RSS feed for shoutbox messages", @@ -3422,7 +3422,7 @@ // "MeetingID provided by BigBlueButton" => "MeetingID provided by BigBlueButton", "Anonymous prefix" => "Préfixe anonyme", // "Unregistered users will get this token prepended to their name" => "Unregistered users will get this token prepended to their name", -// "Welcome Message" => "Welcome Message", +"Welcome Message" => "Message de bienvenue", "Dial Number" => "Numéro d'appel", // "The phone-in support number to join from traditional phones" => "The phone-in support number to join from traditional phones", // "Voice Bridge" => "Voice Bridge", @@ -3607,7 +3607,7 @@ // "Horizontal alignments for header cells separated by |. Choices: left, right, center, justify" => "Horizontal alignments for header cells separated by |. Choices: left, right, center, justify", // "Header Vertical Align" => "Header Vertical Align", "Pre-sorted Columns" => "Colonnes pré-triées", -// "Column widths followed by px for pixels or % for percentages. Each column separated by |" => "Column widths followed by px for pixels or % for percentages. Each column separated by |", +"Column widths followed by px for pixels or % for percentages. Each column separated by |" => "Largeurs de colonnes suivies de px pour pixels ou % pour pourcentages. Chaque colonne séparée par |", // "Cell Horizontal Align" => "Cell Horizontal Align", // "Cell Vertical Align" => "Cell Vertical Align", // "Link to a file that\\'s attached or in a file gallery or archive. See PluginFiles for more functionality" => "Link to a file that\\'s attached or in a file gallery or archive. See PluginFiles for more fu... [truncated message content] |
From: <jon...@us...> - 2011-05-12 19:05:49
|
Revision: 34387 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34387&view=rev Author: jonnybradley Date: 2011-05-12 19:05:40 +0000 (Thu, 12 May 2011) Log Message: ----------- [FIX] modules: Make sure save button is hidden in all themes (some have styling on the outer span as well as the anchor) Modified Paths: -------------- branches/7.x/css/admin.css branches/7.x/lib/modules/tiki-admin_modules.js Modified: branches/7.x/css/admin.css =================================================================== --- branches/7.x/css/admin.css 2011-05-12 18:56:41 UTC (rev 34386) +++ branches/7.x/css/admin.css 2011-05-12 19:05:40 UTC (rev 34387) @@ -353,6 +353,10 @@ display: none; } +#save_modules { + display: none; +} + /* end modules revamp */ /* tiki 7 theme generator * Modified: branches/7.x/lib/modules/tiki-admin_modules.js =================================================================== --- branches/7.x/lib/modules/tiki-admin_modules.js 2011-05-12 18:56:41 UTC (rev 34386) +++ branches/7.x/lib/modules/tiki-admin_modules.js 2011-05-12 19:05:40 UTC (rev 34387) @@ -49,7 +49,8 @@ revert: 200, stop: function (event, ui) { if ($("#save_modules a:visible").length === 0) { - $("#save_modules a").show("fast").attr("sortable", $(this).attr("id")); + $("#save_modules a").show("fast").attr("sortable", $(this).attr("id")) + .parent().show("fast"); modAdminDirty = true; } }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-05-13 13:38:26
|
Revision: 34391 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34391&view=rev Author: jonnybradley Date: 2011-05-13 13:38:19 +0000 (Fri, 13 May 2011) Log Message: ----------- [MOD] Move feature_syntax_highlighter (code mirror) into experimental and default to off for 7.0 Modified Paths: -------------- branches/7.x/lib/prefs/feature.php branches/7.x/lib/setup/prefs.php branches/7.x/templates/tiki-admin_include_features.tpl Modified: branches/7.x/lib/prefs/feature.php =================================================================== --- branches/7.x/lib/prefs/feature.php 2011-05-12 22:24:12 UTC (rev 34390) +++ branches/7.x/lib/prefs/feature.php 2011-05-13 13:38:19 UTC (rev 34391) @@ -1778,6 +1778,7 @@ 'type' => 'flag', 'help' => 'CodeMirror', 'description' => tra('Enables syntax highlighting with the use of CodeMirror'), + 'warning' => tra('Experimental. This feature is still under development.'), ), ); } Modified: branches/7.x/lib/setup/prefs.php =================================================================== --- branches/7.x/lib/setup/prefs.php 2011-05-12 22:24:12 UTC (rev 34390) +++ branches/7.x/lib/setup/prefs.php 2011-05-13 13:38:19 UTC (rev 34391) @@ -1906,7 +1906,7 @@ 'unified_default_content' => array('contents', 'title'), // Syntax Highlighter - 'feature_syntax_highlighter' => 'y', + 'feature_syntax_highlighter' => 'n', 'feature_accounting' => 'n', Modified: branches/7.x/templates/tiki-admin_include_features.tpl =================================================================== --- branches/7.x/templates/tiki-admin_include_features.tpl 2011-05-12 22:24:12 UTC (rev 34390) +++ branches/7.x/templates/tiki-admin_include_features.tpl 2011-05-13 13:38:19 UTC (rev 34391) @@ -159,7 +159,6 @@ <fieldset> <legend class="heading">{icon _id="star"} <span>{tr}New{/tr}</span></legend> <p class="description">{tr}These features are relatively new, or recently underwent major renovations. You should expect growing pains and possibly a lack of up to date documentation, as you would of a version 1.0 application{/tr}</p> - {preference name=feature_syntax_highlighter} {preference name=feature_invite} {preference name=feature_quick_object_perms} {preference name=feature_webdav} @@ -193,6 +192,7 @@ <fieldset> <legend class="heading">{icon _id="new"} <span>{tr}Fresh out of the oven{/tr}</span></legend> + {preference name=feature_syntax_highlighter} {preference name=feature_credits} {preference name=feature_loadbalancer} {preference name=feature_socialnetworks} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-05-13 18:41:29
|
Revision: 34402 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34402&view=rev Author: jonnybradley Date: 2011-05-13 18:41:23 +0000 (Fri, 13 May 2011) Log Message: ----------- [FIX] autosave/preview: Don't double encode and decode the autoSaveId - was breaking preview etc on pages with accented chars in the pagename. (thanks Burghard and devels) Modified Paths: -------------- branches/7.x/lib/ajax/autosave.js branches/7.x/tiki-auto_save.php Modified: branches/7.x/lib/ajax/autosave.js =================================================================== --- branches/7.x/lib/ajax/autosave.js 2011-05-13 18:18:50 UTC (rev 34401) +++ branches/7.x/lib/ajax/autosave.js 2011-05-13 18:41:23 UTC (rev 34402) @@ -141,7 +141,7 @@ h = h && h.length ? h[1] : ""; $.get("tiki-auto_save.php", { editor_id: editorId, - autoSaveId: escape(autoSaveId), + autoSaveId: autoSaveId, inPage: true, hdr: h, allowHtml: allowHtml Modified: branches/7.x/tiki-auto_save.php =================================================================== --- branches/7.x/tiki-auto_save.php 2011-05-13 18:18:50 UTC (rev 34401) +++ branches/7.x/tiki-auto_save.php 2011-05-13 18:41:23 UTC (rev 34402) @@ -63,7 +63,6 @@ send_ajax_response( $_REQUEST['command'], $res ); } else if (isset($_REQUEST['autoSaveId'])) { // wiki page previews - $_REQUEST['autoSaveId'] = urldecode($_REQUEST['autoSaveId']); $autoSaveIdParts = explode(':', $_REQUEST['autoSaveId']); // user, section, object id if (count($autoSaveIdParts) === 3 && !empty($user) && $user === $autoSaveIdParts[0] && $autoSaveIdParts[1] === 'wiki_page') { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-05-14 11:21:41
|
Revision: 34418 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34418&view=rev Author: jonnybradley Date: 2011-05-14 11:21:34 +0000 (Sat, 14 May 2011) Log Message: ----------- [FIX] mobile: Link to better "latest build" jqm lib instead of the "test" repo, also obey minified prefs Modified Paths: -------------- branches/7.x/lib/prefs/mobile.php branches/7.x/tiki-setup.php Modified: branches/7.x/lib/prefs/mobile.php =================================================================== --- branches/7.x/lib/prefs/mobile.php 2011-05-14 04:01:40 UTC (rev 34417) +++ branches/7.x/lib/prefs/mobile.php 2011-05-14 11:21:34 UTC (rev 34418) @@ -91,9 +91,9 @@ ), 'mobile_use_latest_lib' => array( 'name' => tra('Use Latest Library'), - 'description' => tra('Use latest test version of the jquery.mobile'), + 'description' => tra('Use latest version of the jquery.mobile'), 'help' => 'Mobile', - 'warning' => tra('Caution: Uses jqm development server, please use sparingly.'), + 'warning' => tra('Uses latest build from jquery.com CDN.'), 'type' => 'flag', 'dependencies' => array( 'mobile_feature', Modified: branches/7.x/tiki-setup.php =================================================================== --- branches/7.x/tiki-setup.php 2011-05-14 04:01:40 UTC (rev 34417) +++ branches/7.x/tiki-setup.php 2011-05-14 11:21:34 UTC (rev 34418) @@ -224,12 +224,14 @@ $headerlib->add_jsfile( 'lib/jquery_tiki/tiki-jquery.mobile.js' ); + $jsmin = $prefs['tiki_minify_javascript'] === 'y' ? '.min' : ''; + $cssmin = $prefs['tiki_minify_css'] === 'y' ? '.min' : ''; if ($prefs['mobile_use_latest_lib'] === 'y') { - $headerlib->add_jsfile( 'http://jquerymobile.com/test/js/' ); - $headerlib->add_cssfile( 'http://jquerymobile.com/test/themes/default/' ); + $headerlib->add_jsfile( "http://code.jquery.com/mobile/latest/jquery.mobile$jsmin.js" ); + $headerlib->add_cssfile( "http://code.jquery.com/mobile/latest/jquery.mobile$cssmin.css" ); } else { - $headerlib->add_jsfile( 'lib/jquery/jquery.mobile/jquery.mobile.js' ); - $headerlib->add_cssfile( 'lib/jquery/jquery.mobile/jquery.mobile.css' ); + $headerlib->add_jsfile( "lib/jquery/jquery.mobile/jquery.mobile$jsmin.js" ); + $headerlib->add_cssfile( "lib/jquery/jquery.mobile/jquery.mobile$cssmin.css" ); } $headerlib->drop_cssfile('css/cssmenus.css'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sam...@us...> - 2011-05-17 17:48:22
|
Revision: 34457 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34457&view=rev Author: sampaioprimo Date: 2011-05-17 17:48:12 +0000 (Tue, 17 May 2011) Log Message: ----------- backporting translations done on i18n.tiki.org Modified Paths: -------------- branches/7.x/lang/de/language.php branches/7.x/lang/fr/language.php Property Changed: ---------------- branches/7.x/ Property changes on: branches/7.x ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33677,33681,33708-33712,33851-33853,33873,33956-33957,33959-33961,34050,34052,34102-34104,34202-34203,34369-34371 + /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31409,33409 /branches/experimental/big-blue-button:26681-26698 /branches/experimental/declfilter:15787-16031 /branches/experimental/edit_fixup:20923-21573 /branches/experimental/kaltura_integration_two:20962-22011 /branches/experimental/moz-metrics:23452-23480 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402 /branches/experimental/xajax_removal:31497 /branches/proposals/4.x:24005 /trunk:33677,33681,33708-33712,33851-33853,33873,33956-33957,33959-33961,34050,34052,34102-34104,34202-34203,34369-34371,34455-34456 Modified: branches/7.x/lang/de/language.php =================================================================== --- branches/7.x/lang/de/language.php 2011-05-17 17:33:42 UTC (rev 34456) +++ branches/7.x/lang/de/language.php 2011-05-17 17:48:12 UTC (rev 34457) @@ -4792,7 +4792,7 @@ // "Weight" => "Weight", // "Metric Name" => "Metric Name", // "For list-based metrics, include the \"LIMIT #\" in your query" => "For list-based metrics, include the \"LIMIT #\" in your query", -// "Show hidden modules" => "Show hidden modules", +"Show hidden modules" => "Zeige versteckte Module", // "Hide hidden modules" => "Hide hidden modules", // "Groups included through inheritence" => "Groups included through inheritence", // "Unsubscribed" => "Unsubscribed", Modified: branches/7.x/lang/fr/language.php =================================================================== --- branches/7.x/lang/fr/language.php 2011-05-17 17:33:42 UTC (rev 34456) +++ branches/7.x/lang/fr/language.php 2011-05-17 17:48:12 UTC (rev 34457) @@ -219,12 +219,12 @@ "End activity is not reachable from start activity" => "L'activité finale ne peut être atteinte depuis l'activité initiale", "Ended" => "Terminé", "english" => "anglais", -"Enter a character to use as the delimiter when displaying page names. All characters after the delimiter will be stripped when displaying the page name.</em>" => "Saisissez un caractère à utiliser en tant que délimiteur lors de l'affichage de noms de pages. Tous les caractères après le délimiteur seront masqués à l'affichage du nom de page.", +"Enter a character to use as the delimiter when displaying page names. All characters after the delimiter will be stripped when displaying the page name.</em>" => "Saisir un caractère à utiliser en tant que délimiteur lors de l'affichage de noms de pages. Tous les caractères après le délimiteur seront masqués à l'affichage du nom de page.", "Enter the name of this instance" => "Donner le nom de cette instance", "Enter Tiki" => "Accéder à Tiki", -"Enter TikiWiki <em>without</em> disabling the installation script" => "Entrer dans TikiWiki <em>sans</em> désactiver les scripts d'installation", +"Enter TikiWiki <em>without</em> disabling the installation script" => "Entrer dans TikiWiki <em>sans</em> désactiver le script d'installation", "Enter your TNS Name here and leave Host empty" => "Entrez votre nom 'TNS' à cet endroit et laissez le champ 'Adresse Internet' vide", -"Entering TikiWiki" => "Entrer dans TikiWiki", +"Entering TikiWiki" => "Entrée dans TikiWiki", "entire location" => "fil d'Ariane complet", "Ephemerides Admin" => "Administrer les éphémérides", "Ephemerides" => "Éphémérides", @@ -403,10 +403,10 @@ "Icon ID" => "Icon ID", "ID3 Tag Color" => "Couleur des tags ID3", "if no jscalendar" => "Si jscalendar non activé", -"if not" => "if not", +"if not" => "si non", "If passwords </em>are not<em> plain text, reset instructions will be emailed to the user" => "Si le mot de passe </em>n'est pas stocké</em> en texte clair, les informations pour réinitialiser seront envoyées par email à l'utilisateur", "If passwords </em>are stored<em> as plain text, the password will be emailed to the user" => "Si le mot de passe </em>est stocké <em> en texte clair, il sera envoyé par email à l'utilisateur", -"If set to \"y\", the date at which comments were posted is not displayed in the module box" => "Si la valeur égale \"y\", la date à laquelle les commentaires ont été reportés n'est affichée dans le champ du module", +"If set to \"y\", the date at which comments were posted is not displayed in the module box" => "Si réglé sur \"y\", la date à laquelle les commentaires ont été reportés n'est affichée dans le champ du module", "If set to \"y\", the post on which a comment is made is not displayed in the module box, but instead moved in the item\\'s tooltip" => "Si la valeur égale \"y\", la mise à jour qui contient le commentaire n'est affichée dans le champ du module, mais au contraire se trouve au point de l'outil", "If the page does not exist, Tiki will create it" => "Si la page n'existe pas, Tiki la créera", "If you can't see the game then you need a flash plugin for your browser" => "Si le jeu ne s'affiche pas à l'écran, vous avez besoin du module d'extension Flash", @@ -438,7 +438,7 @@ "Include a page\\'s content" => "Inclure le contenu d\\'une page", "Include the content of a remote HTTP page. Regular expression selecting the content portion to include must be specified" => "Inclure le contenu d\\'une page HTTP externe. Une expression régulière selectionnant la portion à inclure doit être must be specifiée", "Includes a calendar and/or a list of calendar events" => "Inclut un calendrier et/ou une liste d'évènements calendaires", -"Includes a calendar or a list of calendar events" => "Includes a calendar or a list of calendar events", +"Includes a calendar or a list of calendar events" => "Inclut un calendrier ou une liste d'évènements du calendrier", "Includes an article\\'s content within the page" => "Inclut le contenu d\\'un article dans la page", "Includes content from the dynamic content system" => "Inclure le contenu provenant des contenues dynamiques", "Includes random content from the dynamic content system" => "Inclut un contenu aléatoire depuis le système de contenu dynamique", @@ -1486,15 +1486,15 @@ "Urgent Translation" => "Traduction Urgente", "URL to the image." => "URL de l'image.", "Use %1 for where internal file name should be substituted (example: \"strings %1\" to convert the document to text using the unix strings command)" => "Utiliser %1 pour indiquer le nom du fichier interne dans la commande (exemple: \"strings %1\" pour convertir le fichier en texte en utilisant la commande unix strings)", -"Use <strong>-1</strong> for never" => "Utilisez <strong>-1</strong> pour jamais", +"Use <strong>-1</strong> for never" => "Utiliser <strong>-1</strong> pour jamais", "Use <strong>0</strong> for no caching" => "Utiliser <strong>0</strong> pour désactiver la mise en cache", "Use @version:x.x specified in theme css or 1.8 if not specified" => "Utiliser @version:x.x spécifiée dans le thème css ou 1.8 si non spécifiée", "Use @version:x.x specified in theme css or 1.9 if not specified" => "Utiliser @version:x.x spécifiée dans le thème css ou 1.9 si non spécifiée", "Use @version:x.x specified in theme css or 2.0 if not specified" => "Utiliser @version:x.x spécifiée dans le thème css ou 2.0 si non spécifiée", "Use @version:x.x specified in theme css or none if not specified" => "Utiliser @version:x.x spécifiée dans le thème css ou aucune si non spécifiée", -"Use BLOGLIST to include posts from a blog" => "Utiliser BLOGLIST pour inclure des posts d'un blogue", -"Use cache for external images" => "Utiliser l'antémémoire pour les images externes", -"Use cache for external pages" => "Utiliser l'antémémoire pour les pages externes", +"Use BLOGLIST to include posts from a blog" => "Utiliser BLOGLIST pour inclure des publications d'un blogue", +"Use cache for external images" => "Utiliser le cache pour les images externes", +"Use cache for external pages" => "Utiliser le cache pour les pages externes", "Use categories to regroup various Tiki objects" => "Utilisez les catégories pour regrouper différents objets Tiki", "Use context menus for actions (icons) (only in file galleries yet)" => "Utiliser les menus contextuels pour les actions (icônes) (seulement dans les galeries de fichiers pour l'heure)", "Use context menus for actions (text) (only in file galleries yet)" => "Utiliser les menus contextuels pour les actions (texte) (seulement dans les galeries de fichiers pour l'heure)", @@ -2000,7 +2000,7 @@ "Shows Number of Files" => "Afficher le nombre de fichiers", "Shows the slideshow of a gallery" => "Afficher le diaporama de la galerie", "Include literal HTML" => "Inclure du code HTML", -"Anti-Bot verification code" => "Code de vérification anti-bot", +"Anti-Bot verification code" => "Code de vérification anti-robot", "Reply to the selected commwent" => "Répondre au commentaire sélectionné", "Comment on the selected post" => "Répondre au commentaire sélectionné", "A new article was submitted by {\$mail_user} to {\$mail_site} at {\$mail_date|tiki_short_datetime}" => "Un nouvel article a été soumis par {\$mail_user} sur {\$mail_site} le {\$mail_date|tiki_short_datetime}", @@ -2037,7 +2037,7 @@ "Wysiwyg means What You See Is What You Get, and is handled in Tikiwiki by <a href=\"http://fckeditor.net\">FCKeditor</a>" => "Wysiwyg signifie \"What You See Is What You Get\" (Ce que vous avez est ce que vous obtenez) et est implémenté dans Tikiwiki par <a href=\"http://fckeditor.net\">FCKeditor</a>", "Custom Categories" => "Catégories configurables", "Use wysiwyg editor" => "Utiliser un éditeur Wysiwyg", -"Use normal editor" => "Utiliser un éditeur non Wysiwyg", +"Use normal editor" => "Utiliser l'éditeur normal", "tiki admin external wikis template" => "gabarit de l'administration des Wiki externes", "There are individual permissions set for this forum" => "Des droits d'accès individuels ont été mis sur ce forum", "Add a subscription newsletters" => "Ajouter un abonné à une lettre d'informations", @@ -2138,7 +2138,7 @@ "If set to \"y\", events are displayed with their calendar's custom background color (if one is set)" => "Si réglé sur \"y\", les évènements sont affichés avec la couleur personnalisée d'arrière-plan du calendrier (si une a été configurée)", "If set to \"y\", the name of the object on which a comment is made is not displayed in the module box, but instead moved in the item's tooltip" => "Si réglé sur \"y\", le nom de l'objet sur lequel un commentaire a été fait n'est pas affiché dans la boite du module, mais au contraire déplacé dans le cadre astuce de l'article ", "If set to \"y\", the post on which a comment is made is not displayed in the module box, but instead moved in the item's tooltip" => "Si réglé sur \"y\", la publication sur laquelle un commentaire a été fait n'est pas affichée dans la boite du module, mais au contraire déplacé dans le cadre astuce de l'article", -"If set, displays an image for each article if one applies, with the given width (in pixels). The article's own image is used, with a fallback to the article's topic image" => "Si configuré, affiche une image pour chaque article si une s'applique, avec la largeur donnée (en pixels). L'image de l'article lui-même est utilisée, avec un repli sur l'image du sujet de l'article", +"If set, displays an image for each article if one applies, with the given width (in pixels). The article's own image is used, with a fallback to the article's topic image" => "Si défini, affiche une image pour chaque article si une s'applique, avec la largeur donnée (en pixels). L'image de l'article lui-même est utilisée, avec un repli sur l'image du sujet de l'article", "Include a page's content" => "Inclure le contenu d'une page", "Includes an article's content within the page" => "Inclut le contenu d'un article à l'intérieur de la page", "Instead of creating new usernames, use the user's email address for authentication" => "Au lieu de créer de nouveaux noms d'utilisateurs, utiliser l'adresse e-mail de l'utilisateur pour identification", @@ -2150,7 +2150,7 @@ "Sets the div's id attribute, as defined by HTML" => "Sets the div's id attribute, as defined by HTML", "Tracker Field ID containing the element's group. Elements of a same group are displayed on the same row" => "Tracker Field ID containing the element's group. Elements of a same group are displayed on the same row", "Unless set to \"ignore\", the module changes the reference point in time from the user's last login date and time to a day where users browse to using the calendar" => "Unless set to \"ignore\", the module changes the reference point in time from the user's last login date and time to a day where users browse to using the calendar", -"URL of the product's information. The URL may be relative or absolute (begin with http://)" => "URL of the product's information. The URL may be relative or absolute (begin with http://)", +"URL of the product's information. The URL may be relative or absolute (begin with http://)" => "Lien ou URL de l'information sur le produit. L'URL peut être relative ou absolue (commence par http://)", "When accessing a page which has an equivalent in the user's preferred language, favor the translated page" => "When accessing a page which has an equivalent in the user's preferred language, favor the translated page", "Whether obey article type's \"show before publish\" and \"show after expiry\" settings" => "Whether obey article type's \"show before publish\" and \"show after expiry\" settings", "Unless you have a reason to, you should use MySQL Full-Text Search feature instead" => "Sauf à avoir une bonne raison, vous devez utiliser la recherche « Full-Text » de MySQL", @@ -2209,10 +2209,10 @@ "pluginalias thumb" => "pluginalias thumb", "User Levels" => "Niveaux Utilisateurs", "Custom code" => "Personnalisation du code", -"Url to go to when clicking on a username" => "Url utilisée lors d'un clique sur le nom d'utilisateur", +"Url to go to when clicking on a username" => "Url utilisée lors d'un clic sur le nom d'utilisateur", "Disable javascript" => "Désactiver javascript", "Disable javascript for testing purpose even if the browser allows it" => "Désactiver javascript pour les tests même si le navigateur l'autorise", -"Use CDN for Javascript" => "Utiliser CDN pour le Javascript", +"Use CDN for Javascript" => "Utiliser un CDN pour le Javascript", "Allow users to define icons for menus entries" => "Permettre aux utilisateurs de définir des icônes pour les menus", "Minify javascript" => "Compresser le code javascript", "Url a user is redirected to after account validation" => "Url vers laquelle l'utilisateur est redirigée après validation de son compte", @@ -2426,7 +2426,7 @@ "Insert back link on wiki page" => "Insère un lien de retour dans la page wiki", "List all pages that link to specific pages" => "Liste toutes les pages pointant vers des pages spécifiques", "Insert a banner" => "Insérer une bannière", -"Use BLOGLIST to include posts from a blog. Syntax is" => "Utiliser BLOGLIST pour inclure des posts d'un blog. La syntax est", +"Use BLOGLIST to include posts from a blog. Syntax is" => "Utiliser BLOGLIST pour inclure des publications d'un blog. La syntax est", "where Id is the blog Id and Items is the max number of posts to display" => "où Id est l'Id du blog et Items est le nombre max de posts à afficher", "Insert theme-styled box on wiki page" => "Insère le contenu du plugiciel dans une boîte avec une en-tête colorée", "Insert list of items with the current/given category in the wiki page" => "Insère la liste d'items pour la catégorie courante ou donnée", @@ -2627,7 +2627,7 @@ "Don't insert ref. to TPL into mails" => "Ne pas insérer de réf au TPL dans les mails", "Insert tikiTPL tag into mail header" => "Insérer une marque Tiki dans l\\'en tête de mail", "Introduce during system test into mails, in HTML comment format, the reference of the TPL used as a mark into header and optionnally at the beginning and the end of the text" => "Introduire dans les mails, en phase de test, dans le format d'un commentaire HTML, une référence au template (TPL) utilisé, suivant l'option : <br /><ul><li>-dans l\\'en tête (caché)</li><li>-en en tête et fin du texte et à la fin du sujet</li><li>-aucune référence</li></ul>)", -"Use only for development the option \"Insert into text\", not in production, because these warnings are added to emails content as well, and are visible to the users" => "N\\'utiliser l\\'option \"insérer dans le texte\" que pour les test, pas en production parce ces alertes sont évidemment visibles par les utilisateurs, si vous voulez laisser marqués les mails utiliser l'\\option \"caché\" (Insérer une marque Tiki dans l\\'en tête de mail)", +"Use only for development the option \"Insert into text\", not in production, because these warnings are added to emails content as well, and are visible to the users" => "N\\'utiliser l\\'option \"insérer dans le texte\" que pour le développement, pas en production parce ces alertes sont ajoutées au contenu des courriels et sont visibles par les utilisateurs", "Dynamic content" => "Contenu dynamique", "Renamed" => "Renommé(e)", "Removed version" => "Version supprimée", @@ -6958,7 +6958,7 @@ "Forum" => "Forum", "Simple" => "Simple", "Faqs" => "Faqs", -"Allows to keep track of what users are doing and produce reports on a per-user or per-category basis" => "Allows to keep track of what users are doing and produce reports on a per-user or per-category basis", +"Allows to keep track of what users are doing and produce reports on a per-user or per-category basis" => "Permet de garder une trace de ce que font les utilisateurs et produire des rapports sur des bases par utilisateur ou par catégorie", "Contribution" => "Contribution", "FAQ" => "FAQ", "Quick comment (graffiti) box. Like a group chat, but not in real time" => "Quick comment (graffiti) box. Like a group chat, but not in real time", @@ -6984,7 +6984,7 @@ "JQuery UI" => "JQuery UI", "Validation" => "Validation", "Tiki will warn users who attempt to edit a page that another user is currenly editing" => "Tiki will warn users who attempt to edit a page that another user is currenly editing", -"Allow users to upload images (pictures) to a page" => "Allow users to upload images (pictures) to a page", +"Allow users to upload images (pictures) to a page" => "Autoriser les utilisateurs à télécharger des images (photos) vers une page", "Structures" => "Structures", "Generate automated statistics from configured database queries" => "Generate automated statistics from configured database queries", "Tiki will automatically convert http:// and email addresses into links" => "Tiki will automatically convert http:// and email addresses into links", @@ -7025,7 +7025,7 @@ "image/bmp" => "image/bmp", "image/x-icon" => "image/x-icon", "Show to others who viewed my stuff on the user information page. Admins can always see this information" => "Show to others who viewed my stuff on the user information page. Admins can always see this information", -"Include a flag by each e-mail to quickly flag/un-flag them" => "Include a flag by each e-mail to quickly flag/un-flag them", +"Include a flag by each e-mail to quickly flag/un-flag them" => "Inclure un drapeau dans chaque courriel pour les marquer/démarquer rapidement", "Strict" => "Strict", "minute" => "minute", "Double (%%varname%%)" => "Double (%%varname%%)", @@ -7050,7 +7050,7 @@ "Image" => "Image", "Article" => "Article", "information" => "information", -"Admin page" => "Admin page", +"Admin page" => "Page administrateur", "Minute" => "Minute", "Relation not found" => "Relation not found", "This invoice does not exist or is in limited access" => "This invoice does not exist or is in limited access", @@ -7107,7 +7107,7 @@ "Zone" => "Zone", "BigBlueButton" => "BigBlueButton", "Latest date to select posts from" => "Latest date to select posts from", -"If set to a list of calendar identifiers, restricts the events to those in the identified calendars. Identifiers are separated by commas (\",\")" => "If set to a list of calendar identifiers, restricts the events to those in the identified calendars. Identifiers are separated by commas (\",\")", +"If set to a list of calendar identifiers, restricts the events to those in the identified calendars. Identifiers are separated by commas (\",\")" => "Si défini comme une liste d'identificateurs de calendriers, limite les événements à ceux des calendriers identifiés. Les identificateurs sont séparés par des virgules \",\"", "Possible values" => "Possible values", "If in calendar (or \"table\") view type, determines the time span displayed by the calendar" => "If in calendar (or \"table\") view type, determines the time span displayed by the calendar", "List of category IDs separated by + signs. ex: 1+2+3. Default will use category of the current page" => "List of category IDs separated by + signs. ex: 1+2+3. Default will use category of the current page", @@ -7118,7 +7118,7 @@ "Label of the dynamic content to display" => "Label of the dynamic content to display", "Pattern to display the copyright in. May contain ~title~, ~year~ and ~authors~" => "Pattern to display the copyright in. May contain ~title~, ~year~ and ~authors~", "Minutes" => "Minutes", -"If y, will display amount of time since the event (default). If n will simply display that the event is over" => "If y, will display amount of time since the event (default). If n will simply display that the event is over", +"If y, will display amount of time since the event (default). If n will simply display that the event is over" => "Si y, affiche le temps écoulé depuis l'événement (par défaut). Si n affichera simplement que l'événement est terminé", "Name of the channel as registered by the administrator" => "Name of the channel as registered by the administrator", "Div" => "Div", "Span" => "Span", @@ -7162,7 +7162,7 @@ "Result limit" => "Result limit", "Label displayed above the remark" => "Label displayed above the remark", "IDs" => "IDs", -"Input a list of post services (like facebook, myspace, digg, etc.) separated by a | to customize the services that are shown in the opening panel of the widget" => "Input a list of post services (like facebook, myspace, digg, etc.) separated by a | to customize the services that are shown in the opening panel of the widget", +"Input a list of post services (like facebook, myspace, digg, etc.) separated by a | to customize the services that are shown in the opening panel of the widget" => "Inclure une liste de services de publication (comme facebook, myspace, digg, etc.) séparés par | pour personnaliser les services qui sont affichés dans le panneau d'ouverture du gadget", "Custom link text for the button" => "Custom link text for the button", "HTML color code (not color name) for the background color for the header if an optional header title is used" => "HTML color code (not color name) for the background color for the header if an optional header title is used", "HTML color code (not color name) for the header text if an optional header title is used" => "HTML color code (not color name) for the header text if an optional header title is used", @@ -7188,20 +7188,20 @@ "Options: \"article, wiki page, blog post\"" => "Options: \"article, wiki page, blog post\"", "Link color, as optionally provided by Google" => "Link color, as optionally provided by Google", "If set to \"y\", displays a button labelled \"More...\" that links to a paginated view of the selected articles" => "If set to \"y\", displays a button labelled \"More...\" that links to a paginated view of the selected articles", -"If set to a category identifier, only consider the articles in the specified category" => "If set to a category identifier, only consider the articles in the specified category", -"If set to a list of article type names separated by plus signs, only consider the articles of the specified types. If the string is preceded by an exclamation mark (\"!\"), the effect is reversed, i.e. articles of the specified article types are not considered" => "If set to a list of article type names separated by plus signs, only consider the articles of the specified types. If the string is preceded by an exclamation mark (\"!\"), the effect is reversed, i.e. articles of the specified article types are not considered", -"If set to a language code, only consider the articles in the specified language" => "If set to a language code, only consider the articles in the specified language", +"If set to a category identifier, only consider the articles in the specified category" => "Si réglé sur un identificateur de catégorie, prend uniquement en compte les articles de la catégorie désignéeonly consider the articles in the specified category", +"If set to a list of article type names separated by plus signs, only consider the articles of the specified types. If the string is preceded by an exclamation mark (\"!\"), the effect is reversed, i.e. articles of the specified article types are not considered" => "Si défini comme une liste de noms de type d'article séparés par \"+\", prendre en considération seulement les articles des types spécifiés. Si la chaîne est précédée par \"!\", l'effet est inversé, i.e. les articles des types spécifiés sont ignorés", +"If set to a language code, only consider the articles in the specified language" => "Si réglé sur un code de langue, prendre uniquement en compte les articles dans la langue spécifiée", "If set to \"y\", article publication times are shown" => "If set to \"y\", article publication times are shown", "If set to \"y\", article creation times are shown" => "If set to \"y\", article creation times are shown", "If set to \"y\", offers the user to filter articles based on a minimum and a maximum rating" => "If set to \"y\", offers the user to filter articles based on a minimum and a maximum rating", -"If set to a category identifier, only lists the articles in the specified category" => "If set to a category identifier, only lists the articles in the specified category", -"If set to a list of article type names separated by plus signs, only lists the articles of the specified types. If the string is preceded by an exclamation mark (\"!\"), the effect is reversed, i.e. articles of the specified article types are not listed" => "If set to a list of article type names separated by plus signs, only lists the articles of the specified types. If the string is preceded by an exclamation mark (\"!\"), the effect is reversed, i.e. articles of the specified article types are not listed", -"If set to a language code, only lists the articles in the specified language" => "If set to a language code, only lists the articles in the specified language", +"If set to a category identifier, only lists the articles in the specified category" => "Si réglé sur un identificateur de catégorie, affiche seulement les articles de la catégorie désignée", +"If set to a list of article type names separated by plus signs, only lists the articles of the specified types. If the string is preceded by an exclamation mark (\"!\"), the effect is reversed, i.e. articles of the specified article types are not listed" => "Si défini comme une liste de noms de type d'article séparés par \"+\", affiche seulement les articles des types spécifiés. Si la chaîne est précédée par \"!\", l'effet est inversé, i.e. les articles des types spécifiés ne sont pas affichés", +"If set to a language code, only lists the articles in the specified language" => "Si réglé sur un code de langue, affiche uniquement en compte les articles dans la langue spécifiée", "Specifies how the articles should be sorted" => "Specifies how the articles should be sorted", "If set to an integer, offsets the articles list by the given number. For example, if the module was otherwise set to list the 10 articles most recently published, setting the offset to 10 would make the module list the 11th to 20th articles in descending order of publication time instead" => "If set to an integer, offsets the articles list by the given number. For example, if the module was otherwise set to list the 10 articles most recently published, setting the offset to 10 would make the module list the 11th to 20th articles in descending order of publication time instead", "If set to \"y\", displays a button labelled \"More\" that links to a paginated view of the selected articles" => "If set to \"y\", displays a button labelled \"More\" that links to a paginated view of the selected articles", -"If set to \"y\", some of the links use an absolute URL instead of a relative one. This can avoid broken links if the module is to be sent in a newsletter, for example" => "If set to \"y\", some of the links use an absolute URL instead of a relative one. This can avoid broken links if the module is to be sent in a newsletter, for example", -"If set to a list of calendar identifiers, restricts the events to those in the identified calendars. Identifiers are separated by vertical bars (\"|\"), commas (\",\") or colons (\":\")" => "If set to a list of calendar identifiers, restricts the events to those in the identified calendars. Identifiers are separated by vertical bars (\"|\"), commas (\",\") or colons (\":\")", +"If set to \"y\", some of the links use an absolute URL instead of a relative one. This can avoid broken links if the module is to be sent in a newsletter, for example" => "Si réglé sur \"y\", quelques liens utilisent une adresse (URL) absolue au lieu d'un relative. Ceci peut éviter des liens morts si le module doit être envoyé dans une lettre de nouvelles, par exemple", +"If set to a list of calendar identifiers, restricts the events to those in the identified calendars. Identifiers are separated by vertical bars (\"|\"), commas (\",\") or colons (\":\")" => "Si défini comme une liste d'identificateurs de calendriers, limite les événements à ceux des calendriers identifiés. Les identificateurs sont séparés par des barres verticales \"|\", virgules \",\" ou deux-points \":\"", "The quantities in your cart were updated" => "The quantities in your cart were updated", "Object type filter to apply when accessing a linked category. Example values" => "Object type filter to apply when accessing a linked category. Example values", "Show subcategories objects when accessing a linked category. Possible values: on (default), off" => "Show subcategories objects when accessing a linked category. Possible values: on (default), off", @@ -7215,35 +7215,35 @@ "If set to \"y\", shows a list of categories in which the object is. If deletion is not disabled, it is done with the list" => "If set to \"y\", shows a list of categories in which the object is. If deletion is not disabled, it is done with the list", "If set to \"n\", the detailed list of categories will not offer to unassign a category" => "If set to \"n\", the detailed list of categories will not offer to unassign a category", "If set to \"y\", allow to assign new categories" => "If set to \"y\", allow to assign new categories", -"If set to a directory category identifier, only displays the sites in the specified directory category" => "If set to a directory category identifier, only displays the sites in the specified directory category", +"If set to a directory category identifier, only displays the sites in the specified directory category" => "Si réglé sur un identificateur de catégorie de l'annuaire, affiche seulement les sites de la catégorie désignée", "If set to \"y\", displays a button labelled \"More\" that links to the directory" => "If set to \"y\", displays a button labelled \"More\" that links to the directory", "Shows current freetags and enables to add and remove some if permissions allow" => "Shows current freetags and enables to add and remove some if permissions allow", "Type of objects to extract" => "Type of objects to extract", -"If set to \"cloud\", links are displayed as a cloud" => "If set to \"cloud\", links are displayed as a cloud", +"If set to \"cloud\", links are displayed as a cloud" => "Si réglé sur \"cloud\", les liens sont affichés sous forme de nuage de mots-clés", "If set to a number, limits the number of tags displayed" => "If set to a number, limits the number of tags displayed", -"If set to \"y\", user names are displayed in the module box" => "If set to \"y\", user names are displayed in the module box", +"If set to \"y\", user names are displayed in the module box" => "Si réglé sur \"y\", les noms d'utilisateurs sont affichés dans la boîte du module", "If set to \"y\", action dates are displayed in the module box" => "If set to \"y\", action dates are displayed in the module box", -"If set to \"y\", the date of posts is not displayed in the module box" => "If set to \"y\", the date of posts is not displayed in the module box", -"If set to a blog identifier, restricts the blog posts to those in the identified blog" => "If set to a blog identifier, restricts the blog posts to those in the identified blog", +"If set to \"y\", the date of posts is not displayed in the module box" => "Si réglé sur \"y\", la date des publications n'est pas affichée dans la boîte du module", +"If set to a blog identifier, restricts the blog posts to those in the identified blog" => "si réglé sur un identificateur de blogue, restreint les publications à celles du blogue désigné", "Lists the specified number of objects of the given type in the given category, starting from the most recently created" => "Lists the specified number of objects of the given type in the given category, starting from the most recently created", -"Identifier of the category from which objects are listed. Objects merely in child categories will not be displayed" => "Identifier of the category from which objects are listed. Objects merely in child categories will not be displayed", +"Identifier of the category from which objects are listed. Objects merely in child categories will not be displayed" => "Identificateur d'une catégorie dont les objets sont listés. Les objets seulement reliés aux catégories enfants ne seront pas affichés", "Type of the objects to list. Example values" => "Type of the objects to list. Example values", "If set to a set of file gallery identifiers, restricts the files to those in the identified galleries. The value is a colon-separated sequence of integers" => "If set to a set of file gallery identifiers, restricts the files to those in the identified galleries. The value is a colon-separated sequence of integers", "List the specified number of images, starting from the most recently added" => "List the specified number of images, starting from the most recently added", "If set to an image gallery identifier, restricts the images to those in the identified gallery" => "If set to an image gallery identifier, restricts the images to those in the identified gallery", -"If set to a calendar identifier, restricts the events to those in the identified calendar" => "If set to a calendar identifier, restricts the events to those in the identified calendar", +"If set to a calendar identifier, restricts the events to those in the identified calendar" => "Si réglé sur un identificateur de calendrier, restreint les événements à ceux du calendrier désigné", "Target URL of the \"...more\" link at the bottom of the module" => "Target URL of the \"...more\" link at the bottom of the module", "Lists the specified number of tracker comments (optionally restricting to those in a specific tracker or tracker item) starting from the most recently posted" => "Lists the specified number of tracker comments (optionally restricting to those in a specific tracker or tracker item) starting from the most recently posted", "If set to a tracker identifier, only displays the comments on the given tracker" => "If set to a tracker identifier, only displays the comments on the given tracker", "If set to an item identifier, only displays the comments on the given item" => "If set to an item identifier, only displays the comments on the given item", -"Identifier of the tracker from which items are listed" => "Identifier of the tracker from which items are listed", -"Identifier of the field from which values are listed. If Field name is set, this parameter is ignored" => "Identifier of the field from which values are listed. If Field name is set, this parameter is ignored", +"Identifier of the tracker from which items are listed" => "Identificateur du formulaire dont les fiches sont listées", +"Identifier of the field from which values are listed. If Field name is set, this parameter is ignored" => "Identificateur du champ dont les valeurs sont listées. Si le nom du champ est choisi, ce paramètre sera ignoré", "Name of the field from which values are listed" => "Name of the field from which values are listed", "Specifies how the items should be sorted" => "Specifies how the items should be sorted", "Possible values include created and created_asc (equivalent), created_desc, status, lastModif, createdBy and lastModifBy. Unless \"_desc\" is specified, the sort is ascending. \"created\" sorts on item creation date. \"lastModif\" sorts on the last modification date of items. \"lastModif_desc\" sorts in descending order of last modification date" => "Possible values include created and created_asc (equivalent), created_desc, status, lastModif, createdBy and lastModifBy. Unless \"_desc\" is specified, the sort is ascending. \"created\" sorts on item creation date. \"lastModif\" sorts on the last modification date of items. \"lastModif_desc\" sorts in descending order of last modification date", "If set, limits the listed items to those with the given statuses. Values are combinations of \"o\" (open), \"p\" (pending) and \"c\" (closed). Possible values" => "If set, limits the listed items to those with the given statuses. Values are combinations of \"o\" (open), \"p\" (pending) and \"c\" (closed). Possible values", "Unable to determine which field to show. Tracker identifier may be invalid, or the tracker has no main field and neither Field identifier nor Field name were set" => "Unable to determine which field to show. Tracker identifier may be invalid, or the tracker has no main field and neither Field identifier nor Field name were set", -"If set to a faq identifier, restricts the chosen questions to those in the identified faq" => "If set to a faq identifier, restricts the chosen questions to those in the identified faq", +"If set to a faq identifier, restricts the chosen questions to those in the identified faq" => "Si réglé sur un identificateur de FAQ, restreint les questions choisies à celles de la FAQ désignée", "If set to \"y\", show user avatars" => "If set to \"y\", show user avatars", "Number of characters for username and password input fields" => "Number of characters for username and password input fields", "Site logo, title and subtitle" => "Site logo, title and subtitle", @@ -7252,20 +7252,20 @@ "List of chat channels. Channel names are separated by a comma (\",\")" => "List of chat channels. Channel names are separated by a comma (\",\")", "Mobile" => "Mobile", "Type of objects to link to" => "Type of objects to link to", -"Identifier of an object with children to link to" => "Identifier of an object with children to link to", +"Identifier of an object with children to link to" => "Identificateur d'un objet avec enfant à relier par un lien", "This is required for the blog Object type" => "This is required for the blog Object type", "Credits" => "Credits", "If set, send the form to the given location (relative to Tiki\\'s root) for processing" => "If set, send the form to the given location (relative to Tiki\\'s root) for processing", "The label on the button to submit the form" => "The label on the button to submit the form", "If set to an image gallery identifier, restricts the chosen images to those in the identified gallery" => "If set to an image gallery identifier, restricts the chosen images to those in the identified gallery", "If set to \"n\", the image thumbnail does not link to the image" => "If set to \"n\", the image thumbnail does not link to the image", -"If set to \"y\", the name of the image is displayed" => "If set to \"y\", the name of the image is displayed", -"If set to \"y\", the description of the image is displayed" => "If set to \"y\", the description of the image is displayed", +"If set to \"y\", the name of the image is displayed" => "Si réglé sur \"y\", le nom de l'image est affiché", +"If set to \"y\", the description of the image is displayed" => "Si réglé sur \"y\", la description de l'image est affichée", "Setting to emulate previous behaviour" => "Setting to emulate previous behaviour", "If set to \"y\" the search performed is a \"Tiki search\"" => "If set to \"y\" the search performed is a \"Tiki search\"", "If set to \"y\" shows a dropdown of sections to search" => "If set to \"y\" shows a dropdown of sections to search", "If set to \"y\" input uses autocomplete for pagenames if applicable" => "If set to \"y\" input uses autocomplete for pagenames if applicable", -"Use advanced (boolean) search (full text search only)" => "Use advanced (boolean) search (full text search only)", +"Use advanced (boolean) search (full text search only)" => "Utiliser les fonctions avancées (booléen) de recherche (recherche en texte intégral seulement)", "Show advanced search checkbox (full text search only)" => "Show advanced search checkbox (full text search only)", "Show advanced search help icon (full text search only)" => "Show advanced search help icon (full text search only)", "Show search button" => "Show search button", @@ -7273,24 +7273,24 @@ "Show edit button" => "Show edit button", "Size attribute (horizontal, in characters) of the text input field" => "Size attribute (horizontal, in characters) of the text input field", "Size of the Search Filter dropdown list" => "Size of the Search Filter dropdown list", -"If set to a category identifier, pages created through the module are automatically categorized in the specified category" => "If set to a category identifier, pages created through the module are automatically categorized in the specified category", +"If set to a category identifier, pages created through the module are automatically categorized in the specified category" => "Si réglé sur un identificateur de catégorie, les pages crées au travers de ce module sont automaitquement rattéchées à cette catégorie", "Search is disabled" => "Search is disabled", "If set, send the form to the given location (relative to Tiki's root) for processing" => "If set, send the form to the given location (relative to Tiki's root) for processing", -"If set to \"y\", the search performed is a \"Tiki search\"" => "If set to \"y\", the search performed is a \"Tiki search\"", -"If set to \"1\", displays message post dates and times as tooltips instead of showing directly in the module content" => "If set to \"1\", displays message post dates and times as tooltips instead of showing directly in the module content", +"If set to \"y\", the search performed is a \"Tiki search\"" => "Si réglé sur \"y\", la recherche effectuée est une \"recherche Tiki\"", +"If set to \"1\", displays message post dates and times as tooltips instead of showing directly in the module content" => "Si réglé sur \"1\", affiche les date et heure de publication du message sous forme d'info-bulles plutôt que des les montrer directement dans le contenu du module", "Label on the button to post a message" => "Label on the button to post a message", "Label on the button to post a message when the message is being posted if AJAX is enabled" => "Label on the button to post a message when the message is being posted if AJAX is enabled", "Number of messages to display" => "Number of messages to display", -"If set to \"n\", do not show new users" => "If set to \"n\", do not show new users", +"If set to \"n\", do not show new users" => "Si réglé sur \"n\", ne pas montrer les nouveaux utilisateurs", "If set to \"n\", do not show tracker changes" => "If set to \"n\", do not show tracker changes", "Tiki test suite helper" => "Tiki test suite helper", -"If set to a language code, restricts the localized pages shown to the reference page, unless that page is being displayed" => "If set to a language code, restricts the localized pages shown to the reference page, unless that page is being displayed", -"If \"y\" the page language will be shown instead of the page name" => "If \"y\" the page language will be shown instead of the page name", +"If set to a language code, restricts the localized pages shown to the reference page, unless that page is being displayed" => "Si réglé sur un code de langue, restreint les pages locales affichées à la page de référence, à moins que celle-ci soit en cours d'affichage ", +"If \"y\" the page language will be shown instead of the page name" => "Si \"y\" la langue de la page sera affichée au lieu du nom de la page", "Lists the specified number of calendar events, ordered by their start date" => "Lists the specified number of calendar events, ordered by their start date", "If set to \"n\", event tooltips will not display event information" => "If set to \"n\", event tooltips will not display event information", -"If set to \"1\", separate users based on which host/server they logged on" => "If set to \"1\", separate users based on which host/server they logged on", +"If set to \"1\", separate users based on which host/server they logged on" => "Si réglé sur \"1\", séparer les utilisateurs selon le serveur sur lequel ils se sont connectés", "Lists the specified number of comments starting from the most recently posted" => "Lists the specified number of comments starting from the most recently posted", -"If set to \"y\", the name of the object on which a comment is made is not displayed in the module box, but instead moved in the item\\'s tooltip" => "If set to \"y\", the name of the object on which a comment is made is not displayed in the module box, but instead moved in the item\\'s tooltip", +"If set to \"y\", the name of the object on which a comment is made is not displayed in the module box, but instead moved in the item\\'s tooltip" => "Si réglé sur \"y\", le nom de l'objet qui a reçu un commentaire n'est pas affiché dans la boîte du module, mais au contraire déplacé dans l'info-bulle de l'élément", "Type of the objects from which comments will be listed. Possible values" => "Type of the objects from which comments will be listed. Possible values", "List of YouTube videos identifiers to display. Identifiers are separated by a comma (\",\")" => "List of YouTube videos identifiers to display. Identifiers are separated by a comma (\",\")", "If set to a YouTube user identifier, display a link to the videos of this user" => "If set to a YouTube user identifier, display a link to the videos of this user", @@ -7481,7 +7481,7 @@ "users prefs userbreadCrumb" => "users prefs userbreadCrumb", "validateRegistration" => "validateRegistration", "validator emails" => "validator emails", -"url after validation" => "url after validation", +"url after validation" => "url après validation", "urlOnUsername" => "urlOnUsername", "messu mailbox size" => "messu mailbox size", "messu archive size" => "messu archive size", @@ -7626,7 +7626,7 @@ "site favicon type" => "site favicon type", "style" => "style", "style option" => "style option", -"use context menu icon" => "use context menu icon", +"use context menu icon" => "utiliser l'icône de menu contextuel", "feature layoutshadows" => "feature layoutshadows", "main shadow start" => "main shadow start", "main shadow end" => "main shadow end", @@ -7641,7 +7641,7 @@ "feature mods provider" => "feature mods provider", "mods dir" => "mods dir", "mods server" => "mods server", -"feature actionlog" => "feature actionlog", +"feature actionlog" => "fonctionnalité journal des actions", "feature actionlog bytes" => "feature actionlog bytes", "tmpDir" => "tmpDir", "feature tell a friend" => "feature tell a friend", @@ -7704,7 +7704,7 @@ "log mail" => "log mail", "site closed" => "site closed", "site closed msg" => "site closed msg", -"use load threshold" => "use load threshold", +"use load threshold" => "seuil de charge utilisation", "load threshold" => "load threshold", "site busy msg" => "site busy msg", "feature create webhelp" => "feature create webhelp", @@ -7781,7 +7781,7 @@ "Register this web service. It will be possible to register the templates afterwards. Service name must only contain letters" => "Register this web service. It will be possible to register the templates afterwards. Service name must only contain letters", "Select <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">Admin > Modules</a> to add this (or other) modules" => "Select <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">Admin > Modules</a> to add this (or other) modules", "To use these links, you must assign the featured_links <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">module</a>" => "To use these links, you must assign the featured_links <a class=\"rbox-link\" href=\"tiki-admin_modules.php\">module</a>", -"If the url is ((PageName)), you do not need to put the groups, the option will be displayed only if the page can be displayed" => "If the url is ((PageName)), you do not need to put the groups, the option will be displayed only if the page can be displayed", +"If the url is ((PageName)), you do not need to put the groups, the option will be displayed only if the page can be displayed" => "Si le lien est ((PageName)), vous n'avez pas besoin de mettre les groupes, l'option ne s'affichera que si la page peut être affichée", "For list-based metrics, include the \"LIMIT #\" in your query" => "For list-based metrics, include the \"LIMIT #\" in your query", "The following required parameters are missing" => "The following required parameters are missing", "type" => "type", @@ -7790,8 +7790,8 @@ "Inodes that are not files or directories are not part of tiki. Review these Inodes" => "Inodes that are not files or directories are not part of tiki. Review these Inodes", "Setting the executable bit can be dangerous if the webserver is configured to execute cgi scripts from that directories. If you use the usual php module (for apache) then php scripts and other files in tiki do not need to have the executable bit. You can safely remove the executable bit with chmod" => "Setting the executable bit can be dangerous if the webserver is configured to execute cgi scripts from that directories. If you use the usual php module (for apache) then php scripts and other files in tiki do not need to have the executable bit. You can safely remove the executable bit with chmod", "To configure the toolbars on the various text editing areas select the section, and optionally check the comments checkbox, you want to edit and drag the icons from the left hand box to the toolbars on the right.<br />\nDrag icons back from the toolbar rows onto the full list to remove them.<br />\nIcons with <strong>bold</strong> labels are for wiki text areas, those that are <em>italic</em> are for WYSIWYG mode, and those that are <strong><em>bold and italic</em></strong> are for both.<br />\nTo save the current set use the dropdown (and optionally check the comments checkbox) at the bottom of the page to set where you want these toolbars to appear, and click Save" => "To configure the toolbars on the various text editing areas select the section, and optionally check the comments checkbox, you want to edit and drag the icons from the left hand box to the toolbars on the right.<br />\nDrag icons back from the toolbar rows onto the full list to remove them.<br />\nIcons with <strong>bold</strong> labels are for wiki text areas, those that are <em>italic</em> are for WYSIWYG mode, and those that are <strong><em>bold and italic</em></strong> are for both.<br />\nTo save the current set use the dropdown (and optionally check the comments checkbox) at the bottom of the page to set where you want these toolbars to appear, and click Save", -"Identify creation user in tracker item" => "Identify creation user in tracker item", -"Identify lastModif user in tracker item" => "Identify lastModif user in tracker item", +"Identify creation user in tracker item" => "Identifier l'utilisateur créateur dans la fiche de formulaire", +"Identify lastModif user in tracker item" => "Identifier l'utilisateur ayant fait la dernière modification dans la fiche de formulaire", "UTF-8" => "UTF-8", "ISO-8859-1" => "ISO-8859-1", "RSS" => "RSS", @@ -7800,7 +7800,7 @@ "Pixels" => "Pixels", "ex" => "ex", "Important" => "Important", -"If you go to edit this (or any other TPL file) file via the Tiki built-in TPL editor below, all the javascript can be sanitized or completely stripped out by Tiki security filtering" => "If you go to edit this (or any other TPL file) file via the Tiki built-in TPL editor below, all the javascript can be sanitized or completely stripped out by Tiki security filtering", +"If you go to edit this (or any other TPL file) file via the Tiki built-in TPL editor below, all the javascript can be sanitized or completely stripped out by Tiki security filtering" => "Si vous pensez éditer ce fichier (ou tout autre fichier TPL) via l'éditeur TPL Tiki intégré ci-dessous, tous les scripts javascript peuvent être assainis ou complètement vidés par le filtrage de sécurité Tiki", "This is a new staging page that has not been approved before" => "This is a new staging page that has not been approved before", "The current staging copy may contain changes that have yet to be approved" => "The current staging copy may contain changes that have yet to be approved", "There are currently changes in the staging copy that have yet to be approved" => "There are currently changes in the staging copy that have yet to be approved", @@ -7808,7 +7808,7 @@ "Select the style used to display differences to be translated" => "Select the style used to display differences to be translated", "Translate to" => "Translate to", "Note that tags that were created on pages with no language set will remain\n\tuniversal (i.e. is the same tag in all languages) until a language has been set for the tag" => "Note that tags that were created on pages with no language set will remain\n\tuniversal (i.e. is the same tag in all languages) until a language has been set for the tag", -"If you are NOT running a new Tiki installation, make a backup of your database before using this importer" => "If you are NOT running a new Tiki installation, make a backup of your database before using this importer", +"If you are NOT running a new Tiki installation, make a backup of your database before using this importer" => "Si vous n'exécutez pas une nouvelle installation Tiki, faire une sauvegarde de votre base de données avant d'utiliser cet importateur", "Importer log" => "Importer log", "Documentation" => "Documentation", "Kaltura Remix Entries" => "Kaltura Remix Entries", @@ -7860,7 +7860,7 @@ "TikiHelp WebHelp generation engine. Generating WebHelp using" => "TikiHelp WebHelp generation engine. Generating WebHelp using", "Last sites of directory \" . \$rc[\"name\"] . \" " => "Last sites of directory \" . \$rc[\"name\"] . \" ", "New payment requested" => "New payment requested", -"Payment canceled" => "Payment canceled", +"Payment canceled" => "Paiement annulé", "Index" => "Index", "unicode" => "unicode", // ### @@ -8528,7 +8528,7 @@ "LDAP version" => "Version LDAP", "(Leave this empty if the group name is already given in the user attribute)" => "(Laisser vide si le nom du groupe est déjà donné dans l'attribut utilisateur)", "Admin user" => "Utilisateur Admin", -"Admin password" => "Mot de passe Admin", +"Admin password" => "Mot de passe administrateur", "Disable Tiki users who don't have a phpBB login. (They could have been deleted)" => "Désactiver les utilisateurs Tiki qui n'ont pas de compte phpBB (Ils ont pu être supprimés)", "All" => "Tous", "Available languages" => "Langues disponibles", @@ -8575,7 +8575,7 @@ "Depends user language" => "Selon langue utilisateur", "Split hours in periods of" => "Découpage des heures par", "First year in the dropdown" => "Première année dans la liste déroulante", -"Enter a year or use +/- N to specify a year relative to the current year" => "Entrez une année ou utilisez +/- N pour spécifier une année relative à l'année courante", +"Enter a year or use +/- N to specify a year relative to the current year" => "Entrer une année ou utilisez +/- N pour spécifier une année relative à l'année courante", "Last year in the dropdown" => "Dernière année dans la liste déroulante", "Sticky popup" => "Popup collant", "Show Add to Google Calendar icon" => "Afficher l'icone ajouter au calendrier Google", @@ -8846,7 +8846,7 @@ "When accessing a page which has an equivalent in the user\\'s preferred language, favor the translated page" => "En cas d\\'accès à un page ayant une équivalence dans la langue préférée de l\\'utilisateur, favoriser la page traduite", "Changing the page language also changes the site language" => "Changer la langue de la page change également la langue du site", "Translation assistant" => "Assistant de traduction", -"Urgent translation notifications" => "Notification d'une traduction urgente", +"Urgent translation notifications" => "Notifications d'une traduction urgente", "Allow to flag changes as urgent, leading translations to be marked with a notice visible to all users" => "Permettre de signaler les changements comme urgents, ce qui entraîne que les traductions soient marqués d'une notice visible à tous les utilisateurs", "Use the site language as a master language and prevent translations from sending critical updates" => "Utiliser la langue du site comme une langue principale et empêcher les traductions d'envoyer des mises à jour critiques", "Incomplete translation notice" => "Notification des traductions incomplètes", @@ -9043,7 +9043,7 @@ "Wiki argument variables" => "Argument variables Wiki", "Allow to write request variables inside wiki content using {{paramname}} or {{paramname|default}} - special case {{page}} {{user}}" => "Permet d'écrire des variables requises dans un contenu wiki en utilisant {{paramname}} ou {{paramname|default}} - cas spécial {{page}} {{user}}", "Use challenge/response authentication" => "Utiliser une authentification challenge/réponse", -"Confirm that the Admin account has a valid email address or you will not be permitted to login" => "Confirmer que le compte Admin possède une adresse mail valide ou vous ne pourrez pas vous connecter", +"Confirm that the Admin account has a valid email address or you will not be permitted to login" => "Confirmer que le compte Administrateur possède une adresse mail valide ou vous ne pourrez pas vous connecter", "Users can choose to stay in SSL mode after an HTTPS login" => "Les utilisateurs peuvent choisir de rester en mode SSL après un login HTTPS", "Users can switch between secured or standard mode at login" => "Les utilisateurs peuvent commuter entre le mode standard et le mode sécurisé au login", "Wiki paragraph formatting" => "M... [truncated message content] |
From: <jon...@us...> - 2011-05-18 11:45:29
|
Revision: 34467 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34467&view=rev Author: jonnybradley Date: 2011-05-18 11:45:23 +0000 (Wed, 18 May 2011) Log Message: ----------- [MOD] modules: Cosmetic change of user module to custom module. Deeper code renaming TODO after 7.0 release Modified Paths: -------------- branches/7.x/lib/profilelib/installlib.php branches/7.x/lib/smarty_tiki/block.textarea.php branches/7.x/templates/admin_modules_form.tpl branches/7.x/templates/tiki-admin_modules.tpl branches/7.x/tiki-admin_modules.php Modified: branches/7.x/lib/profilelib/installlib.php =================================================================== --- branches/7.x/lib/profilelib/installlib.php 2011-05-18 07:23:02 UTC (rev 34466) +++ branches/7.x/lib/profilelib/installlib.php 2011-05-18 11:45:23 UTC (rev 34467) @@ -1410,7 +1410,7 @@ $modtitle = $data['title']; } - // Set up module only as a user module if position is set to 'none' + // Set up module only as a custom module if position is set to 'none' if( $data['position'] == 'none' ) { // but still allow module_arguments but keep it simple and don't include the $key= Modified: branches/7.x/lib/smarty_tiki/block.textarea.php =================================================================== --- branches/7.x/lib/smarty_tiki/block.textarea.php 2011-05-18 07:23:02 UTC (rev 34466) +++ branches/7.x/lib/smarty_tiki/block.textarea.php 2011-05-18 11:45:23 UTC (rev 34467) @@ -56,7 +56,7 @@ unset($params['codemirror']); unset($params['syntax']); - // mainly for modules admin - preview is for the module, not the user module so don;t need to confirmExit + // mainly for modules admin - preview is for the module, not the custom module so don;t need to confirmExit $params['_previewConfirmExit'] = isset($params['_previewConfirmExit']) ? $params['_previewConfirmExit'] : 'y'; $params['_simple'] = isset($params['_simple']) ? $params['_simple'] : 'n'; @@ -213,7 +213,7 @@ language: "' . ($prefs['feature_detect_language'] === 'y' ? '' : $prefs['language']) . '", '. (empty($params['cols']) ? 'height: 400,' : '') .' contentsLangDirection: "' . ($prefs['feature_bidi'] === 'y' ? 'rtl' : 'ltr') . '" -}); +}).data("nocodemirror", true); ', 20); // after dialog tools init (10) $html .= '<textarea class="wikiedit" name="'.$params['name'].'" id="'.$as_id.'" style="visibility:hidden;'; // missing closing quotes, closed in condition Modified: branches/7.x/templates/admin_modules_form.tpl =================================================================== --- branches/7.x/templates/admin_modules_form.tpl 2011-05-18 07:23:02 UTC (rev 34466) +++ branches/7.x/templates/admin_modules_form.tpl 2011-05-18 11:45:23 UTC (rev 34467) @@ -128,7 +128,7 @@ </div> <div class="q234"> <textarea id="assign_params" name="assign_params" rows="1" cols="60" >{$assign_params|escape}</textarea> - {self_link um_edit=$assign_name cookietab="2" _anchor="editcreate"}{tr}Edit user module{/tr} {icon _id="arrow_right"}{/self_link} + {self_link um_edit=$assign_name cookietab="2" _anchor="editcreate"}{tr}Edit custom module{/tr} {icon _id="arrow_right"}{/self_link} </div> </div> {/if} Modified: branches/7.x/templates/tiki-admin_modules.tpl =================================================================== --- branches/7.x/templates/tiki-admin_modules.tpl 2011-05-18 07:23:02 UTC (rev 34466) +++ branches/7.x/templates/tiki-admin_modules.tpl 2011-05-18 11:45:23 UTC (rev 34467) @@ -133,13 +133,13 @@ {/tab} {/if} -{tab name="{tr}User Modules{/tr}"} +{tab name="{tr}Custom Modules{/tr}"} {if $prefs.feature_tabs neq 'y'} <legend class="heading"> - <a href="#usertheme" name="usertheme"><span>{tr}User Modules{/tr}</span></a> + <a href="#usertheme" name="usertheme"><span>{tr}Custom Modules{/tr}</span></a> </legend> {/if} - <h2>{tr}User Modules{/tr}</h2> + <h2>{tr}Custom Modules{/tr}</h2> <table class="normal"> <tr> <th>{tr}Name{/tr}</th> @@ -163,9 +163,9 @@ </table> <br /> {if $um_name eq ''} - <h2>{tr}Create new user module{/tr}</h2> + <h2>{tr}Create new custom module{/tr}</h2> {else} - <h2>{tr}Edit this user module:{/tr} {$um_name}</h2> + <h2>{tr}Edit this custom module:{/tr} {$um_name}</h2> {/if} {remarksbox type="tip" title="{tr}Tip{/tr}"} {tr}Create your new custom module below. Make sure to preview first and make sure all is OK before <a href="#assign">assigning it</a>. Using html, you will be fine. However, if you improperly use wiki syntax or Smarty code, you could lock yourself out of the site.{/tr} @@ -176,7 +176,7 @@ <tr valign="top"> <td valign="top" class="odd"> {if $um_name ne ''} - <a href="tiki-admin_modules.php#editcreate">{tr}Create new user module{/tr}</a> + <a href="tiki-admin_modules.php#editcreate">{tr}Create new custom module{/tr}</a> {/if} <table> <tr> Modified: branches/7.x/tiki-admin_modules.php =================================================================== --- branches/7.x/tiki-admin_modules.php 2011-05-18 07:23:02 UTC (rev 34466) +++ branches/7.x/tiki-admin_modules.php 2011-05-18 11:45:23 UTC (rev 34467) @@ -148,7 +148,7 @@ $smarty->assign_by_ref('um_data', $_REQUEST["um_data"]); $smarty->assign_by_ref('um_parse', $_REQUEST["um_parse"]); $modlib->replace_user_module($_REQUEST["um_name"], $_REQUEST["um_title"], $_REQUEST["um_data"], $_REQUEST["um_parse"]); - $logslib->add_log('adminmodules', 'changed user module ' . $_REQUEST["um_name"]); + $logslib->add_log('adminmodules', 'changed custom module ' . $_REQUEST["um_name"]); } if (!isset($_REQUEST["groups"])) { $_REQUEST["groups"] = array(); @@ -279,9 +279,9 @@ if (isset($_REQUEST["um_remove"])) { $_REQUEST["um_remove"] = urldecode($_REQUEST["um_remove"]); - $access->check_authenticity(tra('Are you sure you want to delete this User Module?') . ' ("' . $_REQUEST["um_remove"] . '")'); + $access->check_authenticity(tra('Are you sure you want to delete this Custom Module?') . ' ("' . $_REQUEST["um_remove"] . '")'); $modlib->remove_user_module($_REQUEST["um_remove"]); - $logslib->add_log('adminmodules', 'removed user module ' . $_REQUEST["um_remove"]); + $logslib->add_log('adminmodules', 'removed custom module ' . $_REQUEST["um_remove"]); $cookietab = 1; } if (isset($_REQUEST["um_edit"])) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-05-18 16:19:55
|
Revision: 34476 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34476&view=rev Author: jonnybradley Date: 2011-05-18 16:19:49 +0000 (Wed, 18 May 2011) Log Message: ----------- [FIX] modules: Various fixes for modules admin drag and drop - use pointer "tolerance" instead of "intersect", add hover highlight class to droppable module zones to show where it's going to drop, and make it possible to drag into empty zones. Modified Paths: -------------- branches/7.x/lib/modules/tiki-admin_modules.js branches/7.x/tiki-admin_modules.php Modified: branches/7.x/lib/modules/tiki-admin_modules.js =================================================================== --- branches/7.x/lib/modules/tiki-admin_modules.js 2011-05-18 15:56:08 UTC (rev 34475) +++ branches/7.x/lib/modules/tiki-admin_modules.js 2011-05-18 16:19:49 UTC (rev 34476) @@ -8,7 +8,7 @@ // drag & drop ones first var dragZonesSelector = "#top_modules, #topbar_modules, #bottom_modules, #pagetop_modules, #pagebottom_modules"; -$(dragZonesSelector).droppable({}); +$(dragZonesSelector).droppable({ hoverClass: "ui-state-active" }); $(".module", dragZonesSelector).each(function() { if ($(this).css("position") === "absolute") { var el = this; @@ -40,6 +40,11 @@ return null; } }); + $(".modules").each(function () { + if ($.trim($(this).text()) === "") { + $(this).css("min-height", "1em"); + } + }); }); $(".modules").sortable( { @@ -47,15 +52,17 @@ items: ".module:not('.ui-draggable')", placeholder: "module-placeholder", revert: 200, + tolerance: 'pointer', stop: function (event, ui) { if ($("#save_modules a:visible").length === 0) { $("#save_modules a").show("fast").attr("sortable", $(this).attr("id")) .parent().show("fast"); modAdminDirty = true; } + $(this).removeClass("ui-state-active"); }, start: function (event, ui) { - + $(this).addClass("ui-state-active"); }, receive: function(event, ui) { Modified: branches/7.x/tiki-admin_modules.php =================================================================== --- branches/7.x/tiki-admin_modules.php 2011-05-18 15:56:08 UTC (rev 34475) +++ branches/7.x/tiki-admin_modules.php 2011-05-18 16:19:49 UTC (rev 34476) @@ -388,13 +388,13 @@ $smarty->assign_by_ref( 'assigned_modules', $assigned_modules ); $smarty->assign_by_ref( 'module_zones', $module_zones ); -$prefs['module_zones_top'] = 'y'; -$prefs['module_zones_topbar'] = 'y'; -$prefs['module_zones_pagetop'] = 'y'; -$prefs['feature_left_column'] = 'y'; -$prefs['feature_right_column'] = 'y'; -$prefs['module_zones_pagebottom'] = 'y'; -$prefs['module_zones_bottom'] = 'y'; +$prefs['module_zones_top'] = 'fixed'; +$prefs['module_zones_topbar'] = 'fixed'; +$prefs['module_zones_pagetop'] = 'fixed'; +$prefs['feature_left_column'] = 'fixed'; +$prefs['feature_right_column'] = 'fixed'; +$prefs['module_zones_pagebottom'] = 'fixed'; +$prefs['module_zones_bottom'] = 'fixed'; $headerlib->add_css('.module:hover { cursor: move; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-05-18 16:27:02
|
Revision: 34477 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34477&view=rev Author: jonnybradley Date: 2011-05-18 16:26:56 +0000 (Wed, 18 May 2011) Log Message: ----------- [FIX] modules: Better fix for drag into empty zones using CSS (so if you empty a zone by dragging everything out, you can now drag back into it). Modified Paths: -------------- branches/7.x/css/admin.css branches/7.x/lib/modules/tiki-admin_modules.js Modified: branches/7.x/css/admin.css =================================================================== --- branches/7.x/css/admin.css 2011-05-18 16:19:49 UTC (rev 34476) +++ branches/7.x/css/admin.css 2011-05-18 16:26:56 UTC (rev 34477) @@ -357,6 +357,10 @@ display: none; } +.modules { + min-height: 1em; +} + /* end modules revamp */ /* tiki 7 theme generator * Modified: branches/7.x/lib/modules/tiki-admin_modules.js =================================================================== --- branches/7.x/lib/modules/tiki-admin_modules.js 2011-05-18 16:19:49 UTC (rev 34476) +++ branches/7.x/lib/modules/tiki-admin_modules.js 2011-05-18 16:26:56 UTC (rev 34477) @@ -40,11 +40,6 @@ return null; } }); - $(".modules").each(function () { - if ($.trim($(this).text()) === "") { - $(this).css("min-height", "1em"); - } - }); }); $(".modules").sortable( { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sy...@us...> - 2011-05-18 20:02:49
|
Revision: 34490 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34490&view=rev Author: sylvieg Date: 2011-05-18 20:02:42 +0000 (Wed, 18 May 2011) Log Message: ----------- [FIX]tracker: better fix to encode csv data Modified Paths: -------------- branches/7.x/lib/core/Tracker/Field/Abstract.php branches/7.x/tiki-export_tracker_ajax.php Modified: branches/7.x/lib/core/Tracker/Field/Abstract.php =================================================================== --- branches/7.x/lib/core/Tracker/Field/Abstract.php 2011-05-18 19:36:28 UTC (rev 34489) +++ branches/7.x/lib/core/Tracker/Field/Abstract.php 2011-05-18 20:02:42 UTC (rev 34490) @@ -149,7 +149,11 @@ protected function renderInnerOutput($context = array()) { if ($context['list_mode'] === 'csv') { - return $this->getConfiguration('value'); + $val = $this->getConfiguration('value'); + $default = array('CR'=>'%%%', 'delimitorL'=>'"', 'delimitorR'=>'"'); + $context = array_merge($default, $context); + $val = str_replace(array("\r\n", "\n", '<br />', $context['delimitorL'], $context['delimitorR']), array($context['CR'], $context['CR'], $context['CR'], $context['delimitorL'].$context['delimitorL'], $context['delimitorR'].$context['delimitorR']), $val); + return $val; } else { return $this->getConfiguration('pvalue', $this->getConfiguration('value')); } Modified: branches/7.x/tiki-export_tracker_ajax.php =================================================================== --- branches/7.x/tiki-export_tracker_ajax.php 2011-05-18 19:36:28 UTC (rev 34489) +++ branches/7.x/tiki-export_tracker_ajax.php 2011-05-18 20:02:42 UTC (rev 34490) @@ -316,16 +316,15 @@ case 'd': // text etc $data = $field_value['value']; if (is_array($data)) { // TODO handle other types of field better here (preferably in a function in $trklib) - $data = implode('%%%', $data); + $data = implode($CR, $data); } + $data = str_replace(array("\r\n", "\n", '<br />', $delimitorL, $delimitorR), array($CR, $CR, $CR, $delimitorL.$delimitorL, $delimitorR.$delimitorR), $data); break; - default: - $data = $trklib->get_field_handler($field_value, $item)->renderOutput(array( - 'list_mode' => 'csv', + default: + $data = $trklib->get_field_handler($field_value, $item)->renderOutput(array( + 'list_mode' => 'csv', 'CR'=>$CR, 'delimitorL'=>$delimitorL, 'delimitorR'=>$delimitorR )); } - $data = str_replace(array("\r\n", "\n", '<br />', $delimitorL, $delimitorR), array($CR, $CR, $CR, $delimitorL.$delimitorL, $delimitorR.$delimitorR), $data); - } $str .= needs_separator($str) ? '' : $separator; $str .= $delimitorL.$data.$delimitorR; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2011-05-19 04:47:22
|
Revision: 34496 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34496&view=rev Author: marclaporte Date: 2011-05-19 04:47:16 +0000 (Thu, 19 May 2011) Log Message: ----------- Adding missing prefs for category-related features Modified Paths: -------------- branches/7.x/lib/prefs/feature.php branches/7.x/templates/tiki-admin_include_category.tpl Modified: branches/7.x/lib/prefs/feature.php =================================================================== --- branches/7.x/lib/prefs/feature.php 2011-05-19 03:46:50 UTC (rev 34495) +++ branches/7.x/lib/prefs/feature.php 2011-05-19 04:47:16 UTC (rev 34496) @@ -26,12 +26,13 @@ return array( 'feature_blog_mandatory_category' => array( - 'name' => tra('Force and limit categorization to within subtree of'), + 'name' => tra('Blog:'.' '.'Force and limit categorization to within subtree of'), 'description' => tra('If you get an error message indicating a mandatory category is required when editing a blog post, this is the option to blame. Set it to None.'), 'type' => 'list', 'options' => $catree, 'dependencies' => array( 'feature_categories', + 'feature_blogs', ), ), 'feature_wiki' => array( @@ -1534,14 +1535,25 @@ 'type' => 'flag', ), 'feature_wiki_mandatory_category' => array( - 'name' => tra('Force and limit categorization to within subtree of'), + 'name' => tra('Wiki:'.' '.'Force and limit categorization to within subtree of'), 'description' => tra('If you get an error message indicating a mandatory category is required when editing a wiki page, this is the option to blame. Set it to None.'), 'type' => 'list', 'options' => $catree, 'dependencies' => array( 'feature_categories', + 'feature_wiki', ), ), + 'feature_image_gallery_mandatory_category' => array( + 'name' => tra('Image Gallery:'.' '.'Force and limit categorization to within subtree of'), + 'description' => tra('If you get an error message indicating a mandatory category is required when editing an image (in an image gallery), this is the option to blame. Set it to None.'), + 'type' => 'list', + 'options' => $catree, + 'dependencies' => array( + 'feature_categories', + 'feature_galleries', + ), + ), 'feature_wiki_show_hide_before' => array( 'name' => tra('Display show/hide icon displayed before headings'), 'type' => 'flag', Modified: branches/7.x/templates/tiki-admin_include_category.tpl =================================================================== --- branches/7.x/templates/tiki-admin_include_category.tpl 2011-05-19 03:46:50 UTC (rev 34495) +++ branches/7.x/templates/tiki-admin_include_category.tpl 2011-05-19 04:47:16 UTC (rev 34496) @@ -1,6 +1,7 @@ <div class="navbar"> {button href="tiki-browse_categories.php" _text="{tr}Browse categories{/tr}"} {button href="tiki-admin_categories.php" _text="{tr}Administer categories{/tr}"} + {button href="tiki-edit_categories.php" _text="{tr}Organize Objects{/tr}" _title="{tr}Organize Objects{/tr}"} </div> <form action="tiki-admin.php?page=category" method="post"> @@ -42,6 +43,11 @@ {preference name=category_i18n_synced} </div> + {preference name=feature_wiki_mandatory_category} + {preference name=feature_blog_mandatory_category} + {preference name=feature_image_gallery_mandatory_category} + + </fieldset> <fieldset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2011-05-19 17:21:48
|
Revision: 34513 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34513&view=rev Author: jonnybradley Date: 2011-05-19 17:21:41 +0000 (Thu, 19 May 2011) Log Message: ----------- [FIX] modules revamp: Remove orphaned prefs and change warning on site logo feature Modified Paths: -------------- branches/7.x/lib/prefs/feature.php branches/7.x/lib/prefs/sitelogo.php branches/7.x/lib/setup/prefs.php branches/7.x/templates/tiki-admin_include_look.tpl Modified: branches/7.x/lib/prefs/feature.php =================================================================== --- branches/7.x/lib/prefs/feature.php 2011-05-19 17:08:10 UTC (rev 34512) +++ branches/7.x/lib/prefs/feature.php 2011-05-19 17:21:41 UTC (rev 34513) @@ -1131,7 +1131,7 @@ 'feature_sitelogo' => array( 'name' => tra('Site Logo and Title'), 'type' => 'flag', - 'warning' => tra('Obsolete in tiki7'), + 'warning' => tra('Will be obsolete in Tiki 8 and migrated to modules entirely.'), ), 'feature_left_column' => array( 'name' => tra('Left column'), Modified: branches/7.x/lib/prefs/sitelogo.php =================================================================== --- branches/7.x/lib/prefs/sitelogo.php 2011-05-19 17:08:10 UTC (rev 34512) +++ branches/7.x/lib/prefs/sitelogo.php 2011-05-19 17:21:41 UTC (rev 34513) @@ -17,21 +17,6 @@ 'type' => 'text', 'size' => '15', ), - 'sitelogo_bgstyle' => array( - 'name' => tra('Logo background style'), - 'hint' => tra('Examples:') . ' ' . '1) silver url(myStyle/img.gif) repeat - 2) padding: 30px 10px; background: #fff', - 'type' => 'text', - 'size' => '20', - ), - 'sitelogo_align' => array( - 'name' => tra('Logo alignment'), - 'type' => 'list', - 'options' => array( - 'left' => tra('Left'), - 'center' => tra('Center'), - 'right' => tra('Right'), - ), - ), 'sitelogo_title' => array( 'name' => tra('Logo title (on mouse over)'), 'type' => 'text', Modified: branches/7.x/lib/setup/prefs.php =================================================================== --- branches/7.x/lib/setup/prefs.php 2011-05-19 17:08:10 UTC (rev 34512) +++ branches/7.x/lib/setup/prefs.php 2011-05-19 17:21:41 UTC (rev 34513) @@ -1358,8 +1358,6 @@ 'site_nav_seper' => '|', 'feature_sitelogo' => 'y', 'sitelogo_bgcolor' => 'transparent', - 'sitelogo_bgstyle' => '', - 'sitelogo_align' => 'left', 'sitelogo_title' => 'Tiki powered site', 'sitelogo_src' => 'img/tiki/Tiki_WCG.png', 'sitelogo_alt' => 'Site Logo', Modified: branches/7.x/templates/tiki-admin_include_look.tpl =================================================================== --- branches/7.x/templates/tiki-admin_include_look.tpl 2011-05-19 17:08:10 UTC (rev 34512) +++ branches/7.x/templates/tiki-admin_include_look.tpl 2011-05-19 17:21:41 UTC (rev 34513) @@ -76,8 +76,6 @@ <legend>{tr}Logo{/tr}</legend> {preference name=sitelogo_src} {preference name=sitelogo_bgcolor} - {preference name=sitelogo_bgstyle} - {preference name=sitelogo_align} {preference name=sitelogo_title} {preference name=sitelogo_alt} </fieldset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ch...@us...> - 2011-05-19 21:49:16
|
Revision: 34537 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=34537&view=rev Author: chealer Date: 2011-05-19 21:49:09 +0000 (Thu, 19 May 2011) Log Message: ----------- [MOD] Quick Edit module: remove parameters pastetext, enterdescription and chooseCateg introduced in Tiki 6 (r28084) These fields overlap with those in page edition. http://article.gmane.org/gmane.comp.cms.tiki.cvs/63827/match=28084 Sorry if this affects anyone, please speak up Modified Paths: -------------- branches/7.x/modules/mod-func-quick_edit.php branches/7.x/templates/modules/mod-quick_edit.tpl branches/7.x/tiki-editpage.php Modified: branches/7.x/modules/mod-func-quick_edit.php =================================================================== --- branches/7.x/modules/mod-func-quick_edit.php 2011-05-19 21:42:15 UTC (rev 34536) +++ branches/7.x/modules/mod-func-quick_edit.php 2011-05-19 21:49:09 UTC (rev 34537) @@ -31,7 +31,7 @@ ), 'size' => array( 'name' => tra('INPUT SIZE'), - 'description' => tra('Size attribute (horizontal, in characters) of the text input fields for page names and description. The size of the other fields is relative to the module width') . " " . tra('Default:') . " 15" + 'description' => tra('Size attribute (horizontal, in characters) of the text input field for page names.') . " " . tra('Default:') . " 15" ), 'mod_quickedit_heading' => array( 'name' => tra('Heading'), @@ -57,26 +57,12 @@ 'name' => tra('Custom header template'), 'description' => tra('Wiki page to be used as a template to show content on top of edit page'), ), - 'pastetext' => array( - 'name' => tra('input field for copy/paste'), - 'description' => tra('If set to 1 , a text area for copy/paste page content is shown') . " " . tra('Default:') . ' 0', - 'filter' => 'int', - ), - 'enterdescription' => array( - 'name' => tra('show description field'), - 'description' => tra('If set to 1, a text field to enter the page description is shown (requires feature_wiki_description)') . " " . tra('Default:') . ' 0', - ), - 'chooseCateg' => array( - 'name' => tra('choose category'), - 'description' => tra('If set to 1, this allows the user to choose a category instead of preselecting one') . " " . tra('Default:') . ' 0', - ), ) ); } function module_quick_edit( $mod_reference, $module_params ) { global $smarty, $prefs; - global $categlib; include_once 'lib/categories/categlib.php'; $smarty->assign('tpl_module_title', tra("Quick Edit a Wiki Page")); @@ -131,27 +117,7 @@ } else { $wikiHeaderTpl = ''; } - if (isset($module_params["pastetext"])) { - $pastetext=$module_params["pastetext"]; - } else { - $pastetext=0; - } - if (isset($module_params["enterdescription"])) { - $enterdescription=$module_params["enterdescription"]; - } else { - $enterdescription=0; - } - if (isset($module_params["chooseCateg"])) { - $chooseCateg=$module_params["chooseCateg"]; - $cats=$categlib->list_categs(); - $smarty->assign('qcats',$cats); - } else { - $chooseCateg=0; - } - - $smarty->assign('chooseCateg',$chooseCateg); - $smarty->assign('enterdescription',$enterdescription); - $smarty->assign('pastetext',$pastetext); + $smarty->assign('wikiHeaderTpl', $wikiHeaderTpl); $smarty->assign('customTip', $customTip); $smarty->assign('customTipTitle', $customTipTitle); Modified: branches/7.x/templates/modules/mod-quick_edit.tpl =================================================================== --- branches/7.x/templates/modules/mod-quick_edit.tpl 2011-05-19 21:42:15 UTC (rev 34536) +++ branches/7.x/templates/modules/mod-quick_edit.tpl 2011-05-19 21:49:09 UTC (rev 34537) @@ -6,31 +6,10 @@ {if $customTipTitle}<input type="hidden" name="customTipTitle" value="{$customTipTitle}" />{/if} {if $wikiTplHeader}<input type="hidden" name="wikiTplHeader" value="{$wikiTplHeader}" />{/if} {if $mod_quickedit_heading}<div class="box-data">{$mod_quickedit_heading}</div>{/if} -{if $enterdescription==1 or $chooseCateg==1 or $pastetext==1}<label>{tr}Page name{/tr}</label>{/if} <input id="{$qefield}" size="{$size}" type="text" name="page" /> -{if $enterdescription==1}{if $prefs.feature_wiki_description eq 'y' or $prefs.metatag_pagedesc eq 'y'} -<div> -<label>{if $prefs.metatag_pagedesc eq 'y'}{tr}Description (used for metatags):{/tr}{else}{tr}Description:{/tr}{/if}</label> -{if $prefs.disableJavascript != 'y'}<a id="flipperqdescription" href="javascript:flipWithSign('qdescription')">[+]</a>{/if} -<input id="qdescription" {if $prefs.disableJavascript != 'y'} style="display: none;"{/if} type="text" size="{$size}" name="description" /> -</div>{/if}{/if} -{if $chooseCateg==1} -<div> -<input type="hidden" name="cat_categorize" value="on" /> -<label>{tr}Category{/tr}</label> -{if $prefs.disableJavascript != 'y'}<a id="flipperqcat" href="javascript:flipWithSign('qcat')">[+]</a>{/if} -<select id="qcat" style="width:97%;{if $prefs.disableJavascript != 'y'} display: none;{/if}" name="cat_categories[]"> -<option></option> -{foreach from=$qcats item="cat"}<option value="{$cat.categId}"{if $cat.categId==$categId} selected="selected"{/if}>{$cat.name}</option> -{/foreach} -</select> -</div> -{else} {if $categId}<input type="hidden" name="categId" value="{$categId}" />{/if} -{/if} {if $addcategId}<input type="hidden" name="cat_categories[]" value="{$addcategId}" /> <input type="hidden" name="cat_categorize" value="on" />{/if} -{if $pastetext==1}<label>{tr}Paste content here{/tr}</label><textarea name="copypaste" style="width:96%;" cols="{$size}" rows="2"></textarea>{/if} <input type="submit" name="qedit" value="{$submit}" /> </div> </form> Modified: branches/7.x/tiki-editpage.php =================================================================== --- branches/7.x/tiki-editpage.php 2011-05-19 21:42:15 UTC (rev 34536) +++ branches/7.x/tiki-editpage.php 2011-05-19 21:49:09 UTC (rev 34537) @@ -156,11 +156,6 @@ $smarty->assign('page', $page); $info = $tikilib->get_page_info($page); -//if $_REQUEST['copypaste'] is set from QuickEdit module this is the copy/paste field -if (isset($_REQUEST['copypaste']) and $_REQUEST['copypaste']!='') { - $_REQUEST['edit']=$info['data']."\n".$_REQUEST['copypaste']; -} - // String use to lock the page currently edit. $editLockPageId = 'edit_lock_' . (isset($info['page_id']) ? (int) $info['page_id'] : 0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |