Anastasia / energyforum

Commit 1f0c5c46e3604674c5871a672317c8367caace12

Authored by alex
2 parents 9a961bfe 06df1d06

Merge remote-tracking branch 'origin/master'

Showing 3 changed files with 116 additions and 102 deletions   Show diff stats
Inline Side-by-side
common/models/Logo.php
  Show/Hide comments   View file @1f0c5c4
@@ -2,15 +2,16 @@ @@ -2,15 +2,16 @@
2 2
3 namespace common\models; 3 namespace common\models;
4 4
  5 +use artbox\core\models\Image;
5 use Yii; 6 use Yii;
6 7
7 /** 8 /**
8 * This is the model class for table "logo". 9 * This is the model class for table "logo".
9 * 10 *
10 - * @property int $id  
11 - * @property int $image_id 11 + * @property int $id
  12 + * @property int $image_id
12 * @property string $link 13 * @property string $link
13 - * @property int $sort 14 + * @property int $sort
14 */ 15 */
15 class Logo extends \yii\db\ActiveRecord 16 class Logo extends \yii\db\ActiveRecord
16 { 17 {
@@ -21,29 +22,34 @@ class Logo extends \yii\db\ActiveRecord @@ -21,29 +22,34 @@ class Logo extends \yii\db\ActiveRecord
21 { 22 {
22 return 'logo'; 23 return 'logo';
23 } 24 }
24 - 25 +
25 /** 26 /**
26 * {@inheritdoc} 27 * {@inheritdoc}
27 */ 28 */
28 public function rules() 29 public function rules()
29 { 30 {
30 return [ 31 return [
31 - [['image_id', 'sort'], 'default', 'value' => null],  
32 - [['image_id', 'sort'], 'integer'],  
33 - [['link'], 'string'], 32 + [ [ 'image_id', 'sort'], 'default', 'value' => null],
  33 + [ [ 'image_id', 'sort'], 'integer'],
  34 + [ [ 'link'], 'string'],
34 ]; 35 ];
35 } 36 }
36 - 37 +
37 /** 38 /**
38 * {@inheritdoc} 39 * {@inheritdoc}
39 */ 40 */
40 public function attributeLabels() 41 public function attributeLabels()
41 { 42 {
42 return [ 43 return [
43 - 'id' => Yii::t('app', 'ID'), 44 + 'id' => Yii::t('app', 'ID'),
44 'image_id' => Yii::t('app', 'Image ID'), 45 'image_id' => Yii::t('app', 'Image ID'),
45 - 'link' => Yii::t('app', 'Link'),  
46 - 'sort' => Yii::t('app', 'Sort'), 46 + 'link' => Yii::t('app', 'Link'),
  47 + 'sort' => Yii::t('app', 'Sort'),
47 ]; 48 ];
48 } 49 }
  50 +
  51 + public function getImage()
  52 + {
  53 + return $this->hasOne(Image::class, [ 'id' => 'image_id' ]);
  54 + }
49 } 55 }
frontend/controllers/SiteController.php
  Show/Hide comments   View file @1f0c5c4
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 4
5 use artbox\core\models\Feedback; 5 use artbox\core\models\Feedback;
6 use common\models\Customer; 6 use common\models\Customer;
  7 + use common\models\Logo;
7 use common\models\Settings; 8 use common\models\Settings;
8 use common\models\speaker\Speaker; 9 use common\models\speaker\Speaker;
9 use Yii; 10 use Yii;
@@ -70,10 +71,13 @@ @@ -70,10 +71,13 @@
70 ->where([ 'status' => true ]) 71 ->where([ 'status' => true ])
71 ->orderBy('sort') 72 ->orderBy('sort')
72 ->all(); 73 ->all();
  74 + $partners = Logo::find()
  75 + ->all();
73 return $this->render( 76 return $this->render(
74 'index', 77 'index',
75 [ 78 [
76 'speakers' => $speakers, 79 'speakers' => $speakers,
  80 + 'partners' => $partners,
77 ] 81 ]
78 ); 82 );
79 } 83 }
frontend/views/site/index.php
  Show/Hide comments   View file @1f0c5c4
