mdd 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ccd2d47ebc90d59b4120180d599011f4acbece3
-  data.tar.gz: b1cd8ae06a883a3e20d8202c60bf40c959af1be6
+  metadata.gz: ab255edf08e646a2ec7de103dafd791b76a0dcbb
+  data.tar.gz: 272da5bcce16ac2e8307f0b37181f3d94748102a
 SHA512:
-  metadata.gz: 9095ac4d2193c684a3eb0fd07bb969afb811b3967caad141cfc40956127fe2fd581a88b1c86f602dec287676af698c3ee2ff07adb9d88074dd443be8eeb3005d
-  data.tar.gz: ae17133aad702f09e12c033ab97f4600009c05920fa4227cfeb1e6e456c51a2768d90ca9610330600b156ddacc417ca37c626d1dcf48f163a19d5d1a13aa14ac
+  metadata.gz: aaf0e2552c9ea969af26c3a779fea1f83e6ebfcbb8614a6477ff196facce326f2c392e36361d8e5fe77d873261276d9fb03711c05b613b2f8b9827731ad54e8d
+  data.tar.gz: 6d08505e76a2ae80c8c0e6312d9cb6e0c9e3f2459b4b2ef3544322a34029192c4bf8812a8e8d8693d6f88883eabc852462c704e70830a133e4af675067edae38

data/app/helpers/mdwa_helper.rb

@@ -1,11 +1,12 @@
 module MdwaHelper
   
-  def pagination_footer( object_list )
+  def pagination_footer( object_list, parameters = {} )
 
+    parameters[:per_page] = WillPaginate.per_page if parameters[:per_page].blank?
     options = [
-      [WillPaginate.per_page, WillPaginate.per_page],
-      [(WillPaginate.per_page*2.5).to_i, (WillPaginate.per_page*2.5).to_i],
-      [(WillPaginate.per_page*5).to_i, (WillPaginate.per_page*5).to_i],
+      [parameters[:per_page], parameters[:per_page]],
+      [(parameters[:per_page]*2.5).to_i, (parameters[:per_page]*2.5).to_i],
+      [(parameters[:per_page]*5).to_i, (parameters[:per_page]*5).to_i],
       [I18n.t('will_paginate.all'), object_list.count]
     ]
 
@@ -44,5 +45,13 @@ module MdwaHelper
 
     return "#{path}/#{size}/#{ext}_file.png"
   end
+
+  def check_all_th
+    check_box_tag "check_all", '', false, { :onclick => "checkOrUncheckAll( $(\"#check_all\").prop( \"checked\" ) )" }
+  end
+  
+  def check_all_td( id, checked = false )
+    check_box_tag "cid[]", id, checked, { :id => "cb#{id}", :class => "cid" }
+  end
   
 end

data/app/views/template/mdwa/_autocomplete_multiple_tag.html.erb

@@ -40,9 +40,9 @@
 			}
 	    });
 	
-	  $(document).on('click', ".<%= dom_element_id %>_remove_autocomplete", function() {
-	    $(this).parent().remove();
-	  });
+    $(document).on('click', "<%= ul %> a", function() {
+      $(this).parent().remove();
+    });
   });
 
 </script>

data/app/views/template/mdwa/_autocomplete_remote_multiple_tag.html.erb

@@ -21,7 +21,10 @@
       source: function( request, response ) {
         // delegate back to autocomplete, but extract the last term
         $.getJSON( '<%= source_path %>', {
-          term: extractLastAutocompleteRemoteMultiple( request.term )
+          term: extractLastAutocompleteRemoteMultiple( request.term ),
+          <% if defined? additional_params %>
+            <%= additional_params.collect{|key, value| "#{key.to_s}: $(\"##{value.to_s}\").val()".html_safe}.join(',').html_safe %>
+          <% end %>
         }, response );
       },
       focus: function() {
@@ -41,7 +44,7 @@
       }
       });
   
