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

Added proper Description Implementation and Layout for programs

Browse Source
This commit is contained in:
Mike Schwörer
2014-07-05 21:15:24 +02:00
parent eb5c4fd7e0
commit 427b5b1dc4
13 changed files with 600 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,14 +13,14 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?php
echo $this->pageTitle; ?></title>
echo $this->pageTitle; ?></title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width">
<link rel="icon" type="image/png" href="/images/favicon.png" /> <?php //TODO-MS Add nice favicon ?>
<link rel="icon" type="image/png" href="/images/favicon.png"/> <?php //TODO-MS Add nice favicon ?>
<?php Yii::app()->bootstrap->register(); ?>
<link rel="stylesheet" type="text/css" href="/css/styles.css" />
<link rel="stylesheet" type="text/css" href="/css/styles.css"/>
<title><?php echo CHtml::encode($this->pageTitle); ?></title>
</head>
@@ -29,13 +29,15 @@
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
<!endif]-->
<?php
if (! isset($this->selectedNav)) $this->selectedNav = "";
<div id="fullbodywrapper">
<?php
if (!isset($this->selectedNav)) $this->selectedNav = "";
$this->widget('bootstrap.widgets.TbNavbar',
[
'brandLabel'=>'<img src="/images/logo_static.png" class="brandLogo"/>',
'brandUrl'=>'/',
'brandLabel' => '<img src="/images/logo_static.png" class="brandLogo"/>',
'brandUrl' => '/',
'display' => null,
'htmlOptions' =>
[
@@ -47,12 +49,12 @@
'class' => 'bootstrap.widgets.TbNav',
'items' =>
[
['label' => 'Home', 'url' => '/', 'active' => ($this->selectedNav === 'index')],
['label' => 'Blog', 'url' => '#', 'active' => ($this->selectedNav === 'blog')],
['label' => 'Programs', 'url' => '/programs/', 'active' => ($this->selectedNav === 'prog')],
['label' => '', 'items' => ProgramHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')],
['label' => '[[Log "'.Yii::app()->user->name.'" out]]', 'url' => '/logout', 'visible' => !Yii::app()->user->isGuest, 'htmlOptions' => ['class' => 'cstm-main-navbar-highlight']]
['label' => 'Home', 'url' => '/', 'active' => ($this->selectedNav === 'index')],
['label' => 'Blog', 'url' => '#', 'active' => ($this->selectedNav === 'blog')],
['label' => 'Programs', 'url' => '/programs/', 'active' => ($this->selectedNav === 'prog')],
['label' => '', 'items' => ProgramHelper::GetProgDropDownList(), 'htmlOptions' => ['class' => 'dropdown-append']],
['label' => 'About', 'url' => '/about', 'active' => ($this->selectedNav === 'about')],
['label' => '[[Log "' . Yii::app()->user->name . '" out]]', 'url' => '/logout', 'visible' => !Yii::app()->user->isGuest, 'htmlOptions' => ['class' => 'cstm-main-navbar-highlight']]
],
],
MsHtml::navbarSearchForm('/search', '',
@@ -71,37 +73,38 @@
]),
],
]);
?>
?>
<?php
if(isset($this->breadcrumbs))
{
<?php
if (isset($this->breadcrumbs)) {
$this->widget('bootstrap.widgets.TbBreadcrumb',
[
'links'=>$this->breadcrumbs,
'links' => $this->breadcrumbs,
]);
}
?>
?>
<?php
<?php
echo $content;
?>
?>
<div class="footer">
Copyright &copy; <?php echo date('Y'); ?> by Mike Schwörer &#xb7; <i><a href="/admin">{{admin}}</a></i><br/>
All Rights Reserved.<br/>
<?php echo Yii::powered(); ?>
</div>
<div class="footer">
Copyright &copy; <?php echo date('Y'); ?> by Mike Schwörer &#xb7; <a href="/admin">admin</a><br/>
All Rights Reserved.<br/>
<?php echo Yii::powered(); ?>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="/javascript/scripts.js"></script>
<?php
foreach($this->js_scripts as $script ) {
echo '<script type="text/javascript" language="JavaScript">', PHP_EOL;
echo $script;
echo '</script>', PHP_EOL;
}
foreach ($this->js_scripts as $script) {
echo '<script type="text/javascript" language="JavaScript">', PHP_EOL;
echo $script;
echo '</script>', PHP_EOL;
}
?>
</body>

2
www/protected/views/log/index.php
View File

@@ -21,7 +21,7 @@ $this->selectedNav = '';
<div class="accordion" id="lca">
<?php
$i = 0;
foreach($logs as $logelem) { //TODO-MS Translate all log things to eng
foreach($logs as $logelem) {
$i++;
$this->widget('ExpandedLogHeader',

43
www/protected/views/programs/view.php
View File

@@ -20,8 +20,8 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
?>
<div class="container">
<?php if (! $model->enabled) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users disabled'); ?>
<?php if (! $model->visible) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users invisible'); ?>
<?php if (!$model->enabled) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users disabled'); ?>
<?php if (!$model->visible) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users invisible'); ?>
<div class="row">
<div class="span3">
@@ -63,7 +63,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
<div class="text-right progview_inforow">
<?php if ($model->uses_absCanv): ?>
<a href="/programs/view/AbsCanvas">
<?php echo TbHtml::badge('AbsCanvas', array('color' => TbHtml::BADGE_COLOR_WARNING)); ?>
<?php echo TbHtml::badge('AbsCanvas', array('color' => TbHtml::BADGE_COLOR_WARNING)); ?>
</a>
<?php endif ?>
@@ -73,28 +73,15 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
</div>
<div class="span6">
<div class="well">
<h1 class="text-center"><?php echo $model->Name; ?></h1>
<hr/>
<div class="markdownOwner">
<div>
<p>
<?php
$this->beginWidget('CMarkdown');
for ($i = 0; $i < 24; $i++)
echo $model->Description . '<br>';
$this->endWidget();
?>
</p>
</div>
</div>
</div>
<?php
$this->widget('ProgDescription',
[
'program' => $model,
]
);
?>
</div>
<div class="span3">
<div class="well">
<img src="<?php echo $model->getImagePath(); ?>" class="progview_image"/>
@@ -106,12 +93,12 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
'block' => true,
'color' => TbHtml::BUTTON_COLOR_PRIMARY,
'size' => TbHtml::BUTTON_SIZE_DEFAULT,
'url' => '#',
'url' => '#', //TODO-MS Add Download link
]);
?>
<?php
if (! empty($model->github_url))
if (!empty($model->github_url))
echo TbHtml::linkbutton('Github',
[
'block' => true,
@@ -122,7 +109,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
?>
<?php
if (! empty($model->sourceforge_url))
if (!empty($model->sourceforge_url))
echo TbHtml::linkbutton('Sourceforge',
[
'block' => true,
@@ -133,7 +120,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
?>
<?php
if (! empty($model->homepage_url))
if (!empty($model->homepage_url))
echo TbHtml::linkbutton('Homepage',
[
'block' => true,
@@ -150,7 +137,7 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
'block' => true,
'color' => TbHtml::BUTTON_COLOR_SUCCESS,
'size' => TbHtml::BUTTON_SIZE_DEFAULT,
'url' => '#',
'url' => '#', //TODO-MS Add Highscore link
]);
?>
</div>