@@ -213,13 +213,17 @@ @@ -213,13 +213,17 @@
213 <!-- </span>--> 213 <!-- </span>-->
214 <!-- </div>--> 214 <!-- </div>-->
215 <!-- </div>--> 215 <!-- </div>-->
216 - <div class="partners-wr col-xs-12 col-sm-2"> 216 + <?php foreach ($partners as $partner) { ?>
  217 + <div class="partners-wr col-xs-12 col-sm-2">
217 <div> 218 <div>
218 - <a href="https://www.osce.org/" target="_blank">  
219 - <img src="/images/partners/img-9.png" alt="">  
220 - </a> 219 + <a href="<?= $partner->link ?>" target="_blank">
  220 + <img src="<?= ImageHelper::set($partner->image->getPath())
  221 + ->resize(162, 80)
  222 + ->render() ?>" alt="">
  223 + </a>
221 </div> 224 </div>
222 - </div> 225 + </div>
  226 + <?php } ?>
223 <!-- <div class="partners-wr col-xs-12 col-sm-2">--> 227 <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
224 <!-- <div>--> 228 <!-- <div>-->
225 <!-- <span>--> 229 <!-- <span>-->
@@ -241,21 +245,21 @@ @@ -241,21 +245,21 @@
241 <!-- </span>--> 245 <!-- </span>-->
242 <!-- </div>--> 246 <!-- </div>-->
243 <!-- </div>--> 247 <!-- </div>-->
244 -  
245 - <div class="partners-wr col-xs-12 col-sm-2">  
246 - <div>  
247 - <a href="http://www.iiasa.ac.at/" target="_blank">  
248 - <img src="/images/partners/img-13.png" alt="">  
249 - </a>  
250 - </div>  
251 - </div>  
252 - <div class="partners-wr col-xs-12 col-sm-2">  
253 - <div>  
254 - <a href="https://www.umsicht.fraunhofer.de/" target="_blank">  
255 - <img src="/images/partners/img-14.png" alt="">  
256 - </a>  
257 - </div>  
258 - </div> 248 +
  249 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  250 + <!-- <div>-->
  251 + <!-- <a href="http://www.iiasa.ac.at/" target="_blank">-->
  252 + <!-- <img src="/images/partners/img-13.png" alt="">-->
  253 + <!-- </a>-->
  254 + <!-- </div>-->
  255 + <!-- </div>-->
  256 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  257 + <!-- <div>-->
  258 + <!-- <a href="https://www.umsicht.fraunhofer.de/" target="_blank">-->
  259 + <!-- <img src="/images/partners/img-14.png" alt="">-->
  260 + <!-- </a>-->
  261 + <!-- </div>-->
  262 + <!-- </div>-->
