Changeset 8143

Timestamp:

06/20/2008 05:57:14 PM (18 years ago)

Author:

mdawaffe

Message:

crazyhorse: first pass at QuickPress dashboard widget. Slightly broken. Bug fixes to follow

Location:

branches/crazyhorse/wp-admin

Files:

• admin-header.php (modified) (1 diff)
• css/dashboard.css (modified) (1 diff)
• includes/dashboard.php (modified) (4 diffs)
• includes/post.php (modified) (1 diff)
• post.php (modified) (1 diff)
• press-this.php (modified) (2 diffs)

branches/crazyhorse/wp-admin/admin-header.php

@@ -2 +2 @@
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 if (!isset($_GET["page"])) require_once('admin.php');
-if ( $editing ) {
-    if ( user_can_richedit() )
-        wp_enqueue_script( 'wp_tiny_mce' );
-}
 wp_enqueue_script( 'wp-gears' );
 

branches/crazyhorse/wp-admin/css/dashboard.css

@@ -55 +55 @@
     font-weight: bold;
 }
+
+form .input-text-wrap {
+    border-style: solid;
+    border-width: 1px;
+    padding: 2px 3px;
+    border-color: #CCCCCC;
+}
+
+form .input-text-wrap input {
+    border: 0pt none;
+    outline-color: -moz-use-text-color;
+    outline-style: none;
+    outline-width: medium;
+    padding: 0pt;
+    width: 100%;
+    border-style: solid;
+    color: #333333;
+}
+
+form .textarea-wrap {
+    border-style: solid;
+    border-width: 1px;
+    padding: 0;
+    border-color: #CCCCCC;
+}
+
+form .textarea-wrap textarea {
+    border: 0pt none;
+}
+
+
+
 
 /* Widgets */

branches/crazyhorse/wp-admin/includes/dashboard.php

@@ -34 +34 @@
     wp_register_sidebar_widget( 'dashboard_recent_comments', __( 'Recent Comments' ), 'wp_dashboard_recent_comments',
         array( 'all_link' => 'edit-comments.php', 'notice' => $notice, 'width' => 'half' )
+    );
+
+
+    // QuickPress Widget
+    wp_register_sidebar_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press',
+        array( 'width' => 'half', 'height' => 'double' )
     );
 
@@ -132 +138 @@
     // Hard code the sidebar's widgets and order
     $dashboard_widgets = array();
+    $dashboard_widgets[] = 'dashboard_quick_press';
     $dashboard_widgets[] = 'dashboard_recent_comments';
     $dashboard_widgets[] = 'dashboard_incoming_links';
@@ -141 +148 @@
     // Filter widget order
     $dashboard_widgets = apply_filters( 'wp_dashboard_widgets', $dashboard_widgets );
+    if ( in_array( 'dashboard_quick_press', $dashboard_widgets ) ) {
+        add_action( 'admin_head', 'wp_teeny_mce' );
+        add_action( 'admin_head', 'wp_dashboard_quick_press_js' );
+    }
 
     $wp_dashboard_sidebars = array( 'wp_dashboard' => $dashboard_widgets, 'array_version' => 3.5 );
@@ -258 +269 @@
 /* Dashboard Widgets */
 
