Skip to content

Commit 2ae727c

Browse files
kaspergkasperg
committed
Merge v1.5.11 changes
2 parents b3b2542 + 662eb85 commit 2ae727c

12 files changed

+103
-66
lines changed

‎ding_base/ding_base.info

+5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ dependencies[] = "ting_search_carousel"
2323
description = "Base module providing configuration, formats and APIs used across all Ding module."
2424
features[ctools][] = "strongarm:strongarm:1"
2525
features[variable][] = "admin_theme"
26+
features[variable][] = "admin_theme_admin_theme_batch"
27+
features[variable][] = "admin_theme_admin_theme_devel"
28+
features[variable][] = "admin_theme_path"
29+
features[variable][] = "admin_theme_path_disallow"
2630
features[variable][] = "better_formats_fieldset_title"
2731
features[variable][] = "better_formats_long_tips_link_text"
2832
features[variable][] = "better_formats_per_node_type"
@@ -34,6 +38,7 @@ features[variable][] = "default_oembedcore_provider"
3438
features[variable][] = "htmLawed_format_1"
3539
features[variable][] = "htmLawed_format_2"
3640
features[variable][] = "htmLawed_format_3"
41+
features[variable][] = "node_admin_theme"
3742
features[variable][] = "page_manager_node_view_disabled"
3843
features[variable][] = "page_manager_term_view_disabled"
3944
features[variable][] = "page_manager_user_view_disabled"

‎ding_base/ding_base.strongarm.inc

