diff --git a/www/css/style.css b/www/css/style.css index 90fb12c..45a7b91 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -356,6 +356,7 @@ button.button:hover, .button:active { background-position: 0 -39px; } .sf { width: 150px; } .mf { width: 265px; } .lf { width: 460px; } +.ff { width: 100%; } textarea.mf { height: 100px; } input[type=radio], input[type=checkbox] { margin: 0; padding: 0; vertical-align: middle; } @@ -385,9 +386,9 @@ input[type=radio], input[type=checkbox] { margin: 0; padding: 0; vertical-align: .form_default button:hover { background: #005681 url(../images/buttonbg3.png) repeat-x 0 -36px; } .form_default button:active { -moz-box-shadow: inset 2px 2px 2px #12274c; -webkit-box-shadow: inset 2px 2px 2px #12274c; box-shadow: inset 2px 2px 2px #12274c; } -.form_default input.error, .form_default textarea.error, .form_default select.error { border: 1px solid #ff0000; } -.form_default div.error { float: none; width: auto; color: #ff0000; font-size: 11px; display: inline-block; } -.form_default label.error { color: #ff0000; } +.form_default div.error { } +.form_default .error input, .form_default .error textarea, .form_default .error select { border: 1px solid #FF4444; box-shadow: 1px 1px 3px #FFAAAA inset; background-color: #FFEEEE;} +.form_default div.errortext { float: none; width: auto; color: #ff0000; font-size: 11px; display: inline-block; } /***MAIN CONTENT: STANDARD TABLE (users.html)***/ .addNewButton { float: left; border: 1px solid #ccc; background: #4b6592 url(../images/buttonbg3.png) repeat-x top left; color: #fff; padding: 5px 20px; } diff --git a/www/protected/controllers/CandidatoCapacidadController.php b/www/protected/controllers/CandidatoCapacidadController.php index 21efcd3..9d98181 100644 --- a/www/protected/controllers/CandidatoCapacidadController.php +++ b/www/protected/controllers/CandidatoCapacidadController.php @@ -2,175 +2,168 @@ class CandidatoCapacidadController extends Controller { - /** - * @var string the default layout for the views. Defaults to '//layouts/column2', meaning - * using two-column layout. See 'protected/views/layouts/column2.php'. - */ - public $layout='//layouts/column2'; + /** + * @var string the default layout for the views. Defaults to '//layouts/column2', meaning + * using two-column layout. See 'protected/views/layouts/column2.php'. + */ + public $layout='//layouts/default'; - /** - * @return array action filters - */ - public function filters() - { - return array( - 'accessControl', // perform access control for CRUD operations - ); - } + /** + * @return array action filters + */ + public function filters() + { + return array( + 'accessControl', // perform access control for CRUD operations + ); + } - /** - * Specifies the access control rules. - * This method is used by the 'accessControl' filter. - * @return array access control rules - */ - public function accessRules() - { - return array( - array('allow', // allow all users to perform 'index' and 'view' actions - 'actions'=>array('index','view'), - 'users'=>array('*'), - ), - array('allow', // allow authenticated user to perform 'create' and 'update' actions - 'actions'=>array('create','update'), - 'users'=>array('@'), - ), - array('allow', // allow admin user to perform 'admin' and 'delete' actions - 'actions'=>array('admin','delete'), - 'users'=>array('admin'), - ), - array('deny', // deny all users - 'users'=>array('*'), - ), - ); - } + /** + * Specifies the access control rules. + * This method is used by the 'accessControl' filter. + * @return array access control rules + */ + public function accessRules() + { + return array( + array('allow', // allow authenticated user to perform 'create' and 'update' actions + 'actions'=>array('index','view','create','update','delete','admin'), + 'users'=>array('@'), + ), + array('deny', // deny all users + 'users'=>array('*'), + ), + ); + } - /** - * Displays a particular model. - * @param integer $id the ID of the model to be displayed - */ - public function actionView($id) - { - $this->render('view',array( - 'model'=>$this->loadModel($id), - )); - } + /** + * Displays a particular model. + * @param integer $id the ID of the model to be displayed + */ + public function actionView($id) + { + $this->render('view',array( + 'model'=>$this->loadModel($id), + )); + } - /** - * Creates a new model. - * If creation is successful, the browser will be redirected to the 'view' page. - */ - public function actionCreate() - { - $model=new CandidatoCapacidad; + /** + * Creates a new model. + * If creation is successful, the browser will be redirected to the 'view' page. + */ + public function actionCreate() + { + $model=new CandidatoCapacidad; - // Uncomment the following line if AJAX validation is needed - // $this->performAjaxValidation($model); + // Uncomment the following line if AJAX validation is needed + $this->performAjaxValidation($model); - if(isset($_POST['CandidatoCapacidad'])) - { - $model->attributes=$_POST['CandidatoCapacidad']; - if($model->save()) - $this->redirect(array('view','id'=>$model->id)); - } + if(isset($_POST['CandidatoCapacidad'])) + { + print_r($_POST); + $model->attributes=$_POST['CandidatoCapacidad']; + if($model->save()) + $this->redirect(array('view','id'=>$model->id)); + } - $this->render('create',array( - 'model'=>$model, - )); - } + $this->render('create',array( + 'model'=>$model, + )); + } - /** - * Updates a particular model. - * If update is successful, the browser will be redirected to the 'view' page. - * @param integer $id the ID of the model to be updated - */ - public function actionUpdate($id) - { - $model=$this->loadModel($id); + /** + * Updates a particular model. + * If update is successful, the browser will be redirected to the 'view' page. + * @param integer $id the ID of the model to be updated + */ + public function actionUpdate($id) + { + $model=$this->loadModel($id); - // Uncomment the following line if AJAX validation is needed - // $this->performAjaxValidation($model); + // Uncomment the following line if AJAX validation is needed + $this->performAjaxValidation($model); - if(isset($_POST['CandidatoCapacidad'])) - { - $model->attributes=$_POST['CandidatoCapacidad']; - if($model->save()) - $this->redirect(array('view','id'=>$model->id)); - } + if(isset($_POST['CandidatoCapacidad'])) + { + $model->attributes=$_POST['CandidatoCapacidad']; + if($model->save()) + $this->redirect(array('view','id'=>$model->id)); + } - $this->render('update',array( - 'model'=>$model, - )); - } + $this->render('update',array( + 'model'=>$model, + )); + } - /** - * Deletes a particular model. - * If deletion is successful, the browser will be redirected to the 'admin' page. - * @param integer $id the ID of the model to be deleted - */ - public function actionDelete($id) - { - if(Yii::app()->request->isPostRequest) - { - // we only allow deletion via POST request - $this->loadModel($id)->delete(); + /** + * Deletes a particular model. + * If deletion is successful, the browser will be redirected to the 'admin' page. + * @param integer $id the ID of the model to be deleted + */ + public function actionDelete($id) + { + if(Yii::app()->request->isPostRequest) + { + // we only allow deletion via POST request + $this->loadModel($id)->delete(); - // if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser - if(!isset($_GET['ajax'])) - $this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin')); - } - else - throw new CHttpException(400,'Invalid request. Please do not repeat this request again.'); - } + // if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser + if(!isset($_GET['ajax'])) + $this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin')); + } + else + throw new CHttpException(400,'Invalid request. Please do not repeat this request again.'); + } - /** - * Lists all models. - */ - public function actionIndex() - { - $dataProvider=new CActiveDataProvider('CandidatoCapacidad'); - $this->render('index',array( - 'dataProvider'=>$dataProvider, - )); - } + /** + * Lists all models. + */ + public function actionIndex() + { + $dataProvider=new CActiveDataProvider('CandidatoCapacidad'); + $this->render('index',array( + 'dataProvider'=>$dataProvider, + )); + } - /** - * Manages all models. - */ - public function actionAdmin() - { - $model=new CandidatoCapacidad('search'); - $model->unsetAttributes(); // clear any default values - if(isset($_GET['CandidatoCapacidad'])) - $model->attributes=$_GET['CandidatoCapacidad']; + /** + * Manages all models. + */ + public function actionAdmin() + { + $model=new CandidatoCapacidad('search'); + $model->unsetAttributes(); // clear any default values + if(isset($_GET['CandidatoCapacidad'])) + $model->attributes=$_GET['CandidatoCapacidad']; - $this->render('admin',array( - 'model'=>$model, - )); - } + $this->render('admin',array( + 'model'=>$model, + )); + } - /** - * Returns the data model based on the primary key given in the GET variable. - * If the data model is not found, an HTTP exception will be raised. - * @param integer the ID of the model to be loaded - */ - public function loadModel($id) - { - $model=CandidatoCapacidad::model()->findByPk($id); - if($model===null) - throw new CHttpException(404,'The requested page does not exist.'); - return $model; - } + /** + * Returns the data model based on the primary key given in the GET variable. + * If the data model is not found, an HTTP exception will be raised. + * @param integer the ID of the model to be loaded + */ + public function loadModel($id) + { + $model=CandidatoCapacidad::model()->findByPk($id); + if($model===null) + throw new CHttpException(404,'The requested page does not exist.'); + return $model; + } - /** - * Performs the AJAX validation. - * @param CModel the model to be validated - */ - protected function performAjaxValidation($model) - { - if(isset($_POST['ajax']) && $_POST['ajax']==='candidato-capacidad-form') - { - echo CActiveForm::validate($model); - Yii::app()->end(); - } - } + /** + * Performs the AJAX validation. + * @param CModel the model to be validated + */ + protected function performAjaxValidation($model) + { + if(isset($_POST['ajax']) && $_POST['ajax']==='candidato-capacidad-form') + { + echo CActiveForm::validate($model); + Yii::app()->end(); + } + } } diff --git a/www/protected/controllers/CandidatoController.php b/www/protected/controllers/CandidatoController.php index ff25d23..0df7f0a 100644 --- a/www/protected/controllers/CandidatoController.php +++ b/www/protected/controllers/CandidatoController.php @@ -63,7 +63,7 @@ class CandidatoController extends Controller $titulacionesValidas = array(); // Uncomment the following line if AJAX validation is needed - //$this->performAjaxValidation($model); + $this->performAjaxValidation($model); /*if(isset($_POST['Candidato'])) { @@ -160,7 +160,7 @@ class CandidatoController extends Controller $titulacionesValidas = array(); // Uncomment the following line if AJAX validation is needed - //$this->performAjaxValidation($model); + $this->performAjaxValidation($model); /*if(isset($_POST['Candidato'])) { diff --git a/www/protected/views/candidato/_form.php b/www/protected/views/candidato/_form.php index 5bbe458..4d19b4b 100644 --- a/www/protected/views/candidato/_form.php +++ b/www/protected/views/candidato/_form.php @@ -4,7 +4,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e beginWidget('CActiveForm', array( 'id'=>'candidato-form', - 'enableAjaxValidation'=>false, + 'enableAjaxValidation'=>true, 'htmlOptions'=>array('enctype' => 'multipart/form-data'), )); ?> @@ -32,7 +32,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e array("title" => $model->nombre, "width"=>"120", "height"=>"120") ); ?> - error($model,'foto', array('class'=>'error')); ?> + error($model,'foto', array('class'=>'errortext')); ?> @@ -40,7 +40,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e labelEx($model,'nombre'); ?>
textField($model,'nombre',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'nombre', array('class'=>'error')); ?> + error($model,'nombre', array('class'=>'errortext')); ?>
@@ -48,7 +48,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e labelEx($model,'apellidos'); ?>
textField($model,'apellidos',array('maxlength'=>255,'class'=>'lf')); ?> - error($model,'apellidos', array('class'=>'error')); ?> + error($model,'apellidos', array('class'=>'errortext')); ?>
@@ -62,7 +62,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e array('separator'=>'    ')); echo strip_tags($cadena, ''); ?> - error($model,'sexo', array('class'=>'error')); ?> + error($model,'sexo', array('class'=>'errortext')); ?> @@ -70,7 +70,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e labelEx($model,'dni'); ?>
textField($model,'dni',array('maxlength'=>255,'class'=>'sf')); ?> - error($model,'dni', array('class'=>'error')); ?> + error($model,'dni', array('class'=>'errortext')); ?>
@@ -78,7 +78,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e labelEx($model,'fecha_nacimiento'); ?>
textField($model,'fecha_nacimiento',array('class'=>'sf','id'=>'datepicker')); ?> - error($model,'fecha_nacimiento', array('class'=>'error')); ?> + error($model,'fecha_nacimiento', array('class'=>'errortext')); ?>
@@ -86,7 +86,7 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e labelEx($model,'lugar_nacimiento'); ?>
textField($model,'lugar_nacimiento',array('maxlength'=>255,'class'=>'lf')); ?> - error($model,'lugar_nacimiento', array('class'=>'error')); ?> + error($model,'lugar_nacimiento', array('class'=>'errortext')); ?>

@@ -104,21 +104,21 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e labelEx($model,'telefono_fijo'); ?>
textField($model,'telefono_fijo',array('maxlength'=>255,'class'=>'sf')); ?> - error($model,'telefono_fijo', array('class'=>'error')); ?> + error($model,'telefono_fijo', array('class'=>'errortext')); ?>
labelEx($model,'telefono_movil'); ?>
textField($model,'telefono_movil',array('maxlength'=>255,'class'=>'sf')); ?> - error($model,'telefono_movil', array('class'=>'error')); ?> + error($model,'telefono_movil', array('class'=>'errortext')); ?>
labelEx($model,'email'); ?>
textField($model,'email',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'email', array('class'=>'error')); ?> + error($model,'email', array('class'=>'errortext')); ?>
@@ -135,16 +135,16 @@ Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/e unset($lista[$provincia->id]); } } - echo CHtml::dropDownList( - 'localidad', - $model->localidad, + echo $form->dropDownList( + $model, + 'localidad', $lista, array( 'empty'=>'', 'class'=>'mf', )); ?> - error($model,'localidad', array('class'=>'error')); ?> + error($model,'localidad', array('class'=>'errortext')); ?> diff --git a/www/protected/views/candidato/update.php b/www/protected/views/candidato/update.php index 6902b85..84e35b9 100644 --- a/www/protected/views/candidato/update.php +++ b/www/protected/views/candidato/update.php @@ -1,7 +1,8 @@ breadcrumbs=array( 'Candidatos'=>array('index'), - $model->nombre . ' ' . $model->apellidos, + $model->nombre . ' ' . $model->apellidos=>array('view','id'=>$model->id), + Yii::t('intranet', 'Modificación'), ); /*$this->menu=array( @@ -11,16 +12,14 @@ $this->breadcrumbs=array( array('label'=>'Manage Candidato', 'url'=>array('admin')), );*/ -$this->pageTitle='Modificar candidato "' . $model->nombre . ' ' . $model->apellidos . '"'; +$this->pageTitle=Yii::t('intranet', 'Modificar candidato') . ' "' . $model->nombre . ' ' . $model->apellidos . '"'; ?> renderPartial('_form', array( 'model'=>$model, 'idioma'=>$idioma, 'titulacion'=>$titulacion, - //'capacidad'=>$capacidad, 'idiomasValidos'=>$idiomasValidos, 'titulacionesValidas'=>$titulacionesValidas, - //'capacidadesValidas'=>$capacidadesValidas, )); ?> \ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/_form.php b/www/protected/views/candidatoCapacidad/_form.php index 1ea8f85..c56ad70 100644 --- a/www/protected/views/candidatoCapacidad/_form.php +++ b/www/protected/views/candidatoCapacidad/_form.php @@ -1,42 +1,109 @@ -
+clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/custom/elements.js'); +Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/plugins/wysiwyg/jquery.wysiwyg.js'); +Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . 'js/plugins/wysiwyg/wysiwyg.image.js'); +Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . 'js/plugins/wysiwyg/wysiwyg.link.js'); +Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . 'js/plugins/wysiwyg/wysiwyg.table.js'); + +$script=<<clientScript->registerScript('wysiwyg', $script, CClientScript::POS_END); +?> beginWidget('CActiveForm', array( 'id'=>'candidato-capacidad-form', - 'enableAjaxValidation'=>false, + 'enableAjaxValidation'=>true, + 'clientOptions'=>array('validateOnSubmit'=>true, 'validateOnChange'=>true), )); ?> -

