From e9206418d89e45586857f528f48bfe1a1dee6a33 Mon Sep 17 00:00:00 2001 From: yusuf amer Date: Tue, 29 Jan 2013 09:31:26 +0100 Subject: [PATCH 01/35] Added restriction, at least 1 nodequeue must be created to be visible. --- templates/views-view-unformatted--libraries-tabroll.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/views-view-unformatted--libraries-tabroll.tpl.php b/templates/views-view-unformatted--libraries-tabroll.tpl.php index 7ce3936..8bd63c6 100644 --- a/templates/views-view-unformatted--libraries-tabroll.tpl.php +++ b/templates/views-view-unformatted--libraries-tabroll.tpl.php @@ -4,7 +4,7 @@ // We need jQuery UI tabs for this. drupal_add_library('system', 'ui.tabs'); - +if (count($view->result) > 0) { ?> - + \ No newline at end of file From c03bf2fc947e6c2ff2d57dab9b93eb1131975d64 Mon Sep 17 00:00:00 2001 From: yusuf amer Date: Wed, 27 Mar 2013 00:45:35 +0100 Subject: [PATCH 02/35] Converted ui-tabs triangle image to css to use inherited color from the theme. --- css/ding_tabroll.css | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index dfaa631..0d66a6e 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -36,10 +36,13 @@ } #featured .ui-tabs-nav li.ui-tabs-selected { - border-bottom-color: #FFFFFF; - background: url("../images/tab-active.png") no-repeat scroll left top transparent; - margin-left: -12px; - padding-left: 12px; + position: relative; +} +#featured .ui-tabs-nav li.ui-tabs-selected:after { + right: 100%; border: solid transparent; content: " "; height: 0; width: 0; position: absolute; pointer-events: none; +} +#featured .ui-tabs-nav li.ui-tabs-selected:after { + border-color: rgba(153, 215, 219, 0); border-right-color: inherit; border-width: 24px; top: 50%; margin-top: -24px; } #featured li.ui-tabs-nav-item a { @@ -56,8 +59,7 @@ min-width: 90%; } -#featured ul.ui-tabs-nav li.ui-tabs-selected a { - background: none repeat scroll 0 0 #99D7DB; +#featured ul.ui-tabs-nav li.ui-tabs-selected a { color: #fff; height: 43px; overflow: hidden; From e1fc116805e66cb82e196f6ba449caecc43a4db3 Mon Sep 17 00:00:00 2001 From: yusuf amer Date: Fri, 5 Apr 2013 10:21:58 +0200 Subject: [PATCH 03/35] Removed selected tab triangle image because it had been converted to CSS. --- images/tab-active.png | Bin 267 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 images/tab-active.png diff --git a/images/tab-active.png b/images/tab-active.png deleted file mode 100644 index bba9e31b261caba6e5ade03cdfac0315494eb4ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp@Ky1Ll1|(1Mf8YmFjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf Date: Mon, 7 Oct 2013 09:52:57 +0200 Subject: [PATCH 04/35] Allow having no link. --- .../views-view-fields--ding-tabroll.tpl.php | 16 ++++++++++++++-- .../views-view-fields--libraries-tabroll.tpl.php | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index 001e8ad..041b792 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -1,8 +1,20 @@
- content, 'node/' . $fields['field_ding_tabroll_link']->raw, array('html' => TRUE)); ?> + raw)) { + print $fields['field_ding_tabroll_image']->content; + } else { + print l($fields['field_ding_tabroll_image']->content, 'node/' . $fields['field_ding_tabroll_link']->raw, array('html' => TRUE)); + } + ?>
-

content, 'node/' . $fields['field_ding_tabroll_link']->raw); ?>

+

raw)) { + print $fields['title']->content; + } else { + print l($fields['title']->content, 'node/' . $fields['field_ding_tabroll_link']->raw); + } + ?>

content; ?>

diff --git a/templates/views-view-fields--libraries-tabroll.tpl.php b/templates/views-view-fields--libraries-tabroll.tpl.php index 001e8ad..0fb6e08 100644 --- a/templates/views-view-fields--libraries-tabroll.tpl.php +++ b/templates/views-view-fields--libraries-tabroll.tpl.php @@ -1,8 +1,20 @@
- content, 'node/' . $fields['field_ding_tabroll_link']->raw, array('html' => TRUE)); ?> + raw)) { + print $fields['field_ding_tabroll_image']->content; + } else { + print l($fields['field_ding_tabroll_image']->content, 'node/' . $fields['field_ding_tabroll_link']->raw, array('html' => TRUE)); + } + ?>
-

content, 'node/' . $fields['field_ding_tabroll_link']->raw); ?>

+

raw)) { + print $fields['title']; + } else { + print l($fields['title']->content, 'node/' . $fields['field_ding_tabroll_link']->raw); + } + ?>

content; ?>

