From d17e5dbabfd5e33c3a52583eb25d23cdc8bd5aad Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 26 Mar 2013 17:57:55 +0000
Subject: [PATCH] Cambios

git-svn-id: https://192.168.0.254/svn/Proyectos.EstudioJuridicoAlmagro_Web/trunk@4 c22fe52d-42d7-ba4f-95f7-33effcf65713
---
 www/404.php                                |  2 +-
 www/functions.php                          | 18 ++++---
 www/header.php                             |  2 +-
 www/index.php                              |  7 +--
 www/page.php                               |  2 +-
 www/single-standard.php                    | 16 +++---
 www/single.php                             |  5 +-
 www/wpv_common/helpers/base.php            |  2 +-
 www/wpv_theme/assets/css/default.css       |  8 +--
 www/wpv_theme/assets/css/layout.css        | 35 ++++++++++---
 www/wpv_theme/assets/css/paginas.css       | 60 ++++++++++++++++++++--
 www/wpv_theme/assets/css/slider_styles.css |  4 +-
 www/wpv_theme/assets/css/typography.css    |  2 +-
 www/wpv_theme/helpers/base.php             | 12 +++--
 14 files changed, 129 insertions(+), 46 deletions(-)

diff --git a/www/404.php b/www/404.php
index 9c599d9..d9a891e 100644
--- a/www/404.php
+++ b/www/404.php
@@ -8,7 +8,7 @@ get_header(); ?>
 
 <div class="clearfix"> 
 	<div class="page-404">
-		<?php get_search_form(); ?>
+		<?php /*get_search_form();*/ ?>
 	</div>
 	
 	<div class="clearfix"></div>
diff --git a/www/functions.php b/www/functions.php
index 79e8355..ad0a267 100644
--- a/www/functions.php
+++ b/www/functions.php
@@ -18,17 +18,17 @@ function language_selector_flags() {
         foreach ($languages as $l) {
             $imgflag = $l['country_flag_url'];
             if ($l['language_code'] == 'es') {
-                $imgflag = $uploads['baseurl'] . '/2012/04/spanish_flag.jpg';
+                $imgflag = $uploads['baseurl'] . '/2013/03/spanish_flag.jpg';
             }
             if ($l['language_code'] == 'en') {
-                $imgflag = $uploads['baseurl'] . '/2012/04/english_flag.jpg';
+                $imgflag = $uploads['baseurl'] . '/2013/03/english_flag.jpg';
             }
             if ($l['language_code'] == 'fr') {
-                $imgflag = $imgflag = $uploads['baseurl'] . '/2012/04/french_flag.jpg';
+                $imgflag = $imgflag = $uploads['baseurl'] . '/2013/03/french_flag.jpg';
+            }
+            if ($l['language_code'] == 'ru') {
+                $imgflag = $imgflag = $uploads['baseurl'] . '/2013/03/russian_flag.jpg';
             }
-            /*if ($l['language_code'] == 'ru') {
-                $imgflag = $imgflag = $uploads['baseurl'] . '/2012/04/french_flag.jpg';
-            }*/
             $l['country_flag_url'] = $imgflag;
             $idiomas[$l['language_code']] = $l;
         }
@@ -40,3 +40,9 @@ function language_selector_flags() {
         }
     }
 }
+
+function the_slug() {
+    $post_data = get_post($post->ID, ARRAY_A);
+    $slug = $post_data['post_name'];
+    return $slug; 
+}
diff --git a/www/header.php b/www/header.php
index b15a604..abf6266 100644
--- a/www/header.php
+++ b/www/header.php
@@ -185,7 +185,7 @@
 				<div class="slider-shadow"></div>
 			</div>
 			
-                        <?php if (!is_front_page() ) {?>
+                        <?php if (1) /* !is_front_page() )*/ {?>
 			<!-- #main (do not remove this comment) -->
 			<div id="main" role="main" class="body-helper <?php echo wpv_get_option('body-helper-style')?> <?php if(wpv_get_option('body-helper-classic')) echo 'classic'?>">
 				
diff --git a/www/index.php b/www/index.php
index eb217d8..680736b 100644
--- a/www/index.php
+++ b/www/index.php
@@ -6,15 +6,16 @@
 
 get_header(); ?>
 
+<?php if ( get_post_format(get_the_id()) ) : ?>
 <header class="page-header">
 	<h1><?php 
 		$format = get_query_var('format_filter');
-		echo $format?
-					sprintf(__('Post format: %s', 'wpv'), $format) :
-					__('Legal Update', 'wpv'); 
+		echo $format ? sprintf(__('Post format: %s', 'wpv'), $format) : __('Legal Update', 'wpv'); 
 	?></h1>
 </header>
+<?php endif; ?>
 
+<div class="clearfix">&nbsp;</div>
 <div class="page-wrapper clearfix">
 	<article class="full">
 		<div class="page-content">
diff --git a/www/page.php b/www/page.php
index c06ad4c..3d2a474 100644
--- a/www/page.php
+++ b/www/page.php
@@ -28,7 +28,7 @@ get_header(); ?>
 
 <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
 
-<?php $slug = sanitize_title( get_the_title(), $fallback_title ); ?>
+<?php $slug = the_slug();  //sanitize_title( get_the_title(), $fallback_title ); ?>
 
 <?php if(!!wpv_post_default('show_page_header', 'has-page-header')): ?>
 	<header class="page-header <?php echo $slug; ?>">
diff --git a/www/single-standard.php b/www/single-standard.php
index 1a98159..1423bb9 100644
--- a/www/single-standard.php
+++ b/www/single-standard.php
@@ -1,3 +1,5 @@
+<div class="clearfix"></div>
+
 <?php extract(wpv_post_info()) ?>
 
 <?php
@@ -17,7 +19,7 @@
 	$post_image = ob_get_clean();
 ?>
 
-<div class="side-post-info <?php echo $has_image?>-wrapper">
+<div class="side-post-info <?php echo $has_image?>-wrapper one_half">
         <?php
                 if($show_image) {
                         $has_image = po_post_image($img_style, $width);
@@ -28,23 +30,25 @@
 	<?php
 		$format = get_post_format();
 		$format = empty($format)? 'standard' : $format;
-	?>
-	<a class="post-format-pad" href="<?php echo add_query_arg( 'format_filter',$format,home_url()) ?>"><span class="<?php echo $format?>"></span></a>
+	?>	
 	<?php if(wpv_get_option('meta_posted_on')): ?>
-		<span class="entry-date" title="<?php the_time(); ?>"><?php the_time('j F'); ?></span>
+		<span class="entry-date" title="<?php the_time(); ?>"><?php the_time('j F Y'); ?></span>
 	<?php endif ?>
 	<?php edit_post_link('Edit') ?>
 
 
 </div>
-<div class="post-article no-image-wrapper">
-	<?php if(!has_post_format('aside') && !has_post_format('quote') && $img_style == 'fullimage') po_post_header($meta) ?>
+<div class="<?php /*post-article*/ ?>no-image-wrapper one_half last">
+	<?php // if(!has_post_format('aside') && !has_post_format('quote') && $img_style == 'fullimage') po_post_header($meta) ?>
 	
 	<div class="<?php echo $format?>-post-format clearfix">
 		<div class="post-content-outer <?php echo $has_image ?>">
 			<?php if(!has_post_format('aside') && !has_post_format('quote') && $img_style != 'fullimage') po_post_header($meta) ?>
 			
 			<div class="post-content the-content">
+                                <h2><?php the_title(); ?></h2>
+                                <br/>
+                                
 				<?php if(has_post_format('quote')): ?>
 					<blockquote>
 						<?php the_content() ?>
diff --git a/www/single.php b/www/single.php
index dbc91c4..44efd0e 100644
--- a/www/single.php
+++ b/www/single.php
@@ -24,9 +24,10 @@ switch($layout_type) {
 get_header(); ?>
 
 <?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+<?php if (0) : ?>
 <header class="page-header">
 	
-	<h1><?php the_title() ?></h1>
+	<h1><?php the_title() ?> <?php echo $the_format; ?></h1>
 	<?php
 		$page_desc = get_post_meta(get_the_id(), 'description', true);
 		if(!empty($page_desc)):
@@ -34,7 +35,7 @@ get_header(); ?>
 		<div class="description"><?php echo $page_desc?></div>
 	<?php endif ?>
 </header>
-
+<?php endif; ?>
 <?php
 	global $wpv_has_header_sidebars;
 	if( $wpv_has_header_sidebars) {
diff --git a/www/wpv_common/helpers/base.php b/www/wpv_common/helpers/base.php
index c0eb582..2f6d515 100644
--- a/www/wpv_common/helpers/base.php
+++ b/www/wpv_common/helpers/base.php
@@ -113,7 +113,7 @@ function wpv_post_default($meta, $default, $default_is_value = false) {
 		$default = wpv_sanitize_bool(wpv_get_option($default));
 	}
 	
-	return (get_post_meta($post->ID, 'use-global-options', true) !== 'false') ? $default : wpv_sanitize_bool(get_post_meta($post->ID, $meta, true));
+	return (get_post_meta($post->ID, 'use-global-options', false) !== 'false') ? $default : wpv_sanitize_bool(get_post_meta($post->ID, $meta, false));
 }
 
 function wpv_sanitize_bool($value) {
diff --git a/www/wpv_theme/assets/css/default.css b/www/wpv_theme/assets/css/default.css
index db95e92..0fa1595 100644
--- a/www/wpv_theme/assets/css/default.css
+++ b/www/wpv_theme/assets/css/default.css
@@ -9,7 +9,7 @@ a:visited {
 	border-bottom: 1px dotted #bebfc1;
 }
 
-a:hover { 
+a:hover {     
 	border-bottom: 1px solid #00a362;
 }
 
@@ -83,7 +83,7 @@ ul li ul.children {
 	margin-top: 10px;
 }
 
-.sitemap {
+.sitemap, .site-map, mapa-del-sitio, Карта-сайта {
 	list-style-image: url(../images/bullets/arrow_down.png);
 }
 
@@ -107,7 +107,7 @@ ul li ul.children {
 }
 
 .sitemap ul li ul > li > a {
-	font-size: 12px;
+	/*font-size: 12px;*/
 }
 
 .sitemap ul li ul li ul {
@@ -2776,7 +2776,7 @@ footer.main-footer.classic.footer-helper.dark .widget
 .classic.slider-helper.light .sep,
 .classic.body-helper.light .sep,
 .classic.footer-helper.light .sep {
-	background-image: url(../images/light/classic_sep.png); 
+	/*background-image: url(../images/light/classic_sep.png); */
 }
 
 .classic.header-helper.light .sep-2, 
diff --git a/www/wpv_theme/assets/css/layout.css b/www/wpv_theme/assets/css/layout.css
index 23be7aa..e8d5561 100644
--- a/www/wpv_theme/assets/css/layout.css
+++ b/www/wpv_theme/assets/css/layout.css
@@ -35,6 +35,14 @@ img.marco, div.marco {
     padding: 6px !important;
 }
 
+div.marco {
+    width: 426px;
+}
+
+.wpgmza_map_1 {
+    margin-left: 5px;
+}
+
 .style-navigation-preview .wpv-caption .helper-caption-1 strong {
     color: #e1bf47 !important;
 }
@@ -362,7 +370,7 @@ nav ul li a {
 	border-bottom: none;
 	overflow: hidden;
 	/*padding: 0px 0px 30px 0px;*/
-        letter-spacing: -1px;
+        letter-spacing: 0;
 } 
 
 nav ul li a:hover {
@@ -374,7 +382,8 @@ nav ul li.hover a {
     border-bottom: none !important;
 }
 
-nav ul li.current_page_item a, nav ul li.current_page_item a:hover {
+nav ul li.current_page_item a, nav ul li.current_page_item a:hover,
+nav ul li.current_page_ancestor a, nav ul li.current_page_ancestor a:hover {
     border-bottom: 3px solid !important;
 }
 
@@ -584,11 +593,11 @@ nav ul ul ul li {
 }
 
 .loop-wrapper:first-child {
-	margin-top: -32px; 
+	margin-top: 0px; 
 }
 
 .no-page-header .loop-wrapper:first-child {
-	margin-top: -32px;
+	margin-top: 0px;
 }
 
 .has-header-slider.no-header-sidebars.no-page-header .loop-wrapper:first-child {
@@ -837,7 +846,7 @@ li:hover > .thumbnail > .info-pad {
 	width: 100%;
 	display: block;
 	float: left;
-        font-size: 38px !important;
+        font-size: 34px !important;
         line-height: 35px;
 }
 
@@ -959,6 +968,10 @@ code:before {
 	margin: -5px 20px 10px 0px;
 }
 
+.standard-post-format {
+    margin-top: 25px;
+}
+
 .standard-post-format blockquote { 
 	/* margin-left: -100px; */
 }
@@ -1893,21 +1906,27 @@ div.anythingSlider .arrow.forward,
 	Blog
 ----------------------------------------- */
 .side-post-info {
-	width: 75px;
-	padding: 30px 0px 0px 0px;
+	width: 30%;
+	padding: 140px 0px 0px 0px;
 	float: left;
 	text-align: center;
 	position: relative;
 	margin-bottom: -40px;
 }
 
+.full .loop-wrapper.full .post-article {
+    width: 60% !important;        
+}
+
 .post-article {
 	padding: 36px 0px 28px 21px;
 	float: left;
 }
 
 .post-article article,
-.post-content .the-content {}
+.post-content .the-content {
+    
+}
 
 .entry-utility {}
 
diff --git a/www/wpv_theme/assets/css/paginas.css b/www/wpv_theme/assets/css/paginas.css
index 394dbb7..4759ddf 100644
--- a/www/wpv_theme/assets/css/paginas.css
+++ b/www/wpv_theme/assets/css/paginas.css
@@ -1,25 +1,65 @@
 /*---------------------------------------------------------------------------
-	Paginas
+        Paginas
 --------------------------------------------------------------------------*/
+
+.home .page-content .titulo {
+    /*margin: -30px 0 10px !important;*/
+    margin: 0 !important;
+    padding: 30px 0 0 0 !important; 
+}
+
+.home .page-content .titulo p {
+    font-family: 'Palatino Linotype', 'Book Antiqua3', Palatino, serif !important;
+    font-size: 72px !important;
+    font-style: normal !important;
+    color: #353535 !important; 
+    letter-spacing: -1px !important;
+    line-height: 16px !important;
+    margin:0 !important;
+    margin-bottom:0.8em !important;
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) !important;
+    display: block;
+}
+
+.home .page-content .titulo strong {
+    display: block;
+    padding-top: 20px;
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) !important;
+    font-size: 136px !important;
+    font-weight: normal !important;
+}
+
+.home .page-content strong {
+    color: #E1BF47 !important;
+}
+
 .texto_portada {
     padding: 20px;
     background: rgba(0, 0, 0, 0.6) !important;
     position: relative;
     top: -170px;
- }
+}
 
 .texto_portada,
 .texto_portada * {
-    font-size: 16px !important;
+    font-size: 15px !important;
     letter-spacing: 0 !important;
     line-height: 1.2em !important;
     color: #efefef !important;
+    text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2) !important;
 }
 
 .texto_portada p {
     padding-bottom: 10px;
 }
 
+.texto_portada h3 {
+    padding-bottom: 10px;
+    font-size: 18px !important;
+    color: #E1BF47 !important;
+}
+
+
 .nosotros .page-content,
 .about-us .page-content,
 .a-propos-de-nous .page-content {
@@ -37,11 +77,21 @@
     margin-top: -25px;
 }
 
+.internacional .page-content,
 .international .page-content {
-    min-height: 690px;
+    min-height: 790px;
 }
 
+.internacional .page-content h1,
 .international .page-content h1 {
     font-size: 78px !important;
     line-height: 68px !important;
-}
\ No newline at end of file
+}
+
+.areas-de-practica .page-content,
+.domaines-de-pratique .page-content,
+.areas-of-practice .page-content,
+.сферы-деятельности .page-content {
+    min-height: 544px;
+}
+
diff --git a/www/wpv_theme/assets/css/slider_styles.css b/www/wpv_theme/assets/css/slider_styles.css
index b78edf1..744e59f 100644
--- a/www/wpv_theme/assets/css/slider_styles.css
+++ b/www/wpv_theme/assets/css/slider_styles.css
@@ -776,7 +776,7 @@
 }
 
 .style-navigation-preview .wpv-caption .helper-caption-1 * {
-	font-size: 84px;
+	font-size: 72px;
 	color: #353535;
 	font-style: normal;
 	line-height: 72px;
@@ -786,7 +786,7 @@
 }
 
 .style-navigation-preview .wpv-caption .helper-caption-1 strong {
-    font-size: 160px;
+    font-size: 136px;
     line-height: 127px;
     font-weight: normal;
 }
diff --git a/www/wpv_theme/assets/css/typography.css b/www/wpv_theme/assets/css/typography.css
index f4191c0..426254d 100644
--- a/www/wpv_theme/assets/css/typography.css
+++ b/www/wpv_theme/assets/css/typography.css
@@ -479,7 +479,7 @@ tfoot {
 .entry-utility *,
 .copyrights,
 .comment-author {
-	font-size: 11px !important;
+	font-size: 14px !important;
 }
 
 .entry-date {
diff --git a/www/wpv_theme/helpers/base.php b/www/wpv_theme/helpers/base.php
index 8ba6e37..2ad2fed 100644
--- a/www/wpv_theme/helpers/base.php
+++ b/www/wpv_theme/helpers/base.php
@@ -56,10 +56,11 @@ function po_post_header($meta) {
 	if(!is_single()):
 ?>
 	<header>
-		<h2>
-			<a href="<?php echo $link ?>" title="<?php the_title()?>"><?php the_title(); ?></a>
-		</h2>
-		<?php if($meta && !wpv_get_option('hide_post_author')): ?><span class="author"><?php _e('by', 'wpv');?> <b><?php the_author_posts_link()?></b></span><?php endif ?>
+		<h1>
+			<?php /*<a href="< ? php echo $link ? >" title=" < ? php the_title() ? >">< ? php the_title(); ? ></a>*/ ?>
+                        <?php the_title(); ?>
+		</h1>
+		<?php if($meta && !wpv_get_option('hide-post-author')): ?><span class="author"><?php _e('by', 'wpv');?> <b><?php the_author_posts_link()?></b></span><?php endif ?>
 	</header>
 <?php
 	endif;
@@ -84,7 +85,8 @@ function po_post_image($img_style, $width='full') {
 			}
 ?>
 			<div class="post-thumb <?php echo $class?>">
-				<a class="<?php if(is_single()):?>lightbox<?php endif?>" href="<?php echo is_single() ? $img[0] : get_permalink(); ?>">
+				<?php /*<a class="< ? php if(is_single()):? >lightbox< ? php endif ? >" href="< ? php echo is_single() ? $img[0] : get_permalink(); ? > ">*/ ?>
+                                <a class="lightbox" href="<?php echo $img[0]; ?>">
 					<?php wpv_lazy_load(wpv_resize_image($img[0], wpv_get_option('post-thumbnail-width'), wpv_get_option('post-thumbnail-height')), get_the_title(), array(
 						'width' => (int)wpv_get_option('post-thumbnail-width'),
 						'height' => wpv_get_option('post-thumbnail-height')