From ad5226a1d166a97d19bf4c2c10bb0c671bd1835d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Wed, 28 May 2014 21:29:49 +0200 Subject: [PATCH] Adjustments to The ProgramsView --- .idea/workspace.xml | 191 ++++++++---------- www/css/styles.css | 39 +++- www/protected/components/ThumbnailPreview.php | 1 + .../components/views/thumbnailPreview.php | 22 +- www/protected/views/programs/index.php | 13 +- 5 files changed, 148 insertions(+), 118 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0961e2d..b55b5ba 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -63,64 +63,47 @@ - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -166,21 +149,21 @@ @@ -711,7 +694,7 @@ - + @@ -896,13 +879,6 @@ - - - - - - - @@ -917,13 +893,6 @@ - - - - - - - @@ -977,20 +946,6 @@ - - - - - - - - - - - - - - @@ -998,32 +953,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1101,6 +1030,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/css/styles.css b/www/css/styles.css index b93feb1..001e1e6 100644 --- a/www/css/styles.css +++ b/www/css/styles.css @@ -60,12 +60,47 @@ } ul.nav li.dropdown-append:hover > ul.dropdown-menu { - display: block; + display: block; } -/* programs/view +/* ThumbnalPreview -------------------------------------------------- */ .progThumbnailCaption { color: #2C3E50; + text-decoration: none; +} + +.progThumbnailCaption:active, +.progThumbnailCaption:visited, +.progThumbnailCaption:link, +.progThumbnailCaption:hover { + /*color: #2C3E50;*/ + text-decoration: none; +} + +.thumbnailParentSpan { + width: 270px; +} + +.thumbnailParentSpan > div { + min-height: 600px; +} + +.thumbnailParentSpan > div > div { + padding: 0; +} + +.thumbnailInnerHead { + padding: 4px; + height: 225px; + overflow-y: hidden; +} + +.thumbnailInnerFooter { + text-align: left; +} + +.thumbnailInnerDescription { + min-height: 120px; } \ No newline at end of file diff --git a/www/protected/components/ThumbnailPreview.php b/www/protected/components/ThumbnailPreview.php index dfc79b8..4ccc7ea 100644 --- a/www/protected/components/ThumbnailPreview.php +++ b/www/protected/components/ThumbnailPreview.php @@ -2,6 +2,7 @@ class ThumbnailPreview extends CWidget { public $caption = ''; + public $link = ''; public $description = ''; public $category = ''; public $language = []; diff --git a/www/protected/components/views/thumbnailPreview.php b/www/protected/components/views/thumbnailPreview.php index 0c0e36e..b4fca28 100644 --- a/www/protected/components/views/thumbnailPreview.php +++ b/www/protected/components/views/thumbnailPreview.php @@ -2,21 +2,23 @@ /* @var $this ThumbnailPreview */ ?> -
  • -
    -
    -
    - +
  • +
    +
    +
    + + +
    - caption) > 13) - echo '

    ' . $this->caption . '

    '; + echo '

    ' . $this->caption . '

    '; else - echo '

    ' . $this->caption . '

    '; + echo '

    ' . $this->caption . '

    '; ?> -

    description; ?>

    +

    description; ?>

    -
    +
    menu = array( ?>
    + +

    My Programs

    +

    +
    findAll(); + $criteria = new CDbCriteria; + $criteria->order = "add_date DESC"; + $criteria->condition = "visible=1"; + + $all = Program::model()->findAll($criteria); $rows = ceil((count($all) / 4)); for ($i = 0; $i < $rows; $i++) { echo '
      '; - foreach (array_slice(Program::model()->findAll(), $i * 4, 4) as $record) { + foreach (array_slice($all, $i * 4, 4) as $record) { $this->widget('ThumbnailPreview', [ 'caption' => $record->attributes['Thumbnailname'], + 'link' => '/programs/view/' . $record->attributes['Name'], 'description' => $record->attributes['Description'], 'category' => $record->attributes['Kategorie'], 'language' => explode("|", $record->attributes['Language']),