From: cash Date: Sat, 22 Jan 2011 20:33:28 +0000 (+0000) Subject: finished the first pass on the pages plugin for using the new HTML/CSS X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8423cda014c6aee9fb3a3f7ebe78bc0465e7355f;p=lorea%2Felgg.git finished the first pass on the pages plugin for using the new HTML/CSS git-svn-id: http://code.elgg.org/elgg/trunk@7904 36083f99-b078-4883-b0ff-0f9b5a30f544 --- diff --git a/mod/pages/history.php b/mod/pages/history.php index cb8a52ee2..5a31723cb 100644 --- a/mod/pages/history.php +++ b/mod/pages/history.php @@ -19,7 +19,12 @@ if (!$container) { elgg_set_page_owner_guid($container->getGUID()); -elgg_push_breadcrumb($container->name, $container->getURL()); +if (elgg_instanceof($container, 'group')) { + elgg_push_breadcrumb($container->name, "pg/pages/group/$container->guid/owner"); +} else { + elgg_push_breadcrumb($container->name, "pg/pages/owner/$container->username"); +} +pages_prepare_parent_breadcrumbs($page); elgg_push_breadcrumb($page->title, $page->getURL()); elgg_push_breadcrumb(elgg_echo('pages:history')); @@ -27,15 +32,12 @@ $title = $page->title . ": " . elgg_echo('pages:history'); $content = list_annotations($page_guid, 'page', 20, false); -pages_set_navigation_parent($page); -$sidebar = elgg_view('pages/sidebar/tree'); - $body = elgg_view_layout('content', array( 'filter' => '', 'buttons' => '', 'content' => $content, 'title' => $title, - 'sidebar' => $sidebar, + 'sidebar' => elgg_view('pages/sidebar/navigation', array('page' => $page)), )); echo elgg_view_page($title, $body); diff --git a/mod/pages/images/application.png b/mod/pages/images/application.png deleted file mode 100644 index 1dee9e366..000000000 Binary files a/mod/pages/images/application.png and /dev/null differ diff --git a/mod/pages/images/code.png b/mod/pages/images/code.png deleted file mode 100644 index 0c76bd129..000000000 Binary files a/mod/pages/images/code.png and /dev/null differ diff --git a/mod/pages/images/css.png b/mod/pages/images/css.png deleted file mode 100644 index f907e44b3..000000000 Binary files a/mod/pages/images/css.png and /dev/null differ diff --git a/mod/pages/images/db.png b/mod/pages/images/db.png deleted file mode 100644 index bddba1f98..000000000 Binary files a/mod/pages/images/db.png and /dev/null differ diff --git a/mod/pages/images/directory.png b/mod/pages/images/directory.png deleted file mode 100644 index 784e8fa48..000000000 Binary files a/mod/pages/images/directory.png and /dev/null differ diff --git a/mod/pages/images/doc.png b/mod/pages/images/doc.png deleted file mode 100644 index ae8ecbf47..000000000 Binary files a/mod/pages/images/doc.png and /dev/null differ diff --git a/mod/pages/images/file.png b/mod/pages/images/file.png deleted file mode 100644 index 8b8b1ca00..000000000 Binary files a/mod/pages/images/file.png and /dev/null differ diff --git a/mod/pages/images/film.png b/mod/pages/images/film.png deleted file mode 100644 index b0ce7bb19..000000000 Binary files a/mod/pages/images/film.png and /dev/null differ diff --git a/mod/pages/images/flash.png b/mod/pages/images/flash.png deleted file mode 100644 index 5769120b1..000000000 Binary files a/mod/pages/images/flash.png and /dev/null differ diff --git a/mod/pages/images/folder_open.png b/mod/pages/images/folder_open.png deleted file mode 100644 index 4e3548352..000000000 Binary files a/mod/pages/images/folder_open.png and /dev/null differ diff --git a/mod/pages/images/html.png b/mod/pages/images/html.png deleted file mode 100644 index 6ed2490ed..000000000 Binary files a/mod/pages/images/html.png and /dev/null differ diff --git a/mod/pages/images/java.png b/mod/pages/images/java.png deleted file mode 100644 index b7bfcd15f..000000000 Binary files a/mod/pages/images/java.png and /dev/null differ diff --git a/mod/pages/images/linux.png b/mod/pages/images/linux.png deleted file mode 100644 index 52699bfee..000000000 Binary files a/mod/pages/images/linux.png and /dev/null differ diff --git a/mod/pages/images/music.png b/mod/pages/images/music.png deleted file mode 100644 index a8b3ede3d..000000000 Binary files a/mod/pages/images/music.png and /dev/null differ diff --git a/mod/pages/images/pdf.png b/mod/pages/images/pdf.png deleted file mode 100644 index 8f8095e46..000000000 Binary files a/mod/pages/images/pdf.png and /dev/null differ diff --git a/mod/pages/images/php.png b/mod/pages/images/php.png deleted file mode 100644 index 7868a2594..000000000 Binary files a/mod/pages/images/php.png and /dev/null differ diff --git a/mod/pages/images/picture.png b/mod/pages/images/picture.png deleted file mode 100644 index 4a158fef7..000000000 Binary files a/mod/pages/images/picture.png and /dev/null differ diff --git a/mod/pages/images/ppt.png b/mod/pages/images/ppt.png deleted file mode 100644 index c4eff0387..000000000 Binary files a/mod/pages/images/ppt.png and /dev/null differ diff --git a/mod/pages/images/psd.png b/mod/pages/images/psd.png deleted file mode 100644 index 73c5b3f24..000000000 Binary files a/mod/pages/images/psd.png and /dev/null differ diff --git a/mod/pages/images/ruby.png b/mod/pages/images/ruby.png deleted file mode 100644 index f59b7c436..000000000 Binary files a/mod/pages/images/ruby.png and /dev/null differ diff --git a/mod/pages/images/script.png b/mod/pages/images/script.png deleted file mode 100644 index 63fe6ceff..000000000 Binary files a/mod/pages/images/script.png and /dev/null differ diff --git a/mod/pages/images/spinner.gif b/mod/pages/images/spinner.gif deleted file mode 100644 index 85b99d46b..000000000 Binary files a/mod/pages/images/spinner.gif and /dev/null differ diff --git a/mod/pages/images/txt.png b/mod/pages/images/txt.png deleted file mode 100644 index 813f712f7..000000000 Binary files a/mod/pages/images/txt.png and /dev/null differ diff --git a/mod/pages/images/xls.png b/mod/pages/images/xls.png deleted file mode 100644 index b977d7e52..000000000 Binary files a/mod/pages/images/xls.png and /dev/null differ diff --git a/mod/pages/images/zip.png b/mod/pages/images/zip.png deleted file mode 100644 index fd4bbccdf..000000000 Binary files a/mod/pages/images/zip.png and /dev/null differ diff --git a/mod/pages/index.php b/mod/pages/index.php index b257b14b4..c4e391206 100644 --- a/mod/pages/index.php +++ b/mod/pages/index.php @@ -18,7 +18,7 @@ group_gatekeeper(); $title = elgg_echo('pages:owner', array($owner->name)); -elgg_push_breadcrumb($title); +elgg_push_breadcrumb($owner->name); $content = elgg_list_entities(array( 'types' => 'object', @@ -27,9 +27,17 @@ $content = elgg_list_entities(array( 'limit' => $limit, 'full_view' => false, )); +if (!$content) { + $content = '

