Muchos cambios. Adaptación a la propuesta.

git-svn-id: https://192.168.0.254/svn/Proyectos.FundacionLQDVI_Web/trunk@26 77ab8c26-3d69-2c4d-86f2-786f4ba54905

src/nbproject/private/private.xml

@@ -6,18 +6,4 @@
             <line>420</line>
         </file>
     </editor-bookmarks>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-config.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/lib/admin.lib.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/lib/api.lib.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/fields/post.fields.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/index.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/archive.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/single.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/templates/template-portfolio-2.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/lib/widgets.lib.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/templates/template-slider-accordion.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/templates/template-portfolio-4.php</file>
-        <file>file:/D:/Trabajo/LQDVI.org/trunk/src/wp-content/themes/lqdvi/templates/template-portfolio-3.php</file>
-    </open-files>
 </project-private>

src/wp-content/themes/lqdvi/css/lqdvi.css

@@ -10,30 +10,22 @@ pre, code, tt
     background: #222;
 }
 
-label
-{
-	color: #fff
-}
-
-
 #wrapper {
-	background: #003756;
+    background-color: #000;
 }
 
-#footer 
+#footer {
-{
+    background-color: #000;
-	background: #004971;
 }
 
 #header_wrapper
 {
         background: #0077D4; /* url('../images/featuredbg.jpg') no-repeat top ;*/
-        height: 140px;
+        height: 192px;
         border-bottom: 2px solid #001623;
 }
 
-.page_caption
+.page_caption {
-{
 	background: transparent;
         border: none;
         padding-top: 0;
@@ -41,12 +33,19 @@ label
         font-weight: normal;
 }
 
+.page_caption h1 {
+    font-size: 50px;
+    text-transform: lowercase;
+}
+
 .caption_desc {
-    font-size: 16px;    
+    font-size: 22px;    
+    margin-top: 0px;
+    margin-bottom: 12px;
 }
 
 .caption_header {
-    margin: 8px 50px 8px 0;
+    margin: 0 50px 8px 0;
 }
 
 #top_bar
@@ -70,14 +69,18 @@ label
     margin-bottom: 15px;
 }
 
+#menu_wrapper {
+    padding-right: 0;
+}
+
 #menu_wrapper .nav ul, #menu_wrapper div .nav
 {
 	list-style: none;
 	display: block;
-	padding: 8px 5px 0 0;
+	padding: 8px 0 0 0;
 	float: right;
-	text-transform: uppercase;
+	text-transform: lowercase;
-	font-size: 13px;
+	font-size: 24px;
 }
 
 #menu_wrapper .nav ul li, #menu_wrapper div .nav li
@@ -87,35 +90,30 @@ label
 	margin: 0 0 0 0;
 }
 
-#menu_wrapper .nav ul li a, #menu_wrapper div .nav li a
+#menu_wrapper .nav ul li a, #menu_wrapper div .nav li a {
-{
+        display: block;
-	display: block;
+	padding: 8px 10px 8px 10px;
-	padding: 8px 17px 8px 17px;
 	margin: 20px 0 0 0;
 	color: #fff;
+}
+
+#menu_wrapper .nav ul li a.hover, #menu_wrapper .nav ul li a:hover, #menu_wrapper div .nav li a.hover, #menu_wrapper div .nav li a:hover {
+        color: #000;        
+        background-color: #37A3DE;
 	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;
-	border-radius: 5px;
+	border-radius: 5px;        
 }
 
-#menu_wrapper .nav ul li a.hover, #menu_wrapper .nav ul li a:hover, #menu_wrapper div .nav li a.hover, #menu_wrapper div .nav li a:hover
+#menu_wrapper div .nav li.current-menu-item a {
-{
+        color: #000;
-	background: #004971;
-        color: #fff;        
-}
-
-#menu_wrapper div .nav li.current-menu-item a
-{
-	background: #004971;
-        color: #fff;
 }
 
 #menu_wrapper .nav ul li ul, #menu_wrapper div .nav li ul
 {
-	
         display: none;
 	list-style: none;
-	background: #004971;
+	background: #37A3DE;
         box-shadow: none;
         border: none;
 	position:absolute;
@@ -123,11 +121,12 @@ label
  	padding: 3px 0 5px 0;
  	width: 200px;
  	z-index: 1000;
- 	margin-top: -6px;
+ 	margin-top: -33px;
  	padding-bottom: 5px;
  	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;
-	border-radius: 5px;
+	border-radius: 5px;   
+        font-size: 18px;
 }
 
 #menu_wrapper .nav ul li:hover ul, #menu_wrapper div .nav li:hover ul
