tacf change

app/controllers/admin/seminars_controller.rb

@@ -556,6 +556,13 @@ class Admin::SeminarsController < OrbitAdminController
           render action: :edit  and return
         end
       end
+      Rails.logger.info "&&&&&&&&&&&&&&"
+      if @seminar_params[:seminar_email_sets_attributes]
+        Rails.logger.info "*********************"
+        Rails.logger.info @seminar_params[:seminar_email_sets_attributes]
+        @seminar.update_attributes(@seminar_params[:seminar_email_sets_attributes])
+        flash.now[:notice] = "Updated Fields"
+      end
     end
     redirect_to admin_seminars_path
   end

app/controllers/seminars_controller.rb

@@ -8,13 +8,13 @@ class SeminarsController < ApplicationController
   def index
 
   	time_now = Time.now
-    
+
     seminars = SeminarMain.all.desc(:seminar_start_date).filter_by_categories
     {
       "seminars" => seminars,
       'time_now' => time_now,
       "total_pages" => seminars.total_pages
-    } 
+    }
 
   end
   def widget
@@ -85,7 +85,7 @@ class SeminarsController < ApplicationController
     prefix_url = OrbitHelper.request.path.split("-").first + "-#{params[:uid]}"
     @prefix_url = prefix_url
     @registration_postfix = "/home/registration"
-    header_data = "<a href=\"#{prefix_url}#{home_page.url}\">Home</a> | " + 
+    header_data = "<a href=\"#{prefix_url}#{home_page.url}\">Home</a> | " +
                   "<a href=\"/\">Main Site</a>"
     content_style = seminar_template_setting.content_style
     background_style = seminar_template_setting.background_style
@@ -295,7 +295,7 @@ class SeminarsController < ApplicationController
     if last_path.include?("?")
       referer_url = split_path[0...-1].join('/') + '/' + last_path.split('?')[0]
       uri_query = last_path.split("?")[1..-1].join('?')
-      uri_query.gsub!(/notice=[^&]*/,'').gsub!(/&+$/,'')
+      uri_query.gsub!(/notice=[^&]*/,'').gsub!(/&+$/,'') #rescue nil
       if uri_query.blank?
         referer_url = referer_url + "?notice=#{notice_words}"
       else
@@ -391,18 +391,18 @@ class SeminarsController < ApplicationController
   def check_email
 
     params = OrbitHelper.params
-
+    success = true
-    if !params[:email].blank? 
+    if !params[:email].blank?
       count = SeminarSignup.where(:email => params[:email], :seminar_main_id => params[:no]).count
 
       result = count > 0 ? t('seminar.already_used') : t('seminar.available')
-    else
+      success = count > 0 ? false : true
-      result = t('seminar.please_enter_email')
     end
 
-    {
+    render :json => {
-      "result" => result
+        "result" => result,
-    }
+        "success" => success
+    }.to_json
 
   end
 
@@ -733,6 +733,12 @@ class SeminarsController < ApplicationController
 
   end
 
+  def reset_email
+  end
+
+  def reset_password_page
+  end
+
   def con_login_proc
 
     seminar = SeminarMain.find_by(id: params[:seminar_signup][:seminar_main_id])
@@ -746,11 +752,43 @@ class SeminarsController < ApplicationController
 
       redirect_to "#{params[:referer_url].to_s.chomp('/')}/?method=con_upload"
     else
-      redirect_to "#{params[:referer_url].to_s.chomp('/')}/?method=con_login", :notice => '登入失敗'
+      redirect_to "#{params[:referer_url].to_s.chomp('/')}/?method=con_login", :notice => t('seminar_signup.login_failed')
     end
 
   end
 
+  def reset_confirm_password_proc
+    seminar_signup = SeminarSignup.where(:status=>'C', :reset_token=> params[:token], :seminar_main_id => params[:seminar_signup][:seminar_main_id]).first
+    if !seminar_signup.blank?
+      params.permit!
+      seminar_signup.password = params[:password]
+      seminar_signup.reset_token = ""
+      seminar_signup.save
+      redirect_to "#{params[:referer_url].to_s.chomp('/')}/?method=con_login", :notice => t('seminar_signup.password_changed')
+    else
+      redirect_to "#{params[:referer_url].to_s.chomp('/')}/?method=con_login"
+    end
+  end
+
+  def reset_password_proc
+    # seminar = SeminarMain.find_by(id: params[:seminar_signup][:seminar_main_id])
+    seminar_signup = SeminarSignup.where(:status=>'C', :email=> params[:user_name], :seminar_main_id => params[:seminar_signup][:seminar_main_id]).first
+    if !seminar_signup.blank?
+      token = seminar_signup.generate_reset_token
+
+      mail = Email.create(mail_to:params[:user_name],
+        module_app_key:"seminar",
+        template:"email/reset_password_email.html.erb",
+        mail_sentdate:Time.current,
+        mail_subject: t("seminar_signup.email_reset_password_success"),
+        template_data:{'url'=> request.protocol + request.host_with_port + "#{params[:referer_url].to_s.chomp('/')}/?method=reset_password_page&token=#{token}",'locale'=>I18n.locale})
+      # mail.deliver
+      redirect_to "#{params[:referer_url].to_s.chomp('/')}/?method=reset_email", :notice => t('seminar_signup.reset_email_sent')
+    else
+      redirect_to "#{params[:referer_url].to_s.chomp('/')}/?method=reset_email", :notice => t('seminar_signup.email_not_found')
+    end
+  end
+
   def seminar_signup_params
     params.require(:seminar_signup).permit!
   end
