anoopmb
/
frappe
1
0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Toiminta
Selaa lähdekoodia

Merge pull request #12860 from rmehta/fix-language-select 

fix(website): Make language select optional and fix breakpoint issues
version-14
Rushabh Mehta 4 vuotta sitten
committed by GitHub
vanhempi
8678c09e91 27ed3dd373
commit
17c640e37d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 muutettua tiedostoa jossa 85 lisäystä ja 57 poistoa
Jaettu näkymä
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -0
      frappe/public/scss/website/index.scss
  2. +13
    -1
      frappe/public/scss/website/navbar.scss
  3. +2
    -34
      frappe/templates/base.html
  4. +2
    -2
      frappe/templates/includes/navbar/navbar.html
  5. +18
    -3
      frappe/website/doctype/website_settings/website_settings.json
  6. +2
    -5
      frappe/website/doctype/website_settings/website_settings.py
  7. +41
    -12
      frappe/website/js/website.js

+ 7
- 0
frappe/public/scss/website/index.scss Näytä tiedosto

@@ -90,6 +90,13 @@
margin: 2rem 0;
}

@media (max-width: map-get($grid-breakpoints, "lg")) {
.page-content-wrapper .container {
padding-left: 1rem;
padding-right: 1rem;
}
}

.breadcrumb-container {
margin-top: 1rem;
padding-top: 0.25rem;


+ 13
- 1
frappe/public/scss/website/navbar.scss Näytä tiedosto

@@ -1,3 +1,15 @@
.navbar {
padding-left: 0;
padding-right: 0;
}

@media (max-width: map-get($grid-breakpoints, "lg")) {
.navbar {
padding-left: 1rem;
padding-right: 1rem;
}
}

.navbar-light {
border-bottom: 1px solid $border-color;
background: $navbar-bg;
@@ -96,4 +108,4 @@
@extend .ellipsis;
max-width: 100%;
vertical-align: middle;
}
}

+ 2
- 34
frappe/templates/base.html Näytä tiedosto

@@ -56,6 +56,8 @@
}
window.dev_server = {{ dev_server }};
window.socketio_port = {{ (frappe.socketio_port or 'null') }};
window.show_language_picker = {{ show_language_picker }};
window.is_chat_enabled = {{ chat_enable }};
</script>
</head>
<body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {% endif -%} class="{{ body_class or ''}}">
@@ -110,39 +112,5 @@
{%- endblock %}
<!-- csrf_token -->
{%- block body_include %}{{ body_include or "" }}{% endblock -%}
<script>
frappe.ready(() => {
if (frappe.session.user === 'Guest') {
frappe.call("frappe.translate.get_all_languages", {
with_language_name: true
}).then(res => {
let language_list = res.message;
let language = frappe.get_cookie('preferred_language');
let language_codes = [];
language_list.forEach(language_doc => {
language_codes.push(language_doc.language_code)
$("#language-switcher")
.append(
$("<option></option>")
.attr("value", language_doc.language_code)
.text(language_doc.language_name)
);
});
$("#language-switcher").removeClass('hide');
language = language || (language_codes.includes(navigator.language) ? navigator.language : 'en');
$("#language-switcher").val(language);
document.documentElement.lang = language;
$("#language-switcher").change((e) => {
let lang = $("#language-switcher").val();
frappe.call("frappe.translate.set_preferred_language_cookie", {
"preferred_language": lang
}).then(() => {
window.location.reload();
});
});
});
}
})
</script>
</body>
</html>

+ 2
- 2
frappe/templates/includes/navbar/navbar.html Näytä tiedosto

@@ -21,8 +21,8 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
{% include "templates/includes/navbar/navbar_items.html" %}
</div>
<div class="form-group mb-0">
<select class="form-control hide" id="language-switcher"></select>
<div class="form-group mb-0 hide" id="language-switcher">
<select class="form-control"></select>
</div>
</div>
</nav>

+ 18
- 3
frappe/website/doctype/website_settings/website_settings.json Näytä tiedosto

