Introduced candidate voting and various tweaks

Merge branch 'develop'
2016-11-22 17:35:02 -06:00
parent 1d605b4bc2 f94de75f01
commit 439c0bf553
58 changed files with 1064 additions and 31 deletions
--- a/app/views/admin/auth/login.html.erb
+++ b/app/views/admin/auth/login.html.erb
@ -1,11 +1,11 @@
 <%
  content_for :main_class, "intro_tpl"
+  content_for :title, "Skills Assessment Admin"
 %>

 <h1>Admin Login</h1>

 <%= form_for :auth, url: admin_login_path do |form| %>
-
  <% if flash[:error].present? %>
    <div class="form-group">
      Need a <%= link_to "password reset", admin_reset_request_path %>?
--- a/app/views/admin/auth/reset.html.erb
+++ b/app/views/admin/auth/reset.html.erb
@ -1,5 +1,6 @@
 <%
  content_for :main_class, "intro_tpl"
+  content_for :title, "Skills Assessment Admin"
 %>

 <h1>Password Reset</h1>
--- a/app/views/admin/auth/reset_request.html.erb
+++ b/app/views/admin/auth/reset_request.html.erb
@ -1,5 +1,6 @@
 <%
  content_for :main_class, "intro_tpl"
+  content_for :title, "Skills Assessment Admin"
 %>

 <h1>Password Reset</h1>