@@ -171,12 +170,11 @@ label
 
 #menu_wrapper .nav ul li ul li a.hover, #menu_wrapper .nav ul li ul li a:hover, #menu_wrapper div .nav li ul li a.hover, #menu_wrapper div .nav li ul li a:hover
 {
-	color: #fff;
 }
 
 
 .logo {
-    margin: 13px 10px 0 20px;
+    margin: 13px 10px 0 -75px;
 }
 
 #content_wrapper {
@@ -197,7 +195,7 @@ label
 #content_wrapper,
 .content_bg, #content_wrapper.content_bg
 {
-	background: #0077D4;
+	background: #fff;
 	-moz-box-shadow: 0 1px 3px #000;
  	-webkit-box-shadow: 0 1px 3px #000;
  	box-shadow: 0px 1px 3px #000;
@@ -552,6 +550,10 @@ hr
     font-size: 13px;
 }
 
+.img_shadow_536, .img_shadow_360, .img_shadow_220, .img_shadow_160 {
+    background-image: none;
+}
+
 /*--------------------*/
 /*>>>>> Webcam   <<<<<*/
 /*--------------------*/

src/wp-content/themes/lqdvi/header.php

@@ -91,15 +91,23 @@ $pp_theme_version = '1.0';
 	}
 
 	$pp_general_font = get_option('pp_general_font');
