![\"delete](\"/assets/delete_button.png\")
<%= yield %>
<% if signed_in? %>
- <%= render "layouts/right_side_bar"%>
-
- <%= render "problems/system_recommendation" if student_signed_in? %>
+ <%= render "layouts/right_side_bar" %>
+
<% else %>
-
+
-
<%= yield %>
<% end %>
- CoolSoft - Java Tutor
+
+
+
+ <%= link_to "Sign in", new_session_path(resource_name) %>
<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %>
<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
<% end -%> <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> <% end -%> diff --git a/tutor/app/views/lecturers/show.html.erb b/tutor/app/views/lecturers/show.html.erb new file mode 100644 index 00000000..456e3b28 --- /dev/null +++ b/tutor/app/views/lecturers/show.html.erb @@ -0,0 +1,62 @@ +
+ Previous Answers + -Delete
-
-<%= button_to "Delete", {controller: :hints, action: :destroy, id: hint1.id},
- :method => :delete, class: 'btn btn-primary btn-xs' %>
+
- <% @answers.each do |answer1| %>
-
-
-
<%= f.label :Title %> + <%= f.text_field :title %> +
<%= f.label :Answer %> +
<%= render partial: "tips/index" %> +
<%= render partial: "hints/index" %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/model_answers/index.html.erb b/tutor/app/views/model_answers/index.html.erb deleted file mode 100644 index 6a016e67..00000000 --- a/tutor/app/views/model_answers/index.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -
-
\ No newline at end of file
diff --git a/tutor/app/views/model_answers/new.html.erb b/tutor/app/views/model_answers/new.html.erb
new file mode 100644
index 00000000..8e287136
--- /dev/null
+++ b/tutor/app/views/model_answers/new.html.erb
@@ -0,0 +1,25 @@
+<%= form_for :model_answer, url: model_answers_path do |f| %>
+<% if @new_answer.errors.any? %>
+
<%= f.label :Title %> + <%= f.text_field :title %> +
<%= f.label :Answer %> + <%= f.text_area :answer, :cols => "50", :rows => "15" %> + +
+<%= f.submit "Save Model Answer", class: "btn btn-large btn-primary" %> + +<% end %> \ No newline at end of file diff --git a/tutor/app/views/posts/create.html.erb b/tutor/app/views/posts/create.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/tutor/app/views/posts/edit.html.erb b/tutor/app/views/posts/edit.html.erb new file mode 100644 index 00000000..2a22740a --- /dev/null +++ b/tutor/app/views/posts/edit.html.erb @@ -0,0 +1,41 @@ + + +
<% end %> \ No newline at end of file diff --git a/tutor/app/views/problems/_title.html.erb b/tutor/app/views/problems/_title.html.erb new file mode 100644 index 00000000..f21b5c39 --- /dev/null +++ b/tutor/app/views/problems/_title.html.erb @@ -0,0 +1,6 @@ +
- -<%= form_for :Problem, url: {action: "create"} do |p| %> -
@@ -66,7 +63,7 @@
- <%= render "layouts/footer"%>
-
+
+ <%= render "layouts/footer" %>
\ No newline at end of file
diff --git a/tutor/app/views/lecturers/confirmations/new.html.erb b/tutor/app/views/lecturers/confirmations/new.html.erb
index 896c821a..7dfa7419 100644
--- a/tutor/app/views/lecturers/confirmations/new.html.erb
+++ b/tutor/app/views/lecturers/confirmations/new.html.erb
@@ -1,12 +1,16 @@
-Resend confirmation instructions
+
+
\ No newline at end of file
diff --git a/tutor/app/views/lecturers/index.html.erb b/tutor/app/views/lecturers/index.html.erb
new file mode 100644
index 00000000..caa85295
--- /dev/null
+++ b/tutor/app/views/lecturers/index.html.erb
@@ -0,0 +1,9 @@
+
+
+
+ Resend confirmation instructions
-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Resend confirmation instructions" %>
-<% end %>
+ <%= f.submit "Resend confirmation instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "lecturers/shared/links" %>
+ <%= render "lecturers/shared/links" %>
+lecturers Index
+ + \ No newline at end of file diff --git a/tutor/app/views/lecturers/passwords/edit.html.erb b/tutor/app/views/lecturers/passwords/edit.html.erb index 3ab4deb8..586ba0fd 100644 --- a/tutor/app/views/lecturers/passwords/edit.html.erb +++ b/tutor/app/views/lecturers/passwords/edit.html.erb @@ -1,16 +1,23 @@ -Change your password
+
+
\ No newline at end of file
diff --git a/tutor/app/views/lecturers/passwords/new.html.erb b/tutor/app/views/lecturers/passwords/new.html.erb
index 16789b88..38aa8895 100644
--- a/tutor/app/views/lecturers/passwords/new.html.erb
+++ b/tutor/app/views/lecturers/passwords/new.html.erb
@@ -1,12 +1,16 @@
-Change your password
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :reset_password_token %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), + html: { method: :put, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> -<%= f.label :password, "New password" %>
- <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+ - <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+ <%= f.password_field :password, autofocus: true, autocomplete: "off", class:"form-control",
+ placeholder:"Password" %>
+
- <%= f.label :password_confirmation, "Confirm new password" %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ - <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control",
+ placeholder: "Confirm Password" %>
+
- <%= f.submit "Change my password" %>
-<% end %>
+ <%= f.submit "Change my password", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "lecturers/shared/links" %>
+ <%= render "lecturers/shared/links" %>
+Forgot your password?
+
+
\ No newline at end of file
diff --git a/tutor/app/views/lecturers/registrations/edit.html.erb b/tutor/app/views/lecturers/registrations/edit.html.erb
deleted file mode 100644
index 808d62c9..00000000
--- a/tutor/app/views/lecturers/registrations/edit.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-Forgot your password?
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Send me reset password instructions" %>
-<% end %>
+ <%= f.submit "Send me reset password instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "lecturers/shared/links" %>
+ <%= render "lecturers/shared/links" %>
+Edit <%= resource_name.to_s.humanize %>
- -<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
-
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
- - <%= f.email_field :email, autofocus: true %>
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
- <% end %>
-
- <%= f.label :password %> (leave blank if you don't want to change it)
- <%= f.password_field :password, autocomplete: "off" %>
-
- - <%= f.password_field :password, autocomplete: "off" %>
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
-
- - <%= f.password_field :password_confirmation, autocomplete: "off" %>
<%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password, autocomplete: "off" %>
-
- - <%= f.password_field :current_password, autocomplete: "off" %>
<%= f.submit "Update" %>
-<% end %>
-
-Cancel my account
- -Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>
- -<%= link_to "Back", :back %> diff --git a/tutor/app/views/lecturers/registrations/new.html.erb b/tutor/app/views/lecturers/registrations/new.html.erb index 80ada924..221650d5 100644 --- a/tutor/app/views/lecturers/registrations/new.html.erb +++ b/tutor/app/views/lecturers/registrations/new.html.erb @@ -1,21 +1,51 @@ -Sign up
+
+
\ No newline at end of file
diff --git a/tutor/app/views/lecturers/sessions/new.html.erb b/tutor/app/views/lecturers/sessions/new.html.erb
index 72eb9c8e..1d072f7c 100644
--- a/tutor/app/views/lecturers/sessions/new.html.erb
+++ b/tutor/app/views/lecturers/sessions/new.html.erb
@@ -1,17 +1,32 @@
-Sign up
+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name), + :html => { :multipart => true, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.email_field :email, class: "form-control", autofocus: true, placeholder: "Email" %>
+
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
- <%= devise_error_messages! %>
+
+ <%= f.text_field :name, class: "form-control", placeholder: "Name" %>
+
- <%= f.label :degree %>
- <%= f.text_field :degree%>
+ - <%= f.text_field :degree%>
+ <%= f.password_field :password, autocomplete: "off", class: "form-control",
+ placeholder:"Password" %>
+
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.password_field :password_confirmation, autocomplete: "off", class: "form-control",
+ placeholder: "Confirm Password" %>
+
- <%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+ - <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.label :gender %>
+ <%= f.select(:gender, [['Male', true], ['Female', false]]) %>
+
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ - <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ <%= f.label :date_of_birth %>
+ <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
- + <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
<%= f.submit "Sign up" %>
-<% end %>
+
+ <%= f.text_field :degree, class: "form-control", placeholder: "Degree" %>
+
-<%= render "lecturers/shared/links" %>
+
+ <%= f.text_field :university, class: "form-control", placeholder: "University" %>
+
+
+
+ <%= f.text_field :department, class: "form-control", placeholder: "Department" %>
+
+
+ <%= f.submit "Sign up", class: "btn btn-success button-devise" %>
+ <% end %>
+
+ <%= render "lecturers/shared/links" %>
+Sign in
+
+
+
+ <% end %> -
\ No newline at end of file
diff --git a/tutor/app/views/lecturers/shared/_links.erb b/tutor/app/views/lecturers/shared/_links.erb
index d84bdde9..898e3d09 100644
--- a/tutor/app/views/lecturers/shared/_links.erb
+++ b/tutor/app/views/lecturers/shared/_links.erb
@@ -1,25 +1,25 @@
<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %>Sign in
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name),
+ :html => { :class => 'form-devise' }) do |f| %>
+ <% if flash[:alert] or flash[:notice] %>
+ - <%= f.email_field :email, autofocus: true %>
+
+ <%= flash[:alert] if flash[:alert] %>
+ <%= flash[:notice] if flash[:notice] %>
+
+ + <% end %> -
<%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+ - <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <% if devise_mapping.rememberable? -%>
- <%= f.check_box :remember_me %> <%= f.label :remember_me %>
- <% end -%>
+
+ <%= f.password_field :password, autocomplete: "off",
+ class:"form-control", placeholder:"Password" %>
+
- <%= f.submit "Sign in" %>
-<% end %>
+ <% if devise_mapping.rememberable? -%>
+ <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+ <% end -%>
-<%= render "lecturers/shared/links" %>
+ <%= f.submit "Sign in", class: "btn btn-success button-devise" %>
+ <% end %>
+
+ <%= render "lecturers/shared/links" %>
++ <%= link_to "Sign in", new_session_path(resource_name) %>
<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %>
<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
<% end -%> <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> <% end -%> diff --git a/tutor/app/views/lecturers/show.html.erb b/tutor/app/views/lecturers/show.html.erb new file mode 100644 index 00000000..456e3b28 --- /dev/null +++ b/tutor/app/views/lecturers/show.html.erb @@ -0,0 +1,62 @@ +
+ <%= image_tag(@lecturer.profile_image_url.to_s) if @lecturer.profile_image? %> + <%= @lecturer.name %>'s Profile +
+
+
+
\ No newline at end of file
diff --git a/tutor/app/views/lecturers/unlocks/new.html.erb b/tutor/app/views/lecturers/unlocks/new.html.erb
index 308bb295..ccaedca7 100644
--- a/tutor/app/views/lecturers/unlocks/new.html.erb
+++ b/tutor/app/views/lecturers/unlocks/new.html.erb
@@ -1,12 +1,16 @@
-
+
+
+
+
+
+ | Name | +Code | +Options | ++ |
|---|---|---|---|
| + <%= link_to course.name, + :controller => 'courses', + :action => 'show', + :id => course.id, :method => :get, + class: "btn btn-success" %> + | +<%= course.code %> | + <% if current_lecturer %> ++ <%= link_to "Manage Course", + { + :controller => 'courses', + :action => 'edit', + :method => :get, + :id => course.id + }, + class: "btn btn-success", + style: "text-decoration:none" %> + | + <% end %> ++ <%= link_to "Discussion Board", + { + :controller => 'discussion_boards', + :action => 'show', + :id => course.id + }, + class: "btn btn-success", + method: :get, + style: "text-decoration:none" %> + | +
+
+ Name: <%= @lecturer.name %>
+Email: <%= @lecturer.email %>
+Resend unlock instructions
+
+
\ No newline at end of file
diff --git a/tutor/app/views/model_answers/_index.html.erb b/tutor/app/views/model_answers/_index.html.erb
index 82a37e01..4c6753d6 100644
--- a/tutor/app/views/model_answers/_index.html.erb
+++ b/tutor/app/views/model_answers/_index.html.erb
@@ -1,7 +1,54 @@
-
+
+
+
+Resend unlock instructions
-<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Resend unlock instructions" %>
-<% end %>
+ <%= f.submit "Resend unlock instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "lecturers/shared/links" %>
+ <%= render "lecturers/shared/links" %>
+- <%= link_to "Create New Model Answer",
+ {:controller => 'model_answers', :action => 'new',
+ :problem_id => @problem.id }, {class: 'btn btn-primary btn'} %>
+ Previous Answers + -
+ <% if !@answers.any? %>
+
+
+
+ <% end %>
+
\ No newline at end of file
diff --git a/tutor/app/views/model_answers/_new.html.erb b/tutor/app/views/model_answers/_new.html.erb
deleted file mode 100644
index c2f3721f..00000000
--- a/tutor/app/views/model_answers/_new.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<%= form_for :model_answer, url: model_answers_path do |f| %>
- You have no previous answers
+ <% end %> + <% if !@answers.empty? %> +| Title | +Created At | +Updated At | +View/Edit | +Remove | +||
|---|---|---|---|---|---|---|
| <%= answer1.title %> | +<%= answer1.created_at %> | +<%= answer1.updated_at %> | +<%= link_to "View/Edit", {:controller => 'model_answers', + :action => 'edit', :method => :get, :id => answer1.id}, + {class: 'btn btn-primary btn-xs', + style: "text-decoration:none"} %> | +Delete | +<%= button_to "Delete", {controller: :hints, action: :destroy, id: hint1.id}, + :method => :delete, class: 'btn btn-primary btn-xs' %> | +Delete | +
Previous Answers
-| <%= answer1.answer %> | -
-
Please Insert your model answer
- <%= f.text_area :answer %> - <%= f.hidden_field :problem_id, value: params[:id] %> - -- <%= f.submit %> -
-<% end %> \ No newline at end of file diff --git a/tutor/app/views/model_answers/edit.html.erb b/tutor/app/views/model_answers/edit.html.erb new file mode 100644 index 00000000..f4b123fa --- /dev/null +++ b/tutor/app/views/model_answers/edit.html.erb @@ -0,0 +1,26 @@ +<% provide(:title, "Edit Answer") %> +<%= form_for(@answer) do |f| %> + <% if @answer.errors.any? %> +
+
+ <% else %>
+ <%= f.hidden_field :problem_id, :value => @problem.id %>
+ <% end %>
+ <%= pluralize(@answer.errors.count, "error") %> prohibited this course from being saved:
+-
+ <% @answer.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
- <%= link_to "Back to edit problem page",
+ :controller => 'problems', :action => 'edit', :id => @answer.problem_id,
+ :method => :get, class: 'btn btn-default btn-xs' %>
<%= f.label :Title %> + <%= f.text_field :title %> +
<%= f.label :Answer %> +
<%= f.text_area :answer, :cols => "50", :rows => "15" %>
+ <%= f.submit "Save changes", class: "btn btn-large btn-primary" %> +<%= render partial: "tips/index" %> +
<%= render partial: "hints/index" %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/model_answers/index.html.erb b/tutor/app/views/model_answers/index.html.erb deleted file mode 100644 index 6a016e67..00000000 --- a/tutor/app/views/model_answers/index.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -
Previous Answers
- -| Title | -Text | -
|---|---|
| <%= answer1.answer %> | -<%= answer1.answer %> | -
+
+<% else %>
+<%= f.hidden_field :problem_id, :value => @problem.id %>
+<% end %>
+<%= pluralize(@new_answer.errors.count, "error") %> prohibited this course from being saved: +
+-
+ <% @new_answer.errors.full_messages.each do |msg| %>
+
- <%= msg %> + <% end %> +
+
Please Insert your model answer
+<%= f.label :Title %> + <%= f.text_field :title %> +
<%= f.label :Answer %> + <%= f.text_area :answer, :cols => "50", :rows => "15" %> + +
+<%= f.submit "Save Model Answer", class: "btn btn-large btn-primary" %> + +<% end %> \ No newline at end of file diff --git a/tutor/app/views/posts/create.html.erb b/tutor/app/views/posts/create.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/tutor/app/views/posts/edit.html.erb b/tutor/app/views/posts/edit.html.erb new file mode 100644 index 00000000..2a22740a --- /dev/null +++ b/tutor/app/views/posts/edit.html.erb @@ -0,0 +1,41 @@ + + +
+
+ <% if @post.errors.any? %> +
+ <%= form_for :post, url: {action: "update", :id => @post.id} do |f| %> +
\ No newline at end of file
diff --git a/tutor/app/views/posts/new.html.erb b/tutor/app/views/posts/new.html.erb
new file mode 100644
index 00000000..09ba1bd1
--- /dev/null
+++ b/tutor/app/views/posts/new.html.erb
@@ -0,0 +1,44 @@
+
+
+Edit Post
++ <% if @post.errors.any? %> +
+
+ + <%= pluralize(@post.errors.count, "error") %> + prohibited the Post from being edited: +
+-
+ <% @post.errors.full_messages.each do |msg| %>
+
- + <%= msg %> + + <% end %> +
+ <%= form_for :post, url: {action: "update", :id => @post.id} do |f| %> +
+ <%= f.label "Title" %>
+ <%= f.text_field :title, autofocus: true, class:"form-control", style: "width:300px", placeholder: "Title",:value => @post.title %>
+
+ <%= f.label :content %>
+ <%= f.text_area :content, class:"form-control", style: "margin-left:auto;
+ margin-right:auto;height:200px;width:500px;resize:none",
+ placeholder: "Enter your post",:value => @post.content %>
+
+ <%= f.submit "Update Post", class: "btn btn-success" %> +
+ <% end %> + <%= button_to "Delete Post", {:action => 'destroy', :id => params[:id]}, method: :delete, + class: 'btn btn-primary', :confirm => "Are you sure??" %> +
+
+ <% if @new_post.errors.any? %> +
+ <%= form_for :post, url: {action: "create"} do |f| %> +
\ No newline at end of file
diff --git a/tutor/app/views/posts/show.html.erb b/tutor/app/views/posts/show.html.erb
new file mode 100644
index 00000000..7f06d3b2
--- /dev/null
+++ b/tutor/app/views/posts/show.html.erb
@@ -0,0 +1,37 @@
+
+
+<%= link_to "back", {:action => 'show', :controller => 'discussion_boards',
+ :id => DiscussionBoard.find_by_id(@post.discussion_board_id).course_id}, {
+ class: 'btn btn-primary'} %>
+New Post
++ <% if @new_post.errors.any? %> +
+
+ + <%= pluralize(@new_post.errors.count, "error") %> + prohibited the Post from being saved: +
+-
+ <% @new_post.errors.full_messages.each do |msg| %>
+
- + <%= msg %> + + <% end %> +
+ <%= form_for :post, url: {action: "create"} do |f| %> +
+ <%= f.label "Title" %>
+ <%= f.text_field :title, autofocus: true, class:"form-control",
+ style: "width:300px", placeholder: "Title",:value => @new_post.title %>
+
+ <%= f.label :content %>
+ <%= f.text_area :content, class:"form-control",
+ style: "height:200px;width:500px",
+ placeholder: "Enter your post",
+ :value => @new_post.content %>
+ <%= f.hidden_field :discussion_board_id,
+ value: params[:discussion_board_id],
+ :value => @discussion_board.id %>
+
+ <%= f.submit "Save", class: "btn btn-success"%> +
+ <% end %> +
+ <% if current_lecturer %>
+ <% @userID = current_lecturer.id %>
+ <% end %>
+ <% if current_student %>
+ <% @userID = current_student.id %>
+ <% end %>
+ <%if current_teaching_assistant %>
+ <% @userID = current_teaching_assistant.id %>
+ <% end %>
+
\ No newline at end of file
diff --git a/tutor/app/views/problems/_description.html.erb b/tutor/app/views/problems/_description.html.erb
new file mode 100644
index 00000000..4a3ea5f4
--- /dev/null
+++ b/tutor/app/views/problems/_description.html.erb
@@ -0,0 +1,8 @@
+
+
+ <% unless @replies.blank? %> + <% @replies.each do |reply| %> +
+ <% end %> + <% else %> + No Replies in this post yet . + <% end %> +
+ <% if @post.owner_id == @userID %>
+ <%= link_to "Edit Post", {:action => 'edit', :controller => 'posts'}, {
+ class: 'btn btn-primary',:id => @post.id} %>
+ <% end %>
+<%=@post.title%>
+ <%= @post.content %> ++ <% unless @replies.blank? %> + <% @replies.each do |reply| %> +
+ <%= reply.content %>
+
+ +
+ <% end %> + <% else %> + No Replies in this post yet . + <% end %> +
<%= @problem.description %>
+<%= form_for :Problem, url: problem_path(@problem), method: :patch, remote: true do |problem| %> + <%= problem.text_area :description, :cols => "50", :rows => "10" %> ++ <%= problem.submit('update description') %> +
+ <%= problem.hidden_field :title, value: @problem.title %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/problems/_failure_options.html.erb b/tutor/app/views/problems/_failure_options.html.erb new file mode 100644 index 00000000..d935cf31 --- /dev/null +++ b/tutor/app/views/problems/_failure_options.html.erb @@ -0,0 +1 @@ +<%= button_to 'Save as Incomplete', track_path(:id => @problem.track_id), method: :get %> \ No newline at end of file diff --git a/tutor/app/views/problems/_flash.html.erb b/tutor/app/views/problems/_flash.html.erb new file mode 100644 index 00000000..ff4bdef0 --- /dev/null +++ b/tutor/app/views/problems/_flash.html.erb @@ -0,0 +1,3 @@ +<% if flash[:notice] %> +<%= flash[:notice] %>
+<% end %>
\ No newline at end of file
diff --git a/tutor/app/views/problems/_success_options.html.erb b/tutor/app/views/problems/_success_options.html.erb
new file mode 100644
index 00000000..fd835cf1
--- /dev/null
+++ b/tutor/app/views/problems/_success_options.html.erb
@@ -0,0 +1 @@
+<%= button_to 'Done', problem_done_path(:problem_id => @problem.id), method: :get %>
\ No newline at end of file
diff --git a/tutor/app/views/problems/_system_recommendation.html.erb b/tutor/app/views/problems/_system_recommendation.html.erb
index 4682f010..afedfb52 100644
--- a/tutor/app/views/problems/_system_recommendation.html.erb
+++ b/tutor/app/views/problems/_system_recommendation.html.erb
@@ -1,7 +1,7 @@
<%
suggestion = current_student.get_a_system_suggested_problem
if suggestion != nil then
- concat link_to "Recommended problem: " + suggestion.title, suggestion
+ concat link_to suggestion.title, suggestion
%><% end %> \ No newline at end of file diff --git a/tutor/app/views/problems/_title.html.erb b/tutor/app/views/problems/_title.html.erb new file mode 100644 index 00000000..f21b5c39 --- /dev/null +++ b/tutor/app/views/problems/_title.html.erb @@ -0,0 +1,6 @@ +
<%= @problem.title %>
+<%= form_for :Problem, url: problem_path(@problem), method: :patch, remote: true do |problem| %> + <%= problem.text_field :title %> + <%= problem.hidden_field :description, value: @problem.description %> + <%= problem.submit('update title') %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/problems/done.js.erb b/tutor/app/views/problems/done.js.erb new file mode 100644 index 00000000..7aacef6d --- /dev/null +++ b/tutor/app/views/problems/done.js.erb @@ -0,0 +1 @@ +$('#div1').html("<%= escape_javascript(render 'problems/flash') %>"); \ No newline at end of file diff --git a/tutor/app/views/problems/edit.html.erb b/tutor/app/views/problems/edit.html.erb index 61b4f592..6bf63c14 100644 --- a/tutor/app/views/problems/edit.html.erb +++ b/tutor/app/views/problems/edit.html.erb @@ -1,11 +1,40 @@ - -<%= @problem.title %>
-<%= @problem.description %>
+
+ <% if flash[:notice] %>
+
+
+<%= flash[:notice] %>
+ <% end %>
+
+
+
+<%= @problem.title %>
+ <%= form_for :Problem, url: problem_path(@problem), method: :patch, remote: true do |problem| %> + <%= problem.text_field :title %> + <%= problem.hidden_field :description, value: @problem.description %> + <%= problem.submit('update title') %> + <% end %> +
+
+
<%= render partial: "test_cases/index" %>
-<%= render partial: "model_answers/new" %>
+<%= render partial: "model_answers/index" %>
+<%= render partial: "problems/success_options" %>
<% if flash[:notice] %>
<%= @problem.description %>
+ <%= form_for :Problem, url: problem_path(@problem), method: :patch, remote: true do |problem| %> + <%= problem.text_area :description, :cols => "50", :rows => "10" %> ++ <%= problem.submit('update description') %> +
+ <%= problem.hidden_field :title, value: @problem.title %> + <% end %> +<%= flash[:notice] %>
-<% end %>
\ No newline at end of file
+<% end %>
+ <%= button_to "Delete Problem", {:action => 'destroy'}, method: :delete,
+ class: 'btn btn-primary', :id => params[:id],
+ :confirm => "Are you sure you want to delete this problem ??" %>
+
+<% if @problem.model_answers.empty? || @problem.test_cases.empty? %>
+ <%= render partial: "problems/failure_options" %>
+<% end %>
diff --git a/tutor/app/views/problems/new.html.erb b/tutor/app/views/problems/new.html.erb
index 3b0ca32b..db1d3764 100644
--- a/tutor/app/views/problems/new.html.erb
+++ b/tutor/app/views/problems/new.html.erb
@@ -1,21 +1,19 @@
Add a problem
- -<%= form_for :Problem, url: {action: "create"} do |p| %> -
- <%= p.label :title %>
- <%= p.text_field :title %>
-
- <%= p.label :description %>
- <%= p.text_area :description , :cols => "50", :rows => "10" %>
-
- <%= p.submit %> -
-<% end %> - + <%= form_for :Problem, url: {action: "create"} do |problem| %> +
+ <%= problem.label :title %>
+ <%= problem.text_field :title %>
+
+ <%= problem.label :description %>
+ <%= problem.text_area :description, :cols => "50", :rows => "10" %>
+
+ <%= problem.submit %> +
+ <% end %> <% if flash[:notice] %><%= flash[:notice] %>
<% end %>
\ No newline at end of file
diff --git a/tutor/app/views/problems/show.html.erb b/tutor/app/views/problems/show.html.erb
index 6e34072b..c74f86a8 100644
--- a/tutor/app/views/problems/show.html.erb
+++ b/tutor/app/views/problems/show.html.erb
@@ -17,8 +17,9 @@
<%= render partial: "solutions/new"%>
- Memory Contents:
-
+ Memory Contents: + +
Hints:
<%= render partial: "hints/give" %>
diff --git a/tutor/app/views/problems/update.js.erb b/tutor/app/views/problems/update.js.erb new file mode 100644 index 00000000..b5f2b5c2 --- /dev/null +++ b/tutor/app/views/problems/update.js.erb @@ -0,0 +1,3 @@ +$('#div1').html("<%= escape_javascript(render 'problems/flash') %>"); +$('#div2').html("<%= escape_javascript(render 'problems/title') %>"); +$('#div3').html("<%= escape_javascript(render 'problems/description') %>"); \ No newline at end of file diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 1428ee66..6549dc93 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -1,13 +1,10 @@ - -
-
+ Memory Contents: + +
Hints:
<%= render partial: "hints/give" %>
diff --git a/tutor/app/views/problems/update.js.erb b/tutor/app/views/problems/update.js.erb new file mode 100644 index 00000000..b5f2b5c2 --- /dev/null +++ b/tutor/app/views/problems/update.js.erb @@ -0,0 +1,3 @@ +$('#div1').html("<%= escape_javascript(render 'problems/flash') %>"); +$('#div2').html("<%= escape_javascript(render 'problems/title') %>"); +$('#div3').html("<%= escape_javascript(render 'problems/description') %>"); \ No newline at end of file diff --git a/tutor/app/views/solutions/_new.html.erb b/tutor/app/views/solutions/_new.html.erb index 1428ee66..6549dc93 100644 --- a/tutor/app/views/solutions/_new.html.erb +++ b/tutor/app/views/solutions/_new.html.erb @@ -1,13 +1,10 @@ - -
<%= flash[:success] %>
-<%= flash[:alert] %>
- +<%= flash[:alert] %>
Time spent: 0:00 - -<%= form_for :solution, url: {controller: 'solutions', action: 'create'}, - html: {method: 'post'} do |f| %> +<%= form_for :solution, + :url => { :controller => "solutions", :action => "create" }, + :html => {:method => :post} do |f| %>
@@ -51,9 +48,9 @@
Wrong Answer
Runtime Error
Compilation Error
- <%= f.submit "Submit", confirm: 'Are you sure you want to submit your solution?' %>
<%= f.submit "Compile" %>
<%= f.submit "Run Test Case" %>
+ <%= f.submit "Submit" %>
Output:
- <% if flash[:exp] %>
+ <% if flash[:exp] || flash[:exp_2] %>
<% else %>
@@ -92,9 +99,18 @@
Console:
+
+
+ <%= f.submit "Save Changes", class: "btn btn-default", onclick:"submitParams();" %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_edit_variable.html.erb b/tutor/app/views/solutions_constraints/_edit_variable.html.erb new file mode 100644 index 00000000..a9356ba1 --- /dev/null +++ b/tutor/app/views/solutions_constraints/_edit_variable.html.erb @@ -0,0 +1,14 @@ +<%= form_for :@variables do |f| %> +
+
+
+ <%= f.submit "Save Changes", class: "btn btn-default "%> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb new file mode 100644 index 00000000..68380f1d --- /dev/null +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -0,0 +1,63 @@ +<%= form_for :@constrain, url:{action:"create"} do |f| %> +
+
+
+ <%= button_tag "Save Changes", type: "button", + class: "btn btn-large btn-success", onclick:"submitParams();" %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb new file mode 100644 index 00000000..c732821c --- /dev/null +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -0,0 +1,11 @@ +
+<%= render 'form' %> \ No newline at end of file diff --git a/tutor/app/views/students/confirmations/new.html.erb b/tutor/app/views/students/confirmations/new.html.erb index 7d4c997d..24c61fbb 100644 --- a/tutor/app/views/students/confirmations/new.html.erb +++ b/tutor/app/views/students/confirmations/new.html.erb @@ -1,12 +1,16 @@ -CoolSoft - Java Tutor
+
+
+
+ <%= link_to "Sign in", new_session_path(resource_name) %>
<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %>
<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
<% end -%> <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> <% end -%> diff --git a/tutor/app/views/students/show.html.erb b/tutor/app/views/students/show.html.erb new file mode 100644 index 00000000..1edd8475 --- /dev/null +++ b/tutor/app/views/students/show.html.erb @@ -0,0 +1,74 @@ +
+ <% if flash[:notice] -%> +
+ + +
+
+
+<%= button_to "Back", {:controller => 'courses', :action => 'index'}, class: "btn btn-success", style: "float:right; margin-top:-50px", :method => :get %>
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/new.html.erb b/tutor/app/views/teaching_assistants/new.html.erb
new file mode 100644
index 00000000..6020f0f5
--- /dev/null
+++ b/tutor/app/views/teaching_assistants/new.html.erb
@@ -0,0 +1,37 @@
+
+<% if flash[:failure_notice] %> +
+ +<%= form_for :teaching_assistant, url: {action: "create"} do |f| %> + <% if @checkbox == true %> +
+ <%= link_to "Sign in", new_session_path(resource_name) %>
<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %>
<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
<% end -%> <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%> -<% end -%> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/show.html.erb b/tutor/app/views/teaching_assistants/show.html.erb new file mode 100644 index 00000000..ddeae09a --- /dev/null +++ b/tutor/app/views/teaching_assistants/show.html.erb @@ -0,0 +1,62 @@ +
@@ -74,6 +71,11 @@
<%= flash[:msg] %>
+ <% if flash[:msg_2] %> + <% flash[:msg_2].each do |message| %> +<%= message %>
+ <% end %> + <% end %>
@@ -81,6 +83,11 @@
<%= flash[:exp] %>
+ <% if flash[:exp_2] %> + <% flash[:exp_2].each do |message| %> +<%= message %>
+ <% end %> + <% end %>
-
-
<% end %>
\ No newline at end of file
diff --git a/tutor/app/views/solutions_constraints/_edit_method.html.erb b/tutor/app/views/solutions_constraints/_edit_method.html.erb
new file mode 100644
index 00000000..f3ea8d16
--- /dev/null
+++ b/tutor/app/views/solutions_constraints/_edit_method.html.erb
@@ -0,0 +1,32 @@
+<%= form_for :@constrain do |f| %>
+ <%= flash[:compiler_success] %>
-<%= flash[:compiler_fail] %>
-<%= flash[:compiler_feedback] %>
+<%= flash[:compiler_success] %>
+<%= flash[:compiler_fail] %>
+ <% if flash[:compiler_success_2] %> + <% flash[:compiler_success_2].each do |message| %> +<%= message %>
+ <% end %> + <% end %> + <% if flash[:compiler_fail_2] %> + <% flash[:compiler_fail_2].each do |message| %> +<%= message %>
+ <% end %> + <% end %> +<%= flash[:compiler_feedback] %>
| Method Constrains | ++ | <%= f.text_field :method_return, placeholder: "Return Type" %> | ++ | <%= f.text_field :method_name, placeholder: "Method Name" %> | +||
|---|---|---|---|---|---|---|
| Method Parameter | ++ | <%= u.text_field :params_type, placeholder: "Variable Type", id:"params_type" %> | ++ | <%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> | ++ | <%= image_tag "add_buttom.png", id:"params", + style: "width:15%;height:15%;margin_top:10px;cursor:pointer", + onclick: "add_params(this);" %> | + <% end %> +
+
+ Paramter
+No paramters
++ <%= f.submit "Save Changes", class: "btn btn-default", onclick:"submitParams();" %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_edit_variable.html.erb b/tutor/app/views/solutions_constraints/_edit_variable.html.erb new file mode 100644 index 00000000..a9356ba1 --- /dev/null +++ b/tutor/app/views/solutions_constraints/_edit_variable.html.erb @@ -0,0 +1,14 @@ +<%= form_for :@variables do |f| %> +
| Variable Constraints | ++ | <%= f.text_field :variable_type, placeholder: "Variable Type" %> | ++ | <%= f.text_field :variable_name, placeholder: "Variable Name" %> | ++ |
|---|
+ <%= f.submit "Save Changes", class: "btn btn-default "%> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/_form.html.erb b/tutor/app/views/solutions_constraints/_form.html.erb new file mode 100644 index 00000000..68380f1d --- /dev/null +++ b/tutor/app/views/solutions_constraints/_form.html.erb @@ -0,0 +1,63 @@ +<%= form_for :@constrain, url:{action:"create"} do |f| %> +
| Method Constrains | ++ | <%= f.text_field :method_return, placeholder: "Return Type" %> | ++ | <%= f.text_field :method_name, placeholder: "Method Name" %> | +||
|---|---|---|---|---|---|---|
| Method Parameter | ++ | <%= u.text_field :params_type, placeholder: "Variable Type", id:"params_type" %> | ++ | <%= u.text_field :parameter, placeholder: "Variable Name", id:"params_name" %> | ++ | <%= image_tag "add_buttom.png", + style: "width:15%;height:15%;margin_top:10px;cursor:pointer", + onclick: "add_params(this);" %> | + <% end %> +
+ Add Variable Constraints++ |
+ ||||||
| Variable Constraints | ++ | <%= u.text_field :variable_type, placeholder: "Variable Type", id:"variable_type" %> | ++ | <%= u.text_field :variable_name, placeholder: "Variable Name", id:"variable_name" %> | ++ | <%= image_tag "add_buttom.png", + style: "width:15%;height:15%;margin_top:10px;cursor:pointer", + onclick: "add_variable(this);" %> | + <% end %> +
+
+ Paramters Constraints
+No paramters
+
+
+ Variables Constraints
+No variables
++ <%= button_tag "Save Changes", type: "button", + class: "btn btn-large btn-success", onclick:"submitParams();" %> +<% end %> \ No newline at end of file diff --git a/tutor/app/views/solutions_constraints/new.html.erb b/tutor/app/views/solutions_constraints/new.html.erb new file mode 100644 index 00000000..c732821c --- /dev/null +++ b/tutor/app/views/solutions_constraints/new.html.erb @@ -0,0 +1,11 @@ +
+
+Add Method Constraints
++<%= render 'form' %> \ No newline at end of file diff --git a/tutor/app/views/students/confirmations/new.html.erb b/tutor/app/views/students/confirmations/new.html.erb index 7d4c997d..24c61fbb 100644 --- a/tutor/app/views/students/confirmations/new.html.erb +++ b/tutor/app/views/students/confirmations/new.html.erb @@ -1,12 +1,16 @@ -
Resend confirmation instructions
+
+
\ No newline at end of file
diff --git a/tutor/app/views/students/index.html.erb b/tutor/app/views/students/index.html.erb
new file mode 100644
index 00000000..41f1318b
--- /dev/null
+++ b/tutor/app/views/students/index.html.erb
@@ -0,0 +1,9 @@
+
+
+
+ Resend confirmation instructions
-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Resend confirmation instructions" %>
-<% end %>
+ <%= f.submit "Resend confirmation instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "students/shared/links" %>
\ No newline at end of file
+ <%= render "students/shared/links" %>
+students Index
+ + \ No newline at end of file diff --git a/tutor/app/views/students/passwords/edit.html.erb b/tutor/app/views/students/passwords/edit.html.erb index d302a497..e23e77b2 100644 --- a/tutor/app/views/students/passwords/edit.html.erb +++ b/tutor/app/views/students/passwords/edit.html.erb @@ -1,16 +1,23 @@ -Change your password
+
+
\ No newline at end of file
diff --git a/tutor/app/views/students/passwords/new.html.erb b/tutor/app/views/students/passwords/new.html.erb
index b17da591..a0c16b94 100644
--- a/tutor/app/views/students/passwords/new.html.erb
+++ b/tutor/app/views/students/passwords/new.html.erb
@@ -1,12 +1,16 @@
-Change your password
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :reset_password_token %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), + html: { method: :put, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> -<%= f.label :password, "New password" %>
- <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+ - <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+ <%= f.password_field :password, autofocus: true, autocomplete: "off",
+ class:"form-control", placeholder:"Password" %>
+
- <%= f.label :password_confirmation, "Confirm new password" %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ - <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off",
+ class:"form-control",placeholder: "Confirm Password" %>
+
- <%= f.submit "Change my password" %>
-<% end %>
+ <%= f.submit "Change my password", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "students/shared/links" %>
\ No newline at end of file
+ <%= render "students/shared/links" %>
+Forgot your password?
+
+
\ No newline at end of file
diff --git a/tutor/app/views/students/registrations/edit.html.erb b/tutor/app/views/students/registrations/edit.html.erb
deleted file mode 100644
index 808d62c9..00000000
--- a/tutor/app/views/students/registrations/edit.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-Forgot your password?
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Send me reset password instructions" %>
-<% end %>
+ <%= f.submit "Send me reset password instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "students/shared/links" %>
\ No newline at end of file
+ <%= render "students/shared/links" %>
+Edit <%= resource_name.to_s.humanize %>
- -<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
-
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
- - <%= f.email_field :email, autofocus: true %>
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
- <% end %>
-
- <%= f.label :password %> (leave blank if you don't want to change it)
- <%= f.password_field :password, autocomplete: "off" %>
-
- - <%= f.password_field :password, autocomplete: "off" %>
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
-
- - <%= f.password_field :password_confirmation, autocomplete: "off" %>
<%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password, autocomplete: "off" %>
-
- - <%= f.password_field :current_password, autocomplete: "off" %>
<%= f.submit "Update" %>
-<% end %>
-
-Cancel my account
- -Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>
- -<%= link_to "Back", :back %> diff --git a/tutor/app/views/students/registrations/new.html.erb b/tutor/app/views/students/registrations/new.html.erb index 1204ea98..1d0d9265 100644 --- a/tutor/app/views/students/registrations/new.html.erb +++ b/tutor/app/views/students/registrations/new.html.erb @@ -1,18 +1,55 @@ -Sign up
+
+
\ No newline at end of file
diff --git a/tutor/app/views/students/sessions/new.html.erb b/tutor/app/views/students/sessions/new.html.erb
index 9f99178a..a3e1f81a 100644
--- a/tutor/app/views/students/sessions/new.html.erb
+++ b/tutor/app/views/students/sessions/new.html.erb
@@ -1,17 +1,32 @@
-Sign up
+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name), + :html => { :multipart => true, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
- <%= devise_error_messages! %>
+
+ <%= f.text_field :name, class: "form-control", placeholder: "Name" %>
+
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.password_field :password, autocomplete: "off", class:"form-control",
+ placeholder:"Password" %>
+
- <%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+ - <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control",
+ placeholder: "Confirm Password" %>
+
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ - <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ <%= f.label :gender %>
+ <%= f.select(:gender, [['Male', true], ['Female', false]]) %>
+
- <%= f.submit "Sign up" %>
-<% end %>
+
+ <%= f.label :date_of_birth %>
+ <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
-<%= render "students/shared/links" %>
\ No newline at end of file
+ + <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
+ <%= f.text_field :university, class: "form-control", placeholder: "University" %>
+
+
+
+ <%= f.text_field :faculty, class: "form-control", placeholder: "Faculty" %>
+
+
+
+ <%= f.text_field :major, class: "form-control", placeholder: "Major" %>
+
+
+
+ <%= f.number_field :semester, class: "form-control", placeholder: "Semester" %>
+
+
+ <%= f.submit "Sign up", class: "btn btn-success button-devise" %>
+ <% end %>
+
+ <%= render "students/shared/links" %>
+Sign in
+
+
+
+ <% end %> -
\ No newline at end of file
diff --git a/tutor/app/views/students/shared/_links.erb b/tutor/app/views/students/shared/_links.erb
index d84bdde9..898e3d09 100644
--- a/tutor/app/views/students/shared/_links.erb
+++ b/tutor/app/views/students/shared/_links.erb
@@ -1,25 +1,25 @@
<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %>Sign in
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name),
+ :html => { :class => 'form-devise' }) do |f| %>
+ <% if flash[:alert] or flash[:notice] %>
+ - <%= f.email_field :email, autofocus: true %>
+
+ <%= flash[:alert] if flash[:alert] %>
+ <%= flash[:notice] if flash[:notice] %>
+
+ + <% end %> -
<%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+ - <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <% if devise_mapping.rememberable? -%>
- <%= f.check_box :remember_me %> <%= f.label :remember_me %>
- <% end -%>
+
+ <%= f.password_field :password, autocomplete: "off", class:"form-control",
+ placeholder:"Password" %>
+
- <%= f.submit "Sign in" %>
-<% end %>
+ <% if devise_mapping.rememberable? -%>
+ <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+ <% end -%>
-<%= render "students/shared/links" %>
\ No newline at end of file
+ <%= f.submit "Sign in", class: "btn btn-success button-devise" %>
+ <% end %>
+
+ <%= render "students/shared/links" %>
++ <%= link_to "Sign in", new_session_path(resource_name) %>
<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %>
<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
<% end -%> <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> <% end -%> diff --git a/tutor/app/views/students/show.html.erb b/tutor/app/views/students/show.html.erb new file mode 100644 index 00000000..1edd8475 --- /dev/null +++ b/tutor/app/views/students/show.html.erb @@ -0,0 +1,74 @@ +
+ <%= image_tag(@student.profile_image_url.to_s) if @student.profile_image? %> + <%= @student.name %>'s Profile +
+
+
diff --git a/tutor/app/views/students/unlocks/new.html.erb b/tutor/app/views/students/unlocks/new.html.erb
index 32583423..8c32f7de 100644
--- a/tutor/app/views/students/unlocks/new.html.erb
+++ b/tutor/app/views/students/unlocks/new.html.erb
@@ -1,12 +1,16 @@
--
+
- Course +
- Info +
- Performance +
+
+
+
+
+
+ | Name | +Code | +Options | ++ |
|---|---|---|---|
| + <%= link_to course.name, + :controller => 'courses', + :action => 'show', + :id => course.id, + :method => :get, + class: "btn btn-success" %> + | +<%= course.code %> | + <% if current_lecturer %> ++ <%= link_to "Manage Course", + { + :controller => 'courses', + :action => 'edit', + :method => :get, + :id => course.id + }, + class: "btn btn-success", + style: "text-decoration:none" %> + | + <% end %> ++ <%= link_to "Discussion Board", + { + :controller => 'discussion_boards', + :action => 'show', + :id => course.id + }, + class: "btn btn-success", + method: :get, + style: "text-decoration:none" %> + | +
+
+ Name: <%= @student.name %>
+Email: <%= @student.email %>
+
+ <%= link_to "Statistics",
+ {
+ :controller => 'students',
+ :action => 'get_performance',
+ :id => @student.id
+ },
+ :method => :get,
+ class: "btn btn-success" %>
+
+ Resend unlock instructions
+
+
\ No newline at end of file
diff --git a/tutor/app/views/system_reminders/reminder_email.html.erb b/tutor/app/views/system_reminders/reminder_email.html.erb
new file mode 100644
index 00000000..2d739ee5
--- /dev/null
+++ b/tutor/app/views/system_reminders/reminder_email.html.erb
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Resend unlock instructions
-<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Resend unlock instructions" %>
-<% end %>
+ <%= f.submit "Resend unlock instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "students/shared/links" %>
\ No newline at end of file
+ <%= render "students/shared/links" %>
+We miss you at our Tutors website, <%= @user.name %>
+
+ Your beloved Tutors website has missed you !
+
+ To login to the site, just follow this link: <%= @url %>. +
++ <%= suggestion = @user.get_a_system_suggested_problem + if suggestion != nil then + link_to "And if you are still up to it can you solve this problem ? ;) ", suggestion + end %> +
+Hoping to see you soon and have a great day!
+ + diff --git a/tutor/app/views/teaching_assistants/confirmations/new.html.erb b/tutor/app/views/teaching_assistants/confirmations/new.html.erb index f6b80b4d..34205f98 100644 --- a/tutor/app/views/teaching_assistants/confirmations/new.html.erb +++ b/tutor/app/views/teaching_assistants/confirmations/new.html.erb @@ -1,12 +1,16 @@ -Resend confirmation instructions
+
+
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/index.html.erb b/tutor/app/views/teaching_assistants/index.html.erb
new file mode 100644
index 00000000..85e51404
--- /dev/null
+++ b/tutor/app/views/teaching_assistants/index.html.erb
@@ -0,0 +1,27 @@
+Resend confirmation instructions
-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Resend confirmation instructions" %>
-<% end %>
+ <%= f.submit "Resend confirmation instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "teaching_assistants/shared/links" %>
\ No newline at end of file
+ <%= render "teaching_assistants/shared/links" %>
+The Course's Teaching Assistants
+ ++ <% if flash[:notice] -%> +
<%= flash[:notice] %>
+ <% end %>
++ + +
| Name | +|
|---|---|
| <%= teaching_assistant.name %> | +<%= teaching_assistant.email %> | +
Add a Teaching Assistant
+ ++<% if flash[:failure_notice] %> +
<%= flash[:failure_notice] %>
+<% end %>
+<% if flash[:success_notice] %>
+ <%= flash[:success_notice] %>
+<% end %>
++ +<%= form_for :teaching_assistant, url: {action: "create"} do |f| %> + <% if @checkbox == true %> +
+ <%= select("teaching_assistant", "id", TeachingAssistant.find(:all).collect{|p| [p.name ,p.id ] }, {:prompt => 'Select'}) %> +
+ <% else %> ++ <%= select("teaching_assistant", "id", current_lecturer.worked_with.find(:all).collect{|p| [p.name ,p.id ] }, {:prompt => 'Select'}) %> +
+ <% end %> ++ <%= f.submit "Add TA", class: "btn btn-success"%> +
+<% end %> + +
+ <% if @checkbox == true %>
+ <% str = "Show only TAs I worked with" %>
+ <% else %>
+ <% str = "Show All TAs" , @checkbox = nil%>
+ <% end %>
+
+
+<%= button_to "Back", {:controller => 'courses', :action =>'index'}, class: "btn btn-success", style: "float:right; margin-top:-50px", :method => :get %>
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/passwords/edit.html.erb b/tutor/app/views/teaching_assistants/passwords/edit.html.erb
index 3477cbc0..73518ace 100644
--- a/tutor/app/views/teaching_assistants/passwords/edit.html.erb
+++ b/tutor/app/views/teaching_assistants/passwords/edit.html.erb
@@ -1,16 +1,23 @@
- <%= button_to str, {:controller => 'teaching_assistants', :action => 'new', check: @checkbox}, class: "btn btn-success" , style: "float: left; margin-left: 15px" %>
+
+Change your password
+
+
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/passwords/new.html.erb b/tutor/app/views/teaching_assistants/passwords/new.html.erb
index db32ee64..27cf7904 100644
--- a/tutor/app/views/teaching_assistants/passwords/new.html.erb
+++ b/tutor/app/views/teaching_assistants/passwords/new.html.erb
@@ -1,12 +1,16 @@
-Change your password
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - <%= f.hidden_field :reset_password_token %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), + html: { method: :put, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> -<%= f.label :password, "New password" %>
- <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+ - <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
+ <%= f.password_field :password, autofocus: true, autocomplete: "off",
+ class:"form-control", placeholder:"Password" %>
+
- <%= f.label :password_confirmation, "Confirm new password" %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ - <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off",
+ class:"form-control",placeholder: "Confirm Password" %>
+
- <%= f.submit "Change my password" %>
-<% end %>
+ <%= f.submit "Change my password", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "teaching_assistants/shared/links" %>
\ No newline at end of file
+ <%= render "teaching_assistants/shared/links" %>
+Forgot your password?
+
+
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/registrations/edit.html.erb b/tutor/app/views/teaching_assistants/registrations/edit.html.erb
deleted file mode 100644
index 808d62c9..00000000
--- a/tutor/app/views/teaching_assistants/registrations/edit.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-Forgot your password?
-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: password_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Send me reset password instructions" %>
-<% end %>
+ <%= f.submit "Send me reset password instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "teaching_assistants/shared/links" %>
\ No newline at end of file
+ <%= render "teaching_assistants/shared/links" %>
+Edit <%= resource_name.to_s.humanize %>
- -<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> - <%= devise_error_messages! %> - -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
-
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
- - <%= f.email_field :email, autofocus: true %>
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
- <% end %>
-
- <%= f.label :password %> (leave blank if you don't want to change it)
- <%= f.password_field :password, autocomplete: "off" %>
-
- - <%= f.password_field :password, autocomplete: "off" %>
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
-
- - <%= f.password_field :password_confirmation, autocomplete: "off" %>
<%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password, autocomplete: "off" %>
-
- - <%= f.password_field :current_password, autocomplete: "off" %>
<%= f.submit "Update" %>
-<% end %>
-
-Cancel my account
- -Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>
- -<%= link_to "Back", :back %> diff --git a/tutor/app/views/teaching_assistants/registrations/new.html.erb b/tutor/app/views/teaching_assistants/registrations/new.html.erb index 305592e1..4043f1d0 100644 --- a/tutor/app/views/teaching_assistants/registrations/new.html.erb +++ b/tutor/app/views/teaching_assistants/registrations/new.html.erb @@ -1,18 +1,59 @@ -Sign up
+
+
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/sessions/new.html.erb b/tutor/app/views/teaching_assistants/sessions/new.html.erb
index de1d04f4..863ed21b 100644
--- a/tutor/app/views/teaching_assistants/sessions/new.html.erb
+++ b/tutor/app/views/teaching_assistants/sessions/new.html.erb
@@ -1,17 +1,32 @@
-Sign up
+ <%= form_for(resource, as: resource_name, url: registration_path(resource_name), + :html => { :multipart => true, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
- <%= devise_error_messages! %>
+
+ <%= f.text_field :name, class: "form-control", placeholder: "Name" %>
+
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.password_field :password, autocomplete: "off", class:"form-control",
+ placeholder:"Password" %>
+
- <%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+ - <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off", class:"form-control",
+ placeholder: "Confirm Password" %>
+
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ - <%= f.password_field :password_confirmation, autocomplete: "off" %>
+ <%= f.label :gender %>
+ <%= f.select(:gender, [['Male', true], ['Female', false]]) %>
+
- <%= f.submit "Sign up" %>
-<% end %>
+
+ <%= f.label :date_of_birth %>
+ <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
-<%= render "teaching_assistants/shared/links" %>
\ No newline at end of file
+ + <%= f.date_select :dob, {:start_year => Date.today.year-90, :end_year => Date.today.year} %> +
+ <%= f.text_field :graduated_from, class: "form-control", placeholder: "Graduated From" %>
+
+
+
+ <%= f.number_field :graduated_year, class: "form-control", placeholder: "Graduation Year" %>
+
+
+
+ <%= f.text_field :degree, class: "form-control", placeholder: "Degree" %>
+
+
+
+ <%= f.text_field :university, class: "form-control", placeholder: "University" %>
+
+
+
+ <%= f.text_field :department, class: "form-control", placeholder: "Department" %>
+
+
+ <%= f.submit "Sign up", class: "btn btn-success button-devise" %>
+ <% end %>
+
+ <%= render "teaching_assistants/shared/links" %>
+Sign in
+
+
+
+ <% end %> -
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/shared/_links.erb b/tutor/app/views/teaching_assistants/shared/_links.erb
index d84bdde9..32444100 100644
--- a/tutor/app/views/teaching_assistants/shared/_links.erb
+++ b/tutor/app/views/teaching_assistants/shared/_links.erb
@@ -1,25 +1,25 @@
<%- if controller_name != 'sessions' %>
- <%= link_to "Sign in", new_session_path(resource_name) %>Sign in
-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name),
+ :html => { :class => 'form-devise' }) do |f| %>
+ <% if flash[:alert] or flash[:notice] %>
+ - <%= f.email_field :email, autofocus: true %>
+
+ <%= flash[:alert] if flash[:alert] %>
+ <%= flash[:notice] if flash[:notice] %>
+
+ + <% end %> -
<%= f.label :password %>
- <%= f.password_field :password, autocomplete: "off" %>
+ - <%= f.password_field :password, autocomplete: "off" %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <% if devise_mapping.rememberable? -%>
- <%= f.check_box :remember_me %> <%= f.label :remember_me %>
- <% end -%>
+
+ <%= f.password_field :password, autocomplete: "off", class:"form-control",
+ placeholder:"Password" %>
+
- <%= f.submit "Sign in" %>
-<% end %>
+ <% if devise_mapping.rememberable? -%>
+ <%= f.check_box :remember_me %> <%= f.label :remember_me %>
+ <% end -%>
-<%= render "teaching_assistants/shared/links" %>
\ No newline at end of file
+ <%= f.submit "Sign in", class: "btn btn-success button-devise" %>
+ <% end %>
+
+ <%= render "teaching_assistants/shared/links" %>
++ <%= link_to "Sign in", new_session_path(resource_name) %>
<% end -%> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_registration_path(resource_name) %>
+ <%= link_to "Sign up", new_registration_path(resource_name) %>
<% end -%> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+ <%= link_to "Forgot your password?", new_password_path(resource_name) %>
<% end -%> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
<% end -%> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
<% end -%> <%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
- <% end -%> -<% end -%> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> \ No newline at end of file diff --git a/tutor/app/views/teaching_assistants/show.html.erb b/tutor/app/views/teaching_assistants/show.html.erb new file mode 100644 index 00000000..ddeae09a --- /dev/null +++ b/tutor/app/views/teaching_assistants/show.html.erb @@ -0,0 +1,62 @@ +
+ <%= image_tag(@teaching_assistant.profile_image_url.to_s) + if @teaching_assistant.profile_image? %> <%= @teaching_assistant.name %>'s Profile +
+
+
+
\ No newline at end of file
diff --git a/tutor/app/views/teaching_assistants/unlocks/new.html.erb b/tutor/app/views/teaching_assistants/unlocks/new.html.erb
index fcb5ac32..7f373f09 100644
--- a/tutor/app/views/teaching_assistants/unlocks/new.html.erb
+++ b/tutor/app/views/teaching_assistants/unlocks/new.html.erb
@@ -1,12 +1,16 @@
-
+
+
+
+
+
+ | Name | +Code | +Options | ++ |
|---|---|---|---|
| + <%= link_to course.name, + :controller => 'courses', + :action => 'show', :id => course.id, + :method => :get, + class: "btn btn-success" %> + | +<%= course.code %> | + <% if current_lecturer %> ++ <%= link_to "Manage Course", + { + :controller => 'courses', + :action => 'edit', + :method => :get, + :id => course.id + }, + class: "btn btn-success", + style: "text-decoration:none" %> + | + <% end %> ++ <%= link_to "Discussion Board", + { + :controller => 'discussion_boards', + :action => 'show', + :id => course.id + }, + class: "btn btn-success", + method: :get, + style: "text-decoration:none" %> + | +
+
+ Name: <%= @teaching_assistant.name %>
+Email: <%= @teaching_assistant.email %>
+Resend unlock instructions
+
+
\ No newline at end of file
diff --git a/tutor/app/views/tips/_index.html.erb b/tutor/app/views/tips/_index.html.erb
new file mode 100644
index 00000000..aa92785f
--- /dev/null
+++ b/tutor/app/views/tips/_index.html.erb
@@ -0,0 +1 @@
+Resend unlock instructions
-<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), + html: { method: :post, :class => 'form-devise' }) do |f| %> + <%= devise_error_messages! %> -<%= f.label :email %>
- <%= f.email_field :email, autofocus: true %>
+ - <%= f.email_field :email, autofocus: true %>
+ <%= f.email_field :email, autofocus: true, class: "form-control", placeholder: "Email" %>
+
- <%= f.submit "Resend unlock instructions" %>
-<% end %>
+ <%= f.submit "Resend unlock instructions", class: "btn btn-success button-devise" %>
+ <% end %>
-<%= render "teaching_assistants/shared/links" %>
\ No newline at end of file
+ <%= render "teaching_assistants/shared/links" %>
+Previous tips
\ No newline at end of file diff --git a/tutor/app/views/topics/new.html.erb b/tutor/app/views/topics/new.html.erb index ad67820c..1ba306b9 100644 --- a/tutor/app/views/topics/new.html.erb +++ b/tutor/app/views/topics/new.html.erb @@ -2,23 +2,30 @@ Author: Ahmed Akram --> -
+
- <% if flash[:notice] -%> -
+ <%= form_for :topic, url: {action: "create"} do |f| %>
New Topic
-- <% if flash[:notice] -%> -
<%= flash[:notice] %>
- <% end %>
- + <%= form_for :topic, url: {action: "create"} do |f| %>
<%= f.label "Title" %>
+ <% unless @new_topic.errors[:title].blank? %>
+
+ Name <%= @new_topic.errors[:title].join(", ") %>
+
+
+ <% end %>
<%= f.text_field :title, autofocus: true, class:"form-control", style: "width:300px", placeholder: "Title", :value => @new_topic.title %>
<%= f.label :description %>
- <%= f.text_area :description, class:"form-control", style: "margin-left:auto;
- margin-right:auto;height:200px;width:500px;resize:none", placeholder: "Description", :value => @new_topic.description %>
+ <% unless @new_topic.errors[:description].blank? %>
+
+ Description <%= @new_topic.errors[:description].join(", ") %>
+
+
+ <% end %>
+ <%= f.text_area :description, class:"form-control", style: "height:200px;width:500px;resize:none", placeholder: "Description", :value => @new_topic.description %>
<%= f.submit "Save", class: "btn btn-success"%> diff --git a/tutor/app/views/tracks/show.html.erb b/tutor/app/views/tracks/show.html.erb index 68a11dbf..1ac3eb72 100644 --- a/tutor/app/views/tracks/show.html.erb +++ b/tutor/app/views/tracks/show.html.erb @@ -14,34 +14,82 @@ <% end %>
- <% @problems.each do |p| %>
- <% if @problems_status %>
- <% if @problems_status[:success].include?(p) %>
- <% color = "label label-success" %>
- <% elsif @problems_status[:failure].include?(p) %>
- <% color = "label label-warning" %>
- <% else %>
- <% color = "label label-default" %>
+ <% @problems.each do |problem| %>
+ <% if problem.incomplete? %>
+ <% if @can_edit %>
+ <% if @problems_status %>
+ <% if @problems_status[:success].include?(problem) %>
+ <% color = "label label-success" %>
+ <% elsif @problems_status[:failure].include?(problem) %>
+ <% color = "label label-warning" %>
+ <% else %>
+ <% color = "label label-default" %>
+ <% end %>
+ <% end %>
+ - " + item[this.propertyToSearch]+ "
" },
+ tokenFormatter: function(item) { return "
+
<% end %>
- <% end %>
-
+
+ <%= link_to problem.title, problem , style: 'color:#003366;' ,
+ class: color %>
+
+ <% if student_signed_in? %>
+
+
+ Recommend to classmates
+ <% end %>
+
+
+ <%= problem.description %>
+ <% if @can_edit %>
+
+ <% end %>
+
+
-
-
<% if @can_edit %>
- <%= link_to "New" , '/problems/new', class: "label label-default" %>
+
<% end %>
diff --git a/tutor/app/views/utilities/_advanced_search.html.erb b/tutor/app/views/utilities/_advanced_search.html.erb
new file mode 100644
index 00000000..a9cb358a
--- /dev/null
+++ b/tutor/app/views/utilities/_advanced_search.html.erb
@@ -0,0 +1,61 @@
+<%= form_tag utilities_advanced_search_path, method: 'get', remote: true,
+ class: "form-horizontal" do %>
+
+<% end %>
\ No newline at end of file
diff --git a/tutor/app/views/utilities/_no_result.html.erb b/tutor/app/views/utilities/_no_result.html.erb
new file mode 100644
index 00000000..eabbfaa3
--- /dev/null
+++ b/tutor/app/views/utilities/_no_result.html.erb
@@ -0,0 +1,3 @@
+
-
- <%= link_to p.title , p , style: 'color:#003366;' ,
+ <% else %>
+ <% if @problems_status %>
+ <% if @problems_status[:success].include?(problem) %>
+ <% color = "label label-success" %>
+ <% elsif @problems_status[:failure].include?(problem) %>
+ <% color = "label label-warning" %>
+ <% else %>
+ <% color = "label label-default" %>
+ <% end %>
+ <% end %>
+
+ <% end %>
<% end %>
+
+
-
+
+ <%= link_to problem.title, problem , style: 'color:#003366;' ,
class: color %>
-
-
+
+ <% if student_signed_in? %>
+
+
+ Recommend to classmates
+ <% end %>
+
+
+ <%= problem.description %>
+ <% if @can_edit %>
+
+ <% end %>
+
- <%= p.description %>
-
-
+
+
+
+
\ No newline at end of file
diff --git a/tutor/app/views/utilities/_result_form.html.erb b/tutor/app/views/utilities/_result_form.html.erb
new file mode 100644
index 00000000..ad8905be
--- /dev/null
+++ b/tutor/app/views/utilities/_result_form.html.erb
@@ -0,0 +1,26 @@
+<% if objects.present? %>
+ No Results match
+
+
+
+<%end%>
\ No newline at end of file
diff --git a/tutor/app/views/utilities/_simple_search.html.erb b/tutor/app/views/utilities/_simple_search.html.erb
new file mode 100644
index 00000000..884b981a
--- /dev/null
+++ b/tutor/app/views/utilities/_simple_search.html.erb
@@ -0,0 +1,33 @@
+
+
+ -
+ <% objects.each do |object| %>
+
- + <%= link_to object.name, class: 'color' %> + + <% end %> +
+
\ No newline at end of file
diff --git a/tutor/app/views/utilities/advanced_search.html.erb b/tutor/app/views/utilities/advanced_search.html.erb
new file mode 100644
index 00000000..2d6af627
--- /dev/null
+++ b/tutor/app/views/utilities/advanced_search.html.erb
@@ -0,0 +1,6 @@
+
+
+
+
+ <% unless @lecturers.present? or @teaching_assisstants.present?\
+ or @courses.present? or @students.present? %>
+
+
+
+ <% else %>
+ <% if @lecturers.present? %>
+ No Result match
+
+ <%= render "result_form", objects: @lecturers %>
+
+ <% end %>
+ <% if @students.present? %>
+
+ <%= render "result_form", objects: @students %>
+
+ <% end %>
+ <% if @teaching_assisstants.present? %>
+
+ <%= render "result_form", objects: @teaching_assisstants %>
+
+ <% end %>
+ <% if @courses.present? %>
+
+ <%= render "result_form", objects: @courses %>
+
+ <% end %>
+ <% end %>
+
+ <%= render "advanced_search" %>
+
+
+
\ No newline at end of file
diff --git a/tutor/app/views/utilities/advanced_search.js.erb b/tutor/app/views/utilities/advanced_search.js.erb
new file mode 100644
index 00000000..c06b65d8
--- /dev/null
+++ b/tutor/app/views/utilities/advanced_search.js.erb
@@ -0,0 +1,9 @@
+$("#advanced_search_result").html("<%=escape_javascript(render 'result_form', objects: @lecturers)%>");
+$("#advanced_search_result").append("<%=escape_javascript(render 'result_form', objects: @teaching_assistants)%>");
+$("#advanced_search_result").append("<%=escape_javascript(render 'result_form', objects: @students)%>");
+$("#advanced_search_result").append("<%=escape_javascript(render 'result_form', objects: @courses)%>");
+$("#advanced_search_result").append("<%=escape_javascript(render 'result_form', objects: @topics)%>");
+$("#advanced_search_result").append("<%=escape_javascript(render 'result_form', objects: @posts)%>");
+if($("#advanced_search_result").children().length == 0){
+ $("#advanced_search_result").html("<%=escape_javascript(render 'no_result')%>");
+}
\ No newline at end of file
diff --git a/tutor/app/views/utilities/auto_complete.json_builder b/tutor/app/views/utilities/auto_complete.json_builder
new file mode 100644
index 00000000..ff619bcb
--- /dev/null
+++ b/tutor/app/views/utilities/auto_complete.json_builder
@@ -0,0 +1,4 @@
+array @objects.each do |object|
+ id object
+ name object.name
+end
\ No newline at end of file
diff --git a/tutor/app/views/utilities/simple_search.html.erb b/tutor/app/views/utilities/simple_search.html.erb
new file mode 100644
index 00000000..d5b51d60
--- /dev/null
+++ b/tutor/app/views/utilities/simple_search.html.erb
@@ -0,0 +1,6 @@
+
+
\ No newline at end of file
diff --git a/tutor/app/views/utilities/simple_search.js.erb b/tutor/app/views/utilities/simple_search.js.erb
new file mode 100644
index 00000000..68b5feb7
--- /dev/null
+++ b/tutor/app/views/utilities/simple_search.js.erb
@@ -0,0 +1,2 @@
+$("#result_body").remove();
+$("#search_result").append("<%=escape_javascript(render partial: 'simple_search')%>");
\ No newline at end of file
diff --git a/tutor/config/deploy.rb b/tutor/config/deploy.rb
new file mode 100644
index 00000000..2cd84af5
--- /dev/null
+++ b/tutor/config/deploy.rb
@@ -0,0 +1,8 @@
+after "deploy:symlink", "deploy:update_crontab"
+
+namespace :deploy do
+ desc "Update the crontab file"
+ task :update_crontab, :roles => :db do
+ run "cd #{release_path} && whenever --update-crontab #{application}"
+ end
+end
\ No newline at end of file
diff --git a/tutor/config/environments/development.rb b/tutor/config/environments/development.rb
index 88d4c8c3..6a2c1a10 100644
--- a/tutor/config/environments/development.rb
+++ b/tutor/config/environments/development.rb
@@ -1,32 +1,43 @@
Tutor::Application.configure do
- # Settings specified here will take precedence over those in config/application.rb.
- # In the development environment your application's code is reloaded on
- # every request. This slows down response time but is perfect for development
- # since you don't have to restart the web server when you make code changes.
- config.cache_classes = false
-
- # Do not eager load code on boot.
- config.eager_load = false
-
- # Show full error reports and disable caching.
- config.consider_all_requests_local = true
- config.action_controller.perform_caching = false
-
- # Don't care if the mailer can't send.
- config.action_mailer.raise_delivery_errors = false
-
- # Print deprecation notices to the Rails logger.
- config.active_support.deprecation = :log
-
- # Raise an error on page load if there are pending migrations
- config.active_record.migration_error = :page_load
-
- # Debug mode disables concatenation and preprocessing of assets.
- # This option may cause significant delays in view rendering with a large
- # number of complex assets.
- config.assets.debug = true
-
- # Configuring Devise mailer in Development environment
- config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
-end
+ # Settings specified here will take precedence over those in config/application.rb.
+
+ # In the development environment your application's code is reloaded on
+ # every request. This slows down response time but is perfect for development
+ # since you don't have to restart the web server when you make code changes.
+ config.cache_classes = false
+
+ # Do not eager load code on boot.
+ config.eager_load = false
+
+ # Show full error reports and disable caching.
+ config.consider_all_requests_local = true
+ config.action_controller.perform_caching = false
+
+ # Print deprecation notices to the Rails logger.
+ config.active_support.deprecation = :log
+
+ # Raise an error on page load if there are pending migrations
+ config.active_record.migration_error = :page_load
+
+ # Debug mode disables concatenation and preprocessing of assets.
+ # This option may cause significant delays in view rendering with a large
+ # number of complex assets.
+ config.assets.debug = true
+
+ # Configuring mailing options in Development environment
+ config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+ config.action_mailer.delivery_method = :smtp
+ config.action_mailer.perform_deliveries = true
+ config.action_mailer.raise_delivery_errors = true
+ config.action_mailer.smtp_settings = {
+ :address => "smtp.gmail.com",
+ :port => 587,
+ :domain => "gmail.com",
+ :user_name => "CoolSoft14@gmail.com",
+ :password => "coolsoftwillrockandwin",
+ :authentication => 'plain',
+ :enable_starttls_auto => true
+ }
+
+end
\ No newline at end of file
diff --git a/tutor/config/initializers/devise.rb b/tutor/config/initializers/devise.rb
index b34152e6..9516ac53 100644
--- a/tutor/config/initializers/devise.rb
+++ b/tutor/config/initializers/devise.rb
@@ -1,256 +1,258 @@
# Use this hook to configure devise mailer, warden hooks and so forth.
# Many of these configuration options can be set straight in your model.
Devise.setup do |config|
- # The secret key used by Devise. Devise uses this key to generate
- # random tokens. Changing this key will render invalid all existing
- # confirmation, reset password and unlock tokens in the database.
- # config.secret_key = '3b6812af72cd3ef10caa3ae11bc1b87ed9a110496e837db6ecb8fdca49c6310d575cface3b96cf11c4b6b69ac7d5689b7edab11de0d631af50ad924a5875317d'
-
- # ==> Mailer Configuration
- # Configure the e-mail address which will be shown in Devise::Mailer,
- # note that it will be overwritten if you use your own mailer class
- # with default "from" parameter.
- config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
-
- # Configure the class responsible to send e-mails.
- # config.mailer = 'Devise::Mailer'
-
- # ==> ORM configuration
- # Load and configure the ORM. Supports :active_record (default) and
- # :mongoid (bson_ext recommended) by default. Other ORMs may be
- # available as additional gems.
- require 'devise/orm/active_record'
-
- # ==> Configuration for any authentication mechanism
- # Configure which keys are used when authenticating a user. The default is
- # just :email. You can configure it to use [:username, :subdomain], so for
- # authenticating a user, both parameters are required. Remember that those
- # parameters are used only when authenticating and not when retrieving from
- # session. If you need permissions, you should implement that in a before filter.
- # You can also supply a hash where the value is a boolean determining whether
- # or not authentication should be aborted when the value is not present.
- # config.authentication_keys = [ :email ]
-
- # Configure parameters from the request object used for authentication. Each entry
- # given should be a request method and it will automatically be passed to the
- # find_for_authentication method and considered in your model lookup. For instance,
- # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
- # The same considerations mentioned for authentication_keys also apply to request_keys.
- # config.request_keys = []
-
- # Configure which authentication keys should be case-insensitive.
- # These keys will be downcased upon creating or modifying a user and when used
- # to authenticate or find a user. Default is :email.
- config.case_insensitive_keys = [ :email ]
-
- # Configure which authentication keys should have whitespace stripped.
- # These keys will have whitespace before and after removed upon creating or
- # modifying a user and when used to authenticate or find a user. Default is :email.
- config.strip_whitespace_keys = [ :email ]
-
- # Tell if authentication through request.params is enabled. True by default.
- # It can be set to an array that will enable params authentication only for the
- # given strategies, for example, `config.params_authenticatable = [:database]` will
- # enable it only for database (email + password) authentication.
- # config.params_authenticatable = true
-
- # Tell if authentication through HTTP Auth is enabled. False by default.
- # It can be set to an array that will enable http authentication only for the
- # given strategies, for example, `config.http_authenticatable = [:database]` will
- # enable it only for database authentication. The supported strategies are:
- # :database = Support basic authentication with authentication key + password
- # config.http_authenticatable = false
-
- # If http headers should be returned for AJAX requests. True by default.
- # config.http_authenticatable_on_xhr = true
-
- # The realm used in Http Basic Authentication. 'Application' by default.
- # config.http_authentication_realm = 'Application'
-
- # It will change confirmation, password recovery and other workflows
- # to behave the same regardless if the e-mail provided was right or wrong.
- # Does not affect registerable.
- # config.paranoid = true
-
- # By default Devise will store the user in session. You can skip storage for
- # particular strategies by setting this option.
- # Notice that if you are skipping storage for all authentication paths, you
- # may want to disable generating routes to Devise's sessions controller by
- # passing skip: :sessions to `devise_for` in your config/routes.rb
- config.skip_session_storage = [:http_auth]
-
- # By default, Devise cleans up the CSRF token on authentication to
- # avoid CSRF token fixation attacks. This means that, when using AJAX
- # requests for sign in and sign up, you need to get a new CSRF token
- # from the server. You can disable this option at your own risk.
- # config.clean_up_csrf_token_on_authentication = true
-
- # ==> Configuration for :database_authenticatable
- # For bcrypt, this is the cost for hashing the password and defaults to 10. If
- # using other encryptors, it sets how many times you want the password re-encrypted.
- #
- # Limiting the stretches to just one in testing will increase the performance of
- # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
- # a value less than 10 in other environments. Note that, for bcrypt (the default
- # encryptor), the cost increases exponentially with the number of stretches (e.g.
- # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
- config.stretches = Rails.env.test? ? 1 : 10
-
- # Setup a pepper to generate the encrypted password.
- # config.pepper = '6253200f58d75f4a163ade86b69e7319dde8f6554b5bb026217b78e471dcde09b289da4c3ae19ff4f582da1133274e953acb38c78dd5960baee1ca7270ebee60'
-
- # ==> Configuration for :confirmable
- # A period that the user is allowed to access the website even without
- # confirming their account. For instance, if set to 2.days, the user will be
- # able to access the website for two days without confirming their account,
- # access will be blocked just in the third day. Default is 0.days, meaning
- # the user cannot access the website without confirming their account.
- # config.allow_unconfirmed_access_for = 2.days
-
- # A period that the user is allowed to confirm their account before their
- # token becomes invalid. For example, if set to 3.days, the user can confirm
- # their account within 3 days after the mail was sent, but on the fourth day
- # their account can't be confirmed with the token any more.
- # Default is nil, meaning there is no restriction on how long a user can take
- # before confirming their account.
- # config.confirm_within = 3.days
-
- # If true, requires any email changes to be confirmed (exactly the same way as
- # initial account confirmation) to be applied. Requires additional unconfirmed_email
- # db field (see migrations). Until confirmed, new email is stored in
- # unconfirmed_email column, and copied to email column on successful confirmation.
- config.reconfirmable = true
-
- # Defines which key will be used when confirming an account
- # config.confirmation_keys = [ :email ]
-
- # ==> Configuration for :rememberable
- # The time the user will be remembered without asking for credentials again.
- # config.remember_for = 2.weeks
-
- # If true, extends the user's remember period when remembered via cookie.
- # config.extend_remember_period = false
-
- # Options to be passed to the created cookie. For instance, you can set
- # secure: true in order to force SSL only cookies.
- # config.rememberable_options = {}
-
- # ==> Configuration for :validatable
- # Range for password length.
- config.password_length = 8..128
-
- # Email regex used to validate email formats. It simply asserts that
- # one (and only one) @ exists in the given string. This is mainly
- # to give user feedback and not to assert the e-mail validity.
- # config.email_regexp = /\A[^@]+@[^@]+\z/
-
- # ==> Configuration for :timeoutable
- # The time you want to timeout the user session without activity. After this
- # time the user will be asked for credentials again. Default is 30 minutes.
- # config.timeout_in = 30.minutes
-
- # If true, expires auth token on session timeout.
- # config.expire_auth_token_on_timeout = false
-
- # ==> Configuration for :lockable
- # Defines which strategy will be used to lock an account.
- # :failed_attempts = Locks an account after a number of failed attempts to sign in.
- # :none = No lock strategy. You should handle locking by yourself.
- # config.lock_strategy = :failed_attempts
-
- # Defines which key will be used when locking and unlocking an account
- # config.unlock_keys = [ :email ]
-
- # Defines which strategy will be used to unlock an account.
- # :email = Sends an unlock link to the user email
- # :time = Re-enables login after a certain amount of time (see :unlock_in below)
- # :both = Enables both strategies
- # :none = No unlock strategy. You should handle unlocking by yourself.
- # config.unlock_strategy = :both
-
- # Number of authentication tries before locking an account if lock_strategy
- # is failed attempts.
- # config.maximum_attempts = 20
-
- # Time interval to unlock the account if :time is enabled as unlock_strategy.
- # config.unlock_in = 1.hour
-
- # Warn on the last attempt before the account is locked.
- # config.last_attempt_warning = false
-
- # ==> Configuration for :recoverable
- #
- # Defines which key will be used when recovering the password for an account
- # config.reset_password_keys = [ :email ]
-
- # Time interval you can reset your password with a reset password key.
- # Don't put a too small interval or your users won't have the time to
- # change their passwords.
- config.reset_password_within = 6.hours
-
- # ==> Configuration for :encryptable
- # Allow you to use another encryption algorithm besides bcrypt (default). You can use
- # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
- # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
- # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
- # REST_AUTH_SITE_KEY to pepper).
- #
- # Require the `devise-encryptable` gem when using anything other than bcrypt
- # config.encryptor = :sha512
-
- # ==> Scopes configuration
- # Turn scoped views on. Before rendering "sessions/new", it will first check for
- # "users/sessions/new". It's turned off by default because it's slower if you
- # are using only default views.
- config.scoped_views = true
-
- # Configure the default scope given to Warden. By default it's the first
- # devise role declared in your routes (usually :user).
- # config.default_scope = :user
-
- # Set this configuration to false if you want /users/sign_out to sign out
- # only the current scope. By default, Devise signs out all scopes.
- # config.sign_out_all_scopes = true
-
- # ==> Navigation configuration
- # Lists the formats that should be treated as navigational. Formats like
- # :html, should redirect to the sign in page when the user does not have
- # access, but formats like :xml or :json, should return 401.
- #
- # If you have any extra navigational formats, like :iphone or :mobile, you
- # should add them to the navigational formats lists.
- #
- # The "*/*" below is required to match Internet Explorer requests.
- # config.navigational_formats = ['*/*', :html]
-
- # The default HTTP method used to sign out a resource. Default is :delete.
- config.sign_out_via = :delete
-
- # ==> OmniAuth
- # Add a new OmniAuth provider. Check the wiki for more information on setting
- # up on your models and hooks.
- # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
-
- # ==> Warden configuration
- # If you want to use other strategies, that are not supported by Devise, or
- # change the failure app, you can configure them inside the config.warden block.
- #
- # config.warden do |manager|
- # manager.intercept_401 = false
- # manager.default_strategies(scope: :user).unshift :some_external_strategy
- # end
-
- # ==> Mountable engine configurations
- # When using Devise inside an engine, let's call it `MyEngine`, and this engine
- # is mountable, there are some extra configurations to be taken into account.
- # The following options are available, assuming the engine is mounted as:
- #
- # mount MyEngine, at: '/my_engine'
- #
- # The router that invoked `devise_for`, in the example above, would be:
- # config.router_name = :my_engine
- #
- # When using omniauth, Devise cannot automatically set Omniauth path,
- # so you need to do it manually. For the users scope, it would be:
- # config.omniauth_path_prefix = '/my_engine/users/auth'
-end
+
+ # The secret key used by Devise. Devise uses this key to generate
+ # random tokens. Changing this key will render invalid all existing
+ # confirmation, reset password and unlock tokens in the database.
+ # config.secret_key = '3b6812af72cd3ef10caa3ae11bc1b87ed9a110496e837db6ecb8fdca49c6310d575cface3b96cf11c4b6b69ac7d5689b7edab11de0d631af50ad924a5875317d'
+
+ # ==> Mailer Configuration
+ # Configure the e-mail address which will be shown in Devise::Mailer,
+ # note that it will be overwritten if you use your own mailer class
+ # with default "from" parameter.
+ config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+ # Configure the class responsible to send e-mails.
+ # config.mailer = 'Devise::Mailer'
+
+ # ==> ORM configuration
+ # Load and configure the ORM. Supports :active_record (default) and
+ # :mongoid (bson_ext recommended) by default. Other ORMs may be
+ # available as additional gems.
+ require 'devise/orm/active_record'
+
+ # ==> Configuration for any authentication mechanism
+ # Configure which keys are used when authenticating a user. The default is
+ # just :email. You can configure it to use [:username, :subdomain], so for
+ # authenticating a user, both parameters are required. Remember that those
+ # parameters are used only when authenticating and not when retrieving from
+ # session. If you need permissions, you should implement that in a before filter.
+ # You can also supply a hash where the value is a boolean determining whether
+ # or not authentication should be aborted when the value is not present.
+ # config.authentication_keys = [ :email ]
+
+ # Configure parameters from the request object used for authentication. Each entry
+ # given should be a request method and it will automatically be passed to the
+ # find_for_authentication method and considered in your model lookup. For instance,
+ # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+ # The same considerations mentioned for authentication_keys also apply to request_keys.
+ # config.request_keys = []
+
+ # Configure which authentication keys should be case-insensitive.
+ # These keys will be downcased upon creating or modifying a user and when used
+ # to authenticate or find a user. Default is :email.
+ config.case_insensitive_keys = [ :email ]
+
+ # Configure which authentication keys should have whitespace stripped.
+ # These keys will have whitespace before and after removed upon creating or
+ # modifying a user and when used to authenticate or find a user. Default is :email.
+ config.strip_whitespace_keys = [ :email ]
+
+ # Tell if authentication through request.params is enabled. True by default.
+ # It can be set to an array that will enable params authentication only for the
+ # given strategies, for example, `config.params_authenticatable = [:database]` will
+ # enable it only for database (email + password) authentication.
+ # config.params_authenticatable = true
+
+ # Tell if authentication through HTTP Auth is enabled. False by default.
+ # It can be set to an array that will enable http authentication only for the
+ # given strategies, for example, `config.http_authenticatable = [:database]` will
+ # enable it only for database authentication. The supported strategies are:
+ # :database = Support basic authentication with authentication key + password
+ # config.http_authenticatable = false
+
+ # If http headers should be returned for AJAX requests. True by default.
+ # config.http_authenticatable_on_xhr = true
+
+ # The realm used in Http Basic Authentication. 'Application' by default.
+ # config.http_authentication_realm = 'Application'
+
+ # It will change confirmation, password recovery and other workflows
+ # to behave the same regardless if the e-mail provided was right or wrong.
+ # Does not affect registerable.
+ # config.paranoid = true
+
+ # By default Devise will store the user in session. You can skip storage for
+ # particular strategies by setting this option.
+ # Notice that if you are skipping storage for all authentication paths, you
+ # may want to disable generating routes to Devise's sessions controller by
+ # passing skip: :sessions to `devise_for` in your config/routes.rb
+ config.skip_session_storage = [:http_auth]
+
+ # By default, Devise cleans up the CSRF token on authentication to
+ # avoid CSRF token fixation attacks. This means that, when using AJAX
+ # requests for sign in and sign up, you need to get a new CSRF token
+ # from the server. You can disable this option at your own risk.
+ # config.clean_up_csrf_token_on_authentication = true
+
+ # ==> Configuration for :database_authenticatable
+ # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+ # using other encryptors, it sets how many times you want the password re-encrypted.
+ #
+ # Limiting the stretches to just one in testing will increase the performance of
+ # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+ # a value less than 10 in other environments. Note that, for bcrypt (the default
+ # encryptor), the cost increases exponentially with the number of stretches (e.g.
+ # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
+ config.stretches = Rails.env.test? ? 1 : 10
+
+ # Setup a pepper to generate the encrypted password.
+ # config.pepper = '6253200f58d75f4a163ade86b69e7319dde8f6554b5bb026217b78e471dcde09b289da4c3ae19ff4f582da1133274e953acb38c78dd5960baee1ca7270ebee60'
+
+ # ==> Configuration for :confirmable
+ # A period that the user is allowed to access the website even without
+ # confirming their account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming their account,
+ # access will be blocked just in the third day. Default is 0.days, meaning
+ # the user cannot access the website without confirming their account.
+ # config.allow_unconfirmed_access_for = 2.days
+
+ # A period that the user is allowed to confirm their account before their
+ # token becomes invalid. For example, if set to 3.days, the user can confirm
+ # their account within 3 days after the mail was sent, but on the fourth day
+ # their account can't be confirmed with the token any more.
+ # Default is nil, meaning there is no restriction on how long a user can take
+ # before confirming their account.
+ # config.confirm_within = 3.days
+
+ # If true, requires any email changes to be confirmed (exactly the same way as
+ # initial account confirmation) to be applied. Requires additional unconfirmed_email
+ # db field (see migrations). Until confirmed, new email is stored in
+ # unconfirmed_email column, and copied to email column on successful confirmation.
+ config.reconfirmable = true
+
+ # Defines which key will be used when confirming an account
+ # config.confirmation_keys = [ :email ]
+
+ # ==> Configuration for :rememberable
+ # The time the user will be remembered without asking for credentials again.
+ config.remember_for = 2.weeks
+
+ # If true, extends the user's remember period when remembered via cookie.
+ # config.extend_remember_period = false
+
+ # Options to be passed to the created cookie. For instance, you can set
+ # secure: true in order to force SSL only cookies.
+ # config.rememberable_options = {}
+
+ # ==> Configuration for :validatable
+ # Range for password length.
+ config.password_length = 8..128
+
+ # Email regex used to validate email formats. It simply asserts that
+ # one (and only one) @ exists in the given string. This is mainly
+ # to give user feedback and not to assert the e-mail validity.
+ # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+ # ==> Configuration for :timeoutable
+ # The time you want to timeout the user session without activity. After this
+ # time the user will be asked for credentials again. Default is 30 minutes.
+ # config.timeout_in = 30.minutes
+
+ # If true, expires auth token on session timeout.
+ # config.expire_auth_token_on_timeout = false
+
+ # ==> Configuration for :lockable
+ # Defines which strategy will be used to lock an account.
+ # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+ # :none = No lock strategy. You should handle locking by yourself.
+ # config.lock_strategy = :failed_attempts
+
+ # Defines which key will be used when locking and unlocking an account
+ # config.unlock_keys = [ :email ]
+
+ # Defines which strategy will be used to unlock an account.
+ # :email = Sends an unlock link to the user email
+ # :time = Re-enables login after a certain amount of time (see :unlock_in below)
+ # :both = Enables both strategies
+ # :none = No unlock strategy. You should handle unlocking by yourself.
+ # config.unlock_strategy = :both
+
+ # Number of authentication tries before locking an account if lock_strategy
+ # is failed attempts.
+ # config.maximum_attempts = 20
+
+ # Time interval to unlock the account if :time is enabled as unlock_strategy.
+ # config.unlock_in = 1.hour
+
+ # Warn on the last attempt before the account is locked.
+ # config.last_attempt_warning = false
+
+ # ==> Configuration for :recoverable
+ #
+ # Defines which key will be used when recovering the password for an account
+ # config.reset_password_keys = [ :email ]
+
+ # Time interval you can reset your password with a reset password key.
+ # Don't put a too small interval or your users won't have the time to
+ # change their passwords.
+ config.reset_password_within = 2.hours
+
+ # ==> Configuration for :encryptable
+ # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+ # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+ # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+ # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+ # REST_AUTH_SITE_KEY to pepper).
+ #
+ # Require the `devise-encryptable` gem when using anything other than bcrypt
+ # config.encryptor = :sha512
+
+ # ==> Scopes configuration
+ # Turn scoped views on. Before rendering "sessions/new", it will first check for
+ # "users/sessions/new". It's turned off by default because it's slower if you
+ # are using only default views.
+ config.scoped_views = true
+
+ # Configure the default scope given to Warden. By default it's the first
+ # devise role declared in your routes (usually :user).
+ # config.default_scope = :user
+
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
+ # config.sign_out_all_scopes = true
+
+ # ==> Navigation configuration
+ # Lists the formats that should be treated as navigational. Formats like
+ # :html, should redirect to the sign in page when the user does not have
+ # access, but formats like :xml or :json, should return 401.
+ #
+ # If you have any extra navigational formats, like :iphone or :mobile, you
+ # should add them to the navigational formats lists.
+ #
+ # The "*/*" below is required to match Internet Explorer requests.
+ # config.navigational_formats = ['*/*', :html]
+
+ # The default HTTP method used to sign out a resource. Default is :delete.
+ config.sign_out_via = :delete
+
+ # ==> OmniAuth
+ # Add a new OmniAuth provider. Check the wiki for more information on setting
+ # up on your models and hooks.
+ # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
+
+ # ==> Warden configuration
+ # If you want to use other strategies, that are not supported by Devise, or
+ # change the failure app, you can configure them inside the config.warden block.
+ #
+ # config.warden do |manager|
+ # manager.intercept_401 = false
+ # manager.default_strategies(scope: :user).unshift :some_external_strategy
+ # end
+
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: '/my_engine'
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using omniauth, Devise cannot automatically set Omniauth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = '/my_engine/users/auth'
+
+end
\ No newline at end of file
diff --git a/tutor/config/locales/devise.en.yml b/tutor/config/locales/devise.en.yml
index abccdb08..bb64a7d4 100644
--- a/tutor/config/locales/devise.en.yml
+++ b/tutor/config/locales/devise.en.yml
@@ -18,11 +18,11 @@ en:
unconfirmed: "You have to confirm your account before continuing."
mailer:
confirmation_instructions:
- subject: "Confirmation instructions"
+ subject: "Coolsoft - Confirmation instructions"
reset_password_instructions:
- subject: "Reset password instructions"
+ subject: "Coolsoft - Reset password instructions"
unlock_instructions:
- subject: "Unlock Instructions"
+ subject: "Coolsoft - Unlock Instructions"
omniauth_callbacks:
failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
success: "Successfully authenticated from %{kind} account."
diff --git a/tutor/config/routes.rb b/tutor/config/routes.rb
index 378532f4..967dd056 100644
--- a/tutor/config/routes.rb
+++ b/tutor/config/routes.rb
@@ -1,5 +1,8 @@
Tutor::Application.routes.draw do
+ get "utilities/simple_search"
+ get "utilities/advanced_search"
+ get "utilities/auto_complete"
devise_for :teaching_assistants
devise_for :students
devise_for :lecturers
@@ -12,7 +15,11 @@
# get 'products/index'
post 'solutions/compile_solution' => 'problems#show'
post 'courses/new' => 'courses#new'
+ post 'courses/share' => 'courses#share'
get 'courses/sign_up'
+ post '/posts/:id' => 'posts#update'
+ get 'tracks/show_classmates/:id' => 'tracks#show_classmates'
+ post 'tracks/insert_recommendation' => 'tracks#insert_recommendation'
post 'solutions/execute' => 'problems#show'
post 'debuggers/:id' => 'debuggers#start'
@@ -28,10 +35,12 @@
resources :courses
resources :test_cases
resources :model_answers
- resources :problems_by_tas
resources :solutions
- resources :problems
resources :topics
+ resources :lecturers
+ resources :teaching_assistants
+ resources :students
+ resources :posts
resources :facebook
# Example resource route with options:
@@ -58,6 +67,16 @@
resources :model_answers do
post "model_answers/new"
end
+ resources :solutions_constraints do
+ collection do
+ post "new"
+ end
+ end
+ resources :problems do
+ get 'done'
+ get 'destroy_problem'
+ end
+
# Example resource route with sub-resources:
# resources :products do
# resources :comments, :sales
@@ -74,6 +93,9 @@
resources :courses do
post 'topics/new' => 'topics#new'
resources :topics
+ resources :teaching_assistants
+ post 'teaching_assistants/new' => 'teaching_assistants#new'
+ resources :acknowledgements
end
# Example resource route with concerns:
@@ -89,5 +111,4 @@
# # (app/controllers/admin/products_controller.rb)
# resources :products
# end
-
end
diff --git a/tutor/config/schedule.rb b/tutor/config/schedule.rb
new file mode 100644
index 00000000..fa47af89
--- /dev/null
+++ b/tutor/config/schedule.rb
@@ -0,0 +1,6 @@
+# for this to work type this the terminal before starting server:
+# whenever --update-crontab sendReminders
+set :environment, 'development'
+every 2.days do
+ runner "Student.send_reminder_mails"
+end
diff --git a/tutor/db/schema.rb b/tutor/db/schema.rb
index d693ab88..0a4e42ab 100644
--- a/tutor/db/schema.rb
+++ b/tutor/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20140422100002) do
+ActiveRecord::Schema.define(version: 20140423104456) do
create_table "acknowledgements", force: true do |t|
t.string "message"
@@ -25,7 +25,7 @@
create_table "admins", force: true do |t|
t.string "name"
t.date "dob"
- t.string "img"
+ t.string "profile_image"
t.boolean "gender"
t.datetime "created_at"
t.datetime "updated_at"
@@ -51,6 +51,16 @@
t.datetime "updated_at"
end
+ create_table "course_students", force: true do |t|
+ t.boolean "share", default: false
+ t.integer "course_id"
+ t.integer "student_id"
+ t.datetime "created_at"
+ t.datetime "updated_at"
+ end
+
+ add_index "course_students", ["course_id", "student_id"], name: "index_course_students_on_course_id_and_student_id", unique: true
+
create_table "courses", force: true do |t|
t.string "name"
t.string "code"
@@ -69,13 +79,6 @@
add_index "courses_lecturers", ["course_id", "lecturer_id"], name: "index_courses_lecturers_on_course_id_and_lecturer_id", unique: true
- create_table "courses_students", id: false, force: true do |t|
- t.integer "course_id", null: false
- t.integer "student_id", null: false
- end
-
- add_index "courses_students", ["course_id", "student_id"], name: "index_courses_students_on_course_id_and_student_id", unique: true
-
create_table "courses_teaching_assistants", id: false, force: true do |t|
t.integer "course_id", null: false
t.integer "teaching_assistant_id", null: false
@@ -114,8 +117,8 @@
t.string "profile_image"
t.boolean "gender"
t.string "degree"
- t.string "university"
t.string "department"
+ t.string "university"
t.datetime "created_at"
t.datetime "updated_at"
t.string "email", default: "", null: false
@@ -128,8 +131,13 @@
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
+ t.string "confirmation_token"
+ t.datetime "confirmed_at"
+ t.datetime "confirmation_sent_at"
+ t.string "unconfirmed_email"
end
+ add_index "lecturers", ["confirmation_token"], name: "index_lecturers_on_confirmation_token", unique: true
add_index "lecturers", ["email"], name: "index_lecturers_on_email", unique: true
add_index "lecturers", ["reset_password_token"], name: "index_lecturers_on_reset_password_token", unique: true
@@ -144,7 +152,6 @@
t.string "method_name"
t.string "method_return"
t.integer "model_answer_id"
- t.integer "method_constraint_id"
t.integer "owner_id"
t.string "owner_type"
t.datetime "created_at"
@@ -154,6 +161,7 @@
create_table "method_parameters", force: true do |t|
t.string "parameter"
t.string "params_type"
+ t.integer "method_constraint_id"
t.integer "model_answer_id"
t.integer "owner_id"
t.string "owner_type"
@@ -242,7 +250,6 @@
t.date "dob"
t.string "profile_image"
t.boolean "gender"
- t.boolean "share", default: false
t.string "university"
t.string "faculty"
t.string "major"
@@ -251,18 +258,23 @@
t.boolean "probation"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "email", default: "", null: false
- t.string "encrypted_password", default: "", null: false
+ t.string "email", default: "", null: false
+ t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
- t.integer "sign_in_count", default: 0, null: false
+ t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
+ t.string "confirmation_token"
+ t.datetime "confirmed_at"
+ t.datetime "confirmation_sent_at"
+ t.string "unconfirmed_email"
end
+ add_index "students", ["confirmation_token"], name: "index_students_on_confirmation_token", unique: true
add_index "students", ["email"], name: "index_students_on_email", unique: true
add_index "students", ["reset_password_token"], name: "index_students_on_reset_password_token", unique: true
@@ -288,8 +300,13 @@
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
+ t.string "confirmation_token"
+ t.datetime "confirmed_at"
+ t.datetime "confirmation_sent_at"
+ t.string "unconfirmed_email"
end
+ add_index "teaching_assistants", ["confirmation_token"], name: "index_teaching_assistants_on_confirmation_token", unique: true
add_index "teaching_assistants", ["email"], name: "index_teaching_assistants_on_email", unique: true
add_index "teaching_assistants", ["reset_password_token"], name: "index_teaching_assistants_on_reset_password_token", unique: true
diff --git a/tutor/db/seeds.rb b/tutor/db/seeds.rb
index 5d0cbbcb..a8a27511 100644
--- a/tutor/db/seeds.rb
+++ b/tutor/db/seeds.rb
@@ -13,32 +13,75 @@
Admin.create(name: "Admin")
puts("# ---------------------------Lecturers-----------------------------")
- Lecturer.create!(name:"Lecturer1", email:"1@lecturer.com", password:"123456789")
- Lecturer.create!(name:"Lecturer1", email:"2@lecturer.com", password:"123456789")
+ l = Lecturer.new(email: '1@lecturer.com', password: '123456789',
+ password_confirmation: '123456789', name: 'LecturerI',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: true,
+ degree: "PhD", university: "GUC", department: "MET")
+ l.save!
+ l = Lecturer.new(email: '2@lecturer.com', password: '123456789',
+ password_confirmation: '123456789', name: 'LecturerII',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: true,
+ degree: "PhD", university: "Uni", department: "Dep")
+ l.save!
puts("# ---------------------------Students-----------------------------")
- Student.create!(name:"Student1", email:"1@student.com", password:"123456789")
- Student.create!(name:"Student2", email:"2@student.com", password:"123456789")
+ s = Student.new(email: '1@student.com', password: '123456789',
+ password_confirmation: '123456789', name: 'StudentI',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: true,
+ faculty: "MET", university: "GUC", major: "CS", semester: 6,
+ advising: false, probation: false)
+ s.save!
+ s = Student.new(email: '2@student.com', password: '123456789',
+ password_confirmation: '123456789', name: 'StudentII',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: false,
+ faculty: "Fac", university: "Uni", major: "Maj", semester: 6,
+ advising: true, probation: true)
+ s.save!
+ s = Student.new(email: '3@student.com', password: '123456789',
+ password_confirmation: '123456789', name: 'StudentIII',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: false,
+ faculty: "Fac", university: "Uni", major: "Maj", semester: 6,
+ advising: false, probation: true)
+ s.save!
+ s = Student.new(email: '4@student.com', password: '123456789',
+ password_confirmation: '123456789', name: 'StudentIV',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: true,
+ faculty: "Fac", university: "Uni", major: "Maj", semester: 8,
+ advising: true, probation: false)
+ s.save!
puts("# ---------------------------TeachingAssistants-----------------------------")
- TeachingAssistant.create(name:"TA1", email:"1@ta.com", password:"123456789")
- TeachingAssistant.create(name:"TA2", email:"2@ta.com", password:"123456789")
+ t = TeachingAssistant.new(email: '1@ta.com', password: '123456789',
+ password_confirmation: '123456789', name: 'TAI',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: true,
+ degree: "MSc", university: "GUC", department: "MET",
+ graduated_from: "GUC", graduated_year: 2005)
+ t.save!
+ t = TeachingAssistant.new(email: '2@ta.com', password: '123456789',
+ password_confirmation: '123456789', name: 'TAII',
+ confirmed_at: Time.now, dob: DateTime.now.to_date, gender: true,
+ degree: "BSc", university: "Uni", department: "Dep",
+ graduated_from: "Uni", graduated_year: 2009)
+ t.save!
puts("# --------------------------Courses------------------------------")
Course.create(name:"Course1", description:"This is course one", code:1, year:2014, semester:1)
Course.create(name:"Course2", description:"This is course two", code:2, year:2014, semester:1)
Course.create(name:"Course3", description:"This is course three", code:3, year:2014, semester:1)
+puts("# --------------------------Course_Student------------------------------")
+ CourseStudent.create(share: true)
+
puts("# --------------------------DiscussionBoards------------------------------")
DiscussionBoard.create(title:"DiscussionBoard1", activated: true)
DiscussionBoard.create(title:"DiscussionBoard2", activated: true)
DiscussionBoard.create(title:"DiscussionBoard3", activated: true)
puts("# --------------------------Posts------------------------------")
- Post.create(content: "The Main Objective is to be a winner", views_count: 20)
- Post.create(content: "It is very hard to keep in this life, be happy", views_count: 100)
- Post.create(content: "Post3")
- Post.create(content: "Post4")
+ Post.create(title:"My 1st Post", content: "The Main Objective is to be a winner", views_count: 20)
+ Post.create(title:"My 2nd Post", content: "It is very hard to keep in this life, be happy", views_count: 100)
+ Post.create(title:"My 3th Post", content: "Post3")
+ Post.create(title:"My 4th Post", content: "Post4")
puts("# --------------------------Replies---------------------------")
Reply.create(content: "Reply1")
@@ -58,25 +101,25 @@
Hint.create(message: "Do not Try to Solve CS problem-3")
puts("# -----------------------ModelAnswer---------------------------")
- ModelAnswer.create(answer: "System.out.println('SQL baaaad')-1")
- ModelAnswer.create(answer: "System.out.println('SQL baaaad')-2")
- ModelAnswer.create(answer: "System.out.println('SQL baaaad')-3")
- ModelAnswer.create(answer: "System.out.println('SQL baaaad')-4")
- ModelAnswer.create(answer: "System.out.println('SQL baaaad')-5")
- ModelAnswer.create(answer: "System.out.println('SQL baaaad')-6")
+ ModelAnswer.create(title: "Answer1", answer: "System.out.println('SQL baaaad')-1")
+ ModelAnswer.create(title: "Answer2", answer: "System.out.println('SQL baaaad')-2")
+ ModelAnswer.create(title: "Answer3", answer: "System.out.println('SQL baaaad')-3")
+ ModelAnswer.create(title: "Answer4", answer: "System.out.println('SQL baaaad')-4")
+ ModelAnswer.create(title: "Answer5", answer: "System.out.println('SQL baaaad')-5")
+ ModelAnswer.create(title: "Answer6", answer: "System.out.println('SQL baaaad')-6")
puts("# -----------------------Test Cases---------------------------")
TestCase.create(output: "hello World 1", input:"x = 0")
TestCase.create(output: "hello World 2", input:"x = 1")
TestCase.create(output: "hello World 3", input:"x = 2")
- TestCase.create(output: "5", input:"10 2")
- TestCase.create(output: "2.5", input:"5 2")
+ TestCase.create(output: "5\n", input:"10 2")
+ TestCase.create(output: "2.5\n", input:"5 2")
TestCase.create(output: "x", input:"10 0")
puts("# -----------------------Method Parameters---------------------------")
- MethodParameter.create(parameter:"MethodParameters 1")
- MethodParameter.create(parameter:"MethodParameters 2")
- MethodParameter.create(parameter:"MethodParameters 3")
+ MethodParameter.create(parameter:"MethodParameters 1", params_type: "int")
+ MethodParameter.create(parameter:"MethodParameters 2", params_type: "int")
+ MethodParameter.create(parameter:"MethodParameters 3", params_type: "int")
puts("# -----------------------Variable Constraints---------------------------")
VariableConstraint.create(variable_name: "VariableConstraint 1")
@@ -85,17 +128,17 @@
puts("# -----------------------Problems---------------------------")
- Problem.create(title:"Problem 1", description:"Given two numbers a and b, output a/b")
- Problem.create(title:"Problem 2", description:"This is very hard Problem" )
- Problem.create(title:"Problem 3", description:"This wont be a hard Problem")
- Problem.create(title:"Problem 4", description:"This will be very easy Problem")
- Problem.create(title:"Problem 5", description:"This is very easy Problem")
+ Problem.create(title: "Problem 1", description: "Given two numbers a and b, output a/b", incomplete: false)
+ Problem.create(title: "Problem 2", description: "This is very hard Problem", incomplete: false)
+ Problem.create(title: "Problem 3", description: "This wont be a hard Problem", incomplete: false)
+ Problem.create(title: "Problem 4", description: "This will be very easy Problem", incomplete: true)
+ Problem.create(title: "Problem 5", description: "This is very easy Problem", incomplete: true)
puts("# -----------------------Tracks---------------------------")
- Track.create(title: "Track 1" , difficulty: 0)
- Track.create(title: "Track 2" , difficulty: 1)
- Track.create(title: "Track 3" , difficulty: 2)
- Track.create(title: "Track 4" , difficulty: 3)
+ Track.create(title: "Track 1", difficulty: 0)
+ Track.create(title: "Track 2", difficulty: 1)
+ Track.create(title: "Track 3", difficulty: 2)
+ Track.create(title: "Track 4", difficulty: 3)
puts("# -----------------------Solutions---------------------------")
Solution.create(code:"println(My first solution)", length:5, status:0)
@@ -103,26 +146,33 @@
Solution.create(code:"println(My third solution)", length:5, status:3)
puts("# -----------------------TrackProgression---------------------------")
- TrackProgression.create(level: 0, student_id: 1, topic_id: 1)
- TrackProgression.create(level: 2, student_id: 1, topic_id: 2)
-
+ TrackProgression.create(:level => 1, :topic_id => 1)
+ TrackProgression.create(:level => 1, :topic_id => 1)
+ TrackProgression.create(:level => 1, :topic_id => 1)
+ TrackProgression.create(level: 0, topic_id: 1)
+ TrackProgression.create(level: 2, topic_id: 2)
+
puts("# -----------------------Attempts---------------------------")
- Attempt.create(success: true)
+ Attempt.create(success: true)
+ Attempt.create(failure: true)
+ Attempt.create(success: true)
+ Attempt.create(failure: true)
+ Attempt.create(success: true)
+ Attempt.create(success: true)
+ Attempt.create(success: true)
+ Attempt.create(success: true)
+ Attempt.create(success: true)
+ Attempt.create(failure: true)
+ Attempt.create(failure: true)
Attempt.create(failure: true)
- Attempt.create(success: true)
- Attempt.create(failure: true)
- Attempt.create(success: true)
- Attempt.create(success: true)
- Attempt.create(success: true)
- Attempt.create(success: true)
- Attempt.create(success: true)
- Attempt.create(failure: true)
- Attempt.create(failure: true)
- Attempt.create(failure: true)
- Attempt.create(failure: true)
+ Attempt.create(failure: true)
+
+puts("#-----------------------Recommendations-----------------------")
+ Recommendation.create(problem_id:1, student_id:1, recommender_id:2)
+ Recommendation.create(problem_id:2, student_id:1, recommender_id:2)
+ Recommendation.create(problem_id:5, student_id:1, recommender_id:2)
puts("# -------------------------------------------------------")
-
puts("**************************************************************")
puts(" Creating Relations ")
puts("**************************************************************")
@@ -137,9 +187,11 @@
Lecturer.first.posts << Post.find_by_id(2)
Lecturer.first.replies << Reply.first
Lecturer.first.replies << Reply.find_by_id(2)
+ Lecturer.first.replies << Reply.find_by_id(3)
+ Lecturer.first.replies << Reply.find_by_id(4)
puts("# -----------------------Students---------------------------")
- Student.first.courses << Course.first
+ Student.first.course_students << CourseStudent.first
Student.first.solutions << Solution.first
Student.first.solutions << Solution.find_by_id(2)
Student.first.solutions << Solution.find_by_id(3)
@@ -156,6 +208,26 @@
Student.first.attempts << Attempt.find_by_id(11)
Student.first.attempts << Attempt.find_by_id(12)
Student.first.attempts << Attempt.find_by_id(13)
+ Student.find(2).courses << Course.first
+ Student.find(3).courses << Course.first
+ Student.find(4).courses << Course.first
+
+ Student.find_by_id(2).progressions << TrackProgression.first
+ Student.find_by_id(3).progressions << TrackProgression.find_by_id(2)
+ Student.find_by_id(4).progressions << TrackProgression.find_by_id(3)
+ Student.first.progressions << TrackProgression.find_by_id(4)
+ Student.first.progressions << TrackProgression.find_by_id(5)
+
+ # Other way to add Course into student, but it will require getting Course_student via searching
+ # since the table has key on (student_id and course_id)then the array will always be 1 elemet [0]
+ Student.find_by_id(2).courses << Course.find_by_id(2)
+ CourseStudent.where(student_id:2, course_id:2)[0].update(share: true)
+ Student.find_by_id(1).courses << Course.find_by_id(2)
+ CourseStudent.where(student_id:1, course_id:2)[0].update(share: true)
+
+puts("# -----------------------TeachingAssistants---------------------------")
+ TeachingAssistant.first.courses << Course.first
+ TeachingAssistant.find_by_id(2).courses << Course.find_by_id(2)
puts("# -----------------------Problems---------------------------")
Problem.find_by_id(3).test_cases << TestCase.first
@@ -208,14 +280,10 @@
Course.first.topics << Topic.find_by_id(2)
Course.find_by_id(2).topics << Topic.find_by_id(3)
Course.find_by_id(2).discussion_board = DiscussionBoard.last
+ Course.first.course_students << CourseStudent.first
puts("# ----------------- DiscussionBoard -----------------------")
DiscussionBoard.first.posts << Post.first
DiscussionBoard.first.posts << Post.find_by_id(2)
-puts("# -----------------------Solution---------------------------")
- Student.first.solutions << Solution.first
- Student.first.solutions << Solution.find_by_id(2)
- Student.first.solutions << Solution.find_by_id(3)
-
puts("# ---------------------------------------------------------")
diff --git a/tutor/st1pr1.class b/tutor/st1pr1.class
new file mode 100644
index 00000000..154cd90f
Binary files /dev/null and b/tutor/st1pr1.class differ
diff --git a/tutor/test/controllers/acknowledgements_controller_test.rb b/tutor/test/controllers/acknowledgements_controller_test.rb
new file mode 100644
index 00000000..1a0daa4a
--- /dev/null
+++ b/tutor/test/controllers/acknowledgements_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AcknowledgementsControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/tutor/test/controllers/posts_controller_test.rb b/tutor/test/controllers/posts_controller_test.rb
new file mode 100644
index 00000000..7a6ee4f1
--- /dev/null
+++ b/tutor/test/controllers/posts_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class PostsControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/tutor/test/controllers/solutions_constraints_controller_test.rb b/tutor/test/controllers/solutions_constraints_controller_test.rb
new file mode 100644
index 00000000..15ab65d4
--- /dev/null
+++ b/tutor/test/controllers/solutions_constraints_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SolutionsConstraintsControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/tutor/test/controllers/teaching_assistants_controller_test.rb b/tutor/test/controllers/teaching_assistants_controller_test.rb
new file mode 100644
index 00000000..8015ea3a
--- /dev/null
+++ b/tutor/test/controllers/teaching_assistants_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TeachingAssistantsControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/tutor/test/fixtures/course_students.yml b/tutor/test/fixtures/course_students.yml
new file mode 100644
index 00000000..937a0c00
--- /dev/null
+++ b/tutor/test/fixtures/course_students.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/tutor/test/helpers/acknowledgements_helper_test.rb b/tutor/test/helpers/acknowledgements_helper_test.rb
new file mode 100644
index 00000000..61d66885
--- /dev/null
+++ b/tutor/test/helpers/acknowledgements_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class AcknowledgementsHelperTest < ActionView::TestCase
+end
diff --git a/tutor/test/helpers/method_constraints_helper_test.rb b/tutor/test/helpers/method_constraints_helper_test.rb
new file mode 100644
index 00000000..45964376
--- /dev/null
+++ b/tutor/test/helpers/method_constraints_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class MethodConstraintsHelperTest < ActionView::TestCase
+end
diff --git a/tutor/test/helpers/posts_helper_test.rb b/tutor/test/helpers/posts_helper_test.rb
new file mode 100644
index 00000000..48549c2e
--- /dev/null
+++ b/tutor/test/helpers/posts_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class PostsHelperTest < ActionView::TestCase
+end
diff --git a/tutor/test/helpers/solutions_constraints_helper_test.rb b/tutor/test/helpers/solutions_constraints_helper_test.rb
new file mode 100644
index 00000000..81a477cc
--- /dev/null
+++ b/tutor/test/helpers/solutions_constraints_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class SolutionsConstraintsHelperTest < ActionView::TestCase
+end
diff --git a/tutor/test/helpers/teaching_assistants_helper_test.rb b/tutor/test/helpers/teaching_assistants_helper_test.rb
new file mode 100644
index 00000000..328f99b6
--- /dev/null
+++ b/tutor/test/helpers/teaching_assistants_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class TeachingAssistantsHelperTest < ActionView::TestCase
+end
diff --git a/tutor/test/models/course_student_test.rb b/tutor/test/models/course_student_test.rb
new file mode 100644
index 00000000..cb7a0c13
--- /dev/null
+++ b/tutor/test/models/course_student_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CourseStudentTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/tutor/vendor/assets/javascripts/jquery.tokeninput.js b/tutor/vendor/assets/javascripts/jquery.tokeninput.js
new file mode 100755
index 00000000..87641a57
--- /dev/null
+++ b/tutor/vendor/assets/javascripts/jquery.tokeninput.js
@@ -0,0 +1,860 @@
+/*
+ * jQuery Plugin: Tokenizing Autocomplete Text Entry
+ * Version 1.6.0
+ *
+ * Copyright (c) 2009 James Smith (http://loopj.com)
+ * Licensed jointly under the GPL and MIT licenses,
+ * choose which one suits your project best!
+ *
+ */
+
+(function ($) {
+// Default settings
+var DEFAULT_SETTINGS = {
+ // Search settings
+ method: "GET",
+ contentType: "json",
+ queryParam: "q",
+ searchDelay: 300,
+ minChars: 1,
+ propertyToSearch: "name",
+ jsonContainer: null,
+
+ // Display settings
+ hintText: "Type in a search term",
+ noResultsText: "No results",
+ searchingText: "Searching...",
+ deleteText: "×",
+ animateDropdown: true,
+
+ // Tokenization settings
+ tokenLimit: null,
+ tokenDelimiter: ",",
+ preventDuplicates: false,
+
+ // Output settings
+ tokenValue: "id",
+
+ // Prepopulation settings
+ prePopulate: null,
+ processPrePopulate: false,
+
+ // Manipulation settings
+ idPrefix: "token-input-",
+
+ // Formatters
+ resultsFormatter: function(item){ return "
+
+ <%= render 'simple_search' %>
+Search Results :
+" + item[this.propertyToSearch] + "
")
+ .addClass(settings.classes.dropdown)
+ .appendTo("body")
+ .hide();
+
+ // Magic element to help us resize the text input
+ var input_resizer = $("
"+settings.searchingText+"
"); + show_dropdown(); + } + } + + function show_dropdown_hint () { + if(settings.hintText) { + dropdown.html(""+settings.hintText+"
"); + show_dropdown(); + } + } + + // Highlight the query part of the search term + function highlight_term(value, term) { + return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "$1"); + } + + function find_value_and_highlight_term(template, value, term) { + return template.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + value + ")(?![^<>]*>)(?![^&;]+;)", "g"), highlight_term(value, term)); + } + + // Populate the results dropdown with some results + function populate_dropdown (query, results) { + if(results && results.length) { + dropdown.empty(); + var dropdown_ul = $("- ")
+ .appendTo(dropdown)
+ .mouseover(function (event) {
+ select_dropdown_item($(event.target).closest("li"));
+ })
+ .mousedown(function (event) {
+ add_token($(event.target).closest("li").data("tokeninput"));
+ hidden_input.change();
+ return false;
+ })
+ .hide();
+
+ $.each(results, function(index, value) {
+ var this_li = settings.resultsFormatter(value);
+
+ this_li = find_value_and_highlight_term(this_li ,value[settings.propertyToSearch], query);
+
+ this_li = $(this_li).appendTo(dropdown_ul);
+
+ if(index % 2) {
+ this_li.addClass(settings.classes.dropdownItem);
+ } else {
+ this_li.addClass(settings.classes.dropdownItem2);
+ }
+
+ if(index === 0) {
+ select_dropdown_item(this_li);
+ }
+
+ $.data(this_li.get(0), "tokeninput", value);
+ });
+
+ show_dropdown();
+
+ if(settings.animateDropdown) {
+ dropdown_ul.slideDown("fast");
+ } else {
+ dropdown_ul.show();
+ }
+ } else {
+ if(settings.noResultsText) {
+ dropdown.html("
"+settings.noResultsText+"
"); + show_dropdown(); + } + } + } + + // Highlight an item in the results dropdown + function select_dropdown_item (item) { + if(item) { + if(selected_dropdown_item) { + deselect_dropdown_item($(selected_dropdown_item)); + } + + item.addClass(settings.classes.selectedDropdownItem); + selected_dropdown_item = item.get(0); + } + } + + // Remove highlighting from an item in the results dropdown + function deselect_dropdown_item (item) { + item.removeClass(settings.classes.selectedDropdownItem); + selected_dropdown_item = null; + } + + // Do a search and show the "searching" dropdown if the input is longer + // than settings.minChars + function do_search() { + var query = input_box.val().toLowerCase(); + + if(query && query.length) { + if(selected_token) { + deselect_token($(selected_token), POSITION.AFTER); + } + + if(query.length >= settings.minChars) { + show_dropdown_searching(); + clearTimeout(timeout); + + timeout = setTimeout(function(){ + run_search(query); + }, settings.searchDelay); + } else { + hide_dropdown(); + } + } + } + + // Do the actual search + function run_search(query) { + var cache_key = query + computeURL(); + var cached_results = cache.get(cache_key); + if(cached_results) { + populate_dropdown(query, cached_results); + } else { + // Are we doing an ajax search or local data search? + if(settings.url) { + var url = computeURL(); + // Extract exisiting get params + var ajax_params = {}; + ajax_params.data = {}; + if(url.indexOf("?") > -1) { + var parts = url.split("?"); + ajax_params.url = parts[0]; + + var param_array = parts[1].split("&"); + $.each(param_array, function (index, value) { + var kv = value.split("="); + ajax_params.data[kv[0]] = kv[1]; + }); + } else { + ajax_params.url = url; + } + + // Prepare the request + ajax_params.data[settings.queryParam] = query; + ajax_params.type = settings.method; + ajax_params.dataType = settings.contentType; + if(settings.crossDomain) { + ajax_params.dataType = "jsonp"; + } + + // Attach the success callback + ajax_params.success = function(results) { + if($.isFunction(settings.onResult)) { + results = settings.onResult.call(hidden_input, results); + } + cache.add(cache_key, settings.jsonContainer ? results[settings.jsonContainer] : results); + + // only populate the dropdown if the results are associated with the active search query + if(input_box.val().toLowerCase() === query) { + populate_dropdown(query, settings.jsonContainer ? results[settings.jsonContainer] : results); + } + }; + + // Make the request + $.ajax(ajax_params); + } else if(settings.local_data) { + // Do the search through local data + var results = $.grep(settings.local_data, function (row) { + return row[settings.propertyToSearch].toLowerCase().indexOf(query.toLowerCase()) > -1; + }); + + if($.isFunction(settings.onResult)) { + results = settings.onResult.call(hidden_input, results); + } + cache.add(cache_key, results); + populate_dropdown(query, results); + } + } + } + + // compute the dynamic URL + function computeURL() { + var url = settings.url; + if(typeof settings.url == 'function') { + url = settings.url.call(); + } + return url; + } +}; + +// Really basic cache for the results +$.TokenList.Cache = function (options) { + var settings = $.extend({ + max_size: 500 + }, options); + + var data = {}; + var size = 0; + + var flush = function () { + data = {}; + size = 0; + }; + + this.add = function (query, results) { + if(size > settings.max_size) { + flush(); + } + + if(!data[query]) { + size += 1; + } + + data[query] = results; + }; + + this.get = function (query) { + return data[query]; + }; +}; +}(jQuery)); diff --git a/tutor/vendor/assets/stylesheets/bootstrap.css b/tutor/vendor/assets/stylesheets/bootstrap.css index 9d5b6e0e..338f20c3 100644 --- a/tutor/vendor/assets/stylesheets/bootstrap.css +++ b/tutor/vendor/assets/stylesheets/bootstrap.css @@ -3639,8 +3639,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar { position: relative; - min-height: 60px; - margin-bottom: 21px; + min-height: 50px; border: 1px solid transparent; } @media (min-width: 768px) { @@ -3936,7 +3935,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-default { - background-color: #2c3e50; + background-color: #333333; border-color: transparent; } .navbar-default .navbar-brand { @@ -4058,10 +4057,10 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - background-color: #128f76; + background-color: #333333; } .navbar-inverse .navbar-toggle .icon-bar { - background-color: #ffffff; + background-color: #333333; } .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { @@ -4085,7 +4084,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus { - color: #2c3e50; + color: #333333; background-color: transparent; } .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,