Index: simpleviews.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpleviews/simpleviews.css,v
retrieving revision 1.1
diff -u -p -r1.1 simpleviews.css
--- simpleviews.css	25 Sep 2008 22:08:09 -0000	1.1
+++ simpleviews.css	27 Oct 2009 14:09:40 -0000
@@ -23,6 +23,6 @@
   padding-left: 5em;
 }
 
-#simpleviews-elements div.form-item select, #simpleviews-form div.form-item input  {
+#simpleviews-elements div.form-item select, #simpleviews-form div.form-item input.form-text  {
   width: 18em;
 }
Index: simpleviews.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpleviews/simpleviews.info,v
retrieving revision 1.3
diff -u -p -r1.3 simpleviews.info
--- simpleviews.info	25 Sep 2008 22:08:09 -0000	1.3
+++ simpleviews.info	27 Oct 2009 14:09:40 -0000
@@ -1,5 +1,10 @@
 ; $Id: simpleviews.info,v 1.3 2008/09/25 22:08:09 eaton Exp $
 name = SimpleViews
 description = An easy-to-use tool for bulding content listing pages.
-dependencies[] = views
-core = 6.x
+; @todo: put back when views is available
+; dependencies[] = views
+core = 7.x
+files[] = simpleviews.module
+files[] = simpleviews.install
+files[] = simpleviews.pages.inc
+files[] = simpleviews.views_default.inc
Index: simpleviews.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpleviews/simpleviews.install,v
retrieving revision 1.3
diff -u -p -r1.3 simpleviews.install
--- simpleviews.install	25 Sep 2008 22:08:09 -0000	1.3
+++ simpleviews.install	27 Oct 2009 14:09:40 -0000
@@ -6,14 +6,6 @@
  * SimpleViews module's install and uninstall code.
  */
 
-
-/**
- * Implementation of hook_install().
- */
-function simpleviews_install() {
-  drupal_install_schema('simpleviews');
-}
-
 /**
  * Implementation of hook_schema().
  */
@@ -100,10 +92,3 @@ function simpleviews_schema() {
   );
   return $schema;
 }
-
-/**
- * Implementation of hook_uninstall().
- */
-function simpleviews_uninstall() {
-  drupal_uninstall_schema('simpleviews');
-}
Index: simpleviews.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpleviews/simpleviews.js,v
retrieving revision 1.2
diff -u -p -r1.2 simpleviews.js
--- simpleviews.js	26 Sep 2008 03:37:37 -0000	1.2
+++ simpleviews.js	27 Oct 2009 14:09:40 -0000
@@ -1,7 +1,9 @@
 // $Id: simpleviews.js,v 1.2 2008/09/26 03:37:37 eaton Exp $
