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

Added proper Log to msmain/index + added msmain/log + alot more

Browse Source
This commit is contained in:
Mike Schwörer
2014-06-06 12:02:56 +02:00
parent d478647418
commit 53211ea359
30 changed files with 877 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,7 @@ use Yiinitializr\Helpers\ArrayX;
<?php
$this->widget('bootstrap.widgets.TbNav',
[
'type' => TbHtml::NAV_TYPE_LIST,
'type' => MsHtml::NAV_TYPE_LIST,
'items' => ArrayX::merge(
[
['label' => 'List header'],

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

@@ -50,13 +50,13 @@
['label' => '[[Log "'.Yii::app()->user->name.'" out]]', 'url' => '/logout', 'visible' => !Yii::app()->user->isGuest]
],
],
TbHtml::navbarSearchForm('search', '',
MsHtml::navbarSearchForm('search', '',
[
'class' => 'pull-right',
'placeholder' => 'Search',
'inputOptions' =>
[
'append' => TbHtml::submitButton(TbHtml::icon(TbHtml::ICON_SEARCH)),
'append' => MsHtml::submitButton(MsHtml::icon(MsHtml::ICON_SEARCH)),
'addOnOptions' =>
[
'class' => 'pull-right',

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

@@ -1,5 +1,5 @@
<?php
/* @var $this SiteController */
/* @var $this MsMainController */
$this->pageTitle=Yii::app()->name;
@@ -14,24 +14,24 @@ $this->selectedNav = 'about';
<div class="container">
<?php if (isset($alerts_success)) foreach($alerts_success as $alert) echo TbHtml::alert(TbHtml::ALERT_COLOR_SUCCESS, $alert); ?>
<?php if (isset($alerts_error)) foreach($alerts_error as $alert) echo TbHtml::alert(TbHtml::ALERT_COLOR_ERROR, $alert); ?>
<?php if (isset($alerts_success)) foreach($alerts_success as $alert) echo MsHtml::alert(MsHtml::ALERT_COLOR_SUCCESS, $alert); ?>
<?php if (isset($alerts_error)) foreach($alerts_error as $alert) echo MsHtml::alert(MsHtml::ALERT_COLOR_ERROR, $alert); ?>
<?php echo TbHtml::pageHeader('About Mikescher.de', ''); ?>
<?php echo MsHtml::pageHeader('About Mikescher.de', ''); ?>
<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>If you want you can look <?php echo TbHtml::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 programd </p>
</div>
<div class="well cstm-well-light">
<?php
$form = $this->beginWidget('bootstrap.widgets.TbActiveForm',
[
'layout' => TbHtml::FORM_LAYOUT_HORIZONTAL
'layout' => MsHtml::FORM_LAYOUT_HORIZONTAL
]);
?>
@@ -41,37 +41,37 @@ $this->selectedNav = 'about';
echo $form->textFieldControlGroup($model, 'name',
[
'placeholder' => 'Name',
'size' => TbHtml::INPUT_SIZE_XXLARGE,
'prepend' => TbHtml::icon(TbHtml::ICON_USER),
'size' => MsHtml::INPUT_SIZE_XXLARGE,
'prepend' => MsHtml::icon(MsHtml::ICON_USER),
'span' => 2,
]);
echo $form->textFieldControlGroup($model, 'email',
[
'placeholder' => 'Email address',
'size' => TbHtml::INPUT_SIZE_XXLARGE,
'prepend' => TbHtml::icon(TbHtml::ICON_ENVELOPE),
'size' => MsHtml::INPUT_SIZE_XXLARGE,
'prepend' => MsHtml::icon(MsHtml::ICON_ENVELOPE),
'span' => 2,
]);
echo $form->textFieldControlGroup($model, 'header',
[
'placeholder' => 'Header',
'size' => TbHtml::INPUT_SIZE_XXLARGE,
'prepend' => TbHtml::icon(TbHtml::ICON_TAG),
'size' => MsHtml::INPUT_SIZE_XXLARGE,
'prepend' => MsHtml::icon(MsHtml::ICON_TAG),
'span' => 5,
]);
echo $form->textAreaControlGroup( $model, 'message',
[
'placeholder' => 'Message',
'size' => TbHtml::INPUT_SIZE_XXLARGE,
'size' => MsHtml::INPUT_SIZE_XXLARGE,
'rows' => 10,
]);
?>
</fieldset>
<?php echo TbHtml::formActions(
<?php echo MsHtml::formActions(
[
TbHtml::submitButton('Submit', array('color' => TbHtml::BUTTON_COLOR_PRIMARY)),
TbHtml::resetButton('Reset'),
MsHtml::submitButton('Submit', array('color' => MsHtml::BUTTON_COLOR_PRIMARY)),
MsHtml::resetButton('Reset'),
],
[
'class' => 'cstm-background-white',
@@ -80,6 +80,6 @@ $this->selectedNav = 'about';
<?php $this->endWidget(); ?>
</div>
<?php echo TbHtml::well( file_get_contents('protected/data/disclaimer.php') ); ?>
<?php echo MsHtml::well( file_get_contents('protected/data/disclaimer.php') ); ?>
</div>

53
www/protected/views/msmain/index.php
View File

@@ -1,6 +1,7 @@
<?php
/* @var $this MsMainController */
/* @var $program Program */
/* @var $logs Log[] */
$this->pageTitle=Yii::app()->name;
@@ -18,44 +19,30 @@ $this->selectedNav = 'index';
<!-- Main hero unit for a primary marketing message or call to action -->
<?php
$this->widget('FullProgPreview',
[
'caption' => "Program of the Day:",
'program' => $program,
]);
$i = 0;
foreach ($logs as $logelem) {
if ($i == 0) {
$this->widget('ExpandedLogHeader',
[
'date' => $logelem->getDateTime(),
'caption' => $logelem->title,
'link' => '',
'content' => $logelem->content,
]);
} else {
echo MsHtml::collapsedHeader($logelem->getDateTime(), $logelem->title, $logelem->getLink());
}
$i++;
}
?>
<?php
$this->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.',
]);
?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World", "/log/1"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
<?php echo MsHtml::collapsedHeader(new DateTime(), "Hello World"); ?>
</div>

40
www/protected/views/msmain/log.php Normal file
View File

@@ -0,0 +1,40 @@
<?php
/* @var $this MsMainController */
/* @var $logs Log[] */
/* @var $logid integer */
$this->pageTitle=Yii::app()->name;
$this->breadcrumbs=
[
'Log'
];
$this->selectedNav = '';
?>
<div class="container">
<?php echo MsHtml::pageHeader("Site-log", "Changelog and Blog for mikescher.de"); ?>
<div class="accordion" id="lca">
<?php
$i = 0;
foreach($logs as $logelem) {
$i++;
$this->widget('ExpandedLogHeader',
[
'date' => new DateTime($logelem->date),
'caption' => $logelem->title,
'content' => $logelem->content,
'collapseID' => $i,
'collapseOwner' => '#lca',
'collapseOpen' => ($logelem->ID == $logid),
]);
}
?>
</div>
</div>

69
www/protected/views/msmain/login.php
View File

@@ -9,47 +9,50 @@ $this->breadcrumbs = array(
);
?>
<div class="container well">
<div class="container">
<h1>Login</h1>
<?php echo MsHtml::pageHeader("Login", ""); ?>
<p>Please fill out the following form with your login credentials:</p>
<div class="well">
<div class="form">
<?php $form = $this->beginWidget('TbActiveForm', array(
'id' => 'login-form',
'enableClientValidation' => true,
'clientOptions' => array(
'validateOnSubmit' => true,
),
)); ?>
<p>Please fill out the following form with your login credentials:</p>
<p class="note">Fields with <span class="required">*</span> are required.</p>
<div class="form">
<?php $form = $this->beginWidget('TbActiveForm', array(
'id' => 'login-form',
'enableClientValidation' => true,
'clientOptions' => array(
'validateOnSubmit' => true,
),
)); ?>
<div>
<?php echo $form->labelEx($model, 'username'); ?>
<?php echo $form->textField($model, 'username'); ?>
<?php echo $form->error($model, 'username'); ?>
</div>
<p class="note">Fields with <span class="required">*</span> are required.</p>
<div>
<?php echo $form->labelEx($model, 'password'); ?>
<?php echo $form->passwordField($model, 'password'); ?>
<?php echo $form->error($model, 'password'); ?>
</div>
<div>
<?php echo $form->labelEx($model, 'username'); ?>
<?php echo $form->textField($model, 'username'); ?>
<?php echo $form->error($model, 'username'); ?>
</div>
<div class="rememberMe">
<?php echo $form->checkBox($model, 'rememberMe'); ?>
<?php echo $form->label($model, 'rememberMe'); ?>
<?php echo $form->error($model, 'rememberMe'); ?>
</div>
<div>
<?php echo $form->labelEx($model, 'password'); ?>
<?php echo $form->passwordField($model, 'password'); ?>
<?php echo $form->error($model, 'password'); ?>
</div>
<div class="buttons">
<?php echo TbHtml::submitButton('Login'); ?>
</div>
<div class="rememberMe">
<?php echo $form->checkBox($model, 'rememberMe'); ?>
<?php echo $form->label($model, 'rememberMe'); ?>
<?php echo $form->error($model, 'rememberMe'); ?>
</div>
<?php $this->endWidget(); ?>
</div>
<!-- form -->
<div class="buttons">
<?php echo MsHtml::submitButton('Login'); ?>
</div>
<?php $this->endWidget(); ?>
</div> <!-- form -->
</div> <!-- Well -->
</div><!-- Container -->

6
www/protected/views/programs/_form.php
View File

@@ -56,9 +56,9 @@
<?php echo $form->textFieldControlGroup($model,'highscore_gid',array('span'=>5)); ?>
<div class="form-actions">
<?php echo TbHtml::submitButton($model->isNewRecord ? 'Create' : 'Save',array(
'color'=>TbHtml::BUTTON_COLOR_PRIMARY,
'size'=>TbHtml::BUTTON_SIZE_LARGE,
<?php echo MsHtml::submitButton($model->isNewRecord ? 'Create' : 'Save',array(
'color'=>MsHtml::BUTTON_COLOR_PRIMARY,
'size'=>MsHtml::BUTTON_SIZE_LARGE,
)); ?>
</div>

2
www/protected/views/programs/_search.php
View File

@@ -50,7 +50,7 @@
<?php echo $form->textFieldControlGroup($model,'highscore_gid',array('span'=>5)); ?>
<div class="form-actions">
<?php echo TbHtml::submitButton('Search', array('color' => TbHtml::BUTTON_COLOR_PRIMARY,));?>
<?php echo MsHtml::submitButton('Search', array('color' => MsHtml::BUTTON_COLOR_PRIMARY,));?>
</div>
<?php $this->endWidget(); ?>

2
www/protected/views/programs/admin.php
View File

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

8
www/protected/views/programs/index.php
View File

@@ -19,8 +19,7 @@
<div class="container">
<h1>My Programs</h1>
<br><br>
<?php echo MsHtml::pageHeader("Programs", "Games and Tools, developed by me"); ?>
<div class="row-fluid">
<?php
@@ -29,6 +28,7 @@
echo '<ul class="thumbnails">';
foreach($datarow as $dataelem) {
/* @var $dataelem Program */
$this->widget('ThumbnailProgPreview',
[
'caption' => $dataelem->Thumbnailname,
@@ -39,7 +39,7 @@
'image' => $dataelem->getImagePath(),
'starcount' => $dataelem->Sterne,
'downloads' => $dataelem->Downloads,
'date' => new DateTime($dataelem->add_date),
'date' => $dataelem->getDateTime(),
'enabled' => $dataelem->enabled,
'programminglang' => $dataelem->programming_lang,
]);
@@ -61,7 +61,7 @@
}
$pagination_arr[] = ['label' => '&raquo;', 'url' => '?page=' . ($page+1), 'disabled' => ($page >= $pagecount)];
echo TbHtml::pagination($pagination_arr,
echo MsHtml::pagination($pagination_arr,
[
'align' => 'right',
]);