' . elgg_echo('pages:none') . '

'; +} + +$filter_context = ''; +if (elgg_get_page_owner_guid() == get_loggedin_userid()) { + $filter_context = 'mine'; +} $params = array( - 'filter_context' => 'mine', + 'filter_context' => $filter_context, 'content' => $content, 'title' => $title, 'sidebar' => elgg_view('pages/sidebar/navigation'), diff --git a/mod/pages/lib/pages.php b/mod/pages/lib/pages.php index e3ed3c822..72aad2aed 100644 --- a/mod/pages/lib/pages.php +++ b/mod/pages/lib/pages.php @@ -41,6 +41,26 @@ function pages_prepare_form_vars($page = null, $parent_guid = 0) { return $values; } +/** + * Recurses the page tree and adds the breadcrumbs for all ancestors + * + * @param ElggObject $page Page entity + */ +function pages_prepare_parent_breadcrumbs($page) { + if ($page && $page->parent_guid) { + $parents = array(); + $parent = get_entity($page->parent_guid); + while ($parent) { + array_push($parents, $parent); + $parent = get_entity($parent->parent_guid); + } + while ($parents) { + $parent = array_pop($parents); + elgg_push_breadcrumb($parent->title, $parent->getURL()); + } + } +} + /** * Register the navigation menu * @@ -54,7 +74,7 @@ function pages_register_navigation_tree($container) { $top_pages = elgg_get_entities(array( 'type' => 'object', 'subtype' => 'page_top', - 'container_guid' => $container->getGUID, + 'container_guid' => $container->getGUID(), )); foreach ($top_pages as $page) { @@ -87,20 +107,3 @@ function pages_register_navigation_tree($container) { } } } - -/** - * Return the correct sidebar for a given entity - * - * @param ElggObject $entity - */ -function pages_get_entity_sidebar(ElggObject $entity, $fulltree = 0) { - $body = ""; - - $children = elgg_get_entities_from_metadata(array('metadata_names' => 'parent_guid', 'metadata_values' => $entity->guid, 'limit' => 9999)); - $body .= elgg_view('pages/sidebar/sidebarthis', array('entity' => $entity, - 'children' => $children, - 'fulltree' => $fulltree)); - //$body = elgg_view('pages/sidebar/wrapper', array('body' => $body)); - - return $body; -} diff --git a/mod/pages/new.php b/mod/pages/new.php index 31b0c7951..42a8e04e1 100644 --- a/mod/pages/new.php +++ b/mod/pages/new.php @@ -13,10 +13,10 @@ if (!$container) { } -$parent_page = null; +$parent_guid = 0; $page_owner = $container; if (elgg_instanceof($container, 'object')) { - $parent_page = $container; + $parent_guid = $container->getGUID(); $page_owner = $container->getContainerEntity(); } @@ -25,7 +25,7 @@ elgg_set_page_owner_guid($page_owner->getGUID()); $title = elgg_echo('pages:add'); elgg_push_breadcrumb($title); -$vars = pages_prepare_form_vars(null, $parent_page->getGUID()); +$vars = pages_prepare_form_vars(null, $parent_guid); $content = elgg_view_form('pages/edit', array(), $vars); $body = elgg_view_layout('content', array( diff --git a/mod/pages/pagesTree.php b/mod/pages/pagesTree.php deleted file mode 100644 index ed8457a7e..000000000 --- a/mod/pages/pagesTree.php +++ /dev/null @@ -1,21 +0,0 @@ -title . ": " . elgg_echo('pages:revision'); -elgg_push_breadcrumb($container->name, $container->getURL()); +if (elgg_instanceof($container, 'group')) { + elgg_push_breadcrumb($container->name, "pg/pages/group/$container->guid/owner"); +} else { + elgg_push_breadcrumb($container->name, "pg/pages/owner/$container->username"); +} +pages_prepare_parent_breadcrumbs($page); elgg_push_breadcrumb($page->title, $page->getURL()); elgg_push_breadcrumb(elgg_echo('pages:revision')); @@ -36,7 +41,7 @@ $content = elgg_view('object/page_top', array( 'full' => true, )); -$sidebar = elgg_view('pages/sidebar/tree', array('page' => $page)); +$sidebar = elgg_view('pages/sidebar/history', array('page' => $page)); $body = elgg_view_layout('content', array( 'filter' => '', diff --git a/mod/pages/start.php b/mod/pages/start.php index 5872e6b11..b4e082f20 100644 --- a/mod/pages/start.php +++ b/mod/pages/start.php @@ -36,7 +36,6 @@ function pages_init() { // Extend some views elgg_extend_view('css/screen', 'pages/css'); - elgg_extend_view('groups/right_column', 'pages/groupprofile_pages'); // Add to groups context // Register entity type for search register_entity_type('object', 'page'); @@ -94,6 +93,12 @@ function pages_init() { function pages_page_handler($page) { elgg_load_library('elgg:pages'); + + // add the jquery treeview files for navigation + $js_url = elgg_get_site_url() . 'mod/pages/vendors/jquery-treeview/jquery.treeview.min.js'; + elgg_register_js($js_url, 'jquery-treeview'); + $css_url = elgg_get_site_url() . 'mod/pages/vendors/jquery-treeview/jquery.treeview.css'; + elgg_register_css($css_url, 'jquery-treeview'); if (!isset($page[0])) { $page[0] = 'all'; @@ -220,43 +225,6 @@ function page_notify_message($hook, $entity_type, $returnvalue, $params) { return null; } - -/** - * Sets the parent of the current page, for navigation purposes - * - * @param ElggObject $entity - */ -function pages_set_navigation_parent(ElggObject $entity) { - $guid = $entity->getGUID(); - - while ($parent_guid = $entity->parent_guid) { - $entity = get_entity($parent_guid); - if ($entity) { - $guid = $entity->getGUID(); - } - } - - set_input('treeguid',$guid); -} - -function pages_get_path($guid) { - - if (!$entity = get_entity($guid)) { - return array(); - } - - $path = array($guid); - - while ($parent_guid = $entity->parent_guid) { - $entity = get_entity($parent_guid); - if ($entity) { - $path[] = $entity->getGUID(); - } - } - - return $path; -} - /** * Extend permissions checking to extend can-edit for write users. * diff --git a/mod/pages/vendors/jquery-treeview/.gitignore b/mod/pages/vendors/jquery-treeview/.gitignore new file mode 100644 index 000000000..e39040f5b --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/.gitignore @@ -0,0 +1,7 @@ +build/dist +docs +.project +*~ +*.diff +*.patch +.DS_Store diff --git a/mod/pages/vendors/jquery-treeview/README.md b/mod/pages/vendors/jquery-treeview/README.md new file mode 100644 index 000000000..4b6209d28 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/README.md @@ -0,0 +1,8 @@ +[jQuery Treeview Plugin](http://bassistance.de/jquery-plugins/jquery-plugin-treeview/) - Its just a tree +================================ + +Converts nested lists into a mouse-navigatable tree - not keyboard support, yet. + +Provides some options for customizing, an async-tree extension and an experimental sortable extension. + +API documentation can be found at [http://docs.jquery.com/Plugins/Treeview](http://docs.jquery.com/Plugins/Treeview). There's also some background on the async extension. diff --git a/mod/pages/vendors/jquery-treeview/changelog.txt b/mod/pages/vendors/jquery-treeview/changelog.txt new file mode 100644 index 000000000..29c6e1975 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/changelog.txt @@ -0,0 +1,36 @@ +1.4.1 +----- +* Fix for #2360 +* Added option cookieOptions: Passed through to $.cookie to set path, domain etc. +* Tested with jQuery 1.2.x and 1.4.3 +* Fixed combination of persist: "location" and prerendered: true + +1.4 +--- + +* Added changelog (this file) +* Fixed tree control to search only for anchors, allowing images or other elements inside the controls, while keeping the control usable with the keyboard +* Restructured folder layout: root contains plugin resources, lib contains script dependencies, demo contains demos and related files +* Added prerendered option: If set to true, assumes all hitarea divs and classes already rendered, speeding up initialization for big trees, but more obtrusive +* Added jquery.treeview.async.js for ajax-lazy-loading trees, see async.html demo +* Exposed $.fn.treeview.classes for custom classes if necessary +* Show treecontrol only when JavaScript is enabled +* Completely reworked themeing via CSS sprites, resulting in only two files per theme + * updated dotted, black, gray and red theme + * added famfamfam theme (no lines) +* Improved cookie persistence to allow multiple persisted trees per page via cookieId option +* Improved location persistence by making it case-insensitive +* Improved swapClass and replaceClass plugin implementations +* Added folder-closed.gif to filetree example + +1.3 +--- + +* Fixes for all outstanding bugs +* Added persistence features + * location based: click on a link in the treeview and reopen that link after the page loaded + * cookie based: save the state of the tree in a cookie on each click and load that on reload +* smoothed animations, fixing flickering in both IE and Opera +* Tested in Firefox 2, IE 6 & 7, Opera 9, Safari 3 +* Moved documentation to jQuery wiki +* Requires jQuery 1.2+ diff --git a/mod/pages/vendors/jquery-treeview/demo/async.html b/mod/pages/vendors/jquery-treeview/demo/async.html new file mode 100644 index 000000000..da6fe667d --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/async.html @@ -0,0 +1,91 @@ + + + + + + jQuery async treeview + + + + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
+ + + +

