diff -u atrium_answers.defaults.inc atrium_answers.defaults.inc --- atrium_answers.defaults.inc 2010-01-08 09:24:17.000000000 -0800 +++ atrium_answers.defaults.inc 2010-06-22 20:08:44.398421731 -0700 @@ -4,33 +4,66 @@ * Helper to implementation of hook_context_default_contexts(). */ function _atrium_answers_context_default_contexts() { - $items = array(); - - $items[] = array( - 'namespace' => 'spaces', - 'attribute' => 'feature', - 'value' => 'answers', - 'description' => 'Questions and Answers, with User Reputations.', + $export = array(); + $context = new stdClass; + $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */ + $context->api_version = 3; + $context->name = 'spaces-feature-answers'; + $context->description = 'Questions and Answers, with User Reputations.'; + $context->tag = 'features'; + $context->conditions = array( 'node' => array( - '0' => 'question', + 'values' => array( + 'question' => 'question', + ), + 'options' => array( + 'node_form' => 1, + ), ), 'views' => array( - '0' => 'atrium_answers', + 'values' => array( + 'atrium_answers' => 'atrium_answers', + ), ), - 'menu' => 'answers', + ); + $context->reactions = array( 'block' => array( - 'views_atrium_answers-block_1' => array( - 'module' => 'views', - 'delta' => 'atrium_answers-block_1', - 'weight' => 34, - 'region' => 'right', - 'status' => '0', - 'label' => 'atrium_answers: Block', - 'type' => 'context_ui', + 'blocks' => array( + 'views-atrium_answers-block_1' => array( + 'module' => 'views', + 'delta' => 'atrium_answers-block_1', + 'region' => 'right', + 'weight' => 0, + ), ), + 'layout' => 'default', ), + 'menu' => 'answers', ); - return $items; + $context->condition_mode = 0; + + $translatables['spaces-feature-answers'] = array( + t('Questions and Answers, with User Reputations.'), + t('features'), + ); + + $export['spaces-feature-answers'] = $context; + return $export; +} + +/** + * Helper to implementation of hook_ctools_plugin_api(). + */ +function _atrium_answers_ctools_plugin_api() { + $args = func_get_args(); + $module = array_shift($args); + $api = array_shift($args); + if ($module == "context" && $api == "context") { + return array("version" => 3); + } + else if ($module == "strongarm" && $api == "strongarm") { + return array("version" => 1); + } } /** @@ -59,6 +92,15 @@ function _atrium_answers_user_default_permissions() { $permissions = array(); + // Exported permission: access vote up/down statistics + $permissions[] = array( + 'name' => 'access vote up/down statistics', + 'roles' => array( + '0' => 'admin', + '1' => 'manager', + ), + ); + // Exported permission: create question content $permissions[] = array( 'name' => 'create question content', @@ -101,51 +143,56 @@ ), ); + // Exported permission: reset vote up/down votes $permissions[] = array( - 'name' => 'use vote up/down', + 'name' => 'reset vote up/down votes', 'roles' => array( '0' => 'authenticated user', ), ); + + // Exported permission: see vote up/down node stats $permissions[] = array( - 'name' => 'use vote up/down on comments', + 'name' => 'see vote up/down node stats', 'roles' => array( - '0' => 'authenticated user', + '0' => 'admin', + '1' => 'manager', ), ); + + // Exported permission: use vote up/down $permissions[] = array( - 'name' => 'use vote up/down on nodes', + 'name' => 'use vote up/down', 'roles' => array( '0' => 'authenticated user', ), ); + + // Exported permission: use vote up/down on comments $permissions[] = array( - 'name' => 'reset vote up/down votes', + 'name' => 'use vote up/down on comments', 'roles' => array( '0' => 'authenticated user', ), ); + + // Exported permission: use vote up/down on nodes $permissions[] = array( - 'name' => 'access vote up/down statistics', - 'roles' => array( - '0' => 'admin', - '1' => 'manager', - ), - ); - $permissions[] = array( - 'name' => 'see vote up/down node stats', + 'name' => 'use vote up/down on nodes', 'roles' => array( - '0' => 'admin', - '1' => 'manager', + '0' => 'authenticated user', ), ); + // Exported permission: view own userpoints $permissions[] = array( 'name' => 'view own userpoints', 'roles' => array( '0' => 'authenticated user', ), ); + + // Exported permission: view userpoints $permissions[] = array( 'name' => 'view userpoints', 'roles' => array( @@ -155,3 +202,405 @@ return $permissions; } + +/** + * Helper to implementation of hook_strongarm(). + */ +function _atrium_answers_strongarm() { + $export = array(); + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'atrium_update_type_question'; + $strongarm->value = 1; + + $export['atrium_update_type_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_anonymous_question'; + $strongarm->value = 0; + + $export['comment_anonymous_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_controls_question'; + $strongarm->value = '3'; + + $export['comment_controls_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_default_mode_question'; + $strongarm->value = '2'; + + $export['comment_default_mode_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_default_order_question'; + $strongarm->value = '2'; + + $export['comment_default_order_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_default_per_page_question'; + $strongarm->value = '300'; + + $export['comment_default_per_page_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_form_location_question'; + $strongarm->value = '1'; + + $export['comment_form_location_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_preview_question'; + $strongarm->value = '0'; + + $export['comment_preview_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_question'; + $strongarm->value = 2; + + $export['comment_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_subject_field_question'; + $strongarm->value = '0'; + + $export['comment_subject_field_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'comment_upload_question'; + $strongarm->value = '1'; + + $export['comment_upload_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'node_options_question'; + $strongarm->value = array( + '0' => 'status', + '1' => 'revision', + ); + + $export['node_options_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'notifications_content_type_question'; + $strongarm->value = array( + '0' => 'thread', + '1' => 'nodetype', + '2' => 'author', + '3' => 'grouptype', + ); + + $export['notifications_content_type_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'og_content_type_usage_question'; + $strongarm->value = 'group_post_standard'; + + $export['og_content_type_usage_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'show_diff_inline_question'; + $strongarm->value = 0; + + $export['show_diff_inline_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'show_preview_changes_question'; + $strongarm->value = 0; + + $export['show_preview_changes_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'upload_question'; + $strongarm->value = '1'; + + $export['upload_question'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_category_default_tid'; + $strongarm->value = '0'; + + $export['userpoints_category_default_tid'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_category_profile_display_tid'; + $strongarm->value = 'all'; + + $export['userpoints_category_profile_display_tid'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_display_message'; + $strongarm->value = '1'; + + $export['userpoints_display_message'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_expireafter_date'; + $strongarm->value = ''; + + $export['userpoints_expireafter_date'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_expireon_date'; + $strongarm->value = array( + 'month' => '1', + 'day' => '1', + 'year' => '1980', + ); + + $export['userpoints_expireon_date'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_expiry_description'; + $strongarm->value = ''; + + $export['userpoints_expiry_description'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_down'; + $strongarm->value = 2; + + $export['userpoints_karma_points_down'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_notify'; + $strongarm->value = 1; + + $export['userpoints_karma_points_notify'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_up'; + $strongarm->value = '10'; + + $export['userpoints_karma_points_up'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_voter'; + $strongarm->value = '0'; + + $export['userpoints_karma_points_voter'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_voter_change'; + $strongarm->value = 0; + + $export['userpoints_karma_points_voter_change'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_voter_hide'; + $strongarm->value = 0; + + $export['userpoints_karma_points_voter_hide'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_voter_own'; + $strongarm->value = 0; + + $export['userpoints_karma_points_voter_own'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_points_voter_tid'; + $strongarm->value = '0'; + + $export['userpoints_karma_points_voter_tid'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_karma_tag'; + $strongarm->value = 'userpoints_karma'; + + $export['userpoints_karma_tag'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_points_moderation'; + $strongarm->value = '0'; + + $export['userpoints_points_moderation'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_report_displayzero'; + $strongarm->value = '1'; + + $export['userpoints_report_displayzero'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_report_limit'; + $strongarm->value = '100'; + + $export['userpoints_report_limit'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_report_usercount'; + $strongarm->value = '100'; + + $export['userpoints_report_usercount'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_trans_lcpoint'; + $strongarm->value = 'point'; + + $export['userpoints_trans_lcpoint'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_trans_lcpoints'; + $strongarm->value = 'points'; + + $export['userpoints_trans_lcpoints'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_trans_ucpoint'; + $strongarm->value = 'Point'; + + $export['userpoints_trans_ucpoint'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_trans_ucpoints'; + $strongarm->value = 'Points'; + + $export['userpoints_trans_ucpoints'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_trans_uncat'; + $strongarm->value = 'Uncategorized'; + + $export['userpoints_trans_uncat'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'userpoints_transaction_timestamp'; + $strongarm->value = ' 1'; + + $export['userpoints_transaction_timestamp'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'votingapi_anonymous_window'; + $strongarm->value = 86400; + + $export['votingapi_anonymous_window'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'votingapi_calculation_schedule'; + $strongarm->value = 'immediate'; + + $export['votingapi_calculation_schedule'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_comment_node_types'; + $strongarm->value = array( + 'question' => 'question', + ); + + $export['vud_comment_node_types'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_comment_reset'; + $strongarm->value = '0'; + + $export['vud_comment_reset'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_comment_votes'; + $strongarm->value = '0'; + + $export['vud_comment_votes'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_comment_widget'; + $strongarm->value = 'updown'; + + $export['vud_comment_widget'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_node_reset'; + $strongarm->value = '0'; + + $export['vud_node_reset'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_node_types'; + $strongarm->value = array( + 'question' => 'question', + ); + + $export['vud_node_types'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_node_votes'; + $strongarm->value = '0'; + + $export['vud_node_votes'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_node_widget'; + $strongarm->value = 'updown'; + + $export['vud_node_widget'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_node_widget_show'; + $strongarm->value = '2'; + + $export['vud_node_widget_show'] = $strongarm; + $strongarm = new stdClass; + $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ + $strongarm->api_version = 1; + $strongarm->name = 'vud_tag'; + $strongarm->value = 'userpoints_karma'; + + $export['vud_tag'] = $strongarm; + return $export; +} diff -u atrium_answers.features.inc atrium_answers.features.inc --- atrium_answers.features.inc 2010-01-08 09:24:17.000000000 -0800 +++ atrium_answers.features.inc 2010-06-22 20:08:44.408447656 -0700 @@ -10,6 +10,15 @@ } /** + * Implementation of hook_ctools_plugin_api(). + */ +function atrium_answers_ctools_plugin_api() { + module_load_include('inc', 'atrium_answers', 'atrium_answers.defaults'); + $args = func_get_args(); + return call_user_func_array('_atrium_answers_ctools_plugin_api', $args); +} + +/** * Implementation of hook_menu_default_items(). */ function atrium_answers_menu_default_items() { @@ -37,6 +46,15 @@ } /** + * Implementation of hook_strongarm(). + */ +function atrium_answers_strongarm() { + module_load_include('inc', 'atrium_answers', 'atrium_answers.defaults'); + $args = func_get_args(); + return call_user_func_array('_atrium_answers_strongarm', $args); +} + +/** * Implementation of hook_views_default_views(). */ function atrium_answers_views_default_views() { diff -u atrium_answers.features.views.inc atrium_answers.features.views.inc --- atrium_answers.features.views.inc 2010-01-08 09:24:17.000000000 -0800 +++ atrium_answers.features.views.inc 2010-06-22 20:08:44.455910602 -0700 @@ -222,6 +222,7 @@ 'title' => '', 'description' => '', 'weight' => 0, + 'name' => 'navigation', )); $handler = $view->new_display('block', 'Block', 'block_1'); $handler->override_option('arguments', array( @@ -337,6 +338,7 @@ 'title' => '', 'description' => '', 'weight' => 0, + 'name' => 'navigation', )); $handler->override_option('displays', array()); $handler->override_option('sitename_title', 1); @@ -654,6 +656,8 @@ $handler->override_option('attachment_position', 'after'); $handler->override_option('inherit_arguments', TRUE); $handler->override_option('inherit_exposed_filters', FALSE); + $handler->override_option('inherit_pager', FALSE); + $handler->override_option('render_pager', TRUE); $handler->override_option('displays', array( 'block_2' => 'block_2', 'default' => 0, @@ -661,15 +665,15 @@ 'block_1' => 0, )); $translatables['atrium_answers'] = array( - t('Defaults'), t('Answers'), - t('Page'), - t('Block'), + t('Answers teaser'), + t('Answers teaser (list)'), t('Archive'), + t('Block'), + t('Defaults'), t('Feed'), - t('Answers teaser'), + t('Page'), t('more'), - t('Answers teaser (list)'), ); $views[$view->name] = $view; diff -u atrium_answers.info atrium_answers.info --- atrium_answers.info 2010-01-12 15:45:03.000000000 -0800 +++ atrium_answers.info 2010-06-22 20:08:44.418459473 -0700 @@ -1,4 +1,5 @@ core = "6.x" +datestamp = "1263339903" dependencies[] = "atrium" dependencies[] = "comment" dependencies[] = "content" @@ -7,13 +8,16 @@ dependencies[] = "litenode" dependencies[] = "og_views" dependencies[] = "spaces" +dependencies[] = "strongarm" dependencies[] = "userpoints" dependencies[] = "userpoints_karma" dependencies[] = "vud" -dependencies[] = "vud_node" dependencies[] = "vud_comment" +dependencies[] = "vud_node" description = "Questions and Answers, with User Reputations" features[context][] = "spaces-feature-answers" +features[ctools][] = "context" +features[ctools][] = "variable" features[menu][] = "answers" features[node][] = "question" features[user][] = "access vote up/down statistics" @@ -29,16 +33,63 @@ features[user][] = "use vote up/down on nodes" features[user][] = "view own userpoints" features[user][] = "view userpoints" +features[variable][] = "atrium_update_type_question" +features[variable][] = "comment_anonymous_question" +features[variable][] = "comment_controls_question" +features[variable][] = "comment_default_mode_question" +features[variable][] = "comment_default_order_question" +features[variable][] = "comment_default_per_page_question" +features[variable][] = "comment_form_location_question" +features[variable][] = "comment_preview_question" +features[variable][] = "comment_question" +features[variable][] = "comment_subject_field_question" +features[variable][] = "comment_upload_question" +features[variable][] = "node_options_question" +features[variable][] = "notifications_content_type_question" +features[variable][] = "og_content_type_usage_question" +features[variable][] = "show_diff_inline_question" +features[variable][] = "show_preview_changes_question" +features[variable][] = "upload_question" +features[variable][] = "userpoints_category_default_tid" +features[variable][] = "userpoints_category_profile_display_tid" +features[variable][] = "userpoints_display_message" +features[variable][] = "userpoints_expireafter_date" +features[variable][] = "userpoints_expireon_date" +features[variable][] = "userpoints_expiry_description" +features[variable][] = "userpoints_karma_points_down" +features[variable][] = "userpoints_karma_points_notify" +features[variable][] = "userpoints_karma_points_up" +features[variable][] = "userpoints_karma_points_voter" +features[variable][] = "userpoints_karma_points_voter_change" +features[variable][] = "userpoints_karma_points_voter_hide" +features[variable][] = "userpoints_karma_points_voter_own" +features[variable][] = "userpoints_karma_points_voter_tid" +features[variable][] = "userpoints_karma_tag" +features[variable][] = "userpoints_points_moderation" +features[variable][] = "userpoints_report_displayzero" +features[variable][] = "userpoints_report_limit" +features[variable][] = "userpoints_report_usercount" +features[variable][] = "userpoints_trans_lcpoint" +features[variable][] = "userpoints_trans_lcpoints" +features[variable][] = "userpoints_trans_ucpoint" +features[variable][] = "userpoints_trans_ucpoints" +features[variable][] = "userpoints_trans_uncat" +features[variable][] = "userpoints_transaction_timestamp" +features[variable][] = "votingapi_anonymous_window" +features[variable][] = "votingapi_calculation_schedule" +features[variable][] = "vud_comment_node_types" +features[variable][] = "vud_comment_reset" +features[variable][] = "vud_comment_votes" +features[variable][] = "vud_comment_widget" +features[variable][] = "vud_node_reset" +features[variable][] = "vud_node_types" +features[variable][] = "vud_node_votes" +features[variable][] = "vud_node_widget" +features[variable][] = "vud_node_widget_show" +features[variable][] = "vud_tag" features[views][] = "atrium_answers" name = "Atrium Answers" package = "Features" project = "atrium_answers" spaces[types][] = "og" -spaces[types][] = "user" - -; Information added by drupal.org packaging script on 2010-01-12 -version = "6.x-1.1" -core = "6.x" -project = "atrium_answers" -datestamp = "1263339903" - +version = "6.x-1.2" diff -u atrium_answers.module atrium_answers.module --- atrium_answers.module 2010-01-12 15:40:57.000000000 -0800 +++ atrium_answers.module 2010-06-22 20:08:44.398421731 -0700 @@ -4,148 +4,4 @@ function atrium_answers_init() { drupal_add_css(drupal_get_path('module', 'atrium_answers') . '/atrium_answers.css'); -} - -/** - * Implementation of hook_strongarm(). - */ -function atrium_answers_strongarm() { - $conf = array(); - - $conf['node_options_question'] = array('status', 'revision'); - - $conf['og_content_type_usage_question'] = "group_post_standard"; - - $conf['notifications_content_type_question'] = array('thread', 'grouptype', 'nodetype', 'author'); - - $conf['og_notifications_content_types']['question'] = 'question'; - - $conf['upload_question'] = true; - - // Comments - $conf['comment_anonymous_question'] = false; - $conf['comment_controls_question'] = COMMENT_CONTROLS_HIDDEN; - $conf['comment_default_mode_question'] = COMMENT_MODE_FLAT_EXPANDED; - $conf['comment_default_order_question'] = COMMENT_ORDER_OLDEST_FIRST; - $conf['comment_default_per_page_question'] = 300; - $conf['comment_form_location_question'] = COMMENT_FORM_BELOW; - $conf['comment_preview_question'] = COMMENT_PREVIEW_OPTIONAL; - $conf['comment_question'] = COMMENT_NODE_READ_WRITE; - $conf['comment_subject_field_question'] = false; - $conf['comment_upload_question'] = true; - - // FeedAPI - $conf['feedapi_settings_question'] = array('enabled' => FALSE); - - // Disable Diff button - $conf["show_preview_changes_question"] = false; - $conf["show_diff_inline_question"] = false; - - // Enable for recent activity views - $conf['atrium_update_type_question'] = true; - - // Pathauto (optional) settings - $conf["pathauto_node_question_pattern"] = "[space-og-path]/question/[title-raw]"; - - // Userpoints settings - $conf['userpoints_category_default_tid'] = 0; - $conf['userpoints_category_profile_display_tid'] = "all"; - $conf['userpoints_display_message'] = 1; - $conf['userpoints_expireafter_date'] = 0; - $conf['userpoints_expireon_date'] = array("month"=>"1","day"=>"1","year"=>"1980"); - $conf['userpoints_expiry_description'] = ""; - $conf['userpoints_points_moderation'] = 0; - $conf['userpoints_report_displayzero'] = 1; - $conf['userpoints_report_limit'] = 100; - $conf['userpoints_report_usercount'] = 100; - $conf['userpoints_transaction_timestamp'] = 1; - $conf['userpoints_trans_lcpoint'] = "point"; - $conf['userpoints_trans_lcpoints'] = "points"; - $conf['userpoints_trans_ucpoint'] = "Point"; - $conf['userpoints_trans_ucpoints'] = "Points"; - $conf['userpoints_trans_uncat'] = "Uncategorized"; - - // Userpoints Karma settings - $conf['userpoints_karma_points_down'] = 2; - $conf['userpoints_karma_points_notify'] = 1; - $conf['userpoints_karma_points_up'] = 10; - $conf['userpoints_karma_points_voter'] = '0'; - $conf['userpoints_karma_points_voter_change'] = 0; - $conf['userpoints_karma_points_voter_hide'] = 0; - $conf['userpoints_karma_points_voter_own'] = 0; - $conf['userpoints_karma_points_voter_tid'] = '0'; - $conf['userpoints_karma_tag'] = 'userpoints_karma'; - - // Voting API settings - $conf['votingapi_anonymous_window'] = 86400; - $conf['votingapi_calculation_schedule'] = "immediate"; - - // Vote Up/Down settings - $conf['vud_tag'] = "userpoints_karma"; - $conf['vud_comment_node_types'] = array("question"=>"question"); - $conf['vud_comment_reset'] = 0; - $conf['vud_comment_votes'] = 0; - $conf['vud_comment_widget'] = "updown"; - $conf['vud_node_reset'] = 0; - $conf['vud_node_types'] = array("question"=>"question"); - $conf['vud_node_votes'] = 0; - $conf['vud_node_widget'] = "updown"; - $conf['vud_node_widget_show'] = 2; - - return $conf; -} - - -function atrium_answers_theme_registry_alter(&$theme_registry) { - if (!empty($theme_registry['username'])) { - $theme_registry['username']['function'] = 'atrium_answers_theme_username'; - } -} - -function atrium_answers_theme_username($object) { - if ($object->uid && $object->name) { - // Shorten the name when it is too long or it will break many tables. - if (drupal_strlen($object->name) > 20) { - $name = drupal_substr($object->name, 0, 15) .'...'; - } - else { - $name = $object->name; - } - - if (user_access('access user profiles')) { - $output = l($name, 'user/'. $object->uid, array('title' => t('View user profile.'))); - } - else { - $output = check_plain($name); - } - - $user=user_load(array('uid'=>$object->uid)); - if (in_array('admin',$user->roles)) { - $output .= ' ❖'; - } - if (in_array('manager',$user->roles)) { - $output .= ' ◆'; - } - $output .= ' ('.userpoints_get_current_points($object->uid).')'; - $output = ''.$output.''; - } - else if ($object->name) { - // Sometimes modules display content composed by people who are - // not registered members of the site (e.g. mailing list or news - // aggregator modules). This clause enables modules to display - // the true author of the content. - if ($object->homepage) { - $output = l($object->name, $object->homepage); - } - else { - $output = check_plain($object->name); - } - - $output .= ' ('. t('not verified') .')'; - } - else { - $output = variable_get('anonymous', t('Anonymous')); - } - - return $output; -} +} \ No newline at end of file