SmartDukaan – /trunk/Website/src/main/resources/templates/

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 1241 – Revert jquery-custom.css changes

chandranshu — Fri, 01 Apr 2011 18:08:35 +0530

chandranshu – 4 file(s) modified
Revert jquery-custom.css changes

~ /trunk/Website/src/main/resources/templates/commoncssfiles.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/search-index.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 1204 – FB Like updated

varun.gupta — Wed, 30 Mar 2011 17:35:02 +0530

varun.gupta – 1 file(s) modified
FB Like updated

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

Rev 1201 – Display message added in case of not shipping address

varun.gupta — Wed, 30 Mar 2011 16:53:56 +0530

varun.gupta – 1 file(s) modified
Display message added in case of not shipping address

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

Rev 1197 – Product specific tweets

varun.gupta — Wed, 30 Mar 2011 13:51:54 +0530

varun.gupta – 3 file(s) modified
Product specific tweets

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/src/main/resources/templates/socialutils.vm

Rev 1187 – Button to add shipping address fixed.

varun.gupta — Tue, 29 Mar 2011 19:34:34 +0530

varun.gupta – 1 file(s) modified
Button to add shipping address fixed.

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

Rev 1184 – Signin-Signup Page's header updated

varun.gupta — Tue, 29 Mar 2011 17:05:06 +0530

varun.gupta – 3 file(s) modified
Signin-Signup Page's header updated

~ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserController.java
~ /trunk/Website/src/main/java/in/shop2020/serving/services/PageLoaderHandler.java
+ /trunk/Website/src/main/resources/templates/signinsignupheader.vm

Rev 1183 – Login and Registration forms now included in a single page.

varun.gupta — Tue, 29 Mar 2011 16:45:30 +0530

varun.gupta – 4 file(s) modified
Login and Registration forms now included in a single page.

+ /trunk/Website/src/main/java/in/shop2020/serving/controllers/UserController.java
~ /trunk/Website/src/main/resources/templates/commoncssfiles.vm
+ /trunk/Website/src/main/webapp/css/signinsignup.css
+ /trunk/Website/src/main/webapp/WEB-INF/content/user-index.vm

Rev 1179 – fblike using iframe.

vikas — Tue, 29 Mar 2011 12:59:15 +0530

vikas – 1 file(s) modified
fblike using iframe.

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

Rev 1173 – CSS for 'Contact Us' form linked.

varun.gupta — Mon, 28 Mar 2011 15:32:23 +0530

varun.gupta – 1 file(s) modified
CSS for 'Contact Us' form linked.

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

Rev 1108 – Corrected the searchbar anchor issue

chandranshu — Tue, 22 Mar 2011 19:10:19 +0530

chandranshu – 1 file(s) modified
Corrected the searchbar anchor issue

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

Rev 1105 – ebizon changes

rajveer — Tue, 22 Mar 2011 18:16:03 +0530

rajveer – 1 file(s) modified
ebizon changes

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

Rev 1053 – Fix some js issues.

vikas — Fri, 18 Mar 2011 13:10:27 +0530

vikas – 3 file(s) modified
Fix some js issues.

~ /trunk/Website/src/main/resources/templates/shippingaddressdetails.vm
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/WEB-INF/content/personal-details-index.vm

Rev 1047 –

vikas — Thu, 17 Mar 2011 20:06:50 +0530

vikas – 3 file(s) modified

~ /trunk/Website/src/main/resources/templates/shippingdetails.vm
~ /trunk/Website/src/main/webapp/js/all.js
~ /trunk/Website/src/main/webapp/js/custom-jquery.js

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 1025 – Added message for empty research box for signed-in user and ...

varun.gupta — Thu, 17 Mar 2011 13:24:58 +0530

varun.gupta – 1 file(s) modified
Added message for empty research box for signed-in user and some formatting.

~ /trunk/Website/conf/templates/myresearch.vm

Rev 1018 – added fb-root to fb like button

rajveer — Wed, 16 Mar 2011 19:33:27 +0530

rajveer – 1 file(s) modified
added fb-root to fb like button

~ /trunk/Website/conf/templates/socialutils.vm

Rev 1014 – removed alerts and added saholic account in twitter

rajveer — Wed, 16 Mar 2011 19:17:31 +0530

rajveer – 2 file(s) modified
removed alerts and added saholic account in twitter

~ /trunk/Website/conf/templates/socialutils.vm
~ /trunk/Website/WebContent/js/custom-jquery.js

Rev 1006 – Anchor tag moved higher in DOM to make whole DIV ...

varun.gupta — Wed, 16 Mar 2011 17:27:42 +0530

varun.gupta – 1 file(s) modified
Anchor tag moved higher in DOM to make whole DIV a hyperlink

~ /trunk/Website/conf/templates/searchbar.vm

Rev 981 – Trac#213: Added order city and state to the display

chandranshu — Tue, 15 Mar 2011 13:07:36 +0530

chandranshu – 1 file(s) modified
Trac#213: Added order city and state to the display

~ /trunk/Website/conf/templates/orderdetails.vm

Rev 980 – SEO changes.

vikas — Mon, 14 Mar 2011 18:07:38 +0530

vikas – 8 file(s) modified
SEO changes.

