Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273)

This commit is contained in:
François Lamontagne 2014-12-30 11:52:31 -05:00
parent 8fa0ae1db2
commit 4c33a6adeb
5 changed files with 47 additions and 2 deletions

View file

@ -106,6 +106,7 @@ This is disabled by default since it requires the installation of additional pac
* Correctly validate if local recipients actually want to receive a conversation [#5449](https://github.com/diaspora/diaspora/pull/5449)
* Improve consistency of poll answer ordering [#5471](https://github.com/diaspora/diaspora/pull/5471)
* Fix broken aspect selectbox on asynchronous search results [#5488](https://github.com/diaspora/diaspora/pull/5488)
* Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ [#5509](https://github.com/diaspora/diaspora/pull/5509)
## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

View file

@ -8,6 +8,7 @@ app.views.Help = app.views.StaticContentView.extend({
"click .faq-link-getting-help" : "gettingHelp",
"click .faq-link-sharing" : "sharing",
"click .faq-link-posts-and-posting" : "postsAndPosting",
"click .faq-link-tags": "tags",
"click .faq-link-keyboard-shortcuts" : "keyboardShortcuts",
},
@ -28,6 +29,12 @@ app.views.Help = app.views.StaticContentView.extend({
}
};
this.TAGS_SUBS = {
filter_tags_a: {
third_party_tools: this.linkHtml("https://wiki.diasporafoundation.org/Tools_to_use_with_Diaspora", Diaspora.I18n.t( 'third_party_tools' )),
}
};
this.data = {
title_header: Diaspora.I18n.t( 'title_header' ),
title_getting_help: Diaspora.I18n.t( 'getting_help.title' ),
@ -147,6 +154,13 @@ app.views.Help = app.views.StaticContentView.extend({
e.preventDefault();
},
tags: function(e) {
this.renderStaticSection("tags", "faq_tags", this.TAGS_SUBS);
this.menuClicked(e);
e.preventDefault();
},
keyboardShortcuts: function(e) {
this.renderStaticSection("keyboard_shortcuts", "faq_keyboard_shortcuts", {});
this.menuClicked(e);

View file

@ -0,0 +1,30 @@
<div class='question opened collapsible'>
<a class='toggle' href='#'>
<h4>{{ what_are_tags_for_q }}</h4>
</a>
<div class='answer hideable'>{{{ what_are_tags_for_a }}}</div>
</div>
<div class='question opened collapsible'>
<a class='toggle' href='#'>
<h4>{{ tags_in_comments_q }}</h4>
</a>
<div class='answer hideable'>{{{ tags_in_comments_a }}}</div>
</div>
<div class='question opened collapsible'>
<a class='toggle' href='#'>
<h4>{{ followed_tags_q }}</h4>
</a>
<div class='answer hideable'>{{{ followed_tags_a }}}</div>
</div>
<div class='question opened collapsible'>
<a class='toggle' href='#'>
<h4>{{ people_tag_page_q }}</h4>
</a>
<div class='answer hideable'>{{{ people_tag_page_a }}}</div>
</div>
<div class='question opened collapsible'>
<a class='toggle' href='#'>
<h4>{{ filter_tags_q }}</h4>
</a>
<div class='answer hideable'>{{{ filter_tags_a }}}</div>
</div>

View file

@ -57,7 +57,7 @@
<span class="section-selected">{{ title_sharing }}</span>
</li>
<li>
<a href="#" class="section-unselected faq-link" data-section="tags" data-items="what_are_tags_for tags_in_comments followed_tags people_tag_page filter_tags">{{ title_tags }}</a>
<a href="#" class="section-unselected faq-link-tags" data-section="tags" data-items="what_are_tags_for tags_in_comments followed_tags people_tag_page filter_tags">{{ title_tags }}</a>
<span class="section-selected">{{ title_tags }}</span>
</li>
<li>

View file

@ -74,7 +74,7 @@ describe("app.views.Help", function(){
it('should show tags section', function(){
this.view.$el.find('a[data-section=tags]').trigger('click');
expect(this.view.$el.find('#faq').children().first().hasClass('faq_question_tags')).toBeTruthy();
expect(this.view.$el.find('#faq').children().first().data('template') == 'faq_tags')).toBeTruthy();
});
it('should show keyboard shortcuts section', function(){