SmartDukaan – /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 8917 – Changes in controllers and vm's for banner implementation.

kshitij.sood — Thu, 28 Nov 2013 14:07:27 +0530

kshitij.sood – 27 file(s) modified
Changes in controllers and vm's for banner implementation.

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HomeController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserImageController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /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/webapp/js/common.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaign-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/campaignEdit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/insurance-terms.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-faq.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-Edit.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/SideBanner-New.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/special-page-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-edit.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-editNew.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/user-image-index.vm
~ /trunk/Website/src/production/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/production/resources/templates/commonjsfiles.vm

Rev 6775 – Remove mynotes controller from the website. Also remove mynotes from ...

rajveer — Thu, 31 Jan 2013 14:47:06 +0530

rajveer – 9 file(s) modified
Remove mynotes controller from the website. Also remove mynotes from content.

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
x /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/entity.js
x /trunk/Website/src/main/webapp/js/my-notes.js
x /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-json.vm
x /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-show.vm

Rev 6050 – Create Recharge.

anupam.singh — Wed, 26 Sep 2012 15:33:51 +0530

anupam.singh – 53 file(s) modified
Create Recharge.

~ /trunk/PaymentService/src/main/java/in/shop2020/payment/domain/Payment.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/HdfcPaymentHandler.java
~ /trunk/PaymentService/src/main/java/in/shop2020/payment/service/handler/PaymentServiceHandler.java
~ /trunk/PyProj/src/shop2020/config/resources/shop2020.cfg
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/model/v1/order/TransactionService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService-remote
~ /trunk/PyProj/src/shop2020/thriftpy/payments/PaymentService.py
~ /trunk/PyProj/src/shop2020/thriftpy/payments/ttypes.py
~ /trunk/ThriftConfig/src/main/java/in/shop2020/model/v1/order/TransactionService.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/Payment.java
~ /trunk/ThriftConfig/src/main/java/in/shop2020/payments/PaymentService.java
~ /trunk/ThriftGen/thriftsrc/OrderService/OrderService.thrift
~ /trunk/ThriftGen/thriftsrc/PaymentService/PaymentService.thrift
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/ConfirmController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcRechargeResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePaymentController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargePayOptionsController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/RechargeResultController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CodPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcEmiPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
+ /trunk/Website/src/main/webapp/css/recharge.css
+ /trunk/Website/src/main/webapp/images/+91.png
+ /trunk/Website/src/main/webapp/images/91.jpg
+ /trunk/Website/src/main/webapp/images/back1.png
+ /trunk/Website/src/main/webapp/images/back2.jpg
+ /trunk/Website/src/main/webapp/images/blue.png
+ /trunk/Website/src/main/webapp/images/confirm.png
+ /trunk/Website/src/main/webapp/images/confirm_pressed.png
+ /trunk/Website/src/main/webapp/images/dth.png
+ /trunk/Website/src/main/webapp/images/dth_pressed.png
+ /trunk/Website/src/main/webapp/images/grey.jpg
+ /trunk/Website/src/main/webapp/images/input_back.jpg
+ /trunk/Website/src/main/webapp/images/phone.png
+ /trunk/Website/src/main/webapp/images/phone_pressed.png
+ /trunk/Website/src/main/webapp/images/Rupee.png
+ /trunk/Website/src/main/webapp/js/recharge.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/confirm-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/hdfc-recharge-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-pay-options-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-payment-success.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/recharge-result-index.vm

Rev 5542 – Changes to include tracking code inside head tag instead of ...

amar.kumar — Wed, 04 Jul 2012 12:22:13 +0530

amar.kumar – 45 file(s) modified
Changes to include tracking code inside head tag instead of body tag
Reviewed by Anupam Singh

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /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/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/clearance-sale-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/coming-soon-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/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/easy-linux.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-maybe.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.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/generated-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/get-paid-for-your-reviews.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/my-purchases-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/myaccount-index.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/product-index-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/quicklinks-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/register-index.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

Rev 4126 – Trac #675: - Widgets on sidebar are now collapsible - ...

varun.gupta — Thu, 24 Nov 2011 15:35:10 +0530

