From 52104782518dee949e24371231497ed5b91cdb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <mailport@mikescher.de>
Date: Fri, 23 May 2014 11:22:34 +0200
Subject: [PATCH] Added Code for Prog Display

---
 .idea/workspace.xml                           | 208 ++++++++++++------
 www/css/styles.css                            |  17 ++
 .../controllers/ProgrammeController.php       |   7 +-
 .../bootstrap/assets/css/bootstrap.css        |  13 --
 www/protected/models/Programme.php            |   2 -
 www/protected/views/layouts/main.php          |  50 ++++-
 www/protected/views/programme/index.php       |  30 ++-
 www/protected/views/site/about.php            |   4 +-
 8 files changed, 229 insertions(+), 102 deletions(-)

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 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="main.php" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="main.php" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="0.56369984" vertical-offset="816" max-vertical-offset="1751">
+            <state line="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="-43.807693" vertical-offset="0" max-vertical-offset="1751">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="index.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/protected/views/programme/index.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="21" column="0" selection-start="382" selection-end="382" vertical-scroll-proportion="-13.538462" vertical-offset="5" max-vertical-offset="680">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="main.php" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="71" column="17" selection-start="2099" selection-end="2099" vertical-scroll-proportion="0.39285713" vertical-offset="987" max-vertical-offset="2312">
+              <folding>
+                <marker date="1400836934640" expanded="true" signature="3258:3293" placeholder="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="about.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="29" column="36" selection-start="881" selection-end="881" vertical-scroll-proportion="17.846153" vertical-offset="957" max-vertical-offset="1530">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ProgrammeController.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="130" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="-6.5384617" vertical-offset="2040" max-vertical-offset="3111">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CController.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/framework/web/CController.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-1.7692307" vertical-offset="13044" max-vertical-offset="20910">
               <folding />
             </state>
           </provider>
@@ -93,19 +140,19 @@
         <option value="$PROJECT_DIR$/www/protected/config/env/dev.php" />
         <option value="$PROJECT_DIR$/www/protected/config/env/prod.php" />
         <option value="$PROJECT_DIR$/www/protected/views/layouts/column-2.php" />
-        <option value="$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php" />
         <option value="$PROJECT_DIR$/www/protected/views/layouts/column2.php" />
         <option value="$PROJECT_DIR$/www/protected/views/programme/create.php" />
-        <option value="$PROJECT_DIR$/www/protected/views/programme/index.php" />
         <option value="$PROJECT_DIR$/www/protected/views/programme/update.php" />
         <option value="$PROJECT_DIR$/www/protected/views/programme/view.php" />
-        <option value="$PROJECT_DIR$/www/protected/models/Programme.php" />
         <option value="$PROJECT_DIR$/www/protected/config/main.php" />
         <option value="$PROJECT_DIR$/www/protected/views/programme/admin.php" />
-        <option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
         <option value="$PROJECT_DIR$/www/css/styles.css" />
-        <option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
         <option value="$PROJECT_DIR$/www/javascript/scripts.js" />
+        <option value="$PROJECT_DIR$/www/protected/models/Programme.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/site/about.php" />
+        <option value="$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/programme/index.php" />
+        <option value="$PROJECT_DIR$/www/protected/views/layouts/main.php" />
       </list>
     </option>
   </component>
@@ -255,7 +302,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="extensions" />
+              <option name="myItemId" value="views" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="site" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -277,11 +328,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="extensions" />
+              <option name="myItemId" value="views" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="bootstrap" />
+              <option name="myItemId" value="programme" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -303,15 +354,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="extensions" />
+              <option name="myItemId" value="views" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="bootstrap" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="assets" />
+              <option name="myItemId" value="layouts" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -333,19 +380,29 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="extensions" />
+              <option name="myItemId" value="models" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www.mikescher.de" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="www.mikescher.de" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="bootstrap" />
+              <option name="myItemId" value="www" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="assets" />
+              <option name="myItemId" value="protected" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="css" />
+              <option name="myItemId" value="controllers" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -590,11 +647,6 @@
         <state line="12" column="16" selection-start="412" selection-end="412" vertical-scroll-proportion="0.30357143" vertical-offset="0" max-vertical-offset="672" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/framework/web/CController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-1.0349514" vertical-offset="13623" max-vertical-offset="20910" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbNavbar.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.9475728" vertical-offset="488" max-vertical-offset="2176" />
@@ -640,11 +692,6 @@
         <state line="1987" column="27" selection-start="82594" selection-end="82594" vertical-scroll-proportion="-4.076923" vertical-offset="33554" max-vertical-offset="44438" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="268" column="10" selection-start="8363" selection-end="8363" vertical-scroll-proportion="0.33333334" vertical-offset="4265" max-vertical-offset="74018" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/widgets/TbActiveForm.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="46" column="30" selection-start="1287" selection-end="1287" vertical-scroll-proportion="1.1201551" vertical-offset="102" max-vertical-offset="10948" />
@@ -695,11 +742,6 @@
         <state line="0" column="0" selection-start="0" selection-end="530" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="581" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/demos/default/protected/views/layouts/main.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="2222" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="1105" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/css/screen.css">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4148" />
@@ -735,11 +777,6 @@
         <state line="7" column="14" selection-start="118" selection-end="118" vertical-scroll-proportion="0.20481928" vertical-offset="0" max-vertical-offset="581" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/index.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="14" selection-start="135" selection-end="135" vertical-scroll-proportion="0.20481928" vertical-offset="0" max-vertical-offset="581" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/views/programme/create.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="7" column="14" selection-start="118" selection-end="118" vertical-scroll-proportion="0.20481928" vertical-offset="0" max-vertical-offset="581" />
@@ -755,16 +792,6 @@
         <state line="4" column="0" selection-start="49" selection-end="75" vertical-scroll-proportion="-0.65384614" vertical-offset="51" max-vertical-offset="1105" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/models/Programme.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="132" column="16" selection-start="4671" selection-end="4671" vertical-scroll-proportion="0.0" vertical-offset="1982" max-vertical-offset="2601" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="111" column="35" selection-start="2698" selection-end="2698" vertical-scroll-proportion="0.0" vertical-offset="2237" max-vertical-offset="3128" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/column2.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="19" column="25" selection-start="500" selection-end="500" vertical-scroll-proportion="0.0" vertical-offset="323" max-vertical-offset="680" />
@@ -785,19 +812,11 @@
         <state line="46" column="7" selection-start="1087" selection-end="1087" vertical-scroll-proportion="0.0" vertical-offset="524" max-vertical-offset="1411" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="24" column="149" selection-start="717" selection-end="717" vertical-scroll-proportion="0.0" vertical-offset="34" max-vertical-offset="1530" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/www/css/styles.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="41" column="14" selection-start="650" selection-end="650" vertical-scroll-proportion="0.0" vertical-offset="298" max-vertical-offset="884" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="98" column="31" selection-start="2867" selection-end="2867" vertical-scroll-proportion="0.0" vertical-offset="928" max-vertical-offset="1802" />
