diff --git a/app/helpers/series_helper.rb b/app/helpers/series_helper.rb index eaf212d7c54..ae228529d5e 100644 --- a/app/helpers/series_helper.rb +++ b/app/helpers/series_helper.rb @@ -19,7 +19,7 @@ def show_series_data(work) def work_series_description(work, series) serial = SerialWork.where(:work_id => work.id, :series_id => series.id).first - ("Part #{serial.position} of " + link_to(series.title, series)).html_safe + ("Part #{serial.position} of the series " + link_to(series.title, series)).html_safe end def series_list_for_feeds(work) diff --git a/app/views/abuse_reports/new.html.erb b/app/views/abuse_reports/new.html.erb index 511f969f5bf..b4ef6091579 100644 --- a/app/views/abuse_reports/new.html.erb +++ b/app/views/abuse_reports/new.html.erb @@ -7,7 +7,9 @@ <%= form_for(@abuse_report) do |f| %> -
+
+ Link and Describe Abuse +
<%= f.label :url, t('.link', :default => "Link to the page you are reporting (required):") %>
<%= f.text_field :url, :size => 60 %>

<%=h t('.pre_filled', :default => "If you came here from the abuse link at the bottom of the page, this will be filled in for you.") %>

@@ -30,15 +32,18 @@
<%= f.label :email, t('.your_email', :default => "Your email (optional):") %>
<%= f.text_field :email, :size => 60 %>

<%=h t('.anonymous_report', :default => "Leave this blank to file an anonymous report.") %>

-

<%= label_tag('cc_me', "Email me a copy of my message (optional): ") %><%= check_box_tag('cc_me', false) %>

<%= f.hidden_field :ip_address, :value => request.remote_ip %> - -
<%=h t('.submit_message', :default => "Submit your message to the abuse team:") %>
-
<%= f.submit t('.submit', :default => "Submit") %>
-
+ +
+ +
+ Send Message to Abuse Team +

<%= f.submit t('.submit', :default => "Submit") %>

+
+ <% end %> \ No newline at end of file diff --git a/app/views/admin/_admin_nav.html.erb b/app/views/admin/_admin_nav.html.erb index 3b6521ac175..8c35ce800b4 100644 --- a/app/views/admin/_admin_nav.html.erb +++ b/app/views/admin/_admin_nav.html.erb @@ -1,17 +1,17 @@

Admin Navigation

diff --git a/app/views/admin_posts/_admin_index.html.erb b/app/views/admin_posts/_admin_index.html.erb index 032fea328ce..bab13691b49 100644 --- a/app/views/admin_posts/_admin_index.html.erb +++ b/app/views/admin_posts/_admin_index.html.erb @@ -7,33 +7,33 @@
- - - - - - - - - - - - - - - - <% @admin_posts.each do |admin_post| %> - - - - - - - - - <% end %> - -
Manage News Postings
<%= ts("Title") %><%= ts("Posted") %><%= ts("Updated") %><%= ts("Actions") %>
<%= link_to admin_post.title, admin_post %><%=h admin_post.created_at %><%=h admin_post.updated_at %><%= link_to ts("Show"), admin_post %><%= link_to ts("Edit"), edit_admin_post_path(admin_post) %><%= link_to ts("Delete"), admin_post, :confirm => 'Are you sure?', :method => :delete %>
+ + + + + + + + + + + + + + + + <% @admin_posts.each do |admin_post| %> + + + + + + + + + <% end %> + +
Manage News Postings
<%= ts("Title") %><%= ts("Posted") %><%= ts("Updated") %><%= ts("Actions") %>
<%= link_to admin_post.title, admin_post %><%= admin_post.created_at %><%= admin_post.updated_at %><%= link_to ts("Show"), admin_post %><%= link_to ts("Edit"), edit_admin_post_path(admin_post) %><%= link_to ts("Delete"), admin_post, :confirm => 'Are you sure?', :method => :delete %>
diff --git a/app/views/admin_posts/_admin_post_form.html.erb b/app/views/admin_posts/_admin_post_form.html.erb index 0fe0eee0666..3c5655034af 100644 --- a/app/views/admin_posts/_admin_post_form.html.erb +++ b/app/views/admin_posts/_admin_post_form.html.erb @@ -1,7 +1,7 @@
- <%= form_for(@admin_post) do |f| %> - <%= error_messages_for @admin_post %> - + <%= form_for(@admin_post) do |f| %> + <%= error_messages_for @admin_post %> +

