From: <jon...@us...> - 2009-09-03 11:23:40
|
Revision: 21230 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=21230&view=rev Author: jonnybradley Date: 2009-09-03 11:23:31 +0000 (Thu, 03 Sep 2009) Log Message: ----------- [MRG] Automatic merge, trunk 21215 to 21229 Modified Paths: -------------- branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php branches/experimental/kaltura_integration_two/lib/freetag/freetaglib.php branches/experimental/kaltura_integration_two/lib/toolbars/toolbarslib.php branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_mouseover.php branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_thumb.php branches/experimental/kaltura_integration_two/styles/layout/layout-reference.css branches/experimental/kaltura_integration_two/styles/layout/layout.css branches/experimental/kaltura_integration_two/templates/tiki-admin_menus.tpl branches/experimental/kaltura_integration_two/templates/tiki-admin_modules.tpl branches/experimental/kaltura_integration_two/templates/tiki-list_banners.tpl branches/experimental/kaltura_integration_two/tiki-browse_freetags.php branches/experimental/kaltura_integration_two/tiki-list_banners.php Property Changed: ---------------- branches/experimental/kaltura_integration_two/ branches/experimental/kaltura_integration_two/installer/schema/20081125_tiki_tracker_types_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090513_calendar_priority_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090513_wiki_similar_permission_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090727_category_permissions_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090727_user_votings_index_tiki.sql branches/experimental/kaltura_integration_two/installer/schema/20090805_kill_newsreader_tiki.sql branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/BilingualAligner.php branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php branches/experimental/kaltura_integration_two/lib/importer/index.php branches/experimental/kaltura_integration_two/lib/importer/tikiimporter.php branches/experimental/kaltura_integration_two/lib/importer/tikiimporter_wiki.php branches/experimental/kaltura_integration_two/lib/importer/tikiimporter_wiki_mediawiki.php branches/experimental/kaltura_integration_two/lib/jquery_tiki/ branches/experimental/kaltura_integration_two/lib/search/searchlib-mysql.php branches/experimental/kaltura_integration_two/lib/search/searchlib-tiki.php branches/experimental/kaltura_integration_two/lib/test/AllTests.php branches/experimental/kaltura_integration_two/lib/test/TikiTestCase.php branches/experimental/kaltura_integration_two/lib/test/core/AllTests.php branches/experimental/kaltura_integration_two/lib/test/core/Category/ branches/experimental/kaltura_integration_two/lib/test/core/DeclFilter/ branches/experimental/kaltura_integration_two/lib/test/core/JitFilter/ branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/ branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/AllTests.php branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php branches/experimental/kaltura_integration_two/lib/test/core/Perms/ branches/experimental/kaltura_integration_two/lib/test/core/TikiFilter/ branches/experimental/kaltura_integration_two/lib/test/core/WikiParser/ branches/experimental/kaltura_integration_two/lib/test/core/bootstrap.php branches/experimental/kaltura_integration_two/lib/test/core/phpunit.xml branches/experimental/kaltura_integration_two/lib/test/importer/AllTests.php branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/ branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/index.php branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/mediawiki_invalid_upload.xml branches/experimental/kaltura_integration_two/lib/test/importer/index.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_test.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_testcase.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_wiki_mediawiki_test.php branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_wiki_test.php branches/experimental/kaltura_integration_two/lib/test/index.php branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_mediaplayer.php branches/experimental/kaltura_integration_two/pics/icons/announce.png branches/experimental/kaltura_integration_two/pics/icons/announce_new.png branches/experimental/kaltura_integration_two/pics/icons/hot.png branches/experimental/kaltura_integration_two/pics/icons/hot_new.png branches/experimental/kaltura_integration_two/pics/icons/lock_new.png branches/experimental/kaltura_integration_two/pics/icons/page_new.png branches/experimental/kaltura_integration_two/pics/icons/sticky.png branches/experimental/kaltura_integration_two/pics/icons/sticky_new.png branches/experimental/kaltura_integration_two/styles/strasa/options/mono/pics/ branches/experimental/kaltura_integration_two/templates/ branches/experimental/kaltura_integration_two/tests/test_php_beautifier.php Property changes on: branches/experimental/kaltura_integration_two ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0:16998-18916 /branches/experimental/declfilter:15787-16031 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /trunk:20962-21110 + /branches/3.0:16998-18916 /branches/experimental/declfilter:15787-16031 /branches/experimental/ui-revamp2:16728-16731,16999-17002 /trunk:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20081125_tiki_tracker_types_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002 /trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:20049-20460,20962-21110 + /branches/3.0/installer/schema/20081125_tiki_tracker_types.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20081125_tiki_tracker_types.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20081125_tiki_tracker_types.sql:16728-16731,16999-17002 /trunk/installer/schema/20081125_tiki_tracker_types_tiki.sql:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090513_calendar_priority_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_calendar_priority_tiki.sql:20049-20460,20962-21110 + /branches/3.0/installer/schema/20090513_calendar_priority.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_calendar_priority.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_calendar_priority.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_calendar_priority_tiki.sql:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090513_wiki_similar_permission_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:20049-20460,20962-21110 + /branches/3.0/installer/schema/20090513_wiki_similar_permission.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090513_wiki_similar_permission.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090513_wiki_similar_permission.sql:16728-16731,16999-17002 /trunk/installer/schema/20090513_wiki_similar_permission_tiki.sql:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090727_category_permissions_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/installer/schema/20090727_category_permissions_tiki.sql:20962-21110 + /trunk/installer/schema/20090727_category_permissions_tiki.sql:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090727_user_votings_index_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090727_user_votings_index.php:16998-18916 /branches/experimental/declfilter/installer/schema/20090727_user_votings_index.php:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090727_user_votings_index.php:16728-16731,16999-17002 /trunk/installer/schema/20090727_user_votings_index_tiki.sql:20962-21110 + /branches/3.0/installer/schema/20090727_user_votings_index.php:16998-18916 /branches/experimental/declfilter/installer/schema/20090727_user_votings_index.php:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090727_user_votings_index.php:16728-16731,16999-17002 /trunk/installer/schema/20090727_user_votings_index_tiki.sql:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/installer/schema/20090805_kill_newsreader_tiki.sql ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/installer/schema/20090805_kill_newsreader.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090805_kill_newsreader.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090805_kill_newsreader.sql:16728-16731,16999-17002 /trunk/installer/schema/20090805_kill_newsreader_tiki.sql:20962-21110 + /branches/3.0/installer/schema/20090805_kill_newsreader.sql:16998-18916 /branches/experimental/declfilter/installer/schema/20090805_kill_newsreader.sql:15787-16031 /branches/experimental/ui-revamp2/installer/schema/20090805_kill_newsreader.sql:16728-16731,16999-17002 /trunk/installer/schema/20090805_kill_newsreader_tiki.sql:20962-21110,21216-21229 Modified: branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php =================================================================== --- branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/lib/calendar/calendarlib.php 2009-09-03 11:23:31 UTC (rev 21230) @@ -60,8 +60,9 @@ $mid .= implode( ' and ', $tmp_mid ) . ')'; } } - - $bindvars = array_merge($bindvars, $join_bindvars); + if (is_array($join_bindvars)) { + $bindvars = array_merge($bindvars, $join_bindvars); + } $query = "select $distinct * from `tiki_calendars` as tcal $join_tables $mid order by tcal.".$this->convertSortMode($sort_mode); $result = $this->query($query,$bindvars,$maxRecords,$offset); Property changes on: branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/BilingualAligner.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031 /trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:20049-20460,20962-21110 + /branches/3.0/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031 /trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031 /trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:20049-20460,20962-21110 + /branches/3.0/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031 /trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031 /trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:20049-20460,20962-21110 + /branches/3.0/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031 /trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:20049-20460,20962-21110,21216-21229 Modified: branches/experimental/kaltura_integration_two/lib/freetag/freetaglib.php =================================================================== --- branches/experimental/kaltura_integration_two/lib/freetag/freetaglib.php 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/lib/freetag/freetaglib.php 2009-09-03 11:23:31 UTC (rev 21230) @@ -310,14 +310,23 @@ $ret = array(); $permMap = $categlib->map_object_type_to_permission(); while ($row = $result->fetchRow()) { - if ($tiki_p_admin == 'y' || $this->user_has_perm_on_object($user, $row['itemId'], $row['type'], $permMap[$row['type']])) { + if ($tiki_p_admin == 'y') { $ret[] = $row; + } elseif ($row['type'] == 'blog post') { + global $bloglig; include_once('lib/blogs/bloglib.php'); + $post_info = $bloglib->get_post($row['itemId']); + if ($this->user_has_perm_on_object($user, $post_info['blogId'], 'blog', 'tiki_p_read_blog')) { + $ret[] = $row; + } else { + --$cant; + } + } elseif ($this->user_has_perm_on_object($user, $row['itemId'], $row['type'], $permMap[$row['type']])) { + $ret[] = $row; } else { --$cant; - } + } } - - + return array('data' => $ret, 'cant' => $cant); } Property changes on: branches/experimental/kaltura_integration_two/lib/importer/index.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/importer/index.php:20962-21110 + /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/importer/index.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/importer/tikiimporter.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/TikiImporter.php:16998-18916 /branches/experimental/declfilter/lib/importer/TikiImporter.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/TikiImporter.php:16728-16731,16999-17002 /trunk/lib/importer/tikiimporter.php:20049-20460,20962-21110 + /branches/3.0/lib/importer/TikiImporter.php:16998-18916 /branches/experimental/declfilter/lib/importer/TikiImporter.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/TikiImporter.php:16728-16731,16999-17002 /trunk/lib/importer/tikiimporter.php:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/importer/tikiimporter_wiki.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/TikiImporter_Wiki.php:16998-18916 /branches/experimental/declfilter/lib/importer/TikiImporter_Wiki.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki.php:16728-16731,16999-17002 /trunk/lib/importer/tikiimporter_wiki.php:20049-20460,20962-21110 + /branches/3.0/lib/importer/TikiImporter_Wiki.php:16998-18916 /branches/experimental/declfilter/lib/importer/TikiImporter_Wiki.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki.php:16728-16731,16999-17002 /trunk/lib/importer/tikiimporter_wiki.php:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/importer/tikiimporter_wiki_mediawiki.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/TikiImporter_Wiki_Mediawiki.php:16998-18916 /branches/experimental/declfilter/lib/importer/TikiImporter_Wiki_Mediawiki.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki_Mediawiki.php:16728-16731,16999-17002 /trunk/lib/importer/tikiimporter_wiki_mediawiki.php:20049-20460,20962-21110 + /branches/3.0/lib/importer/TikiImporter_Wiki_Mediawiki.php:16998-18916 /branches/experimental/declfilter/lib/importer/TikiImporter_Wiki_Mediawiki.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/TikiImporter_Wiki_Mediawiki.php:16728-16731,16999-17002 /trunk/lib/importer/tikiimporter_wiki_mediawiki.php:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/jquery_tiki ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/jquery_tiki:17151-18916 /branches/experimental/jquery/lib/jquery_tiki:16288-17075 /trunk/lib/jquery_tiki:20049-20460,20962-21110 + /branches/3.0/lib/jquery_tiki:17151-18916 /branches/experimental/jquery/lib/jquery_tiki:16288-17075 /trunk/lib/jquery_tiki:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/search/searchlib-mysql.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/searchlib.php:16998-18916 /branches/experimental/declfilter/lib/searchlib.php:15787-16031 /branches/experimental/ui-revamp2/lib/searchlib.php:16728-16731,16999-17002 /trunk/lib/search/searchlib-mysql.php:20206-20460,20962-21110 + /branches/3.0/lib/searchlib.php:16998-18916 /branches/experimental/declfilter/lib/searchlib.php:15787-16031 /branches/experimental/ui-revamp2/lib/searchlib.php:16728-16731,16999-17002 /trunk/lib/search/searchlib-mysql.php:20206-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/search/searchlib-tiki.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/search/searchlib.php:16998-18916 /branches/experimental/declfilter/lib/search/searchlib.php:15787-16031 /branches/experimental/ui-revamp2/lib/search/searchlib.php:16728-16731,16999-17002 /trunk/lib/search/searchlib-tiki.php:20206-20460,20962-21110 + /branches/3.0/lib/search/searchlib.php:16998-18916 /branches/experimental/declfilter/lib/search/searchlib.php:15787-16031 /branches/experimental/ui-revamp2/lib/search/searchlib.php:16728-16731,16999-17002 /trunk/lib/search/searchlib-tiki.php:20206-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/AllTests.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002 /trunk/lib/test/AllTests.php:20962-21110 + /branches/3.0/lib/core/test/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002 /trunk/lib/test/AllTests.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/TikiTestCase.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/TikiTestCase.php:16998-18916 /branches/experimental/declfilter/lib/core/test/TikiTestCase.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/TikiTestCase.php:16728-16731,16999-17002 /trunk/lib/test/TikiTestCase.php:20962-21110 + /branches/3.0/lib/core/test/TikiTestCase.php:16998-18916 /branches/experimental/declfilter/lib/core/test/TikiTestCase.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/TikiTestCase.php:16728-16731,16999-17002 /trunk/lib/test/TikiTestCase.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/AllTests.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002 /trunk/lib/test/core/AllTests.php:20962-21110 + /branches/3.0/lib/core/test/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/core/test/AllTests.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/AllTests.php:16728-16731,16999-17002 /trunk/lib/test/core/AllTests.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/Category ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/Category:16998-18916 /branches/experimental/declfilter/lib/core/test/Category:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/Category:16728-16731,16999-17002 /trunk/lib/test/core/Category:20962-21110 + /branches/3.0/lib/core/test/Category:16998-18916 /branches/experimental/declfilter/lib/core/test/Category:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/Category:16728-16731,16999-17002 /trunk/lib/test/core/Category:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/DeclFilter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/DeclFilter:16998-18916 /branches/experimental/declfilter/lib/core/test/DeclFilter:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/DeclFilter:16728-16731,16999-17002 /trunk/lib/test/core/DeclFilter:20962-21110 + /branches/3.0/lib/core/test/DeclFilter:16998-18916 /branches/experimental/declfilter/lib/core/test/DeclFilter:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/DeclFilter:16728-16731,16999-17002 /trunk/lib/test/core/DeclFilter:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/JitFilter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/JitFilter:16998-18916 /branches/experimental/declfilter/lib/core/test/JitFilter:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/JitFilter:16728-16731,16999-17002 /trunk/lib/test/core/JitFilter:20962-21110 + /branches/3.0/lib/core/test/JitFilter:16998-18916 /branches/experimental/declfilter/lib/core/test/JitFilter:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/JitFilter:16728-16731,16999-17002 /trunk/lib/test/core/JitFilter:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/Multilingual ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/Multilingual:16998-18916 /branches/experimental/declfilter/lib/core/test/Multilingual:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/Multilingual:16728-16731,16999-17002 /trunk/lib/test/core/Multilingual:20962-21110 + /branches/3.0/lib/core/test/Multilingual:16998-18916 /branches/experimental/declfilter/lib/core/test/Multilingual:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/Multilingual:16728-16731,16999-17002 /trunk/lib/test/core/Multilingual:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/AllTests.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/Multilingual/Aligner/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031 /trunk/lib/core/test/Multilingual/Aligner/AllTests.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/AllTests.php:20962-21110 + /branches/3.0/lib/core/test/Multilingual/Aligner/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031 /trunk/lib/core/test/Multilingual/Aligner/AllTests.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/AllTests.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031 /trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php:20962-21110 + /branches/3.0/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031 /trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/BilingualAlignerTest.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031 /trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php:20962-21110 + /branches/3.0/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16998-18916 /branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031 /trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/SentenceSegmentorTest.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16998-18916 /trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php:20962-21110 /trunk/tiki/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:4-9737 + /branches/3.0/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16998-18916 /trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:20049-20460 /trunk/lib/test/core/Multilingual/Aligner/ShortestPathFinderTest.php:20962-21110,21216-21229 /trunk/tiki/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:4-9737 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/Perms ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/Perms:16998-18916 /branches/experimental/declfilter/lib/core/test/Perms:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/Perms:16728-16731,16999-17002 /trunk/lib/test/core/Perms:20962-21110 + /branches/3.0/lib/core/test/Perms:16998-18916 /branches/experimental/declfilter/lib/core/test/Perms:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/Perms:16728-16731,16999-17002 /trunk/lib/test/core/Perms:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/TikiFilter ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/TikiFilter:16998-18916 /branches/experimental/declfilter/lib/core/test/TikiFilter:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/TikiFilter:16728-16731,16999-17002 /trunk/lib/test/core/TikiFilter:20962-21110 + /branches/3.0/lib/core/test/TikiFilter:16998-18916 /branches/experimental/declfilter/lib/core/test/TikiFilter:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/TikiFilter:16728-16731,16999-17002 /trunk/lib/test/core/TikiFilter:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/WikiParser ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/WikiParser:16998-18916 /branches/experimental/declfilter/lib/core/test/WikiParser:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/WikiParser:16728-16731,16999-17002 /trunk/lib/test/core/WikiParser:20962-21110 + /branches/3.0/lib/core/test/WikiParser:16998-18916 /branches/experimental/declfilter/lib/core/test/WikiParser:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/WikiParser:16728-16731,16999-17002 /trunk/lib/test/core/WikiParser:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/bootstrap.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/bootstrap.php:16998-18916 /branches/experimental/declfilter/lib/core/test/bootstrap.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/bootstrap.php:16728-16731,16999-17002 /trunk/lib/test/core/bootstrap.php:20962-21110 + /branches/3.0/lib/core/test/bootstrap.php:16998-18916 /branches/experimental/declfilter/lib/core/test/bootstrap.php:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/bootstrap.php:16728-16731,16999-17002 /trunk/lib/test/core/bootstrap.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/core/phpunit.xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/core/test/phpunit.xml:16998-18916 /branches/experimental/declfilter/lib/core/test/phpunit.xml:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/phpunit.xml:16728-16731,16999-17002 /trunk/lib/test/core/phpunit.xml:20962-21110 + /branches/3.0/lib/core/test/phpunit.xml:16998-18916 /branches/experimental/declfilter/lib/core/test/phpunit.xml:15787-16031 /branches/experimental/ui-revamp2/lib/core/test/phpunit.xml:16728-16731,16999-17002 /trunk/lib/test/core/phpunit.xml:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/AllTests.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/test/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/AllTests.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/AllTests.php:16728-16731,16999-17002 /trunk/lib/test/importer/AllTests.php:20962-21110 + /branches/3.0/lib/importer/test/AllTests.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/AllTests.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/AllTests.php:16728-16731,16999-17002 /trunk/lib/test/importer/AllTests.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/fixtures ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/test/fixtures:16998-18916 /branches/experimental/declfilter/lib/importer/test/fixtures:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/fixtures:16728-16731,16999-17002 /trunk/lib/test/importer/fixtures:20962-21110 + /branches/3.0/lib/importer/test/fixtures:16998-18916 /branches/experimental/declfilter/lib/importer/test/fixtures:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/fixtures:16728-16731,16999-17002 /trunk/lib/test/importer/fixtures:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/index.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/test/importer/fixtures/index.php:20962-21110 + /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/test/importer/fixtures/index.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/fixtures/mediawiki_invalid_upload.xml ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/test/fixtures/mediawiki_upload.xml:16998-18916 /branches/experimental/declfilter/lib/importer/test/fixtures/mediawiki_upload.xml:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/fixtures/mediawiki_upload.xml:16728-16731,16999-17002 /trunk/lib/test/importer/fixtures/mediawiki_invalid_upload.xml:20962-21110 + /branches/3.0/lib/importer/test/fixtures/mediawiki_upload.xml:16998-18916 /branches/experimental/declfilter/lib/importer/test/fixtures/mediawiki_upload.xml:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/fixtures/mediawiki_upload.xml:16728-16731,16999-17002 /trunk/lib/test/importer/fixtures/mediawiki_invalid_upload.xml:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/index.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/test/importer/index.php:20962-21110 + /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/test/importer/index.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_test.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/test/tikiimporter_test.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/tikiimporter_test.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_test.php:16728-16731,16999-17002 /trunk/lib/test/importer/tikiimporter_test.php:20962-21110 + /branches/3.0/lib/importer/test/tikiimporter_test.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/tikiimporter_test.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_test.php:16728-16731,16999-17002 /trunk/lib/test/importer/tikiimporter_test.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_testcase.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/test/tikiimporter_testcase.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/tikiimporter_testcase.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_testcase.php:16728-16731,16999-17002 /trunk/lib/test/importer/tikiimporter_testcase.php:20962-21110 + /branches/3.0/lib/importer/test/tikiimporter_testcase.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/tikiimporter_testcase.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_testcase.php:16728-16731,16999-17002 /trunk/lib/test/importer/tikiimporter_testcase.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_wiki_mediawiki_test.php ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/lib/test/importer/tikiimporter_wiki_mediawiki_test.php:20962-21110 + /trunk/lib/test/importer/tikiimporter_wiki_mediawiki_test.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/importer/tikiimporter_wiki_test.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/importer/test/tikiimporter_wiki_test.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/tikiimporter_wiki_test.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_wiki_test.php:16728-16731,16999-17002 /trunk/lib/test/importer/tikiimporter_wiki_test.php:20962-21110 + /branches/3.0/lib/importer/test/tikiimporter_wiki_test.php:16998-18916 /branches/experimental/declfilter/lib/importer/test/tikiimporter_wiki_test.php:15787-16031 /branches/experimental/ui-revamp2/lib/importer/test/tikiimporter_wiki_test.php:16728-16731,16999-17002 /trunk/lib/test/importer/tikiimporter_wiki_test.php:20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/lib/test/index.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/test/index.php:20962-21110 + /branches/3.0/lib/index.php:16998-18916 /branches/experimental/declfilter/lib/index.php:15787-16031 /branches/experimental/ui-revamp2/lib/index.php:16728-16731,16999-17002 /trunk/lib/test/index.php:20962-21110,21216-21229 Modified: branches/experimental/kaltura_integration_two/lib/toolbars/toolbarslib.php =================================================================== --- branches/experimental/kaltura_integration_two/lib/toolbars/toolbarslib.php 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/lib/toolbars/toolbarslib.php 2009-09-03 11:23:31 UTC (rev 21230) @@ -818,8 +818,7 @@ { $this->setLabel( tra('Wiki Help') ) ->setIcon( 'pics/icons/help.png' ) - ->setWysiwygToken( 'help' ) - ->setType('Helptool'); + ->setType('Helptool'); } // }}} function getWikiHtml( $areaName ) // {{{ Property changes on: branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_mediaplayer.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-18916 /trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:20049-20460,20962-21110 /trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737 + /branches/3.0/lib/wiki-plugins/wikiplugin_mediaplayer.php:16998-18916 /trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:20049-20460,20962-21110,21216-21229 /trunk/tiki/lib/wiki-plugins/wikiplugin_mediaplayer.php:4-9737 Modified: branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_mouseover.php =================================================================== --- branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_mouseover.php 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_mouseover.php 2009-09-03 11:23:31 UTC (rev 21230) @@ -63,22 +63,28 @@ 'description' => tra('y|n, parse the body of the plugin as wiki content. (Default to y)'), 'filter' => 'alpha', ), + 'class' => array( + 'required' => false, + 'name' => tra('CSS Class'), + 'description' => 'Default: plugin-mouseover', + 'filter' => 'alpha', + ), 'bgcolor' => array( 'required' => false, - 'name' => tra('Color of the inside popup'), - 'description' => tra('Default: #F5F5F5'), + 'name' => tra('Background color of the popup'), + 'description' => tra(''), 'filter' => 'striptags', ), 'textcolor' => array( 'required' => false, - 'name' => tra('Text popup color'), - 'description' => tra('#FFFFFF'), + 'name' => tra('Text color in the popup'), + 'description' => tra(''), 'filter' => 'striptags', ), 'sticky' => array( 'required' => false, 'name' => tra('Sticky'), - 'description' => 'y|n, when enabled, popup stays visible until an other one is displayed or it is clicked.', + 'description' => 'y|n, when enabled, popup stays visible until it is clicked.', 'filter' => 'alpha', ), 'padding' => array( @@ -87,6 +93,18 @@ 'description' => 'Default: 5px', 'filter' => 'digits', ), + 'effect' => array( + 'required' => false, + 'name' => tra('Effect'), + 'description' => 'Options: None|Default|Slide|Fade (and with jQuery UI enabled: Blind|Clip|Drop|Explode|Fold|Puff|Slide)', + 'filter' => 'alpha', + ), + 'speed' => array( + 'required' => false, + 'name' => tra('Effect speed'), + 'description' => 'Options: Fast|Normal|Slow', + 'filter' => 'alpha', + ), ), ); } @@ -95,7 +113,7 @@ global $smarty, $tikilib; if( ! isset($params['url']) ) { - $url = 'javascript:void()'; + $url = 'javascript:void(0)'; } else { $url = $params['url']; } @@ -106,7 +124,9 @@ $offsety = isset( $params['offsety'] ) ? (int) $params['offsety'] : 0; $parse = ! isset($params['parse']) || $params['parse'] != 'n'; $sticky = isset($params['sticky']) && $params['sticky'] == 'y'; - $padding = isset( $params['padding'] ) ? (int) $params['padding'] : 5; + $padding = isset( $params['padding'] ) ? 'padding: '.$params['padding'].'px;' : ''; + $effect = !isset( $params['effect'] ) || $params['effect'] == 'Default' ? '' : strtolower($params['effect']); + $speed = !isset( $params['speed'] ) ? 'normal' : strtolower($params['speed']); if (empty($params['label']) && empty($params['text'])) { $label = tra('No label specified'); @@ -129,31 +149,21 @@ global $headerlib; - $headerlib->add_js( " -window.addEvent('domready', function() { - $('$id-link').addEvent( 'mouseover', function(event) { - if( window.wikiplugin_mouseover ) - window.wikiplugin_mouseover.setStyle('display', 'none'); + $js = "\$jq('#$id-link').mouseover(function(event) { + \$jq('#$id').css('left', event.pageX + $offsetx).css('top', event.pageY + $offsety); showJQ('#$id', '$effect', '$speed'); });"; + if ($sticky) { + $js .= "\$jq('#$id').click(function(event) { hideJQ('#$id', '$effect', '$speed'); }).css('cursor','pointer');\n"; + } else { + $js .= "\$jq('#$id-link').mouseout(function(event) { setTimeout(function() {hideJQ('#$id', '$effect', '$speed')}, 250); });"; + } + $headerlib->add_jq_onready($js); + + $bgcolor = isset($params['bgcolor']) ? ("background-color: " . $params['bgcolor'] . ';') : ''; + $textcolor = isset($params['textcolor']) ? ("color:" . $params['textcolor'] . ';') : ''; + $class = !isset( $params['class'] ) ? 'class="plugin-mouseover"' : 'class="'.$params['class'].'"'; + + $html = "~np~<a id=\"$id-link\" href=\"$url\">$label</a>". + "<span id=\"$id\" $class style=\"width: {$width}px; " . (isset($params['height']) ? "height: {$height}px; " : "") ."{$bgcolor} {$textcolor} {$padding} \">$text</span>~/np~"; - window.wikiplugin_mouseover = $('$id'); - window.wikiplugin_mouseover.setStyle('left', (event.page.x + $offsetx) + 'px'); - window.wikiplugin_mouseover.setStyle('top', (event.page.y + $offsety) + 'px'); - window.wikiplugin_mouseover.setStyle('display','block'); - - window.wikiplugin_mouseover.addEvent( 'click', function(event) { - window.wikiplugin_mouseover.setStyle( 'display', 'none' ); - } ); - } ); - " . ( $sticky ? '' : " - $('$id-link').addEvent( 'mouseout', function(event) { - $('$id').setStyle('display','none'); - } ); " ) . " -} ); -" ); - $bgcolor = "background-color: " . ( isset($params['bgcolor']) ? $params['bgcolor'] : '#F5F5F5' ) . ';'; - $textcolor = isset($params['textcolor']) ? ("color:" . $params['textcolor'] . ';') : ''; - - $html = "~np~<a id=\"$id-link\" href=\"$url\">$label</a><div id=\"$id\" style=\"width: {$width}px; " . (isset($params['height']) ? "height: {$height}px; " : "") . "{$bgcolor} {$textcolor} display:none; padding: {$padding}px ;position: absolute; z-index: 500;\">$text</div>~/np~"; - return $html; } Modified: branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_thumb.php =================================================================== --- branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_thumb.php 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/lib/wiki-plugins/wikiplugin_thumb.php 2009-09-03 11:23:31 UTC (rev 21230) @@ -85,7 +85,7 @@ $float = "none"; } if (!isset($url)) { - $url = "javascript:void()"; + $url = "javascript:void(0)"; } if( isset($file) && !empty($file) ) { Property changes on: branches/experimental/kaltura_integration_two/pics/icons/announce.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/announce.png:15787-16031 /trunk/pics/icons/announce.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/announce.png:15787-16031 /trunk/pics/icons/announce.png:18953-20428,20611-20670,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/pics/icons/announce_new.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/announce_new.png:15787-16031 /trunk/pics/icons/announce_new.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/announce_new.png:15787-16031 /trunk/pics/icons/announce_new.png:18953-20428,20611-20670,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/pics/icons/hot.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/hot.png:15787-16031 /trunk/pics/icons/hot.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/hot.png:15787-16031 /trunk/pics/icons/hot.png:18953-20428,20611-20670,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/pics/icons/hot_new.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/hot_new.png:15787-16031 /trunk/pics/icons/hot_new.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/hot_new.png:15787-16031 /trunk/pics/icons/hot_new.png:18953-20428,20611-20670,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/pics/icons/lock_new.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/locked_new.png:15787-16031 /trunk/pics/icons/lock_new.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/locked_new.png:15787-16031 /trunk/pics/icons/lock_new.png:18953-20428,20611-20670,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/pics/icons/page_new.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/page_new.png:15787-16031 /trunk/pics/icons/page_new.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/page_new.png:15787-16031 /trunk/pics/icons/page_new.png:18953-20428,20611-20670,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/pics/icons/sticky.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/sticky.png:15787-16031 /trunk/pics/icons/sticky.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/sticky.png:15787-16031 /trunk/pics/icons/sticky.png:18953-20428,20611-20670,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/pics/icons/sticky_new.png ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/declfilter/img/silk/sticky_new.png:15787-16031 /trunk/pics/icons/sticky_new.png:18953-20428,20611-20670,20962-21110 + /branches/experimental/declfilter/img/silk/sticky_new.png:15787-16031 /trunk/pics/icons/sticky_new.png:18953-20428,20611-20670,20962-21110,21216-21229 Modified: branches/experimental/kaltura_integration_two/styles/layout/layout-reference.css =================================================================== --- branches/experimental/kaltura_integration_two/styles/layout/layout-reference.css 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/styles/layout/layout-reference.css 2009-09-03 11:23:31 UTC (rev 21230) @@ -1556,6 +1556,15 @@ margin-top: 8px; } +/* mouseover plugin */ + +.plugin-mouseover { + position: absolute; + z-index: 500; + display:none; + padding: .4em; +} + /** Wiki tocs **/ div.tocnav { margin-bottom: 4px; Modified: branches/experimental/kaltura_integration_two/styles/layout/layout.css =================================================================== --- branches/experimental/kaltura_integration_two/styles/layout/layout.css 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/styles/layout/layout.css 2009-09-03 11:23:31 UTC (rev 21230) @@ -1268,6 +1268,15 @@ margin-top: 8px; } +/* mouseover plugin */ + +.plugin-mouseover { + position: absolute; + z-index: 500; + display:none; + padding: .4em; +} + /** Wiki tocs **/ div.tocnav { margin-bottom: 4px; Property changes on: branches/experimental/kaltura_integration_two/styles/strasa/options/mono/pics ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/styles/strasa/options/mono/pics:18696-18916 /trunk/styles/strasa/options/mono/pics:20049-20460,20962-21110 + /branches/3.0/styles/strasa/options/mono/pics:18696-18916 /trunk/styles/strasa/options/mono/pics:20049-20460,20962-21110,21216-21229 Property changes on: branches/experimental/kaltura_integration_two/templates ___________________________________________________________________ Modified: svn:mergeinfo - /branches/experimental/perms-take2/templates:20049-20462 /trunk/templates:20962-21110 + /branches/experimental/perms-take2/templates:20049-20462 /trunk/templates:20962-21110,21216-21229 Modified: branches/experimental/kaltura_integration_two/templates/tiki-admin_menus.tpl =================================================================== --- branches/experimental/kaltura_integration_two/templates/tiki-admin_menus.tpl 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/templates/tiki-admin_menus.tpl 2009-09-03 11:23:31 UTC (rev 21230) @@ -1,5 +1,11 @@ {title help="Menus"}{tr}Admin Menus{/tr}{/title} +{if $tiki_p_admin eq 'y'} + <div class="navbar"> + {button href="tiki-admin_modules.php" _text="{tr}Admin Modules{/tr}"} + </div> +{/if} + {tabset name="admin_menus"} {tab name="{tr}Menus{/tr}"} {include file='find.tpl'} Modified: branches/experimental/kaltura_integration_two/templates/tiki-admin_modules.tpl =================================================================== --- branches/experimental/kaltura_integration_two/templates/tiki-admin_modules.tpl 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/templates/tiki-admin_modules.tpl 2009-09-03 11:23:31 UTC (rev 21230) @@ -5,6 +5,9 @@ <div class="navbar"> {button href="tiki-admin_modules.php?clear_cache=1" _text="{tr}Clear Cache{/tr}"} + {if $tiki_p_edit_menu eq 'y'} + {button href="tiki-admin_menus.php" _text="{tr}Admin Menus{/tr}"} + {/if} </div> {tabset name='tabs_adminmodules'} Modified: branches/experimental/kaltura_integration_two/templates/tiki-list_banners.tpl =================================================================== --- branches/experimental/kaltura_integration_two/templates/tiki-list_banners.tpl 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/templates/tiki-list_banners.tpl 2009-09-03 11:23:31 UTC (rev 21230) @@ -4,9 +4,11 @@ {remarksbox type="tip" title="{tr}Tip{/tr}"}{tr}To use a banner in a <a class="rbox-link" href="tiki-admin_modules.php">module</a> or a template, use {literal}{banner zone=ABC}{/literal}, where ABC is the name of the zone.{/tr}{/remarksbox} -<div class="navbar"> - {button href="tiki-edit_banner.php" _text="{tr}Create banner{/tr}"} -</div> +{if $tiki_p_admin_banners eq 'y'} + <div class="navbar"> + {button href="tiki-edit_banner.php" _text="{tr}Create banner{/tr}"} + </div> +{/if} {if $listpages or ($find ne '')} {include file='find.tpl'} Property changes on: branches/experimental/kaltura_integration_two/tests/test_php_beautifier.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/3.0/test_php_beautifier.php:16998-18916 /branches/experimental/declfilter/test_php_beautifier.php:15787-16031 /branches/experimental/ui-revamp2/test_php_beautifier.php:16728-16731,16999-17002 /trunk/tests/test_php_beautifier.php:20049-20460,20962-21110 + /branches/3.0/test_php_beautifier.php:16998-18916 /branches/experimental/declfilter/test_php_beautifier.php:15787-16031 /branches/experimental/ui-revamp2/test_php_beautifier.php:16728-16731,16999-17002 /trunk/tests/test_php_beautifier.php:20049-20460,20962-21110,21216-21229 Modified: branches/experimental/kaltura_integration_two/tiki-browse_freetags.php =================================================================== --- branches/experimental/kaltura_integration_two/tiki-browse_freetags.php 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/tiki-browse_freetags.php 2009-09-03 11:23:31 UTC (rev 21230) @@ -37,6 +37,9 @@ $tag = $freetaglib->get_tag_suggestion('', 1); if (!empty($tag[0])) { $_REQUEST['tag'] = $tag[0]; + if (strstr($tag[0], ' ')) { + $_REQUEST['tag'] = '"'.$_REQUEST['tag'].'"'; + } } } if (!isset($_REQUEST["sort_mode"])) { Modified: branches/experimental/kaltura_integration_two/tiki-list_banners.php =================================================================== --- branches/experimental/kaltura_integration_two/tiki-list_banners.php 2009-09-02 15:08:40 UTC (rev 21229) +++ branches/experimental/kaltura_integration_two/tiki-list_banners.php 2009-09-03 11:23:31 UTC (rev 21230) @@ -15,13 +15,7 @@ $smarty->display("error.tpl"); die; } -// IF NOT LOGGED aND NOT ADMIN BAIL OUT -if ($tiki_p_admin != 'y') { - $smarty->assign('errortype', 401); - $smarty->assign('msg', tra("Permission denied")); - $smarty->display("error.tpl"); - die; -} + if (isset($_REQUEST["remove"])) { if ($tiki_p_admin_banners != 'y') { $smarty->assign('errortype', 401); @@ -63,7 +57,11 @@ } $smarty->assign('find', $find); // Get a list of last changes to the Wiki database -$who = 'admin'; +if ($tiki_p_admin_banners == 'y') { + $who = 'admin'; +} else { + $who = $user; +} $listpages = $bannerlib->list_banners($offset, $maxRecords, $sort_mode, $find, $who); $smarty->assign_by_ref('cant_pages', $listpages["cant"]); $smarty->assign_by_ref('listpages', $listpages["data"]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |