Merge branch 'develop'

category-rfc.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * The template for displaying Category pages.
+ *
+ * Used to display archive-type pages for posts in a category.
+ *
+ * Learn more: http://codex.wordpress.org/Template_Hierarchy
+ *
+ * @package WordPress
+ * @subpackage Twenty_Twelve
+ * @since Twenty Twelve 1.0
+ */
+
+//check for private RFCs
+if (!current_user_can('edit_private_posts'))
+{
+    global $wp_query;
+    $wp_query->set_404();
+    status_header(404);
+    nocache_headers();
+    include( get_query_template( '404' ) );
+    die();
+}
+
+get_header(); ?>
+
+    <section class="content cat archive">
+        <div class="row-fluid span12">
+            <div class="span8">
+                <h1 class="blue-block"><strong>Categoria: </strong><?php echo single_cat_title('', false ); ?></h1>
+                <?php while ( have_posts() ) : the_post(); ?>
+                    <?php get_template_part( 'archive', 'post' ); ?>
+                <?php endwhile; ?>
+                <div class="nav-previous">&nbsp;<?php previous_posts_link( '<< Página Anterior' ); ?></div>
+                <div class="nav-next">&nbsp;<?php next_posts_link( 'Próxima Página >>' ); ?></div>
+            </div>
+            <div class="span4 right-column">
+                <?php if (is_active_sidebar('content-right-column-1')) : ?>
+                    <?php dynamic_sidebar('content-right-column-1'); ?>
+                <?php endif; ?>
+            </div>
+        </div>
+    </section>
+
+<?php get_footer(); ?>

single.php

@@ -6,15 +6,27 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
+
+//check for private RFCs
+if (has_category('rfc') && !current_user_can('edit_private_posts'))
+{
+    global $wp_query;
+    $wp_query->set_404();
+    status_header(404);
+    nocache_headers();
+    include( get_query_template( '404' ) );
+    die();
+}
+
 get_header();
 the_post();
 ?>
 
 	<section class="content sing single">
 		<div class="row-fluid span12">
 			<div class="span8">
-				<article itemtype="http://schema.org/Article" itemscope>					
-					<h2><?php the_title(); ?></h2>						
+				<article itemtype="http://schema.org/Article" itemscope>
+					<h2><?php the_title(); ?></h2>
 					<div class="author">
                         <p>Por <span itemprop="author"><?php the_author_posts_link(); ?> </span>
                             em <time itemprop="dateCreated" datetime="<?php the_time('Y-m-d H:i'); ?>"><?php the_date(); ?></time>

style.css

@@ -4,7 +4,7 @@ Theme URI: http://phpsp.org.br/
 Author: phpsp contributors
 Author URI: https://github.com/PHPSP/phpsp-blog-theme/graphs/contributors
 Description: Tema Wordpress do site do phpsp.org.br
-Version: 1.6.1
+Version: 1.6.2
 License: Creative Commons
 License URI: http://creativecommons.org/licenses/by-nc-nd/3.0/deed.pt
 Tags: php, phpsp

widgets.php

@@ -407,10 +407,11 @@ function PHPSP_register_widgets() {
 
 	$meetup_widget_content_1[1] = array(
 		'title'           => 'Próximos Eventos',
-		'ids'             => 'php-sp,vagrant-sao-paulo,laravel-sp,wpsampa',
+		'ids'             => 'php-sp,phpsp-campinas,vagrant-sao-paulo,laravel-sp,wpsampa',
+        'highlight_groups'=> 'php-sp,phpsp-campinas',
 		'limit'           => 7,
 		'highlight_first' => 1,
-		'date_format'     => 'd/m @ H:i'
+		'date_format'     => 'd/m @ H:i',
 	);
 
 	update_option( 'widget_vsmeetgroupslistwidget', $meetup_widget_content_1 );