From 6e39aefd5235fdd4d852e90f1b02cf1576bc481d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Mon, 30 Jun 2014 22:51:59 +0200 Subject: [PATCH] Added various things Translated Log + Short Prog Desc to Eng Added Category filter to progs --- .idea/workspace.xml | 588 ++++++++---------- www/css/styles.css | 12 + www/images/log/captcha_img.png | Bin 0 -> 12381 bytes .../widgets/views/thumbnailProgPreview.php | 2 +- www/protected/config/main.php | 3 +- .../controllers/ProgramsController.php | 8 +- www/protected/models/Log.php | 1 + www/protected/models/Program.php | 4 +- .../views/log/_ajaxMarkdownPreview.php | 2 +- www/protected/views/log/_form.php | 7 +- www/protected/views/log/admin.php | 1 + www/protected/views/programs/_form.php | 2 + www/protected/views/programs/index.php | 24 +- www/protected/views/programs/view.php | 7 + 14 files changed, 328 insertions(+), 333 deletions(-) create mode 100644 www/images/log/captcha_img.png diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 41467d0..745b1e4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,13 @@ - - - - - + + + + + @@ -63,28 +63,55 @@ - - + + - + - - + + - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -103,12 +130,6 @@ @@ -300,146 +327,6 @@ - - + + - + - + @@ -719,61 +636,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -796,23 +663,9 @@ - - - - - - - - - - - - - - - + @@ -830,11 +683,6 @@ - - - - - @@ -845,16 +693,6 @@ - - - - - - - - - - @@ -865,35 +703,14 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -903,14 +720,7 @@ - - - - - - - - + @@ -920,28 +730,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -954,11 +742,6 @@ - - - - - @@ -974,6 +757,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -983,19 +820,138 @@ - + - + - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/css/styles.css b/www/css/styles.css index 6e4720d..5f9d872 100644 --- a/www/css/styles.css +++ b/www/css/styles.css @@ -106,6 +106,18 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu { text-decoration: none; } +.thumbnail a:active, +.thumbnail a:visited, +.thumbnail a:link { + color: #95A5A6; + text-decoration: none; +} + +.thumbnail a:hover { + color: #1ABC9C; + text-decoration: none; +} + .thumbnailParentSpan { width: 270px; } diff --git a/www/images/log/captcha_img.png b/www/images/log/captcha_img.png new file mode 100644 index 0000000000000000000000000000000000000000..f3e16b5797a75c616f62f0204d01e2c686ee3aed GIT binary patch literal 12381 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 P00000NkvXXu0mjf1Rf`& literal 0 HcmV?d00001 diff --git a/www/protected/components/widgets/views/thumbnailProgPreview.php b/www/protected/components/widgets/views/thumbnailProgPreview.php index 661ab38..ddd6590 100644 --- a/www/protected/components/widgets/views/thumbnailProgPreview.php +++ b/www/protected/components/widgets/views/thumbnailProgPreview.php @@ -32,7 +32,7 @@ category)) { echo MsHtml::icon(MsHtml::ICON_TAG); - echo $this->category . ''; + echo MsHtml::link($this->category . '', '/programs/cat/' . $this->category); } ?>

diff --git a/www/protected/config/main.php b/www/protected/config/main.php index 33f2e99..327823e 100644 --- a/www/protected/config/main.php +++ b/www/protected/config/main.php @@ -66,7 +66,8 @@ return ArrayX::merge( 'showScriptName' => false, 'rules' => [ - 'programs/' => 'programs/index', + 'programs/' => ['programs/index', 'defaultParams' => ['categoryfilter' => '']], + 'programs/cat/' => ['programs/index', 'defaultParams' => ['categoryfilter' => '']], 'programs/view/' => 'programs/view', 'log/' => ['log/index', 'defaultParams' => ['logid' => '-1']], diff --git a/www/protected/controllers/ProgramsController.php b/www/protected/controllers/ProgramsController.php index 5035245..c18da37 100644 --- a/www/protected/controllers/ProgramsController.php +++ b/www/protected/controllers/ProgramsController.php @@ -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); } diff --git a/www/protected/models/Log.php b/www/protected/models/Log.php index 21d8a6d..e0559d9 100644 --- a/www/protected/models/Log.php +++ b/www/protected/models/Log.php @@ -81,6 +81,7 @@ class Log extends CActiveRecord return new CActiveDataProvider($this, array( 'criteria'=>$criteria, + 'sort'=>[ 'defaultOrder'=>'date ASC' ], )); } diff --git a/www/protected/models/Program.php b/www/protected/models/Program.php index 8cf1ef2..b7b2a7c 100644 --- a/www/protected/models/Program.php +++ b/www/protected/models/Program.php @@ -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', diff --git a/www/protected/views/log/_ajaxMarkdownPreview.php b/www/protected/views/log/_ajaxMarkdownPreview.php index b35821e..03f0693 100644 --- a/www/protected/views/log/_ajaxMarkdownPreview.php +++ b/www/protected/views/log/_ajaxMarkdownPreview.php @@ -1,6 +1,6 @@ beginWidget('CMarkdown'); +$this->beginWidget('CMarkdown', array('purifyOutput'=>true)); echo $content; diff --git a/www/protected/views/log/_form.php b/www/protected/views/log/_form.php index cb3b7e3..be6a5d2 100644 --- a/www/protected/views/log/_form.php +++ b/www/protected/views/log/_form.php @@ -19,7 +19,12 @@ errorSummary($model); ?> - textFieldControlGroup($model,'date',array('span'=>5, 'value'=>date('Y-m-d'))); ?> + isNewRecord) + echo $form->textFieldControlGroup($model,'date',array('span'=>5, 'value' => date('Y-m-d'))); + else + echo $form->textFieldControlGroup($model,'date',array('span'=>5, )); + ?> textAreaControlGroup($model,'title',array('rows'=>6,'span'=>8)); ?> diff --git a/www/protected/views/log/admin.php b/www/protected/views/log/admin.php index ef30147..bba1e6f 100644 --- a/www/protected/views/log/admin.php +++ b/www/protected/views/log/admin.php @@ -47,6 +47,7 @@ or =) 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', diff --git a/www/protected/views/programs/_form.php b/www/protected/views/programs/_form.php index 91b0d34..36c2f5e 100644 --- a/www/protected/views/programs/_form.php +++ b/www/protected/views/programs/_form.php @@ -37,6 +37,8 @@ textAreaControlGroup($model,'Description',array('rows'=>6,'span'=>8)); ?> + textFieldControlGroup($model,'programming_lang',array('rows'=>6,'span'=>8)); ?> + textFieldControlGroup($model,'add_date',array('span'=>5)); ?> textFieldControlGroup($model,'download_url',array('rows'=>6,'span'=>8)); ?> diff --git a/www/protected/views/programs/index.php b/www/protected/views/programs/index.php index 4cedba7..31bd69f 100644 --- a/www/protected/views/programs/index.php +++ b/www/protected/views/programs/index.php @@ -1,9 +1,10 @@ pageTitle = 'Programs - ' . Yii::app()->name; $this->breadcrumbs = array( - 'Programs', - ); + 'Programs', +); ?>
- +
'; - 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' => '«', 'url' => '?page=' . ($page-1), 'disabled' => ($page <= 1)]; - for($i = 1; $i <= $pagecount; $i++) { + $pagination_arr[] = ['label' => '«', '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' => '»', 'url' => '?page=' . ($page+1), 'disabled' => ($page >= $pagecount)]; + $pagination_arr[] = ['label' => '»', 'url' => '?page=' . ($page + 1), 'disabled' => ($page >= $pagecount)]; echo MsHtml::pagination($pagination_arr, [ diff --git a/www/protected/views/programs/view.php b/www/protected/views/programs/view.php index d42b65e..fe39e5b 100644 --- a/www/protected/views/programs/view.php +++ b/www/protected/views/programs/view.php @@ -20,6 +20,9 @@ if (!$model->visible && Yii::app()->user->name != 'admin') { ?>
+ enabled) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users disabled'); ?> + visible) echo TbHtml::alert(TbHtml::ALERT_COLOR_WARNING, TbHtml::b('Warning!') . ' This programm is for normal users invisible'); ?> +
@@ -50,6 +53,10 @@ if (!$model->visible && Yii::app()->user->name != 'admin') { version->Version, array('color' => TbHtml::BADGE_COLOR_INFO)); ?> +