Merge pull request #61 from codehaiku/2.1.9

2.1.9
JosephGabito · Apr 30, 2017 · 3830179 · 3830179
2 parents f8b7af5 + 6ae36e0
commit 3830179
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 15 deletions.
diff --git a/.sensiolabs.yml b/.sensiolabs.yml
@@ -7,3 +7,4 @@ global_exclude_dirs:
 exclude_patterns:
     - task-breaker.php
     - update-check.php
+    - templates/project-loop-content.php
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -252,6 +252,7 @@
 #task_breaker-project .wp-editor-area,
 #task_breaker-project div.mce-panel {
 	border: 0 solid #ddd;
+	background: #f5f5f5;
 }
 
 #task_breaker-project div.mce-toolbar-grp {
@@ -273,7 +274,7 @@
 	padding-left: 0;
 	width: 100%;
 	display: inline-block;
-	margin: 0 0 -6px 0;
+	margin: 0 0 0 0;
 }
 
 #task_breaker-project-tab-li li {
@@ -319,6 +320,17 @@
 	position: relative;
 }
 
+#task_breaker-project-tab-content .wp-switch-editor {
+	height: auto;
+	padding: 10px 15px;
+	margin: 0;
+}
+
+#task_breaker-project-tab-content .tmce-active .wp-switch-editor.switch-tmce {
+	background: #fff!important;
+	border-bottom: 0 none;
+}
+
 #task_breaker-project-tab-content * {
 	box-sizing: border-box;
 }

diff --git a/includes/project-post-type.php b/includes/project-post-type.php
@@ -93,10 +93,12 @@ function register_post_type() {
 	 */
 	public function single_project_filter() {
 
-		if ( is_singular( 'project' ) ) {
+		if ( ! wp_style_is('editor-buttons') ) {
+			wp_print_styles( 'editor-buttons' );
+		}
 
+		if ( is_singular( 'project' ) ) {
 			add_filter( 'the_content', array( $this, 'project_content_filter' ) );
-
 		}
 
 		return;
@@ -106,21 +108,24 @@ public function single_project_filter() {
 	 * Displays the project single template.
 	 *
 	 * @param  mixed $content The callback argument for the_content filter.
-	 * @return void
+	 * @return mixed The html output of the project.
 	 */
 	public function project_content_filter( $content ) {
 
+		ob_start();
+
 		$template = new TaskBreakerTemplate();
 
 		$taskbreaker = new TaskBreaker();
 
 		$taskbreaker_post = $taskbreaker->get_post();
 
 		include_once plugin_dir_path( __FILE__ ) . '../core/functions.php';
-
+		
 		$template->locate_template( 'project-single', $taskbreaker_post );
 
-		return;
+		return ob_get_clean();
+
 	}
 }
 

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Donate link:https://www.paypal.me/dunhakdis/25
 Tags: project, task, task discussion, collaboration
 Requires at least: 4.2.0
 Tested up to: 4.8.0
-Stable tag: 1.4.8
+Stable tag: 1.4.9
 
 A simple WordPress plugin for managing projects and tasks. Integrated into BuddyPress Groups for best collaborative experience.  
 

diff --git a/task-breaker.php b/task-breaker.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: TaskBreaker - Group Project Management
  * Description: A simple WordPress plugin for managing projects and tasks. Integrated into BuddyPress Groups for best collaborative experience.
- * Version: 1.4.8
+ * Version: 1.4.9
  * Author: Dunhakdis
  * Author URI: http://dunhakdis.com
  * Text Domain: task_breaker
@@ -24,7 +24,7 @@
 
 define( 'TASK_BREAKER_PROFILER', false );
 
-define( 'TASK_BREAKER_VERSION', '1.4.8' );
+define( 'TASK_BREAKER_VERSION', '1.4.9' );
 
 define( 'TASK_BREAKER_PROJECT_LIMIT', 10 );
 

diff --git a/templates/project-settings.php b/templates/project-settings.php
@@ -23,7 +23,6 @@
 
 <?php $template = new TaskBreakerTemplate(); ?>
 
-
 <?php if ( $user_access->can_edit_project( $__post->ID ) ) { ?>
 
 <div id="task_breaker-project-settings">
@@ -46,7 +45,7 @@
 
         <span class="description">
 
-				<?php _e( 'Explain what this project is all about', 'task_breaker' ); ?>
+            <?php esc_html_e( 'Explain what this project is all about', 'task_breaker' ); ?>
 
 		</span>
 
@@ -56,7 +55,7 @@
 
         <label for="task_breaker-project-assigned-group">
 
-            <?php _e( 'Assign to Group:', 'task_breaker' ); ?>
+            <?php esc_html_e( 'Assign to Group:', 'task_breaker' ); ?>
 
         </label>
 
@@ -81,6 +80,7 @@
             <?php } ?>
 
         </select>
+
         <?php } ?>
 
     </div>
@@ -90,13 +90,13 @@
         <div class="alignright">
 
             <button id="task_breakerUpdateProjectBtn" type="button" class="button">
-                <?php echo _e( 'Update Project', 'task_breaker' ); ?>
+                <?php esc_html_e( 'Update Project', 'task_breaker' ); ?>
             </button>
 
             <?php if ( $user_access->can_delete_project( $__post->ID ) ) { ?>
 
                 <button id="task_breakerDeleteProjectBtn" type="button" class="button button-danger">
-                    <?php echo _e( 'Delete', 'task_breaker' ); ?>
+                    <?php esc_html_e( 'Delete', 'task_breaker' ); ?>
                 </button>
 
             <?php } ?>
@@ -107,10 +107,11 @@
 
     </div>
 </div>
+
 <?php } else { ?>
 
 <p id="message" class="danger task-breaker-message">
-    <?php _e( 'You cannot access this group project settings page. Only the administrators and the moderators of this group are allowed to access.', 'task-breaker' ); ?>
+    <?php esc_htmle_( 'You cannot access this group project settings page. Only the administrators and the moderators of this group are allowed to access.', 'task-breaker' ); ?>
 </p>
 
 <?php } ?>