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

public/desktop_themes/4f8d3f3c3b67fcd05f086358/css/default.css

@@ -0,0 +1,45 @@
+/* 
+Theme Color
+
+random apply to:
+.widget_fn - on hover status
+#search_app .submit
+.tile
+
+*/
+.thmc1 { background: #6F0; }
+.thmc2 { background: #C09; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#search_app
+
+*/
+.thmc3 { background: #FFFFFF; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#rwidget
+
+*/
+.thmc4 { background: #000000; }
+
+
+/* Theme Text Color */
+.thmtxt { color: #fff; }
+.thmtxth { color: #000; }
+
+/* Group Seprate Color */
+.g_sep { border-color: #fff; }
+
+/*
+theme bg image 
+
+#thmbackground img - background
+#bgover - upon #thmbackground
+
+*/

public/desktop_themes/4f8d3f3c3b67fcd05f086358/settings/4f8d3f3c3b67fcd05f086358.json

@@ -0,0 +1,39 @@
+{
+	"css":"default.css",
+	"background":"background.jpg",
+	"tilecolor":["thmc1","thmc2"],
+	"icons":{
+		"home":"d_home.png",
+		"app_manager":"d_app_manager.png",
+		"sections":"d_sections.png",
+		"settings":"d_settings.png",
+		"publication":"d_publication.png",
+		"journal_p":"d_journal_p.png",
+		"seminar_p":"d_seminar_p.png",
+		"books":"d_books.png",
+		"research":"d_research.png",
+		"research_d":"d_research_d.png",
+		"research_p":"d_research_p.png",
+		"patents":"d_patents.png",
+		"labs":"d_labs.png",
+		"experience":"d_experience.png",
+		"working":"d_working.png",
+		"education":"d_education.png",
+		"honors":"d_honors.png",
+		"activities":"d_activities.png",
+		"clubs":"d_clubs.png",
+		"landt":"d_landt.png",
+		"courses":"d_courses.png",
+		"homework":"d_homework.png",
+		"certification":"d_certification.png",
+		"personal":"d_personal.png",
+		"mypage":"d_mypage.png",
+		"blog":"d_blog.png",
+		"album":"d_album.png",
+		"calendar":"d_calendar.png",
+		"files":"d_files.png",
+		"orbit":"d_orbit.png",
+		"connection":"d_connection.png",
+		"appstore":"d_appstore.png"
+		}
+	}

public/desktop_themes/4f8d3f493b67fcd05f086359/css/default.css

@@ -0,0 +1,45 @@
+/* 
+Theme Color
+
+random apply to:
+.widget_fn - on hover status
+#search_app .submit
+.tile
+
+*/
+.thmc1 { background: #0099CC; }
+.thmc2 { background: #3366CC; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#search_app
+
+*/
+.thmc3 { background: #FFFFFF; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#rwidget
+
+*/
+.thmc4 { background: #000000; }
+
+
+/* Theme Text Color */
+.thmtxt, .thmtxt:hover { color: #fff; }
+.thmtxth { color: #fff; }
+
+/* Group Seprate Color */
+.g_sep { border-color: #fff; }
+
+/*
+theme bg image 
+
+#thmbackground img - background
+#bgover - upon #thmbackground
+
+*/

public/desktop_themes/4f8d3f493b67fcd05f086359/settings/4f8d3f493b67fcd05f086359.json

@@ -0,0 +1,39 @@
+{
+	"css":"default.css",
+	"background":"background.jpg",
+	"tilecolor":["thmc1","thmc2"],
+	"icons":{
+		"home":"d_home.png",
+		"app_manager":"d_app_manager.png",
+		"sections":"d_sections.png",
+		"settings":"d_settings.png",
+		"publication":"d_publication.png",
+		"journal_p":"d_journal_p.png",
+		"seminar_p":"d_seminar_p.png",
+		"books":"d_books.png",
+		"research":"d_research.png",
+		"research_d":"d_research_d.png",
+		"research_p":"d_research_p.png",
+		"patents":"d_patents.png",
+		"labs":"d_labs.png",
+		"experience":"d_experience.png",
+		"working":"d_working.png",
+		"education":"d_education.png",
+		"honors":"d_honors.png",
+		"activities":"d_activities.png",
+		"clubs":"d_clubs.png",
+		"landt":"d_landt.png",
+		"courses":"d_courses.png",
+		"homework":"d_homework.png",
+		"certification":"d_certification.png",
+		"personal":"d_personal.png",
+		"mypage":"d_mypage.png",
+		"blog":"d_blog.png",
+		"album":"d_album.png",
+		"calendar":"d_calendar.png",
+		"files":"d_files.png",
+		"orbit":"d_orbit.png",
+		"connection":"d_connection.png",
+		"appstore":"d_appstore.png"
+		}
+	}

public/desktop_themes/4f8d3f533b67fcd05f08635a/css/natural.css

@@ -0,0 +1,46 @@
+/* 
+Theme Color
+
+random apply to:
+.widget_fn - on hover status
+#search_app .submit
+.tile
+
+*/
+.thmc1 { background: #B6662C; }
+.thmc2 { background: #34520C; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#search_app
+
+*/
+.thmc3 { background: #FFFFFF; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#rwidget
+
+first one
+*/
+.thmc4 { background: #5CA360; }
+
+
+/* Theme Text Color */
+.thmtxt, .thmtxt:hover { color: #fff; }
+.thmtxth { color: #fff; }
+
+/* Group Seprate Color */
+.g_sep { border-color: #fff; }
+
+/*
+theme bg image 
+
+#thmbackground img - background
+#bgover - upon #thmbackground
+
+*/