<%= ts("* Required information") %>

diff --git a/app/views/admin_posts/_sidebar.html.erb b/app/views/admin_posts/_sidebar.html.erb index 71e08392f30..19448f2ab85 100644 --- a/app/views/admin_posts/_sidebar.html.erb +++ b/app/views/admin_posts/_sidebar.html.erb @@ -1,6 +1,6 @@

Page Summary

- +
<%=raw sanitize_field(@collection, :description) %>
+
diff --git a/app/views/collections/index.html.erb b/app/views/collections/index.html.erb index b91f3ee171c..360e21a088e 100644 --- a/app/views/collections/index.html.erb +++ b/app/views/collections/index.html.erb @@ -12,7 +12,7 @@ <% if @collections.empty? %> <%= ts("Sorry, there were no collections found.") %> <% else %> -

<%= search_header @collections, @query, "Collection" %>

+

<%= search_header @collections, @query, "Collection" %>

<% end %> diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 0f350b213f5..f6221125652 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -7,14 +7,14 @@

We're the <%= link_to t('.archive_faq', :default => "Archive of Our Own"), archive_faqs_path %>, but you can call us <%= link_to ts('AO3'), works_path %>

<% if logged_in? %> -

<%= link_to ts('Invite a friend'), user_invitations_path(current_user) %>

+ <% else %> <% if @admin_settings.account_creation_enabled? %> -

<%= link_to ts('Log in'), login_path %> or <%= link_to ts("Create an Account"), new_user_path %>

+ <% elsif @admin_settings.invite_from_queue_enabled? %> -

<%= link_to ts('Get a Code'), invite_requests_path %>

+ <% else %> -

<%= link_to ts('Log in'), login_path %>

+ <% end %> <% end %> diff --git a/app/views/inbox/show.html.erb b/app/views/inbox/show.html.erb index c3d20a0f756..9a5361d0f85 100644 --- a/app/views/inbox/show.html.erb +++ b/app/views/inbox/show.html.erb @@ -8,22 +8,26 @@ <% unless @inbox_comments.blank? %> <%= form_tag user_inbox_path(@user), :method => :put, :id => 'inbox-form' do %>
- Mass Edit Options - -

- <%= "Mark checked as:" %> + Mass Edit Options +

+
Select:
+
+ all
+
+ +
+
+ <%= "Mark checked as:" %>
+
<%= submit_tag ts("Read"), :name => 'read' %> <%= submit_tag ts("Unread"), :name => 'unread' %> <%= submit_tag ts("Delete From Inbox"), :name => 'delete' %> -

-
-
- List of Comments -
    + + +
+
+ List of Comments +
    <% for inbox_comment in @inbox_comments %>
  1. @@ -88,9 +92,9 @@ inbox_comment.feedback_comment), :remote => true %> -

    Filter

    <%= form_tag(user_inbox_path(@user), :class => 'filters', :method => :get) do %> - <%= field_set_tag do %> +

    Filter

    + <%= field_set_tag do %>
    <%= 'Filter by read' %>
    diff --git a/app/views/invitations/_invitation.html.erb b/app/views/invitations/_invitation.html.erb index a9d96d3a48a..7ae39532c53 100644 --- a/app/views/invitations/_invitation.html.erb +++ b/app/views/invitations/_invitation.html.erb @@ -1,45 +1,28 @@ - - - - - - - - - - - - - - - - +
    +
    Sender
    +
    <%= creator_link(invitation) %>
    +
    Invitation token
    +
    <%= invitation.token %>
    +
    Copy link
    +
    <% unless invitation.redeemed_at %><%= link_to "copy and use", new_user_path(:invitation_token => invitation.token) %><% end %>
    +
    Sent to
    <% if invitation.redeemed_at %> -
    +
    <%= invitation.invitee_email %>
    <% else %> - + <% end %> - - - - - - - - - - - - - - - - - -
    Sender<%= creator_link(invitation) %>
    Invitation token<%= invitation.token %>
    Copy link<% unless invitation.redeemed_at %><%= link_to "copy and use", new_user_path(:invitation_token => invitation.token) %><% end %>
    Sent to<%= invitation.invitee_email %> +
    <%= form_for(invitation) do |f| %>

    <%= f.text_field :invitee_email %>

    <%= hidden_field_tag :user_id, @user.try(:login) %>

    <%= f.submit %>

    <% end %> -
    Redeemed by<%= invitee_link(invitation) %>
    Created at<%= invitation.created_at %>
    Sent at<%= invitation.sent_at %>
    Redeemed at<%= invitation.redeemed_at %>
    +
    Redeemed by
    +
    <%= invitee_link(invitation) %>
    +
    Created at
    +
    <%= invitation.created_at %>
    +
    Sent at
    +
    <%= invitation.sent_at %>
    +
    Redeemed at
    +
    <%= invitation.redeemed_at %>
    +
    diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 56a58aa99a5..cbe7279214b 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,10 +1,8 @@ @@ -27,18 +25,19 @@     <% end %> +
