Merge branch 'various_bugs' into nccu_master

Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

app/helpers/admin/ad_banners_helper.rb

@@ -1,4 +1,4 @@
-module Admin::AdBannerHelper
+module Admin::AdBannersHelper
   def preview_block_ad_images_helper(ad_banner)  
          printable_ad_images = []
          ad_banner.ad_images.each do |ad_image|

app/helpers/admin/ad_images_helper.rb

@@ -1,3 +0,0 @@
-module Admin::AdImagesHelper
-
-end

app/helpers/admin/app_auths_helper.rb

@@ -1,4 +1,4 @@
-module Admin::AppAuthHelper
+module Admin::AppAuthsHelper
   def on_off_switch(attribute,attribute_type)
     link_to t(:enable), eval("admin_#{attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{attribute_type} => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? 'none' : ''}", :class => 'switch' 
     link_to t(:disable), eval("admin_#{attribute_type}_path(attribute, :authenticity_token => form_authenticity_token, :#{attribute_type} => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{attribute.id}", :style => "display:#{attribute.is_disabled? ? '' : 'none'}", :class => 'switch'

app/helpers/admin/assets_helper.rb

@@ -1,4 +1,4 @@
-module Admin::AssetHelper
+module Admin::AssetsHelper
 
   def show_all_fields(asset, field)
     a = []

app/helpers/admin/dashboards_helper.rb

@@ -1,4 +1,4 @@
-module Admin::DashboardHelper
+module Admin::DashboardsHelper
   
 	def get_link(title)
 		case title

app/helpers/admin/items_helper.rb

@@ -1,4 +1,4 @@
-module Admin::ItemHelper
+module Admin::ItemsHelper
   
   def render_node_and_children(node)
     ret = ''

app/helpers/admin/module_apps_helper.rb

@@ -1,4 +1,4 @@
-module Admin::ModuleAppHelper
+module Admin::ModuleAppsHelper
 
   def if_permit_to_delete(item)
     case item.downcase

app/helpers/admin/page_content_helper.rb

@@ -1,18 +0,0 @@
-module Admin::PageContentHelper
-include ActionView::Helpers::UrlHelper
-
-  
-  def show_page_context_edit_auth_link(page_context)
-    type = 'Edit'
-# debugger
-#     a=1
-    oa = page_context.get_object_auth_by_title(type)
-    if oa.nil?
-      page_context.object_auths.new(title: type ).save rescue
-      oa = page_context.get_object_auth_by_title(type)
-    end
-#    link_to t(:category_auth), edit_admin_object_auth_path(oa)
-     link_to t(:category_auth),admin_object_auth_ob_auth_path(oa)
-  end
-
-end

app/helpers/admin/plugins_helper.rb

@@ -0,0 +1,30 @@
+module Admin::PluginsHelper
+  
+  def render_plugin_list
+    ret = ''
+		
+    ret << "<div class=\"subnav\">"
+    ret << "<div id=\"module-nav\">"
+    ret << "<div class=\"arrow_next pull-right\"><i class=\"icon-chevron-right\"></i></div>"
+    ret << "<div class=\"arrow_prev pull-left\"><i class=\"icon-chevron-left\"></i></div>"
+    ret << "<div class=\"module-nav-view\">"
+    
+    ret << "<ul class=\"nav nav-pills\">"
+	  
+    @plugins.each do |plugin|
+      ret << "<li>"
+	  ret << (link_to eval("#{plugin.title}") , eval("panel_#{plugin.title}_back_end_#{plugin.object}s_path")) rescue nil
+	  ret << "</li>"
+    end
+	  
+    ret << "</ul>"
+	
+    ret << "</div>"
+    ret << "</div>"
+    ret << "</div>"
+    
+    ret.html_safe
+	
+  end
+  
+end

app/helpers/admin/users_helper.rb

@@ -1,4 +1,4 @@
-module Admin::UserHelper
+module Admin::UsersHelper
 
   def show_attribute(object, field_id, locale = '')
     attribute = object.attribute_values.detect {|av| av.attribute_field_id.eql?(field_id) || av[locale.to_s].eql?(locale.to_s) } rescue nil

app/helpers/admin/web_link_helper.rb

@@ -1,11 +0,0 @@
-module Admin::WebLinkHelper
-    def show_web_link_permission_link(web_link)
-      type = 'edit'
-      oa = web_link.get_object_auth_by_title(type)
-    if oa.nil?
-      web_link.object_auths.new(title: type ).save
-      oa = web_link.get_object_auth_by_title(type)
-    end
-     link_to t(:category_auth),admin_object_auth_ob_auth_path(oa)
-  end
-end