From: <jy...@us...> - 2012-04-05 07:57:41
|
Revision: 40745 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40745&view=rev Author: jyhem Date: 2012-04-05 07:57:32 +0000 (Thu, 05 Apr 2012) Log Message: ----------- [ENH] Get useful feedback after tracker import Modified Paths: -------------- branches/9.x/lib/core/Services/Tracker/Controller.php branches/9.x/templates/tracker/import_items.tpl Modified: branches/9.x/lib/core/Services/Tracker/Controller.php =================================================================== --- branches/9.x/lib/core/Services/Tracker/Controller.php 2012-04-05 07:57:06 UTC (rev 40744) +++ branches/9.x/lib/core/Services/Tracker/Controller.php 2012-04-05 07:57:32 UTC (rev 40745) @@ -1032,6 +1032,7 @@ return array( 'trackerId' => $trackerId, 'return' => $count, + 'importfile' => $_FILES['importfile']['name'], ); } Modified: branches/9.x/templates/tracker/import_items.tpl =================================================================== --- branches/9.x/templates/tracker/import_items.tpl 2012-04-05 07:57:06 UTC (rev 40744) +++ branches/9.x/templates/tracker/import_items.tpl 2012-04-05 07:57:32 UTC (rev 40745) @@ -3,6 +3,7 @@ {include file="tracker_actions.tpl"} </div> {remarksbox type="note" title="{tr}Confirmation{/tr}"} + <p>{tr _0=$importfile}Imported file '%0'{/tr}</p> <p>{tr _0=$return}Import completed with '%0'{/tr}</p> {/remarksbox} {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-04-06 19:41:08
|
Revision: 40781 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40781&view=rev Author: jonnybradley Date: 2012-04-06 19:41:02 +0000 (Fri, 06 Apr 2012) Log Message: ----------- [FIX] unit tests: Pass on $local_php to upgrade php scripts so they use the correct database in tests for updates and declare $smarty global Modified Paths: -------------- branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php branches/9.x/lib/test/bootstrap.php Modified: branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php =================================================================== --- branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php 2012-04-06 19:41:00 UTC (rev 40780) +++ branches/9.x/installer/schema/999999991_decode_pages_sources_tiki.php 2012-04-06 19:41:02 UTC (rev 40781) @@ -10,7 +10,7 @@ exit; } -global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input, $smarty, $access; // globals are required here for tiki-setup_base.php +global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input, $smarty, $access, $local_php; // globals are required here for tiki-setup_base.php include_once('tiki-setup_base.php'); // ABOUT THE NUMBERING: Modified: branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php =================================================================== --- branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php 2012-04-06 19:41:00 UTC (rev 40780) +++ branches/9.x/installer/schema/99999999_image_plugins_kill_tiki.php 2012-04-06 19:41:02 UTC (rev 40781) @@ -10,7 +10,7 @@ exit; } -global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input; // globals are required here for tiki-setup_base.php +global $tikilib, $prefs, $tikiroot, $user_overrider_prefs, $tiki_p_trust_input, $smarty, $access, $local_php; // globals are required here for tiki-setup_base.php include_once('tiki-setup_base.php'); // ABOUT THE NUMBERING: Modified: branches/9.x/lib/test/bootstrap.php =================================================================== --- branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:00 UTC (rev 40780) +++ branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:02 UTC (rev 40781) @@ -32,7 +32,10 @@ die("\nYou need to setup a new database and create a local.php file for the test suite inside " . dirname(__FILE__) . "\n\n"); } -require_once(dirname(__FILE__) . '/local.php'); +global $local_php, $api_tiki; +$api_tiki = 'adodb'; +$local_php = dirname(__FILE__) . '/local.php'; +require_once($local_php); require_once ('lib/adodb/adodb.inc.php'); include_once ('lib/adodb/adodb-pear.inc.php'); @@ -64,6 +67,7 @@ $pwd = getcwd(); chdir(dirname(__FILE__) . '/../..'); +global $smarty; require_once 'lib/init/smarty.php'; $smarty->addPluginsDir('../smarty_tiki/'); require_once 'lib/cache/cachelib.php'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. <ma...@ma...> - 2012-04-06 22:00:24
|
$api_tiki = 'adodb'; No pdo? Tks! > Modified: branches/9.x/lib/test/bootstrap.php > =================================================================== > --- branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:00 UTC (rev 40780) > +++ branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:02 UTC (rev 40781) > @@ -32,7 +32,10 @@ > die("\nYou need to setup a new database and create a local.php file for the test suite inside " . dirname(__FILE__) . "\n\n"); > } > > -require_once(dirname(__FILE__) . '/local.php'); > +global $local_php, $api_tiki; > +$api_tiki = 'adodb'; > +$local_php = dirname(__FILE__) . '/local.php'; > +require_once($local_php); > > require_once ('lib/adodb/adodb.inc.php'); > include_once ('lib/adodb/adodb-pear.inc.php'); > @@ -64,6 +67,7 @@ > > $pwd = getcwd(); > chdir(dirname(__FILE__) . '/../..'); > +global $smarty; > require_once 'lib/init/smarty.php'; > $smarty->addPluginsDir('../smarty_tiki/'); > require_once 'lib/cache/cachelib.php'; > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > http://p.sf.net/sfu/Boundary-d2dvs2 > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: Jonny B. <svn...@no...> - 2012-04-07 12:38:56
|
Seems not... "tests" are a very strange place! (i still can't get most of the tests to run!) jb On 6 Apr 2012, at 23:00, Marc Laporte wrote: > $api_tiki = 'adodb'; > > No pdo? > > Tks! > > > > Modified: branches/9.x/lib/test/bootstrap.php > > =================================================================== > > --- branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:00 UTC (rev 40780) > > +++ branches/9.x/lib/test/bootstrap.php 2012-04-06 19:41:02 UTC (rev 40781) > > @@ -32,7 +32,10 @@ > > die("\nYou need to setup a new database and create a local.php file for the test suite inside " . dirname(__FILE__) . "\n\n"); > > } > > > > -require_once(dirname(__FILE__) . '/local.php'); > > +global $local_php, $api_tiki; > > +$api_tiki = 'adodb'; > > +$local_php = dirname(__FILE__) . '/local.php'; > > +require_once($local_php); > > > > require_once ('lib/adodb/adodb.inc.php'); > > include_once ('lib/adodb/adodb-pear.inc.php'); > > @@ -64,6 +67,7 @@ > > > > $pwd = getcwd(); > > chdir(dirname(__FILE__) . '/../..'); > > +global $smarty; > > require_once 'lib/init/smarty.php'; > > $smarty->addPluginsDir('../smarty_tiki/'); > > require_once 'lib/cache/cachelib.php'; > > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > > > > > ------------------------------------------------------------------------------ > > For Developers, A Lot Can Happen In A Second. > > Boundary is the first to Know...and Tell You. > > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > > http://p.sf.net/sfu/Boundary-d2dvs2 > > _______________________________________________ > > Tikiwiki-cvs mailing list > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > http://p.sf.net/sfu/Boundary-d2dvs2_______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: <Jy...@us...> - 2012-04-07 14:25:59
|
Revision: 40803 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40803&view=rev Author: Jyhem Date: 2012-04-07 14:25:49 +0000 (Sat, 07 Apr 2012) Log Message: ----------- [DOC] minor edits (typos, caps, consistency, etc) to English text items. No context or meaning changes. Modified Paths: -------------- branches/9.x/lang/ar/language.php branches/9.x/lang/bg/language.php branches/9.x/lang/ca/language.php branches/9.x/lang/cn/language.php branches/9.x/lang/cs/language.php branches/9.x/lang/cy/language.php branches/9.x/lang/da/language.php branches/9.x/lang/de/language.php branches/9.x/lang/el/language.php branches/9.x/lang/en/language.php branches/9.x/lang/en-uk/language.php branches/9.x/lang/es/language.php branches/9.x/lang/fa/language.php branches/9.x/lang/fi/language.php branches/9.x/lang/fj/language.php branches/9.x/lang/fr/language.php branches/9.x/lang/fy-NL/language.php branches/9.x/lang/gl/language.php branches/9.x/lang/he/language.php branches/9.x/lang/hr/language.php branches/9.x/lang/hu/language.php branches/9.x/lang/id/language.php branches/9.x/lang/is/language.php branches/9.x/lang/it/language.php branches/9.x/lang/iu/language.php branches/9.x/lang/ja/language.php branches/9.x/lang/ko/language.php branches/9.x/lang/lt/language.php branches/9.x/lang/nds/language.php branches/9.x/lang/nl/language.php branches/9.x/lang/no/language.php branches/9.x/lang/pl/language.php branches/9.x/lang/pt/language.php branches/9.x/lang/pt-br/language.php branches/9.x/lang/rm/language.php branches/9.x/lang/ro/language.php branches/9.x/lang/ru/language.php branches/9.x/lang/sb/language.php branches/9.x/lang/si/language.php branches/9.x/lang/sk/language.php branches/9.x/lang/sl/language.php branches/9.x/lang/sq/language.php branches/9.x/lang/sr-latn/language.php branches/9.x/lang/sv/language.php branches/9.x/lang/tr/language.php branches/9.x/lang/tv/language.php branches/9.x/lang/tw/language.php branches/9.x/lang/uk/language.php branches/9.x/lang/vi/language.php branches/9.x/lib/core/Tracker/Field/Computed.php branches/9.x/lib/prefs/feature.php branches/9.x/lib/prefs/server.php branches/9.x/lib/prefs/wysiwyg.php branches/9.x/lib/rss/rsslib.php branches/9.x/lib/wiki-plugins/wikiplugin_addtocart.php branches/9.x/lib/wiki-plugins/wikiplugin_htmlfeed.php branches/9.x/lib/wiki-plugins/wikiplugin_htmlfeedlink.php branches/9.x/lib/wiki-plugins/wikiplugin_img.php branches/9.x/lib/wiki-plugins/wikiplugin_js.php branches/9.x/lib/wiki-plugins/wikiplugin_lsdir.php branches/9.x/lib/wiki-plugins/wikiplugin_sf.php branches/9.x/lib/wiki-plugins/wikiplugin_slideshow.php branches/9.x/lib/wiki-plugins/wikiplugin_tracker.php branches/9.x/templates/admin/include_profiles.tpl branches/9.x/templates/tiki-admin_modules.tpl branches/9.x/templates/tiki-admin_newsletters.tpl branches/9.x/templates/tiki-edit_article.tpl branches/9.x/templates/tiki-edit_help.tpl branches/9.x/templates/tiki-edit_templates.tpl branches/9.x/templates/tiki-importer.tpl branches/9.x/templates/tiki-send_newsletters.tpl branches/9.x/templates/tiki-user_preferences.tpl branches/9.x/tiki-admin_security.php Modified: branches/9.x/lang/ar/language.php =================================================================== --- branches/9.x/lang/ar/language.php 2012-04-07 14:02:18 UTC (rev 40802) +++ branches/9.x/lang/ar/language.php 2012-04-07 14:25:49 UTC (rev 40803) @@ -830,7 +830,9 @@ // "No" => "No", // "Computed Field" => "Computed Field", // "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type" => "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type", +// "Provides a computed value based on numeric field values. Consider using webservices or JavaScript to perform the task instead of using this type" => "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type", // "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field" => "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field", +// "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom JavaScript is recommended instead of this field" => "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field", // "Formula" => "Formula", // "The formula to be computed supporting various operators (+ - * / and parenthesis), references to other field made using the field id preceeded by #" => "The formula to be computed supporting various operators (+ - * / and parenthesis), references to other field made using the field id preceeded by #", // "Country Selector" => "Country Selector", @@ -2017,7 +2019,9 @@ // "If you are using Apache, you can copy _htaccess to .htaccess to get Short URLs. On IIS, copy web_config to web.config" => "If you are using Apache, you can copy _htaccess to .htaccess to get Short URLs. On IIS, copy web_config to web.config", // "Search engine friendly url Postfilter" => "Search engine friendly url Postfilter", // "Display article title in the sefurl" => "Display article title in the sefurl", +// "Display article title in the SEFURL" => "Display article title in the sefurl", // "Display blog title in the sefurl" => "Display blog title in the sefurl", +// "Display blog title in the SEFURL" => "Display blog title in the sefurl", // "Rewrite tiki-view_tracker.php?itemId=yyy to Prefixyyy page" => "Rewrite tiki-view_tracker.php?itemId=yyy to Prefixyyy page", // "This redirection uses the wiki prefix alias feature" => "This redirection uses the wiki prefix alias feature", // "Canonical URL tag" => "Canonical URL tag", @@ -2259,6 +2263,7 @@ // "Time Sheet" => "Time Sheet", // "A project time manager" => "A project time manager", // "Html Feed" => "Html Feed", +// "HTML Feed" => "Html Feed", // "A way to push and pull html bits around from one site to another" => "A way to push and pull html bits around from one site to another", // "ForwardLink-Protocol" => "ForwardLink-Protocol", // "A Dynamic Compendia" => "A Dynamic Compendia", @@ -3056,6 +3061,7 @@ // "Sender email" => "Sender email", // "Email address that will be used as the sender for outgoing emails" => "Email address that will be used as the sender for outgoing emails", // "Timezone" => "Timezone", +// "Time zone" => "Timezone", // "Indicates the default time zone to use for the server" => "Indicates the default time zone to use for the server", // "Session storage location" => "Session storage location", // "Select where the session information should be stored. Memcache sessions require memcache to be configured" => "Select where the session information should be stored. Memcache sessions require memcache to be configured", @@ -3512,8 +3518,10 @@ // "Reopen with the same editor" => "Reopen with the same editor", // "Content is parsed like wiki page" => "Content is parsed like wiki page", // "This allows a mixture of wiki and html. All wiki syntax is parsed" => "This allows a mixture of wiki and html. All wiki syntax is parsed", +// "This allows a mixture of wiki and HTML. All wiki syntax is parsed" => "This allows a mixture of wiki and html. All wiki syntax is parsed", // "Content is partially wiki parsed" => "Content is partially wiki parsed", // "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)", +// "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)", // "Wysiwyg editor skin" => "Wysiwyg editor skin", // "Kama (Default)" => "Kama (Default)", // "Office 2003" => "Office 2003", @@ -3637,6 +3645,7 @@ // "To fix this error go to Admin -> Feeds" => "To fix this error go to Admin -> Feeds", // "Please contact the site administrator and ask him to fix this error" => "Please contact the site administrator and ask him to fix this error", // "If you set feed author email or url you have to set feed author name" => "If you set feed author email or url you have to set feed author name", +// "If you set feed author email or URL, you must set feed author name" => "If you set feed author email or url you have to set feed author name", // "Feed logo" => "Feed logo", // "Unspecified" => "Unspecified", "Log In" => "دخول", @@ -4403,6 +4412,7 @@ // "Shop as anonymous always" => "Shop as anonymous always", // "Add to cart as anonymous shopper even if logged in" => "Add to cart as anonymous shopper even if logged in", // "Forward to this url after free purchase" => "Forward to this url after free purchase", +// "Forward to this URL after free purchase" => "Forward to this url after free purchase", // "Gift certificate" => "Gift certificate", // "Allows user to add gift certificate from the product view" => "Allows user to add gift certificate from the product view", // "Order Item ID to exchange product" => "Order Item ID to exchange product", @@ -5462,7 +5472,9 @@ // "Parse wiki syntax within the HTML code" => "Parse wiki syntax within the HTML code", // "Textlink" => "Textlink", // "Adds an item to html feed" => "Adds an item to html feed", +// "Adds an item to HTML feed" => "Adds an item to html feed", // "Html Feed Link" => "Html Feed Link", +// "HTML Feed Link" => "Html Feed Link", // "Display remote content" => "Display remote content", // "Initial Value" => "Initial Value", // "Feed location" => "Feed location", @@ -5471,12 +5483,15 @@ // "Highlight" => "Highlight", // "Asterisk" => "Asterisk", // "Html Feed Link Type" => "Html Feed Link Type", +// "HTML Feed Link Type" => "Html Feed Link Type", "Replace" => "تعويض", // "Backlink" => "Backlink", // "Popup" => "Popup", // "Hover" => "Hover", // "Is the html feed moderated" => "Is the html feed moderated", +// "Is the HTML feed moderated" => "Is the html feed moderated", // "Date of last accepted html item, not used if not moderated" => "Date of last accepted html item, not used if not moderated", +// "Date of last accepted HTML item, not used if not moderated" => "Date of last accepted html item, not used if not moderated", // "Iframe" => "Iframe", // "Include another web page within a frame" => "Include another web page within a frame", // "Frame title" => "Frame title", @@ -5538,6 +5553,7 @@ // "Enlarge button" => "Enlarge button", // "Button for enlarging image" => "Button for enlarging image", // "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting" => "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting", +// "Enter a URL to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting" => "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting", // "Link relation" => "Link relation", // "Enter \"box\" for colorbox effect (like shadowbox and lightbox) or appropriate syntax for link relation" => "Enter \"box\" for colorbox effect (like shadowbox and lightbox) or appropriate syntax for link relation", // "Image map" => "Image map", @@ -5616,6 +5632,7 @@ // "Optional markup for when JavaScript is off" => "Optional markup for when JavaScript is off", // "<!-- jq plugin inactive: JavaScript off -->" => "<!-- jq plugin inactive: JavaScript off -->", // "Javascript" => "Javascript", +// "JavaScript" => "Javascript", // "javascript code" => "javascript code", // "JavaScript filename" => "JavaScript filename", // "Kaltura Video" => "Kaltura Video", @@ -5671,6 +5688,7 @@ // "Full path to the server-local directory. Default is the document root" => "Full path to the server-local directory. Default is the document root", // "URL Prefix" => "URL Prefix", // "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/" => "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/", +// "Make the file name a link to the file by adding the URL path preceding the file name. Example: http://yoursite.com/tiki/" => "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/", // "Set the sort order of the file list" => "Set the sort order of the file list", // "File Name" => "File Name", // "File Size" => "File Size", @@ -6039,8 +6057,11 @@ // "Creates a link to SourceForge tracker items" => "Creates a link to SourceForge tracker items", // "Group ID" => "Group ID", // "SourceForge project ID (shows as group_id in the url of a tracker item" => "SourceForge project ID (shows as group_id in the url of a tracker item", +// "SourceForge project ID (shows as group_id in the URL of a tracker item" => "SourceForge project ID (shows as group_id in the url of a tracker item", // "SourceForge tracker ID (shows as atid in the url of a tracker item" => "SourceForge tracker ID (shows as atid in the url of a tracker item", +// "SourceForge tracker ID (shows as atid in the URL of a tracker item" => "SourceForge tracker ID (shows as atid in the url of a tracker item", // "SourceForge item ID (shows as aid in the url of a tracker item" => "SourceForge item ID (shows as aid in the url of a tracker item", +// "SourceForge item ID (shows as aid in the URL of a tracker item" => "SourceForge item ID (shows as aid in the url of a tracker item", // "First part of link tooltip identifying the type of tracker item (bug, feature request, patch or support request)" => "First part of link tooltip identifying the type of tracker item (bug, feature request, patch or support request)", // "ShareThis" => "ShareThis", // "Add a ShareThis button" => "Add a ShareThis button", @@ -6175,6 +6196,7 @@ // "Header font color" => "Header font color", // "Apply a color to the headers of your slideshow" => "Apply a color to the headers of your slideshow", // "Any html color" => "Any html color", +// "Any HTML color" => "Any html color", // "Header background color" => "Header background color", // "Slide font color" => "Slide font color", // "Apply a color to the slides of your slideshow" => "Apply a color to the slides of your slideshow", @@ -6414,6 +6436,7 @@ // "to" => "to", // "Email format" => "Email format", // "Text or html setting" => "Text or html setting", +// "Text or HTML setting" => "Text or html setting", // "URL the user is sent to after the form is submitted" => "URL the user is sent to after the form is submitted", // "URL Target" => "URL Target", // "Set the target parameter for the url (determines whether target will open in a new page, etc.)" => "Set the target parameter for the url (determines whether target will open in a new page, etc.)", @@ -8115,6 +8138,7 @@ // "Last update" => "Last update", // "Refresh" => "Refresh", // "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again" => "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again", +// "JavaScript must be turned <strong>ON</strong> in order to apply Profiles. Please enable your JavaScript and try again" => "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again", // "Export YAML" => "Export YAML", // "Export modified preferences as YAML" => "Export modified preferences as YAML", // "Toggle Visible" => "Toggle Visible", @@ -10021,6 +10045,7 @@ // "Add unsubscribe instructions to each newsletter" => "Add unsubscribe instructions to each newsletter", "Validate email addresses" => "تفعيل عنوان البريد الالكتروني", // "Allow customized text message to be sent with the html version" => "Allow customized text message to be sent with the html version", +// "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", @@ -10780,7 +10805,9 @@ // "If not the topic name" => "If not the topic name", // "Allow full HTML" => "Allow full HTML", // "Keep any html tag" => "Keep any html tag", +// "Keep any HTML tag" => "Keep any html tag", // "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)" => "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)", +// "If not enabled, Tiki will retain some HTML tags (a, p, pre, img, hr, b, i)" => "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)", // "Emails to be notified (separated with commas)" => "Emails to be notified (separated with commas)", // "Edit or create banners" => "Edit or create banners", // "List banners" => "List banners", @@ -10920,6 +10947,7 @@ // "Special characters" => "Special characters", // "hard space" => "hard space", // "numeric between ~ for html numeric characters entity" => "numeric between ~ for html numeric characters entity", +// "numeric between ~ for HTML numeric characters entity" => "numeric between ~ for html numeric characters entity", // "Plugin Help" => "Plugin Help", // "Note that plugin arguments can be enclosed with double quotes ("); this allows them to contain , or = or >" => "Note that plugin arguments can be enclosed with double quotes ("); this allows them to contain , or = or >", // "More help here" => "More help here", @@ -11301,6 +11329,7 @@ // "Tiki Importer" => "Tiki 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", // "If your pages contain xml code, the html purifier will delete it. Deactivate this feature" => "If your pages contain xml code, the html purifier will delete it. Deactivate this feature", +// "If your pages contain XML code, the HTML purifier will delete it. Deactivate this feature" => "If your pages contain xml code, the html purifier will delete it. Deactivate this feature", // "Your PHP is running with safe mode enabled. This might cause problems to the import process as safe mode limits the possibility to change in run time some PHP settings (like max_execution_time). It is recommended to run this script without safe mode" => "Your PHP is running with safe mode enabled. This might cause problems to the import process as safe mode limits the possibility to change in run time some PHP settings (like max_execution_time). It is recommended to run this script without safe mode", // "Depending on the size of the file from the source software, the import process may take a while to complete. This might be a problem according to your PHP and web server settings. This script tries to change the relevant settings but there are some settings that the script cannot change. So, if you are having problems with the script, please try to increase the value of the following PHP settings: max_input_time, max_execution_time (this setting is limited by the web server setting, if you are running Apache also change its Timeout setting), post_max_size, upload_max_filesize, memory_limit. It is recommended that you run this script on a server where you can change the values of those settings (if needed)" => "Depending on the size of the file from the source software, the import process may take a while to complete. This might be a problem according to your PHP and web server settings. This script tries to change the relevant settings but there are some settings that the script cannot change. So, if you are having problems with the script, please try to increase the value of the following PHP settings: max_input_time, max_execution_time (this setting is limited by the web server setting, if you are running Apache also change its Timeout setting), post_max_size, upload_max_filesize, memory_limit. It is recommended that you run this script on a server where you can change the values of those settings (if needed)", // "Select the software to import from" => "Select the software to import from", @@ -12149,6 +12178,7 @@ // "Apply content template" => "Apply content template", // "Data HTML" => "Data HTML", // "Is html" => "Is html", +// "Is HTML" => "Is html", // "Data Txt" => "Data Txt", // "Article Clip (read only)" => "Article Clip (read only)", // "Clip Now" => "Clip Now", @@ -12534,6 +12564,7 @@ // "Other languages you can read (select on the left to add to the list on the right)" => "Other languages you can read (select on the left to add to the list on the right)", // "Select language.." => "Select language..", // "Detect user timezone if browser allows, otherwise site default" => "Detect user timezone if browser allows, otherwise site default", +// "Detect user time zone if browser allows, otherwise site default" => "Detect user timezone if browser allows, otherwise site default", // "Use 12-hour clock in time selectors" => "Use 12-hour clock in time selectors", // "Display info tooltip on mouseover for every user who allows his/her information to be public" => "Display info tooltip on mouseover for every user who allows his/her information to be public", // "Notify sender when reading his mail" => "Notify sender when reading his mail", Modified: branches/9.x/lang/bg/language.php =================================================================== --- branches/9.x/lang/bg/language.php 2012-04-07 14:02:18 UTC (rev 40802) +++ branches/9.x/lang/bg/language.php 2012-04-07 14:25:49 UTC (rev 40803) @@ -830,7 +830,9 @@ // "No" => "No", // "Computed Field" => "Computed Field", // "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type" => "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type", +// "Provides a computed value based on numeric field values. Consider using webservices or JavaScript to perform the task instead of using this type" => "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type", // "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field" => "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field", +// "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom JavaScript is recommended instead of this field" => "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field", // "Formula" => "Formula", // "The formula to be computed supporting various operators (+ - * / and parenthesis), references to other field made using the field id preceeded by #" => "The formula to be computed supporting various operators (+ - * / and parenthesis), references to other field made using the field id preceeded by #", // "Country Selector" => "Country Selector", @@ -2017,7 +2019,9 @@ // "If you are using Apache, you can copy _htaccess to .htaccess to get Short URLs. On IIS, copy web_config to web.config" => "If you are using Apache, you can copy _htaccess to .htaccess to get Short URLs. On IIS, copy web_config to web.config", // "Search engine friendly url Postfilter" => "Search engine friendly url Postfilter", // "Display article title in the sefurl" => "Display article title in the sefurl", +// "Display article title in the SEFURL" => "Display article title in the sefurl", // "Display blog title in the sefurl" => "Display blog title in the sefurl", +// "Display blog title in the SEFURL" => "Display blog title in the sefurl", // "Rewrite tiki-view_tracker.php?itemId=yyy to Prefixyyy page" => "Rewrite tiki-view_tracker.php?itemId=yyy to Prefixyyy page", // "This redirection uses the wiki prefix alias feature" => "This redirection uses the wiki prefix alias feature", // "Canonical URL tag" => "Canonical URL tag", @@ -2259,6 +2263,7 @@ // "Time Sheet" => "Time Sheet", // "A project time manager" => "A project time manager", // "Html Feed" => "Html Feed", +// "HTML Feed" => "Html Feed", // "A way to push and pull html bits around from one site to another" => "A way to push and pull html bits around from one site to another", // "ForwardLink-Protocol" => "ForwardLink-Protocol", // "A Dynamic Compendia" => "A Dynamic Compendia", @@ -3056,6 +3061,7 @@ // "Sender email" => "Sender email", // "Email address that will be used as the sender for outgoing emails" => "Email address that will be used as the sender for outgoing emails", // "Timezone" => "Timezone", +// "Time zone" => "Timezone", // "Indicates the default time zone to use for the server" => "Indicates the default time zone to use for the server", // "Session storage location" => "Session storage location", // "Select where the session information should be stored. Memcache sessions require memcache to be configured" => "Select where the session information should be stored. Memcache sessions require memcache to be configured", @@ -3512,8 +3518,10 @@ // "Reopen with the same editor" => "Reopen with the same editor", // "Content is parsed like wiki page" => "Content is parsed like wiki page", // "This allows a mixture of wiki and html. All wiki syntax is parsed" => "This allows a mixture of wiki and html. All wiki syntax is parsed", +// "This allows a mixture of wiki and HTML. All wiki syntax is parsed" => "This allows a mixture of wiki and html. All wiki syntax is parsed", // "Content is partially wiki parsed" => "Content is partially wiki parsed", // "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)", +// "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)", // "Wysiwyg editor skin" => "Wysiwyg editor skin", // "Kama (Default)" => "Kama (Default)", // "Office 2003" => "Office 2003", @@ -3637,6 +3645,7 @@ // "To fix this error go to Admin -> Feeds" => "To fix this error go to Admin -> Feeds", // "Please contact the site administrator and ask him to fix this error" => "Please contact the site administrator and ask him to fix this error", // "If you set feed author email or url you have to set feed author name" => "If you set feed author email or url you have to set feed author name", +// "If you set feed author email or URL, you must set feed author name" => "If you set feed author email or url you have to set feed author name", // "Feed logo" => "Feed logo", // "Unspecified" => "Unspecified", // "Log In" => "Log In", @@ -4403,6 +4412,7 @@ // "Shop as anonymous always" => "Shop as anonymous always", // "Add to cart as anonymous shopper even if logged in" => "Add to cart as anonymous shopper even if logged in", // "Forward to this url after free purchase" => "Forward to this url after free purchase", +// "Forward to this URL after free purchase" => "Forward to this url after free purchase", // "Gift certificate" => "Gift certificate", // "Allows user to add gift certificate from the product view" => "Allows user to add gift certificate from the product view", // "Order Item ID to exchange product" => "Order Item ID to exchange product", @@ -5462,7 +5472,9 @@ // "Parse wiki syntax within the HTML code" => "Parse wiki syntax within the HTML code", // "Textlink" => "Textlink", // "Adds an item to html feed" => "Adds an item to html feed", +// "Adds an item to HTML feed" => "Adds an item to html feed", // "Html Feed Link" => "Html Feed Link", +// "HTML Feed Link" => "Html Feed Link", // "Display remote content" => "Display remote content", // "Initial Value" => "Initial Value", // "Feed location" => "Feed location", @@ -5471,12 +5483,15 @@ // "Highlight" => "Highlight", // "Asterisk" => "Asterisk", // "Html Feed Link Type" => "Html Feed Link Type", +// "HTML Feed Link Type" => "Html Feed Link Type", // "Replace" => "Replace", // "Backlink" => "Backlink", // "Popup" => "Popup", // "Hover" => "Hover", // "Is the html feed moderated" => "Is the html feed moderated", +// "Is the HTML feed moderated" => "Is the html feed moderated", // "Date of last accepted html item, not used if not moderated" => "Date of last accepted html item, not used if not moderated", +// "Date of last accepted HTML item, not used if not moderated" => "Date of last accepted html item, not used if not moderated", // "Iframe" => "Iframe", // "Include another web page within a frame" => "Include another web page within a frame", // "Frame title" => "Frame title", @@ -5538,6 +5553,7 @@ // "Enlarge button" => "Enlarge button", // "Button for enlarging image" => "Button for enlarging image", // "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting" => "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting", +// "Enter a URL to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting" => "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting", // "Link relation" => "Link relation", // "Enter \"box\" for colorbox effect (like shadowbox and lightbox) or appropriate syntax for link relation" => "Enter \"box\" for colorbox effect (like shadowbox and lightbox) or appropriate syntax for link relation", // "Image map" => "Image map", @@ -5616,6 +5632,7 @@ // "Optional markup for when JavaScript is off" => "Optional markup for when JavaScript is off", // "<!-- jq plugin inactive: JavaScript off -->" => "<!-- jq plugin inactive: JavaScript off -->", // "Javascript" => "Javascript", +// "JavaScript" => "Javascript", // "javascript code" => "javascript code", // "JavaScript filename" => "JavaScript filename", // "Kaltura Video" => "Kaltura Video", @@ -5671,6 +5688,7 @@ // "Full path to the server-local directory. Default is the document root" => "Full path to the server-local directory. Default is the document root", // "URL Prefix" => "URL Prefix", // "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/" => "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/", +// "Make the file name a link to the file by adding the URL path preceding the file name. Example: http://yoursite.com/tiki/" => "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/", // "Set the sort order of the file list" => "Set the sort order of the file list", // "File Name" => "File Name", // "File Size" => "File Size", @@ -6039,8 +6057,11 @@ // "Creates a link to SourceForge tracker items" => "Creates a link to SourceForge tracker items", // "Group ID" => "Group ID", // "SourceForge project ID (shows as group_id in the url of a tracker item" => "SourceForge project ID (shows as group_id in the url of a tracker item", +// "SourceForge project ID (shows as group_id in the URL of a tracker item" => "SourceForge project ID (shows as group_id in the url of a tracker item", // "SourceForge tracker ID (shows as atid in the url of a tracker item" => "SourceForge tracker ID (shows as atid in the url of a tracker item", +// "SourceForge tracker ID (shows as atid in the URL of a tracker item" => "SourceForge tracker ID (shows as atid in the url of a tracker item", // "SourceForge item ID (shows as aid in the url of a tracker item" => "SourceForge item ID (shows as aid in the url of a tracker item", +// "SourceForge item ID (shows as aid in the URL of a tracker item" => "SourceForge item ID (shows as aid in the url of a tracker item", // "First part of link tooltip identifying the type of tracker item (bug, feature request, patch or support request)" => "First part of link tooltip identifying the type of tracker item (bug, feature request, patch or support request)", // "ShareThis" => "ShareThis", // "Add a ShareThis button" => "Add a ShareThis button", @@ -6175,6 +6196,7 @@ // "Header font color" => "Header font color", // "Apply a color to the headers of your slideshow" => "Apply a color to the headers of your slideshow", // "Any html color" => "Any html color", +// "Any HTML color" => "Any html color", // "Header background color" => "Header background color", // "Slide font color" => "Slide font color", // "Apply a color to the slides of your slideshow" => "Apply a color to the slides of your slideshow", @@ -6414,6 +6436,7 @@ // "to" => "to", // "Email format" => "Email format", // "Text or html setting" => "Text or html setting", +// "Text or HTML setting" => "Text or html setting", // "URL the user is sent to after the form is submitted" => "URL the user is sent to after the form is submitted", // "URL Target" => "URL Target", // "Set the target parameter for the url (determines whether target will open in a new page, etc.)" => "Set the target parameter for the url (determines whether target will open in a new page, etc.)", @@ -8115,6 +8138,7 @@ // "Last update" => "Last update", // "Refresh" => "Refresh", // "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again" => "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again", +// "JavaScript must be turned <strong>ON</strong> in order to apply Profiles. Please enable your JavaScript and try again" => "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again", // "Export YAML" => "Export YAML", // "Export modified preferences as YAML" => "Export modified preferences as YAML", // "Toggle Visible" => "Toggle Visible", @@ -10021,6 +10045,7 @@ // "Add unsubscribe instructions to each newsletter" => "Add unsubscribe instructions to each newsletter", // "Validate email addresses" => "Validate email addresses", // "Allow customized text message to be sent with the html version" => "Allow customized text message to be sent with the html version", +// "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", @@ -10780,7 +10805,9 @@ // "If not the topic name" => "If not the topic name", // "Allow full HTML" => "Allow full HTML", // "Keep any html tag" => "Keep any html tag", +// "Keep any HTML tag" => "Keep any html tag", // "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)" => "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)", +// "If not enabled, Tiki will retain some HTML tags (a, p, pre, img, hr, b, i)" => "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)", // "Emails to be notified (separated with commas)" => "Emails to be notified (separated with commas)", // "Edit or create banners" => "Edit or create banners", // "List banners" => "List banners", @@ -10920,6 +10947,7 @@ // "Special characters" => "Special characters", // "hard space" => "hard space", // "numeric between ~ for html numeric characters entity" => "numeric between ~ for html numeric characters entity", +// "numeric between ~ for HTML numeric characters entity" => "numeric between ~ for html numeric characters entity", // "Plugin Help" => "Plugin Help", // "Note that plugin arguments can be enclosed with double quotes ("); this allows them to contain , or = or >" => "Note that plugin arguments can be enclosed with double quotes ("); this allows them to contain , or = or >", // "More help here" => "More help here", @@ -11301,6 +11329,7 @@ // "Tiki Importer" => "Tiki 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", // "If your pages contain xml code, the html purifier will delete it. Deactivate this feature" => "If your pages contain xml code, the html purifier will delete it. Deactivate this feature", +// "If your pages contain XML code, the HTML purifier will delete it. Deactivate this feature" => "If your pages contain xml code, the html purifier will delete it. Deactivate this feature", // "Your PHP is running with safe mode enabled. This might cause problems to the import process as safe mode limits the possibility to change in run time some PHP settings (like max_execution_time). It is recommended to run this script without safe mode" => "Your PHP is running with safe mode enabled. This might cause problems to the import process as safe mode limits the possibility to change in run time some PHP settings (like max_execution_time). It is recommended to run this script without safe mode", // "Depending on the size of the file from the source software, the import process may take a while to complete. This might be a problem according to your PHP and web server settings. This script tries to change the relevant settings but there are some settings that the script cannot change. So, if you are having problems with the script, please try to increase the value of the following PHP settings: max_input_time, max_execution_time (this setting is limited by the web server setting, if you are running Apache also change its Timeout setting), post_max_size, upload_max_filesize, memory_limit. It is recommended that you run this script on a server where you can change the values of those settings (if needed)" => "Depending on the size of the file from the source software, the import process may take a while to complete. This might be a problem according to your PHP and web server settings. This script tries to change the relevant settings but there are some settings that the script cannot change. So, if you are having problems with the script, please try to increase the value of the following PHP settings: max_input_time, max_execution_time (this setting is limited by the web server setting, if you are running Apache also change its Timeout setting), post_max_size, upload_max_filesize, memory_limit. It is recommended that you run this script on a server where you can change the values of those settings (if needed)", // "Select the software to import from" => "Select the software to import from", @@ -12149,6 +12178,7 @@ // "Apply content template" => "Apply content template", // "Data HTML" => "Data HTML", // "Is html" => "Is html", +// "Is HTML" => "Is html", // "Data Txt" => "Data Txt", // "Article Clip (read only)" => "Article Clip (read only)", // "Clip Now" => "Clip Now", @@ -12534,6 +12564,7 @@ // "Other languages you can read (select on the left to add to the list on the right)" => "Other languages you can read (select on the left to add to the list on the right)", // "Select language.." => "Select language..", // "Detect user timezone if browser allows, otherwise site default" => "Detect user timezone if browser allows, otherwise site default", +// "Detect user time zone if browser allows, otherwise site default" => "Detect user timezone if browser allows, otherwise site default", // "Use 12-hour clock in time selectors" => "Use 12-hour clock in time selectors", // "Display info tooltip on mouseover for every user who allows his/her information to be public" => "Display info tooltip on mouseover for every user who allows his/her information to be public", // "Notify sender when reading his mail" => "Notify sender when reading his mail", Modified: branches/9.x/lang/ca/language.php =================================================================== --- branches/9.x/lang/ca/language.php 2012-04-07 14:02:18 UTC (rev 40802) +++ branches/9.x/lang/ca/language.php 2012-04-07 14:25:49 UTC (rev 40803) @@ -830,7 +830,9 @@ "No" => "No", // "Computed Field" => "Computed Field", // "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type" => "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type", +// "Provides a computed value based on numeric field values. Consider using webservices or JavaScript to perform the task instead of using this type" => "Provides a computed value based on numeric field values. Consider using webservices or javascript to perform the task instead of using this type", // "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field" => "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field", +// "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom JavaScript is recommended instead of this field" => "This feature is still in place for backwards compatibility. While there are no flaws associated to it, it could be used as a vector for attacks causing a lot of damage. Webservice field or custom javascript is recommended instead of this field", "Formula" => "Fórmula", // "The formula to be computed supporting various operators (+ - * / and parenthesis), references to other field made using the field id preceeded by #" => "The formula to be computed supporting various operators (+ - * / and parenthesis), references to other field made using the field id preceeded by #", // "Country Selector" => "Country Selector", @@ -2017,7 +2019,9 @@ // "If you are using Apache, you can copy _htaccess to .htaccess to get Short URLs. On IIS, copy web_config to web.config" => "If you are using Apache, you can copy _htaccess to .htaccess to get Short URLs. On IIS, copy web_config to web.config", // "Search engine friendly url Postfilter" => "Search engine friendly url Postfilter", // "Display article title in the sefurl" => "Display article title in the sefurl", +// "Display article title in the SEFURL" => "Display article title in the sefurl", // "Display blog title in the sefurl" => "Display blog title in the sefurl", +// "Display blog title in the SEFURL" => "Display blog title in the sefurl", // "Rewrite tiki-view_tracker.php?itemId=yyy to Prefixyyy page" => "Rewrite tiki-view_tracker.php?itemId=yyy to Prefixyyy page", // "This redirection uses the wiki prefix alias feature" => "This redirection uses the wiki prefix alias feature", // "Canonical URL tag" => "Canonical URL tag", @@ -2259,6 +2263,7 @@ // "Time Sheet" => "Time Sheet", // "A project time manager" => "A project time manager", // "Html Feed" => "Html Feed", +// "HTML Feed" => "Html Feed", // "A way to push and pull html bits around from one site to another" => "A way to push and pull html bits around from one site to another", // "ForwardLink-Protocol" => "ForwardLink-Protocol", // "A Dynamic Compendia" => "A Dynamic Compendia", @@ -3056,6 +3061,7 @@ "Sender email" => "correu-e de l'enviador", // "Email address that will be used as the sender for outgoing emails" => "Email address that will be used as the sender for outgoing emails", // "Timezone" => "Timezone", +// "Time zone" => "Timezone", // "Indicates the default time zone to use for the server" => "Indicates the default time zone to use for the server", // "Session storage location" => "Session storage location", // "Select where the session information should be stored. Memcache sessions require memcache to be configured" => "Select where the session information should be stored. Memcache sessions require memcache to be configured", @@ -3512,8 +3518,10 @@ "Reopen with the same editor" => "Reobre amb el mateix editor", "Content is parsed like wiki page" => "El contingut és processat com una pàgina Wiki", // "This allows a mixture of wiki and html. All wiki syntax is parsed" => "This allows a mixture of wiki and html. All wiki syntax is parsed", +// "This allows a mixture of wiki and HTML. All wiki syntax is parsed" => "This allows a mixture of wiki and html. All wiki syntax is parsed", // "Content is partially wiki parsed" => "Content is partially wiki parsed", // "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)", +// "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)", // "Wysiwyg editor skin" => "Wysiwyg editor skin", // "Kama (Default)" => "Kama (Default)", // "Office 2003" => "Office 2003", @@ -3637,6 +3645,7 @@ // "To fix this error go to Admin -> Feeds" => "To fix this error go to Admin -> Feeds", // "Please contact the site administrator and ask him to fix this error" => "Please contact the site administrator and ask him to fix this error", // "If you set feed author email or url you have to set feed author name" => "If you set feed author email or url you have to set feed author name", +// "If you set feed author email or URL, you must set feed author name" => "If you set feed author email or url you have to set feed author name", // "Feed logo" => "Feed logo", "Unspecified" => "No especificat", // "Log In" => "Log In", @@ -4404,6 +4413,7 @@ // "Shop as anonymous always" => "Shop as anonymous always", // "Add to cart as anonymous shopper even if logged in" => "Add to cart as anonymous shopper even if logged in", // "Forward to this url after free purchase" => "Forward to this url after free purchase", +// "Forward to this URL after free purchase" => "Forward to this url after free purchase", // "Gift certificate" => "Gift certificate", // "Allows user to add gift certificate from the product view" => "Allows user to add gift certificate from the product view", // "Order Item ID to exchange product" => "Order Item ID to exchange product", @@ -5464,7 +5474,9 @@ // "Parse wiki syntax within the HTML code" => "Parse wiki syntax within the HTML code", // "Textlink" => "Textlink", // "Adds an item to html feed" => "Adds an item to html feed", +// "Adds an item to HTML feed" => "Adds an item to html feed", // "Html Feed Link" => "Html Feed Link", +// "HTML Feed Link" => "Html Feed Link", // "Display remote content" => "Display remote content", // "Initial Value" => "Initial Value", // "Feed location" => "Feed location", @@ -5473,12 +5485,15 @@ // "Highlight" => "Highlight", // "Asterisk" => "Asterisk", // "Html Feed Link Type" => "Html Feed Link Type", +// "HTML Feed Link Type" => "Html Feed Link Type", "Replace" => "Reemplaçar", // "Backlink" => "Backlink", // "Popup" => "Popup", // "Hover" => "Hover", // "Is the html feed moderated" => "Is the html feed moderated", +// "Is the HTML feed moderated" => "Is the html feed moderated", // "Date of last accepted html item, not used if not moderated" => "Date of last accepted html item, not used if not moderated", +// "Date of last accepted HTML item, not used if not moderated" => "Date of last accepted html item, not used if not moderated", "Iframe" => "Iframe", // "Include another web page within a frame" => "Include another web page within a frame", // "Frame title" => "Frame title", @@ -5540,6 +5555,7 @@ // "Enlarge button" => "Enlarge button", // "Button for enlarging image" => "Button for enlarging image", // "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting" => "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting", +// "Enter a URL to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting" => "Enter a url to the address the image should link to. Not needed if thumb parameter is set; overrides thumb setting", // "Link relation" => "Link relation", // "Enter \"box\" for colorbox effect (like shadowbox and lightbox) or appropriate syntax for link relation" => "Enter \"box\" for colorbox effect (like shadowbox and lightbox) or appropriate syntax for link relation", // "Image map" => "Image map", @@ -5618,6 +5634,7 @@ // "Optional markup for when JavaScript is off" => "Optional markup for when JavaScript is off", // "<!-- jq plugin inactive: JavaScript off -->" => "<!-- jq plugin inactive: JavaScript off -->", // "Javascript" => "Javascript", +// "JavaScript" => "Javascript", // "javascript code" => "javascript code", // "JavaScript filename" => "JavaScript filename", // "Kaltura Video" => "Kaltura Video", @@ -5673,6 +5690,7 @@ // "Full path to the server-local directory. Default is the document root" => "Full path to the server-local directory. Default is the document root", // "URL Prefix" => "URL Prefix", // "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/" => "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/", +// "Make the file name a link to the file by adding the URL path preceding the file name. Example: http://yoursite.com/tiki/" => "Make the file name a link to the file by adding the url path preceding the file name. Example: http://yoursite.com/tiki/", // "Set the sort order of the file list" => "Set the sort order of the file list", "File Name" => "Nom d'arxiu", // "File Size" => "File Size", @@ -6043,8 +6061,11 @@ // "Creates a link to SourceForge tracker items" => "Creates a link to SourceForge tracker items", // "Group ID" => "Group ID", // "SourceForge project ID (shows as group_id in the url of a tracker item" => "SourceForge project ID (shows as group_id in the url of a tracker item", +// "SourceForge project ID (shows as group_id in the URL of a tracker item" => "SourceForge project ID (shows as group_id in the url of a tracker item", // "SourceForge tracker ID (shows as atid in the url of a tracker item" => "SourceForge tracker ID (shows as atid in the url of a tracker item", +// "SourceForge tracker ID (shows as atid in the URL of a tracker item" => "SourceForge tracker ID (shows as atid in the url of a tracker item", // "SourceForge item ID (shows as aid in the url of a tracker item" => "SourceForge item ID (shows as aid in the url of a tracker item", +// "SourceForge item ID (shows as aid in the URL of a tracker item" => "SourceForge item ID (shows as aid in the url of a tracker item", // "First part of link tooltip identifying the type of tracker item (bug, feature request, patch or support request)" => "First part of link tooltip identifying the type of tracker item (bug, feature request, patch or support request)", // "ShareThis" => "ShareThis", // "Add a ShareThis button" => "Add a ShareThis button", @@ -6179,6 +6200,7 @@ // "Header font color" => "Header font color", // "Apply a color to the headers of your slideshow" => "Apply a color to the headers of your slideshow", // "Any html color" => "Any html color", +// "Any HTML color" => "Any html color", // "Header background color" => "Header background color", // "Slide font color" => "Slide font color", // "Apply a color to the slides of your slideshow" => "Apply a color to the slides of your slideshow", @@ -6419,6 +6441,7 @@ "to" => "a", // "Email format" => "Email format", // "Text or html setting" => "Text or html setting", +// "Text or HTML setting" => "Text or html setting", // "URL the user is sent to after the form is submitted" => "URL the user is sent to after the form is submitted", // "URL Target" => "URL Target", // "Set the target parameter for the url (determines whether target will open in a new page, etc.)" => "Set the target parameter for the url (determines whether target will open in a new page, etc.)", @@ -8123,6 +8146,7 @@ "Last update" => "Última actualització", "Refresh" => "Refrescar", // "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again" => "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again", +// "JavaScript must be turned <strong>ON</strong> in order to apply Profiles. Please enable your JavaScript and try again" => "Javascript must be turned <b>ON</b> in order to apply Profiles. Please enable your javascript and try again", // "Export YAML" => "Export YAML", "Object type:" => "Tipus d'objecte:", // "Export modified preferences as YAML" => "Export modified preferences as YAML", @@ -9988,7 +10012,7 @@ // "Custom Modules" => "Custom Modules", // "Create new custom module" => "Create new custom module", // "Edit this custom module" => "Edit this custom module", -"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." => "Crea el teu nou mòdul personalitzat a continuació. Assegura't de previsualitzar-lo primer i que tot és correcte abans d'<a href=\"#assign\">assignar-lo</a>. Pots emprar html si vols a més. No obstant això, si utilizes la sintaxi wiki o un codi Smarty de manera incorrecta, pot ser que tu mateix t'expulsis del lloc web.", +"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." => "Crea el teu nou mòdul personalitzat a continuació. Assegura't de previsualitzar-lo primer i que tot és correcte abans d'<a href=\"#assign\">assignar-lo</a>. Pots emprar html si vols a més. No obstant això, si utilizes la sintaxi wiki o un codi Smarty de manera incorrecta, pot ser que tu mateix t'expulsis del lloc web.", "Must be wiki parsed" => "Interpreta el format Wiki", "Objects that can be included" => "Objectes que es poden incloure", "Available polls" => "Consultes disponibles", @@ -10060,6 +10084,7 @@ "Add unsubscribe instructions to each newsletter" => "Afegir instruccions de desubscripció a cada butlletí", "Validate email addresses" => "Valida adreces de correu-e", "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 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", @@ -10822,7 +10847,9 @@ // "If not the topic name" => "If not the topic name", // "Allow full HTML" => "Allow full HTML", // "Keep any html tag" => "Keep any html tag", +// "Keep any HTML tag" => "Keep any html tag", // "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)" => "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)", +// "If not enabled, Tiki will retain some HTML tags (a, p, pre, img, hr, b, i)" => "If uncheck will keep anyway some html tags (a,p,pre,img,hr,b,i)", // "Emails to be notified (separated with commas)" => "Emails to be notified (separated with commas)", "Edit or create banners" => "Edita o crea blocs de publicitat", "List banners" => "Llista butlletins", @@ -10963,6 +10990,7 @@ "Special characters" => "Caràcters especials", "hard space" => "espai rigid (no permet que es trenqui la línia)", "numeric between ~ for html numeric characters entity" => "numeric entre ~ per a entitats html de caràcters numèrics", +"numeric between ~ for HTML numeric characters entity" => "numeric entre ~ per a entitats html de caràcters numèrics", "Plugin Help" => "Ajuda de Plugins", "Note that plugin arguments can be enclosed with double quotes ("); this allows them to contain , or = or >" => "Fixa't que els arguments dels connectors (plugins) es poden envoltar de cometes dobles ("); això permet que continguin , o = o >", "More help here" => "Més ajuda, aquí", @@ -11348,6 +11376,7 @@ // "Tiki Importer" => "Tiki 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", // "If your pages contain xml code, the html purifier will delete it. Deactivate this feature" => "If your pages contain xml code, the html purifier will delete it. Deactivate this feature", +// "If your pages contain XML code, the HTML purifier will delete it. Deactivate this feature" => "If your pages contain xml code, the html purifier will delete it. Deactivate this feature", // "Your PHP is running with safe mode enabled. This might cause problems to the import process as safe mode limits the possibility to change in run time some PHP settings (like max_execution_ti... [truncated message content] |
From: <jon...@us...> - 2012-04-07 17:42:49
|
Revision: 40815 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40815&view=rev Author: jonnybradley Date: 2012-04-07 17:42:42 +0000 (Sat, 07 Apr 2012) Log Message: ----------- [FIX] javascript_cdn: Use https to access jquery files if appropriate (and removed workround for for missing 1.7.2 files) Modified Paths: -------------- branches/9.x/lib/prefs/javascript.php branches/9.x/tiki-setup.php Modified: branches/9.x/lib/prefs/javascript.php =================================================================== --- branches/9.x/lib/prefs/javascript.php 2012-04-07 17:33:57 UTC (rev 40814) +++ branches/9.x/lib/prefs/javascript.php 2012-04-07 17:42:42 UTC (rev 40815) @@ -14,7 +14,7 @@ 'type' => 'list', 'options' => array( 'none' => tra('None'), - 'google' => tra('Google'), + 'google' => tra('Google (supports SSL via HTTPS)'), 'jquery' => tra('jQuery'), ), 'default' => 'none', Modified: branches/9.x/tiki-setup.php =================================================================== --- branches/9.x/tiki-setup.php 2012-04-07 17:33:57 UTC (rev 40814) +++ branches/9.x/tiki-setup.php 2012-04-07 17:42:42 UTC (rev 40815) @@ -218,10 +218,7 @@ if ( isset($prefs['javascript_cdn']) && $prefs['javascript_cdn'] == 'google' ) { - // google doesn't keep up to date, so use the most recent minor release they have available - $v = explode('.', $headerlib->jquery_version); - $v = $v[0] . '.' . $v[1]; - $headerlib->add_jsfile_dependancy("http://ajax.googleapis.com/ajax/libs/jquery/$v/jquery.min.js"); + $headerlib->add_jsfile_dependancy("$url_scheme://ajax.googleapis.com/ajax/libs/jquery/$headerlib->jquery_version/jquery.min.js"); } else if ( isset($prefs['javascript_cdn']) && $prefs['javascript_cdn'] == 'jquery' ) { $headerlib->add_jsfile_dependancy("http://code.jquery.com/jquery-$headerlib->jquery_version.min.js"); } else { @@ -279,7 +276,7 @@ if ( $prefs['feature_jquery_ui'] == 'y' ) { if ( isset($prefs['javascript_cdn']) && $prefs['javascript_cdn'] == 'google' ) { - $headerlib->add_jsfile_dependancy("http://ajax.googleapis.com/ajax/libs/jqueryui/$headerlib->jqueryui_version/jquery-ui.min.js"); + $headerlib->add_jsfile_dependancy("$url_scheme://ajax.googleapis.com/ajax/libs/jqueryui/$headerlib->jqueryui_version/jquery-ui.min.js"); } else if ( isset($prefs['javascript_cdn']) && $prefs['javascript_cdn'] == 'jquery' ) { $headerlib->add_jsfile_dependancy("http://code.jquery.com/ui/$headerlib->jqueryui_version/jquery-ui.min.js"); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-04-07 19:07:46
|
Revision: 40821 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40821&view=rev Author: jonnybradley Date: 2012-04-07 19:07:39 +0000 (Sat, 07 Apr 2012) Log Message: ----------- [FIX] content templates: Cheap fix for html no longer being parsed by default (since tiki 7?). Done by adding a new template "section" section_wiki_html which parses as is_html and uses the wysiwyg editor. Seems to work in (html) wiki pages, needs further testing... Modified Paths: -------------- branches/9.x/templates/tiki-admin_content_templates.tpl branches/9.x/tiki-admin_content_templates.php Modified: branches/9.x/templates/tiki-admin_content_templates.tpl =================================================================== --- branches/9.x/templates/tiki-admin_content_templates.tpl 2012-04-07 19:03:53 UTC (rev 40820) +++ branches/9.x/templates/tiki-admin_content_templates.tpl 2012-04-07 19:07:39 UTC (rev 40821) @@ -37,6 +37,9 @@ <label><input type="checkbox" name="section_wiki" {if $info.section_wiki eq 'y'}checked="checked"{/if} /> {tr}Wiki{/tr}</label> <br /> + <label style="margin-left: 2em;"><input type="checkbox" name="section_wiki_html" {if $info.section_wiki_html eq 'y'}checked="checked"{/if} /> + {tr}Is HTML{/tr}</label> + <br /> {/if} {if $prefs.feature_file_galleries_templates eq 'y'} <label><input type="checkbox" name="section_file_galleries" {if $info.section_file_galleries eq 'y'}checked="checked"{/if} /> @@ -78,6 +81,7 @@ <td>{tr}Page Name:{/tr}</td> <td> <input type="text" name="page_name" value="{$info.page_name}"/> + {autocomplete element='input[name=page_name]' type='pagename'} </td> </tr> @@ -88,7 +92,15 @@ </tr> <tr class="type-cond for-static"> <td colspan="2"> - {textarea id="editwiki" name="content" switcheditor="y"}{$info.content}{/textarea} + {if $prefs.feature_wysiwyg eq 'y' and $info.section_wiki_html eq 'y'} + {$use_wysiwyg='y'} + <input type="hidden" id="allowhtml" value="y"/> + {if $prefs.wysiwyg_htmltowiki eq 'y'}{$is_html = 'y'}{else}{$is_html = 'n'}{/if} + {else} + {$use_wysiwyg='n'} + {$is_html = 'n'} + {/if} + {textarea id="editwiki" name="content" switcheditor="y" _wysiwyg=$use_wysiwyg _is_html=$is_html}{$info.content}{/textarea} </td> </tr> Modified: branches/9.x/tiki-admin_content_templates.php =================================================================== --- branches/9.x/tiki-admin_content_templates.php 2012-04-07 19:03:53 UTC (rev 40820) +++ branches/9.x/tiki-admin_content_templates.php 2012-04-07 19:07:39 UTC (rev 40821) @@ -11,6 +11,8 @@ include_once ('lib/templates/templateslib.php'); +$auto_query_args = array('templateId'); + $access->check_permission('tiki_p_edit_content_templates'); //get_strings tra('Content Templates') @@ -30,6 +32,11 @@ } else { $info["section_wiki"] = 'n'; } + if ($templateslib->template_is_in_section($_REQUEST["templateId"], 'wiki_html')) { + $info["section_wiki_html"] = 'y'; + } else { + $info["section_wiki_html"] = 'n'; + } if ($templateslib->template_is_in_section($_REQUEST["templateId"], 'file_galleries')) { $info["section_file_galleries"] = 'y'; } else { @@ -63,6 +70,7 @@ $info["section_cms"] = 'n'; $info["section_html"] = 'n'; $info["section_wiki"] = 'n'; + $info["section_wiki_html"] = 'n'; $info["section_file_galleries"] = 'n'; $info["section_newsletters"] = 'n'; $info["section_event"] = 'n'; @@ -85,7 +93,7 @@ $parsed = nl2br($_REQUEST["content"]); } else { $info["section_html"] = 'n'; - $parsed = $tikilib->parse_data($_REQUEST["content"]); + $parsed = $tikilib->parse_data($_REQUEST["content"], array('is_html' => $info['section_wiki_html'] === 'y')); } $smarty->assign('parsed', $parsed); if (isset($_REQUEST["section_wiki"]) && $_REQUEST["section_wiki"] == 'on') { @@ -135,6 +143,7 @@ $info["content"] = ''; $info["section_cms"] = 'n'; $info["section_wiki"] = 'n'; + $info["section_wiki_html"] = 'n'; $info["section_file_galleries"] = 'n'; $info["section_newsletters"] = 'n'; $info["section_events"] = 'n'; @@ -150,6 +159,11 @@ } else { $templateslib->remove_template_from_section($tid, 'wiki'); } + if (isset($_REQUEST["section_wiki_html"]) && $_REQUEST["section_wiki_html"] == 'on') { + $templateslib->add_template_to_section($tid, 'wiki_html'); + } else { + $templateslib->remove_template_from_section($tid, 'wiki_html'); + } if (isset($_REQUEST["section_file_galleries"]) && $_REQUEST["section_file_galleries"] == 'on') { $templateslib->add_template_to_section($tid, 'file_galleries'); } else { @@ -176,6 +190,7 @@ $info["content"] = (isset($_REQUEST["content"]) && $_REQUEST["content"] != '') ? $_REQUEST["content"] : '' ; $info["section_cms"] = (isset($_REQUEST["section_cms"]) && $_REQUEST["section_cms"] == 'on') ? 'y' : 'n'; $info["section_wiki"] = (isset($_REQUEST["section_wiki"]) && $_REQUEST["section_wiki"] == 'on') ? 'y' : 'n'; + $info["section_wiki_html"] = (isset($_REQUEST["section_wiki_html"]) && $_REQUEST["section_wiki_html"] == 'on') ? 'y' : 'n'; $info["section_file_galleries"] = (isset($_REQUEST["section_file_galleries"]) && $_REQUEST["section_file_galleries"] == 'on') ? 'y' : 'n'; $info["section_newsletters"] = (isset($_REQUEST["section_newsletters"]) && $_REQUEST["section_newsletters"] == 'on') ? 'y' : 'n' ; $info["section_events"] = (isset($_REQUEST["section_events"]) && $_REQUEST["section_events"] == 'on') ? 'y' : 'n'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@en...> - 2012-04-07 21:38:38
|
hmmm - seems to be a step back for me I can't get the editor to toggle into the wysiwyg mode any more in the 'Content templates' area The toolbar in Content templates still doesn't show the same as on a 'proper' wiki page - and existing/new templates will only open in the wiki editor Using r40823 and FF geoff -----Original Message----- From: jon...@us... [mailto:jon...@us...] Sent: 07 April 2012 20:08 To: tik...@li... Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[40821] branches/9.x Revision: 40821 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40821&view=rev Author: jonnybradley Date: 2012-04-07 19:07:39 +0000 (Sat, 07 Apr 2012) Log Message: ----------- [FIX] content templates: Cheap fix for html no longer being parsed by default (since tiki 7?). Done by adding a new template "section" section_wiki_html which parses as is_html and uses the wysiwyg editor. Seems to work in (html) wiki pages, needs further testing... Modified Paths: -------------- branches/9.x/templates/tiki-admin_content_templates.tpl branches/9.x/tiki-admin_content_templates.php Modified: branches/9.x/templates/tiki-admin_content_templates.tpl =================================================================== --- branches/9.x/templates/tiki-admin_content_templates.tpl 2012-04-07 19:03:53 UTC (rev 40820) +++ branches/9.x/templates/tiki-admin_content_templates.tpl 2012-04-07 19:07:39 UTC (rev 40821) @@ -37,6 +37,9 @@ <label><input type="checkbox" name="section_wiki" {if $info.section_wiki eq 'y'}checked="checked"{/if} /> {tr}Wiki{/tr}</label> <br /> + <label style="margin-left: 2em;"><input type="checkbox" name="section_wiki_html" {if $info.section_wiki_html eq 'y'}checked="checked"{/if} /> + {tr}Is HTML{/tr}</label> + <br /> {/if} {if $prefs.feature_file_galleries_templates eq 'y'} <label><input type="checkbox" name="section_file_galleries" {if $info.section_file_galleries eq 'y'}checked="checked"{/if} /> @@ -78,6 +81,7 @@ <td>{tr}Page Name:{/tr}</td> <td> <input type="text" name="page_name" value="{$info.page_name}"/> + {autocomplete element='input[name=page_name]' type='pagename'} </td> </tr> @@ -88,7 +92,15 @@ </tr> <tr class="type-cond for-static"> <td colspan="2"> - {textarea id="editwiki" name="content" switcheditor="y"}{$info.content}{/textarea} + {if $prefs.feature_wysiwyg eq 'y' and $info.section_wiki_html eq 'y'} + {$use_wysiwyg='y'} + <input type="hidden" id="allowhtml" value="y"/> + {if $prefs.wysiwyg_htmltowiki eq 'y'}{$is_html = 'y'}{else}{$is_html = 'n'}{/if} + {else} + {$use_wysiwyg='n'} + {$is_html = 'n'} + {/if} + {textarea id="editwiki" name="content" switcheditor="y" +_wysiwyg=$use_wysiwyg _is_html=$is_html}{$info.content}{/textarea} </td> </tr> Modified: branches/9.x/tiki-admin_content_templates.php =================================================================== --- branches/9.x/tiki-admin_content_templates.php 2012-04-07 19:03:53 UTC (rev 40820) +++ branches/9.x/tiki-admin_content_templates.php 2012-04-07 19:07:39 UTC (rev 40821) @@ -11,6 +11,8 @@ include_once ('lib/templates/templateslib.php'); +$auto_query_args = array('templateId'); + $access->check_permission('tiki_p_edit_content_templates'); //get_strings tra('Content Templates') @@ -30,6 +32,11 @@ } else { $info["section_wiki"] = 'n'; } + if ($templateslib->template_is_in_section($_REQUEST["templateId"], 'wiki_html')) { + $info["section_wiki_html"] = 'y'; + } else { + $info["section_wiki_html"] = 'n'; + } if ($templateslib->template_is_in_section($_REQUEST["templateId"], 'file_galleries')) { $info["section_file_galleries"] = 'y'; } else { @@ -63,6 +70,7 @@ $info["section_cms"] = 'n'; $info["section_html"] = 'n'; $info["section_wiki"] = 'n'; + $info["section_wiki_html"] = 'n'; $info["section_file_galleries"] = 'n'; $info["section_newsletters"] = 'n'; $info["section_event"] = 'n'; @@ -85,7 +93,7 @@ $parsed = nl2br($_REQUEST["content"]); } else { $info["section_html"] = 'n'; - $parsed = $tikilib->parse_data($_REQUEST["content"]); + $parsed = $tikilib->parse_data($_REQUEST["content"], array('is_html' +=> $info['section_wiki_html'] === 'y')); } $smarty->assign('parsed', $parsed); if (isset($_REQUEST["section_wiki"]) && $_REQUEST["section_wiki"] == 'on') { @@ -135,6 +143,7 @@ $info["content"] = ''; $info["section_cms"] = 'n'; $info["section_wiki"] = 'n'; + $info["section_wiki_html"] = 'n'; $info["section_file_galleries"] = 'n'; $info["section_newsletters"] = 'n'; $info["section_events"] = 'n'; @@ -150,6 +159,11 @@ } else { $templateslib->remove_template_from_section($tid, 'wiki'); } + if (isset($_REQUEST["section_wiki_html"]) && $_REQUEST["section_wiki_html"] == 'on') { + $templateslib->add_template_to_section($tid, 'wiki_html'); + } else { + $templateslib->remove_template_from_section($tid, 'wiki_html'); + } if (isset($_REQUEST["section_file_galleries"]) && $_REQUEST["section_file_galleries"] == 'on') { $templateslib->add_template_to_section($tid, 'file_galleries'); } else { @@ -176,6 +190,7 @@ $info["content"] = (isset($_REQUEST["content"]) && $_REQUEST["content"] != '') ? $_REQUEST["content"] : '' ; $info["section_cms"] = (isset($_REQUEST["section_cms"]) && $_REQUEST["section_cms"] == 'on') ? 'y' : 'n'; $info["section_wiki"] = (isset($_REQUEST["section_wiki"]) && $_REQUEST["section_wiki"] == 'on') ? 'y' : 'n'; + $info["section_wiki_html"] = (isset($_REQUEST["section_wiki_html"]) +&& $_REQUEST["section_wiki_html"] == 'on') ? 'y' : 'n'; $info["section_file_galleries"] = (isset($_REQUEST["section_file_galleries"]) && $_REQUEST["section_file_galleries"] == 'on') ? 'y' : 'n'; $info["section_newsletters"] = (isset($_REQUEST["section_newsletters"]) && $_REQUEST["section_newsletters"] == 'on') ? 'y' : 'n' ; $info["section_events"] = (isset($_REQUEST["section_events"]) && $_REQUEST["section_events"] == 'on') ? 'y' : 'n'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ---------------------------------------------------------------------------- -- For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ Tikiwiki-cvs mailing list Tik...@li... https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs ----- No virus found in this message. Checked by AVG - www.avg.com Version: 2012.0.1913 / Virus Database: 2409/4920 - Release Date: 04/07/12 ----- No virus found in this message. Checked by AVG - www.avg.com Version: 2012.0.1913 / Virus Database: 2409/4920 - Release Date: 04/07/12 |
From: <jon...@us...> - 2012-04-08 13:23:21
|
Revision: 40826 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40826&view=rev Author: jonnybradley Date: 2012-04-08 13:23:13 +0000 (Sun, 08 Apr 2012) Log Message: ----------- [FIX] content templates: Restore switcing of editors and use correct toolbar for template section Modified Paths: -------------- branches/9.x/templates/tiki-admin_content_templates.tpl branches/9.x/tiki-admin_content_templates.php Modified: branches/9.x/templates/tiki-admin_content_templates.tpl =================================================================== --- branches/9.x/templates/tiki-admin_content_templates.tpl 2012-04-07 22:16:51 UTC (rev 40825) +++ branches/9.x/templates/tiki-admin_content_templates.tpl 2012-04-08 13:23:13 UTC (rev 40826) @@ -31,11 +31,13 @@ {if $prefs.feature_cms_templates eq 'y'} <input type="checkbox" name="section_cms" {if $info.section_cms eq 'y'}checked="checked"{/if} /> {tr}CMS{/tr} ({tr}Articles{/tr}) + {$toolbar_section='cms'} <br /> {/if} {if $prefs.feature_wiki_templates eq 'y'} <label><input type="checkbox" name="section_wiki" {if $info.section_wiki eq 'y'}checked="checked"{/if} /> {tr}Wiki{/tr}</label> + {$toolbar_section='wiki page'} <br /> <label style="margin-left: 2em;"><input type="checkbox" name="section_wiki_html" {if $info.section_wiki_html eq 'y'}checked="checked"{/if} /> {tr}Is HTML{/tr}</label> @@ -43,21 +45,25 @@ {/if} {if $prefs.feature_file_galleries_templates eq 'y'} <label><input type="checkbox" name="section_file_galleries" {if $info.section_file_galleries eq 'y'}checked="checked"{/if} /> + {$toolbar_section='admin'} {tr}File Galleries{/tr}</label> <br /> {/if} {if $prefs.feature_newsletters eq 'y'} <label><input type="checkbox" name="section_newsletters" {if $info.section_newsletters eq 'y'}checked="checked"{/if} /> + {$toolbar_section='newsletters'} {tr}Newsletters{/tr}</label> <br /> {/if} {if $prefs.feature_events eq 'y'} <label><input type="checkbox" name="section_events" {if $info.section_events eq 'y'}checked="checked"{/if} /> + {$toolbar_section='calendar'} {tr}Events{/tr}</label> <br /> {/if} {if $prefs.feature_html_pages eq 'y'} <label><input type="checkbox" name="section_html" {if $info.section_html eq 'y'}checked="checked"{/if} /> + {$toolbar_section='wiki page'} {tr}HTML Pages{/tr}</label> <br /> {/if} @@ -100,7 +106,7 @@ {$use_wysiwyg='n'} {$is_html = 'n'} {/if} - {textarea id="editwiki" name="content" switcheditor="y" _wysiwyg=$use_wysiwyg _is_html=$is_html}{$info.content}{/textarea} + {textarea id="editwiki" name="content" switcheditor="y" _wysiwyg=$use_wysiwyg _is_html=$is_html section=$toolbar_section}{$info.content}{/textarea} </td> </tr> Modified: branches/9.x/tiki-admin_content_templates.php =================================================================== --- branches/9.x/tiki-admin_content_templates.php 2012-04-07 22:16:51 UTC (rev 40825) +++ branches/9.x/tiki-admin_content_templates.php 2012-04-08 13:23:13 UTC (rev 40826) @@ -76,7 +76,7 @@ $info["section_event"] = 'n'; } -$smarty->assign('info', $info); +$smarty->assign_by_ref('info', $info); if (isset($_REQUEST["remove"])) { $access->check_authenticity(); $templateslib->remove_template($_REQUEST["remove"]); @@ -219,8 +219,27 @@ $smarty->assign_by_ref('sort_mode', $sort_mode); $channels = $templateslib->list_all_templates($offset, $maxRecords, $sort_mode, $find); $smarty->assign_by_ref('cant_pages', $channels["cant"]); + // wysiwyg decision +$info['is_html'] = $info['section_wiki_html'] === 'y' ? 1 : 0; +$info['wysiwyg'] = $info['section_wiki_html']; include 'lib/setup/editmode.php'; +$info['section_wiki_html'] = $_SESSION['wysiwyg']; //$info['is_html'] ? 'y' : 'n'; + +// Handles switching editor modes +global $editlib; include_once ('lib/wiki/editlib.php'); +if (isset($_REQUEST['mode_normal']) && $_REQUEST['mode_normal']=='y') { + // Parsing page data as first time seeing html page in normal editor + $smarty->assign('msg', "Parsing html to wiki"); + $info['content'] = $editlib->parseToWiki($_REQUEST["content"]); + $smarty->assign('parsed', $parsed); +} elseif (isset($_REQUEST['mode_wysiwyg']) && $_REQUEST['mode_wysiwyg']=='y') { + // Parsing page data as first time seeing wiki page in wysiwyg editor + $smarty->assign('msg', "Parsing wiki to html"); + $info['content'] = $editlib->parseToWysiwyg($_REQUEST["content"]); + $smarty->assign('parsed', $parsed); +} + $smarty->assign_by_ref('channels', $channels["data"]); ask_ticket('admin-content-templates'); global $wikilib; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-04-08 17:00:34
|
Revision: 40832 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40832&view=rev Author: jonnybradley Date: 2012-04-08 17:00:26 +0000 (Sun, 08 Apr 2012) Log Message: ----------- [ENH] sefurl/canonical: Add in missing objects types for canonical links, which necessitated completing some missing sefurl rules (hence partly an enhancement which started out as a fix) Modified Paths: -------------- branches/9.x/_htaccess branches/9.x/lib/smarty_tiki/modifier.sefurl.php branches/9.x/templates/canonical.tpl Added Paths: ----------- branches/9.x/installer/schema/20120408_add_forumthread_sefurl_tiki.sql Modified: branches/9.x/_htaccess =================================================================== --- branches/9.x/_htaccess 2012-04-08 15:47:08 UTC (rev 40831) +++ branches/9.x/_htaccess 2012-04-08 17:00:26 UTC (rev 40832) @@ -173,6 +173,7 @@ RewriteRule ^display([0-9]+)(.*) tiki-download_file.php?fileId=$1&display$2 [QSA,L] RewriteRule ^preview([0-9]+)(.*) tiki-download_file.php?fileId=$1&preview$2 [QSA,L] RewriteRule ^forum([0-9]+)(.*) tiki-view_forum.php?forumId=$1$2 [QSA,L] +RewriteRule ^forumthread([0-9]+)(.*) tiki-view_forum_thread.php?comments_parentId=$1$2 [QSA,L] RewriteRule ^gallery([0-9]+)(.*) tiki-browse_gallery.php?galleryId=$1$2 [QSA,L] RewriteRule ^img([0-9]+)(.*) show_image.php?id=$1$2 [QSA,L] RewriteRule ^image([0-9]+)(.*) show_image.php?id=$1$2 [QSA,L] Added: branches/9.x/installer/schema/20120408_add_forumthread_sefurl_tiki.sql =================================================================== --- branches/9.x/installer/schema/20120408_add_forumthread_sefurl_tiki.sql (rev 0) +++ branches/9.x/installer/schema/20120408_add_forumthread_sefurl_tiki.sql 2012-04-08 17:00:26 UTC (rev 40832) @@ -0,0 +1,2 @@ +INSERT INTO `tiki_sefurl_regex_out` (`left`, `right`, `type`, `feature`, `order`) + VALUES ('tiki-view_forum_thread.php\\?comments_parentId=(\\d+)', 'forumthread$1', 'forumthread', 'feature_forums', '0'); Modified: branches/9.x/lib/smarty_tiki/modifier.sefurl.php =================================================================== --- branches/9.x/lib/smarty_tiki/modifier.sefurl.php 2012-04-08 15:47:08 UTC (rev 40831) +++ branches/9.x/lib/smarty_tiki/modifier.sefurl.php 2012-04-08 17:00:26 UTC (rev 40832) @@ -94,10 +94,15 @@ $href = 'tiki-list_file_gallery.php?galleryId='.$source; break; - case 'forum post': - $href = 'tiki-view_forum_thread.php?comments_parentId='.$source; + case 'forum': + $href = $sefurl ? "forum$source" : 'tiki-view_forum.php?forumId='.$source; break; + case 'forumthread': + case 'forum post': // unused? + $href = $sefurl ? "forumthread$source" : 'tiki-view_forum_thread.php?comments_parentId='.$source; + break; + case 'image': $href = 'tiki-browse_image.php?imageId='.$source; break; Modified: branches/9.x/templates/canonical.tpl =================================================================== --- branches/9.x/templates/canonical.tpl 2012-04-08 15:47:08 UTC (rev 40831) +++ branches/9.x/templates/canonical.tpl 2012-04-08 17:00:26 UTC (rev 40832) @@ -4,11 +4,17 @@ <link rel="canonical" href="{$base_url}{$page|sefurl}" /> {elseif $mid eq 'tiki-view_tracker_item.tpl'} <link rel="canonical" href="{$base_url}{$itemId|sefurl:trackeritem}" /> + {elseif $mid eq 'tiki-view_forum.tpl'} + <link rel="canonical" href="{$base_url}{$forumId|sefurl:forum}" /> {elseif $mid eq 'tiki-view_forum_thread.tpl'} - <link rel="canonical" href="{$base_url}tiki-view_forum_thread.php?comments_parentId={$comments_parentId}" /> + <link rel="canonical" href="{$base_url}{$comments_parentId|sefurl:forumthread}" /> + {elseif $mid eq 'tiki-view_blog.tpl'} + <link rel="canonical" href="{$base_url}{$blogId|sefurl:blog}" /> {elseif $mid eq 'tiki-view_blog_post.tpl'} <link rel="canonical" href="{$base_url}{$postId|sefurl:blogpost}" /> {elseif $mid eq 'tiki-read_article.tpl'} <link rel="canonical" href="{$base_url}{$articleId|sefurl:article}" /> + {elseif $mid eq 'tiki-browse_categories.tpl'} + <link rel="canonical" href="{$base_url}{$parentId|sefurl:category}" /> {/if} {/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-04-08 20:09:45
|
Revision: 40839 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40839&view=rev Author: jonnybradley Date: 2012-04-08 20:09:39 +0000 (Sun, 08 Apr 2012) Log Message: ----------- [FIX] selectmenu: Make menu wider so the text doesn't get covered over by the triangle graphic, improve workaround for creating selectmenus in hidden divs as well as fieldsets and add warning on pref (also another warning on feature_jquery_tablesorter re js minify) Modified Paths: -------------- branches/9.x/lib/jquery_tiki/tiki-jquery.js branches/9.x/lib/prefs/feature.php branches/9.x/lib/prefs/jquery.php branches/9.x/tiki-setup.php Modified: branches/9.x/lib/jquery_tiki/tiki-jquery.js =================================================================== --- branches/9.x/lib/jquery_tiki/tiki-jquery.js 2012-04-08 18:22:20 UTC (rev 40838) +++ branches/9.x/lib/jquery_tiki/tiki-jquery.js 2012-04-08 20:09:39 UTC (rev 40839) @@ -507,7 +507,7 @@ } if ($smenus.length) { $smenus.each ( function () { - $.merge( hidden, $(this).parents("fieldset:hidden:last")); + $.merge( hidden, $(this).parents("fieldset:hidden:last, div:hidden:last")); }); hidden = $.unique($(hidden)); hidden.show(); Modified: branches/9.x/lib/prefs/feature.php =================================================================== --- branches/9.x/lib/prefs/feature.php 2012-04-08 18:22:20 UTC (rev 40838) +++ branches/9.x/lib/prefs/feature.php 2012-04-08 20:09:39 UTC (rev 40839) @@ -1806,6 +1806,7 @@ 'type' => 'flag', 'help' => 'JQuery#TableSorter', 'description' => tra('Sort in fancytable plugin'), + 'warning' => tra('This feature can cause problems with JS minify on some systems.'), 'default' => 'n', // sortable tables ([will] override existing) ), 'feature_jquery_media' => array( Modified: branches/9.x/lib/prefs/jquery.php =================================================================== --- branches/9.x/lib/prefs/jquery.php 2012-04-08 18:22:20 UTC (rev 40838) +++ branches/9.x/lib/prefs/jquery.php 2012-04-08 20:09:39 UTC (rev 40839) @@ -104,6 +104,7 @@ 'type' => 'flag', 'default' => 'n', 'tags' => array('experimental'), + 'warning' => tra('Experimental. This feature is under development.'), 'dependencies' => array( 'jquery_ui_selectmenu', ), Modified: branches/9.x/tiki-setup.php =================================================================== --- branches/9.x/tiki-setup.php 2012-04-08 18:22:20 UTC (rev 40838) +++ branches/9.x/tiki-setup.php 2012-04-08 20:09:39 UTC (rev 40839) @@ -306,9 +306,10 @@ // standard css for selectmenu seems way too big for tiki - to be added to layout.css when not so experimental $headerlib->add_css( '.ui-selectmenu-menu ul li a, .ui-selectmenu-status { white-space: nowrap; } -.ui-selectmenu { height: 1.8em; } +.ui-selectmenu { height: 1.8em; padding-right: 16px; } +.ui-selectmenu-menu ul { padding-right: 16px; } .ui-selectmenu-menu li a,.ui-selectmenu-status { line-height: 1.0em; padding: .4em 1em; } -.ui-selectmenu-status { line-height: .8em; }' +.ui-selectmenu-status { line-height: .8em; margin-right: 16px; }' ); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-04-09 13:06:05
|
Revision: 40842 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40842&view=rev Author: jonnybradley Date: 2012-04-09 13:05:54 +0000 (Mon, 09 Apr 2012) Log Message: ----------- [FIX] Switch theme: Empty values were obscuring site defaults following prefs overhaul (so themegen theme could not be set - thanks Chibaguy!) Modified Paths: -------------- branches/9.x/lib/tikilib.php branches/9.x/tiki-switch_theme.php Modified: branches/9.x/lib/tikilib.php =================================================================== --- branches/9.x/lib/tikilib.php 2012-04-09 11:15:41 UTC (rev 40841) +++ branches/9.x/lib/tikilib.php 2012-04-09 13:05:54 UTC (rev 40842) @@ -3426,6 +3426,7 @@ $prefs['style'] = $value; if ( $value == '' ) { $prefs['style'] = $prefs['site_style']; + $userPreferences->delete(array('user' => $my_user, 'prefName' => $name)); } } elseif ( $name == 'theme-option' && $prefs['change_theme'] == 'y' ) { // FIXME: Remove this exception as well? $prefs['style_option'] = $value; @@ -3433,10 +3434,12 @@ $prefs['style_option'] = $prefs['site_style_option']; } else if ( $value == 'None' ) { $prefs['style_option'] = ''; + $userPreferences->delete(array('user' => $my_user, 'prefName' => $name)); } } elseif ( $value == '' ) { if ( in_array($name, $user_overrider_prefs) ) { $prefs[$name] = $prefs['site_'.$name]; + $userPreferences->delete(array('user' => $my_user, 'prefName' => $name)); } } } Modified: branches/9.x/tiki-switch_theme.php =================================================================== --- branches/9.x/tiki-switch_theme.php 2012-04-09 11:15:41 UTC (rev 40841) +++ branches/9.x/tiki-switch_theme.php 2012-04-09 13:05:54 UTC (rev 40842) @@ -24,11 +24,12 @@ $theme = $_REQUEST['theme']; if (empty($theme)) { - $theme = $prefs['site_style']; - $themeOption = $prefs['site_style_option']; - $themeGenerator_theme = $prefs['site_themegenerator_theme']; + $theme = ''; + $themeOption = ''; + $themeGenerator_theme = ''; } elseif ($theme != $prefs['style']) { // use default theme option when changing main theme $themeOption = ''; + $themeGenerator_theme = ''; } $tikilib->set_user_preference($user, 'theme', $theme); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jon...@us...> - 2012-04-10 20:59:20
|
Revision: 40863 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40863&view=rev Author: jonnybradley Date: 2012-04-10 20:59:13 +0000 (Tue, 10 Apr 2012) Log Message: ----------- [FIX] structures: Restore top level alias form from pre-revamp, not pretty but functional (thanks again Geoff) Modified Paths: -------------- branches/9.x/templates/tiki-edit_structure.tpl branches/9.x/tiki-edit_structure.php Modified: branches/9.x/templates/tiki-edit_structure.tpl =================================================================== --- branches/9.x/templates/tiki-edit_structure.tpl 2012-04-10 20:27:48 UTC (rev 40862) +++ branches/9.x/templates/tiki-edit_structure.tpl 2012-04-10 20:59:13 UTC (rev 40863) @@ -67,12 +67,19 @@ <h2>{tr}Structure Layout{/tr}</h2> {button _text="{tr}Save{/tr}" _style="display:none;" _class="save_structure" _ajax="n" _auto_args="save_structure,page_ref_id"} +{self_link page_ref_id=$structure_id} + {if $structure_id eq $page_ref_id}<strong>{/if} + {tr}Top{/tr} + {if $structure_id eq $page_ref_id}</strong> + {/if} +{/self_link} +<form action="tiki-edit_structure.php" method="post" style="display: inline-block; margin-left: 1em;"> + <input type="hidden" name="page_ref_id" value="{$structure_id}" /> + <label for="pageAlias">{tr}Alias:{/tr}</label></td> + <input type="text" name="pageAlias" id="pageAlias" value="{$topPageAlias}" /> + <small><input type="submit" name="create" value="{tr}Update{/tr}" /></small> +</form> <div class="structure-container"> - {self_link page_ref_id=$structure_id} - {if $structure_id eq $page_ref_id}<strong>{/if} - {tr}Top{/tr} - {if $structure_id eq $page_ref_id}</strong>{/if} - {/self_link} {$nodelist} </div> {button _text="{tr}Save{/tr}" _style="display:none;" _class="save_structure" _ajax="n" _auto_args="save_structure,page_ref_id"} Modified: branches/9.x/tiki-edit_structure.php =================================================================== --- branches/9.x/tiki-edit_structure.php 2012-04-10 20:27:48 UTC (rev 40862) +++ branches/9.x/tiki-edit_structure.php 2012-04-10 20:59:13 UTC (rev 40863) @@ -194,6 +194,7 @@ $page_info = $structlib->s_get_page_info($_REQUEST["page_ref_id"]); $smarty->assign('pageName', $page_info["pageName"]); $smarty->assign('pageAlias', $page_info["page_alias"]); +$smarty->assign('topPageAlias', $structure_info["page_alias"]); $subpages = $structlib->s_get_pages($_REQUEST["page_ref_id"]); $max = count($subpages); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rob...@us...> - 2012-04-10 21:36:44
|
Revision: 40866 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev Author: robertplummer Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) Log Message: ----------- [NEW] Some much needed prefs for lucene search to help make it more controllable, from jonnyb Modified Paths: -------------- branches/9.x/lib/core/Search/Index/Lucene.php branches/9.x/lib/prefs/unified.php branches/9.x/templates/admin/include_search.tpl Modified: branches/9.x/lib/core/Search/Index/Lucene.php =================================================================== --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 21:26:17 UTC (rev 40865) +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 21:36:38 UTC (rev 40866) @@ -40,10 +40,16 @@ } catch (Zend_Search_Lucene_Exception $e) { $this->lucene = Zend_Search_Lucene::create($this->directory); } - - $this->lucene->setMaxBufferedDocs(100); - $this->lucene->setMaxMergeDocs(5000); - $this->lucene->setMergeFactor(50); + global $prefs; + if (!empty($prefs['unified_lucene_max_buffered_docs'])) { // these break indexing if set empty + $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); // default is 10 + } + if (!empty($prefs['unified_lucene_max_merge_docs'])) { + $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); // default is PHP_INT_MAX (effectively "infinite") + } + if (!empty($prefs['unified_lucene_merge_factor'])) { + $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); // default is 10 + } $this->lucene->setResultSetLimit($this->resultSetLimit); return $this->lucene; Modified: branches/9.x/lib/prefs/unified.php =================================================================== --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev 40865) +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev 40866) @@ -40,8 +40,8 @@ ), 'unified_lucene_max_resultset_limit' => array( 'name' => tra('Lucene Maximum Result Set Limit'), - 'description' => tra('Maximum size of result set to consider. Default 1000, 0 = unlimited.'), - 'hint' => tra('This is used when calculating result scores and sort order which can lead to out of memory errors on large data sets. The default of 1000 is safe with the PHP memory_limit set to 128M'), + 'hint' => tra('Maximum size of result set to consider. Default 1000, 0 = unlimited.'), + 'description' => tra('This is used when calculating result scores and sort order which can lead to out of memory errors on large data sets. The default of 1000 is safe with the PHP memory_limit set to 128M'), 'type' => 'text', 'filter' => 'int', 'default' => 1000, @@ -55,6 +55,33 @@ 'default' => 1024, 'size' => 6, ), + 'unified_lucene_max_buffered_docs' => array( + 'name' => tra('Lucene Max Buffered Documents'), + 'description' => tra('Number of documents required before the buffered in-memory documents are written into a new segment.'), + 'hint' => tra(''), + 'type' => 'text', + 'filter' => 'int', + 'default' => 10, + 'size' => 6, + ), + 'unified_lucene_max_merge_docs' => array( + 'name' => tra('Lucene Max Merge Documents'), + 'description' => tra('Largest number of documents ever merged by addDocument(). Small values (e.g., less than 10,000) are best for interactive indexing, as this limits the length of pauses while indexing to a few seconds. Larger values are best for batched indexing and speedier searches.'), + 'hint' => tra('Small values (e.g., less than 10,000) are best for interactive indexing. Use 0 for the Lucene default, which is practically infinite.'), + 'type' => 'text', + 'filter' => 'int', + 'default' => 0, + 'size' => 8, + ), + 'unified_lucene_merge_factor' => array( + 'name' => tra('Lucene Merge Factor'), + 'description' => tra('How often segment indices are merged by addDocument(). With smaller values, less RAM is used while indexing, and searches on unoptimized indices are faster, but indexing speed is slower. With larger values, more RAM is used during indexing, and while searches on unoptimized indices are slower, indexing is faster. Thus larger values (> 10) are best for batch index creation, and smaller values (< 10) for indices that are interactively maintained.'), + 'hint' => tra('Large values (> 10) are best for batch index creation, and smaller values (< 10) for indices that are interactively maintained.'), + 'type' => 'text', + 'filter' => 'int', + 'default' => 10, + 'size' => 6, + ), 'unified_incremental_update' => array( 'name' => tra('Incremental Index Update'), 'description' => tra('Update the index incrementally as the site content is modified. This may lead to lower performance and accuracy than processing the index on a periodic basis.'), Modified: branches/9.x/templates/admin/include_search.tpl =================================================================== --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 21:26:17 UTC (rev 40865) +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 21:36:38 UTC (rev 40866) @@ -22,14 +22,20 @@ {preference name=feature_search visible="always"} <div class="adminoptionboxchild" id="feature_search_childcontainer"> - {preference name="unified_incremental_update"} {preference name="unified_engine"} <div class="adminoptionboxchild unified_engine_childcontainer lucene"> + {preference name="unified_incremental_update"} + {preference name="unified_lucene_highlight"} {preference name="unified_lucene_location"} - {preference name="unified_lucene_highlight"} - {preference name="unified_lucene_max_result"} - {preference name="unified_lucene_max_resultset_limit"} - {preference name="unified_lucene_terms_limit"} + <fieldset> + <legend>{tr}Search Engine Settings{/tr}</legend> + {preference name="unified_lucene_max_result"} + {preference name="unified_lucene_max_resultset_limit"} + {preference name="unified_lucene_terms_limit"} + {preference name="unified_lucene_max_buffered_docs"} + {preference name="unified_lucene_max_merge_docs"} + {preference name="unified_lucene_merge_factor"} + </fieldset> </div> {preference name=unified_forum_deepindexing} @@ -48,7 +54,19 @@ <ul> <li><a href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> <li> - <a href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> + <a href="tiki-admin.php?page=search&rebuild=now" id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> + <label for="log-rebuild">{tr}Log rebuild?{/tr}</label> + <input type="checkbox" id="log-rebuild" /> + <span class="description">{tr}Log file is saved as temp/Search_Indexer.log{/tr}</span> + {jq} +$("#log-rebuild").click(function(){ + if ($(this).prop("checked")) { + $("#rebuild-link").attr("href", $("#rebuild-link").attr("href") + "&loggit"); + } else { + $("#rebuild-link").attr("href", $("#rebuild-link").attr("href").replace("&loggit","")); + } +}); + {/jq} {if !empty($stat)} {remarksbox type='feedback' title="{tr}Indexation{/tr}"} <ul> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Marc L. <ma...@ma...> - 2012-04-11 01:42:52
|
awesome! I hope doc.tiki.org and dev.tiki.org can complete index rebuilding with these new preferences! On 2012-04-10 5:37 PM, <rob...@us...> wrote: > Revision: 40866 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev > Author: robertplummer > Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) > Log Message: > ----------- > [NEW] Some much needed prefs for lucene search to help make it more > controllable, from jonnyb > > Modified Paths: > -------------- > branches/9.x/lib/core/Search/Index/Lucene.php > branches/9.x/lib/prefs/unified.php > branches/9.x/templates/admin/include_search.tpl > > Modified: branches/9.x/lib/core/Search/Index/Lucene.php > =================================================================== > --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 > 21:26:17 UTC (rev 40865) > +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 > 21:36:38 UTC (rev 40866) > @@ -40,10 +40,16 @@ > } catch (Zend_Search_Lucene_Exception $e) { > $this->lucene = > Zend_Search_Lucene::create($this->directory); > } > - > - $this->lucene->setMaxBufferedDocs(100); > - $this->lucene->setMaxMergeDocs(5000); > - $this->lucene->setMergeFactor(50); > + global $prefs; > + if (!empty($prefs['unified_lucene_max_buffered_docs'])) { > // these break > indexing if set empty > + > $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); > // default is 10 > + } > + if (!empty($prefs['unified_lucene_max_merge_docs'])) { > + > $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); > // default is PHP_INT_MAX (effectively "infinite") > + } > + if (!empty($prefs['unified_lucene_merge_factor'])) { > + > $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); > // default is 10 > + } > $this->lucene->setResultSetLimit($this->resultSetLimit); > > return $this->lucene; > > Modified: branches/9.x/lib/prefs/unified.php > =================================================================== > --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev 40865) > +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev 40866) > @@ -40,8 +40,8 @@ > ), > 'unified_lucene_max_resultset_limit' => array( > 'name' => tra('Lucene Maximum Result Set Limit'), > - 'description' => tra('Maximum size of result set > to consider. Default 1000, 0 = unlimited.'), > - 'hint' => tra('This is used when calculating > result scores and sort order which can lead to out of memory errors on > large data sets. The default of 1000 is safe with the PHP memory_limit set > to 128M'), > + 'hint' => tra('Maximum size of result set to > consider. Default 1000, 0 = unlimited.'), > + 'description' => tra('This is used when > calculating result scores and sort order which can lead to out of memory > errors on large data sets. The default of 1000 is safe with the PHP > memory_limit set to 128M'), > 'type' => 'text', > 'filter' => 'int', > 'default' => 1000, > @@ -55,6 +55,33 @@ > 'default' => 1024, > 'size' => 6, > ), > + 'unified_lucene_max_buffered_docs' => array( > + 'name' => tra('Lucene Max Buffered Documents'), > + 'description' => tra('Number of documents required > before the buffered in-memory documents are written into a new segment.'), > + 'hint' => tra(''), > + 'type' => 'text', > + 'filter' => 'int', > + 'default' => 10, > + 'size' => 6, > + ), > + 'unified_lucene_max_merge_docs' => array( > + 'name' => tra('Lucene Max Merge Documents'), > + 'description' => tra('Largest number of documents > ever merged by addDocument(). Small values (e.g., less than 10,000) are > best for interactive indexing, as this limits the length of pauses while > indexing to a few seconds. Larger values are best for batched indexing and > speedier searches.'), > + 'hint' => tra('Small values (e.g., less than > 10,000) are best for interactive indexing. Use 0 for the Lucene default, > which is practically infinite.'), > + 'type' => 'text', > + 'filter' => 'int', > + 'default' => 0, > + 'size' => 8, > + ), > + 'unified_lucene_merge_factor' => array( > + 'name' => tra('Lucene Merge Factor'), > + 'description' => tra('How often segment indices > are merged by addDocument(). With smaller values, less RAM is used while > indexing, and searches on unoptimized indices are faster, but indexing > speed is slower. With larger values, more RAM is used during indexing, and > while searches on unoptimized indices are slower, indexing is faster. Thus > larger values (> 10) are best for batch index creation, and smaller values > (< 10) for indices that are interactively maintained.'), > + 'hint' => tra('Large values (> 10) are best for > batch index creation, and smaller values (< 10) for indices that are > interactively maintained.'), > + 'type' => 'text', > + 'filter' => 'int', > + 'default' => 10, > + 'size' => 6, > + ), > 'unified_incremental_update' => array( > 'name' => tra('Incremental Index Update'), > 'description' => tra('Update the index > incrementally as the site content is modified. This may lead to lower > performance and accuracy than processing the index on a periodic basis.'), > > Modified: branches/9.x/templates/admin/include_search.tpl > =================================================================== > --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 > 21:26:17 UTC (rev 40865) > +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 > 21:36:38 UTC (rev 40866) > @@ -22,14 +22,20 @@ > > {preference name=feature_search > visible="always"} > <div class="adminoptionboxchild" > id="feature_search_childcontainer"> > - {preference > name="unified_incremental_update"} > {preference name="unified_engine"} > <div class="adminoptionboxchild > unified_engine_childcontainer lucene"> > + {preference > name="unified_incremental_update"} > + {preference > name="unified_lucene_highlight"} > {preference > name="unified_lucene_location"} > - {preference > name="unified_lucene_highlight"} > - {preference > name="unified_lucene_max_result"} > - {preference > name="unified_lucene_max_resultset_limit"} > - {preference > name="unified_lucene_terms_limit"} > + <fieldset> > + <legend>{tr}Search > Engine Settings{/tr}</legend> > + {preference > name="unified_lucene_max_result"} > + {preference > name="unified_lucene_max_resultset_limit"} > + {preference > name="unified_lucene_terms_limit"} > + {preference > name="unified_lucene_max_buffered_docs"} > + {preference > name="unified_lucene_max_merge_docs"} > + {preference > name="unified_lucene_merge_factor"} > + </fieldset> > </div> > > {preference > name=unified_forum_deepindexing} > @@ -48,7 +54,19 @@ > <ul> > <li><a > href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> > <li> > - <a > href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> > + <a > href="tiki-admin.php?page=search&rebuild=now" > id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> > + <label > for="log-rebuild">{tr}Log rebuild?{/tr}</label> > + <input > type="checkbox" id="log-rebuild" /> > + <span > class="description">{tr}Log file is saved as > temp/Search_Indexer.log{/tr}</span> > + {jq} > +$("#log-rebuild").click(function(){ > + if ($(this).prop("checked")) { > + $("#rebuild-link").attr("href", > $("#rebuild-link").attr("href") + "&loggit"); > + } else { > + $("#rebuild-link").attr("href", > $("#rebuild-link").attr("href").replace("&loggit","")); > + } > +}); > + {/jq} > {if !empty($stat)} > {remarksbox > type='feedback' title="{tr}Indexation{/tr}"} > <ul> > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > > ------------------------------------------------------------------------------ > Better than sec? Nothing is better than sec when it comes to > monitoring Big Data applications. Try Boundary one-second > resolution app monitoring today. Free. > http://p.sf.net/sfu/Boundary-dev2dev > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Robert P. <rob...@gm...> - 2012-04-11 14:08:05
|
I'm not sure why, but before rebuilding indexes on my site took about 1 to 3 min. Now it takes just a few seconds, I wonder why..... On Apr 10, 2012 9:42 PM, "Marc Laporte" <ma...@ma...> wrote: > awesome! > > I hope doc.tiki.org and dev.tiki.org can complete index rebuilding with > these new preferences! > On 2012-04-10 5:37 PM, <rob...@us...> wrote: > >> Revision: 40866 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev >> Author: robertplummer >> Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) >> Log Message: >> ----------- >> [NEW] Some much needed prefs for lucene search to help make it more >> controllable, from jonnyb >> >> Modified Paths: >> -------------- >> branches/9.x/lib/core/Search/Index/Lucene.php >> branches/9.x/lib/prefs/unified.php >> branches/9.x/templates/admin/include_search.tpl >> >> Modified: branches/9.x/lib/core/Search/Index/Lucene.php >> =================================================================== >> --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >> 21:26:17 UTC (rev 40865) >> +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >> 21:36:38 UTC (rev 40866) >> @@ -40,10 +40,16 @@ >> } catch (Zend_Search_Lucene_Exception $e) { >> $this->lucene = >> Zend_Search_Lucene::create($this->directory); >> } >> - >> - $this->lucene->setMaxBufferedDocs(100); >> - $this->lucene->setMaxMergeDocs(5000); >> - $this->lucene->setMergeFactor(50); >> + global $prefs; >> + if (!empty($prefs['unified_lucene_max_buffered_docs'])) { >> // these break >> indexing if set empty >> + >> $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); >> // default is 10 >> + } >> + if (!empty($prefs['unified_lucene_max_merge_docs'])) { >> + >> $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); >> // default is PHP_INT_MAX (effectively "infinite") >> + } >> + if (!empty($prefs['unified_lucene_merge_factor'])) { >> + >> $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); >> // default is 10 >> + } >> $this->lucene->setResultSetLimit($this->resultSetLimit); >> >> return $this->lucene; >> >> Modified: branches/9.x/lib/prefs/unified.php >> =================================================================== >> --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev >> 40865) >> +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev >> 40866) >> @@ -40,8 +40,8 @@ >> ), >> 'unified_lucene_max_resultset_limit' => array( >> 'name' => tra('Lucene Maximum Result Set Limit'), >> - 'description' => tra('Maximum size of result set >> to consider. Default 1000, 0 = unlimited.'), >> - 'hint' => tra('This is used when calculating >> result scores and sort order which can lead to out of memory errors on >> large data sets. The default of 1000 is safe with the PHP memory_limit set >> to 128M'), >> + 'hint' => tra('Maximum size of result set to >> consider. Default 1000, 0 = unlimited.'), >> + 'description' => tra('This is used when >> calculating result scores and sort order which can lead to out of memory >> errors on large data sets. The default of 1000 is safe with the PHP >> memory_limit set to 128M'), >> 'type' => 'text', >> 'filter' => 'int', >> 'default' => 1000, >> @@ -55,6 +55,33 @@ >> 'default' => 1024, >> 'size' => 6, >> ), >> + 'unified_lucene_max_buffered_docs' => array( >> + 'name' => tra('Lucene Max Buffered Documents'), >> + 'description' => tra('Number of documents >> required before the buffered in-memory documents are written into a new >> segment.'), >> + 'hint' => tra(''), >> + 'type' => 'text', >> + 'filter' => 'int', >> + 'default' => 10, >> + 'size' => 6, >> + ), >> + 'unified_lucene_max_merge_docs' => array( >> + 'name' => tra('Lucene Max Merge Documents'), >> + 'description' => tra('Largest number of documents >> ever merged by addDocument(). Small values (e.g., less than 10,000) are >> best for interactive indexing, as this limits the length of pauses while >> indexing to a few seconds. Larger values are best for batched indexing and >> speedier searches.'), >> + 'hint' => tra('Small values (e.g., less than >> 10,000) are best for interactive indexing. Use 0 for the Lucene default, >> which is practically infinite.'), >> + 'type' => 'text', >> + 'filter' => 'int', >> + 'default' => 0, >> + 'size' => 8, >> + ), >> + 'unified_lucene_merge_factor' => array( >> + 'name' => tra('Lucene Merge Factor'), >> + 'description' => tra('How often segment indices >> are merged by addDocument(). With smaller values, less RAM is used while >> indexing, and searches on unoptimized indices are faster, but indexing >> speed is slower. With larger values, more RAM is used during indexing, and >> while searches on unoptimized indices are slower, indexing is faster. Thus >> larger values (> 10) are best for batch index creation, and smaller values >> (< 10) for indices that are interactively maintained.'), >> + 'hint' => tra('Large values (> 10) are best for >> batch index creation, and smaller values (< 10) for indices that are >> interactively maintained.'), >> + 'type' => 'text', >> + 'filter' => 'int', >> + 'default' => 10, >> + 'size' => 6, >> + ), >> 'unified_incremental_update' => array( >> 'name' => tra('Incremental Index Update'), >> 'description' => tra('Update the index >> incrementally as the site content is modified. This may lead to lower >> performance and accuracy than processing the index on a periodic basis.'), >> >> Modified: branches/9.x/templates/admin/include_search.tpl >> =================================================================== >> --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 >> 21:26:17 UTC (rev 40865) >> +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 >> 21:36:38 UTC (rev 40866) >> @@ -22,14 +22,20 @@ >> >> {preference name=feature_search >> visible="always"} >> <div class="adminoptionboxchild" >> id="feature_search_childcontainer"> >> - {preference >> name="unified_incremental_update"} >> {preference name="unified_engine"} >> <div class="adminoptionboxchild >> unified_engine_childcontainer lucene"> >> + {preference >> name="unified_incremental_update"} >> + {preference >> name="unified_lucene_highlight"} >> {preference >> name="unified_lucene_location"} >> - {preference >> name="unified_lucene_highlight"} >> - {preference >> name="unified_lucene_max_result"} >> - {preference >> name="unified_lucene_max_resultset_limit"} >> - {preference >> name="unified_lucene_terms_limit"} >> + <fieldset> >> + >> <legend>{tr}Search Engine Settings{/tr}</legend> >> + {preference >> name="unified_lucene_max_result"} >> + {preference >> name="unified_lucene_max_resultset_limit"} >> + {preference >> name="unified_lucene_terms_limit"} >> + {preference >> name="unified_lucene_max_buffered_docs"} >> + {preference >> name="unified_lucene_max_merge_docs"} >> + {preference >> name="unified_lucene_merge_factor"} >> + </fieldset> >> </div> >> >> {preference >> name=unified_forum_deepindexing} >> @@ -48,7 +54,19 @@ >> <ul> >> <li><a >> href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> >> <li> >> - <a >> href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> >> + <a >> href="tiki-admin.php?page=search&rebuild=now" >> id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> >> + <label >> for="log-rebuild">{tr}Log rebuild?{/tr}</label> >> + <input >> type="checkbox" id="log-rebuild" /> >> + <span >> class="description">{tr}Log file is saved as >> temp/Search_Indexer.log{/tr}</span> >> + {jq} >> +$("#log-rebuild").click(function(){ >> + if ($(this).prop("checked")) { >> + $("#rebuild-link").attr("href", >> $("#rebuild-link").attr("href") + "&loggit"); >> + } else { >> + $("#rebuild-link").attr("href", >> $("#rebuild-link").attr("href").replace("&loggit","")); >> + } >> +}); >> + {/jq} >> {if !empty($stat)} >> >> {remarksbox type='feedback' title="{tr}Indexation{/tr}"} >> >> <ul> >> >> This was sent by the SourceForge.net collaborative development platform, >> the world's largest Open Source development site. >> >> >> >> ------------------------------------------------------------------------------ >> Better than sec? Nothing is better than sec when it comes to >> monitoring Big Data applications. Try Boundary one-second >> resolution app monitoring today. Free. >> http://p.sf.net/sfu/Boundary-dev2dev >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> > > > ------------------------------------------------------------------------------ > Better than sec? Nothing is better than sec when it comes to > monitoring Big Data applications. Try Boundary one-second > resolution app monitoring today. Free. > http://p.sf.net/sfu/Boundary-dev2dev > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > |
From: Marc L. <ma...@ma...> - 2012-04-11 20:50:00
|
Makes you wonder if it worked! :-) On 2012-04-11 10:08 AM, "Robert Plummer" <rob...@gm...> wrote: > I'm not sure why, but before rebuilding indexes on my site took about 1 to > 3 min. Now it takes just a few seconds, I wonder why..... > On Apr 10, 2012 9:42 PM, "Marc Laporte" <ma...@ma...> wrote: > >> awesome! >> >> I hope doc.tiki.org and dev.tiki.org can complete index rebuilding with >> these new preferences! >> On 2012-04-10 5:37 PM, <rob...@us...> wrote: >> >>> Revision: 40866 >>> >>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev >>> Author: robertplummer >>> Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) >>> Log Message: >>> ----------- >>> [NEW] Some much needed prefs for lucene search to help make it more >>> controllable, from jonnyb >>> >>> Modified Paths: >>> -------------- >>> branches/9.x/lib/core/Search/Index/Lucene.php >>> branches/9.x/lib/prefs/unified.php >>> branches/9.x/templates/admin/include_search.tpl >>> >>> Modified: branches/9.x/lib/core/Search/Index/Lucene.php >>> =================================================================== >>> --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >>> 21:26:17 UTC (rev 40865) >>> +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >>> 21:36:38 UTC (rev 40866) >>> @@ -40,10 +40,16 @@ >>> } catch (Zend_Search_Lucene_Exception $e) { >>> $this->lucene = >>> Zend_Search_Lucene::create($this->directory); >>> } >>> - >>> - $this->lucene->setMaxBufferedDocs(100); >>> - $this->lucene->setMaxMergeDocs(5000); >>> - $this->lucene->setMergeFactor(50); >>> + global $prefs; >>> + if (!empty($prefs['unified_lucene_max_buffered_docs'])) >>> { // these break >>> indexing if set empty >>> + >>> $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); >>> // default is 10 >>> + } >>> + if (!empty($prefs['unified_lucene_max_merge_docs'])) { >>> + >>> $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); >>> // default is PHP_INT_MAX (effectively "infinite") >>> + } >>> + if (!empty($prefs['unified_lucene_merge_factor'])) { >>> + >>> $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); >>> // default is 10 >>> + } >>> $this->lucene->setResultSetLimit($this->resultSetLimit); >>> >>> return $this->lucene; >>> >>> Modified: branches/9.x/lib/prefs/unified.php >>> =================================================================== >>> --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev >>> 40865) >>> +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev >>> 40866) >>> @@ -40,8 +40,8 @@ >>> ), >>> 'unified_lucene_max_resultset_limit' => array( >>> 'name' => tra('Lucene Maximum Result Set Limit'), >>> - 'description' => tra('Maximum size of result set >>> to consider. Default 1000, 0 = unlimited.'), >>> - 'hint' => tra('This is used when calculating >>> result scores and sort order which can lead to out of memory errors on >>> large data sets. The default of 1000 is safe with the PHP memory_limit set >>> to 128M'), >>> + 'hint' => tra('Maximum size of result set to >>> consider. Default 1000, 0 = unlimited.'), >>> + 'description' => tra('This is used when >>> calculating result scores and sort order which can lead to out of memory >>> errors on large data sets. The default of 1000 is safe with the PHP >>> memory_limit set to 128M'), >>> 'type' => 'text', >>> 'filter' => 'int', >>> 'default' => 1000, >>> @@ -55,6 +55,33 @@ >>> 'default' => 1024, >>> 'size' => 6, >>> ), >>> + 'unified_lucene_max_buffered_docs' => array( >>> + 'name' => tra('Lucene Max Buffered Documents'), >>> + 'description' => tra('Number of documents >>> required before the buffered in-memory documents are written into a new >>> segment.'), >>> + 'hint' => tra(''), >>> + 'type' => 'text', >>> + 'filter' => 'int', >>> + 'default' => 10, >>> + 'size' => 6, >>> + ), >>> + 'unified_lucene_max_merge_docs' => array( >>> + 'name' => tra('Lucene Max Merge Documents'), >>> + 'description' => tra('Largest number of >>> documents ever merged by addDocument(). Small values (e.g., less than >>> 10,000) are best for interactive indexing, as this limits the length of >>> pauses while indexing to a few seconds. Larger values are best for batched >>> indexing and speedier searches.'), >>> + 'hint' => tra('Small values (e.g., less than >>> 10,000) are best for interactive indexing. Use 0 for the Lucene default, >>> which is practically infinite.'), >>> + 'type' => 'text', >>> + 'filter' => 'int', >>> + 'default' => 0, >>> + 'size' => 8, >>> + ), >>> + 'unified_lucene_merge_factor' => array( >>> + 'name' => tra('Lucene Merge Factor'), >>> + 'description' => tra('How often segment indices >>> are merged by addDocument(). With smaller values, less RAM is used while >>> indexing, and searches on unoptimized indices are faster, but indexing >>> speed is slower. With larger values, more RAM is used during indexing, and >>> while searches on unoptimized indices are slower, indexing is faster. Thus >>> larger values (> 10) are best for batch index creation, and smaller values >>> (< 10) for indices that are interactively maintained.'), >>> + 'hint' => tra('Large values (> 10) are best for >>> batch index creation, and smaller values (< 10) for indices that are >>> interactively maintained.'), >>> + 'type' => 'text', >>> + 'filter' => 'int', >>> + 'default' => 10, >>> + 'size' => 6, >>> + ), >>> 'unified_incremental_update' => array( >>> 'name' => tra('Incremental Index Update'), >>> 'description' => tra('Update the index >>> incrementally as the site content is modified. This may lead to lower >>> performance and accuracy than processing the index on a periodic basis.'), >>> >>> Modified: branches/9.x/templates/admin/include_search.tpl >>> =================================================================== >>> --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 >>> 21:26:17 UTC (rev 40865) >>> +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 >>> 21:36:38 UTC (rev 40866) >>> @@ -22,14 +22,20 @@ >>> >>> {preference name=feature_search >>> visible="always"} >>> <div class="adminoptionboxchild" >>> id="feature_search_childcontainer"> >>> - {preference >>> name="unified_incremental_update"} >>> {preference name="unified_engine"} >>> <div class="adminoptionboxchild >>> unified_engine_childcontainer lucene"> >>> + {preference >>> name="unified_incremental_update"} >>> + {preference >>> name="unified_lucene_highlight"} >>> {preference >>> name="unified_lucene_location"} >>> - {preference >>> name="unified_lucene_highlight"} >>> - {preference >>> name="unified_lucene_max_result"} >>> - {preference >>> name="unified_lucene_max_resultset_limit"} >>> - {preference >>> name="unified_lucene_terms_limit"} >>> + <fieldset> >>> + >>> <legend>{tr}Search Engine Settings{/tr}</legend> >>> + {preference >>> name="unified_lucene_max_result"} >>> + {preference >>> name="unified_lucene_max_resultset_limit"} >>> + {preference >>> name="unified_lucene_terms_limit"} >>> + {preference >>> name="unified_lucene_max_buffered_docs"} >>> + {preference >>> name="unified_lucene_max_merge_docs"} >>> + {preference >>> name="unified_lucene_merge_factor"} >>> + </fieldset> >>> </div> >>> >>> {preference >>> name=unified_forum_deepindexing} >>> @@ -48,7 +54,19 @@ >>> <ul> >>> <li><a >>> href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> >>> <li> >>> - <a >>> href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> >>> + <a >>> href="tiki-admin.php?page=search&rebuild=now" >>> id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> >>> + <label >>> for="log-rebuild">{tr}Log rebuild?{/tr}</label> >>> + <input >>> type="checkbox" id="log-rebuild" /> >>> + <span >>> class="description">{tr}Log file is saved as >>> temp/Search_Indexer.log{/tr}</span> >>> + {jq} >>> +$("#log-rebuild").click(function(){ >>> + if ($(this).prop("checked")) { >>> + $("#rebuild-link").attr("href", >>> $("#rebuild-link").attr("href") + "&loggit"); >>> + } else { >>> + $("#rebuild-link").attr("href", >>> $("#rebuild-link").attr("href").replace("&loggit","")); >>> + } >>> +}); >>> + {/jq} >>> {if !empty($stat)} >>> >>> {remarksbox type='feedback' title="{tr}Indexation{/tr}"} >>> >>> <ul> >>> >>> This was sent by the SourceForge.net collaborative development platform, >>> the world's largest Open Source development site. >>> >>> >>> >>> ------------------------------------------------------------------------------ >>> Better than sec? Nothing is better than sec when it comes to >>> monitoring Big Data applications. Try Boundary one-second >>> resolution app monitoring today. Free. >>> http://p.sf.net/sfu/Boundary-dev2dev >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tik...@li... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> >> >> >> ------------------------------------------------------------------------------ >> Better than sec? Nothing is better than sec when it comes to >> monitoring Big Data applications. Try Boundary one-second >> resolution app monitoring today. Free. >> http://p.sf.net/sfu/Boundary-dev2dev >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> >> > > ------------------------------------------------------------------------------ > Better than sec? Nothing is better than sec when it comes to > monitoring Big Data applications. Try Boundary one-second > resolution app monitoring today. Free. > http://p.sf.net/sfu/Boundary-dev2dev > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > |
From: Robert P. <rob...@gm...> - 2012-04-12 03:47:30
|
I did a few searches, it worked. In fact I had integrated lucene in the past in c# and it only took a few seconds for small indexes, so I wondered why 3 pages and a tracker with 1 item would take so long. Now it works like I thought it should. I will double check in the morning. On Apr 11, 2012 4:50 PM, "Marc Laporte" <ma...@ma...> wrote: > Makes you wonder if it worked! :-) > On 2012-04-11 10:08 AM, "Robert Plummer" <rob...@gm...> > wrote: > >> I'm not sure why, but before rebuilding indexes on my site took about 1 >> to 3 min. Now it takes just a few seconds, I wonder why..... >> On Apr 10, 2012 9:42 PM, "Marc Laporte" <ma...@ma...> wrote: >> >>> awesome! >>> >>> I hope doc.tiki.org and dev.tiki.org can complete index rebuilding with >>> these new preferences! >>> On 2012-04-10 5:37 PM, <rob...@us...> wrote: >>> >>>> Revision: 40866 >>>> >>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev >>>> Author: robertplummer >>>> Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) >>>> Log Message: >>>> ----------- >>>> [NEW] Some much needed prefs for lucene search to help make it more >>>> controllable, from jonnyb >>>> >>>> Modified Paths: >>>> -------------- >>>> branches/9.x/lib/core/Search/Index/Lucene.php >>>> branches/9.x/lib/prefs/unified.php >>>> branches/9.x/templates/admin/include_search.tpl >>>> >>>> Modified: branches/9.x/lib/core/Search/Index/Lucene.php >>>> =================================================================== >>>> --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >>>> 21:26:17 UTC (rev 40865) >>>> +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >>>> 21:36:38 UTC (rev 40866) >>>> @@ -40,10 +40,16 @@ >>>> } catch (Zend_Search_Lucene_Exception $e) { >>>> $this->lucene = >>>> Zend_Search_Lucene::create($this->directory); >>>> } >>>> - >>>> - $this->lucene->setMaxBufferedDocs(100); >>>> - $this->lucene->setMaxMergeDocs(5000); >>>> - $this->lucene->setMergeFactor(50); >>>> + global $prefs; >>>> + if (!empty($prefs['unified_lucene_max_buffered_docs'])) >>>> { // these break >>>> indexing if set empty >>>> + >>>> $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); >>>> // default is 10 >>>> + } >>>> + if (!empty($prefs['unified_lucene_max_merge_docs'])) { >>>> + >>>> $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); >>>> // default is PHP_INT_MAX (effectively "infinite") >>>> + } >>>> + if (!empty($prefs['unified_lucene_merge_factor'])) { >>>> + >>>> $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); >>>> // default is 10 >>>> + } >>>> $this->lucene->setResultSetLimit($this->resultSetLimit); >>>> >>>> return $this->lucene; >>>> >>>> Modified: branches/9.x/lib/prefs/unified.php >>>> =================================================================== >>>> --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev >>>> 40865) >>>> +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev >>>> 40866) >>>> @@ -40,8 +40,8 @@ >>>> ), >>>> 'unified_lucene_max_resultset_limit' => array( >>>> 'name' => tra('Lucene Maximum Result Set Limit'), >>>> - 'description' => tra('Maximum size of result >>>> set to consider. Default 1000, 0 = unlimited.'), >>>> - 'hint' => tra('This is used when calculating >>>> result scores and sort order which can lead to out of memory errors on >>>> large data sets. The default of 1000 is safe with the PHP memory_limit set >>>> to 128M'), >>>> + 'hint' => tra('Maximum size of result set to >>>> consider. Default 1000, 0 = unlimited.'), >>>> + 'description' => tra('This is used when >>>> calculating result scores and sort order which can lead to out of memory >>>> errors on large data sets. The default of 1000 is safe with the PHP >>>> memory_limit set to 128M'), >>>> 'type' => 'text', >>>> 'filter' => 'int', >>>> 'default' => 1000, >>>> @@ -55,6 +55,33 @@ >>>> 'default' => 1024, >>>> 'size' => 6, >>>> ), >>>> + 'unified_lucene_max_buffered_docs' => array( >>>> + 'name' => tra('Lucene Max Buffered Documents'), >>>> + 'description' => tra('Number of documents >>>> required before the buffered in-memory documents are written into a new >>>> segment.'), >>>> + 'hint' => tra(''), >>>> + 'type' => 'text', >>>> + 'filter' => 'int', >>>> + 'default' => 10, >>>> + 'size' => 6, >>>> + ), >>>> + 'unified_lucene_max_merge_docs' => array( >>>> + 'name' => tra('Lucene Max Merge Documents'), >>>> + 'description' => tra('Largest number of >>>> documents ever merged by addDocument(). Small values (e.g., less than >>>> 10,000) are best for interactive indexing, as this limits the length of >>>> pauses while indexing to a few seconds. Larger values are best for batched >>>> indexing and speedier searches.'), >>>> + 'hint' => tra('Small values (e.g., less than >>>> 10,000) are best for interactive indexing. Use 0 for the Lucene default, >>>> which is practically infinite.'), >>>> + 'type' => 'text', >>>> + 'filter' => 'int', >>>> + 'default' => 0, >>>> + 'size' => 8, >>>> + ), >>>> + 'unified_lucene_merge_factor' => array( >>>> + 'name' => tra('Lucene Merge Factor'), >>>> + 'description' => tra('How often segment indices >>>> are merged by addDocument(). With smaller values, less RAM is used while >>>> indexing, and searches on unoptimized indices are faster, but indexing >>>> speed is slower. With larger values, more RAM is used during indexing, and >>>> while searches on unoptimized indices are slower, indexing is faster. Thus >>>> larger values (> 10) are best for batch index creation, and smaller values >>>> (< 10) for indices that are interactively maintained.'), >>>> + 'hint' => tra('Large values (> 10) are best for >>>> batch index creation, and smaller values (< 10) for indices that are >>>> interactively maintained.'), >>>> + 'type' => 'text', >>>> + 'filter' => 'int', >>>> + 'default' => 10, >>>> + 'size' => 6, >>>> + ), >>>> 'unified_incremental_update' => array( >>>> 'name' => tra('Incremental Index Update'), >>>> 'description' => tra('Update the index >>>> incrementally as the site content is modified. This may lead to lower >>>> performance and accuracy than processing the index on a periodic basis.'), >>>> >>>> Modified: branches/9.x/templates/admin/include_search.tpl >>>> =================================================================== >>>> --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 >>>> 21:26:17 UTC (rev 40865) >>>> +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 >>>> 21:36:38 UTC (rev 40866) >>>> @@ -22,14 +22,20 @@ >>>> >>>> {preference name=feature_search >>>> visible="always"} >>>> <div class="adminoptionboxchild" >>>> id="feature_search_childcontainer"> >>>> - {preference >>>> name="unified_incremental_update"} >>>> {preference >>>> name="unified_engine"} >>>> <div class="adminoptionboxchild >>>> unified_engine_childcontainer lucene"> >>>> + {preference >>>> name="unified_incremental_update"} >>>> + {preference >>>> name="unified_lucene_highlight"} >>>> {preference >>>> name="unified_lucene_location"} >>>> - {preference >>>> name="unified_lucene_highlight"} >>>> - {preference >>>> name="unified_lucene_max_result"} >>>> - {preference >>>> name="unified_lucene_max_resultset_limit"} >>>> - {preference >>>> name="unified_lucene_terms_limit"} >>>> + <fieldset> >>>> + >>>> <legend>{tr}Search Engine Settings{/tr}</legend> >>>> + {preference >>>> name="unified_lucene_max_result"} >>>> + {preference >>>> name="unified_lucene_max_resultset_limit"} >>>> + {preference >>>> name="unified_lucene_terms_limit"} >>>> + {preference >>>> name="unified_lucene_max_buffered_docs"} >>>> + {preference >>>> name="unified_lucene_max_merge_docs"} >>>> + {preference >>>> name="unified_lucene_merge_factor"} >>>> + </fieldset> >>>> </div> >>>> >>>> {preference >>>> name=unified_forum_deepindexing} >>>> @@ -48,7 +54,19 @@ >>>> <ul> >>>> <li><a >>>> href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> >>>> <li> >>>> - <a >>>> href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> >>>> + <a >>>> href="tiki-admin.php?page=search&rebuild=now" >>>> id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> >>>> + <label >>>> for="log-rebuild">{tr}Log rebuild?{/tr}</label> >>>> + <input >>>> type="checkbox" id="log-rebuild" /> >>>> + <span >>>> class="description">{tr}Log file is saved as >>>> temp/Search_Indexer.log{/tr}</span> >>>> + {jq} >>>> +$("#log-rebuild").click(function(){ >>>> + if ($(this).prop("checked")) { >>>> + $("#rebuild-link").attr("href", >>>> $("#rebuild-link").attr("href") + "&loggit"); >>>> + } else { >>>> + $("#rebuild-link").attr("href", >>>> $("#rebuild-link").attr("href").replace("&loggit","")); >>>> + } >>>> +}); >>>> + {/jq} >>>> {if >>>> !empty($stat)} >>>> >>>> {remarksbox type='feedback' title="{tr}Indexation{/tr}"} >>>> >>>> <ul> >>>> >>>> This was sent by the SourceForge.net collaborative development >>>> platform, the world's largest Open Source development site. >>>> >>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> Better than sec? Nothing is better than sec when it comes to >>>> monitoring Big Data applications. Try Boundary one-second >>>> resolution app monitoring today. Free. >>>> http://p.sf.net/sfu/Boundary-dev2dev >>>> _______________________________________________ >>>> Tikiwiki-cvs mailing list >>>> Tik...@li... >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>> >>> >>> >>> ------------------------------------------------------------------------------ >>> Better than sec? Nothing is better than sec when it comes to >>> monitoring Big Data applications. Try Boundary one-second >>> resolution app monitoring today. Free. >>> http://p.sf.net/sfu/Boundary-dev2dev >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tik...@li... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> >>> >> >> ------------------------------------------------------------------------------ >> Better than sec? Nothing is better than sec when it comes to >> monitoring Big Data applications. Try Boundary one-second >> resolution app monitoring today. Free. >> http://p.sf.net/sfu/Boundary-dev2dev >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> >> > > ------------------------------------------------------------------------------ > Better than sec? Nothing is better than sec when it comes to > monitoring Big Data applications. Try Boundary one-second > resolution app monitoring today. Free. > http://p.sf.net/sfu/Boundary-dev2dev > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > |
From: Robert P. <rob...@gm...> - 2012-04-12 15:42:36
|
Just checked, works great. However it seems that some pages are executed and others are not, I'm having trouble with the group plugin particularly. Shouldn't the source be searched but the rendered page be displayed? On Wed, Apr 11, 2012 at 11:39 PM, Robert Plummer < rob...@gm...> wrote: > I did a few searches, it worked. In fact I had integrated lucene in the > past in c# and it only took a few seconds for small indexes, so I wondered > why 3 pages and a tracker with 1 item would take so long. Now it works > like I thought it should. I will double check in the morning. > On Apr 11, 2012 4:50 PM, "Marc Laporte" <ma...@ma...> wrote: > >> Makes you wonder if it worked! :-) >> On 2012-04-11 10:08 AM, "Robert Plummer" <rob...@gm...> >> wrote: >> >>> I'm not sure why, but before rebuilding indexes on my site took about 1 >>> to 3 min. Now it takes just a few seconds, I wonder why..... >>> On Apr 10, 2012 9:42 PM, "Marc Laporte" <ma...@ma...> wrote: >>> >>>> awesome! >>>> >>>> I hope doc.tiki.org and dev.tiki.org can complete index rebuilding >>>> with these new preferences! >>>> On 2012-04-10 5:37 PM, <rob...@us...> wrote: >>>> >>>>> Revision: 40866 >>>>> >>>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev >>>>> Author: robertplummer >>>>> Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) >>>>> Log Message: >>>>> ----------- >>>>> [NEW] Some much needed prefs for lucene search to help make it more >>>>> controllable, from jonnyb >>>>> >>>>> Modified Paths: >>>>> -------------- >>>>> branches/9.x/lib/core/Search/Index/Lucene.php >>>>> branches/9.x/lib/prefs/unified.php >>>>> branches/9.x/templates/admin/include_search.tpl >>>>> >>>>> Modified: branches/9.x/lib/core/Search/Index/Lucene.php >>>>> =================================================================== >>>>> --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >>>>> 21:26:17 UTC (rev 40865) >>>>> +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 >>>>> 21:36:38 UTC (rev 40866) >>>>> @@ -40,10 +40,16 @@ >>>>> } catch (Zend_Search_Lucene_Exception $e) { >>>>> $this->lucene = >>>>> Zend_Search_Lucene::create($this->directory); >>>>> } >>>>> - >>>>> - $this->lucene->setMaxBufferedDocs(100); >>>>> - $this->lucene->setMaxMergeDocs(5000); >>>>> - $this->lucene->setMergeFactor(50); >>>>> + global $prefs; >>>>> + if >>>>> (!empty($prefs['unified_lucene_max_buffered_docs'])) { >>>>> // these break indexing if set empty >>>>> + >>>>> $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); >>>>> // default is 10 >>>>> + } >>>>> + if (!empty($prefs['unified_lucene_max_merge_docs'])) { >>>>> + >>>>> $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); >>>>> // default is PHP_INT_MAX (effectively "infinite") >>>>> + } >>>>> + if (!empty($prefs['unified_lucene_merge_factor'])) { >>>>> + >>>>> $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); >>>>> // default is 10 >>>>> + } >>>>> $this->lucene->setResultSetLimit($this->resultSetLimit); >>>>> >>>>> return $this->lucene; >>>>> >>>>> Modified: branches/9.x/lib/prefs/unified.php >>>>> =================================================================== >>>>> --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev >>>>> 40865) >>>>> +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev >>>>> 40866) >>>>> @@ -40,8 +40,8 @@ >>>>> ), >>>>> 'unified_lucene_max_resultset_limit' => array( >>>>> 'name' => tra('Lucene Maximum Result Set >>>>> Limit'), >>>>> - 'description' => tra('Maximum size of result >>>>> set to consider. Default 1000, 0 = unlimited.'), >>>>> - 'hint' => tra('This is used when calculating >>>>> result scores and sort order which can lead to out of memory errors on >>>>> large data sets. The default of 1000 is safe with the PHP memory_limit set >>>>> to 128M'), >>>>> + 'hint' => tra('Maximum size of result set to >>>>> consider. Default 1000, 0 = unlimited.'), >>>>> + 'description' => tra('This is used when >>>>> calculating result scores and sort order which can lead to out of memory >>>>> errors on large data sets. The default of 1000 is safe with the PHP >>>>> memory_limit set to 128M'), >>>>> 'type' => 'text', >>>>> 'filter' => 'int', >>>>> 'default' => 1000, >>>>> @@ -55,6 +55,33 @@ >>>>> 'default' => 1024, >>>>> 'size' => 6, >>>>> ), >>>>> + 'unified_lucene_max_buffered_docs' => array( >>>>> + 'name' => tra('Lucene Max Buffered Documents'), >>>>> + 'description' => tra('Number of documents >>>>> required before the buffered in-memory documents are written into a new >>>>> segment.'), >>>>> + 'hint' => tra(''), >>>>> + 'type' => 'text', >>>>> + 'filter' => 'int', >>>>> + 'default' => 10, >>>>> + 'size' => 6, >>>>> + ), >>>>> + 'unified_lucene_max_merge_docs' => array( >>>>> + 'name' => tra('Lucene Max Merge Documents'), >>>>> + 'description' => tra('Largest number of >>>>> documents ever merged by addDocument(). Small values (e.g., less than >>>>> 10,000) are best for interactive indexing, as this limits the length of >>>>> pauses while indexing to a few seconds. Larger values are best for batched >>>>> indexing and speedier searches.'), >>>>> + 'hint' => tra('Small values (e.g., less than >>>>> 10,000) are best for interactive indexing. Use 0 for the Lucene default, >>>>> which is practically infinite.'), >>>>> + 'type' => 'text', >>>>> + 'filter' => 'int', >>>>> + 'default' => 0, >>>>> + 'size' => 8, >>>>> + ), >>>>> + 'unified_lucene_merge_factor' => array( >>>>> + 'name' => tra('Lucene Merge Factor'), >>>>> + 'description' => tra('How often segment >>>>> indices are merged by addDocument(). With smaller values, less RAM is used >>>>> while indexing, and searches on unoptimized indices are faster, but >>>>> indexing speed is slower. With larger values, more RAM is used during >>>>> indexing, and while searches on unoptimized indices are slower, indexing is >>>>> faster. Thus larger values (> 10) are best for batch index creation, and >>>>> smaller values (< 10) for indices that are interactively maintained.'), >>>>> + 'hint' => tra('Large values (> 10) are best >>>>> for batch index creation, and smaller values (< 10) for indices that are >>>>> interactively maintained.'), >>>>> + 'type' => 'text', >>>>> + 'filter' => 'int', >>>>> + 'default' => 10, >>>>> + 'size' => 6, >>>>> + ), >>>>> 'unified_incremental_update' => array( >>>>> 'name' => tra('Incremental Index Update'), >>>>> 'description' => tra('Update the index >>>>> incrementally as the site content is modified. This may lead to lower >>>>> performance and accuracy than processing the index on a periodic basis.'), >>>>> >>>>> Modified: branches/9.x/templates/admin/include_search.tpl >>>>> =================================================================== >>>>> --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 >>>>> 21:26:17 UTC (rev 40865) >>>>> +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 >>>>> 21:36:38 UTC (rev 40866) >>>>> @@ -22,14 +22,20 @@ >>>>> >>>>> {preference name=feature_search >>>>> visible="always"} >>>>> <div class="adminoptionboxchild" >>>>> id="feature_search_childcontainer"> >>>>> - {preference >>>>> name="unified_incremental_update"} >>>>> {preference >>>>> name="unified_engine"} >>>>> <div class="adminoptionboxchild >>>>> unified_engine_childcontainer lucene"> >>>>> + {preference >>>>> name="unified_incremental_update"} >>>>> + {preference >>>>> name="unified_lucene_highlight"} >>>>> {preference >>>>> name="unified_lucene_location"} >>>>> - {preference >>>>> name="unified_lucene_highlight"} >>>>> - {preference >>>>> name="unified_lucene_max_result"} >>>>> - {preference >>>>> name="unified_lucene_max_resultset_limit"} >>>>> - {preference >>>>> name="unified_lucene_terms_limit"} >>>>> + <fieldset> >>>>> + >>>>> <legend>{tr}Search Engine Settings{/tr}</legend> >>>>> + {preference >>>>> name="unified_lucene_max_result"} >>>>> + {preference >>>>> name="unified_lucene_max_resultset_limit"} >>>>> + {preference >>>>> name="unified_lucene_terms_limit"} >>>>> + {preference >>>>> name="unified_lucene_max_buffered_docs"} >>>>> + {preference >>>>> name="unified_lucene_max_merge_docs"} >>>>> + {preference >>>>> name="unified_lucene_merge_factor"} >>>>> + </fieldset> >>>>> </div> >>>>> >>>>> {preference >>>>> name=unified_forum_deepindexing} >>>>> @@ -48,7 +54,19 @@ >>>>> <ul> >>>>> <li><a >>>>> href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> >>>>> <li> >>>>> - <a >>>>> href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> >>>>> + <a >>>>> href="tiki-admin.php?page=search&rebuild=now" >>>>> id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> >>>>> + <label >>>>> for="log-rebuild">{tr}Log rebuild?{/tr}</label> >>>>> + <input >>>>> type="checkbox" id="log-rebuild" /> >>>>> + <span >>>>> class="description">{tr}Log file is saved as >>>>> temp/Search_Indexer.log{/tr}</span> >>>>> + {jq} >>>>> +$("#log-rebuild").click(function(){ >>>>> + if ($(this).prop("checked")) { >>>>> + $("#rebuild-link").attr("href", >>>>> $("#rebuild-link").attr("href") + "&loggit"); >>>>> + } else { >>>>> + $("#rebuild-link").attr("href", >>>>> $("#rebuild-link").attr("href").replace("&loggit","")); >>>>> + } >>>>> +}); >>>>> + {/jq} >>>>> {if >>>>> !empty($stat)} >>>>> >>>>> {remarksbox type='feedback' title="{tr}Indexation{/tr}"} >>>>> >>>>> <ul> >>>>> >>>>> This was sent by the SourceForge.net collaborative development >>>>> platform, the world's largest Open Source development site. >>>>> >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> Better than sec? Nothing is better than sec when it comes to >>>>> monitoring Big Data applications. Try Boundary one-second >>>>> resolution app monitoring today. Free. >>>>> http://p.sf.net/sfu/Boundary-dev2dev >>>>> _______________________________________________ >>>>> Tikiwiki-cvs mailing list >>>>> Tik...@li... >>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>>> >>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> Better than sec? Nothing is better than sec when it comes to >>>> monitoring Big Data applications. Try Boundary one-second >>>> resolution app monitoring today. Free. >>>> http://p.sf.net/sfu/Boundary-dev2dev >>>> _______________________________________________ >>>> Tikiwiki-cvs mailing list >>>> Tik...@li... >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>> >>>> >>> >>> ------------------------------------------------------------------------------ >>> Better than sec? Nothing is better than sec when it comes to >>> monitoring Big Data applications. Try Boundary one-second >>> resolution app monitoring today. Free. >>> http://p.sf.net/sfu/Boundary-dev2dev >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tik...@li... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> >>> >> >> ------------------------------------------------------------------------------ >> Better than sec? Nothing is better than sec when it comes to >> monitoring Big Data applications. Try Boundary one-second >> resolution app monitoring today. Free. >> http://p.sf.net/sfu/Boundary-dev2dev >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> >> -- Robert Plummer |
From: Marc L. <ma...@ma...> - 2012-04-16 22:44:36
|
source vs rendered: but rendered for whom? current user? On 2012-04-12 11:43 AM, "Robert Plummer" <rob...@gm...> wrote: > > Just checked, works great. However it seems that some pages are executed and others are not, I'm having trouble with the group plugin particularly. Shouldn't the source be searched but the rendered page be displayed? > > On Wed, Apr 11, 2012 at 11:39 PM, Robert Plummer <rob...@gm...> wrote: >> >> I did a few searches, it worked. In fact I had integrated lucene in the past in c# and it only took a few seconds for small indexes, so I wondered why 3 pages and a tracker with 1 item would take so long. Now it works like I thought it should. I will double check in the morning. >> >> On Apr 11, 2012 4:50 PM, "Marc Laporte" <ma...@ma...> wrote: >>> >>> Makes you wonder if it worked! :-) >>> >>> On 2012-04-11 10:08 AM, "Robert Plummer" <rob...@gm...> wrote: >>>> >>>> I'm not sure why, but before rebuilding indexes on my site took about 1 to 3 min. Now it takes just a few seconds, I wonder why..... >>>> >>>> On Apr 10, 2012 9:42 PM, "Marc Laporte" <ma...@ma...> wrote: >>>>> >>>>> awesome! >>>>> >>>>> I hope doc.tiki.org and dev.tiki.org can complete index rebuilding with these new preferences! >>>>> >>>>> On 2012-04-10 5:37 PM, <rob...@us...> wrote: >>>>>> >>>>>> Revision: 40866 >>>>>> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev >>>>>> Author: robertplummer >>>>>> Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) >>>>>> Log Message: >>>>>> ----------- >>>>>> [NEW] Some much needed prefs for lucene search to help make it more controllable, from jonnyb >>>>>> >>>>>> Modified Paths: >>>>>> -------------- >>>>>> branches/9.x/lib/core/Search/Index/Lucene.php >>>>>> branches/9.x/lib/prefs/unified.php >>>>>> branches/9.x/templates/admin/include_search.tpl >>>>>> >>>>>> Modified: branches/9.x/lib/core/Search/Index/Lucene.php >>>>>> =================================================================== >>>>>> --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 21:26:17 UTC (rev 40865) >>>>>> +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 21:36:38 UTC (rev 40866) >>>>>> @@ -40,10 +40,16 @@ >>>>>> } catch (Zend_Search_Lucene_Exception $e) { >>>>>> $this->lucene = Zend_Search_Lucene::create($this->directory); >>>>>> } >>>>>> - >>>>>> - $this->lucene->setMaxBufferedDocs(100); >>>>>> - $this->lucene->setMaxMergeDocs(5000); >>>>>> - $this->lucene->setMergeFactor(50); >>>>>> + global $prefs; >>>>>> + if (!empty($prefs['unified_lucene_max_buffered_docs'])) { // these break indexing if set empty >>>>>> + $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); // default is 10 >>>>>> + } >>>>>> + if (!empty($prefs['unified_lucene_max_merge_docs'])) { >>>>>> + $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); // default is PHP_INT_MAX (effectively "infinite") >>>>>> + } >>>>>> + if (!empty($prefs['unified_lucene_merge_factor'])) { >>>>>> + $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); // default is 10 >>>>>> + } >>>>>> $this->lucene->setResultSetLimit($this->resultSetLimit); >>>>>> >>>>>> return $this->lucene; >>>>>> >>>>>> Modified: branches/9.x/lib/prefs/unified.php >>>>>> =================================================================== >>>>>> --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC (rev 40865) >>>>>> +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC (rev 40866) >>>>>> @@ -40,8 +40,8 @@ >>>>>> ), >>>>>> 'unified_lucene_max_resultset_limit' => array( >>>>>> 'name' => tra('Lucene Maximum Result Set Limit'), >>>>>> - 'description' => tra('Maximum size of result set to consider. Default 1000, 0 = unlimited.'), >>>>>> - 'hint' => tra('This is used when calculating result scores and sort order which can lead to out of memory errors on large data sets. The default of 1000 is safe with the PHP memory_limit set to 128M'), >>>>>> + 'hint' => tra('Maximum size of result set to consider. Default 1000, 0 = unlimited.'), >>>>>> + 'description' => tra('This is used when calculating result scores and sort order which can lead to out of memory errors on large data sets. The default of 1000 is safe with the PHP memory_limit set to 128M'), >>>>>> 'type' => 'text', >>>>>> 'filter' => 'int', >>>>>> 'default' => 1000, >>>>>> @@ -55,6 +55,33 @@ >>>>>> 'default' => 1024, >>>>>> 'size' => 6, >>>>>> ), >>>>>> + 'unified_lucene_max_buffered_docs' => array( >>>>>> + 'name' => tra('Lucene Max Buffered Documents'), >>>>>> + 'description' => tra('Number of documents required before the buffered in-memory documents are written into a new segment.'), >>>>>> + 'hint' => tra(''), >>>>>> + 'type' => 'text', >>>>>> + 'filter' => 'int', >>>>>> + 'default' => 10, >>>>>> + 'size' => 6, >>>>>> + ), >>>>>> + 'unified_lucene_max_merge_docs' => array( >>>>>> + 'name' => tra('Lucene Max Merge Documents'), >>>>>> + 'description' => tra('Largest number of documents ever merged by addDocument(). Small values (e.g., less than 10,000) are best for interactive indexing, as this limits the length of pauses while indexing to a few seconds. Larger values are best for batched indexing and speedier searches.'), >>>>>> + 'hint' => tra('Small values (e.g., less than 10,000) are best for interactive indexing. Use 0 for the Lucene default, which is practically infinite.'), >>>>>> + 'type' => 'text', >>>>>> + 'filter' => 'int', >>>>>> + 'default' => 0, >>>>>> + 'size' => 8, >>>>>> + ), >>>>>> + 'unified_lucene_merge_factor' => array( >>>>>> + 'name' => tra('Lucene Merge Factor'), >>>>>> + 'description' => tra('How often segment indices are merged by addDocument(). With smaller values, less RAM is used while indexing, and searches on unoptimized indices are faster, but indexing speed is slower. With larger values, more RAM is used during indexing, and while searches on unoptimized indices are slower, indexing is faster. Thus larger values (> 10) are best for batch index creation, and smaller values (< 10) for indices that are interactively maintained.'), >>>>>> + 'hint' => tra('Large values (> 10) are best for batch index creation, and smaller values (< 10) for indices that are interactively maintained.'), >>>>>> + 'type' => 'text', >>>>>> + 'filter' => 'int', >>>>>> + 'default' => 10, >>>>>> + 'size' => 6, >>>>>> + ), >>>>>> 'unified_incremental_update' => array( >>>>>> 'name' => tra('Incremental Index Update'), >>>>>> 'description' => tra('Update the index incrementally as the site content is modified. This may lead to lower performance and accuracy than processing the index on a periodic basis.'), >>>>>> >>>>>> Modified: branches/9.x/templates/admin/include_search.tpl >>>>>> =================================================================== >>>>>> --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 21:26:17 UTC (rev 40865) >>>>>> +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 21:36:38 UTC (rev 40866) >>>>>> @@ -22,14 +22,20 @@ >>>>>> >>>>>> {preference name=feature_search visible="always"} >>>>>> <div class="adminoptionboxchild" id="feature_search_childcontainer"> >>>>>> - {preference name="unified_incremental_update"} >>>>>> {preference name="unified_engine"} >>>>>> <div class="adminoptionboxchild unified_engine_childcontainer lucene"> >>>>>> + {preference name="unified_incremental_update"} >>>>>> + {preference name="unified_lucene_highlight"} >>>>>> {preference name="unified_lucene_location"} >>>>>> - {preference name="unified_lucene_highlight"} >>>>>> - {preference name="unified_lucene_max_result"} >>>>>> - {preference name="unified_lucene_max_resultset_limit"} >>>>>> - {preference name="unified_lucene_terms_limit"} >>>>>> + <fieldset> >>>>>> + <legend>{tr}Search Engine Settings{/tr}</legend> >>>>>> + {preference name="unified_lucene_max_result"} >>>>>> + {preference name="unified_lucene_max_resultset_limit"} >>>>>> + {preference name="unified_lucene_terms_limit"} >>>>>> + {preference name="unified_lucene_max_buffered_docs"} >>>>>> + {preference name="unified_lucene_max_merge_docs"} >>>>>> + {preference name="unified_lucene_merge_factor"} >>>>>> + </fieldset> >>>>>> </div> >>>>>> >>>>>> {preference name=unified_forum_deepindexing} >>>>>> @@ -48,7 +54,19 @@ >>>>>> <ul> >>>>>> <li><a href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> >>>>>> <li> >>>>>> - <a href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> >>>>>> + <a href="tiki-admin.php?page=search&rebuild=now" id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> >>>>>> + <label for="log-rebuild">{tr}Log rebuild?{/tr}</label> >>>>>> + <input type="checkbox" id="log-rebuild" /> >>>>>> + <span class="description">{tr}Log file is saved as temp/Search_Indexer.log{/tr}</span> >>>>>> + {jq} >>>>>> +$("#log-rebuild").click(function(){ >>>>>> + if ($(this).prop("checked")) { >>>>>> + $("#rebuild-link").attr("href", $("#rebuild-link").attr("href") + "&loggit"); >>>>>> + } else { >>>>>> + $("#rebuild-link").attr("href", $("#rebuild-link").attr("href").replace("&loggit","")); >>>>>> + } >>>>>> +}); >>>>>> + {/jq} >>>>>> {if !empty($stat)} >>>>>> {remarksbox type='feedback' title="{tr}Indexation{/tr}"} >>>>>> <ul> >>>>>> >>>>>> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. >>>>>> >>>>>> >>>>>> ------------------------------------------------------------------------------ >>>>>> Better than sec? Nothing is better than sec when it comes to >>>>>> monitoring Big Data applications. Try Boundary one-second >>>>>> resolution app monitoring today. Free. >>>>>> http://p.sf.net/sfu/Boundary-dev2dev >>>>>> _______________________________________________ >>>>>> Tikiwiki-cvs mailing list >>>>>> Tik...@li... >>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>>> >>>>> >>>>> ------------------------------------------------------------------------------ >>>>> Better than sec? Nothing is better than sec when it comes to >>>>> monitoring Big Data applications. Try Boundary one-second >>>>> resolution app monitoring today. Free. >>>>> http://p.sf.net/sfu/Boundary-dev2dev >>>>> _______________________________________________ >>>>> Tikiwiki-cvs mailing list >>>>> Tik...@li... >>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>>> >>>> >>>> ------------------------------------------------------------------------------ >>>> Better than sec? Nothing is better than sec when it comes to >>>> monitoring Big Data applications. Try Boundary one-second >>>> resolution app monitoring today. Free. >>>> http://p.sf.net/sfu/Boundary-dev2dev >>>> _______________________________________________ >>>> Tikiwiki-cvs mailing list >>>> Tik...@li... >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>>> >>> >>> ------------------------------------------------------------------------------ >>> Better than sec? Nothing is better than sec when it comes to >>> monitoring Big Data applications. Try Boundary one-second >>> resolution app monitoring today. Free. >>> http://p.sf.net/sfu/Boundary-dev2dev >>> _______________________________________________ >>> Tikiwiki-cvs mailing list >>> Tik...@li... >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >>> > > > > -- > Robert Plummer > > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > http://p.sf.net/sfu/Boundary-d2dvs2 > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Robert P. <rob...@gm...> - 2012-04-16 23:10:43
|
Exactly. Rendered for current user. On Apr 16, 2012 6:44 PM, "Marc Laporte" <ma...@ma...> wrote: > source vs rendered: > > but rendered for whom? current user? > > > > On 2012-04-12 11:43 AM, "Robert Plummer" <rob...@gm...> > wrote: > > > > Just checked, works great. However it seems that some pages are > executed and others are not, I'm having trouble with the group plugin > particularly. Shouldn't the source be searched but the rendered page be > displayed? > > > > On Wed, Apr 11, 2012 at 11:39 PM, Robert Plummer < > rob...@gm...> wrote: > >> > >> I did a few searches, it worked. In fact I had integrated lucene in the > past in c# and it only took a few seconds for small indexes, so I wondered > why 3 pages and a tracker with 1 item would take so long. Now it works > like I thought it should. I will double check in the morning. > >> > >> On Apr 11, 2012 4:50 PM, "Marc Laporte" <ma...@ma...> wrote: > >>> > >>> Makes you wonder if it worked! :-) > >>> > >>> On 2012-04-11 10:08 AM, "Robert Plummer" <rob...@gm...> > wrote: > >>>> > >>>> I'm not sure why, but before rebuilding indexes on my site took about > 1 to 3 min. Now it takes just a few seconds, I wonder why..... > >>>> > >>>> On Apr 10, 2012 9:42 PM, "Marc Laporte" <ma...@ma...> wrote: > >>>>> > >>>>> awesome! > >>>>> > >>>>> I hope doc.tiki.org and dev.tiki.org can complete index rebuilding > with these new preferences! > >>>>> > >>>>> On 2012-04-10 5:37 PM, <rob...@us...> wrote: > >>>>>> > >>>>>> Revision: 40866 > >>>>>> > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40866&view=rev > >>>>>> Author: robertplummer > >>>>>> Date: 2012-04-10 21:36:38 +0000 (Tue, 10 Apr 2012) > >>>>>> Log Message: > >>>>>> ----------- > >>>>>> [NEW] Some much needed prefs for lucene search to help make it more > controllable, from jonnyb > >>>>>> > >>>>>> Modified Paths: > >>>>>> -------------- > >>>>>> branches/9.x/lib/core/Search/Index/Lucene.php > >>>>>> branches/9.x/lib/prefs/unified.php > >>>>>> branches/9.x/templates/admin/include_search.tpl > >>>>>> > >>>>>> Modified: branches/9.x/lib/core/Search/Index/Lucene.php > >>>>>> =================================================================== > >>>>>> --- branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 > 21:26:17 UTC (rev 40865) > >>>>>> +++ branches/9.x/lib/core/Search/Index/Lucene.php 2012-04-10 > 21:36:38 UTC (rev 40866) > >>>>>> @@ -40,10 +40,16 @@ > >>>>>> } catch (Zend_Search_Lucene_Exception $e) { > >>>>>> $this->lucene = > Zend_Search_Lucene::create($this->directory); > >>>>>> } > >>>>>> - > >>>>>> - $this->lucene->setMaxBufferedDocs(100); > >>>>>> - $this->lucene->setMaxMergeDocs(5000); > >>>>>> - $this->lucene->setMergeFactor(50); > >>>>>> + global $prefs; > >>>>>> + if > (!empty($prefs['unified_lucene_max_buffered_docs'])) { > // these break indexing if set empty > >>>>>> + > $this->lucene->setMaxBufferedDocs($prefs['unified_lucene_max_buffered_docs']); > // default is 10 > >>>>>> + } > >>>>>> + if > (!empty($prefs['unified_lucene_max_merge_docs'])) { > >>>>>> + > $this->lucene->setMaxMergeDocs($prefs['unified_lucene_max_merge_docs']); > // default is PHP_INT_MAX (effectively "infinite") > >>>>>> + } > >>>>>> + if (!empty($prefs['unified_lucene_merge_factor'])) { > >>>>>> + > $this->lucene->setMergeFactor($prefs['unified_lucene_merge_factor']); > // default is 10 > >>>>>> + } > >>>>>> > $this->lucene->setResultSetLimit($this->resultSetLimit); > >>>>>> > >>>>>> return $this->lucene; > >>>>>> > >>>>>> Modified: branches/9.x/lib/prefs/unified.php > >>>>>> =================================================================== > >>>>>> --- branches/9.x/lib/prefs/unified.php 2012-04-10 21:26:17 UTC > (rev 40865) > >>>>>> +++ branches/9.x/lib/prefs/unified.php 2012-04-10 21:36:38 UTC > (rev 40866) > >>>>>> @@ -40,8 +40,8 @@ > >>>>>> ), > >>>>>> 'unified_lucene_max_resultset_limit' => array( > >>>>>> 'name' => tra('Lucene Maximum Result Set > Limit'), > >>>>>> - 'description' => tra('Maximum size of > result set to consider. Default 1000, 0 = unlimited.'), > >>>>>> - 'hint' => tra('This is used when > calculating result scores and sort order which can lead to out of memory > errors on large data sets. The default of 1000 is safe with the PHP > memory_limit set to 128M'), > >>>>>> + 'hint' => tra('Maximum size of result set > to consider. Default 1000, 0 = unlimited.'), > >>>>>> + 'description' => tra('This is used when > calculating result scores and sort order which can lead to out of memory > errors on large data sets. The default of 1000 is safe with the PHP > memory_limit set to 128M'), > >>>>>> 'type' => 'text', > >>>>>> 'filter' => 'int', > >>>>>> 'default' => 1000, > >>>>>> @@ -55,6 +55,33 @@ > >>>>>> 'default' => 1024, > >>>>>> 'size' => 6, > >>>>>> ), > >>>>>> + 'unified_lucene_max_buffered_docs' => array( > >>>>>> + 'name' => tra('Lucene Max Buffered > Documents'), > >>>>>> + 'description' => tra('Number of documents > required before the buffered in-memory documents are written into a new > segment.'), > >>>>>> + 'hint' => tra(''), > >>>>>> + 'type' => 'text', > >>>>>> + 'filter' => 'int', > >>>>>> + 'default' => 10, > >>>>>> + 'size' => 6, > >>>>>> + ), > >>>>>> + 'unified_lucene_max_merge_docs' => array( > >>>>>> + 'name' => tra('Lucene Max Merge Documents'), > >>>>>> + 'description' => tra('Largest number of > documents ever merged by addDocument(). Small values (e.g., less than > 10,000) are best for interactive indexing, as this limits the length of > pauses while indexing to a few seconds. Larger values are best for batched > indexing and speedier searches.'), > >>>>>> + 'hint' => tra('Small values (e.g., less > than 10,000) are best for interactive indexing. Use 0 for the Lucene > default, which is practically infinite.'), > >>>>>> + 'type' => 'text', > >>>>>> + 'filter' => 'int', > >>>>>> + 'default' => 0, > >>>>>> + 'size' => 8, > >>>>>> + ), > >>>>>> + 'unified_lucene_merge_factor' => array( > >>>>>> + 'name' => tra('Lucene Merge Factor'), > >>>>>> + 'description' => tra('How often segment > indices are merged by addDocument(). With smaller values, less RAM is used > while indexing, and searches on unoptimized indices are faster, but > indexing speed is slower. With larger values, more RAM is used during > indexing, and while searches on unoptimized indices are slower, indexing is > faster. Thus larger values (> 10) are best for batch index creation, and > smaller values (< 10) for indices that are interactively maintained.'), > >>>>>> + 'hint' => tra('Large values (> 10) are best > for batch index creation, and smaller values (< 10) for indices that are > interactively maintained.'), > >>>>>> + 'type' => 'text', > >>>>>> + 'filter' => 'int', > >>>>>> + 'default' => 10, > >>>>>> + 'size' => 6, > >>>>>> + ), > >>>>>> 'unified_incremental_update' => array( > >>>>>> 'name' => tra('Incremental Index Update'), > >>>>>> 'description' => tra('Update the index > incrementally as the site content is modified. This may lead to lower > performance and accuracy than processing the index on a periodic basis.'), > >>>>>> > >>>>>> Modified: branches/9.x/templates/admin/include_search.tpl > >>>>>> =================================================================== > >>>>>> --- branches/9.x/templates/admin/include_search.tpl 2012-04-10 > 21:26:17 UTC (rev 40865) > >>>>>> +++ branches/9.x/templates/admin/include_search.tpl 2012-04-10 > 21:36:38 UTC (rev 40866) > >>>>>> @@ -22,14 +22,20 @@ > >>>>>> > >>>>>> {preference name=feature_search > visible="always"} > >>>>>> <div class="adminoptionboxchild" > id="feature_search_childcontainer"> > >>>>>> - {preference > name="unified_incremental_update"} > >>>>>> {preference > name="unified_engine"} > >>>>>> <div > class="adminoptionboxchild unified_engine_childcontainer lucene"> > >>>>>> + {preference > name="unified_incremental_update"} > >>>>>> + {preference > name="unified_lucene_highlight"} > >>>>>> {preference > name="unified_lucene_location"} > >>>>>> - {preference > name="unified_lucene_highlight"} > >>>>>> - {preference > name="unified_lucene_max_result"} > >>>>>> - {preference > name="unified_lucene_max_resultset_limit"} > >>>>>> - {preference > name="unified_lucene_terms_limit"} > >>>>>> + <fieldset> > >>>>>> + > <legend>{tr}Search Engine Settings{/tr}</legend> > >>>>>> + {preference > name="unified_lucene_max_result"} > >>>>>> + {preference > name="unified_lucene_max_resultset_limit"} > >>>>>> + {preference > name="unified_lucene_terms_limit"} > >>>>>> + {preference > name="unified_lucene_max_buffered_docs"} > >>>>>> + {preference > name="unified_lucene_max_merge_docs"} > >>>>>> + {preference > name="unified_lucene_merge_factor"} > >>>>>> + </fieldset> > >>>>>> </div> > >>>>>> > >>>>>> {preference > name=unified_forum_deepindexing} > >>>>>> @@ -48,7 +54,19 @@ > >>>>>> <ul> > >>>>>> <li><a > href="tiki-admin.php?page=search&optimize=now">{tr}Optimize{/tr}</a></li> > >>>>>> <li> > >>>>>> - <a > href="tiki-admin.php?page=search&rebuild=now">{tr}Rebuild Index{/tr}</a> > >>>>>> + <a > href="tiki-admin.php?page=search&rebuild=now" > id="rebuild-link">{tr}Rebuild Index{/tr}</a><br /> > >>>>>> + <label > for="log-rebuild">{tr}Log rebuild?{/tr}</label> > >>>>>> + <input > type="checkbox" id="log-rebuild" /> > >>>>>> + <span > class="description">{tr}Log file is saved as > temp/Search_Indexer.log{/tr}</span> > >>>>>> + {jq} > >>>>>> +$("#log-rebuild").click(function(){ > >>>>>> + if ($(this).prop("checked")) { > >>>>>> + $("#rebuild-link").attr("href", > $("#rebuild-link").attr("href") + "&loggit"); > >>>>>> + } else { > >>>>>> + $("#rebuild-link").attr("href", > $("#rebuild-link").attr("href").replace("&loggit","")); > >>>>>> + } > >>>>>> +}); > >>>>>> + {/jq} > >>>>>> {if > !empty($stat)} > >>>>>> > {remarksbox type='feedback' title="{tr}Indexation{/tr}"} > >>>>>> > <ul> > >>>>>> > >>>>>> This was sent by the SourceForge.net collaborative development > platform, the world's largest Open Source development site. > >>>>>> > >>>>>> > >>>>>> > ------------------------------------------------------------------------------ > >>>>>> Better than sec? Nothing is better than sec when it comes to > >>>>>> monitoring Big Data applications. Try Boundary one-second > >>>>>> resolution app monitoring today. Free. > >>>>>> http://p.sf.net/sfu/Boundary-dev2dev > >>>>>> _______________________________________________ > >>>>>> Tikiwiki-cvs mailing list > >>>>>> Tik...@li... > >>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > >>>>> > >>>>> > >>>>> > ------------------------------------------------------------------------------ > >>>>> Better than sec? Nothing is better than sec when it comes to > >>>>> monitoring Big Data applications. Try Boundary one-second > >>>>> resolution app monitoring today. Free. > >>>>> http://p.sf.net/sfu/Boundary-dev2dev > >>>>> _______________________________________________ > >>>>> Tikiwiki-cvs mailing list > >>>>> Tik...@li... > >>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > >>>>> > >>>> > >>>> > ------------------------------------------------------------------------------ > >>>> Better than sec? Nothing is better than sec when it comes to > >>>> monitoring Big Data applications. Try Boundary one-second > >>>> resolution app monitoring today. Free. > >>>> http://p.sf.net/sfu/Boundary-dev2dev > >>>> _______________________________________________ > >>>> Tikiwiki-cvs mailing list > >>>> Tik...@li... > >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > >>>> > >>> > >>> > ------------------------------------------------------------------------------ > >>> Better than sec? Nothing is better than sec when it comes to > >>> monitoring Big Data applications. Try Boundary one-second > >>> resolution app monitoring today. Free. > >>> http://p.sf.net/sfu/Boundary-dev2dev > >>> _______________________________________________ > >>> Tikiwiki-cvs mailing list > >>> Tik...@li... > >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > >>> > > > > > > > > -- > > Robert Plummer > > > > > ------------------------------------------------------------------------------ > > For Developers, A Lot Can Happen In A Second. > > Boundary is the first to Know...and Tell You. > > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > > http://p.sf.net/sfu/Boundary-d2dvs2 > > _______________________________________________ > > Tikiwiki-cvs mailing list > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > > ------------------------------------------------------------------------------ > For Developers, A Lot Can Happen In A Second. > Boundary is the first to Know...and Tell You. > Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! > http://p.sf.net/sfu/Boundary-d2dvs2 > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: <rob...@us...> - 2012-04-12 20:49:33
|
Revision: 40875 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40875&view=rev Author: robertplummer Date: 2012-04-12 20:49:26 +0000 (Thu, 12 Apr 2012) Log Message: ----------- [FIX] Profile check on user with right permissions, migrated from the nast hack into trackers from request to a mildy nast hack of using the $.trackerForm, which isn't so bad, but will be on large sets of items. It works well though. [REM] Deleted replaceItemFromRequestValues and replaceItemFromRequestValue from tracker lib, they were just hacks and did not work [FIX] Commented out the reference to the above in tiki-edit_invoice, will find a better way once tracker query lib matures, it wasen't really working anyway Modified Paths: -------------- branches/9.x/templates/tiki-timesheet.tpl branches/9.x/tiki-edit_invoice.php branches/9.x/tiki-timesheet.php Modified: branches/9.x/templates/tiki-timesheet.tpl =================================================================== --- branches/9.x/templates/tiki-timesheet.tpl 2012-04-12 20:38:05 UTC (rev 40874) +++ branches/9.x/templates/tiki-timesheet.tpl 2012-04-12 20:49:26 UTC (rev 40875) @@ -1,4 +1,4 @@ -{if $timeSheetProfileLoaded neq true} +{if $timeSheetProfileLoaded neq true AND $tiki_p_admin eq 'y'} {tr}Apply the following profile for enhancements: {/tr} {button href="tiki-admin.php" profile="time_sheet" page="profiles" list="List" _text="Time_Sheet"} {/if} Modified: branches/9.x/tiki-edit_invoice.php =================================================================== --- branches/9.x/tiki-edit_invoice.php 2012-04-12 20:38:05 UTC (rev 40874) +++ branches/9.x/tiki-edit_invoice.php 2012-04-12 20:49:26 UTC (rev 40875) @@ -23,6 +23,7 @@ //handle saving data (edit or update) if ($_SERVER['REQUEST_METHOD'] == 'POST') { //start invoice + /* $_REQUEST['InvoiceId'] = $trklib->replaceItemFromRequestValues( $trklib->get_tracker_by_name("Invoices"), array( @@ -38,7 +39,8 @@ "Days Payment Due", ), $_REQUEST, $_REQUEST['InvoiceId'] - ); + );*/ + die; //end invoice //start invoice items @@ -190,6 +192,8 @@ var InvoiceId = $('#InvoiceId'); InvoiceId.val(InvoiceId.val() ? InvoiceId.val() : 0); + + return false; });" ); Modified: branches/9.x/tiki-timesheet.php =================================================================== --- branches/9.x/tiki-timesheet.php 2012-04-12 20:38:05 UTC (rev 40874) +++ branches/9.x/tiki-timesheet.php 2012-04-12 20:49:26 UTC (rev 40875) @@ -9,7 +9,7 @@ $access->check_feature(array('feature_time_sheet','feature_trackers')); $access->check_permission_either(array('tiki_p_view_trackers', 'tiki_p_create_tracker_items')); -global $user; +global $user, $prefs, $tiki_p_admin; $auto_query_args = array( 'all', 'profile', @@ -17,6 +17,10 @@ 'list' ); +$trackerId = (int)TikiLib::lib('trk')->get_tracker_by_name('Time sheet'); +$smarty->assign("tiki_p_admin", $tiki_p_admin); +$smarty->assign("timeSheetProfileLoaded", $trackerId > 0 ? true : false); + $projectList = Tracker_Query::tracker("Project list")->byName()->query(); if (isset($_REQUEST['all'])) { //all views all sheet items @@ -36,35 +40,25 @@ if (isset($projectList)) { if (isset($_REQUEST['save'])) { - $_REQUEST['Done_by'] = $user; - TikiLib::lib("trk")->replaceItemFromRequestValuesByName( - "Time sheet", - array( - "Summary", - "Associated project", - "Description", - "Amount of time spent", - "Done by" - ), - $_REQUEST - ); + echo json_encode( + $timeSheetNewInputs = Tracker_Query::tracker("Time sheet") + ->byName() + ->queryInput() + ); die; } - $timeSheetProfileLoaded = true; - $smarty->assign("timeSheetProfileLoaded", $timeSheetProfileLoaded); $smarty->assign("projectList", $projectList); $smarty->assign("timeSheet", $timeSheet); } TikiLib::lib("sheet")->setup_jquery_sheet(); -$headerlib = TikiLib::lib("header"); -$headerlib->add_cssfile("lib/jquery/jtrack/css/jtrack.css"); -$headerlib->add_jsfile("lib/jquery/jtrack/js/domcached-0.1-jquery.js"); -$headerlib->add_jsfile("lib/jquery/jtrack/js/jtrack.js"); -$headerlib->add_jq_onready( - " +$headerlib = TikiLib::lib("header") + ->add_cssfile("lib/jquery/jtrack/css/jtrack.css") + ->add_jsfile("lib/jquery/jtrack/js/domcached-0.1-jquery.js") + ->add_jsfile("lib/jquery/jtrack/js/jtrack.js") + ->add_jq_onready(" jTask.init(); $.timesheetSpreadsheet = function() { @@ -123,29 +117,49 @@ $('#timeSheetCommit').click(function() { $('#timeSheetTabs').modal(tr('Committing...')); var stack = []; - for (var namespace in $.DOMCached.getStorage()) { - stack.push(namespace); - $.post('tiki-timesheet.php?save', { - 'Summary': namespace, - 'Description': '', - 'Amount of time spent': $.DOMCached.get('timer', namespace) / 60 - }, function(o) { - $.DOMCached.deleteNamespace(namespace); - stack.pop(); - - if (stack.length == 0) { - $('#timeSheetTabs').modal(); - document.location = document.location + ''; - } - }); - } + $.getJSON('tiki-timesheet.php?save', function(inputs) { + for (var namespace in $.DOMCached.getStorage()) { + var summary = namespace + '', + time = $.DOMCached.get('timer', summary) / 60; + stack.push(summary); + + var form = $.trackerForm($trackerId).submit(function() { + $.post(form.attr('action') + '?' + form.serialize(), function() { + $.DOMCached.deleteNamespace(namespace); + + stack.pop(); + + if (stack.length == 0) { + document.location = document.location + ''; + } + }); + return false; + }); + + var input = { + 'Summary': $(inputs['Summary']), + 'Description': $(inputs['Description']), + 'Amount of time spent': $(inputs['Amount of time spent']) + }; + + input['Summary'].val(summary); + input['Amount of time spent'].val(time); + console.log(input); + form.append(input['Summary']); + form.append(input['Description']); + form.append(input['Amount of time spent']); + form.submit(); + } + }); + + return false; }); $('#timeSheetTabs') .width($('#timeSheetTabs').parent().width()) .tabs(); -" -); +"); + $smarty->assign('mid', 'tiki-timesheet.tpl'); // use tiki_full to include include CSS and JavaScript $smarty->display("tiki.tpl"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2012-04-14 23:29:28
|
Revision: 40908 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40908&view=rev Author: marclaporte Date: 2012-04-14 23:29:21 +0000 (Sat, 14 Apr 2012) Log Message: ----------- improve admin panels for PluginNow and PluginCountDown Modified Paths: -------------- branches/9.x/lib/prefs/wikiplugin.php branches/9.x/templates/admin/include_general.tpl branches/9.x/templates/admin/include_textarea.tpl Modified: branches/9.x/lib/prefs/wikiplugin.php =================================================================== --- branches/9.x/lib/prefs/wikiplugin.php 2012-04-14 23:21:19 UTC (rev 40907) +++ branches/9.x/lib/prefs/wikiplugin.php 2012-04-14 23:29:21 UTC (rev 40908) @@ -54,6 +54,7 @@ 'miniquiz' => 'y', 'module' => 'y', 'mouseover' => 'y', + 'now' => 'y', 'payment' => 'y', 'poll' => 'y', 'quote' => 'y', Modified: branches/9.x/templates/admin/include_general.tpl =================================================================== --- branches/9.x/templates/admin/include_general.tpl 2012-04-14 23:21:19 UTC (rev 40907) +++ branches/9.x/templates/admin/include_general.tpl 2012-04-14 23:29:21 UTC (rev 40908) @@ -284,6 +284,8 @@ {preference name=display_field_order} {preference name=users_prefs_display_12hr_clock} {preference name=tiki_same_day_time_only} + {preference name=wikiplugin_now} + {preference name=wikiplugin_countdown} <div class="adminoptionbox"> {assign var="fcnlink" value="http://www.php.net/manual/en/function.strftime.php"} Modified: branches/9.x/templates/admin/include_textarea.tpl =================================================================== --- branches/9.x/templates/admin/include_textarea.tpl 2012-04-14 23:21:19 UTC (rev 40907) +++ branches/9.x/templates/admin/include_textarea.tpl 2012-04-14 23:29:21 UTC (rev 40908) @@ -45,6 +45,7 @@ {preference name=wikiplugin_button} {preference name=wikiplugin_center} {preference name=wikiplugin_code} + {preference name=wikiplugin_countdown} {preference name=wikiplugin_div} {preference name=wikiplugin_dl} {preference name=wikiplugin_fade} @@ -60,6 +61,7 @@ {preference name=wikiplugin_mono} {preference name=wikiplugin_mouseover} {preference name=wikiplugin_mwtable} + {preference name=wikiplugin_now} {preference name=wikiplugin_quote} {preference name=wikiplugin_remarksbox} {preference name=wikiplugin_scroll} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <li...@us...> - 2012-04-15 17:42:36
|
Revision: 40925 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40925&view=rev Author: lindonb Date: 2012-04-15 17:42:29 +0000 (Sun, 15 Apr 2012) Log Message: ----------- [FIX] Renumber array keys from 0 for article topic arrays used in Smarty section loops. It appears there may be a bug in Smarty 3 in looping through arrays that aren't zero-based. I don't see a bug report but it is noted here: https://bugs.launchpad.net/phpdevshell/+bug/781565 Modified Paths: -------------- branches/9.x/modules/mod-func-article_topics.php branches/9.x/tiki-admin_topics.php branches/9.x/tiki-edit_article.php Modified: branches/9.x/modules/mod-func-article_topics.php =================================================================== --- branches/9.x/modules/mod-func-article_topics.php 2012-04-15 15:31:56 UTC (rev 40924) +++ branches/9.x/modules/mod-func-article_topics.php 2012-04-15 17:42:29 UTC (rev 40925) @@ -28,5 +28,9 @@ global $artlib; include_once('lib/articles/artlib.php'); $listTopics = $artlib->list_topics(); + /* To renumber array keys from 0 since smarty 3 doesn't seem to like arrays + * that start with other keys in a section loop, which this variable is used in + */ + $listTopics = array_values($listTopics); $smarty->assign('listTopics', $listTopics); } Modified: branches/9.x/tiki-admin_topics.php =================================================================== --- branches/9.x/tiki-admin_topics.php 2012-04-15 15:31:56 UTC (rev 40924) +++ branches/9.x/tiki-admin_topics.php 2012-04-15 17:42:29 UTC (rev 40925) @@ -47,6 +47,10 @@ $artlib->deactivate_topic($_REQUEST["deactivate"]); } $topics = $artlib->list_topics(); +/* To renumber array keys from 0 since smarty 3 doesn't seem to like arrays + * that start with other keys in a section loop, which this variable is used in + */ +$topics = array_values($topics); $temp_max = count($topics); for ($i = 0; $i < $temp_max; $i++) { if ($userlib->object_has_one_permission($topics[$i]["topicId"], 'topic')) { Modified: branches/9.x/tiki-edit_article.php =================================================================== --- branches/9.x/tiki-edit_article.php 2012-04-15 15:31:56 UTC (rev 40924) +++ branches/9.x/tiki-edit_article.php 2012-04-15 17:42:29 UTC (rev 40925) @@ -224,6 +224,10 @@ } $topics = $artlib->list_topics(); +/* To renumber array keys from 0 since smarty 3 doesn't seem to like arrays + * that start with other keys in a section loop, which this variable is used in + */ +$topics = array_values($topics); $smarty->assign_by_ref('topics', $topics); if (isset($_REQUEST['preview'])) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rob...@us...> - 2012-04-17 00:22:45
|
Revision: 40950 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40950&view=rev Author: robertplummer Date: 2012-04-17 00:22:38 +0000 (Tue, 17 Apr 2012) Log Message: ----------- [FIX] Ensure that handler columns and rows are imported, but found them not to even be saving on layouts, commented out till v10 Modified Paths: -------------- branches/9.x/lib/sheet/grid.php branches/9.x/templates/tiki-sheets.tpl Modified: branches/9.x/lib/sheet/grid.php =================================================================== --- branches/9.x/lib/sheet/grid.php 2012-04-17 00:10:04 UTC (rev 40949) +++ branches/9.x/lib/sheet/grid.php 2012-04-17 00:22:38 UTC (rev 40950) @@ -551,6 +551,8 @@ $this->id = $handler->id; $this->type = $handler->type; $this->cssName = $handler->cssName; + $this->rowCount = (isset($handler->rowCount) ? $handler->rowCount : $this->rowCount); + $this->columnCount = (isset($handler->columnCount) ? $handler->columnCount : $this->columnCount); $this->dataGrid = array(); $this->calcGrid = array(); @@ -1320,7 +1322,9 @@ { var $id; var $readDate; - + var $rowCount; + var $columnCount; + /** Constructor {{{2 * Assigns a sheet ID to the handler. * @param $id The ID of the sheet in the database. Modified: branches/9.x/templates/tiki-sheets.tpl =================================================================== --- branches/9.x/templates/tiki-sheets.tpl 2012-04-17 00:10:04 UTC (rev 40949) +++ branches/9.x/templates/tiki-sheets.tpl 2012-04-17 00:22:38 UTC (rev 40950) @@ -55,9 +55,9 @@ <table class="formcolor"> <tr><td>{tr}Title:{/tr}</td><td><input type="text" name="title" value="{$title|escape}"/></td></tr> <tr><td>{tr}Description:{/tr}</td><td><textarea rows="5" cols="40" name="description">{$description|escape}</textarea></td></tr> - <tr><td>{tr}Class Name:{/tr}</td><td><input type="text" name="className" value="{$className|escape}"/></td></tr> + <!--<tr><td>{tr}Class Name:{/tr}</td><td><input type="text" name="className" value="{$className|escape}"/></td></tr> <tr><td>{tr}Header Rows:{/tr}</td><td><input type="text" name="headerRow" value="{$headerRow|escape}"/></td></tr> - <tr><td>{tr}Footer Rows:{/tr}</td><td><input type="text" name="footerRow" value="{$footerRow|escape}"/></td></tr> + <tr><td>{tr}Footer Rows:{/tr}</td><td><input type="text" name="footerRow" value="{$footerRow|escape}"/></td></tr>--> <tr> <td>{tr}Wiki Parse Values:{/tr}</td><td> <input type="checkbox" name="parseValues"{if $parseValues eq 'y'} checked="checked"{/if}/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |