Index: og/includes/og.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og/includes/Attic/og.admin.inc,v retrieving revision 1.15.4.2 diff -u -p -r1.15.4.2 og.admin.inc --- og/includes/og.admin.inc 22 Jun 2009 15:59:27 -0000 1.15.4.2 +++ og/includes/og.admin.inc 8 Sep 2009 22:44:09 -0000 @@ -11,10 +11,10 @@ function og_admin_settings() { form_set_error('content_types_table', t('You must designate at least one content type to act as a group node and another as a group post. Create new content type if needed.', array('!create' => url('admin/content/types/add', array('query' => drupal_get_destination()))))); } $form['og_settings']['content_types'] = array( - '#type' => 'fieldset', + '#type' => 'fieldset', '#title' => t('Content types'), '#description' => t('You may create new content types as needed. Note that you may have multiple types acting as groups and multiple types are allowed as group posts.', array('!create' => url('admin/content/types/add', array('query' => drupal_get_destination())))), - '#collapsible' => TRUE, + '#collapsible' => TRUE, '#collapsed' => $is_configured, ); $map = og_types_map(); @@ -26,63 +26,63 @@ function og_admin_settings() { $rows[] = array( $type->name, $map[$usage], - l(t('Edit'), "admin/content/node-type/$type_url_str", array('query' => drupal_get_destination())), + l(t('Edit'), "admin/content/node-type/$type_url_str", array('query' => drupal_get_destination())), ); } $form['og_settings']['content_types']['content_types_table'] = array('#value' => theme('table', $header, $rows)); - + $form['og_settings']['group_details'] = array( - '#type' => 'fieldset', - '#title' => t('Group details'), - '#collapsible' => TRUE, + '#type' => 'fieldset', + '#title' => t('Group details'), + '#collapsible' => TRUE, '#collapsed' => TRUE ); // groups directory visibility $options = array( t("New groups don't appear in the groups directory. Administrators control the directory exclusively."), t('New groups always appear in the groups directory.'), - t('Group creator chooses whether her group appears in the directory. Defaults to in directory.'), - t('Group creator chooses whether her group appears in the directory. Defaults to not in directory.'), + t('Group creator chooses whether the new group appears in the directory. Defaults to in directory.'), + t('Group creator chooses whether the new group appears in the directory. Defaults to not in directory.'), ); $form['og_settings']['group_details']['og_visibility_directory'] = array( - '#type' => 'radios', - '#title' => t('Groups directory control'), - '#default_value' => variable_get('og_visibility_directory', OG_DIRECTORY_CHOOSE_TRUE), - '#description' =>t('Site admins always see the checkbox for adding a group to the groups directory. Note that changing this setting has no effect on existing posts. Re-save those posts to acquire this new setting.'), + '#type' => 'radios', + '#title' => t('Groups directory control'), + '#default_value' => variable_get('og_visibility_directory', OG_DIRECTORY_CHOOSE_TRUE), + '#description' =>t('Site admins always see the checkbox for adding a group to the groups directory. Note that changing this setting has no effect on existing groups. Re-save those groups to acquire this new setting.'), '#options' => $options ); - + // groups registration visibility $options = array( t("New groups don't appear on the registration form. Administrators control the form exclusively."), t('New groups always appear on the registration form.'), - t('Group creator chooses whether her group appears on the registration form. Defaults to on form.'), - t('Group creator chooses whether her group appears on the registration form. Defaults to not on form.'), + t('Group creator chooses whether the new group appears on the registration form. Defaults to on form.'), + t('Group creator chooses whether the new group appears on the registration form. Defaults to not on form.'), ); $form['og_settings']['group_details']['og_visibility_registration'] = array( - '#type' => 'radios', - '#title' => t('Registration form control'), - '#default_value' => variable_get('og_visibility_registration', OG_REGISTRATION_CHOOSE_FALSE), - '#description' =>t('OG admins always see the checkbox for adding a group to the registration form. Note that changing this setting has no effect on existing posts. Re-save those posts to acquire this new setting.'), + '#type' => 'radios', + '#title' => t('Registration form control'), + '#default_value' => variable_get('og_visibility_registration', OG_REGISTRATION_CHOOSE_FALSE), + '#description' =>t('OG admins always see the checkbox for adding a group to the registration form. Note that changing this setting has no effect on existing groups. Re-save those groups to acquire this new setting.'), '#options' => $options ); // audience checkboxes $form['og_settings']['group_details']['og_audience_checkboxes'] = array( - '#type' => 'checkbox', - '#title' => t('Audience checkboxes'), - '#default_value' => variable_get('og_audience_checkboxes', TRUE), - '#description' => t('Show each group that the user is a member of as a checkbox in the "Audience" section. This enables the member to place her post into multiple groups. If unchecked, simplify the user interface by omitting the checkboxes and assuming user wants to post into the current group. This simplification only applies to new nodes, and not to edits of existing nodes. Group administrators always see checkboxes.') + '#type' => 'checkbox', + '#title' => t('Audience checkboxes'), + '#default_value' => variable_get('og_audience_checkboxes', TRUE), + '#description' => t('Show each group that the user is a member of as a checkbox in the "Audience" section. This enables the member to place a single post into multiple groups. If unchecked, simplify the user interface by omitting the checkboxes and assuming user wants to post into the current group. This simplification only applies to new nodes, and not to edits of existing nodes. Group administrators always see checkboxes.') ); - + // audience required $options = array(t('Optional'), t('Required')); $form['og_settings']['group_details']['og_audience_required'] = array( - '#type' => 'radios', - '#title' => t('Audience required'), - '#default_value' => variable_get('og_audience_required', 0), - '#options' => $options, + '#type' => 'radios', + '#title' => t('Audience required'), + '#default_value' => variable_get('og_audience_required', 0), + '#options' => $options, '#description' => t('Do you require that all (non administrator) posts be affiliated with a group? Note that changing this setting will affect existing posts when they are edited.') ); unset($options); @@ -132,7 +132,7 @@ function og_admin_settings() { '#rows' => 10, '#description' => t('The body of the message sent to new approved members. Available variables: !group_url, @title'), '#default_value' => _og_mail_text('og_approve_user_body') - ); + ); $form['og_settings']['notifications']['og_deny_user_subject'] = array( '#type' => 'textfield', '#title' => t('User denied notification subject'), @@ -145,7 +145,7 @@ function og_admin_settings() { '#rows' => 10, '#description' => t('The body of the message sent to denied users. Available variables: !group_url, @title'), '#default_value' => _og_mail_text('og_deny_user_body') - ); + ); $form['og_settings']['notifications']['og_invite_user_subject'] = array( '#type' => 'textfield', '#title' => t('Invite user notification subject'), @@ -158,7 +158,7 @@ function og_admin_settings() { '#rows' => 10, '#description' => t('The body of the message sent to users invited to join a group. Available variables: @group, @site, @description, !group_url, @body'), '#default_value' => _og_mail_text('og_invite_user_body') - ); + ); $form['og_settings']['notifications']['og_request_user_subject'] = array( '#type' => 'textfield', '#title' => t('Request user notification subject'), Index: og/modules/og_access/og_access.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og/modules/og_access/Attic/og_access.module,v retrieving revision 1.32.4.2 diff -u -p -r1.32.4.2 og_access.module --- og/modules/og_access/og_access.module 8 Aug 2009 18:58:30 -0000 1.32.4.2 +++ og/modules/og_access/og_access.module 8 Sep 2009 22:44:09 -0000 @@ -82,8 +82,8 @@ function og_access_settings() { $options = array( t('New group home pages and default audience are always public.'), t('New group home pages and default audience are always private.'), - t('Group administrator chooses whether her group homepage and audience are private or not. Defaults to private.'), - t('Group administrator chooses whether her group homepage and audience are private or not. Defaults to public.'), + t('Group administrator chooses whether the new group homepage and audience are private or not. Defaults to private.'), + t('Group administrator chooses whether the new group homepage and audience are private or not. Defaults to public.'), ); $form['og_private_groups'] = array( '#type' => 'radios', Index: og/modules/og_views/og_views.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/og/modules/og_views/Attic/og_views.module,v retrieving revision 1.18.4.4 diff -u -p -r1.18.4.4 og_views.module --- og/modules/og_views/og_views.module 9 Jun 2009 11:42:46 -0000 1.18.4.4 +++ og/modules/og_views/og_views.module 8 Sep 2009 22:44:09 -0000 @@ -175,7 +175,7 @@ function og_views_form_og_admin_settings $form['og_settings']['group_details']['og_home_page_view'] = array( '#type' => 'select', '#title' => t('Group home page view'), - '#description' => t('Pick a View for your group home page. Only Views whose names start with og_ghp_ are eligible. The View determines the layout of your group home page. You may alter the presentation using typical Views themeing techniques. See the Theme information link when editing your View and also see the Theme section of the !README. Also note that group admins can override this presentation using the included Organic Groups Panels module.', array('!README' => og_readme())), + '#description' => t('Pick a View for your group home page. Only Views whose names start with og_ghp_ are eligible. The View determines the layout of your group home page. You may alter the presentation using typical Views theming techniques. See the Theme information link when editing your View and also see the Theme section of the !README. Also note that group admins can override this presentation using the included Organic Groups Panels module.', array('!README' => og_readme())), '#options' => array(0 => t('None')) + $options, '#default_value' => variable_get('og_home_page_view', 'og_ghp_ron'), ); @@ -214,7 +214,7 @@ function og_views_view_group($node, $tea // Otherwise show it to everybody. og_home_empty($node); } - + drupal_set_title(filter_xss_admin($view->build_info['title'])); drupal_add_feed(url("node/$node->nid/feed"), drupal_get_title()); }