lib/odania/config/layout.rb in odania-0.0.17 vs lib/odania/config/layout.rb in odania-0.0.18

@@ -5,10 +5,15 @@
 
 			def initialize
 				reset
 			end
 
+			def assets
+				return {} if self.styles['_general'].nil? or self.styles['_general'].assets.nil?
+				self.styles['_general'].assets
+			end
+
 			def dump
 				style_data = {}
 				styles.each_pair do |name, style|
 					style_data[name] = style.dump
 				end
@@ -16,14 +21,14 @@
 				result = {}
 				result['styles'] =style_data unless style_data.nil?
 				result
 			end
 
-			def load(data)
+			def load(data, group_name)
 				reset
 				unless data['styles'].nil?
 					data['styles'].each_pair do |key, val|
-						self.styles[key].load(val)
+						self.styles[key].load(val, group_name)
 					end
 				end
 			end
 
 			def reset