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/views/admin/sites/_side_bar.html.erb

@@ -13,5 +13,5 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('designs') do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t(:template), admin_designs_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + content_tag(:span, t(:template)), admin_designs_path %>
 <% end -%>

app/views/admin/sites/language.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 language.html.erb

app/views/admin/sites/mail_setting.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <div id="poststuff">

app/views/admin/sites/site_info.html.erb

@@ -1,5 +1,7 @@
+<% # encoding: utf-8 %>
+
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <div id="poststuff">
@@ -79,6 +81,24 @@
 								<% end %>
 							</div>
 						</div>
+						<div class="control-group">
+							<label class="control-label"><%= t 'site.default_image' %></label>
+							<div class="controls">
+								<%= f.file_field :default_image, :id => "input-upload", :class => 'upload', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>
+								<span id='fu' class="file-name"></span>
+							  <!--請程式務必將圖片尺寸加入到行內裡-->
+							  <% if @site.default_image %>
+								<%= image_tag( @site.default_image, :size=>"120x120") rescue ''%>
+							  <% else %>
+								<img class="pull-left upload-picture" src="/assets/default-img.png" />
+							  <% end %>
+								<br>
+								<% if @site.default_image.file %>
+								  <%= f.check_box :remove_default_image %>
+								  <%= t('刪除已上傳檔案') %>
+								<% end %>
+							</div>
+						</div>
 					<% end %>
 				<% end %>
 			</div>

app/views/admin/sites/sitemap.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 

app/views/admin/sites/system_info.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 system_info.html.erb

app/views/admin/sites/ui_theme.html.erb

@@ -1,5 +1,5 @@
 <% content_for :side_bar do %>
-	<%= render 'side_bar' %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 ui_theme.html.erb