<% if @collection %>

<%= @collection.title ? @collection.title : (@collection_parent ? @collection_parent.title : ts("New Collection")) %>

<% else %>

- <%= link_to ArchiveConfig.APP_NAME, root_path %> (BETA) + <%= link_to image_tag('logo-stroke.png', :alt => "#{ArchiveConfig.APP_NAME} (BETA)"), root_path %>

<% end %> diff --git a/app/views/layouts/_includes.html.erb b/app/views/layouts/_includes.html.erb index 620503ce86e..83dadcc952d 100644 --- a/app/views/layouts/_includes.html.erb +++ b/app/views/layouts/_includes.html.erb @@ -7,7 +7,7 @@ '07-actions', '17-interactions', '08-roles-states', -'10-types.css', +'10-groups.css', '11-group-meta', '12-group-blurb', '13-group-preface', diff --git a/app/views/layouts/session.html.erb b/app/views/layouts/session.html.erb index 8c70a0dca7e..c99991542a6 100644 --- a/app/views/layouts/session.html.erb +++ b/app/views/layouts/session.html.erb @@ -1,31 +1,31 @@ - - - - - <%= ArchiveConfig.APP_NAME %> - <% unless ArchiveConfig.REVISION.blank? %>(rev. - <%= ArchiveConfig.REVISION %>) - <% end %>>> - <%= controller.controller_name %> - <%= controller.action_name %> - - <%= render :partial => 'layouts/includes' %> - - - -
- <%= flash_div :error, :warning, :notice %> -

<%= link_to ArchiveConfig.APP_NAME , :controller => 'home', :action => 'index' %>

-

<%= ts("A project of the") %> <%= "Organization For Transformative Works" %>

- -
- <%= yield %> -
-
+ + + + + <%= ArchiveConfig.APP_NAME %> + <% unless ArchiveConfig.REVISION.blank? %>(rev. + <%= ArchiveConfig.REVISION %>) + <% end %>>> + <%= controller.controller_name %> + <%= controller.action_name %> + + <%= render :partial => 'layouts/includes' %> + + + <%= render :partial => 'layouts/header' %> + +
+ <%= flash_div :error, :warning, :notice %> + + +
+ <%= yield %> +
+
<%= render :partial => 'layouts/footer' %> diff --git a/app/views/passwords/new.html.erb b/app/views/passwords/new.html.erb index 55f97971641..52ad4ac1460 100644 --- a/app/views/passwords/new.html.erb +++ b/app/views/passwords/new.html.erb @@ -1,5 +1,5 @@ -

<%= ts("Forgot your password?") %>

+

<%= ts("Forgotten your password?") %>

<%= ts("If you've forgotten your password, we can send you a temporary one.") %> <%= ts("Please tell us the user name or email address you used when you signed up for your Archive account.") %>

