Added Logo

.idea/workspace.xml

@@ -111,7 +111,25 @@
       <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="65" column="27" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.77816904" vertical-offset="663" max-vertical-offset="1768">
+            <state line="31" column="38" selection-start="1105" selection-end="1105" vertical-scroll-proportion="0.12431444" vertical-offset="459" max-vertical-offset="1785">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="styles.css" pinned="false" current="false" current-in-tab="false">
+        <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">
+              <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="24" column="149" selection-start="717" selection-end="717" vertical-scroll-proportion="-14.384615" vertical-offset="34" max-vertical-offset="1530">
               <folding />
             </state>
           </provider>
@@ -120,7 +138,7 @@
       <file leaf-file-name="admin.php" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/www/protected/views/programme/admin.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="50" column="29" selection-start="1229" selection-end="1229" vertical-scroll-proportion="0.0" vertical-offset="850" max-vertical-offset="1411">
+            <state line="46" column="7" selection-start="1087" selection-end="1087" vertical-scroll-proportion="-9.923077" vertical-offset="524" max-vertical-offset="1411">
               <folding />
             </state>
           </provider>
@@ -151,22 +169,22 @@
         <option value="$PROJECT_DIR$/www/index.php" />
         <option value="$PROJECT_DIR$/www/protected/extensions/bootstrap/helpers/TbHtml.php" />
         <option value="$PROJECT_DIR$/www/protected/views/site/index.php" />
-        <option value="$PROJECT_DIR$/www/css/styles.css" />
         <option value="$PROJECT_DIR$/www/protected/models/SendMailForm.php" />
         <option value="$PROJECT_DIR$/www/protected/controllers/SiteController.php" />
         <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/site/about.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/admin.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" />
       </list>
     </option>
@@ -816,29 +834,25 @@
         <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/styles.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="17" column="19" selection-start="300" selection-end="300" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="680" />
-      </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" />
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4148">
+          <folding />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/css/print.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="607" />
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="607">
+          <folding />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/css/ie.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="697" />
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="697">
-      </provider>
+          <folding />
-    </entry>
+        </state>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/site/about.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="21" column="4" selection-start="491" selection-end="507" vertical-scroll-proportion="0.55593807" vertical-offset="34" max-vertical-offset="1530" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/views/site/error.php">
@@ -880,7 +894,9 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/controllers/SiteController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="4" column="0" selection-start="49" selection-end="75" vertical-scroll-proportion="-0.65384614" vertical-offset="51" max-vertical-offset="1105" />
+        <state line="4" column="0" selection-start="49" selection-end="75" vertical-scroll-proportion="-0.65384614" vertical-offset="51" max-vertical-offset="1105">
+          <folding />
+        </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/models/Programme.php">
@@ -890,13 +906,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/admin.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="50" column="29" selection-start="1229" selection-end="1229" vertical-scroll-proportion="0.0" vertical-offset="850" max-vertical-offset="1411">
-          <folding />
-        </state>
-      </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">
@@ -925,6 +934,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/www/protected/views/programme/admin.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="46" column="7" selection-start="1087" selection-end="1087" vertical-scroll-proportion="-9.923077" vertical-offset="524" max-vertical-offset="1411">
+          <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="24" column="149" selection-start="717" selection-end="717" vertical-scroll-proportion="-14.384615" vertical-offset="34" max-vertical-offset="1530">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/www/protected/config/main.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="72" column="32" selection-start="1575" selection-end="1575" vertical-scroll-proportion="-15.692307" vertical-offset="816" max-vertical-offset="1751">
@@ -932,9 +955,16 @@
         </state>
       </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">
+          <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="65" column="27" selection-start="2080" selection-end="2080" vertical-scroll-proportion="0.77816904" vertical-offset="663" max-vertical-offset="1768">
+        <state line="31" column="38" selection-start="1105" selection-end="1105" vertical-scroll-proportion="0.12431444" vertical-offset="459" max-vertical-offset="1785">
           <folding />
         </state>
       </provider>

www/css/styles.css

@@ -33,3 +33,15 @@
 .cstm-main-navbar {
     margin-bottom: 0px;
 }
+
+/* Header
+-------------------------------------------------- */
+
+.brandLogo {
+    height: 30px;
+    padding: 8px 12px 10px 12px;
+}
+
+.navbar .brand {
+    padding: 0px;
+}

www/protected/extensions/bootstrap/assets/css/bootstrap.css

@@ -1098,7 +1098,7 @@ input[type="color"],
   margin-bottom: 10px;
   font-size: 15px;
   line-height: 20px;
-  color: #95a5a6;
+  color: #404040;
   vertical-align: middle;
   -webkit-border-radius: 6px;
      -moz-border-radius: 6px;
@@ -3210,7 +3210,7 @@ button.close {
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
   vertical-align: middle;
   cursor: pointer;
-  background-color: #bfc6cb;
+  background-color: #2c3e50;
   *background-color: #d0d5d9;
   background-image: -moz-linear-gradient(top, #b4bcc2, #d0d5d9);
   background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4bcc2), to(#d0d5d9));
@@ -6370,7 +6370,6 @@ div.subnav .nav > .active > a:hover {
 }
 
 .btn {
-  padding: 9px 20px;
   color: #ffffff;
   text-decoration: none;
   text-shadow: none;

www/protected/views/layouts/main.php

@@ -29,7 +29,8 @@
 
 	$this->widget('bootstrap.widgets.TbNavbar',
 		[
-			'brandLabel' => Yii::app()->name,
+			'brandLabel'=>'<img src="/images/logo.png" class="brandLogo"/>',
+			'brandUrl'=>'/',
 			'display' => null,
 			'htmlOptions' =>
 				[
@@ -43,8 +44,8 @@
 							[
 								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' => 'Programme', 	'url' => '/programme/', 'active' => ($this->selectedNav === 'prog')),
-								array('label' => 'About',		'url' => 'about', 'active' => ($this->selectedNav === 'about')),
+								array('label' => 'About',		'url' => '/about', 'active' => ($this->selectedNav === 'about')),
 							],
 					],
 

www/protected/views/programme/admin.php

@@ -44,7 +44,7 @@ or <b>=</b>) at the beginning of each of your search values to specify how the c
 	'model'=>$model,
 )); ?>
 </div><!-- search-form -->
-
+<br><br>
 <?php $this->widget('bootstrap.widgets.TbGridView',array(
 	'type' => TbHtml::GRID_TYPE_BORDERED,
 	'id'=>'programme-grid',

www/protected/views/site/about.php

@@ -22,7 +22,7 @@ $this->selectedNav = 'about';
 	<div class="well cstm-background-white">
 		<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>
+		<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>
 
 		<p>If you want you can look <?php echo TbHtml::link('here', '#'); // TODO Add Link ?> at the things I programmed </p>
 	</div>