diff --git a/app/controllers/admin/activities_controller.rb b/app/controllers/admin/activities_controller.rb index 2bc59ea..f3c1913 100644 --- a/app/controllers/admin/activities_controller.rb +++ b/app/controllers/admin/activities_controller.rb @@ -167,7 +167,7 @@ class Admin::ActivitiesController < OrbitMemberController @intro = @intro.nil? ? ActivityIntro.new({:member_profile_id=>@member.id}) : @intro @intro.update_attributes(intro_params) @intro.save - redirect_to URI.encode('/admin/members/'+@member.to_param+'/activity') + redirect_to URI.encode('/admin/members/'+@member.to_param+'/Activity') end def get_settings diff --git a/app/views/admin/activities/frontend_setting.html.erb b/app/views/admin/activities/frontend_setting.html.erb new file mode 100644 index 0000000..480c0a1 --- /dev/null +++ b/app/views/admin/activities/frontend_setting.html.erb @@ -0,0 +1,74 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> + +<%= form_for(:activity_intro, :url => update_frontend_setting_admin_activities_path, :method => "post", html: {class: "form-horizontal main-forms previewable"} ) do |f| %> +
+
+ +
<%= t("module_name.personal_activity") %>
+ + +
+
+ <% if !@member.blank? %> +
+ +
+ <%= @member.name rescue '' %> + <%= f.hidden_field :member_profile_id, :value => @member.id %> +
+
+ <% end %> +
+ +
+ <%= f.check_box :brief_intro, :checked => @intro.brief_intro %> <%= t("personal_plugins.brief_intro") %> + <%= f.check_box :complete_list, :checked => @intro.complete_list %> <%= t("personal_plugins.complete_list") %> +
+
+
+
+ +
<%= t(:language) %>
+ + +
+ <% @site_in_use_locales.each_with_index do |locale, i| %> +
"> +
+ +
+
+ <%= f.fields_for :text_translations do |f| %> + <%= f.cktext_area locale, rows: 5, class: "input-block-level", :value => (@intro.text_translations[locale] rescue nil) %> + <% end %> +
+
+
+
+ <% end %> +
+ +
+ +
+ <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= hidden_field_tag :member_profile_id, @member.id.to_s %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
+
+<% end %> diff --git a/app/views/plugin/personal_activity/_profile.html.erb b/app/views/plugin/personal_activity/_profile.html.erb index f782eba..1d159b2 100644 --- a/app/views/plugin/personal_activity/_profile.html.erb +++ b/app/views/plugin/personal_activity/_profile.html.erb @@ -13,7 +13,14 @@ else @activities = Activity.where(is_hidden: false, member_profile_id: @member.id).desc(:year).page(params[:page]).per(10) end %> - +<% if has_access? %> +
+
+ <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => toggle_hide_admin_activities_path(member_profile_id: @member.id.to_s, disable: 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => toggle_hide_admin_activities_path(member_profile_id: @member.id.to_s, disable: 'false') ) %> +
+
+<% end -%> @@ -65,7 +72,7 @@ end
<% if has_access? %>
- <%#= link_to content_tag(:i, nil, :class => 'icon-edit') +' '+ t('setting'),'/admin/members/'+@member.to_param+'/books/frontend_setting', :class => 'btn btn-primary' %> + <%= link_to content_tag(:i, nil, :class => 'icon-edit') +' '+ t('setting'),'/admin/members/'+@member.to_param+'/activities/frontend_setting', :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') +' '+ t('new_'), '/admin/members/'+@member.to_param+'/activities/new', :class => 'btn btn-primary' %>