@@ -25,9 +25,11 @@
"set_banner_from_image",
"favicon",
"top_bar",
"navbar_search",
"hide_login",
"top_bar_items",
"hide_login",
"navbar_search",
"show_language_picker",
"navbar_template_section",
"navbar_template",
"navbar_template_values",
"edit_navbar_template_values",
@@ -410,6 +412,19 @@
"fieldname": "google_analytics_anonymize_ip",
"fieldtype": "Check",
"label": "Google Analytics Anonymize IP"
},
{
"default": "0",
"fieldname": "show_language_picker",
"fieldtype": "Check",
"label": "Show Language Picker"
},
{
"collapsible": 1,
"collapsible_depends_on": "navbar_template",
"fieldname": "navbar_template_section",
"fieldtype": "Section Break",
"label": "Navbar Template"
}
],
"icon": "fa fa-cog",
@@ -418,7 +433,7 @@
"issingle": 1,
"links": [],
"max_attachments": 10,
"modified": "2021-04-13 10:22:51.888788",
"modified": "2021-04-14 17:39:56.609771",
"modified_by": "Administrator",
"module": "Website",
"name": "Website Settings",


+ 2
- 5
frappe/website/doctype/website_settings/website_settings.py Näytä tiedosto

@@ -121,7 +121,8 @@ def get_website_settings(context=None):
"facebook_share", "google_plus_one", "twitter_share", "linked_in_share",
"disable_signup", "hide_footer_signup", "head_html", "title_prefix",
"navbar_template", "footer_template", "navbar_search", "enable_view_tracking",
"footer_logo", "call_to_action", "call_to_action_url"]:
"footer_logo", "call_to_action", "call_to_action_url", "show_language_picker",
"chat_enable"]:
if hasattr(settings, k):
context[k] = settings.get(k)

@@ -178,7 +179,3 @@ def get_items(parentfield):
t['child_items'].append(d)
break
return top_items

@frappe.whitelist(allow_guest=True)
def is_chat_enabled():
return bool(frappe.db.get_single_value('Website Settings', 'chat_enable'))

+ 41
- 12
frappe/website/js/website.js Näytä tiedosto

@@ -376,6 +376,39 @@ $.extend(frappe, {
// Start observing an element
io.observe(el);
});
},
show_language_picker() {
if (frappe.session.user === 'Guest' && window.show_language_picker) {
frappe.call("frappe.translate.get_all_languages", {
with_language_name: true
}).then(res => {
let language_list = res.message;
let language = frappe.get_cookie('preferred_language');
let language_codes = [];
let language_switcher = $("#language-switcher .form-control");
language_list.forEach(language_doc => {
language_codes.push(language_doc.language_code);
language_switcher
.append(
$("<option></option>")
.attr("value", language_doc.language_code)
.text(language_doc.language_name)
);
});
$("#language-switcher").removeClass('hide');
language = language || (language_codes.includes(navigator.language) ? navigator.language : 'en');
language_switcher.val(language);
document.documentElement.lang = language;
language_switcher.change(() => {
let lang = language_switcher.val();
frappe.call("frappe.translate.set_preferred_language_cookie", {
"preferred_language": lang
}).then(() => {
window.location.reload();
});
});
});
}
}
});

@@ -599,17 +632,13 @@ $(document).on("page-change", function() {


frappe.ready(function() {
frappe.call({
method: 'frappe.website.doctype.website_settings.website_settings.is_chat_enabled',
callback: (r) => {
if (r.message) {
frappe.require(['/assets/js/moment-bundle.min.js', "/assets/css/frappe-chat-web.css", "/assets/frappe/js/lib/socket.io.min.js"], () => {
frappe.require('/assets/js/chat.js', () => {
frappe.chat.setup();
});
});
}
}
});
frappe.show_language_picker();
if (window.is_chat_enabled) {
frappe.require(['/assets/js/moment-bundle.min.js', "/assets/css/frappe-chat-web.css", "/assets/frappe/js/lib/socket.io.min.js"], () => {
frappe.require('/assets/js/chat.js', () => {
frappe.chat.setup();
});
});
}
frappe.socketio.init(window.socketio_port);
});

Kirjoita Esikatselu
Ladataan…
Peruuta
Tallenna