From ecdaf2c7727d9312a39b7c11af0db811230f6418 Mon Sep 17 00:00:00 2001 From: david Date: Sun, 30 Sep 2012 19:34:14 +0000 Subject: [PATCH] - Tarea #1105 -> Ordenar la lista de poblaciones - Mejoras visuales git-svn-id: https://192.168.0.254/svn/Proyectos.Incam_PROFIND_Web/trunk@40 3fe1ab16-cfe0-e34b-8c9f-7d8c168d430d --- www/protected/models/Poblacion.php | 9 +++++++++ www/themes/profind/lib/chosen/example.jquery.html | 4 ++-- www/themes/profind/views/empresa/_form.php | 15 +++++++++++++-- www/themes/profind/views/subscripcion/_form.php | 3 +-- www/themes/profind/views/usuario/_form.php | 8 ++++---- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/www/protected/models/Poblacion.php b/www/protected/models/Poblacion.php index a1db963..475f8aa 100644 --- a/www/protected/models/Poblacion.php +++ b/www/protected/models/Poblacion.php @@ -72,6 +72,15 @@ class Poblacion extends CActiveRecord ); } + /** + * @return array Default scope for this model. + */ + public function defaultScope() { + return array ( + 'order' => 'poblacion' + ); + } + /** * Retrieves a list of models based on the current search/filter conditions. * @return CActiveDataProvider the data provider that can return the models based on the search/filter conditions. diff --git a/www/themes/profind/lib/chosen/example.jquery.html b/www/themes/profind/lib/chosen/example.jquery.html index 0e06a42..76a7363 100644 --- a/www/themes/profind/lib/chosen/example.jquery.html +++ b/www/themes/profind/lib/chosen/example.jquery.html @@ -47,7 +47,7 @@ padding-top: 5px; } - +
@@ -1308,7 +1308,7 @@ - +
diff --git a/www/themes/profind/views/empresa/_form.php b/www/themes/profind/views/empresa/_form.php index 83dd582..b9ecc09 100644 --- a/www/themes/profind/views/empresa/_form.php +++ b/www/themes/profind/views/empresa/_form.php @@ -1,3 +1,14 @@ +clientScript->registerCssFile(Yii::app()->theme->baseUrl . '/lib/uniform/css/uniform.default.css'); ?> +clientScript->registerScriptFile(Yii::app()->theme->baseUrl . '/lib/uniform/jquery.uniform.min.js', CClientScript::POS_END); ?> + +clientScript->registerScript( + 'uniform', " + $(document).ready(function(){ + $('.uni_style').uniform(); + }); + ", CClientScript::POS_END); +?> +

@@ -78,7 +89,7 @@ $lista, array( 'empty' => '', - 'class'=>'input-xlarge', + 'class'=>'uni_style input-xlarge', )); ?>
@@ -86,7 +97,7 @@
labelEx($model, 'descripcion', array('class' => 'control-label')); ?>
- textArea($model, 'descripcion', array('class' => 'input-xlarge')); ?> + textArea($model, 'descripcion', array('class' => 'input-xlarge', 'rows'=>7)); ?>
diff --git a/www/themes/profind/views/subscripcion/_form.php b/www/themes/profind/views/subscripcion/_form.php index d70947a..04d5b8c 100644 --- a/www/themes/profind/views/subscripcion/_form.php +++ b/www/themes/profind/views/subscripcion/_form.php @@ -1,7 +1,6 @@ clientScript->registerCssFile(Yii::app()->theme->baseUrl . '/lib/uniform/css/uniform.default.css'); ?> clientScript->registerScriptFile(Yii::app()->theme->baseUrl . '/lib/uniform/jquery.uniform.min.js', CClientScript::POS_END); ?> -clientScript->registerScript( +clientScript->registerScript( 'uniform', " $(document).ready(function(){ $('.uni_style').uniform(); diff --git a/www/themes/profind/views/usuario/_form.php b/www/themes/profind/views/usuario/_form.php index 85c09f2..aa30e4f 100644 --- a/www/themes/profind/views/usuario/_form.php +++ b/www/themes/profind/views/usuario/_form.php @@ -6,7 +6,8 @@ 'chosen', " $(document).ready(function(){ $('#Usuario_localidad').chosen({ - allow_single_deselect: true + allow_single_deselect: true, + no_results_text: 'Localidad no encontrada:' }); }); ", CClientScript::POS_END); @@ -98,8 +99,7 @@
textField($model, 'email', array('class' => 'input-xlarge')); ?> -
- +
@@ -144,7 +144,7 @@
labelEx($model, 'descripcion', array('class' => 'control-label')); ?>
- textArea($model, 'descripcion', array('class' => 'input-xlarge')); ?> + textArea($model, 'descripcion', array('class' => 'input-xlarge', 'rows'=>7)); ?>