[pull] master from jmhdez:master

TODO.txt

@@ -0,0 +1,56 @@
+**- Averiguar qué pasa con la URL. Cuando navego a un post, no cambia la URL
+	No pasa nada. Es porque como no está configurado el htaccess, usa de url
+	test.domain.com/?p=123, y debe ser que algo acaba ocultado el querystring
+
+
+- Ajustar la página de histórico
+- Arreglar accesos directos a github y twitter
+- Dar formato a los títulos de los posts para que no se vean como los demás enlaces
+- Revisar los comentarios
+- Añadir un bloque "Quien soy" en el pie de cada post
+- Añadir botones para compartir en la parte de abajo del post
+- Dar formato a las entradas relacionadas
+- Añadir licencia
+
+Botón de twitter:
+
+<a href="https://twitter.com/share" class="twitter-share-button" data-via="gulnor">Tweet</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+
+Botón de FB:
+
+<!-- En teoría esto va justo tras abrir el body -->
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<!-- ...y esto donde quieras que salga. en el data-href va la url que quieres compartir -->
+<div class="fb-like" data-href="http://developers.facebook.com/docs/reference/plugins/like" data-send="false" data-layout="button_count" data-width="450" data-show-faces="true" data-action="recommend"></div>
+
+Botón de Google Plus:
+
+<!-- Place this tag where you want the +1 button to render. -->
+<div class="g-plusone" data-size="medium"></div>
+
+<!-- Place this tag after the last +1 button tag. -->
+<script type="text/javascript">
+  window.___gcfg = {lang: 'es'};
+
+  (function() {
+    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+    po.src = 'https://apis.google.com/js/plusone.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+  })();
+</script>
+
+Linked in:
+
+<script src="//platform.linkedin.com/in.js" type="text/javascript">
+ lang: es_ES
+</script>
+<script type="IN/Share" data-counter="right"></script>

content-single.php

@@ -4,6 +4,8 @@
  */
 ?>
 
+<?php /** Este template se usa cuando se muestran un único post */ ?>
+
 <?php if ( has_post_format( 'quote' ) ) : ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 			<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
@@ -33,12 +35,15 @@
 	<?php else : ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<div class="entry-title"><h2><?php the_title(); ?></h2>
-			<div class="social-reply <?php echo get_theme_mod( 'show_reply_option', 'hidden' ); ?>"><a href="https://twitter.com/intent/tweet?screen_name=<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>&text=(about%3A%20<?php the_permalink(); ?>) " class="twitterreply replylink left" target="_blank" data-related="<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>">With Twitter</a><div class="replytrigger">Reply</div><a href="https://alpha.app.net/intent/post?text=@<?php echo get_theme_mod( 'adn_reply_username', '' ); ?> (about%3A%20<?php the_permalink(); ?>) " class="adnreply replylink right" target="_blank">With ADN</a></div></div>
+		<div class="entry-title">
+			<h2><?php the_title(); ?></h2>
+		</div>
 	</header><!-- .entry-header -->
 
 		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
 		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
+
+
 		<footer class="entry-meta">
 			<?php edit_post_link( __( 'Edit', 'decode' ), '<span class="edit-link">', '</span>' ); ?>
 			<p class="tags"><?php the_tags(); ?></p>

content.php

@@ -4,35 +4,7 @@
  */
 ?>
 
-	<?php if ( has_post_format( 'quote' ) ) : ?>
-	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-			<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
-		<footer class="entry-meta">
-			<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-		<span class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></span>
-		<?php endif; ?>
-			<p class="date"><a href="<?php the_permalink(); ?>">Posted on <?php decode_posted_on(); ?></a></p>
-		</footer><!-- .entry-meta -->
-	</article><!-- #post-<?php the_ID(); ?> -->
-
-	<?php elseif ( has_post_format( 'link' )): ?>
-				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-				<header class="entry-header">
-					<div class="entry-title"><h2><?php decode_print_post_title() ?></h2>
-					<div class="social-reply <?php echo get_theme_mod( 'show_reply_option', 'hidden' ); ?>"><a href="https://twitter.com/intent/tweet?screen_name=<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>&text=(about%3A%20<?php the_permalink(); ?>) " class="twitterreply replylink left" target="_blank" data-related="<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>">With Twitter</a><div class="replytrigger">Reply</div><a href="https://alpha.app.net/intent/post?text=@<?php echo get_theme_mod( 'adn_reply_username' ); ?> (about%3A%20<?php the_permalink(); ?>) " class="adnreply replylink right" target="_blank">With ADN</a></div></div>
-				</header>
-
-					<div class="entry-content"><?php the_content( __( 'continue reading &raquo;', 'twentyten' ) ); ?></div>
-					<footer class="entry-meta">
-						<?php if ( ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-		<span class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) ); ?></span>
-		<?php endif; ?>
-						<p class="date"><a href="<?php the_permalink(); ?>">Posted on <?php decode_posted_on(); ?></a></p>
-					</footer><!-- .entry-meta -->
-				</article>
-
-	<?php elseif ( is_search() ) : // Only display Excerpts for Search ?>
+	<?php if ( is_search() ) : // Only display Excerpts for Search ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
@@ -41,10 +13,14 @@
 		</div>
 
 	<?php else : ?>
+
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<div class="entry-title"><h2><?php the_title(); ?></h2>
-			<div class="social-reply <?php echo get_theme_mod( 'show_reply_option', 'hidden' ); ?>"><a href="https://twitter.com/intent/tweet?screen_name=<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>&text=(about%3A%20<?php the_permalink(); ?>) " class="twitterreply replylink left" target="_blank" data-related="<?php echo get_theme_mod( 'twitter_reply_username', '' ); ?>">With Twitter</a><div class="replytrigger">Reply</div><a href="https://alpha.app.net/intent/post?text=@<?php echo get_theme_mod( 'adn_reply_username', '' ); ?> (about%3A%20<?php the_permalink(); ?>) " class="adnreply replylink right" target="_blank">With ADN</a></div></div>
+		<div class="entry-title">
+			<a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>">
+				<h2><?php the_title(); ?></h2>
+			</a>
+		</div>
 	</header><!-- .entry-header -->
 
 		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>

functions.php

@@ -48,18 +48,6 @@ function decode_setup() {
 		'primary' => __( 'Primary Menu', 'decode' ),
 	) );
 
