From dc2a40568c50bd3e7b11acf2aa39dd781740caee Mon Sep 17 00:00:00 2001
From: Kenneth Reitz
Date: Fri, 19 Feb 2010 16:25:02 -0500
Subject: [PATCH] updated to collabpress 0.5
---
.../plugins/collabpress/cp-core.php | 190 ++++----
.../collabpress/cp-core/cp-core-comments.php | 37 ++
.../collabpress/cp-core/cp-core-dashboard.php | 103 +++--
.../collabpress/cp-core/cp-core-install.php | 35 +-
.../collabpress/cp-core/cp-core-isset.php | 124 ++++-
.../collabpress/cp-core/cp-core-projects.php | 185 ++++++--
.../collabpress/cp-core/cp-core-settings.php | 23 +-
.../cp-functions/cp-functions-activity.php | 8 +-
.../cp-functions/cp-functions-projects.php | 25 +-
.../cp-functions/cp-functions-tasks.php | 428 ++++++++++++++----
.../plugins/collabpress/cp-loader.php | 6 +-
.../wp-content/plugins/collabpress/readme.txt | 24 +-
.../plugins/collabpress/screenshot-4.png | Bin 0 -> 121071 bytes
.../plugins/collabpress/style/cp-admin.css | 2 +
14 files changed, 923 insertions(+), 267 deletions(-)
create mode 100644 blog/wp-content/plugins/collabpress/cp-core/cp-core-comments.php
create mode 100644 blog/wp-content/plugins/collabpress/screenshot-4.png
diff --git a/blog/wp-content/plugins/collabpress/cp-core.php b/blog/wp-content/plugins/collabpress/cp-core.php
index e46e491..c35a7f0 100644
--- a/blog/wp-content/plugins/collabpress/cp-core.php
+++ b/blog/wp-content/plugins/collabpress/cp-core.php
@@ -1,86 +1,106 @@
-';
-}
-
-add_action('admin_head', 'cp_wp_add_stylesheet');
-
+';
+ ?>
+
+
+
\ No newline at end of file
diff --git a/blog/wp-content/plugins/collabpress/cp-core/cp-core-comments.php b/blog/wp-content/plugins/collabpress/cp-core/cp-core-comments.php
new file mode 100644
index 0000000..64344f9
--- /dev/null
+++ b/blog/wp-content/plugins/collabpress/cp-core/cp-core-comments.php
@@ -0,0 +1,37 @@
+';
+
+
+// Don't display on single
+if ($task_data->id) {
+
+ echo ' · View Comments (' . get_cp_comment_count($task_data->id) . ')
';
+
+} else {
+
+ echo '';
+
+}
+
+?>
+
+
+
\ No newline at end of file
diff --git a/blog/wp-content/plugins/collabpress/cp-core/cp-core-dashboard.php b/blog/wp-content/plugins/collabpress/cp-core/cp-core-dashboard.php
index fa5cbb2..7dd6f5a 100644
--- a/blog/wp-content/plugins/collabpress/cp-core/cp-core-dashboard.php
+++ b/blog/wp-content/plugins/collabpress/cp-core/cp-core-dashboard.php
@@ -60,35 +60,46 @@ class cp_core_dashboard {
wp_enqueue_script('postbox');
// Add several metaboxes now, all metaboxes registered during load page can be switched off/on at "Screen Options" automatically, nothing special to do therefore
- add_meta_box('cp-dashboard-metaboxes-sidebox-1', __( 'Calendar', 'collabpress' ), array(&$this, 'cp_onsidebox_1_content'), $this->pagehook, 'side', 'core');
- add_meta_box('cp-dashboard-metaboxes-sidebox-2', __( 'Projects', 'collabpress' ), array(&$this, 'cp_onsidebox_2_content'), $this->pagehook, 'side', 'core');
- add_meta_box('cp-dashboard-metaboxes-sidebox-3', __( 'Users', 'collabpress' ), array(&$this, 'cp_onsidebox_3_content'), $this->pagehook, 'side', 'core');
+ add_meta_box('cp-dashboard-metaboxes-sidebox-1', __( 'Calendar', 'collabpress' ), array(&$this, 'cp_dashboard_onsidebox_1_content'), $this->pagehook, 'side', 'core');
+ add_meta_box('cp-dashboard-metaboxes-sidebox-2', __( 'Projects', 'collabpress' ), array(&$this, 'cp_dashboard_onsidebox_2_content'), $this->pagehook, 'side', 'core');
+ add_meta_box('cp-dashboard-metaboxes-sidebox-3', __( 'Users', 'collabpress' ), array(&$this, 'cp_dashboard_onsidebox_3_content'), $this->pagehook, 'side', 'core');
- // Toggle dashboard view
- if ($_GET['view'] == 'allactivity') {
+ // All activity
+ if (isset($_GET['view']) && $_GET['view'] == 'allactivity') {
- add_meta_box('cp-dashboard-metaboxes-contentbox-3', __( 'Activity', 'collabpress' ), array(&$this, 'cp_oncontentbox_3_content'), $this->pagehook, 'normal', 'core');
+ add_meta_box('cp-dashboard-metaboxes-contentbox-3', __( 'Activity', 'collabpress' ), array(&$this, 'cp_dashboard_oncontentbox_3_content'), $this->pagehook, 'normal', 'core');
+
+ // All my tasks
+ } else if (isset($_GET['view']) && $_GET['view'] == 'allmytasks') {
- } else if ($_GET['view'] == 'allmytasks') {
-
- add_meta_box('cp-dashboard-metaboxes-contentbox-4', __( 'My Tasks', 'collabpress' ), array(&$this, 'cp_oncontentbox_4_content'), $this->pagehook, 'normal', 'core');
-
- } else if ($_GET['view'] == 'alltasks') {
+ add_meta_box('cp-dashboard-metaboxes-contentbox-4', __( 'My Tasks', 'collabpress' ), array(&$this, 'cp_dashboard_oncontentbox_4_content'), $this->pagehook, 'normal', 'core');
+
+ // All tasks
+ } else if (isset($_GET['view']) && $_GET['view'] == 'alltasks') {
- add_meta_box('cp-dashboard-metaboxes-contentbox-5', __( 'Tasks', 'collabpress' ), array(&$this, 'cp_oncontentbox_5_content'), $this->pagehook, 'normal', 'core');
-
- } else if ($_GET['view'] == 'userpage') {
+ add_meta_box('cp-dashboard-metaboxes-contentbox-5', __( 'Tasks', 'collabpress' ), array(&$this, 'cp_dashboard_oncontentbox_5_content'), $this->pagehook, 'normal', 'core');
+
+ // User page
+ } else if (isset($_GET['view']) && $_GET['view'] == 'userpage') {
- $user_info = get_userdata($_GET['user']);
+ $user_info = get_userdata($_GET['user']);
- add_meta_box('cp-dashboard-metaboxes-contentbox-6', 'Tasks for ' . $user_info->user_nicename, array(&$this, 'cp_oncontentbox_6_content'), $this->pagehook, 'normal', 'core');
-
- } else {
-
- add_meta_box('cp-dashboard-metaboxes-contentbox-1', __( 'Recent Activity', 'collabpress' ), array(&$this, 'cp_oncontentbox_1_content'), $this->pagehook, 'normal', 'core');
- add_meta_box('cp-dashboard-metaboxes-contentbox-2', __( 'My Tasks', 'collabpress' ), array(&$this, 'cp_oncontentbox_2_content'), $this->pagehook, 'normal', 'core');
- add_meta_box('cp-dashboard-metaboxes-contentbox-additional-2', __( 'About', 'collabpress' ), array(&$this, 'cp_oncontentbox_additional_2_content'), $this->pagehook, 'additional', 'core');
+ add_meta_box('cp-dashboard-metaboxes-contentbox-6', 'Tasks for ' . $user_info->user_nicename, array(&$this, 'cp_dashboard_oncontentbox_6_content'), $this->pagehook, 'normal', 'core');
+
+ // Task page
+ } else if (isset($_GET['view']) && $_GET['view'] == 'task') {
+
+ $task_data = get_taskdata(intval($_GET['task_id']));
+
+ add_meta_box('cp-dashboard-metaboxes-contentbox-7', 'Task: ' .stripslashes($task_data->title), array(&$this, 'cp_dashboard_oncontentbox_7_content'), $this->pagehook, 'normal', 'core');
+
+ // Dashboard
+ } else {
+ add_meta_box('cp-dashboard-metaboxes-contentbox-1', __( 'Recent Activity', 'collabpress' ), array(&$this, 'cp_dashboard_oncontentbox_1_content'), $this->pagehook, 'normal', 'core');
+ add_meta_box('cp-dashboard-metaboxes-contentbox-2', __( 'My Tasks', 'collabpress' ), array(&$this, 'cp_dashboard_oncontentbox_2_content'), $this->pagehook, 'normal', 'core');
+ add_meta_box('cp-dashboard-metaboxes-contentbox-additional-2', __( 'About', 'collabpress' ), array(&$this, 'cp_dashboard_oncontentbox_additional_2_content'), $this->pagehook, 'additional', 'core');
+
}
}
@@ -120,13 +131,8 @@ class cp_core_dashboard {
- CollabPress'.__('Back', 'collabpress').'';}?>
+ CollabPress'.__('Back', 'collabpress').'';}?>
-
+