ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity
2231 commits 13 branches 148 tags 315 MiB
Commit graph

414 commits

Author SHA1 Message Date
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
Pcoder
545834d3d0 Merge pull request #377 from karthikvrao/refactor/dcl_better_indent_html 
Task #3547: Correct the indentation in the html template files of dcl.
 2017-07-07 22:33:33 +02:00
PCoder
e298f86290 Removed button outline when inactive 2017-07-08 00:12:10 +05:30
Siarhei Puhach
1279d4efbb Merge branch 'master' into feature/ssh_keys 2017-07-07 17:49:22 +03:00
PCoder
67da139106 Fixed one more flake warning 2017-07-07 01:23:56 +05:30
PCoder
ddacfeacf3 Fixed some flake8 errors 2017-07-07 01:20:16 +05:30
PCoder
1a20507c02 Merged master into siarheipuhach-feature/flake8 2017-07-07 00:53:58 +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
M.Ravi
f419ce784f Fixed some flake8 warnings 2017-07-03 23:53:37 +02:00
M.Ravi
f9c3c80864 Merged the latest master into siarheipuhach-feature/flake8 2017-07-03 23:47:56 +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
f48ea4714e changed error message color 2017-07-02 18:34:17 +05:30
Mondi Geetha
0a2b2c815d Aligned Logo, Text, Signature to left 2017-07-02 02:14:18 +05:30
M.Ravi
8fb4607bdd Fixed issues reported by flake 2017-07-01 15:53:25 +02:00
M.Ravi
c8cf166571 Merged code from siarheipuhach/dynamicweb 2017-07-01 15:18:44 +02:00
Mondi Geetha
0c969946f7 Added code for proper return when name/email are not good 2017-07-01 18:02:10 +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
Mondi Geetha
36877d613d Added styles for proper positioning of error msgs 2017-07-01 17:58:42 +05:30
PCoder
b502cb5da8 Fixed logo in payment/order confirmation page not redirecting to index issue 2017-07-01 04:29:11 +05:30
PCoder
4857bc2cd8 Now fetching billing address data from session variable 2017-07-01 03:54:08 +05:30
PCoder
bd766e2073 Fixed filling up of users details while going back to payment page from order confirmation page 2017-07-01 03:11:16 +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
adb792770e Fixed alignment for 100% SSD 2017-07-01 00:55:49 +05:30
Mondi Geetha
05a23bb545 Left aligned We bring future to you section 2017-07-01 00:47:29 +05:30
Mondi Geetha
a936c6cb17 Deleted whydcl-pattren.jpg 2017-07-01 00:36:00 +05:30
Mondi Geetha
b4caccaec8 Fixed dropdown menu width for de 2017-07-01 00:35:17 +05:30
Mondi Geetha
6247deb27c Changed img alt text 2017-06-30 23:22:34 +05:30
Mondi Geetha
8510e0239e Added some styles for landscape devices 2017-06-30 23:21:37 +05:30
Mondi Geetha
3a26b93082 Fixed Lato light font and navbar alignment 2017-06-30 21:18:45 +05:30
Mondi Geetha
646f1b0760 Fixed dropdown text alinment, Why data center Light header background and some alignment issues 2017-06-30 14:44:01 +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
160df7685c Refactored dcl text and support email 2017-06-30 12:47:04 +05:30
PCoder
699326dc57 Made to return empty string for the template filter get_value_from_dict instead of None 2017-06-30 12:33:28 +05:30
PCoder
2350247cdb Removed unused code 2017-06-30 12:27:18 +05:30
PCoder
1deeec4c33 Added the locale time code to new flow order detail 2017-06-30 12:18:31 +05:30
PCoder
3eca55a32a Fixed billing address bug. Fixed back button issues in the new flow 2017-06-30 12:08:07 +05:30
PCoder
d32d2a8976 Added a form in order confirmation page 2017-06-30 12:06:41 +05:30
PCoder
4c3d8627b1 Added code to fetch cc data and put in context 2017-06-30 11:06:58 +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
8754850ac9 Changed Navbar hover effect that only applicable for desktop devices 2017-06-30 01:27:21 +05:30
Mondi Geetha
f69375fb69 Added style to nav bar 2017-06-30 01:21:53 +05:30
Mondi Geetha
4ec47c687b Added dropdown toggle function for highlets menu 2017-06-29 21:56:09 +05:30
Mondi Geetha
d2457f71e4 Changed some styles for font sizes and dropdown 2017-06-29 21:54:45 +05:30
siarheipuhach
a9c9f74aed Fixed PEP8 violations 2017-06-29 19:23:25 +03:00
Siarhei Puhach
fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Mondi Geetha
059f1bb680 Changed font-family 'Lato-Regular' to 'Lato-light' except Navbar and order form and changed some styles as per template 2017-06-29 20:30:36 +05:30
Mondi Geetha
445e8e3583 Adjusted some sections as per templates 2017-06-29 20:25:30 +05:30
Siarhei Puhach
edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
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
Mondi Geetha
e7c652588a Reformated the code 2017-06-29 17:34:15 +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
80e463c3bf Added image whydatacenterlight heder 2017-06-29 14:51:30 +05:30
Mondi Geetha
b9222c71ad Nezwly Added styles for whydatacenterlight page header 2017-06-29 14:50:14 +05:30
Mondi Geetha
e7fea1ea39 Changed the background pattren of Whydatacenterlight page header 2017-06-29 14:49:03 +05:30
PCoder
4fc11bbe17 Made WhyDataCenterLightView a subclass of the IndexView 2017-06-29 13:14:13 +05:30
PCoder
cb6aeae1ae Refactored the logic to OrderConfirmationView from the PaymentOrderView 2017-06-29 13:08:24 +05:30
PCoder
a2153777e4 We do not have order created when in Order Confirmation page. So removed the id parameter in url 2017-06-29 13:06:05 +05:30
PCoder
3313dab485 Added get_value_from_dict filter to obtain values from a dict in templates 2017-06-29 13:05:06 +05:30
PCoder
a3c3a5cd2e Changed the way we get info in dcl order_detail template 2017-06-29 13:04:13 +05:30
Geetha Mondi
1a994d1e70 Removed unnecassary href link from nav logo 2017-06-28 17:52:19 +05:30
Geetha Mondi
e84897db18 Removed unnesassary BetaAccessForm class 2017-06-28 17:13:02 +05:30
Geetha Mondi
7cbc001d6a Added style for 540 device and images 2017-06-28 15:15:19 +05:30
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
Sanghee Kim
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