features and widgets added

Conflicts:
	app/assets/javascripts/orbitdesktop.js

app/controllers/desktop_controller.rb

@@ -117,6 +117,8 @@ class DesktopController< ApplicationController
         jsfile = []
         cssfile = ""
         shape = "w1 h1"
+        fullsize = false
+        link = ""
         if tile.data_category == "widget"
           widge = DesktopWidget.find(tile.desktop_widget_id.to_s)
           # data_content = widge.widget_layout.file
@@ -125,11 +127,21 @@ class DesktopController< ApplicationController
           cssfile = widge.css_default.file.as_json[:file]
           shape = widge.shape
           title = widge.name
+          # binding.pry
+          if not widge.fullsize.nil?
+            fullsize = widge.fullsize
+          end
         else
           data_content = tile.data_content
           title = tile.title
+          case data_content
+            when "envocab"
+              link = "http://www.english-vocabulary.eu/"
+            when "wikibooks"
+              link = "http://www.wikibooks.org"
+          end
         end
-        gr << {"id"=>tile.id,"data_category"=>tile.data_category,"data_content"=>data_content,"js"=>jsfile,"css"=>cssfile,"shape"=>shape,"position"=>tile.position,"title"=>title}
+        gr << {"id"=>tile.id,"data_category"=>tile.data_category,"data_content"=>data_content,"js"=>jsfile,"css"=>cssfile,"shape"=>shape,"position"=>tile.position,"title"=>title,"fullsize"=>fullsize,"link"=>link}
       end
       # gr << a
     end