diff --git a/common/models/Logo.php b/common/models/Logo.php index 04197fe..b1e3bf6 100644 --- a/common/models/Logo.php +++ b/common/models/Logo.php @@ -2,15 +2,16 @@ namespace common\models; +use artbox\core\models\Image; use Yii; /** * This is the model class for table "logo". * - * @property int $id - * @property int $image_id + * @property int $id + * @property int $image_id * @property string $link - * @property int $sort + * @property int $sort */ class Logo extends \yii\db\ActiveRecord { @@ -21,29 +22,34 @@ class Logo extends \yii\db\ActiveRecord { return 'logo'; } - + /** * {@inheritdoc} */ public function rules() { return [ - [['image_id', 'sort'], 'default', 'value' => null], - [['image_id', 'sort'], 'integer'], - [['link'], 'string'], + [ [ 'image_id', 'sort'], 'default', 'value' => null], + [ [ 'image_id', 'sort'], 'integer'], + [ [ 'link'], 'string'], ]; } - + /** * {@inheritdoc} */ public function attributeLabels() { return [ - 'id' => Yii::t('app', 'ID'), + 'id' => Yii::t('app', 'ID'), 'image_id' => Yii::t('app', 'Image ID'), - 'link' => Yii::t('app', 'Link'), - 'sort' => Yii::t('app', 'Sort'), + 'link' => Yii::t('app', 'Link'), + 'sort' => Yii::t('app', 'Sort'), ]; } + + public function getImage() + { + return $this->hasOne(Image::class, [ 'id' => 'image_id' ]); + } } diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 0d1bd10..98e3d0e 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -4,6 +4,7 @@ use artbox\core\models\Feedback; use common\models\Customer; + use common\models\Logo; use common\models\Settings; use common\models\speaker\Speaker; use Yii; @@ -70,10 +71,13 @@ ->where([ 'status' => true ]) ->orderBy('sort') ->all(); + $partners = Logo::find() + ->all(); return $this->render( 'index', [ 'speakers' => $speakers, + 'partners' => $partners, ] ); } diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index 33eab38..81709ad 100755 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -213,13 +213,17 @@ -
+ +
- - - + + +
-
+
+ @@ -241,21 +245,21 @@ - -
-
- - - -
-
-
-
- - - -
-
+ + + + + + + + + + + + + + + @@ -263,77 +267,77 @@ -
-
- - - -
-
-
-
- - - -
-
- - -
-
- - - -
-
- -
-
- - - -
-
- -
-
- - - -
-
- -
-
- - - -
-
- -
-
- - - -
-
- -
-
- - - -
-
- -
-
- - - -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- libgit2 0.21.4