new theme: "minimal"

composer.json

@@ -0,0 +1,8 @@
+{
+  "name": "mlaa/buddypress-docs",
+  "type": "wordpress-plugin",
+  "require": {
+    "php": ">=5.3.0",
+    "composer/installers": "~1.0"
+  }
+}

config.rb

@@ -23,3 +23,6 @@
 # preferred_syntax = :sass
 # and then run:
 # sass-convert -R --from scss --to sass includes/sass scss && rm -rf sass && mv scss sass
+
+# Enable sourcemaps!
+sass_options = {:sourcemap => true}

includes/activity.php

@@ -397,9 +397,9 @@ function bp_docs_prefetch_activity_object_data( $activities ) {
 function bp_docs_activity_filter_options() {
 	?>
 
-	<option value="bp_doc_created"><?php _e( 'Show New Docs', 'bp-docs' ); ?></option>
-	<option value="bp_doc_edited"><?php _e( 'Show Doc Edits', 'bp-docs' ); ?></option>
-	<option value="bp_doc_comment"><?php _e( 'Show Doc Comments', 'bp-docs' ); ?></option>
+	<option value="bp_doc_created"><?php _e( 'New Docs', 'bp-docs' ); ?></option>
+	<option value="bp_doc_edited"><?php _e( 'Doc Edits', 'bp-docs' ); ?></option>
+	<option value="bp_doc_comment"><?php _e( 'Doc Comments', 'bp-docs' ); ?></option>
 
 	<?php
 }

includes/admin.php

@@ -79,6 +79,16 @@ public function setup_settings() {
 		);
 		register_setting( 'bp-docs-settings', 'bp-docs-excerpt-length', 'absint' );
 
+		// General - Enable Comments
+		add_settings_field(
+			'bp-docs-enable-comments',
+			__( 'Enable Comments', 'bp-docs' ),
+			array( $this, 'enable_comments_setting_markup' ),
+			'bp-docs-settings',
+			'bp-docs-general'
+		);
+		register_setting( 'bp-docs-settings', 'bp-docs-enable-comments', 'absint' );
+
 		// Users
 		add_settings_section(
 			'bp-docs-users',
@@ -134,12 +144,31 @@ public function setup_settings() {
 			'bp-docs-attachments'
 		);
 		register_setting( 'bp-docs-settings', 'bp-docs-enable-attachments' );
+
+		// Appearance
+		add_settings_section(
+			'bp-docs-appearance', 
+			__( 'Appearance', 'bp-docs' ), 
+			array( $this, 'appearance_section' ), 
+			'bp-docs-settings'
+		); 
+
+		// Appearance - Theme
+		add_settings_field(
+			'bp-docs-theme', 
+			__( 'Theme', 'bp-docs' ), 
+			array( $this, 'theme_setting_markup' ), 
+			'bp-docs-settings', 
+			'bp-docs-appearance'
+		); 
+		register_setting( 'bp-docs-settings', 'bp-docs-theme' ); 
 	}
 
 	public function general_section() {}
 	public function users_section() {}
 	public function groups_section() {}
 	public function attachments_section() {}
+	public function appearance_section() {}
 
 	public function slug_setting_markup() {
 		global $bp;
@@ -164,6 +193,17 @@ public function excerpt_length_setting_markup() {
 		<?php
 	}
 
+	public function enable_comments_setting_markup() {
+
+		$comments_enabled = bp_docs_get_setting_comments_enabled(); 
+
+		?>
+			<input name="bp-docs-enable-comments" id="bp-docs-enable-comments" type="checkbox" value="1" <?php checked( $comments_enabled ); ?> />
+		<p class="description"><?php _e( "Allow people to post comments on new docs? This will override your WordPress comments setting.", 'bp-docs' ) ?></p>
+
+		<?php
+	}
+
 	public function group_tab_name_setting_markup() {
 		$name = bp_docs_get_group_tab_name();
 
@@ -197,6 +237,19 @@ public function enable_attachments_setting_markup() {
 		<?php
 	}
 
+	public function theme_setting_markup() { 
+		$theme = bp_docs_get_theme(); 
+
+		?> 
+		<select name="bp-docs-theme" id="bp-docs-theme">
+			<option value="default" <?php selected( $theme, 'default' ) ?>><?php _e( 'Default', 'bp-docs' ) ?></option>
+			<option value="minimal" <?php selected( $theme, 'minimal' ) ?>><?php _e( 'Minimal', 'bp-docs' ) ?></option>
+		</select>
+		<p class="description"><?php _e( "Change the look and feel of Buddypress Docs.", 'bp-docs' ) ?></p>
+
+		<?php
+	} 
+
 	function replace_recent_comments_dashboard_widget() {
 		global $wp_meta_boxes;
 

includes/component.php

@@ -288,10 +288,10 @@ function set_current_view( $item_type = false ) {
 	function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
 		$main_nav = array(
-			'name' 		      => bp_docs_get_user_tab_name(),
+			//'name' 		      => bp_docs_get_user_tab_name(),
 
 			// Disabled count for now. See https://github.com/boonebgorges/buddypress-docs/issues/261
-			//'name' 		      => sprintf( __( 'Docs <span>%d</span>', 'bp-docs' ), bp_docs_get_doc_count( bp_displayed_user_id(), 'user' ) ),
+			'name' 		      => sprintf( __( 'Docs <span>%d</span>', 'bp-docs' ), bp_docs_get_doc_count( bp_displayed_user_id(), 'user' ) ),
 			'slug' 		      => bp_docs_get_docs_slug(),
 			'position' 	      => 80,
 			'screen_function'     => array( &$this, 'template_loader' ),

includes/css/edit.css

@@ -27,7 +27,7 @@ a.delete-doc-button {
 }
 
 form.standard-form input[type="text"]#doc-title {
-	width: 98%;
+	width: 100%;
 }
 
 #buddypress .standard-form label#content-label,

includes/functions.php

@@ -794,3 +794,9 @@ function bp_docs_revisions_to_keep( $num, $post ) {
 	return intval( $num );
 }
 add_filter( 'wp_revisions_to_keep', 'bp_docs_revisions_to_keep', 10, 2 );
+
+/* What's the current Buddypress Docs theme? */ 
+function bp_docs_get_theme() { 
+	$theme = get_option( 'bp-docs-theme', 'default' );
+	return apply_filters( 'bp_docs_theme', $theme );
+} 

includes/integration-groups.php

@@ -59,8 +59,8 @@ function __construct() {
 		add_filter( 'bp_docs_hide_sitewide',		array( $this, 'hide_sitewide' ), 10, 5 );
 
 		// These functions are used to keep the group Doc count up to date
-		add_filter( 'bp_docs_doc_saved',		array( $this, 'update_doc_count' )  );
-		add_filter( 'bp_docs_doc_deleted',		array( $this, 'update_doc_count' ) );
+		add_action( 'bp_docs_doc_saved',		array( $this, 'update_doc_count' ) );
+		add_action( 'bp_docs_doc_deleted',		array( $this, 'update_doc_count' ) );
 
 		// On non-group Doc directories, add a Groups column
 		add_filter( 'bp_docs_loop_additional_th',       array( $this, 'groups_th' ), 5 );
@@ -74,7 +74,7 @@ function __construct() {
 		// Sneak into the nav before it's rendered to insert the group Doc count. Hooking
 		// to bp_actions because of the craptastic nature of the BP_Group_Extension loader
 		// @todo Temporarily disabled
-		//add_action( 'bp_actions',			array( $this, 'show_doc_count_in_tab' ), 9 );
+		add_action( 'bp_actions',			array( $this, 'show_doc_count_in_tab' ), 9 );
 
 		// Prettify the page title
 		add_filter( 'bp_page_title',			array( $this, 'page_title' ) );
@@ -681,15 +681,34 @@ function hide_sitewide( $hide_sitewide, $comment, $doc, $item, $component ) {
 	 * @package BuddyPress Docs
 	 * @since 1.0.8
 	 */
-	function update_doc_count() {
+	function update_doc_count( $group_id = 0 ) {
 		global $bp;
 
-		// If this is not a group Doc, skip it
-		if ( !bp_is_group() )
-			return;
-
-		// Get a fresh doc count for the group
-		bp_docs_update_doc_count( bp_get_current_group_id(), 'group' );
+		if ( array_key_exists( 'delete', $_GET ) ) { 
+			// We're deleting a doc. In the deleting context,
+			// we get useful information from `bp_docs_get_associated_group_id()`. 
+			$doc_id = is_singular() ? get_the_ID() : 0;
+			$group_id = bp_docs_get_associated_group_id( $doc_id );
+		} else if ( array_key_exists( 'group', $_GET ) ) { 
+			// We're creating a doc. In the doc creation context,
+			// we don't get anything useful from `bp_docs_get_associated_group_id()`, 
+			// so we have to figure out what group we're in by looking at the 
+			// $_GET variable that's passed during this step. 
+			$group_id = BP_Groups_Group::group_exists( $_GET['group'] ); 
+		} else if ( 0 !== $group_id ) {  
+			// If $group_id is passed through this function, 
+			// that means it's probably being called via show_doc_count_in_tab(). 
+			// This means that the doc count is probably '', which means this is probably 
+			// the first time this function has been run for this group. 
+			// Nothing to do here. Pass along through. 
+		} else {  
+			// If we're not creating or deleting a document, or updating for the first time,
+			// get outta here!
+			return; 
+		} 
+
+		// Update the doc count for the group, since it has now changed. 
+		bp_docs_update_doc_count( $group_id, 'group' );
 	}
 
 	/**
@@ -836,12 +855,14 @@ function show_doc_count_in_tab() {
 		if ( !empty( $bp->bp_options_nav[$group_slug] ) && !empty( $bp->bp_options_nav[$group_slug][ $docs_slug ] ) ) {
 			$current_tab_name = $bp->bp_options_nav[$group_slug][ $docs_slug ]['name'];
 
-			$doc_count = groups_get_groupmeta( $bp->groups->current_group->id, 'bp-docs-count' );
+			$group_id = $bp->groups->current_group->id; 
+
+			$doc_count = groups_get_groupmeta( $group_id, 'bp-docs-count' );
 
 			// For backward compatibility
 			if ( '' === $doc_count ) {
-				BP_Docs_Groups_Integration::update_doc_count();
-				$doc_count = groups_get_groupmeta( $bp->groups->current_group->id, 'bp-docs-count' );
+				BP_Docs_Groups_Integration::update_doc_count( $group_id );
+				$doc_count = groups_get_groupmeta( $group_id, 'bp-docs-count' );
 			}
 
 			$bp->bp_options_nav[$group_slug][ $docs_slug ]['name'] = sprintf( __( '%s <span>%d</span>', 'bp-docs' ), $current_tab_name, $doc_count );
@@ -1204,7 +1225,7 @@ function enable_nav_item() {
 	 * @package BuddyPress Docs
 	 * @since 1.0-beta
 	 */
-	function display() {
+	function display( $group_id = null ) {
 		global $bp;
 
 		// Docs are stored on the root blog

includes/query-builder.php

@@ -464,7 +464,8 @@ function save( $args = false ) {
 				'post_title'   => $_POST['doc']['title'],
 				'post_name'    => isset( $_POST['doc']['permalink'] ) ? sanitize_title( $_POST['doc']['permalink'] ) : sanitize_title( $_POST['doc']['title'] ),
 				'post_content' => sanitize_post_field( 'post_content', $doc_content, 0, 'db' ),
-				'post_status'  => 'publish'
+				'post_status'  => 'publish',
+				'comment_status' => ( ( bp_docs_get_setting_comments_enabled() )  ? 'open' : 'closed' ), 
 			);
 
 			$r = wp_parse_args( $args, $defaults );