-    $( ".<%= dom_element_id %>_remove_autocomplete").on( "click", function() {
+    $(document).on('click', "<%= ul %> a", function() {
       $(this).parent().remove();
     });
   });

data/app/views/template/mdwa/_autocomplete_remote_tag.html.erb

@@ -2,7 +2,26 @@
   $(function() {
     $('<%= dom_element %>').autocomplete({
         minLength: 0,
-        source: '<%= source_path %>',
+        source: function(request, response) {
+          $.ajax({
+            url: '<%= source_path %>',
+            dataType: 'json',
+            data: {
+              term: request.term,
+              <% if defined? additional_params %>
+                <%= additional_params.collect{|key, value| "#{key.to_s}: $(\"##{value.to_s}\").val()".html_safe}.join(',').html_safe %>
+              <% end %>
+            },
+            success: function(data) {
+              response($.map(data, function(item) {
+                return {
+                  label: item.label,
+                  value: item.value
+                }
+              }));
+            }
+          });
+        },
         focus: function( event, ui ) {
           $( '<%= dom_element %>' ).val( ui.item.label );
           return false;
@@ -19,6 +38,7 @@
         $('<%= dom_element_id %>').val("").trigger('change');
       }
     });
+
   });
 
 </script>

data/lib/generators/mdwa/sandbox/sandbox_generator.rb

@@ -23,12 +23,15 @@ module Mdwa
       end
 
       def gem_dependencies
-        gem 'devise'
         gem 'cancan'
-        gem 'will_paginate'
+        gem 'devise'
+        gem 'delayed_job_active_record'
+        gem 'jquery-ui-rails'
         gem 'nested_form'
         gem 'require_all'
+        gem 'rails-settings-cached', '0.2.4'
         gem 'rspec-rails', :group => [:test, :development]
+        gem 'will_paginate'
 
         inside Rails.root do
           run "bundle install"
@@ -56,6 +59,14 @@ module Mdwa
         end
       end
 
+      def generated_stuff
+        generate 'settings Settings'
+        generate 'delayed_job:active_record'
+        rake 'db:migrate' if ask_question( "Run rake db:migrate?" )
+
+        copy_file 'deploy.sh', 'deploy.sh'
+      end
+
       def images
         if ask_question("Create images?")
           directory 'app/assets/images/mdwa', 'app/assets/images/mdwa'
@@ -102,8 +113,17 @@ module Mdwa
         end
 
         if ask_question("Include layout selector in ApplicationController?")
-          inject_into_class 'app/controllers/application_controller.rb', ApplicationController do
-             "\n\n  layout :select_layout\n"
+          inject_into_file 'app/controllers/application_controller.rb', after: "protect_from_forgery" do
+             "\n\n  layout :select_layout\n\n" + 
+             "  private
+
+    def after_sign_out_path_for(user)
+      if user.to_sym.eql?(:a_user)
+        return a_root_path
+      else
+        return root_path
+      end
+    end"
           end
         end
       end
@@ -125,8 +145,9 @@ module Mdwa
         end
 
         if ask_question("Generate views?")
-          copy_file 'app/views/template/_leftbar.html.erb', 'app/views/template/mdwa/_leftbar.html.erb'
-          empty_directory 'app/views/template/mdwa/leftbar'
+          copy_file 'app/views/template/mdwa/_menubar.html.erb', 'app/views/template/mdwa/_menubar.html.erb'
+          copy_file 'app/views/template/mdwa/_login_text.html.erb', 'app/views/template/mdwa/_login_text.html.erb'
+          directory 'app/views/template/mdwa/menubar', 'app/views/template/mdwa/menubar'
           directory 'app/views/public', 'app/views/public'
           directory 'app/views/a/administrators', 'app/views/a/administrators'
           directory 'app/views/a/home', 'app/views/a/home'
@@ -140,6 +161,7 @@ module Mdwa
         copy_file 'config/initializers/mdwa_inflections.rb', 'config/initializers/mdwa_inflections.rb'
         copy_file 'config/initializers/mdwa_layout.rb', 'config/initializers/mdwa_layout.rb'
         copy_file 'config/initializers/will_paginate.rb', 'config/initializers/mdwa_will_paginate.rb'
