Changeset 9518

Timestamp:

11/04/2008 11:15:59 PM (16 years ago)

Author:

azaozz

Message:

Add "Choose from popular tags" to the tags postbox

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/css/colors-fresh.css (modified) (1 diff)
• wp-admin/css/global.css (modified) (6 diffs)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/js/post.js (modified) (2 diffs)
• wp-admin/wp-admin.css (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -422 +422 @@
     ) );
     $x->send();
+    break;
+case 'get-tagcloud' :
+    if ( !current_user_can( 'manage_categories' ) )
+        die('-1');
+
+    $tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
+    
+    if ( empty( $tags ) )
+        die('0');
+    
+    foreach ( $tags as $key => $tag ) {
+        $tags[ $key ]->link = '#';
+        $tags[ $key ]->id = $tag->term_id;
+    }
+
+    $return = wp_generate_tag_cloud( $tags );
+
+    if ( empty($return) )
+        die('0');
+    
+    echo $return;
+    
+    exit;
     break;
 case 'add-comment' :

trunk/wp-admin/css/colors-fresh.css

@@ -890 +890 @@
 
 #timestampdiv input,
-#namediv input {
+#namediv input,
+#tagsdiv #the-tagcloud {
     border-color: #ddd;
 }

trunk/wp-admin/css/global.css

@@ -146 +146 @@
 /* styles for use by people extending the WordPress interface */
 
-body    {
-    margin: 0;
-    padding: 0;
-}
-
-body, td {
-    font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
-}
-
-form, label input {
-    margin: 0;
-    padding: 0;
-}
-
-img {
-    border: 0;
+body,
+td {
+    font: 13px/19px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif;
+}
+
+p {
+    margin: 1em 0;
+}
+
+blockquote {
+    margin: 1em;
 }
 
@@ -168 +163 @@
 }
 
-li, dd {
+li,
+dd {
     margin-bottom: 6px;
 }
 
-p, li, dl, dd, dt {
+p,
+li,
+dl,
+dd,
+dt {
     line-height: 140%;
 }
 
-textarea, input, select {
-    font: 13px Verdana, Arial, Helvetica, sans-serif;
+textarea,
+input,
+select {
+    font: 13px/19px Verdana, Arial, Helvetica, sans-serif;
     margin: 1px;
     padding: 3px;
@@ -292 +294 @@
 }
 
-.widefat td, .widefat th {
+.widefat td,
+.widefat th {
     border-bottom-width: 1px;
     border-bottom-style: solid;
@@ -327 +330 @@
     padding: 10px 0 22px;
 }
-/*
-th.check-column + th, th.check-column + td {
-    padding-left: 5px;
-}
-*/
+
 .widefat .num,
 .widefat .column-comments {
@@ -341 +340 @@
 }
 
-.wrap, .updated, .error {
+.wrap,
+.updated,
+.error {
     margin: 0 15px;
     padding: 0;
 }
 
-.updated, .error {
+.updated,
+.error {
     border-width: 1px;
     border-style: solid;
@@ -353 +355 @@
 }
 
-.updated p, .error p {
+.updated p,
+.error p {
     margin: 0.6em 0;
 }
 
-.wrap .updated, .wrap .error {
+.wrap .updated,
+.wrap .error {
     margin: auto 0 0;
 }
 
-.updated a, .error a {
+.updated a,
+.error a {
     text-decoration: underline;
 }

trunk/wp-admin/edit-form-advanced.php

@@ -236 +236 @@
 <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
 <div id="tagchecklist"></div>
-<p><a href='#'><?php _e( 'Choose from tags' ); ?></a></p>
+<p id="tagcloud-link" class="hide-if-no-js"><a href='#'><?php _e( 'Choose from the most popular tags' ); ?></a></p>
 <?php
 }

trunk/wp-admin/edit-tags.php

@@ -243 +243 @@
     wp_tag_cloud(array('link' => 'edit')); 
 else
-    wp_tag_cloud(); 
+    wp_tag_cloud();
 ?>
 </div>

trunk/wp-admin/js/post.js

@@ -38 +38 @@
 }
 
-function tag_flush_to_text() {
-    var newtags = jQuery('#tags-input').val() + ',' + jQuery('#newtag').val();
+function tag_flush_to_text(e,a) {
+    a = a || false;
+    var text = a ? jQuery(a).text() : jQuery('#newtag').val();
+    var newtags = jQuery('#tags-input').val();
+    var t = text.replace( /\s*([^,]+)[\s,]*/, '$1' );
+
+    if ( newtags.indexOf(t) != -1 )
+        return false;
+
+    newtags += ',' + text;
+
     // massage
     newtags = newtags.replace( /\s+,+\s*/g, ',' ).replace( /,+/g, ',' ).replace( /,+\s+,+/g, ',' ).replace( /,+\s*$/g, '' ).replace( /^\s*,+/g, '' );
     jQuery('#tags-input').val( newtags );
     tag_update_quickclicks();
-    jQuery('#newtag').val('');
-    jQuery('#newtag').focus();
+    if ( ! a ) {
+        jQuery('#newtag').val('');
+        jQuery('#newtag').focus();
+    }
     return false;
 }
@@ -59 +70 @@
         return false;
     }
-}
+};
+
+(function($){
+    tagCloud = {
+        init : function() {
+            $('#tagcloud-link').click(function(){tagCloud.get(); return false;});
+        },
+
+        get : function() {
+            $.post('admin-ajax.php', {'action':'get-tagcloud'}, function(r, stat) {
+                if ( 0 == r || 'success' != stat )
+                    r = wpAjax.broken;
+
+                r = '<p id="the-tagcloud">'+r+'</p>';
+                $('#tagcloud-link').after($(r));
+                $('#the-tagcloud a').click(function(){
+                    tag_flush_to_text(0,this);
+                    return false;
+                });
+            });
+        }
+    }
+})(jQuery);
 
 jQuery(document).ready( function($) {
+    tagCloud.init();
+    
     // close postboxes that should be closed
     jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');

trunk/wp-admin/wp-admin.css

@@ -2922 +2922 @@
     margin-top: 8px;
 }
+
+#tagsdiv #the-tagcloud {
+    margin: 5px 5px 10px;
+    padding: 8px;
+    border-width: 1px;
+    border-style: solid;
+    line-height: 1.8em;
+    word-spacing: 3px;
+    -moz-border-radius: 6px;
+    -khtml-border-radius: 6px;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+}

trunk/wp-includes/category-template.php

@@ -665 +665 @@
     foreach ( $tags as $key => $tag ) {
         $count = $counts[ $key ];
-        $tag_link = clean_url( $tag->link );
+        $tag_link = '#' != $tag->link ? clean_url( $tag->link ) : '#';
         $tag_id = isset($tags[ $key ]->id) ? $tags[ $key ]->id : $key;
         $tag_name = $tags[ $key ]->name;