Merge branch 'design_team' into ldap

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

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

@@ -8,12 +8,15 @@
 		<%= f.text_field :transition_sec,:placeholder=>"3秒請輸入3000",:class=> "span3" %> <%= t("admin.ad.trans_unit_sec") %>
 		<%= f.submit t("admin.ad.update_banner") %>
 		<%= f.submit t("cancel"),:type=>'reset' %>
-	<div>
-			<%= render :partial => "ad_image_update", :collection => ad_banner_tab.ad_images,:as => :ad_image,:locals=>{:ad_banner => ad_banner_tab}  %>
-		<%#= 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 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>
+		<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} %> 

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

@@ -8,5 +8,4 @@
 				<%= link_to	t('edit'),edit_admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn btn-primary'  %>
 				<%= link_to	t('delete'),admin_ad_banner_ad_image_path(ad_banner,ad_image),:class => 'btn',:method => :delete,:confirm => t('sure?') %>
 			</p>
-</li>
-
+</li>

app/views/kaminari/_first_page.html.erb

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="first">
+<li class="first">
   <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
-</span>
+</li>

app/views/kaminari/_gap.html.erb

@@ -5,4 +5,4 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap"><%= raw(t 'views.pagination.truncate') %></span>
+<li class="page gap"><%= raw(t 'views.pagination.truncate') %></li>

app/views/kaminari/_last_page.html.erb

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="last">
+<li class="last">
   <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
-</span>
+</li>

app/views/kaminari/_next_page.html.erb

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="next">
+<li class="next">
   <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
-</span>
+</li>

app/views/kaminari/_page.html.erb

@@ -7,6 +7,10 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page<%= ' current' if page.current? %>">
-  <%= link_to_unless page.current?, page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
-</span>
+<li class="page<%= ' active' if page.current? %>">
+  <% if page.current? %>
+  	<a><%= page %></a>
+  <% else %>
+    <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <% end %>
+</li>

app/views/kaminari/_paginator.html.erb

@@ -7,7 +7,8 @@
     paginator:     the paginator that renders the pagination tags inside
 -%>
 <%= paginator.render do -%>
-  <nav class="pagination">
+<div class="pagination">
+  <ul>
     <%= first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| -%>
@@ -19,5 +20,6 @@
     <% end -%>
     <%= next_page_tag unless current_page.last? %>
     <%= last_page_tag unless current_page.last? %>
-  </nav>
+  </ul>
+</div>
 <% end -%>

app/views/kaminari/_prev_page.html.erb

@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="prev">
+<li class="prev">
   <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
-</span>
+</li>