--
cgit v1.2.3
From e56b227b471a2f77081fdd2c1aec71edafd6d5f8 Mon Sep 17 00:00:00 2001
From: brettp
Date: Wed, 27 Apr 2011 20:42:50 +0000
Subject: Updated search's readme to markdown.
git-svn-id: http://code.elgg.org/elgg/trunk@9034 36083f99-b078-4883-b0ff-0f9b5a30f544
---
mod/search/README.txt | 459 ++++++++++++++++++++++++++------------------------
1 file changed, 239 insertions(+), 220 deletions(-)
(limited to 'mod')
diff --git a/mod/search/README.txt b/mod/search/README.txt
index fe87f3334..851179c58 100644
--- a/mod/search/README.txt
+++ b/mod/search/README.txt
@@ -1,262 +1,281 @@
+= Elgg Search =
+
Full text search developer's reference.
-CONTENTS:
- 1. Overview
- 2. Search and Custom Plugins
- 3. Controlling Search Results
- 3.1 Entities Returned
- 3.2 Custom Search
- 4. Controlling Search Views
- 4.1 Entities
- 4.2 Listing
- 4.3 Layout
- 5. Hints and Quirks
+== Contents ==
+1. Overview
+2. Search and Custom Plugins
+3. Controlling Search Results
+ 1. Entities Returned
+ 2. Custom Search
+4. Controlling Search Views
+ 1. Entities
+ 2. Listing
+ 3. Layout
+5. Hints and Quirks
-1. OVERVIEW
- * All entities are searched through title and description using
- MySQL's native fulltext search when possible, and LIKE %...% when not.
- This can be overridden on a type/subtype basis.
-
- * Entities are displayed in a standard list view consisting of a
- title, blurb, and icon of the owning entity. This can be overridden
- on a type/subtype basis.
-
- * Search is separated based upon types/subtypes pairs and any
- registered custom search.
-
- * METADATA, ANNOTATIONS, AND PRIVATE DATA ARE NOT SEARCHED.
- These are used in a variety of ways by plugin authors and generally
- should not be displayed. There are exceptions (profile fields and
- comments) but if a plugin needs to match against metadata,
- annotations, or private data it must register a search hook itself.
+== 1. Overview ==
+All entities are searched through title and description using
+MySQL's native fulltext search when possible, and `LIKE %...%` when not.
+This can be overridden on a type/subtype basis.
-2. SEARCH AND CUSTOM PLUGINS
+Entities are displayed in a standard list view consisting of a
+title, blurb, and icon of the owning entity. This can be overridden
+on a type/subtype basis.
- * To appear in search you must register your entity type and subtype
- by saying in your plugin's init function:
-
- register_entity_type($type, $subtype);
-
- If you are extending ElggObject with your own class, it is also advised
- to add a subtype in your plugin's run_once function by saying:
-
- add_subtype($type, $subtype, $class);
+Search is separated based upon types/subtypes pairs and any
+registered custom search.
- * If your plugin uses ElggEntity's standard title and description,
- and you don't need a custom display, there is nothing else you need
- to do for your results to appear in search. If you would like more
- granular control of search, continue below.
+**METADATA, ANNOTATIONS, AND PRIVATE DATA ARE NOT SEARCHED BY DEFAULT!**
-3.0 CONTROLLING SEARCH RESULTS
+These are used in a variety of ways by plugin authors and generally
+should not be displayed. There are exceptions (profile fields and
+comments) but if a plugin needs to match against metadata,
+annotations, or private data it must register a search hook itself.
- * Search results can be controlled at a object:subtype level.
-
- * You can specify your own search types by responding to a hook.
-
-3.1 CONTROLLING SEARCH RESULTS - ENTITIES RETURNED
+== 2. Search and Custom Plugins ==
- * You can override the default search by responding to the search/type
- or search/type:subtype hook. Generally, you will be replying to
- search/object:subtype.
+To appear in search you must register your entity type and subtype
+by saying in your plugin's init function:
- * Search will first trigger a hook for search/type:subtype. If no
- results are returned (but not FALSE, see below) a hook for search/type
- will be triggered.
-
- * FALSE returned for any search hook will halt results for that
- type/subtype.
-
- * Register plugin hooks like this:
-
- register_plugin_hook('search', 'object:my_subtype',
- 'my_subtype_search_hook');
-
- * The hooked function is provided with details about the search query
- in $param. These include:
- query
- offset
- limit
- search_type
- type - Entity type. (Not applicable for custom searches)
- subtype - Entity subtype. (Not applicable for custom searches)
- owner_guid
- friends - Should only entities by friends of the logged in
- user be searched? (@todo)
- pagination - Show pagination?
-
- * The hooked function should respond to search triggers with the
- following:
- array(
- 'count' => A count of ALL entities found,
- 'entities' => An array of entities.
- )
-
- This information is passed directly to the search view, so if you are
- registering your own custom hook, you can provide more
- information to display in your custom view.
-
- * For each entity in the returned array, search expects two pieces of
- volatile data: search_matched_title and search_matched_description.
- Set these by saying:
-
- $entity->setVolatileData('data_name', 'data_value');
-
- Again, if you are customizing your search views, you can add anything
- you need.
+ register_entity_type($type, $subtype);
+If you are extending ElggObject with your own class, it is also advised
+to add a subtype in your plugin's run_once function by saying:
-3.2 CONTROLLING SEARCH RESULTS - CUSTOM SEARCH
-
- * Non-entities, including information from 3rd party applications,
- can easily be included in search by registering a custom search hook
- that responds to the search_types/get_types trigger:
-
- register_plugin_hook('search_types', 'get_types',
- 'my_custom_search_hook_function');
+ add_subtype($type, $subtype, $class);
+
+If your plugin uses ElggEntity's standard title and description,
+and you don't need a custom display, there is nothing else you need
+to do for your results to appear in search. If you would like more
+granular control of search, continue below.
+
+
+== 3. Controlling Search Results ==
+
+Search results can be controlled at a object:subtype level.
- In this function, append to the array sent in $value with the name of
- your custom search:
+You can specify your own search types by responding to a hook.
+
+
+=== 3.1 Controlling Search Results - Entities Returned ===
+
+You can override the default search by responding to the search/type
+or search/type:subtype hook. Generally, you will be replying to
+search/object:subtype.
+
+Search will first trigger a hook for search/type:subtype. If no
+results are returned (but not FALSE, see below) a hook for search/type
+will be triggered.
+
+FALSE returned for any search hook will halt results for that
+type/subtype.
+
+Register plugin hooks like this:
+
+ register_plugin_hook('search', 'object:my_subtype',
+ 'my_subtype_search_hook');
+
+The hooked function is provided with details about the search query
+in $param. These include:
+
+* query
+* offset
+* limit
+* search_type
+* type - Entity type. (Not applicable for custom searches)
+* subtype - Entity subtype. (Not applicable for custom searches)
+* owner_guid
+* friends - Should only entities by friends of the logged in
+ user be searched? (@todo)
+* pagination - Show pagination?
+
+The hooked function should respond to search triggers with the
+following:
+
+ array(
+ 'count' => A count of ALL entities found,
+ 'entities' => An array of entities.
+ )
+
+This information is passed directly to the search view, so if you are
+registering your own custom hook, you can provide more
+information to display in your custom view.
+
+For each entity in the returned array, search expects two pieces of
+volatile data: search_matched_title and search_matched_description.
+Set these by saying:
+
+ $entity->setVolatileData('data_name', 'data_value');
+
+Again, if you are customizing your search views, you can add anything
+you need.
+
+
+=== 3.2 Controlling Search Results - Custom Search ===
- function my_custom_search_hook_function($hook, $type,
+Non-entities, including information from 3rd party applications,
+can easily be included in search by registering a custom search hook
+that responds to the search_types/get_types trigger:
+
+ register_plugin_hook('search_types', 'get_types',
+ 'my_custom_search_hook_function');
+
+In this function, append to the array sent in $value with the name of
+your custom search:
+
+ function my_custom_search_hook_function($hook, $type,
$value, $params) {
- $value[] = 'my_custom_search';
- return $value;
- }
-
- Search will trigger a hook for search/my_custom_search, which your
- plugin should respond to as detailed in section 3.1 above.
+ $value[] = 'my_custom_search';
+ return $value;
+ }
-4.0 CONTROLLING SEARCH VIEWS
- * Three types views are used for displaying search: entity, listing,
- and layout.
+Search will trigger a hook for search/my_custom_search, which your
+plugin should respond to as detailed in section 3.1 above.
- * Each view has a default that standardizes the display of entities
- regardless of type, subtype, or search type.
- * The entity and listing views can be customized based upon a type,
- subtype, or custom search type of the results.
+== 4.0 Controlling Search Views ==
+Three types views are used for displaying search: entity, listing,
+and layout.
- * The layout view can be customized based upon the original search
- type. NB: This can be different to the types for the results.
+Each view has a default that standardizes the display of entities
+regardless of type, subtype, or search type.
- * The entity view controls how each individual result is formatted.
+The entity and listing views can be customized based upon a type,
+subtype, or custom search type of the results.
- * The listing view control how each group of listings is formatted.
+The layout view can be customized based upon the original search
+type. NB: This can be different to the types for the results.
- * The listing layout controls how each full result set is formatted.
+The entity view controls how each individual result is formatted.
+The listing view control how each group of listings is formatted.
-4.1 CONTROLLING SEARCH VIEWS - ENTITIES
+The listing layout controls how each full result set is formatted.
- * The default view for entities is search/entity.
- * Search views are separate from the object/entity views because
- view types might not match entity types.
-
- * The default search listing view iterates through each entity
- found and passes to the entity view. See 3.3 for more information
- about listing views.
-
- * Entity views are discovered in the following order. The first search
- view found is used.
- search/type/subtype/entity (For entity-based searches only)
- search/type/entity
- search/entity
-
- * The following parameters are passed in $vars to the entity view by
- the default listing view:
- entity => The current returned entity
- results => The results from the search/type:subtype hook
- params => The params passed to the search/type:subtype hook
-
- * Example: To create an entity view for an ElggObject of subtype blog,
- create a file called:
- views/default/search/object/blog/entity.php
-
- To create an entity view for a custom search mysearch, create a file
- called:
- views/default/search/mysearch/entity.php
-
-
-4.2 CONTROLLING SEARCH VIEWS - LISTING
+=== 4.1 Controlling Search Views - Entities ===
+
+The default view for entities is search/entity.
+
+Search views are separate from the object/entity views because
+view types might not match entity types.
+
+The default search listing view iterates through each entity
+found and passes to the entity view. See 3.3 for more information
+about listing views.
+
+Entity views are discovered in the following order. The first search
+view found is used.
+
+ search/type/subtype/entity (For entity-based searches only)
+ search/type/entity
+ search/entity
- * The default search view is search/listing.
+The following parameters are passed in $vars to the entity view by
+the default listing view:
+
+ entity => The current returned entity
+ results => The results from the search/type:subtype hook
+ params => The params passed to the search/type:subtype hook
+
+Example: To create an entity view for an ElggObject of subtype blog,
+create a file called:
+
+ views/default/search/object/blog/entity.php
+
+To create an entity view for a custom search mysearch, create a file
+called:
+
+ views/default/search/mysearch/entity.php
- * For each entity in the returned array, search expects two pieces of
- volatile data: search_matched_title and search_matched_description.
- * Listing views are discovered in the following order. The first
- search view found is used.
- search/type/subtype/listing (For entity-based searches only)
- search/type/listing
- search/listing
-
- * The view is called with the following in $vars:
- results => The results from the search/type:subtype hook
- params => The params passed to the search/type:subtype hook
-
- * Example: To create a listing view for ElggObjects with the subtype
- of blog, create a file called:
- views/default/search/object/blog/listing.php
-
- To create a listing view for the custom search mysearch, create a file
- called:
- views/default/search/mysearch/listing.php
+=== 4.2 Controlling Search Views - Listing
+
+The default search view is search/listing.
+
+For each entity in the returned array, search expects two pieces of
+volatile data: search_matched_title and search_matched_description.
+
+Listing views are discovered in the following order. The first
+search view found is used.
+ search/type/subtype/listing (For entity-based searches only)
+ search/type/listing
+ search/listing
+
+The view is called with the following in $vars:
+ results => The results from the search/type:subtype hook
+ params => The params passed to the search/type:subtype hook
+
+Example: To create a listing view for ElggObjects with the subtype
+of blog, create a file called:
+
+ views/default/search/object/blog/listing.php
+
+To create a listing view for the custom search mysearch, create a file
+called:
+
+ views/default/search/mysearch/listing.php
-4.3 CONTROLLING SEARCH VIEWS - LAYOUT
-
- * The default layout view for search is search/layout, which calls
- to elgg_view_layout(two_column_left_sidebar', '', $entity_results);
+=== 4.3 Controlling Search Views - Layout ===
- * Layouts can be overridden only when not searching all entities.
-
- * Layout views are discovered in the following order. The first search
- view found is used.
- search/type/subtype/layout (For entity-based searches only)
- search/type/layout
- search/layout
-
- * The following parameters are passed in $vars to the layout view:
- body => The HTML formatted list of results.
- params => The original params for the search.
-
- * Example: To create a layout view for ElggObjects with the subtype
- of blog, create a file called:
- views/default/search/object/blog/layout.php
-
- To create a layout view for the custom search mysearch, create a file
- called:
- views/default/search/mysearch/layout.php
+The default layout view for search is search/layout, which calls
+to `elgg_view_layout(two_column_left_sidebar', '', $entity_results);`
+Layouts can be overridden only when not searching all entities.
-5. HINTS AND QUIRKS
+Layout views are discovered in the following order. The first search
+view found is used.
- * Use search_get_relevant_substring() to extract and highlight
- relevant substrings for the search_match_title and description.
-
- * If searching in 3rd party applications, create a temporary
- ElggObject to hold the results. No need to save it since search
- uses volatile data.
- $entity = new ElggObject();
- $entity->owner_guid = use_magic_to_match_to_a_real_user();
- $entity->setVolatileData('search_matched_title',
- '3rd Party Integration');
- $entity->setVolatileData('search_matched_description',
- 'Searching is fun!');
-
- return array(
- 'count' => $count,
- 'entities' => array($entity)
- );
+ search/type/subtype/layout (For entity-based searches only)
+ search/type/layout
+ search/layout
+
+The following parameters are passed in $vars to the layout view:
+
+ body => The HTML formatted list of results.
+ params => The original params for the search.
+
+Example: To create a layout view for ElggObjects with the subtype
+of blog, create a file called:
+
+ views/default/search/object/blog/layout.php
+
+To create a layout view for the custom search mysearch, create a file
+called:
+
+ views/default/search/mysearch/layout.php
+
+
+== 5. Hints and Quirks ==
+
+Use search_get_relevant_substring() to extract and highlight
+relevant substrings for the search_match_title and description.
+
+If searching in 3rd party applications, create a temporary
+ElggObject to hold the results. No need to save it since search
+uses volatile data.
+
+ $entity = new ElggObject();
+ $entity->owner_guid = use_magic_to_match_to_a_real_user();
+ $entity->setVolatileData('search_matched_title',
+ '3rd Party Integration');
+ $entity->setVolatileData('search_matched_description',
+ 'Searching is fun!');
+
+ return array(
+ 'count' => $count,
+ 'entities' => array($entity)
+ );
- * MySQL's fulltext engine returns *ZERO* rows if more than 50% of
- the rows searched match.
+MySQL's fulltext engine returns *ZERO* rows if more than 50% of
+the rows searched match.
- * The default search hooks for users and groups ignore subtypes.
- See http://trac.elgg.org/elgg/ticket/1499
+The default search hooks for users and groups ignore subtypes.
+See [trac ticket 1499](http://trac.elgg.org/elgg/ticket/1499)
--
cgit v1.2.3
From 27c49d2f0d4a6f4ed797c0e52626b444364efa4a Mon Sep 17 00:00:00 2001
From: brettp
Date: Wed, 27 Apr 2011 21:20:48 +0000
Subject: Fixed typo in search's readme.
git-svn-id: http://code.elgg.org/elgg/trunk@9036 36083f99-b078-4883-b0ff-0f9b5a30f544
---
mod/search/README.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'mod')
diff --git a/mod/search/README.txt b/mod/search/README.txt
index 851179c58..63b490e28 100644
--- a/mod/search/README.txt
+++ b/mod/search/README.txt
@@ -154,7 +154,7 @@ type. NB: This can be different to the types for the results.
The entity view controls how each individual result is formatted.
-The listing view control how each group of listings is formatted.
+The listing view controls how each group of listings is formatted.
The listing layout controls how each full result set is formatted.
--
cgit v1.2.3
From cbae343867676a78808ccdbd303c3c8bc4984cc1 Mon Sep 17 00:00:00 2001
From: brettp
Date: Thu, 28 Apr 2011 02:16:32 +0000
Subject: Fixed a problem with the ajax for deleting message board posts.
git-svn-id: http://code.elgg.org/elgg/trunk@9041 36083f99-b078-4883-b0ff-0f9b5a30f544
---
mod/messageboard/views/default/messageboard/js.php | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'mod')
diff --git a/mod/messageboard/views/default/messageboard/js.php b/mod/messageboard/views/default/messageboard/js.php
index 131c96c8a..5d89fcd69 100644
--- a/mod/messageboard/views/default/messageboard/js.php
+++ b/mod/messageboard/views/default/messageboard/js.php
@@ -1,16 +1,18 @@
-
+//
\ No newline at end of file
--
cgit v1.2.3
From 8e4a8d4d3c396c090256ae49c8b64ecc80f7ea89 Mon Sep 17 00:00:00 2001
From: cash
Date: Sat, 14 May 2011 19:50:44 +0000
Subject: defined elgg_dev_tools:settings:explanation
git-svn-id: http://code.elgg.org/elgg/trunk@9079 36083f99-b078-4883-b0ff-0f9b5a30f544
---
mod/developers/languages/en.php | 1 +
1 file changed, 1 insertion(+)
(limited to 'mod')
diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
index a2db69bc4..26deb5fcf 100644
--- a/mod/developers/languages/en.php
+++ b/mod/developers/languages/en.php
@@ -11,6 +11,7 @@ $english = array(
'admin:developers:preview' => 'Theming Preview',
// settings
+ 'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.',
'developers:label:simple_cache' => 'Use simple cache',
'developers:help:simple_cache' => 'Turn off the file cache when developing. Otherwise, changes to your views (including css) will be ignored.',
'developers:label:view_path_cache' => 'Use view path cache',
--
cgit v1.2.3
From a59b9ec70ef9c8aaf0ae2e03bdc66753da415d08 Mon Sep 17 00:00:00 2001
From: cash
Date: Wed, 18 May 2011 01:08:27 +0000
Subject: Fixes #3464 group discussion replies work on activity page
git-svn-id: http://code.elgg.org/elgg/trunk@9096 36083f99-b078-4883-b0ff-0f9b5a30f544
---
mod/groups/start.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'mod')
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 9de7f1cc1..73bdd08a9 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -734,7 +734,7 @@ function discussion_add_to_river_menu($hook, $type, $return, $params) {
'href' => "#groups-reply-$object->guid",
'text' => elgg_view_icon('speech-bubble'),
'title' => elgg_echo('reply:this'),
- 'class' => "elgg-toggler",
+ 'link_class' => "elgg-toggler",
'priority' => 50,
);
$return[] = ElggMenuItem::factory($options);
--
cgit v1.2.3
From 6edf852e9c5e352e02140ba9f2ab93b3a8750172 Mon Sep 17 00:00:00 2001
From: cash
Date: Fri, 20 May 2011 01:08:10 +0000
Subject: Refs #2104 changed extension to enhancement and added security,
widget, and theme categories
git-svn-id: http://code.elgg.org/elgg/trunk@9105 36083f99-b078-4883-b0ff-0f9b5a30f544
---
languages/en.php | 5 ++++-
mod/blog/manifest.xml | 1 +
mod/bookmarks/manifest.xml | 1 +
mod/categories/manifest.xml | 1 +
mod/diagnostics/manifest.xml | 2 ++
mod/embed/manifest.xml | 1 +
mod/file/manifest.xml | 1 +
mod/garbagecollector/manifest.xml | 1 +
mod/groups/manifest.xml | 1 +
mod/htmlawed/manifest.xml | 1 +
mod/invitefriends/manifest.xml | 1 +
mod/logrotate/manifest.xml | 1 +
mod/messageboard/manifest.xml | 1 +
mod/pages/manifest.xml | 1 +
mod/tagcloud/manifest.xml | 1 +
mod/tinymce/manifest.xml | 2 +-
mod/twitter/manifest.xml | 1 +
mod/uservalidationbyemail/manifest.xml | 1 +
mod/zaudio/manifest.xml | 2 +-
19 files changed, 23 insertions(+), 3 deletions(-)
(limited to 'mod')
diff --git a/languages/en.php b/languages/en.php
index 768658c99..509de7fb0 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -597,11 +597,14 @@ $english = array(
'admin:plugins:category:bundled' => 'Bundled',
'admin:plugins:category:content' => 'Content',
'admin:plugins:category:development' => 'Development',
- 'admin:plugins:category:extension' => 'Extensions',
+ 'admin:plugins:category:enhancement' => 'Enhancements',
'admin:plugins:category:api' => 'Service/API',
'admin:plugins:category:communication' => 'Communication',
+ 'admin:plugins:category:security' => 'Security and Spam',
'admin:plugins:category:social' => 'Social',
'admin:plugins:category:multimedia' => 'Multimedia',
+ 'admin:plugins:category:theme' => 'Themes',
+ 'admin:plugins:category:widget' => 'Widgets',
'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.',
'admin:plugins:markdown:unknown_file' => 'Unknown file.',
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
index f0ec96e8b..991462060 100644
--- a/mod/blog/manifest.xml
+++ b/mod/blog/manifest.xml
@@ -5,6 +5,7 @@
1.8bundledcontent
+ widgetBlog pluginAdds simple blogging capabilities to your Elgg installation.http://elgg.org/
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
index 88921dcce..72e9af9b0 100644
--- a/mod/bookmarks/manifest.xml
+++ b/mod/bookmarks/manifest.xml
@@ -5,6 +5,7 @@
1.8bundledcontent
+ widgetAdd and comment on bookmarks.Adds the ability for users to bookmark internal and external sites. Other users can then comment on the bookmarks.http://www.elgg.org/
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
index 43df13d02..15d7192c1 100644
--- a/mod/categories/manifest.xml
+++ b/mod/categories/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.8bundled
+ enhancementAdd site-wide categoriesSite-wide Categories lets administrators define categories that users across the site can add content to.http://www.elgg.org/
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
index f84b07cd4..7821d128d 100644
--- a/mod/diagnostics/manifest.xml
+++ b/mod/diagnostics/manifest.xml
@@ -4,6 +4,8 @@
Core developers1.8bundled
+ developer
+ adminElgg diagnostics toolhttp://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/embed/manifest.xml b/mod/embed/manifest.xml
index 102daa761..f61d27c23 100644
--- a/mod/embed/manifest.xml
+++ b/mod/embed/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.8bundled
+ enhancementAllows users to easily upload and embed media into text areas.http://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/file/manifest.xml b/mod/file/manifest.xml
index 966aa1195..aac9c3f6b 100644
--- a/mod/file/manifest.xml
+++ b/mod/file/manifest.xml
@@ -5,6 +5,7 @@
1.8bundledcontent
+ widgetFile browser pluginhttp://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/garbagecollector/manifest.xml b/mod/garbagecollector/manifest.xml
index 23223bc44..466e49d61 100644
--- a/mod/garbagecollector/manifest.xml
+++ b/mod/garbagecollector/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.5bundled
+ adminPerform some database cleanup taskshttp://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/groups/manifest.xml b/mod/groups/manifest.xml
index c67a5307f..4188aa861 100644
--- a/mod/groups/manifest.xml
+++ b/mod/groups/manifest.xml
@@ -5,6 +5,7 @@
1.8bundledsocial
+ widgetProvides group support for elgghttp://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/htmlawed/manifest.xml b/mod/htmlawed/manifest.xml
index ba8978814..0c48bbd28 100644
--- a/mod/htmlawed/manifest.xml
+++ b/mod/htmlawed/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.5bundled
+ securityProvides security filtering. Disabling this plugin is extremely insecure. DO NOT DISABLE.http://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/invitefriends/manifest.xml b/mod/invitefriends/manifest.xml
index e54513d01..d445c5025 100644
--- a/mod/invitefriends/manifest.xml
+++ b/mod/invitefriends/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.8bundled
+ socialInvite friends via email invites.http://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/logrotate/manifest.xml b/mod/logrotate/manifest.xml
index 153dfa921..ab6250ac0 100644
--- a/mod/logrotate/manifest.xml
+++ b/mod/logrotate/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.5bundled
+ adminRotate the system log at specific intervalshttp://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/messageboard/manifest.xml b/mod/messageboard/manifest.xml
index 602c991d2..25c42ee93 100644
--- a/mod/messageboard/manifest.xml
+++ b/mod/messageboard/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.8bundled
+ widgetThis plugin allows users to put a message board on their profile for other users to post comments.http://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/pages/manifest.xml b/mod/pages/manifest.xml
index e5e23f546..4b5e5c747 100644
--- a/mod/pages/manifest.xml
+++ b/mod/pages/manifest.xml
@@ -5,6 +5,7 @@
1.8bundledcontent
+ widgetElgg Pageshttp://www.elgg.orgSee COPYRIGHT.txt
diff --git a/mod/tagcloud/manifest.xml b/mod/tagcloud/manifest.xml
index 8ca4d10ea..6fcad14e2 100644
--- a/mod/tagcloud/manifest.xml
+++ b/mod/tagcloud/manifest.xml
@@ -4,6 +4,7 @@
Cash Costello1.0bundled
+ widgetWidget-based tag clouds.http://cashcostello.com/See COPYRIGHT.txt
diff --git a/mod/tinymce/manifest.xml b/mod/tinymce/manifest.xml
index a3df59e3d..5e69055d8 100644
--- a/mod/tinymce/manifest.xml
+++ b/mod/tinymce/manifest.xml
@@ -4,7 +4,7 @@
Core developers1.8bundled
- extension
+ enhancementTinyMCE plugin.http://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/twitter/manifest.xml b/mod/twitter/manifest.xml
index b198aa0e9..bd7176620 100644
--- a/mod/twitter/manifest.xml
+++ b/mod/twitter/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.7bundled
+ widgetElgg simple twitter widgethttp://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/uservalidationbyemail/manifest.xml b/mod/uservalidationbyemail/manifest.xml
index 5fffb0d2b..df0a7cb58 100644
--- a/mod/uservalidationbyemail/manifest.xml
+++ b/mod/uservalidationbyemail/manifest.xml
@@ -4,6 +4,7 @@
Core developers1.8bundled
+ securitySimple user account validation via email.http://www.elgg.org/See COPYRIGHT.txt
diff --git a/mod/zaudio/manifest.xml b/mod/zaudio/manifest.xml
index 3b2dc47e8..ecbff85fe 100644
--- a/mod/zaudio/manifest.xml
+++ b/mod/zaudio/manifest.xml
@@ -4,7 +4,7 @@
Core developers1.8bundled
- extension
+ enhancementmultimediaThis simple plugin lets users play mp3's in the page.http://www.elgg.org/
--
cgit v1.2.3
From 3f293fe7b5deae93bc90e8f9f30a6b5ae221ea2e Mon Sep 17 00:00:00 2001
From: cash
Date: Fri, 20 May 2011 02:51:33 +0000
Subject: Refs #3340 pulls dashboard out as plugin
git-svn-id: http://code.elgg.org/elgg/trunk@9108 36083f99-b078-4883-b0ff-0f9b5a30f544
---
engine/lib/users.php | 13 --------
mod/dashboard/manifest.xml | 16 ++++++++++
mod/dashboard/start.php | 42 +++++++++++++++++++++++++
mod/dashboard/views/default/dashboard/blurb.php | 17 ++++++++++
pages/dashboard.php | 29 -----------------
views/default/core/dashboard/blurb.php | 17 ----------
views/default/css/elements/misc.php | 4 ---
7 files changed, 75 insertions(+), 63 deletions(-)
create mode 100644 mod/dashboard/manifest.xml
create mode 100644 mod/dashboard/start.php
create mode 100644 mod/dashboard/views/default/dashboard/blurb.php
delete mode 100644 pages/dashboard.php
delete mode 100644 views/default/core/dashboard/blurb.php
(limited to 'mod')
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 43b6980b2..a7765a5e5 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1128,18 +1128,6 @@ function collections_page_handler($page_elements) {
}
}
-/**
- * Page handler for dashboard
- *
- * @param array $page_elements Page elements
- *
- * @return void
- */
-function dashboard_page_handler($page_elements) {
- require_once(dirname(dirname(dirname(__FILE__))) . "/pages/dashboard.php");
-}
-
-
/**
* Page handler for registration
*
@@ -1525,7 +1513,6 @@ function users_init() {
elgg_register_page_handler('friends', 'friends_page_handler');
elgg_register_page_handler('friendsof', 'friends_of_page_handler');
- elgg_register_page_handler('dashboard', 'dashboard_page_handler');
elgg_register_page_handler('register', 'registration_page_handler');
elgg_register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler');
elgg_register_page_handler('login', 'elgg_user_login_page_handler');
diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
new file mode 100644
index 000000000..b5e9cff2e
--- /dev/null
+++ b/mod/dashboard/manifest.xml
@@ -0,0 +1,16 @@
+
+
+ User Dashboard
+ Core developers
+ 1.8
+ bundled
+ A widget-based dashboard for your users
+ http://www.elgg.org/
+ See COPYRIGHT.txt
+ GNU Public License version 2
+
+ elgg_version
+ 2010030101
+
+ advanced
+
\ No newline at end of file
diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php
new file mode 100644
index 000000000..4fa048b3d
--- /dev/null
+++ b/mod/dashboard/start.php
@@ -0,0 +1,42 @@
+ 'dashboard',
+ 'href' => 'dashboard',
+ 'text' => elgg_view_icon('home') . elgg_echo('dashboard'),
+ 'priority' => 450,
+ 'section' => 'alt',
+ ));
+}
+
+function dashboard_page_handler() {
+ // Ensure that only logged-in users can see this page
+ gatekeeper();
+
+ // Set context and title
+ elgg_set_context('dashboard');
+ elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+ $title = elgg_echo('dashboard');
+
+ // wrap intro message in a div
+ $intro_message = elgg_view('dashboard/blurb');
+
+ $params = array(
+ 'content' => $intro_message,
+ 'num_columns' => 3,
+ 'show_access' => false,
+ );
+ $widgets = elgg_view_layout('widgets', $params);
+
+ $body = elgg_view_layout('one_column', array('content' => $widgets));
+
+ echo elgg_view_page($title, $body);
+}
diff --git a/mod/dashboard/views/default/dashboard/blurb.php b/mod/dashboard/views/default/dashboard/blurb.php
new file mode 100644
index 000000000..202be1dc5
--- /dev/null
+++ b/mod/dashboard/views/default/dashboard/blurb.php
@@ -0,0 +1,17 @@
+
+
+
';
echo "";
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/js.php b/mod/embed/views/default/embed/js.php
index f80d7367d..a0a2e8ff5 100644
--- a/mod/embed/views/default/embed/js.php
+++ b/mod/embed/views/default/embed/js.php
@@ -9,35 +9,39 @@
$(function() {
$('a[rel*=facebox]').facebox();
- // fire off the ajax upload
- $('#file_embed_upload').submit(function() {
- var options = {
- success: function(data) {
- var info = jQuery.parseJSON(data);
-
- if (info.status == 'success') {
- $('.popup .content').load(elgg.get_site_url() + 'embed/embed?active_section=file');
- } else {
- $('.popup .content').find('form').prepend('
' + info.message + '
');
+ // Only apply the .live binding after facebox has been displayed
+ $(document).bind('afterReveal.facebox', function() {
+
+ // fire off the ajax upload
+ $('#file_embed_upload').live('submit', function() {
+ var options = {
+ success: function(data) {
+ var info = jQuery.parseJSON(data);
+
+ if (info.status == 'success') {
+ $('.popup .content').load(elgg.get_site_url() + 'embed/embed?active_section=file');
+ } else {
+ $('.popup .content').find('form').prepend('
' + info.message + '
');
+ }
}
- }
- };
- $(this).ajaxSubmit(options);
- return false;
+ };
+ $(this).ajaxSubmit(options);
+ return false;
+ });
});
});
-function elggEmbedInsertContent(content, textAreaName) {
+function elggEmbedInsertContent(content, textAreaId) {
content = ' ' + content + ' ';
// default input.
// if this doesn't match anything it won't add anything.
- $('textarea[name=' + textAreaName + ']').val($('textarea[name=' + textAreaName + ']').val() + ' ' + content);
+ $('#' + textAreaId).val($('#' + textAreaId).val() + ' ' + content);
Date: Tue, 7 Jun 2011 22:46:47 +0000
Subject: Refs #3510, #9113. Updated tinyMCE version in trunk.
git-svn-id: http://code.elgg.org/elgg/trunk@9140 36083f99-b078-4883-b0ff-0f9b5a30f544
---
mod/tinymce/vendor/tinymce/changelog.txt | 250 +
.../vendor/tinymce/examples/accessibility.html | 101 +
.../vendor/tinymce/examples/css/content.css | 105 +
mod/tinymce/vendor/tinymce/examples/css/word.css | 53 +
.../vendor/tinymce/examples/custom_formats.html | 111 +
mod/tinymce/vendor/tinymce/examples/full.html | 101 +
mod/tinymce/vendor/tinymce/examples/index.html | 10 +
.../vendor/tinymce/examples/lists/image_list.js | 9 +
.../vendor/tinymce/examples/lists/link_list.js | 10 +
.../vendor/tinymce/examples/lists/media_list.js | 14 +
.../vendor/tinymce/examples/lists/template_list.js | 9 +
mod/tinymce/vendor/tinymce/examples/media/logo.jpg | Bin 0 -> 2729 bytes
.../vendor/tinymce/examples/media/logo_over.jpg | Bin 0 -> 6473 bytes
.../vendor/tinymce/examples/media/sample.avi | Bin 0 -> 82944 bytes
.../vendor/tinymce/examples/media/sample.dcr | Bin 0 -> 6774 bytes
.../vendor/tinymce/examples/media/sample.flv | Bin 0 -> 88722 bytes
.../vendor/tinymce/examples/media/sample.mov | Bin 0 -> 55622 bytes
.../vendor/tinymce/examples/media/sample.ram | 1 +
.../vendor/tinymce/examples/media/sample.rm | Bin 0 -> 17846 bytes
.../vendor/tinymce/examples/media/sample.swf | Bin 0 -> 6118 bytes
mod/tinymce/vendor/tinymce/examples/menu.html | 18 +
mod/tinymce/vendor/tinymce/examples/simple.html | 47 +
mod/tinymce/vendor/tinymce/examples/skins.html | 216 +
.../vendor/tinymce/examples/templates/layout1.htm | 15 +
.../vendor/tinymce/examples/templates/snippet1.htm | 1 +
mod/tinymce/vendor/tinymce/examples/word.html | 72 +
.../vendor/tinymce/jscripts/tiny_mce/langs/en.js | 59 +-
.../tiny_mce/plugins/advhr/langs/en_dlg.js | 2 +
.../jscripts/tiny_mce/plugins/advhr/rule.htm | 59 +-
.../jscripts/tiny_mce/plugins/advimage/image.htm | 65 +-
.../jscripts/tiny_mce/plugins/advimage/js/image.js | 25 +-
.../tiny_mce/plugins/advimage/langs/en_dlg.js | 2 +
.../tiny_mce/plugins/advlink/js/advlink.js | 38 +-
.../tiny_mce/plugins/advlink/langs/en_dlg.js | 6 +-
.../jscripts/tiny_mce/plugins/advlink/link.htm | 65 +-
.../tiny_mce/plugins/advlist/editor_plugin.js | 2 +-
.../tiny_mce/plugins/advlist/editor_plugin_src.js | 13 +-
.../tiny_mce/plugins/autolink/editor_plugin.js | 1 +
.../tiny_mce/plugins/autolink/editor_plugin_src.js | 169 +
.../tiny_mce/plugins/autoresize/editor_plugin.js | 2 +-
.../plugins/autoresize/editor_plugin_src.js | 15 +-
.../tiny_mce/plugins/autosave/editor_plugin.js | 2 +-
.../tiny_mce/plugins/autosave/editor_plugin_src.js | 21 +-
.../tiny_mce/plugins/bbcode/editor_plugin.js | 2 +-
.../tiny_mce/plugins/bbcode/editor_plugin_src.js | 2 +-
.../tiny_mce/plugins/contextmenu/editor_plugin.js | 2 +-
.../plugins/contextmenu/editor_plugin_src.js | 49 +-
.../tiny_mce/plugins/emotions/emotions.htm | 29 +-
.../tiny_mce/plugins/fullpage/css/fullpage.css | 45 +-
.../tiny_mce/plugins/fullpage/editor_plugin.js | 2 +-
.../tiny_mce/plugins/fullpage/editor_plugin_src.js | 374 +-
.../tiny_mce/plugins/fullpage/fullpage.htm | 348 +-
.../tiny_mce/plugins/fullpage/js/fullpage.js | 637 +-
.../tiny_mce/plugins/fullscreen/editor_plugin.js | 2 +-
.../plugins/fullscreen/editor_plugin_src.js | 14 +-
.../tiny_mce/plugins/inlinepopups/editor_plugin.js | 2 +-
.../plugins/inlinepopups/editor_plugin_src.js | 91 +-
.../inlinepopups/skins/clearlooks2/window.css | 2 +-
.../tiny_mce/plugins/layer/editor_plugin.js | 2 +-
.../tiny_mce/plugins/layer/editor_plugin_src.js | 2 +
.../tiny_mce/plugins/legacyoutput/editor_plugin.js | 2 +-
.../plugins/legacyoutput/editor_plugin_src.js | 59 +-
.../tiny_mce/plugins/lists/editor_plugin.js | 1 +
.../tiny_mce/plugins/lists/editor_plugin_src.js | 617 +
.../tiny_mce/plugins/media/css/content.css | 6 -
.../jscripts/tiny_mce/plugins/media/css/media.css | 9 +-
.../tiny_mce/plugins/media/editor_plugin.js | 2 +-
.../tiny_mce/plugins/media/editor_plugin_src.js | 948 +-
.../jscripts/tiny_mce/plugins/media/img/flash.gif | Bin 241 -> 0 bytes
.../tiny_mce/plugins/media/img/flv_player.swf | Bin 11668 -> 0 bytes
.../tiny_mce/plugins/media/img/quicktime.gif | Bin 303 -> 0 bytes
.../tiny_mce/plugins/media/img/realmedia.gif | Bin 439 -> 0 bytes
.../tiny_mce/plugins/media/img/shockwave.gif | Bin 387 -> 0 bytes
.../jscripts/tiny_mce/plugins/media/img/trans.gif | Bin 43 -> 0 bytes
.../tiny_mce/plugins/media/img/windowsmedia.gif | Bin 415 -> 0 bytes
.../jscripts/tiny_mce/plugins/media/js/media.js | 930 +-
.../tiny_mce/plugins/media/langs/en_dlg.js | 10 +-
.../jscripts/tiny_mce/plugins/media/media.htm | 571 +-
.../tiny_mce/plugins/media/moxieplayer.swf | Bin 0 -> 33931 bytes
.../tiny_mce/plugins/nonbreaking/editor_plugin.js | 2 +-
.../plugins/nonbreaking/editor_plugin_src.js | 2 +-
.../tiny_mce/plugins/noneditable/editor_plugin.js | 2 +-
.../plugins/noneditable/editor_plugin_src.js | 2 +
.../tiny_mce/plugins/pagebreak/css/content.css | 1 -
.../tiny_mce/plugins/pagebreak/editor_plugin.js | 2 +-
.../plugins/pagebreak/editor_plugin_src.js | 5 +-
.../tiny_mce/plugins/pagebreak/img/pagebreak.gif | Bin 325 -> 0 bytes
.../tiny_mce/plugins/pagebreak/img/trans.gif | Bin 43 -> 0 bytes
.../tiny_mce/plugins/paste/editor_plugin.js | 2 +-
.../tiny_mce/plugins/paste/editor_plugin_src.js | 249 +-
.../plugins/searchreplace/editor_plugin.js | 2 +-
.../plugins/searchreplace/editor_plugin_src.js | 4 +
.../plugins/searchreplace/js/searchreplace.js | 24 +-
.../plugins/searchreplace/searchreplace.htm | 33 +-
.../tiny_mce/plugins/spellchecker/editor_plugin.js | 2 +-
.../plugins/spellchecker/editor_plugin_src.js | 118 +-
.../jscripts/tiny_mce/plugins/style/js/props.js | 10 +-
.../tiny_mce/plugins/style/langs/en_dlg.js | 9 +-
.../jscripts/tiny_mce/plugins/style/props.htm | 911 +-
.../tiny_mce/plugins/tabfocus/editor_plugin.js | 2 +-
.../tiny_mce/plugins/tabfocus/editor_plugin_src.js | 58 +-
.../jscripts/tiny_mce/plugins/table/cell.htm | 24 +-
.../tiny_mce/plugins/table/editor_plugin.js | 2 +-
.../tiny_mce/plugins/table/editor_plugin_src.js | 149 +-
.../jscripts/tiny_mce/plugins/table/js/cell.js | 20 +-
.../jscripts/tiny_mce/plugins/table/js/row.js | 31 +-
.../jscripts/tiny_mce/plugins/table/js/table.js | 33 +-
.../tiny_mce/plugins/table/langs/en_dlg.js | 2 +-
.../tiny_mce/plugins/table/merge_cells.htm | 22 +-
.../jscripts/tiny_mce/plugins/table/row.htm | 18 +-
.../jscripts/tiny_mce/plugins/table/table.htm | 107 +-
.../tiny_mce/plugins/template/js/template.js | 2 +-
.../tiny_mce/plugins/visualchars/editor_plugin.js | 2 +-
.../plugins/visualchars/editor_plugin_src.js | 33 +-
.../tiny_mce/plugins/wordcount/editor_plugin.js | 2 +-
.../plugins/wordcount/editor_plugin_src.js | 54 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm | 11 +-
.../tiny_mce/plugins/xhtmlxtras/acronym.htm | 11 +-
.../tiny_mce/plugins/xhtmlxtras/attributes.htm | 11 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm | 9 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/del.htm | 17 +-
.../tiny_mce/plugins/xhtmlxtras/editor_plugin.js | 2 +-
.../plugins/xhtmlxtras/editor_plugin_src.js | 24 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm | 21 +-
.../tiny_mce/plugins/xhtmlxtras/js/attributes.js | 17 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js | 14 +-
.../plugins/xhtmlxtras/js/element_common.js | 8 +-
.../jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js | 17 +-
.../jscripts/tiny_mce/themes/advanced/about.htm | 8 +-
.../jscripts/tiny_mce/themes/advanced/anchor.htm | 10 +-
.../jscripts/tiny_mce/themes/advanced/charmap.htm | 79 +-
.../tiny_mce/themes/advanced/color_picker.htm | 19 +-
.../tiny_mce/themes/advanced/editor_template.js | 2 +-
.../themes/advanced/editor_template_src.js | 298 +-
.../jscripts/tiny_mce/themes/advanced/image.htm | 102 +-
.../tiny_mce/themes/advanced/img/flash.gif | Bin 0 -> 241 bytes
.../tiny_mce/themes/advanced/img/iframe.gif | Bin 0 -> 600 bytes
.../tiny_mce/themes/advanced/img/pagebreak.gif | Bin 0 -> 325 bytes
.../tiny_mce/themes/advanced/img/quicktime.gif | Bin 0 -> 303 bytes
.../tiny_mce/themes/advanced/img/realmedia.gif | Bin 0 -> 439 bytes
.../tiny_mce/themes/advanced/img/shockwave.gif | Bin 0 -> 387 bytes
.../tiny_mce/themes/advanced/img/trans.gif | Bin 0 -> 43 bytes
.../tiny_mce/themes/advanced/img/video.gif | Bin 0 -> 597 bytes
.../tiny_mce/themes/advanced/img/windowsmedia.gif | Bin 0 -> 415 bytes
.../jscripts/tiny_mce/themes/advanced/js/about.js | 1 +
.../jscripts/tiny_mce/themes/advanced/js/anchor.js | 5 +
.../tiny_mce/themes/advanced/js/charmap.js | 32 +-
.../tiny_mce/themes/advanced/js/color_picker.js | 140 +-
.../jscripts/tiny_mce/themes/advanced/js/image.js | 4 +-
.../jscripts/tiny_mce/themes/advanced/js/link.js | 11 +-
.../tiny_mce/themes/advanced/js/source_editor.js | 18 +-
.../jscripts/tiny_mce/themes/advanced/langs/en.js | 10 +-
.../tiny_mce/themes/advanced/langs/en_dlg.js | 9 +-
.../jscripts/tiny_mce/themes/advanced/link.htm | 55 +-
.../tiny_mce/themes/advanced/shortcuts.htm | 47 +
.../themes/advanced/skins/default/content.css | 12 +
.../tiny_mce/themes/advanced/skins/default/ui.css | 8 +-
.../themes/advanced/skins/highcontrast/content.css | 23 +
.../themes/advanced/skins/highcontrast/dialog.css | 105 +
.../themes/advanced/skins/highcontrast/ui.css | 101 +
.../themes/advanced/skins/o2k7/content.css | 11 +
.../tiny_mce/themes/advanced/skins/o2k7/dialog.css | 1 +
.../tiny_mce/themes/advanced/skins/o2k7/ui.css | 9 +-
.../themes/advanced/skins/o2k7/ui_black.css | 2 +-
.../themes/advanced/skins/o2k7/ui_silver.css | 2 +-
.../tiny_mce/themes/advanced/source_editor.htm | 6 +-
.../tiny_mce/themes/simple/editor_template.js | 2 +-
.../tiny_mce/themes/simple/editor_template_src.js | 3 +-
.../vendor/tinymce/jscripts/tiny_mce/tiny_mce.js | 2 +-
.../tinymce/jscripts/tiny_mce/tiny_mce_popup.js | 2 +-
.../tinymce/jscripts/tiny_mce/tiny_mce_src.js | 12325 +++++++++++--------
.../tinymce/jscripts/tiny_mce/utils/form_utils.js | 18 +-
.../tinymce/jscripts/tiny_mce/utils/mctabs.js | 105 +-
.../tinymce/jscripts/tiny_mce/utils/validate.js | 38 +-
174 files changed, 13409 insertions(+), 8768 deletions(-)
create mode 100644 mod/tinymce/vendor/tinymce/examples/accessibility.html
create mode 100644 mod/tinymce/vendor/tinymce/examples/css/content.css
create mode 100644 mod/tinymce/vendor/tinymce/examples/css/word.css
create mode 100644 mod/tinymce/vendor/tinymce/examples/custom_formats.html
create mode 100644 mod/tinymce/vendor/tinymce/examples/full.html
create mode 100644 mod/tinymce/vendor/tinymce/examples/index.html
create mode 100644 mod/tinymce/vendor/tinymce/examples/lists/image_list.js
create mode 100644 mod/tinymce/vendor/tinymce/examples/lists/link_list.js
create mode 100644 mod/tinymce/vendor/tinymce/examples/lists/media_list.js
create mode 100644 mod/tinymce/vendor/tinymce/examples/lists/template_list.js
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/logo.jpg
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/logo_over.jpg
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/sample.avi
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/sample.dcr
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/sample.flv
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/sample.mov
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/sample.ram
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/sample.rm
create mode 100644 mod/tinymce/vendor/tinymce/examples/media/sample.swf
create mode 100644 mod/tinymce/vendor/tinymce/examples/menu.html
create mode 100644 mod/tinymce/vendor/tinymce/examples/simple.html
create mode 100644 mod/tinymce/vendor/tinymce/examples/skins.html
create mode 100644 mod/tinymce/vendor/tinymce/examples/templates/layout1.htm
create mode 100644 mod/tinymce/vendor/tinymce/examples/templates/snippet1.htm
create mode 100644 mod/tinymce/vendor/tinymce/examples/word.html
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/css/content.css
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/realmedia.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/trans.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/img/windowsmedia.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/pagebreak.gif
delete mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/pagebreak.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/realmedia.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/trans.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/img/windowsmedia.gif
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
create mode 100644 mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
(limited to 'mod')
diff --git a/mod/tinymce/vendor/tinymce/changelog.txt b/mod/tinymce/vendor/tinymce/changelog.txt
index 7ca00d134..a7c6bb650 100644
--- a/mod/tinymce/vendor/tinymce/changelog.txt
+++ b/mod/tinymce/vendor/tinymce/changelog.txt
@@ -1,3 +1,253 @@
+Version 3.4.2 (2011-04-07)
+ Added new 'paste_text_sticky_default' option to paste plugin, enables you to set the default state for paste as plain text.
+ Added new autoresize_bottom_margin option to autoresize plugin that enables you to add an extra margin at the bottom. Patch contributed by Andrew Ozz.
+ Rewritten the fullpage plugin to handle style contents better and have a more normalized behavior across browsers.
+ Fixed bug where contents inserted with mceInsertContent wasn't parsed using the default dom parser.
+ Fixed bug where blocks containing a single anchor element would be treated as empty.
+ Fixed bug where merging of table cells on IE 6, 7 wouldn't look correctly until the contents was refreshed.
+ Fixed bug where context menu wouldn't work properly on Safari since it was passing out the ctrl key as pressed.
+ Fixed bug where image border color/style values were overwritten by advimage plugin.
+ Fixed bug where setting border in advimage plugin would throw error in IE.
+ Fixed bug where empty anchors list in link settings wasn't hidden.
+ Fixed bug where xhtmlextras popups were missing localized popup-size parameters.
+ Fixed bug where the context menu wouldn't select images on WebKit browsers.
+ Fixed bug where paste plugin wouldn't properly extract the contents on WebKit due to recent changes in browser behavior.
+ Fixed bug where focus of the editor would get on control contents on IE lost due to a bug in the ColorSplitButton control.
+ Fixed bug where contextmenu wasn't disabled on noneditable elements.
+ Fixed bug where getStyle function would trigger error when called on element without style property.
+ Fixed bug where editor fail to load if Javascript Compressor was used.
+ Fixed bug where list-style-type=lower-greek would produce errors in IE<8.
+ Fixed bug where spellchecker plugin would produce errors on IE6-7.
+ Fixed bug where theme_advanced_containers configuration option causes error.
+ Fixed bug where the mceReplaceContent command would produce an error since it didn't correctly handle a return value.
+ Fixed bug where you couldn't enter float point values for em in dialog input fields since it wouldn't be considered a valid size.
+ Fixed bug in xhtmlxtras plugin where it wasn't possible to remove some attributes in the attributes dialog.
+Version 3.4.1 (2011-03-24)
+ Added significantly improved list handling via the new 'lists' plugin.
+ Added 'autolink' plugin to enable automatically linking URLs. Similar to the behavior IE has by default.
+ Added 'theme_advanced_show_current_color' setting to enable the forecolor and backcolor buttons to continuously show the current text color.
+ Added 'contextmenu_never_use_native' setting to disable the ctrl-right-click showing the native browser context menu behaviour.
+ Added 'paste_enable_default_filters' setting to enable the default paste filters to be disabled.
+ Fixed bug where selection locations on undo/redo didn't work correctly on specific contents.
+ Fixed bug where an exception would be trown on IE when loading TinyMCE inside an iframe.
+ Fixed bug where some ascii numeric entities wasn't properly decoded.
+ Fixed bug where some non western language codes wasn't properly decoded/encoded.
+ Fixed bug where undo levels wasn't created when deleting contents on IE.
+ Fixed bug where the initial undo levels bookmark wasn't updated correctly.
+ Fixed bug where search/replace wouldn't be scoped to editor instances on IE8.
+ Fixed bug where IE9 would produce two br elements after block elements when pasting.
+ Fixed bug where IE would place the caret at an incorrect position after a paste operation.
+ Fixed bug where a paste operation using the keyboard would add an extra undo level.
+ Fixed bug where some attributes/elements wasn't correctly filtered when invalid contents was inserted.
+ Fixed bug where the table plugin couldn't correctly handle invalid table structures.
+ Fixed bug where charset and title of the page were handled incorrectly by the fullpage plugin.
+ Fixed bug where toggle states on some of the list boxes didn't update correctly.
+ Fixed bug where sub/sub wouldn't work correctly when done as a caret action in Chrome 10.
+ Fixed bug where the constrain proportions checkbox wouldn't work in the media plugin.
+ Fixed bug where block elements containing trailing br elements wouldn't treated properly if they where invalid.
+ Fixed bug where the color picker dialog wouldn't be rendered correctly when using the o2k7 theme.
+ Fixed bug where setting border=0 using advimage plugin invalid style attribute content was created in Chrome.
+ Fixed bug with references to non-existing images in css of fullpage plugin.
+ Fixed bug where item could be unselected in spellchecker's language selector.
+ Fixed bug where some mispelled words could be not highlighted using spellchecker plugin.
+ Fixed bug where spellchecking would merge some words on IE.
+ Fixed bug where spellchecker context menu was not always positioned correctly.
+ Fixed bug with empty anchors list in advlink popup when Invisible Elements feature was disabled.
+ Fixed bug where older IE versions wouldn't properly handle some elements if they where placed at the top of editor contents.
+ Fixed bug where selecting the whole table would enable table tools for cells and rows.
+ Fixed bug where it wasn't possible to replace selected contents on IE when pasting using the paste plugin.
+ Fixed bug where setting text color in fullpage plugin doesn't work.
+ Fixed bug where the state of checkboxes in media plugin wouldn't be set correctly.
+ Fixed bug where black spade suit character was not included in special character selector.
+ Fixed bug where setting invalid values for table cell size would throw an error in IE.
+ Fixed bug where spellchecking would remove whitespace characters from PRE block in IE.
+ Fixed bug where HR was inserted inside P elements instead of splitting them.
+ Fixed bug where extra, empty span tags were added when using a format with both selector and inline modes.
+ Fixed bug where bullet lists weren't always detected correctly.
+ Fixed bug where deleting some paragraphs on IE would cause an exception.
+ Fixed bug where the json encoder logic wouldn't properly encode \ characters.
+ Fixed bug where the onChange event would be fired when the editor was first initialized.
+ Fixed bug where mceSelected wouldn't be removed properly from output even if it's an internal class.
+ Fixed issue with table background colors not being transparent. This improves compliance with users browser color preferences.
+ Fixed issue where styles were not included when using the full page plugin.
+ Fixed issue where drag/drop operations wasn't properly added to the undo levels.
+ Fixed issue where colors wasn't correctly applied to elements with underline decoration.
+ Fixed issue where deleting some paragraphs on IE would cause an exception.
+Version 3.4 (2011-03-10)
+ Added accessibility example with various accessibility options contributed by Ephox.
+ Fixed bug where attributes wasn't properly handled in the xhtmlxtras plugin.
+ Fixed bug where the image.htm had some strange td artifacts probably due to auto merging.
+ Fixed bug where the ToolbarGroup had an missing reference to this in it's destroy method.
+ Fixed bug with the resizeBy function in the advanced theme where it was scaled by the wrong parent.
+ Fixed bug where an exception would be thrown by the element if the page was served in xhtml mode.
+ Fixed bug where mceInsertContent would throw an exception when page was served in xhtml mode.
+ Fixed bug where you couldn't select a forground/background color when page was served in xhtml mode.
+ Fixed bug where the editor would scroll to the toolbar when clicked due to a call to focus in ListBox.
+ Fixed bug where pages with rtl dir wouldn't render split buttons correctly when using the o2k7 theme.
+ Fixed bug where anchor elements with names wasn't properly collapsed as they where in 3.3.x.
+ Fixed bug where WebKit wouldn't properly handle image selection if it was done left to right.
+ Fixed bug where the formatter would align images when the selection range was collapsed.
+ Fixed bug where the image button would be active when the selection range was collapsed.
+ Fixed bug where the element_format option wasn't used by the new (X)HTML serializer logic.
+ Fixed bug where the table cell/row dialogs would produce empty attributes.
+ Fixed bug where the tfoot wouldn't be added to the top of the table.
+ Fixed bug where the formatter would merge siblings with white space between them.
+ Fixed bug where pasting headers and paragraphs would produce an extra paragraph.
+ Fixed bug where the ColorSplitButton would throw an exception if you clicked out side a color.
+ Fixed bug where IE9 wouldn't properly produce new paragraphs on enter if the current paragraph had formatting.
+ Fixed bug where multiple BR elements at end of block elements where removed.
+ Fixed bug where fullscreen plugin wouldn't correctly display the edit area on IE6 for long pages.
+ Fixed bug where paste plugin wouldn't properly encode raw entities when pasting in plain text mode.
+ Fixed bug where the search/replace plugin wouldn't work correctly on IE 9.
+ Fixed so the drop menus doesn't get an outline border visible when focused, patch contributed by Ephox.
+ Fixed so the values entered in the color picker are forced to hex values.
+ Removed dialog workaround for IE 9 beta since the RC is now out and people should upgrade.
+ Removed obsolete calls in various plugins to the mceBeginUndoLevel command.
+Version 3.4b3 (2011-02-10)
+ Added WAI-ARIA support for the main UI and dialogs this feature was contributed by Ephox.
+ Added iframe support to media plugin in order to handle the new YouTube HTML5 video formats.
+ Fixed bug where anchors would wrap the text contents after it due to a bug in the DomParser logic.
+ Fixed bug where the selected state wouldn't be removed on ListBox controls when a menu item was selected.
+ Fixed bug where IE could throw an unspecified error exception when the getBookmark logic was executed.
+ Fixed bug where IE would throw an invalid argument error when focus was applied to an empty editor instance.
+ Fixed bug where applying inline format wouldn't work if the start cell in the selection was empty.
+ Fixed bug where auto detection logic for YouTube and Google Video wouldn't work in the new media plugin.
+ Fixed bug where td elements would get a colspan/rowspan of 1 when created by the table plugin.
+ Fixed bug where removal/padding of empty elements wasn't handled correctly.
+ Fixed bug where internal elements would show up in element path.
+ Fixed bug where internal elements would get serialized as valid output.
+ Fixed bug where color wasn't correctly applied to anchor elements.
+ Fixed bug where float option in the style plugin dialog wouldn't be handled correctly on WebKit.
+ Fixed bug where the tinymce.dom.TreeWalker prev function wouldn't walk the DOM correctly.
+ Fixed bug where mceInsertContent command could produce empty block elements after the inserted content.
+ Fixed bug where mceInsertContent command wouldn't apply visual aids on tables and similar elements.
+ Fixed bug where empty block elements would get double br bogus elements in them.
+ Fixed bug where the color menu wouldn't apply the color correctly on IE when the viewport was to small.
+ Fixed bug where right clicking out side the body element of the editor iframe would prevent paste from working on IE.
+ Fixed bug where the onContextMenu event wouldn't fire correctly on IE if you clicked out side the body element.
+ Fixed bug where the onContextMenu event wouldn't fire correctly on modern Opera versions that now support it by default.
+ Fixed bug where legacy content wasn't converted correctly when inserted using mceInsertContent or through the source dialog.
+ Fixed bug where resizing images or tables wouldn't update the style attribute correctly or leave data-mce prefixed attributes.
+ Fixed bug where adding links wouldn't work correctly when using TinyMCE jQuery version with jQuery 1.5.
+ Fixed bug where single quotes inside param elements wasn't treated correctly by the media plugin.
+ Fixed bug where pasting plain text in WebKit wouldn't work correctly. It will now auto detect the WebKit bug and use plain text mode.
+ Fixed bug where the DomParser would fail to move out invalid elements within invalid elements on complex contents.
+ Fixed bug where paste as plain text would not decode html entities properly.
+ Fixed bug where large paragraphs would cause incorrect scrolling behavior if you would split them using enter.
+ Fixed bug where the SaxParser wouldn't properly parse some specific short ended elements.
+ Fixed so mceReplaceContent supports caret position and makes sure that the contents inserted gets validated.
+ Fixed so unnecessary traling br elements in blocks gets removed on Gecko/WebKit when using mceInsertContent command.
+ Moved some plugin css contents into the skin content css files to reduce the number of http requests.
+ Moved some plugin specific images into the theme img directory since they can then be shared.
+Version 3.4b2 (2011-01-13)
+ Added new custom flash player, this player supports mp4 and flv and has skin support.
+ Fixed so mceInsertContent handles context correctly to enforce valid nesting of elements.
+ Fixed bug where scrolling would become jerky on IE on some contents.
+ Fixed bug where paste as plain text would throw exception of missing entities setting.
+ Fixed bug where anchor nodes where removed by the new serializer engine.
+ Fixed bug where IE would crash if when backspace where used on some specific contents.
+ Fixed bug where pasting of plain text in WebKit would result in merging of text lines.
+ Fixed bug where it wasn't possible to delete images or tables using backspace on IE9.
+ Fixed bug where urls in styles would generate a JS error due to incorrect scope.
+ Fixed bug where copy paste from Java applications would produce extra contents in FF on Mac.
+ Fixed bug where the verify_html option wouldn't allow all elements and attributes.
+Version 3.4b1 (2010-12-20)
+ Added new serialization engine that increases performance and enforces valid output according to the specified schema settings.
+ Added new HTML parser logic used by the serialization engine and can handle malformed html contents.
+ Added new valid_children config option, enables more fine grain control of elements can be inside other elements.
+ Added new entities encoding logic boost performance and will only encode entities based on context i.e. attributes/text nodes.
+ Added new protect setting that enables users to protect template items from being removed by the serializer logic.
+ Added new {$caret} marker for the mceInsertContent command. Makes it possible to move the caret to a specific position when inserting contents.
+ Added new validation of anchor names. Only valid W3C names will be accepted.
+ Replaced the internal _mce_ prefixed attributes to the more standard HTML5 data-mce- prefix. This will also resolve future browser santiaztion issues.
+ Fixed bug where the paste plugin wouldn't convert Word lists with more than 9 items to real ol lists. Patch contributed by Mike (yogaboy).
+ Fixed bug where clicking on a format title would produce errors if the current selection didn't have any formats.
+ Fixed bug where paste of simple texts wouldn't work correctly in Gecko using the paste plugin since it keeps block formatting.
+ Fixed bug where confirm dialogs didn't display correctly due to resent IE9 fixes.
+ Fixed bug where spaces in URLs wouldn't be properly encoded to %20 if the user entered them in the link dialogs. Patch contributed by Ephox.
+ Fixed bug where the image alignment buttons wouldn't reposition the resize handles on FF due to a browser issue. Patch contributed by Ephox.
+ Fixed bug where the compareBoundaryPoints method of the IE Range class didn't work correctly. Patch contributed by Ephox.
+ Fixed bug where selection of elements using double click wouldn't select the clicked element but rather the parent node on FF. Patch contributed by Ephox.
+ Fixed bug where IE would scroll the user to the current selection causing parent document to scroll as well. Patch contributed by Ephox.
+ Fixed bug where style compression would incorrectly compress items with different values. It now only compresses if the values are the same. Patch contributed by Ephox.
+ Fixed bug where FF would add non breaking spaces outside TD elements if formatting was applied to table cells. Patch contributed by Ephox.
+ Fixed bug where the caret position would be lost on WebKit browsers if you pasted images multiple times. Patch contributed by Ephox.
+ Fixed bug where non word contents like * would be counted as words in the wordcount pluging. Patch contributed by David Balatero.
+ Fixed bug where the toggle absolute button in the layer plugin wouldn't remove the existing internal style attribute first.
+ Fixed bug where the autosave plugin would generate an exception on IE if the user had disabled userdata persistence.
+ Fixed bug where the paste plugin would remove dashed classes on IE since the regexps didn't include that character.
+ Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.
+ Fixed bug where applying block formats to empty elements wouldn't render correctly on IE.
+ Fixed bug where the searchreplace plugin would add a f or r character when shortcuts where used on IE while using default dialogs.
+ Fixed bug where Opera wouldn't load scripts correctly since the onreadystate would fire even though the script wasn't loaded.
+ Fixed issue where wouldn't be handled correctly in the bbcode plugin if entity_encoding was set to raw.
+ Fixed issue where contents would flicker since the content css files where asynchronously loaded.
+ Fixed bug where WebKit wouldn't create links on images with a float style.
+Version 3.3.9.3 (2010-12-20)
+ Fixed issue where WebKit wouldn't correctly apply ins/del in xhtmlxtras plugin.
+ Fixed bug where paste as plaintext on WebKit wouldn't produce br and p elements correctly.
+ Fixed bug where the confirm dialog texts would be incorrectly placed due to recent IE 9 workarounds in the window.css.
+ Fixed bug where applying text color would not add spans inside link elements. This is needed due to CSS style inheritance.
+Version 3.3.9.2 (2010-09-29)
+ Fixed bug where placing the caret in IE 9 beta 1 would not work correctly if you clicked out side the document body element.
+ Fixed bug where IE 9 beta 1 wouldn't resize the editor correctly since the events didn't fire as previous versions did.
+ Fixed bug where FF would produce an error message when being rendered inside a hidden div element.
+ Fixed bug where resize logic could produce a cookie with a width/height less than the size of the container.
+ Fixed bug where content_css wouldn't populate the styles dropdown correctly.
+Version 3.3.9.1 (2010-09-23)
+ Fixed bug where WebKit browsers wouldn't activate the image button when images where selected.
+ Fixed bug where Opera Presto 10.60 deletes elements when restoring bookmarks.
+ Fixed bug where IE9 beta1 doesn't handle regexp replacement values correctly.
+ Fixed bug where IE9 beta1 didn't render the inline dialogs correctly due to a bug with CSS clip.
+ Fixed bug where IE9 beta1 would produce error messages on load since they removed the document.recalc method.
+ Fixed bug where IE9 beta1 would produce since they haven't implemented document.implementation.createDocument correctly.
+ Fixed bug where IE9 beta1 would searchreplace doesn't work since their native DOM Range doesn't have a find method.
+ Fixed bug where IE9 beta1 would render the source view incorrectly due to incorrect viewport size measurements.
+ Fixed bug where IE9 beta1 would crash when running the basic functionality unit tests.
+ Fixed bug where IE9 beta1 would wrap elements in blocks correctly due to changes to the selection object.
+ Fixed bug where IE9 beta1 would fail to insert contents since they havn't implemented the createContextualFragment method in their DOM Range.
+ Fixed bug where IE9 beta1 would fail to handle image selection since they currently doesn't support control selections in their DOM Range.
+ Fixed bug where IE9 beta1 would fail to load scripts since they fire the onload event before the scripts are parsed and executed.
+Version 3.3.9 (2010-09-08)
+ Fixed bug where inserting table rows into a table with subtable would produce an incorrect column count.
+ Fixed bug where the selection of cells in a table with subtables could produce invalid selections.
+ Fixed bug where the table plugin would produce a script error if you tried to move the caret before a first child table.
+ Fixed bug where the keep_styles feature on IE would move the caret to an incorrect location at the end of list blocks.
+ Fixed so attributes from legacy elements such as font gets retained when they get converted to spans.
+ Fixed minor issue where the select boxes wouldn't be set the not set by default in the table dialog.
+Version 3.3.8 (2010-06-30)
+ On IE8+ and FireFox 3.5+, dragging an image now correctly adds an undo
+ event.
+ Fixed bug where WebKit would not move the caret to a correct position after a paste operation.
+ Fixed bug where WebKit would produce a div wrapper element when pasting some contents.
+ Fixed bug where the visual chars and nonbreaking plugin wouldn't show nbsp elements correctly.
+ Fixed bug where the format states would be enabled even after the format was removed.
+ Fixed bug where the delete key would move the caret to an incorrect position.
+ Fixed bug where it wasn't possible to toggle of the current font size/family/style by clicking the title item.
+ Fixed bug where the abbr element wouldn't get serialized correctly on IE6.
+ Fixed so that the examples checks if they are executed from the local file system since that might not work properly.
+Version 3.3.7 (2010-06-10)
+ Fixed bug where context menu would produce an error on IE if you right clicked twice and left clicked once.
+ Fixed bug where resizing of the window on WebKit browsers in fullscreen mode wouldn't position the statusbar correctly.
+ Fixed bug where IE would produce an error if the editor was empty and you where undoing to that initial level.
+ Fixed bug where setting the table background on gecko would produce \" entities inside the url style property.
+ Fixed bug where the button states wouldn't be updated correctly on IE if you placed the caret inside the new element.
+ Fixed bug where undo levels wasn't properly added after applying styles or font sizes.
+ Fixed bug where IE would throw an error if you used "select all" on empty elements and applied formatting to that.
+ Fixed bug where IE could select one extra character when you did a bookmark call on a caret location.
+ Fixed bug where IE could produce a script error on delete since it would sometimes produce an invalid DOM.
+ Fixed bug where IE would return the wrong start element if the whole element was selected.
+ Fixed bug where formatting states wasn't updated on IE if you pressed enter at the end of a block with formatting.
+ Fixed bug where submenus for the context menu wasn't removed correctly when the editor was destroyed.
+ Fixed bug where Gecko could select the wrong element after applying format to multiple elements.
+ Fixed bug where Gecko would delete parts of the previous element if the selection range was a element selection.
+ Fixed bug where Gecko would not merge paragraph elements correctly if they contained br elements.
+ Fixed bug where the cleanup button could produce span artifacts if you pressed it twice in a row.
+ Fixed bug where the fullpage plugin header/footer would be have it's header reseted to it's initial state on undo.
+ Fixed bug where an empty paragraph would be collapsed if you performed a cleanup while having the caret inside it.
+ Fixed a few memory leaks on IE especially with drop menus in listboxes and the spellchecker.
+ Fixed so formats applied to the current caret gets merged to reduce the number of output elements.
+ Added the latest version of Sizzle for the CSS selector logic to fix a compatibility issue with prototype.
Version 3.3.6 (2010-05-20)
Fixed bug where a editor.focus call could produce errors on IE in very specific scenarios.
Fixed bug where Gecko would produce an error if you unformatted text inside an empty element.
diff --git a/mod/tinymce/vendor/tinymce/examples/accessibility.html b/mod/tinymce/vendor/tinymce/examples/accessibility.html
new file mode 100644
index 000000000..69059403c
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/accessibility.html
@@ -0,0 +1,101 @@
+
+
+
+Full featured example
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/css/content.css b/mod/tinymce/vendor/tinymce/examples/css/content.css
new file mode 100644
index 000000000..a76c38a2f
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/css/content.css
@@ -0,0 +1,105 @@
+body {
+ background-color: #FFFFFF;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ scrollbar-3dlight-color: #F0F0EE;
+ scrollbar-arrow-color: #676662;
+ scrollbar-base-color: #F0F0EE;
+ scrollbar-darkshadow-color: #DDDDDD;
+ scrollbar-face-color: #E0E0DD;
+ scrollbar-highlight-color: #F0F0EE;
+ scrollbar-shadow-color: #F0F0EE;
+ scrollbar-track-color: #F5F5F5;
+}
+
+td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+pre {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+.example1 {
+ font-weight: bold;
+ font-size: 14px
+}
+
+.example2 {
+ font-weight: bold;
+ font-size: 12px;
+ color: #FF0000
+}
+
+.tablerow1 {
+ background-color: #BBBBBB;
+}
+
+thead {
+ background-color: #FFBBBB;
+}
+
+tfoot {
+ background-color: #BBBBFF;
+}
+
+th {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+/* Basic formats */
+
+.bold {
+ font-weight: bold;
+}
+
+.italic {
+ font-style: italic;
+}
+
+.underline {
+ text-decoration: underline;
+}
+
+/* Global align classes */
+
+.left {
+ text-align: inherit;
+}
+
+.center {
+ text-align: center;
+}
+
+.right {
+ text-align: right;
+}
+
+.full {
+ text-align: justify
+}
+
+/* Image and table specific aligns */
+
+img.left, table.left {
+ float: left;
+ text-align: inherit;
+}
+
+img.center, table.center {
+ margin-left: auto;
+ margin-right: auto;
+ text-align: inherit;
+}
+
+img.center {
+ display: block;
+}
+
+img.right, table.right {
+ float: right;
+ text-align: inherit;
+}
diff --git a/mod/tinymce/vendor/tinymce/examples/css/word.css b/mod/tinymce/vendor/tinymce/examples/css/word.css
new file mode 100644
index 000000000..049a39fbd
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/css/word.css
@@ -0,0 +1,53 @@
+body {
+ background-color: #FFFFFF;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ scrollbar-3dlight-color: #F0F0EE;
+ scrollbar-arrow-color: #676662;
+ scrollbar-base-color: #F0F0EE;
+ scrollbar-darkshadow-color: #DDDDDD;
+ scrollbar-face-color: #E0E0DD;
+ scrollbar-highlight-color: #F0F0EE;
+ scrollbar-shadow-color: #F0F0EE;
+ scrollbar-track-color: #F5F5F5;
+}
+
+p {margin:0; padding:0;}
+
+td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+pre {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+.example1 {
+ font-weight: bold;
+ font-size: 14px
+}
+
+.example2 {
+ font-weight: bold;
+ font-size: 12px;
+ color: #FF0000
+}
+
+.tablerow1 {
+ background-color: #BBBBBB;
+}
+
+thead {
+ background-color: #FFBBBB;
+}
+
+tfoot {
+ background-color: #BBBBFF;
+}
+
+th {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
diff --git a/mod/tinymce/vendor/tinymce/examples/custom_formats.html b/mod/tinymce/vendor/tinymce/examples/custom_formats.html
new file mode 100644
index 000000000..ba9d1eb0c
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/custom_formats.html
@@ -0,0 +1,111 @@
+
+
+
+Custom formats example
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/full.html b/mod/tinymce/vendor/tinymce/examples/full.html
new file mode 100644
index 000000000..e4d187e88
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/full.html
@@ -0,0 +1,101 @@
+
+
+
+Full featured example
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/index.html b/mod/tinymce/vendor/tinymce/examples/index.html
new file mode 100644
index 000000000..6ebfbea57
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/index.html
@@ -0,0 +1,10 @@
+
+
+
+ TinyMCE examples
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/lists/image_list.js b/mod/tinymce/vendor/tinymce/examples/lists/image_list.js
new file mode 100644
index 000000000..7ba049a24
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/image_list.js
@@ -0,0 +1,9 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.
+// There images will be displayed as a dropdown in all image dialogs if the "external_link_image_url"
+// option is defined in TinyMCE init.
+
+var tinyMCEImageList = new Array(
+ // Name, URL
+ ["Logo 1", "media/logo.jpg"],
+ ["Logo 2 Over", "media/logo_over.jpg"]
+);
diff --git a/mod/tinymce/vendor/tinymce/examples/lists/link_list.js b/mod/tinymce/vendor/tinymce/examples/lists/link_list.js
new file mode 100644
index 000000000..0d464331f
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/link_list.js
@@ -0,0 +1,10 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.
+// There links will be displayed as a dropdown in all link dialogs if the "external_link_list_url"
+// option is defined in TinyMCE init.
+
+var tinyMCELinkList = new Array(
+ // Name, URL
+ ["Moxiecode", "http://www.moxiecode.com"],
+ ["Freshmeat", "http://www.freshmeat.com"],
+ ["Sourceforge", "http://www.sourceforge.com"]
+);
diff --git a/mod/tinymce/vendor/tinymce/examples/lists/media_list.js b/mod/tinymce/vendor/tinymce/examples/lists/media_list.js
new file mode 100644
index 000000000..79b3f1bfe
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/media_list.js
@@ -0,0 +1,14 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.
+// There flash movies will be displayed as a dropdown in all media dialog if the "media_external_list_url"
+// option is defined in TinyMCE init.
+
+var tinyMCEMediaList = [
+ // Name, URL
+ ["Some Flash", "media/sample.swf"],
+ ["Some Quicktime", "media/sample.mov"],
+ ["Some AVI", "media/sample.avi"],
+ ["Some RealMedia", "media/sample.rm"],
+ ["Some Shockwave", "media/sample.dcr"],
+ ["Some Video", "media/sample.mp4"],
+ ["Some FLV", "media/sample.flv"],
+];
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/examples/lists/template_list.js b/mod/tinymce/vendor/tinymce/examples/lists/template_list.js
new file mode 100644
index 000000000..e06d35788
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/lists/template_list.js
@@ -0,0 +1,9 @@
+// This list may be created by a server logic page PHP/ASP/ASPX/JSP in some backend system.
+// There templates will be displayed as a dropdown in all media dialog if the "template_external_list_url"
+// option is defined in TinyMCE init.
+
+var tinyMCETemplateList = [
+ // Name, URL, Description
+ ["Simple snippet", "templates/snippet1.htm", "Simple HTML snippet."],
+ ["Layout", "templates/layout1.htm", "HTML Layout."]
+];
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/examples/media/logo.jpg b/mod/tinymce/vendor/tinymce/examples/media/logo.jpg
new file mode 100644
index 000000000..ad535d671
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/logo.jpg differ
diff --git a/mod/tinymce/vendor/tinymce/examples/media/logo_over.jpg b/mod/tinymce/vendor/tinymce/examples/media/logo_over.jpg
new file mode 100644
index 000000000..79fcd884a
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/logo_over.jpg differ
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.avi b/mod/tinymce/vendor/tinymce/examples/media/sample.avi
new file mode 100644
index 000000000..238bb688a
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/sample.avi differ
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.dcr b/mod/tinymce/vendor/tinymce/examples/media/sample.dcr
new file mode 100644
index 000000000..353b3ce67
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/sample.dcr differ
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.flv b/mod/tinymce/vendor/tinymce/examples/media/sample.flv
new file mode 100644
index 000000000..799d137e6
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/sample.flv differ
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.mov b/mod/tinymce/vendor/tinymce/examples/media/sample.mov
new file mode 100644
index 000000000..9c0a0932c
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/sample.mov differ
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.ram b/mod/tinymce/vendor/tinymce/examples/media/sample.ram
new file mode 100644
index 000000000..e2ce04cf7
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/media/sample.ram
@@ -0,0 +1 @@
+http://streaming.uga.edu/samples/ayp_lan.rm
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.rm b/mod/tinymce/vendor/tinymce/examples/media/sample.rm
new file mode 100644
index 000000000..8947706e0
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/sample.rm differ
diff --git a/mod/tinymce/vendor/tinymce/examples/media/sample.swf b/mod/tinymce/vendor/tinymce/examples/media/sample.swf
new file mode 100644
index 000000000..9f5fc4ac5
Binary files /dev/null and b/mod/tinymce/vendor/tinymce/examples/media/sample.swf differ
diff --git a/mod/tinymce/vendor/tinymce/examples/menu.html b/mod/tinymce/vendor/tinymce/examples/menu.html
new file mode 100644
index 000000000..e48650abd
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/menu.html
@@ -0,0 +1,18 @@
+
+
+
+Menu
+
+
+
+
Examples
+Full featured
+Simple theme
+Skin support
+Word processor
+Custom formats
+Accessibility Options
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/simple.html b/mod/tinymce/vendor/tinymce/examples/simple.html
new file mode 100644
index 000000000..70720caa1
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/simple.html
@@ -0,0 +1,47 @@
+
+
+
+Simple theme example
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/skins.html b/mod/tinymce/vendor/tinymce/examples/skins.html
new file mode 100644
index 000000000..c15085885
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/skins.html
@@ -0,0 +1,216 @@
+
+
+
+Skin support example
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/templates/layout1.htm b/mod/tinymce/vendor/tinymce/examples/templates/layout1.htm
new file mode 100644
index 000000000..a38df3e68
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/templates/layout1.htm
@@ -0,0 +1,15 @@
+
+
+
+
Column 1
+
Column 2
+
+
+
+
+
+
Username: {$username}
+
Staffid: {$staffid}
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/examples/templates/snippet1.htm b/mod/tinymce/vendor/tinymce/examples/templates/snippet1.htm
new file mode 100644
index 000000000..b2520beaf
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/templates/snippet1.htm
@@ -0,0 +1 @@
+This is just some code.
diff --git a/mod/tinymce/vendor/tinymce/examples/word.html b/mod/tinymce/vendor/tinymce/examples/word.html
new file mode 100644
index 000000000..d827b6fed
--- /dev/null
+++ b/mod/tinymce/vendor/tinymce/examples/word.html
@@ -0,0 +1,72 @@
+
+
+
+Word processor example
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
index ea4a1b0e1..8a80d46b1 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
@@ -12,9 +12,54 @@ not_set:"-- Not set --",
clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
+invalid_data:"{#field} is invalid",
+invalid_data_number:"{#field} must be a number",
+invalid_data_min:"{#field} must be a number greater than {#min}",
+invalid_data_size:"{#field} must be a number or percentage",
more_colors:"More colors"
},
+colors:{
+'000000':'Black',
+'993300':'Burnt orange',
+'333300':'Dark olive',
+'003300':'Dark green',
+'003366':'Dark azure',
+'000080':'Navy Blue',
+'333399':'Indigo',
+'333333':'Very dark gray',
+'800000':'Maroon',
+'FF6600':'Orange',
+'808000':'Olive',
+'008000':'Green',
+'008080':'Teal',
+'0000FF':'Blue',
+'666699':'Grayish blue',
+'808080':'Gray',
+'FF0000':'Red',
+'FF9900':'Amber',
+'99CC00':'Yellow green',
+'339966':'Sea green',
+'33CCCC':'Turquoise',
+'3366FF':'Royal blue',
+'800080':'Purple',
+'999999':'Medium gray',
+'FF00FF':'Magenta',
+'FFCC00':'Gold',
+'FFFF00':'Yellow',
+'00FF00':'Lime',
+'00FFFF':'Aqua',
+'00CCFF':'Sky blue',
+'993366':'Brown',
+'C0C0C0':'Silver',
+'FF99CC':'Pink',
+'FFCC99':'Peach',
+'FFFF99':'Light yellow',
+'CCFFCC':'Pale green',
+'CCFFFF':'Pale cyan',
+'99CCFF':'Light sky blue',
+'CC99FF':'Plum',
+'FFFFFF':'White'
+},
contextmenu:{
align:"Alignment",
left:"Left",
@@ -151,7 +196,8 @@ langs:"Languages",
wait:"Please wait...",
sug:"Suggestions",
no_sug:"No suggestions",
-no_mpell:"No misspellings found."
+no_mpell:"No misspellings found.",
+learn_word:"Learn word"
},
pagebreak:{
desc:"Insert page break."
@@ -167,4 +213,11 @@ upper_roman:"Upper roman",
circle:"Circle",
disc:"Disc",
square:"Square"
-}}});
\ No newline at end of file
+},
+aria:{
+rich_text_area:"Rich Text Area"
+},
+wordcount:{
+words: 'Words: '
+}
+}});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
index 873bfd8d3..ad6a7b698 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -1,5 +1,7 @@
tinyMCE.addI18n('en.advhr_dlg',{
+normal:"Normal",
width:"Width",
+widthunits:"Units",
size:"Height",
noshade:"No shadow"
});
\ No newline at end of file
diff --git a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
index fc37b2aec..843e1f8f0 100644
--- a/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
+++ b/mod/tinymce/vendor/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm
@@ -8,43 +8,44 @@
-
+