Issue #466 Fixing conflicts

tutor/.gitignore

@@ -20,7 +20,6 @@
 /public/uploads/*
 *.rbc
 capybara-*.html
-.rspec
 /coverage/
 /spec/tmp
 **.orig
@@ -40,4 +39,5 @@ models.svg
 
 # Ignoring .java and .class files
 /students_solutions/Java/*.java
-/students_solutions/Class/*.class
+/students_solutions/Class/*.class
+/students_solutions/*

tutor/Gemfile

@@ -54,6 +54,8 @@ gem 'foreman'
 # Use composite primary keys in models
 gem 'composite_primary_keys', '~> 6.0.1'
 
+gem 'activeadmin', github: 'gregbell/active_admin'
+
 #
 gem 'acts_as_list'
 
@@ -63,3 +65,10 @@ gem 'json_builder', '3.1.0'
 
 # whenever gem for scheduling tasks
 gem 'whenever', :require => false
+
+#pagination
+gem 'will_paginate', '~> 3.0.5'
+
+group :development, :test do
+	gem 'rspec-rails', '~> 3.0.0.beta'
+end

tutor/Gemfile.lock

@@ -1,3 +1,20 @@
+GIT
+  remote: git://github.com/gregbell/active_admin.git
+  revision: 109ab88cb7c0777d3460cbfac3cc217068ecfabf
+  specs:
+    activeadmin (1.0.0.pre)
+      arbre (~> 1.0)
+      bourbon
+      coffee-rails
+      formtastic (~> 2.3.0.rc3)
+      inherited_resources (~> 1.3)
+      jquery-rails
+      jquery-ui-rails
+      kaminari (~> 0.15)
+      rails (>= 3.2, < 4.2)
+      ransack (~> 1.0)
+      sass-rails
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -28,8 +45,13 @@ GEM
     acts_as_list (0.4.0)
       activerecord (>= 3.0)
     ansi (1.4.3)
+    arbre (1.0.1)
+      activesupport (>= 3.0.0)
     arel (4.0.2)
     bcrypt (3.1.7)
+    bourbon (3.2.1)
+      sass (~> 3.2)
+      thor
     builder (3.1.4)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
@@ -52,24 +74,38 @@ GEM
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    diff-lcs (1.2.5)
     dotenv (0.7.0)
     erubis (2.7.0)
     execjs (2.0.2)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
+    formtastic (2.3.0.rc3)
+      actionpack (>= 3.0)
+    has_scope (0.6.0.rc)
+      actionpack (>= 3.2, < 5)
+      activesupport (>= 3.2, < 5)
     hashr (0.0.22)
     hike (1.2.3)
     i18n (0.6.9)
+    inherited_resources (1.4.1)
+      has_scope (~> 0.6.0.rc)
+      responders (~> 1.0.0.rc)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.2.1)
+      railties (>= 3.2.16)
     json (1.8.1)
     json_builder (3.1.0)
       activesupport (>= 2.0.0)
+    kaminari (0.15.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
     kgio (2.9.2)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -78,6 +114,8 @@ GEM
     minitest (4.7.5)
     multi_json (1.9.2)
     orm_adapter (0.5.0)
+    polyamorous (1.0.0)
+      activerecord (>= 3.0)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -97,11 +135,39 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
     rake (10.3.1)
+    ransack (1.2.3)
+      actionpack (>= 3.0)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
+      i18n
+      polyamorous (~> 1.0.0)
     rdoc (4.1.1)
       json (~> 1.4)
+    responders (1.0.0)
+      railties (>= 3.2, < 5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rmagick (2.13.2)
+    rspec-collection_matchers (0.0.4)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-expectations (3.0.0.beta2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.beta2)
+    rspec-mocks (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-rails (3.0.0.beta2)
+      actionpack (>= 3.0)
+      activemodel (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-collection_matchers
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-support (3.0.0.beta2)
     sass (3.2.19)
     sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
@@ -148,11 +214,13 @@ GEM
     whenever (0.9.2)
       activesupport (>= 2.3.4)
       chronic (>= 0.6.3)
+    will_paginate (3.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activeadmin!
   acts_as_list
   carrierwave
   coffee-rails (~> 4.0.0)
@@ -164,10 +232,12 @@ DEPENDENCIES
   json_builder (= 3.1.0)
   rails (= 4.0.4)
   rmagick
+  rspec-rails (~> 3.0.0.beta)
   sass-rails (~> 4.0.2)
   sdoc
   sqlite3
   tire
   uglifier (>= 1.3.0)
   unicorn
   whenever
+  will_paginate (~> 3.0.5)

tutor/app/admin/admin_user.rb

@@ -0,0 +1,28 @@
+ActiveAdmin.register AdminUser do
+  permit_params :email, :password, :password_confirmation
+
+  index do
+    selectable_column
+    id_column
+    column :email
+    column :current_sign_in_at
+    column :sign_in_count
+    column :created_at
+    actions
+  end
+
+  filter :email
+  filter :current_sign_in_at
+  filter :sign_in_count
+  filter :created_at
+
+  form do |f|
+    f.inputs "Admin Details" do
+      f.input :email
+      f.input :password
+      f.input :password_confirmation
+    end
+    f.actions
+  end
+
+end

tutor/app/admin/dashboard.rb

@@ -0,0 +1,33 @@
+ActiveAdmin.register_page "Dashboard" do
+
+  menu priority: 1, label: proc{ I18n.t("active_admin.dashboard") }
+
+  content title: proc{ I18n.t("active_admin.dashboard") } do
+    div class: "blank_slate_container", id: "dashboard_default_message" do
+      span class: "blank_slate" do
+        span I18n.t("active_admin.dashboard_welcome.welcome")
+        small I18n.t("active_admin.dashboard_welcome.call_to_action")
+      end
+    end
+
+    # Here is an example of a simple dashboard with columns and panels.
+    #
+    # columns do
+    #   column do
+    #     panel "Recent Posts" do
+    #       ul do
+    #         Post.recent(5).map do |post|
+    #           li link_to(post.title, admin_post_path(post))
+    #         end
+    #       end
+    #     end
+    #   end
+
+    #   column do
+    #     panel "Info" do
+    #       para "Welcome to ActiveAdmin."
+    #     end
+    #   end
+    # end
+  end # content
+end

tutor/app/assets/javascripts/_solutions.js

@@ -0,0 +1,41 @@
+// [Editor cusomization - Story 3.19]
+//	Enable method "selectpicker" from the javascript file.
+// Parameters: none.
+// Returns: none.
+// Author: Mimi
+$(document).ready(function(e){
+	$('.selectpicker').selectpicker();
+});
+
+// [Editor cusomization - Story 3.19] 
+//	change the theme of the editor.
+// Parameters: 
+//	The selected input from the 'theme' drop-downlist.
+// Returns: none.
+// Author: Mimi
+function changeTheme(){
+	var new_theme = $('#theme').val();
+	editor.setTheme("ace/theme/"+new_theme);
+}
+
+// [Editor cusomization - Story 3.19]
+//	change the mode of the editor.
+// Parameters: 
+//	The selected input from the 'mode' drop-downlist.
+// Returns: none.
+// Author: Mimi
+function changeMode(){
+	var new_mode = $('#mode').val();
+	edit_session.setMode("ace/mode/"+new_mode);
+}
+
+// [Editor cusomization - Story 3.19]
+//	change the font-size of the editor.
+// Parameters: 
+//	The selected input from the 'font' drop-downlist.
+// Returns: none.
+// Author: Mimi
+function changeFont(){
+	var new_font = $('#font').val();
+	editor.setFontSize(parseInt(new_font));
+}

tutor/app/assets/javascripts/application.js

@@ -12,6 +12,19 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery-ui-1.10.4
 //= require_tree .
+//= require bootstrap
 //= require jquery.tokeninput
-//= require utilities
+//= require utilities
+
+// [Simple Search auto-complete - Story 1.23]
+// autocomplete for the search bar
+// Parameters: search term
+// Returns: Array with the matched results
+// Author: Ahmed Elassuty
+$(function(){
+	$('#search_field').autocomplete({
+		source: $('#search_field').data("autocomplete-source")
+	});
+});

tutor/app/assets/javascripts/assignment_problems.js.coffee

@@ -0,0 +1,3 @@
+@showDiv = ->
+	ocument.getElementById("test").style.display = ""
+	return

tutor/app/assets/javascripts/assignments.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/