Alexey Boroda / openeurope

Commit f27e5c7857d3c9f5db5f6844674842e73a4b72de

Authored by Alexey Boroda
2 parents 42cdd20e 47d2ce1f

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 12 additions and 8 deletions   Show diff stats
Inline Side-by-side
common/messages/ua/core.php
  Show/Hide comments   View file @f27e5c7
1 <?php 1 <?php
2 2
3 return [ 3 return [
4 - 'name'=>'Ім\'я',  
5 - 'email'=>'Email',  
6 - 'phone'=>'Телефон',  
7 - 'message'=>'Повідомленя',  
8 - 'Name'=>'Ім\'я',  
9 - 'Email'=>'Email',  
10 - 'Phone'=>'Телефон',  
11 - 'Message'=>'Повідомленя' 4 + 'name' =>'Ім\'я',
  5 + 'email' =>'Email',
  6 + 'phone' =>'Телефон',
  7 + 'message' =>'Повідомленя',
  8 + 'Name' =>'Ім\'я',
  9 + 'Email' =>'Email',
  10 + 'Phone' =>'Телефон',
  11 + 'Message' => 'Повідомленя',
  12 + #'Send message'=>'Відправити повідомлення'
12 ]; 13 ];
13 \ No newline at end of file 14 \ No newline at end of file
frontend/config/main.php
  Show/Hide comments   View file @f27e5c7
@@ -130,6 +130,8 @@ @@ -130,6 +130,8 @@
130 setTimeout(function(){$(".success_").animate({opacity: 0, top: \'0\'}, 200,function(){ 130 setTimeout(function(){$(".success_").animate({opacity: 0, top: \'0\'}, 200,function(){
131 $(this).removeClass("done_"); 131 $(this).removeClass("done_");
132 })}, 4000); 132 })}, 4000);
  133 + var data = $("#feedback-form").data(\'yiiActiveForm\');
  134 + data.validated = false;
133 } 135 }
134 136
135 }', 137 }',
frontend/controllers/SiteController.php
  Show/Hide comments   View file @f27e5c7
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
51 */ 51 */
52 public function actionIndex() 52 public function actionIndex()
53 { 53 {
  54 +
54 $slides = Slide::find()->with('language')->where(['status' => true])->orderBy('sort')->all(); 55 $slides = Slide::find()->with('language')->where(['status' => true])->orderBy('sort')->all();
55 $articles = Article::find() 56 $articles = Article::find()
56 ->with('language') 57 ->with('language')