Common subdirectories: ./images and /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/images Common subdirectories: ./po and /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/po Only in .: uc_cart_1.patch diff -up ./uc_cart_block.css /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/uc_cart_block.css --- ./uc_cart_block.css 2008-04-23 22:38:07.000000000 +0300 +++ /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/uc_cart_block.css 2008-07-05 01:50:15.000000000 +0300 @@ -1,38 +1,36 @@ /* $Id:$ */ -#block-cart-icon { - padding-right: 1em; -} - -#block-cart-title-bar { +#block-cart-title-bar-text.collapsed, #block-cart-title-bar-text.expanded { + padding: 0 0 0 18px; cursor: pointer; white-space: nowrap; } - -#block-cart-title-arrow { - padding-top: 5px; - padding-right: 2px; +#block-cart-title-bar-text.collapsed { + background: url(../../../../../misc/menu-collapsed.png) 0 50% no-repeat; +} +#block-cart-title-bar-text.expanded { + background: url(../../../../../misc/menu-expanded.png) 0 50% no-repeat; } - .cart-help-text { font-size: x-small; position: relative; top: -5px; } - -#block-cart-title-image { - padding-right: 5px; -} -.block-cart-title-bar { - white-space: nowrap; +#block-cart-title-link { + float: right; + width: 16px; + height: 1.4em; + margin: 0 0 0 5px; + background-position: 50% 50%; + background-repeat: no-repeat; + text-indent: -1000px; + overflow: hidden; } -.cart-block-toggle { - cursor: pointer; +#block-cart-title-link.cart-empty { + background-image: url(images/cart_empty.gif); } -#block-cart-title-arrow { - position: relative; - top: -5px; - right: -23px; +#block-cart-title-link.cart-full { + background-image: url(images/cart_full.gif); } .cart-block-table { border-bottom: 2px; @@ -71,7 +69,6 @@ .cart-block-summary-checkout { text-align: right; } - #block-cart-contents ul.cart-options { margin: 0pt; padding: 0pt 0pt 0.25em 1em; diff -up ./uc_cart_block.js /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/uc_cart_block.js --- ./uc_cart_block.js 2008-04-23 22:38:07.000000000 +0300 +++ /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/uc_cart_block.js 2008-07-05 01:50:15.000000000 +0300 @@ -7,20 +7,21 @@ $(document).ready(function() { if (collapsed_block == true) { $('#block-cart-contents').hide(0); } - $('.cart-block-toggle').click(function() { cart_block_toggle(); } ); + $('#block-cart-title-bar-text').click(function() { cart_block_toggle(); } ); }); /** * Toggle the shopping cart block open and closed. */ + function cart_block_toggle() { $('#block-cart-contents').toggle(); - isrc = $('#block-cart-title-arrow').attr('src'); - if (isrc.toLowerCase().match("up") != null) { - $('#block-cart-title-arrow').attr('src', uc_cart_path + '/images/bullet-arrow-down.gif'); + tclass = $('#block-cart-title-bar-text').attr('class'); + if (tclass.toLowerCase().match("collapsed") != null) { + $('#block-cart-title-bar-text').attr('class', 'expanded'); } else { - $('#block-cart-title-arrow').attr('src', uc_cart_path + '/images/bullet-arrow-up.gif'); + $('#block-cart-title-bar-text').attr('class', 'collapsed'); } -} +} diff -up ./uc_cart.module /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/uc_cart.module --- ./uc_cart.module 2008-06-04 23:33:19.000000000 +0300 +++ /var/www/htdocs/drupal/sites/default/modules/ubercart/uc_cart/uc_cart.module 2008-07-05 02:27:27.000000000 +0300 @@ -217,12 +217,10 @@ function uc_cart_block($op = 'list', $de return $blocks; } elseif ($op == 'view') { - $uc_cart_path = base_path() . drupal_get_path('module', 'uc_cart'); if (variable_get('uc_cart_block_collapsible', TRUE)) { $val = variable_get('uc_cart_block_collapsed', TRUE) ? 'true' : 'false'; uc_add_js('var collapsed_block = '. $val .';', 'inline'); - uc_add_js("var uc_cart_path = '". $uc_cart_path ."';", 'inline'); uc_add_js(drupal_get_path('module', 'uc_cart') .'/uc_cart_block.js'); } @@ -233,12 +231,9 @@ function uc_cart_block($op = 'list', $de return; } - $cart_image = $uc_cart_path; - $cart_image .= ($item_count) ? '/images/cart_full.gif' : '/images/cart_empty.gif'; - $arrow_down_image = $uc_cart_path .'/images/bullet-arrow-down.gif'; - $arrow_up_image = $uc_cart_path .'/images/bullet-arrow-up.gif'; + $cart_link_class = ($item_count) ? 'cart-full' : 'cart-empty'; - $block['subject'] = theme('uc_cart_block_title', $cart_image, $arrow_up_image); + $block['subject'] = theme('uc_cart_block_title', $cart_link_class); $block['content'] = theme('uc_cart_block_content'); return $block; @@ -262,7 +257,7 @@ function uc_cart_block($op = 'list', $de ); $form['uc_cart_block_collapsible'] = array( '#type' => 'checkbox', - '#title' => t('Make the shopping cart block collapsible by clicking the name or arrow.'), + '#title' => t('Make the shopping cart block collapsible by clicking the name.'), '#default_value' => variable_get('uc_cart_block_collapsible', TRUE), ); $form['uc_cart_block_collapsed'] = array( @@ -299,27 +294,29 @@ function uc_cart_block($op = 'list', $de /** * Theme the shopping cart block title */ -function theme_uc_cart_block_title($cart_image, $arrow_up_image) { - if (variable_get('uc_cart_block_image', TRUE)) { - $output = l('', 'cart', NULL, NULL, NULL, FALSE, TRUE); - } +function theme_uc_cart_block_title($cart_link_class) { $title = trim(variable_get('uc_cart_block_title', '')); if (empty($title)) { $title = t('Shopping cart'); } - if (variable_get('uc_cart_block_collapsible', TRUE)) { - $class = ' cart-block-toggle'; + if (variable_get('uc_cart_block_image', TRUE)) { + $output .= l('View cart', 'cart', array('id' => 'block-cart-title-link', 'class'=>$cart_link_class, 'title'=>t('View cart')), NULL, NULL, FALSE, TRUE); } - $output .= '' - .''. check_plain($title) .''; - + $output .= ''; + if (variable_get('uc_cart_block_collapsed', TRUE)) { + $output .= ' class="collapsed"'; + } + else { + $output .= ' class="expanded"'; + } + $output .= ' title="'. t('Expand cart block').'"'; } + $output .= ' id="block-cart-title-bar-text">'.check_plain($title) .''; + return $output; }