Merge 33a1718 into ecf6d58

openstax · Jan 9, 2017 · 47af11d · 47af11d
2 parents ecf6d58 + 33a1718
commit 47af11d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/app/assets/stylesheets/signinup.scss b/app/assets/stylesheets/signinup.scss
@@ -4,5 +4,11 @@ body.sessions {
     display: block;
     margin: auto;
   }
-
+  &.new {
+    .ox-card .form-group +
+    a:not(.footer).trouble {
+      display: block;
+      margin-top: 10px;
+    }
+  }
 }
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
@@ -27,6 +27,9 @@
       <div class="card-body">
         <%= fh.text_field name: :username_or_email,
             label: '.email_placeholder', autofocus: true %>
+        <a class="trouble" target="_blank" href="http://openstax.force.com/support/articles/How_To/Can-t-log-in-to-your-OpenStax-account">
+          <%= t '.having_trouble' %> <i class="fa fa-external-link" aria-hidden="true"></i>
+        </a>
       </div>
 
       <section class="footer">

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -275,6 +275,7 @@ en:
       cannot_find_user: Cannot find user
       unknown_username: We don’t recognize this username.  Please try again or use your email address instead.
       unknown_email: We don’t recognize this email.  Please try again.
+      having_trouble: Trouble logging in?
       multiple_users:
         # %{link}   a hyperlink that sends usernames to the email being used for log in.
         #           The label is defined by the .click_here key.