Permalink
Browse files

Merge pull request #644 from ariana-paris/issue_3088-Add_new_help_pag…

…es_on_new_work_form

Issue 3088 add new help pages on new work form
  • Loading branch information...
2 parents 7a66b0a + 999d72b commit d7768b46c46be326352c97f4a3041c6a5be46b1c @CristinaRO CristinaRO committed Aug 22, 2012
View
13 app/views/bookmarks/_external_work_fields.html.erb
@@ -50,11 +50,10 @@
<legend>Tag</legend>
<p>
<%= ts("Author's Tags (comma separated, %{max} characters per tag). Only a fandom is required.", :max => ArchiveConfig.TAG_MAX) %>
- <%= link_to_help "tagging-help" %>
</p>
<dl>
<dt class="required">
- <%= ew.label :fandom_string, Fandom::NAME.pluralize %>
+ <%= ew.label :fandom_string, Fandom::NAME.pluralize %>* <%= link_to_help "fandom-help" %>
</dt>
<dd title="fandom required">
<%= ew.text_field :fandom_string, autocomplete_options('fandom') %>
@@ -66,21 +65,21 @@
<%= ew.collection_select(:rating_string, Rating.canonical.by_name, :name, :name, {:selected => ArchiveConfig.RATING_DEFAULT_TAG_NAME}) %>
</dd>
<dt>
- <%= ew.label :category_string, Category::NAME %>
+ <%= ew.label :category_string, Category::NAME %> <%= link_to_help "categories-help" %>
</dt>
<dd>
<%= ew.collection_select(:category_string, Category.canonical.by_name, :name, :name, {:include_blank => true}) %>
</dd>
<dt>
- <%= ew.label :relationship_string, Relationship::NAME.pluralize %>
+ <%= ew.label :relationship_string, Relationship::NAME.pluralize %> <%= link_to_help "relationships-help" %>
</dt>
- <dd title-"relationship">
+ <dd title="relationships">
<%= ew.text_field :relationship_string, autocomplete_options('relationship_in_fandom', :autocomplete_live_params => 'fandom=bookmark_external_fandom_string') %>
</dd>
<dt>
- <%= ew.label :character_string, Character::NAME.pluralize %>
+ <%= ew.label :character_string, Character::NAME.pluralize %> <%= link_to_help "characters-help" %>
</dt>
- <dd title="character">
+ <dd title="characters">
<%= ew.text_field :character_string, autocomplete_options('character_in_fandom', :autocomplete_live_params => 'fandom=bookmark_external_fandom_string') %>
</dd>
</dl>
View
18 app/views/works/_work_form_tags.html.erb
@@ -1,7 +1,7 @@
<fieldset class="work meta">
<legend><%= ts("Tags") %></legend>
<h3 class="landmark">Tags</h3>
- <p class="note"><%= h t('.tags', :default =>"Tags are comma separated, %{max} characters per tag.", :max => ArchiveConfig.TAG_MAX) %> <%= link_to_help "tagging-help" %></p>
+ <p class="note"><%= ts("Tags are comma separated, %{max} characters per tag.", :max => ArchiveConfig.TAG_MAX) %></p>
<dl>
<dt class="rating required">
@@ -29,7 +29,7 @@
</dd>
<dt class="fandom required">
- <label for="work_fandom" title="fandom"><%= Fandom::NAME.pluralize %>*</label>
+ <label for="work_fandom" title="fandom"><%= Fandom::NAME.pluralize %>* <%= link_to_help "fandom-help" %></label>
</dt>
<dd class="fandom required" title="fandom">
<%= text_field_tag "work[fandom_string]", include_blank ? "" : @work.fandom_string,
@@ -40,7 +40,7 @@
<dt class="category">
- <label><%= Category::NAME %></label>
+ <label><%= Category::NAME %> <%= link_to_help "categories-help" %></label>
</dt>
<dd class="category">
<fieldset>
@@ -56,9 +56,9 @@
</dd>
<dt class="relationship">
- <label for="work_relationship"><%= Relationship::NAME.pluralize %></label>
+ <label for="work_relationship"><%= Relationship::NAME.pluralize %> <%= link_to_help "relationships-help" %></label>
</dt>
- <dd class="relationship" title="relationship">
+ <dd class="relationship" title="relationships">
<%= text_field_tag "work[relationship_string]", include_blank ? "" : @work.relationship_string,
autocomplete_options("relationship_in_fandom",
:id => "work_relationship",
@@ -67,18 +67,18 @@
</dd>
<dt class="character">
- <label for="work_character"><%= Character::NAME.pluralize %></label>
+ <label for="work_character"><%= Character::NAME.pluralize %> <%= link_to_help "characters-help" %></label>
</dt>
- <dd class="character" title="character">
+ <dd class="character" title="characters">
<%= text_field_tag "work[character_string]", include_blank ? "" : @work.character_string,
autocomplete_options('character_in_fandom',
:id => "work_character", :title => "character", :autocomplete_live_params => 'fandom=work_fandom') %>
</dd>
<dt class="freeform">
- <label for="work_freeform"><%= Freeform::NAME %></label>
+ <label for="work_freeform"><%= Freeform::NAME %> <%= link_to_help "additional-tags-help" %></label>
</dt>
- <dd class="freeform" title="freeform">
+ <dd class="freeform" title="additional tags">
<%= text_field_tag "work[freeform_string]", include_blank ? "" : @work.freeform_string, autocomplete_options('freeform', :id => "work_freeform", :title => "freeform") %>
</dd>
View
3 public/help/additional-tags-help.html
@@ -0,0 +1,3 @@
+<h4>Additional Tags</h4>
+
+<p>Any other tags you want to give your work (for example, "Angst", "Crossover", or "Tentacles"). You may also use this field to warn for things not covered by the Archive Warnings. Please do not enter fandom, relationship, or character names in this field. Multiple tags should be separated by commas.</p>
View
16 public/help/categories-help.html
@@ -0,0 +1,16 @@
+<h4>Categories Tags</h4>
+
+ <p>There are 6 categories of works on the Archive. While here we have given an interpretation of the abbreviations, the exact definitions of these vary from fandom to fandom and fan to fan; use whichever you feel are applicable, or else none:</p>
+ <ul>
+ <li>F/F (Female/Female)</li>
+
+ <li>F/M (Female/Male)</li>
+
+ <li>Gen (General - no relationship or contains relationships which are not the main focus of the work)</li>
+
+ <li>M/M (Male/Male)</li>
+
+ <li>Multi (Any combination of relationships, multiple partners)</li>
+
+ <li>Other (Other)</li>
+ </ul>
View
3 public/help/characters-help.html
@@ -0,0 +1,3 @@
+<h4>Characters Tags</h4>
+
+<p>The main character(s) in your work, separated by commas. Full names (personal name and family name) are preferred.</p>
View
3 public/help/fandom-help.html
@@ -0,0 +1,3 @@
+<h4>Fandom Tags</h4>
+
+<p>The name(s) of the fandom(s) to which your work belongs. Full names, rather than abbreviations, are preferred. You may list multiple fandoms, separated by commas (for example, if your work is a crossover).</p>
View
3 public/help/relationships-help.html
@@ -0,0 +1,3 @@
+<h4>Relationships Tags</h4>
+
+<p>The relationships in your work. Full names are preferred (for example, "Mickey Mouse/Minnie Mouse" or "Rodney McKay & John Sheppard"), or you may use a nickname for the relationship (for example, "Snarry" or "McShep"). You may list more than one relationship, separated by commas. Please note that all user-created tags must be 100 characters or less; if your work contains a threesome (or a larger poly group) you may want to use first names only to avoid going over the character limit.</p>
View
8 public/help/tagging-help.html
@@ -3,18 +3,18 @@
<dl id="help">
<dt>Fandoms</dt>
<dd>
- The name(s) of the fandom(s) to which your story belongs. Full names, rather than abbreviations, are preferred. You may list multiple fandoms, separated by commas (for example, if your story is a crossover).
+ The name(s) of the fandom(s) to which your work belongs. Full names, rather than abbreviations, are preferred. You may list multiple fandoms, separated by commas (for example, if your story is a crossover).
</dd>
<dt>Relationships</dt>
<dd>
- The relationships in your story. Full names are preferred (for example, "Mickey Mouse/Minnie Mouse" or "Rodney McKay & John Sheppard"), or you may use a nickname for the relationship (for example, "Snarry" or "McShep"). You may list more than one relationship, separated by commas. Please note that all user-created tags must be 100 characters or less; if your story contains a threesome (or a larger poly group) you may want to use first names only to avoid going over the character limit.
+ The relationships in your work. Full names are preferred (for example, "Mickey Mouse/Minnie Mouse" or "Rodney McKay & John Sheppard"), or you may use a nickname for the relationship (for example, "Snarry" or "McShep"). You may list more than one relationship, separated by commas. Please note that all user-created tags must be 100 characters or less; if your work contains a threesome (or a larger poly group) you may want to use first names only to avoid going over the character limit.
</dd>
<dt>Characters</dt>
<dd>
- The main character(s) in your story, separated by commas. Full names (personal name and family name) are preferred
+ The main character(s) in your work, separated by commas. Full names (personal name and family name) are preferred
</dd>
<dt>Additional tags (genre, warnings, other information)</dt>
<dd>
- Any other tags you want to give your story (for example, "Angst", "Crossover", or "Tentacles"). You may also use this field to warn for things not covered by the Archive Warnings. Please do not enter fandom, relationship, or character names in this field. Multiple tags should be separated by commas.
+ Any other tags you want to give your work (for example, "Angst", "Crossover", or "Tentacles"). You may also use this field to warn for things not covered by the Archive Warnings. Please do not enter fandom, relationship, or character names in this field. Multiple tags should be separated by commas.
</dd>
</dl>

0 comments on commit d7768b4

Please sign in to comment.