@@ -12,11 +12,11 @@ discard block |
||
12 | 12 | <div class="form-element"> |
13 | 13 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
14 | 14 | <? if (isset($dynamicBrick)) : |
15 | - $fieldSlug = $field->slug; |
|
16 | - $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; |
|
17 | - else : |
|
18 | - $value = ''; |
|
19 | - endif ?> |
|
15 | + $fieldSlug = $field->slug; |
|
16 | + $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; |
|
17 | + else : |
|
18 | + $value = ''; |
|
19 | + endif ?> |
|
20 | 20 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
21 | 21 | <ul class="grid-wrapper sortable"> |
22 | 22 | <li class="grid-container"> |
@@ -44,10 +44,10 @@ discard block |
||
44 | 44 | </div> |
45 | 45 | </li> |
46 | 46 | <? if (isset($dynamicBrick)) : |
47 | - $fieldSlug = $field->slug; |
|
48 | - $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); |
|
49 | - array_shift($iterable); |
|
50 | - ?> |
|
47 | + $fieldSlug = $field->slug; |
|
48 | + $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); |
|
49 | + array_shift($iterable); |
|
50 | + ?> |
|
51 | 51 | <? foreach ($iterable as $value) : ?> |
52 | 52 | |
53 | 53 | <li class="grid-container"> |
@@ -70,10 +70,10 @@ discard block |
||
70 | 70 | <a class="btn js-addmultiple">+</a> |
71 | 71 | <? elseif ($field->multiple == true) : ?> |
72 | 72 | <? if (isset($dynamicBrick)) : |
73 | - $fieldSlug = $field->slug; |
|
74 | - $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); |
|
75 | - array_shift($iterable); |
|
76 | - ?> |
|
73 | + $fieldSlug = $field->slug; |
|
74 | + $iterable = isset($dynamicBrick->fields->$fieldSlug) ? $dynamicBrick->fields->$fieldSlug : array(); |
|
75 | + array_shift($iterable); |
|
76 | + ?> |
|
77 | 77 | <? foreach ($iterable as $value) : ?> |
78 | 78 | |
79 | 79 | <li> |
@@ -14,8 +14,10 @@ |
||
14 | 14 | <? if (isset($dynamicBrick)) : |
15 | 15 | $fieldSlug = $field->slug; |
16 | 16 | $value = isset($dynamicBrick->fields->$fieldSlug) ? current($dynamicBrick->fields->$fieldSlug) : ''; |
17 | - else : |
|
17 | + else { |
|
18 | + : |
|
18 | 19 | $value = ''; |
20 | + } |
|
19 | 21 | endif ?> |
20 | 22 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
21 | 23 | <ul class="grid-wrapper sortable"> |
@@ -22,11 +22,11 @@ discard block |
||
22 | 22 | <div class="form-element"> |
23 | 23 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
24 | 24 | <? if (isset($document)) : |
25 | - $fieldSlug = $field->slug; |
|
26 | - $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; |
|
27 | - else : |
|
28 | - $value = ''; |
|
29 | - endif ?> |
|
25 | + $fieldSlug = $field->slug; |
|
26 | + $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; |
|
27 | + else : |
|
28 | + $value = ''; |
|
29 | + endif ?> |
|
30 | 30 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
31 | 31 | <ul class="grid-wrapper sortable"> |
32 | 32 | <li class="grid-container"> |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | </div> |
55 | 55 | </li> |
56 | 56 | <? if (isset($document)) : |
57 | - $fieldSlug = $field->slug; |
|
58 | - $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); |
|
59 | - array_shift($iterable); |
|
60 | - ?> |
|
57 | + $fieldSlug = $field->slug; |
|
58 | + $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); |
|
59 | + array_shift($iterable); |
|
60 | + ?> |
|
61 | 61 | <? foreach ($iterable as $value) : ?> |
62 | 62 | |
63 | 63 | <li class="grid-container"> |
@@ -80,10 +80,10 @@ discard block |
||
80 | 80 | <a class="btn js-addmultiple">+</a> |
81 | 81 | <? elseif ($field->multiple == true) : ?> |
82 | 82 | <? if (isset($document)) : |
83 | - $fieldSlug = $field->slug; |
|
84 | - $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); |
|
85 | - array_shift($iterable); |
|
86 | - ?> |
|
83 | + $fieldSlug = $field->slug; |
|
84 | + $iterable = isset($document->fields->$fieldSlug) ? $document->fields->$fieldSlug : array(); |
|
85 | + array_shift($iterable); |
|
86 | + ?> |
|
87 | 87 | <? foreach ($iterable as $value) : ?> |
88 | 88 | |
89 | 89 | <li> |
@@ -118,10 +118,10 @@ discard block |
||
118 | 118 | <? foreach ($document->bricks as $currentBrickSlug => $brickArray) : ?> |
119 | 119 | <? foreach ($brickArray as $dynamicBrick) : ?> |
120 | 120 | <? foreach ($bricks as $brick) : |
121 | - if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) { |
|
122 | - break; |
|
123 | - } |
|
124 | - endforeach ?> |
|
121 | + if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) { |
|
122 | + break; |
|
123 | + } |
|
124 | + endforeach ?> |
|
125 | 125 | <? if (is_object($dynamicBrick) && isset($dynamicBrick->type) && $brick->slug === $dynamicBrick->type && $currentBrickSlug === $myBrickSlug) : ?> |
126 | 126 | <li class="brick form-element"> |
127 | 127 | |
@@ -142,12 +142,12 @@ discard block |
||
142 | 142 | <div class="form-element"> |
143 | 143 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
144 | 144 | <? if (isset($document)) : |
145 | - $brickSlug = $brick->slug; |
|
146 | - $fieldSlug = $field->slug; |
|
147 | - $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; |
|
148 | - else : |
|
149 | - $value = ''; |
|
150 | - endif ?> |
|
145 | + $brickSlug = $brick->slug; |
|
146 | + $fieldSlug = $field->slug; |
|
147 | + $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; |
|
148 | + else : |
|
149 | + $value = ''; |
|
150 | + endif ?> |
|
151 | 151 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
152 | 152 | <ul class="grid-wrapper sortable"> |
153 | 153 | <li class="grid-container"> |
@@ -175,11 +175,11 @@ discard block |
||
175 | 175 | </div> |
176 | 176 | </li> |
177 | 177 | <? if (isset($document)) : |
178 | - $brickSlug = $brick->slug; |
|
179 | - $fieldSlug = $field->slug; |
|
180 | - $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); |
|
181 | - array_shift($iterable); |
|
182 | - ?> |
|
178 | + $brickSlug = $brick->slug; |
|
179 | + $fieldSlug = $field->slug; |
|
180 | + $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); |
|
181 | + array_shift($iterable); |
|
182 | + ?> |
|
183 | 183 | <? foreach ($iterable as $value) : ?> |
184 | 184 | |
185 | 185 | <li class="grid-container"> |
@@ -202,11 +202,11 @@ discard block |
||
202 | 202 | <a class="btn js-addmultiple">+</a> |
203 | 203 | <? elseif ($field->multiple == true) : ?> |
204 | 204 | <? if (isset($document)) : |
205 | - $brickSlug = $brick->slug; |
|
206 | - $fieldSlug = $field->slug; |
|
207 | - $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); |
|
208 | - array_shift($iterable); |
|
209 | - ?> |
|
205 | + $brickSlug = $brick->slug; |
|
206 | + $fieldSlug = $field->slug; |
|
207 | + $iterable = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? $document->bricks->$brickSlug->fields->$fieldSlug : array(); |
|
208 | + array_shift($iterable); |
|
209 | + ?> |
|
210 | 210 | <? foreach ($iterable as $value) : ?> |
211 | 211 | |
212 | 212 | <li> |
@@ -246,10 +246,10 @@ discard block |
||
246 | 246 | <? if (isset($document)) : ?> |
247 | 247 | <? foreach ($document->dynamicBricks as $dynamicBrick) : ?> |
248 | 248 | <? foreach ($bricks as $brick) : |
249 | - if ($brick->slug == $dynamicBrick->type) { |
|
250 | - break; |
|
251 | - } |
|
252 | - endforeach ?> |
|
249 | + if ($brick->slug == $dynamicBrick->type) { |
|
250 | + break; |
|
251 | + } |
|
252 | + endforeach ?> |
|
253 | 253 | <li class="brick form-element"> |
254 | 254 | <label><?=$brick->title?></label> |
255 | 255 | <?$static = false; ?> |
@@ -1,7 +1,8 @@ discard block |
||
1 | 1 | <form method="<?= isset($documentType) ? 'post' : 'get' ?>" onsubmit="return processRtes();" action="<?= isset($formId) ? '#' . $formId : '' ?>"> |
2 | 2 | <? if (!isset($hideTitleAndState)) : ?> |
3 | 3 | <input type="hidden" name="path" value="<?= $request::$get['path'] ?>"/> |
4 | - <? else : ?> |
|
4 | + <? else { |
|
5 | + : ?> |
|
5 | 6 | <input type="hidden" name="formId" value="<?= $formId ?>"/> |
6 | 7 | <a name="<?= $formId ?>"></a> |
7 | 8 | <? endif ?> |
@@ -17,15 +18,19 @@ discard block |
||
17 | 18 | <input required="required" value="<?=isset($document) ? $document->title : '' ?>" type="text" id="title" name="title" placeholder="Title" /> |
18 | 19 | </div> |
19 | 20 | <? endif ?> |
20 | - <?$fieldPrefix='fields';?> |
|
21 | + <?$fieldPrefix='fields'; |
|
22 | +} |
|
23 | +?> |
|
21 | 24 | <? foreach ($documentType->fields as $field) : ?> |
22 | 25 | <div class="form-element"> |
23 | 26 | <label for="<?=$field->slug?>"><?=$field->title?></label> |
24 | 27 | <? if (isset($document)) : |
25 | 28 | $fieldSlug = $field->slug; |
26 | 29 | $value = isset($document->fields->$fieldSlug) ? current($document->fields->$fieldSlug) : ''; |
27 | - else : |
|
30 | + else { |
|
31 | + : |
|
28 | 32 | $value = ''; |
33 | + } |
|
29 | 34 | endif ?> |
30 | 35 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
31 | 36 | <ul class="grid-wrapper sortable"> |
@@ -135,8 +140,11 @@ discard block |
||
135 | 140 | </ul> |
136 | 141 | <a class="btn" onclick="addDynamicBrick(this, 'true', 'newBrickDropzone_<?=$static_brick_nr?>');">+</a> |
137 | 142 | <?$static_brick_nr += 1?> |
138 | - <? else : ?> |
|
139 | - <?$fieldPrefix='bricks[' . $brick->slug . '][fields]';?> |
|
143 | + <? else { |
|
144 | + : ?> |
|
145 | + <?$fieldPrefix='bricks[' . $brick->slug . '][fields]'; |
|
146 | +} |
|
147 | +?> |
|
140 | 148 | <input type="hidden" name="bricks[<?=$brick->slug?>][type]" value="<?=$brick->brickSlug?>" /> |
141 | 149 | <? foreach ($brick->structure->fields as $field) : ?> |
142 | 150 | <div class="form-element"> |
@@ -145,8 +153,10 @@ discard block |
||
145 | 153 | $brickSlug = $brick->slug; |
146 | 154 | $fieldSlug = $field->slug; |
147 | 155 | $value = isset($document->bricks->$brickSlug->fields->$fieldSlug) ? current($document->bricks->$brickSlug->fields->$fieldSlug) : ''; |
148 | - else : |
|
156 | + else { |
|
157 | + : |
|
149 | 158 | $value = ''; |
159 | + } |
|
150 | 160 | endif ?> |
151 | 161 | <? if ($field->multiple == true && $field->type != 'Rich Text') : ?> |
152 | 162 | <ul class="grid-wrapper sortable"> |
@@ -27,7 +27,9 @@ |
||
27 | 27 | |
28 | 28 | // Define which ratio will be used, depending on which is the smallest side |
29 | 29 | $ratio = min($hRatio, $wRatio); |
30 | - if ($ratio > 1) $ratio = 1; |
|
30 | + if ($ratio > 1) { |
|
31 | + $ratio = 1; |
|
32 | + } |
|
31 | 33 | |
32 | 34 | // Define sizes |
33 | 35 | $this->_destWidth = floor($originalWidth * $ratio); |
@@ -37,7 +37,9 @@ |
||
37 | 37 | |
38 | 38 | // Define which ratio will be used, depending on which is the biggest side |
39 | 39 | $ratio = $wRatio < $hRatio ? $wRatio : $hRatio; |
40 | - if ($ratio < 1) $ratio = 1; |
|
40 | + if ($ratio < 1) { |
|
41 | + $ratio = 1; |
|
42 | + } |
|
41 | 43 | |
42 | 44 | // Calculate the destination width, height, x and y |
43 | 45 | $this->_destWidth = $originalWidth / $ratio; |
@@ -63,7 +63,9 @@ discard block |
||
63 | 63 | */ |
64 | 64 | protected function calculateX($imageResource) |
65 | 65 | { |
66 | - if (intval($this->_x) === $this->_x) return $this->_x; |
|
66 | + if (intval($this->_x) === $this->_x) { |
|
67 | + return $this->_x; |
|
68 | + } |
|
67 | 69 | |
68 | 70 | $x = strtolower($this->_x); |
69 | 71 | |
@@ -88,7 +90,9 @@ discard block |
||
88 | 90 | */ |
89 | 91 | public function calculateY($imageResource) |
90 | 92 | { |
91 | - if (intval($this->_y) === $this->_y) return $this->_y; |
|
93 | + if (intval($this->_y) === $this->_y) { |
|
94 | + return $this->_y; |
|
95 | + } |
|
92 | 96 | |
93 | 97 | $y = strtolower($this->_y); |
94 | 98 | |
@@ -125,7 +129,9 @@ discard block |
||
125 | 129 | */ |
126 | 130 | public function GetWatermark() |
127 | 131 | { |
128 | - if ($this->_watermark == null) throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark'); |
|
132 | + if ($this->_watermark == null) { |
|
133 | + throw new \Exception('A watermark is not set. Please supply a \CloudControl\Cms\image\Image using $this->SetWatermark'); |
|
134 | + } |
|
129 | 135 | return $this->_watermark; |
130 | 136 | } |
131 | 137 |
@@ -78,12 +78,15 @@ |
||
78 | 78 | */ |
79 | 79 | public static function humanFileSize($size, $unit = "") |
80 | 80 | { |
81 | - if ((!$unit && $size >= 1 << 30) || $unit == "GB") |
|
82 | - return number_format($size / (1 << 30), 2) . "GB"; |
|
83 | - if ((!$unit && $size >= 1 << 20) || $unit == "MB") |
|
84 | - return number_format($size / (1 << 20), 2) . "MB"; |
|
85 | - if ((!$unit && $size >= 1 << 10) || $unit == "KB") |
|
86 | - return number_format($size / (1 << 10), 2) . "KB"; |
|
81 | + if ((!$unit && $size >= 1 << 30) || $unit == "GB") { |
|
82 | + return number_format($size / (1 << 30), 2) . "GB"; |
|
83 | + } |
|
84 | + if ((!$unit && $size >= 1 << 20) || $unit == "MB") { |
|
85 | + return number_format($size / (1 << 20), 2) . "MB"; |
|
86 | + } |
|
87 | + if ((!$unit && $size >= 1 << 10) || $unit == "KB") { |
|
88 | + return number_format($size / (1 << 10), 2) . "KB"; |
|
89 | + } |
|
87 | 90 | |
88 | 91 | return number_format($size) . " bytes"; |
89 | 92 | } |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | <a href="<?= $request::$subfolders ?><?= $cmsPrefix ?>/search/update-index?returnUrl=<?=urlencode($request::$subfolders . $cmsPrefix . '/documents')?>" title="Update Index">Update Index</a> |
21 | 21 | <? endif ?> |
22 | 22 | </div> |
23 | - <? else : ?> |
|
23 | + <? else { |
|
24 | + : ?> |
|
24 | 25 | <div class="message valid"> |
25 | 26 | <i class="fa fa-check"></i> Search index is in sync with documents. |
26 | 27 | </div> |
@@ -52,7 +53,9 @@ discard block |
||
52 | 53 | <? foreach ($documents as $document) : ?> |
53 | 54 | <li class="grid-container"> |
54 | 55 | <? if ($document->type == 'document') : ?> |
55 | - <? renderDocument($document, $cmsPrefix, '', $request); ?> |
|
56 | + <? renderDocument($document, $cmsPrefix, '', $request); |
|
57 | +} |
|
58 | +?> |
|
56 | 59 | <? elseif ($document->type == 'folder') : ?> |
57 | 60 | <? renderFolder($document, $cmsPrefix, '', true, $request); ?> |
58 | 61 | <? endif ?> |
@@ -31,29 +31,29 @@ |
||
31 | 31 | </div> |
32 | 32 | <div class="documentActions grid-box-2"> |
33 | 33 | <? renderAction( |
34 | - $document->state == 'unpublished' || $document->unpublishedChanges, |
|
35 | - 'Publish', |
|
36 | - 'publish', |
|
37 | - $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
38 | - 'check'); ?> |
|
34 | + $document->state == 'unpublished' || $document->unpublishedChanges, |
|
35 | + 'Publish', |
|
36 | + 'publish', |
|
37 | + $request::$subfolders . $cmsPrefix . '/documents/publish-document?slug=' . $slugPrefix . $document->slug, |
|
38 | + 'check'); ?> |
|
39 | 39 | <? renderAction( |
40 | - $document->state == 'published', |
|
41 | - 'Unpublish', |
|
42 | - 'unpublish', |
|
43 | - $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
44 | - 'times'); ?> |
|
40 | + $document->state == 'published', |
|
41 | + 'Unpublish', |
|
42 | + 'unpublish', |
|
43 | + $request::$subfolders . $cmsPrefix . '/documents/unpublish-document?slug=' . $slugPrefix . $document->slug, |
|
44 | + 'times'); ?> |
|
45 | 45 | <? renderAction( |
46 | - true, |
|
47 | - 'Edit', |
|
48 | - '', |
|
49 | - $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
50 | - 'pencil'); ?> |
|
46 | + true, |
|
47 | + 'Edit', |
|
48 | + '', |
|
49 | + $request::$subfolders . $cmsPrefix . '/documents/edit-document?slug=' . $slugPrefix . $document->slug, |
|
50 | + 'pencil'); ?> |
|
51 | 51 | <? renderAction( |
52 | - $document->state == 'unpublished', |
|
53 | - 'Delete', |
|
54 | - 'error', |
|
55 | - $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
56 | - 'trash', |
|
57 | - 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
52 | + $document->state == 'unpublished', |
|
53 | + 'Delete', |
|
54 | + 'error', |
|
55 | + $request::$subfolders . $cmsPrefix . '/documents/delete-document?slug=' . $slugPrefix . $document->slug, |
|
56 | + 'trash', |
|
57 | + 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
58 | 58 | </div> |
59 | 59 | <? } ?> |
@@ -17,18 +17,18 @@ |
||
17 | 17 | </div> |
18 | 18 | <div class="documentActions grid-box-4"> |
19 | 19 | <? renderAction( |
20 | - true, |
|
21 | - 'Edit', |
|
22 | - '', |
|
23 | - $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug, |
|
24 | - 'pencil'); ?> |
|
20 | + true, |
|
21 | + 'Edit', |
|
22 | + '', |
|
23 | + $request::$subfolders . $cmsPrefix . '/documents/edit-folder?slug=' . $slugPrefix . $document->slug, |
|
24 | + 'pencil'); ?> |
|
25 | 25 | <? renderAction( |
26 | - true, |
|
27 | - 'Delete', |
|
28 | - 'error', |
|
29 | - $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug, |
|
30 | - 'trash', |
|
31 | - 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
26 | + true, |
|
27 | + 'Delete', |
|
28 | + 'error', |
|
29 | + $request::$subfolders . $cmsPrefix . '/documents/delete-folder?slug=' . $slugPrefix . $document->slug, |
|
30 | + 'trash', |
|
31 | + 'return confirm(\'Are you sure you want to delete this document?\');'); ?> |
|
32 | 32 | </div> |
33 | 33 | <ul class="documents grid-wrapper nested<?= $root ? ' root' : '' ?>"> |
34 | 34 | <? foreach ($document->getContent() as $subDocument) : ?> |