mirror of
https://github.com/discourse/discourse.git
synced 2025-01-31 03:29:31 +08:00
UX: unified About / Privacy / ToS / FAQ topnav
This commit is contained in:
parent
5266ad4539
commit
ddb8378ab0
|
@ -1,6 +1,10 @@
|
||||||
import ObjectController from 'discourse/controllers/object';
|
import ObjectController from 'discourse/controllers/object';
|
||||||
|
|
||||||
export default ObjectController.extend({
|
export default ObjectController.extend({
|
||||||
|
faqOverriden: function() {
|
||||||
|
return !(this.siteSettings.faq_url.length === 0);
|
||||||
|
}.property(),
|
||||||
|
|
||||||
contactInfo: function() {
|
contactInfo: function() {
|
||||||
if (Discourse.SiteSettings.contact_email) {
|
if (Discourse.SiteSettings.contact_email) {
|
||||||
return I18n.t('about.contact_info', {contact_email: Discourse.SiteSettings.contact_email});
|
return I18n.t('about.contact_info', {contact_email: Discourse.SiteSettings.contact_email});
|
||||||
|
|
|
@ -1,4 +1,18 @@
|
||||||
<div class='container body-page'>
|
<div class='container'>
|
||||||
|
<div class='contents clearfix body-page'>
|
||||||
|
|
||||||
|
<ul class="nav-pills">
|
||||||
|
<li class="nav-item-about">{{#link-to 'about' class="active"}}{{i18n 'about.simple_title'}}{{/link-to}}</li>
|
||||||
|
{{#if faqOverriden}}
|
||||||
|
<li class="nav-item-guidelines">{{#link-to 'guidelines'}}{{i18n 'guidelines'}}{{/link-to}}</li>
|
||||||
|
<li class="nav-item-faq">{{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}</li>
|
||||||
|
{{else}}
|
||||||
|
<li class="nav-item-faq">{{#link-to 'faq'}}{{i18n 'faq'}}{{/link-to}}</li>
|
||||||
|
{{/if}}
|
||||||
|
<li class="nav-item-tos">{{#link-to 'tos'}}{{i18n 'terms_of_service'}}{{/link-to}}</li>
|
||||||
|
<li class="nav-item-privacy">{{#link-to 'privacy'}}{{i18n 'privacy'}}{{/link-to}}</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
<section class='about'>
|
<section class='about'>
|
||||||
<h2>{{i18n 'about.title' title=title}}</h2>
|
<h2>{{i18n 'about.title' title=title}}</h2>
|
||||||
<p>{{description}}</p>
|
<p>{{description}}</p>
|
||||||
|
@ -79,4 +93,5 @@
|
||||||
</section>
|
</section>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
<ul class="nav-pills">
|
<ul class="nav-pills">
|
||||||
|
<li class="nav-item-about"><%= link_to t('about'), '/about' %></a></li>
|
||||||
<% if @faq_overriden %>
|
<% if @faq_overriden %>
|
||||||
<li class="nav-item-guidelines"><a class="<%= @page == 'faq' ? 'active' : '' %>" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
|
<li class="nav-item-guidelines"><a class="<%= @page == 'faq' ? 'active' : '' %>" href="<%=guidelines_path%>"><%=t "guidelines" %></a></li>
|
||||||
<li class="nav-item-faq"><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
|
<li class="nav-item-faq"><a href="<%=faq_path%>"><%=t "js.faq" %></a></li>
|
||||||
|
|
|
@ -1955,6 +1955,7 @@ en:
|
||||||
color_schemes:
|
color_schemes:
|
||||||
base_theme_name: "Base"
|
base_theme_name: "Base"
|
||||||
|
|
||||||
|
about: "About"
|
||||||
guidelines: "Guidelines"
|
guidelines: "Guidelines"
|
||||||
privacy: "Privacy"
|
privacy: "Privacy"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user