-	if(empty($pp_general_font))
+	if(empty($pp_general_font)) {
-	{
 		$pp_general_font = 'FranklinGothicBook_400.font';
 	}
+
+        $pp_menu_font = get_option('pp_menu_font');
+	if(empty($pp_menu_font)) {
+		$pp_menu_font = 'ChildsPlay-AgeEight_500.font';
+	}
                 
 	wp_enqueue_script("cufon_font", get_bloginfo( 'stylesheet_directory' )."/fonts/".$pp_font.".js", false, $pp_theme_version);
         if ($pp_general_font != $pp_font) {
-            wp_enqueue_script("cufon_font", get_bloginfo( 'stylesheet_directory' )."/fonts/".$pp_general_font.".js", false, $pp_theme_version);            
+            wp_enqueue_script("cufon_general_font", get_bloginfo( 'stylesheet_directory' )."/fonts/".$pp_general_font.".js", false, $pp_theme_version);            
         }
+
+        if ($pp_menu_font != $pp_font) {
+            wp_enqueue_script("cufon_menu_font", get_bloginfo( 'stylesheet_directory' )."/fonts/".$pp_menu_font.".js", false, $pp_theme_version);            
+        }        
         
 	wp_enqueue_script("browser_js", get_bloginfo( 'stylesheet_directory' )."/js/browser.js", false, $pp_theme_version);
 	wp_enqueue_script("video_js", get_bloginfo( 'stylesheet_directory' )."/js/video.js", false, $pp_theme_version);
@@ -236,7 +244,7 @@ h6 { font-size:<?php echo $pp_h6_size; ?>px; }
 	if(!empty($pp_font_color))
 	{
 ?>
-body, .styled_box_content, blockquote h2 { color:<?php echo $pp_font_color; ?>; }
+body, .styled_box_content, blockquote h2, label, #searchform label { color:<?php echo $pp_font_color; ?>; }
 <?php
 	}
 	
@@ -248,7 +256,7 @@ body, .styled_box_content, blockquote h2 { color:<?php echo $pp_font_color; ?>;
 	if(!empty($pp_link_color))
 	{
 ?>
-a { color:<?php echo $pp_link_color; ?>; }
+a, #content_wrapper .sidebar a, #content_wrapper .posts li a , .one_third .blog_grid_desc a { color:<?php echo $pp_link_color; ?>; }
 <?php
 	}
 	
@@ -260,7 +268,7 @@ a { color:<?php echo $pp_link_color; ?>; }
 	if(!empty($pp_hover_link_color))
 	{
 ?>
-a:hover, a:active { color:<?php echo $pp_hover_link_color; ?>; }
+a:hover, a:active, #content_wrapper .sidebar a:hover, #content_wrapper .posts li a:hover, .one_third .blog_grid_desc a:hover { color:<?php echo $pp_hover_link_color; ?>; }
 <?php
 	}
 	
@@ -359,7 +367,7 @@ input[type=submit], input[type=button], a.button {
 	if(!empty($pp_footer_font_color))
 	{
 ?>
-#footer, #footer ul { color:<?php echo $pp_footer_font_color; ?>; }
+#footer, #footer ul, #footer h2 { color:<?php echo $pp_footer_font_color; ?>; }
 <?php
 	}
 	

src/wp-content/themes/lqdvi/js/custom.js

@@ -111,7 +111,7 @@ $j(function () {
 
 $j(document).ready(function(){ 
 
-	//$j(document).setNav();
+	$j(document).setNav();
 	
 	$j('#content_wrapper').show();
 	
@@ -345,32 +345,39 @@ $j(document).ready(function(){
   		
 	);
 	
-        Cufon.replace('p', "Franklin Gothic Book");
+        Cufon.replace('#menu_wrapper .nav ul li ul li a, #menu_wrapper div .nav li ul li a', { fontFamily: "ChildsPlay-AgeEight", hover: {color: '#000'} });
+        Cufon.replace('p', { fontFamily: "Franklin Gothic Book" });
+        Cufon.replace('ul', { fontFamily: "Franklin Gothic Book" });
+        
+	Cufon.replace('#welcome_msg', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h1', { fontFamily: "Franklin Gothic Book" });
+        Cufon.replace('h2', { fontFamily: "Franklin Gothic Book" });
+        Cufon.replace('h3', { fontFamily: "Franklin Gothic Book" });
+        Cufon.replace('h4', { fontFamily: "Franklin Gothic Book" });
+        Cufon.replace('h5', { fontFamily: "Franklin Gothic Book" });
+        Cufon.replace('h1.cufon', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h1.cufon', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h2.cufon', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h2.quote', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h2.widgettitle', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h3.cufon', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h4.cufon', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h5.cufon', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('h6.cufon', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('.pricing_box h2', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('.pricing_box .header span', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('#searchform label', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('.tagline p', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('.dropcap1', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('.post_img_date', { fontFamily: "Franklin Gothic Book" });
+	Cufon.replace('.ui-accordion-header', { fontFamily: "Franklin Gothic Book" });
+
+        Cufon.replace('.page_caption h1.cufon', { fontFamily: "ChildsPlay-AgeEight" });
+	Cufon.replace('.page_caption h2.cufon', { fontFamily: "ChildsPlay-AgeEight" });
+        Cufon.replace('.caption_desc', { fontFamily: "ChildsPlay-AgeEight" });
+        Cufon.replace('.nav', { fontFamily: "ChildsPlay-AgeEight" });
+        
         
-	Cufon.replace('#welcome_msg', "Franklin Gothic Book");
-	Cufon.replace('h1', "Franklin Gothic Book");
-        Cufon.replace('h2', "Franklin Gothic Book");
-        Cufon.replace('h3', "Franklin Gothic Book");
-        Cufon.replace('h4', "Franklin Gothic Book");
-        Cufon.replace('h5', "Franklin Gothic Book");
-        Cufon.replace('h1.cufon', "Franklin Gothic Book");
-	Cufon.replace('h1.cufon', "Franklin Gothic Book");
-	Cufon.replace('h2.cufon', "Franklin Gothic Book");
-	Cufon.replace('h2.quote', "Franklin Gothic Book");
-	Cufon.replace('h2.widgettitle', "Franklin Gothic Book");
-	Cufon.replace('h3.cufon', "Franklin Gothic Book");
-	Cufon.replace('h4.cufon', "Franklin Gothic Book");
-	Cufon.replace('h5.cufon', "Franklin Gothic Book");
-	Cufon.replace('h6.cufon', "Franklin Gothic Book");
-	Cufon.replace('.pricing_box h2', "Franklin Gothic Book");
-	Cufon.replace('.pricing_box .header span', "Franklin Gothic Book");
-	Cufon.replace('#searchform label', "Franklin Gothic Book");
-	Cufon.replace('.tagline p', "Franklin Gothic Book");
-	Cufon.replace('.dropcap1', "Franklin Gothic Book");
-	Cufon.replace('.post_img_date', "Franklin Gothic Book");
-	Cufon.replace('.page_caption h1.cufon', "Franklin Gothic Book");
-	Cufon.replace('.page_caption h2.cufon', "Franklin Gothic Book");
-	Cufon.replace('.ui-accordion-header', "Franklin Gothic Book");
 	
 	var footerLi = 0;
 	$j('#footer .sidebar_widget li.widget').each(function()

src/wp-content/themes/lqdvi/lib/admin.lib.php

@@ -139,6 +139,15 @@ array( "name" => "Main Font",
 	"std" => "Colaborate"
 ),   
 
+array( "name" => "Menu Font",
+	"desc" => "Select font for menu",
+	"id" => $shortname."_menu_font",
+	"type" => "select",
+	"options" => $pp_font_arr,
+	"std" => "Colaborate"
+),   
+    
+    
 array( "name" => "P Size (in pixels)",
 	"desc" => "",
 	"id" => $shortname."_p_size",
@@ -411,7 +420,7 @@ array( "name" => "Slider image height",
 	"size" => "40px",
 	"std" => "160",
 	"from" => 120,
-	"to" => 240,
+	"to" => 500,
 	"step" => 1,
 ),
 

src/wp-content/themes/lqdvi/templates/template-portfolio-3.php

@@ -90,7 +90,7 @@ if(!isset($hide_header) OR !$hide_header)
 							break;
 						}
 					?>
-					
+					<br class="clear"/>
 					
 					<?php
 						$pp_portfolio_hide_slider = get_option('pp_portfolio_hide_slider');