daily commit

app/views/admin/page_parts/_custom_widget_setting.html.erb

@@ -3,14 +3,14 @@
     <%= t("default_widget.select_widget_style") %>
   </label>
   <div class="controls well">
-    <% if @module_app.widgets.nil? ||  (@module_app.widgets[@widget_path].blank? rescue true) %>
+    <% if @module_app.nil? || @module_app.widgets.nil? ||  (@module_app.widgets[@widget_path].blank? rescue true) %>
       <%= t("default_widget.no_support_setting")%>
     <%else%>
       <%= select('page_part', 'widget_style', @module_app.widgets[@widget_path]) %>
     <% end %>
   </div>
 </div>
-  <% if(@module_app.widget_options && @module_app.widget_options.has_key?(@widget_path)) %>
+  <% if(@module_app && @module_app.widget_options && @module_app.widget_options.has_key?(@widget_path)) %>
     <div class="style_switch  control-group">
       <label class="control-label"><%= t("default_widget.select_widget_ext_option") %></label>
       <div class="controls well" >

app/views/admin/page_parts/_edit.html.erb

@@ -1,10 +1,11 @@
 <%= stylesheet_link_tag "admin/default_widget_setting" %>
 
 <%= form_for @part, :url => admin_page_part_path(@part),:html=>{:class=>"clear form-horizontal edit_page_part"} do |f| %>
-	
 	<% LIST[:page_part_kinds].each do |kind| %>
+          <%= label_tag '',:class=>'checkbox inline' do  %>
 		<%= f.radio_button :kind, kind, :class => 'part_kind' %>
 		<%= t(kind, :scope => 'page_part_kinds') %>
+        <% end %>
 	<% end %>
 	<% LIST[:page_part_kinds].each do |kind| %>
 		<div id='<%= "part_#{kind}" %>' class='part_kind_partial' style="display:<%= kind.eql?(@part.kind) ? 'block' : 'none' %>">

app/views/admin/page_parts/_module_widget.html.erb

@@ -17,7 +17,7 @@
             <%= t "default_widget.select_module_app" %>
         </label>
         <div class="controls">  
-        <%= f.select :module_app, options_from_collection_for_select(@module_apps, :id, :title, :selected => @module_app.id), {}, {:rel => admin_page_parts_path,:id=>"page_module_app_id"} %>
+        <%= f.select :module_app, options_from_collection_for_select(@module_apps, :id, :title, :selected => (@module_app.id rescue nil)), {:include_blank => true }, {:rel => admin_page_parts_path,:id=>"page_module_app_id"} %>
         </div>
     </div>
     
@@ -26,7 +26,7 @@
             <%= t "default_widget.select_widget_path" %>
         </label>
         <div class="controls">  
-        <%= f.select :widget_path, @module_app.widgets.collect{|k,v| [k.humanize, k]}, {}, { :selected => @part.widget_path, :rel => admin_page_parts_path } %>
+        <%= f.select :widget_path, @module_app ? @module_app.widgets.collect{|k,v| [k.humanize, k]} : [], {}, { :selected => @part.widget_path, :rel => admin_page_parts_path } %>
         </div>
     </div>
 

app/views/admin/page_parts/_reset.html.erb

@@ -0,0 +1,8 @@
+<div class="style_switch  control-group">
+  <label class="control-label">
+    <%= t(label_i18n) %>
+  </label>
+  <div class="controls well">
+    <%= t('default_widget.no_support_setting') %>
+  </div>
+</div>

app/views/admin/page_parts/reload_widgets.js.erb