@@ -778,6 +816,6 @@ class SeminarsController < ApplicationController
       mail_sentdate:Time.current,
       mail_subject: email_set[0].title[I18n.locale],
       template_data:{'seminar_id'=>seminar_id,'locale'=>I18n.locale,'extra_text'=> extra_text})
-    end   
+    end
   end
 end

app/helpers/admin/seminars_field_helper.rb

@@ -50,14 +50,14 @@ module Admin::SeminarsFieldHelper
 
   def render_checkbox
      @prefiled_value ||=[]
-    control_group_wrapper_for_sm do 
+    control_group_wrapper_for_sm do
       a = self.typeE[:option_list].collect do |key,value|
         label_tag("#{get_basic_field_name_org}_#{self.id}_#{key}",check_box_tag(get_field_name_base+"[#{key}]", true ,  (@prefiled_value.include?(key) ? true : false), { :id=>"#{get_basic_field_name_org}_#{self.id}_#{key}"})+value[I18n.locale.to_s],@markup_options.merge(:class=>"checkbox inline"))
       end.join.html_safe rescue ""
     end
   end
 
-  def render_date 
+  def render_date
     d = DateTime.now()
 
     if date_is_range?
@@ -81,13 +81,13 @@ module Admin::SeminarsFieldHelper
         when 'format3'
           fill_from = (@prefiled_value && @prefiled_value["from"] ) ? @prefiled_value["from"] : d.strftime("%Y/%m")
           fill_to = (@prefiled_value && @prefiled_value["to"] ) ? @prefiled_value["to"] : d.strftime("%Y/%m/")
-          buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy/MM')        
+          buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy/MM')
           buf << ' ~ '
           buf << datetime_picker(get_field_name_base+'[to]', fill_to, 'yyyy/MM')
         when 'format4'
           fill_from = (@prefiled_value && @prefiled_value["from"] ) ? @prefiled_value["from"] : d.strftime("%Y")
           fill_to = (@prefiled_value && @prefiled_value["to"] ) ? @prefiled_value["to"] : d.strftime("%Y")
-          buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy')  
+          buf = datetime_picker(get_field_name_base+'[from]', fill_from, 'yyyy')
           buf << ' ~ '
           buf << datetime_picker(get_field_name_base+'[to]', fill_to, 'yyyy')
         end
@@ -107,13 +107,13 @@ module Admin::SeminarsFieldHelper
         when 'format2'
           tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m/%d")), 'yyyy/MM/dd')
         when 'format3'
-          tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m")), 'yyyy/MM')        
+          tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y/%m")), 'yyyy/MM')
         when 'format4'
-          tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), 'yyyy')  
+          tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), 'yyyy')
         end
-      
+
-      control_group_wrapper_for_sm{tmp} 
+      control_group_wrapper_for_sm{tmp}
-      # control_group_wrapper_for_sm{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")} 
+      # control_group_wrapper_for_sm{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
 
     end
   end
@@ -131,7 +131,7 @@ module Admin::SeminarsFieldHelper
   end
 
   def render_date_durnation #Need re-write low priority
-    
+
   end
 
   def render_radio_button
@@ -179,7 +179,7 @@ module Admin::SeminarsFieldHelper
         place_holder= typeA["placeholder"][key_field] rescue ''
         name1 = can_muti_lang_input_for_sm? ? ([get_field_name_base,add_more_blank,"[#{key_field}]"].join) : ([get_field_name_base,add_more_blank].join)
         text_field_tag(name1, value, @markup_options.merge(:placeholder=>place_holder,:class=>'input-medium form-control'))
-      end  
+      end
   end
 
   def render_file_field
@@ -199,9 +199,9 @@ module Admin::SeminarsFieldHelper
     is_range =  "false"
     data = get_data
     if !data.nil?
-      is_range = data['is_range'] if data.has_key? "is_range"  
+      is_range = data['is_range'] if data.has_key? "is_range"
     end
-    is_range == "true" 
+    is_range == "true"
   end
 
 protected
@@ -239,7 +239,7 @@ protected
         div_class << (key == I18n.locale ?  " active in" : '')
         content_tag(:div,yield(key,value), :id=>div_id,:class=>div_class)
       end# of VALID_LOCALES.collect for tabed input
-      tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do 
+      tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do
         buff2 = valid_locales.each.collect do |key|
             # link_entry = self.add_more ? "#{add_more_tab(:tab_btn,loop_counter,key)}" : "#tab"+id.to_s+"_#{key}"
             if @show_set_field_for_sm && @markup=='text_area'
@@ -262,7 +262,7 @@ protected
     else
 
       # tmp = content_tag :div,:class=> (add_more || self.markup=='address') ?  "input-append" : "tab-content" do
-      tmp1 = 
+      tmp1 =
         content_tag :div,:class=> "tab-content" do
 
           buff = valid_locales.collect do |key|
@@ -289,7 +289,7 @@ protected
 
         end
 
