Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions app/controllers/help_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ class HelpController < ApplicationController
skins_creating
skins_parents
symbols_key
tag_sets_about
tag_sets_associations
tag_sets_batch_load
tags_additional
tags_categories
tags_characters
Expand Down
9 changes: 9 additions & 0 deletions app/views/help/tag_sets_about.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<h4><%= t(".page_heading") %></h4>

<p><%= t(".what_are_tag_sets") %></p>

<p><%= t(".who_manages_tag_sets") %></p>

<p><%= t(".where_to_find_tag_sets") %></p>

<p><%= t(".sharing_tag_sets_html", delete_tag_set_warning_strong: tag.strong(t(".delete_tag_set_warning_strong"))) %></p>
7 changes: 7 additions & 0 deletions app/views/help/tag_sets_associations.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<h3><%= t(".page_heading") %></h3>

<p><%= t(".what_are_tag_set_associations") %></p>

<p><%= t(".note_about_tag_set_associations") %></p>

<p><%= t(".tip") %></p>
19 changes: 19 additions & 0 deletions app/views/help/tag_sets_batch_load.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<h4><%= t(".page_heading") %></h4>

<ul>
<li>
<%= t(".load_tag_associations_note") %>
</li>
<li>
<%= t(".add_new_tags_note") %>
</li>
<li>
<%= t(".already_associated_note") %>
</li>
<li>
<%= t(".submit_note") %>
</li>
<li>
<%= t(".loading_error_note") %>
</li>
</ul>
4 changes: 2 additions & 2 deletions app/views/owned_tag_sets/_tag_set_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</fieldset>

<fieldset class="tagset">
<legend>Tags In Set <% unless @tag_set.new_record? || !@tag_set.tag_set || @tag_set.tag_set.tags.empty? %><%= ts('(check to remove)') %><% end %></legend>
<legend>Tags In Set <% unless @tag_set.new_record? || !@tag_set.tag_set || @tag_set.tag_set.tags.empty? %><%= t(".check_to_remove") %><% end %></legend>
<h3 class="landmark heading"><%= ts('Tags in Set') %></h3>
<% @tag_set.build_tag_set unless @tag_set.tag_set %>
<%= tag_set_form.fields_for :tag_set do |internal_tag_set_form| %>
Expand All @@ -44,7 +44,7 @@
<fieldset>
<% associations_for_remove = @tag_set.tag_set_associations.reject {|assoc| assoc.new_record?} %>
<% associations_for_add = @tag_set.tag_set_associations.select {|assoc| assoc.new_record?} %>
<legend>Tag Associations <%= associations_for_remove.empty? ? '' : ts('(check to remove)') %> <%= link_to_help('tagset-tag-associations')%></legend>
<legend>Tag Associations <%= associations_for_remove.empty? ? "" : t(".check_to_remove") %><%= link_to_help_modal(help_tag_sets_associations_path, t(".tag_sets_associations_help_title")) %></legend>

<h3 class="landmark heading"><%= ts('Tag Associations') %> </h3>
<% unless associations_for_remove.empty? %>
Expand Down
8 changes: 4 additions & 4 deletions app/views/owned_tag_sets/batch_load.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--ZONE TAG: tagset POST/CREATE-->
<div class="tag tagset">
<!--Descriptive page name and system messages, descriptions, and instructions.-->
<h2 class="heading"><%= ts('Batch Loading') %> <%= link_to_help "tagset-batch-load" %></h2>
<h2 class="heading"><%= t(".page_heading") %> <%= link_to_help_modal(help_tag_sets_batch_load_path, t(".tag_sets_batch_load_help_title")) %></h2>
<!-- /descriptions-->

<!--subnav-->
Expand All @@ -21,10 +21,10 @@
</dd>
<dt><%= label_tag "batch_do_relationships", ts('Relationships instead?') %></dt>
<dd><%= check_box_tag "batch_do_relationships" %></dd>
<dt class="landmark"><%= ts('Submit') %></dt>
<dd class="submit actions"><%= form.submit ts('Submit') %></dd>
<dt class="landmark"><%= t(".submit") %></dt>
<dd class="submit actions"><%= form.submit t(".submit") %></dd>
</dl>
</fieldset>

