cvs diff -u shazamgallery.module Index: shazamgallery.module =================================================================== RCS file: /cvs/drupal/contributions/modules/shazamgallery/shazamgallery.module,v retrieving revision 1.21 diff -u -r1.21 shazamgallery.module --- shazamgallery.module 2 Mar 2006 19:34:47 -0000 1.21 +++ shazamgallery.module 31 Aug 2006 22:03:42 -0000 @@ -589,17 +614,28 @@ //Latest Image. Single node. $view = new stdClass(); - $view->name = t('latest image'); + $view->name = 'latest_image'; $view->description = t('The last image added to the site.'); + $view->access = array ( +); + $view->view_args_php = ''; $view->page = TRUE; - $view->url = 'gallery/node/latest'; - $view->page_title = t('latest image in %1'); - $view->page_type = 'node'; + $view->page_title = t('latest image'); + $view->page_header = ''; + $view->page_header_format = '1'; + $view->page_footer = ''; + $view->page_footer_format = '1'; + $view->page_empty = ''; + $view->page_empty_format = '1'; + $view->page_type = 'teaser'; + $view->url = 'gallery/latest'; $view->use_pager = FALSE; - $view->nodes_per_page = 1; - $view->block = FALSE; - $view->menu = FALSE; - $view->breadcrumb_no_home = FALSE; + $view->nodes_per_page = '1'; + $view->menu = TRUE; + $view->menu_title = t('latest image'); + $view->menu_tab = FALSE; + $view->menu_tab_default = FALSE; + $view->menu_weight = ''; $view->sort = array ( array ( 'tablename' => 'node', @@ -615,45 +651,51 @@ ), ); $view->argument = array ( - array ( - 'type' => 'nid', - 'argdefault' => '3', - 'title' => t('latest image'), - ), ); $view->field = array ( ); $view->filter = array ( array ( 'tablename' => 'node', - 'field' => 'promote', + 'field' => 'status', 'operator' => '=', 'options' => '', 'value' => '1', ), array ( 'tablename' => 'node', - 'field' => 'status', - 'operator' => '=', + 'field' => 'type', + 'operator' => 'OR', 'options' => '', - 'value' => '1', + 'value' => array ( + 0 => 'image', +), ), ); + $view->exposed_filter = array ( + ); + $view->requires = array(node); $views[$view->name] = $view; //gallery per user $view = new stdClass(); - $view->name = t('user gallery'); + $view->name = 'user_gallery'; $view->description = t('A gallery per user.'); Process cvs exited with code 1 + $view->access = array ( +); + $view->view_args_php = ''; $view->page = TRUE; - $view->url = 'gallery/user'; - $view->page_title = 'gallery for %1'; + $view->page_title = t('galleries for all users'); + $view->page_header = ''; + $view->page_header_format = '1'; + $view->page_footer = ''; + $view->page_footer_format = '1'; + $view->page_empty = ''; + $view->page_empty_format = '1'; $view->page_type = 'teaser'; + $view->url = 'gallery/user'; $view->use_pager = TRUE; - $view->nodes_per_page = variable_get('default_nodes_main', 10); - $view->menu = FALSE; - $view->menu_title = 'user'; - $view->block = FALSE; + $view->nodes_per_page = '10'; $view->sort = array ( array ( 'tablename' => 'node', @@ -672,7 +714,10 @@ array ( 'type' => 'uid', 'argdefault' => '2', - 'title' => t('gallery for all users'), + 'title' => t('galleries for %user', array('%user' => '%1')), + 'options' => '', + 'wildcard' => '', + 'wildcard_substitution' => '', ), ); $view->field = array ( @@ -681,9 +726,11 @@ array ( 'tablename' => 'node', 'field' => 'type', - 'operator' => '=', + 'operator' => 'OR', 'options' => '', - 'value' => 'image', + 'value' => array ( + 0 => 'image', +), ), array ( 'tablename' => 'node', @@ -693,21 +740,33 @@ 'value' => '1', ), ); + $view->exposed_filter = array ( + ); + $view->requires = array(node); $views[$view->name] = $view; + //Dated galleries $view = new stdClass(); - $view->name = t('gallery by date'); - $view->description = t('browse galleries by dates'); + $view->name = 'gallery_by_date'; + $view->description = t('browse galleries by date'); + $view->access = array ( +); + $view->view_args_php = ''; $view->page = TRUE; - $view->page_title = t('gallery for %2 %1'); + $view->page_title = t('browse galleries by date'); + $view->page_header = ''; $view->page_header_format = '1'; + $view->page_footer = ''; + $view->page_footer_format = '1'; + $view->page_empty = ''; + $view->page_empty_format = '1'; $view->page_type = 'teaser'; $view->url = 'gallery/dates'; $view->use_pager = TRUE; $view->nodes_per_page = '10'; $view->menu = TRUE; - $view->menu_title = t('gallery by date'); + $view->menu_title = t('galleries by date'); $view->menu_tab = FALSE; $view->menu_tab_default = FALSE; $view->menu_weight = ''; @@ -729,14 +788,18 @@ array ( 'type' => 'year', 'argdefault' => '3', - 'title' => t('year'), + 'title' => '%1', 'options' => '', + 'wildcard' => '', + 'wildcard_substitution' => '', ), array ( 'type' => 'month', 'argdefault' => '3', - 'title' => t('month'), + 'title' => '%1, %2', 'options' => '', + 'wildcard' => '', + 'wildcard_substitution' => '', ), ); $view->field = array ( @@ -752,12 +815,16 @@ array ( 'tablename' => 'node', 'field' => 'type', - 'operator' => '=', + 'operator' => 'OR', 'options' => '', - 'value' => 'image', + 'value' => array ( + 0 => 'gallery', +), ), ); - $view->requires = array(node, users); + $view->exposed_filter = array ( + ); + $view->requires = array(node); $views[$view->name] = $view; return $views;