Merge branch 'design_team' into ldap

Conflicts: vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
commit f1c8bed29d
@@ -7,6 +7,10 @@
 			<%= 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") %>
+			<%if  at_least_module_manager%>
+				<%= f.label :best_size, t('admin.ad.best_size') %>
+				<%= f.text_field :best_size %> Ex: 500px x 300px
+			<% end -%>
 			<br>
 			<%= f.submit t("admin.ad.update_banner"), :class => 'btn' %>
 			<%= f.submit t("cancel"),:type=>'reset', :class => 'btn'  %>
@@ -21,6 +21,13 @@
 				<%= f.text_field :transition_sec %> <%= t("admin.ad.trans_unit_sec") %>
 			</div>
 		</div>
+
+		<div class="control-group">
+			<%= f.label :best_size, t('admin.ad.best_size'),:class => "control-label" %>
+			<div class="controls">
+				<%= f.text_field :best_size %> Ex: 500px x 300px
+			</div>
+		</div>
 		
 		<div class="control-group">
 			<%= f.label :ad_fx, t('admin.ad.ab_fx') %>
@@ -13,11 +13,16 @@
 	<ul id="banner_tab" class="nav nav-tabs">
 		<% @ad_banners.each do |ab| %>
 			<%= content_tag :li ,:class => (ab ==  @active ? 'active' : nil) do %>
-				<i class="icons-pencil"></i>
-				<%= link_to(ab.title,"##{ab.title.dehumanize}",:contenteditable=>"false",:data=>{:toggle=>"tab" ,'edit-url' =>(admin_rename_ad_banner_path ab) } )%>
+				<%if  at_least_module_manager%>	
+					<i class="icons-pencil"></i>
+					<%= link_to(ab.title,"##{ab.title.dehumanize}",:contenteditable=>"false",:data=>{:toggle=>"tab" ,'edit-url' =>(admin_rename_ad_banner_path ab) } )%>
+				<% else %>
+					<%= link_to(ab.title,"##{ab.title.dehumanize}",:data=>{:toggle=>"tab" } )%>
+				<% end -%>
 			<% end -%>
 		<% end -%>
-		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
+		
+		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"modal"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) if  at_least_module_manager%>
 		
 	</ul>
 	
@@ -80,7 +80,10 @@
              <!--請程式務必將圖片尺寸加入到行內裡-->
              <%= image_tag @ad_image.file rescue ''%>
            </div>
-            <span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) if !@ad_image.ad_banner.best_size.empty?%></span>
+            <% if !@ad_image.ad_banner.best_size.empty?%>
+              <span class="alert widgetInfo"><%= t("admin.ad.widget_info_for_ad_image_size",:best_size=> @ad_image.ad_banner.best_size) %>
+              </span>
+              <% end -%>
            <div class="controls file-upload input-prepend">
              <label class="control-label add-on btn" for="input-upload">
 								<%= t(:browse) %>
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <h1><%= t('admin.editing_design') %></h1>

 <%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %>
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <%= form_for :news_bulletins, :url => delete_admin_designs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), :html => {:id => 'delete_all'}, :remote => true do %>
 	<%= render 'filter' %>
 	<table class="table main-list">
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <h1><%= t('admin.new_design') %></h1>

 <%= form_for :design, :url => admin_designs_path, :html => {:multipart => true} do |f| %>
@@ -1,3 +1,7 @@
+<% content_for :side_bar do %>
+	<%= render 'admin/sites/side_bar' %>
+<% end %>
+
 <div class="main2">
 	<%= form_tag '',:multipart => true,:action=>"post" do |f| %>

@@ -1 +1,6 @@
-<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
+<ol class="nav nav-list">
+	<%= render_node_and_children(Item.first(:conditions => {:parent_id => nil})) %>
+</ol>
+<script type="text/javascript">
+	bindTreeDragHandle();
+</script>
@@ -1,9 +1,7 @@
 $('#back_main').empty();
-switch ("<%= escape_javascript(@item._type)%>") {
-	case 'Link': 
-		$('#back_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
-		break;
-  case 'Page': 
+<% case @item._type %>
+	<% when 'Page' %>
 		$('#back_main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
-   	break;
-};
+	<% when 'Link' %>
+		$('#back_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
+<% end %>
@@ -1 +1,3 @@
-$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
+$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
+$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+history.pushState(null, document.title, "<%= escape_javascript(admin_items_url) %>");
@@ -4,7 +4,7 @@
 	<%= form_for @item, :url => admin_pages_path, :html => { :class => 'form-horizontal edit_page' }  do |f| %>
 		<%= render :partial => "form", :locals => { :f => f } %>
 		<div class="form-actions">
-			<%= f.submit t('update'), :class => 'btn btn-primary' %>
+			<%= f.submit t('create'), :class => 'btn btn-primary' %>
 			<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
 		</div>
 	<% end %>
@@ -1 +1,3 @@
-$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
+$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>");
+$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
+history.pushState(null, document.title, "<%= escape_javascript(admin_items_url) %>");
@@ -10,3 +10,7 @@
 	<% end -%>

 <% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('designs') do -%>
+	<%= link_to content_tag(:i, nil, :class => 'icons-window-block') + t('admin.design'), admin_designs_path %>
+<% end -%>