259 <!-- <div class="partners-wr col-xs-12 col-sm-2">--> 263 <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
260 <!-- <div>--> 264 <!-- <div>-->
261 <!-- <span>--> 265 <!-- <span>-->
@@ -263,77 +267,77 @@ @@ -263,77 +267,77 @@
263 <!-- </span>--> 267 <!-- </span>-->
264 <!-- </div>--> 268 <!-- </div>-->
265 <!-- </div>--> 269 <!-- </div>-->
266 - <div class="partners-wr col-xs-12 col-sm-2">  
267 - <div>  
268 - <a href="https://irving.dartmouth.edu/" target="_blank">  
269 - <img src="/images/partners/img-20-n.png" alt="">  
270 - </a>  
271 - </div>  
272 - </div>  
273 - <div class="partners-wr col-xs-12 col-sm-2">  
274 - <div>  
275 - <a href="https://www.isi.fraunhofer.de/" target="_blank">  
276 - <img src="/images/partners/img-22.png" alt="">  
277 - </a>  
278 - </div>  
279 - </div>  
280 -  
281 -  
282 - <div class="partners-wr col-xs-12 col-sm-2">  
283 - <div>  
284 - <a href="https://energycharter.org/" target="_blank">  
285 - <img src="/images/partners/img-29.png" alt="">  
286 - </a>  
287 - </div>  
288 - </div>  
289 -  
290 - <div class="partners-wr col-xs-12 col-sm-2">  
291 - <div>  
292 - <a href="https://www.iea.org/t&c/" target="_blank">  
293 - <img src="/images/partners/img-23.png" alt="">  
294 - </a>  
295 - </div>  
296 - </div>  
297 -  
298 - <div class="partners-wr col-xs-12 col-sm-2">  
299 - <div>  
300 - <a href="http://www.irena.org/" target="_blank">  
301 - <img src="/images/partners/img-25.png" alt="">  
302 - </a>  
303 - </div>  
304 - </div>  
305 -  
306 - <div class="partners-wr col-xs-12 col-sm-2">  
307 - <div>  
308 - <a href="https://www.unenvironment.org/" target="_blank">  
309 - <img src="/images/partners/img-5.png" alt="">  
310 - </a>  
311 - </div>  
312 - </div>  
313 -  
314 - <div class="partners-wr col-xs-12 col-sm-2">  
315 - <div>  
316 - <a href="http://www.ua.undp.org/" target="_blank">  
317 - <img src="/images/partners/img-3-2.png" alt="">  
318 - </a>  
319 - </div>  
320 - </div>  
321 -  
322 - <div class="partners-wr col-xs-12 col-sm-2">  
323 - <div>  
324 - <span>  
325 - <img src="/images/partners/img-30.png" alt="">  
326 - </span>  
327 - </div>  
328 - </div>  
329 -  
330 - <div class="partners-wr col-xs-12 col-sm-2">  
331 - <div>  
332 - <span>  
333 - <img src="/images/partners/img-31.png" alt="">  
334 - </span>  
335 - </div>  
336 - </div> 270 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  271 + <!-- <div>-->
  272 + <!-- <a href="https://irving.dartmouth.edu/" target="_blank">-->
  273 + <!-- <img src="/images/partners/img-20-n.png" alt="">-->
  274 + <!-- </a>-->
  275 + <!-- </div>-->
  276 + <!-- </div>-->
  277 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  278 + <!-- <div>-->
  279 + <!-- <a href="https://www.isi.fraunhofer.de/" target="_blank">-->
  280 + <!-- <img src="/images/partners/img-22.png" alt="">-->
  281 + <!-- </a>-->
  282 + <!-- </div>-->
  283 + <!-- </div>-->
  284 + <!---->
  285 + <!-- -->
  286 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  287 + <!-- <div>-->
  288 + <!-- <a href="https://energycharter.org/" target="_blank">-->
  289 + <!-- <img src="/images/partners/img-29.png" alt="">-->
  290 + <!-- </a>-->
  291 + <!-- </div>-->
  292 + <!-- </div>-->
  293 + <!---->
  294 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  295 + <!-- <div>-->
  296 + <!-- <a href="https://www.iea.org/t&c/" target="_blank">-->
  297 + <!-- <img src="/images/partners/img-23.png" alt="">-->
  298 + <!-- </a>-->
  299 + <!-- </div>-->
  300 + <!-- </div>-->
  301 + <!---->
  302 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  303 + <!-- <div>-->
  304 + <!-- <a href="http://www.irena.org/" target="_blank">-->
  305 + <!-- <img src="/images/partners/img-25.png" alt="">-->
  306 + <!-- </a>-->
  307 + <!-- </div>-->
  308 + <!-- </div>-->
  309 + <!---->
  310 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  311 + <!-- <div>-->
  312 + <!-- <a href="https://www.unenvironment.org/" target="_blank">-->
  313 + <!-- <img src="/images/partners/img-5.png" alt="">-->
  314 + <!-- </a>-->
  315 + <!-- </div>-->
  316 + <!-- </div>-->
  317 + <!---->
  318 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  319 + <!-- <div>-->
  320 + <!-- <a href="http://www.ua.undp.org/" target="_blank">-->
  321 + <!-- <img src="/images/partners/img-3-2.png" alt="">-->
  322 + <!-- </a>-->
  323 + <!-- </div>-->
  324 + <!-- </div>-->
  325 + <!---->
  326 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  327 + <!-- <div>-->
  328 + <!-- <span>-->
  329 + <!-- <img src="/images/partners/img-30.png" alt="">-->
  330 + <!-- </span>-->
  331 + <!-- </div>-->
  332 + <!-- </div>-->
  333 + <!---->
  334 + <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
  335 + <!-- <div>-->
  336 + <!-- <span>-->
  337 + <!-- <img src="/images/partners/img-31.png" alt="">-->
  338 + <!-- </span>-->
  339 + <!-- </div>-->
  340 + <!-- </div>-->
337 341
338 <!-- <div class="partners-wr col-xs-12 col-sm-2">--> 342 <!-- <div class="partners-wr col-xs-12 col-sm-2">-->
339 <!-- <div>--> 343 <!-- <div>-->