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/designs/edit.html.erb

@@ -1,13 +1,43 @@
 <% content_for :side_bar do %>
-	<%= render 'admin/sites/side_bar' %>
+	<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :side_bar_content => 'admin/sites/side_bar'} %>
 <% end %>
 
 <h1><%= t('editing.design') %></h1>
 
-<%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %>
-  <%= f.error_messages %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <p>
-    <%= f.submit t('update') %> <%= link_back %>
-  </p>
-<% end %>
+<ul class="nav nav-tabs" id="myTab">
+  <li class="active"><a href="#info" data-toggle="tab"><%= t('design.info') %></a></li>
+  <li><a href="#layout" data-toggle="tab"><%= @design.layout.name %></a></li>
+  <li><a href="#css_default" data-toggle="tab"><%= @design.css_default.name %></a></li>
+  <li><a href="#css_reset" data-toggle="tab"><%= @design.css_reset.name %></a></li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.themes') %> <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <% @design.themes.each do |theme| %>
+        <li><a href="#<%= dom_id theme %>" data-toggle="tab"><%= theme.name %></a></li>
+      <% end %>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('design.javascripts') %> <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <% @design.javascripts.each do |js| %>
+        <li><a href="#<%= dom_id js %>" data-toggle="tab"><%= js.name %></a></li>
+      <% end %>
+    </ul>
+  </li>
+  <li><a href="#images" data-toggle="tab"><%= t('design.images') %></a></li>
+</ul>
+ 
+<div class="tab-content">
+  <div class="tab-pane active" id="info"><%= render :partial => 'form' %></div>
+  <div class="tab-pane" id="layout"><%= render :partial => 'tab_form', :locals => {:type => :layout, :object => @design.layout} %></div>
+  <div class="tab-pane" id="css_default"><%= render :partial => 'tab_form', :locals => {:type => :css_default, :object => @design.css_default} %></div>
+  <div class="tab-pane" id="css_reset"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => @design.css_reset} %></div>
+  <% @design.themes.each do |theme| %>
+    <div class="tab-pane" id="<%= dom_id theme %>"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => theme} %></div>
+  <% end %>
+  <% @design.javascripts.each do |js| %>
+    <div class="tab-pane" id="<%= dom_id js %>"><%= render :partial => 'tab_form', :locals => {:type => :css_reset, :object => js} %></div>
+  <% end %>
+  <div class="tab-pane" id="images"><%= render :partial => 'images' %></div>
+</div>