Added Titles to pages

2014-06-10 13:27:17 +02:00
parent 9a200136e7
commit 5f839356bb
23 changed files with 398 additions and 201 deletions
--- 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;
 }
--- a/www/protected/views/layouts/main.php
+++ b/www/protected/views/layouts/main.php
@@ -1,3 +1,5 @@
+<?php /* @var $this MSController */ ?>
+
 <!DOCTYPE html>
 <!--[if lt IE 7]>
 <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
@@ -10,7 +12,8 @@
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-	<title></title>
+	<title><?php
+			echo $this->pageTitle; ?></title>
 	<meta name="description" content="">
 	<meta name="viewport" content="width=device-width">

--- 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'),
--- a/www/protected/views/log/create.php
+++ b/www/protected/views/log/create.php
@@ -4,6 +4,9 @@
 ?>

 <?php
+
+$this->pageTitle = 'Create Logs - ' . Yii::app()->name;
+
 $this->breadcrumbs=array(
 	'Logs'=>array('index'),
 	'Create',
--- 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=
 	[
--- a/www/protected/views/log/update.php
+++ b/www/protected/views/log/update.php
@@ -4,6 +4,10 @@
 ?>

 <?php
+
+$this->pageTitle = 'Update Log - ' . Yii::app()->name;
+
+
 $this->breadcrumbs=array(
 	'Logs'=>array('index'),
 	$model->title=>array('view','id'=>$model->ID),
--- a/www/protected/views/log/view.php
+++ b/www/protected/views/log/view.php
@@ -4,6 +4,10 @@
 ?>

 <?php
+
+$this->pageTitle = 'View Log - ' . Yii::app()->name;
+
+
 $this->breadcrumbs=array(
 	'Logs'=>array('index'),
 	$model->title,
--- a/www/protected/views/msmain/about.php
+++ b/www/protected/views/msmain/about.php
@@ -1,7 +1,7 @@
 <?php
 /* @var $this MsMainController */

-$this->pageTitle=Yii::app()->name;
+$this->pageTitle = 'About - ' . Yii::app()->name;

 $this->breadcrumbs=
 	[
--- a/www/protected/views/msmain/admin.php
+++ b/www/protected/views/msmain/admin.php
@@ -3,7 +3,10 @@
 ?>

 <?php
-	$this->breadcrumbs =
+
+$this->pageTitle = 'Manage - ' . Yii::app()->name;
+
+$this->breadcrumbs =
 		[
 			'Admin',
 		];
--- a/www/protected/views/msmain/admin_updateEGH.php
+++ b/www/protected/views/msmain/admin_updateEGH.php
@@ -1,4 +1,13 @@
 <?php
+
+$this->pageTitle = 'Update EGH - ' . Yii::app()->name;
+
+$this->breadcrumbs =
+	[
+		'Admin',
+	];
+
+
 $v = new ExtendedGitGraph('Mikescher');

 $v->setToken(MsHelper::getStringDBVar('egg_auth-token'));
--- 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)',
--- 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',
--- 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',
 );
--- a/www/protected/views/programs/_form.php
+++ b/www/protected/views/programs/_form.php
@@ -1,5 +1,5 @@
 <?php
-/* @var $this ProgramController */
+/* @var $this ProgramsController */
 /* @var $model Program */
 /* @var $form TbActiveForm */
 ?>
--- a/www/protected/views/programs/_search.php
+++ b/www/protected/views/programs/_search.php
@@ -1,5 +1,5 @@
 <?php
-/* @var $this ProgramController */
+/* @var $this ProgramsController */
 /* @var $model Program */
 /* @var $form CActiveForm */
 ?>
--- a/www/protected/views/programs/_view.php
+++ b/www/protected/views/programs/_view.php
@@ -1,5 +1,5 @@
 <?php
-/* @var $this ProgramController */
+/* @var $this ProgramsController */
 /* @var $data Program */
 ?>

--- a/www/protected/views/programs/admin.php
+++ b/www/protected/views/programs/admin.php
@@ -1,7 +1,8 @@
 <?php
-/* @var $this ProgramController */
+/* @var $this ProgramsController */
 /* @var $model Program */

+$this->pageTitle = 'Manage Programs - ' . Yii::app()->name;

 $this->breadcrumbs=array(
 	'Programs'=>array('index'),
--- a/www/protected/views/programs/create.php
+++ b/www/protected/views/programs/create.php
@@ -4,6 +4,9 @@
 ?>

 <?php
+
+$this->pageTitle = 'Create Programs - ' . Yii::app()->name;
+
 $this->breadcrumbs=array(
 	'Programs'=>array('index'),
 	'Create',
--- a/www/protected/views/programs/index.php
+++ b/www/protected/views/programs/index.php
@@ -7,7 +7,10 @@
 ?>

 <?php
-	$this->breadcrumbs = array(
+
+$this->pageTitle = 'Programs - ' . Yii::app()->name;
+
+$this->breadcrumbs = array(
 		'Programs',
 	);

--- a/www/protected/views/programs/update.php
+++ b/www/protected/views/programs/update.php
@@ -1,9 +1,12 @@
 <?php
-/* @var $this ProgramController */
+/* @var $this ProgramsController */
 /* @var $model Program */
 ?>

 <?php
+
+$this->pageTitle = 'Update Program - ' . Yii::app()->name;
+
 $this->breadcrumbs=array(
 	'Programs'=>array('index'),
 	$model->Name=>array('view','id'=>$model->ID),
--- a/www/protected/views/programs/view.php
+++ b/www/protected/views/programs/view.php
@@ -4,6 +4,9 @@
 ?>

 <?php
+
+$this->pageTitle = $model->Name . ' - ' . Yii::app()->name;
+
 $this->breadcrumbs=array(
 	'Programs'=>array('index'),
 	$model->Name,