-	/**
-	 * Enable support for Post Formats
-	 */
-	add_theme_support( 'post-formats', array( 'aside', 'image', 'video', 'quote', 'link' ) );
-
-	/**
-	 * Setup the WordPress core custom background feature.
-	 */
-	add_theme_support( 'custom-background', apply_filters( 'decode_custom_background_args', array(
-		'default-color' => 'E3E5E7',
-		'default-image' => '',
-	) ) );
 }
 endif; // decode_setup
 add_action( 'after_setup_theme', 'decode_setup' );

header.php

@@ -25,7 +25,7 @@
 		<img id="sidebar_link" class="SidebarLink <?php echo get_theme_mod( 'sidebar_button_position', 'left' );?> <?php echo get_theme_mod( 'show_sidebar', 'hidden' );?>" src="<?php echo get_template_directory_uri(); ?>/images/menu.svg">
 		<div class="site-branding">
 			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
-			<h2 class="site-description"><?php echo get_theme_mod( 'use_html_in_description', '' ); ?></h2>
+			<h2 class="site-description"><?php bloginfo('description'); ?></h2>
 		</div>
 		<div class="sociallinks <?php echo get_theme_mod( 'show_social_icons', 'hidden' );?>">
 			<ul> 

inc/customizer.php

@@ -281,15 +281,7 @@ function decode_customize_register( $wp_customize ) {
     $wp_customize->add_setting( 'show_theme_info', array(
 		'default'        => '',
 	) );
-
-	$wp_customize->add_setting( 'html_description', array(
-		'default'        => '',
-	) );
-
-    $wp_customize->add_setting( 'use_html_in_description', array(
-		'default'        => '',
-	) );
-
+
 
 	$wp_customize->add_control( 'show_theme_info', array(
 		'label'   => 'Show Theme Info (display a line of text about the theme and its creator at the bottom of pages)',
@@ -302,24 +294,6 @@ function decode_customize_register( $wp_customize ) {
 		'priority'=> 1,
 	) );	
 
-	$wp_customize->add_control( 'html_description', array(
-		'label'   => 'HTML for description (set this first, then save)',
-		'section' => 'decode_other_options',
-		'type'    => 'text',
-		'priority'=> 1,
-	) );
-
-	$wp_customize->add_control( 'use_html_in_description', array(
-		'label'   => 'After saving the above setting, set and save this one. Want HTML in the header\'s description?',
-		'section' => 'decode_other_options',
-		'type'       => 'radio',
-		'choices'    => array(
-			get_theme_mod( 'html_description' ) => 'Yes',
-			get_bloginfo ( 'description' ) => 'No',
-        ),
-		'priority'=> 2,
-	) );
-
 
 }
 add_action( 'customize_register', 'decode_customize_register' );

index.php

@@ -13,6 +13,8 @@
 
 get_header(); ?>
 
+<?php /** Este template se usa sólo en la página principal, pero no en el resto de listas (tags, categorías, etc.) */ ?>
+
 		<div id="primary" class="content-area">
 			<div id="content" class="site-content" role="main">