Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/insert_view/README.txt,v retrieving revision 1.2.4.2 diff -u -p -r1.2.4.2 README.txt --- README.txt 11 Mar 2008 03:20:45 -0000 1.2.4.2 +++ README.txt 14 Mar 2008 03:35:29 -0000 @@ -1,25 +1,38 @@ OVERVIEW -------- -Merlinofchaos' excellent Views module allows site admins to build dynamic content lists -for display on pages and in blocks. It also offers a few handy functions for imbedding -view lists in other node bodies. Doing that, though, requires PHP filtering rights for -whoever maintains the node. View Tags allows users to embed these lists in node bodies -using relatively simple tag syntax: +The Views module allows administrators to create dynamic lists of content for +display in pages or blocks. It is possible to insert those lists into existing +node bodies and blocks, but such inclusion requires that PHP filtering be turned +on. The Insert View module allows any user to insert view listings using tag +syntax, without the need for PHP execution permissions. The Insert View tag +syntax for embedding a view is relatively simple: -[view:] is replaced by the content listing, and +[view:] is replaced by the content listing corresponding to the +named view. -[view:=] limits the listing to a particular of entries. +[view:=] limits the listing to a particular of +entries. [view:==] limits the listing to a particular of entries, and passes a comma delimited list of arguments to the view. -Here's an example you could use with a view named "book_reviews" that takes a taxonomy -term ID as an argument: +Here's an example you could use with the default view named "tracker" which +takes a user ID as an argument: -[view:book_reviews=5=2] +[view:tracker=5=1] -In short this tag says, "Insert the view named book_reviews, limit the number of results to -5, and supply the argument/term ID 2." +In short this tag says, "Insert the view named tracker, limit the number of +results to 5, and supply the argument/user ID 1." + +Sometimes you want to pass an argument without placing a limit on the number +of results. You can do that by leaving the position empty, like so: + +[view:==] + +You can use a pager with your view by using the following syntax (note: +you must set a limit which will serve as the number of nodes per page): + +[view_pager:=]. INSTALLATION ------------ Index: insert_view.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/insert_view/insert_view.module,v retrieving revision 1.6.2.7 diff -u -p -r1.6.2.7 insert_view.module --- insert_view.module 11 Mar 2008 04:39:26 -0000 1.6.2.7 +++ insert_view.module 14 Mar 2008 03:35:29 -0000 @@ -28,15 +28,46 @@ function insert_view_filter($op, $delta function insert_view_filter_tips($delta, $format, $long = false) { if ($long) { return t(' -

The Views module allows administrators to create dynamic lists of content for display in pages or blocks. It is also possible to insert those lists into existing node bodies, but such inclusion requires that PHP filtering be turned on. This module allows any user to insert view listings using tag syntax, without the need for PHP execution permissions.

+

The Views module allows administrators to create dynamic lists of content + for display in pages or blocks. It is possible to insert those lists into + existing node bodies and blocks, but such inclusion requires that PHP + filtering be turned on. The Insert View module allows any user to insert + view listings using tag syntax, without the need for PHP execution + permissions. The Insert View tag syntax for embedding a view is relatively + simple:

- 
[view:my view]
- - will be replaced by the full listing of content defined by that view. - - 
[view:my view=10]
- - will limit the listing to 10 items. + 
[view:my_view]
+ +

is replaced by the content listing corresponding to the named view (in + this case, my_view).

+ + 
[view:my_view=5]
+ +

limits the listing to 5 entries.

+ + 
[view:my_view=10=1,2,3]
+ +

limits the listing to 10 entries, and passes a comma delimited list of + arguments (in this case 1, 2, and 3) to the view.

+ +

Here\'s an example you could use with the default view named "tracker" + which takes a user ID as an argument:

+ + 
[view:tracker=5=1]
+ +

In short this tag says, "Insert the view named tracker, limit the + number of results to 5, and supply the argument/user ID 1."

+ +

Sometimes you want to pass an argument without placing a limit on the number + of results. You can do that by leaving the limits position empty, like so:

+ + 
[view:my_view==1]
+ +

You can use a pager with your view by using the following syntax + (note: you must set a limit which will serve as the number of nodes per + page):

+ + 
[view_pager:my_view=3]
'); } else { @@ -45,11 +76,12 @@ function insert_view_filter_tips($delta, } function _insert_view_substitute_tags($text) { - if (preg_match_all("/\[view:([^=\]]+)=?([^=\]]+)?=?([^\]]*)?\]/i", $text, $match)) { - foreach ($match[2] as $key => $value) { - $viewname = $match[1][$key]; - $limit = $match[2][$key]; - $view_args = $match[3][$key]; + if (preg_match_all("/\[view(_pager)?:([^=\]]+)=?([^=\]]+)?=?([^\]]*)?\]/i", $text, $match)) { + foreach ($match[3] as $key => $value) { + $match[1][$key] == '_pager' ? $pager = TRUE : $pager = FALSE; + $viewname = $match[2][$key]; + $limit = $match[3][$key]; + $view_args = $match[4][$key]; $view = views_get_view($viewname); $replace = ""; @@ -65,7 +97,7 @@ function _insert_view_substitute_tags($t // set $view->url to current page so views with exposed filters submit back to the same page $view->url = $_GET['q']; if (is_numeric($limit)) { - $replace = views_build_view('embed', $view, $view_args, FALSE, $limit); + $replace = views_build_view('embed', $view, $view_args, $pager, $limit); } else { $replace = views_build_view('embed', $view, $view_args, FALSE, NULL);