From 80ba8ebef608884e599de24d1482fad3d90e85f8 Mon Sep 17 00:00:00 2001 From: roberto Date: Mon, 1 Oct 2012 16:45:41 +0000 Subject: [PATCH] =?UTF-8?q?Tarea=20#1122=20->=20A=C3=B1adir=20las=20opcion?= =?UTF-8?q?es=20vac=C3=ADas=20de=20'Networks'=20y=20'Portales'.=20Tarea=20?= =?UTF-8?q?#1115=20->=20Poner=20logotipo=20profind=20en=20aplicaci=C3=B3n?= =?UTF-8?q?=20yii=20Tarea=20#1114=20->=20A=C3=B1adir=20arriba=20en=20la=20?= =?UTF-8?q?apliaci=C3=B3n=20donde=20pone=20el=20correo=20el=20nombre=20y?= =?UTF-8?q?=20apellidos=20del=20usuario=20Tarea=20#1109=20->=20Cambiar=20m?= =?UTF-8?q?en=C3=BA=20en=20aplicaci=C3=B3n=20para=20que=20presente=20men?= =?UTF-8?q?=C3=BA=20principal=20y=20submenu=20el=20actual?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Incam_PROFIND_Web/trunk@48 3fe1ab16-cfe0-e34b-8c9f-7d8c168d430d --- www/images/logo_profind.png | Bin 0 -> 4028 bytes www/protected/components/UsuarioWeb.php | 5 + .../controllers/NetworkController.php | 28 ++++ .../controllers/PortalController.php | 28 ++++ www/protected/models/Usuario.php | 4 +- www/themes/profind/css/profind.css | 28 +++- www/themes/profind/views/layouts/main.php | 122 +++++++++++++----- www/themes/profind/views/network/index.php | 7 + www/themes/profind/views/portal/index.php | 7 + 9 files changed, 198 insertions(+), 31 deletions(-) create mode 100644 www/images/logo_profind.png create mode 100644 www/protected/controllers/NetworkController.php create mode 100644 www/protected/controllers/PortalController.php create mode 100644 www/themes/profind/views/network/index.php create mode 100644 www/themes/profind/views/portal/index.php diff --git a/www/images/logo_profind.png b/www/images/logo_profind.png new file mode 100644 index 0000000000000000000000000000000000000000..5405f072c06b75ee81208ca4981dd0f6676605d1 GIT binary patch literal 4028 zcmaJ^XIN8Nw+@P+G!ZF^q9MZQsHD&dpaKEuO_1g&2_zCQ1&H)6y@^8?upqtnqJR(( z1e6ZadyyWBln}^`^NsV}A9wCP&pvDK^}O%9*4}HKA16d#_bw-!AR7Px;M7n@7&5F2 zV**beXS~-QYr8Sbd6KFr=^gL@AjBM9@g$^+7~b*9 zF9ihJ(aHf!Bw-17;7>&)itv=A2x4UVpCjOi|H$GU|Gp;1g+W}9Le~=V z1VP-TQF z45listOQe)Q&v)gsX`Gj6-k+2Tm-@DDGrS%{o-2xmn;3R+@Gz0BQhc*&<D6Zg*g` z^(y%$C*x}Y=xZCP9#;xUs_0vxY^OyPHucWQ+GO;OFI9Y-%_Yw+Z|+sjtUJdwwJrak zZ0#(qZM}Qn7n}EK>&ISFNhkei@2Yv+hqjUZ!y|M^jZ52%CMoU9;7n8Rm~-NL%JcvL z>~_^WJG-XWHo6ud@82^vmr>ni5>OqAeM_Yt(vFTwo5%X6mXd~7o&^M4yq_q6dTH!Y zSwJ58+&?Srl=&p4d7nxhU7*m84qjx`w$HD-xw?*Q?(XbSQ(q@*xRGZT*J4uAPpC&t z4K2L?G6hBFU{lFemDRpq=F>-(4cv1~W2;kQBPFbgJBJsae3}gH`Cj^|FS@XYS2xBp zv-ON-xPoo5vO~?l%H|<$cX(yzfJPmfTFovfo!Z_HO>flF)}5MPu4tblkIYqePh_@? zr#F6^THHvj9jR;`Q8&J@HoLh4_b+^wN`CgP-QUfg zen@{ElD|Yf*xcV&voBd#T8+$Z7qCo9X&jti+Z^eg_ArSSuuZjYoI0Q#dOXFy%gB<# zmd-CzrWQ5|Kg~{$bUQzLUiE1>zrLq7rQha=MI zM|AojV>0Yt4`WHAAJL8&&Yy$fWEA$0e#F?)4i66x4vxO>?AgkOJh#$!r_$o&1qEv05^*@nd%Y#mxj9ZZ1aj;9fuB>%xf^(S-zuGWW?0tO!WPU{U~c45uE}RpZWk*Z z8iz9R=nh@WVO{8`m8sTnDX?%}9x!YgUb|nJTd;aP{Z^5@jFP$j&bQlf`=TG^o!7p2 zIM&HIcF6E@+_$leVpaALgYpI}(L=p*N-X^oAUnV>TvAZX8B}qDUt%-rN`$e`7n}qh zbeuz~=!MLd^q*oEJH-dFBK4ooFWY!!`MwBYJ$g2mGy>38^Jz{R89*j`gh6lh8Obz` zU(wX8LrH)!$@3`nS0{;%m|lH@2=29~H^6~CH!aFsqdj1fIuirUBsWigcSUE2$dE83O)$=xB9nZNvvcM#G2y1qfbnS!marrQC5~8Aq9@p5OGX-7qi18QJ!;$2s}69D|%` z+9s*8%54mVaPjf+J>SwzMFe@Mm_1b0XIGJE-118mMJjs-rCj)I2HT!VCf9Ty51$zH zWL^QyIasDDNf|p{w4Bzab=mPWtTQF(^IWFCDWc#D+Nz;mx=3V$=qZ+`2wJk7`Kp(U zV2Q%zChwz3$BB!Sl}*Hw(8f-D19@;iutJ2lsio7k=!!(2P*g+L<*FAez238JI_}6E zkJ6&7+BV~+NnFZgOrGDOM2NuCbx5&1Rv<@bVX3TRI>3(0_ILvISpGu4_X$3}-};r~ zCL)7#*#+ho!@|lsh$TQT-7Mz%g4~nwmv5?nbn6$}KJ0a~d`Z1Gh7t*GkF$}?jmh>= z;QyL&pT=JjO*pnZ#~hq&#r}PFWa2nVN9f+d2bP(I z9*JzO9CqcI@(aH9TM<64qKQAO1(vnSQSe75e=b0__Z2<3BmL?uAJTjbYwg zbyHQz{01NAz=|fK;Hz&6Es9GaO6q;oOK{6aSwJp3pC)Y_XeK-VU~gu0hGO&Jn_x@= zuR-ON(hCLq@J5Q?7u!H>i!`y#bHrrsGOYAQ7ss7J>{R7Vi*WrbjiAPS=U@w0ovTTo zLZaCWn`<8#gV1YK{``=`J@Dd&DFi~%uZTXB|JmLg(PY<=AUm`upxHJ zuEvvyPT)2{l?cHbkVJN((%DfZ@vFz47O62U_-TbU3teOfx!YbYFkV~Wd&%+Iz~Odt zt+46WGc6i#4V~DDE%?#FTXIfpJXvc|AH!rL4HC_ce+9qd?5asZiiL-)g!Ia%)bk}F zJbbyP7E|8;>a6g~i|16+y8?Na@Mom>G3d{< zR$1>v%*~;5vO9~sDAK?(fvtYsV9NbYFl&SwOI=)081%U>tCNh?K3OB-tG2!}Pu?qG zxx2Vo$nTwK-)o4osToX7;1*oYb`)Y&r4Wde%lQqI+@p zR4%2BH{qiD4B`8chq9D;!6>haGCSsrPGDQ%TsE2G*qjaNx!ACvU2F++uInjrG}q?9 z?~psaU?DyatXYco?_2XUv?i+9_ry92nkzguGfHgmZflljlUw4Wlt;maGHj+SD2@57pyry1}3w(o2eAlK0XKJYPhU7l}UKn~@U3hYQ7 z?dfM`Z`Ay-?F6R}n<0nBzm3)yc)r(q^~b9{;o>l>QxuzH+G^pEU(?l{418PlF4djr zjR4%u+BLPXu?ps_5!)3yIk^8>le%igw9EZyeR|w)a(u2xlq~@DSZ;_4jpwp_!G`$o zU_0vmvPy8M!i5aV-7Q|^2lY%SLE?-drTO$;Z2Gs4-om@pTi1_;s~6uiuvG&{zQ{UN zlMad4zRzF9Tz!muZhG^Nz()Q66w{ltOknw-*XQbbRSnbzR9=S6net?GJsW2my`=w^ z5_C2cNT5qPtLDqJ+W0)Ai*Fva-~J*qF)^NdN1YZqBtlo&mf7s%w~|zZVzst%XQC|K zvf(zOdqL^K!MU9#Eid#6rb}4ns; z$hAuO>y@-S=gVT2(}CSrqr7#VBfNPp_4jc<>JFQqL;xV&I{mfb*ZL9$GfMb2FZg-5}8S`%+pz(kZ#+GeIvVR(+KPONWL; zd`_@nw*2*&GwL-te0`-Otnj$GHg?>s{Pejm0lkz z$S029+R9uwt@puksiUkiF#j<0jTTF6T5!d9_N(iiHM1w#&lGi8Zth%ueB>}M-<;8R zlD$mSuFFEuty$zZkLHkhcKE@{rh^XMg?o1u4# gG9B_v(%GN@+t(X@H{yEifBsKvsOlmLlr8=K2aI;OKmY&$ literal 0 HcmV?d00001 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 @@
- name); ?> +
+ baseUrl . '/images/logo_profind.png', Yii::app()->name); ?> +
  • user->name); ?>
    • createUrl('seguridadUsuario/cambiarPassword', array('id' => Yii::app()->user->id))); ?>
      • -
    • -
    • createUrl('site/logout')); ?>
    • +
  • + createUrl('site/logout')); ?> +
