Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config

Conflicts:
	app/controllers/admin/page_parts_controller.rb
	app/controllers/default_widget_controller.rb
	app/uploaders/gprs_uploader.rb
	app/uploaders/location_uploader.rb
	app/views/admin/page_parts/_module_widget.html.erb
	app/views/admin/page_parts/reload_widget_styles.js.erb
	app/views/admin/page_parts/reload_widgets.js.erb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
	vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
	vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/README.rdoc
	vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
	vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
	vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/models/location.rb
	vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
	vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
	vendor/built_in_modules/location/config/routes.rb
	vendor/built_in_modules/location/lib/location.rb
	vendor/built_in_modules/location/location.gemspec
	vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb

app/helpers/admin/items_helper.rb

@@ -11,8 +11,7 @@ module Admin::ItemsHelper
           no_nested = 'no-nest'
       end
       ret << "<li id='#{node.id}' class='#{no_nested}'>"
-      # ret << "<i class='icons-moves'></i>"
-      ret << "<div class='with_action'><i class='icons-cplus'></i>"
+      ret << "<div class='with_action'><i class='icons-plus-3'></i>"
       ret << (link_to node.title, dest, :class => 'js_history')
       ret << "<div class='quick-edit hide'>"
       ret << (link_to t(:edit), eval("edit_admin_#{node.class.to_s.downcase}_path(node)"), :class => 'js_history') if node.class.to_s.eql?('Page')

app/helpers/admin/page_parts_helper.rb

@@ -9,14 +9,86 @@ module Admin::PagePartsHelper
     end
   end
 
-  def widget_field_options(i)
+  def widget_field_options(i,local_item=nil)
+    local_item = @part if local_item.nil? && @part
+    local_item = @page if local_item.nil? && @page
     options = @module_app.widget_fields.collect{|widget_field| [I18n.t(widget_field[1]), widget_field[0]]}
-    options_for_select(options, (@part[:widget_field][i][0] if (@part && !@part[:widget_field].blank? && !@part[:widget_field][i].blank?)) )
+
+    case local_item
+    when Page
+      options_for_select(options, (local_item[:frontend_field][i][0] if (local_item && !local_item[:frontend_field].blank? && !local_item[:frontend_field][i].blank?)) )
+    when PagePart
+      options_for_select(options, (local_item[:widget_field][i][0] if (local_item && !local_item[:widget_field].blank? && !local_item[:widget_field][i].blank?)) )
+    end
   end
 
-  def widget_fiield_type_options(i)
+  def widget_fiield_type_options(i,local_item=nil)
     options = LIST[:widget_field_type].collect{|widget_field| [widget_field.humanize, widget_field]}
-    options_for_select(options, (@part[:widget_field][i][1] if (@part && !@part[:widget_field].blank? && !@part[:widget_field][i].blank?)) )
+    local_item = @part if local_item.nil? && @part
+    local_item = @page if local_item.nil? && @page
+
+    case local_item
+    when Page
+      options_for_select(options, (local_item[:frontend_field][i][1] if (local_item && !local_item[:frontend_field].blank? && !local_item[:frontend_field][i].blank?)) )
+    when PagePart
+      options_for_select(options, (local_item[:widget_field][i][1] if (local_item && !local_item[:widget_field].blank? && !local_item[:widget_field][i].blank?)) )
+    end
+  end
+
+  def tag_checked_value(part,radio_value)
+    if radio_value.blank?
+      (part.nil? || part[:tag].blank?)? true : false
+    else
+      part and (part[:tag] == radio_value.to_s) ? true : false
+    end
+  end
+
+  def category_checked_value(part,radio_value)
+    if radio_value.blank?
+      (part.nil? || part[:category].blank?)? true : false
+    else
+      part and (part[:category] == radio_value.to_s) ? true : false
+    end
+  end
+
+  def style_checked_value(part,radio_value)
+    case part
+    when Page
+      if  part.frontend_style.nil? && radio_value == "typeA"
+        true
+      else
+        (part.frontend_style == radio_value) ? true : false
+      end
+    when PagePart
+      if  part.widget_style.nil? && radio_value == "typeA"
+        true
+      else
+        (part.widget_style == radio_value) ? true : false  
+      end
+    when nil
+      false
+    end 
+  end
+
+  def nil_radio_button(part,tag_or_cate)
+    field_name = case part
+    when PagePart
+      'page_part'
+    when Page
+      'page'
+    end
+    content_tag :label,:class=>"radio inline" do 
+      op = radio_button(field_name, tag_or_cate, '' , :checked => eval("#{tag_or_cate}_checked_value(part,'')"))
+      op << I18n.t("default_widget.no_value")
+    end
+  end
+
+  def show_default_widget_setting_panel
+      @module_app && @module_app.has_default_widget? && (!@user_choose.nil? && @user_choose== 'default_widget') #&& @part.widget_path == 'default_widget' 
+  end
+
+  def show_custom_widget_setting_panel
+    true
   end
 
 end