<% end %>
</div>
22 changes: 11 additions & 11 deletions app/views/owned_tag_sets/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,43 @@
<!--Descriptive page name and system messages, descriptions, and instructions.-->
<h2 class="heading">
<% if @user %>
<%= ts('%{user_name}\'s Tag Sets', :user_name => @user.login) %> <%= link_to_help 'tagset-about' %>
<%= t(".page_heading_user", user_name: @user.login) %> <%= link_to_help_modal(help_tag_sets_about_path, t(".tag_sets_about_help_title")) %>
<% elsif @restriction %>
<%= ts('Tag Sets Used In This Challenge') %>
<%= t(".page_heading_challenge") %>
<% elsif @query %>
<%= search_header @tag_sets, nil, ts('Tag Set') %> <%= link_to_help 'tagset-about' %>
<%= search_header @tag_sets, nil, t(".page_heading_query") %> <%= link_to_help_modal(help_tag_sets_about_path, t(".tag_sets_about_help_title")) %>
<% else %>
<%= ts('Tag Sets') %> <%= link_to_help 'tagset-about' %> <%= ts('in the %{archive_name}', :archive_name => ArchiveConfig.APP_NAME) %>
<%= t(".page_heading_default") %> <%= link_to_help_modal(help_tag_sets_about_path, t(".tag_sets_about_help_title")) %> <%= t(".in_archive_name", archive_name: ArchiveConfig.APP_NAME) %>
<% end %>
</h2>
<!--/descriptions-->

<!--Subnavigation, sorting and actions-->
<ul class="navigation actions" role="navigation">
<li class="search" role="search">
<%= form_tag tag_sets_path, :class => "simple search", :method => :get do |form| %>
<%= form_tag tag_sets_path, class: "simple search", method: :get do |form| %>
<fieldset>
<%= text_field_tag "query", @query, :title => ts('search') %>
<%= submit_tag ts('Search') %>
<%= text_field_tag "query", @query, title: t(".search_title") %>
<%= submit_tag t(".search_submit") %>
</fieldset>
<% end %>
</li>
<% if logged_in? %>
<li><%= link_to ts('New Tag Set'), new_tag_set_path %></li>
<li><%= link_to ts('Tags'), tags_path %></li>
<li><%= link_to t(".new_tag_set_link"), new_tag_set_path %></li>
<li><%= link_to t(".tags_link"), tags_path %></li>
<% end %>
</ul>
<!--/subnav-->

<!--main content-->
<% if @tag_sets.empty? %>
<p><%= ts('No tag sets found.') %></p>
<p><%= t(".no_tag_sets_found") %></p>
<% else %>
<% if @tag_sets.respond_to?(:total_pages) %>
<%= will_paginate @tag_sets %>
<% end %>

