Archivado/Incam_IntranetNueva
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Cambio de nombre de modelo: CandidatoEstado => EstadoCandidato

Browse Source 
- Cambio en el layout 'default' para registrar mejor los JS y los CSS.
- Ficheros propios estilos CSS para jQuery UI

git-svn-id: https://192.168.0.254/svn/Proyectos.Incam_IntranetNueva/trunk@70 77cfc57b-8ef4-1849-9df6-4a38aa5da120
This commit is contained in:
David Arranz 2012-07-25 14:59:13 +00:00
parent 4b75305de7
commit 6a9b925abb
11 changed files with 132 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/css/custom.css
View File

@ -75,3 +75,4 @@ span.timestamp {
.resumen_table .subtotal td { font-weight: bold; }
.resumen_table tr td.line { border-bottom: 1px solid #ccc; }

0
www/css/plugins/jquery.ui.css → www/css/plugins/jquery-ui.css vendored
View File

15
www/css/style.css
View File

@ -6,12 +6,10 @@
@import url('plugins/colorbox.css');
@import url('plugins/colorpicker.css');
@import url('plugins/jquery.ui.css');
@import url('plugins/jquery.jgrowl.css');
@import url('plugins/jquery.alerts.css');
@import url('plugins/fullcalendar.css');
@import url('tabs.css');
@import url('custom.css');
html, body, div, span, applet, object, iframe,
@ -194,6 +192,19 @@ h2.prize { font-size: 20px; color: #000; font-family: Arial, Helvetica, sans-ser
.tabmenu ul li.current .subnav li a:hover { background: #c8d9ed; }
.tabmenu ul li.current .subnav li a span { text-shadow: 1px 1px #f7f7f7; }
.tabs { border: 1px solid #ccc; background: #fcfcfc; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
.tabs { -moz-box-shadow: 1px 1px 2px #ddd; -webkit-box-shadow: 1px 1px 2px #ddd; box-shadow: 1px 1px 2px #ddd; }
.tabs-nav { list-style: none; background: #eee url(../images/thead.png) repeat-x top left; border-bottom: 1px solid #ccc; }
.tabs-nav { position: relative; height: 41px; -moz-border-radius: 3px 3px 0 0; -webkit-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; }
.tabs-nav li { display: inline-block; float: left; }
.tabs-nav li:first-child a { -moz-border-radius: 3px 0 0 0; -webkit-border-radius: 3px 0 0 0; border-radius: 3px 0 0 0; }
.tabs-nav li a { display: block; padding: 10px 20px; background: #eee; color: #333; border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; }
.tabs-nav li a:hover { text-decoration: none; background: #e7e7e7; }
.tabs-nav li.current a { background: #fcfcfc; color: #069; border-bottom: 1px solid #fcfcfc; }
.tabs-hide { display: none; }
.tabs-panel { padding: 15px; }
/***SIDEBAR (all page)***/
.sidebar { padding: 20px 0 20px 0; width: 50px; display: block; float: left; }

11
www/css/tabs.css
View File

@ -1,11 +0,0 @@
.tabs { border: 1px solid #ccc; background: #fcfcfc; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
.tabs { -moz-box-shadow: 1px 1px 2px #ddd; -webkit-box-shadow: 1px 1px 2px #ddd; box-shadow: 1px 1px 2px #ddd; }
.tabs-nav { list-style: none; background: #eee url(../images/thead.png) repeat-x top left; border-bottom: 1px solid #ccc; }
.tabs-nav { position: relative; height: 41px; -moz-border-radius: 3px 3px 0 0; -webkit-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; }
.tabs-nav li { display: inline-block; float: left; }
.tabs-nav li:first-child a { -moz-border-radius: 3px 0 0 0; -webkit-border-radius: 3px 0 0 0; border-radius: 3px 0 0 0; }
.tabs-nav li a { display: block; padding: 10px 20px; background: #eee; color: #333; border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; }
.tabs-nav li a:hover { text-decoration: none; background: #e7e7e7; }
.tabs-nav li.current a { background: #fcfcfc; color: #069; border-bottom: 1px solid #fcfcfc; }
.tabs-hide { display: none; }
.tabs-panel { padding: 15px; }

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

@ -34,7 +34,7 @@ $config = array(
// application components
'components'=>array(
'user'=>array(
'user'=>array(
// enable cookie-based authentication
'allowAutoLogin'=>true,
),
@ -57,6 +57,71 @@ $config = array(
'CLinkPager'=>array(
'cssFile'=>(strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css/pager.css',
),
'CJuiAccordion' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiAutoComplete' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiButton' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiDatePicker' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiDialog' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiDraggable' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiDroppable' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiInputWidget' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiProgressBar' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiResizable' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiSelectable' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiSlider' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiSliderInput' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiSortable' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiTabs' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
'CJuiWidget' => array (
'themeUrl' => (strlen(dirname($_SERVER['SCRIPT_NAME']))>1 ? dirname($_SERVER['SCRIPT_NAME']) : '' ) . '/css',
'theme' => 'plugins',
),
),
),
),

1
www/protected/migrations/m120504_095056_tbl_candidatos_documentos.php
View File

@ -18,7 +18,6 @@ class m120504_095056_tbl_candidatos_documentos extends CDbMigration
{
$this->dropForeignKey('fk_candidatos_documentos_1', 'tbl_candidatos_documentos');
$this->dropTable('tbl_candidatos_documentos');
return false;
}
/*

24
www/protected/migrations/m120713_172000_tbl_candidatos_estados.php → www/protected/migrations/m120725_101018_tbl_estados_candidatos.php
View File

@ -1,23 +1,33 @@
<?php
class m120713_172000_tbl_candidatos_estados extends CDbMigration
class m120725_101018_tbl_estados_candidatos extends CDbMigration
{
public function up()
{
$this->createTable('tbl_candidatos_estados', array(
$this->createTable('tbl_estados_candidatos', array(
'id' => 'pk',
'descripcion' => 'string NOT NULL',
));
$this->addColumn('tbl_candidatos', 'id_estado', 'integer');
$this->dropColumn('tbl_candidatos', 'estado');
$this->addColumn('tbl_candidatos', 'id_estado', 'integer');
}
public function down()
{
$this->dropTable('tbl_candidatos_estados');
{
$this->dropTable('tbl_estados_candidatos');
$this->dropColumn('tbl_candidatos', 'id_estado');
$this->addColumn('tbal_candidatos', 'estado', 'string');
return false;
$this->addColumn('tbl_candidatos', 'estado', 'string');
}
/*
// Use safeUp/safeDown to do migration with transaction
public function safeUp()
{
}
public function safeDown()
{
}
*/
}

11
www/protected/models/Candidato.php
View File

@ -6,6 +6,7 @@
* The followings are the available columns in table 'tbl_candidatos':
* @property integer $id
* @property integer $id_estado
* @property string $estado
* @property string $dni
* @property string $nombre
* @property string $apellidos
@ -81,7 +82,7 @@ class Candidato extends CActiveRecord
}
public function getEstado() {
$_estado = CandidatoEstado::model()->findByPk($this->id_estado);
$_estado = EstadoCandidato::model()->findByPk($this->id_estado);
if ($_estado != null)
return $_estado->descripcion;
}
@ -112,7 +113,7 @@ class Candidato extends CActiveRecord
public function getCssClassEstado() {
return "estado" . array_search($this->id_estado, $this->opcionesEstado);
}
/**
* Devuelve la lista de estados permitidos para un candidato.
* @return array lista de estados permitidos
@ -185,7 +186,7 @@ class Candidato extends CActiveRecord
// The following rule is used by search().
// Please remove those attributes that should not be searched.
array('id, id_estado, dni, nombre, apellidos, email, telefono_fijo,
array('id, id_estado, estado, dni, nombre, apellidos, email, telefono_fijo,
telefono_movil, sexo, fecha_nacimiento, lugar_nacimiento,
localidad, fecha_alta, usuario_alta, fecha_modificacion,
usuario_modificacion, carnet_conducir, vehiculo_propio,
@ -223,7 +224,8 @@ class Candidato extends CActiveRecord
{
return array(
'id' => 'ID',
'id_estado' => 'Estado',
'id_estado' => 'ID estado',
'estado' => 'Estado',
'nombreApellidos' => 'Candidato',
'foto' => 'Foto',
'dni' => 'DNI/Pasaporte',
@ -270,6 +272,7 @@ class Candidato extends CActiveRecord
$criteria->compare('t.id',$this->id);
$criteria->compare('id_estado',$this->id_estado);
$criteria->compare('estado',$this->estado);
$criteria->compare('dni',$this->dni,true);
$criteria->compare('nombre',$this->nombre,true);
$criteria->compare('apellidos',$this->apellidos,true);

10
www/protected/models/CandidatoEstado.php → www/protected/models/EstadoCandidato.php
View File

@ -1,18 +1,18 @@
<?php
/**
* This is the model class for table "tbl_candidatos_estados".
* This is the model class for table "tbl_estados_candidatos".
*
* The followings are the available columns in table 'tbl_candidatos_estados':
* The followings are the available columns in table 'tbl_estados_candidatos':
* @property integer $id
* @property string $descripcion
*/
class CandidatoEstado extends CActiveRecord
class EstadoCandidato extends CActiveRecord
{
/**
* Returns the static model of the specified AR class.
* @param string $className active record class name.
* @return CandidatoEstado the static model class
* @return EstadoCandidato the static model class
*/
public static function model($className=__CLASS__)
{
@ -24,7 +24,7 @@ class CandidatoEstado extends CActiveRecord
*/
public function tableName()
{
return 'tbl_candidatos_estados';
return 'tbl_estados_candidatos';
}
/**

9
www/protected/tests/fixtures/tbl_estados_candidatos.php vendored Normal file
View File

@ -0,0 +1,9 @@
<?php
return array(
'fila1' => array(
'id'=>'510',
'descripcion'=>'Estado 510',
),
);
?>

20
www/protected/views/layouts/default.php
View File

@ -1,11 +1,23 @@
<?php
$baseUrl = Yii::app()->baseUrl;
$cs = Yii::app()->clientScript;
$cs->coreScriptPosition=CClientScript::POS_HEAD;
$cs->scriptMap = array();
$cs->registerCoreScript('jquery');
$cs->registerCoreScript('jquery.ui');
$cs->registerScriptFile($baseUrl.'/js/custom/general.js');
$cs->registerCssFile($baseUrl.'/css/style.css');
?>
<!doctype html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo Yii::app()->language; ?>" lang="<?php echo Yii::app()->language; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="language" content="<?php echo Yii::app()->language; ?>" />
<link rel="stylesheet" media="screen" href="<?php echo Yii::app()->baseUrl; ?>/css/style.css" />
<link rel="stylesheet" href="<?php echo Yii::app()->baseUrl; ?>/css/plugins/jquery.wysiwyg.css" type="text/css" />
<!--[if IE 9]>
<link rel="stylesheet" media="screen" href="<?php echo Yii::app()->baseUrl; ?>/css/ie9.css"/>
<![endif]-->
@ -17,10 +29,6 @@
<!--[if IE 7]>
<link rel="stylesheet" media="screen" href="<?php echo Yii::app()->baseUrl; ?>/css/ie7.css"/>
<![endif]-->
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/js/plugins/jquery-1.7.min.js"></script>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/js/plugins/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="<?php echo Yii::app()->baseUrl; ?>/js/custom/general.js"></script>
<title><?php echo CHtml::encode($this->pageTitle); ?></title>
</head>