Commit d7febe915bb8a653871c028838ee557c5a1907be
Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
71 additions
and
18 deletions
Show diff stats
backend/views/objectkb/_form_language.php
1 | 1 | <?php |
2 | - use artbox\core\components\imagemanager\components\ImageManagerInputWidget; | |
2 | + | |
3 | 3 | use artbox\core\models\Language; |
4 | 4 | use dosamigos\tinymce\TinyMce; |
5 | 5 | use yii\web\View; |
6 | 6 | use yii\widgets\ActiveForm; |
7 | 7 | use artbox\core\helpers\SlugifyDecorator; |
8 | + use yii\helpers\Url; | |
9 | + use yii\web\JsExpression; | |
8 | 10 | |
9 | 11 | /** |
10 | 12 | * @var \artbox\core\models\SlideLang $model_lang |
... | ... | @@ -29,9 +31,60 @@ |
29 | 31 | |
30 | 32 | |
31 | 33 | echo $form->field($model_lang, '[' . $language->id . ']upper_text') |
32 | - ->textarea([ 'rows' => 7 ]); | |
34 | + ->widget( | |
35 | + TinyMce::className(), | |
36 | + [ | |
37 | + 'options' => [ 'rows' => 30 ], | |
38 | + 'language' => 'ru', | |
39 | + 'clientOptions' => [ | |
40 | + 'file_browser_callback' => new JsExpression( | |
41 | + "function(field_name, url, type, win) { | |
42 | +window.open('" . Url::to( | |
43 | + [ | |
44 | + 'imagemanager/manager', | |
45 | + 'view-mode' => 'iframe', | |
46 | + 'select-type' => 'tinymce', | |
47 | + ] | |
48 | + ) . "&tag_name='+field_name,'','width=800,height=540 ,toolbar=no,status=no,menubar=no,scrollbars=no,resizable=no'); | |
49 | +}" | |
50 | + ), | |
51 | + 'plugins' => [ | |
52 | + "advlist autolink lists link charmap print preview anchor", | |
53 | + "searchreplace visualblocks code fullscreen", | |
54 | + "insertdatetime media table contextmenu paste image", | |
55 | + ], | |
56 | + 'toolbar' => "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | code", | |
57 | + 'image_advtab' => true, | |
58 | + ], | |
59 | + ] | |
60 | + ); | |
33 | 61 | |
34 | 62 | echo $form->field($model_lang, '[' . $language->id . ']about_object_text') |
35 | - ->textarea([ 'rows' => 7 ]); | |
36 | - | |
63 | + ->widget( | |
64 | + TinyMce::className(), | |
65 | + [ | |
66 | + 'options' => [ 'rows' => 30 ], | |
67 | + 'language' => 'ru', | |
68 | + 'clientOptions' => [ | |
69 | + 'file_browser_callback' => new JsExpression( | |
70 | + "function(field_name, url, type, win) { | |
71 | +window.open('" . Url::to( | |
72 | + [ | |
73 | + 'imagemanager/manager', | |
74 | + 'view-mode' => 'iframe', | |
75 | + 'select-type' => 'tinymce', | |
76 | + ] | |
77 | + ) . "&tag_name='+field_name,'','width=800,height=540 ,toolbar=no,status=no,menubar=no,scrollbars=no,resizable=no'); | |
78 | +}" | |
79 | + ), | |
80 | + 'plugins' => [ | |
81 | + "advlist autolink lists link charmap print preview anchor", | |
82 | + "searchreplace visualblocks code fullscreen", | |
83 | + "insertdatetime media table contextmenu paste image", | |
84 | + ], | |
85 | + 'toolbar' => "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image | code", | |
86 | + 'image_advtab' => true, | |
87 | + ], | |
88 | + ] | |
89 | + ); | |
37 | 90 | ?> |
38 | 91 | \ No newline at end of file | ... | ... |
frontend/views/object/view.php
... | ... | @@ -41,7 +41,7 @@ |
41 | 41 | |
42 | 42 | <section class="margin-top: 30px;"> |
43 | 43 | <div class="row portfolio-project"> |
44 | - <div class="col-md-8"> | |
44 | + <div class="col-md-12"> | |
45 | 45 | <div class="heading"> |
46 | 46 | <h3>Про объект</h3> |
47 | 47 | </div> |
... | ... | @@ -51,19 +51,19 @@ |
51 | 51 | </p> |
52 | 52 | |
53 | 53 | </div> |
54 | - <div class="col-md-4 project-more"> | |
55 | - <div class="heading"> | |
56 | - <h3>Дополнительно</h3> | |
57 | - </div> | |
58 | - <h4>КЛИЕНТАМ</h4> | |
59 | - <p>Нет ограничений по возрасту</p> | |
60 | - <h4>ЦЕНА</h4> | |
61 | - <p>В стоимость включен визажист и стилист</p> | |
62 | - <h4>ОБОРУДОВАНИЕ</h4> | |
63 | - <p>Canon Mark 5d</p> | |
64 | - <h4>СТИЛЬ ФОТО</h4> | |
65 | - <p>Глянец, fashion, гранж, стандарт</p> | |
66 | - </div> | |
54 | +<!-- <div class="col-md-4 project-more">--> | |
55 | +<!-- <div class="heading">--> | |
56 | +<!-- <h3>Дополнительно</h3>--> | |
57 | +<!-- </div>--> | |
58 | +<!-- <h4>КЛИЕНТАМ</h4>--> | |
59 | +<!-- <p>Нет ограничений по возрасту</p>--> | |
60 | +<!-- <h4>ЦЕНА</h4>--> | |
61 | +<!-- <p>В стоимость включен визажист и стилист</p>--> | |
62 | +<!-- <h4>ОБОРУДОВАНИЕ</h4>--> | |
63 | +<!-- <p>Canon Mark 5d</p>--> | |
64 | +<!-- <h4>СТИЛЬ ФОТО</h4>--> | |
65 | +<!-- <p>Глянец, fashion, гранж, стандарт</p>--> | |
66 | +<!-- </div>--> | |
67 | 67 | </div> |
68 | 68 | </section> |
69 | 69 | ... | ... |