From a34f66f58dd86168cf6ca3246ed8a499c9861ab0 Mon Sep 17 00:00:00 2001 From: impara Date: Mon, 7 Oct 2013 10:03:34 +0200 Subject: [PATCH 05/35] Make it pretty when there is no link --- css/ding_tabroll.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index 0d66a6e..cff9673 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -73,7 +73,7 @@ left:0; width: 70% } -#featured a img { +#featured img { width: 100% } #featured .ui-tabs-panel .info { @@ -88,6 +88,11 @@ #featured .ui-tabs-panel .info h3 { margin: 10px 10px 0 20px; + color: #FFFFFF; + font-size: 16px; + font-weight: bold; + line-height: 20px; + text-transform: uppercase; } #featured .ui-tabs-panel .info h3 a { From 2ae0d3c6f5178bef9f15e8ad8cd99fe68023b853 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Mon, 25 Nov 2013 15:43:02 +0100 Subject: [PATCH 06/35] upgraded to features 7.x-2.0-beta2 --- ding_tabroll.features.field.inc | 405 ----------------------- ding_tabroll.features.field_base.inc | 166 ++++++++++ ding_tabroll.features.field_instance.inc | 252 ++++++++++++++ ding_tabroll.features.inc | 11 +- ding_tabroll.info | 27 +- ding_tabroll.strongarm.inc | 16 +- ding_tabroll.views_default.inc | 313 +++++------------- 7 files changed, 535 insertions(+), 655 deletions(-) delete mode 100644 ding_tabroll.features.field.inc create mode 100644 ding_tabroll.features.field_base.inc create mode 100644 ding_tabroll.features.field_instance.inc diff --git a/ding_tabroll.features.field.inc b/ding_tabroll.features.field.inc deleted file mode 100644 index c606feb..0000000 --- a/ding_tabroll.features.field.inc +++ /dev/null @@ -1,405 +0,0 @@ - array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', - 'entity_types' => array(), - 'field_name' => 'field_ding_tabroll_image', - 'foreign keys' => array( - 'fid' => array( - 'columns' => array( - 'fid' => 'fid', - ), - 'table' => 'file_managed', - ), - ), - 'indexes' => array( - 'fid' => array( - 0 => 'fid', - ), - ), - 'locked' => '0', - 'module' => 'image', - 'settings' => array( - 'default_image' => 0, - 'profile2_private' => FALSE, - 'uri_scheme' => 'public', - ), - 'translatable' => '0', - 'type' => 'image', - ), - 'field_instance' => array( - 'bundle' => 'ding_tabroll', - 'deleted' => '0', - 'description' => '', - 'display' => array( - 'content_glider' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'default' => array( - 'label' => 'above', - 'module' => 'image', - 'settings' => array( - 'image_link' => '', - 'image_style' => 'ding_tabroll', - ), - 'type' => 'image', - 'weight' => '2', - ), - 'teaser' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'teaser_highlight' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - ), - 'entity_type' => 'node', - 'field_name' => 'field_ding_tabroll_image', - 'label' => 'image', - 'required' => 1, - 'settings' => array( - 'alt_field' => 0, - 'default_image' => 0, - 'file_directory' => '', - 'file_extensions' => 'png gif jpg jpeg', - 'max_filesize' => '', - 'max_resolution' => '', - 'min_resolution' => '', - 'title_field' => 0, - 'user_register_form' => FALSE, - ), - 'widget' => array( - 'active' => 1, - 'module' => 'media', - 'settings' => array( - 'allowed_schemes' => array( - 'private' => 'private', - 'public' => 'public', - ), - 'allowed_types' => array( - 0 => 0, - 'audio' => 0, - 'default' => 0, - 'image' => 'image', - 'video' => 0, - ), - 'browser_plugins' => array( - 'ding_content' => 0, - 'library' => 0, - 'media_default--media_browser_1' => 0, - 'media_default--media_browser_my_files' => 0, - 'upload' => 0, - ), - 'progress_indicator' => 'throbber', - ), - 'type' => 'media_generic', - 'weight' => '32', - ), - ), - ); - - // Exported field: 'node-ding_tabroll-field_ding_tabroll_lead'. - $fields['node-ding_tabroll-field_ding_tabroll_lead'] = array( - 'field_config' => array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', - 'entity_types' => array(), - 'field_name' => 'field_ding_tabroll_lead', - 'foreign keys' => array( - 'format' => array( - 'columns' => array( - 'format' => 'format', - ), - 'table' => 'filter_format', - ), - ), - 'indexes' => array( - 'format' => array( - 0 => 'format', - ), - ), - 'locked' => '0', - 'module' => 'text', - 'settings' => array( - 'profile2_private' => FALSE, - ), - 'translatable' => '0', - 'type' => 'text_long', - ), - 'field_instance' => array( - 'bundle' => 'ding_tabroll', - 'default_value' => NULL, - 'deleted' => '0', - 'description' => '', - 'display' => array( - 'content_glider' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'default' => array( - 'label' => 'above', - 'module' => 'text', - 'settings' => array(), - 'type' => 'text_default', - 'weight' => '3', - ), - 'teaser' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'teaser_highlight' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - ), - 'entity_type' => 'node', - 'field_name' => 'field_ding_tabroll_lead', - 'label' => 'lead', - 'required' => 0, - 'settings' => array( - 'text_processing' => '0', - 'user_register_form' => FALSE, - ), - 'widget' => array( - 'active' => 1, - 'module' => 'text', - 'settings' => array( - 'rows' => '5', - ), - 'type' => 'text_textarea', - 'weight' => '33', - ), - ), - ); - - // Exported field: 'node-ding_tabroll-field_ding_tabroll_link'. - $fields['node-ding_tabroll-field_ding_tabroll_link'] = array( - 'field_config' => array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', - 'entity_types' => array(), - 'field_name' => 'field_ding_tabroll_link', - 'foreign keys' => array( - 'node' => array( - 'columns' => array( - 'target_id' => 'nid', - ), - 'table' => 'node', - ), - ), - 'indexes' => array( - 'target_id' => array( - 0 => 'target_id', - ), - ), - 'locked' => '0', - 'module' => 'entityreference', - 'settings' => array( - 'handler' => 'base', - 'handler_settings' => array( - 'behaviors' => array( - 'views-select-list' => array( - 'status' => 0, - ), - ), - 'sort' => array( - 'type' => 'none', - ), - 'target_bundles' => array( - 'ding_campaign' => 'ding_campaign', - 'ding_event' => 'ding_event', - 'ding_library' => 'ding_library', - 'ding_news' => 'ding_news', - 'ding_page' => 'ding_page', - ), - ), - 'profile2_private' => FALSE, - 'target_type' => 'node', - ), - 'translatable' => '0', - 'type' => 'entityreference', - ), - 'field_instance' => array( - 'bundle' => 'ding_tabroll', - 'default_value' => NULL, - 'deleted' => '0', - 'description' => '', - 'display' => array( - 'content_glider' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'default' => array( - 'label' => 'above', - 'module' => 'entityreference', - 'settings' => array( - 'link' => FALSE, - ), - 'type' => 'entityreference_label', - 'weight' => '4', - ), - 'teaser' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'teaser_highlight' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - ), - 'entity_type' => 'node', - 'field_name' => 'field_ding_tabroll_link', - 'label' => 'link', - 'required' => 0, - 'settings' => array( - 'user_register_form' => FALSE, - ), - 'widget' => array( - 'active' => 1, - 'module' => 'entityreference', - 'settings' => array( - 'match_operator' => 'CONTAINS', - 'path' => '', - 'size' => '60', - ), - 'type' => 'entityreference_autocomplete', - 'weight' => '34', - ), - ), - ); - - // Exported field: 'node-ding_tabroll-field_ding_tabroll_library_ref'. - $fields['node-ding_tabroll-field_ding_tabroll_library_ref'] = array( - 'field_config' => array( - 'active' => '1', - 'cardinality' => '1', - 'deleted' => '0', - 'entity_types' => array(), - 'field_name' => 'field_ding_tabroll_library_ref', - 'foreign keys' => array( - 'node' => array( - 'columns' => array( - 'target_id' => 'nid', - ), - 'table' => 'node', - ), - ), - 'indexes' => array( - 'target_id' => array( - 0 => 'target_id', - ), - ), - 'locked' => '0', - 'module' => 'entityreference', - 'settings' => array( - 'handler' => 'base', - 'handler_settings' => array( - 'behaviors' => array( - 'views-select-list' => array( - 'status' => 0, - ), - ), - 'sort' => array( - 'type' => 'none', - ), - 'target_bundles' => array( - 'ding_library' => 'ding_library', - ), - ), - 'profile2_private' => FALSE, - 'target_type' => 'node', - ), - 'translatable' => '0', - 'type' => 'entityreference', - ), - 'field_instance' => array( - 'bundle' => 'ding_tabroll', - 'default_value' => NULL, - 'deleted' => '0', - 'description' => '', - 'display' => array( - 'default' => array( - 'label' => 'above', - 'module' => 'entityreference', - 'settings' => array( - 'link' => FALSE, - ), - 'type' => 'entityreference_label', - 'weight' => 5, - ), - 'teaser' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - 'teaser_highlight' => array( - 'label' => 'above', - 'settings' => array(), - 'type' => 'hidden', - 'weight' => 0, - ), - ), - 'entity_type' => 'node', - 'field_name' => 'field_ding_tabroll_library_ref', - 'label' => 'library', - 'required' => 0, - 'settings' => array( - 'user_register_form' => FALSE, - ), - 'widget' => array( - 'active' => 1, - 'module' => 'options', - 'settings' => array(), - 'type' => 'options_select', - 'weight' => '35', - ), - ), - ); - - // Translatables - // Included for use with string extractors like potx. - t('image'); - t('ding_tabroll_lead'); - t('ding_tabroll_link'); - t('ding_tabroll_library_ref'); - - return $fields; -} diff --git a/ding_tabroll.features.field_base.inc b/ding_tabroll.features.field_base.inc new file mode 100644 index 0000000..f291f5f --- /dev/null +++ b/ding_tabroll.features.field_base.inc @@ -0,0 +1,166 @@ + 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_ding_tabroll_image', + 'foreign keys' => array( + 'fid' => array( + 'columns' => array( + 'fid' => 'fid', + ), + 'table' => 'file_managed', + ), + ), + 'indexes' => array( + 'fid' => array( + 0 => 'fid', + ), + ), + 'locked' => 0, + 'module' => 'image', + 'settings' => array( + 'default_image' => 0, + 'profile2_private' => FALSE, + 'uri_scheme' => 'public', + ), + 'translatable' => 0, + 'type' => 'image', + ); + + // Exported field_base: 'field_ding_tabroll_lead' + $field_bases['field_ding_tabroll_lead'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_ding_tabroll_lead', + 'foreign keys' => array( + 'format' => array( + 'columns' => array( + 'format' => 'format', + ), + 'table' => 'filter_format', + ), + ), + 'indexes' => array( + 'format' => array( + 0 => 'format', + ), + ), + 'locked' => 0, + 'module' => 'text', + 'settings' => array( + 'profile2_private' => FALSE, + ), + 'translatable' => 0, + 'type' => 'text_long', + ); + + // Exported field_base: 'field_ding_tabroll_library_ref' + $field_bases['field_ding_tabroll_library_ref'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_ding_tabroll_library_ref', + 'foreign keys' => array( + 'node' => array( + 'columns' => array( + 'target_id' => 'nid', + ), + 'table' => 'node', + ), + ), + 'indexes' => array( + 'target_id' => array( + 0 => 'target_id', + ), + ), + 'locked' => 0, + 'module' => 'entityreference', + 'settings' => array( + 'handler' => 'base', + 'handler_settings' => array( + 'behaviors' => array( + 'views-select-list' => array( + 'status' => 0, + ), + ), + 'sort' => array( + 'type' => 'none', + ), + 'target_bundles' => array( + 'ding_library' => 'ding_library', + ), + ), + 'profile2_private' => FALSE, + 'target_type' => 'node', + ), + 'translatable' => 0, + 'type' => 'entityreference', + ); + + // Exported field_base: 'field_ding_tabroll_link' + $field_bases['field_ding_tabroll_link'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_ding_tabroll_link', + 'foreign keys' => array( + 'node' => array( + 'columns' => array( + 'target_id' => 'nid', + ), + 'table' => 'node', + ), + ), + 'indexes' => array( + 'target_id' => array( + 0 => 'target_id', + ), + ), + 'locked' => 0, + 'module' => 'entityreference', + 'settings' => array( + 'handler' => 'base', + 'handler_settings' => array( + 'behaviors' => array( + 'views-select-list' => array( + 'status' => 0, + ), + ), + 'sort' => array( + 'type' => 'none', + ), + 'target_bundles' => array( + 'ding_campaign' => 'ding_campaign', + 'ding_event' => 'ding_event', + 'ding_library' => 'ding_library', + 'ding_news' => 'ding_news', + 'ding_page' => 'ding_page', + ), + ), + 'profile2_private' => FALSE, + 'target_type' => 'node', + ), + 'translatable' => 0, + 'type' => 'entityreference', + ); + + return $field_bases; +} diff --git a/ding_tabroll.features.field_instance.inc b/ding_tabroll.features.field_instance.inc new file mode 100644 index 0000000..eb9b02e --- /dev/null +++ b/ding_tabroll.features.field_instance.inc @@ -0,0 +1,252 @@ + 'ding_tabroll', + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'content_glider' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'image', + 'settings' => array( + 'image_link' => '', + 'image_style' => 'ding_tabroll', + ), + 'type' => 'image', + 'weight' => 2, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser_highlight' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_ding_tabroll_image', + 'label' => 'image', + 'required' => 1, + 'settings' => array( + 'alt_field' => 0, + 'default_image' => 0, + 'file_directory' => '', + 'file_extensions' => 'png gif jpg jpeg', + 'max_filesize' => '', + 'max_resolution' => '', + 'min_resolution' => '', + 'title_field' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'media', + 'settings' => array( + 'allowed_schemes' => array( + 'private' => 'private', + 'public' => 'public', + ), + 'allowed_types' => array( + 'audio' => 0, + 0 => 0, + 'default' => 0, + 'image' => 'image', + 'video' => 0, + ), + 'browser_plugins' => array( + 'ding_content' => 0, + 'library' => 0, + 'media_default--media_browser_1' => 0, + 'media_default--media_browser_my_files' => 0, + 'upload' => 0, + ), + 'progress_indicator' => 'throbber', + ), + 'type' => 'media_generic', + 'weight' => 32, + ), + ); + + // Exported field_instance: 'node-ding_tabroll-field_ding_tabroll_lead' + $field_instances['node-ding_tabroll-field_ding_tabroll_lead'] = array( + 'bundle' => 'ding_tabroll', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'content_glider' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 3, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser_highlight' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_ding_tabroll_lead', + 'label' => 'lead', + 'required' => 0, + 'settings' => array( + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'text', + 'settings' => array( + 'rows' => 5, + ), + 'type' => 'text_textarea', + 'weight' => 33, + ), + ); + + // Exported field_instance: 'node-ding_tabroll-field_ding_tabroll_library_ref' + $field_instances['node-ding_tabroll-field_ding_tabroll_library_ref'] = array( + 'bundle' => 'ding_tabroll', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 5, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser_highlight' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_ding_tabroll_library_ref', + 'label' => 'library', + 'required' => 0, + 'settings' => array( + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'options', + 'settings' => array(), + 'type' => 'options_select', + 'weight' => 35, + ), + ); + + // Exported field_instance: 'node-ding_tabroll-field_ding_tabroll_link' + $field_instances['node-ding_tabroll-field_ding_tabroll_link'] = array( + 'bundle' => 'ding_tabroll', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => '', + 'display' => array( + 'content_glider' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'default' => array( + 'label' => 'above', + 'module' => 'entityreference', + 'settings' => array( + 'link' => FALSE, + ), + 'type' => 'entityreference_label', + 'weight' => 4, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser_highlight' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_ding_tabroll_link', + 'label' => 'link', + 'required' => 0, + 'settings' => array( + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'entityreference', + 'settings' => array( + 'match_operator' => 'CONTAINS', + 'path' => '', + 'size' => 60, + ), + 'type' => 'entityreference_autocomplete', + 'weight' => 34, + ), + ); + + // Translatables + // Included for use with string extractors like potx. + t('image'); + t('lead'); + t('library'); + t('link'); + + return $field_instances; +} diff --git a/ding_tabroll.features.inc b/ding_tabroll.features.inc index e27a696..b06702e 100644 --- a/ding_tabroll.features.inc +++ b/ding_tabroll.features.inc @@ -1,7 +1,7 @@ "3.0"); + return array("api" => "3.0"); } /** @@ -41,10 +41,10 @@ function ding_tabroll_image_default_styles() { 'module' => 'image', 'name' => 'image_scale_and_crop', 'data' => array( - 'width' => '460', - 'height' => '240', + 'width' => 460, + 'height' => 240, ), - 'weight' => '1', + 'weight' => 1, ), ), ); @@ -62,7 +62,6 @@ function ding_tabroll_node_info() { 'base' => 'node_content', 'description' => t('ding_tabroll'), 'has_title' => '1', - 'custom' => '1', 'title_label' => t('Title'), 'help' => '', ), diff --git a/ding_tabroll.info b/ding_tabroll.info index 525c024..df7f5b0 100644 --- a/ding_tabroll.info +++ b/ding_tabroll.info @@ -2,32 +2,38 @@ name = ding_tabroll description = provides the content type tabroll and the view Tabroll, which presents 5 tabs in a carousel - to be shown fx. on frontpage core = 7.x package = Features -version = 7.x-1.0 +php = 5.2.4 +version = 7.x-1.1 project = ding_tabroll dependencies[] = ding_library +dependencies[] = entityreference dependencies[] = features dependencies[] = media dependencies[] = nodequeue dependencies[] = smartqueue_nodetypes -dependencies[] = entityreference dependencies[] = strongarm -dependencies[] = field_sql_storage -dependencies[] = options +dependencies[] = views +dependencies[] = views_content features[ctools][] = strongarm:strongarm:1 +features[ctools][] = views:views_default:3.0 features[features_api][] = api:1 -features[field][] = node-ding_tabroll-field_ding_tabroll_image -features[field][] = node-ding_tabroll-field_ding_tabroll_lead -features[field][] = node-ding_tabroll-field_ding_tabroll_link -features[field][] = node-ding_tabroll-field_ding_tabroll_library_ref +features[field_base][] = field_ding_tabroll_image +features[field_base][] = field_ding_tabroll_lead +features[field_base][] = field_ding_tabroll_library_ref +features[field_base][] = field_ding_tabroll_link +features[field_instance][] = node-ding_tabroll-field_ding_tabroll_image +features[field_instance][] = node-ding_tabroll-field_ding_tabroll_lead +features[field_instance][] = node-ding_tabroll-field_ding_tabroll_library_ref +features[field_instance][] = node-ding_tabroll-field_ding_tabroll_link features[image][] = ding_tabroll features[node][] = ding_tabroll features[variable][] = comment_anonymous_ding_tabroll features[variable][] = comment_default_mode_ding_tabroll features[variable][] = comment_default_per_page_ding_tabroll +features[variable][] = comment_ding_tabroll features[variable][] = comment_form_location_ding_tabroll features[variable][] = comment_preview_ding_tabroll features[variable][] = comment_subject_field_ding_tabroll -features[variable][] = comment_ding_tabroll features[variable][] = field_bundle_settings_node_ding_tabroll features[variable][] = language_content_type_ding_tabroll features[variable][] = menu_options_ding_tabroll @@ -35,6 +41,5 @@ features[variable][] = menu_parent_ding_tabroll features[variable][] = node_options_ding_tabroll features[variable][] = node_preview_ding_tabroll features[variable][] = node_submitted_ding_tabroll -features[views_view][] = libraries_tabroll features[views_view][] = ding_tabroll -features[ctools][] = views:views_default:3.0 +features[views_view][] = libraries_tabroll diff --git a/ding_tabroll.strongarm.inc b/ding_tabroll.strongarm.inc index 673e0f1..4f4a8c4 100644 --- a/ding_tabroll.strongarm.inc +++ b/ding_tabroll.strongarm.inc @@ -1,7 +1,7 @@ value = '50'; $export['comment_default_per_page_ding_tabroll'] = $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_ding_tabroll'; + $strongarm->value = '2'; + $export['comment_ding_tabroll'] = $strongarm; + $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; @@ -52,13 +59,6 @@ function ding_tabroll_strongarm() { $strongarm->value = 1; $export['comment_subject_field_ding_tabroll'] = $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_ding_tabroll'; - $strongarm->value = '2'; - $export['comment_ding_tabroll'] = $strongarm; - $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; diff --git a/ding_tabroll.views_default.inc b/ding_tabroll.views_default.inc index 8867574..b7dc5fb 100644 --- a/ding_tabroll.views_default.inc +++ b/ding_tabroll.views_default.inc @@ -1,7 +1,7 @@ name = 'libraries_tabroll'; - $view->description = 'Display a list of all nodes in queue \'libraries\''; + $view = new view(); + $view->name = 'ding_tabroll'; + $view->description = 'Display a list of all nodes in queue \'frontpage tabroll\''; $view->tag = 'nodequeue'; $view->base_table = 'node'; - $view->human_name = 'libraries tabroll'; - $view->core = 0; + $view->human_name = 'frontpage tabroll'; + $view->core = 7; $view->api_version = '3.0'; $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ - /* Display: Defaults */ - $handler = $view->new_display('default', 'Defaults', 'default'); + /* Display: Master */ + $handler = $view->new_display('default', 'Master', 'default'); + $handler->display->display_options['use_more_always'] = FALSE; $handler->display->display_options['use_more_text'] = 'Se flere'; - $handler->display->display_options['access']['type'] = 'perm'; + $handler->display->display_options['access']['type'] = 'none'; $handler->display->display_options['cache']['type'] = 'none'; $handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['query']['options']['query_comment'] = FALSE; @@ -32,197 +33,112 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sortér efter'; $handler->display->display_options['pager']['type'] = 'some'; $handler->display->display_options['pager']['options']['items_per_page'] = '5'; - $handler->display->display_options['pager']['options']['offset'] = '0'; $handler->display->display_options['style_plugin'] = 'default'; $handler->display->display_options['row_plugin'] = 'fields'; - $handler->display->display_options['row_options']['hide_empty'] = 0; - $handler->display->display_options['row_options']['default_field_elements'] = 0; + $handler->display->display_options['row_options']['default_field_elements'] = FALSE; /* Relationship: Nodequeue: Queue */ $handler->display->display_options['relationships']['nodequeue_rel']['id'] = 'nodequeue_rel'; $handler->display->display_options['relationships']['nodequeue_rel']['table'] = 'node'; $handler->display->display_options['relationships']['nodequeue_rel']['field'] = 'nodequeue_rel'; - $handler->display->display_options['relationships']['nodequeue_rel']['required'] = 1; - $handler->display->display_options['relationships']['nodequeue_rel']['limit'] = TRUE; + $handler->display->display_options['relationships']['nodequeue_rel']['label'] = 'frontpage tabroll'; + $handler->display->display_options['relationships']['nodequeue_rel']['required'] = TRUE; + $handler->display->display_options['relationships']['nodequeue_rel']['limit'] = 1; $handler->display->display_options['relationships']['nodequeue_rel']['names'] = array( - 'ding_tabroll_for_libraries' => 'ding_tabroll_for_libraries', + 'ding_tabroll' => 'ding_tabroll', + 'ding_tabroll_for_libraries' => 0, ); /* Relationship: Entity Reference: Referenced Entity */ $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['id'] = 'field_ding_tabroll_link_target_id'; $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['table'] = 'field_data_field_ding_tabroll_link'; $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['field'] = 'field_ding_tabroll_link_target_id'; - $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['required'] = 0; - /* Felt: Indhold: Titel */ + /* Field: Content: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; $handler->display->display_options['fields']['title']['label'] = ''; - $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['title']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['title']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['title']['alter']['external'] = 0; - $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['title']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['title']['alter']['trim'] = 0; - $handler->display->display_options['fields']['title']['alter']['html'] = 0; + $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE; + $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['title']['element_default_classes'] = 1; - $handler->display->display_options['fields']['title']['hide_empty'] = 0; - $handler->display->display_options['fields']['title']['empty_zero'] = 0; - $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['title']['link_to_node'] = 0; - /* Felt: Indhold: image */ + $handler->display->display_options['fields']['title']['element_default_classes'] = FALSE; + $handler->display->display_options['fields']['title']['link_to_node'] = FALSE; + /* Field: Content: image */ $handler->display->display_options['fields']['field_ding_tabroll_image']['id'] = 'field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['table'] = 'field_data_field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['field'] = 'field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['label'] = ''; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['html'] = 0; $handler->display->display_options['fields']['field_ding_tabroll_image']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ding_tabroll_image']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['hide_alter_empty'] = 1; + $handler->display->display_options['fields']['field_ding_tabroll_image']['element_default_classes'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_image']['click_sort_column'] = 'fid'; $handler->display->display_options['fields']['field_ding_tabroll_image']['settings'] = array( 'image_style' => 'ding_tabroll', 'image_link' => '', ); - $handler->display->display_options['fields']['field_ding_tabroll_image']['field_api_classes'] = 0; - /* Felt: Indhold: ding_tabroll_lead */ + /* Field: Content: lead */ $handler->display->display_options['fields']['field_ding_tabroll_lead']['id'] = 'field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['table'] = 'field_data_field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['field'] = 'field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['label'] = ''; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['html'] = 0; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_type'] = 'p'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['field_api_classes'] = 0; - /* Felt: Indhold: ding_tabroll_link */ + $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_default_classes'] = FALSE; + /* Field: Content: link */ $handler->display->display_options['fields']['field_ding_tabroll_link']['id'] = 'field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['table'] = 'field_data_field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['field'] = 'field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['relationship'] = 'field_ding_tabroll_link_target_id'; $handler->display->display_options['fields']['field_ding_tabroll_link']['label'] = ''; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['html'] = 0; $handler->display->display_options['fields']['field_ding_tabroll_link']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ding_tabroll_link']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['hide_alter_empty'] = 1; + $handler->display->display_options['fields']['field_ding_tabroll_link']['element_default_classes'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_link']['type'] = 'entityreference_entity_id'; $handler->display->display_options['fields']['field_ding_tabroll_link']['settings'] = array( 'link' => 0, ); - $handler->display->display_options['fields']['field_ding_tabroll_link']['field_api_classes'] = 0; /* Sort criterion: Nodequeue: Position */ $handler->display->display_options['sorts']['position']['id'] = 'position'; $handler->display->display_options['sorts']['position']['table'] = 'nodequeue_nodes'; $handler->display->display_options['sorts']['position']['field'] = 'position'; $handler->display->display_options['sorts']['position']['relationship'] = 'nodequeue_rel'; - /* Contextual filter: Nodequeue: Subqueue reference */ - $handler->display->display_options['arguments']['reference']['id'] = 'reference'; - $handler->display->display_options['arguments']['reference']['table'] = 'nodequeue_subqueue'; - $handler->display->display_options['arguments']['reference']['field'] = 'reference'; - $handler->display->display_options['arguments']['reference']['relationship'] = 'nodequeue_rel'; - $handler->display->display_options['arguments']['reference']['default_action'] = 'default'; - $handler->display->display_options['arguments']['reference']['default_argument_type'] = 'node'; - $handler->display->display_options['arguments']['reference']['default_argument_skip_url'] = 0; - $handler->display->display_options['arguments']['reference']['summary']['number_of_records'] = '0'; - $handler->display->display_options['arguments']['reference']['summary']['format'] = 'default_summary'; - $handler->display->display_options['arguments']['reference']['summary_options']['items_per_page'] = '25'; - $handler->display->display_options['arguments']['reference']['glossary'] = 0; - $handler->display->display_options['arguments']['reference']['limit'] = '0'; - $handler->display->display_options['arguments']['reference']['transform_dash'] = 0; - $handler->display->display_options['arguments']['reference']['break_phrase'] = 0; - /* Filter criterion: Indhold: Type */ - $handler->display->display_options['filters']['type']['id'] = 'type'; - $handler->display->display_options['filters']['type']['table'] = 'node'; - $handler->display->display_options['filters']['type']['field'] = 'type'; - $handler->display->display_options['filters']['type']['value'] = array( - 'ding_tabroll' => 'ding_tabroll', - ); - /* Filter criterion: Indhold: Udgivet */ + /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; $handler->display->display_options['filters']['status']['table'] = 'node'; $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = '1'; + $handler->display->display_options['filters']['status']['value'] = 1; + $handler->display->display_options['filters']['status']['group'] = 1; + $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; /* Display: Content pane */ $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1'); - $translatables['libraries_tabroll'] = array( - t('Defaults'), + $translatables['ding_tabroll'] = array( + t('Master'), t('Se flere'), - t('Send'), + t('Apply'), t('Gendan'), t('Sortér efter'), t('Asc'), t('Desc'), - t('queue'), - t('Indhold entity referenced from field_ding_tabroll_link'), - t('Alle'), + t('frontpage tabroll'), + t('Content entity referenced from field_ding_tabroll_link'), t('Content pane'), + t('more'), t('View panes'), ); - $export['libraries_tabroll'] = $view; + $export['ding_tabroll'] = $view; - $view = new view; - $view->name = 'ding_tabroll'; - $view->description = 'Display a list of all nodes in queue \'frontpage tabroll\''; + $view = new view(); + $view->name = 'libraries_tabroll'; + $view->description = 'Display a list of all nodes in queue \'libraries\''; $view->tag = 'nodequeue'; $view->base_table = 'node'; - $view->human_name = 'frontpage tabroll'; - $view->core = 7; + $view->human_name = 'libraries tabroll'; + $view->core = 0; $view->api_version = '3.0'; $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ - /* Display: Master */ - $handler = $view->new_display('default', 'Master', 'default'); + /* Display: Defaults */ + $handler = $view->new_display('default', 'Defaults', 'default'); + $handler->display->display_options['use_more_always'] = FALSE; $handler->display->display_options['use_more_text'] = 'Se flere'; - $handler->display->display_options['access']['type'] = 'none'; + $handler->display->display_options['access']['type'] = 'perm'; $handler->display->display_options['cache']['type'] = 'none'; $handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['query']['options']['query_comment'] = FALSE; @@ -231,162 +147,109 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sortér efter'; $handler->display->display_options['pager']['type'] = 'some'; $handler->display->display_options['pager']['options']['items_per_page'] = '5'; + $handler->display->display_options['pager']['options']['offset'] = '0'; $handler->display->display_options['style_plugin'] = 'default'; $handler->display->display_options['row_plugin'] = 'fields'; - $handler->display->display_options['row_options']['hide_empty'] = 0; - $handler->display->display_options['row_options']['default_field_elements'] = 0; + $handler->display->display_options['row_options']['default_field_elements'] = FALSE; /* Relationship: Nodequeue: Queue */ $handler->display->display_options['relationships']['nodequeue_rel']['id'] = 'nodequeue_rel'; $handler->display->display_options['relationships']['nodequeue_rel']['table'] = 'node'; $handler->display->display_options['relationships']['nodequeue_rel']['field'] = 'nodequeue_rel'; - $handler->display->display_options['relationships']['nodequeue_rel']['label'] = 'frontpage tabroll'; - $handler->display->display_options['relationships']['nodequeue_rel']['required'] = 1; - $handler->display->display_options['relationships']['nodequeue_rel']['limit'] = 1; + $handler->display->display_options['relationships']['nodequeue_rel']['required'] = TRUE; + $handler->display->display_options['relationships']['nodequeue_rel']['limit'] = TRUE; $handler->display->display_options['relationships']['nodequeue_rel']['names'] = array( - 'ding_tabroll' => 'ding_tabroll', - 'ding_tabroll_for_libraries' => 0, + 'ding_tabroll_for_libraries' => 'ding_tabroll_for_libraries', ); /* Relationship: Entity Reference: Referenced Entity */ $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['id'] = 'field_ding_tabroll_link_target_id'; $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['table'] = 'field_data_field_ding_tabroll_link'; $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['field'] = 'field_ding_tabroll_link_target_id'; - $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['required'] = 0; - /* Felt: Indhold: Titel */ + /* Field: Content: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; $handler->display->display_options['fields']['title']['field'] = 'title'; $handler->display->display_options['fields']['title']['label'] = ''; - $handler->display->display_options['fields']['title']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['title']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['title']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['title']['alter']['external'] = 0; - $handler->display->display_options['fields']['title']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['title']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['title']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 0; - $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 0; - $handler->display->display_options['fields']['title']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['title']['alter']['trim'] = 0; - $handler->display->display_options['fields']['title']['alter']['html'] = 0; $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['title']['element_default_classes'] = 0; - $handler->display->display_options['fields']['title']['hide_empty'] = 0; - $handler->display->display_options['fields']['title']['empty_zero'] = 0; - $handler->display->display_options['fields']['title']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['title']['link_to_node'] = 0; - /* Felt: Indhold: image */ + $handler->display->display_options['fields']['title']['link_to_node'] = FALSE; + /* Field: Content: image */ $handler->display->display_options['fields']['field_ding_tabroll_image']['id'] = 'field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['table'] = 'field_data_field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['field'] = 'field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['label'] = ''; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['alter']['html'] = 0; $handler->display->display_options['fields']['field_ding_tabroll_image']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ding_tabroll_image']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_image']['hide_alter_empty'] = 1; + $handler->display->display_options['fields']['field_ding_tabroll_image']['element_default_classes'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_image']['click_sort_column'] = 'fid'; $handler->display->display_options['fields']['field_ding_tabroll_image']['settings'] = array( 'image_style' => 'ding_tabroll', 'image_link' => '', ); - $handler->display->display_options['fields']['field_ding_tabroll_image']['field_api_classes'] = 0; - /* Felt: Indhold: ding_tabroll_lead */ + /* Field: Content: lead */ $handler->display->display_options['fields']['field_ding_tabroll_lead']['id'] = 'field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['table'] = 'field_data_field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['field'] = 'field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['label'] = ''; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['alter']['html'] = 0; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_type'] = 'p'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['hide_alter_empty'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_lead']['field_api_classes'] = 0; - /* Felt: Indhold: ding_tabroll_link */ + $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_default_classes'] = FALSE; + /* Field: Content: link */ $handler->display->display_options['fields']['field_ding_tabroll_link']['id'] = 'field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['table'] = 'field_data_field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['field'] = 'field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['relationship'] = 'field_ding_tabroll_link_target_id'; $handler->display->display_options['fields']['field_ding_tabroll_link']['label'] = ''; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['alter_text'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['make_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['absolute'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['external'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['replace_spaces'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['trim_whitespace'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['nl2br'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['word_boundary'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['ellipsis'] = 1; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['more_link'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['strip_tags'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['trim'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['alter']['html'] = 0; $handler->display->display_options['fields']['field_ding_tabroll_link']['element_label_colon'] = FALSE; - $handler->display->display_options['fields']['field_ding_tabroll_link']['element_default_classes'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['hide_empty'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['empty_zero'] = 0; - $handler->display->display_options['fields']['field_ding_tabroll_link']['hide_alter_empty'] = 1; + $handler->display->display_options['fields']['field_ding_tabroll_link']['element_default_classes'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_link']['type'] = 'entityreference_entity_id'; $handler->display->display_options['fields']['field_ding_tabroll_link']['settings'] = array( 'link' => 0, ); - $handler->display->display_options['fields']['field_ding_tabroll_link']['field_api_classes'] = 0; /* Sort criterion: Nodequeue: Position */ $handler->display->display_options['sorts']['position']['id'] = 'position'; $handler->display->display_options['sorts']['position']['table'] = 'nodequeue_nodes'; $handler->display->display_options['sorts']['position']['field'] = 'position'; $handler->display->display_options['sorts']['position']['relationship'] = 'nodequeue_rel'; - /* Filter criterion: Indhold: Udgivet */ + /* Contextual filter: Nodequeue: Subqueue reference */ + $handler->display->display_options['arguments']['reference']['id'] = 'reference'; + $handler->display->display_options['arguments']['reference']['table'] = 'nodequeue_subqueue'; + $handler->display->display_options['arguments']['reference']['field'] = 'reference'; + $handler->display->display_options['arguments']['reference']['relationship'] = 'nodequeue_rel'; + $handler->display->display_options['arguments']['reference']['default_action'] = 'default'; + $handler->display->display_options['arguments']['reference']['default_argument_type'] = 'node'; + $handler->display->display_options['arguments']['reference']['summary']['number_of_records'] = '0'; + $handler->display->display_options['arguments']['reference']['summary']['format'] = 'default_summary'; + $handler->display->display_options['arguments']['reference']['summary_options']['items_per_page'] = '25'; + $handler->display->display_options['arguments']['reference']['limit'] = '0'; + /* Filter criterion: Content: Type */ + $handler->display->display_options['filters']['type']['id'] = 'type'; + $handler->display->display_options['filters']['type']['table'] = 'node'; + $handler->display->display_options['filters']['type']['field'] = 'type'; + $handler->display->display_options['filters']['type']['value'] = array( + 'ding_tabroll' => 'ding_tabroll', + ); + /* Filter criterion: Content: Published */ $handler->display->display_options['filters']['status']['id'] = 'status'; $handler->display->display_options['filters']['status']['table'] = 'node'; $handler->display->display_options['filters']['status']['field'] = 'status'; - $handler->display->display_options['filters']['status']['value'] = 1; - $handler->display->display_options['filters']['status']['group'] = 1; - $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; + $handler->display->display_options['filters']['status']['value'] = '1'; /* Display: Content pane */ $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1'); - $translatables['ding_tabroll'] = array( - t('Master'), + $translatables['libraries_tabroll'] = array( + t('Defaults'), t('Se flere'), - t('Send'), + t('Apply'), t('Gendan'), t('Sortér efter'), t('Asc'), t('Desc'), - t('frontpage tabroll'), - t('Indhold entity referenced from field_ding_tabroll_link'), + t('queue'), + t('Content entity referenced from field_ding_tabroll_link'), + t('All'), t('Content pane'), + t('more'), t('View panes'), ); - $export['ding_tabroll'] = $view; + $export['libraries_tabroll'] = $view; return $export; } From b7b422838ba89df7b5b23c9b2a58bfe22f6d9c78 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Tue, 26 Nov 2013 13:09:52 +0100 Subject: [PATCH 07/35] Insert descriptions and prettify labels. --- ding_tabroll.features.field_instance.inc | 22 ++++++++++++---------- ding_tabroll.features.inc | 4 ++-- ding_tabroll.info | 4 ++-- ding_tabroll.strongarm.inc | 17 +++++++---------- ding_tabroll.views_default.inc | 12 ++++++------ 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/ding_tabroll.features.field_instance.inc b/ding_tabroll.features.field_instance.inc index eb9b02e..d7399c9 100644 --- a/ding_tabroll.features.field_instance.inc +++ b/ding_tabroll.features.field_instance.inc @@ -47,7 +47,7 @@ function ding_tabroll_field_default_field_instances() { ), 'entity_type' => 'node', 'field_name' => 'field_ding_tabroll_image', - 'label' => 'image', + 'label' => 'Image', 'required' => 1, 'settings' => array( 'alt_field' => 0, @@ -124,7 +124,7 @@ function ding_tabroll_field_default_field_instances() { ), 'entity_type' => 'node', 'field_name' => 'field_ding_tabroll_lead', - 'label' => 'lead', + 'label' => 'Lead', 'required' => 0, 'settings' => array( 'text_processing' => 0, @@ -146,7 +146,7 @@ function ding_tabroll_field_default_field_instances() { 'bundle' => 'ding_tabroll', 'default_value' => NULL, 'deleted' => 0, - 'description' => '', + 'description' => 'Insert this into the chosen library nodequeue.', 'display' => array( 'default' => array( 'label' => 'above', @@ -172,7 +172,7 @@ function ding_tabroll_field_default_field_instances() { ), 'entity_type' => 'node', 'field_name' => 'field_ding_tabroll_library_ref', - 'label' => 'library', + 'label' => 'Library', 'required' => 0, 'settings' => array( 'user_register_form' => FALSE, @@ -191,7 +191,7 @@ function ding_tabroll_field_default_field_instances() { 'bundle' => 'ding_tabroll', 'default_value' => NULL, 'deleted' => 0, - 'description' => '', + 'description' => 'Write part of the node title to search for content to link to.', 'display' => array( 'content_glider' => array( 'label' => 'above', @@ -223,7 +223,7 @@ function ding_tabroll_field_default_field_instances() { ), 'entity_type' => 'node', 'field_name' => 'field_ding_tabroll_link', - 'label' => 'link', + 'label' => 'Link', 'required' => 0, 'settings' => array( 'user_register_form' => FALSE, @@ -243,10 +243,12 @@ function ding_tabroll_field_default_field_instances() { // Translatables // Included for use with string extractors like potx. - t('image'); - t('lead'); - t('library'); - t('link'); + t('Image'); + t('Insert this into the chosen library nodequeue.'); + t('Lead'); + t('Library'); + t('Link'); + t('Write part of the node title to search for content to link to.'); return $field_instances; } diff --git a/ding_tabroll.features.inc b/ding_tabroll.features.inc index b06702e..34f65cf 100644 --- a/ding_tabroll.features.inc +++ b/ding_tabroll.features.inc @@ -32,8 +32,8 @@ function ding_tabroll_image_default_styles() { 'name' => 'ding_tabroll', 'effects' => array( 13 => array( - 'label' => 'Skalér og beskær', - 'help' => 'Skalering og beskæring bevarer billedets højde-bredde-forhold og beskærer derefter den største dimension. Det er nyttigt til at generere kvadratiske thumbnails uden at forvrænge billedet.', + 'label' => 'Scale and crop', + 'help' => 'Scale and crop will maintain the aspect-ratio of the original image, then crop the larger dimension. This is most useful for creating perfectly square thumbnails without stretching the image.', 'effect callback' => 'image_scale_and_crop_effect', 'dimensions callback' => 'image_resize_dimensions', 'form callback' => 'image_resize_form', diff --git a/ding_tabroll.info b/ding_tabroll.info index df7f5b0..e43a9c0 100644 --- a/ding_tabroll.info +++ b/ding_tabroll.info @@ -3,7 +3,7 @@ description = provides the content type tabroll and the view Tabroll, which pres core = 7.x package = Features php = 5.2.4 -version = 7.x-1.1 +version = 7.x-1.2 project = ding_tabroll dependencies[] = ding_library dependencies[] = entityreference @@ -34,7 +34,7 @@ features[variable][] = comment_ding_tabroll features[variable][] = comment_form_location_ding_tabroll features[variable][] = comment_preview_ding_tabroll features[variable][] = comment_subject_field_ding_tabroll -features[variable][] = field_bundle_settings_node_ding_tabroll +features[variable][] = field_bundle_settings_node__ding_tabroll features[variable][] = language_content_type_ding_tabroll features[variable][] = menu_options_ding_tabroll features[variable][] = menu_parent_ding_tabroll diff --git a/ding_tabroll.strongarm.inc b/ding_tabroll.strongarm.inc index 4f4a8c4..3668e68 100644 --- a/ding_tabroll.strongarm.inc +++ b/ding_tabroll.strongarm.inc @@ -62,15 +62,12 @@ function ding_tabroll_strongarm() { $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ $strongarm->api_version = 1; - $strongarm->name = 'field_bundle_settings_node_ding_tabroll'; + $strongarm->name = 'field_bundle_settings_node__ding_tabroll'; $strongarm->value = array( 'view_modes' => array( 'teaser' => array( 'custom_settings' => TRUE, ), - 'content_glider' => array( - 'custom_settings' => TRUE, - ), 'teaser_highlight' => array( 'custom_settings' => TRUE, ), @@ -93,19 +90,19 @@ function ding_tabroll_strongarm() { 'extra_fields' => array( 'form' => array( 'title' => array( - 'weight' => '-5', - ), - 'redirect' => array( - 'weight' => '30', + 'weight' => '0', ), 'path' => array( - 'weight' => '30', + 'weight' => '2', + ), + 'redirect' => array( + 'weight' => '1', ), ), 'display' => array(), ), ); - $export['field_bundle_settings_node_ding_tabroll'] = $strongarm; + $export['field_bundle_settings_node__ding_tabroll'] = $strongarm; $strongarm = new stdClass(); $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */ diff --git a/ding_tabroll.views_default.inc b/ding_tabroll.views_default.inc index b7dc5fb..6d45312 100644 --- a/ding_tabroll.views_default.inc +++ b/ding_tabroll.views_default.inc @@ -61,7 +61,7 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['title']['element_default_classes'] = FALSE; $handler->display->display_options['fields']['title']['link_to_node'] = FALSE; - /* Field: Content: image */ + /* Field: Content: Image */ $handler->display->display_options['fields']['field_ding_tabroll_image']['id'] = 'field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['table'] = 'field_data_field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['field'] = 'field_ding_tabroll_image'; @@ -73,7 +73,7 @@ function ding_tabroll_views_default_views() { 'image_style' => 'ding_tabroll', 'image_link' => '', ); - /* Field: Content: lead */ + /* Field: Content: Lead */ $handler->display->display_options['fields']['field_ding_tabroll_lead']['id'] = 'field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['table'] = 'field_data_field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['field'] = 'field_ding_tabroll_lead'; @@ -81,7 +81,7 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_type'] = 'p'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_default_classes'] = FALSE; - /* Field: Content: link */ + /* Field: Content: Link */ $handler->display->display_options['fields']['field_ding_tabroll_link']['id'] = 'field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['table'] = 'field_data_field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['field'] = 'field_ding_tabroll_link'; @@ -171,7 +171,7 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['title']['label'] = ''; $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['title']['link_to_node'] = FALSE; - /* Field: Content: image */ + /* Field: Content: Image */ $handler->display->display_options['fields']['field_ding_tabroll_image']['id'] = 'field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['table'] = 'field_data_field_ding_tabroll_image'; $handler->display->display_options['fields']['field_ding_tabroll_image']['field'] = 'field_ding_tabroll_image'; @@ -183,7 +183,7 @@ function ding_tabroll_views_default_views() { 'image_style' => 'ding_tabroll', 'image_link' => '', ); - /* Field: Content: lead */ + /* Field: Content: Lead */ $handler->display->display_options['fields']['field_ding_tabroll_lead']['id'] = 'field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['table'] = 'field_data_field_ding_tabroll_lead'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['field'] = 'field_ding_tabroll_lead'; @@ -191,7 +191,7 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_type'] = 'p'; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_label_colon'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_default_classes'] = FALSE; - /* Field: Content: link */ + /* Field: Content: Link */ $handler->display->display_options['fields']['field_ding_tabroll_link']['id'] = 'field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['table'] = 'field_data_field_ding_tabroll_link'; $handler->display->display_options['fields']['field_ding_tabroll_link']['field'] = 'field_ding_tabroll_link'; From 42917c46bfb0c2e75e975fc97f6d8dfb57bb15aa Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Tue, 26 Nov 2013 14:25:54 +0100 Subject: [PATCH 08/35] Add possibility to link to external and add anchor to internal. --- ding_tabroll.features.field_base.inc | 61 +++++++++ ding_tabroll.features.field_instance.inc | 117 +++++++++++++++++- ding_tabroll.field_group.inc | 44 +++++++ ding_tabroll.info | 6 + ding_tabroll.views_default.inc | 14 +++ .../views-view-fields--ding-tabroll.tpl.php | 19 ++- 6 files changed, 253 insertions(+), 8 deletions(-) create mode 100644 ding_tabroll.field_group.inc diff --git a/ding_tabroll.features.field_base.inc b/ding_tabroll.features.field_base.inc index f291f5f..e1f96cf 100644 --- a/ding_tabroll.features.field_base.inc +++ b/ding_tabroll.features.field_base.inc @@ -10,6 +10,67 @@ function ding_tabroll_field_default_field_bases() { $field_bases = array(); + // Exported field_base: 'field_ding_tabroll_anchor' + $field_bases['field_ding_tabroll_anchor'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_ding_tabroll_anchor', + 'foreign keys' => array( + 'format' => array( + 'columns' => array( + 'format' => 'format', + ), + 'table' => 'filter_format', + ), + ), + 'indexes' => array( + 'format' => array( + 0 => 'format', + ), + ), + 'locked' => 0, + 'module' => 'text', + 'settings' => array( + 'max_length' => 255, + 'profile2_private' => FALSE, + ), + 'translatable' => 0, + 'type' => 'text', + ); + + // Exported field_base: 'field_ding_tabroll_external' + $field_bases['field_ding_tabroll_external'] = array( + 'active' => 1, + 'cardinality' => 1, + 'deleted' => 0, + 'entity_types' => array(), + 'field_name' => 'field_ding_tabroll_external', + 'foreign keys' => array(), + 'indexes' => array(), + 'locked' => 0, + 'module' => 'link', + 'settings' => array( + 'attributes' => array( + 'class' => '', + 'rel' => '', + 'target' => 'default', + ), + 'display' => array( + 'url_cutoff' => 80, + ), + 'enable_tokens' => 1, + 'profile2_private' => FALSE, + 'title' => 'optional', + 'title_maxlength' => 128, + 'title_value' => '', + 'url' => 0, + ), + 'translatable' => 0, + 'type' => 'link_field', + ); + // Exported field_base: 'field_ding_tabroll_image' $field_bases['field_ding_tabroll_image'] = array( 'active' => 1, diff --git a/ding_tabroll.features.field_instance.inc b/ding_tabroll.features.field_instance.inc index d7399c9..2707080 100644 --- a/ding_tabroll.features.field_instance.inc +++ b/ding_tabroll.features.field_instance.inc @@ -10,6 +10,111 @@ function ding_tabroll_field_default_field_instances() { $field_instances = array(); + // Exported field_instance: 'node-ding_tabroll-field_ding_tabroll_anchor' + $field_instances['node-ding_tabroll-field_ding_tabroll_anchor'] = array( + 'bundle' => 'ding_tabroll', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => 'Use this to make the browser scroll down to an id (do not include the preceding #)', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'text', + 'settings' => array(), + 'type' => 'text_default', + 'weight' => 9, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser_highlight' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_ding_tabroll_anchor', + 'label' => 'Anchor', + 'required' => 0, + 'settings' => array( + 'text_processing' => 0, + 'user_register_form' => FALSE, + ), + 'widget' => array( + 'active' => 1, + 'module' => 'text', + 'settings' => array( + 'size' => 30, + ), + 'type' => 'text_textfield', + 'weight' => 7, + ), + ); + + // Exported field_instance: 'node-ding_tabroll-field_ding_tabroll_external' + $field_instances['node-ding_tabroll-field_ding_tabroll_external'] = array( + 'bundle' => 'ding_tabroll', + 'default_value' => NULL, + 'deleted' => 0, + 'description' => 'Use this for external links (other domains) - this will only be used if the internal link field is empty.', + 'display' => array( + 'default' => array( + 'label' => 'above', + 'module' => 'link', + 'settings' => array(), + 'type' => 'link_default', + 'weight' => 8, + ), + 'teaser' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + 'teaser_highlight' => array( + 'label' => 'above', + 'settings' => array(), + 'type' => 'hidden', + 'weight' => 0, + ), + ), + 'entity_type' => 'node', + 'field_name' => 'field_ding_tabroll_external', + 'label' => 'External', + 'required' => 0, + 'settings' => array( + 'attributes' => array( + 'class' => '', + 'configurable_title' => 0, + 'rel' => '', + 'target' => 'default', + 'title' => '', + ), + 'display' => array( + 'url_cutoff' => 80, + ), + 'enable_tokens' => 1, + 'title' => 'value', + 'title_maxlength' => 128, + 'title_value' => '[node:title]', + 'url' => 0, + 'user_register_form' => FALSE, + 'validate_url' => 1, + ), + 'widget' => array( + 'active' => 0, + 'module' => 'link', + 'settings' => array(), + 'type' => 'link_field', + 'weight' => 7, + ), + ); + // Exported field_instance: 'node-ding_tabroll-field_ding_tabroll_image' $field_instances['node-ding_tabroll-field_ding_tabroll_image'] = array( 'bundle' => 'ding_tabroll', @@ -85,7 +190,7 @@ function ding_tabroll_field_default_field_instances() { 'progress_indicator' => 'throbber', ), 'type' => 'media_generic', - 'weight' => 32, + 'weight' => 3, ), ); @@ -137,7 +242,7 @@ function ding_tabroll_field_default_field_instances() { 'rows' => 5, ), 'type' => 'text_textarea', - 'weight' => 33, + 'weight' => 4, ), ); @@ -182,7 +287,7 @@ function ding_tabroll_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 35, + 'weight' => 8, ), ); @@ -237,17 +342,21 @@ function ding_tabroll_field_default_field_instances() { 'size' => 60, ), 'type' => 'entityreference_autocomplete', - 'weight' => 34, + 'weight' => 6, ), ); // Translatables // Included for use with string extractors like potx. + t('Anchor'); + t('External'); t('Image'); t('Insert this into the chosen library nodequeue.'); t('Lead'); t('Library'); t('Link'); + t('Use this for external links (other domains) - this will only be used if the internal link field is empty.'); + t('Use this to make the browser scroll down to an id (do not include the preceding #)'); t('Write part of the node title to search for content to link to.'); return $field_instances; diff --git a/ding_tabroll.field_group.inc b/ding_tabroll.field_group.inc new file mode 100644 index 0000000..ccc992b --- /dev/null +++ b/ding_tabroll.field_group.inc @@ -0,0 +1,44 @@ +disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ + $field_group->api_version = 1; + $field_group->identifier = 'group_internal_link|node|ding_tabroll|form'; + $field_group->group_name = 'group_internal_link'; + $field_group->entity_type = 'node'; + $field_group->bundle = 'ding_tabroll'; + $field_group->mode = 'form'; + $field_group->parent_name = ''; + $field_group->data = array( + 'label' => 'Internal', + 'weight' => '5', + 'children' => array( + 0 => 'field_ding_tabroll_link', + 1 => 'field_anchor', + 2 => 'field_ding_tabroll_anchor', + ), + 'format_type' => 'fieldset', + 'format_settings' => array( + 'label' => 'Internal', + 'instance_settings' => array( + 'required_fields' => 0, + 'classes' => '', + 'description' => 'Linking to an unpublished node will hide this until the node is published.', + ), + 'formatter' => 'open', + ), + ); + $export['group_internal_link|node|ding_tabroll|form'] = $field_group; + + return $export; +} diff --git a/ding_tabroll.info b/ding_tabroll.info index e43a9c0..6c4138e 100644 --- a/ding_tabroll.info +++ b/ding_tabroll.info @@ -10,6 +10,7 @@ dependencies[] = entityreference dependencies[] = features dependencies[] = media dependencies[] = nodequeue +dependencies[] = field_group dependencies[] = smartqueue_nodetypes dependencies[] = strongarm dependencies[] = views @@ -17,10 +18,15 @@ dependencies[] = views_content features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 features[features_api][] = api:1 +features[field_base][] = field_ding_tabroll_anchor +features[field_base][] = field_ding_tabroll_external features[field_base][] = field_ding_tabroll_image features[field_base][] = field_ding_tabroll_lead features[field_base][] = field_ding_tabroll_library_ref features[field_base][] = field_ding_tabroll_link +features[field_group][] = group_internal_link|node|ding_tabroll|form +features[field_instance][] = node-ding_tabroll-field_ding_tabroll_anchor +features[field_instance][] = node-ding_tabroll-field_ding_tabroll_external features[field_instance][] = node-ding_tabroll-field_ding_tabroll_image features[field_instance][] = node-ding_tabroll-field_ding_tabroll_lead features[field_instance][] = node-ding_tabroll-field_ding_tabroll_library_ref diff --git a/ding_tabroll.views_default.inc b/ding_tabroll.views_default.inc index 6d45312..bd121c3 100644 --- a/ding_tabroll.views_default.inc +++ b/ding_tabroll.views_default.inc @@ -93,6 +93,20 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['field_ding_tabroll_link']['settings'] = array( 'link' => 0, ); + /* Field: Content: Anchor */ + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['id'] = 'field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['table'] = 'field_data_field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['field'] = 'field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['element_label_colon'] = FALSE; + /* Field: Content: External */ + $handler->display->display_options['fields']['field_ding_tabroll_external']['id'] = 'field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['table'] = 'field_data_field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['field'] = 'field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_external']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_external']['click_sort_column'] = 'url'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['type'] = 'link_plain'; /* Sort criterion: Nodequeue: Position */ $handler->display->display_options['sorts']['position']['id'] = 'position'; $handler->display->display_options['sorts']['position']['table'] = 'nodequeue_nodes'; diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index 041b792..fc3cf35 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -1,19 +1,30 @@ +raw)) { + $link = 'node/' . $fields['field_ding_tabroll_link']->raw; + if (!empty($fields['field_ding_tabroll_anchor']->content)) { + $link .= '#' . $fields['field_ding_tabroll_anchor']->content; + } +} +if (empty($link) && isset($fields['field_ding_tabroll_external'])) { + $link = $fields['field_ding_tabroll_external']->content; +} +?>
raw)) { + if (empty($link)) { print $fields['field_ding_tabroll_image']->content; } else { - print l($fields['field_ding_tabroll_image']->content, 'node/' . $fields['field_ding_tabroll_link']->raw, array('html' => TRUE)); + print l($fields['field_ding_tabroll_image']->content, $link, array('html' => TRUE)); } ?>

raw)) { + if (empty($link)) { print $fields['title']->content; } else { - print l($fields['title']->content, 'node/' . $fields['field_ding_tabroll_link']->raw); + print l($fields['title']->content, $link); } ?>

content; ?>

From c78d551c94ad6ed544a876a504b611b2d55bcd70 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Fri, 29 Nov 2013 11:56:34 +0100 Subject: [PATCH 09/35] Don't double encode titles --- templates/views-view-fields--ding-tabroll.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index fc3cf35..90c667a 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -24,7 +24,7 @@ if (empty($link)) { print $fields['title']->content; } else { - print l($fields['title']->content, $link); + print l($fields['title']->content, $link, array('html' => TRUE)); } ?>

content; ?>

From cf51a9c07ecb5cb9f2f51444c94981c9f53f6d50 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Fri, 29 Nov 2013 12:11:42 +0100 Subject: [PATCH 10/35] Proper naming of the subqueues --- ding_tabroll.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ding_tabroll.install b/ding_tabroll.install index 23b5ab6..6c438f2 100644 --- a/ding_tabroll.install +++ b/ding_tabroll.install @@ -15,7 +15,7 @@ function ding_tabroll_create_nodequeues() { $nodequeue = new stdClass(); $nodequeue->name = 'ding_tabroll'; $nodequeue->title = 'frontpage tabroll'; - $nodequeue->subqueue_title = ''; + $nodequeue->subqueue_title = 'Frontpage'; $nodequeue->subqueues = '1'; $nodequeue->owner = 'nodequeue'; $nodequeue->add_subqueue = array( @@ -28,7 +28,7 @@ function ding_tabroll_create_nodequeues() { $nodequeue->title = 'libraries'; $nodequeue->owner = 'smartqueue_nodetypes'; $nodequeue->reference = 'ding_library'; - $nodequeue->subqueue_title = 'biblioteker'; + $nodequeue->subqueue_title = '%subqueue'; $export['ding_tabroll_for_libraries'] = $nodequeue; foreach ($export as $name => $nodequeue) { From 996ea83373ba268ca39032b381c33362a9bf64a7 Mon Sep 17 00:00:00 2001 From: gorkha Date: Fri, 29 Nov 2013 11:32:31 +0100 Subject: [PATCH 11/35] Fixed styles: Double borders and illogical styling removed. Inherited styles from jquery ui overwritten. Conflicts: css/ding_tabroll.css --- css/ding_tabroll.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index cff9673..e650d8e 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -7,7 +7,9 @@ max-width: 1260px; overflow: hidden; margin-bottom: 15px; + padding: 0; } + #featured ul.ui-tabs-nav { list-style: none outside none; margin: 0; @@ -19,8 +21,6 @@ border: 0 none; font-family: inherit; right: 0; - bottom: -1px; - float: left; font-size: 13px; line-height: 1.3; outline: 0 none; @@ -33,6 +33,7 @@ border-right: 1px solid #666; white-space: normal; width: 100%; + top: 0; } #featured .ui-tabs-nav li.ui-tabs-selected { @@ -52,11 +53,11 @@ overflow: hidden; padding: 5px 5px 0 20px; background: none repeat scroll 0 0 #999999; - border-bottom: 1px solid #fff; font-weight: normal; height: 42px; text-transform: uppercase; min-width: 90%; + /*border-bottom: 0px;*/ } #featured ul.ui-tabs-nav li.ui-tabs-selected a { From 6b1221410cbce78a898d248ffb8a1400eb7a7d4c Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Mon, 9 Dec 2013 10:45:05 +0100 Subject: [PATCH 12/35] Increment version --- ding_tabroll.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ding_tabroll.info b/ding_tabroll.info index 6c4138e..0713dc7 100644 --- a/ding_tabroll.info +++ b/ding_tabroll.info @@ -3,7 +3,7 @@ description = provides the content type tabroll and the view Tabroll, which pres core = 7.x package = Features php = 5.2.4 -version = 7.x-1.2 +version = 7.x-1.2-oc1 project = ding_tabroll dependencies[] = ding_library dependencies[] = entityreference From ff43bac9741e7d991c49e623f7f2675b7ab6a367 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Mon, 9 Dec 2013 13:47:20 +0100 Subject: [PATCH 13/35] only change top and bottom padding. To avoid changing image size. --- css/ding_tabroll.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index e650d8e..8498168 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -7,7 +7,8 @@ max-width: 1260px; overflow: hidden; margin-bottom: 15px; - padding: 0; + padding-bottom: 0; + padding-top: 0; } #featured ul.ui-tabs-nav { From a0f27f72c489c3a70c87315a57aaa1ce7305c594 Mon Sep 17 00:00:00 2001 From: gorkha Date: Tue, 3 Dec 2013 14:38:10 +0100 Subject: [PATCH 14/35] font-size lowered on tabroll Conflicts: css/ding_tabroll.css --- css/ding_tabroll.css | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index e650d8e..4f3bc58 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -28,14 +28,24 @@ } #featured ul.ui-tabs-nav li { - border: 0 none; + border: 0; color: #666666; - border-right: 1px solid #666; white-space: normal; width: 100%; top: 0; } +#featured ul.ui-tabs-nav li.ui-tabs-nav-item:first-child a{ + border-radius: 0; + border-top-right-radius: 4px !important; +} + +#featured ul.ui-tabs-nav li.ui-tabs-nav-item:last-child a { + border-bottom: 0; + border-radius: 0; + border-bottom-right-radius: 4px !important; +} + #featured .ui-tabs-nav li.ui-tabs-selected { position: relative; } @@ -51,13 +61,14 @@ display: block; line-height: 17px; overflow: hidden; - padding: 5px 5px 0 20px; + padding: 5px 5px 0 15px; background: none repeat scroll 0 0 #999999; font-weight: normal; height: 42px; text-transform: uppercase; min-width: 90%; - /*border-bottom: 0px;*/ + font-size: 12px; + float: none; } #featured ul.ui-tabs-nav li.ui-tabs-selected a { From 72dde94bce96099878028cf53e0f0e66454aaab0 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Tue, 10 Dec 2013 14:31:35 +0100 Subject: [PATCH 15/35] name the field group properly --- ding_tabroll.features.field_instance.inc | 6 +++--- ding_tabroll.features.inc | 4 ++++ ding_tabroll.field_group.inc | 11 +++++------ ding_tabroll.info | 18 +++++++++++++++--- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ding_tabroll.features.field_instance.inc b/ding_tabroll.features.field_instance.inc index 2707080..5145bed 100644 --- a/ding_tabroll.features.field_instance.inc +++ b/ding_tabroll.features.field_instance.inc @@ -111,7 +111,7 @@ function ding_tabroll_field_default_field_instances() { 'module' => 'link', 'settings' => array(), 'type' => 'link_field', - 'weight' => 7, + 'weight' => 8, ), ); @@ -175,8 +175,8 @@ function ding_tabroll_field_default_field_instances() { ), 'allowed_types' => array( 'audio' => 0, - 0 => 0, 'default' => 0, + 0 => 0, 'image' => 'image', 'video' => 0, ), @@ -287,7 +287,7 @@ function ding_tabroll_field_default_field_instances() { 'module' => 'options', 'settings' => array(), 'type' => 'options_select', - 'weight' => 8, + 'weight' => 9, ), ); diff --git a/ding_tabroll.features.inc b/ding_tabroll.features.inc index 34f65cf..06d6ea3 100644 --- a/ding_tabroll.features.inc +++ b/ding_tabroll.features.inc @@ -8,6 +8,10 @@ * Implements hook_ctools_plugin_api(). */ function ding_tabroll_ctools_plugin_api() { + list($module, $api) = func_get_args(); + 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"); diff --git a/ding_tabroll.field_group.inc b/ding_tabroll.field_group.inc index ccc992b..eac8b30 100644 --- a/ding_tabroll.field_group.inc +++ b/ding_tabroll.field_group.inc @@ -13,8 +13,8 @@ function ding_tabroll_field_group_info() { $field_group = new stdClass(); $field_group->disabled = FALSE; /* Edit this to true to make a default field_group disabled initially */ $field_group->api_version = 1; - $field_group->identifier = 'group_internal_link|node|ding_tabroll|form'; - $field_group->group_name = 'group_internal_link'; + $field_group->identifier = 'group_ding_tabroll_internal|node|ding_tabroll|form'; + $field_group->group_name = 'group_ding_tabroll_internal'; $field_group->entity_type = 'node'; $field_group->bundle = 'ding_tabroll'; $field_group->mode = 'form'; @@ -24,8 +24,7 @@ function ding_tabroll_field_group_info() { 'weight' => '5', 'children' => array( 0 => 'field_ding_tabroll_link', - 1 => 'field_anchor', - 2 => 'field_ding_tabroll_anchor', + 1 => 'field_ding_tabroll_anchor', ), 'format_type' => 'fieldset', 'format_settings' => array( @@ -35,10 +34,10 @@ function ding_tabroll_field_group_info() { 'classes' => '', 'description' => 'Linking to an unpublished node will hide this until the node is published.', ), - 'formatter' => 'open', + 'formatter' => 'collapsible', ), ); - $export['group_internal_link|node|ding_tabroll|form'] = $field_group; + $export['group_ding_tabroll_internal|node|ding_tabroll|form'] = $field_group; return $export; } diff --git a/ding_tabroll.info b/ding_tabroll.info index 0713dc7..edf06f1 100644 --- a/ding_tabroll.info +++ b/ding_tabroll.info @@ -3,18 +3,24 @@ description = provides the content type tabroll and the view Tabroll, which pres core = 7.x package = Features php = 5.2.4 -version = 7.x-1.2-oc1 +version = 7.x-1.2-oc2 project = ding_tabroll +dependencies[] = ctools dependencies[] = ding_library dependencies[] = entityreference dependencies[] = features +dependencies[] = field_group +dependencies[] = image +dependencies[] = link dependencies[] = media dependencies[] = nodequeue -dependencies[] = field_group +dependencies[] = options dependencies[] = smartqueue_nodetypes dependencies[] = strongarm +dependencies[] = text dependencies[] = views dependencies[] = views_content +features[ctools][] = field_group:field_group:1 features[ctools][] = strongarm:strongarm:1 features[ctools][] = views:views_default:3.0 features[features_api][] = api:1 @@ -24,7 +30,7 @@ features[field_base][] = field_ding_tabroll_image features[field_base][] = field_ding_tabroll_lead features[field_base][] = field_ding_tabroll_library_ref features[field_base][] = field_ding_tabroll_link -features[field_group][] = group_internal_link|node|ding_tabroll|form +features[field_group][] = group_ding_tabroll_internal|node|ding_tabroll|form features[field_instance][] = node-ding_tabroll-field_ding_tabroll_anchor features[field_instance][] = node-ding_tabroll-field_ding_tabroll_external features[field_instance][] = node-ding_tabroll-field_ding_tabroll_image @@ -49,3 +55,9 @@ features[variable][] = node_preview_ding_tabroll features[variable][] = node_submitted_ding_tabroll features[views_view][] = ding_tabroll features[views_view][] = libraries_tabroll +features_exclude[field][node-ding_tabroll-field_ding_tabroll_image] = node-ding_tabroll-field_ding_tabroll_image +features_exclude[field][node-ding_tabroll-field_ding_tabroll_lead] = node-ding_tabroll-field_ding_tabroll_lead +features_exclude[field][node-ding_tabroll-field_ding_tabroll_link] = node-ding_tabroll-field_ding_tabroll_link +features_exclude[field][node-ding_tabroll-field_ding_tabroll_library_ref] = node-ding_tabroll-field_ding_tabroll_library_ref +features_exclude[field][node-ding_tabroll-field_ding_tabroll_anchor] = node-ding_tabroll-field_ding_tabroll_anchor +features_exclude[field][node-ding_tabroll-field_ding_tabroll_external] = node-ding_tabroll-field_ding_tabroll_external From 92b605f7275c0f7ccab8a2942fcee660a27dd66a Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Thu, 9 Jan 2014 15:25:10 +0100 Subject: [PATCH 16/35] code style change --- ding_tabroll.features.field_instance.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ding_tabroll.features.field_instance.inc b/ding_tabroll.features.field_instance.inc index 5145bed..962267d 100644 --- a/ding_tabroll.features.field_instance.inc +++ b/ding_tabroll.features.field_instance.inc @@ -174,11 +174,11 @@ function ding_tabroll_field_default_field_instances() { 'public' => 'public', ), 'allowed_types' => array( - 'audio' => 0, - 'default' => 0, - 0 => 0, 'image' => 'image', 'video' => 0, + 0 => 0, + 'audio' => 0, + 'default' => 0, ), 'browser_plugins' => array( 'ding_content' => 0, From 541d3d772e9a7a3bb3f898085b16be8fa33c7fa4 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Thu, 9 Jan 2014 15:25:17 +0100 Subject: [PATCH 17/35] Add label for image style. It is required to have a label. --- ding_tabroll.features.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/ding_tabroll.features.inc b/ding_tabroll.features.inc index 06d6ea3..9122929 100644 --- a/ding_tabroll.features.inc +++ b/ding_tabroll.features.inc @@ -51,6 +51,7 @@ function ding_tabroll_image_default_styles() { 'weight' => 1, ), ), + 'label' => 'ding_tabroll', ); return $styles; From 8bc91947494f0498084e76e7d6b0d542719bc217 Mon Sep 17 00:00:00 2001 From: Rune Schjellerup Philosof Date: Wed, 29 Jan 2014 12:42:05 +0100 Subject: [PATCH 18/35] add anchor and external to municipality/library view --- ding_tabroll.views_default.inc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ding_tabroll.views_default.inc b/ding_tabroll.views_default.inc index bd121c3..dde9a57 100644 --- a/ding_tabroll.views_default.inc +++ b/ding_tabroll.views_default.inc @@ -217,6 +217,19 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['field_ding_tabroll_link']['settings'] = array( 'link' => 0, ); + /* Field: Content: Anchor */ + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['id'] = 'field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['table'] = 'field_data_field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['field'] = 'field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['element_label_colon'] = FALSE; + /* Field: Content: External */ + $handler->display->display_options['fields']['field_ding_tabroll_external']['id'] = 'field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['table'] = 'field_data_field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['field'] = 'field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_external']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_external']['click_sort_column'] = 'url'; /* Sort criterion: Nodequeue: Position */ $handler->display->display_options['sorts']['position']['id'] = 'position'; $handler->display->display_options['sorts']['position']['table'] = 'nodequeue_nodes'; From 9b1e0ef7118cbd549c7d90a9be0a821bc3140ecb Mon Sep 17 00:00:00 2001 From: Amer Date: Wed, 30 Apr 2014 10:01:19 +0200 Subject: [PATCH 19/35] Fixed target _blank on external link. --- .../views-view-fields--ding-tabroll.tpl.php | 18 +++++++++++++----- ...iews-view-unformatted--ding-tabroll.tpl.php | 2 +- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index 90c667a..7dba42d 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -1,4 +1,8 @@ _field_data['nid']['entity']->field_ding_tabroll_external['und'][0]['attributes']['target'] === '_blank'){ + $target = array(); + $target['attributes']['target'] = '_blank'; +} if (!empty($fields['field_ding_tabroll_link']->raw)) { $link = 'node/' . $fields['field_ding_tabroll_link']->raw; if (!empty($fields['field_ding_tabroll_anchor']->content)) { @@ -6,15 +10,17 @@ } } if (empty($link) && isset($fields['field_ding_tabroll_external'])) { - $link = $fields['field_ding_tabroll_external']->content; + $link = $fields['field_ding_tabroll_external']->content; } ?>
content; - } else { - print l($fields['field_ding_tabroll_image']->content, $link, array('html' => TRUE)); + } elseif(isset($target)) { + print l($fields['field_ding_tabroll_image']->content, $link, $target, array('html' => TRUE)); + }else{ + print l($fields['field_ding_tabroll_image']->content, $link, array('html' => TRUE)); } ?>
@@ -23,8 +29,10 @@

content; - } else { - print l($fields['title']->content, $link, array('html' => TRUE)); + } elseif(isset($target)) { + print l($fields['title']->content, $link, $target, array('html' => TRUE)); + }else { + print l($fields['title']->content, $link, array('html' => TRUE)); } ?>

content; ?>

diff --git a/templates/views-view-unformatted--ding-tabroll.tpl.php b/templates/views-view-unformatted--ding-tabroll.tpl.php index 7ce3936..726e48a 100644 --- a/templates/views-view-unformatted--ding-tabroll.tpl.php +++ b/templates/views-view-unformatted--ding-tabroll.tpl.php @@ -21,7 +21,7 @@ $row): ?>
"> - +
From efa29edf2fd00cd5241cd39d5724752132e20b93 Mon Sep 17 00:00:00 2001 From: Amer Date: Fri, 2 May 2014 12:47:42 +0200 Subject: [PATCH 20/35] Fixed target _blank on external link for libraries --- ...ews-view-fields--libraries-tabroll.tpl.php | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/templates/views-view-fields--libraries-tabroll.tpl.php b/templates/views-view-fields--libraries-tabroll.tpl.php index 0fb6e08..7dba42d 100644 --- a/templates/views-view-fields--libraries-tabroll.tpl.php +++ b/templates/views-view-fields--libraries-tabroll.tpl.php @@ -1,19 +1,38 @@ +_field_data['nid']['entity']->field_ding_tabroll_external['und'][0]['attributes']['target'] === '_blank'){ + $target = array(); + $target['attributes']['target'] = '_blank'; +} +if (!empty($fields['field_ding_tabroll_link']->raw)) { + $link = 'node/' . $fields['field_ding_tabroll_link']->raw; + if (!empty($fields['field_ding_tabroll_anchor']->content)) { + $link .= '#' . $fields['field_ding_tabroll_anchor']->content; + } +} +if (empty($link) && isset($fields['field_ding_tabroll_external'])) { + $link = $fields['field_ding_tabroll_external']->content; +} +?>
raw)) { + if (empty($link)) { print $fields['field_ding_tabroll_image']->content; - } else { - print l($fields['field_ding_tabroll_image']->content, 'node/' . $fields['field_ding_tabroll_link']->raw, array('html' => TRUE)); + } elseif(isset($target)) { + print l($fields['field_ding_tabroll_image']->content, $link, $target, array('html' => TRUE)); + }else{ + print l($fields['field_ding_tabroll_image']->content, $link, array('html' => TRUE)); } ?>

raw)) { - print $fields['title']; - } else { - print l($fields['title']->content, 'node/' . $fields['field_ding_tabroll_link']->raw); + if (empty($link)) { + print $fields['title']->content; + } elseif(isset($target)) { + print l($fields['title']->content, $link, $target, array('html' => TRUE)); + }else { + print l($fields['title']->content, $link, array('html' => TRUE)); } ?>

content; ?>

From 78e81372ca7518a9ca4f5623b601ac7859883d91 Mon Sep 17 00:00:00 2001 From: Amer Date: Tue, 6 May 2014 13:48:38 +0200 Subject: [PATCH 21/35] Fixed libraries decode entities --- templates/views-view-unformatted--libraries-tabroll.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/views-view-unformatted--libraries-tabroll.tpl.php b/templates/views-view-unformatted--libraries-tabroll.tpl.php index 8bd63c6..9b0097e 100644 --- a/templates/views-view-unformatted--libraries-tabroll.tpl.php +++ b/templates/views-view-unformatted--libraries-tabroll.tpl.php @@ -21,7 +21,7 @@ $row): ?>
"> - +
From 5c5de59da168dae7c0efdd9ff67088142fb9f59a Mon Sep 17 00:00:00 2001 From: Amer Date: Fri, 20 Jun 2014 15:31:31 +0200 Subject: [PATCH 22/35] updated to v 1.1 --- ding_tabroll.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ding_tabroll.make b/ding_tabroll.make index e163273..4859f1d 100644 --- a/ding_tabroll.make +++ b/ding_tabroll.make @@ -5,4 +5,4 @@ projects[nodequeue][subdir] = "contrib" projects[nodequeue][version] = "2.0-beta1" projects[entityreference][subdir] = "contrib" -projects[entityreference][version] = "1.0" +projects[entityreference][version] = "1.1" From 6d39b6e53491996fbe3aea5e839e5247685a3e23 Mon Sep 17 00:00:00 2001 From: Amer Date: Fri, 7 Nov 2014 10:27:20 +0100 Subject: [PATCH 23/35] Check if field_ding_tabroll_external exists to remove undefined notice. --- templates/views-view-fields--ding-tabroll.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index 7dba42d..09bc1e6 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -1,5 +1,5 @@ _field_data['nid']['entity']->field_ding_tabroll_external['und'][0]['attributes']['target'] === '_blank'){ +if (isset($row->_field_data['nid']['entity']->field_ding_tabroll_external['und'][0]['attributes']['target']) && ($row->_field_data['nid']['entity']->field_ding_tabroll_external['und'][0]['attributes']['target'] === '_blank')){ $target = array(); $target['attributes']['target'] = '_blank'; } From e707f049dbd58034f707238ed12fb7f907b235f3 Mon Sep 17 00:00:00 2001 From: Amer Date: Mon, 10 Nov 2014 11:01:41 +0100 Subject: [PATCH 24/35] Resized image width to 98% --- css/ding_tabroll.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index 31d9428..73be45e 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -17,7 +17,7 @@ padding: 0; position: absolute; top: 0; - width: 30%; + width: 32%; z-index: 20; border: 0 none; font-family: inherit; @@ -87,7 +87,7 @@ width: 70% } #featured img { - width: 100% + width: 98% } #featured .ui-tabs-panel .info { background: url("../images/bluegbg-75.png") repeat scroll 0 0 transparent; From 68f9292fd23ea03b4646daf05ca78504ac3a74f3 Mon Sep 17 00:00:00 2001 From: Amer Date: Mon, 10 Nov 2014 11:17:58 +0100 Subject: [PATCH 25/35] Resized image width to 97% --- css/ding_tabroll.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index 73be45e..cec6a0e 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -87,7 +87,7 @@ width: 70% } #featured img { - width: 98% + width: 97% } #featured .ui-tabs-panel .info { background: url("../images/bluegbg-75.png") repeat scroll 0 0 transparent; From fa38e25e73b76d874c236e8f79654c9196060a7d Mon Sep 17 00:00:00 2001 From: "Tobias F. Petersen" Date: Mon, 1 Dec 2014 08:47:25 +0100 Subject: [PATCH 26/35] Views/link field relationship seems to have issues. Reads internal links directly from entity now. --- templates/views-view-fields--ding-tabroll.tpl.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index 09bc1e6..7a0fbd9 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -3,8 +3,9 @@ $target = array(); $target['attributes']['target'] = '_blank'; } -if (!empty($fields['field_ding_tabroll_link']->raw)) { - $link = 'node/' . $fields['field_ding_tabroll_link']->raw; +//if (!empty($fields['field_ding_tabroll_link']->raw)) { +if(isset($row->_field_data['nid']['entity']->field_ding_tabroll_link['und'][0]["target_id"])){ + $link = 'node/' . $row->_field_data['nid']['entity']->field_ding_tabroll_link['und'][0]["target_id"]; if (!empty($fields['field_ding_tabroll_anchor']->content)) { $link .= '#' . $fields['field_ding_tabroll_anchor']->content; } @@ -35,5 +36,5 @@ print l($fields['title']->content, $link, array('html' => TRUE)); } ?> -

