Changeset 511018

Timestamp:

02/27/2012 09:05:32 AM (14 years ago)

Author:

stresslimit

Message:

inital commit of drafts drawer feature, including some css & language fixes

Location:

editorial-calendar/branches/drafts_drawer

Files:

• edcal.css (modified) (13 diffs)
• edcal.js (modified) (37 diffs)
• edcal.php (modified) (23 diffs)
• languages/editorial-calendar-fr_FR.mo (modified) (previous)
• languages/editorial-calendar-fr_FR.po (modified) (1 diff)
• languages/editorial-calendar-template.pot (added)
• lib/languages/date-fr-FR.js (moved) (moved from editorial-calendar/branches/drafts_drawer/lib/languages/date-fr_FR.js)
• readme.txt (modified) (5 diffs)

editorial-calendar/branches/drafts_drawer/edcal.css

@@ -14 +14 @@
  *
  ******************************************************************************/
- 
+
+/*
+Table of Contents
+- Reset
+- Loading section
+- Top bar #topbar, including prev/next month arrows at left and Show Today at right
+- Drafts Drawer
+- the Calendar Content #calcont
+  - day head container #dayheadcont [Monday, Tuesday etc]
+  - edcal scrollable area #edcal_scrollable [the main calendar pane]
+  - calendar #cal container
+  - day label table head
+  - row container .rowcont [absolutely positioned, top adjusted by js]
+  - row inner .row [positioned relative, within the rowcont
+  - days
+  - posts
+  - tooltip [new/edit posts popover]
+- Screen options
+- Feedback section [appears once after using the calendar 3 times]
+*/
+
+/*.row .day:first-child, .dayheadcont .dayhead:first-child {
+    margin-left:0 !important;
+}
+.rowcont { margin:0 !important; }
+.day { float:left; }
+*/
+
+
+/* Reset & Utility */
+
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
     background: none repeat scroll 0 0 transparent;
@@ -22 +52 @@
     padding: 0;
 }
-
-#edcal_scrollable {
-    /* required settings */ 
-    position:relative; 
-    overflow:hidden; 
- 
-    /* This height will be reset with JavaScript */ 
-    height: 100%;
-    margin-top: 5px;
-    margin-left: 4px;
-    margin-right: 2px;
-}
+.clearfix:before, .clearfix:after { content:'\0020'; display:block; height:0; visibility:hidden; }
+.clearfix:after { clear:both; }
+.clearfix { zoom:1; }
+
+
+
+/* Loading section */
+
+#loadingcont {
+    position: relative;
+}
+
+#loading, #draftsdrawer_loading {
+    background-image: url('images/loading.gif'); 
+    background-repeat: no-repeat;
+    position: absolute;
+    width: 43px;
+    height: 43px;
+    display: block;
+    left: 20em;
+    top: -1.5em;
+}
+
+.loadingclass > .postlink, .tiploading, .loadingclass:hover > .postlink {
+    background-image: url('images/loading_post.gif'); 
+    background-position: top right;
+    background-repeat: no-repeat;
+    cursor: auto;
+}
+
+
+
+/* Top bar */
+
+#topbar {
+    margin-bottom: 1em;
+    margin-top: 1em;
+    height:2em;
+}
+#topbar .tablenav-pages a {
+    font-weight:normal;
+}
+#topleft.tablenav-pages {
+    float:left;
+}
+#nextmonth, #prevmonth {
+    font-size:12px;
+}
+#topright button {
+    margin-left: 2em;
+    margin-right: 6px;
+    text-decoration: none;
+}
+
+
+
+/* Drafts Drawer */
+
+#draftsdrawer_cont {
+    height:100%;
+    float:right;
+    display:none;
+}
+#draftsdrawer {
+    font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
+    border:1px solid #dfdfdf;
+    padding-bottom:1px;
+    -moz-border-radius:4px;
+    -webkit-border-radius:4px;
+    -o-border-radius:4px;
+    border-radius:4px;
+}
+#draftsdrawer .dayheadcont {  }
+#draftsdrawer .dayhead { float:none; }
+#draftsdrawer .day { border:0; }
+#draftsdrawer .dayobj { height:auto; }
+#draftsdrawer .postlist { top:7px; }
+#draftsdrawer .posttime { display:none; }
+#draftsdrawer_loading {
+    position:relative;
+    margin:2em 2em 0 2em;
+    top:0;
+    left:0;
+}
+
+
+/* Calendar container */
 
 #cal_cont, #edcal_scrollable {
@@ -47 +152 @@
 }
 
+#cal_cont {
+    border:1px solid #dfdfdf;
+    padding-bottom:1px;
+    -moz-border-radius:4px;
+    -webkit-border-radius:4px;
+    -o-border-radius:4px;
+    border-radius:4px;
+}
+
+#edcal_scrollable {
+    /* required settings */ 
+    position:relative; 
+    overflow:hidden; 
+
+    /* This height will be reset with JavaScript */ 
+    height: 100%;
+    margin-top: 5px;
+    margin-left: 4px;
+    margin-right: 2px;
+}
+
 #cal {
     position:absolute; 
- 
+
     /* this time we have very large space for the height */ 
     height:100%; 
@@ -55 +181 @@
 }
 
