diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1c0de88..412f29d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,13 @@ + + - + - - @@ -66,55 +66,34 @@ - - - - - - - - - - - - - + - - + + - + - - + + - + - - + + - - - - - - - - - - + @@ -123,16 +102,7 @@ - - - - - - - - - - + @@ -151,8 +121,6 @@ @@ -770,29 +740,29 @@ - + - - - - - - - + - + + + + + + + - + @@ -820,26 +790,11 @@ - - - - - - - - - - - - - - - @@ -910,11 +865,6 @@ - - - - - @@ -1021,18 +971,7 @@ - - - - - - - - - - - - + @@ -1042,103 +981,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/css/styles.css b/www/css/styles.css index 66058b4..db464dc 100644 --- a/www/css/styles.css +++ b/www/css/styles.css @@ -245,4 +245,28 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu { border: 2px solid #D7E0E2; border-bottom-left-radius: 6px; border-bottom-right-radius: 6px; +} + +/* ExpandedLogHeader +-------------------------------------------------- */ + +.expCollHeader { + margin-bottom: 20px; +} + +.expCollHeader > .collHeaderLinkParent { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; +} + +.expCollContent { + border: 1px solid #D7E0E2; + border-top-width: 0px; + + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; + + margin-top: -20px; + + padding: 5px; } \ No newline at end of file diff --git a/www/protected/components/MsHtml.php b/www/protected/components/MsHtml.php index c3af13b..32de7f0 100644 --- a/www/protected/components/MsHtml.php +++ b/www/protected/components/MsHtml.php @@ -14,7 +14,7 @@ class MsHtml extends CHtml { '
' . $date->format('d.m.Y') . '
' . $caption . '
-
+
'; } else { @@ -22,7 +22,7 @@ class MsHtml extends CHtml { '
' . $date->format('d.m.Y') . '
' . $caption . '
-
+
 
'; diff --git a/www/protected/components/widgets/ExpandedLogHeader.php b/www/protected/components/widgets/ExpandedLogHeader.php new file mode 100644 index 0000000..ce0c094 --- /dev/null +++ b/www/protected/components/widgets/ExpandedLogHeader.php @@ -0,0 +1,15 @@ +date == null) + $this->date = new DateTime('2000-01-01'); + + $this->render('expandedLogHeader'); + } +} \ No newline at end of file diff --git a/www/protected/components/widgets/FullProgPreview.php b/www/protected/components/widgets/FullProgPreview.php index 29f48db..e8207fb 100644 --- a/www/protected/components/widgets/FullProgPreview.php +++ b/www/protected/components/widgets/FullProgPreview.php @@ -11,6 +11,4 @@ class FullProgPreview extends CWidget { public function run() { $this->render('fullProgPreview'); } -} - -?> \ No newline at end of file +} \ No newline at end of file diff --git a/www/protected/components/widgets/ThumbnailProgPreview.php b/www/protected/components/widgets/ThumbnailProgPreview.php index d7cff7a..b253125 100644 --- a/www/protected/components/widgets/ThumbnailProgPreview.php +++ b/www/protected/components/widgets/ThumbnailProgPreview.php @@ -19,6 +19,4 @@ class ThumbnailProgPreview extends CWidget { $this->render('thumbnailProgPreview'); } -} - -?> \ No newline at end of file +} \ No newline at end of file diff --git a/www/protected/components/widgets/views/expandedLogHeader.php b/www/protected/components/widgets/views/expandedLogHeader.php new file mode 100644 index 0000000..13d6a02 --- /dev/null +++ b/www/protected/components/widgets/views/expandedLogHeader.php @@ -0,0 +1,14 @@ + + +
+ + date, $this->caption, $this->link); ?> + +
+

+ content; ?> +

+
+
\ No newline at end of file diff --git a/www/protected/views/layouts/main.php b/www/protected/views/layouts/main.php index 26ba457..aa9e59e 100644 --- a/www/protected/views/layouts/main.php +++ b/www/protected/views/layouts/main.php @@ -82,8 +82,6 @@ echo $content; ?> -
-
Copyright © by Mike Schwörer.
All Rights Reserved.
diff --git a/www/protected/views/msmain/index.php b/www/protected/views/msmain/index.php index 3fa8bdb..890f685 100644 --- a/www/protected/views/msmain/index.php +++ b/www/protected/views/msmain/index.php @@ -1,5 +1,5 @@ pageTitle=Yii::app()->name; @@ -25,6 +25,23 @@ $this->selectedNav = 'index'; ]); ?> + widget('ExpandedLogHeader', + [ + 'date' => new DateTime(), + 'caption' => 'test', + 'link' => '#', + 'content' => + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et + dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. + Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit + amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna + aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd + gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.', + ]); + ?> + + @@ -41,52 +58,4 @@ $this->selectedNav = 'index'; - -
-
-

Heading YD:

- -

- - db; - - $command=$connection->createCommand("SELECT * FROM {{Programs}}"); - $command->execute(); // a non-query SQL statement execution - // or execute an SQL query and fetch the result set - $reader=$command->query(); - - // each $row is an array representing a row of data - $dbgtxt = ""; - foreach($reader as $row) - { - $dbgtxt = $dbgtxt . print_r($row, true); - } - - echo TbHtml::textArea('dbgtxt', $dbgtxt, array('rows' => 5)); - ?> - -

- -

View details »

-
-
-

Heading

- -

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris - condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis - euismod. Donec sed odio dui.

- -

View details »

-
-
-

Heading

- -

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula - porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut - fermentum massa justo sit amet risus.

- -

View details »

-
-
\ No newline at end of file diff --git a/www/protected/views/programs/create.php b/www/protected/views/programs/create.php index 2d9ace3..984891a 100644 --- a/www/protected/views/programs/create.php +++ b/www/protected/views/programs/create.php @@ -1,5 +1,5 @@