@@ -168,20 +168,20 @@ |
||
168 | 168 | <h5 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h5> |
169 | 169 | <ul> |
170 | 170 | <?php |
171 | - foreach ($condition->items as $item) { |
|
172 | - $itemComplete = $item->checkComplete($userId); |
|
173 | - switch ($item->type) { |
|
174 | - case 'event': |
|
171 | + foreach ($condition->items as $item) { |
|
172 | + $itemComplete = $item->checkComplete($userId); |
|
173 | + switch ($item->type) { |
|
174 | + case 'event': |
|
175 | 175 | $name = \Events\Event::get($item->value, 'event')->name(); |
176 | - break; |
|
177 | - } |
|
178 | - ?> |
|
176 | + break; |
|
177 | + } |
|
178 | + ?> |
|
179 | 179 | <li> |
180 | 180 | <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount($userId); ?></b>/<?= $item->count; ?> <br /> |
181 | 181 | </li> |
182 | 182 | <?php |
183 | - } |
|
184 | - ?> |
|
183 | + } |
|
184 | + ?> |
|
185 | 185 | </ul> |
186 | 186 | <?php |
187 | 187 | } |
@@ -24,20 +24,20 @@ |
||
24 | 24 | </div> |
25 | 25 | <div class="col-sm-9"> |
26 | 26 | <?php |
27 | - if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) { |
|
28 | - foreach ($sections as $section) { |
|
29 | - if (!empty($section['smallWidget'])) { |
|
30 | - $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget']; |
|
31 | - $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1; |
|
32 | - ?> |
|
27 | + if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) { |
|
28 | + foreach ($sections as $section) { |
|
29 | + if (!empty($section['smallWidget'])) { |
|
30 | + $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget']; |
|
31 | + $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1; |
|
32 | + ?> |
|
33 | 33 | <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $this->widget($widgetName); ?></div> |
34 | 34 | <?php |
35 | - } |
|
36 | - } |
|
37 | - } else { |
|
38 | - $this->widget($sections[$activeSection]['fullWidget']); |
|
39 | - } |
|
40 | - ?> |
|
35 | + } |
|
36 | + } |
|
37 | + } else { |
|
38 | + $this->widget($sections[$activeSection]['fullWidget']); |
|
39 | + } |
|
40 | + ?> |
|
41 | 41 | </div> |
42 | 42 | </div> |
43 | 43 | </div> |
44 | 44 | \ No newline at end of file |
@@ -8,10 +8,10 @@ discard block |
||
8 | 8 | <div class="form-group"> |
9 | 9 | <label>Регистрация через соц.сети</label><br /> |
10 | 10 | <?php |
11 | - foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) { |
|
12 | - echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
13 | - } |
|
14 | - ?> |
|
11 | + foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) { |
|
12 | + echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
13 | + } |
|
14 | + ?> |
|
15 | 15 | </div> |
16 | 16 | <?php |
17 | 17 | } |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | <?php $form->input('date', 'user_birthday', 'Дата рождения'); ?> |
28 | 28 | <?php $form->input('text', 'user_city', 'Город'); ?> |
29 | 29 | <?php |
30 | - if (!empty(App::$cur->users->config['invites'])) { |
|
31 | - ?> |
|
30 | + if (!empty(App::$cur->users->config['invites'])) { |
|
31 | + ?> |
|
32 | 32 | <div class ='form-group'> |
33 | 33 | <label><?= !empty(App::$cur->users->config['invitesName']) ? App::$cur->users->config['invitesName'] : 'Код приглашения'; ?></label> |
34 | 34 | <input type ='text' name ='invite_code' class ='form-control' value ="<?= (isset($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))); ?>" /> |
35 | 35 | </div> |
36 | 36 | <?php |
37 | - } |
|
38 | - ?> |
|
37 | + } |
|
38 | + ?> |
|
39 | 39 | </div> |
40 | 40 | <div class="col-sm-6"> |
41 | 41 | <div class ='form-group'> |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Group |
|
4 | - * |
|
5 | - * @author Alexey Krupskiy <[email protected]> |
|
6 | - * @link http://inji.ru/ |
|
7 | - * @copyright 2015 Alexey Krupskiy |
|
8 | - * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
9 | - */ |
|
3 | + * Group |
|
4 | + * |
|
5 | + * @author Alexey Krupskiy <[email protected]> |
|
6 | + * @link http://inji.ru/ |
|
7 | + * @copyright 2015 Alexey Krupskiy |
|
8 | + * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE |
|
9 | + */ |
|
10 | 10 | namespace Users; |
11 | 11 | |
12 | 12 | class Group extends \Model |
@@ -58,11 +58,11 @@ discard block |
||
58 | 58 | ]]); |
59 | 59 | ?>)</h3> |
60 | 60 | <?php |
61 | - foreach (\Dashboard\Comment::getList([ 'where' => [ |
|
62 | - ['item_id', $item->id], |
|
63 | - ['model', $modelName], |
|
64 | - ], 'order' => ['date_create', 'desc']]) as $comment) { |
|
65 | - ?> |
|
61 | + foreach (\Dashboard\Comment::getList([ 'where' => [ |
|
62 | + ['item_id', $item->id], |
|
63 | + ['model', $modelName], |
|
64 | + ], 'order' => ['date_create', 'desc']]) as $comment) { |
|
65 | + ?> |
|
66 | 66 | <div class="row"> |
67 | 67 | <div class="col-sm-3" style="max-width: 300px;"> |
68 | 68 | <a href='/admin/Users/view/User/<?= $comment->user->pk(); ?>'><?= $comment->user->name(); ?></a><br /> |
@@ -73,14 +73,14 @@ discard block |
||
73 | 73 | </div> |
74 | 74 | </div> |
75 | 75 | <?php |
76 | - } |
|
77 | - ?> |
|
76 | + } |
|
77 | + ?> |
|
78 | 78 | </div> |
79 | 79 | <div> |
80 | 80 | <?php |
81 | - $form = new \Ui\Form(); |
|
82 | - $form->begin(); |
|
83 | - $form->input('textarea', 'comment', 'Комментарий'); |
|
84 | - $form->end(); |
|
85 | - ?> |
|
81 | + $form = new \Ui\Form(); |
|
82 | + $form->begin(); |
|
83 | + $form->input('textarea', 'comment', 'Комментарий'); |
|
84 | + $form->end(); |
|
85 | + ?> |
|
86 | 86 | </div> |
@@ -14,29 +14,29 @@ |
||
14 | 14 | ?> |
15 | 15 | <form method = "POST" action = ""> |
16 | 16 | <?php |
17 | - if ($form->description) { |
|
18 | - echo "<p class = 'text-center'>{$form->description}</p>"; |
|
19 | - } |
|
20 | - foreach ($form->inputs(['order' => ['weight']]) as $input) { |
|
21 | - switch ($input->type) { |
|
22 | - case 'text': |
|
17 | + if ($form->description) { |
|
18 | + echo "<p class = 'text-center'>{$form->description}</p>"; |
|
19 | + } |
|
20 | + foreach ($form->inputs(['order' => ['weight']]) as $input) { |
|
21 | + switch ($input->type) { |
|
22 | + case 'text': |
|
23 | 23 | ?> |
24 | 24 | <div class ='form-group'> |
25 | 25 | <label><?= $input->label; ?></label> |
26 | 26 | <input class ='form-control' type ='text' name ='UserForms[<?= (int) $form_id; ?>][input<?= $input->id; ?>]' <?= $input->required ? 'required' : ''; ?> /> |
27 | 27 | </div> |
28 | 28 | <?php |
29 | - break; |
|
30 | - case 'textarea': |
|
29 | + break; |
|
30 | + case 'textarea': |
|
31 | 31 | ?> |
32 | 32 | <div class ='form-group'> |
33 | 33 | <label><?= $input->label; ?></label> |
34 | 34 | <textarea class ='form-control' name ='UserForms[<?= (int) $form_id; ?>][input<?= $input->id; ?>]' <?= $input->required ? 'required' : ''; ?> /></textarea> |
35 | 35 | </div> |
36 | 36 | <?php |
37 | - break; |
|
38 | - } |
|
39 | - } |
|
40 | - ?> |
|
37 | + break; |
|
38 | + } |
|
39 | + } |
|
40 | + ?> |
|
41 | 41 | <button class = 'btn btn-success btn-block'>Отправить</button> |
42 | 42 | </form> |
43 | 43 | \ No newline at end of file |
@@ -164,12 +164,12 @@ |
||
164 | 164 | <li><a href ='' onclick='inji.Ui.dataManagers.get(this).rowSelection("inverse");return false;'>Инвертировать</a></li> |
165 | 165 | <li role="separator" class="divider"></li> |
166 | 166 | <?php |
167 | - foreach ($actions as $action => $actionParams) { |
|
168 | - if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) { |
|
169 | - echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>"; |
|
170 | - } |
|
171 | - } |
|
172 | - ?> |
|
167 | + foreach ($actions as $action => $actionParams) { |
|
168 | + if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) { |
|
169 | + echo "<li><a href ='' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>"; |
|
170 | + } |
|
171 | + } |
|
172 | + ?> |
|
173 | 173 | </ul> |
174 | 174 | </div> |
175 | 175 | <?php |
@@ -23,17 +23,17 @@ |
||
23 | 23 | ?> |
24 | 24 | <ul class="treeview" data-col='tree_path'> |
25 | 25 | <?php |
26 | - if (is_string($objectRoot)) { |
|
27 | - $items = $objectRoot::getList(['where' => ['parent_id', 0]]); |
|
28 | - } else { |
|
29 | - $class = get_class($objectRoot); |
|
30 | - $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]); |
|
31 | - } |
|
32 | - $count += count($items); |
|
33 | - foreach ($items as $objectChild) { |
|
34 | - $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc); |
|
35 | - } |
|
36 | - ?> |
|
26 | + if (is_string($objectRoot)) { |
|
27 | + $items = $objectRoot::getList(['where' => ['parent_id', 0]]); |
|
28 | + } else { |
|
29 | + $class = get_class($objectRoot); |
|
30 | + $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]); |
|
31 | + } |
|
32 | + $count += count($items); |
|
33 | + foreach ($items as $objectChild) { |
|
34 | + $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc); |
|
35 | + } |
|
36 | + ?> |
|
37 | 37 | </ul> |
38 | 38 | <?php |
39 | 39 | return $count; |
@@ -61,12 +61,12 @@ discard block |
||
61 | 61 | </div> |
62 | 62 | </div> |
63 | 63 | <?php |
64 | - $packchecked = ''; |
|
65 | - $packItem = false; |
|
66 | - $packSum = 0; |
|
67 | - if ($packItem) { |
|
68 | - $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked'; |
|
69 | - ?> |
|
64 | + $packchecked = ''; |
|
65 | + $packItem = false; |
|
66 | + $packSum = 0; |
|
67 | + if ($packItem) { |
|
68 | + $packchecked = ((!empty($_POST) && empty($_POST['packs']))) ? '' : 'checked'; |
|
69 | + ?> |
|
70 | 70 | <fieldset id="additional"> |
71 | 71 | <h2 class="secondary-title">Дополнительно</h2> |
72 | 72 | <div class=" checkout-payment-form"> |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | </div> |
90 | 90 | </fieldset> |
91 | 91 | <?php |
92 | - } |
|
93 | - ?> |
|
92 | + } |
|
93 | + ?> |
|
94 | 94 | </div> |
95 | 95 | </div> |
96 | 96 | <div class="col-sm-8"> |
@@ -115,24 +115,24 @@ discard block |
||
115 | 115 | <div class="col-md-4"> |
116 | 116 | <ul class="nav nav-pills nav-stacked"> |
117 | 117 | <?php |
118 | - $hiddenId = Tools::randomString(); |
|
119 | - foreach ($payTypes as $payType) { |
|
120 | - if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || $payType->id == $cartPayType->id) { |
|
121 | - $checked = 'checked'; |
|
122 | - } else { |
|
123 | - $checked = ''; |
|
124 | - } |
|
125 | - echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
126 | - echo $payType->name; |
|
127 | - echo '</a></li>'; |
|
128 | - } |
|
129 | - $form->input('hidden', "payType", '', [ |
|
130 | - 'value' => $cartPayType->id, |
|
131 | - 'attributes' => [ |
|
132 | - 'id' => $hiddenId |
|
133 | - ], |
|
134 | - ]); |
|
135 | - ?> |
|
118 | + $hiddenId = Tools::randomString(); |
|
119 | + foreach ($payTypes as $payType) { |
|
120 | + if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || $payType->id == $cartPayType->id) { |
|
121 | + $checked = 'checked'; |
|
122 | + } else { |
|
123 | + $checked = ''; |
|
124 | + } |
|
125 | + echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
|
126 | + echo $payType->name; |
|
127 | + echo '</a></li>'; |
|
128 | + } |
|
129 | + $form->input('hidden', "payType", '', [ |
|
130 | + 'value' => $cartPayType->id, |
|
131 | + 'attributes' => [ |
|
132 | + 'id' => $hiddenId |
|
133 | + ], |
|
134 | + ]); |
|
135 | + ?> |
|
136 | 136 | </ul> |
137 | 137 | </div> |
138 | 138 | <div class="col-md-8"> |