Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@andersbryrup
andersbryrup committed May 13, 2013
2 parents 8c72a4d + 4b8314f commit ca47e1a
Show file tree
Hide file tree
Showing 9 changed files with 2,160 additions and 140 deletions.
689 changes: 689 additions & 0 deletions os2web_contact.features.field_base.inc
View file

Large diffs are not rendered by default.

1,221 changes: 1,221 additions & 0 deletions os2web_contact.features.field_instance.inc
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions os2web_contact.features.filter.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,34 @@ function os2web_contact_filter_default_formats() {
$formats['os2web_contact_contact_format'] = array(
'format' => 'os2web_contact_contact_format',
'name' => 'Blokindhold',
'cache' => '1',
'status' => '1',
'weight' => '-7',
'cache' => 1,
'status' => 1,
'weight' => -7,
'filters' => array(
'filter_html' => array(
'weight' => '-10',
'status' => '1',
'weight' => -10,
'status' => 1,
'settings' => array(
'allowed_html' => '<a> <em> <strong> <ul> <ol> <li> <dl> <dt> <dd> <span> <div> <b> <br> <table> <tr> <td>',
'filter_html_help' => 1,
'filter_html_nofollow' => 0,
),
),
'filter_url' => array(
'weight' => '0',
'status' => '1',
'weight' => 0,
'status' => 1,
'settings' => array(
'filter_url_length' => '60',
'filter_url_length' => 60,
),
),
'media_filter' => array(
'weight' => '2',
'status' => '1',
'weight' => 2,
'status' => 1,
'settings' => array(),
),
'filter_htmlcorrector' => array(
'weight' => '10',
'status' => '1',
'weight' => 10,
'status' => 1,
'settings' => array(),
),
),
Expand Down
72 changes: 48 additions & 24 deletions os2web_contact.info
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,55 @@ features[ctools][] = panels_mini:panels_default:1
features[ctools][] = strongarm:strongarm:1
features[ctools][] = views:views_default:3.0
features[features_api][] = api:1
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_addr
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_callc
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_dept
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_email
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_fricl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_friop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_info
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_moncl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_monop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_mowcl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_mowop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_phone
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_satcl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_satop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_show
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_suncl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_sunop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_thucl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_thuop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_tuecl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_tueop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_wedcl
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_wedop
features[field][] = node-os2web_contact_contact-field_os2web_contact_field_zip
features[field_base][] = field_os2web_contact_field_addr
features[field_base][] = field_os2web_contact_field_callc
features[field_base][] = field_os2web_contact_field_dept
features[field_base][] = field_os2web_contact_field_email
features[field_base][] = field_os2web_contact_field_fricl
features[field_base][] = field_os2web_contact_field_friop
features[field_base][] = field_os2web_contact_field_info
features[field_base][] = field_os2web_contact_field_moncl
features[field_base][] = field_os2web_contact_field_monop
features[field_base][] = field_os2web_contact_field_mowcl
features[field_base][] = field_os2web_contact_field_mowop
features[field_base][] = field_os2web_contact_field_phone
features[field_base][] = field_os2web_contact_field_satcl
features[field_base][] = field_os2web_contact_field_satop
features[field_base][] = field_os2web_contact_field_show
features[field_base][] = field_os2web_contact_field_suncl
features[field_base][] = field_os2web_contact_field_sunop
features[field_base][] = field_os2web_contact_field_thucl
features[field_base][] = field_os2web_contact_field_thuop
features[field_base][] = field_os2web_contact_field_tuecl
features[field_base][] = field_os2web_contact_field_tueop
features[field_base][] = field_os2web_contact_field_wedcl
features[field_base][] = field_os2web_contact_field_wedop
features[field_base][] = field_os2web_contact_field_zip
features[field_group][] = group_os2web_contact_opening|node|os2web_contact_contact|form
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_addr
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_callc
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_dept
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_email
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_fricl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_friop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_info
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_moncl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_monop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_mowcl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_mowop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_phone
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_satcl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_satop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_show
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_suncl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_sunop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_thucl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_thuop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_tuecl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_tueop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_wedcl
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_wedop
features[field_instance][] = node-os2web_contact_contact-field_os2web_contact_field_zip
features[filter][] = os2web_contact_contact_format
features[node][] = os2web_contact_contact
features[panels_mini][] = os2web_contact_panel_sidebar
Expand Down
8 changes: 4 additions & 4 deletions os2web_contact.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ core = 7.x
; Basic

projects[ctools][subdir] = "contrib"
projects[ctools][version] = "1.2"
projects[ctools][version] = "1.3"

projects[features][subdir] = "contrib"
projects[features][version] = "2.0-beta1"
projects[features][version] = "2.0-beta2"

projects[strongarm][subdir] = "contrib"
projects[strongarm][version] = "2.0"

projects[views][subdir] = "contrib"
projects[views][version] = "3.5"
projects[views][version] = "3.7"

projects[context][subdir] = "contrib"
projects[context][version] = "3.0-beta4"
projects[context][version] = "3.0-beta6"

projects[field_group][subdir] = "contrib"
projects[field_group][version] = "1.1"
Expand Down
4 changes: 2 additions & 2 deletions os2web_contact.module
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ function os2web_contact_get_block() {
$path = explode('/', $item['link_path']);
if ($path[0] === 'taxonomy' && $path[1] === 'term') {
$ent = taxonomy_term_load($path[2]);
$field = field_get_items('taxonomy_term', $ent, 'field_node_reference_os2web_contact_contact');
$field = field_get_items('taxonomy_term', $ent, 'field_os2web_base_field_contact');
}
elseif ($path[0] === 'node') {
$ent = node_load($path[1]);
$field = field_get_items('node', $ent, 'field_node_reference_os2web_contact_contact');
$field = field_get_items('node', $ent, 'field_os2web_base_field_contact');
}
else {
// Unknown entity type.. Possibly root.
Expand Down
83 changes: 46 additions & 37 deletions os2web_contact.panels_default.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,14 @@ function os2web_contact_default_panels_mini() {
$pane = new stdClass();
$pane->pid = 'new-1';
$pane->panel = 'middle';
$pane->type = 'views';
$pane->subtype = 'os2web_contact_view_contact';
$pane->type = 'views_panes';
$pane->subtype = 'os2web_contact_view_contact-panel_pane_1';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'override_pager_settings' => 0,
'use_pager' => 0,
'nodes_per_page' => '1',
'pager_id' => '0',
'offset' => '0',
'more_link' => 0,
'feed_icons' => 0,
'panel_args' => 0,
'link_to_view' => 0,
'args' => '2209',
'url' => '',
'display' => 'block',
'arguments' => array(
'nid' => '',
),
'override_title' => 0,
'override_title_text' => '',
);
Expand All @@ -69,16 +60,17 @@ function os2web_contact_default_panels_mini() {
$pane = new stdClass();
$pane->pid = 'new-2';
$pane->panel = 'middle';
$pane->type = 'views_panes';
$pane->subtype = 'os2web_contact_view_contact-panel_pane_1';
$pane->shown = FALSE;
$pane->type = 'custom';
$pane->subtype = 'custom';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'arguments' => array(
'nid' => '',
),
'override_title' => 0,
'override_title_text' => '',
'admin_title' => 'Tekstblok',
'title' => '<none>',
'body' => '<p>Hej</p>
',
'format' => 'full_html',
'substitute' => TRUE,
);
$pane->cache = array();
$pane->style = array(
Expand All @@ -93,16 +85,25 @@ function os2web_contact_default_panels_mini() {
$pane = new stdClass();
$pane->pid = 'new-3';
$pane->panel = 'middle';
$pane->type = 'custom';
$pane->subtype = 'custom';
$pane->type = 'views';
$pane->subtype = 'os2web_spotbox_view_spot';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'admin_title' => 'Tekstblok',
'title' => '<none>',
'body' => '',
'format' => 'full_html',
'substitute' => TRUE,
'override_pager_settings' => 0,
'use_pager' => 0,
'nodes_per_page' => '0',
'pager_id' => '0',
'offset' => '0',
'more_link' => 0,
'feed_icons' => 0,
'panel_args' => 0,
'link_to_view' => 0,
'args' => '',
'url' => '',
'display' => 'block_1',
'override_title' => 0,
'override_title_text' => '',
);
$pane->cache = array();
$pane->style = array(
Expand All @@ -117,16 +118,24 @@ function os2web_contact_default_panels_mini() {
$pane = new stdClass();
$pane->pid = 'new-4';
$pane->panel = 'middle';
$pane->type = 'views_panes';
$pane->subtype = 'os2web_spotbox_box-panel_pane_10';
$pane->type = 'views';
$pane->subtype = 'os2web_base_panels_view_selfserv';
$pane->shown = TRUE;
$pane->access = array();
$pane->configuration = array(
'items_per_page' => '1',
'arguments' => array(
'nid' => '',
),
'override_title' => 1,
'override_pager_settings' => 0,
'use_pager' => 0,
'nodes_per_page' => '0',
'pager_id' => '0',
'offset' => '0',
'more_link' => 0,
'feed_icons' => 0,
'panel_args' => 0,
'link_to_view' => 0,
'args' => '',
'url' => '',
'display' => 'block_6',
'override_title' => 0,
'override_title_text' => '',
);
$pane->cache = array();
Expand All @@ -140,7 +149,7 @@ function os2web_contact_default_panels_mini() {
$display->content['new-4'] = $pane;
$display->panels['middle'][3] = 'new-4';
$display->hide_title = PANELS_TITLE_NONE;
$display->title_pane = 'new-2';
$display->title_pane = 'new-1';
$mini->display = $display;
$export['os2web_contact_panel_sidebar'] = $mini;

Expand Down
2 changes: 1 addition & 1 deletion os2web_contact.strongarm.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function os2web_contact_strongarm() {
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
$strongarm->api_version = 1;
$strongarm->name = 'menu_parent_os2web_contact_contact';
$strongarm->value = 'os2web-main-menu:0';
$strongarm->value = 'main-menu:0';
$export['menu_parent_os2web_contact_contact'] = $strongarm;

$strongarm = new stdClass();
Expand Down
Loading

0 comments on commit ca47e1a

Please sign in to comment.