From d4556a9d0bada46d0dd8bfcdea0d747e3b38fec8 Mon Sep 17 00:00:00 2001 From: Tim Rohaly Date: Tue, 26 Apr 2011 18:40:54 -0700 Subject: [PATCH 1/2] Cleanup of .info files: - Removed leading blank lines. - Removed duplicate "core = 7.x" tag in Image Example. - Re-ordered some tags so they appear in the same order in all .info files. - Added "package = Example modules" to Render Example. --- ajax_example/ajax_example.info | 3 +-- batch_example/batch_example.info | 1 - block_example/block_example.info | 1 - dbtng_example/dbtng_example.info | 1 - email_example/email_example.info | 1 - field_example/field_example.info | 1 - filter_example/filter_example.info | 1 - form_example/form_example.info | 1 - image_example/image_example.info | 2 -- js_example/js_example.info | 3 +-- menu_example/menu_example.info | 1 - node_access_example/node_access_example.info | 1 - node_example/node_example.info | 1 - nodeapi_example/nodeapi_example.info | 1 - page_example/page_example.info | 1 - queue_example/queue_example.info | 1 - render_example/render_example.info | 3 ++- simpletest_example/simpletest_example.info | 3 +-- token_example/token_example.info | 3 +-- trigger_example/trigger_example.info | 1 - vertical_tabs_example/vertical_tabs_example.info | 2 +- xmlrpc_example/xmlrpc_example.info | 1 - 22 files changed, 7 insertions(+), 27 deletions(-) diff --git a/ajax_example/ajax_example.info b/ajax_example/ajax_example.info index 359fe94..7212ef8 100644 --- a/ajax_example/ajax_example.info +++ b/ajax_example/ajax_example.info @@ -1,5 +1,4 @@ - name = AJAX Example description = An example module showing how to use Drupal AJAX forms -core = 7.x package = Example modules +core = 7.x diff --git a/batch_example/batch_example.info b/batch_example/batch_example.info index 5c5ce79..357432a 100644 --- a/batch_example/batch_example.info +++ b/batch_example/batch_example.info @@ -1,4 +1,3 @@ - name = Batch example description = An example outlining how a module can define batch operations. package = Example modules diff --git a/block_example/block_example.info b/block_example/block_example.info index 44f7abf..67ee25d 100644 --- a/block_example/block_example.info +++ b/block_example/block_example.info @@ -1,4 +1,3 @@ - name = Block Example description = An example outlining how a module can define blocks. package = Example modules diff --git a/dbtng_example/dbtng_example.info b/dbtng_example/dbtng_example.info index 7d7acb7..b7658d9 100644 --- a/dbtng_example/dbtng_example.info +++ b/dbtng_example/dbtng_example.info @@ -1,4 +1,3 @@ - name = DBTNG example description = An example module showing how use the database API: DBTNG. package = Example modules diff --git a/email_example/email_example.info b/email_example/email_example.info index 4f19e4e..5a3f790 100644 --- a/email_example/email_example.info +++ b/email_example/email_example.info @@ -1,4 +1,3 @@ - name = E-mail Example description = Demonstrate Drupal's e-mail APIs. package = Example modules diff --git a/field_example/field_example.info b/field_example/field_example.info index bf8c96f..d013df2 100644 --- a/field_example/field_example.info +++ b/field_example/field_example.info @@ -1,4 +1,3 @@ - name = Field Example description = A trivial implementation of a field to show the Field API package = Example modules diff --git a/filter_example/filter_example.info b/filter_example/filter_example.info index 888ee73..7fd9aa4 100755 --- a/filter_example/filter_example.info +++ b/filter_example/filter_example.info @@ -1,4 +1,3 @@ - name = Filter example description = An example module showing how to define a custom filter. package = Example modules diff --git a/form_example/form_example.info b/form_example/form_example.info index 875fdff..5b05d89 100644 --- a/form_example/form_example.info +++ b/form_example/form_example.info @@ -1,4 +1,3 @@ - name = Form example description = Examples of using the Drupal Form API. package = Example modules diff --git a/image_example/image_example.info b/image_example/image_example.info index 29f0811..ab6514e 100644 --- a/image_example/image_example.info +++ b/image_example/image_example.info @@ -1,8 +1,6 @@ - name = Image Example description = Example implementation of image.module hooks. package = Example modules core = 7.x -core = 7.x dependencies[] = image files[] = image_example.test diff --git a/js_example/js_example.info b/js_example/js_example.info index b2f6be2..acc0299 100644 --- a/js_example/js_example.info +++ b/js_example/js_example.info @@ -1,5 +1,4 @@ - name = JS Example description = An example module showing how to use some of the new JavaScript features in Drupal 7 -core = 7.x package = Example modules +core = 7.x diff --git a/menu_example/menu_example.info b/menu_example/menu_example.info index 33c7bb2..5f41fe5 100644 --- a/menu_example/menu_example.info +++ b/menu_example/menu_example.info @@ -1,4 +1,3 @@ - name = Menu example description = An example of advanced uses of the menu APIs. package = Example modules diff --git a/node_access_example/node_access_example.info b/node_access_example/node_access_example.info index 993e0b0..9907fa7 100644 --- a/node_access_example/node_access_example.info +++ b/node_access_example/node_access_example.info @@ -1,4 +1,3 @@ - name = Node access example description = Demonstrates how a module can use Drupal's node access system package = Example modules diff --git a/node_example/node_example.info b/node_example/node_example.info index 349395b..ca137f5 100755 --- a/node_example/node_example.info +++ b/node_example/node_example.info @@ -1,4 +1,3 @@ - name = Node example description = Demonstrates a custom content type and uses the field api. package = Example modules diff --git a/nodeapi_example/nodeapi_example.info b/nodeapi_example/nodeapi_example.info index f50e2a5..812a4c3 100644 --- a/nodeapi_example/nodeapi_example.info +++ b/nodeapi_example/nodeapi_example.info @@ -1,4 +1,3 @@ - name = NodeAPI example description = Demonstrates using the hook_node_* APIs (formerly hook_nodeapi) to alter a node from a different module. package = Example modules diff --git a/page_example/page_example.info b/page_example/page_example.info index 3160a90..31b674b 100644 --- a/page_example/page_example.info +++ b/page_example/page_example.info @@ -1,4 +1,3 @@ - name = Page example description = An example module showing how to define a page to be displayed to the user at a given URL. package = Example modules diff --git a/queue_example/queue_example.info b/queue_example/queue_example.info index 69b11ef..87bd9f0 100644 --- a/queue_example/queue_example.info +++ b/queue_example/queue_example.info @@ -1,4 +1,3 @@ - name = Queue example description = Examples of using the Drupal Queue API. package = Example modules diff --git a/render_example/render_example.info b/render_example/render_example.info index f69f916..5e29969 100644 --- a/render_example/render_example.info +++ b/render_example/render_example.info @@ -1,6 +1,7 @@ name = Render example description = Demonstrates drupal_render's capabilities and altering render arrays +package = Example modules core = 7.x +dependencies[] = devel stylesheets[all][] = render_example.css files[] = render_example.test -dependencies[] = devel diff --git a/simpletest_example/simpletest_example.info b/simpletest_example/simpletest_example.info index 503cae5..2da4c84 100644 --- a/simpletest_example/simpletest_example.info +++ b/simpletest_example/simpletest_example.info @@ -1,7 +1,6 @@ - name = Simpletest Example description = Provides simpletest_example page node type. -core = 7.x package = Example modules +core = 7.x dependencies[] = simpletest files[] = simpletest_example.test diff --git a/token_example/token_example.info b/token_example/token_example.info index c6b7e3c..10badd9 100644 --- a/token_example/token_example.info +++ b/token_example/token_example.info @@ -1,7 +1,6 @@ - name = Token example description = An example module showing how to define and use tokens. -dependencies[] = token package = Example modules core = 7.x +dependencies[] = token files[] = token_example.test diff --git a/trigger_example/trigger_example.info b/trigger_example/trigger_example.info index b7ee8c3..967db20 100644 --- a/trigger_example/trigger_example.info +++ b/trigger_example/trigger_example.info @@ -1,4 +1,3 @@ - name = Trigger example description = An example showing how a module can provide triggers that can have actions associated with them. package = Example modules diff --git a/vertical_tabs_example/vertical_tabs_example.info b/vertical_tabs_example/vertical_tabs_example.info index a61ba45..12036b4 100644 --- a/vertical_tabs_example/vertical_tabs_example.info +++ b/vertical_tabs_example/vertical_tabs_example.info @@ -1,4 +1,4 @@ name = Vertical tabs example description = Show how to use vertical tabs for enhancing user experience. -core = 7.x package = Example modules +core = 7.x diff --git a/xmlrpc_example/xmlrpc_example.info b/xmlrpc_example/xmlrpc_example.info index 8e28812..806f9ab 100644 --- a/xmlrpc_example/xmlrpc_example.info +++ b/xmlrpc_example/xmlrpc_example.info @@ -1,4 +1,3 @@ - name = XMLRPC example description = This is an example of how to implement client and server communications using XML-RPC. package = Example modules -- 1.7.0.5 From dfcee369e1b1ce4b03c1d55cd22ca7c9861de6dc Mon Sep 17 00:00:00 2001 From: Tim Rohaly Date: Tue, 26 Apr 2011 19:06:05 -0700 Subject: [PATCH 2/2] Clean up example files: - Removed leading blank lines. - Removed CVS tag from head of form_example_elements.inc - Converted DOS format files to Unix format files. --- ajax_example/ajax_example.css | 1 - ajax_example/ajax_example.js | 1 - ajax_example/ajax_example_graceful_degradation.inc | 2 +- batch_example/batch_example.module | 2 +- email_example/CHANGELOG.txt | 2 +- field_example/field_example.css | 3 +- field_example/field_example.js | 1 - form_example/form_example_elements.inc | 2 - image_example/image_example.pages.inc | 2 +- menu_example/menu_example.module | 2 +- queue_example/queue_example.css | 3 +- queue_example/queue_example.module | 2 +- render_example/render_example.css | 3 +- render_example/render_example.module | 2 +- simpletest_example/simpletest_example.install | 2 +- vertical_tabs_example/vertical_tabs_example.info | 8 ++-- vertical_tabs_example/vertical_tabs_example.js | 47 ++++++++++---------- 17 files changed, 38 insertions(+), 47 deletions(-) diff --git a/ajax_example/ajax_example.css b/ajax_example/ajax_example.css index 5de6e70..68bf370 100644 --- a/ajax_example/ajax_example.css +++ b/ajax_example/ajax_example.css @@ -1,4 +1,3 @@ - /* * @file ajax_example.css * CSS for ajax_example. diff --git a/ajax_example/ajax_example.js b/ajax_example/ajax_example.js index ce5b88a..2f64d12 100644 --- a/ajax_example/ajax_example.js +++ b/ajax_example/ajax_example.js @@ -1,4 +1,3 @@ - /* * @file ajax_example.js * JavaScript for ajax_example. diff --git a/ajax_example/ajax_example_graceful_degradation.inc b/ajax_example/ajax_example_graceful_degradation.inc index 6bc0f19..205b785 100644 --- a/ajax_example/ajax_example_graceful_degradation.inc +++ b/ajax_example/ajax_example_graceful_degradation.inc @@ -637,4 +637,4 @@ function ajax_example_add_more_submit($form, &$form_state) { $output = t('These people are coming to the picnic: @names', array('@names' => implode(', ', $form_state['values']['names_fieldset']['name'])) ); drupal_set_message($output); -} \ No newline at end of file +} diff --git a/batch_example/batch_example.module b/batch_example/batch_example.module index d5752b3..9cc8dfc 100644 --- a/batch_example/batch_example.module +++ b/batch_example/batch_example.module @@ -261,4 +261,4 @@ function _batch_example_update_http_requests() { function _batch_example_get_http_requests() { return !empty($_SESSION['http_request_count']) ? $_SESSION['http_request_count'] : 0; -} \ No newline at end of file +} diff --git a/email_example/CHANGELOG.txt b/email_example/CHANGELOG.txt index 0e9bee8..849fa55 100755 --- a/email_example/CHANGELOG.txt +++ b/email_example/CHANGELOG.txt @@ -1,2 +1,2 @@ -#730984 by rfay: Email example (D7) needs to check_plain() on user text. \ No newline at end of file +#730984 by rfay: Email example (D7) needs to check_plain() on user text. diff --git a/field_example/field_example.css b/field_example/field_example.css index 00a2a51..7a5beca 100644 --- a/field_example/field_example.css +++ b/field_example/field_example.css @@ -1,4 +1,3 @@ - /** * @file * CSS for Field Example. @@ -6,4 +5,4 @@ div.form-item table .form-type-textfield, div.form-item table .form-type-textfield * { display: inline-block; -} \ No newline at end of file +} diff --git a/field_example/field_example.js b/field_example/field_example.js index 4c7749c..3a4ce62 100644 --- a/field_example/field_example.js +++ b/field_example/field_example.js @@ -1,4 +1,3 @@ - /** * @file * Javascript for Field Example. diff --git a/form_example/form_example_elements.inc b/form_example/form_example_elements.inc index 4e84dc9..a143172 100644 --- a/form_example/form_example_elements.inc +++ b/form_example/form_example_elements.inc @@ -1,7 +1,5 @@ $style, 'path' => $image->uri, 'getsize' => FALSE)); $output .= '

