diff -urNp tables4.7/tables.info tables5.1/tables.info --- tables4.7/tables.info 1969-12-31 19:00:00.000000000 -0500 +++ tables5.1/tables.info 2007-02-06 09:25:06.000000000 -0500 @@ -0,0 +1,8 @@ +; $Id$ +name = Tables filter +description = Filter to allow insertion of a table +package = "Input filters" +dependencies = filter +; Information added by drupal.org packaging script on 2007-02-04 +version = "5.x-1.x-dev" +project = "tables" \ No newline at end of file diff -urNp tables4.7/tables.module tables5.1/tables.module --- tables4.7/tables.module 2006-09-26 00:24:21.000000000 -0400 +++ tables5.1/tables.module 2007-02-06 10:15:06.000000000 -0500 @@ -11,24 +11,6 @@ * */ - -function tables_help($section) { - switch ($section) { - case 'admin/modules#description': - return t('Filter to allow insertion of a table'); - case 'admin/help#tables': - return t('
This filter module makes it easy and safe insert tables into the text of a node. '. - '
A table always starts with "[table". To set a custom class for the table next put in "=class" '. - 'there must not be any space between the "[table" and the "=". You can set the class to be what '. - 'ever you want. A few useful classes are already included in the style sheet provided. '. - 'Next you separate the cells by a "|" and separate the rows by a new line. Cells can span multiple '. - 'columns or rows simply by inserting a "&" to merge the cell with the cell to the left and a "^" to '. - 'merge with the cell above. Currently, the only way to insert a literal "]" into the table is to use "'. - htmlentities(']').'". If a "!" is the first charecter for a cell, the cell is set to be a header cell.'); - break; - } -} - /** * * Impliments the search and process the macro. @@ -142,20 +124,19 @@ function _tables_prepare($intext) { return $out; } - function tables_filter($op, $delta = 0, $format = -1, $text = '') { switch ($op) { case 'list': return (array(0 => t('Tables filter'))); - break; + case 'name': return t('tables filter'); - break; + case 'description': return t('converts [table ...] macros into HTML tables.'); - break; + case 'process': $tables=_tables_prepare($text); //returns an array of $tables[0] = table macro $table[1]= table html @@ -165,11 +146,11 @@ function tables_filter($op, $delta = 0, else { return $text; } - break; + case 'prepare': return $text; - break; + } } @@ -179,15 +160,26 @@ function tables_filter_tips($delta, $for } function tables_menu($may_cache) { + $items = array(); + if (!$may_cache) { if ($css = variable_get('tables_css', drupal_get_path('module','tables').'/tables.css')) { - theme('add_style', $css); + drupal_add_css(drupal_get_path('module', 'tables') .'/tables.css'); } + $items[] = array( + 'path' => 'admin/settings/tables', + 'title' => t('Tables Filter'), + 'description' => t('Filter to allow insertion of a table'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('tables_admin_settings'), + 'access' => user_access('administer site configuration'), + 'type' => MENU_NORMAL_ITEM, // optional + ); } - return array(); + return $items; } -function tables_settings() { +function tables_admin_settings() { if (!file_check_location(variable_get('tables_css', drupal_get_path('module','tables').'/tables.css'))) { $error['tables_css'] = theme('error', t('File does not exist, or is not readable.')); } @@ -207,5 +199,5 @@ function tables_settings() { '#description' => t("Set the default style sheet to use if no style sheet is set in the specific table. "), ); - return $form; + return system_settings_form($form); }