Merge pull request #228 from projecttacoma/turn_registration_back_on

turn registration back on
MeasureAuthoringTool · Apr 3, 2014 · 09cd3a7 · 09cd3a7
2 parents 70ccbd6 + 54b4614
commit 09cd3a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -1,9 +1,6 @@
 <div class="login">
   <header>
     <h1>Bonnie</h1>
-    <br>
-    <div class="alert alert-warning" id="flash_alert"><h2>Coming Soon!</h2></div>
-
     <%= content_tag(:div, flash[:error], id: "flash_error", class: "alert alert-error") if flash[:error] %>
     <%= content_tag(:div, flash[:notice], id: "flash_notice", class: "alert alert-info") if flash[:notice] %>
     <%= content_tag(:div, flash[:alert], id: "flash_alert", class: "alert alert-warning") if flash[:alert] %>

diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
@@ -1,19 +1,19 @@
 <div class="links">
   <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
     <p>
-      <!-- %= link_to new_password_path(resource_name) do % --> <!--
+      <%= link_to new_password_path(resource_name) do %>
         <i class="fa fa-question-circle"></i>
-        forgot password? -->
-      <!-- % end % -->
+        forgot password?
+      <% end %>
     </p>
   <% end -%>
 
   <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
     <p>
-      <!-- %= link_to new_registration_path(resource_name) do %--><!--
+      <%= link_to new_registration_path(resource_name) do %>
         <i class="fa fa-plus-circle"></i>
-        register -->
-      <!--% end %-->
+        register
+      <% end %>
     </p>
   <% end -%>