diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6f701d..5b11ed1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -63,10 +63,57 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -93,19 +140,19 @@
-
-
-
-
-
+
+
+
+
+
@@ -255,7 +302,11 @@
-
+
+
+
+
+
@@ -277,11 +328,11 @@
-
+
-
+
@@ -303,15 +354,11 @@
-
+
-
-
-
-
-
+
@@ -333,19 +380,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -590,11 +647,6 @@
-
-
-
-
-
@@ -640,11 +692,6 @@
-
-
-
-
-
@@ -695,11 +742,6 @@
-
-
-
-
-
@@ -735,11 +777,6 @@
-
-
-
-
-
@@ -755,16 +792,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -785,19 +812,11 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -805,13 +824,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/www/css/styles.css b/www/css/styles.css
index 46d4ba7..40ea8bf 100644
--- a/www/css/styles.css
+++ b/www/css/styles.css
@@ -26,6 +26,11 @@
/* Helper
-------------------------------------------------- */
+.cstm-well-light {
+ border: 2px solid #caecec;
+ background-color: white;
+}
+
.cstm-background-white {
background-color: white;
}
@@ -44,4 +49,16 @@
.navbar .brand {
padding: 0px;
+}
+
+.dropdown-append {
+ padding-left: 0px;
+}
+
+.dropdown-append .dropdown-toggle {
+ padding-left: 0px !important;
+}
+
+ul.nav li.dropdown-append:hover > ul.dropdown-menu {
+ display: block;
}
\ No newline at end of file
diff --git a/www/protected/controllers/ProgrammeController.php b/www/protected/controllers/ProgrammeController.php
index 20b786c..e108d3c 100644
--- a/www/protected/controllers/ProgrammeController.php
+++ b/www/protected/controllers/ProgrammeController.php
@@ -127,10 +127,9 @@ class ProgrammeController extends Controller
*/
public function actionIndex()
{
- $dataProvider=new CActiveDataProvider('Programme');
- $this->render('index',array(
- 'dataProvider'=>$dataProvider,
- ));
+ $this->layout = '//layouts/main';
+
+ $this->render('index');
}
/**
diff --git a/www/protected/extensions/bootstrap/assets/css/bootstrap.css b/www/protected/extensions/bootstrap/assets/css/bootstrap.css
index 843c19e..7f14fdd 100644
--- a/www/protected/extensions/bootstrap/assets/css/bootstrap.css
+++ b/www/protected/extensions/bootstrap/assets/css/bootstrap.css
@@ -2939,8 +2939,6 @@ table th[class*="span"],
.dropdown-menu .divider {
*width: 100%;
height: 1px;
- margin: 9px 1px;
- *margin: -5px 0 5px;
overflow: hidden;
background-color: rgba(0, 0, 0, 0.2);
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
@@ -4711,17 +4709,6 @@ input[type="submit"].btn.btn-mini {
content: '';
}
-.navbar .nav > li > .dropdown-menu:after {
- position: absolute;
- top: -6px;
- left: 10px;
- display: inline-block;
- border-right: 6px solid transparent;
- border-bottom: 6px solid #2c3e50;
- border-left: 6px solid transparent;
- content: '';
-}
-
.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
top: auto;
bottom: -7px;
diff --git a/www/protected/models/Programme.php b/www/protected/models/Programme.php
index 9009e21..2497f11 100644
--- a/www/protected/models/Programme.php
+++ b/www/protected/models/Programme.php
@@ -103,8 +103,6 @@ class Programme extends CActiveRecord
*/
public function search()
{
- // @todo Please modify the following code to remove attributes that should not be searched.
-
$criteria=new CDbCriteria;
$criteria->compare('ID',$this->ID);
diff --git a/www/protected/views/layouts/main.php b/www/protected/views/layouts/main.php
index 8a2acc0..fdecfe3 100644
--- a/www/protected/views/layouts/main.php
+++ b/www/protected/views/layouts/main.php
@@ -1,3 +1,35 @@
+order = "add_date DESC";
+ $criteria->limit = 3;
+ foreach (Programme::model()->findAll($criteria) as $row) {
+ $dropDownModels[] = $row;
+ }
+ $dropDownModels[] = null;
+
+ $criteria = new CDbCriteria;
+ $criteria->order = "add_date DESC";
+ $criteria->limit = 8;
+ $criteria->condition = "Sterne=4 AND visible=1";
+ foreach (Programme::model()->findAll($criteria) as $row) {
+ $dropDownModels[] = $row;
+ }
+
+ foreach ($dropDownModels as $row) {
+ if (is_null($row))
+ $progDropDown[] = TbHtml::menuDivider();
+ else
+ $progDropDown[] = array('label' => $row->attributes['Name'], 'url' => '/programme/' . $row->attributes['Name']);
+ }
+ return $progDropDown;
+}
+?>
+
@@ -42,19 +74,17 @@
'class' => 'bootstrap.widgets.TbNav',
'items' =>
[
- array('label' => 'Home', 'url' => '/', 'active' => ($this->selectedNav === 'index')),
- array('label' => 'Blog', 'url' => '#', 'active' => ($this->selectedNav === 'blog')),
- array('label' => 'Programme', 'url' => '/programme/', 'active' => ($this->selectedNav === 'prog')),
- array('label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')),
+ ['label' => 'Home', 'url' => '/', 'active' => ($this->selectedNav === 'index')],
+ ['label' => 'Blog', 'url' => '#', 'active' => ($this->selectedNav === 'blog')],
+ ['label' => 'Programme', 'url' => '/programme/', 'active' => ($this->selectedNav === 'prog')],
+ ['label' => '', 'items' => GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
+ ['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')],
],
],
-
TbHtml::navbarSearchForm('search', '',
[
'class' => 'pull-right',
-
'placeholder' => 'Search',
-
'inputOptions' =>
[
'append' => TbHtml::submitButton(TbHtml::icon(TbHtml::ICON_SEARCH)),
@@ -94,8 +124,8 @@
-
-
-
+
+
+