diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 6446ec82c..fd08347b4 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -102,11 +102,12 @@ div.dashboard-widget-submit { border-top-color: #ccc; } -div.ui-tabs-panel { - border-color: #f1f1f1; +div.tabs-panel, +ul#category-tabs li.tabs { + border-color: #dfdfdf; } -ul#category-tabs li.ui-tabs-selected { +ul#category-tabs li.tabs { background-color: #f1f1f1; } @@ -367,7 +368,7 @@ div.dashboard-widget-submit input:hover, color: #eaf2fa !important; } -#side-sortables #category-tabs .ui-tabs-selected a { +#side-sortables #category-tabs .tabs a { color: #333; } @@ -473,8 +474,8 @@ a, } /* Because we don't want visited on these links */ -body.press-this .ui-tabs-selected a, -body.press-this .ui-tabs-selected a:hover { +body.press-this .tabs a, +body.press-this .tabs a:hover { background-color: #fff; border-color: #c6d9e9; border-bottom-color: #fff; @@ -1428,7 +1429,7 @@ fieldset.inline-edit-col-right .inline-edit-col { background-color: #f5f5f5; } -#post-body ul#category-tabs li.ui-tabs-selected a { +#post-body ul#category-tabs li.tabs a { color: #333; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 6388284de..fceea1926 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -102,11 +102,12 @@ div.dashboard-widget-submit { border-top-color: #ccc; } -div.ui-tabs-panel { - border-color: #f1f1f1; +div.tabs-panel, +ul#category-tabs li.tabs { + border-color: #dfdfdf; } -ul#category-tabs li.ui-tabs-selected { +ul#category-tabs li.tabs { background-color: #f1f1f1; } @@ -359,7 +360,7 @@ div.dashboard-widget-submit input:hover, color: #EAF2FA !important; } -#side-sortables #category-tabs .ui-tabs-selected a { +#side-sortables #category-tabs .tabs a { color: #333; } @@ -460,8 +461,8 @@ h3.dashboard-widget-title small a:hover { } /* Because we don't want visited on these links */ -body.press-this .ui-tabs-selected a, -body.press-this .ui-tabs-selected a:hover { +body.press-this .tabs a, +body.press-this .tabs a:hover { background-color: #fff; border-color: #c6d9e9; border-bottom-color: #fff; @@ -1409,7 +1410,7 @@ fieldset.inline-edit-col-right .inline-edit-col { background-color: #f5f5f5; } -#post-body ul#category-tabs li.ui-tabs-selected a { +#post-body ul#category-tabs li.tabs a { color: #333; } diff --git a/wp-admin/css/press-this.css b/wp-admin/css/press-this.css index 9c9a9d8d6..25aff1aae 100644 --- a/wp-admin/css/press-this.css +++ b/wp-admin/css/press-this.css @@ -345,7 +345,7 @@ h3.tb { margin-left: 18px; } -#categorydiv div.ui-tabs-panel { +#categorydiv div.tabs-panel { height: 150px; overflow: auto; } diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index eadb7071b..ea016dd44 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -313,17 +313,17 @@ foreach ( get_object_taxonomies('post') as $tax_name ) { function post_categories_meta_box($post) { ?>
-'+e+"
");a("a",e).click(function(){var f=a(this).parents("p").attr("id");tag_flush_to_text(f.substr(f.indexOf("-")+1),this);return false});a("#"+c).after(e)})}};a(document).ready(function(){tagCloud.init()})})(jQuery);jQuery(document).ready(function(g){var d=false,j,e,h=true,a=g("#timestamp").html(),b=g("#post-visibility-display").html(),i="";if(typeof autosave!="function"){autosave=function(){}}postboxes.add_postbox_toggles("post");make_slugedit_clickable();tag_init();g("#title").blur(function(){if((g("#post_ID").val()>0)||(g("#title").val().length==0)){return}autosave()});g(".newtag").each(function(){var k=g(this).parents("div.tagsdiv").attr("id");g(this).suggest("admin-ajax.php?action=ajax-tag-search&tax="+k,{delay:500,minchars:2,multiple:true,multipleSep:", "})});g("#category-tabs a").click(function(){var k=g(this).attr("href");g(this).parent().addClass("ui-tabs-selected").siblings("li").removeClass("ui-tabs-selected");g(".ui-tabs-panel").hide();g(k).show();if("#categories-all"==k){deleteUserSetting("cats")}else{setUserSetting("cats","pop")}return false});if(getUserSetting("cats")){g('#category-tabs a[href="#categories-pop"]').click()}g("#newcat").one("focus",function(){g(this).val("").removeClass("form-input-tip")});g("#category-add-sumbit").click(function(){g("#newcat").focus()});j=function(){if(d){return}d=true;var k=jQuery(this),m=k.is(":checked"),l=k.val().toString();g("#in-category-"+l+", #in-popular-category-"+l).attr("checked",m);d=false};popularCats=g("#categorychecklist-pop :checkbox").map(function(){return parseInt(jQuery(this).val(),10)}).get().join(",");catAddBefore=function(k){if(!g("#newcat").val()){return false}k.data+="&popular_ids="+popularCats+"&"+jQuery("#categorychecklist :checked").serialize();return k};e=function(n,l){var k=jQuery("#newcat_parent"),m=k.find('option[value="-1"]');g(l.what+" response_data",n).each(function(){var o=g(g(this).text());o.find("label").each(function(){var q=g(this),s=q.find("input").val(),t=q.find("input")[0].id,p,r;g("#"+t).change(j).change();if(k.find('option[value="'+s+'"]').size()){return}p=g.trim(q.text());r=g('').text(p);k.prepend(r)});m.attr("selected","selected")})};g("#categorychecklist").wpList({alt:"",response:"category-ajax-response",addBefore:catAddBefore,addAfter:e});g("#category-add-toggle").click(function(){g("#category-adder").toggleClass("wp-hidden-children");g('#category-tabs a[href="#categories-all"]').click();return false});g(".categorychecklist .popular-category :checkbox").change(j).filter(":checked").change(),i="";function f(){if(g("#post-visibility-select input:radio:checked").val()!="public"){g("#sticky").attr("checked",false);g("#sticky-span").hide()}else{g("#sticky-span").show()}if(g("#post-visibility-select input:radio:checked").val()!="password"){g("#password-span").hide()}else{g("#password-span").show()}}function c(){var k,m,l,n;k=new Date(g("#aa").val(),g("#mm").val()-1,g("#jj").val(),g("#hh").val(),g("#mn").val());m=new Date(g("#hidden_aa").val(),g("#hidden_mm").val()-1,g("#hidden_jj").val(),g("#hidden_hh").val(),g("#hidden_mn").val());l=new Date(g("#cur_aa").val(),g("#cur_mm").val()-1,g("#cur_jj").val(),g("#cur_hh").val(),g("#cur_mn").val());if(k>l&&g("#original_post_status").val()!="future"){n=postL10n.publishOnFuture;g("#publish").val(postL10n.schedule)}else{if(k<=l&&g("#original_post_status").val()!="publish"){n=postL10n.publishOn;g("#publish").val(postL10n.publish)}else{n=postL10n.publishOnPast;g("#publish").val(postL10n.update)}}if(m.toUTCString()==k.toUTCString()){g("#timestamp").html(a)}else{g("#timestamp").html(n+" "+g("#mm option[value="+g("#mm").val()+"]").text()+" "+g("#jj").val()+", "+g("#aa").val()+" @ "+g("#hh").val()+":"+g("#mn").val()+" ")}if(g("#post-visibility-select input:radio:checked").val()=="private"){g("#publish").val(postL10n.update);if(g("#post_status option[value=publish]").length==0){g("#post_status").append('")}g("#post_status option[value=publish]").html(postL10n.privatelyPublished);g("#post_status option[value=publish]").attr("selected",true);g(".edit-post-status").hide()}else{if(g("#original_post_status").val()=="future"||g("#original_post_status").val()=="draft"){if(g("#post_status option[value=publish]").length!=0){g("#post_status option[value=publish]").remove();g("#post_status").val(g("#hidden_post_status").val())}}else{g("#post_status option[value=publish]").html(postL10n.published)}g(".edit-post-status").show()}g("#post-status-display").html(g("#post_status :selected").text());if(g("#post_status :selected").val()=="private"||g("#post_status :selected").val()=="publish"){g("#save-post").hide()}else{g("#save-post").show();if(g("#post_status :selected").val()=="pending"){g("#save-post").show().val(postL10n.savePending)}else{g("#save-post").show().val(postL10n.saveDraft)}}}g(".edit-visibility").click(function(){if(g("#post-visibility-select").is(":hidden")){f();g("#post-visibility-select").slideDown("normal");g(".edit-visibility").hide()}return false});g(".cancel-post-visibility").click(function(){g("#post-visibility-select").slideUp("normal");g("#visibility-radio-"+g("#hidden-post-visibility").val()).attr("checked",true);g("#post_password").val(g("#hidden_post_password").val());g("#sticky").attr("checked",g("#hidden-post-sticky").attr("checked"));g("#post-visibility-display").html(b);g(".edit-visibility").show();c();return false});g(".save-post-visibility").click(function(){g("#post-visibility-select").slideUp("normal");g(".edit-visibility").show();c();if(g("#post-visibility-select input:radio:checked").val()!="public"){g("#sticky").attr("checked",false)}if(true==g("#sticky").attr("checked")){i="Sticky"}else{i=""}g("#post-visibility-display").html(postL10n[g("#post-visibility-select input:radio:checked").val()+i]);return false});g("#post-visibility-select input:radio").change(function(){f()});g(".edit-timestamp").click(function(){if(g("#timestampdiv").is(":hidden")){g("#timestampdiv").slideDown("normal");g(".edit-timestamp").hide()}return false});g(".cancel-timestamp").click(function(){g("#timestampdiv").slideUp("normal");g("#mm").val(g("#hidden_mm").val());g("#jj").val(g("#hidden_jj").val());g("#aa").val(g("#hidden_aa").val());g("#hh").val(g("#hidden_hh").val());g("#mn").val(g("#hidden_mn").val());g(".edit-timestamp").show();c();return false});g(".save-timestamp").click(function(){g("#timestampdiv").slideUp("normal");g(".edit-timestamp").show();c();return false});g(".edit-post-status").click(function(){if(g("#post-status-select").is(":hidden")){g("#post-status-select").slideDown("normal");g(this).hide()}return false});g(".save-post-status").click(function(){g("#post-status-select").slideUp("normal");g(".edit-post-status").show();c();return false});g(".cancel-post-status").click(function(){g("#post-status-select").slideUp("normal");g("#post_status").val(g("#hidden_post_status").val());g(".edit-post-status").show();c();return false});jQuery("#the-list").wpList({addAfter:function(k,l){g("table#list-table").show();if(jQuery.isFunction(autosave_update_post_ID)){autosave_update_post_ID(l.parsed.responses[0].supplemental.postid)}},addBefore:function(k){k.data+="&post_id="+jQuery("#post_ID").val();return k}});g("#post-preview").click(function(k){if(1>g("#post_ID").val()&&autosaveFirst){autosaveDelayPreview=true;autosave();return false}g("input#wp-preview").val("dopreview");g("form#post").attr("target","wp-preview").submit().attr("target","");g("input#wp-preview").val("");return false});if(typeof tinyMCE!="undefined"){g("#title")[g.browser.opera?"keypress":"keydown"](function(k){if(k.which==9&&!k.shiftKey&&!k.controlKey&&!k.altKey){if((g("#post_ID").val()<1)&&(g("#title").val().length>0)){autosave()}if(tinyMCE.activeEditor&&!tinyMCE.activeEditor.isHidden()&&h){k.preventDefault();h=false;tinyMCE.activeEditor.focus();return false}}})}}); \ No newline at end of file +function array_unique_noempty(b){var c=[];jQuery.each(b,function(a,d){d=jQuery.trim(d);if(d&&jQuery.inArray(d,c)==-1){c.push(d)}});return c}function new_tag_remove_tag(){var e=jQuery(this).attr("id"),a=e.split("-check-num-")[1],c=jQuery(this).parents(".tagsdiv"),b=c.find(".the-tags").val().split(","),d=[];delete b[a];jQuery.each(b,function(f,g){g=jQuery.trim(g);if(g){d.push(g)}});c.find(".the-tags").val(d.join(",").replace(/\s*,+\s*/,",").replace(/,+/,",").replace(/,+\s+,+/,",").replace(/,+\s*$/,"").replace(/^\s*,+/,""));tag_update_quickclicks(c);return false}function tag_update_quickclicks(b){if(jQuery(b).find(".the-tags").length==0){return}var a=jQuery(b).find(".the-tags").val().split(",");jQuery(b).find(".tagchecklist").empty();shown=false;jQuery.each(a,function(e,f){var c,d;f=jQuery.trim(f);if(!f.match(/^\s+$/)&&""!=f){d=jQuery(b).attr("id")+"-check-num-"+e;c='X '+f+" ";jQuery(b).find(".tagchecklist").append(c);jQuery("#"+d).click(new_tag_remove_tag)}});if(shown){jQuery(b).find(".tagchecklist").prepend(""+postL10n.tagsUsed+"'+e+"
");a("a",e).click(function(){var f=a(this).parents("p").attr("id");tag_flush_to_text(f.substr(f.indexOf("-")+1),this);return false});a("#"+c).after(e)})}};a(document).ready(function(){tagCloud.init()})})(jQuery);jQuery(document).ready(function(g){var d=false,j,e,h=true,a=g("#timestamp").html(),b=g("#post-visibility-display").html(),i="";if(typeof autosave!="function"){autosave=function(){}}postboxes.add_postbox_toggles("post");make_slugedit_clickable();tag_init();g("#title").blur(function(){if((g("#post_ID").val()>0)||(g("#title").val().length==0)){return}autosave()});g(".newtag").each(function(){var k=g(this).parents("div.tagsdiv").attr("id");g(this).suggest("admin-ajax.php?action=ajax-tag-search&tax="+k,{delay:500,minchars:2,multiple:true,multipleSep:", "})});g("#category-tabs a").click(function(){var k=g(this).attr("href");g(this).parent().addClass("tabs").siblings("li").removeClass("tabs");g(".tabs-panel").hide();g(k).show();if("#categories-all"==k){deleteUserSetting("cats")}else{setUserSetting("cats","pop")}return false});if(getUserSetting("cats")){g('#category-tabs a[href="#categories-pop"]').click()}g("#newcat").one("focus",function(){g(this).val("").removeClass("form-input-tip")});g("#category-add-sumbit").click(function(){g("#newcat").focus()});j=function(){if(d){return}d=true;var k=jQuery(this),m=k.is(":checked"),l=k.val().toString();g("#in-category-"+l+", #in-popular-category-"+l).attr("checked",m);d=false};popularCats=g("#categorychecklist-pop :checkbox").map(function(){return parseInt(jQuery(this).val(),10)}).get().join(",");catAddBefore=function(k){if(!g("#newcat").val()){return false}k.data+="&popular_ids="+popularCats+"&"+jQuery("#categorychecklist :checked").serialize();return k};e=function(n,l){var k=jQuery("#newcat_parent"),m=k.find('option[value="-1"]');g(l.what+" response_data",n).each(function(){var o=g(g(this).text());o.find("label").each(function(){var q=g(this),s=q.find("input").val(),t=q.find("input")[0].id,p,r;g("#"+t).change(j).change();if(k.find('option[value="'+s+'"]').size()){return}p=g.trim(q.text());r=g('').text(p);k.prepend(r)});m.attr("selected","selected")})};g("#categorychecklist").wpList({alt:"",response:"category-ajax-response",addBefore:catAddBefore,addAfter:e});g("#category-add-toggle").click(function(){g("#category-adder").toggleClass("wp-hidden-children");g('#category-tabs a[href="#categories-all"]').click();return false});g(".categorychecklist .popular-category :checkbox").change(j).filter(":checked").change(),i="";function f(){if(g("#post-visibility-select input:radio:checked").val()!="public"){g("#sticky").attr("checked",false);g("#sticky-span").hide()}else{g("#sticky-span").show()}if(g("#post-visibility-select input:radio:checked").val()!="password"){g("#password-span").hide()}else{g("#password-span").show()}}function c(){var k,m,l,n;k=new Date(g("#aa").val(),g("#mm").val()-1,g("#jj").val(),g("#hh").val(),g("#mn").val());m=new Date(g("#hidden_aa").val(),g("#hidden_mm").val()-1,g("#hidden_jj").val(),g("#hidden_hh").val(),g("#hidden_mn").val());l=new Date(g("#cur_aa").val(),g("#cur_mm").val()-1,g("#cur_jj").val(),g("#cur_hh").val(),g("#cur_mn").val());if(k>l&&g("#original_post_status").val()!="future"){n=postL10n.publishOnFuture;g("#publish").val(postL10n.schedule)}else{if(k<=l&&g("#original_post_status").val()!="publish"){n=postL10n.publishOn;g("#publish").val(postL10n.publish)}else{n=postL10n.publishOnPast;g("#publish").val(postL10n.update)}}if(m.toUTCString()==k.toUTCString()){g("#timestamp").html(a)}else{g("#timestamp").html(n+" "+g("#mm option[value="+g("#mm").val()+"]").text()+" "+g("#jj").val()+", "+g("#aa").val()+" @ "+g("#hh").val()+":"+g("#mn").val()+" ")}if(g("#post-visibility-select input:radio:checked").val()=="private"){g("#publish").val(postL10n.update);if(g("#post_status option[value=publish]").length==0){g("#post_status").append('")}g("#post_status option[value=publish]").html(postL10n.privatelyPublished);g("#post_status option[value=publish]").attr("selected",true);g(".edit-post-status").hide()}else{if(g("#original_post_status").val()=="future"||g("#original_post_status").val()=="draft"){if(g("#post_status option[value=publish]").length!=0){g("#post_status option[value=publish]").remove();g("#post_status").val(g("#hidden_post_status").val())}}else{g("#post_status option[value=publish]").html(postL10n.published)}g(".edit-post-status").show()}g("#post-status-display").html(g("#post_status :selected").text());if(g("#post_status :selected").val()=="private"||g("#post_status :selected").val()=="publish"){g("#save-post").hide()}else{g("#save-post").show();if(g("#post_status :selected").val()=="pending"){g("#save-post").show().val(postL10n.savePending)}else{g("#save-post").show().val(postL10n.saveDraft)}}}g(".edit-visibility").click(function(){if(g("#post-visibility-select").is(":hidden")){f();g("#post-visibility-select").slideDown("normal");g(".edit-visibility").hide()}return false});g(".cancel-post-visibility").click(function(){g("#post-visibility-select").slideUp("normal");g("#visibility-radio-"+g("#hidden-post-visibility").val()).attr("checked",true);g("#post_password").val(g("#hidden_post_password").val());g("#sticky").attr("checked",g("#hidden-post-sticky").attr("checked"));g("#post-visibility-display").html(b);g(".edit-visibility").show();c();return false});g(".save-post-visibility").click(function(){g("#post-visibility-select").slideUp("normal");g(".edit-visibility").show();c();if(g("#post-visibility-select input:radio:checked").val()!="public"){g("#sticky").attr("checked",false)}if(true==g("#sticky").attr("checked")){i="Sticky"}else{i=""}g("#post-visibility-display").html(postL10n[g("#post-visibility-select input:radio:checked").val()+i]);return false});g("#post-visibility-select input:radio").change(function(){f()});g(".edit-timestamp").click(function(){if(g("#timestampdiv").is(":hidden")){g("#timestampdiv").slideDown("normal");g(".edit-timestamp").hide()}return false});g(".cancel-timestamp").click(function(){g("#timestampdiv").slideUp("normal");g("#mm").val(g("#hidden_mm").val());g("#jj").val(g("#hidden_jj").val());g("#aa").val(g("#hidden_aa").val());g("#hh").val(g("#hidden_hh").val());g("#mn").val(g("#hidden_mn").val());g(".edit-timestamp").show();c();return false});g(".save-timestamp").click(function(){g("#timestampdiv").slideUp("normal");g(".edit-timestamp").show();c();return false});g(".edit-post-status").click(function(){if(g("#post-status-select").is(":hidden")){g("#post-status-select").slideDown("normal");g(this).hide()}return false});g(".save-post-status").click(function(){g("#post-status-select").slideUp("normal");g(".edit-post-status").show();c();return false});g(".cancel-post-status").click(function(){g("#post-status-select").slideUp("normal");g("#post_status").val(g("#hidden_post_status").val());g(".edit-post-status").show();c();return false});jQuery("#the-list").wpList({addAfter:function(k,l){g("table#list-table").show();if(jQuery.isFunction(autosave_update_post_ID)){autosave_update_post_ID(l.parsed.responses[0].supplemental.postid)}},addBefore:function(k){k.data+="&post_id="+jQuery("#post_ID").val();return k}});g("#post-preview").click(function(k){if(1>g("#post_ID").val()&&autosaveFirst){autosaveDelayPreview=true;autosave();return false}g("input#wp-preview").val("dopreview");g("form#post").attr("target","wp-preview").submit().attr("target","");g("input#wp-preview").val("");return false});if(typeof tinyMCE!="undefined"){g("#title")[g.browser.opera?"keypress":"keydown"](function(k){if(k.which==9&&!k.shiftKey&&!k.controlKey&&!k.altKey){if((g("#post_ID").val()<1)&&(g("#title").val().length>0)){autosave()}if(tinyMCE.activeEditor&&!tinyMCE.activeEditor.isHidden()&&h){k.preventDefault();h=false;tinyMCE.activeEditor.focus();return false}}})}}); \ No newline at end of file diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index 8e3730d41..d1260eed3 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -472,7 +472,7 @@ var ajaxurl = '';