Merge pull request 'Hide empty time field.' (#21) from 123/seminar:master into master

Reviewed-on: https://gitlab.tp.rulingcom.com/spen/seminar/pulls/21

app/assets/javascripts/seminar-field-forms-submission.js

@@ -110,6 +110,7 @@ function setData(l, type, ol) {
 			_markup:				fields+"["+l+"][markup]",
 			_option_list:			["option_list_"+l+"_"+ol, fields+"["+l+"]["+type+"][option_list]["+ol+"]", "option_list_"+ol],
 			_placeholder:			["placeholder_"			+l, fields+"["+l+"]["+type+"][placeholder]"],
+			_instructions:			["instructions_"			+l, fields+"["+l+"]["+type+"][instructions]"],
 			_title_translations:	["title_translations_"	+l, fields+"["+l+"][title_translations]"],
 			_destroy:				["destroy_"			+l, fields+"["+l+"][_destroy]"],
 			_to_require:			["to_require_"		    +l, fields+"["+l+"][to_require]"],
@@ -117,6 +118,34 @@ function setData(l, type, ol) {
 	return data;
 }
 
+// Deinit Template HTML (ex: ckeditor)
+function deinit_template_html(_this) {
+	var ckeditor_areas = _this.find('.ckeditor');
+	if (typeof(CKEDITOR) == 'object') {
+		ckeditor_areas.each(function(i,v) {
+			var name = $(v).attr('name');
+			if (CKEDITOR.instances[name]) {
+				CKEDITOR.instances[name].destroy();
+			}
+		})
+	}
+	return _this;
+}
+
+// Init Template HTML (ex: ckeditor)
+function init_template_html(_this) {
+	var ckeditor_areas = _this.find('.ckeditor');
+	if (typeof(CKEDITOR) == 'object') {
+		ckeditor_areas.each(function(i,v) {
+			var name = $(v).attr('name');
+			if (!CKEDITOR.instances[name]) {
+				CKEDITOR.replace(name);
+			}
+		})
+	}
+	return _this;
+}
+
 // Get Default Address Form
 function getAddressForm(trigger, element, decide) {
 	if(decide) {
@@ -256,11 +285,11 @@ $(function() {
 				nameNumber = nameNumber.match(/[^[\D\]]+(?=])/g)[0];
 				seminar_mainType = $(this).data('seminar_mains')
 				if($(this).hasClass('textInput')) {
-					$("#template-text").tmpl().appendTo($(this).closest('.controls').find('.add-target'));
+					init_template_html($("#template-text").tmpl().appendTo($(this).closest('.controls').find('.add-target')));
 				} else if ($(this).hasClass('textLengInput')) {
-					$("#template-text-language").tmpl().appendTo($(this).closest('.controls').find('.add-target'));
+					init_template_html($("#template-text-language").tmpl().appendTo($(this).closest('.controls').find('.add-target')));
 				} else if ($(this).hasClass('address')) {
-					$("#template-address").tmpl().appendTo($(this).closest('.controls').find('.add-target'));
+					init_template_html($("#template-address").tmpl().appendTo($(this).closest('.controls').find('.add-target')));
 				} 
 				inputAppendLength();
 			};
@@ -288,7 +317,7 @@ $(function() {
 			};
 		    attributesHeaderLength = $('.attributes:not(:hidden)').length+1;
 		    attributesLength = $('#attributes-area .attributes').length;
-		    $("#template-attributes").tmpl(setData(attributesLength, default_templateType, appendIndex)).appendTo( "#attributes-area" );
+		    init_template_html($("#template-attributes").tmpl(setData(attributesLength, default_templateType, appendIndex)).appendTo( "#attributes-area" ));
 		    $('.toggle-check').togglebox();
 		});
 
@@ -439,7 +468,7 @@ $(function() {
 				console.log(appendIndex)
 				attributeIndex = $(this).closest('.attributes').index();
 				templateType = $(this).closest('.attributes').find('.dataType').children("option:selected").attr('ref');
-				$("#template-input-append").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo($(this).closest('.controls').find('.add-target'));
+				init_template_html($("#template-input-append").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo($(this).closest('.controls').find('.add-target')));
 				inputAppendLength();
 			};
 			if($(this).hasClass('remove-input')) {
@@ -454,6 +483,7 @@ $(function() {
 		$('#attributes-area').delegate('.dataType', 'change', function() {
 	        $(this).children("option:selected").each(function () {
 	        	var target = $(this).closest('.attributes').find('.field-type').not('.default');
+	        	deinit_template_html(target);
 	    		attributeIndex = $(this).closest('.attributes').index();
 	        	appendIndex = 0
 	        	// $(this).closest('.attributes').find('.add-target').find('.input-append').length;
@@ -467,7 +497,7 @@ $(function() {
 			        	if($(this).attr('ref')) {
 			        		templateType = $(this).attr('ref');
 				        	target.removeAttr('class').addClass('field-type fade in ' + templateType).empty();
-				        	$("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target);
+				        	init_template_html($("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target));
 				        	if(templateType == 'typeB' || templateType == 'typeE' || templateType == 'typeF') {
 				        		inputAppendLength();
 				        	}
@@ -481,7 +511,7 @@ $(function() {
 		        	if($(this).attr('ref')) {
 		        		templateType = $(this).attr('ref');
 			        	target.removeAttr('class').addClass('field-type fade in ' + templateType).empty();
-			        	$("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target);
+			        	init_template_html($("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target));
 			        	if(templateType == 'typeB' || templateType == 'typeE' || templateType == 'typeF') {
 			        		inputAppendLength();
 			        	}

app/assets/javascripts/seminar-field-forms.js

@@ -110,6 +110,7 @@ function setData(l, type, ol) {
 			_markup:				fields+"["+l+"][markup]",
 			_option_list:			["option_list_"+l+"_"+ol, fields+"["+l+"]["+type+"][option_list]["+ol+"]", "option_list_"+ol],
 			_placeholder:			["placeholder_"			+l, fields+"["+l+"]["+type+"][placeholder]"],
+			_instructions:			["instructions_"			+l, fields+"["+l+"]["+type+"][instructions]"],
 			_title_translations:	["title_translations_"	+l, fields+"["+l+"][title_translations]"],
 			_destroy:				["destroy_"			+l, fields+"["+l+"][_destroy]"],
 			_to_require:			["to_require_"		    +l, fields+"["+l+"][to_require]"],
@@ -117,6 +118,34 @@ function setData(l, type, ol) {
 	return data;
 }
 
+// Deinit Template HTML (ex: ckeditor)
+function deinit_template_html(_this) {
+	var ckeditor_areas = _this.find('.ckeditor');
+	if (typeof(CKEDITOR) == 'object') {
+		ckeditor_areas.each(function(i,v) {
+			var name = $(v).attr('name');
+			if (CKEDITOR.instances[name]) {
+				CKEDITOR.instances[name].destroy();
+			}
+		})
+	}
+	return _this;
+}
+
+// Init Template HTML (ex: ckeditor)
+function init_template_html(_this) {
+	var ckeditor_areas = _this.find('.ckeditor');
+	if (typeof(CKEDITOR) == 'object') {
+		ckeditor_areas.each(function(i,v) {
+			var name = $(v).attr('name');
+			if (!CKEDITOR.instances[name]) {
+				CKEDITOR.replace(name);
+			}
+		})
+	}
+	return _this;
+}
+
 // Get Default Address Form
 function getAddressForm(trigger, element, decide) {
 	if(decide) {
@@ -256,11 +285,11 @@ $(function() {
 				nameNumber = nameNumber.match(/[^[\D\]]+(?=])/g)[0];
 				seminar_mainType = $(this).data('seminar_mains')
 				if($(this).hasClass('textInput')) {
-					$("#template-text").tmpl().appendTo($(this).closest('.controls').find('.add-target'));
+					init_template_html($("#template-text").tmpl().appendTo($(this).closest('.controls').find('.add-target')));
 				} else if ($(this).hasClass('textLengInput')) {
-					$("#template-text-language").tmpl().appendTo($(this).closest('.controls').find('.add-target'));
+					init_template_html($("#template-text-language").tmpl().appendTo($(this).closest('.controls').find('.add-target')));
 				} else if ($(this).hasClass('address')) {
-					$("#template-address").tmpl().appendTo($(this).closest('.controls').find('.add-target'));
+					init_template_html($("#template-address").tmpl().appendTo($(this).closest('.controls').find('.add-target')));
 				} 
 				inputAppendLength();
 			};
@@ -288,7 +317,7 @@ $(function() {
 			};
 		    attributesHeaderLength = $('.attributes:not(:hidden)').length+1;
 		    attributesLength = $('#attributes-area .attributes').length;
-		    $("#template-attributes").tmpl(setData(attributesLength, default_templateType, appendIndex)).appendTo( "#attributes-area" );
+		    init_template_html($("#template-attributes").tmpl(setData(attributesLength, default_templateType, appendIndex)).appendTo( "#attributes-area" ));
 		    $('.toggle-check').togglebox();
 		});
 
@@ -438,7 +467,7 @@ $(function() {
 				appendIndex = parseInt(appendIndex.match(/[^[\D\]]+(?=])/g)[1])+1;
 				attributeIndex = $(this).closest('.attributes').index();
 				templateType = $(this).closest('.attributes').find('.dataType').children("option:selected").attr('ref');
-				$("#template-input-append").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo($(this).closest('.controls').find('.add-target'));
+				init_template_html($("#template-input-append").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo($(this).closest('.controls').find('.add-target')));
 				inputAppendLength();
 			};
 			if($(this).hasClass('remove-input')) {
@@ -453,6 +482,7 @@ $(function() {
 		$('#attributes-area').delegate('.dataType', 'change', function() {
 	        $(this).children("option:selected").each(function () {
 	        	var target = $(this).closest('.attributes').find('.field-type').not('.default');
+	        	deinit_template_html(target);
 	    		attributeIndex = $(this).closest('.attributes').index();
 	        	appendIndex = 0
 	        	// $(this).closest('.attributes').find('.add-target').find('.input-append').length;
@@ -466,7 +496,7 @@ $(function() {
 			        	if($(this).attr('ref')) {
 			        		templateType = $(this).attr('ref');
 				        	target.removeAttr('class').addClass('field-type fade in ' + templateType).empty();
-				        	$("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target);
+				        	init_template_html($("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target));
 				        	if(templateType == 'typeB' || templateType == 'typeE' || templateType == 'typeF') {
 				        		inputAppendLength();
 				        	}
@@ -480,7 +510,7 @@ $(function() {
 		        	if($(this).attr('ref')) {
 		        		templateType = $(this).attr('ref');
 			        	target.removeAttr('class').addClass('field-type fade in ' + templateType).empty();
-			        	$("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target);
+			        	init_template_html($("#template-type").tmpl(setData(attributeIndex, templateType, appendIndex)).appendTo(target));
 			        	if(templateType == 'typeB' || templateType == 'typeE' || templateType == 'typeF') {
 			        		inputAppendLength();
 			        	}

app/controllers/seminars_controller.rb

@@ -334,6 +334,7 @@ class SeminarsController < ApplicationController
     seminar_url = (@prefix_url ? @prefix_url : OrbitHelper.url_to_show(seminar.to_param))
     if !registration_is_open
       sign_up = t('seminar.sign_up_not_open')
+      sign_up_not_yet = true
     elsif sign_up_not_yet
       sign_up = t('seminar.sign_up_not_yet')
     elsif sign_up_overdue
@@ -345,7 +346,7 @@ class SeminarsController < ApplicationController
       sign_up = link_to(sign_up_text, seminar.get_frontend_url(seminar_url), :target=>'_blank', :title=>sign_up_text)
     end
 
-    if !seminar.registration_status.blank? && seminar.registration_status.include?('C') && seminar.contribute_start_date <= time_now && ( seminar.contribute_end_date.nil? || seminar.contribute_end_date+1 >= time_now )
+    if !seminar.registration_status.blank? && seminar.registration_status.include?('C') && (seminar.contribute_start_date.nil? || seminar.contribute_start_date <= time_now) && ( seminar.contribute_end_date.nil? || seminar.contribute_end_date+1 >= time_now )
       if @@session[:seminar_signup_id].present? && @@session[:seminar_main_id] == seminar.id
         button_text = t('seminar_signup.uploads')
         contribute_action = link_to(button_text, seminar.get_frontend_url(seminar_url, :con_upload), :title=>button_text)
@@ -360,6 +361,7 @@ class SeminarsController < ApplicationController
       'sign_up' => sign_up,
       'contribute_action' => contribute_action,
       'time_now' => time_now,
+      'sign_up_not_yet' => sign_up_not_yet, 
       'contribute_time_range' => SeminarMain.time_range(seminar.contribute_start_date, seminar.contribute_end_date),
       'sign_up_time_range' => SeminarMain.time_range(seminar.signup_start_date, seminar.signup_end_date),
       'seminar_time_range' => SeminarMain.time_range(seminar.seminar_start_date, seminar.seminar_end_date)
@@ -522,10 +524,13 @@ class SeminarsController < ApplicationController
 
   def add_file_proc
 
-    update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values'])
+    update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values'].to_h)
     flag = true
     update_params.permit!
-    if !update_params['seminar_submission_values'].nil?
+    if update_params['seminar_submission_values'].present?
+      if update_params['seminar_submission_values']['0']['value'].nil?
+        flag = false
+      else
         if update_params['seminar_submission_values']['0']['value'].class==String
           value = update_params['seminar_submission_values']['0']['value']
           if !value.to_s.blank?
@@ -538,6 +543,7 @@ class SeminarsController < ApplicationController
             end
           end
         end
+      end
     else
       flag = false
     end
@@ -574,9 +580,12 @@ class SeminarsController < ApplicationController
 
   def update
     @con = SeminarSignupContribute.find(params[:seminar_signup_contribute][:id])
-    update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values'])
+    update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values'].to_h)
     update_params.permit!
-    unless update_params['seminar_submission_values'].nil?
+    if update_params['seminar_submission_values'].present?
+      if update_params['seminar_submission_values']['0']['value'].nil?
+        flag = false
+      else
         flag = true
         if update_params['seminar_submission_values']['0']['value'].class==String
           value = update_params['seminar_submission_values']['0']['value']
@@ -590,6 +599,7 @@ class SeminarsController < ApplicationController
             end
           end
         end
+      end
       if flag
         update_params['seminar_submission_values']['0']['value']['en'] = ' '
       end

app/helpers/admin/seminars_field_helper.rb

@@ -29,6 +29,20 @@ module Admin::SeminarsFieldHelper
     content_tag(:div,str,:class=>"tab-pane fade",:id=>(get_field_name_base+"tab_#{lang}"))
   end
 
+  def render_instructions
+    control_group_wrapper_for_sm do |key,value|
+      if !@prefiled_value.nil?
+        value = can_muti_lang_input_for_sm? ?  @prefiled_value[key] : @prefiled_value
+      else
+        value = nil
+      end
+      key = can_muti_lang_input_for_sm? ? "#{key}" : I18n.locale
+      instructions = (typeG["instructions"].blank? ? "" : typeG["instructions"][key])
+      name1 = can_muti_lang_input_for_sm? ? (get_field_name_base + "[#{key}]") : get_field_name_base
+      instructions.html_safe
+    end
+  end
+
   def render_address
     control_group_wrapper_for_sm do |key,value|
       value = (can_muti_lang_input_for_sm? ?  @prefiled_value[key] : @prefiled_value) rescue nil

app/models/seminar_signup_field.rb

@@ -24,6 +24,7 @@ class SeminarSignupField
   field :typeD, type: Hash, default: {cross_lang: false}
   field :typeE, type: Hash, default: {}
   field :typeF, type: Hash, default: {}
+  field :typeG, type: Hash, default: {}
   belongs_to :seminar_main
   has_many :seminar_signup_values, autosave: true, dependent: :destroy
   accepts_nested_attributes_for :seminar_signup_values, :allow_destroy => true

app/models/seminar_submission_field.rb

@@ -24,6 +24,7 @@ class SeminarSubmissionField
   field :typeD, type: Hash, default: {cross_lang: false}
   field :typeE, type: Hash, default: {}
   field :typeF, type: Hash, default: {cross_lang: "true"}
+  field :typeG, type: Hash, default: {}
   belongs_to :seminar_main
   has_many :seminar_submission_values, autosave: true, dependent: :destroy
   accepts_nested_attributes_for :seminar_submission_values, :allow_destroy => true

app/views/admin/seminars/_attribute_field.html.erb

@@ -129,6 +129,34 @@
       <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:field_name=>"#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeE][option_list]",:values=>attribute_field["typeE"]["option_list"]}%>
     <% end if show_seminar_type_panel(attribute_field,"typeE") != 'typeE hide' %>
 
+    <%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_field,"typeG")}" do%>
+      <% typeG_field_name = "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeG][instructions]" %>
+      <%= content_tag :div, class: "control-group" do %>
+        <label class="control-label muted" for=""><%= t('lists.markups.instructions') %></label>
+        <div class="controls">
+          <div class="input-append">
+            <div class="btn-group-clearfix">
+              <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_in_use_locales.each do |locale| %>
+                  <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
+                  <%= link_to t(locale).to_s,"##{name_to_id(typeG_field_name)}_#{locale}",:class=>"btn #{active}",:data=>{:toggle=>"tab"}%>
+                <% end %>
+              </div>
+            </div>
+            <div class="tab-content">
+              <% @site_in_use_locales.each do |locale| %>
+                <% active = (locale == @site_in_use_locales.first ? "active in" : "'") %>
+                <%= content_tag :div, {class: "tab-pane fade #{active}", id: "#{name_to_id(typeG_field_name)}_#{locale}"} do %>
+                  <% locale_value = (attribute_field["typeG"].present? ? attribute_field["typeG"]["instructions"][locale.to_s] : "") %>
+                  <%= text_area(typeG_field_name, locale, value: locale_value, placeholder: "#{t(locale).to_s}", data: {:type=>"lang_#{locale}"}, class: 'ckeditor') %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    <% end if show_seminar_type_panel(attribute_field,"typeG") != 'typeG hide' %>
+
     <%= hidden_field "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}]","id",:value=>attribute_field.id%>
 
 </div>

app/views/admin/seminars/_attribute_submission_field.html.erb

@@ -128,6 +128,7 @@
     <%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_submission_field,"typeE")}" do%>
       <%= render :partial=>"shared/attribute_field/list_block",:locals=>{:field_name=>"#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}][typeE][option_list]",:values=>attribute_submission_field["typeE"]["option_list"]}%>
     <% end if show_seminar_type_panel(attribute_submission_field,"typeE") != 'typeE hide' %>
+
     <%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_submission_field,"typeF")}" do%>
       <div class="control-group">
         <label class="control-label muted" for=""><%= t(:options)%></label>
@@ -140,6 +141,35 @@
         </div>
       </div>
     <% end if show_seminar_type_panel(attribute_submission_field,"typeF") != 'typeF hide' %>
+
+    <%= content_tag :div,:class=>"field-type default fade in #{show_seminar_type_panel(attribute_submission_field,"typeG")}" do%>
+      <% typeG_field_name = "#{@field_name}[seminar_signup_fields_attributes][#{@af_counter}][typeG][instructions]" %>
+      <%= content_tag :div, class: "control-group" do %>
+        <label class="control-label muted" for=""><%= t('lists.markups.instructions') %></label>
+        <div class="controls">
+          <div class="input-append">
+            <div class="btn-group-clearfix">
+              <div class="btn-group" data-toggle="buttons-radio">
+                <% @site_in_use_locales.each do |locale| %>
+                  <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
+                  <%= link_to t(locale).to_s,"##{name_to_id(typeG_field_name)}_#{locale}",:class=>"btn #{active}",:data=>{:toggle=>"tab"}%>
+                <% end %>
+              </div>
+            </div>
+            <div class="tab-content">
+              <% @site_in_use_locales.each do |locale| %>
+                <% active = (locale == @site_in_use_locales.first ? "active in" : "'") %>
+                <%= content_tag :div, {class: "tab-pane fade #{active}", id: "#{name_to_id(typeG_field_name)}_#{locale}"} do %>
+                  <% locale_value = (attribute_submission_field["typeG"].present? ? attribute_submission_field["typeG"]["instructions"][locale.to_s] : "") %>
+                  <%= text_area(typeG_field_name, locale, value: locale_value, placeholder: "#{t(locale).to_s}", data: {:type=>"lang_#{locale}"}, class: 'ckeditor') %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      <% end %>
+    <% end if show_seminar_type_panel(attribute_submission_field,"typeG") != 'typeG hide' %>
+
     <%= hidden_field "#{@field_name}[seminar_submission_fields_attributes][#{@af_counter}]","id",:value=>attribute_submission_field.id%>
 
 </div>

app/views/admin/seminars/_support_member_form_js.erb

@@ -112,7 +112,7 @@
 
 
 <script id="template-type" type="text/x-tmpl">
-  {{if templateType == 'typeA' || templateType == 'typeD' || templateType == 'typeG'}}
+  {{if templateType == 'typeA' || templateType == 'typeD'}}
     <div class="control-group">
       <label class="control-label muted"><%= t(:enabled_for)%></label>
       <div class="controls">
@@ -122,7 +122,7 @@
             <%=  t(:cross_lang) %>
           </label>
         {{/if}}
-        {{if templateType == 'typeA' || templateType == 'typeG'}}
+        {{if templateType == 'typeA'}}
           <label class="checkbox inline">
             <input type="checkbox" data-type="extendable_field" id="${_add_more[0]}" name="${_add_more[1]}" value="true">
             <%= t(:add_more)%>
@@ -257,6 +257,35 @@
       </div>
     </div>
   {{/if}}
+  {{if templateType == 'typeG'}}
+    <div class="control-group">
+      <label class="control-label muted">
+        <%= t('lists.markups.instructions') %>
+      </label>
+      <div class="controls">
+        <div class="input-append">
+          <div class="btn-group-clearfix">
+            <div class="btn-group" data-toggle="buttons-radio">
+              <% @site_in_use_locales.each do |locale| %>
+                <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
+                <a class="btn <%= active %>" href="${'#'+_instructions[0]+'_<%= locale %>'}" data-toggle="tab">
+                  <%= t(locale).to_s %>
+                </a>
+              <% end %>
+            </div>
+          </div>
+          <div class="tab-content">
+            <% @site_in_use_locales.each do |locale| %>
+              <% active = (locale == @site_in_use_locales.first ? "active" : "") %>
+              <div class="tab-pane <%= active %> fade in" id="${_instructions[0]+'_<%= locale %>'}">
+                <textarea class="ckeditor" data-type="lang_<%= locale %>" placeholder="<%= t(locale).to_s %>" name="${_instructions[1]+'[<%= locale %>]'}"></textarea>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  {{/if}}
 </script>
 
 

app/views/admin/seminars/seminar_signup_field.html.erb

@@ -10,7 +10,7 @@
   <%= javascript_include_tag "seminar-field-forms.js" %>
 <% end -%>
 
-<%= form_for @attribute,:url => admin_seminar_path(@attribute) , :html => { :class=> "form-horizontal main-forms" } do |f| %>
+<%= form_for @attribute, url: admin_seminar_path(@attribute) , html: { class: "form-horizontal main-forms" } do |f| %>
   <% if flash.now[:notice].present? %>
     <%= flash.now[:notice]%>
   <% end %>
@@ -19,7 +19,7 @@
   <fieldset>
 
     <div id="attributes-area" class="input-area sortable">
-      <%= render partial: "attribute_field",collection: @attribute.seminar_signup_fields.asc(:sort_number, :_id)%>
+      <%= render partial: "attribute_field", collection: @attribute.seminar_signup_fields.asc(:sort_number, :_id)%>
     </div>
 
     <div class="form-actions">

app/views/admin/seminars/seminar_submission_field.html.erb

@@ -9,7 +9,7 @@
   <%= javascript_include_tag "lib/jquery.tmpl.min.js" %>
   <%= javascript_include_tag "seminar-field-forms-submission.js" %>
 <% end -%>
-<%= form_for @attribute,:url => admin_seminar_path(@attribute) , :html => { :class=> "form-horizontal main-forms" } do |f| %>
+<%= form_for @attribute, url: admin_seminar_path(@attribute) , html: { class: "form-horizontal main-forms" } do |f| %>
   <% if flash.now[:notice].present? %>
     <%= flash.now[:notice]%>
   <% end %>

app/views/seminars/con_login.html.erb

@@ -9,7 +9,7 @@
     color: red;
   }
 </style>
-<% if (@seminar.contribute_start_date <= @time_now && (@seminar.contribute_end_date.nil? or @seminar.contribute_end_date+1 >= @time_now ) rescue false) %>
+<% if (@seminar.contribute_start_date.nil? || @seminar.contribute_start_date <= @time_now) && (@seminar.contribute_end_date.nil? or @seminar.contribute_end_date+1 >= @time_now ) %>
 
 <section id="main-wrap">
   <div class="sign-in have-other-sign-in">

app/views/seminars/con_upload.html.erb

@@ -9,9 +9,9 @@
 	data1 = @seminar.seminar_submission_field_sets.select{|v| v.field_name=='title'}[0]
 	data2 = @seminar.seminar_submission_field_sets.select{|v| v.field_name=='description'}[0]
 	data3 = @seminar.seminar_submission_field_sets.select{|v| v.field_name=='file'}[0]
-	show1 = !(data1.disabled) rescue false
+	show1 = data1 ? !(data1.disabled) : false
-	show2 = !(data2.disabled) rescue false
+	show2 = data2 ? !(data2.disabled) : false
-	show3 = !(data3.disabled) rescue false
+	show3 = data3 ? !(data3.disabled) : false
 	name1 = data1['name'][I18n.locale]
 	name2 = data2['name'][I18n.locale]
 	name3 = data3['name'][I18n.locale]
@@ -22,7 +22,7 @@
 		prefix_url = OrbitHelper.url_to_show(@seminar.to_param)
 	end
 %>
-<% if @seminar.contribute_start_date <= @time_now and ( @seminar.contribute_end_date.nil? or @seminar.contribute_end_date+1 >= @time_now ) %>
+<% if (@seminar.contribute_start_date.nil? || @seminar.contribute_start_date <= @time_now) && ( @seminar.contribute_end_date.nil? || @seminar.contribute_end_date+1 >= @time_now ) %>
 	<% begin %>
 	<% if !session[:seminar_signup_id].blank? %>
 	<%=t('seminar_signup.serial_number') %>: <%=@seminar_signup.display_serial_number rescue ""%>

app/views/seminars/show_data.html.erb

@@ -10,6 +10,7 @@
   @seminar_time_range = data["seminar_time_range"]
   @contribute_time_range = data["contribute_time_range"]
   @contribute_action = data["contribute_action"]
+  @sign_up_not_yet = data["sign_up_not_yet"]
 %>
 
 
@@ -19,7 +20,7 @@
       <th class="seminarive-title-field"><%= t(:category) %></th>
       <td class="seminarive-title-value"><%= @seminar.category.title %></td>
     </tr>
-    <tr>
+    <tr <%= 'class="hidden"'.html_safe if @seminar_time_range.blank? %>>
       <th class="seminarive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('seminar.event_during') %></th>
       <td class="seminarive-title-value"><%= @seminar_time_range %></td>
     </tr>
@@ -39,7 +40,7 @@
       <td class="seminarive-title-value"><%= nl2br(@seminar.content) %></td>
     </tr>
     <% end %>
-    <tr>
+    <tr <%= 'class="hidden"'.html_safe if @sign_up_time_range.blank? %>>
       <th class="seminarive-title-field"><i class="fa fa-calendar fa-fw"></i><%= t('seminar.signup_during') %></th>
       <td class="seminarive-title-value"><%= @sign_up_time_range %></td>
     </tr>
@@ -49,7 +50,7 @@
       <td class="seminarive-title-value"><%= @contribute_time_range %></td>
     </tr>
     <% end %>
-    <tr>
+    <tr <%= 'class="hidden"'.html_safe if @sign_up_not_yet && @contribute_action.blank? %>>
       <th class="seminarive-title-field"><%= t('seminar.signup') %></th>
       <td class="seminarive-title-value"><%= @sign_up %><br /><%= @contribute_action %></td>
     </tr>

config/list.yml

@@ -45,3 +45,7 @@ markups:
     ext_support: false
     panel: typeF
     display_only: seminar_submission_field
+  instructions:
+    muti_lang_input_supprt: false
+    ext_support: false
+    panel: typeG

config/locales/en.yml

@@ -6,6 +6,8 @@ en:
   lists:
     markups:
       seminar_preferred_session: Preferred Session
+      instructions: Instructions
+
   restful_actions:
     edit_seminar_review: Review
     copy: Copy

config/locales/zh_tw.yml

@@ -6,6 +6,7 @@ zh_tw:
   lists:
     markups:
       seminar_preferred_session: Preferred Session
+      instructions: "說明文字 Instructions"
 
   restful_actions:
     edit_seminar_review: 審查

custom_announcement/app/helpers/custom_announcements_helper.rb

@@ -320,9 +320,9 @@ module CustomAnnouncementsHelper
     if @target_action == "index"
       filename = overridehtml.nil? ? params[:layout_type] : overridehtml
       f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'custom_announcement', "#{filename}.html.erb")
-      if !File.exists?f
+      if !File.exist?(f)
         f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'custom_announcement', "index.html.erb")
-        if !File.exists?f
+        if !File.exist?(f)
           return "<div class='well'>Maybe the administrator has changed the theme, please select the index page design again from the page settings.</div>".html_safe
         end
       end
@@ -362,7 +362,7 @@ module CustomAnnouncementsHelper
     else
       filename = overridehtml.nil? ? @target_action : overridehtml
       f = File.join(Rails.root, 'app', 'templates', "#{@key}", 'modules', 'custom_announcement', "#{filename}.html.erb")
-      if File.exists?f
+      if File.exist?(f)
         file =  File.open(f)
         doc = Nokogiri::HTML(file, nil, "UTF-8")
         file.close
@@ -464,7 +464,7 @@ module CustomAnnouncementsHelper
     layout_types = []
     @key = Site.first.template
     f = File.join("#{Rails.root}/app/templates/#{@key}/modules/#{module_app}/info.json")
-    if File.exists?f
+    if File.exist?(f)
       info = File.read(f)
       hash = JSON.parse(info) rescue {}
       frontends = hash["frontend"] || []

custom_announcement/lib/custom_announcement/engine.rb

@@ -2,6 +2,7 @@ require "yaml"
 module CustomAnnouncement
   class Engine < ::Rails::Engine
     initializer "custom_announcement" do
+      Rails.application.config.to_prepare do
         begin
           translate_data = Dir["#{CustomAnnouncement::Engine.root}/config/locales/*.yml"] .map{|yaml_file| YAML.load(File.read(yaml_file))}
           data = {}
@@ -151,4 +152,5 @@ module CustomAnnouncement
         # s[:custom_bulletins].indexes.create({expirable_created_at: 1},{ expireAfterSeconds: 180 })
       end
     end
+  end
 end

custom_gallery/app/controllers/admin/custom_galleries_controller.rb

@@ -502,7 +502,7 @@ class Admin::CustomGalleriesController < OrbitAdminController
                  theater_link: admin_image_path(values),
                  description: values.description,
                  title: values.title,
-                 file: values.file.as_json[:file],
+                 file: values.file.as_json,
                  custom_gallery_custom_album_id: values.custom_album_id,
                  order: values.order,
                  tags: values.tags}

custom_gallery/app/controllers/custom_galleries_controller.rb

@@ -242,7 +242,7 @@ class CustomGalleriesController < ApplicationController
                   title: values.title,
                   alt_title: alt_text,
                   url: values.file.url,
-                  file: values.file.as_json[:file],
+                  file: values.file.as_json,
                   custom_gallery_custom_album_id: values.custom_album_id,
                   tags: values.tags}
     end

custom_gallery/lib/custom_gallery/engine.rb

@@ -1,6 +1,7 @@
 module CustomGallery
   class Engine < ::Rails::Engine
     initializer "custom_gallery" do
+      Rails.application.config.to_prepare do
         begin
           translate_data = Dir["#{CustomGallery::Engine.root}/config/locales/*.yml"] .map{|yaml_file| YAML.load(File.read(yaml_file))}
           data = {}
@@ -21,7 +22,7 @@ module CustomGallery
           puts ['error in custom_gallery',e]
         end
 
-      require File.expand_path('../../../app/models/custom_album_setting', __FILE__)
+        require File.join(CustomGallery::Engine.root, 'app/models/custom_album_setting')
         if defined?(CustomAlbumSetting)
           if CustomAlbumSetting.first.nil?
             CustomAlbumSetting.create()
@@ -92,4 +93,5 @@ module CustomGallery
         end
       end
     end
+  end
 end

lib/seminar/engine.rb

@@ -1,6 +1,7 @@
 module Seminar
   class Engine < ::Rails::Engine
     initializer "seminar" do
+      Rails.application.config.to_prepare do
         OrbitApp.registration "Seminar", :type => "ModuleApp" do
           module_label "seminar.seminar"
           base_url File.expand_path File.dirname(__FILE__)
@@ -49,7 +50,7 @@ module Seminar
                                   :active_for_action=>{'admin/seminars'=>'enquiry_for_applicants'},
                                   :available_for => 'users'
           end
-
+        end
       end
     end
   end