-.day {
-    border: 1px solid #ccc; /* this will add to total height in IE. So, 100% + 2px */
-    -moz-border-radius:3px;
-    -webkit-border-radius:3px;
-    -o-border-radius:3px;
-    border-radius:3px;
-    background: white;
-}
-
-.day.beforeToday {
-    background: #ececec;
-/*    background: #f9f9f9;*/
-}
-
-.day.todayAndAfter {
-    background: #fff;
-}
-
-.day.day-active {
-    background-color: lightyellow;
-}
-
-.scrollHover {
-    background: lightblue;
-}
-
-.row {
-    height: 100%;
-}
-
-.dayobj {
-    position: relative;
-    width: 100%;
-    height: 100%;
-}
-
-.firstOfMonth .dayobj {
-    background-color: #eaf2fb;
-    -moz-border-radius:2px;
-    -webkit-border-radius:2px;
-    -o-border-radius:2px;
-    border-radius:2px;
-}
-
-.daylabel {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    left: 0px;
-    font-weight:bold;
-    text-align: right;
-    padding-right: 10px;
-    -moz-border-radius:2px 2px 0 0;
-    -webkit-border-radius:2px 2px 0 0;
-    -o-border-radius:2px 2px 0 0;
-    border-radius:2px 2px 0 0;
-}
-
-.day.month-present .daylabel {
-    border-bottom:1px solid #dfdfdf;
-    background:#e9e9e9;
-    background-image:-moz-linear-gradient(top,#f4f4f4,#e9e9e9);
-    background-image:-o-linear-gradient(top,#f4f4f4,#e9e9e9);
-    background-image:-webkit-gradient(linear,left top,left bottom,from(#f4f4f4),to(#e9e9e9));
-    background-image:-webkit-linear-gradient(top,#f4f4f4,#e9e9e9);
-    background-image:linear-gradient(top,#f4f4f4,#e9e9e9);
-}
-
-.daynewlink {
-    position: absolute;
-    top: 0px;
-    left: 0px;
-    display: none;
-    padding-left: 0.5em;
-    padding-right: 0.5em;
-    text-decoration: none;
-    font-size:10px;
-    z-index: 10;
-    overflow: hidden;
-    height: 1.5em;
-}
-
-.day.today .daylabel {
-    color: white;
-}
-
-.today .daynewlink {
-    color: white;
-}
-
-.post {
-    display: block;
-    list-style-type: none;
-    z-index: 10;
-    margin-left: 2px;
-    margin-right: 2px;
-    font-size: 10px;
-    padding: 0px;
-}
-
-.posttime {
-    font-weight: bold;
-}
-
-.post.draggable .postlink {
-    cursor: move;
-}
-
-.post .postactions {
-    display: none;
-}
-
-.postactions a {
-  text-decoration:none;
-}
-
-.post .postlink:hover {
-    color: #d54e21;
-    background-color: #f5f5f5;
-}
-
-.dayhead {
-    text-align: left;
-    text-indent: 5px;
-    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
-    color: #000;
-    line-height: 2.4em;
-    min-width: 10em;
-}
-
-.dayheadcont {
+
+
+/* Day label table head */
+
+.dayheadcont, .draftsdrawerheadcont {
     position: relative;
     height: 34px;
@@ -205 +205 @@
 }
 
+.dayhead {
+    text-align: left;
+    text-indent: 5px;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
+    color: #000;
+    line-height: 2.4em;
+    min-width: 10em;
+    float:left;
+}
+
 .dayhead.firstday {
     margin-left: 5px;
@@ -212 +222 @@
 }
 
-#cal_cont {
-    border:1px solid #dfdfdf;
-    padding-bottom:1px;
-    -moz-border-radius:4px;
-    -webkit-border-radius:4px;
-    -o-border-radius:4px;
-    border-radius:4px;
-}
-
-#topbar {
-    margin-bottom: 1em;
+
+
+/* Rows */
+
+.row {
+    height: 100%;
+}
+
+
+
+/* Days */
+
+.day {
+    border: 1px solid #ccc; /* this will add to total height in IE. So, 100% + 2px */
+    -moz-border-radius:3px;
+    -webkit-border-radius:3px;
+    -o-border-radius:3px;
+    border-radius:3px;
+    background: white;
+}
+
+.day.beforeToday {
+    background: #ececec;
+/*    background: #f9f9f9;*/
+}
+
+.day.todayAndAfter {
+    background: #fff;
+}
+
+.day.day-active {
+    background-color: lightyellow;
+}
+
+.scrollHover {
+    background: lightblue;
+}
+
+.dayobj {
+    position: relative;
     width: 100%;
-    margin-top: 1em;
-    position: relative;
-    height: 2em;
-}
-
-#topleft {
+    height: 100%;
+}
+
+.firstOfMonth .dayobj {
+    background-color: #eaf2fb;
+    -moz-border-radius:2px;
+    -webkit-border-radius:2px;
+    -o-border-radius:2px;
+    border-radius:2px;
+}
+
+.daylabel {
     position: absolute;
+    top: 0px;
+    right: 0px;
     left: 0px;
-    top: -14px;
-    width: auto;
-}
-
-#topright {
+    font-weight:bold;
+    text-align: right;
+    padding-right: 10px;
+    -moz-border-radius:2px 2px 0 0;
+    -webkit-border-radius:2px 2px 0 0;
+    -o-border-radius:2px 2px 0 0;
+    border-radius:2px 2px 0 0;
+}
+
+.day.month-present .daylabel {
+    border-bottom:1px solid #dfdfdf;
+    background:#e9e9e9;
+    background-image:-moz-linear-gradient(top,#f4f4f4,#e9e9e9);
+    background-image:-o-linear-gradient(top,#f4f4f4,#e9e9e9);
+    background-image:-webkit-gradient(linear,left top,left bottom,from(#f4f4f4),to(#e9e9e9));
+    background-image:-webkit-linear-gradient(top,#f4f4f4,#e9e9e9);
+    background-image:linear-gradient(top,#f4f4f4,#e9e9e9);
+}
+
+.daynewlink {
     position: absolute;
-    right: 0px;
     top: 0px;
-    width: auto;
-    text-align: right;
-}
-
-#moveToToday {
-    margin-left: 2em;
-    margin-right: 6px;
+    left: 0px;
+    display: none;
+    padding-left: 0.5em;
+    padding-right: 0.5em;
     text-decoration: none;
+    font-size:10px;
+    z-index: 10;
+    overflow: hidden;
+    height: 1.5em;
+}
+
+.day.today .daylabel {
+    color: white;
+}
+
+.today .daynewlink {
+    color: white;
+}
+
+
+
+/* Posts */
+
+.post {
+    display: block;
+    list-style-type: none;
+    z-index: 10;
+    margin-left: 2px;
+    margin-right: 2px;
+    font-size: 10px;
+    padding: 0px;
+}
+
+.post .titlewithauthor { display:none; }
+.post .titlewithoutauthor { display:inline; }
+.show-author .post .titlewithauthor { display:inline; }
+.show-author .post .titlewithoutauthor { display:none; }
+#draftsdrawer .post .titlewithauthor { display:inline; }
+#draftsdrawer .post .titlewithoutauthor { display:none; }
+
+.posttime {
+    font-weight: bold;
+}
+
+.post.draggable .postlink {
+    cursor: move;
+}
+
+.post .postactions {
+    display: none;
+}
+
+.postactions a {
+  text-decoration:none;
+}
+
+.post .postlink:hover {
+    color: #d54e21;
+    background-color: #f5f5f5;
 }
 
@@ -253 +365 @@
     color: #a4a4a4;
     font-weight:normal;
-}
-
-#loadingcont {
-    position: relative;
-}
-
-#loading {
-    background-image: url('images/loading.gif'); 
-    background-repeat: no-repeat;
-    position: absolute;
-    width: 43px;
-    height: 43px;
-    display: block;
-    left: 20em;
-    top: -1.5em;
-}
-
-.loadingclass > .postlink, .tiploading, .loadingclass:hover > .postlink {
-    background-image: url('images/loading_post.gif'); 
-    background-position: top right;
-    background-repeat: no-repeat;
-    cursor: auto;
 }
 
@@ -290 +380 @@
     color: #21759B;
 }*/
+
 
 
@@ -350 +441 @@
 }
 
-#edcal-title {
+#edcal-title { /* not sure this is being used */
     padding-top: 0.5em;
     padding-bottom: 0.5em;
@@ -404 +495 @@
 
 
-#nextmonth, #prevmonth {
-    /*padding: 0.5em;*/
-    font-size:12px;
-}
+
+/* Screen Options */
 
 #edcal_weeks_pref {
@@ -449 +538 @@
 }
 
-
 .colorselected {
     opacity: 1;
@@ -458 +546 @@
     -webkit-border-radius: 4px;
 }
+
+#screen-meta #show-edcal-settings-link.show-settings {
+    background-position: right -1px;
+}
+
+#contextual-help-wrap {
+    margin-left: 8px;
+    padding: 0 0 10px;
+}
+
+
+
+/* Feedback section */
 
 #feedbacksection {
@@ -486 +587 @@
 }
 
-#screen-meta #show-edcal-settings-link.show-settings {
-    background-position: right -1px;
-}
-
-#contextual-help-wrap {
-    margin-left: 8px;
-    padding: 0 0 10px;
-}
-

editorial-calendar/branches/drafts_drawer/edcal.js

