Changeset 10916

Timestamp:

04/13/2009 01:17:59 AM (16 years ago)

Author:

azaozz

Message:

Resizing and animation for widgets, see #9511

Location:

trunk/wp-admin

Files:

• css/colors-classic.css (modified) (1 diff)
• css/colors-fresh.css (modified) (1 diff)
• css/widgets.css (modified) (2 diffs)
• includes/widgets.php (modified) (3 diffs)
• js/widgets.dev.js (modified) (6 diffs)
• js/widgets.js (modified) (1 diff)
• widgets.php (modified) (1 diff)

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

@@ -1573 +1573 @@
     border-color: #DDDDDD;
 }
+
+.sidebar-name:hover {
+    color: #d54e21;
+}
+

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

@@ -1575 +1575 @@
     border-color: #DDDDDD;
 }
+
+.sidebar-name:hover {
+    color: #d54e21;
+}
+

trunk/wp-admin/css/widgets.css

@@ -20 +20 @@
     width: 300px;
     margin: 15px 0 18px;
+    position: relative;
 }
 
@@ -91 +92 @@
 
 .widget .widget-inside {
-    margin: 15px;
+    padding: 15px;
     font-size: 11px;
     display: none;

trunk/wp-admin/includes/widgets.php

@@ -178 +178 @@
     $widget_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
     $id_base = isset($control['id_base']) ? $control['id_base'] : $widget_id;
+    $multi_number = isset($sidebar_args['_multi_num']) ? $sidebar_args['_multi_num'] : '';
+    $add_new = isset($sidebar_args['_add']) ? $sidebar_args['_add'] : '';
 
     // We aren't showing a widget control, we're outputing a template for a mult-widget control
@@ -186 +188 @@
         if ( isset($control['id_base']) )
             $id_format = $control['id_base'] . '-__i__';
-
-        $multi_number = $sidebar_args['_multi_num'];
     }
 
@@ -216 +216 @@
             <input type="hidden" name="widget-id" class="widget-id" value="<?php echo $id_format; ?>" />
             <input type="hidden" name="id_base" class="id_base" value="<?php echo $id_base; ?>" />
-            <input type="hidden" name="widget-width" value="<?php echo $control['width']; ?>" />
-            <input type="hidden" name="widget-height" value="<?php echo $control['height']; ?>" />
+            <input type="hidden" name="widget-width" class="widget-width" value="<?php echo $control['width']; ?>" />
+            <input type="hidden" name="widget-height" class="widget-height" value="<?php echo $control['height']; ?>" />
             <input type="hidden" name="widget_number" class="widget_number" value="<?php echo $widget_number; ?>" />
-<?php
-            if ( isset($multi_number) )
-                echo "\t\t\t<input type='hidden' name='multi_number' class='multi_number' value='$multi_number' />\n";
-                
-            if ( isset($sidebar_args['_add']) )
-                echo "\t\t\t<input type='hidden' name='add_new' class='add_new' value='" . $sidebar_args['_add'] . "' />\n"; ?>
+            <input type="hidden" name="multi_number" class="multi_number" value="<?php echo $multi_number; ?>" />
+            <input type="hidden" name="add_new" class="add_new" value="<?php echo $add_new; ?>" />
 
             <div class="widget-control-actions">

trunk/wp-admin/js/widgets.dev.js

@@ -21 +21 @@
             handle: '.widget-title',
             distance: 2,
-            tolerance: 'pointer',
-        //  forcePlaceholderSize: true,
             helper: 'clone',
