From: <jon...@us...> - 2010-12-05 22:53:10
|
Revision: 31162 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=31162&view=rev Author: jonnybradley Date: 2010-12-05 22:52:59 +0000 (Sun, 05 Dec 2010) Log Message: ----------- [MRG] Automatic merge, branches/6.x 31032 to 31160 Conflicts merged manually - please check lib/wiki-plugins/wikiplugin_listpages.php lib/wiki-plugins/wikiplugin_survey.php lib/wiki-plugins/wikiplugin_poll.php (?) lib/wiki-plugins/wikiplugin_code.php lib/wiki-plugins/wikiplugin_file.php lib/blogs/bloglib.php Modified Paths: -------------- trunk/css/ie7.css trunk/lang/ca/language.js trunk/lang/ca/language.php trunk/lang/en/language.js trunk/lang/es/language.js trunk/lib/blogs/bloglib.php trunk/lib/setup/absolute_urls.php trunk/lib/wiki-plugins/wikiplugin_articles.php trunk/lib/wiki-plugins/wikiplugin_catorphans.php trunk/lib/wiki-plugins/wikiplugin_catpath.php trunk/lib/wiki-plugins/wikiplugin_cclite.php trunk/lib/wiki-plugins/wikiplugin_center.php trunk/lib/wiki-plugins/wikiplugin_code.php trunk/lib/wiki-plugins/wikiplugin_colorbox.php trunk/lib/wiki-plugins/wikiplugin_content.php trunk/lib/wiki-plugins/wikiplugin_cookie.php trunk/lib/wiki-plugins/wikiplugin_copyright.php trunk/lib/wiki-plugins/wikiplugin_countdown.php trunk/lib/wiki-plugins/wikiplugin_datachannel.php trunk/lib/wiki-plugins/wikiplugin_dbreport.php trunk/lib/wiki-plugins/wikiplugin_div.php trunk/lib/wiki-plugins/wikiplugin_dl.php trunk/lib/wiki-plugins/wikiplugin_equation.php trunk/lib/wiki-plugins/wikiplugin_events.php trunk/lib/wiki-plugins/wikiplugin_fade.php trunk/lib/wiki-plugins/wikiplugin_fancylist.php trunk/lib/wiki-plugins/wikiplugin_fancytable.php trunk/lib/wiki-plugins/wikiplugin_file.php trunk/lib/wiki-plugins/wikiplugin_files.php trunk/lib/wiki-plugins/wikiplugin_flash.php trunk/lib/wiki-plugins/wikiplugin_footnote.php trunk/lib/wiki-plugins/wikiplugin_footnotearea.php trunk/lib/wiki-plugins/wikiplugin_freetagged.php trunk/lib/wiki-plugins/wikiplugin_ftp.php trunk/lib/wiki-plugins/wikiplugin_gauge.php trunk/lib/wiki-plugins/wikiplugin_googleanalytics.php trunk/lib/wiki-plugins/wikiplugin_googledoc.php trunk/lib/wiki-plugins/wikiplugin_googlemap.php trunk/lib/wiki-plugins/wikiplugin_group.php trunk/lib/wiki-plugins/wikiplugin_grouplist.php trunk/lib/wiki-plugins/wikiplugin_groupmailcore.php trunk/lib/wiki-plugins/wikiplugin_groupstat.php trunk/lib/wiki-plugins/wikiplugin_html.php trunk/lib/wiki-plugins/wikiplugin_iframe.php trunk/lib/wiki-plugins/wikiplugin_img.php trunk/lib/wiki-plugins/wikiplugin_include.php trunk/lib/wiki-plugins/wikiplugin_invite.php trunk/lib/wiki-plugins/wikiplugin_jabber.php trunk/lib/wiki-plugins/wikiplugin_jq.php trunk/lib/wiki-plugins/wikiplugin_js.php trunk/lib/wiki-plugins/wikiplugin_kaltura.php trunk/lib/wiki-plugins/wikiplugin_lang.php trunk/lib/wiki-plugins/wikiplugin_lastmod.php trunk/lib/wiki-plugins/wikiplugin_listpages.php trunk/lib/wiki-plugins/wikiplugin_lsdir.php trunk/lib/wiki-plugins/wikiplugin_mail.php trunk/lib/wiki-plugins/wikiplugin_map.php trunk/lib/wiki-plugins/wikiplugin_mcalendar.php trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php trunk/lib/wiki-plugins/wikiplugin_memberlist.php trunk/lib/wiki-plugins/wikiplugin_memberpayment.php trunk/lib/wiki-plugins/wikiplugin_miniquiz.php trunk/lib/wiki-plugins/wikiplugin_module.php trunk/lib/wiki-plugins/wikiplugin_mono.php trunk/lib/wiki-plugins/wikiplugin_mouseover.php trunk/lib/wiki-plugins/wikiplugin_mwtable.php trunk/lib/wiki-plugins/wikiplugin_myspace.php trunk/lib/wiki-plugins/wikiplugin_objecthits.php trunk/lib/wiki-plugins/wikiplugin_payment.php trunk/lib/wiki-plugins/wikiplugin_perm.php trunk/lib/wiki-plugins/wikiplugin_poll.php trunk/lib/wiki-plugins/wikiplugin_profile.php trunk/lib/wiki-plugins/wikiplugin_proposal.php trunk/lib/wiki-plugins/wikiplugin_quote.php trunk/lib/wiki-plugins/wikiplugin_randominclude.php trunk/lib/wiki-plugins/wikiplugin_rcontent.php trunk/lib/wiki-plugins/wikiplugin_realnamelist.php trunk/lib/wiki-plugins/wikiplugin_redirect.php trunk/lib/wiki-plugins/wikiplugin_regex.php trunk/lib/wiki-plugins/wikiplugin_remarksbox.php trunk/lib/wiki-plugins/wikiplugin_rss.php trunk/lib/wiki-plugins/wikiplugin_scroll.php trunk/lib/wiki-plugins/wikiplugin_sf.php trunk/lib/wiki-plugins/wikiplugin_sharethis.php trunk/lib/wiki-plugins/wikiplugin_sheet.php trunk/lib/wiki-plugins/wikiplugin_showpages.php trunk/lib/wiki-plugins/wikiplugin_skype.php trunk/lib/wiki-plugins/wikiplugin_smarty.php trunk/lib/wiki-plugins/wikiplugin_snarf.php trunk/lib/wiki-plugins/wikiplugin_sort.php trunk/lib/wiki-plugins/wikiplugin_split.php trunk/lib/wiki-plugins/wikiplugin_sql.php trunk/lib/wiki-plugins/wikiplugin_stat.php trunk/lib/wiki-plugins/wikiplugin_sub.php trunk/lib/wiki-plugins/wikiplugin_subscribegroup.php trunk/lib/wiki-plugins/wikiplugin_subscribegroups.php trunk/lib/wiki-plugins/wikiplugin_subscribenewsletter.php trunk/lib/wiki-plugins/wikiplugin_sup.php trunk/lib/wiki-plugins/wikiplugin_survey.php trunk/lib/wiki-plugins/wikiplugin_tabs.php trunk/lib/wiki-plugins/wikiplugin_tag.php trunk/lib/wiki-plugins/wikiplugin_titlesearch.php trunk/lib/wiki-plugins/wikiplugin_toc.php trunk/lib/wiki-plugins/wikiplugin_topfriends.php trunk/lib/wiki-plugins/wikiplugin_tr.php trunk/lib/wiki-plugins/wikiplugin_tracker.php trunk/robots.txt trunk/styles/abse.css trunk/styles/arcturus/options/jalist.css trunk/styles/coelesce.css trunk/styles/darkroom.css trunk/styles/darkshine.css trunk/styles/eatlon.css trunk/styles/feb12.css trunk/styles/jqui/options/excitebike.css trunk/styles/jqui/options/trontastic.css trunk/styles/layout/layout.css trunk/styles/ohia.css trunk/styles/snow.css trunk/styles/strasa/options/cool.css trunk/styles/strasa/options/mono.css trunk/styles/strasa.css trunk/styles/thenews.css trunk/styles/tikinewt.css trunk/styles/twist.css trunk/templates/header.tpl trunk/templates/styles/darkshine/tiki.tpl trunk/templates/styles/twist/tiki.tpl trunk/templates/tiki-view_articles.tpl trunk/templates/tiki-view_tracker_item.tpl trunk/tiki-view_blog_post.php Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31032 /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/proposals/4.x:24005 + /branches/3.0:16998-18916 /branches/4.x:22817-23908 /branches/5.x:26025-26523,26527-28378 /branches/6.x:29486-31160 /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/proposals/4.x:24005 Modified: trunk/css/ie7.css =================================================================== --- trunk/css/ie7.css 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/css/ie7.css 2010-12-05 22:52:59 UTC (rev 31162) @@ -8,6 +8,10 @@ margin-left: 1em; } +.box-data .cssmenu_vert ul { + margin-left: 0; +} + #col2 .cssmenu_vert { margin-left: 0; } @@ -21,4 +25,26 @@ #editpageform { width: 520px; +} + +#header-top { + z-index: 4; +} + +#tiki-top { + position: relative; + z-index: 3; +} + +#middle { + z-index: 1; + position: relative; +} + +h3.box-title { + z-index: 0; +} + +.cssmenu_vert ul li { + width: inherit; } \ No newline at end of file Modified: trunk/lang/ca/language.js =================================================================== --- trunk/lang/ca/language.js 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lang/ca/language.js 2010-12-05 22:52:59 UTC (rev 31162) @@ -6,16 +6,23 @@ */ lang = { - -"Very Secure" : "Molt segura", -"Secure" : "Segura", -"Very Strong" : "Molt forta", -"Strong" : "Forta", -"Average" : "Intermitja", -"Weak" : "Fluixa", -"Very Weak" : "Molt fluixa", -"Strength" : "Força", -"Valid User Name" : "Nom d'usuari vàlid", -"Passwords match" : "Les contrasenyes coincideixen", -"Valid Email" : "Correu-e vàlid" + "Very Secure" : "Molt segura", + "Secure" : "Segura", + "Very Strong" : "Molt forta", + "Strong" : "Forta", + "Average" : "Intermitja", + "Weak" : "Fluixa", + "Very Weak" : "Molt fluixa", + "Strength" : "Força", + "Valid User Name" : "Nom d'usuari vàlid", + "Passwords match" : "Les contrasenyes coincideixen", + "Valid Email" : "Correu-e vàlid" + "Close" : "Tancar", + "Submit" : "Enviar", + "Insert" : "Inserir", + "Replace" : "Substituir", + "Match" : "Igual", + "Do not match" : "Diferent", + "Advanced options" : "Opcions avançades", + "Pick a file." : "Escull un arxiu", }; Modified: trunk/lang/ca/language.php =================================================================== --- trunk/lang/ca/language.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lang/ca/language.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -6300,13 +6300,13 @@ // "Name of the profile" => "Name of the profile", // "Profile plugin only available to administrators" => "Profile plugin only available to administrators", // "Profile %0/%1 not found" => "Profile %0/%1 not found", -// "Proposal" => "Proposal", -// "Provides a widget for users to vote on a proposal and view the current decision" => "Provides a widget for users to vote on a proposal and view the current decision", -// "The list of votes cast. One vote per line. Either 0, +1 or -1 followed by a username" => "The list of votes cast. One vote per line. Either 0, +1 or -1 followed by a username", -// "Accept proposal" => "Accept proposal", -// "Still undecided" => "Still undecided", -// "Reject proposal" => "Reject proposal", -// "Short description of the proposal to vote on. Will be displayed above the result table" => "Short description of the proposal to vote on. Will be displayed above the result table", +"Proposal" => "Proposta", +"Provides a widget for users to vote on a proposal and view the current decision" => "Proporciona un widget per a que els usuaris puguin votar sobre propostes i veure la decisió actual", +"The list of votes cast. One vote per line. Either 0, +1 or -1 followed by a username" => "La llista de vots emesos. Un vot per línia. Ó bé 0, +1 ó -1 seguits per un nom d'usuari", +"Accept proposal" => "Accepta la proposta", +"Still undecided" => "Indecís encara", +"Reject proposal" => "Rebutja la proposta", +"Short description of the proposal to vote on. Will be displayed above the result table" => "Breu descripció de la proposta sobre la que es vol votar. Es mostrarà a sobre de la taula de resultats", // "Quote" => "Quote", // "Quoted text" => "Quoted text", // "Reply to" => "Reply to", @@ -6454,15 +6454,15 @@ // "Subscribe Group" => "Subscribe Group", // "text displyed before the button" => "text displyed before the button", // "As known in Tikiwiki" => "As known in Tikiwiki", -// "Subscribe Text" => "Subscribe Text", -// "Subscribe text, containing %s as the placeholder for the group name" => "Subscribe text, containing %s as the placeholder for the group name", -// "Unsubscribe Text" => "Unsubscribe Text", -// "Unsubscribe text, containing %s as the placeholder for the group name" => "Unsubscribe text, containing %s as the placeholder for the group name", -// "Subscribe Action" => "Subscribe Action", -// "Subscribe button label, containing %s as the placeholder for the group name" => "Subscribe button label, containing %s as the placeholder for the group name", -// "Unsubscribe Action" => "Unsubscribe Action", -// "Unsubscribe button label, containing %s as the placeholder for the group name" => "Unsubscribe button label, containing %s as the placeholder for the group name", -// "Subscribe Groups" => "Subscribe Groups", +"Subscribe Text" => "Text per a la subscripció", +"Subscribe text, containing %s as the placeholder for the group name" => "Text per a la subscripció, contenint %s com a indicador d'on es col·locarà el nom del grup", +"Unsubscribe Text" => "Text per a desubscriure's", +"Unsubscribe text, containing %s as the placeholder for the group name" => "Text per a desubscriure's,contenint %s com a indicador d'on es col·locarà el nom del grup", +"Subscribe Action" => "Acció de Subscriure's", +"Subscribe button label, containing %s as the placeholder for the group name" => "Etiqueta del botó de subscripció, contenint %s com a indicador d'on es col·locarà el nom del grup", +"Unsubscribe Action" => "Acció de de-subscriure's", +"Unsubscribe button label, containing %s as the placeholder for the group name" => "Etiqueta del botó de de-subscripció, contenint %s com a indicador d'on es col·locarà el nom del grup", +"Subscribe Groups" => "Subscribe Groups", // "Show subscribe box" => "Show subscribe box", // "Show default setting and buttons" => "Show default setting and buttons", // "Show group description" => "Show group description", @@ -7837,7 +7837,7 @@ // "Minimum {\$prefs.min_pass_length} characters long" => "Minimum {\$prefs.min_pass_length} characters long", // "To request a passcode, {if \$prefs.feature_contact eq 'y'}<a href=\"tiki-contact.php\">{/if}\n\t\t\t\tcontact the system administrator{if \$prefs.feature_contact eq 'y'}</a>{/if}" => "To request a passcode, {if \$prefs.feature_contact eq 'y'}<a href=\"tiki-contact.php\">{/if}\n\t\t\t\tcontact the system administrator{if \$prefs.feature_contact eq 'y'}</a>{/if}", // "Download Log File" => "Download Log File", -// "Send Newsletter" => "Send Newsletter", +"Send Newsletter" => "Envia el Butlletí", // "absE" => "absE", // "Login SSO" => "Login SSO", // "Module errors" => "Module errors", @@ -8440,30 +8440,30 @@ // "To use a default Tiki menu" => "To use a default Tiki menu", // "To use a <a target=\"tikihelp\" href=\"http://users.tpg.com.au/j_birch/plugins/superfish/\">CSS (Superfish) menu</a>, use one of these syntaxes" => "To use a <a target=\"tikihelp\" href=\"http://users.tpg.com.au/j_birch/plugins/superfish/\">CSS (Superfish) menu</a>, use one of these syntaxes", // "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.)" => "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.)", -// "Edit Newsletter" => "Edit Newsletter", -// "Wiki Page Name" => "Wiki Page Name", -// "Validate Addresses" => "Validate Addresses", -// "Add To List" => "Add To List", -// "Add subscribers" => "Add subscribers", -// "Users from group" => "Users from group", -// "Import emails from file" => "Import emails from file", -// "txt file, one e-mail per line" => "txt file, one e-mail per line", -// "Don't send confirmation mails" => "Don't send confirmation mails", -// "Import emails from wiki page" => "Import emails from wiki page", -// "Wiki page, one e-mail per line" => "Wiki page, one e-mail per line", -// "Use subscribers of another newsletter" => "Use subscribers of another newsletter", -// "Use emails from wiki page" => "Use emails from wiki page", -// "Emails on a wiki page which will be added at each newsletter sending, one e-mail per line" => "Emails on a wiki page which will be added at each newsletter sending, one e-mail per line", -// "Don't subscribe emails" => "Don't subscribe emails", -// "Export Subscriber Emails" => "Export Subscriber Emails", -// "Create Newsletter" => "Create Newsletter", -// "Allow customized text message to be sent with the html version" => "Allow customized text message to be sent with the html version", -// "Allow clipping of articles into newsletter" => "Allow clipping of articles into newsletter", -// "Automatically clip articles into newsletter" => "Automatically clip articles into newsletter", -// "Clip articles published in the past number of days" => "Clip articles published in the past number of days", -// "Article types to clip" => "Article types to clip", -// "Mail notifications" => "Mail notifications", -// "You need to set <a href=\"tiki-admin.php?page=general\">Sender Email</a> before creating email notifications" => "You need to set <a href=\"tiki-admin.php?page=general\">Sender Email</a> before creating email notifications", +"Edit Newsletter" => "Edita el Butlletí", +"Wiki Page Name" => "Nom de pàgina wiki", +"Validate Addresses" => "Valida les adreces", +"Add To List" => "Afegeix-ne a la llista", +"Add subscribers" => "Afegeix subscriptors", +"Users from group" => "Usuaris del grup", +"Import emails from file" => "Importa correus-e des d'un arxiu", +"txt file, one e-mail per line" => "arxiu txt, amb un correu-e a cada línia", +"Don't send confirmation mails" => "No enviïs correus-e de confirmació", +"Import emails from wiki page" => "Importa correus-e des d'una pàgina wiki", +"Wiki page, one e-mail per line" => "Pàgina wiki, un correu-e a cada línia", +"Use subscribers of another newsletter" => "Empra subscriptors d'un altre butlletí", +"Use emails from wiki page" => "Empra correus-e des de pàgina wiki", +"Emails on a wiki page which will be added at each newsletter sending, one e-mail per line" => "Correus-e a una pàgina wiki que seran afegits cada vegada que s'enviï un nou butlletí, amb un correu-e a cada línia", +"Don't subscribe emails" => "No subscriguis correus-e", +"Export Subscriber Emails" => "Exporta els correus-e dels subscriptors", +"Create Newsletter" => "Crea un Butlletí", +"Allow customized text message to be sent with the html version" => "Permet que s'hi pugui posar un missatge de text senzill personalitzat amb l'enviament de la versió en html", +"Allow clipping of articles into newsletter" => "Permet el retallat d'articles a dins d'un butlletí", +"Automatically clip articles into newsletter" => "Retalla automàticament els articles a dins del butlletí", +"Clip articles published in the past number of days" => "Retalla els articles publicats en el darrer número de dies", +"Article types to clip" => "Tipus d'articles a retallar", +"Mail notifications" => "Notificacions per correu-e", +"You need to set <a href=\"tiki-admin.php?page=general\">Sender Email</a> before creating email notifications" => "Has d'especificar el <a href=\"tiki-admin.php?page=general\">Correu-e de l'enviador</a> abans de crear notificacions de correu-e", // "Preload Admin Account" => "Preload Admin Account", // "User / Group" => "User / Group", // "Trackers Outbound Emails" => "Trackers Outbound Emails", @@ -12871,13 +12871,13 @@ "Subscriptions" => "Subscripcions", "Valid" => "Vàlid", "Subscribed" => "subscrit", -"You can add several email addresses by separating them with commas." => "Pedeu afegir varies adreces de correu electrònic separant-les amb comes.", +"You can add several email addresses by separating them with commas." => "Podeu afegir varies adreces de correu electrònic separant-les amb comes.", "Add email:" => "Afegeix email:", "Add user:" => "Afegeix usuari:", "Group subscription also subscribes included groups" => "La subscripció al grup també subscriu als grups inclosos", "Don't send confirmation mail" => "No enviis un correu electrònic de confirmació", "The user email will be refreshed at each newsletter sending" => "El correu-e de l'usuari s'actualitzarà cada vegada que s'envii un butlletí", -"Subscribe group" => "Subscriu al grup", +"Subscribe group" => "Subscriu el grup", "Included group, group users and emails will be refreshed at each newsletter sending" => "Els grups inclosos, els usuaris del grup i els correus electrònics s'actualitzaran a cada butlletí enviat", "Admin newsletters" => "Administrar butlletins", "Editions" => "Edicions", @@ -13925,7 +13925,7 @@ "User forum topics" => "Tòpics de l'usuari als fòrums", "Forum topics" => "Tòpics del Fòrum", "Date of post" => "Data de publicació", -"User forum replies" => "Respostes de l'usuari al forum", +"User forum replies" => "Respostes de l'usuari al fòrum", "Forum replies" => "Respostes al Fòrum", "To display the objects you created or contributed to:" => "Per mostrar els objectes en els que participes:", "MyTiki" => "ElmeuTiki", @@ -13934,7 +13934,7 @@ "Notepad" => "Bloc de notes", "MyFiles" => "Elsmeusarxius", "My Watches" => "Els meus avisos", -"Sent editions" => "Envia edicions", +"Sent editions" => "Edicions enviades", "Sent Edition" => "Edició Enviada", "HTML version" => "Versió en HTML", "Text version" => "Versió en Text senzill", Modified: trunk/lang/en/language.js =================================================================== --- trunk/lang/en/language.js 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lang/en/language.js 2010-12-05 22:52:59 UTC (rev 31162) @@ -17,4 +17,12 @@ // "Valid User Name" : "Valid User Name", // "Passwords match" : "Passwords match", // "Valid Email" : "Valid Email" +// "Close" : "Close", +// "Submit" : "Submit", +// "Insert" : "Insert", +// "Replace" : "Replace", +// "Match" : "Match", +// "Do not match" : "Do not match", +// "Advanced options" : "Advanced options", +// "Pick a file." : "Pick a file.", }; Modified: trunk/lang/es/language.js =================================================================== --- trunk/lang/es/language.js 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lang/es/language.js 2010-12-05 22:52:59 UTC (rev 31162) @@ -6,15 +6,22 @@ */ lang = { - -"Very Secure" : "Muy Segura", -"Secure" : "Segura", -"Very Strong" : "Muy Fuerte", -"Strong" : "Fuerte", -"Average" : "Intermedia", -"Weak" : "Floja", -"Very Weak" : "Muy Floja", -"Strength" : "Fuerza", -"Passwords match" : "Las contraseñas coinciden" - + "Very Secure" : "Muy Segura", + "Secure" : "Segura", + "Very Strong" : "Muy Fuerte", + "Strong" : "Fuerte", + "Average" : "Intermedia", + "Weak" : "Floja", + "Very Weak" : "Muy Floja", + "Strength" : "Fuerza", + "Passwords match" : "Las contraseñas coinciden" + "Valid Email" : "Correo-e válido" + "Close" : "Cerrar", + "Submit" : "Enviar", + "Insert" : "Insertar", + "Replace" : "Sustituir", + "Match" : "Igual", + "Do not match" : "Diferente", + "Advanced options" : "Opciones avanzadas", + "Pick a file." : "Escoge un archivo", }; Modified: trunk/lib/blogs/bloglib.php =================================================================== --- trunk/lib/blogs/bloglib.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/blogs/bloglib.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -891,16 +891,30 @@ * @param int $created when the post was created * @return array */ - function _get_adjacent_posts($blogId, $created) - { + function _get_adjacent_posts($blogId, $created, $publishDate = null, $user=null) { + global $tikilib; $res = array(); - $next_query = 'SELECT postId, title FROM `tiki_blog_posts` WHERE `blogId` = ? AND `created` > ? ORDER BY created ASC'; - $result = $this->fetchAll($next_query, array($blogId, $created), 1); + $next_query = 'SELECT postId, title FROM `tiki_blog_posts` WHERE `blogId` = ? AND `created` > ? '; + $bindvars = array($blogId, $created); + if ($publishDate) { + $next_query .= 'AND (`created` <= ? OR `user` = ?)'; + $bindvars[] = $publishDate; + $bindvars[] = $user; + } + $next_query .= ' ORDER BY created ASC'; + $result = $this->fetchAll($next_query, $bindvars, 1); $res['next'] = !empty($result[0]) ? $result[0] : null; - $prev_query = 'SELECT postId, title FROM `tiki_blog_posts` WHERE `blogId` = ? AND `created` < ? ORDER BY created DESC'; - $result = $this->fetchAll($prev_query, array($blogId, $created), 1); + $prev_query = 'SELECT postId, title FROM `tiki_blog_posts` WHERE `blogId` = ? AND `created` < ? '; + $bindvars = array($blogId, $created); + if ($publishDate) { + $prev_query .= 'AND (`created` <= ? OR `user` = ?)'; + $bindvars[] = $publishDate; + $bindvars[] = $user; + } + $prev_query .= ' ORDER BY created DESC'; + $result = $this->fetchAll($prev_query, $bindvars, 1); $res['prev'] = !empty($result[0]) ? $result[0] : null; return $res; Modified: trunk/lib/setup/absolute_urls.php =================================================================== --- trunk/lib/setup/absolute_urls.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/setup/absolute_urls.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -45,6 +45,8 @@ $base_url = $url_scheme.'://'.$url_host.(($url_port!='')?':'.$url_port:'').$url_path; $base_url_http = 'http://'.$url_host.(($prefs['http_port']!='')?':'.$prefs['http_port']:'').$url_path; $base_url_https = 'https://'.$url_host.(($prefs['https_port']!='')?':'.$prefs['https_port']:'').$url_path; +// for <base> tag, which needs the " absolute URI that acts as the base URI for resolving relative URIs", not just the root of the site +$base_uri = !empty($_SERVER['REDIRECT_SCRIPT_URI']) ? $_SERVER['REDIRECT_SCRIPT_URI'] : isset($_SERVER['SCRIPT_URI']) ? $_SERVER['SCRIPT_URI'] : $base_url; // SSL options Modified: trunk/lib/wiki-plugins/wikiplugin_articles.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_articles.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_articles.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -133,6 +133,12 @@ 'name' => tra('Additional url param'), 'filter' => 'striptags', ), + 'actions' => array( + 'required' => false, + 'name' => tra('Show actions (buttons and links)'), + 'description' => tra('Whether to show the buttons and links to do actions on each article (for the actions you have permission to do') . ' (y|n)', + 'filter' => 'alpha', + ), ), ); } @@ -233,6 +239,7 @@ } $smarty->assign('usePagination', $usePagination); $smarty->assign_by_ref('listpages', $listpages["data"]); + $smarty->assign_by_ref('actions', $actions); if (isset($titleonly) && $titleonly == 'y') { return "~np~ ".$smarty->fetch('tiki-view_articles-titleonly.tpl')." ~/np~"; Modified: trunk/lib/wiki-plugins/wikiplugin_catorphans.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_catorphans.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_catorphans.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -24,24 +24,31 @@ function wikiplugin_catorphans_info() { return array( 'name' => tra('Category Orphans'), - 'documentation' => 'PluginCatOrphans', - 'description' => tra('Display Tiki objects that have not been categorized'), + 'documentation' => tra('PluginCatOrphans'), + 'description' => tra('Display wiki pages that have not been categorized'), 'prefs' => array( 'feature_categories', 'wikiplugin_catorphans' ), 'params' => array( 'objects' => array( 'required' => false, - 'name' => tra('Objects'), - 'description' => tra('wiki|article|blog|faq|fgal|forum<br />|igal|newsletter|poll|quizz<br />|survey|tracker'), + 'name' => tra('Object'), + 'description' => tra('Currently, only works with wiki pages (set to wiki (Wiki Pages) by default)'), + 'default' => 'wiki', + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Wiki Pages'), 'value' => 'wiki'), + ) ), 'max' => array( 'required' => false, - 'name' => tra('max'), - 'description' => tra('Maximum number of items').' '.tra('-1 for unlimited'), + 'name' => tra('Max'), + 'description' => tra('Maximum number of items. Use -1 for unlimited. Default is the site admin setting for maximum records.'), + 'default' => '$prefs[\'maxRecords\']' ), 'offset' => array( 'required' => false, 'name' => tra('Result Offset'), - 'description' => tra('Result number at which the listing should start.'), + 'description' => tra('Result number at which the listing should start (default is no offset)'), + 'default' => 0 ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_catpath.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_catpath.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_catpath.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -23,19 +23,27 @@ function wikiplugin_catpath_info() { return array( 'name' => tra('Category Path'), - 'documentation' => 'PluginCatPath', - 'description' => tra("Insert the full category path for each category that this wiki page belongs to"), + 'documentation' => tra('PluginCatPath'), + 'description' => tra('Insert the full category path for each category that this wiki page belongs to'), 'prefs' => array( 'feature_categories', 'wikiplugin_catpath' ), 'params' => array( 'divider' => array( 'required' => false, 'name' => tra('Separator'), 'description' => tra('String used to separate the categories in the path. Default character is >.'), + 'default' => '>', ), 'top' => array( 'required' => false, - 'name' => tra('Display top category'), - 'description' => tra('yes|no, default to no'), + 'name' => tra('Display Top Category'), + 'description' => tra('Show the top category as part of the path name (not shown by default)'), + 'filter' => 'alpha', + 'default' => 'no', + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), + array('text' => tra('No'), 'value' => 'n') + ), ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_cclite.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_cclite.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_cclite.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -14,6 +14,7 @@ return array( 'name' => tra('Cclite'), + 'documentation' => tra('PluginCclite'), 'description' => tra('General purpose cclite utility plugin'), // 'validate' => '', 'prefs' => array( 'wikiplugin_cclite', 'payment_feature' ), @@ -21,12 +22,13 @@ 'mode' => array( 'required' => false, 'name' => tra('Mode'), - 'description' => tr('Mode of operation - summary, recent. Default: summary'), + 'description' => tr('Mode of operation - summary or recent. Default: summary'), 'filter' => 'text', + 'default' => 'summary', 'options' => array( + array('text' => '', 'value' => ''), array('text' => tra('Account summary'), 'value' => 'summary'), array('text' => tra('Recent transactions'), 'value' => 'recent'), - array('text' => tra('Validate account'), 'value' => 'validate'), ), ), 'registry' => array( @@ -34,6 +36,7 @@ 'name' => tra('Registry'), 'description' => tr('Registry to query. Default: site preference (or first in list when more than one)'), 'filter' => 'text', + 'default' => '', ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_center.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_center.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_center.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -17,8 +17,8 @@ function wikiplugin_center_info() { return array( 'name' => tra('Center'), - 'documentation' => 'PluginCenter', - 'description' => tra("Centers the plugin content in the wiki page"), + 'documentation' => tra('PluginCenter'), + 'description' => tra('Centers the plugin content in the wiki page'), 'prefs' => array('wikiplugin_center'), 'body' => tra('text'), 'icon' => 'pics/icons/text_align_center.png', Modified: trunk/lib/wiki-plugins/wikiplugin_code.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_code.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_code.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -10,7 +10,7 @@ function wikiplugin_code_info() { return array( 'name' => tra('Code'), - 'documentation' => 'PluginCode', + 'documentation' => tra('PluginCode'), 'description' => tra('Displays a snippet of code'), 'prefs' => array('wikiplugin_code'), 'body' => tra('Code'), @@ -26,62 +26,69 @@ 'name' => tra('Word Wrap'), 'description' => tra('Enable word wrapping on the code to avoid breaking the layout. May not be used with line numbers if Geshi version 1.0.8.9+'), 'options' => array( - array('text' => tra('No'), 'value' => ''), + array('text' => '', 'value' => ''), array('text' => tra('Yes'), 'value' => '1'), + array('text' => tra('No'), 'value' => '0'), ), ), 'colors' => array( 'required' => false, 'name' => tra('Colors'), - 'description' => tra('Syntax highlighting to use. GeSHi - Generic Syntax Highlighter must be installed. May not be used with line numbers if Geshi version < 1.0.8.9. Available: php, html, sql, javascript, css, java, c, doxygen, delphi, rsplus...'), + 'description' => tra('Syntax highlighting to use. GeSHi - Generic Syntax Highlighter must be installed for languages other than php. Without GeSHi, the php tag must be included at the + beginning of the displayed code for the highlighting to work. May not be used with line numbers if Geshi version < 1.0.8.9. Available: php, html, sql, javascript, css, java, c, doxygen, delphi, rsplus...'), 'advanced' => true, ), 'ln' => array( 'required' => false, - 'name' => tra('Line numbers'), - 'description' => tra('May not be used with colors.'), + 'name' => tra('Line Numbers'), + 'description' => tra('Show line numbers for each line of code. May not be used with colors unless GeSHI is installed.'), 'options' => array( - array('text' => tra('No'), 'value' => ''), + array('text' => '', 'value' => ''), array('text' => tra('Yes'), 'value' => '1'), + array('text' => tra('No'), 'value' => '0'), ), 'advanced' => true, ), 'wiki' => array( 'required' => false, - 'name' => tra('Wiki syntax'), - 'description' => tra('Parse wiki syntax within the code snippet.'), + 'name' => tra('Wiki Syntax'), + 'description' => tra('Parse wiki syntax within the code snippet (not parsed by default)'), 'options' => array( - array('text' => tra('No'), 'value' => ''), + array('text' => '', 'value' => ''), + array('text' => tra('No'), 'value' => '0'), array('text' => tra('Yes'), 'value' => '1'), ), 'advanced' => true, ), 'rtl' => array( 'required' => false, - 'name' => tra('Right to left'), - 'description' => tra('Switch the text display from left to right to right to left'), + 'name' => tra('Right to Left'), + 'description' => tra('Switch the text display from left to right to right to left (left to right by default)'), 'options' => array( - array('text' => tra('No'), 'value' => ''), + array('text' => '', 'value' => ''), array('text' => tra('Yes'), 'value' => '1'), + array('text' => tra('No'), 'value' => '0'), ), 'advanced' => true, ), 'ishtml' => array( 'required' => false, 'name' => tra('Content is HTML'), - 'description' => tra('Display the content as is instead of escaping HTML special chars'), + 'description' => tra('When set to 1 (Yes), HTML will still be processed (presented as is by default)'), 'options' => array( - array('text' => tra('Show HTML'), 'value' => ''), + array('text' => '', 'value' => ''), + array('text' => tra('Show HTML'), 'value' => '0'), array('text' => tra('Interpret HTML'), 'value' => '1'), ), ), 'cpy' => array( 'required' => false, 'name' => tra('Copy To Clipboard'), - 'description' => tra('Copy the contents of the code box to the clipboard'), + 'description' => tra('Copy the contents of the code box to the clipboard (not copied to clipboard by default)'), 'options' => array( - array('text' => tra('No'), 'value' => ''), + array('text' => '', 'value' => ''), array('text' => tra('Yes'), 'value' => '1'), + array('text' => tra('No'), 'value' => '0'), ), 'advanced' => true, ), Modified: trunk/lib/wiki-plugins/wikiplugin_colorbox.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_colorbox.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_colorbox.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -8,37 +8,37 @@ function wikiplugin_colorbox_info() { return array( 'name' => tra('colorbox'), - 'documentation' => 'PluginColorBox', - 'description' => tra("Display all the images of a file gallery in a colorbox popup"), + 'documentation' => tra('PluginColorBox'), + 'description' => tra('Display all the images of a file gallery in a colorbox popup'), 'prefs' => array( 'feature_file_galleries', 'feature_shadowbox', 'wikiplugin_colorbox' ), 'introduced' => 5, 'params' => array( 'fgalId' => array( 'required' => false, - 'name' => tra('File gallery ID'), - 'description' => tra('File gallery ID'), + 'name' => tra('File Gallery ID'), + 'description' => tra('ID number of the file gallery that contains the images to be displayed'), 'filter' => 'digits', 'accepted' => 'ID', - 'default' => 'none', + 'default' => '', 'since' => '5.0' ), 'galId' => array( 'required' => false, - 'name' => tra('Image gallery ID'), - 'description' => tra('Image gallery ID'), + 'name' => tra('Image Gallery ID'), + 'description' => tra('ID number of the image gallery that contains the images to be displayed'), 'filter' => 'digits', 'accepted' => 'ID', - 'default' => 'none', + 'default' => '', 'since' => '5.0' ), 'fileId' => array( 'required' => false, - 'name' => tra('Filter on fileIds in a file gallery'), - 'description' => tra('Filter on fileIds in a file gallery. Separate each fileId with \':\''), + 'name' => tra('File ID Filter'), + 'description' => tra('Filter on fileIds in a file gallery to only show those images. Separate each fileId with \':\''), 'filter' => 'digits', 'separator' => ':', 'accepted' => 'ID separated with :', - 'default' => 'none', + 'default' => '', 'since' => '6.0' ), 'thumb' => array( @@ -50,6 +50,7 @@ 'default' => 'y', 'since' => '5.0', 'options' => array( + array('text' => '', 'value' => ''), array('text' => tra('Yes'), 'value' => 'y'), array('text' => tra('No'), 'value' => 'n'), ), @@ -65,56 +66,60 @@ ), 'showtitle' => array( 'required' => false, - 'name' => tra('Show file title'), + 'name' => tra('Show File Title'), 'description' => tra('Show file title'), 'filter' => 'alpha', 'accepted' => 'y or n', 'default' => 'n', 'since' => '5.0', 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), array('text' => tra('No'), 'value' => 'n'), - array('text' => tra('Yes'), 'value' => 'y'), - ), ), + ), 'showfilename' => array( 'required' => false, - 'name' => tra('Show file name'), + 'name' => tra('Show File Name'), 'description' => tra('Show file name'), 'filter' => 'alpha', 'accepted' => 'y or n', 'default' => 'n', 'since' => '5.0', 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), array('text' => tra('No'), 'value' => 'n'), - array('text' => tra('Yes'), 'value' => 'y'), - ), ), + ), 'showallthumbs' => array( 'required' => false, - 'name' => tra('Show all thumbs'), - 'description' => tra('Show all thumbs'), + 'name' => tra('Show All Thumbs'), + 'description' => tra('Show thumbnails of all the images in the gallery'), 'filter' => 'alpha', 'accepted' => 'y or n', 'default' => 'n', 'since' => '5.0', 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), array('text' => tra('No'), 'value' => 'n'), - array('text' => tra('Yes'), 'value' => 'y'), - ), ), + ), 'parsedescriptions' => array( 'required' => false, - 'name' => tra('Parse descriptions'), + 'name' => tra('Parse Descriptions'), 'description' => tra('Wiki parse the file descriptions'), 'filter' => 'alpha', 'accepted' => 'y or n', 'default' => 'n', 'since' => '5.0', 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), array('text' => tra('No'), 'value' => 'n'), - array('text' => tra('Yes'), 'value' => 'y'), - ), ), + ), ), ); } Modified: trunk/lib/wiki-plugins/wikiplugin_content.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_content.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_content.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -8,7 +8,7 @@ function wikiplugin_content_info() { return array( 'name' => tra( 'Dynamic Content' ), - 'documentation' => 'PluginContent', + 'documentation' => tra('PluginContent'), 'description' => tra( 'Includes content from the dynamic content system.' ), 'prefs' => array( 'feature_dynamic_content', 'wikiplugin_content' ), 'filter' => 'text', @@ -18,12 +18,14 @@ 'name' => tra('Content ID'), 'description' => tra('Dynamic content ID. The value can be obtained in the listing.'), 'filter' => 'digits', + 'default' => '', ), 'label' => array( 'required' => false, 'name' => tra('Content Label'), 'description' => tra('Label of the dynamic content to display.'), 'filter' => 'description', + 'default' => '', ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_cookie.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_cookie.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_cookie.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -9,8 +9,8 @@ { return array( 'name' => tra('Cookie'), - 'documentation' => 'PluginCookie', - 'description' => tra('Also known as fortune cookies or taglines'), + 'documentation' => tra('PluginCookie'), + 'description' => tra('Display a rotating set of taglines or quotes (also known as fortune cookies)'), 'prefs' => array( 'wikiplugin_cookie' ), 'params' => array( ), Modified: trunk/lib/wiki-plugins/wikiplugin_copyright.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_copyright.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_copyright.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -23,7 +23,7 @@ function wikiplugin_copyright_info() { return array( 'name' => tra('Copyright'), - 'documentation' => 'PluginCopyright', + 'documentation' => tra('PluginCopyright'), 'description' => tra('Insert copyright notices'), 'prefs' => array( 'wiki_feature_copyrights', 'wikiplugin_copyright' ), 'body' => tra('Pattern to display the copyright in. May contain ~title~, ~year~ and ~authors~.'), Modified: trunk/lib/wiki-plugins/wikiplugin_countdown.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_countdown.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_countdown.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -27,7 +27,7 @@ function wikiplugin_countdown_info() { return array( 'name' => tra('Countdown'), - 'documentation' => 'PluginCountdown', + 'documentation' => tra('PluginCountdown'), 'description' => tra('Displays a countdown from now until the specified date.'), 'prefs' => array('wikiplugin_countdown'), 'icon' => 'pics/icons/clock.png', @@ -37,21 +37,50 @@ 'required' => true, 'name' => tra('End date'), 'description' => tra('Target date. Multiple formats accepted.'), + 'default' => '', ), 'locatetime' => array( 'required' => false, 'name' => tra('Locate Time'), - 'description' => tra('on|off'), + 'description' => tra('Set to off to only show days, otherwise hours, minutes and seconds are also shown (all are shown by default)'), + 'default' => '', + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('On'), 'value' => 'on'), + array('text' => tra('Off'), 'value' => 'off') + ), ), 'show' => array( 'required' => false, - 'name' => tra('Items to show'), - 'description' => tra('Select: d=days, h=hours, m=minuts, s=seconds. Enter multiple values as: dhms. If blank, all items are shown.'), + 'name' => tra('Items to Show'), + 'description' => tra('Select: d=days, h=hours, m=minutes, s=seconds. Enter multiple values as: dhms. If blank, all items are shown.'), + 'filter' => 'alpha', + 'default' => '', + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Days'), 'value' => 'd'), + array('text' => tra('Days & Hours'), 'value' => 'dh'), + array('text' => tra('Days, Hours & Minutes'), 'value' => 'dhm'), + array('text' => tra('Days, Hours, Minutes & Seconds'), 'value' => 'dhms'), + array('text' => tra('Hours'), 'value' => 'h'), + array('text' => tra('Hours & Minutes'), 'value' => 'hm'), + array('text' => tra('Hours, Minutes & Seconds'), 'value' => 'hms'), + array('text' => tra('Minutes'), 'value' => 'm'), + array('text' => tra('Minutes & Seconds'), 'value' => 'ms'), + array('text' => tra('Seconds'), 'value' => 's'), + ), ), 'since' => array( 'required' => false, 'name' => tra('Show time since event'), 'description' => tra('If y, will display amount of time since the event (default). If n will simply display that the event is over.'), + 'filter' => 'alpha', + 'default' => '', + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), + array('text' => tra('No'), 'value' => 'n') + ), ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_datachannel.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_datachannel.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_datachannel.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -10,6 +10,7 @@ global $prefs; return array( 'name' => tra('Data Channel'), + 'documentation' => tra('PluginDataChannel'), 'description' => tra('Displays a form to trigger data channels.'), 'prefs' => array('wikiplugin_datachannel'), 'body' => tra('List of fields to display. One field per line. Comma delimited: fieldname,label') . '<br /><br />' . @@ -21,22 +22,26 @@ 'required' => true, 'name' => tra('Channel Name'), 'description' => tra('Name of the channel as registered by the administrator.'), + 'default' => '', ), 'returnURI' => array( 'required' => false, - 'name' => tra('Return URI'), - 'description' => tra('URI to go to after data channel has run. Defaults to current page.'), + 'name' => tra('Return URL'), + 'description' => tra('URL to go to after data channel has run. Defaults to current page.'), 'filter' => 'pagename', + 'default' => '$_SERVER[\'HTTP_REFERER\']', ), 'buttonLabel' => array( 'required' => false, 'name' => tra('Button Label'), 'description' => tra('Label for the submit button. Default: "Go".'), + 'default' => 'Go', ), 'class' => array( 'required' => false, 'name' => tra('Class'), 'description' => tra('CSS class for this form'), + 'default' => '', ), 'emptyCache' => array( 'required' => false, @@ -45,6 +50,7 @@ 'default' => 'all', 'filter' => 'word', 'options' => array( + array('text' => '', 'value' => ''), array('text' => tra('Clear all Tiki caches'), 'value' => 'all'), array('text' => tra('./templates_c/'), 'value' => 'templates_c'), array('text' => tra('./modules/cache/'), 'value' => 'modules_cache'), @@ -64,7 +70,7 @@ ), 'paymentlabel' => array( 'required' => false, - 'name' => tra('Payment label'), + 'name' => tra('Payment Label'), 'prefs' => array('payment_feature'), 'default' => '', 'filter' => 'text', @@ -72,18 +78,28 @@ 'debug' => array( 'required' => false, 'name' => tra('Debug'), - 'description' => '(y | n) '.tra('Be careful, if debug is on, the page will not be refreshed and previous modules can be obsolete'), + 'description' => tra('Be careful, if debug is on, the page will not be refreshed and previous modules can be obsolete (not on by default)'), 'default' => 'n', 'filter' => 'word', 'advanced' => true, + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), + array('text' => tra('No'), 'value' => 'n') + ), ), 'array_values' => array( 'required' => false, - 'name' => tra('Multiple values'), - 'description' => '(y | n) '.tra('Accept arrays of multiple values in the POST. e.g. itemId[]=42&itemId=43 etc.'), + 'name' => tra('Multiple Values'), + 'description' => tra('Accept arrays of multiple values in the POST. e.g. itemId[]=42&itemId=43 etc. (multiple values not accepted by default)'), 'default' => 'n', 'filter' => 'alpha', 'advanced' => true, + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 'y'), + array('text' => tra('No'), 'value' => 'n') + ), ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_dbreport.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_dbreport.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_dbreport.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -1442,8 +1442,8 @@ function wikiplugin_dbreport_info() { return array( 'name' => tra('DBReport'), - 'documentation' => 'PluginDBReport', - 'description' => tra('Run a database report'), + 'documentation' => tra('PluginDBReport'), + 'description' => tra('Run a database report. This plugin only works with adodb. It does not work with PDO.'), 'prefs' => array('wikiplugin_dbreport'), 'body' => tra('report definition'), 'validate' => 'all', @@ -1452,21 +1452,35 @@ 'required' => false, 'name' => tra('Full DSN'), 'description' => tra('A full DSN (Data Source Name) connection string. eg: mysql://user:pass@server/database'), + 'default' => '', ), 'db' => array( 'required' => false, - 'name' => tra('Wiki DSN name'), + 'name' => tra('Wiki DSN Name'), 'description' => tra('The name of a DSN connection defined by the Wiki administrator.'), + 'default' => '', ), 'wiki' => array( 'required' => false, - 'name' => tra('Wiki syntax'), - 'description' => tra('0|1, parse wiki syntax within the report.'), + 'name' => tra('Wiki Syntax'), + 'description' => tra('Parse wiki syntax within the report (not parsed by default)'), + 'default' => '', + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 1), + array('text' => tra('No'), 'value' => 0) + ), ), 'debug' => array( 'required' => false, 'name' => tra('Debug'), - 'description' => tra('0|1, display the parsed report definition.'), + 'description' => tra('Display the parsed report definition (not displayed by default)'), + 'default' => '', + 'options' => array( + array('text' => '', 'value' => ''), + array('text' => tra('Yes'), 'value' => 1), + array('text' => tra('No'), 'value' => 0) + ), ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_div.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_div.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_div.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -8,16 +8,17 @@ function wikiplugin_div_info() { return array( 'name' => tra('Div'), - 'documentation' => 'PluginDiv', - 'description' => tra("Insert a division block, span, blockquote or other text formatting on wiki page."), + 'documentation' => tra('PluginDiv'), + 'description' => tra('Insert a division block, span, blockquote or other text formatting on wiki page.'), 'prefs' => array('wikiplugin_div'), 'body' => tra('text'), 'params' => array( 'type' => array( 'required' => false, 'name' => tra('Type'), - 'description' => tra('div|span|pre|b|i|tt|p|blockquote'), + 'description' => tra('Indicate the type of HTML tag to use (default is div)'), 'filter' => 'alpha', + 'default' => 'div', 'options' => array( array('text' => tra('None'), 'value' => ''), array('text' => tra('Div'), 'value' => 'div'), @@ -32,22 +33,26 @@ ), 'bg' => array( 'required' => false, - 'name' => tra('Background color'), + 'name' => tra('Background Color'), 'description' => tra('As defined by CSS, name or Hex code.'), 'filter' => 'striptags', + 'default' => '', ), 'width' => array( 'required' => false, 'name' => tra('Box width'), - 'description' => tra('In pixels or percentage. Default value is 100%.'), + 'description' => tra('In pixels or percentage. Default is original size'), + 'default' => '', ), 'align' => array( 'required' => false, 'name' => tra('Text Alignment'), - 'description' => tra('left|right|center|justify'), + 'description' => tra('Aligns the text within the element'), 'filter' => 'alpha', + 'default' => '', 'options' => array( - array('text' => tra('None'), 'value' => 'left'), + array('text' => '', 'value' => ''), + array('text' => tra('Left'), 'value' => 'left'), array('text' => tra('Right'), 'value' => 'right'), array('text' => tra('Center'), 'value' => 'center'), array('text' => tra('Justify'), 'value' => 'justify'), @@ -55,25 +60,30 @@ ), 'float' => array( 'required' => false, - 'name' => tra('Float position'), - 'description' => tra('left|right, for box with width less than 100%, make text wrap around the box.'), + 'name' => tra('Float Position'), + 'description' => tra('Set the alignment for the entire element. For elements with a width of less than 100%, other elements will wrap around it + unless the clear parameter is appropriately set.)'), 'filter' => 'alpha', + 'default' => '', 'options' => array( - array('text' => tra('None'), 'value' => 'none'), + array('text' => '', 'value' => ''), array('text' => tra('Right'), 'value' => 'right'), array('text' => tra('Left'), 'value' => 'left'), + array('text' => tra('None'), 'value' => 'none'), ), ), 'clear' => array( 'required' => false, 'name' => tra('Clear'), - 'description' => tra('Determine how other elements can wrap around the element.'), + 'description' => tra('Items are not allowed to wrap around the side(s) this parameter is set to.'), 'filter' => 'text', + 'default' => '', 'options' => array( - array('text' => tra('None'), 'value' => 'none'), + array('text' => '', 'value' => ''), array('text' => tra('Right'), 'value' => 'right'), array('text' => tra('Left'), 'value' => 'left'), array('text' => tra('Both'), 'value' => 'both'), + array('text' => tra('None'), 'value' => 'none'), ), ), 'class' => array( @@ -81,12 +91,14 @@ 'name' => tra('CSS Class'), 'description' => tra('Apply custom CSS class to the div.'), 'filter' => 'text', + 'default' => '', ), 'id' => array( 'required' => false, - 'name' => tra('HTML id'), + 'name' => tra('HTML ID'), 'description' => tra('Sets the div\'s id attribute, as defined by HTML.'), 'filter' => 'striptags', + 'default' => '', ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_dl.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_dl.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_dl.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -12,8 +12,8 @@ function wikiplugin_dl_info() { return array( 'name' => tra('Definition List'), - 'documentation' => 'PluginDL', - 'description' => tra("Creates a definition list"), + 'documentation' => tra('PluginDL'), + 'description' => tra('Creates a definition list'), 'prefs' => array('wikiplugin_dl'), 'body' => tra('One entry per line. Each line is in "Term: Definition" format.'), 'params' => array( Modified: trunk/lib/wiki-plugins/wikiplugin_equation.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_equation.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_equation.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -28,7 +28,7 @@ function wikiplugin_equation_info() { return array( 'name' => tra('Equation'), - 'documentation' => 'PluginEquation', + 'documentation' => tra('PluginEquation'), 'description' => tra('Renders an equation written in LaTeX syntax as an image.'), 'prefs' => array('wikiplugin_equation'), 'body' => tra('equation'), @@ -36,7 +36,9 @@ 'size' => array( 'required' => false, 'name' => tra('Size'), - 'description' => tra('Percentage of increase from normal size. 100 produces the default size. 200 produces an image twice as large.'), + 'description' => tra('Size expressed as a percentage of the normal size. 100 produces the default size. 200 produces an image twice as large.'), + 'default' => 100, + 'filter' => 'digits', ), ), ); Modified: trunk/lib/wiki-plugins/wikiplugin_events.php =================================================================== --- trunk/lib/wiki-plugins/wikiplugin_events.php 2010-12-05 22:43:08 UTC (rev 31161) +++ trunk/lib/wiki-plugins/wikiplugin_events.php 2010-12-05 22:52:59 UTC (rev 31162) @@ -17,34 +17,51 @@ function wikiplugin_events_info() { return array( 'name' => tra('Events'), - 'documentation' => 'PluginEvents', - 'description' => tra('Includes the list of events from a calendar in the page.'), + 'documentation' => tra('PluginEvents'), + 'description' => tra('Display upcoming events from calendars'), 'prefs' => array( 'feature_calendar', 'wikiplugin_events' ), 'params' => array( 'calendarid' => array( 'required' => true, - 'name' => tra('Calendars filter'), - 'description' => tra('Numeric'), + 'name' => tra('Calendar IDs'), + 'description' => tra('ID numbers for the site calendars whose events are to be displayed, separated by vertical bars (|)'), + 'default' => '', ), 'maxdays' => array( 'required' => false, - 'name' => tra('Maximum days'), - 'description' => tra('Numeric'), + 'name' => tra('Maximum Days'), + 'description' => tra('Events occurring within this number of days in the future from today will be included in the list (unless limited by other parameter settings). Default is 365 days.'), + 'filter' => 'digits', + 'default' => 365, ), 'max' => array( 'required' => false, - 'name' => tra('... [truncated message content] |