content; ?>

+

content) ? $fields['field_ding_tabroll_lead']->content : ""; ?>

From 90739c7f53e2e3de30df0acf8d1ca6c2fda4bd8d Mon Sep 17 00:00:00 2001 From: Amer Date: Thu, 5 Mar 2015 11:06:38 +0100 Subject: [PATCH 27/35] Removed entity ref from view to fix external link not showing. --- ding_tabroll.views_default.inc | 97 ++++++++++++++++++++++++++-------- 1 file changed, 76 insertions(+), 21 deletions(-) diff --git a/ding_tabroll.views_default.inc b/ding_tabroll.views_default.inc index dde9a57..d1133c5 100644 --- a/ding_tabroll.views_default.inc +++ b/ding_tabroll.views_default.inc @@ -29,8 +29,11 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['query']['type'] = 'views_query'; $handler->display->display_options['query']['options']['query_comment'] = FALSE; $handler->display->display_options['exposed_form']['type'] = 'basic'; + $handler->display->display_options['exposed_form']['options']['submit_button'] = 'Udfør'; $handler->display->display_options['exposed_form']['options']['reset_button_label'] = 'Gendan'; $handler->display->display_options['exposed_form']['options']['exposed_sorts_label'] = 'Sortér efter'; + $handler->display->display_options['exposed_form']['options']['sort_asc_label'] = 'Stigende'; + $handler->display->display_options['exposed_form']['options']['sort_desc_label'] = 'Faldende'; $handler->display->display_options['pager']['type'] = 'some'; $handler->display->display_options['pager']['options']['items_per_page'] = '5'; $handler->display->display_options['style_plugin'] = 'default'; @@ -44,13 +47,9 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['relationships']['nodequeue_rel']['required'] = TRUE; $handler->display->display_options['relationships']['nodequeue_rel']['limit'] = 1; $handler->display->display_options['relationships']['nodequeue_rel']['names'] = array( - 'ding_tabroll' => 'ding_tabroll', - 'ding_tabroll_for_libraries' => 0, + 'ding_tabroll' => 'ding_tabroll', + 'ding_tabroll_for_libraries' => 0, ); - /* Relationship: Entity Reference: Referenced Entity */ - $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['id'] = 'field_ding_tabroll_link_target_id'; - $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['table'] = 'field_data_field_ding_tabroll_link'; - $handler->display->display_options['relationships']['field_ding_tabroll_link_target_id']['field'] = 'field_ding_tabroll_link_target_id'; /* Field: Content: Title */ $handler->display->display_options['fields']['title']['id'] = 'title'; $handler->display->display_options['fields']['title']['table'] = 'node'; @@ -70,8 +69,8 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['field_ding_tabroll_image']['element_default_classes'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_image']['click_sort_column'] = 'fid'; $handler->display->display_options['fields']['field_ding_tabroll_image']['settings'] = array( - 'image_style' => 'ding_tabroll', - 'image_link' => '', + 'image_style' => 'ding_tabroll', + 'image_link' => '', ); /* Field: Content: Lead */ $handler->display->display_options['fields']['field_ding_tabroll_lead']['id'] = 'field_ding_tabroll_lead'; @@ -91,7 +90,7 @@ function ding_tabroll_views_default_views() { $handler->display->display_options['fields']['field_ding_tabroll_link']['element_default_classes'] = FALSE; $handler->display->display_options['fields']['field_ding_tabroll_link']['type'] = 'entityreference_entity_id'; $handler->display->display_options['fields']['field_ding_tabroll_link']['settings'] = array( - 'link' => 0, + 'link' => 0, ); /* Field: Content: Anchor */ $handler->display->display_options['fields']['field_ding_tabroll_anchor']['id'] = 'field_ding_tabroll_anchor'; @@ -122,19 +121,75 @@ function ding_tabroll_views_default_views() { /* Display: Content pane */ $handler = $view->new_display('panel_pane', 'Content pane', 'panel_pane_1'); + $handler->display->display_options['defaults']['fields'] = FALSE; + /* Felt: Indhold: Titel */ + $handler->display->display_options['fields']['title']['id'] = 'title'; + $handler->display->display_options['fields']['title']['table'] = 'node'; + $handler->display->display_options['fields']['title']['field'] = 'title'; + $handler->display->display_options['fields']['title']['label'] = ''; + $handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE; + $handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE; + $handler->display->display_options['fields']['title']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['title']['element_default_classes'] = FALSE; + $handler->display->display_options['fields']['title']['link_to_node'] = FALSE; + /* Felt: Indhold: Image */ + $handler->display->display_options['fields']['field_ding_tabroll_image']['id'] = 'field_ding_tabroll_image'; + $handler->display->display_options['fields']['field_ding_tabroll_image']['table'] = 'field_data_field_ding_tabroll_image'; + $handler->display->display_options['fields']['field_ding_tabroll_image']['field'] = 'field_ding_tabroll_image'; + $handler->display->display_options['fields']['field_ding_tabroll_image']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_image']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_image']['element_default_classes'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_image']['click_sort_column'] = 'fid'; + $handler->display->display_options['fields']['field_ding_tabroll_image']['settings'] = array( + 'image_style' => 'ding_tabroll', + 'image_link' => '', + ); + /* Felt: Indhold: Lead */ + $handler->display->display_options['fields']['field_ding_tabroll_lead']['id'] = 'field_ding_tabroll_lead'; + $handler->display->display_options['fields']['field_ding_tabroll_lead']['table'] = 'field_data_field_ding_tabroll_lead'; + $handler->display->display_options['fields']['field_ding_tabroll_lead']['field'] = 'field_ding_tabroll_lead'; + $handler->display->display_options['fields']['field_ding_tabroll_lead']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_type'] = 'p'; + $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_lead']['element_default_classes'] = FALSE; + /* Felt: Indhold: Link */ + $handler->display->display_options['fields']['field_ding_tabroll_link']['id'] = 'field_ding_tabroll_link'; + $handler->display->display_options['fields']['field_ding_tabroll_link']['table'] = 'field_data_field_ding_tabroll_link'; + $handler->display->display_options['fields']['field_ding_tabroll_link']['field'] = 'field_ding_tabroll_link'; + $handler->display->display_options['fields']['field_ding_tabroll_link']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_link']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_link']['element_default_classes'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_link']['hide_alter_empty'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_link']['type'] = 'entityreference_entity_id'; + $handler->display->display_options['fields']['field_ding_tabroll_link']['settings'] = array( + 'link' => 0, + ); + /* Felt: Indhold: Anchor */ + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['id'] = 'field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['table'] = 'field_data_field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['field'] = 'field_ding_tabroll_anchor'; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_anchor']['element_label_colon'] = FALSE; + /* Felt: Indhold: External */ + $handler->display->display_options['fields']['field_ding_tabroll_external']['id'] = 'field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['table'] = 'field_data_field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['field'] = 'field_ding_tabroll_external'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['label'] = ''; + $handler->display->display_options['fields']['field_ding_tabroll_external']['element_label_colon'] = FALSE; + $handler->display->display_options['fields']['field_ding_tabroll_external']['click_sort_column'] = 'url'; + $handler->display->display_options['fields']['field_ding_tabroll_external']['type'] = 'link_plain'; $translatables['ding_tabroll'] = array( - t('Master'), - t('Se flere'), - t('Apply'), - t('Gendan'), - t('Sortér efter'), - t('Asc'), - t('Desc'), - t('frontpage tabroll'), - t('Content entity referenced from field_ding_tabroll_link'), - t('Content pane'), - t('more'), - t('View panes'), + t('Master'), + t('Se flere'), + t('Apply'), + t('Gendan'), + t('Sortér efter'), + t('Asc'), + t('Desc'), + t('frontpage tabroll'), + t('Content pane'), + t('more'), + t('View panes'), ); $export['ding_tabroll'] = $view; From 0651e90b44921bca8074f0eabc83e0a4e3229818 Mon Sep 17 00:00:00 2001 From: "Tobias F. Petersen" Date: Wed, 28 Oct 2015 15:36:44 +0100 Subject: [PATCH 28/35] add jquery rotate --- js/ding_tabroll.js | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/js/ding_tabroll.js b/js/ding_tabroll.js index 3cad8f9..a75843e 100644 --- a/js/ding_tabroll.js +++ b/js/ding_tabroll.js @@ -8,4 +8,83 @@ $(document).ready(function($) { } }); +})(jQuery); +/* + * Add the jquery.rotate function back. + */ +(function($){ + $.extend( $.ui.tabs.prototype, { + rotation: null, + rotationDelay: null, + continuing: null, + rotate: function( ms, continuing ) { + var self = this, + o = this.options; + + if((ms > 1 || self.rotationDelay === null) && ms !== undefined){//only set rotationDelay if this is the first time through or if not immediately moving on from an unpause + self.rotationDelay = ms; + } + + if(continuing !== undefined){ + self.continuing = continuing; + } + + var rotate = self._rotate || ( self._rotate = function( e ) { + clearTimeout( self.rotation ); + self.rotation = setTimeout(function() { + var t = o.active; + self.option( "active", ++t < self.anchors.length ? t : 0 ); + }, ms ); + + if ( e ) { + e.stopPropagation(); + } + }); + + var stop = self._unrotate || ( self._unrotate = !continuing + ? function(e) { + if (e.clientX) { // in case of a true click + self.rotate(null); + } + } + : function( e ) { + t = o.active; + rotate(); + }); + + // start rotation + if ( ms ) { + this.element.bind( "tabsactivate", rotate ); + this.anchors.bind( o.event + ".tabs", $.proxy(self.unpause, self) ); + rotate(); + // stop rotation + } else { + clearTimeout( self.rotation ); + this.element.unbind( "tabsactivate", rotate ); + this.anchors.unbind( o.event + ".tabs", $.proxy(self.pause, self) ); + delete this._rotate; + delete this._unrotate; + } + + //rotate immediately and then have normal rotation delay + if(ms === 1){ + //set ms back to what it was originally set to + ms = self.rotationDelay; + } + + return this; + }, + pause: function() { + var self = this, + o = this.options; + + self.rotate(0); + }, + unpause: function(){ + var self = this, + o = this.options; + + self.rotate(1, self.continuing); + } + }); })(jQuery); \ No newline at end of file From b8ed874a2735e99d9e5d6d511d930b5c3d299181 Mon Sep 17 00:00:00 2001 From: Amer Date: Thu, 29 Oct 2015 10:51:17 +0100 Subject: [PATCH 29/35] rotate fix tabroll --- css/ding_tabroll.css | 8 ++++---- js/ding_tabroll.js | 2 +- templates/views-view-unformatted--ding-tabroll.tpl.php | 2 +- .../views-view-unformatted--libraries-tabroll.tpl.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index cec6a0e..6dd7701 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -47,13 +47,13 @@ border-bottom-right-radius: 4px !important; } -#featured .ui-tabs-nav li.ui-tabs-selected { +#featured .ui-tabs-nav li.ui-tabs-active { position: relative; } -#featured .ui-tabs-nav li.ui-tabs-selected:after { +#featured .ui-tabs-nav li.ui-tabs-active:after { right: 100%; border: solid transparent; content: " "; height: 0; width: 0; position: absolute; pointer-events: none; } -#featured .ui-tabs-nav li.ui-tabs-selected:after { +#featured .ui-tabs-nav li.ui-tabs-active:after { border-color: rgba(153, 215, 219, 0); border-right-color: inherit; border-width: 24px; top: 50%; margin-top: -24px; } @@ -72,7 +72,7 @@ float: none; } -#featured ul.ui-tabs-nav li.ui-tabs-selected a { +#featured ul.ui-tabs-nav li.ui-tabs-active a { color: #fff; height: 43px; overflow: hidden; diff --git a/js/ding_tabroll.js b/js/ding_tabroll.js index a75843e..5c820af 100644 --- a/js/ding_tabroll.js +++ b/js/ding_tabroll.js @@ -87,4 +87,4 @@ $(document).ready(function($) { self.rotate(1, self.continuing); } }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/templates/views-view-unformatted--ding-tabroll.tpl.php b/templates/views-view-unformatted--ding-tabroll.tpl.php index 726e48a..db1906b 100644 --- a/templates/views-view-unformatted--ding-tabroll.tpl.php +++ b/templates/views-view-unformatted--ding-tabroll.tpl.php @@ -11,7 +11,7 @@ result)); $i++) { if($i == 0) { - print '
  • ' .$view->result[$i]->node_title .'
  • '; + print '
  • ' .$view->result[$i]->node_title .'
  • '; } else { print '
  • ' .$view->result[$i]->node_title .'
  • '; } diff --git a/templates/views-view-unformatted--libraries-tabroll.tpl.php b/templates/views-view-unformatted--libraries-tabroll.tpl.php index 9b0097e..d26bc83 100644 --- a/templates/views-view-unformatted--libraries-tabroll.tpl.php +++ b/templates/views-view-unformatted--libraries-tabroll.tpl.php @@ -11,7 +11,7 @@ result)); $i++) { if($i == 0) { - print '
  • ' .$view->result[$i]->node_title .'
  • '; + print '
  • ' .$view->result[$i]->node_title .'
  • '; } else { print '
  • ' .$view->result[$i]->node_title .'
  • '; } From 6760eabb77748413553fee8c8644cbfa917889ec Mon Sep 17 00:00:00 2001 From: "Tobias F. Petersen" Date: Thu, 5 Nov 2015 11:23:13 +0100 Subject: [PATCH 30/35] Added image source field support for OC --- css/ding_tabroll.css | 11 ++++++++++- js/ding_tabroll.js | 1 - templates/views-view-fields--ding-tabroll.tpl.php | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index cec6a0e..d516744 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -92,7 +92,7 @@ #featured .ui-tabs-panel .info { background: url("../images/bluegbg-75.png") repeat scroll 0 0 transparent; bottom: 0; - height: 90px; + height: 100px; left: 0; position: absolute; width: 70%; @@ -143,3 +143,12 @@ .node-eresource .field-link span, .node-eresource .field-ding-eresource-availabilit span { font-weight: normal; } +.tabroll-photo-copyright +{ + bottom: -2px; + left: 1px; + position: absolute; + color: white; + font-size: 9px; + z-index: 11; +} \ No newline at end of file diff --git a/js/ding_tabroll.js b/js/ding_tabroll.js index a75843e..e184082 100644 --- a/js/ding_tabroll.js +++ b/js/ding_tabroll.js @@ -1,5 +1,4 @@ (function ($) { - $(document).ready(function($) { // Check if the tabs lib is loaded before trying to call it. if ($.fn.tabs) { diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index 7a0fbd9..5c91940 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -37,4 +37,10 @@ } ?>

    content) ? $fields['field_ding_tabroll_lead']->content : ""; ?>

    + field_field_ding_tabroll_image[0]['raw']['field_kilde']['und'][0]['value'])) + { + echo " " . t('Photo: ') . "{$row->field_field_ding_tabroll_image[0]['raw']['field_kilde']['und'][0]['value']} "; + } + ?>
    From 75aede07a1438c2eb97abc1b0d0627680ce226ee Mon Sep 17 00:00:00 2001 From: "Tobias F. Petersen" Date: Thu, 5 Nov 2015 14:47:42 +0100 Subject: [PATCH 31/35] save --- css/ding_tabroll.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index d516744..5d7bc49 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -146,7 +146,7 @@ .tabroll-photo-copyright { bottom: -2px; - left: 1px; + left: 20px; position: absolute; color: white; font-size: 9px; From 5d04fc92f30f744d9c692c926cdece245c610754 Mon Sep 17 00:00:00 2001 From: "Tobias F. Petersen" Date: Thu, 5 Nov 2015 15:00:11 +0100 Subject: [PATCH 32/35] font size change. --- css/ding_tabroll.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index 40af043..9cea22f 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -149,6 +149,6 @@ left: 20px; position: absolute; color: white; - font-size: 9px; + font-size: 8px; z-index: 11; } \ No newline at end of file From adf904bc0125541d545f26c1c385ce3e2cccfa44 Mon Sep 17 00:00:00 2001 From: "Tobias F. Petersen" Date: Wed, 23 Nov 2016 11:34:51 +0100 Subject: [PATCH 33/35] harden js --- js/ding_tabroll.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/js/ding_tabroll.js b/js/ding_tabroll.js index dcc4930..08f1e90 100644 --- a/js/ding_tabroll.js +++ b/js/ding_tabroll.js @@ -12,6 +12,8 @@ $(document).ready(function($) { * Add the jquery.rotate function back. */ (function($){ + try + { $.extend( $.ui.tabs.prototype, { rotation: null, rotationDelay: null, @@ -86,4 +88,9 @@ $(document).ready(function($) { self.rotate(1, self.continuing); } }); + } + catch(e) + { + + } })(jQuery); From e9e1c79d3beafb74a0f46604244cd6cd1d0caa60 Mon Sep 17 00:00:00 2001 From: impara Date: Thu, 1 Dec 2016 08:32:28 +0100 Subject: [PATCH 34/35] Removed the extra space in link id name. --- templates/views-view-unformatted--ding-tabroll.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/views-view-unformatted--ding-tabroll.tpl.php b/templates/views-view-unformatted--ding-tabroll.tpl.php index db1906b..3a7946f 100644 --- a/templates/views-view-unformatted--ding-tabroll.tpl.php +++ b/templates/views-view-unformatted--ding-tabroll.tpl.php @@ -11,9 +11,9 @@ result)); $i++) { if($i == 0) { - print '
  • ' .$view->result[$i]->node_title .'
  • '; + print '
  • ' .$view->result[$i]->node_title .'
  • '; } else { - print '
  • ' .$view->result[$i]->node_title .'
  • '; + print '
  • ' .$view->result[$i]->node_title .'
  • '; } } ?> From afff6628f90bfa84a07de25da3124991549813a8 Mon Sep 17 00:00:00 2001 From: impara Date: Tue, 6 Dec 2016 09:00:59 +0100 Subject: [PATCH 35/35] Linked lead to content --- css/ding_tabroll.css | 5 +++++ templates/views-view-fields--ding-tabroll.tpl.php | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/css/ding_tabroll.css b/css/ding_tabroll.css index 9cea22f..df69c52 100644 --- a/css/ding_tabroll.css +++ b/css/ding_tabroll.css @@ -122,6 +122,11 @@ width: 90%; } +#featured .ui-tabs-panel .info p a { + color: white; + text-decoration: none; +} + #featured .ui-tabs-hide { display: none; } diff --git a/templates/views-view-fields--ding-tabroll.tpl.php b/templates/views-view-fields--ding-tabroll.tpl.php index 5c91940..b06bc75 100644 --- a/templates/views-view-fields--ding-tabroll.tpl.php +++ b/templates/views-view-fields--ding-tabroll.tpl.php @@ -36,7 +36,19 @@ print l($fields['title']->content, $link, array('html' => TRUE)); } ?> -

    content) ? $fields['field_ding_tabroll_lead']->content : ""; ?>

    +

    + content) ? $fields['field_ding_tabroll_lead']->content : ""; + } + elseif (isset($target)) { + print l($fields['field_ding_tabroll_lead']->content, $link, $target, array('html' => TRUE)); + } + else { + print l($fields['field_ding_tabroll_lead']->content, $link, array('html' => TRUE)); + } + ?> +

    field_field_ding_tabroll_image[0]['raw']['field_kilde']['und'][0]['value'])) {