Fields with * are required.

+
+
+ +

Los campos marcados con * son obligatorios.

+
- errorSummary($model); ?> + errorSummary($model, "", "", array('class'=>"notification msgerror")); ?> +
+
-
- labelEx($model,'candidato_id'); ?> - textField($model,'candidato_id'); ?> - error($model,'candidato_id'); ?> -
- -
- labelEx($model,'perfil_tecnico_id'); ?> - textField($model,'perfil_tecnico_id'); ?> - error($model,'perfil_tecnico_id'); ?> -
- -
- labelEx($model,'meses_perfil_tecnico'); ?> - textField($model,'meses_perfil_tecnico'); ?> - error($model,'meses_perfil_tecnico'); ?> -
- -
- labelEx($model,'observaciones'); ?> - textArea($model,'observaciones',array('rows'=>6, 'cols'=>50)); ?> - error($model,'observaciones'); ?> -
- -
- isNewRecord ? 'Create' : 'Save'); ?> -
+
+

+ + Datos de contacto + +

+
+
+ labelEx($model,'candidato_id'); ?> +
+ findAll(),'id', 'nombreCompleto'); + echo $form->dropDownList( + $model, + 'candidato_id', + $lista, + array( + 'empty'=>'', + 'class'=>'lf', + )); + ?> + error($model,'candidato_id', array('class'=>'errortext')); ?> +
+
+
+ labelEx($model,'perfil_tecnico_id'); ?> +
+ findAll(),'id', 'descripcion'); + echo $form->dropDownList( + $model, + 'perfil_tecnico_id', + $lista, + array( + 'empty'=>'', + 'class'=>'lf', + )); + ?> + error($model,'perfil_tecnico_id', array('class'=>'errortext')); ?> +
+
+
+ labelEx($model,'meses_perfil_tecnico'); ?> +
+ textField($model,'meses_perfil_tecnico',array('maxlength'=>255,'class'=>'sf')); ?> + error($model,'meses_perfil_tecnico', array('class'=>'errortext')); ?> +
+
+
+
+
+ +
+