+function wp_dashboard_quick_press( $sidebar_args ) {
+    extract( $sidebar_args, EXTR_SKIP );
+
+    echo $before_widget;
+
+    echo $before_title;
+    echo $widget_name;
+    echo $after_title;
+
+?>
+
+    <form name="post" action="<?php echo clean_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press">
+        <h3><label for="title"><?php _e('Title') ?></label></h3>
+        <div class="input-text-wrap">
+            <input type="text" name="post_title" id="title" autocomplete="off" />
+        </div>
+
+        <h3><label for="content"><?php _e('Post') ?></label></h3>
+        <div class="textarea-wrap">
+            <textarea name="content" id="quickpress-content" class="mceEditor" rows="3" cols="15"></textarea>
+        </div>
+
+        <h3><label for="tags-input"><?php _e('Tags') ?></label></h3>
+        <div class="input-text-wrap">
+            <input type="text" name="tags_input" id="tags-input" />
+        </div>
+        <p><?php _e('Separate tags with commas'); ?></p>
+
+        <p class="submit">
+            <input type="hidden" name="action" value="post-quickpress" />
+            <?php wp_nonce_field('add-post'); ?>
+            <input type="submit" name="save" id="save-post" class="button" value="<?php _e('Save'); ?>" />
+            <input type="submit" name="publish" id="publish" accesskey="p" class="button button-highlighted" value="<?php _e('Publish'); ?>" />
+        </p>
+
+<?php
+    $drafts_query = new WP_Query( array(
+        'post_type' => 'post',
+        'what_to_show' => 'posts',
+        'post_status' => 'draft',
+        'author' => $GLOBALS['current_user']->ID,
+        'posts_per_page' => 5,
+        'orderby' => 'modified',
+        'order' => 'DESC'
+    ) );
+
+    if ( $drafts_query->posts ) :
+        $list = array();
+        foreach ( $drafts_query->posts as $draft ) {
+            $url = get_edit_post_link( $draft->ID );
+            $title = get_the_title( $draft->ID );
+            $list[] = "<a href='$url' title='" . sprintf( __( 'Edit "%s"' ), attribute_escape( $title ) ) . "'>$title</a>";
+        }
+?>
+
+        <h3><?php _e('Recent Drafts'); ?></h3>
+        <p id='recent-drafts'>
+            <?php echo join( ', ', $list ); ?>
+        </p>
+
+<?php
+
+    endif; // drafts
+
+?>
+
+    </form>
+
+<?php
+
+    echo $after_widget;
+}
+
+function wp_dashboard_quick_press_js() {
+?>
+<script type="text/javascript">
+/* <![CDATA[ */
+var quickPressLoad = function($) {
+    var t = $('#quick-press').submit( function() {
+        t.load( t.attr( 'action' ) + ' #quick-press', t.serializeArray(), function() {
+            quickPressLoad($);
+            if ( 'undefined' != typeof wpTeenyMCEInit && $.isFunction( wpTeenyMCEInit ) ) { wpTeenyMCEInit(); }
+        } );
+        return false;
+    } );
+    $('#publish').click( function() { t.append( "<input type='hidden' name='publish' value='publish' />" ); } );
+};
+jQuery( quickPressLoad );
+/* ]]> */
+</script>
+<?php
+}
+
+
 function wp_dashboard_recent_comments( $sidebar_args ) {
     global $comment;

branches/crazyhorse/wp-admin/includes/post.php

@@ -682 +682 @@
     return _wp_put_post_revision( $_POST, true );
 }