+            zIndex: 5,
             start: function() {
                 wpWidgets.fixWebkit(1);
@@ -42 +41 @@
             cursor: 'move',
             distance: 2,
-            tolerance: 'pointer',
-        //  forcePlaceholderSize: true,
-        //  helper: 'clone',
             opacity: 0.65,
             start: function(e,ui) {
                 wpWidgets.fixWebkit(1);
+                ui.item.find('.widget-inside').hide();
+                ui.item.css({'marginLeft':'','width':''});
             },
             stop: function(e,ui) {
                 var add = ui.item.find('input.add_new').val(), n = ui.item.find('input.multi_number').val(), id = ui.item.attr('id'), sb = $(this).parent().attr('id');
+                ui.item.css({'marginLeft':'','width':''});
 
-                if ( add ) {
+                if ( add && n ) {
                     if ( 'multi' == add ) {
                         ui.item.html( ui.item.html().replace(/<[^<>]+>/g, function(m){ return m.replace(/__i__/g, n); }) );
@@ -93 +92 @@
     save : function(data, sb, del, t) {
         var a;
-        sb = sb || '';
+
         $('#' + sb + ' .ajax-feedback').css('visibility', 'visible');
 
@@ -123 +122 @@
                 }
             } else {
-                $(t).parents('.widget-inside').hide();
+                $(t).parents('.widget-inside').hide('fast');
             }
         });
@@ -131 +130 @@
         n = n ? 'none' : '';
         $('body').css({
-          WebkitUserSelect: n,
-          KhtmlUserSelect: n
+            WebkitUserSelect: n,
+            KhtmlUserSelect: n
         });
     },
@@ -139 +138 @@
         sc = sc || document;
         $('a.widget-action', sc).click(function(){
-            $(this).parents('.widget-top').siblings('.widget-inside').toggle();
+            var w = parseInt( $(this).parents('.widget').find('.widget-width').val(), 10 ), css = {}, inside = $(this).parents('.widget-top').siblings('.widget-inside');
+            if ( inside.is(':hidden') ) {
+                if ( w > 270 && inside.parents('.widgets-sortables').length ) {
+                    css['width'] = w + 30 + 'px';
+                    if ( inside.parents('.widget-liquid-right').length )
+                        css['marginLeft'] = 270 - w + 'px';
+                    inside.parents('.widget').css(css); 
+                }
+                inside.show('fast');
+            } else {
+                inside.parents('.widget').css({'width':'','marginLeft':''});
+                inside.hide('fast');
+            }
             return false;
         });

trunk/wp-admin/js/widgets.js

@@ -1 @@
-var wpWidgets;(function(a){wpWidgets={init:function(){var b;a("h3.sidebar-name").click(function(){var d=a(this).siblings(".widgets-sortables");if(d.is(":visible")){d.hide().sortable("disable")}else{d.show().sortable("enable").sortable("refresh")}a(this).siblings("#widget-list").toggle()});this.addEvents();a("#widget-list .widget").draggable({connectToSortable:".widgets-sortables",handle:".widget-title",distance:2,tolerance:"pointer",helper:"clone",start:function(){wpWidgets.fixWebkit(1)},stop:function(d,c){if(b){a(b).hide()}b="";wpWidgets.fixWebkit()}});a(".widgets-sortables").sortable({placeholder:"widget-placeholder",connectWith:".widgets-sortables",items:".widget",handle:".widget-title",cursor:"move",distance:2,tolerance:"pointer",opacity:0.65,start:function(d,c){wpWidgets.fixWebkit(1)},stop:function(f,c){var d=c.item.find("input.add_new").val(),i=c.item.find("input.multi_number").val(),h=c.item.attr("id"),g=a(this).parent().attr("id");if(d){if("multi"==d){c.item.html(c.item.html().replace(/<[^<>]+>/g,function(e){return e.replace(/__i__/g,i)}));c.item.attr("id",h.replace(/__i__/g,i));i++;a("li#"+h).find("input.multi_number").val(i)}else{if("single"==d){c.item.attr("id","new-"+h);b="li#"+h}}wpWidgets.addEvents(c.item);wpWidgets.save(c.item.find("form").serializeArray(),g,0);c.item.find("input.add_new").val("")}wpWidgets.saveOrder(g);wpWidgets.fixWebkit()},receive:function(d,c){if(!a(this).is(":visible")){a(this).sortable("cancel")}}}).not(":visible").sortable("disable")},saveOrder:function(c){a("#"+c+" .ajax-feedback").css("visibility","visible");var b={action:"widgets-order",savewidgets:a("#_wpnonce_widgets").val()};a(".widgets-sortables").each(function(){b[a(this).parent().attr("id")]=a(this).sortable("toArray").join(",")});a.post(ajaxurl,b,function(){a(".ajax-feedback").css("visibility","hidden")})},save:function(e,f,c,d){var b;f=f||"";a("#"+f+" .ajax-feedback").css("visibility","visible");b={action:"save-widget",savewidgets:a("#_wpnonce_widgets").val(),sidebar:f};if(c){b.delete_widget=1}a.map(e,function(h,g){b[h.name]=h.value});a.post(ajaxurl,b,function(g){var h;a(".ajax-feedback").css("visibility","hidden");if(!d){return}if(c){a(d).parents("li.widget").remove();if(!b.widget_number){h=b["widget-id"];a("#available-widgets .widget-id").each(function(){if(a(this).val()==h){a(this).parents("li.widget").show()}})}}else{a(d).parents(".widget-inside").hide()}})},fixWebkit:function(b){b=b?"none":"";a("body").css({WebkitUserSelect:b,KhtmlUserSelect:b})},addEvents:function(b){b=b||document;a("a.widget-action",b).click(function(){a(this).parents(".widget-top").siblings(".widget-inside").toggle();return false});a(".widget-control-save",b).click(function(){wpWidgets.save(a(this).parents("form").serializeArray(),a(this).parents(".widgets-holder-wrap").attr("id"),0,this);return false});a(".widget-control-remove",b).click(function(){wpWidgets.save(a(this).parents("form").serializeArray(),a(this).parents(".widgets-holder-wrap").attr("id"),1,this);return false})}};a(document).ready(function(){wpWidgets.init()})})(jQuery);
+var wpWidgets;(function(a){wpWidgets={init:function(){var b;a("h3.sidebar-name").click(function(){var d=a(this).siblings(".widgets-sortables");if(d.is(":visible")){d.hide().sortable("disable")}else{d.show().sortable("enable").sortable("refresh")}a(this).siblings("#widget-list").toggle()});this.addEvents();a("#widget-list .widget").draggable({connectToSortable:".widgets-sortables",handle:".widget-title",distance:2,helper:"clone",zIndex:5,start:function(){wpWidgets.fixWebkit(1)},stop:function(d,c){if(b){a(b).hide()}b="";wpWidgets.fixWebkit()}});a(".widgets-sortables").sortable({placeholder:"widget-placeholder",connectWith:".widgets-sortables",items:".widget",handle:".widget-title",cursor:"move",distance:2,opacity:0.65,start:function(d,c){wpWidgets.fixWebkit(1);c.item.find(".widget-inside").hide();c.item.css({marginLeft:"",width:""})},stop:function(f,c){var d=c.item.find("input.add_new").val(),i=c.item.find("input.multi_number").val(),h=c.item.attr("id"),g=a(this).parent().attr("id");c.item.css({marginLeft:"",width:""});if(d&&i){if("multi"==d){c.item.html(c.item.html().replace(/<[^<>]+>/g,function(e){return e.replace(/__i__/g,i)}));c.item.attr("id",h.replace(/__i__/g,i));i++;a("li#"+h).find("input.multi_number").val(i)}else{if("single"==d){c.item.attr("id","new-"+h);b="li#"+h}}wpWidgets.addEvents(c.item);wpWidgets.save(c.item.find("form").serializeArray(),g,0);c.item.find("input.add_new").val("")}wpWidgets.saveOrder(g);wpWidgets.fixWebkit()},receive:function(d,c){if(!a(this).is(":visible")){a(this).sortable("cancel")}}}).not(":visible").sortable("disable")},saveOrder:function(c){a("#"+c+" .ajax-feedback").css("visibility","visible");var b={action:"widgets-order",savewidgets:a("#_wpnonce_widgets").val()};a(".widgets-sortables").each(function(){b[a(this).parent().attr("id")]=a(this).sortable("toArray").join(",")});a.post(ajaxurl,b,function(){a(".ajax-feedback").css("visibility","hidden")})},save:function(e,f,c,d){var b;a("#"+f+" .ajax-feedback").css("visibility","visible");b={action:"save-widget",savewidgets:a("#_wpnonce_widgets").val(),sidebar:f};if(c){b.delete_widget=1}a.map(e,function(h,g){b[h.name]=h.value});a.post(ajaxurl,b,function(g){var h;a(".ajax-feedback").css("visibility","hidden");if(!d){return}if(c){a(d).parents("li.widget").remove();if(!b.widget_number){h=b["widget-id"];a("#available-widgets .widget-id").each(function(){if(a(this).val()==h){a(this).parents("li.widget").show()}})}}else{a(d).parents(".widget-inside").hide("fast")}})},fixWebkit:function(b){b=b?"none":"";a("body").css({WebkitUserSelect:b,KhtmlUserSelect:b})},addEvents:function(b){b=b||document;a("a.widget-action",b).click(function(){var d=parseInt(a(this).parents(".widget").find(".widget-width").val(),10),e={},c=a(this).parents(".widget-top").siblings(".widget-inside");if(c.is(":hidden")){if(d>270&&c.parents(".widgets-sortables").length){e.width=d+30+"px";if(c.parents(".widget-liquid-right").length){e.marginLeft=270-d+"px"}c.parents(".widget").css(e)}c.show("fast")}else{c.parents(".widget").css({width:"",marginLeft:""});c.hide("fast")}return false});a(".widget-control-save",b).click(function(){wpWidgets.save(a(this).parents("form").serializeArray(),a(this).parents(".widgets-holder-wrap").attr("id"),0,this);return false});a(".widget-control-remove",b).click(function(){wpWidgets.save(a(this).parents("form").serializeArray(),a(this).parents(".widgets-holder-wrap").attr("id"),1,this);return false})}};a(document).ready(function(){wpWidgets.init()})})(jQuery);

trunk/wp-admin/widgets.php

@@ -127 +127 @@
 require_once( 'admin-header.php' ); ?>
 
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo wp_specialchars( $title ); ?></h2>
+
 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
-
-
-<div id="message" class="updated"><p>This page is not 100% ready, please use only on test installations.</p></div>
-
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>