Merged conflicts

README.markdown

@@ -30,6 +30,10 @@ Bring Your Own Widgets! It's so easy to create your own widgets! Have a look at
 
 Have a look in the [Wiki](http://wiki.github.com/pusewicz/sonia/).
 
+Initial documentation is available on [YardDoc](http://yardoc.org/docs/pusewicz-sonia).
+
+Follow Sonia on [Twitter](http://www.twitter.com/soniaappcom).
+
 ## Note on Patches/Pull Requests
 
 * Fork the project.

lib/sonia/helpers.rb

@@ -19,5 +19,61 @@ def widget_stylesheets
         file.gsub(File.join(Sonia.root, "widgets"), "/stylesheets")
       end
     end
+
+    def joined_system_javascript
+      files = %w(
+        /javascripts/swfobject.js
+        /javascripts/FABridge.js
+        /javascripts/web_socket.js
+        /javascripts/prototype.js
+        /javascripts/effects.js
+        /javascripts/dragdrop.js
+        /javascripts/livepipe.js
+        /javascripts/window.js
+        /javascripts/resizable.js
+        /javascripts/cookie.js
+        /javascripts/storage.js
+        /javascripts/sonia.js
+        /javascripts/dispatcher.js
+        /javascripts/widget.js
+      )
+
+      joined_javascript files.map { |file| File.join(Sonia.root, "public", file) }
+    end
+
+    def joined_system_css
+      files = %w(
+        /blueprint/reset.css
+        /blueprint/grid.css
+        /stylesheets/sonia.css
+      )
+
+      joined_css files.map { |file| File.join(Sonia.root, "public", file) }
+    end
+
+    def joined_widget_javascript
+      joined_javascript Dir[Sonia.root + "/widgets/*/*.js"]
+    end
+
+    def joined_widget_css
+      joined_javascript Dir[Sonia.root + "/widgets/*/*.css"]
+    end
+
+    def init_javascript
+      File.read(File.join(Sonia.root, "public", "javascripts", "init.js"))
+    end
+
+    private
+    def joined_javascript(files)
+      javascript = ""
+
+      files.each do |file|
+        javascript += "/** #{file} **/\n"
+        javascript += File.read(file)
+      end
+
+      javascript
+    end
+    alias_method :joined_css, :joined_javascript
   end
 end

public/stylesheets/sonia.css

@@ -30,6 +30,15 @@ h1 {
   right: 10px;
   top: 10px;
   background-image: url('/images/project_sonia.png');
+  z-index: 100;
+}
+
+#widgets {
+  overflow: hidden;
+  display: block;
+  width: 100%;
+  height: 100%;
+  position: absolute;
 }
 
 div.widget {

views/index.haml

@@ -3,28 +3,13 @@
   %head
     %title Sonia - Awesome Office Dashboard
     %meta(charset="utf-8")
-    %link(media="screen" rel="stylesheet" type="text/css" href="/blueprint/reset.css")
-    %link(media="screen" rel="stylesheet" type="text/css" href="/stylesheets/sonia.css")
-    - widget_stylesheets.each do |css|
-      %link(media="screen" rel="stylesheet" type="text/css" href=css)
-    %script(type="text/javascript" src="/vendor/swfobject.js")
-    %script(type="text/javascript" src="/vendor/FABridge.js")
-    %script(type="text/javascript" src="/javascripts/web_socket.js")
-    %script(type="text/javascript" src="/vendor/prototype.js")
-    %script(type="text/javascript" src="/vendor/scriptaculous.js")
-    %script(type="text/javascript" src="/vendor/s2.js")
-    %script(type="text/javascript" src="/vendor/livepipe.js")
-    %script(type="text/javascript" src="/vendor/window.js")
-    %script(type="text/javascript" src="/vendor/resizable.js")
-    %script(type="text/javascript" src="/vendor/cookie.js")
-    %script(type="text/javascript" src="/javascripts/storage.js")
-    %script(type="text/javascript" src="/javascripts/sonia.js")
-    %script(type="text/javascript" src="/javascripts/dispatcher.js")
-    %script(type="text/javascript" src="/javascripts/widget.js")
-    %script(type="text/javascript" src="/javascripts/pager.js")
-    - widget_javascripts.each do |js|
-      %script(type="text/javascript" src=js)
-    %script(type="text/javascript" src="/javascripts/init.js")
+    %link(rel="icon" href="favicon.ico" type="image/x-icon")
+    %link(rel="apple-touch-icon" href="/images/sonia_apple_touch.png")
   %body
     %h1 project sonia
     #widgets
+    %style(type="text/css")= joined_system_css
+    %style(type="text/css")= joined_widget_css
+    %script(type="text/javascript")= joined_system_javascript
+    %script(type="text/javascript")= joined_widget_javascript
+    %script(type="text/javascript")= init_javascript