+
+/**
+ * wp_teeny_mce() - adds a trimmed down version of the tinyMCE editor used on the Write -> Post screen.
+ *
+ * @package WordPress
+ * @since 2.6
+ */
+function wp_teeny_mce( $args = null ) {
+    if ( !user_can_richedit() )
+        return;
+
+    $defaults = array(
+        'buttons1' => 'bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink'
+    );
+    $args = wp_parse_args( $args, $defaults );
+    if ( is_array( $args['buttons1'] ) )
+        $args['buttons1'] = join( ',', $args['buttons1'] );
+
+    $language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
+
+?>
+
+<script type="text/javascript" src="<?php echo clean_url( site_url( 'wp-includes/js/tinymce/tiny_mce.js' ) ); ?>"></script>
+<script type="text/javascript">
+/* <![CDATA[ */
+<?php
+    // Add TinyMCE languages
+    @include_once( ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php' );
+
+    if ( isset($strings) )
+        echo $strings;
+
+?>
+    (function() {
+        var base = tinymce.baseURL, sl = tinymce.ScriptLoader, ln = "<?php echo $language; ?>";
+
+        sl.markDone(base + '/langs/' + ln + '.js');
+        sl.markDone(base + '/themes/advanced/langs/' + ln + '.js');
+        sl.markDone(base + '/themes/advanced/langs/' + ln + '_dlg.js');
+    })();
+    
+    var wpTeenyMCEInit = function() {
+    tinyMCE.init({
+        mode: "textareas",
+        editor_selector: "mceEditor",
+        language : "<?php echo $language; ?>",
+        width: "100%",
+        theme : "advanced",
+        theme_advanced_buttons1 : "<?php echo $args['buttons1']; ?>",
+        theme_advanced_buttons2 : "",
+        theme_advanced_buttons3 : "",
+        theme_advanced_toolbar_location : "top",
+        theme_advanced_toolbar_align : "left",
+        theme_advanced_statusbar_location : "bottom",
+        theme_advanced_resizing : true,
+        theme_advanced_resize_horizontal : false,
+        skin : "wp_theme",
+        dialog_type : "modal",
+        relative_urls : false,
+        remove_script_host : false,
+        convert_urls : false,
+        apply_source_formatting : false,
+        remove_linebreaks : false,
+        accessibility_focus : false,
+        tab_focus : ":next",
+        plugins : "safari,inlinepopups",
+        entities : "38,amp,60,lt,62,gt",
+        force_p_newlines : true
+    });
+    };
+    wpTeenyMCEInit();
+/* ]]> */
+</script>
+
+<?php
+}

branches/crazyhorse/wp-admin/post.php

@@ -58 +58 @@
 
 switch($action) {
+case 'post-quickpress':
+    require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+    add_filter( 'wp_dashboard_widgets', create_function( '$a', 'return array( "dashboard_quick_press" );' ) );
+    wp_dashboard_setup();
+    wp_dashboard();
+    // no break
 case 'postajaxpost':
 case 'post':
     check_admin_referer('add-post');
 
-    $post_ID = 'post' == $action ? write_post() : edit_post();
+    $post_ID = 'postajaxpost' == $action ? edit_post() : write_post();
 
-    redirect_post($post_ID);
+    if ( 'post-quickpress' !== $action )
+        redirect_post($post_ID);
     exit();
     break;

branches/crazyhorse/wp-admin/press-this.php

@@ -234 +234 @@
     <title><?php _e('Press This') ?></title>
 
-    <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js"></script>
 <?php
     add_thickbox();
     wp_enqueue_style('press-this');
     wp_enqueue_style( 'colors' );
-    wp_enqueue_script('post');
+    wp_enqueue_script( 'post' );
+
+    wp_teeny_mce();
 
     do_action('admin_print_styles');
@@ -245 +246 @@
     do_action('admin_head');
 ?>
-    <script type="text/javascript">
-    <?php if ( user_can_richedit() ) { 
-        $language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
-        // Add TinyMCE languages
-        @include_once( dirname(__FILE__).'/../wp-includes/js/tinymce/langs/wp-langs.php' );
-        if ( isset($strings) ) echo $strings; ?>
-            (function() {
-                var base = tinymce.baseURL, sl = tinymce.ScriptLoader, ln = "<?php echo $language; ?>";
-
-                sl.markDone(base + '/langs/' + ln + '.js');
-                sl.markDone(base + '/themes/advanced/langs/' + ln + '.js');
-                sl.markDone(base + '/themes/advanced/langs/' + ln + '_dlg.js');
-            })();
-            
-            tinyMCE.init({
-                mode: "textareas",
-                editor_selector: "mceEditor",
-                language : "<?php echo $language; ?>",
-                width: "100%",
-                theme : "advanced",
-                theme_advanced_buttons1 : "bold,italic,underline,blockquote,separator,strikethrough,bullist,numlist,undo,redo,link,unlink",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "top",
-                theme_advanced_toolbar_align : "left",
-                theme_advanced_statusbar_location : "bottom",
-                theme_advanced_resizing : true,
-                theme_advanced_resize_horizontal : false,
-                skin : "wp_theme",
-                dialog_type : "modal",
-                relative_urls : false,
-                remove_script_host : false,
-                convert_urls : false,
-                apply_source_formatting : false,
-                remove_linebreaks : false,
-                accessibility_focus : false,
-                tab_focus : ":next",
-                plugins : "safari,inlinepopups",
-                entities : "38,amp,60,lt,62,gt",
-                force_p_newlines : true
-            });
-    <?php } ?>
-
-    jQuery('#tags-input').hide();
+<script type="text/javascript">
+    jQuery('#tags-input').hide();
 
     tag_update_quickclicks();