Merge branch 'ad_banner' into ldap

2012-04-26 17:15:44 +08:00
commit 7d6b82d9dd
@@ -1,4 +1,4 @@
-<div class="tab-pane fade <%= "active in"  if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title %>>
+<div class="tab-pane fade <%= "active in" if ad_banner_tab==@active%>" id=<%= ad_banner_tab.title.dehumanize %>>

 	<%= form_for ad_banner_tab,:url=> admin_ad_banner_path(ad_banner_tab),:method => :put,:class=>"input-medium" do |f| -%>
 		<div class="adbanner-setup well">
@@ -8,7 +8,7 @@
  <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_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || " ")) %>
 			<% end -%>
    </p>
  </div>
@@ -9,7 +9,7 @@
  <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_msec,:link_open=> ad_image.link_open, :link_url =>((ad_image.out_link || ad_banner.context || ' ')) %>
 			<% end -%>
    </p>
  </div>
@@ -10,7 +10,7 @@
 <div id="post-body-content" class="clear">
 	<ul class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>
-			<%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : nil ) %>
+			<%= content_tag :li,link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : nil ) %>
 		<% end -%>
 		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
 		
@@ -157,7 +157,7 @@
 					</div>
 				</div>
 				<div class="form-actions">
-					<%= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
+					<%#= link_to t("modal.preview"), admin_realtime_preview_ad_banner_path(@ad_image.ad_banner.title) ,:class=>"preview_trigger btn btn-success" rescue nil%>
 					<%= f.submit t("submit"),:class=>"btn btn-primary" %>
 					<%= f.submit t("cancel"),:class=>"btn ",:type => 'reset' %>
 				</div>
@@ -9,7 +9,7 @@
    		<%= link_back %>
 				<%= f.submit t(:edit) %>
 			<% else %>
-				<a id='submit_button'><%= t(:edit) %></a>
+				<a id='ajax_form_submit'><%= t(:edit) %></a>
 			<% end %>
 	  </div>
 	<% end %>
@@ -9,7 +9,7 @@
    		<%= link_back %>
 				<%= f.submit t(:create) %>
 			<% else %>
-				<a id='submit_button' class="new"><%= t(:create) %></a>
+				<a id='ajax_form_submit' class="new"><%= t(:create) %></a>
 			<% end %>
 	  </div>
 	<% end %>
@@ -1,7 +1,7 @@
 <%= flash_messages %>


-<%= page_stylesheets(@item).html_safe %> 
-<%= page_javascripts(@item).html_safe %> 
+<%= page_stylesheets(@item, true).html_safe %> 
+<%= page_javascripts(@item, true).html_safe %> 

 <%= parse_page_edit_noko(@item).html_safe %>
@@ -1,5 +1 @@
-<% content_for :sidebar do %>
-	<%= render 'admin/items/site_map_left_bar' %>
-<% end -%>
-
 <%= render 'show' %>
@@ -33,8 +33,8 @@
 	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.ad_banner'), admin_ad_banners_path %>
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('ad_banners', 'ad_images')) do -%>
 		<%= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
-		<%= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
-		<%= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
+		<%#= content_tag :li, link_to(t('admin.ad.new_banner'), new_admin_ad_banner_path), :class => active_for_action('ad_banners', 'new') %>
+		<%#= content_tag :li, link_to(t('admin.ad.new_image'), new_ad_image_admin_ad_banners_path), :class => active_for_action('ad_images', 'new') %>
 	<% end %>
 <% end %>

@@ -9,31 +9,30 @@
 	<![endif]-->
 	<%= stylesheet_link_tag "site_editor" %>
 	<%= javascript_include_tag "site_editor" %>
-	<%= yield :page_specific_css %>
-	<%= yield :page_specific_javascript %>
 	<%= csrf_meta_tag %>
 </head>
 <body>
-<!--
-	<header id="back_banner_link" class="fixed clear" >
-		<nav id="back_orbit">
-			<span>Orbit Icon</span>
-			<%= render 'layouts/drop_down_menu' %>
-		</nav>
-		<div class="hmenu">
-			<%= render 'devise/menu/login_items' %>
-			<div class="lang"><%= render 'layouts/lang_menu' %></div>
+	<%= render 'layouts/orbit_bar' %>
+	<nav id="main-sidebar" class="my_scroll">
+		<div class="scrollbar">
+			<div class="track">
+				<div class="thumb">
+					<div class="end"></div>
+				</div>
+			</div>
 		</div>
-	</header>
-->
+		<div class="viewport">
+			<div id='back_sidebar' class="overview">
+				<ul class="nav nav-list">
+					<%= yield :sidebar %>
+				</ul>
+			</div>
+		</div>
+	</nav>
 	<div id="main-wrap">
-		<div id="main-sidebar"><%= yield :sidebar %></div>
-		<div class="main"><div id='back_main' class="main2">
+		<div id='back_main'>
 			<%= yield %>
-		</div></div>
-		<div class="tertiary"><%= yield :tertiary %></div>
-		<div id="back_footer"><p><%= APP_CONFIG['ruling_digital'] %></p></div>
+		</div>
 	</div>
-
 </body>
 </html>