Rev 3830 – Merged the Website1 code back into the website

chandranshu — Thu, 20 Oct 2011 19:44:52 +0530

chandranshu – 140 file(s) modified
Merged the Website1 code back into the website

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CartController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EstimateController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/PaySuccessController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ShippingController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/UserSessionInfo.java
~ /trunk/Website/src/main/java/in/shop2020/serving/utils/FormattingUtils.java
~ /trunk/Website/src/main/resources/templates/accessories.vm
~ /trunk/Website/src/main/resources/templates/browsehistory.vm
+ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/footer.vm
~ /trunk/Website/src/main/resources/templates/header.vm
~ /trunk/Website/src/main/resources/templates/mainbanner.vm
~ /trunk/Website/src/main/resources/templates/mostcompared.vm
~ /trunk/Website/src/main/resources/templates/myresearch.vm
~ /trunk/Website/src/main/resources/templates/orderdetails.vm
x /trunk/Website/src/main/resources/templates/searchbar.vm
~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/css/cart.css
+ /trunk/Website/src/main/webapp/css/cartflow.css
~ /trunk/Website/src/main/webapp/css/common.css
~ /trunk/Website/src/main/webapp/css/comparision.css
~ /trunk/Website/src/main/webapp/css/contactus.css
+ /trunk/Website/src/main/webapp/css/entity.css
+ /trunk/Website/src/main/webapp/css/header-footer.css
+ /trunk/Website/src/main/webapp/css/home.css
~ /trunk/Website/src/main/webapp/css/myaccount.css
~ /trunk/Website/src/main/webapp/css/proceed-to-pay.css
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/css/widget.css
+ /trunk/Website/src/main/webapp/css/widgets.css
+ /trunk/Website/src/main/webapp/images/Arrow_OrangeButton_AllScreens.png
+ /trunk/Website/src/main/webapp/images/BG_NavBar.png
+ /trunk/Website/src/main/webapp/images/button-glass-bg.png
+ /trunk/Website/src/main/webapp/images/ButtonAddtoCart_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/ButtonWhite_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_AddNewAddress_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_Apply_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_EnterShippingInfo_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_MakePayment_ALLSTATES-copy.png
+ /trunk/Website/src/main/webapp/images/Button_ProceedToPayment_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_UpdateDeliveryTime_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Button_ViewAllOrders_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Cross_DeleteRow_DEF.png
+ /trunk/Website/src/main/webapp/images/Cross_DeleteRow_DWN.png
+ /trunk/Website/src/main/webapp/images/Cross_DeleteRow_OVR.png
+ /trunk/Website/src/main/webapp/images/FooterBG.png
+ /trunk/Website/src/main/webapp/images/FooterFootBG.png
+ /trunk/Website/src/main/webapp/images/IconAddtoCompare_ProdArea.png
+ /trunk/Website/src/main/webapp/images/IconBestDeals_NavBar.png
+ /trunk/Website/src/main/webapp/images/IconCompareWith_ProdArea.png
+ /trunk/Website/src/main/webapp/images/IconCross_Lists_DEF.png
+ /trunk/Website/src/main/webapp/images/IconCross_Lists_OVR.png
+ /trunk/Website/src/main/webapp/images/IconDownArrow_SelectedTab.png
+ /trunk/Website/src/main/webapp/images/IconDownArrow_UnselectedTab.png
+ /trunk/Website/src/main/webapp/images/IconDownArrow_WhiteButton.png
+ /trunk/Website/src/main/webapp/images/IconEmptyCart_CartSummary.png
+ /trunk/Website/src/main/webapp/images/IconFreeDelivery_TopBar.png
+ /trunk/Website/src/main/webapp/images/IconOfferPack_ProdList.png
+ /trunk/Website/src/main/webapp/images/IconOfferPack_ProdPage.png
+ /trunk/Website/src/main/webapp/images/IconSearchButton_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/IconSupport_TopBar.png
+ /trunk/Website/src/main/webapp/images/Icons_CreditCardsPayment.png
+ /trunk/Website/src/main/webapp/images/Icons_Security.png
+ /trunk/Website/src/main/webapp/images/Icon_AddNewAddress_ALLSTATES.png
+ /trunk/Website/src/main/webapp/images/Icon_DeliveryTime.png
+ /trunk/Website/src/main/webapp/images/Icon_ShareOnFacebook.png
+ /trunk/Website/src/main/webapp/images/LeftTab_Selected.png
+ /trunk/Website/src/main/webapp/images/LeftTab_Unselected.png
+ /trunk/Website/src/main/webapp/images/ListIcon_Cart_Default.png
+ /trunk/Website/src/main/webapp/images/ListIcon_Cart_Mouseover.png
+ /trunk/Website/src/main/webapp/images/MidTab_Selected.png
+ /trunk/Website/src/main/webapp/images/MidTab_Unselected.png
+ /trunk/Website/src/main/webapp/images/number_selected.png
+ /trunk/Website/src/main/webapp/images/number_Unselected.png
+ /trunk/Website/src/main/webapp/images/RadioButton_Selected.png
+ /trunk/Website/src/main/webapp/images/RadioButton_Unselected.png
+ /trunk/Website/src/main/webapp/images/RightTab_Selected.png
+ /trunk/Website/src/main/webapp/images/RightTab_Unselected.png
+ /trunk/Website/src/main/webapp/images/saholic-logo.jpg
+ /trunk/Website/src/main/webapp/images/sprite.png
+ /trunk/Website/src/main/webapp/images/VerticalSeparator_NavBar.png
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/cart-details.js
+ /trunk/Website/src/main/webapp/js/common.js
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
~ /trunk/Website/src/main/webapp/js/entity.js
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/js/my-notes.js
~ /trunk/Website/src/main/webapp/js/productCategory.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/aboutus.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/after-sales-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/browse-history-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/careers.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/cart-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/contact-us-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/estimate-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/failed-orders-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/forgot-password-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/glossary-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/most-compared-products-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/proceed-to-pay-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/related-accessories-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/search-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/terms-conditions.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/updates-psuccess.vm

Rev 2270 – Added date range from 1940 to 2000.

rajveer — Mon, 20 Jun 2011 23:34:27 +0530

rajveer – 1 file(s) modified
Added date range from 1940 to 2000.

~ /trunk/Website/src/main/webapp/js/loginregister.js

Rev 2110 – Page tracking for register page.

vikas — Tue, 07 Jun 2011 19:15:00 +0530

vikas – 2 file(s) modified
Page tracking for register page.

~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/loginregister.js

Rev 2072 – Added instruction text under communication email field.

varun.gupta — Fri, 03 Jun 2011 16:47:57 +0530

varun.gupta – 3 file(s) modified
Added instruction text under communication email field.

~ /trunk/Website/src/main/webapp/css/signinsignup.css
~ /trunk/Website/src/main/webapp/js/loginregister.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/login-index.vm

Rev 1842 – Event tracker code moved out of form validator

varun.gupta — Fri, 13 May 2011 15:51:34 +0530

varun.gupta – 1 file(s) modified
Event tracker code moved out of form validator

~ /trunk/Website/src/main/webapp/js/loginregister.js

Rev 1831 – Javascript code used in Login/Register page now moved into a ...

varun.gupta — Thu, 12 May 2011 17:33:40 +0530

varun.gupta – 3 file(s) modified
Javascript code used in Login/Register page now moved into a new separate file.