~ /trunk/Website/conf/templates/customerservice.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
+ /trunk/Website/src/in/shop2020/serving/controllers/ContactUsController.java (copied from /trunk/Website/src/in/shop2020/serving/controllers/SendMailController.java@977)
x /trunk/Website/src/in/shop2020/serving/controllers/SendMailController.java
+ /trunk/Website/WebContent/WEB-INF/content/contact-us-index.vm (copied from /trunk/Website/WebContent/WEB-INF/content/send-mail-index.vm@977)
+ /trunk/Website/WebContent/WEB-INF/content/contact-us-success.vm (copied from /trunk/Website/WebContent/WEB-INF/content/send-mail-success.vm@977)
x /trunk/Website/WebContent/WEB-INF/content/send-mail-index.vm
x /trunk/Website/WebContent/WEB-INF/content/send-mail-success.vm

Rev 978 – Corrected the order of included JS files for correct parsing

chandranshu — Mon, 14 Mar 2011 17:22:09 +0530

chandranshu – 2 file(s) modified
Corrected the order of included JS files for correct parsing

~ /trunk/Website/conf/templates/cartdetails.vm
~ /trunk/Website/WebContent/WEB-INF/content/cart-index.vm

Rev 974 –

vikas — Fri, 11 Mar 2011 20:15:53 +0530

vikas – 12 file(s) modified

~ /trunk/Website/conf/templates/mainmenu.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/CategoryController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/EntityController.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /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/entity-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/index.vm
~ /trunk/Website/WebContent/WEB-INF/content/latest-arrivals-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/privacy-policy.vm
~ /trunk/Website/WebContent/WEB-INF/content/terms-conditions.vm

Rev 949 – ebizon changes.

rajveer — Thu, 10 Mar 2011 12:15:13 +0530

rajveer – 1 file(s) modified
ebizon changes.

~ /trunk/Website/conf/templates/shippingaddressdetails.vm

Rev 946 – Fix some cross browser issues.

vikas — Wed, 09 Mar 2011 11:51:21 +0530

vikas – 2 file(s) modified
Fix some cross browser issues.

~ /trunk/Website/conf/templates/shippingaddressdetails.vm
~ /trunk/Website/conf/templates/shippingdetails.vm

Rev 943 – Move js imports to bottom. Show tooltip with full string ...

vikas — Tue, 08 Mar 2011 18:01:37 +0530

vikas – 31 file(s) modified
Move js imports to bottom.
Show tooltip with full string in case of overflows.
some inline css cleanup

~ /trunk/Website/build.xml
~ /trunk/Website/conf/templates/commoncssfiles.vm
~ /trunk/Website/WebContent/css/common.css
~ /trunk/Website/WebContent/js/charLimit.js
~ /trunk/Website/WebContent/js/jquery.text-overflow.js
~ /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/cart-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/category-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/completed-orders-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/entity-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/exception.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/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/myaccount-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/order-show.vm
~ /trunk/Website/WebContent/WEB-INF/content/pay-error-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/pay-success-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/personal-details-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/privacy-policy.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/send-mail-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/send-mail-success.vm
~ /trunk/Website/WebContent/WEB-INF/content/shipping-index.vm
~ /trunk/Website/WebContent/WEB-INF/content/terms-conditions.vm

Rev 929 – Removed remaining alert statements

rajveer — Mon, 07 Mar 2011 11:35:30 +0530

rajveer – 4 file(s) modified
Removed remaining alert statements

~ /trunk/Website/conf/templates/shippingdetails.vm
~ /trunk/Website/WebContent/js/myaccount.js
~ /trunk/Website/WebContent/js/productCategory.js
~ /trunk/Website/WebContent/js/shippingAddress.js

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 924 – Do not put redirect url in session to keep session ...

vikas — Fri, 04 Mar 2011 19:37:17 +0530

vikas – 8 file(s) modified
Do not put redirect url in session to keep session stateless as much as possible.

~ /trunk/Website/conf/struts.xml
~ /trunk/Website/conf/templates/header.vm
~ /trunk/Website/src/in/shop2020/serving/controllers/BaseController.java
~ /trunk/Website/src/in/shop2020/serving/controllers/LoginController.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/LoginInterceptor.java
~ /trunk/Website/src/in/shop2020/serving/interceptors/UserInterceptor.java
~ /trunk/Website/src/in/shop2020/serving/services/PageLoaderHandler.java
~ /trunk/Website/WebContent/WEB-INF/content/login-index.vm

Rev 909 – added color in order page

rajveer — Thu, 03 Mar 2011 20:17:46 +0530

rajveer – 1 file(s) modified
added color in order page

~ /trunk/Website/conf/templates/orderdetails.vm

Rev 887 – Added the provider name back to display

chandranshu — Thu, 03 Mar 2011 13:29:02 +0530

chandranshu – 1 file(s) modified
Added the provider name back to display

~ /trunk/Website/conf/templates/myaccount.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 877 – combine and compress js and css files.

vikas — Tue, 01 Mar 2011 14:21:16 +0530

vikas – 2 file(s) modified
combine and compress js and css files.

~ /trunk/Website/build.xml
~ /trunk/Website/conf/templates/commoncssfiles.vm

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 863 – social utls commited

rajveer — Fri, 25 Feb 2011 12:32:53 +0530

rajveer – 1 file(s) modified
social utls commited

~ /trunk/Website/conf/templates/socialutils.vm

Rev 861 – Disable proceed to pay if shipping address is empty.

vikas — Thu, 24 Feb 2011 16:44:35 +0530

vikas – 1 file(s) modified
Disable proceed to pay if shipping address is empty.

~ /trunk/Website/conf/templates/shippingdetails.vm