@@ -210 +210 @@
 
     /*
+     * Initializes the calendar
+     */
+    init: function() {
+         if (jQuery('#edcal_scrollable').length === 0) {
+             /*
+              * This means we are on a page without the editorial
+              * calendar
+              */
+             return;
+         }
+
+        edcal.addFeedbackSection();
+
+        jQuery('#loading').hide();
+
+        jQuery('#edcal_scrollable').css('height', edcal.getCalHeight() + 'px');
+        edcal.windowHeight = jQuery(window).height();
+
+        /*
+         *  Add the days of the week
+         */
+        edcal.createDaysHeader();
+
+        /*
+         * We start by initializting the scrollable.  We use this to manage the
+         * scrolling of the calendar, but don't actually call it to animate the
+         * scrolling.  We specify an easing here because the default is "swing"
+         * and that has a conflict with JavaScript used in the BuddyPress plugin/
+         *
+         * This doesn't really change anything since the animation happens offscreen.
+         */
+        jQuery('#edcal_scrollable').scrollable({
+                                    vertical: true,
+                                    size: edcal.weeksPref,
+                                    keyboard: false,
+                                    keyboardSteps: 1,
+                                    speed: 100,
+                                    easing: 'linear'
+                                    });
+
+        var api = jQuery('#edcal_scrollable').scrollable();
+        
+        api.getConf().keyboard = false;
+
+        /*
+           When the user moves the calendar around we remember their
+           date and save it in a cookie.  Then we read the cookie back
+           when we reload so the calendar stays where the user left
+           it last.
+         */
+        var curDate = jQuery.cookie('edcal_date');
+
+        if (curDate) {
+            curDate = Date.parseExact(curDate, 'yyyy-dd-MM');
+            edcal.output('Resetting to date from the edcal_Date cookie: ' + curDate);
+        } else {
+            curDate = Date.today();
+        }
+
+        edcal.moveTo(curDate.clone());
+        
+        jQuery('#edcal_scrollable').bind('mousewheel', function(event, delta) {
+            var dir = delta > 0 ? false : true, vel = Math.abs(delta);
+            edcal.output(dir + ' at a velocity of ' + vel);
+
+            if (!edcal.isMoving && vel > 0.2) {
+                edcal.move(1, dir);
+            }
+            
+            return false;
+        });
+        
+        /*
+           We are handling all of our own events so we just cancel all events from
+           the scrollable.
+         */
+        api.onBeforeSeek(function(evt, direction) {
+            return false;
+        });
+
+        /*
+         * We also want to listen for a few other key events
+         */
+        jQuery(document).bind('keydown', function(evt) {
+            //if (evt.altKey || evt.ctrlKey) { return; }
+            //edcal.output("evt.altKey: " + evt.altKey);
+            //edcal.output("evt.keyCode: " + evt.keyCode);
+            //edcal.output("evt.ctrlKey: " + evt.ctrlKey);
+            
+            if (evt.keyCode === 27) { //escape key
+                edcal.hideForm();
+                return false;
+            }
+            
+            if (jQuery('#tooltip').is(':visible')) {
+                return;
+            }
+
+            if ((evt.keyCode === 40 && !(evt.altKey || evt.ctrlKey))) {        // down arrow key
+                edcal.move(1, true);
+                return false;
+            } else if ((evt.keyCode === 38 && !(evt.altKey || evt.ctrlKey))) { // up arrow key
+                edcal.move(1, false);
+                return false;
+            } else if ((evt.keyCode === 34 && !(evt.altKey || evt.ctrlKey)) || //page down
+                evt.keyCode === 40 && evt.ctrlKey) {                           // Ctrl+down down arrow
+                edcal.move(edcal.weeksPref, true);
+                return false;
+            } else if ((evt.keyCode === 33 && !(evt.altKey || evt.ctrlKey)) || //page up
+                evt.keyCode === 38 && evt.ctrlKey) {                           // Ctrl+up up arrow
+                edcal.move(edcal.weeksPref, false);
+                return false;
+            }
+        });
+        
+        edcal.getPosts(edcal.nextStartOfWeek(curDate).add(-3).weeks(),
+                       edcal.nextStartOfWeek(curDate).add(edcal.weeksPref + 3).weeks());
+        
+        /*
+           Now we bind the listeners for all of our links and the window
+           resize.
+         */
+        jQuery('#moveToToday').click(function() {
+            edcal.moveTo(Date.today());
+            edcal.getPosts(edcal.nextStartOfWeek(Date.today()).add(-3).weeks(),
+                           edcal.nextStartOfWeek(Date.today()).add(edcal.weeksPref + 3).weeks());
+            return false;
+        });
+        
+        jQuery('#prevmonth').click(function() {
+            edcal.move(edcal.weeksPref, false);
+            return false;
+        });
+
+        jQuery('#nextmonth').click(function() {
+            edcal.move(edcal.weeksPref, true);
+            return false;
+        });
+        
+        /*
+           We used to listen to resize events so we could make the calendar the right size
+           for the current window when it changed size, but this was causing a problem with
+           WordPress 3.3 and it never worked properly because the scroll position was a little
+           off so we are just skipping it.
+         */
+        /*function resizeWindow(e) {
+            if (edcal.windowHeight != jQuery(window).height()) {
+                jQuery('#edcal_scrollable').css('height', edcal.getCalHeight() + 'px');
+                edcal.windowHeight = jQuery(window).height();
+                edcal.savePosition();
+            }
+        }
+        jQuery(window).bind('resize', resizeWindow);*/
+
+        jQuery('#newPostScheduleButton').live('click', function(evt) {
+            // if the button is disabled, don't do anything
+            if (jQuery(this).hasClass('disabled')) {
+                return false;
+            }
+            // Otherwise,
+            // make sure we can't make duplicate posts by clicking twice quickly
+            jQuery(this).addClass('disabled');
+            // and save the post
+            return edcal.savePost(null, false, true);
+        });
+
+        jQuery('#edcal-title-new-field').bind('keyup', function(evt) {
+            if (jQuery('#edcal-title-new-field').val().length > 0 && jQuery('#edcal-time').val().length > 0) {
+                jQuery('#newPostScheduleButton').removeClass('disabled');
+            } else {
+                jQuery('#newPostScheduleButton').addClass('disabled');
+            }
+
+            if (evt.keyCode == 13) {    // enter key
+                /*
+                 * If the user presses enter we want to save the draft.
+                 */
+                return edcal.savePost(null, true);
+            }
+        });
+
+        jQuery('#edcal-status').bind('change', function(evt) {
+            edcal.updatePublishButton();
+        });
+
+        jQuery('#edcal_weeks_pref').live('keyup', function(evt) {
+            if (jQuery('#edcal_weeks_pref').val().length > 0) {
+                jQuery('#edcal_applyoptions').removeClass('disabled');
+            } else {
+                jQuery('#edcal_applyoptions').addClass('disabled');
+            }
+
+            if (evt.keyCode == 13) {    // enter key
+                edcal.saveOptions();
+            }
+
+        });
+
+        edcal.savePosition();
+
+        edcal.addOptionsSection();
+
+        jQuery('#edcal-time').timePicker({
+            show24Hours: edcal.timeFormat === 'H:i',
+            separator: ':',
+            step: 30
+        });
+
+        jQuery('#showdraftsdrawer').click(function() {
+            edcal.showhideDraftsDrawer( jQuery(this) );
+        });
+    },
+
+    /*
+     * This function shows and hides the drafts drawer. Kind of clunky right now.
+     * Inits [loads content] only once. 
+     */
+    showhideDraftsDrawer: function( /*jQuery element*/ showhideElement ) {
+        var drawerwidth = '13%';
+        var drawerwidthmargin = '13.5%';
+        /* tells us if the drafts have been loaded for the first time */
+        if ( !showhideElement.hasClass('isLoaded') ) {
+            showhideElement.addClass('isLoaded');
+            edcal.setupDraftsdrawer();
+        }
+        if ( showhideElement.hasClass('showed') ) {
+            // edcal.output('hiding draftsdrawer');
+            showhideElement.removeClass('showed');
+            jQuery('#cal_cont').css({ 'margin-right': '0' });
+            jQuery('#draftsdrawer_cont').css({ display:'none', width:'0' });
+            showhideElement.html(edcal.str_showdrafts);
+        } else {
+            // edcal.output('showing draftsdrawer');
+            showhideElement.addClass('showed');
+            jQuery('#cal_cont').css({ 'margin-right': drawerwidthmargin });
+            jQuery('#draftsdrawer_cont').css({ display:'block', width:drawerwidth });
+            showhideElement.html(edcal.str_hidedrafts);
+        }
+    },
+
+    /*
+     * Sets up the drafts drawer.
+     */
+    setupDraftsdrawer: function() {
+        jQuery('#draftsdrawer_loading').css({display:'block'});
+        edcal.getPosts( '00000000', null, edcal.initDraftsdrawer );
+    },
+
+    /*
+     * Inits the drafts drawer, much like edcal.createRow()
+     * We could paginate this but right now we're just loading them all.
+     */
+    initDraftsdrawer: function() {
+        var newrow = '';
+
+        newrow += '<ul class="postlist">';
+
+        newrow += edcal.getPostItems( '00000000' );
+
+        newrow += '</ul>';
+
+        edcal.draggablePost('#row' + edcal._wDate.toString(edcal.internalDateFormat) + ' li.post');
+
+        jQuery('#draftsdrawer div.day').droppable({
+            hoverClass: 'day-active',
+            greedy: true,
+            tolerance: 'pointer',
+            drop: function(event, ui) {
+                   // edcal.output('dropped ui.draggable.attr("id"): ' + ui.draggable.attr("id"));
+                   // edcal.output('dropped on jQuery(this).attr("id"): ' + jQuery(this).attr("id"));
+                   // edcal.output('ui.draggable.html(): ' + ui.draggable.html());
+                   // var dayId = 'draftsdrawer';
+                   var dayId = ui.draggable.parent().parent().parent().attr('id');
+                   edcal.doDrop(dayId, ui.draggable.attr('id'), jQuery(this).attr('id'));
+                }
+            });
+        jQuery('#unscheduled').append(newrow);
+        jQuery('#draftsdrawer_loading').css({display:'none'});
+    },
+
+    /*
        This function aligns the grid in two directions.  There
        is a vertical grid with a row of each week and a horizontal
@@ -215 +496 @@
      */
     alignGrid: function(/*string*/ gridid, /*int*/ cols, /*int*/ cellWidth, /*int*/ cellHeight, /*int*/ padding) {
+        if ( jQuery(gridid).parent().attr('id')=='draftsdrawer' )
+            return;
+        // console.log(jQuery(gridid).parent().attr('id'));
         var x = 0;
         var y = 0;
         var count = 1;
-        
+
         jQuery(gridid).each(function() {
             jQuery(this).css('position', 'relative');
@@ -251 +535 @@
     
                     count++;
-                }
+                };
             } else {
                 for (var i = children.length - 1; i > -1; i--) {
@@ -270 +554 @@
     
                     count++;
-                }
+                };
             }
             
@@ -334 +618 @@
          var daystyle;
 