Lazy-loading tree

+ + + +

Mixed pre and lazy-loading

+ + + + + +
+ + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/bg.gif b/mod/pages/vendors/jquery-treeview/demo/bg.gif new file mode 100644 index 000000000..846add071 Binary files /dev/null and b/mod/pages/vendors/jquery-treeview/demo/bg.gif differ diff --git a/mod/pages/vendors/jquery-treeview/demo/demo.js b/mod/pages/vendors/jquery-treeview/demo/demo.js new file mode 100644 index 000000000..57ae04103 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/demo.js @@ -0,0 +1,31 @@ +$(document).ready(function(){ + + // first example + $("#browser").treeview(); + + // second example + $("#navigation").treeview({ + persist: "location", + collapsed: true, + unique: true + }); + + // third example + $("#red").treeview({ + animated: "fast", + collapsed: true, + unique: true, + persist: "cookie", + toggle: function() { + window.console && console.log("%o was toggled", this); + } + }); + + // fourth example + $("#black, #gray").treeview({ + control: "#treecontrol", + persist: "cookie", + cookieId: "treeview-black" + }); + +}); \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/edit.html b/mod/pages/vendors/jquery-treeview/demo/edit.html new file mode 100644 index 000000000..9149c3312 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/edit.html @@ -0,0 +1,82 @@ + + + + + + jQuery treeview + + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
+ + Main Demo + +

Sample 1 - default, right-click to remove items

+ + + + + +
+ + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/images.html b/mod/pages/vendors/jquery-treeview/demo/images.html new file mode 100644 index 000000000..50d5e4320 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/images.html @@ -0,0 +1,56 @@ + + + + + + jQuery treeview + + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
+ +

Sample 1 - default

+ + +
+ + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/index.html b/mod/pages/vendors/jquery-treeview/demo/index.html new file mode 100644 index 000000000..938ca6369 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/index.html @@ -0,0 +1,338 @@ + + + + + + jQuery treeview + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
+ + Pagecode + +

Other demos

+ + +

Sample 1 - default

+ + +

Sample 2 - Navigation

+ + + +

Sample 3 - fast animations, all branches collapsed at first, red theme, cookie-based persistance

+ + +

Sample 4 - two trees with one tree control, black and gray theme, cookie-based persistance

+ + + + +
+ + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/large.html b/mod/pages/vendors/jquery-treeview/demo/large.html new file mode 100644 index 000000000..f70e3777e --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/large.html @@ -0,0 +1,561 @@ + + + + +jQuery treeview + + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
Main Demo + +
+
 
+ + + +
+ +
+ + + + diff --git a/mod/pages/vendors/jquery-treeview/demo/prerendered.html b/mod/pages/vendors/jquery-treeview/demo/prerendered.html new file mode 100644 index 000000000..a8e2b5ae6 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/prerendered.html @@ -0,0 +1,620 @@ + + + + + jQuery treeview + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
+ + Main Demo + +
+
 
+ + + +
+ +
+ + + + diff --git a/mod/pages/vendors/jquery-treeview/demo/screen.css b/mod/pages/vendors/jquery-treeview/demo/screen.css new file mode 100644 index 000000000..965653c8e --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/screen.css @@ -0,0 +1,24 @@ +html, body {height:100%; margin: 0; padding: 0; } + +html>body { + font-size: 16px; + font-size: 68.75%; +} /* Reset Base Font Size */ + +body { + font-family: Verdana, helvetica, arial, sans-serif; + font-size: 68.75%; + background: #fff; + color: #333; +} + +h1, h2 { font-family: 'trebuchet ms', verdana, arial; padding: 10px; margin: 0 } +h1 { font-size: large } + +#banner { padding: 15px; background-color: #06b; color: white; font-size: large; border-bottom: 1px solid #ccc; + background: url(bg.gif) repeat-x; text-align: center } +#banner a { color: white; } + +#main { padding: 1em; } + +a img { border: none; } \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/simple.html b/mod/pages/vendors/jquery-treeview/demo/simple.html new file mode 100644 index 000000000..f79bd96a5 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/simple.html @@ -0,0 +1,82 @@ + + + + + + jQuery treeview + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
+ + Main Demo + + + + + +

+/- Icons from famfamfam

+ +
+ + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/sortable.html b/mod/pages/vendors/jquery-treeview/demo/sortable.html new file mode 100644 index 000000000..6189400cb --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/sortable.html @@ -0,0 +1,222 @@ + + + + + + jQuery treeview + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

jQuery Treeview Plugin Demo

+
+ + Main Demo + +

Sample 1 - default, right-click to remove items

+ +
+
    +
  • Folder 1 +
      +
    • Item 1.1
      • +
    +
    • +
  • Folder 2 +
      +
    • Subfolder 2.1 +
        +
      • File 2.1.1
        • +
      • File 2.1.2
        • +
      • File 2.1.3
        • +
      • Folder 3 (closed at start) +
          +
        • File 3.1
          • +
        +
        • +
      • File 2.1.4
        • +
      • File 2.1.5
        • +
      • File 2.1.6
        • +
      +
      • +
    • File 2.2
      • +
    +
    • +
  • Folder 3 (closed at start) +
      +
    • File 3.1
      • +
    +
    • +
  • File 4
    • +
+
+ +
+
    +
  • Folder 1 +
      +
    • Item 1.1
      • +
    +
    • +
  • Folder 2 +
      +
    • Subfolder 2.1 +
        +
      • File 2.1.1
        • +
      • File 2.1.2
        • +
      • File 2.1.3
        • +
      • Folder 3 (closed at start) +
          +
        • File 3.1
          • +
        +
        • +
      • File 2.1.4
        • +
      • File 2.1.5
        • +
      • File 2.1.6
        • +
      +
      • +
    • File 2.2
      • +
    +
    • +
  • Folder 3 (closed at start) +
      +
    • File 3.1
      • +
    +
    • +
  • File 4
    • +
+
+ +
+ + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/source.php b/mod/pages/vendors/jquery-treeview/demo/source.php new file mode 100644 index 000000000..c31b957f9 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/source.php @@ -0,0 +1,88 @@ + +[ + { + "text": "1. Pre Lunch (120 min)", + "expanded": true, + "classes": "important", + "children": + [ + { + "text": "1.1 The State of the Powerdome (30 min)" + }, + { + "text": "1.2 The Future of jQuery (30 min)" + }, + { + "text": "1.2 jQuery UI - A step to richnessy (60 min)" + } + ] + }, + { + "text": "2. Lunch (60 min)" + }, + { + "text": "3. After Lunch (120+ min)", + "children": + [ + { + "text": "3.1 jQuery Calendar Success Story (20 min)" + }, + { + "text": "3.2 jQuery and Ruby Web Frameworks (20 min)" + }, + { + "text": "3.3 Hey, I Can Do That! (20 min)" + }, + { + "text": "3.4 Taconite and Form (20 min)" + }, + { + "text": "3.5 Server-side JavaScript with jQuery and AOLserver (20 min)" + }, + { + "text": "3.6 The Onion: How to add features without adding features (20 min)", + "id": "36", + "hasChildren": true + }, + { + "text": "3.7 Visualizations with JavaScript and Canvas (20 min)" + }, + { + "text": "3.8 ActiveDOM (20 min)" + }, + { + "text": "3.8 Growing jQuery (20 min)" + } + ] + } +] + + +[ + { + "text": "1. Review of existing structures", + "expanded": true, + "children": + [ + { + "text": "1.1 jQuery core" + }, + { + "text": "1.2 metaplugins" + } + ] + }, + { + "text": "2. Wrapper plugins" + }, + { + "text": "3. Summary" + }, + { + "text": "4. Questions and answers" + } + +] + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/demo/source.phps b/mod/pages/vendors/jquery-treeview/demo/source.phps new file mode 100644 index 000000000..c31b957f9 --- /dev/null +++ b/mod/pages/vendors/jquery-treeview/demo/source.phps @@ -0,0 +1,88 @@ + +[ + { + "text": "1. Pre Lunch (120 min)", + "expanded": true, + "classes": "important", + "children": + [ + { + "text": "1.1 The State of the Powerdome (30 min)" + }, + { + "text": "1.2 The Future of jQuery (30 min)" + }, + { + "text": "1.2 jQuery UI - A step to richnessy (60 min)" + } + ] + }, + { + "text": "2. Lunch (60 min)" + }, + { + "text": "3. After Lunch (120+ min)", + "children": + [ + { + "text": "3.1 jQuery Calendar Success Story (20 min)" + }, + { + "text": "3.2 jQuery and Ruby Web Frameworks (20 min)" + }, + { + "text": "3.3 Hey, I Can Do That! (20 min)" + }, + { + "text": "3.4 Taconite and Form (20 min)" + }, + { + "text": "3.5 Server-side JavaScript with jQuery and AOLserver (20 min)" + }, + { + "text": "3.6 The Onion: How to add features without adding features (20 min)", + "id": "36", + "hasChildren": true + }, + { + "text": "3.7 Visualizations with JavaScript and Canvas (20 min)" + }, + { + "text": "3.8 ActiveDOM (20 min)" + }, + { + "text": "3.8 Growing jQuery (20 min)" + } + ] + } +] + + +[ + { + "text": "1. Review of existing structures", + "expanded": true, + "children": + [ + { + "text": "1.1 jQuery core" + }, + { + "text": "1.2 metaplugins" + } + ] + }, + { + "text": "2. Wrapper plugins" + }, + { + "text": "3. Summary" + }, + { + "text": "4. Questions and answers" + } + +] + \ No newline at end of file diff --git a/mod/pages/vendors/jquery-treeview/images/ajax-loader.gif b/mod/pages/vendors/jquery-treeview/images/ajax-loader.gif new file mode 100644 index 000000000..bc545850a Binary files /dev/null and b/mod/pages/vendors/jquery-treeview/images/ajax-loader.gif differ diff --git a/mod/pages/images/file.gif b/mod/pages/vendors/jquery-treeview/images/file.gif similarity index 100% rename from mod/pages/images/file.gif rename to mod/pages/vendors/jquery-treeview/images/file.gif diff --git a/mod/pages/images/folder-closed.gif b/mod/pages/vendors/jquery-treeview/images/folder-closed.gif similarity index 100% rename from mod/pages/images/folder-closed.gif rename to mod/pages/vendors/jquery-treeview/images/folder-closed.gif diff --git a/mod/pages/images/folder.gif b/mod/pages/vendors/jquery-treeview/images/folder.gif similarity index 100% rename from mod/pages/images/folder.gif rename to mod/pages/vendors/jquery-treeview/images/folder.gif diff --git a/mod/pages/images/minus.gif b/mod/pages/vendors/jquery-treeview/images/minus.gif similarity index 100% rename from mod/pages/images/minus.gif rename to mod/pages/vendors/jquery-treeview/images/minus.gif diff --git a/mod/pages/images/plus.gif b/mod/pages/vendors/jquery-treeview/images/plus.gif similarity index 100% rename from mod/pages/images/plus.gif rename to mod/pages/vendors/jquery-treeview/images/plus.gif diff --git a/mod/pages/images/treeview-black-line.gif b/mod/pages/vendors/jquery-treeview/images/treeview-black-line.gif similarity index 100% rename from mod/pages/images/treeview-black-line.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-black-line.gif diff --git a/mod/pages/images/treeview-black.gif b/mod/pages/vendors/jquery-treeview/images/treeview-black.gif similarity index 100% rename from mod/pages/images/treeview-black.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-black.gif diff --git a/mod/pages/images/treeview-default-line.gif b/mod/pages/vendors/jquery-treeview/images/treeview-default-line.gif similarity index 100% rename from mod/pages/images/treeview-default-line.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-default-line.gif diff --git a/mod/pages/images/treeview-default.gif b/mod/pages/vendors/jquery-treeview/images/treeview-default.gif similarity index 100% rename from mod/pages/images/treeview-default.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-default.gif diff --git a/mod/pages/images/treeview-famfamfam-line.gif b/mod/pages/vendors/jquery-treeview/images/treeview-famfamfam-line.gif similarity index 100% rename from mod/pages/images/treeview-famfamfam-line.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-famfamfam-line.gif diff --git a/mod/pages/images/treeview-famfamfam.gif b/mod/pages/vendors/jquery-treeview/images/treeview-famfamfam.gif similarity index 100% rename from mod/pages/images/treeview-famfamfam.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-famfamfam.gif diff --git a/mod/pages/images/treeview-gray-line.gif b/mod/pages/vendors/jquery-treeview/images/treeview-gray-line.gif similarity index 100% rename from mod/pages/images/treeview-gray-line.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-gray-line.gif diff --git a/mod/pages/images/treeview-gray.gif b/mod/pages/vendors/jquery-treeview/images/treeview-gray.gif similarity index 100% rename from mod/pages/images/treeview-gray.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-gray.gif diff --git a/mod/pages/images/treeview-red-line.gif b/mod/pages/vendors/jquery-treeview/images/treeview-red-line.gif similarity index 100% rename from mod/pages/images/treeview-red-line.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-red-line.gif diff --git a/mod/pages/images/treeview-red.gif b/mod/pages/vendors/jquery-treeview/images/treeview-red.gif similarity index 100% rename from mod/pages/images/treeview-red.gif rename to mod/pages/vendors/jquery-treeview/images/treeview-red.gif diff --git a/mod/pages/javascript/jquery.treeview.async.js b/mod/pages/vendors/jquery-treeview/jquery.treeview.async.js similarity index 54% rename from mod/pages/javascript/jquery.treeview.async.js rename to mod/pages/vendors/jquery-treeview/jquery.treeview.async.js index e37f98ee9..005231054 100644 --- a/mod/pages/javascript/jquery.treeview.async.js +++ b/mod/pages/vendors/jquery-treeview/jquery.treeview.async.js @@ -1,72 +1,110 @@ -/* - * Async Treeview 0.1 - Lazy-loading extension for Treeview - * - * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/ - * - * Copyright (c) 2007 Jörn Zaefferer - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - * Revision: $Id$ - * - */ - -;(function($) { - -function load(settings, root, child, container) { - $.getJSON(settings.url, {root: root, currentpage: settings.currentpage}, function(response) { - function createNode(parent) { - var current = $("
  • ").attr("id", this.id || "").html("" + this.text + "").appendTo(parent); - if (this.classes) { - current.children("span").addClass(this.classes); - } - if (this.expanded) { - current.addClass("open"); - } - if (this.hasChildren || this.children && this.children.length) { - var branch = $("