Completed
Push — master ( 261f7b...6003a8 )
by Alexey
06:32
created
system/modules/Users/appControllers/content/login.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -5,15 +5,15 @@
 block discarded – undo
5 5
         <h3>Вход</h3>
6 6
         <div class="form-group">
7 7
           <?php
8
-          $socials = Users\Social::getList(['where' => ['active', 1]]);
9
-          if ($socials) {
10
-              echo 'Войти через: ';
11
-              foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
12
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
13
-                  echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
14
-              }
15
-          }
16
-          ?>
8
+            $socials = Users\Social::getList(['where' => ['active', 1]]);
9
+            if ($socials) {
10
+                echo 'Войти через: ';
11
+                foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
12
+                    $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
13
+                    echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
14
+                }
15
+            }
16
+            ?>
17 17
         </div>
18 18
         <form action = '' method = 'POST' >
19 19
           <div class ='row'>
Please login to merge, or discard this patch.
system/modules/Ui/widgets/ActiveForm/ActiveForm.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -9,33 +9,33 @@
 block discarded – undo
9 9
 ?>
10 10
 <div id ='<?= $id; ?>' class="uiActiveForm" data-modelname="<?= $activeForm->modelName; ?>" data-formname="<?= $activeForm->formName; ?>" data-inputs='<?= json_encode($formInputs); ?>'>
11 11
   <?php
12
-  $form->action = $activeForm->action;
13
-  $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : ''], ['activeForm' => $activeForm]);
12
+    $form->action = $activeForm->action;
13
+    $form->begin($activeForm->header, ['onsubmit' => $ajax ? 'inji.Ui.forms.submitAjax(this);return false;' : ''], ['activeForm' => $activeForm]);
14 14
 
15
-  if (empty($activeForm->form['noMapCell'])) {
16
-      foreach ($activeForm->form['map'] as $row) {
17
-          $colSize = 12 / count($row);
18
-          echo "<div class ='row'>";
19
-          foreach ($row as $col) {
20
-              echo "<div class = 'col-sm-{$colSize}'>";
21
-              if ($col) {
22
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
23
-              }
24
-              echo '</div>';
25
-          }
26
-          echo '</div>';
27
-      }
28
-  } else {
29
-      foreach ($activeForm->form['map'] as $row) {
30
-          foreach ($row as $col) {
31
-              if ($col) {
32
-                  $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
33
-              }
34
-          }
35
-      }
36
-  }
37
-  $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить', [], ['activeForm' => $activeForm]);
38
-  ?>
15
+    if (empty($activeForm->form['noMapCell'])) {
16
+        foreach ($activeForm->form['map'] as $row) {
17
+            $colSize = 12 / count($row);
18
+            echo "<div class ='row'>";
19
+            foreach ($row as $col) {
20
+                echo "<div class = 'col-sm-{$colSize}'>";
21
+                if ($col) {
22
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
23
+                }
24
+                echo '</div>';
25
+            }
26
+            echo '</div>';
27
+        }
28
+    } else {
29
+        foreach ($activeForm->form['map'] as $row) {
30
+            foreach ($row as $col) {
31
+                if ($col) {
32
+                    $activeForm->drawCol($col, $activeForm->inputs[$col], $form, $params);
33
+                }
34
+            }
35
+        }
36
+    }
37
+    $form->end($activeForm->model ? ($activeForm->model->pk() ? 'Сохранить' : 'Создать') : 'Отправить', [], ['activeForm' => $activeForm]);
38
+    ?>
39 39
 </div>
40 40
 <script>
41 41
     inji.onLoad(function () {
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/begin.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
     }
9 9
     ?>>
10 10
       <?php
11
-  }
12
-  ?>
11
+    }
12
+    ?>
13 13
   <?= !empty($header) ? "<h1>{$header}</h1>" : ''; ?>
14 14
     
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/end.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,10 +5,10 @@
 block discarded – undo
5 5
         <div class="form-group">
6 6
           <button class ='btn btn-primary' 
7 7
                   <?php
8
-                  foreach ($attributs as $attribute => $value) {
9
-                      echo " {$attribute} = '{$value}' ";
10
-                  }
11
-                  ?>
8
+                    foreach ($attributs as $attribute => $value) {
9
+                        echo " {$attribute} = '{$value}' ";
10
+                    }
11
+                    ?>
12 12
                   ><?= $btnText; ?></button>
13 13
         </div>
14 14
         <?php
Please login to merge, or discard this patch.
system/modules/Ui/objects/Tree.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -23,17 +23,17 @@
 block discarded – undo
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()], 'order' => $order]);
31
-          }
32
-          $count += count($items);
33
-          foreach ($items as $objectChild) {
34
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
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()], 'order' => $order]);
31
+            }
32
+            $count += count($items);
33
+            foreach ($items as $objectChild) {
34
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
35
+            }
36
+            ?>
37 37
         </ul>
38 38
         <?php
39 39
         return $count;
Please login to merge, or discard this patch.
system/modules/Sliders/widgets/slider.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
         ?>
33 33
         <div class="item <?= !$i ? 'active' : ''; ?>">
34 34
           <?php
35
-          if ($item->link) {
36
-              echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
37
-          }
38
-          ?>
35
+            if ($item->link) {
36
+                echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
37
+            }
38
+            ?>
39 39
           <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
40 40
           <div class="carousel-caption">
41 41
             <?= $item->description; ?>
42 42
           </div>
43 43
           <?php
44
-          if ($item->link) {
45
-              echo "</a>";
46
-          }
47
-          ?>
44
+            if ($item->link) {
45
+                echo "</a>";
46
+            }
47
+            ?>
48 48
         </div>
49 49
         <?php
50 50
         $i++;
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
   </div>
54 54
 
55 55
   <?php
56
-  if (!isset($arrows) || $arrows) {
57
-      ?>
56
+    if (!isset($arrows) || $arrows) {
57
+        ?>
58 58
       <!-- Controls -->
59 59
       <a class="left carousel-control" href="#sliderWidget-<?= $slider->id; ?>" role="button" data-slide="prev">
60 60
         <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
@@ -65,6 +65,6 @@  discard block
 block discarded – undo
65 65
         <span class="sr-only">Next</span>
66 66
       </a>
67 67
       <?php
68
-  }
69
-  ?>
68
+    }
69
+    ?>
70 70
 </div>
71 71
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/categorys.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,6 +9,6 @@
 block discarded – undo
9 9
 <a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='<?= $model::index(); ?>' data-path ='/' data-id='0'> Корень</a>
10 10
 <div class="categoryTree">
11 11
   <?php
12
-  $dataManager->drawCategorys();
13
-  ?>
12
+    $dataManager->drawCategorys();
13
+    ?>
14 14
 </div>
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Widgets/appAdminControllers/content/widgetChooser.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
 <select class ='form-control' id = 'widgetChooser' onchange="selectChange(this);">
30 30
   <option value = ''>Выберите виджет</option>
31 31
   <?php
32
-  foreach ($widgets as $code => $options) {
33
-      $name = is_string($options) ? $options : $options['name'];
34
-      echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
35
-  }
36
-  ?>
32
+    foreach ($widgets as $code => $options) {
33
+        $name = is_string($options) ? $options : $options['name'];
34
+        echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
35
+    }
36
+    ?>
37 37
 </select>
38 38
 <?php
39 39
 foreach ($widgets as $code => $options) {
Please login to merge, or discard this patch.