-      tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do 
+      tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do
         buff2 = valid_locales.each.collect do |key|
             # link_entry = self.add_more ? "#{add_more_tab(:tab_btn,loop_counter,key)}" : "#tab"+id.to_s+"_#{key}"
             link_entry_ary = ["##{get_pairing_tab_class({})}","_#{key}"]
@@ -304,7 +304,7 @@ protected
       end # of content ul
 
 
-        
+
       tmp = content_tag :div,:class=> "input-append" do
         tmp1 << tmp2
       end
@@ -319,8 +319,8 @@ protected
     add_more_counter = ""
 
     if can_add_more
-      add_more_counter = add_more_params[0][:counter] 
+      add_more_counter = add_more_params[0][:counter]
-      add_more_value = add_more_params[0][:value]  
+      add_more_value = add_more_params[0][:value]
     end
 
     if can_muti_lang_input_for_sm?
@@ -330,7 +330,7 @@ protected
     else #cross lang field
       case can_add_more
        when true
-         value = add_more_params[0][:value]  
+         value = add_more_params[0][:value]
          result << content_tag(:div,:class=>"input-append"){yield(nil,value) + link_to((content_tag :i,'',:class=>'icon-trash'),"#",:class=>"btn remove-input") }
          # result << add_more_unt
         else
@@ -346,7 +346,7 @@ protected
 
   end # of def controls_wrapper_for_sm(&block)
 
-  def control_group_wrapper_for_sm(&block) 
+  def control_group_wrapper_for_sm(&block)
     div_class = can_muti_lang_input_for_sm? ? "col-sm-10 controls" : "col-sm-10 controls"
     # div_class = can_muti_lang_input_for_sm? ? "control-group language-swich" : "control-group"
     result = ""
@@ -357,7 +357,7 @@ protected
 
         if can_add_more
 
-          multipleInputs  =  
+          multipleInputs  =
             content_tag(:div,:class=>"add-target") do
               @attribute_value.add_more_counter.times.collect do |t|
                controls_wrapper_for_sm(:value=>(@prefiled_value[t] rescue nil),:counter=>t,&block)
@@ -366,8 +366,8 @@ protected
 
 
           temp =  content_tag(:div, multipleInputs + add_more_unt, :class=>'add-input')
-          
+
-          result = form_label + content_tag(:div,temp,:class=>div_class)  
+          result = form_label + content_tag(:div,temp,:class=>div_class)
 
           # result =  label +  multipleInputs + add_more_unt
           # result = label + 一堆的輸入框(要用 multipleInput editMore 包起來)  + add_more btn + hidden_fields
@@ -385,7 +385,7 @@ protected
         result =  address
 
     else
-      result = form_label + content_tag(:div,controls_wrapper_for_sm(&block),:class=>div_class)
+      result = form_label + content_tag(:div, controls_wrapper_for_sm(&block),:class=>div_class, :id => "yessss")
     end
     result = result + end_block
     result.html_safe
@@ -393,7 +393,7 @@ protected
   end
 
 
-  def add_more_unt    
+  def add_more_unt
     temp_field_name =  get_basic_field_name_base + '[temp]'
     add_more = content_tag :p,:class=> 'add-btn' do
         content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus"),"#","data-roles"=>"role_a",:class=>"trigger #{can_muti_lang_input_for_sm? ? 'textLengInput' : 'textInput' } btn btn-small btn-primary"
@@ -432,7 +432,7 @@ protected
     prefix = opts[:prefix]
     suffix = opts[:suffix]
     str = get_basic_field_name_base.gsub("[","_").gsub("]",'')
-    str = prefix.nil? ? str : prefix+ str 
+    str = prefix.nil? ? str : prefix+ str
     suffix.nil? ? str : str + suffix
   end
 
@@ -471,7 +471,7 @@ protected
     if self.markup == "address"
       return true
     else
-      $seminar_list[:markups][markup]["muti_lang_input_supprt"] and !(get_data["cross_lang"] == "true")  
+      $seminar_list[:markups][markup]["muti_lang_input_supprt"] and !(get_data["cross_lang"] == "true")
     end
   end
 
@@ -533,23 +533,29 @@ protected
     end
     @attribute_value = field_sets
     @prefiled_value = field_sets[field]
-    a = control_group_wrapper_for_sm do |key,value|
+    add_more_blank = ""
-      add_more_blank = ""
+    if markup=='text_field'
-      if markup=='text_field'
+      a = control_group_wrapper_for_sm do |key,value|
-        if key_field == 'seminar_email_sets'
+        # debugger
-          inside = text_field_tag([get_field_name_base,"[#{key}]"].join,value,:class=>'input-medium form-control')
+          if key_field == 'seminar_email_sets'
-        else 
+            inside = text_field_tag([get_field_name_base,"[#{key}]"].join,value,:class=>'input-medium form-control')
-          inside = text_field_tag([get_field_name_base,"[#{key}]"].join,value)
+          else
+            inside = text_field_tag([get_field_name_base,"[#{key}]"].join,value)
+          end
+            inside
         end
       else
