Commit graph

143 commits

Author SHA1 Message Date
M.Ravi 0b034ec2f8 Fixed typo 'Standort' instead of 'Strandort' 2017-06-15 04:29:57 +05:30
Henry Bravo 7992e39962 Generated .po 2017-06-14 17:34:26 -05:00
Henry Bravo 739a92505d deleted home.htm 2017-06-14 17:29:26 -05:00
Henry Bravo fb860b9a8d fixed typo and delete .mo 2017-06-14 17:16:43 -05:00
Henry Bravo b2379f7a02 Fixed DE Typo, and added text in calculator box 2017-06-14 16:51:42 -05:00
Henry Bravo 8acd249b4d Create Templatetag for change language whit the current path 2017-06-13 22:35:15 -05:00
Levi 8ec290a59f cleaned up index.html 2017-06-13 14:11:11 -05:00
Levi 9333532662 Merge branch 'master' into develop 2017-06-13 14:07:52 -05:00
Levi 11e59c8ea3 added translations 2017-06-13 13:47:55 -05:00
Henry Bravo 2d3e446568 fix locale 2017-06-13 13:39:47 -05:00
Henry Bravo a03f2f8f89 Fix conflicts 2017-06-13 10:36:39 -05:00
Levi b5bb26e445 added missing translations for datacenterlight 2017-06-13 01:48:36 -05:00
Levi 89dedab8ba resolved henry latest conflicts 2017-06-13 01:12:51 -05:00
Levi c7d29be24c Merge branch 'master' into develop 2017-06-12 23:51:03 -05:00
M.Ravi 1a7615dc9a Fixed a typo 2017-06-13 05:03:46 +05:30
M.Ravi 83802a0a52 Added from_address to EmailMessage 2017-06-13 04:39:30 +05:30
sangheekim f2aa5377d8 month added to landing calculator box 2017-06-11 23:32:37 +02:00
Levi Velázquez d2a8c13b9e Merge branch 'master' into bug/3328/dcl_email_headers 2017-06-11 12:30:09 -05:00
M.Ravi 943fc741bf Modified the IndexView to send text email on receiving new order 2017-06-11 20:06:54 +05:30
M.Ravi d7a2335cf4 Merge branch 'master' into telmich-feature/nonhtml-email 2017-06-11 19:56:35 +05:30
M.Ravi a29ceb765f Updated the translation for the modified text 2017-06-11 17:46:42 +05:30
M.Ravi 8e95ed304b Updated the text in dcl index.html template 2017-06-11 16:57:20 +05:30
M.Ravi 24402a2ec8 Refactored the styles 2017-06-11 16:53:57 +05:30
M.Ravi 880e0f0dde Added functions to handle get and post requests. On get, we need to create a opennebula connection to fetch the templates. On successful post of the form, we need to send email and redirect user to order-success 2017-06-11 16:32:38 +05:30
M.Ravi 47d882d1fc Moved the calculator to the index.html template 2017-06-11 16:29:24 +05:30
M.Ravi d792c22e4e Created landing page style price-calc-section-landing which is same as price-calc-section except for padding (we don't need it in the landing page) 2017-06-11 16:28:11 +05:30
M.Ravi 9b40af3975 Removed the unnecessary new_order_notification* email templates as we no longer use them. 2017-06-10 15:41:25 +05:30
M.Ravi 3750ba5182 Changed the to and reply-to fields for EmailMessage to list, as it expects input of that type 2017-06-10 12:42:31 +05:30
Nico Schottelius 9f2f0f7db3 Send order emails as plain text 2017-06-10 00:33:26 +02:00
Henry Bravo d2e9096cc2 Fix conflicts in url footer and fix navbar language 2017-06-09 16:47:39 -05:00
Henry Bravo 7004536a19 Fix conflicts 2017-06-09 16:18:41 -05:00
Levi 24ecdd2f26 footer links 2017-06-09 16:08:37 -05:00
Henry Bravo 54b339a546 Staging fix and cleaned html 2017-06-09 15:37:14 -05:00
Levi d43855adda fixed #3350, #3328, #3316, #3339 2017-06-09 15:36:14 -05:00
Levi 331b7dea98 Merge branch 'master' into develop 2017-06-09 10:37:06 -05:00
M.Ravi 132629734a Merge branch 'telmich-feature/introduce_templating' 2017-06-09 12:34:15 +05:30
M.Ravi 382b0b979d Modified po/mo files to fix de typos (bug 3363) 2017-06-09 12:10:36 +05:30
M.Ravi 47970fb00a Added load staticfiles and i18n and extended datacenterlight/base.html explicitly 2017-06-09 11:32:51 +05:30
Nico Schottelius b15bae4940 Add template base.html 2017-06-08 21:55:35 +02:00
M.Ravi a60ef7cf7a Changed BaseEmail to accept from_address to modify the from header accordingly 2017-06-07 11:35:16 +05:30
M.Ravi a131489e8c Fixed font on order page for mobile view. Changed from Lato-black to Montserrat-Bold 2017-06-07 02:40:45 +05:30
M.Ravi d8ef935fae Updated text on the button to Request Beta Access to go along the text alongside 2017-06-07 02:13:21 +05:30
M.Ravi 06f95dc5ed Made to take the user to /order on click of Order Now button 2017-06-07 02:12:35 +05:30
M.Ravi 94bac7222c Made order and pricing distinct from each other. We use order for feature/manualorder and we leave pricing as it was before. 2017-06-07 02:02:31 +05:30
M.Ravi bef6b03872 Reverted pricing.html to what was before. We should create a new template for order. 2017-06-07 01:35:05 +05:30
M.Ravi c111ad13a8 Updated translation text after completion of manual order. 2017-06-07 01:26:56 +05:30
M.Ravi 366f11be83 Fixed an issue related to redirection to datacenterlight/order url 2017-06-07 01:07:47 +05:30
M.Ravi 6a3f4578db Updated mo file to include the change for exclamation mark missing in german translation 2017-06-07 00:59:19 +05:30
M.Ravi dcdb06d4f6 Added missing exlamation mark for german translation. Updated the translation 2017-06-07 00:47:40 +05:30
M.Ravi 663ea2d713 Merged master into feature/manualorder 2017-06-07 00:41:27 +05:30