Merge branch 'design_team' into ldap

Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

app/models/design/design.rb

@@ -3,10 +3,10 @@ class Design
   include Mongoid::Timestamps
   include ParserLayout
 
-  field :title
-  field :author
-  field :intro
-  field :version
+  field :title, :type => String
+  field :author, :type => String
+  field :intro, :type => String
+  field :version, :type => String
 
   has_many :pages
   

app/models/item.rb

@@ -7,6 +7,8 @@ class Item
   field :full_name, :index => true
   field :position, :type => Integer
   field :is_published, :type => Boolean, :default => false, :index => true
+  field :enabled_for, :type => Array, :default => nil 
+  field :menu_enabled_for, :type => Array, :default => nil 
  
   validates_format_of :name, :with => /^[0-9a-zA-Z\-_]+$/
   validates :name, :exclusion => { :in => LIST[:forbidden_item_names] }
@@ -35,6 +37,21 @@ class Item
     urls = ancestors.map{ |a| a.name } << self.name
     urls.join("/")
   end
+
+  def ordered_children
+    self.children.asc(:position)
+  end
+
+  def ordered_and_visible_children
+    objects = ordered_children
+    a = []
+    if objects
+      objects.each do |object|
+        a << object if object.menu_enabled_for.nil? ? true : object.menu_enabled_for.include?(I18n.locale.to_s)
+      end
+    end
+    a
+  end
   
   protected
   

app/models/meta.rb

@@ -1,15 +0,0 @@
-class Meta
-  
-  include Mongoid::Document
-  include Mongoid::Timestamps
-    
-  field :key
-  field :value, :default => nil
-
-  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
-
-  def get_name_content
-  	[self.key, self.value ? self.value : self.i18n_variable[I18n.locale]]
-  end
-  
-end

app/models/meta/meta.rb

@@ -7,5 +7,13 @@ class Meta
   field :value, :default => nil
 
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
+
+  def get_name_content
+  	[self.key, get_content]
+  end
+
+  def get_content
+  	self.value ? self.value : self.i18n_variable[I18n.locale]
+  end
   
 end

app/models/site.rb

@@ -1,5 +1,7 @@
 class Site
   
+  METAS = ['description', 'keywords']
+
   include Mongoid::Document
   include Mongoid::Timestamps
   
@@ -9,12 +11,17 @@ class Site
   field :roaming_id
   field :private_key, :type => Binary
   field :public_key, :type => Binary
+  field :title_always_on, :type => Boolean, :default => false
   
   field :school
   field :department
 
+  has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
+  has_one :footer, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :site_metas, :autosave => true, :dependent => :destroy
   
+  before_save :set_key
+
   def generate_keys
     private_key = OpenSSL::PKey::RSA.generate(2048)
     self.public_key = private_key.public_key.to_s
@@ -30,5 +37,35 @@ class Site
     res = res.split('rails_3_1').pop.gsub('(', '').gsub(')','').strip rescue nil
     res.eql?('local out of date') ? false : true
   end
+
+  def title
+    @title ||= I18nVariable.first(:conditions => {:key => 'title', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+  end
+
+  def footer
+    @footer ||= I18nVariable.first(:conditions => {:key => 'footer', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
+  end
+
+  METAS.each do |meta|
+    define_method meta do
+      fetch_meta = self.site_metas.where(key: meta).limit(1)
+      fetch_meta.blank? ? nil : fetch_meta[0].i18n_variable
+    end
+    define_method "#{meta}=" do |values|
+      if a = self.send(meta)
+        a.update_attributes(values)
+      else
+        a = self.site_metas.build(key: meta)
+        a.build_i18n_variable(values)
+      end
+    end
+  end
+
+  protected
+  
+  def set_key
+    title.key = 'title' if title && (title.key.blank? rescue true)
+    footer.key = 'footer' if footer && (footer.key.blank? rescue true)
+  end
   
 end