Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Service section design changes #474

Merged
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
cde96d7
About page - added team section
muzammalrahim Jan 20, 2021
8586925
About page - added team section
muzammalrahim Jan 21, 2021
eb3085f
About page - added team section
muzammalrahim Jan 22, 2021
680b874
User page - service section design changes
muzammalrahim Feb 1, 2021
62bf774
Merge remote-tracking branch 'upstream/master' into service_section_d…
muzammalrahim Feb 1, 2021
a93891b
User page - service section design changes-update
muzammalrahim Feb 2, 2021
94d3e12
User page - service section design changes-update
muzammalrahim Feb 3, 2021
558b0f5
User page - service section design changes-update
muzammalrahim Feb 3, 2021
9b0b8be
User page - service section design changes-update-final fixes
muzammalrahim Feb 5, 2021
4d8f211
Models.py localization and formatting
muzammalrahim Feb 9, 2021
707b5b3
fix indentation issue in models file
AyazYousafxai Feb 23, 2021
84fd340
Merge remote-tracking branch 'upstream/master' into service_section_d…
AyazYousafxai Feb 24, 2021
8aa34cd
merge with upstream, fix indentation
AyazYousafxai Feb 24, 2021
eae119e
merge with upstream, fix indentation and css class name change
AyazYousafxai Feb 25, 2021
5fe7e4e
merge with upstream, fix indentation and css class name change
AyazYousafxai Feb 25, 2021
9f5d0ad
extra lines remove
AyazYousafxai Feb 26, 2021
10b48e9
eslint failed
AyazYousafxai Feb 26, 2021
e6fbb44
end-of-file-fixer
AyazYousafxai Feb 26, 2021
5102608
end-of-file-fixer
AyazYousafxai Mar 1, 2021
909abd5
end-of-file-fixer
AyazYousafxai Mar 1, 2021
c362388
end-of-file-fixer
AyazYousafxai Mar 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 58 additions & 11 deletions weblate_web/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -507,17 +507,64 @@ def expires(self):

def get_suggestions(self):
if not self.support_subscriptions.exists():
yield "basic", _("Basic support")
if (
not self.hosted_subscriptions.exists()
and not self.shared_subscriptions.exists()
):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems you've messed up the indentation fully here. Mixing tabs and spaces makes my Python reject loading the module completely.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, let me check it again.

if not self.premium_subscriptions.exists():
yield "premium", _("Extended support")
if not self.extended_subscriptions.exists():
yield "extended", _("Extended support")
if not self.backup_subscriptions.exists():
yield "backup", _("Backup service")
yield (
"basic",
_("Basic support"),
_(
"This will give you more of this and that. "
"You can't resist, because it is a huge deal."
),
"img/Support-Basic.svg",
_(
"Get more support"
),
)

if (
not self.hosted_subscriptions.exists()
and not self.shared_subscriptions.exists()
):
if not self.premium_subscriptions.exists():
yield (
"premium",
_("Premium support"),
_(
"This will give you more of this and that. "
"You can't resist, because it is a huge deal."
),
"img/Support-Plus.svg",
_(
"Get more support"
),
)

if not self.extended_subscriptions.exists():
yield (
"extended",
_("Extended support"),
_(
"This will give you more of this and that. "
"You can't resist, because it is a huge deal."
),
"img/Support-Premium.svg",
_(
"Get more support"
),
)

if not self.backup_subscriptions.exists():
yield (
"backup",
_("Backup service"),
_(
"This will give you more of this and that. "
"You can't resist, because it is a huge deal."
),
"img/Support-Backup.svg",
_(
"Get more support"
),
)

def update_status(self):
status = "community"
Expand Down
4 changes: 4 additions & 0 deletions weblate_web/static/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,3 +207,7 @@ ready(() => {

new ClipboardJS("[data-clipboard-text]");
});

function removeUser(userId) {
document.getElementById(`server_user_${userId}_form`).submit();
}
Binary file added weblate_web/static/img/ArrowR.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added weblate_web/static/img/Shield.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added weblate_web/static/img/delete.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added weblate_web/static/img/donations-picture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added weblate_web/static/img/dowload.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading