diff --git a/Guardfile b/Guardfile
new file mode 100644
index 000000000..4f561da0f
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,22 @@
+guard 'livereload' do
+ watch(%r{app/.+\.(erb|haml)})
+ watch(%r{app/helpers/.+\.rb})
+ watch(%r{public/.+\.(css|js|html)})
+ watch(%r{config/locales/.+\.yml})
+end
+
+guard 'rspec', :version => 2 do
+ watch(%r{^spec/.+_spec\.rb})
+ watch(%r{^lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+ watch('spec/spec_helper.rb') { "spec" }
+
+ # Rails example
+ watch('spec/spec_helper.rb') { "spec" }
+ watch('config/routes.rb') { "spec/routing" }
+ watch('app/controllers/application_controller.rb') { "spec/controllers" }
+ watch(%r{^spec/.+_spec\.rb})
+ watch(%r{^app/(.+)\.rb}) { |m| "spec/#{m[1]}_spec.rb" }
+ watch(%r{^lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+ watch(%r{^app/controllers/(.+)_(controller)\.rb}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/requests/#{m[1]}_spec.rb"] }
+ watch(%r{^app/views/(.+)/}) { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
\ No newline at end of file
diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 17b148413..2b4eb6291 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -332,9 +332,9 @@ var orbitDesktop = function(dom){
if(j==0)$group.attr("id",tile.group_id);
if(tile.data_category == "app")
- $li = $(''+tile.title+' '+tile.title+' '+tile.title+' Loading...
'+tile.title+' Loading...
'.html_safe
@@ -44,36 +49,55 @@ module AttributeFieldsHelper
end
def render_checkbox
+
@prefiled_value ||=[]
- markup_value = eval(self.markup_value) rescue {}
+ # begin
+ # markup_value = eval(self.markup_value)
+ # rescue
+ # markup_value = self.markup_value
+ # ensure
+ # markup_value ||= {}
+ # end
+
control_group_wrapper do
- markup_value.collect do |key,value|
- label_tag(key,check_box_tag(get_field_name_base+"[value][#{key}]", value[I18n.locale.to_s], (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
+ a = self[:option_list].collect do |key,value|
+ label_tag(key,check_box_tag(get_field_name_base+"[#{key}]", true , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
end.join rescue ""
end
end
def render_date
- control_group_wrapper{date_select(get_field_name_base+"[value]",nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
+ #NP
+ control_group_wrapper{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
end
def render_date_durnation #Need re-write low priority
-
+
end
def render_radio_button
@prefiled_value ||=[]
- markup_value = eval(self.markup_value) rescue {}
+ # begin
+ # markup_value = eval(self.markup_value)
+ # rescue
+ # markup_value = self.markup_value
+ # ensure
+ # markup_value ||= {}
+ # end
control_group_wrapper do
- markup_value.collect do |key,value|
- label_tag(key,radio_button_tag(get_field_name_base+"[value][#{key}]", value[I18n.locale.to_s], (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
- end.join rescue ""
+ self[:option_list].collect do |key,value|
+ label_tag(key,radio_button_tag(get_field_name_base, key , (@prefiled_value.include?(key) ? true : false), {})+value[I18n.locale.to_s],@markup_options.merge(:class=>"control-label"))
+ end.join
end
end
def render_select
- markup_value = (self.markup_value.is_a?(Hash) ? self.markup_value : eval(self.markup_value) )rescue {}
- control_group_wrapper{select_tag( get_field_name_base+"[value]",options_for_select(markup_value.collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),@markup_options)} rescue ""
+
+ prompt = @panel_setting[:prompt][I18n.locale] rescue nil
+ @markup_options.merge!(:prompt => prompt) unless prompt.nil?
+ # markup_value = (self.markup_value.is_a?(Hash) ? self.markup_value : eval(self.markup_value) )rescue {}
+ # check self[:option_list].collect{|p| [p[1][I18n.locale.to_s],p[0]]}
+ control_group_wrapper{select_tag( get_field_name_base,options_for_select(self.option_list.collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),@markup_options)} rescue ""
end
def render_text_area
@@ -81,28 +105,35 @@ module AttributeFieldsHelper
if(add_more and value.is_a?(Hash))
values = value
values.each_with_index.collect do |value,index|
- text_area_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options)
+ place_holder= @panel_setting["placeholder"][key]
+ text_area_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options.merge(:placeholder=>place_holder))
end.join.html_safe
else
value = can_muti_lang_input ? @prefiled_value[key] : @prefiled_value
- key = can_muti_lang_input ? "[#{key}]" : "[value]"
- text_area_tag(get_field_name_base + key, value,@markup_options)
+ key = can_muti_lang_input ? "[#{key}]" : ""
+ place_holder= @panel_setting["placeholder"][I18n.locale.to_s] rescue ''
+ text_area_tag(get_field_name_base + key, value,@markup_options.merge(:placeholder=>place_holder))
end
end
end
def render_text_field
control_group_wrapper do |key,value|
- if(add_more and value.is_a?(Hash))
+ if(add_more)
values = value
- values.each_with_index.collect do |value,index|
-
- text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options)
- end.join.html_safe
+ result = ""
+ unless values.nil?
+ result = values.each_with_index.collect do |value,index|
+ place_holder= @panel_setting["placeholder"][key]
+ text_field_tag(get_field_name_base + (key.nil? ? '' : "[#{key}][#{index}]"), value.last,@markup_options.merge(:placeholder=>place_holder))
+ end.join.html_safe
+ end
+ result
else
- value = can_muti_lang_input ? @prefiled_value[key] : @prefiled_value
- key = can_muti_lang_input ? "[#{key}]" : "[value]"
- text_field_tag(get_field_name_base + key, value,@markup_options)
+ value = (can_muti_lang_input ? @prefiled_value[key] : @prefiled_value) rescue nil
+ key_field = can_muti_lang_input ? "[#{key}]" : ""
+ place_holder= @panel_setting["placeholder"][key] rescue ''
+ text_field_tag(get_field_name_base + key_field, value,@markup_options.merge(:placeholder=>place_holder))
end
end
end
@@ -121,12 +152,14 @@ protected
if can_muti_lang_input
result << "
"
result << "
"
+
VALID_LOCALES.collect do |key|
value = @prefiled_value[key.to_s] rescue nil
div_class = ["tab-pane" ,"fade"].join(" ")
div_class << (key == I18n.locale.to_s ? " active in" : '')
result << content_tag(:div,yield(key,value),:class=>div_class,:id=>"tab"+id.to_s+"_#{key}")
end
+
result << "
"
result << "
"
VALID_LOCALES.each do |key|
@@ -161,15 +194,13 @@ protected
def end_block
if @new_attribute
- hidden_field_tag(get_field_name_base+"[attribute_field_id]",id,:for=>"field_#{@index}")
+ hidden_field_tag(get_basic_field_name_base+"[attribute_field_id]",id,:for=>"field_#{@index}")
else
- hidden_field_tag(get_field_name_base+"[id]",@attribute_value.id,:for=>"field_#{@index}")
+ hidden_field_tag(get_basic_field_name_base+"[id]",@attribute_value.id,:for=>"field_#{@index}")
end
end
- def get_field_name_base
- # "user[#{self.attribute._type.downcase.pluralize}][#{self.attribute._id.to_s}][attribute_values][#{attribute_value.id}]"
- # binding.pry if @attribute_value[:key] == 'status'
+ def get_basic_field_name_base
if @new_attribute
"user[new_attribute_values][#{@index}]"
else
@@ -177,12 +208,16 @@ protected
end
end
+ def get_field_name_base
+ get_basic_field_name_base + "[value]"
+ end
+
def label
- label_tag(key,title,:class=>"control-label")
+ label_tag(key,title,:class=>"control-label",:func => "field_label")
end
def can_muti_lang_input
- locale and LIST[:markups][markup]["muti_lang_input_supprt"]
+ LIST[:markups][markup]["muti_lang_input_supprt"] #and locale
end
def can_add_more
diff --git a/app/models/design/css_default.rb b/app/models/design/css_default.rb
index 3ee5a58c0..bd4baa8ca 100644
--- a/app/models/design/css_default.rb
+++ b/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
diff --git a/app/models/design/design.rb b/app/models/design/design.rb
index c9d87982a..54870a896 100644
--- a/app/models/design/design.rb
+++ b/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
diff --git a/app/models/design/image.rb b/app/models/design/image.rb
index 91c4a733f..d1a57d7fb 100644
--- a/app/models/design/image.rb
+++ b/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
diff --git a/app/models/design/javascript.rb b/app/models/design/javascript.rb
index 439e3b982..808679d77 100644
--- a/app/models/design/javascript.rb
+++ b/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
diff --git a/app/models/design/stylesheet.rb b/app/models/design/stylesheet.rb
index 525e40f3f..5e9a57750 100644
--- a/app/models/design/stylesheet.rb
+++ b/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
diff --git a/app/models/desktop.rb b/app/models/desktop/desktop.rb
similarity index 70%
rename from app/models/desktop.rb
rename to app/models/desktop/desktop.rb
index e8c1e9c44..6633005f4 100644
--- a/app/models/desktop.rb
+++ b/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
diff --git a/app/models/desktop_theme.rb b/app/models/desktop/desktop_theme.rb
similarity index 100%
rename from app/models/desktop_theme.rb
rename to app/models/desktop/desktop_theme.rb
diff --git a/app/models/desktop/desktop_widget.rb b/app/models/desktop/desktop_widget.rb
new file mode 100644
index 000000000..feb40aa7b
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/app/models/desktop/group.rb b/app/models/desktop/group.rb
new file mode 100644
index 000000000..2c1992f00
--- /dev/null
+++ b/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
+
\ No newline at end of file
diff --git a/app/models/other_account.rb b/app/models/desktop/other_account.rb
similarity index 100%
rename from app/models/other_account.rb
rename to app/models/desktop/other_account.rb
diff --git a/app/models/section.rb b/app/models/desktop/section.rb
similarity index 100%
rename from app/models/section.rb
rename to app/models/desktop/section.rb
diff --git a/app/models/tile.rb b/app/models/desktop/tile.rb
similarity index 86%
rename from app/models/tile.rb
rename to app/models/desktop/tile.rb
index 70066d1be..91840d8a4 100644
--- a/app/models/tile.rb
+++ b/app/models/desktop/tile.rb
@@ -9,6 +9,6 @@ class Tile
field :title
belongs_to :group
-
-
+ has_one :desktop_widget
+
end
diff --git a/app/models/desktop/widget_layout.rb b/app/models/desktop/widget_layout.rb
new file mode 100644
index 000000000..5bf24805f
--- /dev/null
+++ b/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
diff --git a/app/models/desktop_widget.rb b/app/models/desktop_widget.rb
deleted file mode 100644
index eb0446ded..000000000
--- a/app/models/desktop_widget.rb
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/app/models/group.rb b/app/models/group.rb
deleted file mode 100644
index 7346ad1ec..000000000
--- a/app/models/group.rb
+++ /dev/null
@@ -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
-
\ No newline at end of file
diff --git a/app/models/user/attribute.rb b/app/models/user/attribute.rb
index faa5876a0..c0970863f 100644
--- a/app/models/user/attribute.rb
+++ b/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
diff --git a/app/models/user/attribute_field.rb b/app/models/user/attribute_field.rb
index 0d9999b33..a94a38a28 100644
--- a/app/models/user/attribute_field.rb
+++ b/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
diff --git a/app/models/user/attribute_value.rb b/app/models/user/attribute_value.rb
index a1eb54668..d6500fbf1 100644
--- a/app/models/user/attribute_value.rb
+++ b/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
diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index 5893dae2f..4f645f3bf 100644
--- a/app/models/user/user.rb
+++ b/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
diff --git a/app/views/admin/attributes/edit.html.erb b/app/views/admin/attributes/edit.html.erb
index d45382f63..da1591341 100644
--- a/app/views/admin/attributes/edit.html.erb
+++ b/app/views/admin/attributes/edit.html.erb
@@ -1,14 +1,139 @@
-<% content_for :secondary do %>
- <%= render 'admin/users/side_bar' %>
+ <%= form_for @attribute,:url => admin_info_path(@attribute) ,:class=> "form-horizontal" do |f| %>
+
+
+
<%= t("admin.info")%>
+
+
+
+
<%= t("admin.attributes")%>
+
- <%= form_for @attribute, :url => eval("admin_#{@attribute_type}_path(@attribute)") do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "admin/#{@attribute_type}s/form", :locals => { :f => f, :is_new => false } %>
-
- <%= link_back %>
- <%= link_to t('update'), "#", :onclick=>"$('#edit_#{@attribute_type}_#{@attribute.id}').submit()" %>
-
- <% end %>
-
+ <%= hidden_field_tag "#{temp_field_name}[count]",((values.keys.collect{|t| t.to_i}.max rescue nil) || 0 ),:class=>"list_count"%>
+ <%= hidden_field_tag "#{temp_field_name}[name]",field_name,:class=>"field_name"%>
+
<%= t("admin.infos.list")%>
+
+
+
<%= (defined? label_ext) ? label_ext : t("admin.infos.placeholder") %>
+
+
+
+ <% @site_valid_locales.each do |locale| %>
+ <% active = (locale == @site_valid_locales.first ? "active in" : "'") %>
+ <%= content_tag :div,:class=>"tab-pane fade #{active}",:id=>"#{name_to_id(field_name)}_#{locale}" do%>
+ <% value = values[locale.to_s] rescue nil%>
+ <%= text_field(field_name, locale,:value=>value,:placeholder=>t("langs.#{locale}")) %>
+ <% end %>
+ <% end %>
+
+
+ <% @site_valid_locales.each do |locale| %>
+ <% active = (locale == @site_valid_locales.first ? "active" : "'") %>
+ <%=content_tag :li,:class=>active do %>
+ <%= link_to t("langs.#{locale}"),"##{name_to_id(field_name)}_#{locale}",:data=>{:toggle=>"tab"}%>
+ <% end %>
+ <% end %>
+
+
+
Upload Widget Package
+
+ <%= form_tag '',:multipart => true,:action=>"post" do |f| %>
+
+
+ <%= file_field :desktop_widget,:package_file %>
+
+ <%= submit_tag %>
+
+ <% end %>
+
+
-
-
-
- 29 °C
-
-
Sunny
-
-
- weekly report
-
-
Hsin-Chu
-
> Weekly Report
-
-
\ No newline at end of file
+.clock{
+ /* The .clock div. Created dynamically by jQuery */
+ background-color:#111;
+ height:75px;
+ width:75px;
+ position:relative;
+ overflow:hidden;
+ float:left;
+}
+
+.clock .rotate{
+ /* There are two .rotate divs - one for each half of the background */
+ position:absolute;
+ width:75px;
+ height:75px;
+ top:0;
+ left:0;
+}
+
+.rotate.right{
+ display:none;
+ z-index:9;
+}
+
+.clock .bg, .clock .front{
+ width:37.5px;
+ height:75px;
+ background-color:#111;
+ position:absolute;
+ top:0;
+}
+
+.clock .display{
+ /* Holds the number of seconds, minutes or hours respectfully */
+ position:absolute;
+ width:75px;
+ font-family: Orbitron, sans-serif;
+ z-index:17;
+ color:#F5F5F5;
+ font-size:21px;
+ text-align:center;
+ top:27.5px;
+ left:0px;
+
+}
+
+/* The left part of the background: */
+
+.clock .bg.left{ left:0px; }
+
+/* Individual styles for each color: */
+.orange .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat left top; }
+.green .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat left top; }
+.blue .bg.left{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat left top; }
+
+/* The right part of the background: */
+.clock .bg.right{ left:37.5px; }
+
+.orange .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png) no-repeat right top; }
+.green .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png) no-repeat right top; }
+.blue .bg.right{ background:url(desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png) no-repeat right top; }
+
+
+.clock .front.left{
+ left:0;
+ z-index:15;
+}
+#fancyClock {
+ position: absolute;
+ overflow: hidden;
+ top: 50%;
+ left: 50%;
+ margin: -36px 0 0 -114px;
+}
\ No newline at end of file
diff --git a/public/desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png b/public/desktop_widgets/clock/images/bg_blue.png
similarity index 100%
rename from public/desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_blue.png
rename to public/desktop_widgets/clock/images/bg_blue.png
diff --git a/public/desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png b/public/desktop_widgets/clock/images/bg_green.png
similarity index 100%
rename from public/desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_green.png
rename to public/desktop_widgets/clock/images/bg_green.png
diff --git a/public/desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png b/public/desktop_widgets/clock/images/bg_orange.png
similarity index 100%
rename from public/desktop_widgets/4fa7810ac88514014d7c59bc/img/bg_orange.png
rename to public/desktop_widgets/clock/images/bg_orange.png
diff --git a/public/desktop_widgets/4fa7810ac88514014d7c59bc/4fa7810ac88514014d7c59bc.js b/public/desktop_widgets/clock/javascripts/clock.js
similarity index 100%
rename from public/desktop_widgets/4fa7810ac88514014d7c59bc/4fa7810ac88514014d7c59bc.js
rename to public/desktop_widgets/clock/javascripts/clock.js
diff --git a/public/desktop_widgets/clock/settings.json b/public/desktop_widgets/clock/settings.json
new file mode 100644
index 000000000..8aa41d20f
--- /dev/null
+++ b/public/desktop_widgets/clock/settings.json
@@ -0,0 +1,7 @@
+{
+ "author" : "Harry",
+ "name" : "Clock",
+ "shape" : "w2 h1",
+ "version" : "1.0"
+
+}
diff --git a/public/desktop_widgets/clock/widget.html b/public/desktop_widgets/clock/widget.html
new file mode 100755
index 000000000..aeb6a444f
--- /dev/null
+++ b/public/desktop_widgets/clock/widget.html
@@ -0,0 +1,5 @@
+
+
\ No newline at end of file
diff --git a/public/desktop_widgets/4fa78140c88514014d7c59be/index.html.erb b/public/desktop_widgets/googlesearch/default.css
old mode 100644
new mode 100755
similarity index 59%
rename from public/desktop_widgets/4fa78140c88514014d7c59be/index.html.erb
rename to public/desktop_widgets/googlesearch/default.css
index 341b8d81b..1aede9453
--- a/public/desktop_widgets/4fa78140c88514014d7c59be/index.html.erb
+++ b/public/desktop_widgets/googlesearch/default.css
@@ -1,4 +1,3 @@
-
-
-
-
-
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/public/desktop_widgets/4fa78140c88514014d7c59be/img/google_64.png b/public/desktop_widgets/googlesearch/images/google_64.png
similarity index 100%
rename from public/desktop_widgets/4fa78140c88514014d7c59be/img/google_64.png
rename to public/desktop_widgets/googlesearch/images/google_64.png
diff --git a/public/desktop_widgets/4fa78140c88514014d7c59be/4fa78140c88514014d7c59be.js b/public/desktop_widgets/googlesearch/javascripts/google.js
similarity index 100%
rename from public/desktop_widgets/4fa78140c88514014d7c59be/4fa78140c88514014d7c59be.js
rename to public/desktop_widgets/googlesearch/javascripts/google.js
diff --git a/public/desktop_widgets/googlesearch/settings.json b/public/desktop_widgets/googlesearch/settings.json
new file mode 100644
index 000000000..ddb527274
--- /dev/null
+++ b/public/desktop_widgets/googlesearch/settings.json
@@ -0,0 +1,7 @@
+{
+ "author" : "Eric",
+ "name" : "Google Search",
+ "shape" : "w2 h1",
+ "version" : "1.0"
+
+}
diff --git a/public/desktop_widgets/googlesearch/widget.html b/public/desktop_widgets/googlesearch/widget.html
new file mode 100644
index 000000000..df5c715bc
--- /dev/null
+++ b/public/desktop_widgets/googlesearch/widget.html
@@ -0,0 +1,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/public/desktop_widgets/4fa78161c88514014d7c59c0/4fa78161c88514014d7c59c0.js b/public/desktop_widgets/timetable/4fa78161c88514014d7c59c0.js
similarity index 100%
rename from public/desktop_widgets/4fa78161c88514014d7c59c0/4fa78161c88514014d7c59c0.js
rename to public/desktop_widgets/timetable/4fa78161c88514014d7c59c0.js
diff --git a/public/desktop_widgets/4fa78161c88514014d7c59c0/index.html.erb b/public/desktop_widgets/timetable/index.html.erb
similarity index 100%
rename from public/desktop_widgets/4fa78161c88514014d7c59c0/index.html.erb
rename to public/desktop_widgets/timetable/index.html.erb
diff --git a/public/desktop_widgets/weather/default.css b/public/desktop_widgets/weather/default.css
new file mode 100644
index 000000000..ef65207d4
--- /dev/null
+++ b/public/desktop_widgets/weather/default.css
@@ -0,0 +1,26 @@
+.g_weather { position: relative; height: 198px; }
+ .g_weather img { float: left; display: block; margin: 0; padding: 12px; }
+ .g_weather .gw_recent {
+ overflow: hidden;
+ height: 96%;
+ padding-top: 4%;
+ }
+ .g_weather .gw_weekly { display: none; }
+ .g_weather .gw_location {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ font-size: 15px;
+ line-height: 20px;
+ }
+ .g_weather .gw_condition_des { font-size: 22px; }
+ .g_weather .gw_temp { margin-top: 26px; }
+ .g_weather .gw_temp_num { font-size: 56px; }
+ .g_weather .gw_temp_unit { font-size: 26px; }
+ .g_weather .gw_forecast {
+ position: absolute;
+ right: 0;
+ bottom: 0;
+ font-size: 13px;
+ line-height: 20px;
+}
\ No newline at end of file
diff --git a/public/desktop_widgets/4fa7817cc88514014d7c59c2/img/sunny.png b/public/desktop_widgets/weather/images/sunny.png
similarity index 100%
rename from public/desktop_widgets/4fa7817cc88514014d7c59c2/img/sunny.png
rename to public/desktop_widgets/weather/images/sunny.png
diff --git a/public/desktop_widgets/4fa7817cc88514014d7c59c2/4fa7817cc88514014d7c59c2.js b/public/desktop_widgets/weather/javascripts/weather.js
similarity index 100%
rename from public/desktop_widgets/4fa7817cc88514014d7c59c2/4fa7817cc88514014d7c59c2.js
rename to public/desktop_widgets/weather/javascripts/weather.js
diff --git a/public/desktop_widgets/weather/settings.json b/public/desktop_widgets/weather/settings.json
new file mode 100644
index 000000000..67e5a3788
--- /dev/null
+++ b/public/desktop_widgets/weather/settings.json
@@ -0,0 +1,7 @@
+{
+ "author" : "Devin",
+ "name" : "Weather",
+ "shape" : "w2 h2",
+ "version" : "0.0"
+
+}
diff --git a/public/desktop_widgets/weather/widget.html b/public/desktop_widgets/weather/widget.html
new file mode 100644
index 000000000..8cc412f24
--- /dev/null
+++ b/public/desktop_widgets/weather/widget.html
@@ -0,0 +1,17 @@
+
+
+
+
+ 29 °C
+
+
Sunny
+
+
+ weekly report
+
+
Hsin-Chu
+
> Weekly Report
+
+
+
+ <%= t('bulletin.category') %>
+ <%= t('bulletin.title') %>
+ <%= t('bulletin.start_date') %>
+ <%= t('bulletin.end_date') %>
+ <%= t('bulletin.tags') %>
+ <% if not @user%>
+ <%= t('bulletin.last_modified') %>
+ <% end %>
+
+
+
+ <% @bulletins.each do |bulletin| %>
+
+ <%= bulletin.bulletin_category.title%>
+
+ <% if bulletin.is_checked? %>
+ <%= link_to bulletin.title, panel_announcement_front_end_bulletin_path(bulletin, :category_id => bulletin.bulletin_category.id) rescue ''%>
+ <% else %>
+ <%= bulletin.title%>
+ <% end %>
+
+ <%= display_date_time(bulletin.postdate) %>
+ <% if not bulletin.deadline.nil?%>
+ <%= display_date_time(bulletin.deadline) %>
+ <%else%>
+ <%= t('bulletin.no_deadline') %>
+ <% end %>
+
+
+ <% bulletin.sorted_tags.each do |tag| %>
+ <%= tag[I18n.locale] %>
+ <% end %>
+
+
+ <% if not @user%>
+ <%= User.find(bulletin.create_user_id).name %>
+ <% end %>
+
+ <% end %>
+
+
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb
index f9aba371d..beed6b8ab 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_file_categorys_controller.rb
@@ -37,7 +37,6 @@ class Panel::Archive::BackEnd::ArchiveFileCategorysController < OrbitBackendCont
# GET /archive_files/1/edit
def edit
@archive_file_category = ArchiveFileCategory.find(params[:id])
- @i18n_variable = @archive_file_category.i18n_variable
@url = panel_archive_back_end_archive_file_category_path(@archive_file_category)
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
index a4804bb56..0336c11b7 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/back_end/archive_files_controller.rb
@@ -55,7 +55,6 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
# POST /archive_files.xml
def create
@archive_file = ArchiveFile.new(params[:archive_file])
-
@archive_file.create_user_id = current_user.id
@archive_file.update_user_id = current_user.id
@@ -64,6 +63,8 @@ class Panel::Archive::BackEnd::ArchiveFilesController < OrbitBackendController
format.html { redirect_to(panel_archive_back_end_archive_files_url) }
format.xml { render :xml => @archive_file, :status => :created, :location => @archive_file }
else
+ get_categorys
+ get_tags
format.html { render :action => "new" }
format.xml { render :xml => @archive_file.errors, :status => :unprocessable_entity }
end
diff --git a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
index 594b73488..a436f5a9d 100644
--- a/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
+++ b/vendor/built_in_modules/archive/app/controllers/panel/archive/front_end/archive_files_controller.rb
@@ -9,7 +9,7 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
@item = Page.find(params[:page_id])
- @title = @item.i18n_variable[I18n.locale]
+ @title = @item.title
if @item.frontend_data_count
@page_num = @item.frontend_data_count
@@ -41,7 +41,7 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
@item = Page.find(params[:page_id])
- @title = @item.i18n_variable[I18n.locale]
+ @title = @item.title
@archive_file = ArchiveFile.find(params[:id])
@@ -55,7 +55,7 @@ class Panel::Archive::FrontEnd::ArchiveFilesController < OrbitWidgetController
@item = Page.find(params[:page_id])
- @title = @item.i18n_variable[I18n.locale]
+ @title = @item.title
if @item.frontend_data_count
@page_num = @item.frontend_data_count
diff --git a/vendor/built_in_modules/archive/app/models/archive_file.rb b/vendor/built_in_modules/archive/app/models/archive_file.rb
index 9cf2eedd5..2d53e7ffb 100644
--- a/vendor/built_in_modules/archive/app/models/archive_file.rb
+++ b/vendor/built_in_modules/archive/app/models/archive_file.rb
@@ -26,7 +26,7 @@ class ArchiveFile
accepts_nested_attributes_for :archive_file_multiples, :allow_destroy => true
- validates_presence_of :title
+ validates :title, :at_least_one => true
after_save :save_archive_file_multiples
diff --git a/vendor/built_in_modules/archive/app/models/archive_file_category.rb b/vendor/built_in_modules/archive/app/models/archive_file_category.rb
index abb08bd36..f3d2fcd95 100644
--- a/vendor/built_in_modules/archive/app/models/archive_file_category.rb
+++ b/vendor/built_in_modules/archive/app/models/archive_file_category.rb
@@ -7,8 +7,10 @@ class ArchiveFileCategory
field :key
- has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
+ field :title, localize: true
has_many :archive_files
+
+ validates :title, :at_least_one => true
end
\ No newline at end of file
diff --git a/vendor/built_in_modules/archive/app/models/archive_file_multiple.rb b/vendor/built_in_modules/archive/app/models/archive_file_multiple.rb
index 0ac3070b2..9dc833632 100644
--- a/vendor/built_in_modules/archive/app/models/archive_file_multiple.rb
+++ b/vendor/built_in_modules/archive/app/models/archive_file_multiple.rb
@@ -9,8 +9,6 @@ class ArchiveFileMultiple
# field :description
field :choose_lang, :type => Array, :default => nil
- # has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
-
field :should_destroy, :type => Boolean
def choose_lang_display(lang)
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb
index c6bf4616c..d8c5e8e1b 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_archive_file_category.html.erb
@@ -11,6 +11,6 @@
<% @site_valid_locales.each do |locale| %>
- <%= archive_file_category.i18n_variable[locale] rescue nil %>
+ <%= archive_file_category.title_translations[locale] rescue nil %>
<% end %>
\ No newline at end of file
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb
index f79bbab06..345390df6 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_file_categorys/_form.html.erb
@@ -10,12 +10,12 @@
- <%= post.archive_file_category.i18n_variable[I18n.locale] %>
+ <%= post.archive_file_category.title %>
<%= link_to post.title, panel_archive_front_end_archive_file_path(post) %>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
index e6c93f1f0..bd080e1e5 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
@@ -43,7 +43,7 @@
<%= f.label :category %>
- <%= f.select :archive_file_category_id, @archive_file_categorys.collect {|t| [ t.i18n_variable[I18n.locale], t.id ]} %>
+ <%= f.select :archive_file_category_id, @archive_file_categorys.collect {|t| [ t.title, t.id ]} %>
<% @site_valid_locales.each_with_index do |locale, i| %>
@@ -74,7 +74,7 @@
-
+
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-fp.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-fp.js
deleted file mode 100644
index 634fb5e4e..000000000
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-fp.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * jQuery File Upload File Processing Plugin 1.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document */
-
-(function (factory) {
- 'use strict';
- if (typeof define === 'function' && define.amd) {
- // Register as an anonymous AMD module:
- define([
- 'jquery',
- 'load-image',
- 'canvas-to-blob',
- './jquery.fileupload'
- ], factory);
- } else {
- // Browser globals:
- factory(
- window.jQuery,
- window.loadImage
- );
- }
-}(function ($, loadImage) {
- 'use strict';
-
- // The File Upload IP version extends the basic fileupload widget
- // with file processing functionality:
- $.widget('blueimpFP.fileupload', $.blueimp.fileupload, {
-
- options: {
- // The list of file processing actions:
- process: [
- /*
- {
- action: 'load',
- fileTypes: /^image\/(gif|jpeg|png)$/,
- maxFileSize: 20000000 // 20MB
- },
- {
- action: 'resize',
- maxWidth: 1920,
- maxHeight: 1200,
- minWidth: 800,
- minHeight: 600
- },
- {
- action: 'save'
- }
- */
- ],
-
- // The add callback is invoked as soon as files are added to the
- // fileupload widget (via file input selection, drag & drop or add
- // API call). See the basic file upload widget for more information:
- add: function (e, data) {
- $(this).fileupload('process', data).done(function () {
- data.submit();
- });
- }
- },
-
- processActions: {
- // Loads the image given via data.files and data.index
- // as canvas element.
- // Accepts the options fileTypes (regular expression)
- // and maxFileSize (integer) to limit the files to load:
- load: function (data, options) {
- var that = this,
- file = data.files[data.index],
- dfd = $.Deferred();
- if (window.HTMLCanvasElement &&
- window.HTMLCanvasElement.prototype.toBlob &&
- ($.type(options.maxFileSize) !== 'number' ||
- file.size < options.maxFileSize) &&
- (!options.fileTypes ||
- options.fileTypes.test(file.type))) {
- loadImage(
- file,
- function (canvas) {
- data.canvas = canvas;
- dfd.resolveWith(that, [data]);
- },
- {canvas: true}
- );
- } else {
- dfd.rejectWith(that, [data]);
- }
- return dfd.promise();
- },
- // Resizes the image given as data.canvas and updates
- // data.canvas with the resized image.
- // Accepts the options maxWidth, maxHeight, minWidth and
- // minHeight to scale the given image:
- resize: function (data, options) {
- if (data.canvas) {
- var canvas = loadImage.scale(data.canvas, options);
- if (canvas.width !== data.canvas.width ||
- canvas.height !== data.canvas.height) {
- data.canvas = canvas;
- data.processed = true;
- }
- }
- return data;
- },
- // Saves the processed image given as data.canvas
- // inplace at data.index of data.files:
- save: function (data, options) {
- // Do nothing if no processing has happened:
- if (!data.canvas || !data.processed) {
- return data;
- }
- var that = this,
- file = data.files[data.index],
- name = file.name,
- dfd = $.Deferred(),
- callback = function (blob) {
- if (!blob.name) {
- if (file.type === blob.type) {
- blob.name = file.name;
- } else if (file.name) {
- blob.name = file.name.replace(
- /\..+$/,
- '.' + blob.type.substr(6)
- );
- }
- }
- // Store the created blob at the position
- // of the original file in the files list:
- data.files[data.index] = blob;
- dfd.resolveWith(that, [data]);
- };
- // Use canvas.mozGetAsFile directly, to retain the filename, as
- // Gecko doesn't support the filename option for FormData.append:
- if (data.canvas.mozGetAsFile) {
- callback(data.canvas.mozGetAsFile(
- (/^image\/(jpeg|png)$/.test(file.type) && name) ||
- ((name && name.replace(/\..+$/, '')) ||
- 'blob') + '.png',
- file.type
- ));
- } else {
- data.canvas.toBlob(callback, file.type);
- }
- return dfd.promise();
- }
- },
-
- // Resizes the file at the given index and stores the created blob at
- // the original position of the files list, returns a Promise object:
- _processFile: function (files, index, options) {
- var that = this,
- dfd = $.Deferred().resolveWith(that, [{
- files: files,
- index: index
- }]),
- chain = dfd.promise();
- that._processing += 1;
- $.each(options.process, function (i, settings) {
- chain = chain.pipe(function (data) {
- return that.processActions[settings.action]
- .call(this, data, settings);
- });
- });
- chain.always(function () {
- that._processing -= 1;
- if (that._processing === 0) {
- that.element
- .removeClass('fileupload-processing');
- }
- });
- if (that._processing === 1) {
- that.element.addClass('fileupload-processing');
- }
- return chain;
- },
-
- // Processes the files given as files property of the data parameter,
- // returns a Promise object that allows to bind a done handler, which
- // will be invoked after processing all files (inplace) is done:
- process: function (data) {
- var that = this,
- options = $.extend({}, this.options, data);
- if (options.process && options.process.length &&
- this._isXHRUpload(options)) {
- $.each(data.files, function (index, file) {
- that._processingQueue = that._processingQueue.pipe(
- function () {
- var dfd = $.Deferred();
- that._processFile(data.files, index, options)
- .always(function () {
- dfd.resolveWith(that);
- });
- return dfd.promise();
- }
- );
- });
- }
- return this._processingQueue;
- },
-
- _create: function () {
- $.blueimp.fileupload.prototype._create.call(this);
- this._processing = 0;
- this._processingQueue = $.Deferred().resolveWith(this)
- .promise();
- }
-
- });
-
-}));
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-ui.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-ui.js
deleted file mode 100644
index 4c36f0086..000000000
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload-ui.js
+++ /dev/null
@@ -1,736 +0,0 @@
-/*
- * jQuery File Upload User Interface Plugin 6.9.4
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document, URL, webkitURL, FileReader */
-
-(function (factory) {
- 'use strict';
- if (typeof define === 'function' && define.amd) {
- // Register as an anonymous AMD module:
- define([
- 'jquery',
- 'tmpl',
- 'load-image',
- './jquery.fileupload-fp'
- ], factory);
- } else {
- // Browser globals:
- factory(
- window.jQuery,
- window.tmpl,
- window.loadImage
- );
- }
-}(function ($, tmpl, loadImage) {
- 'use strict';
-
- // The UI version extends the FP (file processing) version or the basic
- // file upload widget and adds complete user interface interaction:
- var parentWidget = ($.blueimpFP || $.blueimp).fileupload;
- $.widget('blueimpUI.fileupload', parentWidget, {
-
- options: {
- // By default, files added to the widget are uploaded as soon
- // as the user clicks on the start buttons. To enable automatic
- // uploads, set the following option to true:
- autoUpload: false,
- // The following option limits the number of files that are
- // allowed to be uploaded using this widget:
- maxNumberOfFiles: undefined,
- // The maximum allowed file size:
- maxFileSize: undefined,
- // The minimum allowed file size:
- minFileSize: undefined,
- // The regular expression for allowed file types, matches
- // against either file type or file name:
- acceptFileTypes: /.+$/i,
- // The regular expression to define for which files a preview
- // image is shown, matched against the file type:
- previewSourceFileTypes: /^image\/(gif|jpeg|png)$/,
- // The maximum file size of images that are to be displayed as preview:
- previewSourceMaxFileSize: 5000000, // 5MB
- // The maximum width of the preview images:
- previewMaxWidth: 80,
- // The maximum height of the preview images:
- previewMaxHeight: 80,
- // By default, preview images are displayed as canvas elements
- // if supported by the browser. Set the following option to false
- // to always display preview images as img elements:
- previewAsCanvas: true,
- // The ID of the upload template:
- uploadTemplateId: 'template-upload',
- // The ID of the download template:
- downloadTemplateId: 'template-download',
- // The container for the list of files. If undefined, it is set to
- // an element with class "files" inside of the widget element:
- filesContainer: undefined,
- // By default, files are appended to the files container.
- // Set the following option to true, to prepend files instead:
- prependFiles: false,
- // The expected data type of the upload response, sets the dataType
- // option of the $.ajax upload requests:
- dataType: 'json',
-
- // The add callback is invoked as soon as files are added to the fileupload
- // widget (via file input selection, drag & drop or add API call).
- // See the basic file upload widget for more information:
- add: function (e, data) {
- var that = $(this).data('fileupload'),
- options = that.options,
- files = data.files;
- $(this).fileupload('process', data).done(function () {
- that._adjustMaxNumberOfFiles(-files.length);
- data.maxNumberOfFilesAdjusted = true;
- data.files.valid = data.isValidated = that._validate(files);
- data.context = that._renderUpload(files).data('data', data);
- options.filesContainer[
- options.prependFiles ? 'prepend' : 'append'
- ](data.context);
- that._renderPreviews(files, data.context);
- that._forceReflow(data.context);
- that._transition(data.context).done(
- function () {
- if ((that._trigger('added', e, data) !== false) &&
- (options.autoUpload || data.autoUpload) &&
- data.autoUpload !== false && data.isValidated) {
- data.submit();
- }
- }
- );
- });
- },
- // Callback for the start of each file upload request:
- send: function (e, data) {
- var that = $(this).data('fileupload');
- if (!data.isValidated) {
- if (!data.maxNumberOfFilesAdjusted) {
- that._adjustMaxNumberOfFiles(-data.files.length);
- data.maxNumberOfFilesAdjusted = true;
- }
- if (!that._validate(data.files)) {
- return false;
- }
- }
- if (data.context && data.dataType &&
- data.dataType.substr(0, 6) === 'iframe') {
- // Iframe Transport does not support progress events.
- // In lack of an indeterminate progress bar, we set
- // the progress to 100%, showing the full animated bar:
- data.context
- .find('.progress').addClass(
- !$.support.transition && 'progress-animated'
- )
- .attr('aria-valuenow', 100)
- .find('.bar').css(
- 'width',
- '100%'
- );
- }
- return that._trigger('sent', e, data);
- },
- // Callback for successful uploads:
- done: function (e, data) {
- var that = $(this).data('fileupload'),
- template;
- if (data.context) {
- data.context.each(function (index) {
- var file = ($.isArray(data.result) &&
- data.result[index]) || {error: 'emptyResult'};
- if (file.error) {
- that._adjustMaxNumberOfFiles(1);
- }
- that._transition($(this)).done(
- function () {
- var node = $(this);
- template = that._renderDownload([file])
- .replaceAll(node);
- that._forceReflow(template);
- that._transition(template).done(
- function () {
- data.context = $(this);
- that._trigger('completed', e, data);
- }
- );
- }
- );
- });
- } else {
- if ($.isArray(data.result)) {
- $.each(data.result, function (index, file) {
- if (data.maxNumberOfFilesAdjusted && file.error) {
- that._adjustMaxNumberOfFiles(1);
- } else if (!data.maxNumberOfFilesAdjusted &&
- !file.error) {
- that._adjustMaxNumberOfFiles(-1);
- }
- });
- data.maxNumberOfFilesAdjusted = true;
- }
- template = that._renderDownload(data.result)
- .appendTo(that.options.filesContainer);
- that._forceReflow(template);
- that._transition(template).done(
- function () {
- data.context = $(this);
- that._trigger('completed', e, data);
- }
- );
- }
- },
- // Callback for failed (abort or error) uploads:
- fail: function (e, data) {
- var that = $(this).data('fileupload'),
- template;
- if (data.maxNumberOfFilesAdjusted) {
- that._adjustMaxNumberOfFiles(data.files.length);
- }
- if (data.context) {
- data.context.each(function (index) {
- if (data.errorThrown !== 'abort') {
- var file = data.files[index];
- file.error = file.error || data.errorThrown ||
- true;
- that._transition($(this)).done(
- function () {
- var node = $(this);
- template = that._renderDownload([file])
- .replaceAll(node);
- that._forceReflow(template);
- that._transition(template).done(
- function () {
- data.context = $(this);
- that._trigger('failed', e, data);
- }
- );
- }
- );
- } else {
- that._transition($(this)).done(
- function () {
- $(this).remove();
- that._trigger('failed', e, data);
- }
- );
- }
- });
- } else if (data.errorThrown !== 'abort') {
- data.context = that._renderUpload(data.files)
- .appendTo(that.options.filesContainer)
- .data('data', data);
- that._forceReflow(data.context);
- that._transition(data.context).done(
- function () {
- data.context = $(this);
- that._trigger('failed', e, data);
- }
- );
- } else {
- that._trigger('failed', e, data);
- }
- },
- // Callback for upload progress events:
- progress: function (e, data) {
- if (data.context) {
- var progress = parseInt(data.loaded / data.total * 100, 10);
- data.context.find('.progress')
- .attr('aria-valuenow', progress)
- .find('.bar').css(
- 'width',
- progress + '%'
- );
- }
- },
- // Callback for global upload progress events:
- progressall: function (e, data) {
- var $this = $(this),
- progress = parseInt(data.loaded / data.total * 100, 10),
- globalProgressNode = $this.find('.fileupload-progress'),
- extendedProgressNode = globalProgressNode
- .find('.progress-extended');
- if (extendedProgressNode.length) {
- extendedProgressNode.html(
- $this.data('fileupload')._renderExtendedProgress(data)
- );
- }
- globalProgressNode
- .find('.progress')
- .attr('aria-valuenow', progress)
- .find('.bar').css(
- 'width',
- progress + '%'
- );
- },
- // Callback for uploads start, equivalent to the global ajaxStart event:
- start: function (e) {
- var that = $(this).data('fileupload');
- that._transition($(this).find('.fileupload-progress')).done(
- function () {
- that._trigger('started', e);
- }
- );
- },
- // Callback for uploads stop, equivalent to the global ajaxStop event:
- stop: function (e) {
- var that = $(this).data('fileupload');
- that._transition($(this).find('.fileupload-progress')).done(
- function () {
- $(this).find('.progress')
- .attr('aria-valuenow', '0')
- .find('.bar').css('width', '0%');
- $(this).find('.progress-extended').html(' ');
- that._trigger('stopped', e);
- }
- );
- },
- // Callback for file deletion:
- destroy: function (e, data) {
- var that = $(this).data('fileupload');
- if (data.url) {
- $.ajax(data);
- that._adjustMaxNumberOfFiles(1);
- }
- that._transition(data.context).done(
- function () {
- $(this).remove();
- that._trigger('destroyed', e, data);
- }
- );
- }
- },
-
- // Link handler, that allows to download files
- // by drag & drop of the links to the desktop:
- _enableDragToDesktop: function () {
- var link = $(this),
- url = link.prop('href'),
- name = link.prop('download'),
- type = 'application/octet-stream';
- link.bind('dragstart', function (e) {
- try {
- e.originalEvent.dataTransfer.setData(
- 'DownloadURL',
- [type, name, url].join(':')
- );
- } catch (err) {}
- });
- },
-
- _adjustMaxNumberOfFiles: function (operand) {
- if (typeof this.options.maxNumberOfFiles === 'number') {
- this.options.maxNumberOfFiles += operand;
- if (this.options.maxNumberOfFiles < 1) {
- this._disableFileInputButton();
- } else {
- this._enableFileInputButton();
- }
- }
- },
-
- _formatFileSize: function (bytes) {
- if (typeof bytes !== 'number') {
- return '';
- }
- if (bytes >= 1000000000) {
- return (bytes / 1000000000).toFixed(2) + ' GB';
- }
- if (bytes >= 1000000) {
- return (bytes / 1000000).toFixed(2) + ' MB';
- }
- return (bytes / 1000).toFixed(2) + ' KB';
- },
-
- _formatBitrate: function (bits) {
- if (typeof bits !== 'number') {
- return '';
- }
- if (bits >= 1000000000) {
- return (bits / 1000000000).toFixed(2) + ' Gbit/s';
- }
- if (bits >= 1000000) {
- return (bits / 1000000).toFixed(2) + ' Mbit/s';
- }
- if (bits >= 1000) {
- return (bits / 1000).toFixed(2) + ' kbit/s';
- }
- return bits + ' bit/s';
- },
-
- _formatTime: function (seconds) {
- var date = new Date(seconds * 1000),
- days = parseInt(seconds / 86400, 10);
- days = days ? days + 'd ' : '';
- return days +
- ('0' + date.getUTCHours()).slice(-2) + ':' +
- ('0' + date.getUTCMinutes()).slice(-2) + ':' +
- ('0' + date.getUTCSeconds()).slice(-2);
- },
-
- _formatPercentage: function (floatValue) {
- return (floatValue * 100).toFixed(2) + ' %';
- },
-
- _renderExtendedProgress: function (data) {
- return this._formatBitrate(data.bitrate) + ' | ' +
- this._formatTime(
- (data.total - data.loaded) * 8 / data.bitrate
- ) + ' | ' +
- this._formatPercentage(
- data.loaded / data.total
- ) + ' | ' +
- this._formatFileSize(data.loaded) + ' / ' +
- this._formatFileSize(data.total);
- },
-
- _hasError: function (file) {
- if (file.error) {
- return file.error;
- }
- // The number of added files is subtracted from
- // maxNumberOfFiles before validation, so we check if
- // maxNumberOfFiles is below 0 (instead of below 1):
- if (this.options.maxNumberOfFiles < 0) {
- return 'maxNumberOfFiles';
- }
- // Files are accepted if either the file type or the file name
- // matches against the acceptFileTypes regular expression, as
- // only browsers with support for the File API report the type:
- if (!(this.options.acceptFileTypes.test(file.type) ||
- this.options.acceptFileTypes.test(file.name))) {
- return 'acceptFileTypes';
- }
- if (this.options.maxFileSize &&
- file.size > this.options.maxFileSize) {
- return 'maxFileSize';
- }
- if (typeof file.size === 'number' &&
- file.size < this.options.minFileSize) {
- return 'minFileSize';
- }
- return null;
- },
-
- _validate: function (files) {
- var that = this,
- valid = !!files.length;
- $.each(files, function (index, file) {
- file.error = that._hasError(file);
- if (file.error) {
- valid = false;
- }
- });
- return valid;
- },
-
- _renderTemplate: function (func, files) {
- if (!func) {
- return $();
- }
- var result = func({
- files: files,
- formatFileSize: this._formatFileSize,
- options: this.options
- });
- if (result instanceof $) {
- return result;
- }
- return $(this.options.templatesContainer).html(result).children();
- },
-
- _renderPreview: function (file, node) {
- var that = this,
- options = this.options,
- dfd = $.Deferred();
- return ((loadImage && loadImage(
- file,
- function (img) {
- node.append(img);
- that._forceReflow(node);
- that._transition(node).done(function () {
- dfd.resolveWith(node);
- });
- if (!$.contains(document.body, node[0])) {
- // If the element is not part of the DOM,
- // transition events are not triggered,
- // so we have to resolve manually:
- dfd.resolveWith(node);
- }
- },
- {
- maxWidth: options.previewMaxWidth,
- maxHeight: options.previewMaxHeight,
- canvas: options.previewAsCanvas
- }
- )) || dfd.resolveWith(node)) && dfd;
- },
-
- _renderPreviews: function (files, nodes) {
- var that = this,
- options = this.options;
- nodes.find('.preview span').each(function (index, element) {
- var file = files[index];
- if (options.previewSourceFileTypes.test(file.type) &&
- ($.type(options.previewSourceMaxFileSize) !== 'number' ||
- file.size < options.previewSourceMaxFileSize)) {
- that._processingQueue = that._processingQueue.pipe(function () {
- var dfd = $.Deferred();
- that._renderPreview(file, $(element)).done(
- function () {
- dfd.resolveWith(that);
- }
- );
- return dfd.promise();
- });
- }
- });
- return this._processingQueue;
- },
-
- _renderUpload: function (files) {
- return this._renderTemplate(
- this.options.uploadTemplate,
- files
- );
- },
-
- _renderDownload: function (files) {
- return this._renderTemplate(
- this.options.downloadTemplate,
- files
- ).find('a[download]').each(this._enableDragToDesktop).end();
- },
-
- _startHandler: function (e) {
- e.preventDefault();
- var button = $(this),
- template = button.closest('.template-upload'),
- data = template.data('data');
- if (data && data.submit && !data.jqXHR && data.submit()) {
- button.prop('disabled', true);
- }
- },
-
- _cancelHandler: function (e) {
- e.preventDefault();
- var template = $(this).closest('.template-upload'),
- data = template.data('data') || {};
- if (!data.jqXHR) {
- data.errorThrown = 'abort';
- e.data.fileupload._trigger('fail', e, data);
- } else {
- data.jqXHR.abort();
- }
- },
-
- _deleteHandler: function (e) {
- e.preventDefault();
- var button = $(this);
- e.data.fileupload._trigger('destroy', e, {
- context: button.closest('.template-download'),
- url: button.attr('data-url'),
- type: button.attr('data-type') || 'DELETE',
- dataType: e.data.fileupload.options.dataType
- });
- },
-
- _forceReflow: function (node) {
- return $.support.transition && node.length &&
- node[0].offsetWidth;
- },
-
- _transition: function (node) {
- var dfd = $.Deferred();
- if ($.support.transition && node.hasClass('fade')) {
- node.bind(
- $.support.transition.end,
- function (e) {
- // Make sure we don't respond to other transitions events
- // in the container element, e.g. from button elements:
- if (e.target === node[0]) {
- node.unbind($.support.transition.end);
- dfd.resolveWith(node);
- }
- }
- ).toggleClass('in');
- } else {
- node.toggleClass('in');
- dfd.resolveWith(node);
- }
- return dfd;
- },
-
- _initButtonBarEventHandlers: function () {
- var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'),
- filesList = this.options.filesContainer,
- ns = this.options.namespace;
- fileUploadButtonBar.find('.start')
- .bind('click.' + ns, function (e) {
- e.preventDefault();
- filesList.find('.start button').click();
- });
- fileUploadButtonBar.find('.cancel')
- .bind('click.' + ns, function (e) {
- e.preventDefault();
- filesList.find('.cancel button').click();
- });
- fileUploadButtonBar.find('.delete')
- .bind('click.' + ns, function (e) {
- e.preventDefault();
- filesList.find('.delete input:checked')
- .siblings('button').click();
- fileUploadButtonBar.find('.toggle')
- .prop('checked', false);
- });
- fileUploadButtonBar.find('.toggle')
- .bind('change.' + ns, function (e) {
- filesList.find('.delete input').prop(
- 'checked',
- $(this).is(':checked')
- );
- });
- },
-
- _destroyButtonBarEventHandlers: function () {
- this.element.find('.fileupload-buttonbar button')
- .unbind('click.' + this.options.namespace);
- this.element.find('.fileupload-buttonbar .toggle')
- .unbind('change.' + this.options.namespace);
- },
-
- _initEventHandlers: function () {
- parentWidget.prototype._initEventHandlers.call(this);
- var eventData = {fileupload: this};
- this.options.filesContainer
- .delegate(
- '.start button',
- 'click.' + this.options.namespace,
- eventData,
- this._startHandler
- )
- .delegate(
- '.cancel button',
- 'click.' + this.options.namespace,
- eventData,
- this._cancelHandler
- )
- .delegate(
- '.delete button',
- 'click.' + this.options.namespace,
- eventData,
- this._deleteHandler
- );
- this._initButtonBarEventHandlers();
- },
-
- _destroyEventHandlers: function () {
- var options = this.options;
- this._destroyButtonBarEventHandlers();
- options.filesContainer
- .undelegate('.start button', 'click.' + options.namespace)
- .undelegate('.cancel button', 'click.' + options.namespace)
- .undelegate('.delete button', 'click.' + options.namespace);
- parentWidget.prototype._destroyEventHandlers.call(this);
- },
-
- _enableFileInputButton: function () {
- this.element.find('.fileinput-button input')
- .prop('disabled', false)
- .parent().removeClass('disabled');
- },
-
- _disableFileInputButton: function () {
- this.element.find('.fileinput-button input')
- .prop('disabled', true)
- .parent().addClass('disabled');
- },
-
- _initTemplates: function () {
- var options = this.options;
- options.templatesContainer = document.createElement(
- options.filesContainer.prop('nodeName')
- );
- if (tmpl) {
- if (options.uploadTemplateId) {
- options.uploadTemplate = tmpl(options.uploadTemplateId);
- }
- if (options.downloadTemplateId) {
- options.downloadTemplate = tmpl(options.downloadTemplateId);
- }
- }
- },
-
- _initFilesContainer: function () {
- var options = this.options;
- if (options.filesContainer === undefined) {
- options.filesContainer = this.element.find('.files');
- } else if (!(options.filesContainer instanceof $)) {
- options.filesContainer = $(options.filesContainer);
- }
- },
-
- _stringToRegExp: function (str) {
- var parts = str.split('/'),
- modifiers = parts.pop();
- parts.shift();
- return new RegExp(parts.join('/'), modifiers);
- },
-
- _initRegExpOptions: function () {
- var options = this.options;
- if ($.type(options.acceptFileTypes) === 'string') {
- options.acceptFileTypes = this._stringToRegExp(
- options.acceptFileTypes
- );
- }
- if ($.type(options.previewSourceFileTypes) === 'string') {
- options.previewSourceFileTypes = this._stringToRegExp(
- options.previewSourceFileTypes
- );
- }
- },
-
- _initSpecialOptions: function () {
- parentWidget.prototype._initSpecialOptions.call(this);
- this._initFilesContainer();
- this._initTemplates();
- this._initRegExpOptions();
- },
-
- _create: function () {
- parentWidget.prototype._create.call(this);
- this._refreshOptionsList.push(
- 'filesContainer',
- 'uploadTemplateId',
- 'downloadTemplateId'
- );
- if (!$.blueimpFP) {
- this._processingQueue = $.Deferred().resolveWith(this).promise();
- this.process = function () {
- return this._processingQueue;
- };
- }
- },
-
- enable: function () {
- parentWidget.prototype.enable.call(this);
- this.element.find('input, button').prop('disabled', false);
- this._enableFileInputButton();
- },
-
- disable: function () {
- this.element.find('input, button').prop('disabled', true);
- this._disableFileInputButton();
- parentWidget.prototype.disable.call(this);
- }
-
- });
-
-}));
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload.js b/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload.js
deleted file mode 100644
index c93752948..000000000
--- a/vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/js/jquery.fileupload.js
+++ /dev/null
@@ -1,975 +0,0 @@
-/*
- * jQuery File Upload Plugin 5.14
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document, Blob, FormData, location */
-
-(function (factory) {
- 'use strict';
- if (typeof define === 'function' && define.amd) {
- // Register as an anonymous AMD module:
- define([
- 'jquery',
- 'jquery.ui.widget'
- ], factory);
- } else {
- // Browser globals:
- factory(window.jQuery);
- }
-}(function ($) {
- 'use strict';
-
- // The FileReader API is not actually used, but works as feature detection,
- // as e.g. Safari supports XHR file uploads via the FormData API,
- // but not non-multipart XHR file uploads:
- $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader);
- $.support.xhrFormDataFileUpload = !!window.FormData;
-
- // The fileupload widget listens for change events on file input fields defined
- // via fileInput setting and paste or drop events of the given dropZone.
- // In addition to the default jQuery Widget methods, the fileupload widget
- // exposes the "add" and "send" methods, to add or directly send files using
- // the fileupload API.
- // By default, files added via file input selection, paste, drag & drop or
- // "add" method are uploaded immediately, but it is possible to override
- // the "add" callback option to queue file uploads.
- $.widget('blueimp.fileupload', {
-
- options: {
- // The namespace used for event handler binding on the dropZone and
- // fileInput collections.
- // If not set, the name of the widget ("fileupload") is used.
- namespace: undefined,
- // The drop target collection, by the default the complete document.
- // Set to null or an empty collection to disable drag & drop support:
- dropZone: $(document),
- // The file input field collection, that is listened for change events.
- // If undefined, it is set to the file input fields inside
- // of the widget element on plugin initialization.
- // Set to null or an empty collection to disable the change listener.
- fileInput: undefined,
- // By default, the file input field is replaced with a clone after
- // each input field change event. This is required for iframe transport
- // queues and allows change events to be fired for the same file
- // selection, but can be disabled by setting the following option to false:
- replaceFileInput: true,
- // The parameter name for the file form data (the request argument name).
- // If undefined or empty, the name property of the file input field is
- // used, or "files[]" if the file input name property is also empty,
- // can be a string or an array of strings:
- paramName: undefined,
- // By default, each file of a selection is uploaded using an individual
- // request for XHR type uploads. Set to false to upload file
- // selections in one request each:
- singleFileUploads: true,
- // To limit the number of files uploaded with one XHR request,
- // set the following option to an integer greater than 0:
- limitMultiFileUploads: undefined,
- // Set the following option to true to issue all file upload requests
- // in a sequential order:
- sequentialUploads: false,
- // To limit the number of concurrent uploads,
- // set the following option to an integer greater than 0:
- limitConcurrentUploads: undefined,
- // Set the following option to true to force iframe transport uploads:
- forceIframeTransport: false,
- // Set the following option to the location of a redirect url on the
- // origin server, for cross-domain iframe transport uploads:
- redirect: undefined,
- // The parameter name for the redirect url, sent as part of the form
- // data and set to 'redirect' if this option is empty:
- redirectParamName: undefined,
- // Set the following option to the location of a postMessage window,
- // to enable postMessage transport uploads:
- postMessage: undefined,
- // By default, XHR file uploads are sent as multipart/form-data.
- // The iframe transport is always using multipart/form-data.
- // Set to false to enable non-multipart XHR uploads:
- multipart: true,
- // To upload large files in smaller chunks, set the following option
- // to a preferred maximum chunk size. If set to 0, null or undefined,
- // or the browser does not support the required Blob API, files will
- // be uploaded as a whole.
- maxChunkSize: undefined,
- // When a non-multipart upload or a chunked multipart upload has been
- // aborted, this option can be used to resume the upload by setting
- // it to the size of the already uploaded bytes. This option is most
- // useful when modifying the options object inside of the "add" or
- // "send" callbacks, as the options are cloned for each file upload.
- uploadedBytes: undefined,
- // By default, failed (abort or error) file uploads are removed from the
- // global progress calculation. Set the following option to false to
- // prevent recalculating the global progress data:
- recalculateProgress: true,
- // Interval in milliseconds to calculate and trigger progress events:
- progressInterval: 100,
- // Interval in milliseconds to calculate progress bitrate:
- bitrateInterval: 500,
-
- // Additional form data to be sent along with the file uploads can be set
- // using this option, which accepts an array of objects with name and
- // value properties, a function returning such an array, a FormData
- // object (for XHR file uploads), or a simple object.
- // The form of the first fileInput is given as parameter to the function:
- formData: function (form) {
- return form.serializeArray();
- },
-
- // The add callback is invoked as soon as files are added to the fileupload
- // widget (via file input selection, drag & drop, paste or add API call).
- // If the singleFileUploads option is enabled, this callback will be
- // called once for each file in the selection for XHR file uplaods, else
- // once for each file selection.
- // The upload starts when the submit method is invoked on the data parameter.
- // The data object contains a files property holding the added files
- // and allows to override plugin options as well as define ajax settings.
- // Listeners for this callback can also be bound the following way:
- // .bind('fileuploadadd', func);
- // data.submit() returns a Promise object and allows to attach additional
- // handlers using jQuery's Deferred callbacks:
- // data.submit().done(func).fail(func).always(func);
- add: function (e, data) {
- data.submit();
- },
-
- // Other callbacks:
- // Callback for the submit event of each file upload:
- // submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
- // Callback for the start of each file upload request:
- // send: function (e, data) {}, // .bind('fileuploadsend', func);
- // Callback for successful uploads:
- // done: function (e, data) {}, // .bind('fileuploaddone', func);
- // Callback for failed (abort or error) uploads:
- // fail: function (e, data) {}, // .bind('fileuploadfail', func);
- // Callback for completed (success, abort or error) requests:
- // always: function (e, data) {}, // .bind('fileuploadalways', func);
- // Callback for upload progress events:
- // progress: function (e, data) {}, // .bind('fileuploadprogress', func);
- // Callback for global upload progress events:
- // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
- // Callback for uploads start, equivalent to the global ajaxStart event:
- // start: function (e) {}, // .bind('fileuploadstart', func);
- // Callback for uploads stop, equivalent to the global ajaxStop event:
- // stop: function (e) {}, // .bind('fileuploadstop', func);
- // Callback for change events of the fileInput collection:
- // change: function (e, data) {}, // .bind('fileuploadchange', func);
- // Callback for paste events to the dropZone collection:
- // paste: function (e, data) {}, // .bind('fileuploadpaste', func);
- // Callback for drop events of the dropZone collection:
- // drop: function (e, data) {}, // .bind('fileuploaddrop', func);
- // Callback for dragover events of the dropZone collection:
- // dragover: function (e) {}, // .bind('fileuploaddragover', func);
-
- // The plugin options are used as settings object for the ajax calls.
- // The following are jQuery ajax settings required for the file uploads:
- processData: false,
- contentType: false,
- cache: false
- },
-
- // A list of options that require a refresh after assigning a new value:
- _refreshOptionsList: [
- 'namespace',
- 'dropZone',
- 'fileInput',
- 'multipart',
- 'forceIframeTransport'
- ],
-
- _BitrateTimer: function () {
- this.timestamp = +(new Date());
- this.loaded = 0;
- this.bitrate = 0;
- this.getBitrate = function (now, loaded, interval) {
- var timeDiff = now - this.timestamp;
- if (!this.bitrate || !interval || timeDiff > interval) {
- this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
- this.loaded = loaded;
- this.timestamp = now;
- }
- return this.bitrate;
- };
- },
-
- _isXHRUpload: function (options) {
- return !options.forceIframeTransport &&
- ((!options.multipart && $.support.xhrFileUpload) ||
- $.support.xhrFormDataFileUpload);
- },
-
- _getFormData: function (options) {
- var formData;
- if (typeof options.formData === 'function') {
- return options.formData(options.form);
- }
- if ($.isArray(options.formData)) {
- return options.formData;
- }
- if (options.formData) {
- formData = [];
- $.each(options.formData, function (name, value) {
- formData.push({name: name, value: value});
- });
- return formData;
- }
- return [];
- },
-
- _getTotal: function (files) {
- var total = 0;
- $.each(files, function (index, file) {
- total += file.size || 1;
- });
- return total;
- },
-
- _onProgress: function (e, data) {
- if (e.lengthComputable) {
- var now = +(new Date()),
- total,
- loaded;
- if (data._time && data.progressInterval &&
- (now - data._time < data.progressInterval) &&
- e.loaded !== e.total) {
- return;
- }
- data._time = now;
- total = data.total || this._getTotal(data.files);
- loaded = parseInt(
- e.loaded / e.total * (data.chunkSize || total),
- 10
- ) + (data.uploadedBytes || 0);
- this._loaded += loaded - (data.loaded || data.uploadedBytes || 0);
- data.lengthComputable = true;
- data.loaded = loaded;
- data.total = total;
- data.bitrate = data._bitrateTimer.getBitrate(
- now,
- loaded,
- data.bitrateInterval
- );
- // Trigger a custom progress event with a total data property set
- // to the file size(s) of the current upload and a loaded data
- // property calculated accordingly:
- this._trigger('progress', e, data);
- // Trigger a global progress event for all current file uploads,
- // including ajax calls queued for sequential file uploads:
- this._trigger('progressall', e, {
- lengthComputable: true,
- loaded: this._loaded,
- total: this._total,
- bitrate: this._bitrateTimer.getBitrate(
- now,
- this._loaded,
- data.bitrateInterval
- )
- });
- }
- },
-
- _initProgressListener: function (options) {
- var that = this,
- xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
- // Accesss to the native XHR object is required to add event listeners
- // for the upload progress event:
- if (xhr.upload) {
- $(xhr.upload).bind('progress', function (e) {
- var oe = e.originalEvent;
- // Make sure the progress event properties get copied over:
- e.lengthComputable = oe.lengthComputable;
- e.loaded = oe.loaded;
- e.total = oe.total;
- that._onProgress(e, options);
- });
- options.xhr = function () {
- return xhr;
- };
- }
- },
-
- _initXHRData: function (options) {
- var formData,
- file = options.files[0],
- // Ignore non-multipart setting if not supported:
- multipart = options.multipart || !$.support.xhrFileUpload,
- paramName = options.paramName[0];
- if (!multipart || options.blob) {
- // For non-multipart uploads and chunked uploads,
- // file meta data is not part of the request body,
- // so we transmit this data as part of the HTTP headers.
- // For cross domain requests, these headers must be allowed
- // via Access-Control-Allow-Headers or removed using
- // the beforeSend callback:
- options.headers = $.extend(options.headers, {
- 'X-File-Name': file.name,
- 'X-File-Type': file.type,
- 'X-File-Size': file.size
- });
- if (!options.blob) {
- // Non-chunked non-multipart upload:
- options.contentType = file.type;
- options.data = file;
- } else if (!multipart) {
- // Chunked non-multipart upload:
- options.contentType = 'application/octet-stream';
- options.data = options.blob;
- }
- }
- if (multipart && $.support.xhrFormDataFileUpload) {
- if (options.postMessage) {
- // window.postMessage does not allow sending FormData
- // objects, so we just add the File/Blob objects to
- // the formData array and let the postMessage window
- // create the FormData object out of this array:
- formData = this._getFormData(options);
- if (options.blob) {
- formData.push({
- name: paramName,
- value: options.blob
- });
- } else {
- $.each(options.files, function (index, file) {
- formData.push({
- name: options.paramName[index] || paramName,
- value: file
- });
- });
- }
- } else {
- if (options.formData instanceof FormData) {
- formData = options.formData;
- } else {
- formData = new FormData();
- $.each(this._getFormData(options), function (index, field) {
- formData.append(field.name, field.value);
- });
- }
- if (options.blob) {
- formData.append(paramName, options.blob, file.name);
- } else {
- $.each(options.files, function (index, file) {
- // File objects are also Blob instances.
- // This check allows the tests to run with
- // dummy objects:
- if (file instanceof Blob) {
- formData.append(
- options.paramName[index] || paramName,
- file,
- file.name
- );
- }
- });
- }
- }
- options.data = formData;
- }
- // Blob reference is not needed anymore, free memory:
- options.blob = null;
- },
-
- _initIframeSettings: function (options) {
- // Setting the dataType to iframe enables the iframe transport:
- options.dataType = 'iframe ' + (options.dataType || '');
- // The iframe transport accepts a serialized array as form data:
- options.formData = this._getFormData(options);
- // Add redirect url to form data on cross-domain uploads:
- if (options.redirect && $('
<%= t('announcement.category') %>
- <%= @bulletin.bulletin_category.i18n_variable[I18n.locale] %>
+ <%= @bulletin.bulletin_category.title %>
<%= t('announcement.postdate') %>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
index ba70d365c..cfcf47f92 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/index.html.erb
@@ -10,11 +10,11 @@
<% @archive_file_categorys.each do |afcpost| %>
- <%= link_to afcpost.i18n_variable[I18n.locale], panel_archive_front_end_archive_files_path(:category_id => afcpost.id) %>
+ <%= link_to afcpost.title, panel_archive_front_end_archive_files_path(:category_id => afcpost.id) %>
<% end %>
- <%= @archive_files.first.archive_file_category.i18n_variable[I18n.locale] rescue nil %>
+ <%= @archive_files.first.archive_file_category.title rescue nil %>
<% @archive_files.each do |post| %>
diff --git a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb
index 080285547..6051eb4c8 100644
--- a/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb
+++ b/vendor/built_in_modules/archive/app/views/panel/archive/front_end/archive_files/show.html.erb
@@ -4,7 +4,7 @@
<%= @title %>
<% end %>
-<%= @archive_file.archive_file_category.i18n_variable[I18n.locale] rescue nil %>
+<%= @archive_file.archive_file_category.title rescue nil %>
<%= @archive_file.title %>
diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
index d023a0fa7..181a757b8 100644
--- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
+++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
@@ -6,8 +6,7 @@ Date.prototype.getWeek = function (dowOffset) {
var newYear = new Date(this.getFullYear(),0,1);
var day = newYear.getDay() - dowOffset; //the day of week the year begins on
day = (day >= 0 ? day : day + 7);
- var daynum = Math.floor((this.getTime() - newYear.getTime() -
- (this.getTimezoneOffset()-newYear.getTimezoneOffset())*60000)/86400000) + 1;
+ var daynum = Math.floor((this.getTime() - newYear.getTime() - (this.getTimezoneOffset()-newYear.getTimezoneOffset())*60000)/86400000) + 1;
var weeknum;
//if the year starts before the middle of a week
if(day < 4) {
@@ -45,12 +44,17 @@ var calendarAPI = function(){
this.cur_week = c.today.getWeek();
this.cur_date = c.today.getDate();
this.view = null;
+ this.calendars = new Array();
this.monthlist = ["","January","February","March","April","May","June","July","August","September","October","November","December"];
this.initialize = function(){
$(window).load(function(){
// c.loadMonthView(c.cur_month,c.cur_year);
// c.loadWeekView(c.cur_week,c.cur_year);
- c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
+ // c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
+ c.loadAgendaView();
+ $(".calendar-filter-btn").each(function(){
+ c.calendars.push($(this).attr("href"));
+ })
bindHandlers();
})
var bindHandlers = function(){
@@ -61,16 +65,56 @@ var calendarAPI = function(){
$("#create_event_btn").click(function(){
if(!$(this).hasClass("active")){
- c.newEvent($(this).attr("href"),$(this).attr("ref"),c.today.getDate(),c.today.getMonth()+1,c.today.getFullYear());
+ c.newEvent($(this).attr("href"),$(this).attr("ref"),c.today.getDate(),c.today.getMonth()+1,c.today.getFullYear(),10.5,"AM");
}else{
c.event_create_div.hide().empty();
}
$(this).toggleClass("active");
return false;
})
- $("td.click_event").live("click",function(){
- c.newEvent($(this).attr("link"),$(this).attr("ref"),$(this).attr("date"),c.cur_month,c.cur_year);
+ $(".click_event").live("click",function(e){
+ var dt = $(this).attr("date");
+ if(!dt){
+ var w = $("td.week_day_body").width();
+ var parentOffset = $("table.cell_map").offset();
+ var relX = e.pageX - parentOffset.left;
+ var t = 60;
+ for (var i = 0; i <= 6; i++) {
+ if(relX > t && relX < (t + w)){
+ console.log(i);
+ dt = $("td.week_day_body").eq(i).attr("date");
+ break;
+ }
+ t = t + w;
+ };
+ }
+ var time = $(this).attr("time");
+ var ses = $(this).attr("ses");
+ if (!time)
+ time = 10.5;
+ if(!ses)
+ ses = "AM";
+
+ c.newEvent($(this).attr("link"),$(this).attr("ref"),dt,c.cur_month,c.cur_year,time,ses);
$("#create_event_btn").toggleClass("active");
+ e.stopPropagation();
+ })
+ $(".calendar-filter-btn").click(function(){
+ $(this).toggleClass("active");
+ c.calendars = [];
+ $(".calendar-filter-btn").each(function(){
+ if($(this).hasClass("active"))
+ c.calendars.push($(this).attr("href"));
+ })
+ c.refresh();
+ })
+
+ $("#edit_event_btn").live("ajax:success",function(evt,form){
+ c.event_quick_view_div.empty().hide();
+ c.updateEvent(form);
+ })
+ $("#refresh_btn").click(function(){
+ c.refresh();
})
$('.mode_switch').click(function(){
@@ -196,6 +240,10 @@ var calendarAPI = function(){
}
}
this.loadMonthView = function(month,year){
+ $("#range_selection").hide();
+ $("#navigation").show();
+ $("#sec1").removeClass("span8").addClass("span3");
+ $("#sec2").show();
c.view = "month";
if(!month){
var dt = new Date();
@@ -236,7 +284,7 @@ var calendarAPI = function(){
this.getEventsForMonth = function(month,year){
- $.getJSON("cals/getMonthEvents",{"month":month,"year":year},function(events){
+ $.getJSON("cals/getMonthEvents",{"month":month,"year":year,"calendars":c.calendars},function(events){
makerow(events);
})
var doneEventArray = new Array();
@@ -262,7 +310,7 @@ var calendarAPI = function(){
curparent.append($eventrow);
}
$eventrow = null;
- $eventrow = $("'+displaystarttime+' - '+displayendtime+' '+evnt.title+' '+displaystarttime+' - '+displayendtime+' '+evnt.title+' '+evnt.title+'
')
+ $(".all_day_event").append(''+evnt.title+'
')
}else{
var starttime,endtime,displaystarttime,displayendtime;
if(evnt.start_am_pm == "AM"){
@@ -521,7 +577,7 @@ var calendarAPI = function(){
if(h == 0.5)
halfhour = "half";
h = 17 + 20 + (((h-1) * 2) * 20) + 1;
- var eventdom = $(''+displaystarttime+' - '+displayendtime+' '+evnt.title+' '+displaystarttime+' - '+displayendtime+' '+evnt.title+' 0){
$('.color-picker').miniColors(); // just in category view
@@ -586,8 +725,26 @@ var calendarAPI = function(){
c.event_quick_view_div.find(".event-close-btn").click(function(){
c.event_quick_view_div.empty().hide();
})
+ c.event_quick_view_div.find(".bt-del").bind("ajax:success",function(){
+ c.event_quick_view_div.empty().hide();
+ dom.remove();
+ })
})
}
+ this.refresh = function(){
+ $(".destroy").remove();
+ switch (c.view){
+ case "week":
+ c.loadWeekView(c.cur_week,c.cur_year);
+ break;
+ case "month":
+ c.loadMonthView(c.cur_month,c.cur_year);
+ break;
+ case "day":
+ c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
+ break;
+ }
+ }
c.initialize();
}
diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/cals.js b/vendor/built_in_modules/calendar/app/assets/javascripts/cals.js
new file mode 100644
index 000000000..f4b7b96cd
--- /dev/null
+++ b/vendor/built_in_modules/calendar/app/assets/javascripts/cals.js
@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery-ui
+//= require bootstrap
+//= require calendarAPI
\ No newline at end of file
diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
index 874904a58..8fa88b913 100644
--- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
+++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
@@ -18,7 +18,6 @@
line-height: 28px;
}
.calendar_mode {
- float: right;
z-index: 2;
}
.mode_switch {
@@ -37,6 +36,9 @@
-webkit-box-shadow: inset 0 0 1px black;
-moz-box-shadow: inset 0 0 1px black;
}
+.modal-body {
+ max-height: 450px;
+}
.event_list_wrapper {
position: relative;
}
@@ -71,7 +73,7 @@
}
#calendar_day .event_holder {
width: 100%;
- height: 100%;
+ /*height: 100%;*/
position: absolute;
top: 0;
z-index: 1;
@@ -164,19 +166,48 @@
/* agenda view */
#calendar_agenda {
- border-bottom: solid 1px #ddd;
+ margin-top: 20px;
}
#calendar_agenda .table {
margin-bottom: 0;
}
+#calendar_agenda .tiny_calendar {
+ border: solid 1px #eee;
+}
+#calendar_agenda .tiny_calendar .table th {
+ border-top: 0;
+}
+#calendar_agenda .tiny_calendar .table td {
+ text-align: center;
+}
#calendar_agenda .event {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
+#calendar_agenda .row-fluid {
+ margin-top: 20px;
+ padding-top: 20px;
+ border-top: dashed 1px #ddd;
+}
+#calendar_agenda .row-fluid:first-child {
+ border-top: 0;
+ padding-top: 0;
+ margin-top: 0;
+}
+#calendar_agenda .table.event_list .span2, #calendar_agenda .table.event_list thead th {
+ min-height: 0 !important;
+ height: 0 !important;
+ line-height: 0;
+ padding: 0;
+}
.event_time {
font-family: Tahoma, sans-serif;
}
+.has_event {
+ background-color: #08c;
+ color: #fff;
+}
/* day view */
#calendar_day .header {
@@ -305,4 +336,25 @@
.miniColors-selector {
float: none;
margin: 4px 0 0 0;
+}
+
+/* create / edit event panel */
+#tags_panel {
+ top: auto;
+ bottom: 34px;
+ width: 258px;
+ height: 170px;
+ padding: 8px 0;
+ overflow: hidden;
+ position: absolute;
+ clear: none;
+}
+#tags_panel .viewport {
+ height: 170px;
+}
+#tags_panel .scrollbar {
+ top: 8px;
+}
+#tags_list {
+ padding: 8px;
}
\ No newline at end of file
diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/cals.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/cals.css
new file mode 100644
index 000000000..f07975b5a
--- /dev/null
+++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/cals.css
@@ -0,0 +1,8 @@
+/*
+ *This is a manifest file that'll automatically include all the stylesheets available in this directory
+ *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ *the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= font-awesome
+ *= calendar
+ *= bootstrap-responsive
+*/
\ No newline at end of file
diff --git a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
index fdf712aa6..9a414378d 100644
--- a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
+++ b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/cals_controller.rb
@@ -1,9 +1,9 @@
class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
include AdminHelper
include Panel::Calendar::BackEnd::CalsHelper
-
+ before_filter :force_order_for_user
def index
-
+ @calendars = Cal.all
end
def new
@@ -39,10 +39,10 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
end
def day_view
- date = params[:date].to_i
+ @date = params[:date].to_i
month = params[:month].to_i
year = params[:year].to_i
- @cur_day = getDayName(date,month,year) + " " + month.to_s + "/" + date.to_s + " - " + year.to_s
+ @cur_day = getDayName(@date,month,year) + " " + month.to_s + "/" + @date.to_s + " - " + year.to_s
@hours = getHours(12)
render :layout => false
end
@@ -79,17 +79,133 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
end
cur_month_days = getMonthDays(year)
@post_disabled_days = @pre_disabled_days + cur_month_days[month]
- @dateset = getDateSet(month,year)
+ @dateset = getDateSet(month,year,true)
render :layout => false
end
def agenda_view
+ @start_year = params[:s_year].to_i
+ @start_month = params[:s_month].to_i
+ @end_year = params[:e_year].to_i
+ @end_month = params[:e_month].to_i
+ t = Time.now
+ if !params[:s_year]
+ @start_year = t.year
+ end
+ if !params[:s_month]
+ @start_month = t.month
+ @end_month = t.month + 3
+ if @end_month > 12
+ @end_month = @end_month - 12
+ @end_year = @start_year + 1
+ end
+ end
+
+ startdt = Date.new(@start_year,@start_month,1)
+ temp = getMonthDays(@end_year)
+ enddt = Date.new(@end_year,@end_month,temp[@end_month])
+ diff = enddt - startdt
+ diff = diff.to_i / 30
+
+
+ @d_s_year = @start_year - 5
+ @datesets = Array.new
+ @calendartitle = Array.new
+ @events = Array.new
+ events = Event.all.asc(:start_date).desc(:total_days)
+ @calevents = Array.new
+ y = @start_year
+ m = @start_month
+ for i in 0..diff-1
+ if m == 13
+ m = 1
+ y = y + 1
+ end
+ @calendartitle << [m,y]
+ @datesets << getDateSet(m,y,false)
+ e = Array.new
+ h = Array.new
+ events.each_with_index do |event,i|
+ # @temp = Array.new
+ startdt = Date.new(event.start_year,event.start_month)
+ enddt = Date.new(event.end_year,event.end_month)
+ range = startdt..enddt
+ dt = Date.new(y,m)
+ if range === dt
+ no_of_days = event.total_days
+ start_date = event.start_date
+
+ if event.start_year < y
+ no_of_days = temp[m] - event.start_date
+ no_of_days += 1
+ temp = m + 12
+ if event.start_month < temp
+ start_date = 1
+ end
+ end
+ if event.end_year > y
+ no_of_days = temp[m] - event.start_date
+ no_of_days += 1
+ temp = m + 12
+ end
+ if event.end_month > m
+ no_of_days = temp[m] - event.start_date
+ no_of_days += 1
+ elsif event.end_month == m
+ no_of_days = event.end_date
+ end
+
+ if event.start_month == m && event.end_month == m
+ no_of_days = event.total_days
+ no_of_days += 1
+ end
+
+ if event.start_month < m
+ start_date = 1
+ end
+
+ if event.start_date == event.end_date
+ display_date = getDayName(event.start_date,event.start_month,event.start_year) + ", " + Date::ABBR_MONTHNAMES[event.start_month] + " " + event.start_date.to_s
+ else
+ display_date = getDayName(event.start_date,event.start_month,event.start_year) + ", " + Date::ABBR_MONTHNAMES[event.start_month].to_s + " " + event.start_date.to_s + " - " + getDayName(event.end_date,event.end_month,event.end_year) + ", " + Date::ABBR_MONTHNAMES[event.end_month] + " " + event.end_date.to_s
+ end
+ if event.all_day
+ display_time = "All Day"
+ else
+ x = event.start_time.to_i
+ if event.start_time > x
+ est = x.to_s + ":30"
+ else
+ est = x.to_s
+ end
+ x = event.end_time.to_i
+ if event.end_time > x
+ eet = x.to_s + ":30"
+ else
+ eet = x.to_s
+ end
+ display_time = est + " " + event.start_am_pm + " - " + eet + " " + event.end_am_pm
+ end
+ for c in start_date..(start_date + no_of_days)
+ if h.index(c) == nil
+ h << c
+ end
+ end
+ color = Cal.find(event.cal_id).color
+ e << {"display_date"=>display_date,"show_link"=>panel_calendar_back_end_event_path(event), "display_time"=>display_time, "start_date"=>start_date,"end_date"=>event.end_date,"start_month"=>event.start_month,"end_month"=>event.end_month,"title" => event.title,"color"=>color}
+ end
+ end
+ @events << e
+ @calevents << h
+ m = m + 1
+ end
render :layout => false
end
def get_month_events
month = params[:month].to_i
year = params[:year].to_i
+ fromcalendars = params[:calendars]
# events = Event.where(:start_month.lt => month).and(:start_year => year).and(:end_month.gte => month).asc(:start_date).desc(:total_days)
@events = Array.new
@@ -121,7 +237,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
# color = Cal.find(event.cal_id).color
# @events << {"id"=>event.id,"index"=>i,"start_date"=>event.start_date, "total_days" => no_of_days, "title" => event.title,"color"=>color,"show_link"=>panel_calendar_back_end_event_path(event)}
# end
- events = Event.all.asc(:start_date).desc(:total_days)
+ events = Event.where(:cal_id.in=>fromcalendars).asc(:start_date).desc(:total_days)
events.each_with_index do |event,i|
# @temp = Array.new
startdt = Date.new(event.start_year,event.start_month)
@@ -174,8 +290,9 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
def get_week_events
week = params[:week].to_i
year = params[:year].to_i
+ fromcalendars = params[:calendars]
@d = getWeekDataSet(week,year)
- events = Event.where(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).and(:start_year => year).asc(:start_week).asc(:start_date)
+ events = Event.where(:cal_id.in=>fromcalendars).and(:start_week.lte => week).and(:start_year => year).and(:end_week.gte => week).and(:start_year => year).asc(:start_week).asc(:start_date)
@events = Array.new
events.each_with_index do |event,i|
# @temp = Array.new
@@ -230,6 +347,7 @@ class Panel::Calendar::BackEnd::CalsController < OrbitBackendController
day = params[:date].to_i
month = params[:month].to_i
year = params[:year].to_i
+ fromcalendars = params[:calendars]
dt = Date.new(year,month,day)
week = dt.strftime("%U")
events = Event.where(:start_month.lte => month).and(:start_year => year).and(:end_month.gte => month)
diff --git a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb
index 41ffa151e..4e477ded5 100644
--- a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb
+++ b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/events_controller.rb
@@ -8,10 +8,47 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
else
@all_day_disabled = false
end
- @placeholder = params[:date]+"/"+params[:month]+"/"+params[:year]
+ @hours = getHoursForForm
+ if params[:time]
+
+ @hours.each_with_index do |h,i|
+ if h['val'].to_s == params[:time].to_s
+ @sindex = i
+ @eindex = i + 2
+ break
+ end
+ end
+ else
+ @sindex = 16
+ @eindex = 18
+ end
+ @ampm = Array.new
+ @ampm << "AM"
+ @ampm << "PM"
+ if params[:ses]
+ @sampm = params[:ses]
+ @eampm = params[:ses]
+ if @eindex >= 22
+ @eampm = "PM"
+ end
+ end
+ @placeholder = params[:month]+"/"+params[:date]+"/"+params[:year]
render :layout => false
end
-
+ def edit
+ @calendars = Cal.all
+ @event = Event.find(params[:id])
+ if @event.all_day
+ @all_day_disabled = true
+ else
+ @all_day_disabled = false
+ end
+ @hours = getHoursForForm
+ @ampm = Array.new
+ @ampm << "AM"
+ @ampm << "PM"
+ render :layout => false
+ end
def create
title = params[:event][:title]
note = params[:event][:note]
@@ -21,14 +58,14 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
$endtime = params[:end_time]
temp = $start.split("/")
- start_date = temp[0]
- start_month = temp[1]
+ start_month = temp[0]
+ start_date = temp[1]
start_year = temp[2]
@m = start_month
@y = start_year
temp = $end.split("/")
- end_date = temp[0]
- end_month = temp[1]
+ end_month = temp[0]
+ end_date = temp[1]
end_year = temp[2]
start_am_pm = params[:start_am_pm]
@@ -81,6 +118,78 @@ class Panel::Calendar::BackEnd::EventsController < OrbitBackendController
h.js
end
end
+
+ def update
+
+ title = params[:event][:title]
+ note = params[:event][:note]
+ $start = params[:start_date]
+ $end = params[:end_date]
+ $starttime = params[:start_time]
+ $endtime = params[:end_time]
+
+ temp = $start.split("/")
+ start_month = temp[0]
+ start_date = temp[1]
+ start_year = temp[2]
+ @m = start_month
+ @y = start_year
+ temp = $end.split("/")
+ end_month = temp[0]
+ end_date = temp[1]
+ end_year = temp[2]
+
+ start_am_pm = params[:start_am_pm]
+ end_am_pm = params[:end_am_pm]
+
+ cal_id = params[:event][:cal_id]
+
+ # if start_am_pm == "PM"
+ # temp_start_time = $starttime + 12
+ # end
+ # if end_am_pm == "PM"
+ # temp_end_time = $endtime + 12
+ # end
+ if params[:all_day]
+ all_day = true
+ $starttime = 0
+ $endtime = 0
+ else
+ all_day = false
+ end
+
+ final_start_time = Date.new(start_year.to_i,start_month.to_i,start_date.to_i)
+ final_end_time = Date.new(end_year.to_i,end_month.to_i,end_date.to_i)
+ start_week = final_start_time.strftime("%U")
+ end_week = final_end_time.strftime("%U")
+ total_days = final_end_time - final_start_time
+ @event = Event.find(params[:id])
+ @event.title = title
+ @event.note = note
+ @event.start_year = start_year
+ @event.end_year = end_year
+ @event.start_month = start_month
+ @event.end_month = end_month
+ @event.start_date = start_date
+ @event.end_date = end_date
+ @event.start_time = $starttime
+ @event.start_am_pm = start_am_pm
+ @event.end_time = $endtime
+ @event.end_am_pm = end_am_pm
+ @event.cal_id = cal_id
+ @event.final_start_time = final_start_time
+ @event.final_end_time = final_end_time
+ @event.total_days = total_days
+ @event.start_week = start_week
+ @event.end_week = end_week
+ @event.all_day = all_day
+ @event.save!
+
+ respond_to do |h|
+ h.js
+ end
+ end
+
def show
@event = Event.find(params[:id])
@start_month_name = Date::ABBR_MONTHNAMES[@event.start_month]
diff --git a/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/tags_controller.rb b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/tags_controller.rb
new file mode 100644
index 000000000..46596250c
--- /dev/null
+++ b/vendor/built_in_modules/calendar/app/controllers/panel/calendar/back_end/tags_controller.rb
@@ -0,0 +1,6 @@
+class Panel::Calendar::BackEnd::TagsController < Admin::TagsController
+ def initialize
+ super
+ @app_title = 'calendar'
+ end
+end
\ No newline at end of file
diff --git a/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb b/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb
index fc349ecd9..177606293 100644
--- a/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb
+++ b/vendor/built_in_modules/calendar/app/helpers/panel/calendar/back_end/cals_helper.rb
@@ -6,7 +6,7 @@ module Panel::Calendar::BackEnd::CalsHelper
return startday
end
- def getDateSet(month,year)
+ def getDateSet(month,year,prepost)
dateset = Array.new
startday = monthStartDay(month,year)
monthsdays = getMonthDays(year)
@@ -20,7 +20,11 @@ module Panel::Calendar::BackEnd::CalsHelper
i = prev_month_days_to_add
while i > 0 do
i -= 1
- dateset << prev_month_days - i
+ if prepost
+ dateset << prev_month_days - i
+ else
+ dateset << "NaN"
+ end
end
i = 0
@@ -29,11 +33,21 @@ module Panel::Calendar::BackEnd::CalsHelper
i += 1
end
- next_month_days_to_add = 42 - (prev_month_days_to_add + cur_month_days)
+ total_days = 42
+ if !prepost
+ if (prev_month_days_to_add + cur_month_days) < 35
+ total_days = 35
+ end
+ end
+ next_month_days_to_add = total_days - (prev_month_days_to_add + cur_month_days)
i = 0
while i < next_month_days_to_add do
- dateset << i + 1
+ if prepost
+ dateset << i + 1
+ else
+ dateset << "NaN"
+ end
i += 1
end
@@ -180,6 +194,15 @@ module Panel::Calendar::BackEnd::CalsHelper
end
hours
end
+
+ def getHoursForForm
+ hours = Array.new
+ for i in 1..12
+ hours << {"val"=>i,"title"=>i.to_s+":00"}
+ hours << {"val"=>i+0.5,"title"=>i.to_s+":30"}
+ end
+ hours
+ end
end
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb
index 57bb1bf9d..0a57ae8cf 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/agenda_view.html.erb
@@ -1,267 +1,110 @@
+
+ From
+ <% for i in 1..12 %>
+ <% if i == @start_month %>
+ <%= Date::MONTHNAMES[i] %>
+ <% else %>
+ <%= Date::MONTHNAMES[i] %>
+ <% end %>
+ <% end %>
+
+
+ <% for i in 1..10 %>
+ <% if (@d_s_year + i) == @start_year %>
+ <%= @d_s_year + i %>
+ <% else %>
+ <%= @d_s_year + i %>
+ <% end %>
+ <% end %>
+
+ To
+ <% for i in 1..12 %>
+ <% if i == @end_month %>
+ <%= Date::MONTHNAMES[i] %>
+ <% else %>
+ <%= Date::MONTHNAMES[i] %>
+ <% end %>
+ <% end %>
+
+
+ <% for i in 1..10 %>
+ <% if (@d_s_year + i) == @end_year %>
+ <%= @d_s_year + i %>
+ <% elsif (@d_s_year + i) <= @start_year %>
+ <%= @d_s_year + i %>
+ <% else %>
+ <%= @d_s_year + i %>
+ <% end %>
+ <% end %>
+
+ Show Events
+
-
-
-
-
-
-
-
- Thu, Sep 6
- 9:00am - 9:30am
-
- Commuting time, from home to RD
-
-
-
- 9:30am - 12:00am
-
- Work on Thu project, and ask ika for help if possible
-
-
-
- 13:30pm - 18:00pm
-
- Template design, at least finish 2 template
-
-
-
- Fri, Sep 7
- 9:00am - 18:00pm
-
- Take a day off
-
-
-
- Sat, Sep 8
- 7:00am - 7:50pm
-
- Work out with Joseph
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ <% lastday = "" %>
+ <% if @events[i].count > 0 %>
+ <% @events[i].each do |event| %>
+
+
+ <% if event['display_date'] != lastday %>
+ <%= event['display_date'] %>
+ <% end %>
+
+ <%= event['display_time'] %>
+
+ <%= event['title'] %>
+
+
+ <% lastday = event['display_date'] %>
+ <% end %>
+ <% else %>
- No events for this month.
-
-
-
-
-
-
- 10:30am - template
-
-
-
-
-
-
-
- 10:30am - template
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 12am
- 1am
- 2am
- 3am
- 4am
- 5am
- 6am
- 7am
- 8am
- 9am
- 10am
- 11am
- 12am
- 1pm
- 2pm
- 3pm
- 4pm
- 5pm
- 6pm
- 7pm
- 8pm
- 9pm
- 10pm
- 11pm
-
-
-
-
-
-
-
-
-
-
-
-
- 10:30am - 11:00am
- template
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ <% end %>
+
+
+
<% @hours.each do |hour| %>
-
-
+
" ref="add-btn" link="<%= new_panel_calendar_back_end_event_path %>" date="<%= @date.to_s %>" ses="AM">
+
-
-
+ <% end %>
+ <% @hours.each do |hour| %>
+
" ref="add-btn" link="<%= new_panel_calendar_back_end_event_path %>" date="<%= @date.to_s %>" ses="PM">
+
<% end %>
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
index 791cfe190..eea0e6471 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
@@ -1,10 +1,8 @@
<%= stylesheet_link_tag "font-awesome" %>
-<%= stylesheet_link_tag "calendar" %>
<%= stylesheet_link_tag "bootstrap-responsive" %>
-<% content_for :page_specific_javascript do %>
- <%= javascript_include_tag "calendarAPI" %>
-<% end %>
-
+<%= stylesheet_link_tag "calendar" %>
+<%= javascript_include_tag "cals" %>
+
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb
index 98703270c..a07068ca6 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/create.js.erb
@@ -1,4 +1,14 @@
$("#event_create").empty().hide();
$("#create_event_btn").removeClass("active");
-$("#calendar_month tr.event_row").remove();
-calendar.getEventsForMonth(<%= @m %>,<%= @y %>);
\ No newline at end of file
+$(".destroy").remove();
+switch (c.view){
+ case "week":
+ c.loadWeekView(c.cur_week,c.cur_year);
+ break;
+ case "month":
+ c.loadMonthView(c.cur_month,c.cur_year);
+ break;
+ case "day":
+ c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
+ break;
+}
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/edit.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/edit.html.erb
new file mode 100644
index 000000000..3db09901f
--- /dev/null
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/edit.html.erb
@@ -0,0 +1,133 @@
+
+
+
+ <%= form_for @event, :url =>panel_calendar_back_end_event_path(@event), :class=>"form-horizontal", :remote => true do |f| %>
+
+ ×
+
+
+ <%= f.text_field :title, :class=>"span12", :placeholder => "Event Name",:value=>@event.title %>
+
+
+
+
+
+
+
+ <% if !@event.all_day %>
+
+
+
From
+
+
+ <% @hours.each_with_index do |hour,i| %>
+ <% if hour['val'] == @event.start_time %>
+ <%= hour['title'] %>
+ <% else %>
+ <%= hour['title'] %>
+ <% end %>
+ <% end %>
+
+
+ <% @ampm.each do |a| %>
+ <% if @event.start_am_pm == a %>
+ <%= a %>
+ <% else %>
+ <%= a %>
+ <% end %>
+ <% end %>
+
+
+
+
+
To
+
+
+ <% @hours.each_with_index do |hour,i| %>
+ <% if hour['val'] == @event.end_time %>
+ <%= hour['title'] %>
+ <% else %>
+ <%= hour['title'] %>
+ <% end %>
+ <% end %>
+
+
+ <% @ampm.each do |a| %>
+ <% if @event.end_am_pm == a %>
+ <%= a %>
+ <% else %>
+ <%= a %>
+ <% end %>
+ <% end %>
+
+
+
+
+ <% else %>
+
+
+
From
+
+
+ <% @hours.each_with_index do |hour,i| %>
+ <% if i == 16 %>
+ <%= hour['title'] %>
+ <% else %>
+ <%= hour['title'] %>
+ <% end %>
+ <% end %>
+
+
+ AM
+ PM
+
+
+
+
+
To
+
+
+ <% @hours.each_with_index do |hour,i| %>
+ <% if i == 18 %>
+ <%= hour['title'] %>
+ <% else %>
+ <%= hour['title'] %>
+ <% end %>
+ <% end %>
+
+
+ AM
+ PM
+
+
+
+
+ <% end %>
+
+
Calendars
+
+ <%= f.select(:cal_id, Cal.all.collect {|p| [ p.name, p.id ] },{:prompt => t("calendar.select_calendar")},:class => "validate", :selected => @event.cal_id) %>
+
+
+
+
Note
+
+ <%= f.text_area :note, :class=>"span12", :cols=>"30", :rows=>"3", :value => @event.note %>
+
+
+
+
+ Cancel
+ <%= f.submit t("calendar.save"), :class=>"btn" %>
+
+
+<% end %>
+
+
+
+
Tags
+
+ Choose Tags
+
+
+
Note
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb
index 6f7317846..a52b9f351 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/show.html.erb
@@ -13,6 +13,6 @@
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/update.js.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/update.js.erb
new file mode 100644
index 000000000..8875d2147
--- /dev/null
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/events/update.js.erb
@@ -0,0 +1,15 @@
+$("#event_create").empty().hide();
+$("#create_event_btn").removeClass("active");
+$(".destroy").remove();
+$("#create_event_btn").show();
+switch (c.view){
+ case "week":
+ c.loadWeekView(c.cur_week,c.cur_year);
+ break;
+ case "month":
+ c.loadMonthView(c.cur_month,c.cur_year);
+ break;
+ case "day":
+ c.loadDayView(c.cur_date,c.cur_month,c.cur_year);
+ break;
+}
diff --git a/vendor/built_in_modules/calendar/config/routes.rb b/vendor/built_in_modules/calendar/config/routes.rb
index 85091807a..b975c548d 100644
--- a/vendor/built_in_modules/calendar/config/routes.rb
+++ b/vendor/built_in_modules/calendar/config/routes.rb
@@ -13,7 +13,7 @@ Rails.application.routes.draw do
resources :cals
resources :events
-
+ resources :tags
end
end
end
diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
index 3e0dc5eac..48ebf3331 100644
--- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
+++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb
@@ -179,12 +179,23 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
@writing_book = WritingBook.new(params[:writing_book])
- @writing_book.create_user_id = current_user.id
- @writing_book.update_user_id = current_user.id
+ if params[:writing_book][:user_id]
+ @writing_book.create_user_id = params[:writing_book][:user_id]
+ @writing_book.update_user_id = params[:writing_book][:user_id]
+ else
+ @writing_book.create_user_id = current_user.id
+ @writing_book.update_user_id = current_user.id
+ end
respond_to do |format|
if @writing_book.save
- format.html { redirect_to(panel_personal_book_back_end_writing_books_url) }
+
+ if params[:writing_book][:user_id]
+ format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_book][:user_id],:show_plugin_profile=>'Book')) }
+ else
+ format.html { redirect_to(panel_personal_book_back_end_writing_books_url) }
+ end
+
format.xml { render :xml => @writing_book, :status => :created, :location => @writing_book }
else
format.html { render :action => "new" }
diff --git a/vendor/built_in_modules/personal_book/app/models/writing_book.rb b/vendor/built_in_modules/personal_book/app/models/writing_book.rb
index 7547d0db4..bc5fbdb34 100644
--- a/vendor/built_in_modules/personal_book/app/models/writing_book.rb
+++ b/vendor/built_in_modules/personal_book/app/models/writing_book.rb
@@ -32,8 +32,8 @@ class WritingBook
field :publication_date, :type => Date
field :url
field :note
- field :create_user_id
- field :update_user_id
+ field :create_user_id, :type => BSON::ObjectId
+ field :update_user_id, :type => BSON::ObjectId
# field :is_top, :type => Boolean, :default => false
# field :is_hot, :type => Boolean, :default => false
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
index 8b0d01325..7cec450f5 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb
@@ -47,6 +47,15 @@
+
+ <% if !params[:user_id].blank? %>
+
+
+ <%= t("著作人")%>
+ <%= User.from_id(params[:user_id]).name rescue ''%>
+
+
+ <% end %>
<%= f.label :year ,t("personal_book.year")%>
@@ -218,6 +227,7 @@
+ <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %>
<%= f.submit t('submit'), :class=>'btn btn-primary' %>
<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb
index 5fd234865..7905433e5 100644
--- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb
+++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb
@@ -50,6 +50,9 @@
+<%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary pull-right' %>
+
+
-