app/helpers/application_helper.rb

@@ -54,8 +54,14 @@ module ApplicationHelper
     raw(formatted_messages.join)
   end
   
-  def link_back
-     link_to t('back'), get_go_back, :class => 'nav'
+  def link_back(custom_class=nil)
+    case custom_class
+    when nil
+     link_to t('back'), get_go_back, :class => 'nav'  
+    else
+      link_to t('back'), get_go_back, :class => custom_class  
+    end
+     
   end
   
   # Clean the link back
@@ -254,6 +260,10 @@ module ApplicationHelper
     object.strftime("%Y-%m-%d")
   end
 
+  def display_time(object)
+    object.strftime("%H:%M")
+  end
+
   def share_links(object, key)
     content_tag :div, :class => 'fb' do
       concat social_share_button_tag(object.title, :fb_url => generate_fb_url(object,key), :image => "http://#{request.env['HTTP_HOST']}#{object.image_url}")
@@ -278,4 +288,9 @@ module ApplicationHelper
     end
   end
 
+  # NTU link
+  def get_link(site_number)
+    "http://#{request.host}:2#{site_number}00"
+  end
+
 end

app/helpers/attribute_fields_helper.rb

@@ -149,7 +149,7 @@ protected
             link_entry_ary = [".#{get_pairing_tab_class({})}",".#{key}"]
             link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more
             link_entry = link_entry_ary.join
-            content_tag(:li,link_to(I18n.t("langs."+key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ?  "active" : nil),:for=>key)
+            content_tag(:li,link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ?  "active" : nil),:for=>key)
           end.join.html_safe  # of VALID_LOCALES.collect for tabs
         end # of content ul
     end

app/helpers/default_widget_helper.rb

@@ -49,7 +49,8 @@ module DefaultWidgetHelper
     when nil
       eval method_entry
     else
-      eval("#{method_entry}('#{object}')" ) 
+      object = "'#{object.to_s}'" if object.class == BSON::ObjectId
+      eval("#{method_entry}(#{object})" ) 
     end
   end
 

app/helpers/desktop/co_author_relations_helper.rb

@@ -1,2 +0,0 @@
-module Desktop::CoAuthorRelationsHelper
-end

app/helpers/desktop/journal_lists_helper.rb

@@ -1,2 +0,0 @@
-module Desktop::JournalListsHelper
-end

app/helpers/front_helper.rb

@@ -0,0 +1,9 @@
+module FrontHelper
+
+  def ad_image_link(ad_image)
+    link = ad_image.out_link
+    link = front_show_inner_ad_image_path(:id=> ad_image.id) if link.blank? && !ad_image.context.blank?
+    link
+  end  
+
+end

app/helpers/orbit_form_helper.rb

@@ -0,0 +1,104 @@
+module OrbitFormHelper
+  def self.included(base)
+    ActionView::Helpers::FormBuilder.send(:include, Orbit::FormBuilder)
+  end
+
+  def datetime_picker(object_name, method, options = {})
+    options[:icon_time] ||= 'icons-clock'
+    options[:icon_date] ||= 'icons-calendar'
+    options[:icon_clear] ||= 'icons-cross-3'
+    options[:input_class] ||= 'input-large'
+    options[:value] ||= options[:object][method] if options[:object] && options[:object][method]
+    case options[:picker_type]
+    when 'date'
+      content_tag :div, :id => options[:id], :class => options[:class] do
+        date_picker(object_name, method, options)
+      end
+    when 'time'
+      content_tag :div, :id => options[:id], :class => options[:class] do
+        time_picker(object_name, method, options)
+      end
+    when 'separated'
+      options[:label] ||= I18n.t('datetime_picker.separated.label')
+      content_tag :div, :id => options[:id], :class => "separated_picker #{options[:class]}" do
+        concat label_tag options[:label] unless options[:no_label]
+        concat hidden_field(object_name, method)
+        concat separated_picker(object_name, method, options)
+      end
+    else
+      content_tag :div, :id => options[:id], :class => options[:class] do
+        default_picker(object_name, method, options)
+      end
+    end
+  end
+
+  def date_picker(object_name, method, options)
+    custom = {}
+    custom[:format] = 'yyyy-MM-dd'
+    custom[:value] = display_date(options[:value]) if options[:value]
+    custom[:picker_class] = 'date_picker'
+    custom[:label] = options[:label] || I18n.t('datetime_picker.date.label')
+    custom[:placeholder] = options[:placeholder] || I18n.t('datetime_picker.date.placeholder')
+    picker(object_name, method, options.merge(custom))
+  end
+
+  def default_picker(object_name, method, options)
+    custom = {}
+    custom[:format] = 'yyyy-MM-dd hh:mm'
+    custom[:value] = display_date_time(options[:value]) if options[:value]
+    custom[:picker_class] = 'default_picker'
+    custom[:label] = options[:label] || I18n.t('datetime_picker.default.label')
+    custom[:placeholder] = options[:placeholder] || I18n.t('datetime_picker.default.placeholder')
+    picker(object_name, method, options.merge(custom))
+  end
+
+  def time_picker(object_name, method, options)
+    custom = {}
+    custom[:format] = 'hh:mm'
+    custom[:value] = display_time(options[:value]) if options[:value]
+    custom[:picker_class] = 'time_picker'
+    custom[:label] = options[:label] || I18n.t('datetime_picker.time.label')
+    custom[:placeholder] = options[:placeholder] || I18n.t('datetime_picker.time.placeholder')
+    picker(object_name, method, options.merge(custom))
+  end
+
+  def separated_picker(object_name, method, options)
+    custom = {}
+    custom[:no_label] = true
+    custom[:separated] = true
+    date_picker(nil, nil, options.merge(custom)) + time_picker(nil, nil, options.merge(custom))
+  end
+
+
+  def single_picker(object_name, method, options)
+    content_tag :div, :id => options[:id], :class => options[:class] do
+      picker(object_name, method, options)
+    end
+  end
+
+  def double_picker(object_name, method, options)
+    
+  end
+
+  def picker(object_name, method, options)
+    content_tag :div, :class => "#{options[:picker_class]} input-append", :style => "#{(options[:picker_class].eql?('time_picker') && options[:value].blank? && options[:separated]) ? 'pointer-events:none' : nil}" do
+      concat label_tag options[:label] unless options[:no_label]
+      concat text_field object_name, method, :placeholder => options[:placeholder], :class => options[:input_class], 'data-format' => options[:format], :value => options[:value]
+      concat (content_tag :span, :class => 'add-on clearDate' do
+                content_tag :i, nil, :class => options[:icon_clear]
+              end)
+      concat (content_tag :span, :class => 'add-on iconbtn' do
+                content_tag :i, nil, 'data-time-icon' => options[:icon_time], 'data-date-icon' => options[:icon_date]
+              end)
+    end
+  end
+
+end
+
+module Orbit::FormBuilder
+  # ActionPack's metaprogramming would have done this for us, if FormHelper#labeled_input 
+  # had been defined  at load.   Instead we define it ourselves here.
+  def datetime_picker(method, options = {})
+    @template.datetime_picker(@object_name, method, objectify_options(options))
+  end
+end