@@ -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'] . '"' : ''; ?> /> |
@@ -61,6 +61,10 @@ |
||
61 | 61 | Inji::$inst->unBlockParallel(); |
62 | 62 | } |
63 | 63 | |
64 | + /** |
|
65 | + * @param string $command |
|
66 | + * @param string $path |
|
67 | + */ |
|
64 | 68 | public static function command($command, $needOutput = true, $path = null) { |
65 | 69 | while (!Inji::$inst->blockParallel()) { |
66 | 70 | sleep(2); |
@@ -15,6 +15,9 @@ |
||
15 | 15 | |
16 | 16 | public $xml = null; |
17 | 17 | |
18 | + /** |
|
19 | + * @param \SimpleXMLElement $xml |
|
20 | + */ |
|
18 | 21 | public function __construct($xml) { |
19 | 22 | $this->xml = $xml; |
20 | 23 | } |
@@ -145,6 +145,9 @@ discard block |
||
145 | 145 | return $result[1]; |
146 | 146 | } |
147 | 147 | |
148 | + /** |
|
149 | + * @param string $source |
|
150 | + */ |
|
148 | 151 | public function parseSource($source) { |
149 | 152 | $tags = $this->parseRaw($source); |
150 | 153 | foreach ($tags as $rawTag) { |
@@ -190,6 +193,9 @@ discard block |
||
190 | 193 | return substr($source, ($pos + strlen($rawTag) + 2)); |
191 | 194 | } |
192 | 195 | |
196 | + /** |
|
197 | + * @param string $type |
|
198 | + */ |
|
193 | 199 | public function getHref($type, $params) { |
194 | 200 | $href = ''; |
195 | 201 | if (is_string($params)) { |
@@ -518,6 +524,9 @@ discard block |
||
518 | 524 | } |
519 | 525 | } |
520 | 526 | |
527 | + /** |
|
528 | + * @param string $type |
|
529 | + */ |
|
521 | 530 | public function customAsset($type, $asset, $lib = false) { |
522 | 531 | if (!$lib) { |
523 | 532 | $this->dynAssets[$type][] = $asset; |
@@ -540,6 +549,9 @@ discard block |
||
540 | 549 | } |
541 | 550 | } |
542 | 551 | |
552 | + /** |
|
553 | + * @param string $lineParams |
|
554 | + */ |
|
543 | 555 | public function widget($_widgetName, $_params = [], $lineParams = null) { |
544 | 556 | $_paths = $this->getWidgetPaths($_widgetName); |
545 | 557 | $find = false; |
@@ -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> |
@@ -16,7 +16,7 @@ |
||
16 | 16 | static $name = 'PickPoint - курьерская служба'; |
17 | 17 | |
18 | 18 | /** |
19 | - * @param \Ecommerce\Cart $cart |
|
19 | + * @param string $URL |
|
20 | 20 | * @return \Money\Sums |
21 | 21 | */ |
22 | 22 | static function curl_get_file_contents($URL, $data) { |