-        inside = cktext_area("seminar_main[#{@key_field}][#{@key_index}][#{@field}]","#{key}",value:value)
+        a = "<label>" + t(:en) + "</label>"
+        a = a + cktext_area("seminar_main[#{@key_field}][#{@key_index}][#{@field}]","en",value:@prefiled_value['en'])
+        a = a + "<label>" + t(:zh_tw) + "</label>"
+        a = a + cktext_area("seminar_main[#{@key_field}][#{@key_index}][#{@field}]","zh_tw",value:@prefiled_value['zh_tw'])
+
       end
-      inside
+
-    end
     @key_field = nil
     @key_index = nil
     @field = nil
     @show_set_field_for_sm = nil
     return a.html_safe
   end
-end
+end

app/models/seminar_signup.rb

@@ -8,6 +8,7 @@ class SeminarSignup
   field :sort_number , type: Integer, default: 10000
 
   field :status
+  field :reset_token
   field :name # become Last Name for TICC
   field :tel, type: String # become First Name for TICC
   field :unit, localize: true #Only localize for preserving old record
@@ -26,7 +27,7 @@ class SeminarSignup
   field :seminar_session_ids, type: Array, default: []
   has_many :seminar_signup_values, :autosave => true, :dependent => :destroy
   has_many :seminar_signup_contributes, :autosave => true, :dependent => :destroy
-  
+
   accepts_nested_attributes_for :seminar_signup_values, allow_destroy: true
   accepts_nested_attributes_for :seminar_signup_contributes, allow_destroy: true
   scope :sort_ordered, ->{ order_by(:sort_number=>1,:created_at=>1) }
@@ -80,6 +81,13 @@ class SeminarSignup
       seminar_session.save
     end
   end
+
+  def generate_reset_token
+    reset_token = SecureRandom.hex(5)
+    self.reset_token = reset_token
+    self.save
+    return reset_token
+  end
   def display_serial_number
   	display_format_string(self.serial_number,4)
   end

app/models/seminar_signup_field.rb

@@ -15,9 +15,9 @@ class SeminarSignupField
   field :built_in, type: Boolean, default: false
   field :disabled, type: Boolean, default: false
   # field :to_delete, type: Boolean, default: false
-  
+
   field :to_require,type: Boolean, default: true
-  
+
   field :typeA, type: Hash, default: {cross_lang: false}
   field :typeB, type: Hash, default: {}
   field :typeC, type: Hash, default: {calendar: "west_calendar", format: "format3"}
@@ -57,8 +57,8 @@ class SeminarSignupField
 
   def option_list
     if self_defined_markup_options?
-      #Class need to have corresponding field and value agent 
+      #Class need to have corresponding field and value agent
-     # Ex: For "status" the class must have field called "statuses" for the relation and "statuses_for_select" for the select function 
+     # Ex: For "status" the class must have field called "statuses" for the relation and "statuses_for_select" for the select function
      method = self.seminar.method(self[:key].pluralize+"_for_"+markup)
       return  (method.call rescue {})
     elsif self[:option_list].nil?  || (self[:option_list].empty?)
@@ -103,7 +103,7 @@ class SeminarSignupField
   def is_built_in?
     self.built_in
   end
-  
+
   def is_disabled?
     self.disabled
   end
@@ -131,7 +131,7 @@ class SeminarSignupField
     if self[field]["cross_lang"] != var["cross_lang"]
       case var["cross_lang"]
       when "true"  #from no-add_more to add_more
-        cross_lang_convert(:to_cross_lang)  
+        cross_lang_convert(:to_cross_lang)
       else #from add_more to no-add_more
         cross_lang_convert(:to_no_cross_lang)
       end # of case
@@ -142,23 +142,23 @@ class SeminarSignupField
     if self["typeA"]["add_more"] != var["add_more"]
       case var["add_more"]
       when "true"  #from no-add_more to add_more
-        add_more_convert(:to_add_more)  
+        add_more_convert(:to_add_more)
       else #from add_more to no-add_more
         add_more_convert(:to_no_add_more)
       end # of case
     end # of if
   end
 
-  def cross_lang_convert(opt) 
+  def cross_lang_convert(opt)
-    
+
   end
 
   def check_option_list
     self[:option_list] = self[panel]["option_list"] rescue nil
   end
 
-  def add_more_convert(opt) 
+  def add_more_convert(opt)
 
   end
 
-end
+end

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

@@ -552,6 +552,8 @@
           $(".summary_choice_block").css("display","none");
         }
       })
+      // $("div#seminar_main_seminar_email_sets_attributes_0_content_en").attr('id',"div_seminar_main_seminar_email_sets_attributes_0_content_en");
+      // $("div#seminar_main_seminar_email_sets_attributes_0_content_zh_tw").attr('id',"div_seminar_main_seminar_email_sets_attributes_0_content_zh_tw");
     });
   </script>
 <% end %>

app/views/email/reset_password_email.html.erb

@@ -0,0 +1,4 @@
+<p><%= t("seminar_signup.click_on_link") %></p>
+<div>
+  <a href="<%= @data['url'].html_safe %>" target="_blank"><%= t("seminar_signup.reset") %></a>
+</div>

app/views/seminars/con_login.html.erb

@@ -39,8 +39,12 @@
               <%= password_field_tag :password, nil, :placeholder => t(:dots), :id=>"user_password" %>
             </div>
             <br/>  
