Commit 2c0e7147 authored by Graham Faulkner's avatar Graham Faulkner
Browse files

fix JS, permissions and text formats and update Readme

parent 70a2538a
......@@ -13,13 +13,25 @@ text (and images), and then some images with their respective metadata:
REQUIREMENTS
------------
This module requires the following modules:
* CTools
* Date
* Features
* Field_collection
* Field_group
* File
* Image
* Menu
* Node
* Options
* Override node options
* Pathauto
* RDF
* Schemaorg
* Search_config
* Strongarm
* Taxonomy
* Text
* UW vocab term lock
* Views
......
......@@ -10,6 +10,39 @@
function uw_ct_exhibit_field_default_field_instances() {
$field_instances = array();
// Exported field_instance: 'comment-comment_node_uw_exhibit-comment_body'
$field_instances['comment-comment_node_uw_exhibit-comment_body'] = array(
'bundle' => 'comment_node_uw_exhibit',
'default_value' => NULL,
'deleted' => 0,
'description' => '',
'display' => array(
'default' => array(
'label' => 'hidden',
'module' => 'text',
'settings' => array(),
'type' => 'text_default',
'weight' => 0,
),
),
'entity_type' => 'comment',
'field_name' => 'comment_body',
'label' => 'Comment',
'required' => TRUE,
'settings' => array(
'text_processing' => 1,
'user_register_form' => FALSE,
),
'widget' => array(
'module' => 'text',
'settings' => array(
'rows' => 5,
),
'type' => 'text_textarea',
'weight' => 0,
),
);
// Exported field_instance: 'field_collection_item-field_uw_exhibit_image-field_creation_date'
$field_instances['field_collection_item-field_uw_exhibit_image-field_creation_date'] = array(
'bundle' => 'field_uw_exhibit_image',
......@@ -108,12 +141,16 @@ function uw_ct_exhibit_field_default_field_instances() {
'better_formats' => array(
'allowed_formats' => array(
'full_html' => 'full_html',
'plain_text' => 'plain_text',
'uw_tf_basic' => 'uw_tf_basic',
'plain_text' => 0,
'uw_tf_basic' => 0,
'uw_tf_comment' => 0,
'uw_tf_contact' => 0,
'uw_tf_standard' => 'uw_tf_standard',
'uw_tf_standard_sidebar' => 0,
'uw_tf_standard_site_footer' => 0,
'uw_tf_standard_wide' => 'uw_tf_standard_wide',
),
'allowed_formats_toggle' => 0,
'allowed_formats_toggle' => 1,
'default_order_toggle' => 0,
'default_order_wrapper' => array(
'formats' => array(
......@@ -126,9 +163,21 @@ function uw_ct_exhibit_field_default_field_instances() {
'uw_tf_basic' => array(
'weight' => 0,
),
'uw_tf_comment' => array(
'weight' => 0,
),
'uw_tf_contact' => array(
'weight' => -5,
),
'uw_tf_standard' => array(
'weight' => -10,
),
'uw_tf_standard_sidebar' => array(
'weight' => -8,
),
'uw_tf_standard_site_footer' => array(
'weight' => -7,
),
'uw_tf_standard_wide' => array(
'weight' => -9,
),
......@@ -465,15 +514,63 @@ function uw_ct_exhibit_field_default_field_instances() {
'entity_type' => 'node',
'field_name' => 'body',
'label' => 'Body',
'required' => FALSE,
'required' => 0,
'settings' => array(
'display_summary' => TRUE,
'better_formats' => array(
'allowed_formats' => array(
'full_html' => 'full_html',
'plain_text' => 0,
'uw_tf_basic' => 0,
'uw_tf_comment' => 0,
'uw_tf_contact' => 0,
'uw_tf_standard' => 'uw_tf_standard',
'uw_tf_standard_sidebar' => 0,
'uw_tf_standard_site_footer' => 0,
'uw_tf_standard_wide' => 'uw_tf_standard_wide',
),
'allowed_formats_toggle' => 1,
'default_order_toggle' => 0,
'default_order_wrapper' => array(
'formats' => array(
'full_html' => array(
'weight' => -6,
),
'plain_text' => array(
'weight' => 10,
),
'uw_tf_basic' => array(
'weight' => 0,
),
'uw_tf_comment' => array(
'weight' => 0,
),
'uw_tf_contact' => array(
'weight' => -5,
),
'uw_tf_standard' => array(
'weight' => -10,
),
'uw_tf_standard_sidebar' => array(
'weight' => -8,
),
'uw_tf_standard_site_footer' => array(
'weight' => -7,
),
'uw_tf_standard_wide' => array(
'weight' => -9,
),
),
),
),
'display_summary' => 1,
'text_processing' => 1,
'user_register_form' => FALSE,
),
'widget' => array(
'active' => 1,
'module' => 'text',
'settings' => array(
'label_help_description' => '',
'rows' => 20,
'summary_rows' => 5,
),
......@@ -786,6 +883,7 @@ function uw_ct_exhibit_field_default_field_instances() {
t('Choose a file');
t('Choose an exhibit image');
t('Choose an image');
t('Comment');
t('Date');
t('Description of image');
t('Image');
......@@ -794,8 +892,8 @@ function uw_ct_exhibit_field_default_field_instances() {
t('The (approximate) date or year of publication. Examples: 1900, c.1904, c.1960-65.');
t('Title or caption');
t('Unique identifier');
t('Wide Page Width');
t('When using wide pages, sidebar complementary content, sidebar related links, and any applicable promotional items will not be displayed.');
t('Wide Page Width');
return $field_instances;
}
......@@ -9,12 +9,12 @@
*/
function uw_ct_exhibit_ctools_plugin_api() {
list($module, $api) = func_get_args();
if ($module == "strongarm" && $api == "strongarm") {
if ($module == "field_group" && $api == "field_group") {
return array("version" => "1");
}
// hack from discussion at https://www.drupal.org/node/1619154
if ($module == 'field_group' && $api == 'field_group') {
return array('version' => 1);
list($module, $api) = func_get_args();
if ($module == "strongarm" && $api == "strongarm") {
return array("version" => "1");
}
}
......
......@@ -9,6 +9,7 @@ dependencies[] = date
dependencies[] = features
dependencies[] = field_collection
dependencies[] = field_group
dependencies[] = file
dependencies[] = image
dependencies[] = menu
dependencies[] = node
......@@ -25,6 +26,7 @@ dependencies[] = uw_ct_image_gallery
dependencies[] = uw_vocab_term_lock
dependencies[] = views
stylesheets[all][] = css/uw-exhibit.css
features[ctools][] = field_group:field_group:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:2
......@@ -39,6 +41,7 @@ features[field_base][] = field_uw_exhibit_image
features[field_group][] = group_exhibit_image|node|uw_exhibit|form
features[field_group][] = group_upload_file|node|uw_exhibit|form
features[field_group][] = group_upload_image|node|uw_exhibit|form
features[field_instance][] = comment-comment_node_uw_exhibit-comment_body
features[field_instance][] = field_collection_item-field_uw_exhibit_image-field_creation_date
features[field_instance][] = field_collection_item-field_uw_exhibit_image-field_description_of_image
features[field_instance][] = field_collection_item-field_uw_exhibit_image-field_exhibit_image
......
......@@ -8,12 +8,13 @@ include_once 'uw_ct_exhibit.features.inc';
/**
* Add handler for selection of wide page width version of exhibit
/
*/
function uw_ct_exhibit_wide_handler($element) {
drupal_add_js(drupal_get_path('module', 'uw_ct_exhibit') . '/uw_ct_exhibit.js');
return($element);
}
/**
* Implements hook_theme_registry_alter().
*/
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment