ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
2,104 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

383 Commits

Author SHA1 Message Date
Geetha Mondi 4f793d516e Changed some divs for responsive 2017-06-28 15:09:17 +05:30
Geetha Mondi 4bf4d250c9 Changed URLs of sections as pages that redirect to home page from whydatacerterlight page 2017-06-28 15:08:12 +05:30
Geetha Mondi 524b9c8090 Added trasparent menu dropdown script 2017-06-28 15:07:07 +05:30
Geetha Mondi f8dfe1b00a Added some style support on screen 768 2017-06-28 15:06:20 +05:30
Geetha Mondi ab5b35f066 Created seperate page for whydatacenterlight page 2017-06-28 13:10:45 +05:30
Geetha Mondi 86984145e9 Some logo images for whydatacenterlight page 2017-06-28 13:08:28 +05:30
Geetha Mondi 1311e7ea89 Created view for whydatacenterlight page 2017-06-28 13:06:24 +05:30
Geetha Mondi 2c1c36cf94 Added url for whydatacenterlight page 2017-06-28 13:05:32 +05:30
Geetha Mondi 36fd7913fe Added nav dropdown and added OR condition for Whydatacenterlight page 2017-06-28 13:03:32 +05:30
Geetha Mondi d27eff9441 Added function for dropdown menu 2017-06-28 12:59:30 +05:30
Geetha Mondi 4930e7d065 Added styles for whydcl page 2017-06-28 12:58:16 +05:30
Andrii Marynets 007fc794c3 Add google analytics to data center light 2017-06-27 23:47:30 +03:00
M.Ravi 796fbbe1f8 Removed status from the order page 2017-06-23 04:38:10 +05:30
M.Ravi aca831adac Resolved conflicts while merging pcoder-new_flow 2017-06-23 04:35:33 +05:30
M.Ravi 3ca7153414 Changed invoice text 2017-06-23 01:34:31 +05:30
M.Ravi 5b8a26eeb3 Fixed a blunder mistake. Was using name instead of email 2017-06-23 00:31:08 +05:30
M.Ravi 5caa79f199 Added CustomUser.DoesNotExist error exception 2017-06-22 13:40:39 +05:30
M.Ravi 31c389e72c Added order_detail.html for dcl 2017-06-22 13:23:13 +05:30
M.Ravi c4c110b506 Added OrderConfirmationView to dcl 2017-06-22 13:21:07 +05:30
M.Ravi e848c318d0 Addd order confirmation url 2017-06-22 13:18:54 +05:30
M.Ravi 041352ac6d Cleaned up some commented code 2017-06-22 00:28:44 +05:30
M.Ravi bbfc7e8515 Not persisting stripe details to db 2017-06-21 23:37:36 +05:30
M.Ravi 66f82572f1 Added payment url 2017-06-21 13:15:37 +05:30
M.Ravi 52524a97a6 Added PaymentOrderView 2017-06-21 13:14:58 +05:30
M.Ravi 2959159863 Added cache_control decorator to control cache while returning back to the index page 2017-06-21 01:40:55 +05:30
M.Ravi b27342b493 Added dcl_text instead the hardcoded text 2017-06-20 23:44:10 +05:30
M.Ravi 543a52baf9 Fixed some more translations 2017-06-20 01:00:48 +05:30
M.Ravi b971751e2b Updated click here text in de 2017-06-20 00:22:12 +05:30
M.Ravi ed26ac8b59 Updated dcl's django.po to resolve some conflict 2017-06-19 12:44:48 +05:30
M.Ravi 47632c6bd1 Updated the django.po for datacenterlight 2017-06-19 12:34:58 +05:30
M.Ravi a7e9946a4f Refactored user activation html email template to use proper translation and parameters 2017-06-19 12:34:01 +05:30
M.Ravi bf941539d7 Refactored user_activation.txt email template 2017-06-19 12:32:08 +05:30
Levi Velázquez 5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails 
Feature/3296/confirm emails
 2017-06-15 15:22:00 -05:00
Levi Velázquez 3aa9b573cc Merge pull request #343 from ungleich/fix_translation 
Fixed translations of validation messages
 2017-06-15 13:38:16 -05:00
M.Ravi 06af225c97 Updated proper translation corrections 2017-06-16 00:00:26 +05:30
M.Ravi 36567071c0 Removed OrderView as we no longer use it 2017-06-15 23:36:58 +05:30
M.Ravi e897bb9c22 Removed unused /order url 2017-06-15 23:32:20 +05:30
M.Ravi 6c588e3531 Deleted the order.html 2017-06-15 23:31:19 +05:30
M.Ravi a56d08e729 Fixed translations of validation messages 2017-06-15 06:29:31 +05:30
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 32e5011241 Added user_activation email templates 2017-06-11 05:08:13 +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
M.Ravi 69001db65f Reverted back to 'I want to have it' text for subscribe to newsletter text. Updated translation files. 2017-06-07 00:16:54 +05:30
M.Ravi 9ffd32b4cb Merge branch 'master' of https://github.com/HenryGBC/dynamicweb into henry_pr 2017-06-06 22:10:35 +05:30
Henry Bravo 6f6277cc49 Mobile styles to calculator card 2017-06-06 10:36:47 -05:00
Henry Bravo b5f93e4ea7 align buttons 2017-06-06 10:33:36 -05:00
Levi 96272ffd44 added mo files 2017-06-06 00:08:22 -05:00
Levi 6fa14971d9 Merge branch 'master' of github.com:ungleich/dynamicweb 2017-06-05 23:08:58 -05:00
M.Ravi d31b05a219 Added jquery validation for the order form 2017-06-06 05:26:02 +05:30
M.Ravi 74c57a42db Added top margin style for error messages 2017-06-06 05:24:39 +05:30
M.Ravi 949f47d124 Added redirection instead of rendering a template for unsuccessful order submission. Also added base_url context parameter to order notification email template 2017-06-06 04:28:41 +05:30
M.Ravi b54b46c08b Renamed success url to order_success for clarity. 2017-06-06 04:23:15 +05:30
M.Ravi 474e0ddc95 Fixed a bug related to redirection to incorrect url on change of language. Still hardcoded (probably need a refactor of this) 2017-06-06 04:22:03 +05:30
M.Ravi 92fb72197d Resolved some conflicts 2017-06-06 03:47:37 +05:30
M.Ravi f4a81e9096 Fixed getting template name from template id 2017-06-06 03:43:50 +05:30
M.Ravi b68f116931 Added the logic to handle orders manually 2017-06-06 03:09:34 +05:30
M.Ravi d7625712f1 Changed template variable name in email template for new order notification 2017-06-06 03:02:57 +05:30
M.Ravi 4ad45dfd43 Added notification email template 2017-06-06 02:55:07 +05:30
Henry Bravo 515cbff001 copy PricingView 2017-06-05 16:03:32 -05:00
Henry Bravo 2ead42bd1a Add input fields (email, name) in Calculator (Pricing page) and Sucess page 2017-06-05 15:35:48 -05:00
M.Ravi 5583648293 Changed the url for 'Order Now!' button on dcl's index page. It is now datacenterlight/order instead of datacenterlight/pricing 2017-06-06 01:44:23 +05:30
Henry Bravo c69694274f Fix conflicts 2017-06-05 14:55:41 -05:00
Henry Bravo b44ab0ce0a Add input fields (email, name) in Calculator (Pricing page) 2017-06-05 14:30:41 -05:00
Henry Bravo ba03cf232e 'what is it' section text change and fixed typo 2017-06-03 21:57:21 -05:00
Henry Bravo 9b121cc702 improveded mobile responsiveness 2017-06-03 21:19:13 -05:00
Nico Schottelius d8bb051f23 Remove unused code 2017-06-03 16:03:02 +02:00
modulos 31e9377818 Merge branch 'develop' into hosting_i18n 2017-06-03 09:59:48 +02:00
Levi Velázquez 8d47018aae Merge pull request #301 from levivm/develop 
removed more info button
 2017-06-02 10:37:24 -05:00
Levi 83705984d0 removed more info button 2017-06-02 10:36:17 -05:00
Henry Bravo be04bee643 Fix center login pages 2017-06-01 15:40:19 -05:00
Henry Bravo 851ae298e9 Collapse navbar when i clicked url dcl 2017-06-01 14:49:05 -05:00
modulos 37a9629408 Add more translations 2017-05-30 15:57:36 +02:00
modulos 9416586d0b Merge branch 'develop' into hosting_i18n 2017-05-30 15:10:22 +02:00
M.Ravi 9a7df541c5 Removed a bogus call to languages() method that caused no showing of the VM templates 2017-05-30 12:20:13 +05:30
Henry Bravo a7c28f5644 Fix conflic translates 2017-05-29 15:05:11 -05:00
Henry Bravo 8207bc2dab Fixed pricing page mobile 2017-05-29 14:54:18 -05:00
modulos 48050a2360 Remove .mo files and update .po files 2017-05-29 16:12:28 +02:00
modulos 40fe3f4d29 Merge branch 'develop' into hosting_i18n 2017-05-29 15:47:22 +02:00
modulos 1d95f87b8d Merge branch 'develop' into dcl_i18n 2017-05-29 15:25:18 +02:00
modulos 6937fb98f0 Merge branch 'develop' into hosting_i18n 2017-05-29 14:00:53 +02:00
Henry Bravo aaf1dcbc7e Fix input width 2017-05-28 15:13:13 -05:00
Henry Bravo 8d8b387cc7 Fix select languages in dcl 2017-05-27 12:49:42 -05:00
Henry Bravo ac28ab0d6b Fix texts bugs and hosting mobile design 2017-05-27 10:39:30 -05:00
modulos f8bbd94f8f Change 15 to 10 GB Storage 2017-05-26 17:12:37 +02:00
modulos a044490ec3 Add i18n to hosting/order 
With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet.
 2017-05-26 17:02:22 +02:00
modulos 5869c6dd87 Add i18n to datacenterlight 
The pricing page is now fully i18n as well as the subscription modal
 2017-05-26 15:53:21 +02:00
Henry Bravo 22a876e134 Fix and add input values in calc 2017-05-25 16:16:18 -05:00
Henry Bravo 792219f6ac Fix image beta 2017-05-25 15:18:42 -05:00
Henry Bravo 7b452740d7 fix values 2017-05-25 14:24:04 -05:00
Henry Bravo fbc1ab28b7 Fix minimun values calculator order widget 2017-05-25 13:40:45 -05:00
Henry Bravo 549acd400a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-25 13:31:16 -05:00
Henry Bravo c91a61b33c Fix order columns in hosting/payment 2017-05-25 13:27:47 -05:00
Noe Thalheim 1ff411e426 Merge branch 'develop' of https://github.com/ungleich/dynamicweb/ 2017-05-25 18:38:58 +02:00
Noe Thalheim cb73bf7b80 Replace lorem ipsum text 2017-05-25 18:37:42 +02:00
Levi Velázquez 505e5920c9 Merge pull request #278 from Modulos/pr/henry 
Henry's changes
 2017-05-25 10:16:13 -05:00
Levi ee80181a55 added redirect after create vm ssh key 2017-05-24 10:58:16 -05:00
Henry Bravo f2649251c2 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-23 18:32:21 -05:00
Henry Bravo c205bb05e8 Fixed Pricing pages bugs 2017-05-23 18:32:06 -05:00
modulos 229c8b9cfc Disable checkbox 2017-05-23 20:27:26 +02:00
modulos e6f2157b83 Correct pricing page redriection 2017-05-23 19:58:29 +02:00
Henry Bravo 398b7062e0 resolve conflicts 2017-05-23 12:13:44 -05:00
Henry Bravo c383156c42 Pass params in form pricing 2017-05-23 12:06:48 -05:00
Levi e278ff742d Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2017-05-23 11:48:25 -05:00
Levi 8d81220202 changed virtual machine list 2017-05-23 11:48:02 -05:00
Levi Velázquez 21d37ffca4 Merge pull request #263 from Modulos/beta_modal 
Show modal after beta access signup
 2017-05-23 11:10:01 -05:00
Henry Bravo 506fbca204 Design calculator page 2017-05-22 23:35:29 -05:00
Henry Bravo 30f042cdc3 Fixed bugs style dcl 2017-05-22 13:00:27 -05:00
modulos 88731d6371 Change buy now to order now and add link 2017-05-22 18:25:56 +02:00
modulos 920e7669dc Show modal after beta access signup 
The beta access form is now in it's own html page. this makes it easier
to work with djangos form validation with reloading the whole page.
 2017-05-22 18:03:33 +02:00
Levi 1aba5cbee5 fixed datacenterlight page 2017-05-20 11:38:37 -05:00
Levi 3503e6568e Merge branch 'develop' into opennebula_api 2017-05-20 11:23:13 -05:00
Levi 03ec8ef674 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api 2017-05-20 11:20:30 -05:00
Levi ec198c74f9 fixed translations 2017-05-20 11:19:58 -05:00
Levi 5dd54f4219 added redirect 2017-05-20 11:06:10 -05:00
verysanghee 14e87feab2 Update django.po 2017-05-20 17:11:50 +02:00
verysanghee 5cead83c89 typo 2017-05-20 17:08:24 +02:00
Henry Bravo 00101921c7 Fixed typo bugs dcl 2017-05-19 22:41:10 -05:00
Henry Bravo 767e95895a Redesign DCL Page 2017-05-18 00:13:00 -05:00
M.Ravi 1ca884e1f6 Removed 'More info' button from datacenterlight index page. 2017-05-14 21:09:16 +05:30
M.Ravi dec1ccd180 Created url for buy button on datacenterlight home page and redirection 
of ^hosting/ endpoint to take to hosting app's login page.
 2017-05-14 12:44:11 +02:00
M.Ravi d537fcb118 Manual merge of ungleich/master into opennebula-integration 2017-04-24 03:01:05 +05:30
HenryGBC b853ce84c5 Fix mobile sspace datacenterlight 2017-03-31 22:55:01 -04:30
HenryGBC 80ecb963b3 Add name field i beta program 2017-03-30 20:21:15 -04:30
HenryGBC 227d69178f Add modal sucess 2017-02-17 09:43:32 -04:30
Levi 38934b0883 added request beta notification 2017-02-16 22:32:14 -05:00
Levi ea2f6444db Added alplora and datacenter beta program 2017-02-14 23:34:06 -05:00
Levi 41362fc948 added translations 2017-01-23 22:34:22 -05:00
Levi 896c07930b fixing language swticher 2017-01-13 12:26:03 -05:00
Levi 640819c7de Fixed #2806 and #2863 2017-01-09 19:49:10 -05:00
Levi ef07f5da83 #2905 2017-01-09 09:34:25 -05:00
Levi f9387cd6b8 Finished #2883 2017-01-06 10:24:34 -05:00
Levi bf82aa61f1 Fixed #2862. Fixed #2861. Fixed #2864. Fixed #2865 2017-01-04 20:31:53 -05:00
Levi ed28fc411e fixed some index datacenterlight issues 2016-12-21 01:24:04 -05:00
Levi db13e642fc fixed datacenter index link 2016-12-21 01:06:27 -05:00
Levi abfab6915c added datacenterlight 2016-12-20 18:05:20 -05:00