+        <state line="41" column="14" selection-start="650" selection-end="650" vertical-scroll-proportion="0.0" vertical-offset="298" max-vertical-offset="884">
+          <folding />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/javascript/scripts.js">
@@ -805,13 +824,78 @@
         <state line="2" column="18" selection-start="45" selection-end="45" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="425" />
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/models/Programme.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="104" column="5" selection-start="3356" selection-end="3356" vertical-scroll-proportion="3.125" vertical-offset="18" max-vertical-offset="2567">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="3408" column="27" selection-start="134698" selection-end="134698" vertical-scroll-proportion="-0.18673648" vertical-offset="57924" max-vertical-offset="74018">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/demos/default/protected/views/site/index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="599">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/demos/default/protected/views/layouts/main.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="33" selection-start="1131" selection-end="1131" vertical-scroll-proportion="0.118673645" vertical-offset="306" max-vertical-offset="1105">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/index.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="0" selection-start="382" selection-end="382" vertical-scroll-proportion="-13.538462" vertical-offset="5" max-vertical-offset="680">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="0.56369984" vertical-offset="816" max-vertical-offset="1751">
+        <state line="67" column="24" selection-start="1393" selection-end="1393" vertical-scroll-proportion="-43.807693" vertical-offset="0" max-vertical-offset="1751">
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/controllers/ProgrammeController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="130" column="0" selection-start="3238" selection-end="3238" vertical-scroll-proportion="-6.5384617" vertical-offset="2040" max-vertical-offset="3111">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/framework/web/CController.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="777" column="20" selection-start="29350" selection-end="29350" vertical-scroll-proportion="-1.7692307" vertical-offset="13044" max-vertical-offset="20910">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="29" column="36" selection-start="881" selection-end="881" vertical-scroll-proportion="17.846153" vertical-offset="957" max-vertical-offset="1530">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/layouts/main.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="71" column="17" selection-start="2099" selection-end="2099" vertical-scroll-proportion="0.39285713" vertical-offset="987" max-vertical-offset="2312">
+          <folding>
+            <marker date="1400836934640" expanded="true" signature="3258:3293" placeholder="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
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 @@
+<?php // ###### FUNCTIONS ######
+function GetProgDropDownList()
+{
+	$progDropDown = array();
+	$dropDownModels = array();
+
+	$criteria = new CDbCriteria;
+	$criteria->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;
+}
+?>
+
 <!DOCTYPE html>
 <!--[if lt IE 7]>
 <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
@@ -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 @@
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.9.1.min.js"><\/script>')</script>
 <script src="<?php echo (YII_DEBUG ? 'bootstrap.js' : 'bootstrap.min.js') ?>"></script>
-<script src="js/plugins.js"></script>
-<script src="js/main.js"></script>
-<script src="javascript/scripts.js"></script>
+<script src="/js/plugins.js"></script>
+<script src="/js/main.js"></script>
+<script src="/javascript/scripts.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/www/protected/views/programme/index.php b/www/protected/views/programme/index.php
index 5c7108c..a3ec23a 100644
--- a/www/protected/views/programme/index.php
+++ b/www/protected/views/programme/index.php
@@ -4,19 +4,31 @@
 ?>
 
 <?php
-$this->breadcrumbs=array(
+$this->breadcrumbs = array(
 	'Programme',
 );
 
-$this->menu=array(
-	array('label'=>'Create Programme','url'=>array('create')),
-	array('label'=>'Manage Programme','url'=>array('admin')),
+$this->menu = array(
+	array('label' => 'Create Programme', 'url' => array('create')),
+	array('label' => 'Manage Programme', 'url' => array('admin')),
 );
 ?>
 
-<h1>Programmes</h1>
+<div class="container">
+	<div class="span12">
+		<h1>My Prog's</h1>
+		<br>
+		<br>
+		<?php
+
+		foreach (Programme::model()->findAll() as $record) {
+			echo "<div class='well'>";
+			echo nl2br(print_r($record->attributes, true));
+			echo "</div>";
+		}
+
+
+		?>
+	</div>
+</div>
 
-<?php $this->widget('bootstrap.widgets.TbListView',array(
-	'dataProvider'=>$dataProvider,
-	'itemView'=>'_view',
-)); ?>
\ No newline at end of file
diff --git a/www/protected/views/site/about.php b/www/protected/views/site/about.php
index 9b6d838..2b264bc 100644
--- a/www/protected/views/site/about.php
+++ b/www/protected/views/site/about.php
@@ -19,7 +19,7 @@ $this->selectedNav = 'about';
 
 	<?php echo TbHtml::pageHeader('About Mikescher.de', ''); ?>
 
-	<div class="well cstm-background-white">
+	<div class="well cstm-well-light">
 		<p>Welcome to my private homepage.</p>
 
 		<p>My name is Mike Schwörer, and this is my homepage - here i upload programs i write in my free time and sometimes i even write a blog entry. </p>
@@ -27,7 +27,7 @@ $this->selectedNav = 'about';
 		<p>If you want you can look <?php echo TbHtml::link('here', '#'); // TODO Add Link ?> at the things I programmed </p>
 	</div>
 
-	<div class="well cstm-background-white">
+	<div class="well cstm-well-light">
 		<?php
 		$form = $this->beginWidget('bootstrap.widgets.TbActiveForm',
 			[