Merge branch 'master' into various_bugs

Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb

app/models/design/css_default.rb

@@ -1,5 +1,8 @@
 class CssDefault < Stylesheet
   
-  belongs_to :design
+  # belongs_to :design
+  # belongs_to :desktop_widget
+
+  belongs_to :css, polymorphic: true
   
 end

app/models/design/design.rb

@@ -8,11 +8,11 @@ class Design
   field :title, :type => String
   field :version, :type => String
 
-  has_one :css_default, :autosave => true, :dependent => :destroy
+  has_one :css_default, as: :css, :autosave => true, :dependent => :destroy
   has_one :layout, :autosave => true, :dependent => :destroy
   has_one :css_reset, :autosave => true, :dependent => :destroy
-  has_many :images, :autosave => true, :dependent => :destroy
-  has_many :javascripts, :autosave => true, :dependent => :destroy
+  has_many :images,as: :imgs, :autosave => true, :dependent => :destroy
+  has_many :javascripts, as: :js, :autosave => true, :dependent => :destroy
   has_many :pages
   has_many :themes, :autosave => true, :dependent => :destroy
 

app/models/design/image.rb

@@ -10,7 +10,10 @@ class Image
   
   mount_uploader :file, ImageUploader
 
-  belongs_to :design
+  # belongs_to :design
+  # belongs_to :desktop_widget
+
+  belongs_to :imgs, polymorphic: true
 
   before_save :set_name
 

app/models/design/javascript.rb

@@ -1,3 +1,6 @@
 class Javascript < DesignFile
-  belongs_to :design
+  # belongs_to :design
+  # belongs_to :desktop_widget
+
+  belongs_to :js, polymorphic: true
 end

app/models/design/stylesheet.rb

@@ -1,36 +1,40 @@
-class Stylesheet < DesignFile
-  belongs_to :design
-  mount_uploader :file_orig, AssetUploader
-  
-  def parse_urls
-    orig_content = content = self.file.read.force_encoding("UTF-8")
-    # self.remove_file!
-    # self.remove_file_orig!
-    names = []
-    images = self.design.images
-    content.scan(/(?<=url)(.*?)(?=\))/){
-      css_name = $1.gsub(' ','').gsub('(','')
-      name = File.basename(css_name).gsub(/[\\\"]/, '')
-      image = images.detect{ |i| i.file_identifier.eql?(name) } rescue nil
-      image.update_attribute(:in_css, true) if image
-      file_name = image.file_url rescue nil
-      names << [css_name, file_name]
-    }
-    names.each do |name|
-      content.gsub!(name[0], name[1]) if name[1]
-    end
-    Dir.mktmpdir('f_path') { |dir|
-      orig_file_name = self.file_identifier
-      
-      temp_file = File.new(dir + '/' + orig_file_name, 'w+')
-      temp_file.write orig_content.force_encoding("UTF-8")
-      self.file_orig = temp_file
-      
-      temp_file = File.new(dir + '/' + orig_file_name, 'w+')
-      temp_file.write content.force_encoding("UTF-8")
-      self.file = temp_file
-      self.save
-    }    
-  end
-  
-end
+class Stylesheet < DesignFile
+  # belongs_to :design
+  mount_uploader :file_orig, AssetUploader
+  
+  def parse_urls
+    orig_content = content = self.file.read.force_encoding("UTF-8")
+    # self.remove_file!
+    # self.remove_file_orig!
+    names = {}
+    images = self.css.images
+    content.scan(/(?<=url)(.*?)(?=\))/){
+      css_name = $1.gsub(' ','').gsub('(','')
+      unless names.has_key?(css_name)
+        name = File.basename(css_name).gsub(/[\\\"]/, '')
+        image = images.detect{ |i| i.file_identifier.eql?(name) } rescue nil
+        if image
+          image.update_attribute(:in_css, true)
+          file_name = image.file_url
+          names.merge!({css_name => file_name})
+        end
+      end
+    }
+    names.each_pair do |key, value|
+      content.gsub!(key, value)
+    end
+    Dir.mktmpdir('f_path') { |dir|
+      orig_file_name = self.file_identifier
+      
+      temp_file = File.new(dir + '/' + orig_file_name, 'w+')
+      temp_file.write orig_content.force_encoding("UTF-8")
+      self.file_orig = temp_file
+      
+      temp_file = File.new(dir + '/' + orig_file_name, 'w+')
+      temp_file.write content.force_encoding("UTF-8")
+      self.file = temp_file
+      self.save
+    }    
+  end
+  
+end

app/models/desktop/desktop.rb

@@ -2,14 +2,15 @@ class Desktop
   include Mongoid::Document
   include Mongoid::Timestamps
   
-  field :theme, default: "4f8d3f493b67fcd05f086359"
+  field :theme, default: "4f8d3f533b67fcd05f08635a"
   field :customtheme
   field :wallpaper
   
   belongs_to :user
+  has_and_belongs_to_many :desktop_widgets, :autosave => true
   
   has_many  :sections, :autosave => true, :dependent => :destroy
-  has_many :desktop_widgets, :autosave => true, :dependent => :destroy
+  # has_many :desktop_widgets, :autosave => true, :dependent => :destroy
 
   before_create :initialize_section
   

app/models/desktop/desktop_widget.rb

@@ -0,0 +1,33 @@
+class DesktopWidget
+	include Mongoid::Document
+  	include Mongoid::Timestamps
+  	include ParserLayoutWidget
+
+  	field :name
+  	field :author
+  	field :shape
+  	field :version, :type => String
+
+  has_one :css_default, as: :css, :autosave => true, :dependent => :destroy
+	has_one :widget_layout, :autosave => true, :dependent => :destroy
+	has_many :images, as: :imgs, :autosave => true, :dependent => :destroy
+	has_many :javascripts, as: :js, :autosave => true, :dependent => :destroy
+  has_and_belongs_to_many :desktops, :autosave => true
+  belongs_to :tiles, :autosave => true
+	
+	accepts_nested_attributes_for :images, :allow_destroy => true
+  accepts_nested_attributes_for :javascripts, :allow_destroy => true
+	
+	after_save :parse_css_for_images
+
+  	# belongs_to :desktop
+
+
+  	protected
+  
+ 	def parse_css_for_images
+	    self.css_default.parse_urls
+	    parse_widget_for_images(self)
+  	end
+
+end

app/models/desktop/group.rb

@@ -0,0 +1,18 @@
+class Group
+  include Mongoid::Document
+  include Mongoid::Timestamps
+  
+  belongs_to :section
+  has_many :tiles, :autosave => true, :dependent => :destroy
+  before_create :initialize_tile
+  
+  def initialize_tile
+    self.tiles.build(data_category: "app", data_content: "quotes", position: 5, shape: "w1 h1", title: "Quotes")
+    self.tiles.build(data_category: "app", data_content: "dailyenglish", position: 6, shape: "w1 h1", title: "Daily English Word")
+    widgets = self.section.desktop.desktop_widgets.collect{|widget| widget.id}
+    for i in 0..3
+      self.tiles.build(data_category: "widget", position: i+1,desktop_widget_id: widgets[i])
+    end
+  end
+end
+ 

app/models/desktop/tile.rb

@@ -9,6 +9,6 @@ class Tile
   field :title
   
   belongs_to :group
-  
-  
+  has_one :desktop_widget
+    
 end

app/models/desktop/widget_layout.rb

@@ -0,0 +1,18 @@
+class WidgetLayout < DesignFile
+ 
+  attr_reader :content
+
+  field :body
+
+  belongs_to :desktop_widget
+  
+
+  def content
+    self.file.read.force_encoding("UTF-8") rescue ''
+  end
+
+  def self.exist_one?
+    WidgetLayout.count > 0
+  end
+  
+end

app/models/desktop_widget.rb

@@ -1,13 +0,0 @@
-class DesktopWidget
-	include Mongoid::Document
-  	include Mongoid::Timestamps
-
-  	field :name
-  	field :author
-  	field :shape
-  	field :desktop_id
-  	field :status
-  	field :section
-
-  	belongs_to :desktop
-end

app/models/group.rb

@@ -1,19 +0,0 @@
-class Group
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  
-  belongs_to :section
-  has_many :tiles, :autosave => true, :dependent => :destroy
-  before_create :initialize_tile
-  
-  def initialize_tile
-    self.tiles.build(data_category: "widget", data_content: "timetable", position: 1, shape: "w2 h2", title: "Tiime Table")
-    self.tiles.build(data_category: "app", data_content: "quotes", position: 2, shape: "w1 h1", title: "Quotes")
-    self.tiles.build(data_category: "widget", data_content: "weather", position: 3, shape: "w2 h2", title: "Weather")
-    self.tiles.build(data_category: "widget", data_content: "clock", position: 4, shape: "w2 h1", title: "Clock")
-    self.tiles.build(data_category: "app", data_content: "dailyenglish", position: 5, shape: "w1 h1", title: "Daily English Word")
-    self.tiles.build(data_category: "widget", data_content: "school_events", position: 6, shape: "w2 h1", title: "School Events")
-  end
-  
-end
- 

app/models/user/attribute.rb

@@ -11,6 +11,7 @@ class Attribute
   has_many :attribute_fields, :autosave => true, :dependent => :destroy
   accepts_nested_attributes_for :attribute_fields, :allow_destroy => true
   
+  
   def is_built_in?
     self.built_in
   end

app/models/user/attribute_field.rb

@@ -5,26 +5,43 @@ class AttributeField
   include ::AttributeFieldsHelper
 
   field :key
-  field :markup 
-  field :markup_value ,:type => Hash
+  field :markup ,:default=>"text_field"
+  field :option_list ,:type => Hash,:default => {}
   field :markup_options,:type => Hash
-  field :locale, :type => Boolean, :default => true
+  # field :locale, :type => Boolean, :default => true
   # field :list_options, :type => Array
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
-  field :add_more,:type => Boolean, :default => false
+  field :to_delete,:type=> Boolean,:default => false
+  field :typeA,:type=> Hash,:default=>{}
+  field :typeB,:type=> Hash,:default=>{}
+  field :typeC,:type=> Hash,:default=>{:claendar=>"west_claendar"}
+  field :typeD,:type=> Hash,:default=>{}
+  field :typeE,:type=> Hash,:default=>{}
+
 
   #field :title, localize: true
 
-  field :locale_title, localize: true
-  field :neutral_title
-  field :neutral_for
+  field :title, localize: true
+  
 
   belongs_to :attribute
   # belongs_to :role
   has_many :attribute_values,:autosave => true, :dependent => :destroy
-  
+  before_save :check_option_list
   # validates_uniqueness_of :key
+  def add_more
+     (get_data["add_more"] == "true" ? true : false) rescue false
+  end
+
+  def locale
+    default = true
+    if get_data["locale"].nil? 
+      return default
+    else
+      (get_data["locale"] == "true"  ? true : false) rescue default
+    end
+  end
 
   def self_defined_markup_options?
     (self.attribute.role.method(self[:key].pluralize.to_sym)  && self.attribute.role.method(self[:key].pluralize+"_for_"+markup)) rescue false
@@ -36,16 +53,16 @@ class AttributeField
     end
   end
 
-  def markup_value
+  def option_list
     if self_defined_markup_options?
       #Class need to have corresponding field and value agent 
      # Ex: For "status" the class must have field called "statuses" for the relation and "statuses_for_select" for the select function 
      method = self.attribute.role.method(self[:key].pluralize+"_for_"+markup)
       return  (method.call rescue {})
-    elsif self[:markup_value].nil?  || (self[:markup_value].empty?)
+    elsif self[:option_list].nil?  || (self[:option_list].empty?)
       return {}
     else
-      return self[:markup_value]
+      return self[:option_list]
     end
   end
 
@@ -68,36 +85,49 @@ class AttributeField
     self.attribute.role
   end
 
-  def title_translations
-    if locale
-      return locale_title_translations
-    else
-      return Hash[VALID_LOCALES.map{|d| [d,neutral_title]}]
-    end
+  def panel
+    panel  = LIST[:markups][self[:markup]]["panel"]
   end
 
-  def title_translations=(var)
-     if locale
-      self.locale_title_translations = var
-    end
+  def get_data
+    self[panel]
   end
 
-  def title
-    if locale
-      return self.locale_title
-    else
-      return self.neutral_title
-    end
-  end
 
-  def title=(var)
-    # binding.pry
-     if locale 
-      self.locale_title = var
-    else
-      self.neutral_title = var
-    end
-  end
+  # def title_translations
+  #   if locale
+  #     return self.locale_title_translations
+  #   else
+  #     return  self[:neutral_title] #Hash[VALID_LOCALES.map{|d| [d,neutral_title]}]
+  #   end
+  # end
+
+  # def title_translations=(var)
+  #    if locale
+  #     self.locale_title_translations = var
+  #   end
+  # end
+
+  # def title
+  #   if locale
+  #     return self.locale_title
+  #   else
+  #     return self.neutral_title
+  #   end
+  # end
+
+  # def check_title
+  #    if locale 
+  #     self.locale_title_translations = self[:temp_title]
+  #   else
+  #     self.neutral_title = self[:temp_title]
+  #   end    
+  #   self.unset("temp_title")
+  # end
+
+  # def title=(var)
+  #    self["temp_title"] = var
+  # end
 
   # # Convert the string list_options into an array
   # def select_list_options=(var)
@@ -117,4 +147,9 @@ class AttributeField
     self.disabled
   end
 
+protected
+  def check_option_list
+    self[:option_list] = self[panel]["option_list"]
+  end
+
 end

app/models/user/attribute_value.rb

@@ -10,11 +10,56 @@ class AttributeValue
   belongs_to :user
 
   before_save :check_key
-
+  before_save :data_proc
   # NO_MULTI_TAG = ["select","date","radio_button","checkbox","date_durnation"]
 
+
+  def data_proc
+    # binding.pry
+    # binding.pry if self.attribute_field.markup == 'radio_button'
+    # if self.attribute_field
+        case self.attribute_field.markup
+        when 'text_field','text_area'
+          # binding.pry
+            self[:temp_data].each{|key,val| 
+              self[key] = val
+            }  unless self[:temp_data].nil?
+          when 'select','date','radio_button'
+            self["val"] = self[:temp_data]
+          when 'checkbox'
+            self["val"] = self[:temp_data].keys rescue {}
+        end #end of case
+      else # if not locale
+        case self.attribute_field.markup
+        when 'text_field','text_area'
+              self["val"] = self[:temp_data]
+          when 'select','date','radio_button'
+            self["val"] = self[:temp_data]
+          when 'checkbox'
+            self["val"] = self[:temp_data].keys rescue {}
+        end #end of case
+    # end #of if self.attribute_field
+    self.unset('temp_data')
+  end
+
+  def value
+    
+    result=""
+    if self.attribute_field.locale && (self.attribute_field.markup == "text_field" || self.attribute_field.markup == "text_area")
+      result= Hash[VALID_LOCALES.collect{|lang|  [lang,self[lang.to_sym]]}]
+    else
+      result = self["val"]  
+    end
+    result
+  end
+
+  def value=(value)
+    #save everything to temp_data waiting for futher process
+    # binding
+    self[:temp_data] = value
+  end
+
   def check_key
-      binding.pry if  attribute_field.nil?
     self.key = attribute_field.key
   end
 
@@ -27,45 +72,46 @@ class AttributeValue
   end
   
   def get_value_by_locale(locale)
+
     case self.attribute_field.markup
       when "text_field"
-        self.attribute_field.locale ? self[locale]  : self[:value]
+        self.attribute_field.locale ? self[locale.to_s]  : self.value
       when "select"
         markup_values = self.attribute_field.self_defined_markup_options? ? self.attribute_field.markup_value : eval(self.attribute_field.markup_value)
-        markup_values[self[:value]][locale.to_s] rescue 'NoData'
+        markup_values[self.value][locale.to_s] rescue 'NoData'
       when "text_area"
-        self.attribute_field.locale ? self[locale]  : self[:value]
+        self.attribute_field.locale ? self[locale.to_s]  : self.value
       when "date"
-        Date.new(self[:value]["(1i)"].to_i,self[:value]["(2i)"].to_i,self[:value]["(3i)"].to_i) rescue nil
+        Date.new(self[:val]["(1i)"].to_i,self[:val]["(2i)"].to_i,self[:val]["(3i)"].to_i) rescue nil
       when "addr"
-        self[:value]
+        self.value
       when "radio_button"
         markup_values = eval(self.attribute_field.markup_value)
-        markup_values[self[:value].first[0]][locale.to_s]
-      when "checkbox"
-        markup_values = eval(self.attribute_field.markup_value)
-        self[:value].keys.collect{|key| markup_values[key][locale.to_s] }.join(",")
+        markup_values[:value][locale.to_s]
+      when "checkbox" 
+        markup_values = self.attribute_field.markup_value
+        self[:value].keys.collect{|key| markup_values[key][locale.to_s]}.join(",")
       when "date_durnation"
-        self[:value]
+        self.value
       else
-        self.attribute_field.locale ? self[locale]  : self[:value]
+        self.attribute_field.locale ? self[locale.to_s]  : self.value
     end
   end
 
-  def get_values
-    unless ['select','checkbox','radio_button'].include?(self.attribute_field.markup )
-      if self.attribute_field.locale && LIST[:markups][self.attribute_field.markup]["muti_lang_input_supprt"]
-        return Hash[VALID_LOCALES.collect{|lang|  [lang,get_value_by_locale(lang.to_sym)]}]
-      else
-          return get_value_by_locale("")
-      end
-    else
-      if self.attribute_field.markup == "select"
-        self[:value]  
-      else
-        self[:value].keys rescue self[:value]
-      end
-    end
-  end
+  # def get_values
+  #   unless ['select','checkbox','radio_button'].include?(self.attribute_field.markup )
+  #     if self.attribute_field.locale && LIST[:markups][self.attribute_field.markup]["muti_lang_input_supprt"]
+  #       return Hash[VALID_LOCALES.collect{|lang|  [lang,get_value_by_locale(lang.to_sym)]}]
+  #     else
+  #         return get_value_by_locale("")
+  #     end
+  #   else
+  #     if self.attribute_field.markup == "select"
+  #       self[:value]  
+  #     else
+  #       self[:value].keys rescue self[:value]
+  #     end
+  #   end
+  # end
 
 end

app/models/user/user.rb

@@ -35,7 +35,8 @@ class User
   before_save :save_roles
   scope :remote_account, where(:nccu_id.ne => nil)
 
-  validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
+  # validates_uniqueness_of :email,:message=> I18n.t("devise.registrations.email_not_unique")
+  
   # def new_attribute_values=(vars)
   #   binding.pry
   # end
@@ -176,7 +177,7 @@ class User
   end
   
   def initialize_desktop
-    self.build_desktop
+   self.build_desktop(desktop_widget_ids: DesktopWidget.all.collect{|widget| widget.id})
   end
   
   protected