Merge branch 'design_team' into ldap

Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb

app/views/admin/ad_banners/_ad_banner_tab.html.erb

@@ -1,23 +1,27 @@
-<div class="tab-pane <%= "active"  if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title %>>
-	<p><%= t("admin.ad.banner_best_size") %>：</p>
+<div class="tab-pane fade <%= "active in"  if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title %>>
 
 	<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
-		<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
-		<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
-		<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
-		<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
-		<%= f.submit t("admin.ad.update_banner") %>
-		<%= f.submit t("cancel"),:type=>'reset' %>
-	<div class="adbanner-list">
-		<div class="adbanner-action">
-			<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
-			<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
+		<div class="adbanner-setup well">
+			<!--<p><%#= t("admin.ad.banner_best_size") %>：</p>-->
+			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
+			<%= f.select :ad_fx ,AdBanner::FX_TYPES %>
+			<%= f.label :transition_sec, t('admin.ad.transition_sec') %>
+			<%= f.text_field :transition_sec,:placeholder=>t('admin.ad.sec_place_holder'),:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
+			<br>
+			<%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
+			<%= f.submit t("cancel"),:type=>'reset', :class => 'btn'  %>
+		</div>
+		<h3>圖片列表</h3>
+		<div class="adbanner-list">
+			<div class="adbanner-action pagination-right">
+				<%= link_to t("admin.ad.new_image"),new_admin_ad_banner_ad_image_path(ad_banner_tab) ,:class => "btn btn-primary"%>
+				<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(ad_banner_tab.title) , :class=>'preview_trigger btn btn-success'%>
+			</div>
+			<ul class="clear">
+				<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
+			</ul>
+			<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
 		</div>
-		<ul class="clear">
-			<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
-		</ul>
-		<%#= render :partial => 'new_add_banner_file', :object => ad_banner_tab.ad_images.build, :locals => { :field_name => "new_ad_images[]", :f => f, :classes => "r_destroy" } %>
-	</div>
 	<% end -%>
 	<%#= render :partial => 'preview_block',:locals=> {:ad_banner =>ad_banner_tab} %> 
 </div>

app/views/admin/ad_banners/_modal_preview.html.erb

@@ -1,6 +1,6 @@
 <% if ad_banner -%>
 
-<div class="modal hide fade in banner-preview" id='slideshow-<%=ad_banner.title.dehumanize%>'>
+<div class="modal hide fade in banner-preview" id="slideshow-<%=ad_banner.title.dehumanize%>">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3><%= t("modal.preview") %></h3>
@@ -8,28 +8,29 @@
   <div class="modal-body">
     <p class="ad_banner_slideshow">
 			<% preview_block_ad_images_helper(ad_banner).each do |ad_image| -%>
-				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || ' '),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
+				<%= image_tag ad_image.file,:alt => (ad_image.title[locale] || " "),:time_to_next => ad_banner.transition_sec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %>
 			<% end -%>
     </p>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn" data-dismiss="modal"><%= t("modal.close") %></a>
   </div>
+  <div>
+  	<script type="text/javascript" src="/static/kernel.js"></script>
+		<script type="text/javascript">
+			$(document).ready(function() {
+	
+			$("#slideshow-<%=ad_banner.title.dehumanize%>").on("show", function () {
+  		$("#slideshow-<%=ad_banner.title.dehumanize%>").find(".ad_banner_slideshow").cycle({delay: -1000, fx: "<%= ad_banner.ad_fx.nil?? "fade": ad_banner.ad_fx %>", timeoutFn: getTimeout });
+			});
+		$(".modal").on("hidden", function () {
+	  $("#show_preview").remove();
+			});
+		});
+		</script>
+	</div>
 </div>
 
-<% end -%>
 
-<script type='text/javascript' src='/static/kernel.js'></script>
-<script type='text/javascript'>
-	$(document).ready(function() {
-	
-	$('#slideshow-<%=ad_banner.title.dehumanize%>').on('show', function () {
-  	$('#slideshow-banner_1').find(".ad_banner_slideshow").cycle({delay: -1000, fx: '<%= ad_banner.ad_fx.nil?? 'fade': ad_banner.ad_fx %>', timeoutFn: getTimeout });
-	});
-	$(".modal").on('hidden', function () {
-	  $("#show_preview").remove();
-	});
-	//$('#slideshow-<%=ad_banner.title.dehumanize%>').show();
-	
-	});
-</script>
+
+<% end -%>

app/views/admin/ad_images/_form.html.erb

@@ -83,7 +83,7 @@
             <span class="alert widgetInfo">此區塊圖片尺寸請使用580px × 225px</span>
             <div class="controls file-upload input-prepend">
               <label class="control-label add-on btn" for="input-upload">
-								Choose file
+								<%= t(:browse) %>
 								<%= f.file_field :file,:id=>"input-upload",:class => "upload", :onchange=> "document.getElementById('fu1').innerHTML = this.form.fu1.value = this.value;" %>
 							</label>
 							<span id="fu1" class="file-name"></span>

app/views/devise/sessions/new.html.erb

@@ -5,9 +5,11 @@
 
 	<%= flash_messages %>
 <div id="container" class="sign-in">
+	  <% flash.each do |key, msg| %>
+    <%= content_tag :spen, msg, :class => [key, "notice label label-warning"] %>
+  <% end%>
 	<%= form_for :user, :url => user_session_path, :html => {:class => 'user_new form-horizontal'} do |f| %>
 		<div class="content">
-			<p class="notice label label-warning">Notice</p>
 			<p class="alert hide">You need to sign in or sign up before continuing.</p>
 			<div class="main">
 				<div class="control-group clear">