@@ -2,9 +2,9 @@ |
||
2 | 2 | <div class="row"> |
3 | 3 | <div class="col-md-3"> |
4 | 4 | <?php |
5 | - $category = $material->category; |
|
6 | - $this->widget('Materials\categoryTree', ['category' => $category]); |
|
7 | - ?> |
|
5 | + $category = $material->category; |
|
6 | + $this->widget('Materials\categoryTree', ['category' => $category]); |
|
7 | + ?> |
|
8 | 8 | </div> |
9 | 9 | <div class="col-md-9"> |
10 | 10 | <div class="content"> |
@@ -5,6 +5,6 @@ |
||
5 | 5 | 'file' => 'index.html', |
6 | 6 | 'css' => ['style.css'], |
7 | 7 | 'libs' => [ |
8 | - 'JqueryUi', 'PaperTheme','FancyBox' |
|
8 | + 'JqueryUi', 'PaperTheme','FancyBox' |
|
9 | 9 | ] |
10 | 10 | ]; |
@@ -5,9 +5,9 @@ discard block |
||
5 | 5 | <?php if (empty($noIndicators)) { ?> |
6 | 6 | <ol class="carousel-indicators"> |
7 | 7 | <?php |
8 | - $i = 0; |
|
9 | - for ($i = 0; $i < count($slides); $i++) { |
|
10 | - ?> |
|
8 | + $i = 0; |
|
9 | + for ($i = 0; $i < count($slides); $i++) { |
|
10 | + ?> |
|
11 | 11 | <li data-target="#<?= $id; ?>" data-slide-to="<?= $i; ?>" <?= !$i ? 'class="active"' : ''; ?>></li> |
12 | 12 | <?php |
13 | 13 | } |
@@ -18,9 +18,9 @@ discard block |
||
18 | 18 | <!-- Wrapper for slides --> |
19 | 19 | <div class="carousel-inner" role="listbox"> |
20 | 20 | <?php |
21 | - $i = 0; |
|
22 | - foreach ($slides as $item) { |
|
23 | - ?> |
|
21 | + $i = 0; |
|
22 | + foreach ($slides as $item) { |
|
23 | + ?> |
|
24 | 24 | <div class="item <?= !$i ? 'active' : ''; ?>"> |
25 | 25 | <?= !empty($item['href']) ? "<a href = '{$item['href']}' style = 'display:inline-block;'>" : ''; ?> |
26 | 26 | <img src="<?= $item['image']; ?>" <?= !empty($item['image']) ? 'alt="' . $item['name'] . '"' : ''; ?> /> |
@@ -12,9 +12,9 @@ |
||
12 | 12 | <div class ="category-materials"> |
13 | 13 | <div class ="row"> |
14 | 14 | <?php |
15 | - $i = 0; |
|
16 | - foreach ($materials as $material) { |
|
17 | - ?> |
|
15 | + $i = 0; |
|
16 | + foreach ($materials as $material) { |
|
17 | + ?> |
|
18 | 18 | <div class = "col-sm-6 category-material"> |
19 | 19 | <a class="category-material-name" href ="<?= $material->getHref(); ?>"><h3><?= $material->name; ?></h3></a> |
20 | 20 | <div class="category-material-preview"><?= $material->preview; ?></div> |
@@ -1,21 +1,21 @@ |
||
1 | 1 | <h1>Установка модулей</h1> |
2 | 2 | <form> |
3 | 3 | <?php |
4 | - $config = Config::app(App::$primary ? App::$primary : App::$cur); |
|
5 | - $modules = array_flip(Module::getInstalled(App::$cur)); |
|
6 | - if (file_exists(App::$primary->path . '/modules')) { |
|
7 | - $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
|
8 | - } |
|
9 | - else { |
|
10 | - $appModules=[]; |
|
11 | - } |
|
12 | - $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
|
13 | - foreach ($systemModules as $module) { |
|
14 | - $info = Module::getInfo($module); |
|
15 | - if (!$info || isset($modules[$module])) { |
|
16 | - continue; |
|
17 | - } |
|
18 | - ?> |
|
4 | + $config = Config::app(App::$primary ? App::$primary : App::$cur); |
|
5 | + $modules = array_flip(Module::getInstalled(App::$cur)); |
|
6 | + if (file_exists(App::$primary->path . '/modules')) { |
|
7 | + $appModules = array_slice(scandir(App::$primary->path . '/modules'), 2); |
|
8 | + } |
|
9 | + else { |
|
10 | + $appModules=[]; |
|
11 | + } |
|
12 | + $systemModules = array_merge(array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2), $appModules); |
|
13 | + foreach ($systemModules as $module) { |
|
14 | + $info = Module::getInfo($module); |
|
15 | + if (!$info || isset($modules[$module])) { |
|
16 | + continue; |
|
17 | + } |
|
18 | + ?> |
|
19 | 19 | <div class ="form-group"> |
20 | 20 | <div class="checkbox"> |
21 | 21 | <label> |
@@ -38,25 +38,25 @@ |
||
38 | 38 | <span class="caption">Вид:</span> |
39 | 39 | <span class="group"> |
40 | 40 | <?php |
41 | - for ($i = 2; $i < 5; $i++) { |
|
42 | - $curLimit = $limit * $i; |
|
43 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
44 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
45 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
46 | - echo $curLimit; |
|
47 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
48 | - echo "</a> "; |
|
49 | - } |
|
50 | - if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
51 | - $curLimit = 'all'; |
|
52 | - $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
53 | - echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
54 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
55 | - echo 'Все'; |
|
56 | - echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
57 | - echo "</a> "; |
|
58 | - } |
|
59 | - ?> |
|
41 | + for ($i = 2; $i < 5; $i++) { |
|
42 | + $curLimit = $limit * $i; |
|
43 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
44 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
45 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
46 | + echo $curLimit; |
|
47 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
48 | + echo "</a> "; |
|
49 | + } |
|
50 | + if (!empty(App::$cur->ecommerce->config['list_all'])) { |
|
51 | + $curLimit = 'all'; |
|
52 | + $curQuery = http_build_query(array_merge($query, ['limit' => $curLimit])); |
|
53 | + echo " <a rel=\"nofollow\" href='{$path}?{$curQuery}'>"; |
|
54 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '<b>' : ''; |
|
55 | + echo 'Все'; |
|
56 | + echo !empty($_GET['limit']) && $_GET['limit'] == $curLimit ? '</b>' : ''; |
|
57 | + echo "</a> "; |
|
58 | + } |
|
59 | + ?> |
|
60 | 60 | </span> |
61 | 61 | <span class="group"> |
62 | 62 | <a rel="nofollow" href='#' onclick="inji.onLoad(function () { |
@@ -21,16 +21,16 @@ |
||
21 | 21 | zoom: 13 |
22 | 22 | }); |
23 | 23 | <?php |
24 | - if (!empty($options['value'])) { |
|
25 | - ?> |
|
24 | + if (!empty($options['value'])) { |
|
25 | + ?> |
|
26 | 26 | myMapCurPin = new ymaps.Placemark(["<?= !empty($options['value']['lat']) ? $options['value']['lat'] : '56.01'; ?>", "<?= !empty($options['value']['lng']) ? $options['value']['lng'] : '92.85'; ?>"], |
27 | 27 | {iconContent: "<?= !empty($options['value']['address']) ? $options['value']['address'] : implode(',', $options['value']); ?>"}, |
28 | 28 | {preset: 'islands#greenStretchyIcon'} |
29 | 29 | ); |
30 | 30 | myMap.geoObjects.add(myMapCurPin, 0); |
31 | 31 | <?php |
32 | - } |
|
33 | - ?> |
|
32 | + } |
|
33 | + ?> |
|
34 | 34 | myMap.events.add('click', function (e) { |
35 | 35 | var myCoords = e.get('coords'); |
36 | 36 | $('#mapinputs' + uid + ' .lat').val(myCoords[0]); |