@@ -32,7 +32,7 @@ |
||
32 | 32 | public $distinct = false; |
33 | 33 | |
34 | 34 | /** |
35 | - * @param $instance |
|
35 | + * @param $instance |
|
36 | 36 | */ |
37 | 37 | public function __construct($instance = null) { |
38 | 38 | if (!$instance) { |
@@ -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 | ]; |
@@ -128,6 +128,7 @@ |
||
128 | 128 | * Get cache dir for app |
129 | 129 | * |
130 | 130 | * @param App $app |
131 | + * @param string $dirname |
|
131 | 132 | * @return string |
132 | 133 | */ |
133 | 134 | public static function getDir($dirname, $app = null) { |
@@ -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'] . '"' : ''; ?> /> |
@@ -1,9 +1,9 @@ |
||
1 | 1 | <div class="item"> |
2 | 2 | <?php |
3 | - if ($item->badge && $item->badge->image) { |
|
4 | - echo "<img class = 'item-icon-badge' src = '{$item->badge->image->path}' />"; |
|
5 | - } |
|
6 | - ?> |
|
3 | + if ($item->badge && $item->badge->image) { |
|
4 | + echo "<img class = 'item-icon-badge' src = '{$item->badge->image->path}' />"; |
|
5 | + } |
|
6 | + ?> |
|
7 | 7 | <h4 class="item-name"> |
8 | 8 | <a href="/ecommerce/view/<?= $item->id; ?>"> |
9 | 9 | <?= $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 | } |
@@ -40,6 +40,9 @@ |
||
40 | 40 | } |
41 | 41 | } |
42 | 42 | |
43 | + /** |
|
44 | + * @return string |
|
45 | + */ |
|
43 | 46 | public function getRealPath() { |
44 | 47 | $sitePath = \App::$primary->path; |
45 | 48 | return "{$sitePath}{$this->path}"; |