aatish
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,279 Commits 11 Branches 82 Tags 313 MiB
Commit Graph

453 Commits

Author SHA1 Message Date
Arvind Tiwari 96a993b235 images added, ungleich landing modified 2017-10-10 02:09:03 +05:30
Arvind Tiwari 695a8687fd first iteration 2017-10-10 00:04:19 +05:30
M.Ravi 564f47cf8a Handle login and billing address forms together in PaymentOrderView 2017-10-08 13:50:43 +02:00
M.Ravi 02d144fbf9 Add form name and error fields to payment login form 2017-10-07 12:59:40 +02:00
Arvind Tiwari 7d7b8661ea translations 2017-10-07 16:19:53 +05:30
Arvind Tiwari 769396d95e login pages restyled and footer included 2017-10-07 14:38:48 +05:30
Arvind Tiwari 6536991209 list all cards, card_input template 2017-10-06 01:17:35 +05:30
Arvind Tiwari 1990c4758e merged master 2017-10-03 23:49:26 +05:30
Arvind Tiwari 6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
Arvind Tiwari e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi 42224a5d38 Add missing form ids 2017-10-02 01:34:32 +02:00
Arvind Tiwari ba366eed77 merge master 2017-09-28 18:37:33 +05:30
Arvind Tiwari b65bc3f1f5 merge master 2017-09-28 18:23:48 +05:30
PCoder e215a85a4d dcl order confirmation: add code to show button on modal 2017-09-28 04:14:35 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Arvind Tiwari 88706b0088 merged master 2017-09-28 03:06:47 +05:30
PCoder 5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
Arvind Tiwari 11c1781839 fix for gmail autoformatiing 2017-09-27 04:37:02 +05:30
Arvind Tiwari 06bc37a977 paddings changed 2017-09-27 04:13:04 +05:30
Arvind Tiwari 5747468c21 outline removed 2017-09-27 03:09:43 +05:30
Arvind Tiwari 2d06173edb logo padding 2017-09-27 02:50:59 +05:30
Arvind Tiwari 8307636b9b Merge branch 'master' into task/3794/update_email_styles 2017-09-27 02:16:09 +05:30
Arvind Tiwari d3f2fd2aa0 dcl logo changed to png 2017-09-27 02:14:20 +05:30
Arvind Tiwari 21660f8d00 font-size reduced, vm cancel and vm create email data fixed 2017-09-27 02:07:52 +05:30
Arvind Tiwari 3cf28c793c form method fix 2017-09-26 03:29:38 +05:30
Arvind Tiwari dfbda2a53b load tag 2017-09-26 03:21:20 +05:30
Arvind Tiwari 3c32abbf8e dcl form added 2017-09-26 03:18:19 +05:30
Arvind Tiwari 050f750322 merged master 2017-09-26 03:06:12 +05:30
Arvind Tiwari f35c3dbc10 modal check icon thinner, terminate modal text smaller 2017-09-26 02:38:31 +05:30
Arvind Tiwari 63ea7dac37 datacenterlight invoice redesigned 2017-09-26 01:04:38 +05:30
PCoder 39a2455817 Merged upstream master into task/3730/refactor_price_parameter 2017-09-24 04:20:41 +05:30
PCoder 656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +05:30
PCoder b428a0933e Deleted datacenterlight pricing.html 2017-09-23 21:23:48 +05:30
PCoder 93d36306fb Removed total and price fields used in dcl flow 2017-09-23 13:21:01 +05:30
Arvind Tiwari 057a2c77a6 password reset email, user activation email redesigned 2017-09-23 01:57:40 +05:30
Arvind Tiwari 29fb7224a6 new translations 2017-09-23 01:08:09 +05:30
Arvind Tiwari 6004a7ede4 new welcome email 2017-09-23 01:03:43 +05:30
M.Ravi a48188a190 datacenterlight: Added create vm modal and responding with json 2017-09-22 21:20:00 +02:00
M.Ravi 0e5a27862a Added base_url and fixed new account emails 2017-09-22 13:46:22 +02:00
M.Ravi 994ffaf117 Send account details in email 2017-09-22 12:01:09 +02:00
PCoder e2cb70a697 first attempt at refatoring the user creating to order confirmaton page 2017-09-21 06:41:09 +05:30
Arvind Tiwari 0f5bf606da minor fixes 2017-09-20 23:32:48 +05:30
Arvind Tiwari 87327d028a hosting form view modified 2017-09-15 20:03:52 +05:30
Arvind Tiwari 6237469ab2 mobile order fixed 2017-09-13 01:55:58 +05:30
Arvind Tiwari 4d2903ca86 billing address save and get 2017-09-12 00:54:02 +05:30
Arvind Tiwari 5d9a20dd94 merged master and added translations 2017-09-11 23:47:35 +05:30
PCoder e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari d4e73f4c74 Merge branch 'master' into task/3756/landing_billing_page 2017-09-09 02:13:24 +05:30
Arvind Tiwari 7a4573f7ad user logged in after signup on payment page 2017-09-09 02:10:25 +05:30
Arvind Tiwari 71e6fac997 Merge pull request #482 from tiwariav/task/3759/hosting_navbar 
Task/3759 hosting navbar redesign
 2017-09-09 00:28:57 +05:30
Arvind Tiwari 2dc9ce4d31 vm specs fixed 2017-09-08 23:53:32 +05:30
Arvind Tiwari de1895d2a0 billing address form fixed 2017-09-08 23:46:29 +05:30
Arvind Tiwari 5c543af25c code cleanup 2017-09-08 20:14:43 +05:30
Arvind Tiwari 223606947a removed icon 2017-09-07 23:48:53 +05:30
Arvind Tiwari db891aaa1e hosting navbar changed and consistent with dcl navbar 2017-09-07 21:01:17 +05:30
Arvind Tiwari 43c6abea7e minor changes 2017-09-07 20:27:18 +05:30
Arvind Tiwari d643e6a5b1 login btn on datacenterlight pages 2017-09-07 20:24:19 +05:30
Arvind Tiwari 0ed104cd56 logged in user 2017-09-07 19:56:34 +05:30
Arvind Tiwari 98e8be1da9 landing payment page layout complete 2017-09-07 02:47:57 +05:30
Arvind Tiwari aaf3bc18d8 landing_payment all sections arranged 2017-09-06 00:12:13 +05:30
Arvind Tiwari 09b80467b9 landing payment page cleanup 2017-09-05 00:24:18 +05:30
M.Ravi 7a4e0760ae Updated account activation txt email template 2017-09-03 18:47:42 +02:00
PCoder 5381e0fa67 Fixed another incorrect template 2017-09-02 14:30:10 +05:30
PCoder ede949004e Fixed an incorrect template name 2017-09-02 14:28:18 +05:30
PCoder 61988ae27b Renamed base_email to base_email_datacenterlight 2017-09-02 14:24:23 +05:30
PCoder cf83a67d51 Further refactored to base_email_datacenterlight.html 2017-09-02 14:17:08 +05:30
PCoder 75611deadd Further refactored user activation email 2017-09-02 13:32:20 +05:30
PCoder eb79251fc0 Added translation and refactored user activation txt email 2017-09-02 13:25:47 +05:30
PCoder aecdff2ab7 Made into a single text -- Your Data Center Light Team 2017-09-02 12:47:44 +05:30
PCoder f4726954b8 Removed Raleway font 2017-09-02 12:35:01 +05:30
PCoder 79f4b38e4c Refactored user activation email 2017-09-02 12:24:10 +05:30
PCoder 39b996ea1a Merge branch 'task/3318/mail_style_fix' of https://github.com/geethamondi/dynamicweb into geethamondi-task/3318/mail_style_fix 2017-09-02 11:03:05 +05:30
Arvind Tiwari f0bca697b1 fix 2017-09-02 03:20:32 +05:30
Arvind Tiwari e524281d16 Merge pull request #466 from pcoder/task/3709/faq_tos_cms_template 
Task/3709/Improvements to Data Center Light CMS template
 2017-09-02 02:27:46 +05:30
Arvind Tiwari 979844e55b hosting payment and datacenterlight payment files supported 2017-09-02 02:02:05 +05:30
Arvind Tiwari ffa0abee34 contact link fix 2017-09-01 02:16:18 +05:30
Arvind Tiwari b1baf564db navbar-header clickable, contact href fixed, highlights focus color fixed 2017-09-01 02:05:24 +05:30
Arvind Tiwari fa538e7747 landing buttons fixed 2017-09-01 01:32:06 +05:30
Arvind Tiwari 5550867870 navbar link hash fixed, footer links fixed 2017-09-01 01:27:44 +05:30
Arvind Tiwari 3ed2399337 merge master 2017-09-01 00:39:01 +05:30
Arvind Tiwari d1f5ead9a0 place order msg posiotion fixed for mobile 2017-08-31 21:26:39 +05:30
PCoder 51190a5546 Added page_title in the title tag and the page title text 2017-08-31 00:36:19 +05:30
PCoder a7b1819d04 Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-31 00:10:02 +05:30
PCoder 28bcef082c Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message 2017-08-27 16:41:39 +05:30
PCoder 6cca92ec3a Reformatted dcl's _navbar.html. 
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
 2017-08-27 16:37:49 +05:30
M.Ravi b044acab5d Refactored class names to better names 2017-08-27 16:37:49 +05:30
M.Ravi 597541a2ee Updated _navbar to show menu on other pages except for index and whydcl 2017-08-27 16:37:49 +05:30
M.Ravi 8caeaf0217 Added cms.css and renamed faq.html to cms_page.html 2017-08-27 16:37:48 +05:30
PCoder 189adbadfb Added cms_tags, sekizai_tags and cms_toolbar 2017-08-27 16:37:48 +05:30
PCoder cd67bb9938 Added faq.html cms template 2017-08-27 16:37:48 +05:30
PCoder 6c1307d1d3 Reverted back to original title in base.html 2017-08-26 21:01:21 +05:30
PCoder af713a0e96 cms_page.html: Added placeholder for title tag 2017-08-26 20:49:17 +05:30
PCoder 0be3266ed3 Moved cms toolbar before title tag 2017-08-26 20:46:51 +05:30
PCoder 2a76167d10 Merge branch 'master' into task/3709/faq_tos_cms_template 2017-08-24 23:59:09 +05:30
M.Ravi 7153b635e5 Removed (incl. VAT) text in hosting,dcl payment template 2017-08-24 13:29:39 +02:00
PCoder f2b0ff04ca Added text and styles for monthly payment clarification 2017-08-24 13:41:48 +05:30
PCoder 6c80f94f67 Reformatted dcl's _navbar.html. 
Attention: Some lines are over 120 char limit as multiline templatetags is not supported.
 2017-08-21 23:16:55 +05:30
M.Ravi 696af58bff Refactored class names to better names 2017-08-21 18:00:41 +02:00
M.Ravi c8dcd65adc Updated _navbar to show menu on other pages except for index and whydcl 2017-08-21 17:52:57 +02:00
M.Ravi 090f338878 Added cms.css and renamed faq.html to cms_page.html 2017-08-21 17:51:38 +02:00
Arvind Tiwari 06c68873ae downtime.html modified as a static html page 2017-08-20 03:59:24 +05:30
Arvind Tiwari 0e72f8a436 downtime page 2017-08-20 03:30:10 +05:30
Arvind Tiwari 65ac2df002 dropdown style changed to match landing page style 2017-08-20 01:46:26 +05:30
PCoder 687cf96287 Added cms_tags, sekizai_tags and cms_toolbar 2017-08-19 06:39:56 +05:30
PCoder 17fbaa59be Added faq.html cms template 2017-08-19 06:37:40 +05:30
ARvind Tiwari 451f2a141e file reformated 2017-08-08 22:46:00 +05:30
ARvind Tiwari 5cea467deb master merged 2017-08-07 22:23:51 +05:30
ARvind Tiwari d93942fa0b heading sizes changed 2017-08-04 18:32:34 +05:30
ARvind Tiwari 6cef45beee lead line break and alignment fixed 2017-08-04 17:20:53 +05:30
PCoder 94bc552f75 Resolved conflicts 2017-08-04 03:25:47 +05:30
ARvind Tiwari 8edbd29fad navbar made white, dropdown fix 2017-08-03 23:18:58 +05:30
ARvind Tiwari fda20eacd6 translation fix and font-weight bold 2017-08-03 03:12:40 +05:30
ARvind Tiwari a3d5c81530 navbar fixed on payment, order-success, order-confirmation 2017-08-03 02:35:44 +05:30
Pcoder 4d33837069 Merge pull request #420 from tiwariav/task/3553 
why datacenterlight page, 'we bring the future' section layout
 2017-08-02 22:57:00 +02:00
ARvind Tiwari 8aac161196 Merge branch 'master' into task/3354/modal_restyling 2017-07-31 20:17:17 +05:30
ARvind Tiwari bb061c67d0 Merge branch 'master' into task/3553 2017-07-31 18:17:30 +05:30
ARvind Tiwari 6b77d2eaff Merge branch 'master' into task/3553 2017-07-31 18:14:02 +05:30
PCoder dc5d45d674 Added trans tag to All rights reserved 2017-07-31 01:00:43 +05:30
ARvind Tiwari 6c63797e7c merged PR #413 2017-07-29 18:51:13 +05:30
ARvind Tiwari 391d123f31 nav js modified 2017-07-29 18:37:56 +05:30
ARvind Tiwari 10108f7d93 merged master 2017-07-28 17:45:38 +05:30
ARvind Tiwari d6b3ee5e09 merged master 2017-07-28 17:12:14 +05:30
ARvind Tiwari 9bd9ec5971 merged master 2017-07-28 16:48:50 +05:30
Arvind Tiwari 2724cbd375 merged from master 2017-07-28 16:43:03 +05:30
Pcoder 53fc982837 Merge pull request #418 from pcoder/task/3615/decouple_landing_page_from_opennebula 
Task/3615/decouple landing page from opennebula
 2017-07-27 23:34:49 +02:00
Pcoder cb4d827f0b Merge pull request #417 from ungleich/siarheipuhach-task3577 
Siarheipuhach task3577

Added backend cpu, ram, ssd fields validation.
 2017-07-27 22:39:44 +02:00
Pcoder 8dd1cbda19 Merge pull request #415 from tiwariav/bugfix/3553/navbar 
Task #3553 fix page "blinks" on click on navbar link
 2017-07-27 21:55:27 +02:00
ARvind Tiwari 33c56b8890 why datacenterlight page, 'we bring the future' section layout changed to flex and mobile layout fixed 2017-07-27 18:35:17 +05:30
ARvind Tiwari 08155c379b Merge branch 'master' into task/3354/modal_restyling 2017-07-27 16:02:39 +05:30
M.Ravi f3cfe19e68 Reformatted the template file and used opennebula_vm_template_id instead of template_id 2017-07-26 20:38:53 +02:00
ARvind Tiwari 2c7a42e447 removed class url from <a> tags which redirect to other page 2017-07-26 16:54:49 +05:30
PCoder fff468f95f Merge branch 'task3577' of https://github.com/siarheipuhach/dynamicweb into siarheipuhach-task3577 2017-07-26 01:30:24 +05:30
Pcoder a05b5b6918 Merge pull request #412 from amarynets/bugfix/change_text_on_button 
Change text on button Order now -> Continue!
 2017-07-25 20:36:13 +02:00
ARvind Tiwari 8e1a5a0221 added back href to links, removed blinking 2017-07-25 19:44:19 +05:30
ARvind Tiwari 0e4a488dc1 footer links :hover :fpcus :active color changed to #ddd 2017-07-25 18:59:07 +05:30
ARvind Tiwari 1e55c6679a removed the language dropdown, replaced with link to the only other language 2017-07-25 18:17:59 +05:30
ARvind Tiwari 7319cc4e1d language options using bootstrap dropdown 2017-07-24 22:16:37 +05:30
Andrii Marynets 0db218cfbf Change text on button Order now! 2017-07-24 18:52:28 +03:00
ARvind Tiwari 918e13bf91 modal close button thinner, some icons changed, vertical alignment changed to middle 2017-07-24 18:52:23 +05:30
ARvind Tiwari c26e9a692a social icons underbars removed 2017-07-21 21:10:33 +05:30
Polycarp Okock 032059c965 Merge branch 'master' into bugfix/#3553-2 2017-07-20 23:30:04 +03:00
Andrii Marynets 72ece2ec29 Merge branch 'master' into bugfix/hover_on_mobile_device_#3588 2017-07-20 22:17:58 +03:00
Polycarp Okock 39b06775a7 Merge pull request #399 from pcoder/task/3581/change_font_weight 
Added font-weight-> 300 to .split-section .split-text .lead in dcl
 2017-07-20 22:14:01 +03:00
Andrii Marynets 884fd6cda1 Fix :hover on mobile device 2017-07-20 22:10:09 +03:00
Polycarp Okock 50f7227b10 Updated Order_detail 
Added the tag to load the Card holder name entered from the billing address
 2017-07-20 15:00:14 +03:00
PCoder af46927b9d Changed the font weight of the lead text to 300 2017-07-18 01:35:33 +05:30
PCoder f4aec68bfd Added style to right align date in desktop view in Order Confirm page 2017-07-18 00:30:32 +05:30
PCoder 3f6250862b Changed text align left to the date in the order_detail.html both in dcl and hosting 2017-07-17 02:57:24 +05:30
PCoder ec4b47ccb6 Fixed overlapping issue of date and billing address in dcl order_detail.html 2017-07-17 02:50:59 +05:30
Siarhei Puhach b30f41219c Added backend cpu,ram,ssd fields validation 2017-07-14 11:34:40 +03:00
Miguel Cardenas 407b3f0a8c Merge branch 'master' into bugfix/#3553-2 2017-07-13 14:30:06 -05:00
PCoder b4e943849c Added DE translations and periods for all validation texts 2017-07-13 23:58:54 +05:30
Siarhei Puhach 290bfe272f Changed field error messages, made fields wider 2017-07-13 12:59:05 +03:00
Miguel Cardenas 696221acb5 add cursor pointer 2017-07-11 20:16:34 -05:00
Miguel Cardenas fa277af33f prevent blink after click of menu elements 2017-07-11 20:04:32 -05:00
PCoder 8980c7deb0 Added bottom padding to tayga image 2017-07-09 16:18:15 +05:30
Pcoder 2e97640a03 Merge pull request #383 from pcoder/bug/order_now_button_disabled_on_page_load 
This PR fixes the "Order Now" button appearing blue (active) momentarily on page load. Also, calculator form is now refactored.
 2017-07-09 10:33:55 +02:00
PCoder 87fb40400b Refactored calculator form code and disabled the Order Now button by default 2017-07-09 13:44:22 +05:30
PCoder 11108a4d59 Refactored calculator form 2017-07-09 13:43:30 +05:30
PCoder 25069f1579 Added the movement text 2017-07-09 12:49:16 +05:30
Pcoder 4fe245901f Merge pull request #375 from karthikvrao/refactor/dcl_remove_duplicate_script_imports 
Task #3545: Remove repeated script imports from dcl's success.html
 2017-07-08 00:00:00 +02:00
PCoder 27ad654f43 Merged refactor/dcl_insert_body_end_tag from karthik into karthikvrao-refactor/dcl_insert_body_end_tag 2017-07-08 02:34:30 +05:30
Karthik Rao fd0e689562 Correct the indentation in the html template files of dcl. 2017-07-06 20:38:22 +05:30
Karthik Rao 3a673bdbac Remove repeated script imports from dcl's success.html 2017-07-05 21:03:54 +05:30
Karthik Rao 66d0df7196 Insert missing body end tag to dcl's base.html 2017-07-05 17:09:03 +05:30
M.Ravi d12687015b opensource -> open source and some text adjustment 2017-07-04 22:18:23 +02:00
Mondi Geetha cac84f5433 Changed some text 2017-07-04 00:10:23 +05:30
Mondi Geetha e19d2e3c13 Updated Pricing Form with updated error messages 2017-07-03 23:31:35 +05:30
Mondi Geetha 36976d923e Merged master into whydcl 2017-07-03 23:03:51 +05:30
M.Ravi e17792badb Merge branch 'master' of https://github.com/ungleich/dynamicweb 2017-07-02 23:38:07 +02:00
M.Ravi 8b9359ede5 Reverted back to the default behavior of bootstrap-validator 2017-07-02 23:37:31 +02:00
Andrii Marynets a91de372e0 Merge branch 'master' into feature/add_google_analytics 2017-07-02 23:01:42 +03:00
M.Ravi f67343ab5c Added missing validation code 2017-07-02 21:26:10 +02:00
Mondi Geetha 3a865bd010 Increased minimum length of the name to 3 2017-07-02 23:33:33 +05:30
Mondi Geetha 5b6a069137 Added DE translations for error messages 2017-07-02 23:16:19 +05:30
Mondi Geetha fd856d7613 Reverted back email templates as they are part of another PR 2017-07-02 20:55:08 +05:30
Andrii Marynets 303d99d70d Merge branch 'master' into feature/add_google_analytics 
# Conflicts:
#	datacenterlight/templates/datacenterlight/order_detail.html
 2017-07-02 17:56:07 +03:00
Mondi Geetha 2045c424ca Added padding to LOGO in user activation email 2017-07-02 03:00:02 +05:30
Mondi Geetha 6cbbbc70be Alinged Logo, Text, Signature to left side 2017-07-02 02:45:22 +05:30
Mondi Geetha 0a2b2c815d Aligned Logo, Text, Signature to left 2017-07-02 02:14:18 +05:30
Mondi Geetha e4cfcbf618 Added some classes and divs for error msg alignment alongside the input field 2017-07-01 18:01:08 +05:30
Mondi Geetha afcec7eb03 Removed unwanted code and add bootstrap-validator cdn js 2017-07-01 17:59:34 +05:30
PCoder 285ce2e710 Added OS configuration to the Order Confirmation page 2017-07-01 02:16:24 +05:30
PCoder dfd910465c Added dcl translations used in new flow 2017-07-01 01:40:17 +05:30
Mondi Geetha 05a23bb545 Left aligned We bring future to you section 2017-07-01 00:47:29 +05:30
Mondi Geetha 6247deb27c Changed img alt text 2017-06-30 23:22:34 +05:30
Mondi Geetha 3a26b93082 Fixed Lato light font and navbar alignment 2017-06-30 21:18:45 +05:30
Mondi Geetha 34395f68eb Fixed lead text align with 100% IPv6 2017-06-30 14:42:10 +05:30
Mondi Geetha 6a96a86fd1 Fixed paragraph text back to old color 2017-06-30 13:55:55 +05:30
PCoder 1deeec4c33 Added the locale time code to new flow order detail 2017-06-30 12:18:31 +05:30
PCoder d32d2a8976 Added a form in order confirmation page 2017-06-30 12:06:41 +05:30
PCoder d0376f35f8 Now getting info in Order Confirmation from session and context 2017-06-30 11:05:34 +05:30
Andrii Marynets 2ad984504c Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID 2017-06-30 01:23:35 +03:00
Mondi Geetha 94a69a4836 Fixed navbar dropdown that works for mobile device 2017-06-30 01:28:29 +05:30
Mondi Geetha 4ec47c687b Added dropdown toggle function for highlets menu 2017-06-29 21:56:09 +05:30
Mondi Geetha 445e8e3583 Adjusted some sections as per templates 2017-06-29 20:25:30 +05:30
Mondi Geetha 14bf3ad8b5 Merge branch 'task/3488/create_whydcl_page' of https://github.com/geethamondi/dynamicweb into task/3488/create_whydcl_page 2017-06-29 17:35:05 +05:30
geethamondi 7eaaea58e3 Fixed some spelling mistakes 2017-06-29 14:00:31 +02:00
geethamondi 2608892537 Fixed typos 2017-06-29 13:53:10 +02:00
Mondi Geetha e7fea1ea39 Changed the background pattren of Whydatacenterlight page header 2017-06-29 14:49:03 +05:30