Mikescher/www.mikescher.com
1
0
Fork 0
Code Actions Activity

Merge remote-tracking branch 'www.mikescher.de/master'

Browse Source 
Conflicts:
	www/protected/views/msmain/admin.php
This commit is contained in:
Mike Schwörer
2014-07-20 21:31:48 +02:00
parent b5327bf993 f0027dd84e
commit fc3dffad30
5 changed files with 272 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/protected/views/layouts/main.php
View File

@@ -1,5 +1,7 @@
<?php /* @var $this MSController */ ?>
<?php Yii::app()->counter->refresh(); ?>
<!DOCTYPE html>
<!--[if lt IE 7]>
<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->

4
www/protected/views/msmain/about.php
View File

@@ -22,9 +22,9 @@ $this->selectedNav = 'about';
<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 program 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. Mainly I will upload my programs here and sometimes I write something for my blog </p>
<p>If you want you can look <?php echo MsHtml::link('here', '/programs'); ?> at the things I programd </p>
<p>If you want you can look <?php echo MsHtml::link('here', '/programs'); ?> at the things I programmed </p>
</div>
<?php $egh = (new ExtendedGitGraph('Mikescher'))->loadFinishedData(); ?>

1
www/protected/views/msmain/admin.php
View File

@@ -88,6 +88,7 @@ $this->breadcrumbs =
</div>
<div class="well well-small">
<h2>Program of the day</h2>
<hr>