diff --git a/sites/all/modules/contrib/uc_varprice/uc_varprice.module b/sites/all/modules/contrib/uc_varprice/uc_varprice.module index 3ff1f01..19997e6 100644 --- a/sites/all/modules/contrib/uc_varprice/uc_varprice.module +++ b/sites/all/modules/contrib/uc_varprice/uc_varprice.module @@ -226,6 +226,8 @@ function uc_varprice_uc_cart_item($op, $item) { if (!empty($item->data['varprice'])) { // Update the cart item's price to the entered price value. $item->price = $item->data['varprice']; + + $item->display_price = $item->data['varprice']; } } } diff --git a/sites/all/modules/custom/custom_prospera/custom_prospera.module b/sites/all/modules/custom/custom_prospera/custom_prospera.module index ade5c7b..3ecee5b 100644 --- a/sites/all/modules/custom/custom_prospera/custom_prospera.module +++ b/sites/all/modules/custom/custom_prospera/custom_prospera.module @@ -5,4 +5,7 @@ function custom_prospera_form_alter(&$form, &$form_state, $form_id) { //dsm($form); $form['tid']['#options']['All'] = '-choose industry-'; } -} \ No newline at end of file + + +} + diff --git a/sites/all/themes/prospera/css/fresh.css b/sites/all/themes/prospera/css/fresh.css index 2dfedec..0f7d190 100644 --- a/sites/all/themes/prospera/css/fresh.css +++ b/sites/all/themes/prospera/css/fresh.css @@ -1,5 +1,6 @@ a.thermal_link { color : #df8f35; + font-weight : bold; } .node-type-landing-page .field-name-field-headline, @@ -15,4 +16,94 @@ a.thermal_link { line-height : 1em; font-weight:normal; color : #FFF; +} + +.node-type-invoice .form-item-attributes-1 input { + width:45px; +} + + +.view-reports .form-item-qty label { + float:left; + padding:2px 2px 0 0; +} +.view-reports .form-item-qty input { + border : 1px solid #000; + width : 55px; + font-style : italic; +} +.view-reports .views-field-addtocartlink .form-actions, +.view-reports .views-field-addtocartlink .form-item { + margin:0; + padding:0; +} + +.view-reports .views-row { + margin:0 0 15px 0; + position:relative; +} +.view-reports .views-row .views-field-sell-price { + color : #f18d1d; + font-size : .95em; + font-weight:bold; +} +.view-reports .views-row .views-field-title { + font-weight:bold; + font-size : 1.1em; +} +.view-reports .views-field-addtocartlink .form-submit, +.node-type-invoice .add-to-cart .form-submit { + text-indent : -10000px; + background : url('../images/buttons/add_to_cart.png') no-repeat top left; + display : block; + width : 83px; + height : 18px; + border:none; + position:absolute; + top:38px; + left:205px; + cursor:pointer; +} +.view-reports .views-field-nothing a, +.node-type-invoice .add-to-cart .checkout { + text-indent : -10000px; + background : url('../images/buttons/checkout.png') no-repeat top left; + display : block; + width : 83px; + height : 18px; + border:none; + position:absolute; + top:38px; + left:303px; + cursor:pointer; +} + + + +.node-type-invoice .add-to-cart { + position : relative; +} +.node-type-invoice .add-to-cart .form-item { + margin:0; +} +.node-type-invoice .add-to-cart .form-item label { + float : left; + padding: 2px 0; +} +.node-type-invoice .add-to-cart .form-item span { + padding:0 2px; +} +.node-type-invoice .add-to-cart .form-item-qty { + display : none; +} +.node-type-invoice .add-to-cart input { + border : 1px solid #000; + width : 150px; + font-style : italic; +} +.node-type-invoice .add-to-cart .form-submit { + top:25px; +} +.node-type-invoice .add-to-cart .checkout { + top: 25px; } \ No newline at end of file diff --git a/sites/all/themes/prospera/css/html-reset.css b/sites/all/themes/prospera/css/html-reset.css index ea9ada8..fc4a9b8 100644 --- a/sites/all/themes/prospera/css/html-reset.css +++ b/sites/all/themes/prospera/css/html-reset.css @@ -107,7 +107,7 @@ fieldset { */ - font-family: "PT Sans" Verdana, Tahoma, "DejaVu Sans", sans-serif; + font-family: "PT Sans", Verdana, Tahoma, "DejaVu Sans", sans-serif; } pre, diff --git a/sites/all/themes/prospera/css/navigation.css b/sites/all/themes/prospera/css/navigation.css index d27f644..c05bcda 100644 --- a/sites/all/themes/prospera/css/navigation.css +++ b/sites/all/themes/prospera/css/navigation.css @@ -29,13 +29,11 @@ text-align:center; #navigation ul.links li, /* A simple method to get navigation links to appear in one line. */ #navigation .content li { display:inline-block; - padding: 9px 55px 9px 0; /* LTR */ + padding: 9px 62px 9px 0; /* LTR */ list-style:none; margin:0; } -#navigation .content li.last { - padding-right:0; -} + #block-menu-block-2 ul li.first { padding-left:15px; } @@ -107,4 +105,25 @@ text-align:center; padding-top:10px; font-size : 10px; line-height : 12px; +} + +#block-menu-menu-secondary-links { + position:absolute; + top:90px; + left:15px; +} +#block-menu-menu-secondary-links ul { + margin:0; + padding:0; +} +#block-menu-menu-secondary-links li { + display:inline-block; + border-right : 1px solid #48413a; + font-size : .8em; + line-height : 1em; + padding:0 5px 0 0; + margin:0 2px 0 0; +} +#block-menu-menu-secondary-links li.last { + border-right:none; } \ No newline at end of file diff --git a/sites/all/themes/prospera/css/pages.css b/sites/all/themes/prospera/css/pages.css index d1f9949..5948b2e 100644 --- a/sites/all/themes/prospera/css/pages.css +++ b/sites/all/themes/prospera/css/pages.css @@ -116,6 +116,9 @@ div#site-name /* The name of the website */ { #content .section { } +.node-type-landing-page #content .section { + padding-top : 0; +} .region-highlighted { } diff --git a/sites/all/themes/prospera/css/views-styles.css b/sites/all/themes/prospera/css/views-styles.css index 17dfe22..6ae8879 100644 --- a/sites/all/themes/prospera/css/views-styles.css +++ b/sites/all/themes/prospera/css/views-styles.css @@ -128,12 +128,12 @@ display : none; padding : 0 0 20px 0; } -.page-calendar .view-events .views-field-nothing { +.page-calendar .view-events .views-field-field-reg { position : absolute; right : 93px; bottom:5px; } -.page-calendar .view-events .views-field-nothing a { +.page-calendar .view-events .views-field-field-reg a { background: url(../images/buttons/register_now.png) no-repeat left top; text-indent : -10000px; display : block; diff --git a/sites/all/themes/prospera/js/script.js b/sites/all/themes/prospera/js/script.js index 0dd4cdb..5c56684 100644 --- a/sites/all/themes/prospera/js/script.js +++ b/sites/all/themes/prospera/js/script.js @@ -1,7 +1,37 @@ (function($) { $(function() { - //Set active trail on month specific pages - + //theming for products + $('.view-reports .views-field-addtocartlink .form-item-qty label').css('display', 'none'); + $('.view-reports .views-field-addtocartlink .form-item-qty input').attr('value', 'enter qty...'); + $('.view-reports .views-field-addtocartlink .form-item-qty input').addClass('clear-default'); + $('.node-type-invoice .add-to-cart .form-item label').css('display', 'none'); + $('.node-type-invoice .add-to-cart .form-item-varprice input').attr('value', 'enter amount to be paid'); + $('.node-type-invoice .add-to-cart .form-item-attributes-1 input').attr('value', 'enter invoice #'); + $('.node-type-invoice .add-to-cart .form-item input').addClass('clear-default'); + $('.node-type-invoice .add-to-cart .form-item-attributes-1 input').before('# '); + + $('.node-type-invoice .add-to-cart .form-submit').click(function(e) { + if ($('.node-type-invoice .add-to-cart .form-item-attributes-1 input').attr('value') == 'enter invoice #') { + e.preventDefault(); + } + + }); + //clear default value of any field having .cler-dfault class + $('.clear-default').each(function(i, elem) { + $(elem).attr('default-value', $(elem).val()); + $(elem).focus(function() { + if($(this).val() == $(this).attr('default-value')) { + $(this).val(''); + $(this).addClass('bold'); + } + }); + $(elem).blur(function() { + if($(this).val() == '') { + $(this).val($(this).attr('default-value')); + $(this).removeClass('bold'); + } + }); + }); //Toggle Learn More Button on Calendar $('.page-calendar a.learn-more').click(function(e) { diff --git a/sites/all/themes/prospera/template.php b/sites/all/themes/prospera/template.php index 482f12e..1d02d3e 100644 --- a/sites/all/themes/prospera/template.php +++ b/sites/all/themes/prospera/template.php @@ -162,3 +162,12 @@ function prospera_preprocess_views_exposed_form(&$vars, $hook) { } } // */ + +function prospera_uc_product_add_to_cart($variables) { + $output = '
'; + $output .= drupal_render($variables['form']); + $output .= l('checkout', 'cart/checkout', array('attributes' => array('class' => 'checkout'))); + $output .= '
'; + + return $output; +}