+32
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,31 @@ function ding_base_strongarm() {
1515
$strongarm = new stdClass;
1616
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
1717
$strongarm->api_version = 1;
18+
$strongarm->name = 'admin_theme_admin_theme_batch';
19+
$strongarm->value = 1;
20+
21+
$export['admin_theme_admin_theme_batch'] = $strongarm;
22+
$strongarm = new stdClass;
23+
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
24+
$strongarm->api_version = 1;
25+
$strongarm->name = 'admin_theme_admin_theme_devel';
26+
$strongarm->value = 1;
27+
28+
$export['admin_theme_admin_theme_devel'] = $strongarm;
29+
$strongarm = new stdClass;
30+
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
31+
$strongarm->api_version = 1;
32+
$strongarm->name = 'admin_theme_path';
33+
$strongarm->value = '';
34+
35+
$export['admin_theme_path'] = $strongarm;
36+
$strongarm = new stdClass;
37+
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
38+
$strongarm->api_version = 1;
39+
$strongarm->name = 'admin_theme_path_disallow';
40+
$strongarm->value = '';
41+
42+
$export['admin_theme_path_disallow'] = $strongarm;
1843
$strongarm->name = 'better_formats_fieldset_title';
1944
$strongarm->value = '';
2045

@@ -996,6 +1021,13 @@ function ding_base_strongarm() {
9961021
$strongarm = new stdClass;
9971022
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
9981023
$strongarm->api_version = 1;
1024+
$strongarm->name = 'node_admin_theme';
1025+
$strongarm->value = 1;
1026+
1027+
$export['node_admin_theme'] = $strongarm;
1028+
$strongarm = new stdClass;
1029+
$strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
1030+
$strongarm->api_version = 1;
9991031
$strongarm->name = 'page_manager_node_view_disabled';
10001032
$strongarm->value = FALSE;
10011033

‎ding_cart/ding_cart.pages_default.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ function ding_cart_default_page_manager_pages() {
6666
$display->layout_settings = array();
6767
$display->panel_settings = array();
6868
$display->cache = array();
69-
$display->title = '';
70-
$display->hide_title = FALSE;
69+
$display->title = 'Kurv';
70+
$display->hide_title = PANELS_TITLE_FIXED;
7171
$display->title_pane = 0;
7272
$display->content = array();
7373
$display->panels = array();

‎ding_content/ding_content.features.content.inc

+7-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function ding_content_content_default_fields() {
5959
'max_resolution' => '0',
6060
'min_resolution' => '0',
6161
'alt' => '',
62-
'custom_alt' => 0,
62+
'custom_alt' => 1,
6363
'title' => '',
6464
'custom_title' => 0,
6565
'title_type' => 'textfield',
@@ -282,7 +282,7 @@ function ding_content_content_default_fields() {
282282
'max_resolution' => '0',
283283
'min_resolution' => '0',
284284
'alt' => '',
285-
'custom_alt' => 0,
285+
'custom_alt' => 1,
286286
'title' => '',
287287
'custom_title' => 0,
288288
'title_type' => 'textfield',
@@ -467,7 +467,7 @@ function ding_content_content_default_fields() {
467467
'max_resolution' => '0',
468468
'min_resolution' => '0',
469469
'alt' => '',
470-
'custom_alt' => 0,
470+
'custom_alt' => 1,
471471
'title' => '',
472472
'custom_title' => 0,
473473
'title_type' => 'textfield',
@@ -826,7 +826,7 @@ function ding_content_content_default_fields() {
826826
'max_resolution' => '0',
827827
'min_resolution' => '0',
828828
'alt' => '',
829-
'custom_alt' => 0,
829+
'custom_alt' => 1,
830830
'title' => '',
831831
'custom_title' => 0,
832832
'title_type' => 'textfield',
@@ -1019,7 +1019,7 @@ function ding_content_content_default_fields() {
10191019
'max_resolution' => '0',
10201020
'min_resolution' => '0',
10211021
'alt' => '',
1022-
'custom_alt' => 0,
1022+
'custom_alt' => 1,
10231023
'title' => '',
10241024
'custom_title' => 0,
10251025
'title_type' => 'textfield',
@@ -1170,7 +1170,7 @@ function ding_content_content_default_fields() {
11701170
'max_resolution' => '0',
11711171
'min_resolution' => '0',
11721172
'alt' => '',
1173-
'custom_alt' => 0,
1173+
'custom_alt' => 1,
11741174
'title' => '',
11751175
'custom_title' => 0,
11761176
'title_type' => 'textfield',
@@ -1601,7 +1601,7 @@ function ding_content_content_default_fields() {
16011601
'max_resolution' => 0,
16021602
'min_resolution' => '120x120',
16031603
'alt' => '',
1604-
'custom_alt' => 0,
1604+
'custom_alt' => 1,
16051605
'title' => '',
16061606
'custom_title' => 0,
16071607
'title_type' => 'textfield',

‎ding_content/ding_content.pages_default.inc

+18-18
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function ding_content_default_page_manager_handlers() {
5757
),
5858
);
5959
$display->cache = array();
60-
$display->title = '';
60+
$display->title = '%node:title';
6161
$display->content = array();
6262
$display->panels = array();
6363
$pane = new stdClass;
@@ -225,7 +225,7 @@ function ding_content_default_page_manager_handlers() {
225225
$pane->position = 0;
226226
$display->content['new-7'] = $pane;
227227
$display->panels['top'][0] = 'new-7';
228-
$display->hide_title = PANELS_TITLE_NONE;
228+
$display->hide_title = PANELS_TITLE_FIXED;
229229
$display->title_pane = 'new-1';
230230
$handler->conf['display'] = $display;
231231

@@ -282,7 +282,7 @@ function ding_content_default_page_manager_handlers() {
282282
),
283283
);
284284
$display->cache = array();
285-
$display->title = '';
285+
$display->title = '%node:title';
286286
$display->content = array();
287287
$display->panels = array();
288288
$pane = new stdClass;
@@ -447,7 +447,7 @@ function ding_content_default_page_manager_handlers() {
447447
$pane->position = 0;
448448
$display->content['new-7'] = $pane;
449449
$display->panels['top'][0] = 'new-7';
450-
$display->hide_title = PANELS_TITLE_NONE;
450+
$display->hide_title = PANELS_TITLE_FIXED;
451451
$display->title_pane = 'new-1';
452452
$handler->conf['display'] = $display;
453453

@@ -513,7 +513,7 @@ function ding_content_default_page_manager_handlers() {
513513
),
514514
);
515515
$display->cache = array();
516-
$display->title = '';
516+
$display->title = '%node:title';
517517
$display->content = array();
518518
$display->panels = array();
519519
$pane = new stdClass;
@@ -746,7 +746,7 @@ function ding_content_default_page_manager_handlers() {
746746
$pane->position = 0;
747747
$display->content['new-10'] = $pane;
748748
$display->panels['top'][0] = 'new-10';
749-
$display->hide_title = PANELS_TITLE_NONE;
749+
$display->hide_title = PANELS_TITLE_FIXED;
750750
$display->title_pane = '0';
751751
$handler->conf['display'] = $display;
752752

@@ -796,7 +796,7 @@ function ding_content_default_page_manager_handlers() {
796796
$display->layout_settings = array();
797797
$display->panel_settings = array();
798798
$display->cache = array();
799-
$display->title = '';
799+
$display->title = '%node:title';
800800
$display->content = array();
801801
$display->panels = array();
802802
$pane = new stdClass;
@@ -849,7 +849,7 @@ function ding_content_default_page_manager_handlers() {
849849
$pane->position = 0;
850850
$display->content['new-2'] = $pane;
851851
$display->panels['right'][0] = 'new-2';
852-
$display->hide_title = PANELS_TITLE_NONE;
852+
$display->hide_title = PANELS_TITLE_FIXED;
853853
$display->title_pane = 'new-1';
854854
$handler->conf['display'] = $display;
855855

@@ -915,7 +915,7 @@ function ding_content_default_page_manager_handlers() {
915915
),
916916
);
917917
$display->cache = array();
918-
$display->title = '';
918+
$display->title = '%node:title';
919919
$display->content = array();
920920
$display->panels = array();
921921
$pane = new stdClass;
@@ -1063,7 +1063,7 @@ function ding_content_default_page_manager_handlers() {
10631063
$pane->position = 0;
10641064
$display->content['new-6'] = $pane;
10651065
$display->panels['top'][0] = 'new-6';
1066-
$display->hide_title = PANELS_TITLE_NONE;
1066+
$display->hide_title = PANELS_TITLE_FIXED;
10671067
$display->title_pane = 'new-1';
10681068
$handler->conf['display'] = $display;
10691069

@@ -1121,7 +1121,7 @@ function ding_content_default_page_manager_handlers() {
11211121
$display->layout_settings = array();
11221122
$display->panel_settings = array();
11231123
$display->cache = array();
1124-
$display->title = '';
1124+
$display->title = '%node:title';
11251125
$display->content = array();
11261126
$display->panels = array();
11271127
$pane = new stdClass;
@@ -1262,7 +1262,7 @@ function ding_content_default_page_manager_handlers() {
12621262
$display->layout_settings = array();
12631263
$display->panel_settings = array();
12641264
$display->cache = array();
1265-
$display->title = '';
1265+
$display->title = '%term:name';
12661266
$display->content = array();
12671267
$display->panels = array();
12681268
$pane = new stdClass;
@@ -1395,7 +1395,7 @@ function ding_content_default_page_manager_handlers() {
13951395
$pane->position = 0;
13961396
$display->content['new-6'] = $pane;
13971397
$display->panels['top'][0] = 'new-6';
1398-
$display->hide_title = PANELS_TITLE_NONE;
1398+
$display->hide_title = PANELS_TITLE_FIXED;
13991399
$display->title_pane = '0';
14001400
$handler->conf['display'] = $display;
14011401

@@ -1550,7 +1550,7 @@ function ding_content_default_page_manager_pages() {
15501550
$display->layout_settings = array();
15511551
$display->panel_settings = array();
15521552
$display->cache = array();
1553-
$display->title = '';
1553+
$display->title = 'Forside';
15541554
$display->content = array();
15551555
$display->panels = array();
15561556
$pane = new stdClass;
@@ -1635,7 +1635,7 @@ function ding_content_default_page_manager_pages() {
16351635
$pane->position = 0;
16361636
$display->content['new-4'] = $pane;
16371637
$display->panels['top'][0] = 'new-4';
1638-
$display->hide_title = PANELS_TITLE_NONE;
1638+
$display->hide_title = PANELS_TITLE_FIXED;
16391639
$display->title_pane = '0';
16401640
$handler->conf['display'] = $display;
16411641
$page->default_handlers[$handler->name] = $handler;
@@ -1755,7 +1755,7 @@ function ding_content_default_page_manager_pages() {
17551755
$pane->position = 0;
17561756
$display->content['new-3'] = $pane;
17571757
$display->panels['top'][0] = 'new-3';
1758-
$display->hide_title = PANELS_TITLE_NONE;
1758+
$display->hide_title = PANELS_TITLE_FIXED;
17591759
$display->title_pane = '0';
17601760
$handler->conf['display'] = $display;
17611761
$page->default_handlers[$handler->name] = $handler;
@@ -1814,7 +1814,7 @@ function ding_content_default_page_manager_pages() {
18141814
),
18151815
);
18161816
$display->cache = array();
1817-
$display->title = '';
1817+
$display->title = 'Lokale emnesamlinger';
18181818
$display->content = array();
18191819
$display->panels = array();
18201820
$pane = new stdClass;
@@ -2167,7 +2167,7 @@ function ding_content_default_page_manager_pages() {
21672167
),
21682168
);
21692169
$display->cache = array();
2170-
$display->title = '';
2170+
$display->title = 'Anbefalinger';
21712171
$display->content = array();
21722172
$display->panels = array();
21732173
$pane = new stdClass;

‎ding_library/ding_library.features.content.inc

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function ding_library_content_default_fields() {
5959
'max_resolution' => '0',
6060
'min_resolution' => '0',
6161
'alt' => '',
62-
'custom_alt' => 0,
62+
'custom_alt' => 1,
6363
'title' => '',
6464
'custom_title' => 0,
6565
'title_type' => 'textfield',
@@ -400,7 +400,7 @@ function ding_library_content_default_fields() {
400400
'max_resolution' => '0',
401401
'min_resolution' => '0',
402402
'alt' => '',
403-
'custom_alt' => 0,
403+
'custom_alt' => 1,
404404
'title' => '',
405405
'custom_title' => 0,
406406
'title_type' => 'textfield',

‎ding_library/ding_library.pages_default.inc

+8-8
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function ding_library_default_page_manager_pages() {
8282
),
8383
);
8484
$display->cache = array();
85-
$display->title = '';
85+
$display->title = 'Om %slug:title';
8686
$display->content = array();
8787
$display->panels = array();
8888
$pane = new stdClass;
@@ -218,7 +218,7 @@ function ding_library_default_page_manager_pages() {
218218
$pane->position = 0;
219219
$display->content['new-6'] = $pane;
220220
$display->panels['top'][0] = 'new-6';
221-
$display->hide_title = PANELS_TITLE_NONE;
221+
$display->hide_title = PANELS_TITLE_FIXED;
222222
$display->title_pane = 'new-1';
223223
$handler->conf['display'] = $display;
224224
$page->default_handlers[$handler->name] = $handler;
@@ -302,7 +302,7 @@ function ding_library_default_page_manager_pages() {
302302
),
303303
);
304304
$display->cache = array();
305-
$display->title = '';
305+
$display->title = '%slug:title Blog-indlæg';
306306
$display->content = array();
307307
$display->panels = array();
308308
$pane = new stdClass;
@@ -418,7 +418,7 @@ function ding_library_default_page_manager_pages() {
418418
$pane->position = 0;
419419
$display->content['new-5'] = $pane;
420420
$display->panels['top'][0] = 'new-5';
421-
$display->hide_title = PANELS_TITLE_NONE;
421+
$display->hide_title = PANELS_TITLE_FIXED;
422422
$display->title_pane = 'new-1';
423423
$handler->conf['display'] = $display;
424424
$page->default_handlers[$handler->name] = $handler;
@@ -503,7 +503,7 @@ function ding_library_default_page_manager_pages() {
503503
),
504504
);
505505
$display->cache = array();
506-
$display->title = '';
506+
$display->title = '%slug:title Arrangementer';
507507
$display->content = array();
508508
$display->panels = array();
509509
$pane = new stdClass;
@@ -639,7 +639,7 @@ function ding_library_default_page_manager_pages() {
639639
$pane->position = 0;
640640
$display->content['new-6'] = $pane;
641641
$display->panels['top'][0] = 'new-6';
642-
$display->hide_title = PANELS_TITLE_NONE;
642+
$display->hide_title = PANELS_TITLE_FIXED;
643643
$display->title_pane = '0';
644644
$handler->conf['display'] = $display;
645645
$page->default_handlers[$handler->name] = $handler;
@@ -723,7 +723,7 @@ function ding_library_default_page_manager_pages() {
723723
),
724724
);
725725
$display->cache = array();
726-
$display->title = '';
726+
$display->title = '%slug:title Faciliteter';
727727
$display->content = array();
728728
$display->panels = array();
729729
$pane = new stdClass;
@@ -839,7 +839,7 @@ function ding_library_default_page_manager_pages() {
839839
$pane->position = 0;
840840
$display->content['new-5'] = $pane;
841841
$display->panels['top'][0] = 'new-5';
842-
$display->hide_title = PANELS_TITLE_NONE;
842+
$display->hide_title = PANELS_TITLE_FIXED;
843843
$display->title_pane = 'new-1';
844844
$handler->conf['display'] = $display;
845845
$page->default_handlers[$handler->name] = $handler;

0 commit comments

Comments
 (0)