-         if (date.compareTo(Date.today()) === -1) {
+         if (date.compareTo(Date.today()) == -1) {
              /*
               * Date is before today
@@ -360 +644 @@
               */
              monthstyle = 'month-present';
-         } else if (date.compareTo(edcal.firstDayOfMonth) === 1) {
+         } else if (date.compareTo(edcal.firstDayOfMonth) == 1) {
              /*
               * Then the date is after the current month
               */
              monthstyle = 'month-future';
-         } else if (date.compareTo(edcal.firstDayOfNextMonth) === -1) {
+         } else if (date.compareTo(edcal.firstDayOfNextMonth) == -1) {
              /*
               * Then the date is before the current month
@@ -372 +656 @@
          }
 
-         if (date.toString('dd') === '01') {
+         if (date.toString('dd') == '01') {
              /*
               * This this date is the first day of the month
@@ -439 +723 @@
                 newrow += '<div class="daylabel">' + _date.toString('d');
             }
-
 
             newrow += '</div>';
@@ -493 +776 @@
             tolerance: 'pointer',
             drop: function(event, ui) {
-                           //output('dropped ui.draggable.attr("id"): ' + ui.draggable.attr("id"));
-                           //output('dropped on jQuery(this).attr("id"): ' + jQuery(this).attr("id"));
-                           //output('ui.draggable.html(): ' + ui.draggable.html());
-
-                           var dayId = ui.draggable.parent().parent().parent().attr('id');
-
-                           edcal.doDrop(dayId, ui.draggable.attr('id'), jQuery(this).attr('id'));
-                        }
+                   // edcal.output('dropped ui.draggable.attr("id"): ' + ui.draggable.attr("id"));
+                   // edcal.output('dropped on jQuery(this).attr("id"): ' + jQuery(this).attr("id"));
+                   // edcal.output('ui.draggable.html(): ' + ui.draggable.html());
+                   var dayId = ui.draggable.parent().parent().parent().attr('id');
+                   // edcal.output('dayId: ' + dayId);
+                   edcal.doDrop(dayId, ui.draggable.attr('id'), jQuery(this).attr('id'));
+                }
             });
 
@@ -542 +824 @@
 
          // Step 3. Add the item to the new DOM parent
+         // Step 3a. Check whether we dropped it on a day or on the Drafts Drawer
          jQuery('#' + newDate + ' .postlist').append(edcal.createPostItem(post, newDate));
 
@@ -594 +877 @@
      */
     handleDrag: function(event, ui) {
-         if (edcal.isMoving || edcal.isDragScrolling) {
+         if (edcal.isMoving || edcal.isDragScrolling
+             /*
+                TODO: make sure that if we are on top of the drafts drawer
+                we don't dragScroll.
+             */
+             ) {
              return;
          }
@@ -653 +941 @@
           * significantly faster.  Especially on IE.
           */
+         // edcal.output('post.id: '+post.id+'\ndayobjId: '+dayobjId);
          jQuery('#' + dayobjId + ' > div > ul').append(edcal.createPostItem(post, dayobjId));
     },
@@ -706 +995 @@
 
 
-
-
     /*
      * Confirms if you want to delete the specified post
@@ -744 +1031 @@
         var date = jQuery(this).parent().parent().attr('id');
 
-        var formattedtime = '10:00';
-        if (edcal.timeFormat !== 'H:i' && edcal.timeFormat !== 'G:i') {
+        var formattedtime = edcal.defaultTime;
+        if (edcal.timeFormat !== 'H:i') {
             formattedtime += ' AM';
         }
@@ -789 +1076 @@
 
          if (!post.title || post.title === '') {
-             return false;
+             return;
          }
 
@@ -855 +1142 @@
                         edcal.showError(edcal.checksum_error);
                     }
-                    return false;
+                    return;
                 }
 
@@ -881 +1168 @@
                     callback(res);
                 }
-                
-                return true;
             },
             error: function(xhr) {
@@ -1040 +1325 @@
      */
     findPostForId: function(/*string*/ dayobjId, /*string*/ postId) {
-        if (edcal.posts[dayobjId]) {
+         if (edcal.posts[dayobjId]) {
             for (var i = 0; i < edcal.posts[dayobjId].length; i++) {
                 if (edcal.posts[dayobjId][i] &&
@@ -1048 +1333 @@
             }
         }
-         
-        return null;
     },
 
@@ -1060 +1343 @@
                  if (edcal.posts[dayobjId][i] &&
                      'post-' + edcal.posts[dayobjId][i].id === postId) {
+                         edcal.output('(#' + postId+').remove()  -  post-'+edcal.posts[dayobjId][i].id);
                      edcal.posts[dayobjId][i] = null;
                      jQuery('#' + postId).remove();
@@ -1192 +1476 @@
          }
 
-         if (edcal.authorPref) {
-             posttitle = sprintf(edcal.str_by, posttitle, '<span class="postauthor">' + post.author + '</span>');
-         }
+         posttitlewithauthor = sprintf(edcal.str_by, posttitle, '<span class="postauthor">' + post.author + '</span>');
 
          var classString = '';
@@ -1201 +1483 @@
              return '<li onmouseover="edcal.showActionLinks(\'post-' + post.id + '\');" ' +
                  'onmouseout="edcal.hideActionLinks(\'post-' + post.id + '\');" ' +
-                 'id="post-' + post.id + '" class="post ' + post.status + ' ' + edcal.getPostEditableClass(post) + '"><div class="postlink ' + classString + '">' + posttitle + '</div>' +
+                 'id="post-' + post.id + '" class="post ' + post.status + ' ' + edcal.getPostEditableClass(post) + '"><div class="postlink ' + classString + '">' + 
+                     '<span class="titlewithoutauthor">' + posttitle + '</span>' +
+                     '<span class="titlewithauthor">' + posttitlewithauthor + '</span>' +
+                   '</div>' +
                  '<div class="postactions">' +
                  '<a href="' + post.editlink + '">' + edcal.str_edit + '</a> | ' +
                  '<a href="#" onclick="edcal.editPost(' + post.id + '); return false;">' + edcal.str_quick_edit + '</a> | ' +
                  '<a href="' + post.dellink + '" onclick="return edcal.confirmDelete(\'' + post.title + '\');">' + edcal.str_del + '</a> | ' +
-                 '<a href="' + post.permalink + '">' + edcal.str_view + '</a>' +
+                 '<a href="' + post.permalink + '"' +
+                   // ' onclick="edcal.getPost('+post.id+',function(r){ edcal.output(r) }); return false;"' + // for debugging
+                 '>' + edcal.str_view + '</a>' +
                  '</div></li>';
          } else {
              return '<li onmouseover="edcal.showActionLinks(\'post-' + post.id + '\');" ' +
                  'onmouseout="edcal.hideActionLinks(\'post-' + post.id + '\');" ' +
-                 'id="post-' + post.id + '" class="post ' + post.status + ' ' + edcal.getPostEditableClass(post) + '"><div class="postlink ' + classString + '">' + posttitle + '</div>' +
+                 'id="post-' + post.id + '" class="post ' + post.status + ' ' + edcal.getPostEditableClass(post) + '"><div class="postlink ' + classString + '">' + 
+                     '<span class="titlewithoutauthor">' + posttitle + '</span>' +
+                     '<span class="titlewithauthor">' + posttitlewithauthor + '</span>' +
+                   '</div>' +
                  '<div class="postactions">' +
                  '<a href="' + post.editlink + '">' + edcal.str_republish + '</a> | ' +
@@ -1543 +1833 @@
     savePosition: function() {
          var cal = jQuery('#edcal_scrollable');
+         var cal_cont = jQuery('#cal_cont');
          edcal.position = {
              top: cal.offset().top,
@@ -1581 +1872 @@
                                '}' +
                                '</style>');
+         jQuery('#draftsdrawer').css({height:cal_cont.height()});
+         jQuery('#draftsdrawer .postlist').css({height:cal.height()});
     },
 
@@ -1639 +1932 @@
 
     /*
-     * Initializes the calendar
-     */
-    init: function() {
-         if (jQuery('#edcal_scrollable').length === 0) {
-             /*
-              * This means we are on a page without the editorial
-              * calendar
-              */
-             return;
-         }
-
-        edcal.addFeedbackSection();
-
-        jQuery('#loading').hide();
-
-        jQuery('#edcal_scrollable').css('height', edcal.getCalHeight() + 'px');
-        edcal.windowHeight = jQuery(window).height();
-
-        /*
-         *  Add the days of the week
-         */
-        edcal.createDaysHeader();
-
-        /*
-         * We start by initializting the scrollable.  We use this to manage the
-         * scrolling of the calendar, but don't actually call it to animate the
-         * scrolling.  We specify an easing here because the default is "swing"
-         * and that has a conflict with JavaScript used in the BuddyPress plugin/
-         *
-         * This doesn't really change anything since the animation happens offscreen.
-         */
-        jQuery('#edcal_scrollable').scrollable({
-                                    vertical: true,
-                                    size: edcal.weeksPref,
-                                    keyboard: false,
-                                    keyboardSteps: 1,
-                                    speed: 100,
-                                    easing: 'linear'
-                                    });
-
-        var api = jQuery('#edcal_scrollable').scrollable();
-        
-        api.getConf().keyboard = false;
-
-        /*
-           When the user moves the calendar around we remember their
-           date and save it in a cookie.  Then we read the cookie back
-           when we reload so the calendar stays where the user left
-           it last.
-         */
-        var curDate = jQuery.cookie('edcal_date');
-
-        if (curDate) {
-            curDate = Date.parseExact(curDate, 'yyyy-dd-MM');
-            edcal.output('Resetting to date from the edcal_Date cookie: ' + curDate);
-        } else {
-            curDate = Date.today();
-        }
-
-        edcal.moveTo(curDate.clone());
-        
-        jQuery('#edcal_scrollable').bind('mousewheel', function(event, delta) {
-            var dir = delta > 0 ? false : true, vel = Math.abs(delta);
-            edcal.output(dir + ' at a velocity of ' + vel);
-
-            if (!edcal.isMoving && vel > 0.2) {
-                edcal.move(1, dir);
-            }
-            
-            return false;
-        });
-        
-        /*
-           We are handling all of our own events so we just cancel all events from
-           the scrollable.
-         */
-        api.onBeforeSeek(function(evt, direction) {
-            return false;
-        });
-
-        /*
-         * We also want to listen for a few other key events
-         */
-        jQuery(document).bind('keydown', function(evt) {
-            //if (evt.altKey || evt.ctrlKey) { return; }
-            //output("evt.altKey: " + evt.altKey);
-            //output("evt.keyCode: " + evt.keyCode);
-            //output("evt.ctrlKey: " + evt.ctrlKey);
-            
-            if (evt.keyCode === 27) { //escape key
-                edcal.hideForm();
-                return false;
-            }
-            
-            if (jQuery('#tooltip').is(':visible')) {
-                return false;
-            }
-
-            if ((evt.keyCode === 40 && !(evt.altKey || evt.ctrlKey))) {        // down arrow key
-                edcal.move(1, true);
-                return false;
-            } else if ((evt.keyCode === 38 && !(evt.altKey || evt.ctrlKey))) { // up arrow key
-                edcal.move(1, false);
-                return false;
-            } else if ((evt.keyCode === 34 && !(evt.altKey || evt.ctrlKey)) || //page down
-                evt.keyCode === 40 && evt.ctrlKey) {                           // Ctrl+down down arrow
-                edcal.move(edcal.weeksPref, true);
-                return false;
-            } else if ((evt.keyCode === 33 && !(evt.altKey || evt.ctrlKey)) || //page up
-                evt.keyCode === 38 && evt.ctrlKey) {                           // Ctrl+up up arrow
-                edcal.move(edcal.weeksPref, false);
-                return false;
-            }
-            
-            return true;
-        });
-        
-        edcal.getPosts(edcal.nextStartOfWeek(curDate).add(-3).weeks(),
-                       edcal.nextStartOfWeek(curDate).add(edcal.weeksPref + 3).weeks());
-        
-        /*
-           Now we bind the listeners for all of our links and the window
-           resize.
-         */
-        jQuery('#moveToToday').click(function() {
-            edcal.moveTo(Date.today());
-            edcal.getPosts(edcal.nextStartOfWeek(Date.today()).add(-3).weeks(),
-                           edcal.nextStartOfWeek(Date.today()).add(edcal.weeksPref + 3).weeks());
-            return false;
-        });
-        
-        jQuery('#prevmonth').click(function() {
-            edcal.move(edcal.weeksPref, false);
-            return false;
-        });
-
-        jQuery('#nextmonth').click(function() {
-            edcal.move(edcal.weeksPref, true);
-            return false;
-        });
-        
-        /*
-           We used to listen to resize events so we could make the calendar the right size
-           for the current window when it changed size, but this was causing a problem with
-           WordPress 3.3 and it never worked properly because the scroll position was a little
-           off so we are just skipping it.
-         */
-        /*function resizeWindow(e) {
-            if (edcal.windowHeight != jQuery(window).height()) {
-                jQuery('#edcal_scrollable').css('height', edcal.getCalHeight() + 'px');
-                edcal.windowHeight = jQuery(window).height();
-                edcal.savePosition();
-            }
-        }
-        jQuery(window).bind('resize', resizeWindow);*/
-
-        jQuery('#newPostScheduleButton').live('click', function(evt) {
-            // if the button is disabled, don't do anything
-            if (jQuery(this).hasClass('disabled')) {
-                return false;
-            }
-            // Otherwise,
-            // make sure we can't make duplicate posts by clicking twice quickly
-            jQuery(this).addClass('disabled');
-            // and save the post
-            return edcal.savePost(null, false, true);
-        });
-
-        jQuery('#edcal-title-new-field').bind('keyup', function(evt) {
-            if (jQuery('#edcal-title-new-field').val().length > 0 && jQuery('#edcal-time').val().length > 0) {
-                jQuery('#newPostScheduleButton').removeClass('disabled');
-            } else {
-                jQuery('#newPostScheduleButton').addClass('disabled');
-            }
-
-            if (evt.keyCode == 13) {    // enter key
-                /*
-                 * If the user presses enter we want to save the draft.
-                 */
-                return edcal.savePost(null, true);
-            }
-        });
-
-        jQuery('#edcal-status').bind('change', function(evt) {
-            edcal.updatePublishButton();
-        });
-
-        jQuery('#edcal_weeks_pref').live('keyup', function(evt) {
-            if (jQuery('#edcal_weeks_pref').val().length > 0) {
-                jQuery('#edcal_applyoptions').removeClass('disabled');
-            } else {
-                jQuery('#edcal_applyoptions').addClass('disabled');
-            }
-
-            if (evt.keyCode == 13) {    // enter key
-                edcal.saveOptions();
-            }
-
-        });
-
-        edcal.savePosition();
-
-        edcal.addOptionsSection();
-
-        jQuery('#edcal-time').timePicker({
-            show24Hours: edcal.timeFormat === 'H:i' || edcal.timeFormat === 'G:i',
-            separator: ':',
-            step: 30
-        });
-    },
-
-    /*
        This function updates the text of te publish button in the quick
        edit dialog to match the current operation.
@@ -1870 +1951 @@
     changeDate: function(/*string*/ newdate, /*Post*/ post, /*function*/ callback) {
          edcal.output('Changing the date of "' + post.title + '" to ' + newdate);
-         var newdateFormatted = edcal.getDayFromDayId(newdate).toString(edcal.wp_dateFormat);
+         var move_to_drawer = newdate=='00000000';
+         var move_from_drawer = post.date=='00000000';
+         var newdateFormatted = move_to_drawer ? '0000-00-00' : edcal.getDayFromDayId(newdate).toString(edcal.wp_dateFormat);
+         // edcal.output('newdate='+newdate+'\nnewdateFormatted='+newdateFormatted);
+         var olddate = move_from_drawer ? post.date : edcal.getDayFromDayId(post.date).toString(edcal.wp_dateFormat);
 
          var url = edcal.ajax_url() + '&action=edcal_changedate&postid=' + post.id +
              '&postStatus=' + post.status +
-             '&newdate=' + newdateFormatted + '&olddate=' + edcal.getDayFromDayId(post.date).toString(edcal.wp_dateFormat);
+             '&newdate=' + newdateFormatted + '&olddate=' + olddate;
 
          jQuery('#post-' + post.id).addClass('loadingclass');
@@ -1883 +1968 @@
             processData: false,
             timeout: 100000,
+            // dataType: 'text',
             dataType: 'json',
             success: function(res) {
+                edcal.output('res.post.date='+res.post.date);
+                edcal.output(res.post);
+                // console.log(res.post);
                 if (res.error) {
                     /*
@@ -1900 +1989 @@
                 }
 
-                edcal.removePostItem(res.post.date, 'post-' + res.post.id);
-                edcal.addPostItem(res.post, res.post.date);
-                edcal.addPostItemDragAndToolltip(res.post.date);
+                // edcal.output(res.post.date);
+                // var container = newdateFormatted == '0000-00-00' ? 
+
+                var removecont = move_to_drawer ? '00000000' : res.post.date;
+                var addcont = move_from_drawer ? newdate : removecont;
+                if ( res.post.date_gmt=='01011970' ) {
+                    // do somthing else
+                }
+
+                edcal.removePostItem(removecont, 'post-' + res.post.id);
+                // edcal.output('remove post from: '+removecont+', add post to: '+addcont);
+                edcal.addPostItem(res.post, addcont);
+                edcal.addPostItemDragAndToolltip(addcont);
 
                 if (callback) {
@@ -1926 +2025 @@
      */
     getPosts: function(/*Date*/ from, /*Date*/ to, /*function*/ callback) {
-         edcal.output('Getting posts from ' + from + ' to ' + to);
+         if ( !to )
+             to = '';
+         // edcal.output('Getting posts from ' + from + ' to ' + to);
 
          var shouldGet = edcal.cacheDates[from];
@@ -1936 +2037 @@
               * it somewhat, but we could get much better about this.
               */
-             edcal.output('Using cached results for posts from ' + from.toString('dd-MMM-yyyy') + ' to ' + to.toString('dd-MMM-yyyy'));
+             // edcal.output('Using cached results for posts from ' + from.toString('dd-MMM-yyyy') + ' to ' + to.toString('dd-MMM-yyyy'));
 
              if (callback) {
@@ -1961 +2062 @@
              dataType: 'text',
              success: function(res) {
+                // edcal.output(res);
                 jQuery('#loading').hide();
                 /*
@@ -2000 +2102 @@
                          */
                         post.date = post.date.replace(post.date.substring(2, 3), post.date.substring(2, 3).toUpperCase());
-
+                        if ( from=='00000000' )
+                            post.date = from;
+
+                        // edcal.output(post.date + ', post-' + post.id);
                         edcal.removePostItem(post.date, 'post-' + post.id);
                         edcal.addPostItem(post, post.date);
+                        // edcal.output(post.id + ', ' + post.date);
                         postDates[postDates.length] = post.date;
                     }
@@ -2018 +2124 @@
                  */
                 setTimeout(function() {
-                    edcal.output('Finished adding draggable support to ' + postDates.length + ' posts.');
+                    // edcal.output('Finished adding draggable support to ' + postDates.length + ' posts.');
                     jQuery.each(postDates, function(i, postDate) {
                         edcal.addPostItemDragAndToolltip(postDate);
@@ -2092 +2198 @@
             }
         });
-
-        return true;
-    },
-
-    /*
-       This function adds the scren options tab to the top of the screen.  I wish
+    },
+
+    /*
+       This function adds the screen options tab to the top of the screen.  I wish
        WordPress had a hook so I could provide this in PHP, but as of version 2.9.1
        they just have an internal loop for their own screen options tabs so we're
@@ -2109 +2213 @@
                    'onclick="edcal.toggleOptions(); return false;" ' +
                    'href="#" ' +
-                   'style="background-image: url(images/screen-options-right.gif); background-position: right 0px;">' + edcal.str_screenoptions + '</a>' +
+                   '>' + 
+                   edcal.str_screenoptions + 
+                   '</a>' +
              '</div>';
          
@@ -2191 +2297 @@
              jQuery('#screen-meta').show();
 
-             jQuery('#show-edcal-settings-link').css('background-image', 'url(images/screen-options-right-up.gif)');
+             jQuery('#show-edcal-settings-link').addClass('screen-meta-active');
          } else {
              jQuery('#contextual-help-wrap').slideUp('fast');
@@ -2202 +2308 @@
              edcal.helpMeta = null;
 
-             jQuery('#show-edcal-settings-link').css('background-image', 'url(images/screen-options-right.gif)');
+             jQuery('#show-edcal-settings-link').removeClass('screen-meta-active');
              jQuery('#contextual-help-link-wrap').css('visibility', '');
          }

editorial-calendar/branches/drafts_drawer/edcal.php

@@ -19 +19 @@
 Plugin Name: WordPress Editorial Calendar
 Description: The Editorial Calendar makes it possible to see all your posts and drag and drop them to manage your blog.
-Version: 1.8.6
+Version: 1.8.5
 Author: Colin Vernon, Justin Evans, Joachim Kudish, Mary Vogt, and Zack Grossbart
 Author URI: http://www.zackgrossbart.com
@@ -51 +51 @@
     
     protected $supports_custom_types;
+    protected $default_time;
 
     function __construct() {
@@ -69 +70 @@
          */
         $this->supports_custom_types = function_exists('get_post_types') && function_exists('get_post_type_object');
+
+        /*
+         * This is the default time that posts get created at, for now 
+         * we are using 10am, but this could become an option later.
+         */
+        $this->default_time = get_option("edcal_default_time") != "" ? get_option("edcal_default_time") : '10:00';        
         
         /*
@@ -154 +161 @@
             update_option("edcal_count", $edcal_count);
         }
-        
         
         /*
@@ -242 +248 @@
                 edcal.timeFormat = "<?php echo(get_option("time_format")); ?>";
                 edcal.previewDateFormat = "MMMM d";
+                edcal.defaultTime = "<?php echo $this->default_time; ?>";
     
                 /*
@@ -310 +317 @@
                 edcal.str_weekserror = <?php echo($this->edcal_json_encode(__('The calendar can only show between 1 and 5 weeks at a time.', 'editorial-calendar'))) ?>;
                 edcal.str_weekstt = <?php echo($this->edcal_json_encode(__('Select the number of weeks for the calendar to show.', 'editorial-calendar'))) ?>;
+
+                edcal.str_showdrafts = <?php echo($this->edcal_json_encode(__('Show Drafts'))) ?>;
+                edcal.str_hidedrafts = <?php echo($this->edcal_json_encode(__('Hide Drafts'))) ?>;
     
                 edcal.str_feedbackmsg = <?php echo($this->edcal_json_encode(__('<div id="feedbacksection">' . 
@@ -358 +368 @@
         <div class="wrap">
             <div class="icon32" id="icon-edit"><br/></div>
-            <h2 id="edcal_main_title"><?php echo($this->edcal_get_posttype_multiplename()); ?><?php echo(__(' Calendar', 'editorial-calendar')); ?></h2>
+            <h2 id="edcal_main_title"><?php echo sprintf( __('%1$s Calendar', 'editorial-calendar'), $this->edcal_get_posttype_multiplename() ) ?></h2>
             
             <div id="loadingcont">
@@ -364 +374 @@
             </div>
             
-            <div id="topbar" class="tablenav">
-                <div id="topleft" class="tablenav-pages">
+            <div id="topbar" class="tablenav clearfix">
+                <div id="topleft" class="tablenav-pages alignleft">
                     <h3>
                         <a href="#" title="<?php echo(__('Jump back', 'editorial-calendar')) ?>" class="prev page-numbers" id="prevmonth">&laquo;</a>
                         <span id="currentRange"></span>
                         <a href="#" title="<?php echo(__('Skip ahead', 'editorial-calendar')) ?>" class="next page-numbers" id="nextmonth">&raquo;</a>
+
+                        <a class="save button" title="<?php echo(__('Scroll the calendar and make the today visible', 'editorial-calendar')) ?>" id="moveToToday"><?php echo(__('Show Today', 'editorial-calendar')) ?></a>
                     </h3>
                 </div>
-                
-                <div id="topright">
-                    <button class="save button" title="<?php echo(__('Scroll the calendar and make the today visible', 'editorial-calendar')) ?>" id="moveToToday"><?php echo(__('Show Today', 'editorial-calendar')) ?></button>
+
+                <div id="topright" class="tablenav-pages alignright">
+                    <a class="save button" title="<?php echo(__('Show unscheduled posts', 'editorial-calendar')) ?>" id="showdraftsdrawer"><?php echo(__('Show Drafts', 'editorial-calendar')) ?></a>
                 </div>
             </div>
             
-            <div id="cal_cont">
+            <div id="draftsdrawer_cont">
+                <div id="draftsdrawer">
+                    <div class="draftsdrawerheadcont"><div class="dayhead"><?php echo(__('Unscheduled Drafts', 'editorial-calendar')) ?></div></div>
+                    <div class="day" id="00000000">
+                        <div id="draftsdrawer_loading"></div>
+                        <div id="unscheduled" class="dayobj"></div>
+                    </div>
+                </div>
+            </div>
+            
+            <div id="cal_cont"<?php if ( get_option("edcal_author_pref") == 'true' ) echo ' class="show-author"'; ?>>
                 <div id="edcal_scrollable" class="edcal_scrollable vertical">
                     <div id="cal"></div>
                 </div>
             </div>
-            
+
             <?php $this->edcal_edit_popup(); ?>
             
@@ -459 +481 @@
      * When we get a set of posts to populate the calendar we don't want
      * to get all of the posts.  This filter allows us to specify the dates
-     * we want.
+     * we want. We also exclude posts that have not been set to a specific date.
      */
     function edcal_filter_where($where = '') {
         global $edcal_startDate, $edcal_endDate;
-        $where .= " AND post_date >= '" . $edcal_startDate . "' AND post_date < '" . $edcal_endDate . "'";
+        if ( $edcal_startDate=='00000000' )
+            $where .= " AND post_date_gmt LIKE '0000%'";
+        else
+            $where .= " AND post_date >= '" . $edcal_startDate . "' AND post_date < '" . $edcal_endDate . "' AND post_date_gmt NOT LIKE '0000%'";
         return $where;
     }
@@ -520 +545 @@
         global $edcal_startDate, $edcal_endDate;
         
-        $edcal_startDate = isset($_GET['from'])?$_GET['from']:null;
-        $edcal_endDate = isset($_GET['to'])?$_GET['to']:null;
+        $edcal_startDate = isset($_GET['from']) ? $_GET['from'] : null;
+        $edcal_endDate = isset($_GET['to']) ? $_GET['to'] : null;
         global $post;
         $args = array(
@@ -528 +553 @@
             'post_parent' => null // any parent
         );
-        
+
         /* 
          * If we're in the specific post type case we need to add
@@ -537 +562 @@
             $args['post_type'] = $post_type;
         }
-        
-        add_filter('posts_where', array(&$this, 'edcal_filter_where'));
+
+        /* 
+         * We add a WHERE clause to filter by calendar date and/or by whether
+         * or not the posts have been scheduled to a specific date:
+         * WHERE `post_date_gmt` = '0000-00-00 00:00:00'
+         */
+
+        add_filter( 'posts_where', array(&$this, 'edcal_filter_where' ));
         $myposts = query_posts($args);
-        remove_filter('posts_where', array(&$this, 'edcal_filter_where'));
-        
+        remove_filter( 'posts_where', array(&$this, 'edcal_filter_where' ));
+
         ?>[
         <?php
@@ -662 +693 @@
         } else if ($timeFormat == "g:i A") {
             $timeFormat = "gA";
-        } else if ($timeFormat == "H:i" || $timeFormat == "G:i") {
+        } else if ($timeFormat == "H:i") {
             $timeFormat = "H";
         }
@@ -668 +699 @@
         setup_postdata($post);
         
-        if (get_post_status() == 'auto-draft' ||
-            get_post_status() == 'inherit') {
+        if (get_post_status() == 'auto-draft' || get_post_status() == 'inherit' ) {
             /*
              * WordPress 3 added a new post status of auto-draft so
-             * we want to hide them from the calendar
+             * we want to hide them from the calendar. 
+             * We also want to hide posts with type 'inherit'
              */
             return;
@@ -691 +722 @@
             $postTypeTitle = 'post';
         }
+
+        $post_date_gmt = date('dmY',strtotime($post->post_date_gmt));
+        if ( $post_date_gmt == '01011970' )
+            $post_date_gmt = '00000000';
         ?>
             {
                 "date" : "<?php the_time('d') ?><?php the_time('m') ?><?php the_time('Y') ?>", 
-                "time" : "<?php the_time() ?>", 
-                "formattedtime" : "<?php $this->edcal_json_encode(the_time($timeFormat)); ?>", 
-                "sticky" : "<?php echo(is_sticky($post->ID)); ?>",
-                "url" : "<?php $this->edcal_json_encode(the_permalink()); ?>", 
-                "status" : "<?php echo(get_post_status()); ?>",
-                "title" : <?php echo($this->edcal_json_encode(get_the_title())); ?>,
-                "author" : <?php echo($this->edcal_json_encode(get_the_author())); ?>,
-                "type" : "<?php echo(get_post_type( $post )); ?>",
-                "typeTitle" : "<?php echo($postTypeTitle); ?>",
+                "date_gmt" : "<?php echo $post_date_gmt; // we are not actually using this right now ?>",
+                "time" : "<?php echo trim(get_the_time()) ?>", 
+                "formattedtime" : "<?php $this->edcal_json_encode(the_time($timeFormat)) ?>", 
+                "sticky" : "<?php echo is_sticky($post->ID) ?>",
+                "url" : "<?php $this->edcal_json_encode(the_permalink()) ?>", 
+                "status" : "<?php echo get_post_status() ?>",
+                "title" : <?php echo $this->edcal_json_encode(get_the_title()) ?>,
+                "author" : <?php echo $this->edcal_json_encode(get_the_author()) ?>,
+                "type" : "<?php echo get_post_type( $post ) ?>",
+                "typeTitle" : "<?php echo $postTypeTitle ?>",
     
                 <?php if ( current_user_can('edit_post', $post->ID) ) {?>
-                "editlink" : "<?php echo(get_edit_post_link($id)); ?>",
+                "editlink" : "<?php echo get_edit_post_link($id) ?>",
                 <?php } ?>
     
@@ -712 +748 @@
                 <?php } ?>
     
-                "permalink" : "<?php echo(get_permalink($id)); ?>",
+                "permalink" : "<?php echo get_permalink($id) ?>",
                 "id" : "<?php the_ID(); ?>"
                 
@@ -730 +766 @@
      * when a user clicks the delete button, and allows the user to 
      * retain their position within the calendar without a page refresh.
-     * It is not called unless the user has permission to delete the post
+     * It is not called unless the user has permission to delete the post.
      */
     function edcal_deletepost() {
@@ -868 +904 @@
     /*
      * This is a helper function to create a new draft post on a specified date
-     * or update an existing post
+     * or update an existing post.
      */
     function edcal_savepost() {
@@ -994 +1030 @@
         $edcal_oldDate = isset($_GET['olddate'])?$_GET['olddate']:null;
         $edcal_postStatus = isset($_GET['postStatus'])?$_GET['postStatus']:null;
-        
+        $move_to_drawer = $edcal_newDate == '0000-00-00';
+        $move_from_drawer = $edcal_oldDate == '00000000';
+
+        global $post;
+        $args = array(
+            'posts_id' => $edcal_postid,
+        );
+        $post = get_post($edcal_postid);
+        setup_postdata($post);
+
+        /*
+         * Posts in WordPress have more than one date.  There is the GMT date,
+         * the date in the local time zone, the modified date in GMT and the
+         * modified date in the local time zone.  We update all of them.
+         */
+        if ( $move_from_drawer ) {
+            /* 
+             * Set the date to 'unscheduled' [ie. 0], and while we're at it we 
+             * add the default time so it won't be at midnight. We use this date 
+             * further down in the concurrency check, and this will make the dates
+             * technically off by 10 hours, but it's still the same day. We only do 
+             * this for posts that were created as drafts.  Works for now, but
+             * we would have to revamp this if we use an actual timestamp check.
+             */
+            $post->post_date = '0000-00-00 '.$this->default_time.':00';
+        } else if ( $move_to_drawer ) {
+            // echo ( "\r\npost->post_date_gmt=".$post->post_date_gmt);
+            $post->post_date_gmt = $post->post_date;
+        } else {
+            // set the scheduled time as our original time
+            $post->post_date_gmt = $post->post_date;
+        }
+// echo ( "\r\npost->post_date_gmt = $post->post_date_gmt \r\npost->post_date = $post->post_date");
+
+        /*
+         * Error-checking:
+         */
+        $error = false;
         if (!current_user_can('edit_post', $edcal_postid)) {
             /*
@@ -1000 +1073 @@
              * user has permission to edit posts.  Most of the time this
              * will never be run because you can't see the calendar unless
-             * you are at least an editor
+             * you are at least an editor.
              */
+            $error = EDCAL_PERMISSION_ERROR;
+        } else if ( date('Y-m-d', strtotime($post->post_date)) != date('Y-m-d', strtotime($edcal_oldDate)) ) {
+            /*
+             * We are doing optimistic concurrency checking on the dates.  If
+             * the user tries to move a post we want to make sure nobody else
+             * has moved that post since the page was last updated.  If the 
+             * old date in the database doesn't match the old date from the
+             * browser then we return an error to the browser along with the
+             * updated post data.
+             */
+            $error = EDCAL_CONCURRENCY_ERROR;
+        }
+
+        if ( $error ) {
+            // die('error= '.$error);
             ?>
             {
-                "error": <?php echo(EDCAL_PERMISSION_ERROR); ?>,
-            <?php
-            
-            global $post;
-            $args = array(
-                'posts_id' => $edcal_postid,
-            );
-            
-            $post = get_post($edcal_postid);
-            ?>
+                "error": <?php echo $error; ?>,
                 "post" :
             <?php
@@ -1022 +1101 @@
             die();
         }
-        
-        $post = get_post($edcal_postid, ARRAY_A);
-        setup_postdata($post);
-        
-        /*
-         * We are doing optimistic concurrency checking on the dates.  If
-         * the user tries to move a post we want to make sure nobody else
-         * has moved that post since the page was last updated.  If the 
-         * old date in the database doesn't match the old date from the
-         * browser then we return an error to the browser along with the
-         * updated post data.
-         */
-         if (date('Y-m-d', strtotime($post['post_date'])) != date('Y-m-d', strtotime($edcal_oldDate))) {
-            ?> {
-                "error": <?php echo(EDCAL_CONCURRENCY_ERROR); ?>,
-            <?php
-            
-            global $post;
-            $args = array(
-                'posts_id' => $edcal_postid,
-            );
-            
-            $post = get_post($edcal_postid);
-            ?>
-                "post" :
-            <?php
-                $this->edcal_postJSON($post, false, true);
-            ?> }
-            
-            <?php
-            die();
-        }
-        
-        /*
-         * Posts in WordPress have more than one date.  There is the GMT date,
-         * the date in the local time zone, the modified date in GMT and the
-         * modified date in the local time zone.  We update all of them.
-         */
-        $post['post_date_gmt'] = $post['post_date'];
-        
+
+
+        /*
+         * No errors, so let's go create our new post parameters to update
+         */
+        
+        $updated_post = array();
+        $updated_post['ID'] = $edcal_postid;
+
+        if ( !$move_to_drawer ) {
+            $updated_post['post_date'] = $edcal_newDate . substr($post->post_date, strlen($edcal_newDate));
+        }
+
         /*
          * When a user creates a draft and never sets a date or publishes it 
@@ -1069 +1121 @@
          * date out and leave the post as publish immediately.
          */
-        $needsEditDate = strpos($post['post_date_gmt'], "0000-00-00 00:00:00") === 0;
-        
-        $updated_post = array();
-        $updated_post['ID'] = $edcal_postid;
-        $updated_post['post_date'] = $edcal_newDate . substr($post['post_date'], strlen($edcal_newDate));
-        if ($needsEditDate != -1) {
-            $updated_post['edit_date'] = $edcal_newDate . substr($post['post_date'], strlen($edcal_newDate));
-        }
-        
+        $needsEditDate = preg_match( '/^0000/', $post->post_date_gmt );
+
+        if ( $needsEditDate ) {
+            // echo "\r\nneeds edit date\r\n";
+            $updated_post['edit_date'] = $edcal_newDate . substr($post->post_date, strlen($edcal_newDate));
+        }
+
+        if ( $move_to_drawer ) {
+            $updated_post['post_date_gmt'] = "0000-00-00 00:00:00";
+            $updated_post['edit_date'] = $post->post_date;
+        } else if ( $move_from_drawer ) {
+            $updated_post['post_date_gmt'] = get_gmt_from_date($post->post_date);
+            $updated_post['post_modified_gmt'] = get_gmt_from_date($post->post_date);
+        }
+
         /*
          * We need to make sure to use the GMT formatting for the date.
          */
-        $updated_post['post_date_gmt'] = get_gmt_from_date($updated_post['post_date']);
-        $updated_post['post_modified'] = $edcal_newDate . substr($post['post_modified'], strlen($edcal_newDate));
-        $updated_post['post_modified_gmt'] = get_gmt_from_date($updated_post['post_date']);
-        
-        if ($edcal_postStatus != $post['post_status']) {
+        if ( !$move_to_drawer ) {
+            $updated_post['post_date_gmt'] = get_gmt_from_date($updated_post['post_date']);
+            $updated_post['post_modified'] = $edcal_newDate . substr($post->post_modified, strlen($edcal_newDate));
+            $updated_post['post_modified_gmt'] = get_gmt_from_date($updated_post['post_date']);
+        }
+        
+        if ($edcal_postStatus != $post->post_status) {
             /*
              * We only want to update the post status if it has changed.
              * If the post status has changed that takes a few more steps
              */
-            wp_transition_post_status($edcal_postStatus, $post['post_status'], $post);
+            wp_transition_post_status($edcal_postStatus, $post->post_status, $post);
             $updated_post['post_status'] = $edcal_postStatus;
             
@@ -1104 +1164 @@
         }
         
+// die(var_dump($updated_post).'success!');
         /*
          * Now we finally update the post into the database

editorial-calendar/branches/drafts_drawer/languages/editorial-calendar-fr_FR.po

@@ -1 @@
-# Translation of the WordPress plugin Editorial Calendar by stresslimitdesign.
-# Copyright (C) 2010
-# This file is distributed under the same license as the  package.
-# COLIN VERNON <[email protected]>, 2010.
-#
+# Translation of WordPress Editorial Calendar in French (France)
+# This file is distributed under the same license as the WordPress Editorial Calendar package.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://wordpress.org/tag/editorial-calendar\n"
-"POT-Creation-Date: 2010-01-14 20:13+0000\n"
-"PO-Revision-Date: 2010-01-18 10:08-0500\n"
-"Last-Translator: Zack Grossbart <[email protected]>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
+"PO-Revision-Date: 2012-02-27 08:53:18+0000\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: GlotPress/0.1\n"
+"Project-Id-Version: WordPress Editorial Calendar\n"
 
-#: edcal.php:60
+msgid "%1$s Calendar"
+msgstr "Calendrier des %1$s"
+
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: edcal.php:130
-#: edcal.php:277
 msgid "en-US"
-msgstr "fr_FR"
+msgstr "fr-FR"
 
-#: edcal.php:138
-msgid "on"
-msgstr "le"
+msgid "%1$s by %2$s"
+msgstr "%1$s par %2$s"
 
-#: edcal.php:139
-msgid "by"
-msgstr "par"
+msgid "New Post"
+msgstr "Nouveau post"
 
-#: edcal.php:140
-msgid "at"
-msgstr "à"
-
-#: edcal.php:142
-msgid "Add a post"
-msgstr "Ajouter un post"
-
-#: edcal.php:144
-msgid "Sunday"
-msgstr "Dimanche"
-
-#: edcal.php:145
-msgid "Monday"
-msgstr "Lundi"
-
-#: edcal.php:146
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: edcal.php:147
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: edcal.php:148
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: edcal.php:149
-msgid "Friday"
-msgstr "Vendredi"
-
-#: edcal.php:150
-msgid "Saturday"
-msgstr "Samedi"
-
-#: edcal.php:152
 msgid " [DRAFT]"
 msgstr " [BROUILLON]"
 
-#: edcal.php:153
+msgid " [PENDING]"
+msgstr " [EN ATTENTE]"
+
+msgid " [STICKY]"
+msgstr " [EN PRIORITÉ]"
+
+msgid " [DRAFT, STICKY]"
+msgstr " [BROUILLON, STICKY]"
+
+msgid " [PENDING, STICKY]"
+msgstr " [EN ATTENTE, EN PRIORITÉ]"
+
 msgid "Edit"
 msgstr "Éditer"
 
-#: edcal.php:154
+msgid "Quick Edit"
+msgstr "Éditer rapide"
+
 msgid "Delete"
 msgstr "Supprimer"
 
-#: edcal.php:155
 msgid "View"
 msgstr "Voir"
 
-#: edcal.php:156
-msgid "Republish"
-msgstr "Republier"
+msgid "Status:"
+msgstr "Statut :"
 
-#: edcal.php:157
-msgid "Status:"
-msgstr "Status :"
-
-#: edcal.php:158
 msgid "Cancel"
 msgstr "Annuler"
 
-#: edcal.php:159
-msgid "Post Title:"
-msgstr "Titre du post :"
+msgid "Title"
+msgstr "Titre"
 
-#: edcal.php:160
-msgid "Save Draft"
-msgstr "Enregistrer brouillon"
+msgid "Content"
+msgstr "Contenu"
 
-#: edcal.php:161
-msgid "Save and Edit Draft"
-msgstr "Enregistrer et éditer brouillon"
+msgid "Add a new post on %s"
+msgstr "Ajouter un article au %s"
 
-#: edcal.php:162
-msgid "Add a new post on "
-msgstr "Ajouter un nouveau post le "
+msgid "New %s - "
+msgstr "Nouveau %s - "
 
-#: edcal.php:164
-msgid "You are about to delete this post "
-msgstr "Vous allez supprimer le post '"
+msgid "Update"
+msgstr "Mettre à jour"
 
-#: edcal.php:165
-msgid "Press cancel to stop, OK to delete."
-msgstr "'. Cliquer sur annuler pour arrêter, OK pour supprimer"
+msgid "Schedule"
+msgstr "Horaire"
 
-#: edcal.php:167
+msgid "Submit for Review"
+msgstr "Soumettre pour revision"
+
+msgid "Save"
+msgstr "Sauvegarder"
+
+msgid "Edit %1$s - %2$s"
+msgstr "Éditer %1$s - %2$s"
+
+msgid "Scheduled"
+msgstr "Planifié"
+
+msgid "You are about to delete the post \""
+msgstr "Vous allez supprimer le post \""
+
+msgid "\". Press Cancel to stop, OK to delete."
+msgstr "\". Cliquer OK pour confirmer."
+
 msgid "Looks like someone else already moved this post."
 msgstr "Quelqu'un d'autre a déjà déplacé ce post."
 
-#: edcal.php:168
 msgid "You do not have permission to edit posts."
 msgstr "Vous n'avez pas les permissions d'éditer les posts."
 
-#: edcal.php:169
 msgid "Invalid checksum for post. This is commonly a cross-site scripting error."
-msgstr "Désolé, le post est corrompu, il se peut que ce soit une erreur de 'cross-site scripting' (XSS)."
+msgstr "Désolé, les donnés de l'article sont corrompu, il se peut que ce soit une erreur de 'cross-site scripting' (XSS)."
 
-#: edcal.php:170
 msgid "There was an error contacting your blog."
 msgstr "Une erreur est survenue en contactant votre blog."
 
-#: edcal.php:172
 msgid "Screen Options"
 msgstr "Options d'affichage"
 
-#: edcal.php:173
-msgid "Calendar Options"
-msgstr "Options du calendrier"
+msgid "Colors"
+msgstr "Couleurs"
 
-#: edcal.php:174
+msgid "Drafts: "
+msgstr "Brouillons:"
+
 msgid "Apply"
 msgstr "Appliquer"
 
-#: edcal.php:175
-msgid "Show "
-msgstr "Afficher "
+msgid "Show on screen"
+msgstr "Afficher"
 
-#: edcal.php:176
-msgid "weeks at a time"
+msgid " weeks at a time"
 msgstr "semaines à la fois"
 
-#: edcal.php:177
+msgid "Show in Calendar Cell"
+msgstr "Afficher en calendrier"
+
+msgid "Author"
+msgstr "Auteur"
+
+msgid "Status"
+msgstr "Statut"
+
+msgid "Time of day"
+msgstr "Heure"
+
+msgid "An error occurred while loading the calendar: "
+msgstr "Il y a eu un erreur en chargement du calendrier : "
+
 msgid "The calendar can only show between 1 and 5 weeks at a time."
 msgstr "Le calendrier ne peut afficher qu'une à cinq semaines à la fois."
 
-#: edcal.php:178
-msgid "Enter the number of weeks, between 1 and 5, for the calendar to show."
-msgstr "Entrer le nombre de semaines que le calendrier va afficher (entre 1 et 5)"
+msgid "Select the number of weeks for the calendar to show."
+msgstr "Sélectionner le nombre de semaines à afficher au calendrier."
 
-#: edcal.php:214
-msgid "Posts Calendar"
-msgstr "Calendrier de posts"
+msgid "<h2>We're done</h2>We've finished collecting data.  Thank you for helping us make the calendar better."
+msgstr "<h2>C'est tout !</h2>On a tout finit. Merci de nous aider à améliorer le calendrier."
 
-#: edcal.php:223
 msgid "Jump back"
 msgstr "Mois précédent"
 
-#: edcal.php:225
 msgid "Skip ahead"
 msgstr "Mois suivant"
 
-#: edcal.php:230
-msgid "Jump to today"
-msgstr "Retourner à aujourd'hui"
+msgid "Scroll the calendar and make the today visible"
+msgstr "Sauter à aujourd'hui"
 
-#: edcal.php:230
-msgid "Today"
-msgstr "Aujourd'hui"
+msgid "Show Today"
+msgstr "Voir aujourd'hui"
 
-#: edcal.php:361
-#: - this is the time format (12 hour or 24 hour)
-msgid "ga"
-msgstr "H"
+msgid "Edit Post"
+msgstr "Éditer l'article"
 
+msgid "Time"
+msgstr "Heure"
+
+msgid "Draft"
+msgstr "Brouillon"
+
+msgid "Pending Review"
+msgstr "En attente de relecture"
+
+msgid "Posts "
+msgstr "Articles"
+
+msgid "Post "
+msgstr "Article"
+
+msgid "Error in deleting..."
+msgstr "Erreur en supprimant..."
+
+msgid "ltr"
+msgstr "ltr"

editorial-calendar/branches/drafts_drawer/readme.txt

@@ -4 +4 @@
 Requires at least: 2.8.5
 Tested up to: 3.3.1
-Stable tag: 1.8.6
+Stable tag: 1.8.5
 
 The Editorial Calendar makes it possible to see all your posts and drag and drop them to manage your blog.
@@ -31 +31 @@
 <h4>Make it better</h4>
 
-Thank you to everyone who has given us feedback and helped us improve this plugin.  If you have questions, problems, or ideas for new features please let us know at <a href="mailto:[email protected]">[email protected]</a>.  
+Thank you to everyone who has given us feedback and helped us improve this plugin.  If you have questions, problems, or ideas for new features please let us know at <a href="mailto:[email protected]">[email protected]</a>.
+
+<h4>Translate it</h4>
+
+Again, thanks to all who have already helped make the plugin available in so many languages. If you would like to help us translate the plugin into your language, or if you use it in a language other than English already and would like to help us keep it up to date, please write to us at <a href="mailto:[email protected]">[email protected]</a>
 
 == Installation ==
@@ -130 +134 @@
 * Subscribers can't see the calendar.
 
-You can see how it looks for different usres on our <a href="http://www.zackgrossbart.com/extras/sandbox/wp-admin/edit.php?page=cal">Zack's WordPress Sandbox</a> with the following users:
+You can see how it looks for different users on our <a href="http://www.zackgrossbart.com/extras/sandbox/wp-admin/edit.php?page=cal">Zack's WordPress Sandbox</a> with the following users:
 
 * edgar the Editor
@@ -168 +172 @@
 == Changelog ==
 
-= 1.9 =
-
-We are now filtering out all posts with a status of inherit from the calendar so we don't show additional revisions.
-
-= 1.8.6 =
-
-The calendar is now using the proper he_IL locale code for Hebrew instead of he.
+= 2.0 =
+
+The calendar now has a new major feature, the "drafts drawer," a kind of post staging area where we make all posts that have not been scheduled available to drag onto the calendar. We can also now drag posts from the calendar back into the drafts drawer to "un-schedule" them.
+
+Moved around functions in the js and css to be a bit more readable, and added table of contents to css file.
+
+Updated css of Screen Options to be more core WordPress.
 
 = 1.8.5 =
@@ -253 +257 @@
 
 = 1.0 =
-* Fixed a scrolling issue that prevented cliking the action links on the last post if the individual day showed a scroll bar.
+* Fixed a scrolling issue that prevented clicking the action links on the last post if the individual day showed a scroll bar.
 
 = 0.9 =