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

Added various things

Browse Source 
Translated Log + Short Prog Desc to Eng
Added Category filter to progs
This commit is contained in:
Mike Schwörer
2014-06-30 22:51:59 +02:00
parent ccf18ad491
commit 6e39aefd52
14 changed files with 328 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/protected/components/widgets/views/thumbnailProgPreview.php
View File

@@ -32,7 +32,7 @@
<?php
if (!empty($this->category)) {
echo MsHtml::icon(MsHtml::ICON_TAG);
echo $this->category . '';
echo MsHtml::link($this->category . '', '/programs/cat/' . $this->category);
}
?>
</p>

3
www/protected/config/main.php
View File

@@ -66,7 +66,8 @@ return ArrayX::merge(
'showScriptName' => false,
'rules' =>
[
'programs/' => 'programs/index',
'programs/' => ['programs/index', 'defaultParams' => ['categoryfilter' => '']],
'programs/cat/<categoryfilter>' => ['programs/index', 'defaultParams' => ['categoryfilter' => '']],
'programs/view/<id>' => 'programs/view',
'log/' => ['log/index', 'defaultParams' => ['logid' => '-1']],

8
www/protected/controllers/ProgramsController.php
View File

@@ -144,7 +144,7 @@ class ProgramsController extends MSController
/**
* Lists all models.
*/
public function actionIndex()
public function actionIndex($categoryfilter)
{
$this->layout = '//layouts/main';
@@ -156,7 +156,10 @@ class ProgramsController extends MSController
$criteria = new CDbCriteria;
$criteria->order = "Sterne DESC, add_date DESC";
$criteria->condition = "visible=1";
if (! empty($categoryfilter))
$criteria->addCondition("Kategorie = :cat");
$criteria->params[':cat'] = $categoryfilter;
$criteria->addCondition("visible=1");
$all = Program::model()->findAll($criteria);
/* @var $all Program[] */
@@ -182,6 +185,7 @@ class ProgramsController extends MSController
$data['pagecount'] = $pagecount;
$data['rowcount'] = $rowcount;
$data['data'] = $progdata;
$data['category'] = $categoryfilter;
$this->render('index', $data);
}

1
www/protected/models/Log.php
View File

@@ -81,6 +81,7 @@ class Log extends CActiveRecord
return new CActiveDataProvider($this, array(
'criteria'=>$criteria,
'sort'=>[ 'defaultOrder'=>'date ASC' ],
));
}

4
www/protected/models/Program.php
View File

@@ -44,7 +44,7 @@ class Program extends CActiveRecord
// NOTE: you should only define rules for those attributes that
// will receive user inputs.
return array(
array('Name, Thumbnailname, Downloads, Kategorie, Sterne, enabled, visible, Language, programming_lang, Description, add_date, download_url, sourceforge_url, homepage_url, github_url, uses_absCanv, update_identifier', 'required'),
array('Name, Thumbnailname, Downloads, Kategorie, Sterne, enabled, visible, Language, programming_lang, Description, add_date, uses_absCanv', 'required'),
array('enabled, visible, uses_absCanv, highscore_gid', 'numerical', 'integerOnly'=>true),
array('Downloads, Sterne', 'numerical'),
array('update_identifier', 'length', 'max'=>64),
@@ -86,7 +86,7 @@ class Program extends CActiveRecord
'enabled' => 'Enabled',
'visible' => 'Visible',
'Language' => 'Language',
'programming_lang' => 'programming_lang',
'programming_lang' => 'programming Language',
'Description' => 'Description',
'add_date' => 'Add Date',
'download_url' => 'Download Url',

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

@@ -1,6 +1,6 @@
<?php
$this->beginWidget('CMarkdown');
$this->beginWidget('CMarkdown', array('purifyOutput'=>true));
echo $content;

7
www/protected/views/log/_form.php
View File

@@ -19,7 +19,12 @@
<?php echo $form->errorSummary($model); ?>
<?php echo $form->textFieldControlGroup($model,'date',array('span'=>5, 'value'=>date('Y-m-d'))); ?>
<?php
if ($model->isNewRecord)
echo $form->textFieldControlGroup($model,'date',array('span'=>5, 'value' => date('Y-m-d')));
else
echo $form->textFieldControlGroup($model,'date',array('span'=>5, ));
?>
<?php echo $form->textAreaControlGroup($model,'title',array('rows'=>6,'span'=>8)); ?>

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

@@ -47,6 +47,7 @@ or <b>=</b>) at the beginning of each of your search values to specify how the c
'id'=>'log-grid',
'dataProvider'=>$model->search(),
'filter'=>$model,
'columns'=>array(
'ID',
'date',

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

@@ -37,6 +37,8 @@
<?php echo $form->textAreaControlGroup($model,'Description',array('rows'=>6,'span'=>8)); ?>
<?php echo $form->textFieldControlGroup($model,'programming_lang',array('rows'=>6,'span'=>8)); ?>
<?php echo $form->textFieldControlGroup($model,'add_date',array('span'=>5)); ?>
<?php echo $form->textFieldControlGroup($model,'download_url',array('rows'=>6,'span'=>8)); ?>

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

@@ -1,9 +1,10 @@
<?php
/* @var $this ProgramsController */
/* @var $page integer */
/* @var $page integer */
/* @var $pagecount integer */
/* @var $rowcount integer */
/* @var $data Program[][] */
/* @var $category string */
?>
<?php
@@ -11,21 +12,26 @@
$this->pageTitle = 'Programs - ' . Yii::app()->name;
$this->breadcrumbs = array(
'Programs',
);
'Programs',
);
?>
<div class="container">
<?php echo MsHtml::pageHeader("Programs", "Games and Tools, developed by me"); ?>
<?php
if (empty($category))
echo MsHtml::pageHeader("Programs", "Games and Tools, developed by me");
else
echo MsHtml::pageHeader("Programs", '"' . $category . '"');
?>
<div class="row-fluid">
<?php
foreach($data as $datarow) {
foreach ($data as $datarow) {
echo '<ul class="thumbnails">';
foreach($datarow as $dataelem) {
foreach ($datarow as $dataelem) {
/* @var $dataelem Program */
$this->widget('ThumbnailProgPreview',
[
@@ -53,11 +59,11 @@ $this->breadcrumbs = array(
if ($pagecount > 1) {
$pagination_arr = array();
$pagination_arr[] = ['label' => '&laquo;', 'url' => '?page=' . ($page-1), 'disabled' => ($page <= 1)];
for($i = 1; $i <= $pagecount; $i++) {
$pagination_arr[] = ['label' => '&laquo;', 'url' => '?page=' . ($page - 1), 'disabled' => ($page <= 1)];
for ($i = 1; $i <= $pagecount; $i++) {
$pagination_arr[] = ['label' => $i, 'url' => '?page=' . $i, 'active' => ($i == $page)];
}
$pagination_arr[] = ['label' => '&raquo;', 'url' => '?page=' . ($page+1), 'disabled' => ($page >= $pagecount)];
$pagination_arr[] = ['label' => '&raquo;', 'url' => '?page=' . ($page + 1), 'disabled' => ($page >= $pagecount)];
echo MsHtml::pagination($pagination_arr,
[

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

@@ -20,6 +20,9 @@ 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'); ?>
<div class="row">
<div class="span3">
<div class="well progview_infocol">
@@ -50,6 +53,10 @@ if (!$model->visible && Yii::app()->user->name != 'admin') {
<td><?php echo TbHtml::badge($model->version->Version, array('color' => TbHtml::BADGE_COLOR_INFO)); ?></td>
</tr>
<?php endif ?>
<?php
// TODO-MS Add Highscore Tables to MVC
// TODO-MS Show highest score when highscore_gid is set
?>
</table>
</div>