<h3 class="landmark heading"><%= ts('Listing Tag Sets') %></h3>
<h3 class="landmark heading"><%= t(".listing_tag_sets_heading") %></h3>
<ul class="index group">
<% @tag_sets.each do |tag_set| %>
<%= render 'tag_set_blurb', :tag_set => tag_set %>
Expand Down
40 changes: 40 additions & 0 deletions config/locales/views/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1687,6 +1687,25 @@ en:
non_con:
acronym: non-con
title: non-consensual sex
tag_sets_about:
delete_tag_set_warning_strong: can delete the tag set or change it without warning
page_heading: About Tag Sets
sharing_tag_sets_html: Some users may choose to make their tag set publicly available for others to use in their challenges. Please note that the owners of a tag set %{delete_tag_set_warning_strong}, so before you use someone else's tag set for your challenge, please be sure that you trust them not to change it.
what_are_tag_sets: If you've ever wanted to run a challenge on the Archive, that's what tag sets are for. You create a tag set to hold a list of all the tags that should be available for sign-up, even if those tags haven't been used on the Archive before now, and then add the tag set to your challenge. Tags in the tag set will then automatically show up in the sign-up form.
where_to_find_tag_sets: All tag sets are listed on the main tag sets page. You can browse them to get a better idea of how they work.
who_manages_tag_sets: You can add as many moderators as you want to help you manage your tag set, and they don't need to have access to the challenge settings. You can also allow the participants in your challenge to nominate tags to be added to your set. You and any co-owners and moderators can review those nominations, and approve or reject them. You can add fandom associations to new tags in your Tag Set, or you can leave them for tag wranglers to make the associations (this may take some time).
tag_sets_associations:
note_about_tag_set_associations: 'Note: if the wranglers have already set up these associations, then you can just add the additional ones that you would like -- you don''t have to (and in fact aren''t allowed) to create copies of canonical associations. You can still limit your participants'' choices to tags actually in your set.'
page_heading: Tag Set Associations
tip: If you're not sure how this might work, try adding a few fandoms and characters and setting up some associations, and then set up your challenge and try out the sign-up form!
what_are_tag_set_associations: Tag associations let you set up associations between the fandoms, characters, and relationships in your tag set, which then lets your participants pick from only the characters and relationships in a given fandom.
tag_sets_batch_load:
add_new_tags_note: If you really want to add some new tags to the Archive, you can add them to your tag set first, and then batch load the associations here afterwards.
already_associated_note: If two tags are already associated in the Archive or in your tag set, it won't associate them again.
load_tag_associations_note: You can only batch load tag associations if the tags already exist. This is to avoid mass-adding piles of wrong tags to the Archive.
loading_error_note: If the batch load is taking too long and you're getting 502 errors, please split up the number of tags you're trying to load!
page_heading: Batch Loading
submit_note: Only the associations that didn't work will remain in the form after you select the "Submit" button.
tags_additional:
description: 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.
more_info:
Expand Down Expand Up @@ -2734,6 +2753,27 @@ en:
orphan_user:
orphaning_bylines_only_message_html: Orphaning will automatically remove your personal information from <strong>bylines only</strong>. It will <strong>not</strong> automatically remove your personal information from anywhere else in the work(s). Social media accounts, contact information, email addresses, names, and any other personal information posted in the title, summary, notes, tags, work body, or comment text will <strong>not</strong> be automatically removed. Comments posted by other users will also <strong>not</strong> be affected by Orphaning. If you want information removed from these places, you should edit or delete it prior to Orphaning. <strong>Once you Orphan the work(s), you will no longer be able to delete information in these places yourself</strong>.
orphaning_works_message_html: 'Orphaning will <strong>permanently</strong> remove your username and/or pseud from the bylines of: the following work(s), their chapters, associated series, and any comments you may have left on them while logged into this account.'
owned_tag_sets:
batch_load:
page_heading: Batch Loading
submit: Submit
tag_sets_batch_load_help_title: Tagset batch load
index:
in_archive_name: in the %{archive_name}
listing_tag_sets_heading: Listing Tag Sets
new_tag_set_link: New Tag Set
no_tag_sets_found: No tag sets found.
page_heading_challenge: Tag Sets Used In This Challenge
page_heading_default: Tag Sets
page_heading_query: Tag Set
page_heading_user: "%{user_name}'s Tag Sets"
search_submit: Search
search_title: search
tag_sets_about_help_title: Tagset about
tags_link: Tags
tag_set_form:
check_to_remove: "(check to remove)"
tag_sets_associations_help_title: Tagset tag associations
pagy:
aria_label:
nav: Pagination
Expand Down
3 changes: 3 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,9 @@
get "/help/skins-creating.html", to: redirect("/help/skins_creating")
get "/help/skins-parents.html", to: redirect("/help/skins_parents")
get "/help/symbols-key.html", to: redirect("/help/symbols_key")
get "/help/tagset-about.html", to: redirect("/help/tag_sets_about")
get "/help/tagset-tag-associations.html", to: redirect("/help/tag_sets_associations")
get "/help/tagset-batch-load.html", to: redirect("/help/tag_sets_batch_load")
get "/help/additional-tags-help.html", to: redirect("/help/tags_additional")
get "/help/categories-help.html", to: redirect("/help/tags_categories")
get "/help/characters-help.html", to: redirect("/help/tags_characters")
Expand Down
32 changes: 0 additions & 32 deletions public/help/tagset-about.html

This file was deleted.

24 changes: 0 additions & 24 deletions public/help/tagset-batch-load.html

This file was deleted.

18 changes: 0 additions & 18 deletions public/help/tagset-tag-associations.html

This file was deleted.

Loading