@@ -1,13 +1,20 @@
-$('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|k,v| k},@part.widget_path) %>");
-$("#widget_data_source_category").html("<%= j render :partial => 'widget_data_source_category',:locals=>{:object=>@part}  %>");
-$("#widget_data_source_tag").html("<%= j render :partial => 'widget_data_source_tag',:locals=>{:object=>@part}  %>");
+<% if  @module_app%>
+  $('#widget_list select').html("<%= j options_for_select(@module_app.widgets.collect{|k,v| k},@part.widget_path) %>");
+  $("#widget_data_source_category").html("<%= j render :partial => 'widget_data_source_category',:locals=>{:object=>@part}  %>");
+  $("#widget_data_source_tag").html("<%= j render :partial => 'widget_data_source_tag',:locals=>{:object=>@part}  %>");
 
-<% if  !@part.widget_path.blank? %>
-  <% if  show_default_widget_setting_panel %>
-    $('#widget_setting').html("<%= j render :partial => 'default_widget_style_panel' %>");
-    $('#widget_setting').append("<%= j render :partial => 'default_widget_setting',:locals=>{:object=>@part} %>");
-  <% elsif show_custom_widget_setting_panel %>
-    $('#widget_setting').html("<%= j render :partial => 'custom_widget_setting' %>");
+  <% if  @part %>
+    <% if  show_default_widget_setting_panel %>
+      $('#widget_setting').html("<%= j render :partial => 'default_widget_style_panel' %>");
+      $('#widget_setting').append("<%= j render :partial => 'default_widget_setting',:locals=>{:object=>@part} %>");
+    <% elsif show_custom_widget_setting_panel %>
+      $('#widget_setting').html("<%= j render :partial => 'custom_widget_setting' %>");
+    <% end %>
   <% end %>
+  <% else %>
+    $('#widget_option').find("div.well.controls").html("<%= t('default_widget.no_support_setting')%>");  
+    $('#widget_setting').html("<%=j render :partial=> 'reset',:locals=>{:label_i18n=>'default_widget.select_widget_style'}%>");  
+    $('#widget_list select').html("<%= j options_for_select([]) %>");
 <% end %>
 
+

app/views/admin/pages/_custom_frontend_setting.html.erb

@@ -0,0 +1,8 @@
+<div class="control-group">
+  <label class="control-label">
+    <%= t("default_widget.select_widget_style") %>
+  </label>
+  <div class="controls well">
+      <%= t("default_widget.no_support_setting")%>
+  </div>
+</div>

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

@@ -2,9 +2,12 @@
 <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %>
 
 <div class="control-group">
-	<%= f.label :name, t(:name), :class => 'control-label' %>
+	<%= f.label :name, '*'+t(:name), :class => 'control-label' %>
+	 
+	
 	<div class="controls">
 		<%= f.text_field :name, :class => 'text input-xlarge' %>
+		<span class="help-inline">請輸入數字或英文，不可使用空白</span>
 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> -->
 	</div>
 </div>
@@ -44,19 +47,12 @@
 </div>
 
 <div  class="control-group" id="frontend_list">
-	<%= f.label '', t("page.select_app_url"), :class => 'control-label' %>
+	<%= f.label '', t("front_page.select_app_url"), :class => 'control-label' %>
 	<div class="controls" id="app_page_url">
-		<%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%>
+		<%= select('page','app_frontend_url', @app_frontend_urls || [], :selected => @item.app_frontend_url ) rescue ''%>
 	</div>
 </div>
 
-<!-- <div  class="control-group">
-	<%= f.label '', "FRONT STYLE", :class => 'control-label' %>
-	<div class="controls" id="app_page_frontend_style"> 
-		<%= select('page','frontend_style', @frontend_style, :selected => @item[:frontend_style], :include_blank => true ) rescue ''%>
-	</div>
-</div>
- -->
 
 <div id="app_page_category"  class="control-group">
 	<%= render :partial=>"admin/page_parts/widget_data_source_category",:locals=>{:object=>@item} %>
@@ -72,7 +68,7 @@
 
 
 <div class="control-group">
-	<%= f.label :is_published, "#{t(:is_published)} ?", :class => 'control-label' %>
+	<%= f.label :is_published, "#{t('front_page.is_published')} ?", :class => 'control-label' %>
 	<div class="controls">
 		<label class="radio">
 			<%= f.radio_button :is_published, true %>
@@ -86,7 +82,7 @@
 	</div>
 </div>
 <div class="control-group">
-	<%= f.label :menu_enabled_for, "#{t(:menu_enabled_for)}:", :class => 'control-label' %>
+	<%= f.label :menu_enabled_for, "#{t('front_page.menu_enable_lang')}:", :class => 'control-label' %>
 	<div class="controls">
 		<% @site_valid_locales.each do |valid_locale| %>
 		<label class="checkbox">
@@ -100,7 +96,7 @@
 </div>
 
 <div class="control-group">
-	<%= f.label :enabled_for, "#{t(:enabled_for)}:", :class => 'control-label' %>
+	<%= f.label :enabled_for, "#{t('front_page.link_enable_lang')}:", :class => 'control-label' %>
 	<div class="controls">
 		<% @site_valid_locales.each do |valid_locale| %>
 		<label class="checkbox">

app/views/admin/pages/reload_frontend_pages.js.erb

@@ -1,24 +1,33 @@
+<% if @module_app %>
+  $('#app_page_category').html("<%= j render :partial => 'admin/page_parts/widget_data_source_category' ,:locals=>{:object=>@page}%>");
+  $('#app_page_tag').html("<%=  j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
 
-$('#app_page_category').html("<%= j render :partial => 'admin/page_parts/widget_data_source_category' ,:locals=>{:object=>@page}%>");
-$('#app_page_tag').html("<%=  j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
+  <% if !@module_app.app_pages.blank? %>
+    $('#app_page_url').html("<%= escape_javascript(select 'page', 'app_frontend_url', options_for_select(@app_frontend_urls, @app_frontend_urls.first)) %>");
+    <%else %>
+    $('#app_page_url').html("<%= t('default_widget.no_support_setting')%>");
+  <% end %>
+
+  <% if  @app_frontend_urls.first =='default_widget' %>
+      $('#app_page_frontend_style').html("<%= escape_javascript(select 'page', 'frontend_style', @module_app.widgets[@frontend_path]) if !@frontend_path.blank? %>");
+    <% else %>
+      $('#app_page_frontend_style').html("<%= t('default_widget.no_support_setting')%>");
+  <% end %>
+
+  <% if  show_default_widget_setting_panel %>
+      $('#app_page_tag').html("<%=  j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
+
+      $('#frontend_setting').html("<%= j render :partial => 'admin/page_parts/default_widget_style_panel',:locals=>{:object=>@page} %>");
+      $('#frontend_setting').append("<%= j render :partial => 'admin/page_parts/default_widget_setting',:locals=>{:object=>@page} %>");
+    <% else %>
+      $('#frontend_setting').html("<%= j render :partial => 'custom_frontend_setting' %>");
+  <% end %>
+<% else %>
 
-<% if !@module_app.app_pages.blank? %>
-  $('#app_page_url').html("<%= escape_javascript(select 'page', 'app_frontend_url', options_for_select(@app_frontend_urls, @app_frontend_urls.first)) %>");
-  <%else %>
   $('#app_page_url').html("<%= t('default_widget.no_support_setting')%>");
+  $('#app_page_category').find("div.well.controls").html("<%= t('default_widget.no_support_setting')%>");
+  $('#app_page_tag').find("div.well.controls").html("<%= t('default_widget.no_support_setting')%>");
+
+  $('#app_page_url').html("<%= t('default_widget.no_support_setting')%>");
+  $('#frontend_setting').html("<%= j render :partial => 'custom_frontend_setting' %>");
 <% end %>
-
-<% if  @app_frontend_urls.first =='default_widget' %>
-    $('#app_page_frontend_style').html("<%= escape_javascript(select 'page', 'frontend_style', @module_app.widgets[@frontend_path]) if !@frontend_path.blank? %>");
-  <% else %>
-    $('#app_page_frontend_style').html("<%= t('default_widget.no_support_setting')%>");
-<% end %>
-
-<% if  show_default_widget_setting_panel %>
-    $('#app_page_tag').html("<%=  j render :partial => 'admin/page_parts/widget_data_source_tag',:locals=>{:object=>@page} %>");
-
-    $('#frontend_setting').html("<%= j render :partial => 'admin/page_parts/default_widget_style_panel',:locals=>{:object=>@page} %>");
-    $('#frontend_setting').append("<%= j render :partial => 'admin/page_parts/default_widget_setting',:locals=>{:object=>@page} %>");
-  <% else %>
-    $('#frontend_setting').html("<%= j render :partial => 'custom_frontend_setting' %>");
-<% end %>