diff --git a/app/assets/javascripts/javascripts b/app/assets/javascripts/javascripts
new file mode 120000
index 00000000..58b551d1
--- /dev/null
+++ b/app/assets/javascripts/javascripts
@@ -0,0 +1 @@
+javascripts
\ No newline at end of file
diff --git a/app/assets/stylesheets/stylesheets b/app/assets/stylesheets/stylesheets
new file mode 120000
index 00000000..b4d32157
--- /dev/null
+++ b/app/assets/stylesheets/stylesheets
@@ -0,0 +1 @@
+stylesheets
\ No newline at end of file
diff --git a/app/controllers/admin/.designs_controller.rb.swp b/app/controllers/admin/.designs_controller.rb.swp
index 2336817e..d81669d2 100644
Binary files a/app/controllers/admin/.designs_controller.rb.swp and b/app/controllers/admin/.designs_controller.rb.swp differ
diff --git a/app/controllers/admin/designs_controller.rb b/app/controllers/admin/designs_controller.rb
index 3231df46..f5026baa 100644
--- a/app/controllers/admin/designs_controller.rb
+++ b/app/controllers/admin/designs_controller.rb
@@ -12,26 +12,28 @@ class Admin::DesignsController < ApplicationController
     temp_file = Tempfile.new("temp_file")
     temp_file.binmode
     original_file = params[:design][:package_file]
-      if original_file.content_type == 'application/zip'
+      #if original_file.content_type == 'application/zip'
         temp_file.write(original_file.read)
-        filename = original_file.original_filename
+        temp_file.rewind
+        filename = File.basename(original_file.original_filename,".zip")
         unzip_design(temp_file, filename)
-      else
-        flash[:error] = "Upload file should be in zip format"
-      end
+      #else
+      #  flash[:error] = "Upload file should be in zip format"
+      #end
       temp_file.close
     end
   end
   def unzip_design(file, zip_name)
     Zip::ZipFile.open(file) { |zip_file|
-      design = Design.new.from_json(zip_file.read("#{zip_name}/#{zip_name}.json"))
-      
+      design = Design.new.from_json(zip_file.read("#{zip_name}/info.json"))
       Dir.mktmpdir('f_path') { |dir|
-        title = design.layout_filename
-        temp_file = File.new(dir + '/' + title, 'w+')
+        title = 'layout.html'  #design.layout_filename  Should be layout file name,set to be fetch
+        temp_file = File.new(dir + '/' + title, 'w+') #dir/zip_name
         temp_file.write zip_file.read(zip_name + '/' + title)
+        debugger
+        design.build_layout
         design.layout = temp_file
-        ['stylesheets', 'javascripts', 'images'].each do |type|
+        ['themes', 'javascripts', 'images'].each do |type|
           eval("design.#{type}").each do |object|
             title = object.file_filename
             temp_file = File.new(dir + '/' + title, 'w+')
@@ -45,19 +47,6 @@ class Admin::DesignsController < ApplicationController
       design.save
     }
   end
-  def proc_package
-    #uri = URI.parse("http://localhost:3001/design/fraisier")
-    #http = Net::HTTP.new(uri.host, uri.port)
-    #request = Net::HTTP::Get.new(uri.request_uri)
-    #response = http.request(request)
-    temp_file = Tempfile.new("temp_file")
-    temp_file.binmode
-    temp_file.write response.body
-    zip_name = response['content-disposition'].split('filename=')[1].gsub(/[\\\"]|.zip/, '') rescue ''
-    unzip_design(temp_file, zip_name)
-    temp_file.close
-  end
-
 
   def index
     @designs = Design.all.entries
@@ -78,17 +67,6 @@ class Admin::DesignsController < ApplicationController
     end
   end
 
-  def apply
-    @design = Design.find(params[:id])
-    Layout.create(:name => @design.title,:description=>@design.intro,:content=>@design.layout.file.read)
-    #TODO do somehting to validate 
-#    doc = Nokogiri::HTML(@design.layout.file.read)
-    flash[:notice] = "Successfully applied design and created a layout."
-    
-    redirect_to admin_designs_url
-
-  end
-
   def edit_file
     @design = Design.find(params[:id])
     filename = params[:filename]
diff --git a/app/models/design.rb b/app/models/design.rb
index 397cf154..78bc51fc 100644
--- a/app/models/design.rb
+++ b/app/models/design.rb
@@ -2,6 +2,7 @@ class Design
   include Mongoid::Document
   include Mongoid::Timestamps
 
+
   field :title
   field :author
   field :intro