Changeset 752882

Timestamp:

08/07/2013 11:03:54 AM (13 years ago)

Author:

EkAndreas

Message:

Minor update

Location:

flowboard

Files:

• tags/1.3/flowboard.php (modified) (2 diffs)
• tags/1.3/includes/ajax.php (modified) (9 diffs)
• tags/1.3/includes/main.php (modified) (1 diff)
• tags/1.3/includes/note.php (modified) (8 diffs)
• tags/1.3/includes/shortcode.php (modified) (4 diffs)
• tags/1.3/readme.txt (modified) (5 diffs)
• tags/1.3/styles.css (modified) (6 diffs)
• trunk/flowboard.php (modified) (4 diffs)
• trunk/includes/ajax.php (modified) (1 diff)
• trunk/includes/main.php (modified) (4 diffs)
• trunk/includes/shortcode.php (modified) (1 diff)
• trunk/readme.txt (modified) (3 diffs)

flowboard/tags/1.3/flowboard.php

@@ -4 +4 @@
 Plugin URI: http://plugins.flowcom.se/flowboard
 Description: Web development tool, agile whiteboard with sticky notes. Your notes are posts in WP!
-Version: 1.3
+Version: 1.6
 Author: Flowcom AB, Andreas Ek
 Author URI: http://www.flowcom.se
@@ -12 +12 @@
 include 'includes/ajax.php';
 include 'includes/note.php';
-include 'includes/optionpage.php';
 include 'includes/main.php';
 include 'includes/shortcode.php';
+include 'includes/board.php';
 
 $flowboard_ajax = new FlowBoard_Ajax();
-$flowboard_option = new FlowBoard_Option();
 $flowboard_main = new FlowBoard_Main();
 $flowboard_shortcode = new FlowBoard_Shortcode();
 
 function flowboard_metakey() {
-    return 'FlowBoard_ID';
+    return '_flowboard_board';
 }
 
 function flowboard_metadata() {
-    return 'FlowBoard_Data';
+    return '_flowboard_meta';
 }
 
+function flowboard_activate() {
+    flush_rewrite_rules();
+}
+register_activation_hook( __FILE__, 'flowboard_activate' );
 
+function flowboard_deactivate() {
+    flush_rewrite_rules();
+}
+register_deactivation_hook( __FILE__, 'flowboard_deactivate' );
 
 ?>

flowboard/tags/1.3/includes/ajax.php

@@ -50 +50 @@
         error_reporting(E_ALL^E_NOTICE);
         // Checking whether all input variables are in place:
-        if(!is_numeric($_POST['board']) || !is_numeric($_POST['zindex']) || !isset($_POST['author']) || !isset($_POST['body']) || !in_array($_POST['color'],array('yellow','green','blue','purple','orange','pink')))
+        if(!is_numeric($_POST['zindex']) || !isset($_POST['author']) || !isset($_POST['body']) || !in_array($_POST['color'],array('yellow','green','blue','purple','orange','pink')))
         {
             echo 'Not valid input to save note!';
@@ -65 +65 @@
 
         // Escaping the input data:
-        $author = esc_attr($_POST['author']);
-        $body = esc_html($_POST['body']);
-        $color = esc_attr($_POST['color']);
-        $id = (int)esc_attr($_POST['id']);
-        $pos = (int)esc_attr($_POST['pos']);
-        $zindex = (int)esc_attr($_POST['zindex']);
-        $board = (int)esc_attr($_POST['board']);
-        $estimate = (int)esc_attr($_POST['estimate']);
-        $timeleft = (int)esc_attr($_POST['timeleft']);
-
-        $dataArr = array('board'=>$board,'id'=>0,'author'=>$author,'color'=>$color,'zindex'=>$zindex,'estimate'=>$estimate,'timeleft'=>$timeleft,'xyz'=>$pos);
+        $author         = esc_attr($_POST['author']);
+        $body           = esc_html($_POST['body']);
+        $color          = esc_attr($_POST['color']);
+        $id             = (int)esc_attr($_POST['id']);
+        $pos            = (int)esc_attr($_POST['pos']);
+        $zindex         = (int)esc_attr($_POST['zindex']);
+        $board          = (int)esc_attr($_POST['board']);
+        $estimate       = (int)esc_attr($_POST['estimate']);
+        $timeleft       = (int)esc_attr($_POST['timeleft']);
+        $postcontent    = wp_kses_post($_POST['postcontent']);
+                $add_link           = $_POST['add_link'] ? true : false;
+
+        $dataArr = array('id'=>0,'author'=>$author,'color'=>$color,'zindex'=>$zindex,'estimate'=>$estimate,'timeleft'=>$timeleft,'xyz'=>$pos,'add_link'=>$add_link);
 
         if (is_numeric($id) && $id>0)
@@ -88 +90 @@
             {
                 $my_post['post_title'] = $body;
+                $my_post['post_content'] = $postcontent;
             }
 
@@ -93 +96 @@
             wp_update_post( $my_post );
 
-            if (!update_post_meta($id, flowboard_metakey(), $board))
+            /*if (!update_post_meta($id, flowboard_metakey(), $board))
             {
                 add_post_meta($id, flowboard_metakey(), $board, true);
-            }
+            }*/
 
             $dataString = get_post_meta($id,flowboard_metadata());
@@ -113 +116 @@
         else
         {
+            if (!$board) {
+                echo 'Unknown board ID';
+                die(0);
+            }
+
             global $user_ID;
             $new_post = array(
                 'post_title' => $body,
-                'post_content' => '',
+                'post_content' => $postcontent,
                 'post_status' => 'publish',
-                'post_date' => date('Y-m-d H:i:s'),
+                'post_date' => current_time('mysql'),
                 'post_author' => $user_ID,
                 'post_type' => 'flowboard_note',
@@ -128 +136 @@
 
             $dataArr['id'] = $id;
-            $dataArr['xyz'] = '42x72x'.$zindex;
+
+            //If new check if other in the same place and increase pos and zindex!
+            $posts = FlowBoard_Board::all_notes($board);
+
+            $xyz = "42x72x1";
+            $xyz = $this->reverse_pos($xyz, $posts);
+
+            //Default status:
+            $dataArr['status'] = $this->board_default_status($board);
+
+            $dataArr['xyz'] = $xyz;
             add_post_meta($id, flowboard_metadata(), json_encode($dataArr), true);
 
@@ -136 +154 @@
         die(0);
     }
+
+    function board_default_status($board){
+        $meta = get_post_meta($board, flowboard_metadata(), true);
+        $meta = json_decode($meta);
+        if (is_array($meta->zones)) return $meta->zones[0];
+        return "";
+    }
+
+    function reverse_pos($xyz, $posts){
+
+        $moved = false;
+        list($left, $top, $zindex) = explode('x', $xyz);
+        foreach($posts as $post){
+            $meta = get_post_meta($post->ID, flowboard_metadata(), true);
+            $meta = json_decode($meta);
+            list( $l , $t , $z ) = explode('x', $meta->xyz);
+            if ( $l == $left && $t == $top ) {
+                $moved = true;
+                $left += 4;
+                $top += 4;
+                $zindex = $z + 1;
+            }
+            if ($z>$zindex) $zindex = $z+1;
+        }
+        $result = $left . 'x' . $top . 'x' . $zindex;
+
+        if ($moved) {
+            return $this->reverse_pos($result, $posts);
+        }
+        else
+        {
+            return $result;
+        }
+    }
+
 
     function update_position()
@@ -150 +203 @@
         // Escaping:
         $id = (int)$_GET['id'];
+        $status = esc_attr($_GET['status']);
         $x = (int)$_GET['x'];
         $y = (int)$_GET['y'];
@@ -165 +219 @@
 
         $dataArr->xyz = $pos;
+
+        if (!empty($status)) $dataArr->status = $status;
 
         if (!update_post_meta($id, flowboard_metadata(), json_encode($dataArr)))

flowboard/tags/1.3/includes/main.php

@@ -1 +1 @@
 <?php
 
-class FlowBoard_Main{
+class FlowBoard_Main
+{
 
     function __construct()
     {
-        add_action('wp_print_styles', array(&$this, 'wp_print_styles'));
-        add_action('init', array(&$this, 'init'));
+        add_action( 'wp_print_styles', array( &$this, 'wp_print_styles' ) );
+        add_action( 'init', array( &$this, 'init' ) );
+        add_action( 'admin_init', array( &$this, 'admin_init' ) );
+        add_action( 'admin_menu', array( &$this, 'admin_menu' ) );
+        add_action( 'save_post', array( &$this, 'save_post' ) );
+        add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
+    }
+
+    function save_post( $post_id )
+    {
+
+        global $post;
+
+        if ( $post->post_type == 'flowboard_note' ) {
+            $board = esc_attr( $_POST[ 'flowboard_board' ] );
+            update_post_meta( $post->ID, flowboard_metakey(), $board );
+        }
+
+        if ( $post->post_type == 'flowboard_board' ) {
+
+            $z = $_POST[ 'zone_ui_dynamic' ];
+            if ( is_array( $z ) ) {
+                foreach ( $z as $zone ) {
+                    if ( !empty( $zone ) ) {
+                        $store_zones[ ] = $zone;
+                    }
+                }
+            } else {
+                $store_zones = FlowBoard_Board::default_zones();
+            }
+
+            $meta[ 'zones' ] = $store_zones;
+            if ( !update_post_meta( $post->ID, flowboard_metadata(), json_encode( $meta ) ) ) {
+                add_post_meta( $post->ID, flowboard_metadata(), json_encode( $meta ), true );
+            }
+        }
+
+        return $post_id;
+
+    }
+
+    function admin_menu()
+    {
+        add_menu_page( 'Flowboard', 'Flowboard', 'edit_posts', 'flowboard', array( &$this, 'display_flowboard_page' ), plugins_url( 'flowboard/img/notes.png' ) );
+
+        // remove submenu 'add new'
+        global $submenu;
+        unset( $submenu[ 'edit.php?post_type=flowboard_note' ][ 10 ] ); // Removes 'Add New'.
+    }
+
+    function admin_init()
+    {
+
+        add_meta_box(
+            'flowboard_board_zones', __( 'FlowBoard Zones', 'flowboard' ), array( &$this, 'show_zones' ),
+            'flowboard_board', 'normal', 'default'
+        );
+        add_meta_box(
+            'flowboard_note_board', __( 'Flowboard properties', 'flowboard' ), array( &$this, 'show_note_properties' ),
+            'flowboard_note', 'side', 'default'
+        );
+
+    }
+
+    function admin_enqueue_scripts()
+    {
+
+        wp_enqueue_script( array( 'jquery', 'editor', 'thickbox', 'tinymce_editor' ) );
+
+        // Main jQuery
+        $src = WP_PLUGIN_URL . '/flowboard/js/metabox.js';
+        wp_deregister_script( 'flowboard_metabox' );
+        wp_register_script( 'flowboard_metabox', $src );
+        wp_enqueue_script( 'flowboard_metabox' );
+    }
+
+    function show_note_properties()
+    {
+        global $post;
+
+        $board = get_post_meta( $post->ID, flowboard_metakey(), true );
+
+        ?>
+        <strong><?php _e( 'Board', 'flowboard' ); ?>:</strong>
+        (<a href="<?php echo admin_url( 'edit.php?post_type=flowboard_board' ); ?>"><?php _e(
+            'manage boards here!', 'flowboard'
+        ); ?></a>)
+        <select name="flowboard_board" id="flowboard_board">
+            <option value="0"><?php _e( '--- choose assigned board ---', 'flowboard' ); ?></option>
+            <?php
+            $args = array( 'post_type' => 'flowboard_board', 'numberposts' => '-1' );
+            $posts = get_posts( $args );
+            foreach ( $posts as $p ) {
+                echo '<option value="' . $p->ID . '"';
+                if ( $board == $p->ID ) {
+                    echo ' selected';
+                }
+                echo '>' . $p->post_title . '</option>' . "\r\n";
+            }
+            ?>
+        </select>
+        </p>
+    <?php
+    }
+
+    function show_zones()
+    {
+        global $post;
+
+        echo '<p>';
+
+        $zones = FlowBoard_Board::get_zones( $post->ID );
+
+        ?>
+        <div class="flowboard_zones_control">
+
+        <div style="margin-bottom: 4px;">
+            <input type="button" class="button-secondary" value="<?php _e( 'Add', 'flowboard' ); ?>"
+                   id="flowboard_zones_add"/>
+            <input type="button" class="button-secondary" value="<?php _e( 'Remove', 'flowboard' ); ?>"
+                   id="flowboard_zones_remove"/>
+            <input type="button" class="button-secondary" value="<?php _e( 'Reset', 'flowboard' ); ?>"
+                   id="flowboard_zones_reset"/>
+        </div>
+
+        <div id="flowboard_zones_ui">
+
+            <?php
+            foreach ( $zones as $key => $z ) {
+                ?>
+                <div class="zone_ui_div">
+                    <input type="text" class="text zone_ui_dynamic" name="zone_ui_dynamic[]"
+                           value="<?php echo $z; ?>"/>
+                </div>
+            <?php
+            }
+            ?>
+
+        </div>
+        <?php
+
+        echo '</p>';
+
+        return true;
     }
 
     /*Required stylesheets */
-    function wp_print_styles() {
+    function wp_print_styles()
+    {
         $myStyleUrl = WP_PLUGIN_URL . '/flowboard/styles.css';
         $myStyleFile = WP_PLUGIN_DIR . '/flowboard/styles.css';
 
-        if ( file_exists($myStyleFile) ) {
-            wp_register_style('FlowBoardStyleSheets', $myStyleUrl);
-            wp_enqueue_style( 'FlowBoardStyleSheets');
-        }
-    }
-
-    function init() {
-
-        register_post_type('flowboard_note', array( 'label' => 'Notes','description' => 'FlowBoard custom post types','public' => true,'show_ui' => true,'show_in_menu' => true,'capability_type' => 'post','hierarchical' => false,'rewrite' => array('slug' => ''),'query_var' => true,'exclude_from_search' => false,'supports' => array('title','editor','custom-fields','comments',),'labels' => array (
-            'name' => 'Notes',
-            'singular_name' => 'Note',
-            'menu_name' => 'Notes',
-            'add_new' => 'Add Note',
-            'add_new_item' => 'Add New Note',
-            'edit' => 'Edit',
-            'edit_item' => 'Edit Note',
-            'new_item' => 'New Note',
-            'view' => 'View Note',
-            'view_item' => 'View Note',
-            'search_items' => 'Search Notes',
-            'not_found' => 'No Notes Found',
-            'not_found_in_trash' => 'No Notes Found in Trash',
-            'parent' => 'Parent Note',
-        ),) );
-
-        if (!is_admin()) {
-
-            //Kolla av nu om användaren har access alternativt om Public Access är aktiverat.
-            $options = get_option('flowboard_plugin_options');
-
-            if (current_user_can('edit_posts') || $options['public_access'])
-            {
-
-            }
-        }
-    }
-
+        if ( file_exists( $myStyleFile ) ) {
+            wp_register_style( 'FlowBoardStyleSheets', $myStyleUrl );
+            wp_enqueue_style( 'FlowBoardStyleSheets' );
+        }
+    }
+
+    function init()
+    {
+
+        register_post_type(
+            'flowboard_note', array(
+                'label' => 'Notes', 'description' => 'FlowBoard custom post types', 'public' => true, 'show_ui' => true,
+                'show_in_menu' => 'flowboard', 'capability_type' => 'post', 'hierarchical' => false,
+                'rewrite' => array( 'slug' => '' ), 'query_var' => true, 'exclude_from_search' => false,
+                'supports' => array( 'title', 'editor', 'comments', ), 'labels' => array(
+                    'name' => 'Notes',
+                    'singular_name' => 'Note',
+                    'menu_name' => 'Notes',
+                    'add_new' => 'Add Note',
+                    'add_new_item' => 'Add New Note',
+                    'edit' => 'Edit',
+                    'edit_item' => 'Edit Note',
+                    'new_item' => 'New Note',
+                    'view' => 'View Note',
+                    'view_item' => 'View Note',
+                    'search_items' => 'Search Notes',
+                    'not_found' => 'No Notes Found',
+                    'not_found_in_trash' => 'No Notes Found in Trash',
+                    'parent' => 'Parent Note',
+                ),
+            )
+        );
+
+        register_post_type(
+            'flowboard_board', array(
+                'label' => 'Boards', 'description' => '', 'public' => false, 'show_ui' => true,
+                'show_in_menu' => 'flowboard', 'capability_type' => 'post',
+                'hierarchical' => false, 'rewrite' => array( 'slug' => '' ), 'query_var' => true,
+                'exclude_from_search' => true, 'supports' => array( 'title', ), 'labels' => array(
+                    'name' => 'Boards',
+                    'singular_name' => 'Board',
+                    'menu_name' => 'Boards',
+                    'add_new' => 'Add Board',
+                    'add_new_item' => 'Add New Board',
+                    'edit' => 'Edit',
+                    'edit_item' => 'Edit Board',
+                    'new_item' => 'New Board',
+                    'view' => 'View Board',
+                    'view_item' => 'View Board',
+                    'search_items' => 'Search Boards',
+                    'not_found' => 'No Boards Found',
+                    'not_found_in_trash' => 'No Boards Found in Trash',
+                    'parent' => 'Parent Board',
+                ),
+            )
+        );
+
+        if ( !is_admin() ) {
+            $options = get_option( 'flowboard_plugin_options' );
+            if ( current_user_can( 'edit_posts' ) || $options[ 'public_access' ] ) {
+                //TODO actions!
+            }
+        }
+    }
+
+    function display_flowboard_page(){
+    }
 
 }

flowboard/tags/1.3/includes/note.php

@@ -14 +14 @@
     public $top;
     public $zindex;
+    public $status;
+    public $postcontent;
+        public $add_link;
 
     /**
@@ -32 +35 @@
             $this->timeleft = $dataArr->timeleft;
             $this->estimate = $dataArr->estimate;
+            $this->status = $dataArr->status;
+                        $this->add_link = $dataArr->add_link;
+            $this->postcontent = $post->post_content;
             list($this->left,$this->top,$this->zindex) = explode('x', $dataArr->xyz);
             $this->board = $dataArr->board;
@@ -43 +49 @@
             $this->timeleft = "0";
             $this->estimate = "0";
-            //$this->left = 10;
-            //$this->top = 10;
-            //$this->zindex = 1;
-            $this->board = get_the_ID();
+            $this->status = "";
+            $this->postcontent = '';
+            $this->board = 0;
         }
     }
@@ -83 +88 @@
 
         $str .= '>
-                    <div class="body">'.$this->body.'</div>
-                    <div class="author">' . $this->author . '</div>
-                    <span class="data hidden_field">'.$this->id.'</span>
-                    <span class="color hidden_field">'.$this->color.'</span>
-                    <div class="time">
-                        <span class="timeleft">'.$this->timeleft.'</span>/<span class="estimate">'.$this->estimate.'</span>
-                    </div>
-                </div>';
+                            <div class="body">'.$this->body.'</div>
+                            <div class="author">' . $this->author . '</div>
+                            <span class="data hidden_field">'.$this->id.'</span>
+                            <span class="status hidden_field">'.$this->status.'</span>
+                            <span class="color hidden_field">'.$this->color.'</span>
+                            <div class="time">
+                                    <span class="timeleft">'.$this->timeleft.'</span>/<span class="estimate">'.$this->estimate.'</span>
+                            </div>';
+
+                if ( $this->add_link ){
+                    $str .= '<div class="readmore"><a href="' . get_permalink( $this->id ) . '">Read more</a></div>';
+                }
+
+        $str .= '</div>';
 
         return $str;
@@ -96 +107 @@
 
     public function form(){
+
+        $board = get_post_meta($this->id, flowboard_metakey(), true);
+        $zones = FlowBoard_Board::get_zones($board);
 
         $str = '<div id="noteData"> <!-- Holds the form -->
@@ -102 +116 @@
                 <label for="note-body">Headline</label>
                 <textarea name="note-body" id="note-body" class="pr-body" cols="30" rows="6">'.$this->body.'</textarea>
-                <label for="note-estimate">Estimate</label>
-                <input type="text" name="note-estimate" id="note-estimate" class="pr-estimate numbersOnly" value="'.$this->timeleft.'" />
-                <label for="note-name">Time left</label>
-                <input type="text" name="note-timeleft" id="note-timeleft" class="pr-timeleft numbersOnly" value="'.$this->estimate.'" />
+                <table cellspacing="0" cellpadding="0">
+                    <tr>
+                        <td>
+                            <label for="note-name">Time left</label>
+                            <input type="text" name="note-timeleft" id="note-timeleft" class="pr-timeleft numbersOnly" value="'.$this->timeleft.'" />
+                        </td>
+                        <td style="width:40px;">&nbsp;</td>
+                        <td>
+                            <label for="note-estimate">Estimate</label>
+                            <input type="text" name="note-estimate" id="note-estimate" class="pr-estimate numbersOnly" value="'.$this->estimate.'" />
+                        </td>
+                    </tr>
+                </table>
+                <label for="note-status">Status</label>
+                <select name="note-status" class="pr-status">
+                ';
+
+        foreach($zones as $zone){
+            $str .= '<option';
+            if ($this->status==$zone) $str.=' selected';
+            $str .= '>'.$zone.'</option>';
+        }
+
+        $str .= '</select><br/><br/>
                 <label for="note-name">Responsible</label>
                 <input type="text" name="note-name" id="note-name" class="pr-author" value="'.$this->author.'" />
@@ -116 +150 @@
                 <div class="color pink"></div>
                 <input type="hidden" class="pr-board" name="board" id="note-board" value="'.$this->board.'" />
-                <div class="clear"></div>
+                <br/><br/>
+                <label>Text</label> <!-- Clicking one of the divs changes the color of the preview -->
+                <textarea class="pr-postcontent" name="note-postcontent" id="note-postcontent">' . $this->postcontent . '</textarea>
+                <br/>
+                <input type="checkbox" class="pr-addlink" id="add_link" name="add_link" ';
+
+                if ( $this->add_link ) $str .= 'checked';
+
+                $str .= '/>Add hyperlink to the post in this note<div class="clear"></div>
                 <button id="note-submit" class="dialog_button button-primary">Save</button>';
 
             if ($this->id && is_user_logged_in()){
-                $str .= '<button onclick="document.location=\'/wp-admin/post.php?post='.$this->id.'&action=edit\';" id="note-post" class="dialog_button">To Post</button>';
+                $str .= '<button onclick="document.location=\''.admin_url('post.php?post='.$this->id.'&action=edit').'\';" id="note-post" class="dialog_button">To Post</button>';
             }
 
@@ -136 +178 @@
     /* getNotes generates a string with inline html notes from wpdb table */
     static function board_notes($board_id, $override) {
-        global $post; // required
 
         $notes = "";

flowboard/tags/1.3/includes/shortcode.php

@@ -27 +27 @@
         ), $atts ) );
 
-        if (current_user_can('edit_posts') || $override){
+        $meta = get_post_meta($id, flowboard_metadata());
+        $meta = json_decode($meta[0]);
+
+        if ( current_user_can( 'edit_posts' ) || $override ){
+
             wp_enqueue_script('jquery');
+            wp_admin_css('thickbox');
             wp_enqueue_script('jquery-ui-draggable');
+            wp_enqueue_script('jquery-ui-droppable');
             add_thickbox();
-            $myScriptUrl = WP_PLUGIN_URL . '/flowboard/script.js';
+
+            $myScriptUrl = WP_PLUGIN_URL . '/flowboard/js/script.js';
             wp_deregister_script( 'flowboardjs' );
             wp_register_script( 'flowboardjs', $myScriptUrl);
             wp_enqueue_script( 'flowboardjs' );
             wp_localize_script( 'flowboardjs', 'FlowBoardAjax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );
+
+            $myScriptUrl = WP_PLUGIN_URL . '/flowboard/js/jquery.ui.touch-punch.min.js';
+            wp_deregister_script( 'touch-punch' );
+            wp_register_script( 'touch-punch', $myScriptUrl );
+            wp_enqueue_script( 'touch-punch' );
         }
 
         $board = "<!--FlowBoard-->";
 
-        $board .= '<div id="flowboardmain_'.$id.'" class="flowboardmain" style="';
+        /*$board .= '<div id="flowboardmain_'.$id.'" class="flowboardmain" style="';
         $options = get_option('flowboard_plugin_options');
         if ($options['board_background']!=NULL) {
@@ -48 +60 @@
             $board = $board.'background-image: url('.WP_PLUGIN_URL.'/flowboard/img/flowboard_bg.jpg);';
         }
+        $board = $board.'">';
+        */
 
-        $board = $board.'">';
+        $board .= '<div id="flowboardmain_'.$id.'" class="flowboardmain">';
 
         if (current_user_can('edit_posts') || $override){
-            $board = $board.'<a href="'.admin_url('admin-ajax.php').'?action=flowboard_note_form&id=0&board='.$id.'" class="thickbox add_new_note" title="Add new note">&nbsp;&nbsp;+&nbsp;&nbsp;</a>';
+            $board = $board.'<a href="'.admin_url('admin-ajax.php').'?action=flowboard_note_form&id=0&height=550&width=600&board='.$id.'" class="thickbox" title="Add new note">';
+            $board .= '<img src="'.WP_PLUGIN_URL.'/flowboard/img/button.png" alt="add new note" />';
+            $board .= '</a><br/>';
         }
+
+
+        $zones = FlowBoard_Board::get_zones($id);
+
+        foreach($zones as $key => $zone){
+            $board .= '<div id="flowboard_zone'.$key.'" name="'.$zone.'" class="flowboard_zone" style="width:'.round(95/sizeof($zones)).'%">'.$zone.'</div>';
+        }
+
         $board .= FlowBoard_Note::board_notes($id, $override) . '</div>';
+
+        $board .= '<div style="clear: both;"></div>';
 
         $board .= "<!--/FlowBoard-->\r\n";
@@ -82 +108 @@
 
         <p>
+            <select name="flowboard_board" id="flowboard_board">
+                <option value="0"><?php _e('--- choose board to insert ---','flowboard'); ?></option>
+                <?php
+                    $args = array('post_type'=>'flowboard_board','numberposts'=>'-1');
+                    $posts = get_posts($args);
+                    foreach($posts as $post){
+                        echo '<option value="'.$post->ID.'">' . $post->post_title . '</option>' . "\r\n";
+                    }
+                ?>
+            </select> (<a href="<?php echo admin_url('edit.php?post_type=flowboard_board'); ?>"><?php _e('manage boards here!','flowboard'); ?></a>)
+        </p>
+
+        <p>
             <input id="flowboard_override" type="checkbox" value="0" /> <?php _e( 'Make the FlowBoard draggable for unauthorized visitors.', 'flowboard' ); ?>
         </p>
@@ -94 +133 @@
     </div>
 
-        <script language="javascript">
+        <script>
             function flowboardSetShortCode() {
 
                 var override    = jQuery('#flowboard_override').is(':checked');
+                var board       = parseInt(jQuery('#flowboard_board').val());
                 _boardkey = 0;
 
-                jQuery.ajaxSetup({async: false});
+                if (!board) return '';
 
-                jQuery.get('<?php echo admin_url('admin-ajax.php'); ?>?action=flowboard_boardkey', function(data) {
-                    _boardkey = data;
-                });
-
-                var shortcode = '[FlowBoard id=' + _boardkey;
+                var shortcode = '[FlowBoard id=' + board;
 
                 if (override) shortcode += ' override=1';

flowboard/tags/1.3/readme.txt

@@ -3 +3 @@
 Tags: agile, tools, whiteboard, project management, sticky notes, kanban, scrum
 Requires at least: 3.4
-Tested up to: 3.5
-Stable tag: 1.3
+Tested up to: 3.6
+Stable tag: 1.6
 
 FlowBoard makes it easier for web development to visualize the agile process.
@@ -28 +28 @@
 1. Download the plugin
 2. Activate the plugin through the 'Plugins' menu in WordPress
-3. Open a post or a page and click the "note"-button to add a board to your page!
+3. Create a new board in wp-admin/Flowboard/Boards (just title is enough)
+4. Open a post or a page and click the "note"-button to add a board to your page!
 
 In the admin settings menu you can change the board background image for your purposes.
@@ -36 +37 @@
 = Does it fit into my theme? =
 Yes, you can choose your own background in the admin settings. The whiteboard takes full width.
-
-= Will you continue develop the plugin? =
-Yes, we use it our self in projects and new ideas will be implemented, se roadmap at the site!
 
 = Have ideas? =
@@ -49 +47 @@
 
 == Changelog ==
+
+= 1.6 =
+* Admin menu moved
+* Flush rewrite rules made in plugin activate/deactivate
+* Removed some error_log messages
+*
+
+= 1.5.5 =
+* Flush rewrite rules after new registration of post types
+
+= 1.5.4 =
+* Added a readmore link in the note if selected
+
+= 1.5.3 =
+* Touch-Pounch added, support for ipad/iphone
+
+= 1.5.2 =
+* Post date fixed thanks to "innerbot".
+* Post content editable in popup (no html), thanks to "vlood".
+* Some removal of fonts in css
+
+= 1.5.1 =
+* New note didn't show until refresh, fixed.
+* New note on top, fixed.
+
+= 1.5 =
+* Added zones to board
+
+= 1.4 =
+* Added Board as an entity / custom post type (preparing for properties, burndown, etc)
+* Metabox added to Notes
+* Cascade postition at new note
+
+= 1.3.1 =
+* Quick fix, estimate and timeleft switched in edit note
+* Admin url fixed in edit post from edit note
 
 = 1.3 =
@@ -91 +125 @@
 == Upgrade Notice ==
 
--
+1.3 to 1.4, You will have to recreate the board and reset all Note posts to the right board ID.
 

flowboard/tags/1.3/styles.css

@@ -5 +5 @@
 
 #noteDialog { display:none; background-color: #fff; }
+
+.flowboard_zone{
+
+    height: 700px;
+    border: 1px solid #ccc;
+    float:left;
+    text-align: center;
+    font-weight: bold;
+    overflow: hidden;
+
+}
 
 .note{
@@ -19 +30 @@
     font-size:12px;
 
-    /* Adding a CSS3 shadow below the note, in the browsers which support it: */
-    -moz-box-shadow:2px 2px 0 #DDDDDD;
-    -webkit-box-shadow:2px 2px 0 #DDDDDD;
-    box-shadow:2px 2px 0 #DDDDDD;
+    -moz-box-shadow: 5px 5px 5px #aaa;
+    -webkit-box-shadow: 5px 5px 5px #aaa;
+    box-shadow: 5px 5px 5px #ccc;
+}
+
+.note .readmore{
+    font-size:  10px;
+    color:#666666;
+    font-family:Arial,Verdana,sans-serif;
+    text-decoration: none;
 }
 
@@ -109 +126 @@
 }
 
+.ui-state-active{
+    background-color: #eee;
+}
 
 .author{
@@ -134 +154 @@
 #noteData{
     /* The input form in the pop-up: */
-    height:200px;
+    height:400px;
     margin:0px 0px 0px 130px;
     width:315px;
@@ -155 +175 @@
     height:60px;
     padding:5px;
-    width:300px;
     margin-bottom:10px;
     line-height: 16px;
+}
+
+.pr-body{
+    width: 300px;
+}
+
+.pr-timeleft{
+    width:40px;
+}
+
+.pr-estimate{
+    width:40px;
+}
+
+.pr-status{
+    width:300px;
+    height: auto;
+}
+
+.pr-author{
+    width:300px;
+}
+
+.pr-postcontent{
+    width:300px;
 }
 
@@ -184 +228 @@
 .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
 
-.ui-widget { font-family: Arial, sans-serif; font-size: 12px; }
-.ui-widget .ui-widget { font-size: 12px; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS, Tahoma, Verdana, Arial, sans-serif; font-size: 12px; }
+.ui-widget { }
+.ui-widget .ui-widget { }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {  }
 .ui-widget-content { border: 1px solid #dddddd; background: #eeeeee 50% top repeat-x; color: #333333; }
 .ui-widget-content a { color: #333333; }

flowboard/trunk/flowboard.php

@@ -4 +4 @@
 Plugin URI: http://plugins.flowcom.se/flowboard
 Description: Web development tool, agile whiteboard with sticky notes. Your notes are posts in WP!
-Version: 1.5.5
+Version: 1.6
 Author: Flowcom AB, Andreas Ek
 Author URI: http://www.flowcom.se
@@ -12 +12 @@
 include 'includes/ajax.php';
 include 'includes/note.php';
-//include 'includes/optionpage.php';
 include 'includes/main.php';
 include 'includes/shortcode.php';
@@ -18 +17 @@
 
 $flowboard_ajax = new FlowBoard_Ajax();
-//$flowboard_option = new FlowBoard_Option();
 $flowboard_main = new FlowBoard_Main();
 $flowboard_shortcode = new FlowBoard_Shortcode();
@@ -30 +28 @@
 }
 
+function flowboard_activate() {
+    flush_rewrite_rules();
+}
+register_activation_hook( __FILE__, 'flowboard_activate' );
 
+function flowboard_deactivate() {
+    flush_rewrite_rules();
+}
+register_deactivation_hook( __FILE__, 'flowboard_deactivate' );
 
 ?>

flowboard/trunk/includes/ajax.php

@@ -170 +170 @@
             $meta = json_decode($meta);
             list( $l , $t , $z ) = explode('x', $meta->xyz);
-            error_log($xyz);
-            error_log($meta->xyz);
             if ( $l == $left && $t == $top ) {
                 $moved = true;

flowboard/trunk/includes/main.php

@@ -1 +1 @@
 <?php
 
-class FlowBoard_Main{
+class FlowBoard_Main
+{
 
     function __construct()
     {
-        add_action('wp_print_styles', array(&$this, 'wp_print_styles'));
-        add_action('init', array(&$this, 'init'));
-        add_action('admin_init', array(&$this, 'admin_init'));
-        add_action('admin_menu', array(&$this, 'remove_submenus'));
+        add_action( 'wp_print_styles', array( &$this, 'wp_print_styles' ) );
+        add_action( 'init', array( &$this, 'init' ) );
+        add_action( 'admin_init', array( &$this, 'admin_init' ) );
+        add_action( 'admin_menu', array( &$this, 'admin_menu' ) );
         add_action( 'save_post', array( &$this, 'save_post' ) );
         add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-
-    }
-
-    function save_post( $post_id ){
+    }
+
+    function save_post( $post_id )
+    {
 
         global $post;
 
-        if ($post->post_type == 'flowboard_note'){
-            //Get intro text from the postback
-            $board = esc_attr( $_POST['flowboard_board'] );
+        if ( $post->post_type == 'flowboard_note' ) {
+            $board = esc_attr( $_POST[ 'flowboard_board' ] );
             update_post_meta( $post->ID, flowboard_metakey(), $board );
         }
 
-        if ($post->post_type == 'flowboard_board'){
-
-            $z = $_POST['zone_ui_dynamic'];
-            if (is_array($z)){
+        if ( $post->post_type == 'flowboard_board' ) {
+
+            $z = $_POST[ 'zone_ui_dynamic' ];
+            if ( is_array( $z ) ) {
                 foreach ( $z as $zone ) {
-                    if ( ! empty( $zone ) ) $store_zones[] = $zone;
+                    if ( !empty( $zone ) ) {
+                        $store_zones[ ] = $zone;
+                    }
                 }
-            }
-            else
-            {
+            } else {
                 $store_zones = FlowBoard_Board::default_zones();
             }
 
-            $meta['zones'] = $store_zones;
-            if (!update_post_meta($post->ID, flowboard_metadata(), json_encode($meta)))
-            {
-                add_post_meta($post->ID, flowboard_metadata(), json_encode($meta),true);
+            $meta[ 'zones' ] = $store_zones;
+            if ( !update_post_meta( $post->ID, flowboard_metadata(), json_encode( $meta ) ) ) {
+                add_post_meta( $post->ID, flowboard_metadata(), json_encode( $meta ), true );
             }
         }
@@ -48 +47 @@
     }
 
-    function remove_submenus(){
+    function admin_menu()
+    {
+        add_menu_page( 'Flowboard', 'Flowboard', 'edit_posts', 'flowboard', array( &$this, 'display_flowboard_page' ), plugins_url( 'flowboard/img/notes.png' ) );
+
+        // remove submenu 'add new'
         global $submenu;
-        unset($submenu['edit.php?post_type=flowboard_note'][10]); // Removes 'Add New'.
-    }
-
-    function admin_init(){
-
-        add_meta_box( 'flowboard_board_zones', __( 'FlowBoard Zones', 'flowboard' ), array( &$this, 'show_zones' ), 'flowboard_board', 'normal', 'default' );
-        add_meta_box( 'flowboard_note_board', __( 'Flowboard properties', 'flowboard' ), array( &$this, 'show_note_properties' ), 'flowboard_note', 'side', 'default' );
-
-    }
-
-    function admin_enqueue_scripts() {
-
-        wp_enqueue_script(array('jquery', 'editor', 'thickbox', 'tinymce_editor' ));
+        unset( $submenu[ 'edit.php?post_type=flowboard_note' ][ 10 ] ); // Removes 'Add New'.
+    }
+
+    function admin_init()
+    {
+
+        add_meta_box(
+            'flowboard_board_zones', __( 'FlowBoard Zones', 'flowboard' ), array( &$this, 'show_zones' ),
+            'flowboard_board', 'normal', 'default'
+        );
+        add_meta_box(
+            'flowboard_note_board', __( 'Flowboard properties', 'flowboard' ), array( &$this, 'show_note_properties' ),
+            'flowboard_note', 'side', 'default'
+        );
+
+    }
+
+    function admin_enqueue_scripts()
+    {
+
+        wp_enqueue_script( array( 'jquery', 'editor', 'thickbox', 'tinymce_editor' ) );
 
         // Main jQuery
@@ -71 +82 @@
     }
 
-    function show_note_properties(){
+    function show_note_properties()
+    {
         global $post;
 
-        $board = get_post_meta($post->ID, flowboard_metakey(), true);
+        $board = get_post_meta( $post->ID, flowboard_metakey(), true );
 
         ?>
-            <strong><?php _e('Board','flowboard'); ?>:</strong>
-            (<a href="<?php echo admin_url('edit.php?post_type=flowboard_board'); ?>"><?php _e('manage boards here!','flowboard'); ?></a>)
-            <select name="flowboard_board" id="flowboard_board">
-                <option value="0"><?php _e('--- choose assigned board ---','flowboard'); ?></option>
-                <?php
-                $args = array('post_type'=>'flowboard_board','numberposts'=>'-1');
-                $posts = get_posts($args);
-                foreach($posts as $p){
-                    echo '<option value="'.$p->ID.'"';
-                    if ($board == $p->ID) echo ' selected';
-                    echo '>' . $p->post_title . '</option>' . "\r\n";
+        <strong><?php _e( 'Board', 'flowboard' ); ?>:</strong>
+        (<a href="<?php echo admin_url( 'edit.php?post_type=flowboard_board' ); ?>"><?php _e(
+            'manage boards here!', 'flowboard'
+        ); ?></a>)
+        <select name="flowboard_board" id="flowboard_board">
+            <option value="0"><?php _e( '--- choose assigned board ---', 'flowboard' ); ?></option>
+            <?php
+            $args = array( 'post_type' => 'flowboard_board', 'numberposts' => '-1' );
+            $posts = get_posts( $args );
+            foreach ( $posts as $p ) {
+                echo '<option value="' . $p->ID . '"';
+                if ( $board == $p->ID ) {
+                    echo ' selected';
                 }
-                ?>
-            </select>
+                echo '>' . $p->post_title . '</option>' . "\r\n";
+            }
+            ?>
+        </select>
         </p>
     <?php
     }
 
-    function show_zones(){
+    function show_zones()
+    {
         global $post;
 
         echo '<p>';
 
-        $zones = FlowBoard_Board::get_zones($post->ID);
+        $zones = FlowBoard_Board::get_zones( $post->ID );
 
         ?>
         <div class="flowboard_zones_control">
 
-          <div style="margin-bottom: 4px;">
-              <input type="button" class="button-secondary" value="<?php _e( 'Add', 'flowboard' ); ?>"
-                     id="flowboard_zones_add" />
-              <input type="button" class="button-secondary" value="<?php _e( 'Remove', 'flowboard' ); ?>"
-                     id="flowboard_zones_remove" />
-              <input type="button" class="button-secondary" value="<?php _e( 'Reset', 'flowboard' ); ?>"
-                     id="flowboard_zones_reset" />
-          </div>
-
-          <div id="flowboard_zones_ui">
-
-              <?php
-              foreach ( $zones as $key => $z ) {
-                  ?>
-                  <div class="zone_ui_div">
-                      <input type="text" class="text zone_ui_dynamic" name="zone_ui_dynamic[]"
-                             value="<?php echo $z; ?>" />
-                  </div>
-                  <?php
-              }
-              ?>
-
-          </div>
+        <div style="margin-bottom: 4px;">
+            <input type="button" class="button-secondary" value="<?php _e( 'Add', 'flowboard' ); ?>"
+                   id="flowboard_zones_add"/>
+            <input type="button" class="button-secondary" value="<?php _e( 'Remove', 'flowboard' ); ?>"
+                   id="flowboard_zones_remove"/>
+            <input type="button" class="button-secondary" value="<?php _e( 'Reset', 'flowboard' ); ?>"
+                   id="flowboard_zones_reset"/>
+        </div>
+
+        <div id="flowboard_zones_ui">
+
+            <?php
+            foreach ( $zones as $key => $z ) {
+                ?>
+                <div class="zone_ui_div">
+                    <input type="text" class="text zone_ui_dynamic" name="zone_ui_dynamic[]"
+                           value="<?php echo $z; ?>"/>
+                </div>
+            <?php
+            }
+            ?>
+
+        </div>
         <?php
 
@@ -136 +153 @@
 
     /*Required stylesheets */
-    function wp_print_styles() {
+    function wp_print_styles()
+    {
         $myStyleUrl = WP_PLUGIN_URL . '/flowboard/styles.css';
         $myStyleFile = WP_PLUGIN_DIR . '/flowboard/styles.css';
 
-        if ( file_exists($myStyleFile) ) {
-            wp_register_style('FlowBoardStyleSheets', $myStyleUrl);
-            wp_enqueue_style( 'FlowBoardStyleSheets');
-        }
-    }
-
-    function init() {
-
-        register_post_type('flowboard_note', array( 'label' => 'Notes','description' => 'FlowBoard custom post types','public' => true,'show_ui' => true,'show_in_menu' => true,'capability_type' => 'post','hierarchical' => false,'rewrite' => array('slug' => ''),'query_var' => true,'exclude_from_search' => false,'supports' => array('title','editor','comments',),'labels' => array (
-            'name' => 'Notes',
-            'singular_name' => 'Note',
-            'menu_name' => 'Notes',
-            'add_new' => 'Add Note',
-            'add_new_item' => 'Add New Note',
-            'edit' => 'Edit',
-            'edit_item' => 'Edit Note',
-            'new_item' => 'New Note',
-            'view' => 'View Note',
-            'view_item' => 'View Note',
-            'search_items' => 'Search Notes',
-            'not_found' => 'No Notes Found',
-            'not_found_in_trash' => 'No Notes Found in Trash',
-            'parent' => 'Parent Note',
-        ),) );
-
-        register_post_type('flowboard_board', array(    'label' => 'Boards','description' => '','public' => false,'show_ui' => true,'show_in_menu' => 'edit.php?post_type=flowboard_note','capability_type' => 'post','hierarchical' => false,'rewrite' => array('slug' => ''),'query_var' => true,'exclude_from_search' => true,'supports' => array('title',),'labels' => array (
-            'name' => 'Boards',
-            'singular_name' => 'Board',
-            'menu_name' => 'Boards',
-            'add_new' => 'Add Board',
-            'add_new_item' => 'Add New Board',
-            'edit' => 'Edit',
-            'edit_item' => 'Edit Board',
-            'new_item' => 'New Board',
-            'view' => 'View Board',
-            'view_item' => 'View Board',
-            'search_items' => 'Search Boards',
-            'not_found' => 'No Boards Found',
-            'not_found_in_trash' => 'No Boards Found in Trash',
-            'parent' => 'Parent Board',
-        ),) );
-
-                flush_rewrite_rules();
-
-        if (!is_admin()) {
-
-            //Kolla av nu om användaren har access alternativt om Public Access är aktiverat.
-            $options = get_option('flowboard_plugin_options');
-
-            if (current_user_can('edit_posts') || $options['public_access'])
-            {
-
-            }
-        }
-    }
-
+        if ( file_exists( $myStyleFile ) ) {
+            wp_register_style( 'FlowBoardStyleSheets', $myStyleUrl );
+            wp_enqueue_style( 'FlowBoardStyleSheets' );
+        }
+    }
+
+    function init()
+    {
+
+        register_post_type(
+            'flowboard_note', array(
+                'label' => 'Notes', 'description' => 'FlowBoard custom post types', 'public' => true, 'show_ui' => true,
+                'show_in_menu' => 'flowboard', 'capability_type' => 'post', 'hierarchical' => false,
+                'rewrite' => array( 'slug' => '' ), 'query_var' => true, 'exclude_from_search' => false,
+                'supports' => array( 'title', 'editor', 'comments', ), 'labels' => array(
+                    'name' => 'Notes',
+                    'singular_name' => 'Note',
+                    'menu_name' => 'Notes',
+                    'add_new' => 'Add Note',
+                    'add_new_item' => 'Add New Note',
+                    'edit' => 'Edit',
+                    'edit_item' => 'Edit Note',
+                    'new_item' => 'New Note',
+                    'view' => 'View Note',
+                    'view_item' => 'View Note',
+                    'search_items' => 'Search Notes',
+                    'not_found' => 'No Notes Found',
+                    'not_found_in_trash' => 'No Notes Found in Trash',
+                    'parent' => 'Parent Note',
+                ),
+            )
+        );
+
+        register_post_type(
+            'flowboard_board', array(
+                'label' => 'Boards', 'description' => '', 'public' => false, 'show_ui' => true,
+                'show_in_menu' => 'flowboard', 'capability_type' => 'post',
+                'hierarchical' => false, 'rewrite' => array( 'slug' => '' ), 'query_var' => true,
+                'exclude_from_search' => true, 'supports' => array( 'title', ), 'labels' => array(
+                    'name' => 'Boards',
+                    'singular_name' => 'Board',
+                    'menu_name' => 'Boards',
+                    'add_new' => 'Add Board',
+                    'add_new_item' => 'Add New Board',
+                    'edit' => 'Edit',
+                    'edit_item' => 'Edit Board',
+                    'new_item' => 'New Board',
+                    'view' => 'View Board',
+                    'view_item' => 'View Board',
+                    'search_items' => 'Search Boards',
+                    'not_found' => 'No Boards Found',
+                    'not_found_in_trash' => 'No Boards Found in Trash',
+                    'parent' => 'Parent Board',
+                ),
+            )
+        );
+
+        if ( !is_admin() ) {
+            $options = get_option( 'flowboard_plugin_options' );
+            if ( current_user_can( 'edit_posts' ) || $options[ 'public_access' ] ) {
+                //TODO actions!
+            }
+        }
+    }
+
+    function display_flowboard_page(){
+    }
 
 }

flowboard/trunk/includes/shortcode.php

@@ -133 +133 @@
     </div>
 
-        <script language="javascript">
+        <script>
             function flowboardSetShortCode() {
 

flowboard/trunk/readme.txt

@@ -3 +3 @@
 Tags: agile, tools, whiteboard, project management, sticky notes, kanban, scrum
 Requires at least: 3.4
-Tested up to: 3.5.1
-Stable tag: 1.5.5
+Tested up to: 3.6
+Stable tag: 1.6
 
 FlowBoard makes it easier for web development to visualize the agile process.
@@ -28 +28 @@
 1. Download the plugin
 2. Activate the plugin through the 'Plugins' menu in WordPress
-3. Create a new board in wp-admin/Notes/Boards (just title is enough)
+3. Create a new board in wp-admin/Flowboard/Boards (just title is enough)
 4. Open a post or a page and click the "note"-button to add a board to your page!
 
@@ -47 +47 @@
 
 == Changelog ==
+
+= 1.6 =
+* Admin menu moved
+* Flush rewrite rules made in plugin activate/deactivate
+* Removed some error_log messages
+*
 
 = 1.5.5 =