varun.gupta – 10 file(s) modified
Trac #675:
- Widgets on sidebar are now collapsible
- Phone images on home page aligned in the middle.
- In the widget areas the distance between arrows and title decreased.
- In top black bar and cart summary area, the text aligned vertically
- "Compare Selected" should show the count as "0" (for ex. Compare Selected (0).

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/cartwidget.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/header-footer.css
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/css/widgets.css
+ /trunk/Website/src/main/webapp/images/IconRightArrow_UnselectedTab.png
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
+ /trunk/Website/src/main/webapp/js/widgets.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-show.vm

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 3283 – Added support of auto complete feature while searching.

rajveer — Tue, 13 Sep 2011 16:33:04 +0530

rajveer – 11 file(s) modified
Added support of auto complete feature while searching.

~ /trunk/Website/pom.xml
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/AutoSuggestController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/AutoSuggestService.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/searchbar.vm
~ /trunk/Website/src/main/webapp/css/jquery.ui.autocomplete.css
+ /trunk/Website/src/main/webapp/images/ui-bg_glass_100_fdf5ce_1x400.png
~ /trunk/Website/src/main/webapp/js/all.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/auto-suggest-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 3111 – Added remarketing code for google ad and ohana. Add conversion ...

vikas — Wed, 31 Aug 2011 15:54:51 +0530

vikas – 5 file(s) modified
Added remarketing code for google ad and ohana. Add conversion tracking for ohana.

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
+ /trunk/Website/src/main/webapp/js/remarketing.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/src/production/resources/templates/commonjsfiles.vm

Rev 3068 – Corrected reference to an image and removed reference to an ...

chandranshu — Mon, 29 Aug 2011 11:39:49 +0530

chandranshu – 3 file(s) modified
Corrected reference to an image and removed reference to an invalid javascript file in production environment

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/jquery.ui.autocomplete.css
~ /trunk/Website/src/main/webapp/WEB-INF/content/compare-show.vm

Rev 2718 – My Notes - Second Iteration

varun.gupta — Tue, 26 Jul 2011 20:22:30 +0530

varun.gupta – 10 file(s) modified
My Notes - Second Iteration

~ /trunk/Website/pom.xml
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyNotesController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/product.css
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/my-notes.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-json.vm (copied from /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-show.vm@2683)
~ /trunk/Website/src/main/webapp/WEB-INF/content/my-notes-show.vm

Rev 1905 – EBS Payment service integration

chandranshu — Fri, 20 May 2011 18:30:36 +0530

chandranshu – 20 file(s) modified
EBS Payment service integration

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EbsPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/OrderController.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/CommonPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/EbsPaymentService.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/HdfcPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/services/IPaymentService.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs/Base64.java
+ /trunk/Website/src/main/java/in/shop2020/serving/utils/ebs/RC4.java
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
+ /trunk/Website/src/main/webapp/images/maestro-logo.gif
+ /trunk/Website/src/main/webapp/images/visa-master-logo.jpg
+ /trunk/Website/src/main/webapp/js/paymode-selection.js
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-response-show.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/ebs-pay-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/shipping-index.vm

Rev 1871 – Added ga_invoker.js to track events from local machines too.

varun.gupta — Tue, 17 May 2011 16:08:29 +0530

varun.gupta – 1 file(s) modified
Added ga_invoker.js to track events from local machines too.

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1840 – Updated JS files ordering

varun.gupta — Fri, 13 May 2011 15:36:23 +0530

varun.gupta – 1 file(s) modified
Updated JS files ordering

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1484 – Changed the default resources to use separate CSS and JS ...

chandranshu — Thu, 21 Apr 2011 11:58:12 +0530

chandranshu – 4 file(s) modified
Changed the default resources to use separate CSS and JS files

~ /trunk/Website/src/dev/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/dev/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1372 – Store myresearch and browsehistory widgets in browser.

vikas — Tue, 12 Apr 2011 14:58:11 +0530

vikas – 33 file(s) modified
Store myresearch and browsehistory widgets in browser.

~ /trunk/Website/build.xml
~ /trunk/Website/pom.xml
+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/BrowseHistoryController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/MyresearchController.java
~ /trunk/Website/src/main/resources/templates/browsehistory.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/resources/templates/myresearch.vm
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/charLimit.js
~ /trunk/Website/src/main/webapp/js/custom-jquery.js
+ /trunk/Website/src/main/webapp/js/jquery.cookie.js
+ /trunk/Website/src/main/webapp/js/jquery.Storage.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/address-index.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-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-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/contact-us-success.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/exception.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/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/myaccount-index.vm
+ /trunk/Website/src/main/webapp/WEB-INF/content/myresearch-index.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/order-show.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/search-index.vm

Rev 1256 – minify js and css.

vikas — Mon, 04 Apr 2011 15:48:34 +0530

vikas – 3 file(s) modified
minify js and css.

~ /trunk/Website/build.xml
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1237 – remove colorbox as it messed up product page.

vikas — Fri, 01 Apr 2011 17:41:33 +0530

vikas – 1 file(s) modified
remove colorbox as it messed up product page.

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1235 – ellipses and tootip using jquery.truncate plugin.

vikas — Fri, 01 Apr 2011 17:08:50 +0530

vikas – 7 file(s) modified
ellipses and tootip using jquery.truncate plugin.

~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm
~ /trunk/Website/src/main/webapp/css/style.css
~ /trunk/Website/src/main/webapp/js/charLimit.js
x /trunk/Website/src/main/webapp/js/jquery.text-overflow.js
+ /trunk/Website/src/main/webapp/js/jquery.truncate.min.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/category-show.vm
~ /trunk/Website/src/main/webapp/WEB-INF/content/entity-show.vm

Rev 1233 – Removed for now since this file has been #included ...

chandranshu — Fri, 01 Apr 2011 16:51:41 +0530

chandranshu – 3 file(s) modified
Removed for now since this file has been #included in other vm files and #parsed. Later on, it'll pass through a resource filter.

~ /trunk/Website/build.properties
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.vm

Rev 1232 – All CSS and JS files will now be served from ...

chandranshu — Fri, 01 Apr 2011 16:16:31 +0530

chandranshu – 8 file(s) modified
All CSS and JS files will now be served from static* domains

~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
~ /trunk/Website/src/main/resources/templates/commonjsfiles.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/category-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/search-index.vm

Rev 1038 – Moved conf files to src/main/resources

chandranshu — Thu, 17 Mar 2011 17:28:38 +0530

chandranshu – 11 file(s) modified
Moved conf files to src/main/resources

x /trunk/Website/conf/log4j.properties
x /trunk/Website/conf/struts.properties
x /trunk/Website/conf/struts.xml
x /trunk/Website/conf/templates
x /trunk/Website/conf/velocity.properties
+ /trunk/Website/src/main/resources
+ /trunk/Website/src/main/resources/log4j.properties (copied from /trunk/Website/conf/log4j.properties@1036)
+ /trunk/Website/src/main/resources/struts.properties (copied from /trunk/Website/conf/struts.properties@1036)
+ /trunk/Website/src/main/resources/struts.xml (copied from /trunk/Website/conf/struts.xml@1036)
+ /trunk/Website/src/main/resources/templates (copied from /trunk/Website/conf/templates@1036)
+ /trunk/Website/src/main/resources/velocity.properties (copied from /trunk/Website/conf/velocity.properties@1036)

Rev 927 – broken cart button fixed in mail success. Added email to ...

rajveer — Sun, 06 Mar 2011 00:38:14 +0530

rajveer – 4 file(s) modified
broken cart button fixed in mail success. Added email to from box on contact us page

~ /trunk/Website/conf/templates/commonjsfiles.vm
~ /trunk/Website/WebContent/WEB-INF/content/forgot-password-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/send-mail-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/send-mail-success.vm

Rev 882 – Remove unused files.

vikas — Tue, 01 Mar 2011 18:55:23 +0530

vikas – 3 file(s) modified
Remove unused files.

~ /trunk/Website/conf/templates/commonjsfiles.vm
x /trunk/Website/WebContent/js/formvalidation.js
x /trunk/Website/WebContent/js/searchResult.js

Rev 864 – changes by ebizon

rajveer — Fri, 25 Feb 2011 12:36:42 +0530

rajveer – 2 file(s) modified
changes by ebizon

~ /trunk/Website/conf/templates/commonjsfiles.vm
~ /trunk/Website/conf/templates/header.vm

Rev 794 – ebizon css and js changes

rajveer — Wed, 16 Feb 2011 14:05:56 +0530

rajveer – 46 file(s) modified
ebizon css and js changes

~ /trunk/Website/conf/templates/bestdeals.vm
~ /trunk/Website/conf/templates/bestsellers.vm
~ /trunk/Website/conf/templates/cartdetails.vm
~ /trunk/Website/conf/templates/commonjsfiles.vm
~ /trunk/Website/conf/templates/completedorders.vm
~ /trunk/Website/conf/templates/header.vm
~ /trunk/Website/conf/templates/latestarrivals.vm
~ /trunk/Website/conf/templates/logindetails.vm
~ /trunk/Website/conf/templates/mainmenu.vm
~ /trunk/Website/conf/templates/myaccount.vm
~ /trunk/Website/conf/templates/myresearch.vm
~ /trunk/Website/conf/templates/personaldetails.vm
~ /trunk/Website/conf/templates/pricediv.vm
~ /trunk/Website/conf/templates/productsummary.vm
~ /trunk/Website/conf/templates/searchbar.vm
~ /trunk/Website/conf/templates/shippingaddressdetails.vm
~ /trunk/Website/conf/templates/shippingdetails.vm
~ /trunk/Website/WebContent/css/cart.css
~ /trunk/Website/WebContent/css/common.css
~ /trunk/Website/WebContent/css/demoStyles.css
~ /trunk/Website/WebContent/css/gc_safari.css
~ /trunk/Website/WebContent/css/ie7.css
~ /trunk/Website/WebContent/css/ie8.css
~ /trunk/Website/WebContent/css/jquery-ui-1.8.6.custom.css
~ /trunk/Website/WebContent/css/lightbox_inline.css
~ /trunk/Website/WebContent/css/myaccount.css
~ /trunk/Website/WebContent/css/nav.css
~ /trunk/Website/WebContent/css/product.css
~ /trunk/Website/WebContent/css/style.css
~ /trunk/Website/WebContent/css/widget.css
+ /trunk/Website/WebContent/images/button-bg.jpg
+ /trunk/Website/WebContent/js/cart-details.js
+ /trunk/Website/WebContent/js/custom-jquery.js
~ /trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/category-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/index.vm
~ /trunk/Website/WebContent/WEB-INF/content/latest-arrivals-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/login-details-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/login-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/register-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/search-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/shipping-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/test-index.vm

Rev 768 – removed old color selector

rajveer — Thu, 10 Feb 2011 13:06:07 +0530

rajveer – 10 file(s) modified
removed old color selector

~ /trunk/Website/conf/templates/commonjsfiles.vm
~ /trunk/Website/conf/templates/customerservice.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/AddressController.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/WebContent/WEB-INF/content/address-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/category-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/search-index.vm

Rev 741 – Payment gateway integration. Javascript code clean up. deleted unused files.

rajveer — Wed, 02 Feb 2011 14:45:57 +0530

rajveer – 54 file(s) modified
Payment gateway integration. Javascript code clean up. deleted unused files.

~ /trunk/Website/conf/templates/commonjsfiles.vm
~ /trunk/Website/conf/templates/loginform.vm
~ /trunk/Website/conf/templates/myaccount.vm
~ /trunk/Website/conf/templates/shippingaddressdetails.vm
~ /trunk/Website/conf/templates/shippingdetails.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/BestDealsController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/BestSellersController.java
x /trunk/Website/src/in/shop2020/serving/controllers/CompareController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/HdfcPayResponseController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LatestArrivalsController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/OrderController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/RegisterController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/TestController.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/in/shop2020/serving/utils/Utils.java
~ /trunk/Website/WebContent/WEB-INF/content/address-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/best-deals-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/best-sellers-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/best-sellers-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/cart-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/category-show.vm
x /trunk/Website/WebContent/WEB-INF/content/compare-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/entity-show.vm
x /trunk/Website/WebContent/WEB-INF/content/footer.vm
~ /trunk/Website/WebContent/WEB-INF/content/forgot-password-index.vm
x /trunk/Website/WebContent/WEB-INF/content/header.vm
~ /trunk/Website/WebContent/WEB-INF/content/home-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/latest-arrivals-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/login-details-index.vm
x /trunk/Website/WebContent/WEB-INF/content/login-details-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/login-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/myaccount-index.vm
x /trunk/Website/WebContent/WEB-INF/content/myaccount-login.vm
x /trunk/Website/WebContent/WEB-INF/content/myaccount-show.vm
x /trunk/Website/WebContent/WEB-INF/content/order-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/order-show.vm
x /trunk/Website/WebContent/WEB-INF/content/order-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/pay-error-index.vm
x /trunk/Website/WebContent/WEB-INF/content/pay-response-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
x /trunk/Website/WebContent/WEB-INF/content/personal-details-success.vm
x /trunk/Website/WebContent/WEB-INF/content/ratings-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/register-index.vm
x /trunk/Website/WebContent/WEB-INF/content/register-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/search-index.vm
x /trunk/Website/WebContent/WEB-INF/content/search-index_old.vm
~ /trunk/Website/WebContent/WEB-INF/content/send-mail-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/send-mail-success.vm
x /trunk/Website/WebContent/WEB-INF/content/widgetdiv.vm

Rev 583 – My accounts UI changes.

rajveer — Wed, 12 Jan 2011 17:58:49 +0530

rajveer – 16 file(s) modified
My accounts UI changes.

+ /trunk/Website/conf/templates/commonjsfiles.vm
~ /trunk/Website/conf/templates/completedorders.vm
~ /trunk/Website/conf/templates/logindetails.vm
~ /trunk/Website/conf/templates/myaccount.vm
~ /trunk/Website/conf/templates/orderdetails.vm
~ /trunk/Website/conf/templates/personaldetails.vm
~ /trunk/Website/conf/templates/shippingaddressdetails.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/ForgotPasswordController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/SearchController.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/WebContent/index.jsp
~ /trunk/Website/WebContent/js/priceSlider.js
+ /trunk/Website/WebContent/WEB-INF/content/forgot-password-failure.vm
~ /trunk/Website/WebContent/WEB-INF/content/forgot-password-index.vm
+ /trunk/Website/WebContent/WEB-INF/content/forgot-password-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/search-index.vm