From 07683cffb11837b7715996b83e9078fd609efb26 Mon Sep 17 00:00:00 2001
From: markAking <mark@iliketocolor.com>
Date: Mon, 13 Jun 2016 16:08:11 -0400
Subject: [PATCH 1/6] added new project status, this is just in admin now. Next
 commit will have it on the dashboard

---
 .../wp-content/themes/backer/functions.php    | 254 ++++++++++--------
 1 file changed, 145 insertions(+), 109 deletions(-)

diff --git a/wordpress/wp-content/themes/backer/functions.php b/wordpress/wp-content/themes/backer/functions.php
index 8e2c2ad7..e724a9f4 100644
--- a/wordpress/wp-content/themes/backer/functions.php
+++ b/wordpress/wp-content/themes/backer/functions.php
@@ -1,4 +1,40 @@
 <?php
+/*---------------------------------
+	Custom Project Status
+-----------------------------------*/
+add_action( 'init', 'custom_project_status' );
+add_action('admin_footer-post.php', 'append_project_status_list');
+
+function custom_project_status(){
+	 register_post_status( 'needsediting', array(
+		'label'                     => _x( 'Needs Editing', 'post' ),
+		'public'                    => true,
+		'show_in_admin_all_list'    => true,
+		'show_in_admin_status_list' => true,
+		'label_count'               => _n_noop( 'Needs Editing <span class="count">(%s)</span>', 'Needs Editing <span class="count">(%s)</span>' )
+	 ) );
+}
+
+function append_project_status_list(){
+	global $post;
+	$complete = '';
+	$label = '';
+	if($post->post_type == 'ignition_product'){
+		if($post->post_status == 'needsediting'){
+			$complete = ' selected=\'selected\'';
+			$label = '<span id=\'post-status-display\'> Needs Editing</span>';
+		}
+		echo '
+		<script>
+		jQuery(document).ready(function($){
+			$("select#post_status").append("<option value=\'needsediting\' '.$complete.'>Needs Editing</option>");
+			$(".misc-pub-section label").append("'.$label.'");
+		});
+		</script>
+		';
+	 }
+}
+
 /*---------------------------------
 	Setup OptionTree
 ------------------------------------*/