+        copy_file 'config/initializers/mime_types.rb', 'config/initializers/mdwa_mime_types.rb'
 
         # language files
         copy_file 'config/locales/devise.en.yml', 'config/locales/devise.en.yml'
@@ -162,7 +184,7 @@ module Mdwa
         production << "  #####################"
         production << "  assets << 'mdwa/login_manifest.css'"
         production << "  assets << 'mdwa/public_manifest.css'"
-        production << "  assets << 'mdwa/system_manifest.js'"
+        production << "  assets << 'mdwa/system_manifest.css'"
         production << "  config.assets.precompile += assets"
         production << "\n"
         inject_into_file 'config/environments/production.rb', production.join("\n"), :after => "config.assets.digest = true\n"
@@ -221,6 +243,7 @@ module Mdwa
         
         rake "db:seed" if ask_question( "Run rake db:seeds?" )
       end
+
       
       def testes
         # Install Rspec as the default testing framework

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/login_manifest.js

@@ -1,7 +1,7 @@
 // Login screen javascript files
 //
 //= require jquery
-//= require jquery-ui
 //= require jquery_ujs
+//= require jquery.ui.all
 //= require_tree ../jquery
 //= require ./template/all_pages

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/system_manifest.js

@@ -4,7 +4,7 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery-ui
+//= require jquery.ui.all
 //= require_tree ../jquery
 //= require jquery_nested_form
 //= require_tree ./template

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/ajaxloader.js

