diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2cc3e34..4bce165 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,13 @@ - - - - - + + + + + @@ -63,10 +63,98 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85,20 +173,12 @@ @@ -232,6 +320,20 @@ + + + + + + + + + + @@ -303,6 +405,10 @@ @@ -330,6 +436,32 @@ + + + + + + + + + + + + + + - - - - - - - - - - @@ -638,7 +756,7 @@ - + @@ -646,12 +764,12 @@ - + - + @@ -679,41 +797,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -729,36 +812,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -774,21 +832,6 @@ - - - - - - - - - - - - - - - @@ -814,41 +857,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -864,23 +882,6 @@ - - - - - - - - - - - - - - - - - @@ -891,11 +892,6 @@ - - - - - @@ -927,23 +923,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/index.php b/www/index.php index 6e267c7..49171bd 100644 --- a/www/index.php +++ b/www/index.php @@ -14,7 +14,6 @@ Yii::createWebApplication($config)->run(); // TODO-MS Add title property to pages -// TODO-MS Add Metadata property to pages (especially programs) ->Search engines // TODO-MS More contrast in design ??? // TODO-MS Add Favicon // TODO-MS Add Blog diff --git a/www/protected/components/MSController.php b/www/protected/components/MSController.php index 7dd71a6..e774491 100644 --- a/www/protected/components/MSController.php +++ b/www/protected/components/MSController.php @@ -5,26 +5,13 @@ */ class MSController extends CController { - /** - * @var string the default layout for the controller view. Defaults to '//layouts/main', - * meaning using a single column layout. See 'protected/views/layouts/main.php'. - */ public $layout='//layouts/main'; - /** - * @var array the breadcrumbs of the current page. The value of this property will - * be assigned to {@link CBreadcrumbs::links}. Please refer to {@link CBreadcrumbs::links} - * for more details on how to specify this property. - */ public $breadcrumbs=array(); - /** - * @var string the currently active Element in the Navbar - */ public $selectedNav = ''; - /** - * @var string[] additional js scripts - */ public $js_scripts = array(); + + public $title = null; } \ No newline at end of file diff --git a/www/protected/views/layouts/main.php b/www/protected/views/layouts/main.php index 0a6942f..fd17866 100644 --- a/www/protected/views/layouts/main.php +++ b/www/protected/views/layouts/main.php @@ -1,3 +1,5 @@ + + @@ -10,7 +12,8 @@ - + <?php + echo $this->pageTitle; ?> diff --git a/www/protected/views/log/admin.php b/www/protected/views/log/admin.php index e711fad..ef30147 100644 --- a/www/protected/views/log/admin.php +++ b/www/protected/views/log/admin.php @@ -2,6 +2,7 @@ /* @var $this LogController */ /* @var $model Log */ +$this->pageTitle = 'Manage Logs - ' . Yii::app()->name; $this->breadcrumbs=array( 'Logs'=>array('index'), diff --git a/www/protected/views/log/create.php b/www/protected/views/log/create.php index e674a16..cfdf8bb 100644 --- a/www/protected/views/log/create.php +++ b/www/protected/views/log/create.php @@ -4,6 +4,9 @@ ?> pageTitle = 'Create Logs - ' . Yii::app()->name; + $this->breadcrumbs=array( 'Logs'=>array('index'), 'Create', diff --git a/www/protected/views/log/index.php b/www/protected/views/log/index.php index 119610b..713ef03 100644 --- a/www/protected/views/log/index.php +++ b/www/protected/views/log/index.php @@ -3,7 +3,7 @@ /* @var $logs Log[] */ /* @var $logid integer */ -$this->pageTitle=Yii::app()->name; +$this->pageTitle = 'Log - ' . Yii::app()->name; $this->breadcrumbs= [ diff --git a/www/protected/views/log/update.php b/www/protected/views/log/update.php index c5501c1..fe8a312 100644 --- a/www/protected/views/log/update.php +++ b/www/protected/views/log/update.php @@ -4,6 +4,10 @@ ?> pageTitle = 'Update Log - ' . Yii::app()->name; + + $this->breadcrumbs=array( 'Logs'=>array('index'), $model->title=>array('view','id'=>$model->ID), diff --git a/www/protected/views/log/view.php b/www/protected/views/log/view.php index 6399c70..9bc1a89 100644 --- a/www/protected/views/log/view.php +++ b/www/protected/views/log/view.php @@ -4,6 +4,10 @@ ?> pageTitle = 'View Log - ' . Yii::app()->name; + + $this->breadcrumbs=array( 'Logs'=>array('index'), $model->title, diff --git a/www/protected/views/msmain/about.php b/www/protected/views/msmain/about.php index b80dbb9..ecc50fc 100644 --- a/www/protected/views/msmain/about.php +++ b/www/protected/views/msmain/about.php @@ -1,7 +1,7 @@ pageTitle=Yii::app()->name; +$this->pageTitle = 'About - ' . Yii::app()->name; $this->breadcrumbs= [ diff --git a/www/protected/views/msmain/admin.php b/www/protected/views/msmain/admin.php index 29652fd..29c0fdd 100644 --- a/www/protected/views/msmain/admin.php +++ b/www/protected/views/msmain/admin.php @@ -3,7 +3,10 @@ ?> breadcrumbs = + +$this->pageTitle = 'Manage - ' . Yii::app()->name; + +$this->breadcrumbs = [ 'Admin', ]; diff --git a/www/protected/views/msmain/admin_updateEGH.php b/www/protected/views/msmain/admin_updateEGH.php index 4388040..492eb74 100644 --- a/www/protected/views/msmain/admin_updateEGH.php +++ b/www/protected/views/msmain/admin_updateEGH.php @@ -1,4 +1,13 @@ pageTitle = 'Update EGH - ' . Yii::app()->name; + +$this->breadcrumbs = + [ + 'Admin', + ]; + + $v = new ExtendedGitGraph('Mikescher'); $v->setToken(MsHelper::getStringDBVar('egg_auth-token')); diff --git a/www/protected/views/msmain/debugerror.php b/www/protected/views/msmain/debugerror.php index f52d332..bdd1104 100644 --- a/www/protected/views/msmain/debugerror.php +++ b/www/protected/views/msmain/debugerror.php @@ -2,7 +2,7 @@ /* @var $this MsMainController */ /* @var $error array */ - $this->pageTitle=Yii::app()->name . ' - Error'; + $this->pageTitle='Error [DBG] - ' . Yii::app()->name; $this->breadcrumbs=array( 'Error (debug)', diff --git a/www/protected/views/msmain/error.php b/www/protected/views/msmain/error.php index 4550872..86067bf 100644 --- a/www/protected/views/msmain/error.php +++ b/www/protected/views/msmain/error.php @@ -2,7 +2,7 @@ /* @var $this MsMainController */ /* @var $error array */ - $this->pageTitle=Yii::app()->name . ' - Error'; + $this->pageTitle='Error - ' . Yii::app()->name; $this->breadcrumbs=array( 'Error', diff --git a/www/protected/views/msmain/login.php b/www/protected/views/msmain/login.php index d6f2ba4..95b5104 100644 --- a/www/protected/views/msmain/login.php +++ b/www/protected/views/msmain/login.php @@ -3,7 +3,7 @@ /* @var $model LoginForm */ /* @var $form CActiveForm */ -$this->pageTitle = Yii::app()->name . ' - Login'; +$this->pageTitle = 'Admin Login - ' . Yii::app()->name; $this->breadcrumbs = array( 'Login', ); diff --git a/www/protected/views/programs/_form.php b/www/protected/views/programs/_form.php index d67917c..6ff3c3c 100644 --- a/www/protected/views/programs/_form.php +++ b/www/protected/views/programs/_form.php @@ -1,5 +1,5 @@ diff --git a/www/protected/views/programs/_search.php b/www/protected/views/programs/_search.php index 9939de7..e4e221b 100644 --- a/www/protected/views/programs/_search.php +++ b/www/protected/views/programs/_search.php @@ -1,5 +1,5 @@ diff --git a/www/protected/views/programs/_view.php b/www/protected/views/programs/_view.php index daae53e..ff17b37 100644 --- a/www/protected/views/programs/_view.php +++ b/www/protected/views/programs/_view.php @@ -1,5 +1,5 @@ diff --git a/www/protected/views/programs/admin.php b/www/protected/views/programs/admin.php index fd975d8..a07efbf 100644 --- a/www/protected/views/programs/admin.php +++ b/www/protected/views/programs/admin.php @@ -1,7 +1,8 @@ pageTitle = 'Manage Programs - ' . Yii::app()->name; $this->breadcrumbs=array( 'Programs'=>array('index'), diff --git a/www/protected/views/programs/create.php b/www/protected/views/programs/create.php index 984891a..fadf9be 100644 --- a/www/protected/views/programs/create.php +++ b/www/protected/views/programs/create.php @@ -4,6 +4,9 @@ ?> pageTitle = 'Create Programs - ' . Yii::app()->name; + $this->breadcrumbs=array( 'Programs'=>array('index'), 'Create', diff --git a/www/protected/views/programs/index.php b/www/protected/views/programs/index.php index 0e40331..2433f71 100644 --- a/www/protected/views/programs/index.php +++ b/www/protected/views/programs/index.php @@ -7,7 +7,10 @@ ?> breadcrumbs = array( + +$this->pageTitle = 'Programs - ' . Yii::app()->name; + +$this->breadcrumbs = array( 'Programs', ); diff --git a/www/protected/views/programs/update.php b/www/protected/views/programs/update.php index 725f53d..0f1373a 100644 --- a/www/protected/views/programs/update.php +++ b/www/protected/views/programs/update.php @@ -1,9 +1,12 @@ pageTitle = 'Update Program - ' . Yii::app()->name; + $this->breadcrumbs=array( 'Programs'=>array('index'), $model->Name=>array('view','id'=>$model->ID), diff --git a/www/protected/views/programs/view.php b/www/protected/views/programs/view.php index 2bf0a2c..6913feb 100644 --- a/www/protected/views/programs/view.php +++ b/www/protected/views/programs/view.php @@ -4,6 +4,9 @@ ?> pageTitle = $model->Name . ' - ' . Yii::app()->name; + $this->breadcrumbs=array( 'Programs'=>array('index'), $model->Name,