@concretecms/bedrock 1.2.1 → 1.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/cms/js/edit-mode/duplicateblock.js +1 -1
- package/assets/cms/js/edit-mode/orphanedblock.js +1 -1
- package/assets/cms/js/edit-mode/stack.js +1 -0
- package/assets/cms/js/edit-mode/stackblock.js +2 -2
- package/assets/cms/scss/_inline-toolbar.scss +7 -0
- package/assets/cms/scss/_login-page.scss +4 -0
- package/assets/cms/scss/jquery-ui/_theme.scss +7 -7
- package/assets/cms/scss/panels/pages/_mobile-preview.scss +14 -14
- package/assets/desktop/scss/frontend/_waiting-for-me.scss +0 -4
- package/assets/documents/js/frontend/document-library.js +5 -1
- package/package.json +1 -1
|
@@ -57,7 +57,7 @@ import _ from 'underscore'
|
|
|
57
57
|
$.fn.dialog.closeAll()
|
|
58
58
|
$.fn.dialog.showLoader()
|
|
59
59
|
|
|
60
|
-
var url = CCM_DISPATCHER_FILENAME + `/ccm/system/block/process/alias/${cID}/${area_handle}/${pcID}/${dragAreaBlockID || '0'}/0`
|
|
60
|
+
var url = CCM_DISPATCHER_FILENAME + `/ccm/system/block/process/alias/${cID}/${area_handle}/${pcID}/${dragAreaBlockID || '0'}/0/0`
|
|
61
61
|
|
|
62
62
|
$.getJSON(url, { ccm_token: CCM_SECURITY_TOKEN }, function (response) {
|
|
63
63
|
my.handleAddResponse(response, area, dragAreaBlock, function () {
|
|
@@ -56,7 +56,7 @@ import _ from 'underscore'
|
|
|
56
56
|
$.fn.dialog.closeAll()
|
|
57
57
|
$.fn.dialog.showLoader()
|
|
58
58
|
|
|
59
|
-
var url = CCM_DISPATCHER_FILENAME + `/ccm/system/block/process/alias/${cID}/${area_handle}/0
|
|
59
|
+
var url = CCM_DISPATCHER_FILENAME + `/ccm/system/block/process/alias/${cID}/${area_handle}/0/${dragAreaBlockID || '0'}/${my.getId()}/0`
|
|
60
60
|
|
|
61
61
|
$.getJSON(url, { ccm_token: CCM_SECURITY_TOKEN }, function (response) {
|
|
62
62
|
my.handleAddResponse(response, area, dragAreaBlock, function () {
|
|
@@ -46,6 +46,7 @@ import _ from 'underscore'
|
|
|
46
46
|
|
|
47
47
|
$.fn.dialog.showLoader()
|
|
48
48
|
$.getJSON(CCM_DISPATCHER_FILENAME + '/ccm/system/page/add_stack', settings, function (response) {
|
|
49
|
+
ConcreteToolbar.disableDirectExit()
|
|
49
50
|
my.handleAddResponse(response, area, dragAreaBlock)
|
|
50
51
|
})
|
|
51
52
|
},
|
|
@@ -27,7 +27,7 @@ import _ from 'underscore'
|
|
|
27
27
|
|
|
28
28
|
addToDragArea: function StackBlockAddToDragArea(drag_area) {
|
|
29
29
|
var my = this; var elem = my.getElem()
|
|
30
|
-
var
|
|
30
|
+
var bID = elem.data('block-id')
|
|
31
31
|
var area = drag_area.getArea()
|
|
32
32
|
var area_handle = area.getHandle()
|
|
33
33
|
var dragAreaBlockID = 0
|
|
@@ -39,7 +39,7 @@ import _ from 'underscore'
|
|
|
39
39
|
|
|
40
40
|
ConcretePanelManager.exitPanelMode()
|
|
41
41
|
|
|
42
|
-
var url = CCM_DISPATCHER_FILENAME + `/ccm/system/block/process/alias/${CCM_CID}/${area_handle}/${
|
|
42
|
+
var url = CCM_DISPATCHER_FILENAME + `/ccm/system/block/process/alias/${CCM_CID}/${area_handle}/0/${dragAreaBlockID || '0'}/0/${bID || '0'}`
|
|
43
43
|
|
|
44
44
|
$.getJSON(url, { ccm_token: CCM_SECURITY_TOKEN }, function (response) {
|
|
45
45
|
my.handleAddResponse(response, area, dragAreaBlock)
|
|
@@ -265,37 +265,37 @@ a.ui-button:active,
|
|
|
265
265
|
|
|
266
266
|
.ui-icon,
|
|
267
267
|
.ui-widget-content .ui-icon {
|
|
268
|
-
background-image: url('
|
|
268
|
+
background-image: url($concrete-path + '/images/ui-icons_444444_256x240.png');
|
|
269
269
|
}
|
|
270
270
|
|
|
271
271
|
.ui-widget-header .ui-icon {
|
|
272
|
-
background-image: url('
|
|
272
|
+
background-image: url($concrete-path + '/images/ui-icons_444444_256x240.png');
|
|
273
273
|
}
|
|
274
274
|
|
|
275
275
|
.ui-state-hover .ui-icon,
|
|
276
276
|
.ui-state-focus .ui-icon,
|
|
277
277
|
.ui-button:hover .ui-icon,
|
|
278
278
|
.ui-button:focus .ui-icon {
|
|
279
|
-
background-image: url('
|
|
279
|
+
background-image: url($concrete-path + '/images/ui-icons_555555_256x240.png');
|
|
280
280
|
}
|
|
281
281
|
|
|
282
282
|
.ui-state-active .ui-icon,
|
|
283
283
|
.ui-button:active .ui-icon {
|
|
284
|
-
background-image: url('
|
|
284
|
+
background-image: url($concrete-path + '/images/ui-icons_ffffff_256x240.png');
|
|
285
285
|
}
|
|
286
286
|
|
|
287
287
|
.ui-state-highlight .ui-icon,
|
|
288
288
|
.ui-button .ui-state-highlight.ui-icon {
|
|
289
|
-
background-image: url('
|
|
289
|
+
background-image: url($concrete-path + '/images/ui-icons_777620_256x240.png');
|
|
290
290
|
}
|
|
291
291
|
|
|
292
292
|
.ui-state-error .ui-icon,
|
|
293
293
|
.ui-state-error-text .ui-icon {
|
|
294
|
-
background-image: url('
|
|
294
|
+
background-image: url($concrete-path + '/images/ui-icons_cc0000_256x240.png');
|
|
295
295
|
}
|
|
296
296
|
|
|
297
297
|
.ui-button .ui-icon {
|
|
298
|
-
background-image: url('
|
|
298
|
+
background-image: url($concrete-path + '/images/ui-icons_777777_256x240.png');
|
|
299
299
|
}
|
|
300
300
|
|
|
301
301
|
/* positioning */
|
|
@@ -17,37 +17,37 @@
|
|
|
17
17
|
|
|
18
18
|
.ccm-device-orientation-portrait {
|
|
19
19
|
.ccm-device-iphone13 {
|
|
20
|
-
background: url('
|
|
20
|
+
background: url($concrete-path + '/images/devices/iphone/iphone13.png') no-repeat;
|
|
21
21
|
padding: 75px 38px 62px 39px;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
.ccm-device-iphone6 {
|
|
25
|
-
background: url('
|
|
25
|
+
background: url($concrete-path + '/images/devices/iphone/iphone6.png') no-repeat;
|
|
26
26
|
padding: 108px 28px;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
.ccm-device-iphone6-plus {
|
|
30
|
-
background: url('
|
|
30
|
+
background: url($concrete-path + '/images/devices/iphone/iphone6plus.png') no-repeat;
|
|
31
31
|
padding: 108px 28px;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
.ccm-device-iphone5 {
|
|
35
|
-
background: url('
|
|
35
|
+
background: url($concrete-path + '/images/devices/iphone/iphone5.png') no-repeat;
|
|
36
36
|
padding: 119px 33px;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
.ccm-device-iphone4 {
|
|
40
|
-
background: url('
|
|
40
|
+
background: url($concrete-path + '/images/devices/iphone/iphone4.png') no-repeat;
|
|
41
41
|
padding: 256px 56px;
|
|
42
42
|
}
|
|
43
43
|
|
|
44
44
|
.ccm-device-galaxys5 {
|
|
45
|
-
background: url('
|
|
45
|
+
background: url($concrete-path + '/images/devices/galaxy/s5.png') no-repeat;
|
|
46
46
|
padding: 79px 26px;
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
.ccm-device-ipad {
|
|
50
|
-
background: url('
|
|
50
|
+
background: url($concrete-path + '/images/devices/ipad/ipad.png') no-repeat;
|
|
51
51
|
padding: 112px 58px;
|
|
52
52
|
}
|
|
53
53
|
|
|
@@ -55,37 +55,37 @@
|
|
|
55
55
|
|
|
56
56
|
.ccm-device-orientation-landscape {
|
|
57
57
|
.ccm-device-iphone13 {
|
|
58
|
-
background: url('
|
|
58
|
+
background: url($concrete-path + '/images/devices/iphone/iphone13-landscape.png') no-repeat;
|
|
59
59
|
padding: 38px 76px 38px 62px;
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
.ccm-device-iphone6 {
|
|
63
|
-
background: url('
|
|
63
|
+
background: url($concrete-path + '/images/devices/iphone/iphone6-landscape.png') no-repeat;
|
|
64
64
|
padding: 28px 108px;
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
.ccm-device-iphone6-plus {
|
|
68
|
-
background: url('
|
|
68
|
+
background: url($concrete-path + '/images/devices/iphone/iphone6plus-landscape.png') no-repeat;
|
|
69
69
|
padding: 28px 108px;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
.ccm-device-iphone5 {
|
|
73
|
-
background: url('
|
|
73
|
+
background: url($concrete-path + '/images/devices/iphone/iphone5-landscape.png') no-repeat;
|
|
74
74
|
padding: 33px 119px;
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
.ccm-device-iphone4 {
|
|
78
|
-
background: url('
|
|
78
|
+
background: url($concrete-path + '/images/devices/iphone/iphone4-landscape.png') no-repeat;
|
|
79
79
|
padding: 56px 256px;
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
.ccm-device-galaxys5 {
|
|
83
|
-
background: url('
|
|
83
|
+
background: url($concrete-path + '/images/devices/galaxy/s5-landscape.png') no-repeat;
|
|
84
84
|
padding: 26px 79px;
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
.ccm-device-ipad {
|
|
88
|
-
background: url('
|
|
88
|
+
background: url($concrete-path + '/images/devices/ipad/ipad-landscape.png') no-repeat;
|
|
89
89
|
padding: 58px 112px;
|
|
90
90
|
}
|
|
91
91
|
|
|
@@ -83,7 +83,6 @@ div.ccm-block-desktop-waiting-for-me {
|
|
|
83
83
|
font-size: 1rem;
|
|
84
84
|
font-weight: bold;
|
|
85
85
|
height: 40px;
|
|
86
|
-
line-height: 50px;
|
|
87
86
|
padding: 0;
|
|
88
87
|
position: relative;
|
|
89
88
|
text-align: center;
|
|
@@ -97,9 +96,6 @@ div.ccm-block-desktop-waiting-for-me {
|
|
|
97
96
|
|
|
98
97
|
i {
|
|
99
98
|
color: #ccc;
|
|
100
|
-
left: 10px;
|
|
101
|
-
position: absolute;
|
|
102
|
-
top: 10px;
|
|
103
99
|
}
|
|
104
100
|
|
|
105
101
|
&:active {
|
|
@@ -9,7 +9,8 @@ import '../../../cms/js/file-manager/file-manager'
|
|
|
9
9
|
options = $.extend({
|
|
10
10
|
bID: 0,
|
|
11
11
|
allowFileUploading: false,
|
|
12
|
-
allowInPageFileManagement: false
|
|
12
|
+
allowInPageFileManagement: false,
|
|
13
|
+
advancedSearchDisplayed: false
|
|
13
14
|
}, options)
|
|
14
15
|
|
|
15
16
|
this.options = options
|
|
@@ -119,6 +120,9 @@ import '../../../cms/js/file-manager/file-manager'
|
|
|
119
120
|
$details.show()
|
|
120
121
|
}
|
|
121
122
|
})
|
|
123
|
+
if (this.options.advancedSearchDisplayed) {
|
|
124
|
+
$('a[data-document-library-advanced-search]').trigger('click')
|
|
125
|
+
}
|
|
122
126
|
}
|
|
123
127
|
|
|
124
128
|
ConcreteDocumentLibrary.prototype.setupEditProperties = function() {
|
package/package.json
CHANGED