@@ -51,38 +54,41 @@ CHtml::tag('i', array('class' => 'icon-file icon-white'), '') . ' ' . Yii::t('profind', 'Perfil del agente'), + 'label' => CHtml::tag('i', array('class' => 'icon-user icon-white'), '') . ' ' . Yii::t('profind', 'Agente'), 'url' => array('/usuario/modificar', 'id' => Yii::app()->user->id), + 'active' => true, 'linkOptions' => array(), ); - // Empresa - if (Yii::app()->user->esCoordinador) - $itemsMenu[] = array( - 'label' => CHtml::tag('i', array('class' => 'icon-briefcase icon-white'), '') . ' ' . Yii::t('profind', 'Empresa'), - 'url' => array('/empresa/modificar', 'id' => Yii::app()->user->id_empresa), - 'linkOptions' => array(), - ); + // Tablero + $itemsMenu[] = array( + 'label' => CHtml::tag('i', array('class' => 'icon-th icon-white'), '') . ' ' . Yii::t('profind', 'Tablero'), + 'url' => '', + 'linkOptions' => array(), + ); - // Producto - if (Yii::app()->user->esCoordinador) - $itemsMenu[] = array( - 'label' => CHtml::tag('i', array('class' => 'icon-tag icon-white'), '') . ' ' . Yii::t('profind', 'Producto'), - 'url' => array('/subscripcion/modificar', 'id' => Yii::app()->user->subscripcion->id), - 'linkOptions' => array(), - ); - - // Equipo - if ((Yii::app()->user->esCoordinador) && (Yii::app()->user->tieneEquipo)) - $itemsMenu[] = array( - 'label' => CHtml::tag('i', array('class' => 'icon-user icon-white'), '') . ' ' . Yii::t('profind', 'Equipo'), - 'url' => array('/equipo/index'), - 'linkOptions' => array('class' => 'icon_block contacto'), - ); + // Publicaciones + $itemsMenu[] = array( + 'label' => CHtml::tag('i', array('class' => 'icon-tags icon-white'), '') . ' ' . Yii::t('profind', 'Publicaciones'), + 'url' => '', + 'linkOptions' => array(), + ); + // Inscripciones + $itemsMenu[] = array( + 'label' => CHtml::tag('i', array('class' => 'icon-bookmark icon-white'), '') . ' ' . Yii::t('profind', 'Inscripciones'), + 'url' => '', + 'linkOptions' => array(), + ); + // BD Candidatos + $itemsMenu[] = array( + 'label' => CHtml::tag('i', array('class' => 'icon-hdd icon-white'), '') . ' ' . Yii::t('profind', 'BD Candidatos'), + 'url' => '', + 'linkOptions' => array(), + ); $this->widget('zii.widgets.CMenu', array( 'activeCssClass' => 'active', @@ -92,8 +98,7 @@ ), 'items' => $itemsMenu, )); - ?> - + ?>
@@ -104,6 +109,65 @@
+
diff --git a/www/themes/profind/views/network/index.php b/www/themes/profind/views/network/index.php new file mode 100644 index 0000000..32b1526 --- /dev/null +++ b/www/themes/profind/views/network/index.php @@ -0,0 +1,7 @@ +pageTitle = Yii::t('profind', 'Networks'); ?> + +
+
+

+
+
diff --git a/www/themes/profind/views/portal/index.php b/www/themes/profind/views/portal/index.php new file mode 100644 index 0000000..3fb3759 --- /dev/null +++ b/www/themes/profind/views/portal/index.php @@ -0,0 +1,7 @@ +pageTitle = Yii::t('profind', 'Portales'); ?> + +
+
+

+
+