+            <div class="control-group clear">
+              <a href="<%= request.original_url.split(request.env["HTTP_HOST"]).last.split('?').first + "?method=reset_email" %>"><%= t('seminar_signup.forgot_password') %></a>
+            </div>
             <input type="hidden" name="referer_url" value="<%= request.original_url.split(request.env["HTTP_HOST"]).last.split('?').first %>">
             <input type="hidden" name="seminar_signup[seminar_main_id]" value="<%= @seminar.id %>">
+            
             <button class="btn btn-primary" name="button" type="submit"><%= t('seminar_signup.login') %></button>
           <% end %>
         </div>

app/views/seminars/con_upload.html.erb

@@ -22,11 +22,12 @@
 		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 ) %>
 	<% begin %>
 	<% if !session[:seminar_signup_id].blank? %>
 	<%=t('seminar_signup.serial_number') %>: <%=@seminar_signup.display_serial_number rescue ""%>
-	<a href="<%= prefix_url %>?method=con_logout&con_no=<%= @seminar.id %>" class='btn btn-primary'><%= t('seminar_signup.logout') %></a>
+	<a href="<%= prefix_url %>?method=con_logout&con_no=<%= @seminar.id %>" class='btn btn-primary' style="display: block; width: 150px;"><%= t('seminar_signup.logout') %></a>
 
 	<table class="table table-hover table-striped seminar-index">
 		<caption>
@@ -69,13 +70,19 @@
 					<td><%= description.html_safe %></td>
 				<% end %>
 				<% if show3 %>
-					<td><%= link_to seminar_signup_contribute.disp_filename, seminar_signup_contribute.file.url, {:target => '_blank', :title => Nokogiri::HTML(description.gsub("<br>"," , ")).text, :download=>seminar_signup_contribute.disp_filename} if seminar_signup_contribute.file.file %></td>
+					<td>
+						<% if show2 %>
+							<%= link_to seminar_signup_contribute.disp_filename, seminar_signup_contribute.file.url, {:target => '_blank', :title => Nokogiri::HTML(description.gsub("<br>"," , ")).text, :download=>seminar_signup_contribute.disp_filename} if seminar_signup_contribute.file.file %>
+						<% else %>
+							<%= link_to seminar_signup_contribute.disp_filename, seminar_signup_contribute.file.url, {:target => '_blank', :title => seminar_signup_contribute.disp_filename, :download=>seminar_signup_contribute.disp_filename} if seminar_signup_contribute.file.file %>
+						<% end %>
+					</td>
 				<% end %>
 				<% if seminar_submission_field %>
 					<td><%= seminar_signup_contribute.seminar_submission_values.where(:seminar_submission_field=>seminar_submission_field).first.get_value_by_locale(I18n.locale) %></td>
 				<% end %>
 				<td>
-					<%= link_to t(:edit), prefix_url + '?method=edit_file&con_no=' + seminar_signup_contribute.id, :class => 'btn btn-primary' %> 
+					<%= link_to t(:edit), prefix_url + '?method=edit_file&con_no=' + seminar_signup_contribute.id, :class => 'btn btn-primary', :style => 'display:block; width: 150px;' %> 
 					<%= form_tag(del_file_seminars_path, {method: "post"}) do |f| %>
 					  <%= submit_tag t(:delete_), class: "btn btn-primary" %>
 					  <%= hidden_field_tag "referer_url", request.original_url.split(request.env["HTTP_HOST"]).last.split('?').first %>
@@ -89,7 +96,7 @@
 
 	<% if ( @seminar.contribute_file_count.blank? or @seminar_signup.seminar_signup_contributes.count < @seminar.contribute_file_count.to_i ) %>
 
-	<%= link_to content_tag(:i, nil, :class => 'icon-plus') +' '+ t('seminar_signup.new_'), prefix_url + '?method=add_file', :class => 'btn btn-primary' %>
+	<%= link_to content_tag(:i, nil, :class => 'icon-plus') +' '+ t('seminar_signup.new_'), prefix_url + '?method=add_file', :class => 'btn btn-primary' , :style => 'display:block; width: 150px;' %>
 
 	<% end %>
 	<br />

app/views/seminars/index.html.erb

@@ -6,12 +6,14 @@
 	@time_now = data["time_now"]
 %>
 <% begin %>
-<table class="table table-hover table-striped seminar-index">
+<table class="table seminar-index">
 	<caption>
 		<% page = OrbitHelper.page rescue Page.where(:page_id => OrbitHelper.params[:page_id]).first %>
 		<h3><%= page.name rescue t('seminar.seminar') %></h3>
 	</caption>
-	<thead>
+	<%
+=begin%>
+ <thead>
 		<tr>
 			<th class="col-md-2"><%= t(:category) %></th>
 			<th class="col-md-3"><%= t('seminar.title') %></th>
@@ -19,7 +21,9 @@
 			<th class="col-md-2"><%= t('seminar_signup.place') %></th>
 			<th class="col-md-2"><%= t('seminar.signup') %></th>
 		</tr>
-	</thead>
+	</thead> 
+<%
+=end%>
 	<tbody>
 		<% 
 			@seminars.each do |seminar| 	
@@ -43,9 +47,9 @@
 				seminar_title = seminar.title
 		%>
 		<tr>
-			<td><%= seminar.category.title %></td>
 			<td>