' . t('This image is being displayed using the image style %style_name.', array('%style_name' => $style)) . '

'; return $output; -} \ No newline at end of file +} diff --git a/menu_example/menu_example.module b/menu_example/menu_example.module index c19b07d..db38b09 100644 --- a/menu_example/menu_example.module +++ b/menu_example/menu_example.module @@ -464,4 +464,4 @@ function menu_example_arg_optional_load($id) { function menu_example_arg_optional_to_arg($arg) { // If our argument is not provided, give a default of 99. return (empty($arg) || $arg == '%') ? 99 : $arg; -} \ No newline at end of file +} diff --git a/queue_example/queue_example.css b/queue_example/queue_example.css index acb4565..fd80c4b 100644 --- a/queue_example/queue_example.css +++ b/queue_example/queue_example.css @@ -1,4 +1,3 @@ - .form-item-string-to-add, div.form-item-claim-time { display: inline; -} \ No newline at end of file +} diff --git a/queue_example/queue_example.module b/queue_example/queue_example.module index 1239f40..4eecab1 100644 --- a/queue_example/queue_example.module +++ b/queue_example/queue_example.module @@ -272,4 +272,4 @@ function queue_example_theme() { 'variables' => array('items' => NULL), ), ); -} \ No newline at end of file +} diff --git a/render_example/render_example.css b/render_example/render_example.css index de562c0..6b2ae5f 100644 --- a/render_example/render_example.css +++ b/render_example/render_example.css @@ -1,4 +1,3 @@ - .render-array { border: 2px solid black; margin-top: 10px; @@ -18,4 +17,4 @@ .rendered { background-color: lightblue; -} \ No newline at end of file +} diff --git a/render_example/render_example.module b/render_example/render_example.module index 9b471d3..40d1ab6 100644 --- a/render_example/render_example.module +++ b/render_example/render_example.module @@ -495,4 +495,4 @@ function render_example_change_to_ol($element) { function render_example_add_hr($markup, $element) { $output = $markup . '
'; return $output; -} \ No newline at end of file +} diff --git a/simpletest_example/simpletest_example.install b/simpletest_example/simpletest_example.install index 494fcf0..36d1f13 100644 --- a/simpletest_example/simpletest_example.install +++ b/simpletest_example/simpletest_example.install @@ -26,4 +26,4 @@ function simpletest_example_update_7001() { node_types_rebuild(); $types = node_type_get_types(); node_add_body_field($types['simpletest_example']); -} \ No newline at end of file +} diff --git a/vertical_tabs_example/vertical_tabs_example.info b/vertical_tabs_example/vertical_tabs_example.info index 12036b4..222fca5 100644 --- a/vertical_tabs_example/vertical_tabs_example.info +++ b/vertical_tabs_example/vertical_tabs_example.info @@ -1,4 +1,4 @@ -name = Vertical tabs example -description = Show how to use vertical tabs for enhancing user experience. -package = Example modules -core = 7.x +name = Vertical tabs example +description = Show how to use vertical tabs for enhancing user experience. +package = Example modules +core = 7.x diff --git a/vertical_tabs_example/vertical_tabs_example.js b/vertical_tabs_example/vertical_tabs_example.js index 9aea6e8..ca1d861 100644 --- a/vertical_tabs_example/vertical_tabs_example.js +++ b/vertical_tabs_example/vertical_tabs_example.js @@ -1,24 +1,23 @@ - -(function ($) { - -/** - * Custom summary for the module vertical tab. - */ -Drupal.behaviors.vertical_tabs_exampleFieldsetSummaries = { - attach: function (context) { - // Use the fieldset class to identify the vertical tab element - $('fieldset#edit-vertical-tabs-example', context).drupalSetSummary(function (context) { - // Depending on the checkbox status, the settings will be customized, so - // update the summary with the custom setting textfield string or a use a - // default string. - if ($('#edit-vertical-tabs-example-enabled', context).attr('checked')) { - return Drupal.checkPlain($('#edit-vertical-tabs-example-custom-setting', context).val()); - } - else { - return Drupal.t('Using default'); - } - }); - } -}; - -})(jQuery); +(function ($) { + +/** + * Custom summary for the module vertical tab. + */ +Drupal.behaviors.vertical_tabs_exampleFieldsetSummaries = { + attach: function (context) { + // Use the fieldset class to identify the vertical tab element + $('fieldset#edit-vertical-tabs-example', context).drupalSetSummary(function (context) { + // Depending on the checkbox status, the settings will be customized, so + // update the summary with the custom setting textfield string or a use a + // default string. + if ($('#edit-vertical-tabs-example-enabled', context).attr('checked')) { + return Drupal.checkPlain($('#edit-vertical-tabs-example-custom-setting', context).val()); + } + else { + return Drupal.t('Using default'); + } + }); + } +}; + +})(jQuery); -- 1.7.0.5