Merge branch 'master' of https://github.com/alaashafaee/Coolsoft-14 i…

…nto C2_Rania_283_remove_solutions_constraints

tutor/Gemfile

@@ -9,8 +9,8 @@ gem 'rails', '4.0.4'
 gem 'devise'
 
 # File uploading
-# gem 'carrierwave'
-# gem 'rmagick'
+gem 'carrierwave'
+gem 'rmagick'
 
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
@@ -30,9 +30,6 @@ gem 'coffee-rails', '~> 4.0.0'
 # Use jquery as the JavaScript library
 gem 'jquery-rails', '~> 3.1.0'
 
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
-
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 1.2'
 
@@ -57,9 +54,12 @@ gem 'foreman'
 # Use composite primary keys in models
 gem 'composite_primary_keys', '~> 6.0.1'
 
+#
+gem 'acts_as_list'
+
 #search
 gem 'tire'
 gem 'json_builder', '3.1.0'
 
 # whenever gem for scheduling tasks
-gem 'whenever', :require => false
+gem 'whenever', :require => false

tutor/Gemfile.lock

@@ -25,10 +25,17 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    acts_as_list (0.4.0)
+      activerecord (>= 3.0)
     ansi (1.4.3)
     arel (4.0.2)
     bcrypt (3.1.7)
     builder (3.1.4)
+    carrierwave (0.10.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
     chronic (0.10.2)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -94,6 +101,7 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
+    rmagick (2.13.2)
     sass (3.2.19)
     sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
@@ -127,8 +135,6 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
-      coffee-rails
     tzinfo (0.3.39)
     uglifier (2.5.0)
       execjs (>= 0.3.0)
@@ -147,6 +153,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts_as_list
+  carrierwave
   coffee-rails (~> 4.0.0)
   composite_primary_keys (~> 6.0.1)
   devise
@@ -155,11 +163,11 @@ DEPENDENCIES
   jquery-rails (~> 3.1.0)
   json_builder (= 3.1.0)
   rails (= 4.0.4)
+  rmagick
   sass-rails (~> 4.0.2)
   sdoc
   sqlite3
   tire
-  turbolinks
   uglifier (>= 1.3.0)
   unicorn
   whenever

tutor/app/assets/javascripts/application.js

@@ -12,7 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require turbolinks
 //= require_tree .
 //= require jquery.tokeninput
 //= require utilities

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

@@ -0,0 +1,8 @@
+# [Design - Story Design]
+# Checks if an element exists in the document
+# Parameters: 
+# 	element_id: The id of the element to be checked
+# Returns: True if the element exist and false if not
+# Author: Mussab ElDash
+@element_exists = (element_id) ->
+	$("##{element_id}").length > 0

tutor/app/assets/javascripts/hints.js

@@ -0,0 +1,13 @@
+//[View hints and tips-story 4.22]
+//Toggle to view previous hints.
+//Parameters:
+//	id: Element that will be toggled.
+//Returns: none.
+//Author: Nadine Adel
+function toggle_visibility(id) {
+	var element = document.getElementById(id);
+	if(element.style.display == 'block')
+		element.style.display = 'none';
+	else
+		element.style.display = 'block';
+}