+ + + +

+ +
+ textArea($model, 'observaciones', array('id'=>'wysiwyg', 'class'=>'ff')); ?> + error($model,'observaciones', array('class'=>'errortext')); ?> +
+
+
+
+ +
endWidget(); ?> - -
\ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/create.php b/www/protected/views/candidatoCapacidad/create.php index fef516f..fe6ab5f 100644 --- a/www/protected/views/candidatoCapacidad/create.php +++ b/www/protected/views/candidatoCapacidad/create.php @@ -1,15 +1,13 @@ breadcrumbs=array( - 'Candidato Capacidads'=>array('index'), - 'Create', + 'Capacidades profesionales'=>array('index'), + Yii::t('intranet', 'Nueva capacidad profesional'), ); -$this->menu=array( - array('label'=>'List CandidatoCapacidad', 'url'=>array('index')), - array('label'=>'Manage CandidatoCapacidad', 'url'=>array('admin')), -); +$this->pageTitle=Yii::t('intranet', 'Nueva capacidad profesional'); ?> -

Create CandidatoCapacidad

- -renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file +renderPartial('_form', array( + 'model'=>$model, + )); +?> \ No newline at end of file diff --git a/www/protected/views/candidatoCapacidad/update.php b/www/protected/views/candidatoCapacidad/update.php index f22e324..8c81c9f 100644 --- a/www/protected/views/candidatoCapacidad/update.php +++ b/www/protected/views/candidatoCapacidad/update.php @@ -1,18 +1,14 @@ breadcrumbs=array( - 'Candidato Capacidads'=>array('index'), - $model->id=>array('view','id'=>$model->id), - 'Update', + 'Capacidades profesionales'=>array('index'), + $model->id=>array('view','id'=>$model->id), + Yii::t('intranet', 'Modificación'), ); -$this->menu=array( - array('label'=>'List CandidatoCapacidad', 'url'=>array('index')), - array('label'=>'Create CandidatoCapacidad', 'url'=>array('create')), - array('label'=>'View CandidatoCapacidad', 'url'=>array('view', 'id'=>$model->id)), - array('label'=>'Manage CandidatoCapacidad', 'url'=>array('admin')), -); +$this->pageTitle=Yii::t('intranet', 'Modificar capacidad profesional'); ?> -