@@ -1,21 +1,21 @@
 $(function() {
 
-	$('body').append("<div id='ajax-loader'></div>");
-	$('#ajax-loader').css( { 
-		'background': 'url(/assets/mdwa/ajax-loader.gif) no-repeat scroll 0 0 transparent',
-    	'display': 'none',
-    	'height': '42px',
-    	'left': '50%',
-    	'position': 'fixed',
-    	'text-align': 'center',
-    	'top': '50%',
-    	'width': '42px',
-    	'z-index': '10001'
+    $('body').append("<div id='ajax-loader'></div>");
+    $('#ajax-loader').css( { 
+        'background': 'url(/assets/mdwa/ajax-loader.gif) no-repeat scroll 0 0 transparent',
+        'display': 'none',
+        'height': '42px',
+        'left': '50%',
+        'position': 'fixed',
+        'text-align': 'center',
+        'top': '50%',
+        'width': '42px',
+        'z-index': '10001'
     });
 
-	$(document).bind("ajaxSend", function() {
-		$('#ajax-loader').show();
-	}).bind("ajaxComplete", function() {
-		$('#ajax-loader').hide();
-	});
+    $(document).bind("ajaxSend", function() {
+        $('#ajax-loader').show();
+    }).bind("ajaxComplete", function() {
+        $('#ajax-loader').hide();
+    });
 });

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/all_pages.js

@@ -1,39 +1,39 @@
 $(function() {
-	
-	// all .toggle links must have a rel attribute to identify what element will toggle
-	$(document).on("click",'a.toggle', function() {
-		$($(this).attr('rel')).toggle();
-	});
+  
+  // all .toggle links must have a rel attribute to identify what element will toggle
+  $(document).on("click",'a.toggle', function() {
+    $($(this).attr('rel')).toggle();
+  });
 
-	// open modalbox
-	$('.lightbox').fancybox({
-		closeClick: false,
-		autoSize: true
-	});
+  // open modalbox
+  $('.lightbox, .fancybox').fancybox({
+    closeClick: false,
+    autoSize: true
+  });
 
-	// datepicker input text field
-	$('.datepicker').datepicker();
+  // datepicker input text field
+  loadDatepickers();
 
-	// notices fadeout
-	$(document).on("click",'a#system_notice_close, #system_notice', function() {
-		$('#system_notice').remove();
-	});
+  // notices fadeout
+  $(document).on("click",'a#system_notice_close, #system_notice', function() {
+    $('#system_notice').remove();
+  });
 
-	// ajax forms cancel button closes modal window
-	$(document).on("click",'.mdwa_ajax a.cancel', function() {
-		$.fancybox.close(true);
-	});	
+  // ajax forms cancel button closes modal window
+  $(document).on("click",'.mdwa_ajax a.cancel', function() {
+    $.fancybox.close(true);
+  }); 
 
-	// set focus on modalbox form
+  // set focus on modalbox form
   $(document).bind("ajaxComplete", function() {
     setFocusOnForm();
   });
-	
+  
 });
 
 function checkOrUncheckAll( to_be_checked ){
   var to_be_checked = to_be_checked || false;
-  $( ".cid" ).attr( "checked", to_be_checked );
+  $( ".cid" ).prop( "checked", to_be_checked ).trigger('change');
 }
 
 function defineAction( form, action, confirmation ) {
@@ -42,26 +42,30 @@ function defineAction( form, action, confirmation ) {
     response = confirm("Are you sure?");
   }
   if( response ) {
-    $( "#" + form ).attr( "action", action);
+    $( "#" + form ).prop( "action", action);
     $( "#" + form ).submit();
   }
 }
 
 function defineOrder( form, action, id ) {
-  $( "#" + form ).attr( "action", action);
-  $( "#cb" + id ).attr( "checked", true);
+  $( "#" + form ).prop( "action", action);
+  $( "#cb" + id ).prop( "checked", true);
   $( "#" + form ).submit();
 }
 
 function deleteSystemNotice() {
-	$('#system_notice').fadeOut('slow', function() {
-		$('#system_notice').remove();
-	});
+  $('#system_notice').fadeOut('slow', function() {
+    $('#system_notice').remove();
+  });
 }
 
 // focus on the first text input field in the first field on the page
 function setFocusOnForm() {
-	$(':input:enabled:visible:first', "div.filtros").focus();
+  $(':input:enabled:visible:first', "div.filtros").focus();
   $(':input:enabled:visible:first', "div.mdwa_new").focus();
   $(':input:enabled:visible:first', "div.mdwa_edit").focus();
 }
+
+function loadDatepickers() {
+  $('.datepicker').datepicker();
+}

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/batch_update.js

@@ -0,0 +1,35 @@
+$(document).ready(function() {
+  $(document).on('click', 'a.batch_update', function(event) {
+
+    event.preventDefault();
+
+    if( !confirm('Are you sure?') ) return false;
+
+    // seleciona os inputs checados
+    var input_container = $(this).attr('input_container');
+    if($(this).attr('input_container') == null) input_container = '' 
+    if( $(input_container + ' input[type="checkbox"].cid:checked').length == 0 ) return false;
+
+    var ids = new Array();
+    $(input_container + ' input[type="checkbox"].cid:checked').each(function() {
+      ids.push($(this).val());
+    });
+
+    var url = $(this).attr('href');
+    var attribute = $(this).attr('attribute');
+    var value = $(this).attr('value');
+
+    $.ajax({
+      url: url,
+      type: 'POST',
+      dataType: 'script',
+      data: {
+        ids: ids,
+        attribute: attribute,
+        value: value
+      }
+    });
+
+    return false;
+  });
+});

data/lib/generators/mdwa/sandbox/templates/app/assets/javascripts/mdwa/template/xls_export.js

@@ -0,0 +1,14 @@
+$(document).ready( function() {
+
+  $(document).on('click', 'a.export.xls', function() {
+    var form = '#' + $(this).attr('form');
+    var url = $(form).attr('action') + '.xls?';
+    $(form).find('input[type="text"], input[type="hidden"], input[type="email"], select').each(function(index) {
+      if(index != 0) url += '&';
+      url += $(this).attr('id') + '=' + $(this).val();
+    });
+    url += '&skip_pagination=1';
+    window.location = url;
+  });
+
+});

data/lib/generators/mdwa/sandbox/templates/app/assets/stylesheets/jquery/{jquery-ui-1.10.0.custom.css → jquery-ui.css}

@@ -1,8 +1,8 @@
-/*! jQuery UI - v1.10.0 - 2013-01-21
+/*! jQuery UI - v1.10.3 - 2013-05-24
 * http://jqueryui.com
 * Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
-* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Helvetica%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=2px&bgColorHeader=dddddd&bgTextureHeader=highlight_soft&bgImgOpacityHeader=50&borderColorHeader=dddddd&fcHeader=444444&iconColorHeader=0073ea&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=dddddd&fcContent=444444&iconColorContent=ff0084&bgColorDefault=f6f6f6&bgTextureDefault=highlight_soft&bgImgOpacityDefault=100&borderColorDefault=dddddd&fcDefault=0073ea&iconColorDefault=666666&bgColorHover=0073ea&bgTextureHover=highlight_soft&bgImgOpacityHover=25&borderColorHover=0073ea&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=dddddd&fcActive=ff0084&iconColorActive=454545&bgColorHighlight=ffffff&bgTextureHighlight=flat&bgImgOpacityHighlight=55&borderColorHighlight=cccccc&fcHighlight=444444&iconColorHighlight=0073ea&bgColorError=ffffff&bgTextureError=flat&bgImgOpacityError=55&borderColorError=ff0084&fcError=222222&iconColorError=ff0084&bgColorOverlay=eeeeee&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=80&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=60&thicknessShadow=4px&offsetTopShadow=-4px&offsetLeftShadow=-4px&cornerRadiusShadow=0px
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
 
 /* Layout helpers
 ----------------------------------*/
@@ -33,6 +33,7 @@
 .ui-helper-clearfix:after {
 	content: "";
 	display: table;
+	border-collapse: collapse;
 }
 .ui-helper-clearfix:after {
 	clear: both;
@@ -538,6 +539,8 @@ button.ui-button::-moz-focus-inner {
 	margin: 0;
 	padding: 0;
 	width: 100%;
+	/* support: IE10, see #8844 */
+	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
 }
 .ui-menu .ui-menu-divider {
 	margin: 5px -2px 5px -2px;
@@ -600,7 +603,7 @@ button.ui-button::-moz-focus-inner {
 	height: 100%;
 }
 .ui-progressbar .ui-progressbar-overlay {
-	background: url("assets/mdwa/jquery-ui/animated-overlay.gif");
+	background: url(/assets/mdwa/jquery-ui/animated-overlay.gif);
 	height: 100%;
 	filter: alpha(opacity=25);
 	opacity: 0.25;
@@ -740,7 +743,7 @@ button.ui-button::-moz-focus-inner {
 	position: relative;
 	top: 0;
 	margin: 1px .2em 0 0;
-	border-bottom: 0;
+	border-bottom-width: 0;
 	padding: 0;
 	white-space: nowrap;
 }
@@ -783,7 +786,7 @@ body .ui-tooltip {
 /* Component containers
 ----------------------------------*/
 .ui-widget {
-	font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+	font-family: Helvetica,Arial,sans-serif;
 	font-size: 1.1em;
 }
 .ui-widget .ui-widget {
@@ -793,25 +796,25 @@ body .ui-tooltip {
 .ui-widget select,
 .ui-widget textarea,
 .ui-widget button {
-	font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;
+	font-family: Helvetica,Arial,sans-serif;
 	font-size: 1em;
 }
 .ui-widget-content {
 	border: 1px solid #dddddd;
-	background: #eeeeee url(assets/mdwa/jquery-ui/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x;
-	color: #333333;
+	background: #ffffff url(/assets/mdwa/jquery-ui/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+	color: #444444;
 }
 .ui-widget-content a {
-	color: #333333;
+	color: #444444;
 }
 .ui-widget-header {
-	border: 1px solid #e78f08;
-	background: #f6a828 url(assets/mdwa/jquery-ui/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x;
-	color: #ffffff;
+	border: 1px solid #dddddd;
+	background: #dddddd url(/assets/mdwa/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png) 50% 50% repeat-x;
+	color: #444444;
 	font-weight: bold;
 }
 .ui-widget-header a {
-	color: #ffffff;
+	color: #444444;
 }
 
 /* Interaction states
@@ -819,15 +822,15 @@ body .ui-tooltip {
 .ui-state-default,
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
-	border: 1px solid #cccccc;
-	background: #f6f6f6 url(assets/mdwa/jquery-ui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x;
+	border: 1px solid #dddddd;
+	background: #f6f6f6 url(/assets/mdwa/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png) 50% 50% repeat-x;
 	font-weight: bold;
-	color: #1c94c4;
+	color: #0073ea;
 }
 .ui-state-default a,
 .ui-state-default a:link,
 .ui-state-default a:visited {
-	color: #1c94c4;
+	color: #0073ea;
 	text-decoration: none;
 }
 .ui-state-hover,
@@ -836,30 +839,30 @@ body .ui-tooltip {
 .ui-state-focus,
 .ui-widget-content .ui-state-focus,
 .ui-widget-header .ui-state-focus {
-	border: 1px solid #fbcb09;
-	background: #fdf5ce url(assets/mdwa/jquery-ui/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x;
+	border: 1px solid #0073ea;
+	background: #0073ea url(/assets/mdwa/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png) 50% 50% repeat-x;
 	font-weight: bold;
-	color: #c77405;
+	color: #ffffff;
 }
 .ui-state-hover a,
 .ui-state-hover a:hover,
 .ui-state-hover a:link,
 .ui-state-hover a:visited {
-	color: #c77405;
+	color: #ffffff;
 	text-decoration: none;
 }
 .ui-state-active,
 .ui-widget-content .ui-state-active,
 .ui-widget-header .ui-state-active {
-	border: 1px solid #fbd850;
-	background: #ffffff url(assets/mdwa/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+	border: 1px solid #dddddd;
+	background: #ffffff url(/assets/mdwa/jquery-ui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
 	font-weight: bold;
-	color: #eb8f00;
+	color: #ff0084;
 }
 .ui-state-active a,
 .ui-state-active a:link,
 .ui-state-active a:visited {
-	color: #eb8f00;
+	color: #ff0084;
 	text-decoration: none;
 }
 
@@ -868,31 +871,31 @@ body .ui-tooltip {
 .ui-state-highlight,
 .ui-widget-content .ui-state-highlight,
 .ui-widget-header .ui-state-highlight {
-	border: 1px solid #fed22f;
-	background: #ffe45c url(assets/mdwa/jquery-ui/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x;
-	color: #363636;
+	border: 1px solid #cccccc;
+	background: #ffffff url(/assets/mdwa/jquery-ui/ui-bg_flat_55_ffffff_40x100.png) 50% 50% repeat-x;
+	color: #444444;
 }
 .ui-state-highlight a,
 .ui-widget-content .ui-state-highlight a,
 .ui-widget-header .ui-state-highlight a {
-	color: #363636;
+	color: #444444;
 }
 .ui-state-error,
 .ui-widget-content .ui-state-error,
 .ui-widget-header .ui-state-error {
-	border: 1px solid #cd0a0a;
-	background: #b81900 url(assets/mdwa/jquery-ui/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat;
-	color: #ffffff;
+	border: 1px solid #ff0084;
+	background: #ffffff url(/assets/mdwa/jquery-ui/ui-bg_flat_55_ffffff_40x100.png) 50% 50% repeat-x;
+	color: #222222;
 }
 .ui-state-error a,
 .ui-widget-content .ui-state-error a,
 .ui-widget-header .ui-state-error a {
-	color: #ffffff;
+	color: #222222;
 }
 .ui-state-error-text,
 .ui-widget-content .ui-state-error-text,
 .ui-widget-header .ui-state-error-text {
-	color: #ffffff;
+	color: #222222;
 }
 .ui-priority-primary,
 .ui-widget-content .ui-priority-primary,
@@ -924,34 +927,34 @@ body .ui-tooltip {
 .ui-icon {
 	width: 16px;
 	height: 16px;
-	background-position: 16px 16px;
 }
 .ui-icon,
 .ui-widget-content .ui-icon {
-	background-image: url(assets/mdwa/jquery-ui/ui-icons_222222_256x240.png);
+	background-image: url(/assets/mdwa/jquery-ui/ui-icons_ff0084_256x240.png);
 }
 .ui-widget-header .ui-icon {
-	background-image: url(assets/mdwa/jquery-ui/ui-icons_ffffff_256x240.png);
+	background-image: url(/assets/mdwa/jquery-ui/ui-icons_0073ea_256x240.png);
 }
 .ui-state-default .ui-icon {
-	background-image: url(assets/mdwa/jquery-ui/ui-icons_ef8c08_256x240.png);
+	background-image: url(/assets/mdwa/jquery-ui/ui-icons_666666_256x240.png);
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon {
-	background-image: url(assets/mdwa/jquery-ui/ui-icons_ef8c08_256x240.png);
+	background-image: url(/assets/mdwa/jquery-ui/ui-icons_ffffff_256x240.png);
 }
 .ui-state-active .ui-icon {
-	background-image: url(assets/mdwa/jquery-ui/ui-icons_ef8c08_256x240.png);
+	background-image: url(/assets/mdwa/jquery-ui/ui-icons_454545_256x240.png);
 }
 .ui-state-highlight .ui-icon {
-	background-image: url(assets/mdwa/jquery-ui/ui-icons_228ef1_256x240.png);
+	background-image: url(/assets/mdwa/jquery-ui/ui-icons_0073ea_256x240.png);
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-	background-image: url(assets/mdwa/jquery-ui/ui-icons_ffd27a_256x240.png);
+	background-image: url(/assets/mdwa/jquery-ui/ui-icons_ff0084_256x240.png);
 }
 
 /* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
 .ui-icon-carat-1-n { background-position: 0 0; }
 .ui-icon-carat-1-ne { background-position: -16px 0; }
 .ui-icon-carat-1-e { background-position: -32px 0; }
@@ -1137,38 +1140,38 @@ body .ui-tooltip {
 .ui-corner-top,
 .ui-corner-left,
 .ui-corner-tl {
-	border-top-left-radius: 4px;
+	border-top-left-radius: 2px;
 }
 .ui-corner-all,
 .ui-corner-top,
 .ui-corner-right,
 .ui-corner-tr {
-	border-top-right-radius: 4px;
+	border-top-right-radius: 2px;
 }
 .ui-corner-all,
 .ui-corner-bottom,
 .ui-corner-left,
 .ui-corner-bl {
-	border-bottom-left-radius: 4px;
+	border-bottom-left-radius: 2px;
 }
 .ui-corner-all,
 .ui-corner-bottom,
 .ui-corner-right,
 .ui-corner-br {
-	border-bottom-right-radius: 4px;
+	border-bottom-right-radius: 2px;
 }
 
 /* Overlays */
 .ui-widget-overlay {
-	background: #666666 url(assets/mdwa/jquery-ui/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat;
-	opacity: .5;
-	filter: Alpha(Opacity=50);
+	background: #eeeeee url(/assets/mdwa/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png) 50% 50% repeat-x;
+	opacity: .8;
+	filter: Alpha(Opacity=80);
 }
 .ui-widget-shadow {
-	margin: -5px 0 0 -5px;
-	padding: 5px;
-	background: #000000 url(assets/mdwa/jquery-ui/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x;
-	opacity: .2;
-	filter: Alpha(Opacity=20);
-	border-radius: 5px;
-}
+	margin: -4px 0 0 -4px;
+	padding: 4px;
+	background: #aaaaaa url(/assets/mdwa/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	opacity: .6;
+	filter: Alpha(Opacity=60);
+	border-radius: 0px;
+}