diff --git a/www/images/logo_profind.png b/www/images/logo_profind.png new file mode 100644 index 0000000..5405f07 Binary files /dev/null and b/www/images/logo_profind.png differ diff --git a/www/protected/components/UsuarioWeb.php b/www/protected/components/UsuarioWeb.php index a2bed73..f711268 100644 --- a/www/protected/components/UsuarioWeb.php +++ b/www/protected/components/UsuarioWeb.php @@ -23,6 +23,11 @@ class UsuarioWeb extends CWebUser { return $this->loadSubscripcion(Yii::app()->user->id); } + public function getName() { + $usuario = $this->loadUser(Yii::app()->user->id); + return ($usuario->nombre) ? $usuario->nombreCompleto : parent::getName(); + } + // Load user model. protected function loadUser($id = null) { if ($this->_model === null) { diff --git a/www/protected/controllers/NetworkController.php b/www/protected/controllers/NetworkController.php new file mode 100644 index 0000000..aa71aeb --- /dev/null +++ b/www/protected/controllers/NetworkController.php @@ -0,0 +1,28 @@ + array('index'), + 'users' => array('@'), + ), + array('deny', // deny all users + 'users' => array('*'), + ), + ); + } + + public function actionIndex() { + $this->render('index'); + } +} + +?> diff --git a/www/protected/controllers/PortalController.php b/www/protected/controllers/PortalController.php new file mode 100644 index 0000000..b9ecc93 --- /dev/null +++ b/www/protected/controllers/PortalController.php @@ -0,0 +1,28 @@ + array('index'), + 'users' => array('@'), + ), + array('deny', // deny all users + 'users' => array('*'), + ), + ); + } + + public function actionIndex() { + $this->render('index'); + } +} + +?> diff --git a/www/protected/models/Usuario.php b/www/protected/models/Usuario.php index f30fb00..da5aba3 100644 --- a/www/protected/models/Usuario.php +++ b/www/protected/models/Usuario.php @@ -225,7 +225,9 @@ class Usuario extends CActiveRecord { } public function getNombreCompleto() { - return $this->nombre . ' ' . $this->apellidos; + $cadena = $this->nombre; + if ($this->apellidos) $cadena .= ' ' . $this->apellidos; + return $cadena; } } diff --git a/www/themes/profind/css/profind.css b/www/themes/profind/css/profind.css index af895cc..f4daaad 100644 --- a/www/themes/profind/css/profind.css +++ b/www/themes/profind/css/profind.css @@ -161,10 +161,36 @@ form .row-fluid + .row-fluid { margin-top: 10px } .nav-pills + .nav-pills { - margin-left: 10px; + margin-left: 20px; padding-left: 10px; border-left: 1px solid #dcdcdc; } +.nav-pills { + margin-top: -10px; + + display:block; + overflow:hidden; + border:solid 1px #e9e9e9; + background:#fff; + padding:5px; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #f5f5f5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#f5f5f5)); + background: -webkit-linear-gradient(top, #ffffff 0%,#f5f5f5 100%); + background: -o-linear-gradient(top, #ffffff 0%,#f5f5f5 100%); + background: -ms-linear-gradient(top, #ffffff 0%,#f5f5f5 100%); + background: linear-gradient(top, #ffffff 0%,#f5f5f5 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f5f5f5',GradientType=0 ); + + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + -ms-border-radius: 4px; + border-radius: 4px; + +} +.nav-pills > li { + margin-right: 10px; +} .nav-pills > li > a { padding: 5px 8px } diff --git a/www/themes/profind/views/layouts/main.php b/www/themes/profind/views/layouts/main.php index 82423ef..30a5cbf 100644 --- a/www/themes/profind/views/layouts/main.php +++ b/www/themes/profind/views/layouts/main.php @@ -32,16 +32,19 @@