Issue 2957 #543

Merged
merged 4 commits into from Mar 22, 2012
Jump to file or symbol
Failed to load files and symbols.
+32 −24
Split
@@ -2,23 +2,25 @@
<% if logged_in_as_admin? %>
<%= render :partial => "admin_index" %>
<% else %>
- <h2 class="heading"><%= t("archive_faq", :default => "Archive FAQ") %></h2>
+ <h2 class="heading"><%= ts("Archive FAQ") %></h2>
<!--/descriptions-->
<!--main content-->
- <div class="admin userstuff">
- <p>Some commonly asked questions about the Archive are answered here.
+ <div class="faq admin">
+ <div class="userstuff">
+ <p>Some commonly asked questions about the Archive are answered here.
Questions and answers about our Terms of Service can be found in the <%= link_to "TOS FAQ", tos_faq_path %>.
You may also like to check out our <%= link_to "Known Issues", known_issues_path %>.
If you need more help, please submit a <%= link_to "support request", feedbacks_path %>.</p>
- <% unless @archive_faqs.blank? %>
- <h3 id="categories">Available Categories</h3>
- <ol role="navigation">
- <% for faq in @archive_faqs %>
- <li><%= link_to faq.title, faq %></li>
+ <% unless @archive_faqs.blank? %>
+ <h3 id="categories">Available Categories</h3>
+ <ol role="navigation">
+ <% for faq in @archive_faqs %>
+ <li><%= link_to faq.title, faq %></li>
+ <% end %>
+ </ol>
<% end %>
- </ol>
- <% end %>
+ </div>
</div>
<% end %>
@@ -1,25 +1,20 @@
<!--Descriptive page name, messages and instructions-->
-<h2 class="heading"><%= t("archive_faq", :default => "Archive FAQ") %></h2>
+<h2 class="heading"><%= link_to ts("Archive FAQ"), archive_faqs_path %> > <%= @archive_faq.title %></h2>
<!--/descriptions-->
<!--subnav-->
-<ul class="navigation actions" role="navigation">
- <li><%= link_to t('.back_to_archive_faq_text', :default => 'Back to Archive FAQ'), archive_faqs_path %></li>
-</ul>
+
<!--/subnav-->
<!--main content-->
-<div class="admin" role="article">
- <div class="header">
- <h3 class="heading">
- <%= @archive_faq.title %>
- </h3>
- <% if logged_in_as_admin? %>
- <h4 class="heading">
+<div class="faq admin" role="article">
+ <% if logged_in_as_admin? %>
+ <div class="header">
+ <h3 class="heading">
Updated: <%=h @archive_faq.updated_at %> | <%= link_to 'Edit', edit_archive_faq_path(@archive_faq) %>
- </h4>
- <% end %>
- </div>
+ </h3>
+ </div>
+ <% end %>
<div class="userstuff">
<%=raw sanitize_field(@archive_faq, :content) %>
</div>
@@ -147,4 +147,15 @@
float: none;
}
+/* FAQ PAGES */
+
+.faq .userstuff {
+ max-width: 72em;
+ margin: auto;
+}
+
+.faq .userstuff h3 {
+ margin-top: 3em;
+}
+
/*END== */