+(function($) {
 
 jQuery(document).ready(function(){
-  jQuery("div#simpleviews-elements").prepend('<div id="simpleview-preview-img"></div>');
+  // @todo: no preview - this also breaks the layout in Seven.
+  // jQuery("div#simpleviews-elements").prepend('<div id="simpleview-preview-img"></div>');
   jQuery("#edit-arg-toggle").bind("change", function() {
     if (this.checked) {
       $("#simpleviews-arg-wrapper").show();
@@ -12,3 +14,5 @@ jQuery(document).ready(function(){
     return false;
   })
 });
+
+})(jQuery);
Index: simpleviews.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpleviews/simpleviews.module,v
retrieving revision 1.4
diff -u -p -r1.4 simpleviews.module
--- simpleviews.module	26 Sep 2008 19:28:12 -0000	1.4
+++ simpleviews.module	27 Oct 2009 14:09:40 -0000
@@ -17,7 +17,7 @@
 function simpleviews_menu() {
   $items = array();
 
-  $items['admin/build/simpleviews'] = array(
+  $items['admin/structure/simpleviews'] = array(
     'title' => 'Simple views',
     'description' => 'Manage views.',
     'page callback' => 'drupal_get_form',
@@ -26,13 +26,13 @@ function simpleviews_menu() {
     'file' => 'simpleviews.pages.inc',
   );
 
-  $items['admin/build/simpleviews/list'] = array(
+  $items['admin/structure/simpleviews/list'] = array(
     'title' => 'List',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
 
-  $items['admin/build/simpleviews/add'] = array(
+  $items['admin/structure/simpleviews/add'] = array(
     'title' => 'Add view',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('simpleviews_form'),
@@ -41,7 +41,7 @@ function simpleviews_menu() {
     'file' => 'simpleviews.pages.inc',
   );
 
-  $items['admin/build/simpleviews/%simpleviews_item/edit'] = array(
+  $items['admin/structure/simpleviews/%simpleviews_item/edit'] = array(
     'title' => 'Edit view',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('simpleviews_form', 3),
@@ -50,7 +50,7 @@ function simpleviews_menu() {
     'file' => 'simpleviews.pages.inc',
   );
 
-  $items['admin/build/simpleviews/%simpleviews_item/delete'] = array(
+  $items['admin/structure/simpleviews/%simpleviews_item/delete'] = array(
     'title' => 'Delete view',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('simpleviews_delete_confirm', 3),
@@ -120,7 +120,8 @@ function simpleviews_content_type_submit
   $type = $form['#node_type']->type;
   $values = $form_state['values'];
   if ($values["simpleviews_type_previous_$type"] != $values["simpleviews_type_$type"]) {
-    views_invalidate_cache();
+    // @todo: put back when views is available
+    // views_invalidate_cache();
     menu_rebuild();
   }
 }
@@ -141,7 +142,7 @@ function simpleviews_content_type_submit
 function simpleviews_item_load($svid) {
   $sql = "SELECT * FROM {simpleviews} WHERE svid = %d";
   $result = db_query($sql, $svid);
-  if ($record = db_fetch_array($result)) {
+  if ($record = $result->fetchAssoc()) {
     return $record;
   }
   else {
@@ -174,7 +175,8 @@ function simpleviews_item_save($item) {
     drupal_write_record('simpleviews', $item);
   }
 
-  views_invalidate_cache();
+  // @todo: put back when views is available
+  // views_invalidate_cache();
   menu_rebuild();
   return $item;
 }
@@ -189,7 +191,8 @@ function simpleviews_item_delete($svid) 
   $sql = 'DELETE FROM {simpleviews} WHERE svid = %d';
   db_query($sql, $svid);
   
-  views_invalidate_cache();
+  // @todo: put back when views is available
+  // views_invalidate_cache();
   menu_rebuild();
 }
 
Index: simpleviews.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/simpleviews/simpleviews.pages.inc,v
retrieving revision 1.3
diff -u -p -r1.3 simpleviews.pages.inc
--- simpleviews.pages.inc	26 Sep 2008 19:28:12 -0000	1.3
+++ simpleviews.pages.inc	27 Oct 2009 14:09:40 -0000
@@ -13,17 +13,25 @@
  * @see theme_simpleviews_overview_form()
  */
 function simpleviews_overview_form(&$form_state) {
-  $results = db_query("SELECT * FROM {simpleviews}");
+  $results = db_query(
+    "SELECT * FROM {simpleviews}",
+    array(),
+    array(
+      'fetch' => PDO::FETCH_ASSOC,
+    )
+  );
   $items = array();
-  while ($item = db_fetch_array($results)) {
+  foreach ($results as $item) {
     $items[$item['svid']] = $item;
   }
-
-  $form['items']['#tree'] = TRUE;
-  foreach ($items as $svid => $item) {
-    $form['items'][$svid] = _simpleviews_overview_item_field($item);
+  
+  if (count($items)) {
+    $form['items']['#tree'] = TRUE;
+    foreach ($items as $svid => $item) {
+      $form['items'][$svid] = _simpleviews_overview_item_field($item);
+    }
   }
-
+  
   return $form;
 }
 
@@ -41,29 +49,29 @@ function _simpleviews_overview_item_fiel
 
   $form['title'] = array(
     '#type' => 'markup',
-    '#value' => check_plain($item['title']),
+    '#markup' => check_plain($item['title']),
   );
 
   $form['path'] = array(
     '#type' => 'markup',
-    '#value' => l($item['path'], $item['path']),
+    '#markup' => l($item['path'], $item['path']),
   );
 
   $path = drupal_get_path('module', 'simpleviews') . '/images/';
   $links[] = array(
     'title' => theme('image', $path . 'text-editor.png', t('Edit')),
-    'href' => 'admin/build/simpleviews/' . $item['svid'] . '/edit',
+    'href' => 'admin/structure/simpleviews/' . $item['svid'] . '/edit',
     'html' => TRUE,
   );
   $links[] = array(
     'title' => theme('image', $path . 'edit-delete.png', t('Delete')),
-    'href' => 'admin/build/simpleviews/' . $item['svid'] . '/delete',
+    'href' => 'admin/structure/simpleviews/' . $item['svid'] . '/delete',
     'html' => TRUE,
   );
 
   $form['operations'] = array(
     '#type' => 'markup',
-    '#value' => theme('links', $links),
+    '#markup' => theme('links', $links),
   );
 
   return $form;
@@ -103,7 +111,7 @@ function theme_simpleviews_overview_form
   // elements (like buttons) will appear properly at the bottom of the form.
   $header = array(t('Title'), t('Path'), t('Operations'));
   $output = theme('table', $header, $rows);
-  $output .= drupal_render($form);
+  $output .= drupal_render_children($form);
 
   return $output;
 }
@@ -186,7 +194,7 @@ function _simpleviews_form($simpleview =
     '#required' => TRUE,
     '#default_value' => $simpleview['filter'],
   );
-  foreach (node_get_types('names') as $type => $name) {
+  foreach (node_type_get_names() as $type => $name) {
     $form['filter']['#options']['node:'. $type] = t('!type posts', array('!type' => $name));
   }
 
@@ -282,7 +290,7 @@ function theme_simpleviews_edit_form($fo
   $form['argument']['argument']['#prefix'] = '<div id="simpleviews-arg-wrapper"' . $extra . '>';
   $form['argument']['argument']['#suffix'] = '</div>';
 
-  $output .= '<div id="simpleviews-elements">' . drupal_render($form) . '</div>';
+  $output .= '<div id="simpleviews-elements">'. drupal_render_children($form) . '</div>';
   return $output;
 }
 
@@ -299,8 +307,9 @@ function theme_simpleviews_edit_form($fo
 function simpleviews_form_submit($form, &$form_state) {
   $item = $form_state['values'];
   simpleviews_item_save($item);
-  views_flush_caches();
-  $form_state['redirect'] = 'admin/build/simpleviews';
+  // @todo: put back when views is available
+  // views_flush_caches();
+  $form_state['redirect'] = 'admin/structure/simpleviews';
 }
 
 
@@ -314,7 +323,7 @@ function simpleviews_form_submit($form, 
  * @see simpleviews_form()
  */
 function simpleviews_form_delete($form, &$form_state) {
-  $form_state['redirect'] = 'admin/build/simpleviews/' . $form_state['values']['svid'] . '/delete';
+  $form_state['redirect'] = 'admin/structure/simpleviews/' . $form_state['values']['svid'] . '/delete';
 }
 
 
@@ -336,7 +345,7 @@ function simpleviews_delete_confirm(&$fo
 
   return confirm_form($form,
     t('Are you sure you want to delete %title?', array('%title' => $item['title'])),
-    isset($_GET['destination']) ? $_GET['destination'] : 'admin/build/simpleviews',
+    isset($_GET['destination']) ? $_GET['destination'] : 'admin/structure/simpleviews',
     t('This action cannot be undone.'),
     t('Delete'),
     t('Cancel')
@@ -359,5 +368,5 @@ function simpleviews_delete_confirm_subm
     simpleviews_item_delete($form_state['values']['svid']);
     drupal_set_message(t('Your item was deleted.'));
   }
-  $form_state['redirect'] = 'admin/build/simpleviews';
+  $form_state['redirect'] = 'admin/structure/simpleviews';
 }