@@ -232,7 +268,7 @@ add_action( 'after_setup_theme', 'krown_setup' );
 if ( ! function_exists( '_wp_render_title_tag' ) ) {
 
 	function theme_slug_render_title() {
-	    echo '<title>' . wp_title( '|', false, 'right' ) . "</title>\n";
+		echo '<title>' . wp_title( '|', false, 'right' ) . "</title>\n";
 	}
 
 	add_action( 'wp_head', 'theme_slug_render_title' );
@@ -432,7 +468,7 @@ if ( ! function_exists( 'krown_excerptlength_post' ) ) {
 	// Length (words no)
 	 
 	function krown_excerptlength_post() {
-	    return 15;
+		return 15;
 	}
 
 }
@@ -442,7 +478,7 @@ if ( ! function_exists( 'krown_excerptlength_post_big' ) ) {
 	// Length (words no)
 	 
 	function krown_excerptlength_post_big() {
-	    return 80;
+		return 80;
 	}
 
 }
@@ -452,7 +488,7 @@ if ( ! function_exists( 'krown_excerptmore' ) ) {
 	// More text
 
 	function krown_excerptmore() {
-	    return ' ...';
+		return ' ...';
 	}
 
 }
@@ -467,37 +503,37 @@ if ( ! function_exists( 'krown_excerpt' ) ) {
 	
 	function krown_excerpt( $length_callback = '', $more_callback = 'krown_excerptmore' ) {
 
-	    global $post;
+		global $post;
 		
-	    if ( function_exists( $length_callback ) ) {
+		if ( function_exists( $length_callback ) ) {
 			add_filter( 'excerpt_length', $length_callback );
-	    }
+		}
 		
-	    if ( function_exists( $more_callback ) ){
+		if ( function_exists( $more_callback ) ){
 			add_filter( 'excerpt_more', $more_callback );
-	    }
+		}
 		
-	    $output = get_the_excerpt();
+		$output = get_the_excerpt();
 
-	    if ( empty( $output ) ) {
+		if ( empty( $output ) ) {
 
-	    	// If the excerpt is empty (on pages created 100% with shortcodes), we should take the content, strip shortcodes, remove all HTML tags, then return the correct number of words
+			// If the excerpt is empty (on pages created 100% with shortcodes), we should take the content, strip shortcodes, remove all HTML tags, then return the correct number of words
 
-	    	$output = strip_tags( preg_replace( "~(?:\[/?)[^\]]+/?\]~s", '', $post->post_content ) );
-	    	$output = explode( ' ', $output, $length_callback() );
-	    	array_pop( $output );
-	    	$output = implode( ' ', $output ) . $more_callback();
+			$output = strip_tags( preg_replace( "~(?:\[/?)[^\]]+/?\]~s", '', $post->post_content ) );
+			$output = explode( ' ', $output, $length_callback() );
+			array_pop( $output );
+			$output = implode( ' ', $output ) . $more_callback();
 
-	    } else {
+		} else {
 
-	    	// Continue with the regular excerpt method
+			// Continue with the regular excerpt method
 
-		    $output = apply_filters( 'wptexturize', $output );
-		    $output = apply_filters( 'convert_chars', $output );
+			$output = apply_filters( 'wptexturize', $output );
+			$output = apply_filters( 'convert_chars', $output );
 
-	    }
+		}
 		
-	    return $output;
+		return $output;
 		
 	}   
 
@@ -535,13 +571,13 @@ if ( ! function_exists( 'krown_search_form' ) ) {
 
 	function krown_search_form( $form ) {
 
-	    $form = '
+		$form = '
 		<form role="search" method="get" id="searchform" class="hover-show" action="' . home_url( '/' ) . '" >
 			<label class="screen-reader-text hidden" for="s">' . __( 'Search for:', 'krown' ) . '</label>
 			<input type="search" value="" name="s" id="s" placeholder="' . __( 'Type and hit enter', 'krown' ) . '" />
 			<input id="submit_s" type="submit" />
-	    </form>';
-	    return $form;
+		</form>';
+		return $form;
 		
 	}
 
@@ -772,9 +808,9 @@ if ( ! function_exists( 'krown_custom_header' ) ) {
 ------------------------------------*/
 
 function krown_custom_login_logo() {
-    echo '<style type="text/css">
-        h1 a { background-image: url(' . ot_get_option( 'krown_custom_login_logo_uri', get_template_directory_uri() . '/images/krown-login-logo.png' ) . ') !important; background-size: 273px 63px !important; width: 273px !important; height: 63px !important; }
-    </style>';
+	echo '<style type="text/css">
+		h1 a { background-image: url(' . ot_get_option( 'krown_custom_login_logo_uri', get_template_directory_uri() . '/images/krown-login-logo.png' ) . ') !important; background-size: 273px 63px !important; width: 273px !important; height: 63px !important; }
+	</style>';
 }
 
 add_action( 'login_head', 'krown_custom_login_logo' );
@@ -863,11 +899,11 @@ function krown_sidebar_class() {
 
 function krown_request_filter( $query_vars ) {
 
-    if( isset( $_GET['s'] ) && empty( $_GET['s'] ) ) {
-        $query_vars['s'] = " ";
-    }
+	if( isset( $_GET['s'] ) && empty( $_GET['s'] ) ) {
+		$query_vars['s'] = " ";
+	}
 
-    return $query_vars;
+	return $query_vars;
 }
 
 add_filter('request', 'krown_request_filter');
@@ -1006,21 +1042,21 @@ if ( ! function_exists( 'krown_mce_custom_styles' ) ) {
 
 	function krown_mce_custom_styles($settings) {
 
-	    $settings['theme_advanced_blockformats'] = 'p,h1,h2,h3,h4';
+		$settings['theme_advanced_blockformats'] = 'p,h1,h2,h3,h4';
 
-	    $style_formats = array(
-	        array('title' => 'Extreme', 'inline' => 'span', 'classes' => 'extreme'),
-	        array('title' => 'Large', 'inline' => 'span', 'classes' => 'large'),
-	        array('title' => 'Medium', 'inline' => 'span', 'classes' => 'medium'),
-	        array('title' => 'Regular', 'inline' => 'span', 'classes' => 'regular'),
-	        array('title' => 'Small', 'inline' => 'span', 'classes' => 'small'),
-	        array('title' => 'Cite', 'inline' => 'cite', 'classes' => '')
-	    );
+		$style_formats = array(
+			array('title' => 'Extreme', 'inline' => 'span', 'classes' => 'extreme'),
+			array('title' => 'Large', 'inline' => 'span', 'classes' => 'large'),
+			array('title' => 'Medium', 'inline' => 'span', 'classes' => 'medium'),
+			array('title' => 'Regular', 'inline' => 'span', 'classes' => 'regular'),
+			array('title' => 'Small', 'inline' => 'span', 'classes' => 'small'),
+			array('title' => 'Cite', 'inline' => 'cite', 'classes' => '')
+		);
 
-	    $settings['style_formats'] = json_encode( $style_formats );
+		$settings['style_formats'] = json_encode( $style_formats );
 
-	    return $settings;
-	    
+		return $settings;
+		
 	}
 
 }
@@ -1047,7 +1083,7 @@ if ( ! function_exists( 'krown_mce_buttons' ) ) {
 	function krown_mce_buttons( $buttons ) {
 
 		array_unshift( $buttons, 'fontsizeselect' );
-    	array_unshift( $buttons, 'styleselect');
+		array_unshift( $buttons, 'styleselect');
 		return $buttons;
 	}
 
@@ -1056,7 +1092,7 @@ if ( ! function_exists( 'krown_mce_buttons' ) ) {
 add_filter( 'mce_buttons_2', 'krown_mce_buttons' );
 
 /*---------------------------------
-    Update Notice
+	Update Notice
 ------------------------------------*/
 
 add_action( 'admin_notices', 'krown_update_notice' );
@@ -1065,12 +1101,12 @@ function krown_update_notice() {
 
 	if ( get_option( 'krown_koncept_version' ) != '1.1' ) {
 
-        echo '<div class="updated" style="position: relative;">
-        	<h4>You have just updated to version 1.1 - <a style="text-decoration" href="' . admin_url( 'themes.php?page=ot-theme-options&krown_update_done_do=1#section_log' ) . '">Read the CHANGELOG</a></h4>';
+		echo '<div class="updated" style="position: relative;">
+			<h4>You have just updated to version 1.1 - <a style="text-decoration" href="' . admin_url( 'themes.php?page=ot-theme-options&krown_update_done_do=1#section_log' ) . '">Read the CHANGELOG</a></h4>';
 
-        printf(__('<em style="position: absolute; top: 18px; right: 20px;"><a href="%1$s">Dismiss</a></em>'), '?krown_update_done_do=1');
+		printf(__('<em style="position: absolute; top: 18px; right: 20px;"><a href="%1$s">Dismiss</a></em>'), '?krown_update_done_do=1');
 
-        echo "<p></p></div>";
+		echo "<p></p></div>";
 
 	}
 
@@ -1079,99 +1115,99 @@ add_action( 'admin_init', 'krown_update_done_do' );
 
 function krown_update_done_do() {
 	global $current_user;
-    $user_id = $current_user->ID;
-    if ( isset( $_GET['krown_update_done_do'] ) && '1' == $_GET['krown_update_done_do'] ) {
-        update_option( 'krown_koncept_version', '1.1' );
+	$user_id = $current_user->ID;
+	if ( isset( $_GET['krown_update_done_do'] ) && '1' == $_GET['krown_update_done_do'] ) {
+		update_option( 'krown_koncept_version', '1.1' );
 	}
 }
 
 /*---------------------------------
-    Navigation Walker
+	Navigation Walker
 ------------------------------------*/
 
 class Krown_Nav_Walker extends Walker_Nav_Menu {
 
-    function start_lvl( &$output, $depth=0, $args=array() ) {
-    	if ( $depth == 0 ) {
-        	$output .= '<div class="sub-menu-holder"><ul class="sub-menu">';
-    	} else if ( $depth == 1 ) {
-        	$output .= '<div class="third-menu-holder"><ul class="third-menu">';
-    	}
-    }
+	function start_lvl( &$output, $depth=0, $args=array() ) {
+		if ( $depth == 0 ) {
+			$output .= '<div class="sub-menu-holder"><ul class="sub-menu">';
+		} else if ( $depth == 1 ) {
+			$output .= '<div class="third-menu-holder"><ul class="third-menu">';
+		}
+	}
 
-    function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ){
+	function display_element( $element, &$children_elements, $max_depth, $depth=0, $args, &$output ){
 
-        $id_field = $this->db_fields['id'];
+		$id_field = $this->db_fields['id'];
 
-        if ( is_object( $args[0] ) ) {
-            $args[0]->has_children = ! empty( $children_elements[$element->$id_field] );
-        }
+		if ( is_object( $args[0] ) ) {
+			$args[0]->has_children = ! empty( $children_elements[$element->$id_field] );
+		}
 
-        return parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
+		return parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
 
-    }
+	}
 
-    function start_el( &$output, $object, $depth=0, $args=array(), $current_object_id=0 ) {
+	function start_el( &$output, $object, $depth=0, $args=array(), $current_object_id=0 ) {
 
-        global $wp_query;
-        global $rb_submenus;
+		global $wp_query;
+		global $rb_submenus;
 
-        $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
 
-        $new_output = '';
-        $depth_class = ( $args->has_children ? 'parent ' : '' );
+		$new_output = '';
+		$depth_class = ( $args->has_children ? 'parent ' : '' );
 
-        $class_names = $value = $selected_class = '';
-        $classes = empty( $object->classes ) ? array() : ( array ) $object->classes;
+		$class_names = $value = $selected_class = '';
+		$classes = empty( $object->classes ) ? array() : ( array ) $object->classes;
 
-        $current_indicators = array('current-menu-item', 'current-menu-parent', 'current_page_item', 'current_page_parent', 'current-menu-ancestor');
+		$current_indicators = array('current-menu-item', 'current-menu-parent', 'current_page_item', 'current_page_parent', 'current-menu-ancestor');
 
-        foreach ( $classes as $el ) {
-            if ( in_array( $el, $current_indicators ) ) {
-                $selected_class = 'selected ';
-            }
-        }
+		foreach ( $classes as $el ) {
+			if ( in_array( $el, $current_indicators ) ) {
+				$selected_class = 'selected ';
+			}
+		}
 
-        $class_names = ' class="' . $selected_class . $depth_class . 'menu-item' . ( ! empty( $classes[0] ) ? ' ' . $classes[0] : '' ) . '"';
+		$class_names = ' class="' . $selected_class . $depth_class . 'menu-item' . ( ! empty( $classes[0] ) ? ' ' . $classes[0] : '' ) . '"';
 
-        if ( ! get_post_meta( $object->object_id , '_members_only' , true ) || is_user_logged_in() ) {
-            $output .= $indent . '<li id="menu-item-'. $object->ID . '"' . $class_names . '>';
-        }
+		if ( ! get_post_meta( $object->object_id , '_members_only' , true ) || is_user_logged_in() ) {
+			$output .= $indent . '<li id="menu-item-'. $object->ID . '"' . $class_names . '>';
+		}
 
-        $attributes  = ! empty( $object->attr_title ) ? ' title="'  . esc_attr( $object->attr_title ) .'"' : '';
-        $attributes .= ! empty( $object->target )     ? ' target="' . esc_attr( $object->target     ) .'"' : '';
-        $attributes .= ! empty( $object->xfn )        ? ' rel="'    . esc_attr( $object->xfn        ) .'"' : '';
-        $attributes .= ! empty( $object->url )        ? ' href="'   . esc_attr( $object->url        ) .'"' : '';
+		$attributes  = ! empty( $object->attr_title ) ? ' title="'  . esc_attr( $object->attr_title ) .'"' : '';
+		$attributes .= ! empty( $object->target )     ? ' target="' . esc_attr( $object->target     ) .'"' : '';
+		$attributes .= ! empty( $object->xfn )        ? ' rel="'    . esc_attr( $object->xfn        ) .'"' : '';
+		$attributes .= ! empty( $object->url )        ? ' href="'   . esc_attr( $object->url        ) .'"' : '';
 
-        $object_output = $args->before;
-        $object_output .= '<a' . $attributes . '>';
-        $object_output .= $args->link_before . apply_filters( 'the_title', $object->title, $object->ID ) . $args->link_after;
-        $object_output .= '</a>';
-        $object_output .= $args->after;
+		$object_output = $args->before;
+		$object_output .= '<a' . $attributes . '>';
+		$object_output .= $args->link_before . apply_filters( 'the_title', $object->title, $object->ID ) . $args->link_after;
+		$object_output .= '</a>';
+		$object_output .= $args->after;
 
-        if ( !get_post_meta( $object->object_id, '_members_only' , true ) || is_user_logged_in() ) {
+		if ( !get_post_meta( $object->object_id, '_members_only' , true ) || is_user_logged_in() ) {
 
-            $output .= apply_filters( 'walker_nav_menu_start_el', $object_output, $object, $depth, $args );
+			$output .= apply_filters( 'walker_nav_menu_start_el', $object_output, $object, $depth, $args );
 
-        }
+		}
 
-        $output .= $new_output;
+		$output .= $new_output;
 
-    }
+	}
 
-    function end_el(&$output, $object, $depth=0, $args=array()) {
+	function end_el(&$output, $object, $depth=0, $args=array()) {
 
-        if ( !get_post_meta( $object->object_id, '_members_only' , true ) || is_user_logged_in() ) {
-            $output .= "</li>\n";
-        }
+		if ( !get_post_meta( $object->object_id, '_members_only' , true ) || is_user_logged_in() ) {
+			$output .= "</li>\n";
+		}
 
-    }
-    
-    function end_lvl(&$output, $depth=0, $args=array()) {
+	}
+	
+	function end_lvl(&$output, $depth=0, $args=array()) {
 
-        $output .= "</ul></div>\n";
+		$output .= "</ul></div>\n";
 
-    }
+	}
 
 }
 
-- 
GitLab


From ef9a65af2b58a23d2e07d263e30595367a89b3d6 Mon Sep 17 00:00:00 2001
From: markAking <mark@iliketocolor.com>
Date: Mon, 13 Jun 2016 17:51:33 -0400
Subject: [PATCH 2/6] added filters to My Projects page

---
 .../includes/ignitiondeck-functions.php       |  1 +
 .../ignitiondeck-templates/_myProjects.php    |  5 ++---
 .../ignitiondeck-templates/_projectSort.php   | 22 +++++++++++++++++++
 wordpress/wp-content/themes/backer/style.css  | 10 +++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php

diff --git a/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php b/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php
index d9b368dd..cc1308a1 100644
--- a/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php
+++ b/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php
@@ -176,6 +176,7 @@ function krown_md_ide_creator_projects($content) {
 	echo '<div class="memberdeck">';
 	include_once IDC_PATH.'templates/_mdProfileTabs.php';
 	echo '<ul class="md-box-wrapper full-width cf"><li class="md-box full"><div class="md-profile">';
+	include get_template_directory() . '/includes/ignitiondeck-templates/_projectSort.php';
 	echo '<h3>'.__( 'My Projects', 'krown' ).'</h3>';
 	echo '<ul class="md-projects-list clearfix">';
 	$user_projects = get_user_meta($user_id, 'ide_user_projects', true);
diff --git a/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_myProjects.php b/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_myProjects.php
index 175e3a72..0151c4b8 100644
--- a/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_myProjects.php
+++ b/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_myProjects.php
@@ -1,7 +1,6 @@
-<li class="project clearfix">
+<?php global $post; ?>
+<li class="project clearfix <?php echo $status; ?>">
 	
-	<?php global $post; ?>
-
 	<div class="thumb">
 		<?php if ( ! empty( $thumb ) ) {
 
diff --git a/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php b/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php
new file mode 100644
index 00000000..fa68622e
--- /dev/null
+++ b/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php
@@ -0,0 +1,22 @@
+<?php global $post; ?>	
+<div class="project_sortby">
+	<label for="sortby_status">Filter By:</label>
+	<select name="sortby_status" id="sortby_status">
+		<option value="all">All</option>
+		<option value="publish">Published</option>
+		<option value="needsediting">Needs Editing</option>
+		<option value="pending">Pending Review</option>
+		<option value="draft">Draft</option>
+	</select>
+</div>
+<script>
+	jQuery('#sortby_status').change(function(){
+		var type = jQuery(this).val();
+		if(type === 'all'){
+			jQuery('.project').removeAttr('style');
+		} else {
+			jQuery('.project').css('cssText', ' display: none !important;');
+			jQuery('.'+type).removeAttr('style');
+		}
+	});
+</script>
\ No newline at end of file
diff --git a/wordpress/wp-content/themes/backer/style.css b/wordpress/wp-content/themes/backer/style.css
index 7a0f0455..6b862289 100644
--- a/wordpress/wp-content/themes/backer/style.css
+++ b/wordpress/wp-content/themes/backer/style.css
@@ -1951,6 +1951,16 @@ input.terms-checkbox-input {
 .memberdeck .idc-terms-checkbox{
   padding: 0;
 }
+
+.memberdeck .project_sortby{
+  float: right;
+}
+.memberdeck .project_sortby label{
+  padding-right: 5px;
+}
+.memberdeck .project_sortby select{
+  width: auto;
+}
 /* Notices */
 
 .memberdeck p.success, .memberdeck p.error, .memberdeck p.info, .memberdeck .md-profile h2 + p, .ignitiondeck .notification {
-- 
GitLab


From f45290a388e323fa74dcc72416559d9f6a22b087 Mon Sep 17 00:00:00 2001
From: markAking <mark@iliketocolor.com>
Date: Tue, 14 Jun 2016 11:05:17 -0400
Subject: [PATCH 3/6] added more status options

---
 .../wp-content/themes/backer/functions.php    | 26 ++++++++++++++-----
 .../ignitiondeck-templates/_projectSort.php   |  4 ++-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/wordpress/wp-content/themes/backer/functions.php b/wordpress/wp-content/themes/backer/functions.php
index e724a9f4..94ac1e4d 100644
--- a/wordpress/wp-content/themes/backer/functions.php
+++ b/wordpress/wp-content/themes/backer/functions.php
@@ -5,29 +5,43 @@
 add_action( 'init', 'custom_project_status' );
 add_action('admin_footer-post.php', 'append_project_status_list');
 
-function custom_project_status(){
-	 register_post_status( 'needsediting', array(
+function custom_project_status(){ 
+	register_post_status( 'closed', array(
+		'label'                     => _x( 'Closed', 'post' ),
+		'public'                    => true,
+		'show_in_admin_all_list'    => true,
+		'show_in_admin_status_list' => true,
+		'label_count'               => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>' )
+	) );
+	register_post_status( 'completed', array(
+		'label'                     => _x( 'Completed', 'post' ),
+		'public'                    => true,
+		'show_in_admin_all_list'    => true,
+		'show_in_admin_status_list' => true,
+		'label_count'               => _n_noop( 'Completed <span class="count">(%s)</span>', 'Completed <span class="count">(%s)</span>' )
+	) );
+	register_post_status( 'needsediting', array(
 		'label'                     => _x( 'Needs Editing', 'post' ),
 		'public'                    => true,
 		'show_in_admin_all_list'    => true,
 		'show_in_admin_status_list' => true,
 		'label_count'               => _n_noop( 'Needs Editing <span class="count">(%s)</span>', 'Needs Editing <span class="count">(%s)</span>' )
-	 ) );
+	) );
 }
 
 function append_project_status_list(){
 	global $post;
-	$complete = '';
 	$label = '';
 	if($post->post_type == 'ignition_product'){
 		if($post->post_status == 'needsediting'){
-			$complete = ' selected=\'selected\'';
 			$label = '<span id=\'post-status-display\'> Needs Editing</span>';
 		}
 		echo '
 		<script>
 		jQuery(document).ready(function($){
-			$("select#post_status").append("<option value=\'needsediting\' '.$complete.'>Needs Editing</option>");
+			$("select#post_status").prepend("<option value=\'needsediting\' '.selected( $post->post_status, 'needsediting' ).'>Needs Editing</option>");
+			$("select#post_status").prepend("<option value=\'completed\' '.selected( $post->post_status, 'completed' ).'>Completed</option>");
+			$("select#post_status").prepend("<option value=\'closed\' '.selected( $post->post_status, 'closed' ).'>Closed</option>");
 			$(".misc-pub-section label").append("'.$label.'");
 		});
 		</script>
diff --git a/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php b/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php
index fa68622e..84f8899c 100644
--- a/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php
+++ b/wordpress/wp-content/themes/backer/includes/ignitiondeck-templates/_projectSort.php
@@ -3,8 +3,10 @@
 	<label for="sortby_status">Filter By:</label>
 	<select name="sortby_status" id="sortby_status">
 		<option value="all">All</option>
-		<option value="publish">Published</option>
+		<option value="closed">Closed</option>
+		<option value="completed">Completed</option>
 		<option value="needsediting">Needs Editing</option>
+		<option value="publish">Published</option>
 		<option value="pending">Pending Review</option>
 		<option value="draft">Draft</option>
 	</select>
-- 
GitLab


From 5318844aa88fe2dff26b5d4834793abb12caf983 Mon Sep 17 00:00:00 2001
From: markAking <mark@iliketocolor.com>
Date: Tue, 14 Jun 2016 13:16:30 -0400
Subject: [PATCH 4/6] added filters and status column to project edit page

---
 .../includes/ignitiondeck-functions.php       | 232 +++++++++++++++---
 1 file changed, 200 insertions(+), 32 deletions(-)

diff --git a/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php b/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php
index cc1308a1..a84c1a95 100644
--- a/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php
+++ b/wordpress/wp-content/themes/backer/includes/ignitiondeck-functions.php
@@ -3,6 +3,174 @@
  * This file contains some IgnitionDeck related functions
  */
 
+/*---------------------------------
+	overrides for project admin
+-----------------------------------*/
+function override_ign_change_columns( $cols ) {
+	require ID_PATH.'languages/text_variables.php';		
+	$cols = array(
+		'cb'		=> '<input type="checkbox" />',
+		'title'		=> $tr_Product,
+		'author' 	=> __('Author', 'ignitiondeck'),
+		'type'		=> __('Type', 'ignitiondeck'),
+		'status'	=> $tr_Status,
+		'goal'		=> $tr_Funding_Goal,
+		'raised'	=> $tr_Pledged,	
+		'enddate'	=> $tr_End_Date,		
+		'daysleft'	=> $tr_Days_Remaining ,		
+	);
+	return apply_filters('id_project_columns', $cols);
+}
+add_filter( "manage_ignition_product_posts_columns", "override_ign_change_columns" );
+
+function override_ign_sortable_columns() {
+  $sortable_columns = array(
+	'title'     => 'title',
+	'author' 	=> 'author',
+	'type'		=> 'type',
+	'status'	=> 'status',
+	'goal'      => 'goal',
+	'raised'	=> 'raised',
+	'enddate'	=> 'enddate',
+	'daysleft'	=> 'daysleft',
+  );
+  return apply_filters('id_sortable_project_columns', $sortable_columns);
+}
+add_filter( "manage_edit-ignition_product_sortable_columns", "override_ign_sortable_columns" );
+
+
+remove_action(	'manage_posts_custom_column', 'manage_ign_product_columns', 10);
+add_action(	'manage_posts_custom_column', 'override_manage_ign_product_columns', 10, 2 );
+
+function override_manage_ign_product_columns($column_name, $id) {
+	global $post;
+	require ID_PATH.'languages/text_variables.php';		
+	$post_id = $post->ID;
+	$project_id = get_post_meta($id, 'ign_project_id', true);
+	$project = new ID_Project($project_id);
+	$cCode = $project->currency_code();
+	switch ($column_name) {
+		// display goal amount with currency formatting
+	case 'author':
+		echo (!empty($post->post_author) ? $post->post_author : __('None', 'ignitiondeck'));
+		break;
+
+	case 'type':
+		$type = get_post_meta($post_id, 'ign_project_type', true);
+		if (isset($type)) {
+			if ($type == 'pwyw') {
+				$type = __('Pledge What You Want', 'Ignitiondeck');
+			}
+			else if ($type == 'level-based') {
+				$type = __('Level-Based', 'ignitiondeck');
+			}
+		}
+		$type = apply_filters('id_project_type', $type);
+		echo (isset($type) ? $type : '');
+		break;
+
+	case 'status':
+		$status = get_post_status_object($post->post_status);
+		echo $status->label;
+		break;
+
+	case 'goal':
+		if (get_post_meta( $post->ID, 'ign_fund_goal', true)) {
+			$goal_amt = number_format(get_post_meta( $post->ID, 'ign_fund_goal', true), 2, '.', ',');
+			
+			setlocale(LC_MONETARY, 'en_US');
+			echo //money_format('%(#10n', $goal_amt);
+				$cCode.$goal_amt;
+		} else {
+			echo '<em>'.$tr_No_Goal_set.'</em>';		
+		}
+		break;
+
+	case 'raised':
+		if (isset($project_id)) {
+			$project = new ID_Project($project_id);
+			$post_id = $project->get_project_postid();
+			$raised = apply_filters('id_funds_raised', $project->get_project_raised(), $post_id);
+			echo $raised;
+		}
+		break;
+		// display end date
+	case 'enddate':
+		if (get_post_meta( $post->ID, 'ign_fund_end', true)) {
+			echo get_post_meta( $post->ID, 'ign_fund_end', true);
+		} else {
+			echo '<em>'.$tr_No_Date_set.'</em>';		
+		}
+		break;
+		
+		// calculate days remaining
+	case 'daysleft':
+		if (get_post_meta( $post->ID, 'ign_fund_end', true)) {
+			$days_left = $project->days_left();
+			//$ending = get_post_meta( $post->ID, 'ign_fund_end', true);
+			//$daysleft = ID_Project::days_left($ending);
+			echo $days_left;
+		} else {
+			echo '<em>'.$tr_No_Date_set.'</em>';		
+		}
+		break;
+		
+		// return standard post columns
+	default:
+		break;
+	} // end switch
+}
+
+function filter_by_project_status(){
+	$type = 'post';
+	if (isset($_GET['post_type'])) {
+		$type = $_GET['post_type'];
+	}
+	//only add filter to post type you want
+	if ('ignition_product' == $type){
+		//change this to the list of values you want to show
+		//in 'label' => 'value' format
+		$values = array(
+			'All Status' => 'any', 
+			'Closed' => 'closed',
+			'Completed' => 'completed',
+			'Needs Editing' => 'needsediting',
+			'Published' => 'publish',
+			'Pending Review' => 'pending',
+			'Draft ' => 'draft',
+		);
+		?>
+		<select name="project_status">
+		<?php
+			$current_v = isset($_GET['project_status'])? $_GET['project_status']:'';
+			foreach ($values as $label => $value) {
+				printf
+					(
+						'<option value="%s"%s>%s</option>',
+						$value,
+						$value == $current_v? ' selected="selected"':'',
+						$label
+					);
+				}
+		?>
+		</select>
+		<?php
+	}
+}
+add_action( 'restrict_manage_posts', 'filter_by_project_status' );
+
+function status_project_filter( $query ){
+	global $pagenow;
+	$type = 'post';
+	if (isset($_GET['post_type'])) {
+		$type = $_GET['post_type'];
+	}
+	if ( 'ignition_product' == $type && is_admin() && $pagenow=='edit.php' && isset($_GET['project_status']) && $_GET['project_status'] != '') {
+		$query->query_vars['post_status'] = $_GET['project_status'];
+	}
+}
+add_filter( 'parse_query', 'status_project_filter' );
+
 /*---------------------------------
 	Raised Funds Filter
 ------------------------------------*/
@@ -31,7 +199,7 @@ function krown_count_posts( $userid, $post_type = 'post' ) {
 	global $wpdb;
 	$where = get_posts_by_author_sql( $post_type, true, $userid );
 	$count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
-  	return apply_filters( 'get_usernumposts', $count, $userid );
+	return apply_filters( 'get_usernumposts', $count, $userid );
 
 }
 
@@ -75,15 +243,15 @@ if ( ! function_exists( 'krown_add_dashboard_links' ) ) {
 
 		$durl = md_get_durl();
 
-	    if ( is_user_logged_in() && $args->theme_location == 'primary' ) {
-	        $items .= '<li class="green"><a href="'. $durl . '">' . __( 'Dashboard', 'krown' ) . '</a></li>';
-	        $items .= '<li class="green"><a href="'. wp_logout_url( get_permalink() ) .'">' . __( 'Log Out', 'krown' ) . '</a></li>';
-	    } else if ( ! is_user_logged_in() && $args->theme_location == 'primary' ) {
-	        $items .= '<li class="green"><a href="'. $durl .'">' . __( 'Log In', 'krown' ) . '</a></li>';
-	        $items .= '<li class="green"><a href="' . $durl . '?action=register' . '">' . __( 'Sign Up', 'krown' ) . '</a></li>';
-	    }
+		if ( is_user_logged_in() && $args->theme_location == 'primary' ) {
+			$items .= '<li class="green"><a href="'. $durl . '">' . __( 'Dashboard', 'krown' ) . '</a></li>';
+			$items .= '<li class="green"><a href="'. wp_logout_url( get_permalink() ) .'">' . __( 'Log Out', 'krown' ) . '</a></li>';
+		} else if ( ! is_user_logged_in() && $args->theme_location == 'primary' ) {
+			$items .= '<li class="green"><a href="'. $durl .'">' . __( 'Log In', 'krown' ) . '</a></li>';
+			$items .= '<li class="green"><a href="' . $durl . '?action=register' . '">' . __( 'Sign Up', 'krown' ) . '</a></li>';
+		}
 
-	    return $items;
+		return $items;
 
 	}
 
@@ -234,27 +402,27 @@ function krown_project_grid_shortcode( $atts ) {
 
 	// Default attributes
 
-    extract( shortcode_atts( array(
-        'el_class'   => '',
-        'category'   => '',
-        'author' 	 => '',
-        'orderby'    => 'date', 
-        'order' 	 => 'DESC',
-        'max'		 => '-1',
-        'visible'    => '4',
-        'pagination' => 'no',
-        'style'		 => 'default'
-    ), $atts ) );
+	extract( shortcode_atts( array(
+		'el_class'   => '',
+		'category'   => '',
+		'author' 	 => '',
+		'orderby'    => 'date', 
+		'order' 	 => 'DESC',
+		'max'		 => '-1',
+		'visible'    => '4',
+		'pagination' => 'no',
+		'style'		 => 'default'
+	), $atts ) );
 
-    // Start output and Query arguments
+	// Start output and Query arguments
 
-    $html = '<div class="krown-id-grid ' . $style . ' clearfix" id="ign-' . rand( 99, 9999 ) . '">';
+	$html = '<div class="krown-id-grid ' . $style . ' clearfix" id="ign-' . rand( 99, 9999 ) . '">';
 
 	// Start carousel (if case)
 
-    if ( $style == 'carousel' ) {
-    	$html .= '<div class="holder"><div class="carousel-holder clearfix" data-visible="' . $visible . '">';
-    }
+	if ( $style == 'carousel' ) {
+		$html .= '<div class="holder"><div class="carousel-holder clearfix" data-visible="' . $visible . '">';
+	}
 
 	// Define categories if present (multiple)
 
@@ -332,19 +500,19 @@ function krown_project_grid_shortcode( $atts ) {
 
 	// End carousel (if case)
 
-    if ( $style == 'carousel' ) {
-    	$html .= '</div></div><a href="#" class="btn btn-prev"><i class="krown-icon-arrow_left"></i></a><a href="#" class="btn btn-next"><i class="krown-icon-arrow_right"></i></a>';
-    }
+	if ( $style == 'carousel' ) {
+		$html .= '</div></div><a href="#" class="btn btn-prev"><i class="krown-icon-arrow_left"></i></a><a href="#" class="btn btn-next"><i class="krown-icon-arrow_right"></i></a>';
+	}
 
-    $html .= '</div>';
+	$html .= '</div>';
 
-    // Add pagination
+	// Add pagination
 
-    if ( $pagination == 'yes' ) {
+	if ( $pagination == 'yes' ) {
 		$html .= krown_pagination( $all_posts, true, 2, false );
 	}
 
-    return $html;
+	return $html;
 
 }
 
-- 
GitLab


From 714094c023d03140347422a4c2923889b3279b15 Mon Sep 17 00:00:00 2001
From: markAking <mark@iliketocolor.com>
Date: Tue, 14 Jun 2016 14:41:06 -0400
Subject: [PATCH 5/6] fixing stupid publish button

---
 wordpress/wp-admin/js/post.js                    |  3 ---
 wordpress/wp-content/themes/backer/functions.php | 12 +++++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wordpress/wp-admin/js/post.js b/wordpress/wp-admin/js/post.js
index 096ae2fe..516c9ab8 100644
--- a/wordpress/wp-admin/js/post.js
+++ b/wordpress/wp-admin/js/post.js
@@ -713,9 +713,6 @@ jQuery(document).ready( function($) {
 			if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
 				publishOn = postL10n.publishOnFuture;
 				$('#publish').val( postL10n.schedule );
-			} else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {
-				publishOn = postL10n.publishOn;
-				$('#publish').val( postL10n.publish );
 			} else {
 				publishOn = postL10n.publishOnPast;
 				$('#publish').val( postL10n.update );
diff --git a/wordpress/wp-content/themes/backer/functions.php b/wordpress/wp-content/themes/backer/functions.php
index 94ac1e4d..f2584391 100644
--- a/wordpress/wp-content/themes/backer/functions.php
+++ b/wordpress/wp-content/themes/backer/functions.php
@@ -33,8 +33,17 @@ function append_project_status_list(){
 	global $post;
 	$label = '';
 	if($post->post_type == 'ignition_product'){
-		if($post->post_status == 'needsediting'){
+		$post_value = "";
+		$original_status = "";
+		if($post->post_status == 'closed'){
+			$label = '<span id=\'post-status-display\'> Closed</span>';
+			$post_value = '$("#original_publish, #publish").val("Update");';
+		} else if($post->post_status == 'completed'){
+			$label = '<span id=\'post-status-display\'> Completed</span>';
+			$post_value = '$("#original_publish, #publish").val("Update");';
+		} else if($post->post_status == 'needsediting'){
 			$label = '<span id=\'post-status-display\'> Needs Editing</span>';
+			$post_value = '$("#original_publish, #publish").val("Update");';
 		}
 		echo '
 		<script>
@@ -43,6 +52,7 @@ function append_project_status_list(){
 			$("select#post_status").prepend("<option value=\'completed\' '.selected( $post->post_status, 'completed' ).'>Completed</option>");
 			$("select#post_status").prepend("<option value=\'closed\' '.selected( $post->post_status, 'closed' ).'>Closed</option>");
 			$(".misc-pub-section label").append("'.$label.'");
+			'.$post_value.'
 		});
 		</script>
 		';
-- 
GitLab


From 8ad4a9f8883b4df2cf170f7d89269a271c97ea69 Mon Sep 17 00:00:00 2001
From: Steven Walker <me@iamwalker.com>
Date: Wed, 15 Jun 2016 14:45:03 -0400
Subject: [PATCH 6/6] hardcoding GA into footer instead of plugin

---
 wordpress/wp-content/themes/backer/footer.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/wordpress/wp-content/themes/backer/footer.php b/wordpress/wp-content/themes/backer/footer.php
index 91b2d5d7..6d174579 100644
--- a/wordpress/wp-content/themes/backer/footer.php
+++ b/wordpress/wp-content/themes/backer/footer.php
@@ -123,7 +123,16 @@
 	<!-- IE7 Message End -->
 
 	<?php wp_footer(); ?>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
+  ga('create', 'UA-67611405-1', 'auto');
+  ga('send', 'pageview');
+
+</script>
 <script src="<?php bloginfo('template_directory');?>/js/bootstrap.min.js"></script> 
 
 
-- 
GitLab