-				<%= link_to(seminar_title, seminar.get_frontend_url(seminar_url, :show_data), :target=>'_blank', :title=>seminar_title) %>
+				<%= seminar_title %>
+				<%#= link_to(seminar_title, seminar.get_frontend_url(seminar_url, :show_data), :target=>'_blank', :title=>seminar_title) %>
 			</td>
 			<td><%= SeminarMain.time_range(seminar.seminar_start_date, seminar.seminar_end_date) %></td>
 			<td><%= seminar.act_place %></td>

app/views/seminars/reset_email.html.erb

@@ -0,0 +1,50 @@
+<% # encoding: utf-8 %>
+<% 
+	data = action_data("con_login")
+  @seminar = data["seminar"]
+	@time_now = data["time_now"]
+%>
+<style type="text/css">
+  .alert-error{
+    color: red;
+  }
+</style>
+
+<section id="main-wrap">
+  <div class="sign-in have-other-sign-in">
+    <% flash.each do |key, msg| %>
+      <%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
+    <% end %>
+    <div class="form">
+      <h2><%= @seminar.title %></h2>
+      <h3 class="login-logo"><%= t('seminar_signup.forgot_password') %></h3>
+      <div>
+        <input name="utf8" type="hidden" value="" />
+        <input name="authenticity_token" type="hidden" value="" />
+      </div>
+      <div class="form-block">
+        <div class="form-list clearfix">
+          <%= form_tag reset_password_proc_seminars_path, :class => 'content' do %>
+            <div class="control-group clear">
+              <label for="user_email">
+                <i class="icon-user"></i><%=t('seminar_signup.email_address')%>
+              </label>
+              <%= text_field_tag :user_name, params[:user_name], :placeholder => t('seminar_signup.email_address'), :id=>"user_email" %>
+            </div>
+            <br/>  
+            <input type="hidden" name="referer_url" value="<%= request.original_url.split(request.env["HTTP_HOST"]).last.split('?').first %>">
+            <input type="hidden" name="seminar_signup[seminar_main_id]" value="<%= @seminar.id %>">
+            <button class="btn btn-primary" name="button" type="submit"><%= t('seminar_signup.reset') %></button>
+          <% end %>
+        </div>
+      </div>
+      <br/>
+    </div>
+  </div>
+</section>
+<script type="text/javascript">
+  $(document).ready(function(){
+    var max_width = Math.max.apply(null, $(".form .control-group label").map(function(i,el){return $(el).width()}));
+    $(".form .control-group label").width(max_width);
+  })
+</script>

app/views/seminars/reset_password_page.html.erb

@@ -0,0 +1,70 @@
+<% # encoding: utf-8 %>
+<% 
+	data = action_data("con_login")
+  @seminar = data["seminar"]
+	@time_now = data["time_now"]
+%>
+<style type="text/css">
+  .alert-error{
+    color: red;
+  }
+</style>
+
+<section id="main-wrap">
+  <div class="sign-in have-other-sign-in">
+    <% flash.each do |key, msg| %>
+      <%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
+    <% end %>
+    <div class="form">
+      <h2><%= @seminar.title %></h2>
+      <h3 class="login-logo"><%= t('seminar_signup.forgot_password') %></h3>
+      <div>
+        <input name="utf8" type="hidden" value="" />
+        <input name="authenticity_token" type="hidden" value="" />
+      </div>
+      <div class="form-block">
+        <div class="form-list clearfix">
+          <%= form_tag reset_confirm_password_proc_seminars_path, :class => 'content', :id =>"change-password-form" do %>
+            <div class="control-group clear">
+              <label for="user_password">
+                <i class="icon-user"></i><%=t('seminar_signup.password')%>
+              </label>
+              <%= password_field_tag :password, nil, :placeholder => t(:dots), :id=>"user_password", :required=> true %>
+              
+            </div>
+            <div class="control-group clear">
+              <label for="confirm_user_password">
+                <i class="icon-user"></i><%=t('seminar_signup.confirm_password')%>
+              </label>
+              <%= password_field_tag :confirm_password, nil, :placeholder => t(:dots), :id=>"confirm_user_password", :required=> true %> 
+            </div>
+            <p class="alert-error" id="confirm-error"></p>
+            <br/> 
+            <input type="hidden" name="referer_url" value="<%= request.original_url.split(request.env["HTTP_HOST"]).last.split('?').first %>">
+            <input type="hidden" name="seminar_signup[seminar_main_id]" value="<%= @seminar.id %>">
+            <input type="hidden" name="reset_token" value="<%= params['token']  %>" /> 
+            <button class="btn btn-primary" name="button" type="submit"><%= t('seminar_signup.reset') %></button>
+          <% end %>
+        </div>
+      </div>
+      <br/>
+    </div>
+  </div>
+</section>
+<script type="text/javascript">
+  $(document).ready(function(){
+    var max_width = Math.max.apply(null, $(".form .control-group label").map(function(i,el){return $(el).width()}));
+    $(".form .control-group label").width(max_width);
+  })
+  form = document.querySelector("#change-password-form");
+  form.onsubmit = function () {
+    var up = document.querySelector("#user_password").value,
+        cup = document.querySelector("#confirm_user_password").value
+      if(up != cup){
+        document.querySelector("#confirm-error").textContent = "<%= t("seminar_signup.password_mismatch") %>"
+        return false;
+      }else{
+        return true;
+      }
+  }
+</script>