diff --git a/app/views/people/_author_blurb.html.erb b/app/views/people/_author_blurb.html.erb index f2abf1ecfd8..0b4d9394910 100644 --- a/app/views/people/_author_blurb.html.erb +++ b/app/views/people/_author_blurb.html.erb @@ -1,5 +1,5 @@ -
  • -
    +
  • +

    <%= link_to(author.name, user_pseud_path(author.user, author)) %> <% if (author.name != author.user.login) %> (<%= link_to(author.user_name, user_path(author.user)) %>) @@ -13,6 +13,7 @@
    <%=raw standard_icon_display(author.user, author) %>
    +

    <% unless author.description.blank? %>

    <%=raw sanitize_field(author, :description) %>

    @@ -29,5 +30,4 @@ <% end %> <% end %> -
    • diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb index 575bb9c8ae2..e29e944afc5 100644 --- a/app/views/people/index.html.erb +++ b/app/views/people/index.html.erb @@ -1,27 +1,30 @@ <% if @collection %>

    <%= authors_header @authors %> <%= "in" %> '<%= (params[:letter] && params[:letter].is_a?(String)) ? params[:letter] : @pseuds_alphabet[0] %>' <%= ts("in %{collection}", :collection => @collection.title) %>

    -

    Next Page Navigation

    + + +

    Next Page Navigation

    <%= alpha_paginated_section @pseuds_alphabet %> <%= paginated_section @authors do %> - - + <% end %> - - <%= alpha_paginated_section @pseuds_alphabet %> + + +

    Next Page Navigation

    +<%= alpha_paginated_section @pseuds_alphabet %> <% else %> -
    - <%= link_to "People Search (Alpha)", search_people_path %> -
    +

    <%= link_to "People Search (Alpha)", search_people_path %>

    <% end %> diff --git a/app/views/preferences/index.html.erb b/app/views/preferences/index.html.erb index 5a996b61da5..913324e0a0f 100644 --- a/app/views/preferences/index.html.erb +++ b/app/views/preferences/index.html.erb @@ -1,5 +1,5 @@ -

    <%= ts('Update My Preferences') %>

    +

    <%= ts('Set My Preferences') %>

    <%= error_messages_for :preference %> @@ -16,7 +16,9 @@ <%= form_for(@preference, :url => { :action => "update", :user_id => @user }) do |f| %> -

    <%= ts("Privacy") %>

    +
    + <%= ts("Privacy") %> +

    <%= ts("Privacy") %>

    - -

    <%= ts("Site Display") %>

    +
    +
    + <%= ts("Site Display") %>

    <%= ts("Site Display") %>

    - +
    +
    + <%= ts("Statistics") %>

    <%= ts("Statistics") %>

    - +
    +
    + <%= ts("Comments") %>

    <%= ts("Comments") %>

    - +
    +
    + <%= ts("Collections, Challenges and Gifts") %>

    <%= ts("Collections, Challenges and Gifts") %>

    -

    <%= ts("Misc") %>

    +
    +
    + <%= ts("Misc") %> +

    <%= ts("Misc") %>

    - +

    <%= f.submit t('.forms.update', :default => "Update") %> diff --git a/app/views/profile/show.html.erb b/app/views/profile/show.html.erb index ca8b72910ef..d8a32115687 100644 --- a/app/views/profile/show.html.erb +++ b/app/views/profile/show.html.erb @@ -26,7 +26,7 @@ <% unless @user.profile.about_me.blank? %>

    -

    <%=h ts("Bio:") %>

    +

    <%=h ts("Bio") %>

    <%=raw sanitize_field(@user.profile, :about_me) %>
    <% end %> diff --git a/app/views/pseuds/_pseud_blurb.html.erb b/app/views/pseuds/_pseud_blurb.html.erb index 76991fa008b..2ec1aed4e74 100644 --- a/app/views/pseuds/_pseud_blurb.html.erb +++ b/app/views/pseuds/_pseud_blurb.html.erb @@ -1,5 +1,5 @@ -
  • -
    +
  • +

    <%= link_to(pseud.name, user_pseud_path(pseud.user, pseud)) %> <% if (pseud.name != pseud.user_name || pseud.user.pseuds.size > 1) %> (<%= link_to(pseud.user_name, user_path(pseud.user)) %>) @@ -12,26 +12,26 @@
    <%= standard_icon_display(@user, pseud) %>
    +

    <% unless pseud.description.blank? %> -
    +
    <%=raw sanitize_field(pseud, :description) %>
    <% end %> <% if current_user == pseud.user %> -