Update CandidatoCapacidad id; ?>

- -renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file +renderPartial('_form', array( + 'model'=>$model, + )); +?> diff --git a/www/protected/views/layouts/default.php b/www/protected/views/layouts/default.php index b178403..1a47ab6 100644 --- a/www/protected/views/layouts/default.php +++ b/www/protected/views/layouts/default.php @@ -5,6 +5,7 @@ + @@ -18,7 +19,8 @@ - + + <?php echo CHtml::encode($this->pageTitle); ?> diff --git a/www/protected/views/usuario/_form.php b/www/protected/views/usuario/_form.php index 08c4922..4a11a45 100644 --- a/www/protected/views/usuario/_form.php +++ b/www/protected/views/usuario/_form.php @@ -25,7 +25,7 @@ labelEx($model,'name'); ?>
textField($model,'name',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'name', array('class'=>'error')); ?> + error($model,'name', array('class'=>'errortext')); ?>
@@ -33,7 +33,7 @@ labelEx($model,'email'); ?>
textField($model,'email',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'email', array('class'=>'error')); ?> + error($model,'email', array('class'=>'errortext')); ?>
@@ -41,7 +41,7 @@ labelEx($model,'username'); ?>
textField($model,'username',array('maxlength'=>255,'class'=>'mf')); ?> - error($model,'username', array('class'=>'error')); ?> + error($model,'username', array('class'=>'errortext')); ?>
@@ -50,7 +50,7 @@ labelEx($model,'password'); ?>
passwordField($model,'password',array('maxlength'=>255, 'class'=>'sf')); ?> - error($model,'password', array('class'=>'error')); ?> + error($model,'password', array('class'=>'errortext')); ?>
@@ -58,7 +58,7 @@ labelEx($model,'password_repeat'); ?>
passwordField($model,'password_repeat',array('maxlength'=>255, 'class'=>'sf')); ?> - error($model,'password_repeat', array('class'=>'error')); ?> + error($model,'password_repeat', array('class'=>'errortext')); ?>