app/views/seminars/show.html.erb

@@ -36,6 +36,11 @@
   <%= javascript_include_tag "lib/bootstrap-datetimepicker" %>
   <%= javascript_include_tag "lib/datetimepicker/date.time.picker.js" %>
   <%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
+  <style>
+    .error{
+  	  color: red;
+    }
+  </style>
 <% notice = flash["notice"] || params[:notice] %>
 <% flash.each do |key, msg| %>
   <% next if key.to_s == "notice" %>
@@ -58,8 +63,8 @@
     
       <!-- Title -->
       <div class="form-group">
-        <label for="title" class="col-sm-2 control-label"><%= t('seminar.title') %></label>
+        <label for="title" class="col-sm-2 control-label hide"><%= t('seminar.title') %></label>
-        <div class="col-sm-10">
+        <div class="col-sm-10 seminar-title">
           <%= @seminar.title %>
         </div>
       </div>
@@ -77,7 +82,7 @@
       <% if @seminar.seminar_signup_field_sets.count != 0 %>
         <% @seminar.seminar_signup_field_sets.each do |signup_field| %>
           <% if !(signup_field.disabled) && signup_field.field_name != 'recaptcha' %>
-            <div class="form-group<%= (@seminar.registration_status[0] == 'G' && signup_field.field_name == 'password') ? ' hide' : '' %>" id="<%= signup_field.field_name == 'password' ? 'registration_status' : '' %>">
+            <div class="form-group<%= (@seminar.registration_status[0] == 'G' && signup_field.field_name == 'password') ? ' hide' : '' %><%= (signup_field.hidden) ? ' hide' : '' %>" id="<%= signup_field.field_name == 'password' ? 'registration_status' : '' %>">
               <label for="<%= signup_field['name'][I18n.locale] %>" class="col-sm-2 control-label">
                 <% if !(['address','note'].include? signup_field.field_name) %>
                 *
@@ -124,7 +129,8 @@
                 </div>
               <% elsif signup_field.field_name == 'email' %>
                 <div class="col-sm-10">
-                  <%= f.email_field :email, :class=>"input-medium form-control availibility", :placeholder=> signup_field.placeholder[I18n.locale], :required => true %> <a href="#" onclick="window.open(' <%= prefix_url %>?method=check_email&no=<%=@seminar.id%>&layout=false&email='+ $('input[type=email]').val() , 'check mail', config='height=100,width=300');" class="btn btn-primary">check mail</a>
+                  <%= f.email_field :email, :class=>"input-medium form-control availibility", :placeholder=> signup_field.placeholder[I18n.locale], :required => true %>
+                  <div class="loader"></div>
                 </div>
               <% elsif signup_field.field_name == 'note' %>
                 <div class="col-sm-10">
@@ -203,18 +209,31 @@
         </div>
 
       <% end %>
-      <% @seminar.seminar_signup_fields.where(:disabled=>false).asc(:sort_number, :_id).each  do |rf| %>
+      <% 
-
+        group = 1 
+        counter = 0
+      %>
+      <% @seminar.seminar_signup_fields.where(:disabled=>false).asc(:sort_number, :_id).each_with_index  do |rf, idx| %>
+        <% if(idx % 4 == 0) && idx != 0 %>
+          <% group += 1 %>
+          <div id="group<%= group %>" style="display:none;">
+        <% end %>
+        <% counter += 1 %>
         <div class="form-group">
 
          <%= rf.block_helper(@seminar,@form_index,false,"seminar_signup",@seminar_signup, rf.to_require) %>
 
         </div>
-
+        <% if(counter % 4 == 0) && idx != 3 %>
+          <% counter = 0 %>
+          </div>
+        <% end %>
         <% @form_index = @form_index +1 %>
 
       <% end %>
-
+      <div class="form-group" style="text-align:center;margin:10px 0;">
+        <button id="add-member" class="btn btn-primary" style="display:inline; width: 150px">增加組員</button>
+      </div>
       
       <!-- 驗證碼 -->
       <% if @seminar.seminar_signup_field_sets.count != 0 %>
@@ -310,34 +329,41 @@
       loader = $(this).parent().find('.loader'),
       elem = $(this),
       value = $(this).val() || null;
-    var checkAvailability = function(){
+      var checkAvailability = function(){
-      $.ajax({
+        $.ajax({
-        url : "<%= "#{prefix_url}?method=check_availability&no=#{@seminar.id}" %>",
+          url : "<%= "/xhr/seminars/check_email/#{@seminar.id}" %>",
-        data : {"type" : type, "value" : value},
+          data : {"type" : type, "email" : value},
-        dataType : "json",
+          dataType : "json",
-        type : "get",
+          type : "get",
-        success : function(data){
+          success : function(data){
-          if( data.success == true ){
+            if( data.success == true ){
-            
+              loader.removeClass("error");
-alert("1tttt");
+            }else{
-          }else{
+              loader.addClass("error");  
-            
+            }
-alert("1ssss2");
+            loader.text(data.result);
           }
+        })
+      }
+      if( value ){
+        if(type == "seminar_signup_email"){
+          loader.text("Checking...")
+          checkAvailability();
         }
-      })
+      }
-    }
+  })
-
+  let currentGroup = 1;
-    if( value ){
+  $("#add-member").on("click",function () {
-      if(type == "seminar_signup_email"){
+    if(currentGroup < 5){
-        checkAvailability();
+      currentGroup++;
+      $("#group" + currentGroup).show();
+      if(currentGroup == 5){
+        $(this).attr("disabled","disabled").hide();
       }
     }
-
+    return false;
-    
   })
 
-
 })();
 </script>
 

