From 054e7a2f0e38e745ef52e9b411c6521b78b711f8 Mon Sep 17 00:00:00 2001 From: david Date: Mon, 15 Oct 2012 14:49:53 +0000 Subject: [PATCH] =?UTF-8?q?Reorganizaci=C3=B3n=20del=20interfaz:=20fluido?= =?UTF-8?q?=20y=20con=20barra=20lateral=20izquierda?= 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@62 3fe1ab16-cfe0-e34b-8c9f-7d8c168d430d --- www/themes/profind/css/profind.css | 8 +- www/themes/profind/images/noise.white.png | Bin 0 -> 7924 bytes .../profind/js/ios-orientationchange-fix.js | 3 +- .../profind/views/empresa/modificar.php | 18 +- www/themes/profind/views/layouts/main.php | 154 +++++++++--------- www/themes/profind/views/network/index.php | 14 +- www/themes/profind/views/portal/index.php | 14 +- .../_cerrar_cuenta.php} | 41 ++--- .../views/subscripcion/_lista_productos.php | 4 +- .../profind/views/subscripcion/index.php | 14 +- www/themes/profind/views/usuario/_form.php | 1 - .../profind/views/usuario/modificar.php | 19 ++- 12 files changed, 177 insertions(+), 113 deletions(-) create mode 100644 www/themes/profind/images/noise.white.png rename www/themes/profind/views/{usuario/_cerrarCuenta.php => sidebars/_cerrar_cuenta.php} (53%) diff --git a/www/themes/profind/css/profind.css b/www/themes/profind/css/profind.css index 9ad7257..9ddaecf 100644 --- a/www/themes/profind/css/profind.css +++ b/www/themes/profind/css/profind.css @@ -1,5 +1,6 @@ html { - overflow-y: scroll + overflow-y: scroll; + background: url("../images/noise.white.png") repeat scroll 0 0 transparent; } body { color: #222; @@ -494,6 +495,11 @@ a.rowlink { border-top: 1px solid #ccc; background: #fafafa; } + +.sidebar .accordion-group .btn { + color: #fff; +} + .sdb_h_active a { background: url("../images/bullet_green.png") no-repeat 98% center } diff --git a/www/themes/profind/images/noise.white.png b/www/themes/profind/images/noise.white.png new file mode 100644 index 0000000000000000000000000000000000000000..8c9aa91c60c16e60dd14f9eff2c19b67f1a435a4 GIT binary patch literal 7924 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:g||l()}if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1))return;var b=a.document;if(!b.querySelector)return;var c=b.querySelector("meta[name=viewport]"),d=c&&c.getAttribute("content"),e=d+",maximum-scale=1",f=d+",maximum-scale=10",g=!0,h,i,j,k;if(!c)return;a.addEventListener("orientationchange",l,!1),a.addEventListener("devicemotion",n,!1)})(this); \ No newline at end of file +/*! A fix for the iOS orientationchange zoom bug. Script by @scottjehl, rebound by @wilto.MIT License.*/ +(function(a){function l(){c.setAttribute("content",f),g=!0}function m(){c.setAttribute("content",e),g=!1}function n(b){k=b.accelerationIncludingGravity,h=Math.abs(k.x),i=Math.abs(k.y),j=Math.abs(k.z),(!a.orientation||a.orientation===180)&&(h>7||(j>6&&i<8||j<8&&i>6)&&h>5)?g&&m():g||l()}if(!(/iPhone|iPad|iPod/.test(navigator.platform)&&navigator.userAgent.indexOf("AppleWebKit")>-1))return;var b=a.document;if(!b.querySelector)return;var c=b.querySelector("meta[name=viewport]"),d=c&&c.getAttribute("content"),e=d+",maximum-scale=1",f=d+",maximum-scale=10",g=!0,h,i,j,k;if(!c)return;a.addEventListener("orientationchange",l,!1),a.addEventListener("devicemotion",n,!1)})(this); \ No newline at end of file diff --git a/www/themes/profind/views/empresa/modificar.php b/www/themes/profind/views/empresa/modificar.php index f7c02b0..aa941c6 100644 --- a/www/themes/profind/views/empresa/modificar.php +++ b/www/themes/profind/views/empresa/modificar.php @@ -1,2 +1,16 @@ -pageTitle=Yii::t('profind', 'Modificación de los datos de la empresa'); ?> -renderPartial('_form', array('model'=>$model)); ?> \ No newline at end of file +pageTitle=Yii::t('profind', 'Modificación de los datos de la empresa'); + + $this->breadcrumbs = array( + Yii::t('profind', 'Perfil') => array('/usuario/modificar', 'id' => Yii::app()->user->id), + Yii::t('profind', 'Empresa'), + ); + + // Sidebar + echo $this->renderPartial('//sidebars/_menu_usuario'); + + // Contenido + echo $this->renderPartial('_form', array('model' => $model)); + +?> diff --git a/www/themes/profind/views/layouts/main.php b/www/themes/profind/views/layouts/main.php index 17c2d0b..ee673ef 100644 --- a/www/themes/profind/views/layouts/main.php +++ b/www/themes/profind/views/layouts/main.php @@ -21,11 +21,11 @@ - - + +
@@ -37,38 +37,44 @@
-
    -
  • -
    -
    -
    • +
      +
    • user->name); ?>
        -
      • createUrl('usuario/modificar', array('id' => Yii::app()->user->id))); ?>
        • -
      • createUrl('usuario/cambiarPassword', array('id' => Yii::app()->user->id))); ?>
        • +
      • createUrl('usuario/modificar', array('id' => Yii::app()->user->id))); ?>
        • + user->esCoordinador): ?> +
      • createUrl('empresa/modificar', array('id' => Yii::app()->user->id_empresa))); ?>
        • +
      • createUrl('subscripcion/modificar', array('id' => Yii::app()->user->subscripcion->id))); ?>
        • + user->tieneEquipo): ?> +
      • createUrl('equipo/index')); ?>
        • + +
      • -
      • createUrl('site/logout')); ?>
        • +
      • createUrl('network/index')); ?>
        • +
      • createUrl('portal/index')); ?>
        • +
      • +
      • createUrl('usuario/cambiarPassword', array('id' => Yii::app()->user->id))); ?>
      +
      • +
    • + 'icon-off icon-white'), '') . ' ' . Yii::t('profind', 'Salir'), + $this->createUrl('site/logout') + ); + ?>
    +