app/views/seminars/signup_ok.html.erb

@@ -13,7 +13,7 @@
 <%=t('seminar_signup.serial_number') %>: <%=data["serial_number"] rescue ""%>
 <% if !params['status'].nil? %>
 	<br>
-	<a href="<%= prefix_url %>?method=con_login" class="btn btn-primary"> 
+	<a href="<%= prefix_url %>?method=con_login" class="btn btn-primary" style="display: block; width: 250px;"> 
 		<%= t('seminar.click_to_contribute') %>
 	</a>
 <% else %>

config/list.yml

@@ -44,4 +44,4 @@ markups:
     muti_lang_input_supprt: false
     ext_support: false
     panel: typeF
-    display_only: seminar_submission_field
+    display_only: seminar_submission_field

config/locales/en.yml

@@ -205,11 +205,21 @@ en:
     email_address: Email address
     _password: Password
     login: Login
-    new_: 'Load abstract'
+    new_: 'Upload'
     load_file: load file
     enable_summary_choice: Enable summary choice
     summary_choice_type: Summary choice type
     select: Select box
     checkbox: Multiple choice
     radio: Single choice
-    choices: Choices
+    choices: Choices
+    forgot_password: Forgot Password
+    reset_email_sent: Reset Email Sent
+    login_failed: Login Failed
+    email_not_found: Email not found
+    reset: Reset
+    email_reset_password_success: Password reset
+    click_on_link: Please click on the link below to reset your password
+    confirm_password: Confirm Password
+    password_mismatch: Password missmatch
+    password_changed: Password changed successfully

config/locales/zh_tw.yml

@@ -103,8 +103,8 @@ zh_tw:
     email_edit_file: 編輯上傳
     email_add_file: 新增上傳
     auto_send_email_set: 自動發信設定
-    click_to_contribute: 按此登入投稿
+    click_to_contribute: 按此登入上傳切結書
-    required: '必填, necessary'
+    required: '必填'
     already_used: 已存在
     please_enter_email: 請輸入Email
     available: 可使用
@@ -191,7 +191,7 @@ zh_tw:
     note: 註解
     time: (開始/結束)時間
     place: 地點
-    agree: 同意接受本站個資及隱私權保護宣告(Agree upon personal data protection declaration of this web)
+    agree: 參賽隊伍或其法定代理人皆同意「個人資料蒐集處理利用告知書」、「活動須知」。註冊表單填寫完成後將上傳每位參賽者的「參賽切結書」。
     privacy_statement: '個資及隱私權保護宣告'
     recaptcha: 驗證碼
     signup_field: 圈選項目
@@ -202,15 +202,25 @@ zh_tw:
     files: 檔案
     logout: Logout
     logouting: 登出中
-    success_message: '您的報名已成功，感謝您的參與。'
+    success_message: '感謝您們報名「臺北程式設計節2023城市運行大黑客松」！收到此Email代表您們已順利填寫註冊表單。請接續上傳每位參賽者的「參賽切結書」，以完成報名流程作業。'
     email_address: Email address
     _password: Password
     login: Login
-    new_: '新增(load abstract)'
+    new_: '新增'
     load_file: load file
     enable_summary_choice: 開啟摘要選項
     summary_choice_type: 摘要選項類型
     select: 下拉選單
     checkbox: 多選
     radio: 單選
-    choices: 選項
+    choices: 選項
+    forgot_password: Forgot Password
+    reset_email_sent: Reset Email Sent
+    login_failed: 登入失敗
+    email_not_found: Email not found
+    reset: Reset
+    email_reset_password_success: Password reset
+    click_on_link: 請點選下方連結後重設密碼。
+    confirm_password: Confirm Password
+    password_mismatch: Password missmatch
+    password_changed: Password changed successfully

config/routes.rb

@@ -53,7 +53,7 @@ Rails.application.routes.draw do
     SeminarSubmissionField.create_indexes
   end
   locales = Site.first.in_use_locales rescue I18n.available_locales
-  
+
   scope "(:locale)", locale: Regexp.new(locales.join("|")) do
    namespace :admin do
     resources :seminars do
@@ -100,13 +100,15 @@ Rails.application.routes.draw do
       collection do
         get ':slug_title-:uid', to: 'seminars#show'
         post 'con_login_proc', to: 'seminars#con_login_proc'
+        post 'reset_password_proc', to: 'seminars#reset_password_proc'
+        post 'reset_confirm_password_proc', to: 'seminars#reset_confirm_password_proc'
         post 'con_logout_proc', to: 'seminars#con_logout_proc'
         post 'add_file_proc', to: 'seminars#add_file_proc'
         post 'edit_file_proc', to: 'seminars#edit_file_proc'
         post 'del_file', to: 'seminars#del_file'
       end
     end
-
+    get "/xhr/seminars/check_email/:no" => "seminars#check_email"
   end
-  
+
 end