diff --git a/app/assets/javascripts/lib/list-check.js b/app/assets/javascripts/lib/list-check.js new file mode 100644 index 00000000..c21899fd --- /dev/null +++ b/app/assets/javascripts/lib/list-check.js @@ -0,0 +1,105 @@ +var ListCheck = function(element) { + this.element = $(element); + this.element.data('exists', true); + if(this.element.context.parentNode.tagName == "TD") { + this.elementWrap = $(this.element.context.parentNode); + this.elementWrap.addClass('listCheck'); + } else if(this.element.context.parentNode.tagName == "TH") { + this.elementWrap = $(this.element.context.parentNode); + this.elementWrap.addClass('listCheckHead'); + } + this.element.before(''); +}; + +$.fn.listCheck = function (callback) { + this.each(function (i) { + if(!$(this).data('exists')) { + new ListCheck(this); + }; + }); + this.on(clickEvent, function(e) { + if($(this).prop('checked')) { + $(this).siblings('i').addClass('icon-check').removeClass('icon-check-empty').closest('tr').addClass('checkHit'); + } else { + $(this).siblings('i').addClass('icon-check-empty').removeClass('icon-check').closest('tr').removeClass('checkHit'); + }; + if ($(this).closest('.listCheckHead').length) { + $('.listCheck .list-check').prop('checked', $(this).prop('checked')); + if($(this).prop('checked')) { + $('.listCheck i').addClass('icon-check').removeClass('icon-check-empty').closest('tr').addClass('checkHit'); + } else { + $('.listCheck i').addClass('icon-check-empty').removeClass('icon-check').closest('tr').removeClass('checkHit'); + } + }; + + var _isCheck = $('tbody .list-check').filter(':checked').length, + _defaultLength = $('tbody .list-check').length; + + if(_isCheck > 0 && _isCheck < _defaultLength) { + $('.listCheckHead i').removeClass('icon-check-empty icon-check').addClass('icon-minus'); + } else if(!_isCheck) { + $('.listCheckHead i').removeClass('icon-minus icon-check').addClass('icon-check-empty'); + } else { + $('.listCheckHead i').removeClass('icon-check-empty icon-minus').addClass('icon-check'); + } + _isCheck ? $('.list-active-btn').removeClass('disabled').data('actionable', true) : $('.list-active-btn').addClass('disabled').data('actionable', false); + }); +}; +function clearCheck() { + $('.list-check').each(function() { + $(this).prop('checked', false); + }) +} +function actionSuccess(e) { + $("tbody .list-check").each(function() { + switch(e) { + case 'list-be-hide': + $(this).filter(':checked').closest('tr').addClass('checkHide'); + break; + case 'list-be-show': + $(this).filter(':checked').closest('tr').removeClass('checkHide'); + break; + case 'list-be-remove': + $(this).filter(':checked').closest('tr').fadeOut(300, function() { + $(this).remove(); + }); + break; + }; + $('.list-check').siblings('i').removeAttr('class').addClass('icon-check-empty').closest('tr').removeClass('checkHit'); + }); + clearCheck(); +} +$(function() { + var $t = null, + _data = null; + clearCheck(); + $('.list-check').listCheck(); + $('.list-active-btn').data('actionable', false).on(clickEvent, function(e) { + $t = $(this) + _data = $(this).data() + _data.actionable ? $('#dialog').modal('show') : ""; + e.preventDefault(); + }); + + $("#dialog").on('show', function (e) { + $(this).find('.delete-item').on(clickEvent, function() { + var _v = []; + $("tbody .list-check").each(function() { + this.checked && _v.push("ids[]="+this.value) + }); + var _t = $t.attr("rel"); + if(_t.indexOf("?") > -1) { + $.ajax(_t + "&" + _v.join("&")).done(function() { + actionSuccess(_data.checkAction) + }); + } else { + $.ajax(_t + "?" + _v.join("&")).done(function() { + actionSuccess(_data.checkAction) + }); + } + $('#dialog').modal('hide'); + $('.list-active-btn').addClass('disabled').data('actionable', false); + e.preventDefault(); + }) + }); +}); \ No newline at end of file diff --git a/app/assets/stylesheets/lib/list-check.css b/app/assets/stylesheets/lib/list-check.css new file mode 100644 index 00000000..5e5e05b5 --- /dev/null +++ b/app/assets/stylesheets/lib/list-check.css @@ -0,0 +1,28 @@ +.table .listCheckHead, +.table .listCheck { + width: 30px; + vertical-align: middle; + padding: 0 0 0 10px!important; +} +.listCheckHead .list-check, +.listCheck .list-check { + position: absolute; + margin: -12px 0 0 -1px; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=0); + opacity: 0; +} +.listCheckHead i, +.listCheck i { + display: block; +} +.checkHide td { + background-color: #E6E6E6 !important; + color: #B9B9B9; +} +.checkHide a { + color: #B9B9B9; +} +.checkHit td { + background-color: #FFFEDB !important; +} \ No newline at end of file diff --git a/app/assets/stylesheets/lib/member.css b/app/assets/stylesheets/lib/member.css index a2bf3195..5a9c6cf2 100644 --- a/app/assets/stylesheets/lib/member.css +++ b/app/assets/stylesheets/lib/member.css @@ -3,9 +3,9 @@ color: #000; text-decoration: none; display: block; - overflow: hidden; width: 100%; text-overflow: ellipsis; + overflow: hidden; white-space: nowrap; } @@ -364,6 +364,9 @@ #profile #module-navbar { margin-left: 10px; } +#profile #module-navbar .navbar { + margin-bottom: 15px; +} #profile #member-module { margin-left: 360px; } @@ -372,9 +375,13 @@ } #profile #member-module #module-content .content { right: 10px; + padding-bottom: 10px; outline: none; } - +#profile #member-module #module-content .list-active { + padding-bottom: 8px; + /*border-bottom: 1px solid #DDD;*/ +} /* Responsive */ @media (max-width: 979px) { diff --git a/app/assets/stylesheets/lib/wrap-nav.css b/app/assets/stylesheets/lib/wrap-nav.css index a1bb13f7..80622262 100644 --- a/app/assets/stylesheets/lib/wrap-nav.css +++ b/app/assets/stylesheets/lib/wrap-nav.css @@ -26,6 +26,9 @@ margin-top: 4px; margin-left: 10px; } +.topnav .btn-group { + margin-left: 0; +} /* Bottom Nav */ .bottomnav { diff --git a/app/controllers/admin/personal_plugin_intros_controller.rb b/app/controllers/admin/personal_plugin_intros_controller.rb new file mode 100644 index 00000000..2d726f55 --- /dev/null +++ b/app/controllers/admin/personal_plugin_intros_controller.rb @@ -0,0 +1,83 @@ +class Admin::PersonalPluginIntrosController < OrbitMemberController + + include OrbitControllerLib::DivisionForDisable + + before_filter :authenticate_user! + before_filter :is_admin? + + + def index + + get_types + @plugin_intro = @types.where(:user_id => params[:user_id]).first + + if @plugin_intro.blank? + + @set_type = @types.new() + @url = eval("panel_#{@app_type_name}_back_end_#{@app_type}s_path(:user_id=>params[:user_id])") + @verb = :post + + else + + @set_type = @types.find(@plugin_intro.id) + @url = polymorphic_path(["panel_#{@app_type_name}_back_end", @plugin_intro]) + @verb = :put + + end + + end + + + def show + + end + + + def new + end + + + def edit + end + + def create + + get_types + + @plugin_intro = @types.new(params[:plugin_intro]) + + respond_to do |format| + if @plugin_intro.save + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:plugin_intro][:user_id],:show_plugin_profile=>@reback_name)) } + end + end + + end + + + def update + + get_types + + @plugin_intro = @types.find(params[:id]) + + respond_to do |format| + + if @plugin_intro.update_attributes(params[:plugin_intro]) + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:plugin_intro][:user_id],:show_plugin_profile=>@reback_name)) } + end + end + + end + + + def destroy + end + + protected + + def get_types + @types = @app_type.classify.constantize + end + +end diff --git a/app/controllers/admin/users_new_interface_controller.rb b/app/controllers/admin/users_new_interface_controller.rb index 4f4e352f..f7a1bdf4 100644 --- a/app/controllers/admin/users_new_interface_controller.rb +++ b/app/controllers/admin/users_new_interface_controller.rb @@ -98,9 +98,11 @@ class Admin::UsersNewInterfaceController < OrbitMemberController if(!params[:show_plugin_profile].nil?) - @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary' + @right_partial = OrbitApp::Plugin::Registration.find_by_app_name(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary' + @plugin_app_name = OrbitApp::Plugin::Registration.find_by_app_name(params[:show_plugin_profile]).name rescue nil else @right_partial = "plugin_summary" + @plugin_app_name = '' end # @user.attribute_values.each{|att_val| diff --git a/app/models/user/personal_plugin_intro.rb b/app/models/user/personal_plugin_intro.rb new file mode 100644 index 00000000..8dec3b27 --- /dev/null +++ b/app/models/user/personal_plugin_intro.rb @@ -0,0 +1,28 @@ +class PersonalPluginIntro + + include Mongoid::Document + include Mongoid::Timestamps + # include OrbitCoreLib::ObjectAuthable + # include OrbitCoreLib::ObjectDisable + + # has_and_belongs_to_many :users + belongs_to :user + + field :text, localize: true + field :brief_intro, :type => Boolean, :default => false + field :complete_list, :type => Boolean, :default => true + + + def pp_object + brief_intro + end + + def self.from_id(id) + PersonalPluginIntro.find(id) rescue nil + end + + def self.is_localized?(field_name) + self.fields[field_name.to_s].localized? + end + +end \ No newline at end of file diff --git a/app/models/user/user.rb b/app/models/user/user.rb index c8a682c8..b726c0f3 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -38,12 +38,15 @@ class User has_and_belongs_to_many :sub_role_tags has_many :user_actions, :dependent => :destroy + + has_many :personal_plugin_intro # has_and_belongs_to_many :statuses has_and_belongs_to_many :roles has_and_belongs_to_many :sub_roles has_and_belongs_to_many :role_statuses has_and_belongs_to_many :role_categorys + accepts_nested_attributes_for :attribute_values, :allow_destroy => true before_create :initialize_desktop diff --git a/app/views/admin/personal_plugin_intros/index.html.erb b/app/views/admin/personal_plugin_intros/index.html.erb new file mode 100644 index 00000000..3c399fd5 --- /dev/null +++ b/app/views/admin/personal_plugin_intros/index.html.erb @@ -0,0 +1,117 @@ +<% # encoding: utf-8 %> + +<% content_for :side_bar do %> + <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %> +<% end %> + +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> +<% end %> + +<%= form_for(:plugin_intro, :url => @url, :method => @verb, html: {class: "form-horizontal main-forms previewable"} ) do |f| %> + +<%= f.error_messages %> + +
+ + +
+ + +
<%= I18n.t("module_name.#{@app_type_name}") %>
+ + + +
+ + +
+ + <% if !params[:user_id].blank? %> + +
+ +
+ <%= User.from_id(params[:user_id]).name rescue ''%> +
+
+ + <% end %> + + +
+ +
+ <%= f.check_box :brief_intro, :checked => @set_type.brief_intro %> <%= t("personal_plugins.brief_intro") %> + <%= f.check_box :complete_list, :checked => @set_type.complete_list %> <%= t("personal_plugins.complete_list") %> +
+
+ +
+ +
+ + +
<%= t(:language) %>
+ + + +
+ + <% @site_valid_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 => (@set_type.text_translations[locale] rescue nil) %> + <% end %> +
+
+
+ + +
+ + <% end %> + + + +
+ + + +
+ + +
+ <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
+ + +
+ +<% end %> \ No newline at end of file diff --git a/app/views/admin/users_new_interface/_plugin_summary.html.erb b/app/views/admin/users_new_interface/_plugin_summary.html.erb index 1c1c0589..3b3ef767 100644 --- a/app/views/admin/users_new_interface/_plugin_summary.html.erb +++ b/app/views/admin/users_new_interface/_plugin_summary.html.erb @@ -1,46 +1,46 @@ -
-

Module Name

-
- - - - - - - -
模組數量
-
-
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - -
University2,304
Master783
Doctor45
Staff62
-
-
-
+
+

Module Name

+
+ + + + + + + +
<%= t(:module) %><%= t(:quantity) %>
+
+
+
+
+
-
\ No newline at end of file +
+
+
+
+ + + + <% + @plugins.each do |plugin| + + if is_admin? + @data = plugin.app_name.classify.constantize.where(:create_user_id=>@user.id).count + else + @data = plugin.app_name.classify.constantize.where(:is_hidden=>false , :create_user_id=>@user.id).count + end + %> + + + + + <% end -%> + + +
<%= plugin.name %><%= @data %>
+
+
+
+
+
\ No newline at end of file diff --git a/app/views/admin/users_new_interface/index.html.erb b/app/views/admin/users_new_interface/index.html.erb index d639725e..b72e62d4 100644 --- a/app/views/admin/users_new_interface/index.html.erb +++ b/app/views/admin/users_new_interface/index.html.erb @@ -5,7 +5,8 @@ <%= render :partial => "js_and_css"%> -
+<% content_for :right_nav do %> +
<%= text_field_tag 'mq',( params[:mq] ? params[:mq] : '' ), {:id=>'filter-input', :class => "search-query input-medium", :placeholder => 'Search'} %> @@ -34,8 +35,8 @@
-
- + +<% end %>
diff --git a/app/views/admin/users_new_interface/index_summary.html.erb b/app/views/admin/users_new_interface/index_summary.html.erb index aaa34db5..0bd2e430 100644 --- a/app/views/admin/users_new_interface/index_summary.html.erb +++ b/app/views/admin/users_new_interface/index_summary.html.erb @@ -5,8 +5,9 @@ <%= render :partial => "js_and_css"%> -
-
+<% content_for :right_nav do %> + +
<%= text_field_tag 'mq',( params[:mq] ? params[:mq] : '' ), {:id=>'filter-input', :class => "search-query input-medium", :placeholder => 'Search'} %> @@ -35,7 +36,8 @@
-
+ +<% end %>
    diff --git a/app/views/admin/users_new_interface/index_thumbnail.html.erb b/app/views/admin/users_new_interface/index_thumbnail.html.erb index 6b303c27..df37ddf5 100644 --- a/app/views/admin/users_new_interface/index_thumbnail.html.erb +++ b/app/views/admin/users_new_interface/index_thumbnail.html.erb @@ -5,8 +5,9 @@ <%= render :partial => "js_and_css"%> -
    -
    +<% content_for :right_nav do %> + +
    <%= text_field_tag 'mq',( params[:mq] ? params[:mq] : '' ), {:id=>'filter-input', :class => "search-query input-medium", :placeholder => 'Search'} %> @@ -35,7 +36,8 @@
    -
    + +<% end %>
      diff --git a/app/views/admin/users_new_interface/show.html.erb b/app/views/admin/users_new_interface/show.html.erb index 07a59cfd..bcdc4be1 100644 --- a/app/views/admin/users_new_interface/show.html.erb +++ b/app/views/admin/users_new_interface/show.html.erb @@ -43,7 +43,7 @@
      - <%= params[:show_plugin_profile].nil? ? t(:all_plugin_summary) : params[:show_plugin_profile] %> + <%= @plugin_app_name.nil? ? t(:all_plugin_summary) : @plugin_app_name %>
      • @@ -52,8 +52,8 @@
          <% @plugins.each do |plugin| %> - <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %> - <%= link_to plugin.name, :show_plugin_profile => plugin.name %> + <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.app_name ? "active" : nil) do %> + <%= link_to plugin.name, :show_plugin_profile => plugin.app_name %> <% end -%> <% end -%> diff --git a/app/views/layouts/member.html.erb b/app/views/layouts/member.html.erb index 369ae32e..e3936b19 100644 --- a/app/views/layouts/member.html.erb +++ b/app/views/layouts/member.html.erb @@ -23,8 +23,8 @@
          -
            -
          • Dashboard /
            • + <%= yield :right_nav %> diff --git a/config/locales/en.yml b/config/locales/en.yml index f0f36b5c..30916a86 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -331,6 +331,12 @@ en: password_confirmation: Password confirmation password_current: Current password pending: Pending + personal_plugins: + author : "Author" + edit_brief_intro : "Edit Brief Intro." + brief_intro : "Brief Intro." + complete_list : "Complete List" + frontend_page : "Frontend Page" picture: Picture placeholder: Field Hint plugins: Plugins diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml index fb309739..a0978103 100644 --- a/config/locales/zh_tw.yml +++ b/config/locales/zh_tw.yml @@ -332,6 +332,12 @@ zh_tw: password_confirmation: 確認密碼 password_current: 目前的密碼 pending: 待審核 + personal_plugins: + author : "著作人" + edit_brief_intro : "編輯摘要" + brief_intro : "摘要" + complete_list : "完整列表" + frontend_page : "前台呈現" picture: 圖片 placeholder: 欄位提示文字 plugins: 學術資訊 diff --git a/config/mongoid.yml b/config/mongoid.yml index 49a7167c..9e54f531 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -24,4 +24,4 @@ production: # password: <%= ENV['MONGOID_PASSWORD'] %> # database: <%= ENV['MONGOID_DATABASE'] %> <<: *defaults - database: test_site + database: test_site_new diff --git a/lib/orbit_app/plugin/registration.rb b/lib/orbit_app/plugin/registration.rb index a8a5d80c..64b0d312 100644 --- a/lib/orbit_app/plugin/registration.rb +++ b/lib/orbit_app/plugin/registration.rb @@ -14,6 +14,13 @@ module OrbitApp @@registrations << DataSheet.new(name,args,:base_path=>base_path) end + def find_by_app_name(name) + @@registrations.each{|t| + return t if t.app_name == name + } + return nil + end + def find_by_key(key) @@registrations.each{|t| return t if t.name == key @@ -46,6 +53,8 @@ module OrbitApp def initialize(name,partial=nil,*args ,&block) @base_path = args[0][:base_path] @name = partial[0][:i18n].nil? ? name : lambda{ I18n.t(partial[0][:i18n]) } + @app_name = partial[0][:app_name] + @intro_app_name = partial[0][:intro_app_name] @partial_path = '' @front_partial_path = '' @admin_partial_path = '' @@ -59,6 +68,14 @@ module OrbitApp block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given? end + def app_name + return @app_name + end + + def intro_app_name + return @intro_app_name + end + def profile_partial_path return @partial_path end diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb index 833454fb..7d8219a6 100644 --- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb +++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/_show_roles.html.erb @@ -24,27 +24,29 @@ <% show_roles.attribute_fields.where(:disabled=>false).asc(:_id).each do |rf| %> - <% - if !@member.get_attribute_value(rf).blank? - if !@member.get_attribute_value(rf)['val'].blank? - @rodata = @member.get_attribute_value(rf)['val'] - elsif !@member.get_attribute_value(rf)[I18n.locale].blank? - @rodata = @member.get_attribute_value(rf)[I18n.locale] - else - @rodata = nil - end - end + <% + if !@member.get_attribute_value(rf).blank? + if !@member.get_attribute_value(rf)['val'].blank? + @rodata = @member.get_attribute_value(rf)['val'] + elsif !@member.get_attribute_value(rf)[I18n.locale].blank? + @rodata = @member.get_attribute_value(rf)[I18n.locale] + else + @rodata = nil + end - if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank? - %> + if !@rodata.blank? and !@member.get_attribute_value(rf).get_value_by_locale(I18n.locale).blank? + %> - - <%= rf.title %> - <%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %> - + + <%= rf.title %> + <%= nl2br(show_attribute_value(@member.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %> + + <% end -%> + + <% end -%> + <% end -%> - <% end -%> + <%= render :partial => 'show_sub_role',:collection=> @member.get_sub_roles_by_role(show_roles)%> - <%= render :partial => 'show_sub_role',:collection=> @member.get_sub_roles_by_role(show_roles)%> \ No newline at end of file diff --git a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb index 1480f603..3a77f0a6 100644 --- a/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb +++ b/vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb @@ -46,38 +46,71 @@ <%= show_avatar(@member) %>
          -
            - <% @plugins.each do |plugin| %> -
          • <%= plugin.name %>
            • + <% + @plugins.each do |plugin| + + @data = plugin.app_name.classify.constantize.where(is_hidden: false, :create_user_id=>@member.id) + @intro_data = plugin.intro_app_name.classify.constantize.where(:user_id=>@member.id).first + %> + + <% if !@intro_data.blank? %> + + <% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %> +
          • <%= plugin.name %>
            • + <% end %> + + <% else %> + + <% if !@data.blank? %> +
          • <%= plugin.name %>
            • + <% end %> + + <% end %> + <% end %>
          <% - - @plugins.each do |plugin| + @plugins.each do |plugin| @plugin_partial = !plugin.front_partial_path.blank? ? OrbitApp::Plugin::Registration.find_by_key(plugin.name).front_partial_path : nil + + @data = plugin.app_name.classify.constantize.where(:create_user_id=>@member.id) + @intro_data = plugin.intro_app_name.classify.constantize.where(:user_id=>@member.id).first %> - -
          - <%= render :partial => @plugin_partial if !@plugin_partial.blank? %> -
          + + <% if !@intro_data.blank? %> + + <% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %> +
          + <%= render :partial => @plugin_partial if !@plugin_partial.blank? %> +
          + <% end %> + + <% else %> + + <% if !@data.blank? %> +
          + <%= render :partial => @plugin_partial if !@plugin_partial.blank? %> +
          + <% end %> + + <% end %> <% end %> -
          + +
          +
          - - - - +
      <%= stylesheet_link_tag "member/default_member" %> - <%= javascript_include_tag "member/moduletab" %> +<%= javascript_include_tag "member/moduletab" %> diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/personal_book_intros_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/personal_book_intros_controller.rb new file mode 100644 index 00000000..8e2b5adf --- /dev/null +++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/personal_book_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalBook::BackEnd::PersonalBookIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_book_intro' + @app_type_name = 'personal_book' + @reback_name = 'WritingBook' + end + +end diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb index 581acaed..60ba0c27 100644 --- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb +++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/writing_books_controller.rb @@ -9,43 +9,19 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl end def index - - get_plugins + get_plugins - get_categorys("BookPaperType",params[:book_paper_type_id]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - @paper_types = BookPaperType.all - @paper_type_ids = @paper_types.collect{|t| t.id.to_s} + [nil] - - - # @writing_books = WritingBook.search(params[:category_id]) - #@writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_books : WritingBook.all.page(params[:page]).per(10) - - @writing_books = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_book",:book_paper_type_id.in => @paper_type_ids) : get_viewable("writing_book",:book_paper_type_id.in => @paper_type_ids) - @books = @writing_books.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @paper_type_ids = BookPaperType.all.collect{|t| t.id.to_s} + [nil] + @writing_books = get_sorted_and_filtered("writing_book", :book_paper_type_id.in => @paper_type_ids) respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @writing_books } - format.js end end @@ -59,10 +35,10 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl @tags = get_tags @set_author_type = BookAuthorType.new(:display => 'List') - @author_type_url = panel_personal_book_back_end_writing_books_path + @author_type_url = panel_personal_book_back_end_writing_books_path @set_paper_type = BookPaperType.new(:display => 'List') - @paper_type_url = panel_personal_book_back_end_writing_books_path + @paper_type_url = panel_personal_book_back_end_writing_books_path end @@ -183,25 +159,26 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl # @level_types = BookLevelType.all @author_types = BookAuthorType.all @paper_types = BookPaperType.all - @tags = get_tags + @tags = get_tags @writing_book = WritingBook.new(params[:writing_book]) - if params[:writing_book][:user_id] + if params[:writing_book][:user_id] @writing_book.create_user_id = params[:writing_book][:user_id] @writing_book.update_user_id = params[:writing_book][:user_id] else - @writing_book.create_user_id = current_user.id + @writing_book.create_user_id = current_user.id @writing_book.update_user_id = current_user.id end respond_to do |format| + if @writing_book.save - if params[:writing_book][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_book][:user_id],:show_plugin_profile=>'Book')) } + if params[:writing_book][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_book][:user_id],:show_plugin_profile=>"WritingBook")) } else - format.html { redirect_to(panel_personal_book_back_end_writing_books_url) } + format.html { redirect_to(panel_personal_book_back_end_writing_books_url) } end format.xml { render :xml => @writing_book, :status => :created, :location => @writing_book } @@ -209,7 +186,9 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl format.html { render :action => "new" } format.xml { render :xml => @writing_book.errors, :status => :unprocessable_entity } end + end + end end @@ -244,23 +223,24 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl else - @writing_book = WritingBook.find(params[:id]) - - @writing_book.update_user_id = current_user.id - - params[:writing_book][:tag_ids] ||=[] + @writing_book = WritingBook.find(params[:id]) + + @writing_book.update_user_id = current_user.id + + params[:writing_book][:tag_ids] ||=[] - respond_to do |format| - if @writing_book.update_attributes(params[:writing_book]) - format.html { redirect_to(panel_personal_book_back_end_writing_books_url) } - # format.js { render 'toggle_enable' } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @writing_book.errors, :status => :unprocessable_entity } + respond_to do |format| + if @writing_book.update_attributes(params[:writing_book]) + format.html { redirect_to(panel_personal_book_back_end_writing_books_url) } + # format.js { render 'toggle_enable' } + format.xml { head :ok } + else + format.html { render :action => "edit" } + format.xml { render :xml => @writing_book.errors, :status => :unprocessable_entity } + end end + end - end end @@ -283,6 +263,29 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl end redirect_to panel_personal_book_back_end_writing_books_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @writing_books = WritingBook.any_in(:_id => params[:ids]) + + @writing_books.each do |writing_book| + + writing_book.is_hidden = params[:disable] + + writing_book.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingBook")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_book/app/models/personal_book_intro.rb b/vendor/built_in_modules/personal_book/app/models/personal_book_intro.rb new file mode 100644 index 00000000..a817ecf6 --- /dev/null +++ b/vendor/built_in_modules/personal_book/app/models/personal_book_intro.rb @@ -0,0 +1,4 @@ +class PersonalBookIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb index b825470a..851526fe 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form.html.erb @@ -1,256 +1,340 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      <%= f.label :author_type ,t("personal_book.author_type")%>

      -
      - <% @author_types.each do |author_type| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_book[book_author_type_ids][]', author_type.id, @writing_book.book_author_type_ids.include?(author_type.id)%> - <%= author_type.title %> - <%= hidden_field_tag 'writing_book[book_author_type_ids][]', '' %> - <% end %> + +
      <%= t(:module) %>
      + + + +
      + + +
      + + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      + + <% end %> + + +
      + +
      + <% @author_types.each do |author_type| %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'writing_book[book_author_type_ids][]', author_type.id, @writing_book.book_author_type_ids.include?(author_type.id)%> + <%= author_type.title %> + <%= hidden_field_tag 'writing_book[book_author_type_ids][]', '' %> <% end %> -
      -
      - - -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_book[tag_ids][]', tag.id, @writing_book.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'writing_book[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - - -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - <% end %> - -
      - <%= f.label :year ,t("personal_book.year")%> - <%= select_year((@writing_book.year ? @writing_book.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_book[year]'} ) %> -
      - -
      - <%= f.label :book_paper_type ,t("personal_book.book_paper_type")%> - <%= f.select :book_paper_type_id, @paper_types.collect {|t| [ t.title, t.id ]} %> -
      - - - -
      - <%= f.label :publish_date ,t("personal_book.publish_date")%> - <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> -
      - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> -
      - <%= f.label :paper_title ,t("personal_book.paper_title")%> - <%= f.fields_for :paper_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_book.paper_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :book_title ,t("personal_book.book_title")%> - <%= f.fields_for :book_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_book.book_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :extracted_chapters ,t("personal_book.extracted_chapters")%> - <%= f.fields_for :extracted_chapters_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_book.extracted_chapters_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :publisher ,t("personal_book.publisher")%> - <%= f.fields_for :publisher_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_book.publisher_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :editor ,t("personal_book.editor")%> - <%= f.fields_for :editor_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_book.editor_translations[locale] rescue nil) %> - <% end %> -
      +
      +
      -
      - <%= f.label :authors,t("web_resource.authors") %> - <%= f.fields_for :authors_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :size => "60x3", :value => (@writing_book.authors_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      + +
      + <%= f.select :book_paper_type_id, @paper_types.collect {|t| [ t.title, t.id ]} %> +
      +
      - <% end %> - -
      - -
      - <%= f.label :publication_date ,t("personal_book.publication_date")%> - <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month, :day] }, {:class => 'span1'} %> -
      + +
      + +
      + <%= select_year((@writing_book.year ? @writing_book.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_book[year]',:class => 'span1'} ) %> +
      +
      -
      - <%= f.label :url, t("personal_book.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_book.keywords") %> - <%= f.text_field :keywords %> -
      + +
      + +
      + <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> +
      +
      -
      - <%= f.label :pages, t("personal_book.pages") %> - <%= f.text_field :pages %> -
      + +
      + +
      + <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month, :day] }, {:class => 'span1'} %> +
      +
      -
      - <%= f.label :isbn, t("personal_book.isbn") %> - <%= f.text_field :isbn %> -
      - -
      - <%= f.label :language, t("personal_book.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_book.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_book.English") %> -
      + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      -
      - <%= f.label :note, t("personal_book.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - - - - -
      - -
      - - - - - - - - - - - - - - - - - - <% @writing_book.writing_book_files.each_with_index do |writing_book_file, i| %> - <%= f.fields_for :writing_book_files, writing_book_file do |f| %> - <%= render :partial => 'form_file', :object => writing_book_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
      FileFile Name
      -
      - <%= hidden_field_tag 'plugin_file_field_count', @writing_book.writing_book_files.count %> - ADD/新增 -
      -
      - -
      - -
      - - - - - - -
      - - + +
      + +
      + <%= f.text_field :keywords %> +
      +
      - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - + +
      + +
      + <%= f.text_field :pages %> +
      +
      + + +
      + +
      + <%= f.text_field :isbn %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_book.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_book.English") %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@writing_book) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :paper_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_book.paper_title"), value: (@writing_book.paper_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :book_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_book.book_title"), value: (@writing_book.book_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :extracted_chapters_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_book.extracted_chapters"), value: (@writing_book.extracted_chapters_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :publisher_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_book.publisher"), value: (@writing_book.publisher_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :editor_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_book.editor"), value: (@writing_book.editor_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :authors_translations do |f| %> + <%= f.text_area locale, rows: 2, class: "input-block-level", value: (@writing_book.authors_translations[locale] rescue nil) %> + <% end %> +
      +
      + + + +
      + + <% end %> + + +
      + +
      + + + <% if @writing_book && !@writing_book.writing_book_files.blank? %> +
      + <% @writing_book.writing_book_files.each_with_index do |writing_book_file, i| %> + <%= f.fields_for :writing_book_files, writing_book_file do |f| %> + <%= render :partial => 'form_file', :object => writing_book_file, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> +
      +
      + <% end %> + + +
      +
      +

      + <%= hidden_field_tag 'plugin_file_field_count', @writing_book.writing_book_files.count %> + <%= t(:add) %> +

      + +
      +
      + + + + +
      + + + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - + <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb index a91d6a85..fa9848e5 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_form_file.html.erb @@ -1,50 +1,45 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
      -
      - <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
      -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
      - -
      - <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
      -
      - <% end %> - -
      - - <% end %> - -
      - - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - +<% if form_file.new_record? %> +
      +<% else %> +
      + <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
      + + + + <% @site_valid_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb index d5bfa6d9..af5afc72 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_writing_book.html.erb @@ -1,9 +1,4 @@ - - <% if (writing_book.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', writing_book.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= writing_book.year %> <%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %> diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb index faed0f6d..697bca05 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/edit.html.erb @@ -9,8 +9,8 @@
      -

      <%= t('personal_book.editing_personal_book') %>

      - -<%= form_for @writing_book, :url => panel_personal_book_back_end_writing_book_path(@writing_book), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @writing_book, url: panel_personal_book_back_end_writing_book_path(@writing_book), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb index d8537a9e..7a91d6b0 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/index.html.erb @@ -13,10 +13,9 @@ - - - - + + + @@ -24,10 +23,13 @@
      <%= t("personal_book.year") %><%= t("personal_book.book_title") %><%= t("personal_plugins.author") %>
      -
      +
      +
      <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_book_back_end_writing_book_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      +
      + diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb index af352ea5..b72d110f 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/new.html.erb @@ -7,16 +7,10 @@ <%= render :partial => 'admin/plugins/plugin_list' %> -
      - -<%= flash_messages %> - -
      -

      <%= t('writing_book.new_personal_book') %>

      -<%= form_for @writing_book, :url => panel_personal_book_back_end_writing_books_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> +
      +<%= form_for @writing_book, url: panel_personal_book_back_end_writing_books_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb index 8d556a6c..5ba71a48 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/writing_book_setting.html.erb @@ -15,7 +15,7 @@

      <%= t('add')%> - 論文型態 + <%= t("personal_book.book_paper_type") %>

      @@ -41,7 +41,7 @@

      <%= t('add')%> - 作者型態 + <%= t("personal_book.author_type") %>

      diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb index c408c9c7..451ca3ca 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/front_end/_profile.html.erb @@ -1,42 +1,50 @@ <% if @member - @writing_books = WritingBook.where(:create_user_id => @member.id).desc(:year) - else - @writing_books = WritingBook.all.desc(:year) - end + @writing_books = WritingBook.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + + @writing_book_intro = !PersonalBookIntro.where(:user_id => @member.id).blank? ? PersonalBookIntro.where(:user_id => @member.id).first : PersonalBookIntro.new %> -<% if !@writing_books.blank? %> + <% if @writing_book_intro.brief_intro and !@writing_book_intro.blank? %> - - - - - - - - - - - <% @writing_books.each do |writing_book| %> - - - - - - - - <% end %> +
      + <%= @writing_book_intro.text.html_safe rescue '' %> +
      - -
      <%= t('personal_book.year') %><%= t('personal_book.book_title') %><%= t('personal_book.authors') %>
      <%= writing_book.year %> - <%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %> - <%= writing_book.authors %>
      + <% end %> + <% if ( !@writing_book_intro.blank? and @writing_book_intro.complete_list ) or @writing_book_intro.blank? %> -<% else %> + <% if !@writing_books.blank? %> - <%= t('nothing')%> + + + + + + + + + + + <% @writing_books.each do |writing_book| %> + + + + + + + + <% end %> + + +
      <%= t('personal_book.year') %><%= t('personal_book.book_title') %><%= t('personal_book.authors') %>
      <%= writing_book.year %> + <%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %> + <%= writing_book.authors %>
      + + <% end %> + + <% end %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb index 9a4674c2..d9df9f31 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,17 +24,29 @@ end - if @user - @writing_books = WritingBook.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @writing_books = WritingBook.where(:create_user_id => @user.id).desc(:year).page(params[:page]).per(10) else - @writing_books = WritingBook.all.page(params[:page]).per(10) + @writing_books = WritingBook.where(is_hidden: false, :create_user_id => @user.id).desc(:year).page(params[:page]).per(10) end %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_book_back_end_writing_books_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_book_back_end_writing_books_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -36,7 +55,12 @@ <% @writing_books.each do |writing_book| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_book.year') %> <%= t('personal_book.book_title') %>
      + <%= check_box_tag 'to_change[]', writing_book.id.to_s, false, :class => "list-check" %> + <%= writing_book.year %> <%= link_to writing_book.create_link, panel_personal_book_front_end_writing_book_path(writing_book) %> @@ -48,11 +72,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_book_back_end_personal_book_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_book_back_end_writing_book_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      -
      \ No newline at end of file +
      +<% end %> + + diff --git a/vendor/built_in_modules/personal_book/config/routes.rb b/vendor/built_in_modules/personal_book/config/routes.rb index 3ce4b034..ba824826 100644 --- a/vendor/built_in_modules/personal_book/config/routes.rb +++ b/vendor/built_in_modules/personal_book/config/routes.rb @@ -9,10 +9,13 @@ Rails.application.routes.draw do namespace :back_end do match 'writing_book_setting' => "writing_books#writing_book_setting" ,:as => :writing_book_setting + + # match 'writing_book_intro' => "writing_books#writing_book_intro" ,:as => :writing_book_intro resources :writing_books do collection do get 'delete' + get 'data_share' end match "author_type_quick_add" => "writing_books#author_type_quick_add" ,:as => :author_type_quick_add @@ -21,8 +24,10 @@ Rails.application.routes.draw do match "paper_type_quick_add" => "writing_books#paper_type_quick_add" ,:as => :paper_type_quick_add match "paper_type_quick_edit" => "writing_books#paper_type_quick_edit" ,:as => :paper_type_quick_edit end - resources :book_paper_types - resources :book_author_types + + resources :personal_book_intros + resources :book_paper_types + resources :book_author_types resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_book/init.rb b/vendor/built_in_modules/personal_book/init.rb index 8c9d8493..1344198b 100644 --- a/vendor/built_in_modules/personal_book/init.rb +++ b/vendor/built_in_modules/personal_book/init.rb @@ -2,7 +2,7 @@ module PersonalBook OrbitApp.registration "PersonalBook",:type=> 'ModuleApp' do module_label 'module_name.personal_book' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_book/plugin/profile",:front_path=>"panel/personal_book/front_end/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book' + personal_plugin :enable => true, :app_name=>"WritingBook", :intro_app_name=>"PersonalBookIntro",:path=>"panel/personal_book/plugin/profile",:front_path=>"panel/personal_book/front_end/profile",:admin_path=>"/panel/personal_book/back_end/writing_books",:i18n=>'module_name.personal_book' diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/personal_conference_intros_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/personal_conference_intros_controller.rb new file mode 100644 index 00000000..bb7b75e9 --- /dev/null +++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/personal_conference_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalConference::BackEnd::PersonalConferenceIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_conference_intro' + @app_type_name = 'personal_conference' + @reback_name = 'WritingConference' + end + +end diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb index 20f587d7..a6ae1f9f 100644 --- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb +++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/writing_conferences_controller.rb @@ -9,43 +9,19 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa end def index - - get_plugins + get_plugins - get_categorys("ConferencePaperType",params[:conference_paper_type_id]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - @paper_types = ConferencePaperType.all - @paper_type_ids = @paper_types.collect{|t| t.id.to_s} + [nil] - - - # @writing_conferences = WritingConference.search(params[:category_id]) - #@writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_conferences : WritingConference.all.page(params[:page]).per(10) - - @writing_conferences = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_conference",:conference_paper_type_id.in => @paper_type_ids) : get_viewable("writing_conference",:conference_paper_type_id.in => @paper_type_ids) - @conferences = @writing_conferences.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @paper_type_ids = ConferencePaperType.all.collect{|t| t.id.to_s} + [nil] + @writing_conferences = get_sorted_and_filtered("writing_conference", :conference_paper_type_id.in => @paper_type_ids) respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @writing_conferences } - format.js end end @@ -59,10 +35,10 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa @tags = get_tags @set_author_type = ConferenceAuthorType.new(:display => 'List') - @author_type_url = panel_personal_conference_back_end_writing_conferences_path + @author_type_url = panel_personal_conference_back_end_writing_conferences_path @set_paper_type = ConferencePaperType.new(:display => 'List') - @paper_type_url = panel_personal_conference_back_end_writing_conferences_path + @paper_type_url = panel_personal_conference_back_end_writing_conferences_path end @@ -181,25 +157,25 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa # @paper_types = ConferenceLevelType.all @author_types = ConferenceAuthorType.all @paper_types = ConferencePaperType.all - @tags = get_tags + @tags = get_tags @writing_conference = WritingConference.new(params[:writing_conference]) - if params[:writing_conference][:user_id] + if params[:writing_conference][:user_id] @writing_conference.create_user_id = params[:writing_conference][:user_id] @writing_conference.update_user_id = params[:writing_conference][:user_id] else - @writing_conference.create_user_id = current_user.id + @writing_conference.create_user_id = current_user.id @writing_conference.update_user_id = current_user.id end respond_to do |format| if @writing_conference.save - if params[:writing_conference][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_conference][:user_id],:show_plugin_profile=>'Conference')) } + if params[:writing_conference][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_conference][:user_id],:show_plugin_profile=>'WritingConference')) } else - format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) } + format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) } end format.xml { render :xml => @writing_conference, :status => :created, :location => @writing_conference } @@ -242,23 +218,24 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa else - @writing_conference = WritingConference.find(params[:id]) + @writing_conference = WritingConference.find(params[:id]) + + @writing_conference.update_user_id = current_user.id - @writing_conference.update_user_id = current_user.id - - params[:writing_conference][:tag_ids] ||=[] + params[:writing_conference][:tag_ids] ||=[] - respond_to do |format| - if @writing_conference.update_attributes(params[:writing_conference]) - format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) } - # format.js { render 'toggle_enable' } - format.xml { head :ok } - else - format.html { render :action => "edit" } - format.xml { render :xml => @writing_conference.errors, :status => :unprocessable_entity } + respond_to do |format| + if @writing_conference.update_attributes(params[:writing_conference]) + format.html { redirect_to(panel_personal_conference_back_end_writing_conferences_url) } + # format.js { render 'toggle_enable' } + format.xml { head :ok } + else + format.html { render :action => "edit" } + format.xml { render :xml => @writing_conference.errors, :status => :unprocessable_entity } + end end + end - end end @@ -281,6 +258,30 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa end redirect_to panel_personal_conference_back_end_writing_conferences_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @writing_conferences = WritingConference.any_in(:_id => params[:ids]) + + @writing_conferences.each do |writing_conference| + + writing_conference.is_hidden = params[:disable] + + writing_conference.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingConference")) } + + end + + end + protected diff --git a/vendor/built_in_modules/personal_conference/app/models/personal_conference_intro.rb b/vendor/built_in_modules/personal_conference/app/models/personal_conference_intro.rb new file mode 100644 index 00000000..b977dfc1 --- /dev/null +++ b/vendor/built_in_modules/personal_conference/app/models/personal_conference_intro.rb @@ -0,0 +1,4 @@ +class PersonalConferenceIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb index 5c6a31dc..eee673a3 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form.html.erb @@ -1,258 +1,333 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      <%= f.label :paper_type ,t("personal_conference.paper_type")%>

      -
      - <% @paper_types.each do |paper_type| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_conference[conference_paper_type_ids][]', paper_type.id, @writing_conference.conference_paper_type_ids.include?(paper_type.id)%> - <%= paper_type.title %> - <%= hidden_field_tag 'writing_conference[conference_paper_type_ids][]', '' %> - <% end %> - <% end %> -
      -
      + +
      <%= t(:module) %>
      + -
      -
      - -
      -

      <%= f.label :author_type ,t("personal_conference.author_type")%>

      -
      - <% @author_types.each do |author_type| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_conference[conference_author_type_ids][]', author_type.id, @writing_conference.conference_author_type_ids.include?(author_type.id)%> - <%= author_type.title %> - <%= hidden_field_tag 'writing_conference[conference_author_type_ids][]', '' %> - <% end %> - <% end %> -
      -
      - + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_conference[tag_ids][]', tag.id, @writing_conference.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'writing_conference[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :year ,t("personal_conference.year")%> - <%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]'} ) %> -
      - - - -
      - <%= f.label :period_start_date ,t("personal_conference.period_start_date")%> - <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> -
      - -
      - <%= f.label :period_end_date ,t("personal_conference.period_end_date")%> - <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> -
      - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> -
      - <%= f.label :paper_title ,t("personal_conference.paper_title")%> - <%= f.fields_for :paper_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_conference.paper_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :conference_title ,t("personal_conference.conference_title")%> - <%= f.fields_for :conference_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_conference.conference_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :location ,t("personal_conference.location")%> - <%= f.fields_for :location_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_conference.location_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :sponsor ,t("personal_conference.sponsor")%> - <%= f.fields_for :sponsor_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_conference.sponsor_translations[locale] rescue nil) %> - <% end %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :authors,t("web_resource.authors") %> - <%= f.fields_for :authors_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :size => "60x3", :value => (@writing_conference.authors_translations[locale] rescue nil) %> - <% end %> -
      - -
      + <% end %> - <% end %> - -
      - -
      - <%= f.label :publication_date ,t("personal_conference.publication_date")%> - <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month, :day] }, {:class => 'span1'} %> -
      + +
      + +
      + <% @paper_types.each do |paper_type| %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'writing_conference[conference_paper_type_ids][]', paper_type.id, @writing_conference.conference_paper_type_ids.include?(paper_type.id)%> + <%= paper_type.title %> + <%= hidden_field_tag 'writing_conference[conference_paper_type_ids][]', '' %> + <% end %> + <% end %> +
      +
      -
      - <%= f.label :url, t("personal_conference.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_conference.keywords") %> - <%= f.text_field :keywords %> -
      + +
      + +
      + <% @author_types.each do |author_type| %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'writing_conference[conference_author_type_ids][]', author_type.id, @writing_conference.conference_author_type_ids.include?(author_type.id)%> + <%= author_type.title %> + <%= hidden_field_tag 'writing_conference[conference_author_type_ids][]', '' %> + <% end %> + <% end %> +
      +
      -
      - <%= f.label :abstract, t("personal_conference.abstract") %> - <%= f.text_field :abstract %> -
      + +
      + +
      + <%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]',:class => 'span1'} ) %> +
      +
      -
      - <%= f.label :language, t("personal_journal.language") %> - <%= f.select :language, WritingConference::LANGUAGE_TYPES, :prompt => 'Select' %> -
      + +
      + +
      + <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month, :day] }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.text_field :abstract %> +
      +
      + + +
      + +
      + <%= f.select :language, WritingConference::LANGUAGE_TYPES, :prompt => 'Select' %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@writing_conference) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :paper_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_conference.paper_title"), value: (@writing_conference.paper_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :conference_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_conference.conference_title"), value: (@writing_conference.conference_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :location_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_conference.location"), value: (@writing_conference.location_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :sponsor_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_conference.sponsor"), value: (@writing_conference.sponsor_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :authors_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_conference.authors"), value: (@writing_conference.authors_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + + <% end %> + + +
      + +
      + + + <% if @writing_conference && !@writing_conference.writing_conference_files.blank? %> +
      + <% @writing_conference.writing_conference_files.each_with_index do |archive_file_multiple, i| %> + <%= f.fields_for :writing_conference_files, archive_file_multiple do |f| %> + <%= render :partial => 'form_file', :object => archive_file_multiple, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> +
      +
      + <% end %> + + +
      +
      +

      + <%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %> + <%= t(:add) %> +

      + +
      +
      +
      + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      -
      - <%= f.label :note, t("personal_conference.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - - - - -
      - -
      - - - - - - - - - - - - - - - - - - <% @writing_conference.writing_conference_files.each_with_index do |writing_conference_file, i| %> - <%= f.fields_for :writing_conference_files, writing_conference_file do |f| %> - <%= render :partial => 'form_file', :object => writing_conference_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
      FileFile Name
      -
      - <%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %> - ADD/新增 -
      -
      - -
      - -
      - - - - - - -
      - - - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - + <% end %> + + + diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb index a91d6a85..fa9848e5 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_form_file.html.erb @@ -1,50 +1,45 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
      -
      - <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
      -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
      - -
      - <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
      -
      - <% end %> - -
      - - <% end %> - -
      - - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - +<% if form_file.new_record? %> +
      +<% else %> +
      + <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
      + + + + <% @site_valid_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_writing_conference.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_writing_conference.html.erb index 3f884496..efd509f5 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_writing_conference.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/_writing_conference.html.erb @@ -1,9 +1,4 @@ - - <% if (writing_conference.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', writing_conference.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= writing_conference.year %> <%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %> diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb index d40d7ae6..b8cfcd6c 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_conference.editing_personal_conference') %>

      - -<%= form_for @writing_conference, :url => panel_personal_conference_back_end_writing_conference_path(@writing_conference), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @writing_conference, url: panel_personal_conference_back_end_writing_conference_path(@writing_conference), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb index 5b9aad5c..a36d4a8c 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/index.html.erb @@ -13,10 +13,9 @@ - - - - + + + @@ -24,10 +23,12 @@
      <%= t("personal_book.year") %><%= t("module_name.personal_conference") %><%= t("personal_plugins.author") %>
      -
      +
      +
      <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_conference_back_end_writing_conference_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      +
      diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb index f2664a90..7938562f 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/new.html.erb @@ -8,14 +8,8 @@
      -<%= flash_messages %> - -
      -

      <%= t('writing_conference.new_personal_conference') %>

      -<%= form_for @writing_conference, :url => panel_personal_conference_back_end_writing_conferences_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> - +<%= form_for @writing_conference, url: panel_personal_conference_back_end_writing_conferences_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb index 7e86f073..84c11072 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/back_end/writing_conferences/writing_conference_setting.html.erb @@ -15,7 +15,7 @@

      <%= t('add')%> - 論文型態 + <%= t("personal_conference.paper_type") %>

      @@ -41,7 +41,7 @@

      <%= t('add')%> - 作者型態 + <%= t("personal_conference.author_type") %>

      diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb index b50d81ed..e7fde716 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/front_end/_profile.html.erb @@ -1,42 +1,50 @@ <% if @member - @writing_conferences = WritingConference.where(:create_user_id => @member.id).desc(:year) - else - @writing_conferences = WritingConference.all.desc(:year) - end + @writing_conferences = WritingConference.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + + @writing_conference_intro = !PersonalConferenceIntro.where(:user_id => @member.id).blank? ? PersonalConferenceIntro.where(:user_id => @member.id).first : PersonalConferenceIntro.new %> -<% if !@writing_conferences.blank? %> + <% if @writing_conference_intro.brief_intro and !@writing_conference_intro.blank? %> - - - - - - - - - - - <% @writing_conferences.each do |writing_conference| %> - - - - - - - - <% end %> +
      + <%= @writing_conference_intro.text.html_safe rescue '' %> +
      - -
      <%= t('personal_conference.year') %><%= t('module_name.personal_conference') %><%= t('personal_conference.authors') %>
      <%= writing_conference.year %> - <%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %> - <%= writing_conference.authors %>
      + <% end %> + <% if ( !@writing_conference_intro.blank? and @writing_conference_intro.complete_list ) or @writing_conference_intro.blank? %> -<% else %> + <% if !@writing_conferences.blank? %> - <%= t('nothing')%> + + + + + + + + + + + <% @writing_conferences.each do |writing_conference| %> + + + + + + + + <% end %> + + +
      <%= t('personal_conference.year') %><%= t('module_name.personal_conference') %><%= t('personal_conference.authors') %>
      <%= writing_conference.year %> + <%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %> + <%= writing_conference.authors %>
      + + <% end %> + + <% end %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb index 367ab55a..081a3c58 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,18 +24,29 @@ end - if @user - @writing_conferences = WritingConference.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @writing_conferences = WritingConference.where(:create_user_id => @user.id).desc(:year).page(params[:page]).per(10) else - @writing_conferences = WritingConference.all.page(params[:page]).per(10) + @writing_conferences = WritingConference.where(is_hidden: false, :create_user_id => @user.id).desc(:year).page(params[:page]).per(10) end - - + %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_conference_back_end_writing_conferences_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_conference_back_end_writing_conferences_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -37,7 +55,12 @@ <% @writing_conferences.each do |writing_conference| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_conference.year') %> <%= t('module_name.personal_conference') %>
      + <%= check_box_tag 'to_change[]', writing_conference.id.to_s, false, :class => "list-check" %> + <%= writing_conference.year %> <%= link_to writing_conference.create_link, panel_personal_conference_front_end_writing_conference_path(writing_conference) %> @@ -49,11 +72,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_conference_back_end_personal_conference_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_conference_back_end_writing_conference_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +<% end %> + + diff --git a/vendor/built_in_modules/personal_conference/config/locales/en.yml b/vendor/built_in_modules/personal_conference/config/locales/en.yml index a1792eda..5e2ee524 100644 --- a/vendor/built_in_modules/personal_conference/config/locales/en.yml +++ b/vendor/built_in_modules/personal_conference/config/locales/en.yml @@ -1,7 +1,7 @@ en: module_name: - personal_conference: Conference + personal_conference: Conference Paper personal_conference: year : "Year" diff --git a/vendor/built_in_modules/personal_conference/config/routes.rb b/vendor/built_in_modules/personal_conference/config/routes.rb index bf6466b7..f4185c07 100644 --- a/vendor/built_in_modules/personal_conference/config/routes.rb +++ b/vendor/built_in_modules/personal_conference/config/routes.rb @@ -14,12 +14,14 @@ Rails.application.routes.draw do resources :writing_conferences do collection do get 'delete' + get 'data_share' end match "author_type_quick_add" => "writing_conferences#author_type_quick_add" ,:as => :author_type_quick_add match "author_type_quick_edit" => "writing_conferences#author_type_quick_edit" ,:as => :author_type_quick_edit match "paper_type_quick_add" => "writing_conferences#paper_type_quick_add" ,:as => :paper_type_quick_add match "paper_type_quick_edit" => "writing_conferences#paper_type_quick_edit" ,:as => :paper_type_quick_edit end + resources :personal_conference_intros resources :conference_paper_types resources :conference_author_types # resources :conference_level_types diff --git a/vendor/built_in_modules/personal_conference/init.rb b/vendor/built_in_modules/personal_conference/init.rb index 6e5de97d..1bbf7c6d 100644 --- a/vendor/built_in_modules/personal_conference/init.rb +++ b/vendor/built_in_modules/personal_conference/init.rb @@ -2,7 +2,7 @@ module PersonalConference OrbitApp.registration "PersonalConference",:type=> 'ModuleApp' do module_label 'module_name.personal_conference' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_conference/plugin/profile",:front_path=>"panel/personal_conference/front_end/profile",:admin_path=>"/panel/personal_conference/back_end/writing_conferences",:i18n=>'module_name.personal_conference' + personal_plugin :enable => true, :app_name=>"WritingConference", :intro_app_name=>"PersonalConferenceIntro",:path=>"panel/personal_conference/plugin/profile",:front_path=>"panel/personal_conference/front_end/profile",:admin_path=>"/panel/personal_conference/back_end/writing_conferences",:i18n=>'module_name.personal_conference' diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb index 8350641e..cfbaae98 100644 --- a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb +++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/diplomas_controller.rb @@ -3,38 +3,20 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll include OrbitControllerLib::DivisionForDisable before_filter :authenticate_user! - + def index - - get_plugins - - @filter = params[:filter] - new_filter = params[:new_filter] + get_plugins - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - - @diplomas = (params[:sort] || @filter) ? get_sorted_and_filtered("diploma") : get_viewable("diploma") - @diplomas_page = @diplomas.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @diplomas = get_sorted_and_filtered("diploma") respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @diplomas } - format.js end end @@ -86,25 +68,25 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll # POST /diplomas.xml def create - @tags = get_tags + @tags = get_tags @diploma = Diploma.new(params[:diploma]) - if params[:diploma][:user_id] + if params[:diploma][:user_id] @diploma.create_user_id = params[:diploma][:user_id] @diploma.update_user_id = params[:diploma][:user_id] else - @diploma.create_user_id = current_user.id + @diploma.create_user_id = current_user.id @diploma.update_user_id = current_user.id end respond_to do |format| if @diploma.save - if params[:diploma][:user_id] + if params[:diploma][:user_id] format.html { redirect_to(admin_users_new_interface_url(:id=>params[:diploma][:user_id],:show_plugin_profile=>'Diploma')) } else - format.html { redirect_to(panel_personal_diploma_back_end_diplomas_url) } + format.html { redirect_to(panel_personal_diploma_back_end_diplomas_url) } end format.xml { render :xml => @diploma, :status => :created, :location => @diploma } @@ -113,6 +95,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll format.xml { render :xml => @diploma.errors, :status => :unprocessable_entity } end end + end # PUT /diplomas/1 @@ -123,18 +106,19 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll @diploma.update_user_id = current_user.id - params[:diploma][:tag_ids] ||=[] + params[:diploma][:tag_ids] ||=[] respond_to do |format| if @diploma.update_attributes(params[:diploma]) format.html { redirect_to(panel_personal_diploma_back_end_diplomas_url) } - # format.js { render 'toggle_enable' } + # format.js { render 'toggle_enable' } format.xml { head :ok } else format.html { render :action => "edit" } format.xml { render :xml => @diploma.errors, :status => :unprocessable_entity } end end + end # DELETE /diplomas/1 @@ -156,6 +140,29 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll end redirect_to panel_personal_diploma_back_end_diplomas_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @diplomas = Diploma.any_in(:_id => params[:ids]) + + @diplomas.each do |diploma| + + diploma.is_hidden = params[:disable] + + diploma.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Diploma")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/personal_diploma_intros_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/personal_diploma_intros_controller.rb new file mode 100644 index 00000000..22b85034 --- /dev/null +++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/personal_diploma_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalDiploma::BackEnd::PersonalDiplomaIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_diploma_intro' + @app_type_name = 'personal_diploma' + @reback_name = 'Diploma' + end + +end diff --git a/vendor/built_in_modules/personal_diploma/app/models/personal_diploma_intro.rb b/vendor/built_in_modules/personal_diploma/app/models/personal_diploma_intro.rb new file mode 100644 index 00000000..be90da99 --- /dev/null +++ b/vendor/built_in_modules/personal_diploma/app/models/personal_diploma_intro.rb @@ -0,0 +1,4 @@ +class PersonalDiplomaIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb index c0141009..bcba7536 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_diploma.html.erb @@ -1,9 +1,4 @@ - - <% if (diploma.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', diploma.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %> <%= diploma.school_name %> diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb index 4335e9c2..f147f4d7 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/_form.html.erb @@ -1,136 +1,210 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'diploma[tag_ids][]', tag.id, @diploma.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'diploma[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      <%= t(:module) %>
      + -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :start_date ,t("personal_diploma.start_date")%> - <%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      - -
      - <%= f.label :end_date ,t("personal_diploma.end_date")%> - <%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - -
      - <%= f.label :school_name ,t("personal_diploma.school_name")%> - <%= f.fields_for :school_name_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@diploma.school_name_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :country ,t("personal_diploma.country")%> - <%= f.fields_for :country_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@diploma.country_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :department ,t("personal_diploma.department")%> - <%= f.fields_for :department_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@diploma.department_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :degree ,t("personal_diploma.degree")%> - <%= f.fields_for :degree_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@diploma.degree_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      - <% end %> - -
      + +
      -
      - <%= f.label :url, t("personal_diploma.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_diploma.keywords") %> - <%= f.text_field :keywords %> -
      - -
      - <%= f.label :language, t("personal_diploma.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_diploma.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_diploma.English") %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :note, t("personal_diploma.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - -
      - - + <% end %> - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      \ No newline at end of file + +
      + +
      + <%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_diploma.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_diploma.English") %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@diploma) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :school_name_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_diploma.school_name"), value: (@diploma.school_name_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :country_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_diploma.country"), value: (@diploma.country_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :department_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_diploma.department"), value: (@diploma.department_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :degree_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_diploma.degree"), value: (@diploma.degree_translations[locale] rescue nil) %> + <% end %> +
      +
      + +
      + + <% end %> + +
      + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/edit.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/edit.html.erb index d4c1224f..146d940f 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/edit.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/edit.html.erb @@ -1,12 +1,15 @@ - <% content_for :side_bar do %> <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %> <% end %> +
      + <%= render :partial => 'admin/plugins/plugin_list' %> -

      <%= t('personal_diploma.editing_personal_diploma') %>

      +
      -<%= form_for @diploma, :url => panel_personal_diploma_back_end_diploma_path(@diploma), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @diploma, url: panel_personal_diploma_back_end_diploma_path(@diploma), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/index.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/index.html.erb index 4f400180..a06b6ed6 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/index.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/index.html.erb @@ -13,10 +13,9 @@ - - - - + + + @@ -24,10 +23,12 @@
      <%= t('date_') %><%= t('personal_diploma.school_name') %><%= t("personal_plugins.author") %>
      -
      +
      +
      <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_diploma_back_end_diploma_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_diploma_back_end_diploma_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @diplomas_page, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      +
      diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/new.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/new.html.erb index ef4e0070..4c319168 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/new.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/back_end/diplomas/new.html.erb @@ -1,18 +1,15 @@ - <% content_for :side_bar do %> <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:user), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %> <% end %> +
      + <%= render :partial => 'admin/plugins/plugin_list' %> -<%= flash_messages %> - -
      -

      <%= t('diploma.new_personal_diploma') %>

      -<%= form_for @diploma, :url => panel_personal_diploma_back_end_diplomas_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %>
      -<%#= link_back %> - +<%= form_for @diploma, url: panel_personal_diploma_back_end_diplomas_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/front_end/_profile.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/front_end/_profile.html.erb index 4fc4cc7f..ebb10c20 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/front_end/_profile.html.erb @@ -1,38 +1,48 @@ <% if @member - @diplomas = Diploma.where(:create_user_id => @member.id).desc(:start_date) - else - @diplomas = Diploma.all.desc(:start_date) - end + + @diplomas = Diploma.where(is_hidden: false, :create_user_id => @member.id).desc(:start_date) + + @diploma_intro = !PersonalDiplomaIntro.where(:user_id => @member.id).blank? ? PersonalDiplomaIntro.where(:user_id => @member.id).first : PersonalDiplomaIntro.new %> - -<% if !@diplomas.blank? %> - - - - - - - - - - <% @diplomas.each do |diploma| %> - - - - - - - <% end %> + <% if @diploma_intro.brief_intro and !@diploma_intro.blank? %> - -
      <%= t('date_') %><%= t('personal_diploma.school_name') %>
      <%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %> - <%= link_to diploma.school_name, panel_personal_diploma_front_end_diploma_path(diploma) %> -
      +
      + <%= @diploma_intro.text.html_safe rescue '' %> +
      -<% else %> + <% end %> - <%= t('nothing')%> + <% if ( !@diploma_intro.blank? and @diploma_intro.complete_list ) or @diploma_intro.blank? %> + + <% if !@diplomas.blank? %> + + + + + + + + + + + <% @diplomas.each do |diploma| %> + + + + + + + <% end %> + + +
      <%= t('date_') %><%= t('personal_diploma.school_name') %>
      <%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %> + <%= link_to diploma.school_name, panel_personal_diploma_front_end_diploma_path(diploma) %> +
      + + <% end %> + + <% end %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/_profile.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/_profile.html.erb index 4773de7a..edae638a 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,17 +24,29 @@ end - if @user - @diplomas = Diploma.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @diplomas = Diploma.where(:create_user_id => @user.id).desc(:start_date).page(params[:page]).per(10) else - @diplomas = Diploma.all.page(params[:page]).per(10) + @diplomas = Diploma.where(is_hidden: false, :create_user_id => @user.id).desc(:start_date).page(params[:page]).per(10) end %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_diploma_back_end_diplomas_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_diploma_back_end_diplomas_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -36,7 +55,12 @@ <% @diplomas.each do |diploma| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('date_') %> <%= t('personal_diploma.school_name') %>
      + <%= check_box_tag 'to_change[]', diploma.id.to_s, false, :class => "list-check" %> + <%= diploma.start_date.strftime("%Y.%m") %> ~ <%= diploma.end_date.strftime("%Y.%m") %> <%= link_to diploma.school_name, panel_personal_diploma_front_end_diploma_path(diploma) %> @@ -48,11 +72,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_diploma_back_end_personal_diploma_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_diploma_back_end_diploma_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_diploma/config/routes.rb b/vendor/built_in_modules/personal_diploma/config/routes.rb index 667ec181..7dd03023 100644 --- a/vendor/built_in_modules/personal_diploma/config/routes.rb +++ b/vendor/built_in_modules/personal_diploma/config/routes.rb @@ -13,9 +13,11 @@ Rails.application.routes.draw do resources :diplomas do collection do get 'delete' + get 'data_share' end end + resources :personal_diploma_intros resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_diploma/init.rb b/vendor/built_in_modules/personal_diploma/init.rb index 8cd9f6c4..aef73f71 100644 --- a/vendor/built_in_modules/personal_diploma/init.rb +++ b/vendor/built_in_modules/personal_diploma/init.rb @@ -2,7 +2,7 @@ module PersonalDiploma OrbitApp.registration "PersonalDiploma",:type=> 'ModuleApp' do module_label 'module_name.personal_diploma' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_diploma/plugin/profile",:front_path=>"panel/personal_diploma/front_end/profile",:admin_path=>"/panel/personal_diploma/back_end/diplomas",:i18n=>'module_name.personal_diploma' + personal_plugin :enable => true, :app_name=>"Diploma", :intro_app_name=>"PersonalDiplomaIntro",:path=>"panel/personal_diploma/plugin/profile",:front_path=>"panel/personal_diploma/front_end/profile",:admin_path=>"/panel/personal_diploma/back_end/diplomas",:i18n=>'module_name.personal_diploma' diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb index 079aab19..fd2470ac 100644 --- a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb +++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/experiences_controller.rb @@ -10,40 +10,19 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo end def index - - get_plugins + get_plugins - get_categorys("ExperienceCategory",params[:experience_category_ids]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - @experience_categorys = get_categories_for_index("ExperienceCategory") - @experience_category_ids = @experience_categorys.collect{|t| t.id.to_s} + [nil] - - - @experiences = (params[:sort] || @filter) ? get_sorted_and_filtered("experience",:experience_category_id.in => @experience_category_ids) : get_viewable("experience",:experience_category_id.in => @experience_category_ids) - @experience_pages = @experiences.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @experience_category_ids = ExperienceCategory.all.collect{|t| t.id.to_s} + [nil] + @experiences = get_sorted_and_filtered("experience", :experience_category_id.in => @experience_category_ids) respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @experiences } - format.js end end @@ -56,7 +35,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo @tags = get_tags @set_experience_type = ExperienceCategory.new(:display => 'List') - @experience_type_url = panel_personal_experience_back_end_experiences_path + @experience_type_url = panel_personal_experience_back_end_experiences_path end @@ -138,25 +117,25 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo else @experience_types = ExperienceCategory.all - @tags = get_tags + @tags = get_tags @experience = Experience.new(params[:experience]) - if params[:experience][:user_id] + if params[:experience][:user_id] @experience.create_user_id = params[:experience][:user_id] @experience.update_user_id = params[:experience][:user_id] else - @experience.create_user_id = current_user.id + @experience.create_user_id = current_user.id @experience.update_user_id = current_user.id end respond_to do |format| if @experience.save - if params[:experience][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:experience][:user_id],:show_plugin_profile=>'Experience')) } + if params[:experience][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:experience][:user_id],:show_plugin_profile=>"Experience")) } else - format.html { redirect_to(panel_personal_experience_back_end_experiences_url) } + format.html { redirect_to(panel_personal_experience_back_end_experiences_url) } end format.xml { render :xml => @experience, :status => :created, :location => @experience } @@ -191,18 +170,19 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo @experience.update_user_id = current_user.id - params[:experience][:tag_ids] ||=[] + params[:experience][:tag_ids] ||=[] respond_to do |format| if @experience.update_attributes(params[:experience]) format.html { redirect_to(panel_personal_experience_back_end_experiences_url) } - # format.js { render 'toggle_enable' } + # format.js { render 'toggle_enable' } format.xml { head :ok } else format.html { render :action => "edit" } format.xml { render :xml => @experience.errors, :status => :unprocessable_entity } end end + end end @@ -226,6 +206,29 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo end redirect_to panel_personal_experience_back_end_experiences_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @experiences = Experience.any_in(:_id => params[:ids]) + + @experiences.each do |experience| + + experience.is_hidden = params[:disable] + + experience.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Experience")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/personal_experience_intros_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/personal_experience_intros_controller.rb new file mode 100644 index 00000000..0e4e3def --- /dev/null +++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/personal_experience_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalExperience::BackEnd::PersonalExperienceIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_experience_intro' + @app_type_name = 'personal_experience' + @reback_name = 'Experience' + end + +end diff --git a/vendor/built_in_modules/personal_experience/app/models/personal_experience_intro.rb b/vendor/built_in_modules/personal_experience/app/models/personal_experience_intro.rb new file mode 100644 index 00000000..ce41eba6 --- /dev/null +++ b/vendor/built_in_modules/personal_experience/app/models/personal_experience_intro.rb @@ -0,0 +1,4 @@ +class PersonalExperienceIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience.html.erb index be437c79..7cb777e7 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_experience.html.erb @@ -1,9 +1,4 @@ - - <% if (experience.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', experience.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %> <%= experience.organizationt_title %> diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb index 3f8ec027..3c1e9e23 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_form.html.erb @@ -1,133 +1,208 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'experience[tag_ids][]', tag.id, @experience.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'experience[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      <%= t(:module) %>
      + -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :experience_category ,t("personal_experience.experience_category")%> - <%= f.select :experience_category_id, @experience_categorys.collect {|t| [ t.title, t.id ]} %> -
      - -
      - <%= f.label :start_date ,t("personal_experience.start_date")%> - <%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      - -
      - <%= f.label :end_date ,t("personal_experience.end_date")%> - <%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - -
      - <%= f.label :organizationt_title ,t("personal_experience.organizationt_title")%> - <%= f.fields_for :organizationt_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@experience.organizationt_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :department ,t("personal_experience.department")%> - <%= f.fields_for :department_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@experience.department_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :job_title ,t("personal_experience.job_title")%> - <%= f.fields_for :job_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@experience.job_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      - <% end %> - -
      + +
      -
      - <%= f.label :url, t("personal_experience.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_experience.keywords") %> - <%= f.text_field :keywords %> -
      - -
      - <%= f.label :language, t("personal_experience.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_experience.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_experience.English") %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :note, t("personal_experience.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - -
      - - + <% end %> - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      \ No newline at end of file + +
      + +
      + <%= f.select :experience_category_id, @experience_categorys.collect {|t| [ t.title, t.id ]} %> +
      +
      + + +
      + +
      + <%= f.date_select :start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.date_select :end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_experience.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_experience.English") %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@experience) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :organizationt_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_experience.organizationt_title"), value: (@experience.school_name_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :department_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_experience.department"), value: (@experience.department_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :job_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_experience.job_title"), value: (@experience.job_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + +
      + + <% end %> + +
      + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/edit.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/edit.html.erb index bd959934..140819bc 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/edit.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_experience.editing_personal_experience') %>

      - -<%= form_for @experience, :url => panel_personal_experience_back_end_experience_path(@experience), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @experience, url: panel_personal_experience_back_end_experience_path(@experience), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/experience_setting.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/experience_setting.html.erb index cc0e281e..2cd0fbe9 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/experience_setting.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/experience_setting.html.erb @@ -15,7 +15,7 @@

      <%= t('add')%> - 機關類別 + <%= t("personal_experience.experience_category") %>

      diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/index.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/index.html.erb index 71b7e97c..2b7c4b64 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/index.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/index.html.erb @@ -13,12 +13,11 @@ - - - - - - + + + + + @@ -26,10 +25,12 @@
      <%= t('date_') %><%= t('personal_experience.organizationt_title') %><%= t('personal_experience.department') %><%= t('personal_experience.job_title') %><%= t("personal_plugins.author") %>
      -
      +
      +
      <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_experience_back_end_experience_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_experience_back_end_experience_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @experience_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      +
      diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/new.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/new.html.erb index d3956e7e..547dc4d3 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/new.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/new.html.erb @@ -8,14 +8,8 @@
      -<%= flash_messages %> - -
      -

      <%= t('experience.new_personal_experience') %>

      -<%= form_for @experience, :url => panel_personal_experience_back_end_experiences_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> +<%= form_for @experience, url: panel_personal_experience_back_end_experiences_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      <% end %> -
      - -<%#= link_back %> - diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb index 9d85075d..68ec0e5c 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/front_end/_profile.html.erb @@ -1,38 +1,48 @@ <% if @member - @experiences = Experience.where(:create_user_id => @member.id).desc(:start_date) - else - @experiences = Experience.all.desc(:start_date) - end + + @experiences = Experience.where(is_hidden: false, :create_user_id => @member.id).desc(:start_date) + + @experience_intro = !PersonalExperienceIntro.where(:user_id => @member.id).blank? ? PersonalExperienceIntro.where(:user_id => @member.id).first : PersonalExperienceIntro.new %> - -<% if !@experiences.blank? %> - - - - - - - - - - <% @experiences.each do |experience| %> - - - - - - - <% end %> + <% if @experience_intro.brief_intro and !@experience_intro.blank? %> - -
      <%= t('date_') %><%= t('personal_experience.organizationt_title') %>
      <%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %> - <%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %> -
      +
      + <%= @experience_intro.text.html_safe rescue '' %> +
      -<% else %> + <% end %> - <%= t('nothing')%> + <% if ( !@experience_intro.blank? and @experience_intro.complete_list ) or @experience_intro.blank? %> + + <% if !@experiences.blank? %> + + + + + + + + + + + <% @experiences.each do |experience| %> + + + + + + + <% end %> + + +
      <%= t('date_') %><%= t('personal_experience.organizationt_title') %>
      <%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %> + <%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %> +
      + + <% end %> + + <% end %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/_profile.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/_profile.html.erb index 05e5353b..90da957b 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,18 +24,29 @@ end - if @user - @experiences = Experience.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @experiences = Experience.where(:create_user_id => @user.id).desc(:start_date).page(params[:page]).per(10) else - @experiences = Experience.all.page(params[:page]).per(10) + @experiences = Experience.where(is_hidden: false, :create_user_id => @user.id).desc(:start_date).page(params[:page]).per(10) end - %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_experience_back_end_experiences_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_experience_back_end_experiences_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -37,7 +55,12 @@ <% @experiences.each do |experience| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('date_') %> <%= t('personal_experience.organizationt_title') %>
      + <%= check_box_tag 'to_change[]', experience.id.to_s, false, :class => "list-check" %> + <%= experience.start_date.strftime("%Y.%m") %> ~ <%= experience.end_date.strftime("%Y.%m") %> <%= link_to experience.organizationt_title, panel_personal_experience_front_end_experience_path(experience) %> @@ -49,10 +72,24 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_experience_back_end_personal_experience_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_experience_back_end_experience_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_experience/config/routes.rb b/vendor/built_in_modules/personal_experience/config/routes.rb index 3cf82617..433d6270 100644 --- a/vendor/built_in_modules/personal_experience/config/routes.rb +++ b/vendor/built_in_modules/personal_experience/config/routes.rb @@ -13,12 +13,14 @@ Rails.application.routes.draw do resources :experiences do collection do get 'delete' + get 'data_share' end match "experience_category_quick_add" => "experiences#experience_category_quick_add" ,:as => :experience_category_quick_add match "experience_category_quick_edit" => "experiences#experience_category_quick_edit" ,:as => :experience_category_quick_edit end - resources :experience_categorys + resources :personal_experience_intros + resources :experience_categorys resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_experience/init.rb b/vendor/built_in_modules/personal_experience/init.rb index 148798bb..ad0a687d 100644 --- a/vendor/built_in_modules/personal_experience/init.rb +++ b/vendor/built_in_modules/personal_experience/init.rb @@ -2,7 +2,7 @@ module PersonalExperience OrbitApp.registration "PersonalExperience",:type=> 'ModuleApp' do module_label 'module_name.personal_experience' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_experience/plugin/profile",:front_path=>"panel/personal_experience/front_end/profile",:admin_path=>"/panel/personal_experience/back_end/experiences",:i18n=>'module_name.personal_experience' + personal_plugin :enable => true, :app_name=>"Experience", :intro_app_name=>"PersonalExperienceIntro",:path=>"panel/personal_experience/plugin/profile",:front_path=>"panel/personal_experience/front_end/profile",:admin_path=>"/panel/personal_experience/back_end/experiences",:i18n=>'module_name.personal_experience' diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb index 3bcf761c..210a2396 100644 --- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb +++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/honors_controller.rb @@ -9,40 +9,19 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController end def index - - get_plugins + get_plugins - get_categorys("HonorCategory",params[:honor_category_ids]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - @honor_categorys = get_categories_for_index("HonorCategory") - @honor_category_ids = @honor_categorys.collect{|t| t.id.to_s} + [nil] - - - @honors = (params[:sort] || @filter) ? get_sorted_and_filtered("honor",:honor_category_id.in => @honor_category_ids) : get_viewable("honor",:honor_category_id.in => @honor_category_ids) - @honor_pages = @honors.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @honor_category_ids = HonorCategory.all.collect{|t| t.id.to_s} + [nil] + @honors = get_sorted_and_filtered("honor", :honor_category_id.in => @honor_category_ids) respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @honors } - format.js end end @@ -55,7 +34,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController @tags = get_tags @set_honor_type = HonorCategory.new(:display => 'List') - @honor_type_url = panel_personal_honor_back_end_honors_path + @honor_type_url = panel_personal_honor_back_end_honors_path end @@ -137,28 +116,28 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController else @honor_types = HonorCategory.all - @tags = get_tags + @tags = get_tags @honor = Honor.new(params[:honor]) @honor.create_user_id = current_user.id @honor.update_user_id = current_user.id - if params[:honor][:user_id] + if params[:honor][:user_id] @honor.create_user_id = params[:honor][:user_id] @honor.update_user_id = params[:honor][:user_id] else - @honor.create_user_id = current_user.id + @honor.create_user_id = current_user.id @honor.update_user_id = current_user.id end respond_to do |format| if @honor.save - if params[:honor][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:honor][:user_id],:show_plugin_profile=>'Honor')) } + if params[:honor][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:honor][:user_id],:show_plugin_profile=>"Honor")) } else - format.html { redirect_to(panel_personal_honor_back_end_honors_url) } + format.html { redirect_to(panel_personal_honor_back_end_honors_url) } end format.xml { render :xml => @honor, :status => :created, :location => @honor } @@ -193,12 +172,12 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController @honor.update_user_id = current_user.id - params[:honor][:tag_ids] ||=[] + params[:honor][:tag_ids] ||=[] respond_to do |format| if @honor.update_attributes(params[:honor]) format.html { redirect_to(panel_personal_honor_back_end_honors_url) } - # format.js { render 'toggle_enable' } + # format.js { render 'toggle_enable' } format.xml { head :ok } else format.html { render :action => "edit" } @@ -228,6 +207,29 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController end redirect_to panel_personal_honor_back_end_honors_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @honors = Honor.any_in(:_id => params[:ids]) + + @honors.each do |honor| + + honor.is_hidden = params[:disable] + + honor.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Honor")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/personal_honor_intros_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/personal_honor_intros_controller.rb new file mode 100644 index 00000000..f89e92f6 --- /dev/null +++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/personal_honor_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalHonor::BackEnd::PersonalHonorIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_honor_intro' + @app_type_name = 'personal_honor' + @reback_name = 'Honor' + end + +end diff --git a/vendor/built_in_modules/personal_honor/app/models/personal_honor_intro.rb b/vendor/built_in_modules/personal_honor/app/models/personal_honor_intro.rb new file mode 100644 index 00000000..967427f6 --- /dev/null +++ b/vendor/built_in_modules/personal_honor/app/models/personal_honor_intro.rb @@ -0,0 +1,4 @@ +class PersonalHonorIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb index bdd67f9d..f6d21b42 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_form.html.erb @@ -1,97 +1,163 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'honor[tag_ids][]', tag.id, @honor.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'honor[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      <%= t(:module) %>
      + -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :year ,t("personal_honor.year")%> - <%= select_year((@honor.year ? @honor.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'honor[year]'} ) %> -
      - -
      - <%= f.label :honor_category ,t("personal_honor.honor_category")%> - <%= f.select :honor_category_id, @honor_categorys.collect {|t| [ t.title, t.id ]} %> -
      + +
      -
      - <%= f.label :award_name, t("personal_honor.award_name") %> - <%= f.text_field :award_name %> -
      + +
      -
      - <%= f.label :awarding_unit, t("personal_honor.awarding_unit") %> - <%= f.text_field :awarding_unit %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :url, t("personal_honor.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_honor.keywords") %> - <%= f.text_field :keywords %> -
      - -
      - <%= f.label :language, t("personal_honor.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_honor.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_honor.English") %> -
      + <% end %> -
      - <%= f.label :note, t("personal_honor.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - -
      - - + +
      + +
      + <%= select_year((@honor.year ? @honor.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'honor[year]', :class => "span1"} ) %> +
      +
      - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - \ No newline at end of file + +
      + +
      + <%= f.select :honor_category_id, @honor_categorys.collect {|t| [ t.title, t.id ]} %> +
      +
      + + +
      + +
      + <%= f.text_field :award_name %> +
      +
      + + +
      + +
      + <%= f.text_field :awarding_unit %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_honor.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_honor.English") %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@honor) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor.html.erb index 3cbc9960..d03c4988 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_honor.html.erb @@ -1,9 +1,4 @@ - - <% if (honor.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', honor.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= honor.year %> <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/edit.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/edit.html.erb index ff9924b1..44bf926e 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/edit.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_honor.editing_personal_honor') %>

      - -<%= form_for @honor, :url => panel_personal_honor_back_end_honor_path(@honor), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @honor, url: panel_personal_honor_back_end_honor_path(@honor), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb index fc8156e3..0ede75f7 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/honor_setting.html.erb @@ -15,7 +15,7 @@

      <%= t('add')%> - 類別 + <%= t("personal_honor.honor_category") %>

      diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/index.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/index.html.erb index 5a84d06e..f9f16096 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/index.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/index.html.erb @@ -13,11 +13,10 @@ - - - - - + + + + @@ -25,9 +24,12 @@
      <%= t('personal_honor.year') %><%= t('personal_honor.award_name') %><%= t('personal_honor.awarding_unit') %><%= t("personal_plugins.author") %>
      -
      +
      +
      + <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_honor_back_end_honor_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_honor_back_end_honor_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @honor_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      +
      diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/new.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/new.html.erb index cad74a99..f35fcd52 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/new.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/new.html.erb @@ -8,14 +8,8 @@
      -<%= flash_messages %> - -
      -

      <%= t('honor.new_personal_honor') %>

      -<%= form_for @honor, :url => panel_personal_honor_back_end_honors_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> - +<%= form_for @honor, url: panel_personal_honor_back_end_honors_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb index 438bbae3..d400affd 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/front_end/_profile.html.erb @@ -1,38 +1,49 @@ <% if @member - @honors = Honor.where(:create_user_id => @member.id).desc(:year) - else - @honors = Honor.all.desc(:year) - end + + @honors = Honor.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + + @honor_intro = !PersonalHonorIntro.where(:user_id => @member.id).blank? ? PersonalHonorIntro.where(:user_id => @member.id).first : PersonalHonorIntro.new %> - -<% if !@honors.blank? %> - - - - - - - - - - <% @honors.each do |honor| %> - - - - - - - <% end %> + <% if @honor_intro.brief_intro and !@honor_intro.blank? %> - -
      <%= t('personal_honor.year') %><%= t('personal_honor.award_name') %>
      <%= honor.year %> - <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> -
      +
      + <%= @honor_intro.text.html_safe rescue '' %> +
      -<% else %> + <% end %> - <%= t('nothing')%> + <% if ( !@honor_intro.blank? and @honor_intro.complete_list ) or @honor_intro.blank? %> + + <% if !@honors.blank? %> + + + + + + + + + + + <% @honors.each do |honor| %> + + + + + + + <% end %> + + +
      <%= t('personal_honor.year') %><%= t('personal_honor.award_name') %>
      <%= honor.year %> + <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> +
      + + <% end %> + + <% end %> + +<% end %> -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/_profile.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/_profile.html.erb index cbb9e3cf..28e8658b 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,18 +24,29 @@ end - if @user - @honors = Honor.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @honors = Honor.where(:create_user_id => @user.id).desc(:year).page(params[:page]).per(10) else - @honors = Honor.all.page(params[:page]).per(10) + @honors = Honor.where(is_hidden: false, :create_user_id => @user.id).desc(:year).page(params[:page]).per(10) end - %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_honor_back_end_honors_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_honor_back_end_honors_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -37,7 +55,12 @@ <% @honors.each do |honor| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_honor.year') %> <%= t('personal_honor.award_name') %>
      + <%= check_box_tag 'to_change[]', honor.id.to_s, false, :class => "list-check" %> + <%= honor.year %> <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> @@ -49,11 +72,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_honor_back_end_personal_honor_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_honor_back_end_honor_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_honor/config/routes.rb b/vendor/built_in_modules/personal_honor/config/routes.rb index ec5e9097..6e0333cf 100644 --- a/vendor/built_in_modules/personal_honor/config/routes.rb +++ b/vendor/built_in_modules/personal_honor/config/routes.rb @@ -14,12 +14,14 @@ Rails.application.routes.draw do resources :honors do collection do get 'delete' + get 'data_share' end match "honor_category_quick_add" => "honors#honor_category_quick_add" ,:as => :honor_category_quick_add match "honor_category_quick_edit" => "honors#honor_category_quick_edit" ,:as => :honor_category_quick_edit end - resources :honor_categorys + resources :personal_honor_intros + resources :honor_categorys resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_honor/init.rb b/vendor/built_in_modules/personal_honor/init.rb index b6851e00..965d7156 100644 --- a/vendor/built_in_modules/personal_honor/init.rb +++ b/vendor/built_in_modules/personal_honor/init.rb @@ -2,7 +2,7 @@ module PersonalHonor OrbitApp.registration "PersonalHonor",:type=> 'ModuleApp' do module_label 'module_name.personal_honor' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_honor/plugin/profile",:front_path=>"panel/personal_honor/front_end/profile",:admin_path=>"/panel/personal_honor/back_end/honors",:i18n=>'module_name.personal_honor' + personal_plugin :enable => true, :app_name=>"Honor", :intro_app_name=>"PersonalHonorIntro",:path=>"panel/personal_honor/plugin/profile",:front_path=>"panel/personal_honor/front_end/profile",:admin_path=>"/panel/personal_honor/back_end/honors",:i18n=>'module_name.personal_honor' diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/personal_journal_intros_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/personal_journal_intros_controller.rb new file mode 100644 index 00000000..164cb9c1 --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/personal_journal_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalJournal::BackEnd::PersonalJournalIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_journal_intro' + @app_type_name = 'personal_journal' + @reback_name = 'WritingJournal' + end + +end diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb index 1b4460ed..da0e7605 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/writing_journals_controller.rb @@ -9,43 +9,19 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC end def index - - get_plugins - - get_categorys("JournalPaperType",params[:journal_paper_type_id]) - @filter = params[:filter] - new_filter = params[:new_filter] + get_plugins - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - @paper_types = JournalPaperType.all - @paper_type_ids = @paper_types.collect{|t| t.id.to_s} + [nil] - - @level_types = JournalLevelType.all - - # @writing_journals = WritingJournal.search(params[:category_id]) - #@writing_journals = (params[:sort] || @filter) ? get_sorted_and_filtered_writing_journals : WritingJournal.all.page(params[:page]).per(10) - @writing_journals = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_journal",:journal_paper_type_id.in => @paper_type_ids) : get_viewable("writing_journal",:journal_paper_type_id.in => @paper_type_ids) - @writing_journal_pages = @writing_journals.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @paper_type_ids = JournalPaperType.all.collect{|t| t.id.to_s} + [nil] + @writing_journals = get_sorted_and_filtered("writing_journal", :journal_paper_type_id.in => @paper_type_ids) respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @writing_journals } - format.js end end @@ -61,13 +37,13 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC # @writing_journal_categorys = JournalLevelType.all @set_level_type = JournalLevelType.new(:display => 'List') - @level_type_url = panel_personal_journal_back_end_writing_journals_path + @level_type_url = panel_personal_journal_back_end_writing_journals_path @set_author_type = JournalAuthorType.new(:display => 'List') - @author_type_url = panel_personal_journal_back_end_writing_journals_path + @author_type_url = panel_personal_journal_back_end_writing_journals_path @set_paper_type = JournalPaperType.new(:display => 'List') - @paper_type_url = panel_personal_journal_back_end_writing_journals_path + @paper_type_url = panel_personal_journal_back_end_writing_journals_path end @@ -193,7 +169,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC end end - elsif params[:journal_author_type] + elsif params[:journal_author_type] @journal_author_type = JournalAuthorType.new(params[:journal_author_type]) @@ -204,7 +180,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC end - elsif params[:journal_paper_type] + elsif params[:journal_paper_type] @journal_paper_type = JournalPaperType.new(params[:journal_paper_type]) @@ -219,28 +195,28 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC @level_types = JournalLevelType.all @author_types = JournalAuthorType.all @paper_types = JournalPaperType.all - @tags = get_tags + @tags = get_tags @writing_journal = WritingJournal.new(params[:writing_journal]) - if params[:writing_journal][:user_id] + if params[:writing_journal][:user_id] @writing_journal.create_user_id = params[:writing_journal][:user_id] @writing_journal.update_user_id = params[:writing_journal][:user_id] else - @writing_journal.create_user_id = current_user.id + @writing_journal.create_user_id = current_user.id @writing_journal.update_user_id = current_user.id end respond_to do |format| if @writing_journal.save - if params[:writing_journal][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_journal][:user_id],:show_plugin_profile=>'Journal')) } + if params[:writing_journal][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_journal][:user_id],:show_plugin_profile=>"WritingJournal")) } else - format.html { redirect_to(panel_personal_journal_back_end_writing_journals_url) } + format.html { redirect_to(panel_personal_journal_back_end_writing_journals_url) } end - format.xml { render :xml => @writing_journal, :status => :created, :location => @writing_journal } + format.xml { render :xml => @writing_journal, :status => :created, :location => @writing_journal } else format.html { render :action => "new" } @@ -255,32 +231,32 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC # PUT /writing_journals/1.xml def update - if params[:journal_level_type] - - @journal_level_type = JournalLevelType.find(params[:id]) + if params[:journal_level_type] + + @journal_level_type = JournalLevelType.find(params[:id]) - respond_to do |format| + respond_to do |format| - if @journal_level_type.update_attributes(params[:journal_level_type]) - # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } - format.js { render 'update_writing_journal_setting' } - end - end - - elsif params[:journal_author_type] - - @journal_author_type = JournalAuthorType.find(params[:id]) + if @journal_level_type.update_attributes(params[:journal_level_type]) + # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } + format.js { render 'update_writing_journal_setting' } + end + end + + elsif params[:journal_author_type] + + @journal_author_type = JournalAuthorType.find(params[:id]) - respond_to do |format| + respond_to do |format| - if @journal_author_type.update_attributes(params[:journal_author_type]) - # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } - format.js { render 'update_writing_journal_setting' } - end - end - - elsif params[:journal_paper_type] - + if @journal_author_type.update_attributes(params[:journal_author_type]) + # format.html { redirect_to(panel_announcement_back_end_bulletins_url) } + format.js { render 'update_writing_journal_setting' } + end + end + + elsif params[:journal_paper_type] + @journal_paper_type = JournalPaperType.find(params[:id]) respond_to do |format| @@ -293,26 +269,25 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC else - @writing_journal = WritingJournal.find(params[:id]) @writing_journal.update_user_id = current_user.id - params[:writing_journal][:tag_ids] ||=[] + params[:writing_journal][:tag_ids] ||=[] respond_to do |format| if @writing_journal.update_attributes(params[:writing_journal]) format.html { redirect_to(panel_personal_journal_back_end_writing_journals_url) } - # format.js { render 'toggle_enable' } + # format.js { render 'toggle_enable' } format.xml { head :ok } else format.html { render :action => "edit" } format.xml { render :xml => @writing_journal.errors, :status => :unprocessable_entity } end end - end - end + + end # DELETE /writing_journals/1 # DELETE /writing_journals/1.xml @@ -333,6 +308,29 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC end redirect_to panel_personal_journal_back_end_writing_journals_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @writing_journals = WritingJournal.any_in(:_id => params[:ids]) + + @writing_journals.each do |writing_journal| + + writing_journal.is_hidden = params[:disable] + + writing_journal.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingJournal")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_journal/app/models/personal_journal_intro.rb b/vendor/built_in_modules/personal_journal/app/models/personal_journal_intro.rb new file mode 100644 index 00000000..ebf8996e --- /dev/null +++ b/vendor/built_in_modules/personal_journal/app/models/personal_journal_intro.rb @@ -0,0 +1,4 @@ +class PersonalJournalIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb index 24b63ca6..9fc636ea 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form.html.erb @@ -1,295 +1,345 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      - -
      -
      - -
      -

      <%= f.label :abstract, t("personal_journal.abstract") %>

      -
      - <%= f.text_area :abstract, :size => "60x3" %> -
      -
      - -
      -
      - -
      -

      <%= f.label :abstract, t("personal_journal.note") %>

      -
      - <%= f.text_area :note, :size => "60x3" %> -
      -
      - + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_journal[tag_ids][]', tag.id, @writing_journal.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'writing_journal[tag_ids][]', '' %> - <% end %> + +
      <%= t(:module) %>
      + + + +
      + + +
      + + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      + + <% end %> + + +
      + +
      + <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "span1"} ) %> +
      +
      + + +
      + +
      + <%= f.select :language, WritingJournal::LANGUAGE_TYPES, :prompt => 'Select', :class => "span3" %> +
      +
      + + +
      + +
      + <% @level_types.each do |level_type| %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'writing_journal[journal_level_type_ids][]', level_type.id, @writing_journal.journal_level_type_ids.include?(level_type.id)%> + <%= level_type.title %> + <%= hidden_field_tag 'writing_journal[journal_level_type_ids][]', '' %> <% end %> -
      -
      - -
      - - - - + <% end %> +
      +
      -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :year ,t("personal_journal.year")%> - <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "span6"} ) %> -
      + +
      + +
      + <%= f.select :journal_paper_type_id, @paper_types.collect {|t| [ t.title, t.id ]}, :class => "span3" %> +
      +
      -
      - <%= f.label :language, t("personal_journal.language") %> - <%= f.select :language, WritingJournal::LANGUAGE_TYPES, :prompt => 'Select', :class => "span6" %> -
      - -
        - <% @site_valid_locales.each_with_index do |locale, i| %> -
      • ><%= I18nVariable.from_locale(locale) %>
        • + +
        + +
        + <% @author_types.each do |author_type| %> + <%= content_tag :label,:class => "checkbox inline" do -%> + <%= check_box_tag 'writing_journal[journal_author_type_ids][]', author_type.id, @writing_journal.journal_author_type_ids.include?(author_type.id)%> + <%= author_type.title %> + <%= hidden_field_tag 'writing_journal[journal_author_type_ids][]', '' %> <% end %> -
      - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - - <%= f.label :paper_title ,t("personal_journal.paper_title")%> - <%= f.fields_for :paper_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'span12', :value => (@writing_journal.paper_title_translations[locale] rescue nil) %> - <% end %> -
      - - <%= f.label :journal_title ,t("personal_journal.journal_title")%> - <%= f.fields_for :journal_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'span12', :value => (@writing_journal.journal_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      + <% end %> +
      +
      - <% end %> + +
      + +
      + <%= f.text_field :vol_no %> +
      +
      - <%= f.label :level_type ,t("personal_journal.level_type")%> -
      -
        - <% @level_types.each_with_index do |level_type, i| %> -
      • - <%= check_box_tag 'writing_journal[journal_level_type_ids][]', level_type.id, @writing_journal.journal_level_type_ids.include?(level_type.id), :id => "field-#{i}" %> - - <%= hidden_field_tag 'writing_journal[journal_level_type_ids][]', '' %> -
        • - <% end %> -
      -
      + +
      + +
      + <%= f.text_field :issue_no %> +
      +
      -
      + +
      + +
      + <%= f.text_field :form_to_start, :class=>'span1' %> ~ <%= f.text_field :form_to_end, :class=>'span1' %> +
      +
      -
      - <%= f.label :vol_no, t("personal_journal.vol_no") %> - <%= f.text_field :vol_no %> -
      + +
      + +
      + <%= f.text_field :total_pages %> +
      +
      -
      - <%= f.label :issue_no, t("personal_journal.issue_no") %> - <%= f.text_field :issue_no %> -
      + +
      + +
      + <%= f.text_field :isbn %> +
      +
      -
      - <%= f.label :form_to, t("personal_journal.form_to") %> - <%= f.text_field :form_to_start, :class=>'span1' %> ~ <%= f.text_field :form_to_end, :class=>'span1' %> -
      + +
      + +
      + <%= f.text_field :keywords %> +
      +
      -
      - <%= f.label :total_pages, t("personal_journal.total_pages") %> - <%= f.text_field :total_pages %> -
      - -
      + +
      + +
      + <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> +
      +
      -
      - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      -
      - <%= f.label :authors,t("web_resource.authors") %> - <%= f.fields_for :authors_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'span5', :value => (@writing_journal.authors_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      + +
      + <%= f.text_area :abstract, rows: 2, class: "input-block-level" %> +
      +
      - <% end %> - -
      - + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      -
      - - -
      - -
      - -
      +
      -
      -
      - <%= f.label :author_type ,t("personal_journal.author_type")%> - -
      -
        - <% @author_types.each_with_index do |author_type, i | %> -
      • - <%= check_box_tag 'writing_journal[journal_author_type_ids][]', author_type.id, @writing_journal.journal_author_type_ids.include?(author_type.id), :id => "field-#{i}" %> - - <%= hidden_field_tag 'writing_journal[journal_author_type_ids][]', '' %> -
        • - <% end %> -
      -
      -
      - -
      - <%= f.label :paper_type ,t("personal_journal.paper_type")%> - <%= f.select :journal_paper_type_id, @paper_types.collect {|t| [ t.title, t.id ]}, :class => "span7" %> -
      - -
      + + <% if show_form_status_field(@writing_journal) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :paper_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_journal.paper_title"), value: (@writing_journal.paper_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :journal_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_journal.journal_title"), value: (@writing_journal.journal_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :authors_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_journal.authors"), value: (@writing_journal.authors_translations[locale] rescue nil) %> + <% end %> +
      +
      + +
      + + <% end %> + + +
      + +
      + + + <% if @writing_journal && !@writing_journal.writing_journal_files.blank? %> +
      + <% @writing_journal.writing_journal_files.each_with_index do |writing_journal_file, i| %> + <%= f.fields_for :writing_journal_files, writing_journal_file do |f| %> + <%= render :partial => 'form_file', :object => writing_journal_file, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> +
      +
      + <% end %> + + +
      +
      +

      + <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %> + <%= t(:add) %> +

      + +
      +
      - - <%= f.label :isbn, t("personal_journal.isbn") %> - <%= f.text_field :isbn , :class => "span12" %> -
      - - <%= f.label :keywords, t("personal_journal.keywords") %> - <%= f.text_field :keywords , :class => "span12" %> -
      - -
      - <%= f.label :publication_date ,t("personal_journal.publication_date")%> - <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 'span1'} %> -
      - - <%= f.label :url, t("personal_journal.url") %> - <%= f.text_field :url , :class => "span12" %> -
      - -
      - - - - -
      - -
      - - - - - - - - - - - - - - - - - - <% @writing_journal.writing_journal_files.each_with_index do |writing_journal_file, i| %> - <%= f.fields_for :writing_journal_files, writing_journal_file do |f| %> - <%= render :partial => 'form_file', :object => writing_journal_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
      FileFile Name
      -
      - <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %> - ADD/新增 -
      -
      - -
      - -
      - - - - - - -
      - - - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - + +
      + + + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - + <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb index a91d6a85..fa9848e5 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_form_file.html.erb @@ -1,50 +1,45 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
      -
      - <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
      -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
      - -
      - <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
      -
      - <% end %> - -
      - - <% end %> - -
      - - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - +<% if form_file.new_record? %> +
      +<% else %> +
      + <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
      + + + + <% @site_valid_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_writing_journal.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_writing_journal.html.erb index c2709e37..09f7a44b 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_writing_journal.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_writing_journal.html.erb @@ -1,10 +1,6 @@ - - <% if (writing_journal.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', writing_journal.id, false, :class => "checkbox_in_list" %> - <% end -%> - - <%= writing_journal.publication_date %> + + <%= writing_journal.year %> <%= link_to writing_journal.create_link , panel_personal_journal_front_end_writing_journal_path(writing_journal) %>
      diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/edit.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/edit.html.erb index be84f49e..23c576af 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/edit.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_journal.editing_personal_journal') %>

      - -<%= form_for @writing_journal, :url => panel_personal_journal_back_end_writing_journal_path(@writing_journal), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @writing_journal, url: panel_personal_journal_back_end_writing_journal_path(@writing_journal), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb index d5eebc3d..b7db0dc6 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/index.html.erb @@ -13,10 +13,9 @@ - - - - + + + @@ -24,10 +23,12 @@
      <%= t('personal_journal.year') %><%= t('module_name.personal_journal') %><%= t('personal_journal.authors') %>
      -
      +
      +
      <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_journal_back_end_writing_journal_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @writing_journal_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      +
      diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/new.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/new.html.erb index 77bd655d..256eb024 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/new.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/new.html.erb @@ -8,14 +8,8 @@
      -<%= flash_messages %> - -
      -

      <%= t('writing_journal.new_personal_journal') %>

      -<%= form_for @writing_journal, :url => panel_personal_journal_back_end_writing_journals_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> - +<%= form_for @writing_journal, url: panel_personal_journal_back_end_writing_journals_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb index 3b56dc62..62514b69 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/writing_journal_setting.html.erb @@ -15,7 +15,7 @@

      <%= t('add')%> - 等級 + <%= t("personal_journal.level_type") %>

      @@ -41,7 +41,7 @@

      <%= t('add')%> - 作者型態 + <%= t("personal_journal.author_type") %>

      @@ -67,7 +67,7 @@

      <%= t('add')%> - 論文型態 + <%= t("personal_journal.paper_type") %>

      diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb index e3c740ad..9af050c7 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/front_end/_profile.html.erb @@ -1,41 +1,50 @@ <% if @member - @writing_journals = WritingJournal.where(:create_user_id => @member.id).desc(:year) - else - @writing_journals = WritingJournal.all.desc(:year) - end + @writing_journals = WritingJournal.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + + @writing_journal_intro = !PersonalJournalIntro.where(:user_id => @member.id).blank? ? PersonalJournalIntro.where(:user_id => @member.id).first : PersonalJournalIntro.new %> - -<% if !@writing_journals.blank? %> - - - - - - - - - + <% if @writing_journal_intro.brief_intro and !@writing_journal_intro.blank? %> + +
      + <%= @writing_journal_intro.text.html_safe rescue '' %> +
      + + <% end %> + + <% if ( !@writing_journal_intro.blank? and @writing_journal_intro.complete_list ) or @writing_journal_intro.blank? %> + + <% if !@writing_journals.blank? %> + +
      <%= t('personal_journal.year') %><%= t('module_name.personal_journal') %><%= t('personal_journal.authors') %>
      + + + + + + + + + + <% @writing_journals.each do |writing_journal| %> + + + + + + + + <% end %> + + +
      <%= t('personal_journal.year') %><%= t('module_name.personal_journal') %><%= t('personal_journal.authors') %>
      <%= writing_journal.year %> + <%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %> + <%= writing_journal.authors %>
      - <% @writing_journals.each do |writing_journal| %> - - - <%= writing_journal.year %> - - <%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %> - - <%= writing_journal.authors %> - - <% end %> - - + <% end %> -<% else %> - - <%= t('nothing')%> - -<% end %> \ No newline at end of file +<% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb index 59961b00..124439f2 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -16,17 +23,29 @@ @filter = {new_filter[:type] => [new_filter[:id].to_s]} end - if @user - @writing_journals = WritingJournal.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @writing_journals = WritingJournal.where(:create_user_id => @user.id).desc(:year).page(params[:page]).per(10) else - @writing_journals = WritingJournal.all.page(params[:page]).per(10) + @writing_journals = WritingJournal.where(is_hidden: false, :create_user_id => @user.id).desc(:year).page(params[:page]).per(10) end %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_journal_back_end_writing_journals_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_journal_back_end_writing_journals_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> <% if not @user%> @@ -38,7 +57,12 @@ <% @writing_journals.each do |writing_journal| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_journal.year') %> <%= t('module_name.personal_journal') %>
      + <%= check_box_tag 'to_change[]', writing_journal.id.to_s, false, :class => "list-check" %> + <%= writing_journal.year %> <%= link_to writing_journal.create_link, panel_personal_journal_front_end_writing_journal_path(writing_journal) %> @@ -53,11 +77,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_journal_back_end_personal_journal_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_journal_back_end_writing_journal_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/config/locales/en.yml b/vendor/built_in_modules/personal_journal/config/locales/en.yml index fa2fffa1..2d2fc8cf 100644 --- a/vendor/built_in_modules/personal_journal/config/locales/en.yml +++ b/vendor/built_in_modules/personal_journal/config/locales/en.yml @@ -1,6 +1,6 @@ en: module_name: - personal_journal: Journal + personal_journal: Journal Paper personal_journal: paper_title : "Paper Title" journal_title : "Journal Title" diff --git a/vendor/built_in_modules/personal_journal/config/routes.rb b/vendor/built_in_modules/personal_journal/config/routes.rb index 5a03564d..817f08cc 100644 --- a/vendor/built_in_modules/personal_journal/config/routes.rb +++ b/vendor/built_in_modules/personal_journal/config/routes.rb @@ -15,6 +15,7 @@ Rails.application.routes.draw do resources :writing_journals do collection do get 'delete' + get 'data_share' end match "level_type_quick_add" => "writing_journals#level_type_quick_add" ,:as => :level_type_quick_add @@ -27,6 +28,7 @@ Rails.application.routes.draw do match "tag_quick_edit" => "writing_journals#tag_quick_edit" ,:as => :tag_quick_edit end + resources :personal_journal_intros resources :journal_paper_types resources :journal_author_types resources :journal_level_types diff --git a/vendor/built_in_modules/personal_journal/init.rb b/vendor/built_in_modules/personal_journal/init.rb index cd85ea0a..461f7257 100644 --- a/vendor/built_in_modules/personal_journal/init.rb +++ b/vendor/built_in_modules/personal_journal/init.rb @@ -2,7 +2,7 @@ module PersonalJournal OrbitApp.registration "PersonalJournal",:type=> 'ModuleApp' do module_label 'module_name.personal_journal' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_journal/plugin/profile",:front_path=>"panel/personal_journal/front_end/profile",:admin_path=>"/panel/personal_journal/back_end/writing_journals",:i18n=>'module_name.personal_journal' + personal_plugin :enable => true, :app_name=>"WritingJournal", :intro_app_name=>"PersonalJournalIntro",:path=>"panel/personal_journal/plugin/profile",:front_path=>"panel/personal_journal/front_end/profile",:admin_path=>"/panel/personal_journal/back_end/writing_journals",:i18n=>'module_name.personal_journal' diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb index 38f4063d..e1954e59 100644 --- a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb +++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/labs_controller.rb @@ -9,40 +9,18 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController # end def index - - get_plugins + get_plugins - # get_categorys("LabCategory",params[:lab_category_ids]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - # @lab_categorys = get_categories_for_index("LabCategory") - # @lab_category_ids = @lab_categorys.collect{|t| t.id.to_s} + [nil] - - - @labs = (params[:sort] || @filter) ? get_sorted_and_filtered("lab") : get_viewable("lab") - @lab_pages = @labs.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @labs = get_sorted_and_filtered("lab") respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @labs } - format.js end end @@ -94,24 +72,24 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController # POST /labs.xml def create - @tags = get_tags + @tags = get_tags @lab = Lab.new(params[:lab]) - if params[:lab][:user_id] + if params[:lab][:user_id] @lab.create_user_id = params[:lab][:user_id] @lab.update_user_id = params[:lab][:user_id] else - @lab.create_user_id = current_user.id + @lab.create_user_id = current_user.id @lab.update_user_id = current_user.id end respond_to do |format| if @lab.save - if params[:lab][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:lab][:user_id],:show_plugin_profile=>'Lab')) } + if params[:lab][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:lab][:user_id],:show_plugin_profile=>"Lab")) } else - format.html { redirect_to(panel_personal_lab_back_end_labs_url) } + format.html { redirect_to(panel_personal_lab_back_end_labs_url) } end format.xml { render :xml => @lab, :status => :created, :location => @lab } @@ -130,7 +108,7 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController @lab.update_user_id = current_user.id - params[:lab][:tag_ids] ||=[] + params[:lab][:tag_ids] ||=[] respond_to do |format| if @lab.update_attributes(params[:lab]) @@ -164,6 +142,29 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController end redirect_to panel_personal_lab_back_end_labs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @labs = Lab.any_in(:_id => params[:ids]) + + @labs.each do |lab| + + lab.is_hidden = params[:disable] + + lab.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Lab")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/personal_lab_intros_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/personal_lab_intros_controller.rb new file mode 100644 index 00000000..7f0aebec --- /dev/null +++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/personal_lab_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalLab::BackEnd::PersonalLabIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_lab_intro' + @app_type_name = 'personal_lab' + @reback_name = 'Lab' + end + +end diff --git a/vendor/built_in_modules/personal_lab/app/models/personal_lab_intro.rb b/vendor/built_in_modules/personal_lab/app/models/personal_lab_intro.rb new file mode 100644 index 00000000..46ad2603 --- /dev/null +++ b/vendor/built_in_modules/personal_lab/app/models/personal_lab_intro.rb @@ -0,0 +1,4 @@ +class PersonalLabIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb index 7495d74c..f9b83f18 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form.html.erb @@ -1,214 +1,288 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'lab[tag_ids][]', tag.id, @lab.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'lab[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      <%= t(:module) %>
      + -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :year ,t("personal_lab.year")%> - <%= select_year((@lab.year ? @lab.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'lab[year]'} ) %> -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - -
      - <%= f.label :lab_title ,t("personal_lab.lab_title")%> - <%= f.fields_for :lab_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@lab.lab_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :location ,t("personal_lab.location")%> - <%= f.fields_for :location_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@lab.location_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :participating_professor ,t("personal_lab.participating_professor")%> - <%= f.fields_for :participating_professor_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@lab.participating_professor_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :participating_student ,t("personal_lab.participating_student")%> - <%= f.fields_for :participating_student_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@lab.participating_student_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      - <% end %> - -
      + +
      -
      - <%= f.label :extension_no, t("personal_lab.extension_no") %> - <%= f.text_field :extension_no %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :research_direction, t("personal_lab.research_direction") %> - <%= f.text_field :research_direction %> -
      + <% end %> -
      - <%= f.label :facility, t("personal_lab.facility") %> - <%= f.text_field :facility %> -
      + +
      + +
      + <%= select_year((@lab.year ? @lab.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'lab[year]', :class => 'span1'} ) %> +
      +
      -
      - <%= f.label :url, t("personal_lab.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_lab.keywords") %> - <%= f.text_field :keywords %> -
      - -
      - <%= f.label :language, t("personal_lab.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_lab.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_lab.English") %> -
      + +
      + +
      + <%= f.text_field :extension_no %> +
      +
      -
      - <%= f.label :note, t("personal_lab.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - - - - -
      - -
      - - - - - - - - - - - - - - - - - - <% @lab.lab_files.each_with_index do |lab_file, i| %> - <%= f.fields_for :lab_files, lab_file do |f| %> - <%= render :partial => 'form_file', :object => lab_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
      FileFile Name
      -
      - <%= hidden_field_tag 'plugin_file_field_count', @lab.lab_files.count %> - ADD/新增 -
      -
      - -
      - -
      - - - - - - -
      - - + +
      + +
      + <%= f.text_field :research_direction %> +
      +
      - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - + +
      + +
      + <%= f.text_field :facility %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_lab.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_lab.English") %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@lab) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :lab_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.lab_title"), value: (@lab.lab_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :location_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.location"), value: (@lab.location_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :participating_professor_chapters_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.participating_professor"), value: (@lab.participating_professor_chapters_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :participating_student_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_lab.participating_student"), value: (@lab.participating_student_translations[locale] rescue nil) %> + <% end %> +
      +
      + +
      + + <% end %> + + +
      + +
      + + + <% if @lab && !@lab.lab_files.blank? %> +
      + <% @lab.lab_files.each_with_index do |lab_file, i| %> + <%= f.fields_for :lab_files, lab_file do |f| %> + <%= render :partial => 'form_file', :object => lab_file, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> +
      +
      + <% end %> + + +
      +
      +

      + <%= hidden_field_tag 'plugin_file_field_count', @lab.lab_files.count %> + <%= t(:add) %> +

      + +
      +
      + + + + +
      + + + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - + <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb index a91d6a85..fa9848e5 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_form_file.html.erb @@ -1,50 +1,45 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
      -
      - <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
      -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
      - -
      - <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
      -
      - <% end %> - -
      - - <% end %> - -
      - - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - +<% if form_file.new_record? %> +
      +<% else %> +
      + <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
      + + + + <% @site_valid_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_lab.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_lab.html.erb index bbc52ae2..83cd99f3 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_lab.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_lab.html.erb @@ -1,9 +1,4 @@ - - <% if (lab.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', lab.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= lab.year %> <%= link_to lab.lab_title, panel_personal_lab_front_end_lab_path(lab) %> diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/edit.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/edit.html.erb index f96423a1..86533007 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/edit.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_lab.editing_personal_lab') %>

      - -<%= form_for @lab, :url => panel_personal_lab_back_end_lab_path(@lab), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @lab, url: panel_personal_lab_back_end_lab_path(@lab), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/index.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/index.html.erb index ac59222a..0ef63d74 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/index.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/index.html.erb @@ -13,11 +13,10 @@ - - - - - + + + + @@ -25,9 +24,11 @@
      <%= t('personal_lab.year') %><%= t('personal_lab.lab_title') %><%= t('personal_lab.location') %><%= t("personal_plugins.author") %>
      -
      +
      +
      <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_lab_back_end_lab_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @lab_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
      -
      + +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/new.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/new.html.erb index 92b21a4c..f4628771 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/new.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/new.html.erb @@ -8,14 +8,8 @@
      -<%= flash_messages %> - -
      -

      <%= t('lab.new_personal_lab') %>

      -<%= form_for @lab, :url => panel_personal_lab_back_end_labs_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> - +<%= form_for @lab, url: panel_personal_lab_back_end_labs_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/_profile.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/_profile.html.erb index 18c4a9ac..f6a2a635 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/front_end/_profile.html.erb @@ -1,40 +1,50 @@ <% if @member - @labs = Lab.where(:create_user_id => @member.id).desc(:year) - else - @labs = Lab.all.desc(:year) - end + + @labs = Lab.where(is_hidden: false, :create_user_id => @member.id).desc(:year) + + @lab_intro = !PersonalLabIntro.where(:user_id => @member.id).blank? ? PersonalLabIntro.where(:user_id => @member.id).first : PersonalLabIntro.new %> - -<% if !@labs.blank? %> - - - - - - - - - - - <% @labs.each do |lab| %> - - - - - - - - <% end %> + <% if @lab_intro.brief_intro and !@lab_intro.blank? %> - -
      <%= t('personal_lab.year') %><%= t('personal_lab.lab_title') %><%= t('personal_lab.location') %>
      <%= lab.year %> - <%= link_to lab.lab_title, panel_personal_lab_front_end_lab_path(lab) %> - <%= lab.location %>
      +
      + <%= @lab_intro.text.html_safe rescue '' %> +
      -<% else %> + <% end %> - <%= t('nothing')%> + <% if ( !@lab_intro.blank? and @lab_intro.complete_list ) or @lab_intro.blank? %> -<% end %> \ No newline at end of file + <% if !@labs.blank? %> + + + + + + + + + + + + <% @labs.each do |lab| %> + + + + + + + + <% end %> + + +
      <%= t('personal_lab.year') %><%= t('personal_lab.lab_title') %><%= t('personal_lab.location') %>
      <%= lab.year %> + <%= link_to lab.lab_title, panel_personal_lab_front_end_lab_path(lab) %> + <%= lab.location %>
      + + <% end %> + + <% end %> + +<% end %> diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/_profile.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/_profile.html.erb index 4598ef79..6bbc9176 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,18 +24,29 @@ end - if @user - @labs = Lab.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @labs = Lab.where(:create_user_id => @user.id).desc(:year).page(params[:page]).per(10) else - @labs = Lab.all.page(params[:page]).per(10) + @labs = Lab.where(is_hidden: false, :create_user_id => @user.id).desc(:year).page(params[:page]).per(10) end - %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_lab_back_end_labs_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_lab_back_end_labs_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -38,7 +56,12 @@ <% @labs.each do |lab| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_lab.year') %> <%= t('personal_lab.lab_title') %> <%= t('personal_lab.location') %>
      + <%= check_box_tag 'to_change[]', lab.id.to_s, false, :class => "list-check" %> + <%= lab.year %> <%= link_to lab.lab_title, panel_personal_lab_front_end_lab_path(lab) %> @@ -51,11 +74,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_lab_back_end_personal_lab_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_lab_back_end_lab_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_lab/config/routes.rb b/vendor/built_in_modules/personal_lab/config/routes.rb index 29be7a87..fea3ceb7 100644 --- a/vendor/built_in_modules/personal_lab/config/routes.rb +++ b/vendor/built_in_modules/personal_lab/config/routes.rb @@ -13,9 +13,11 @@ Rails.application.routes.draw do resources :labs do collection do get 'delete' + get 'data_share' end end + resources :personal_lab_intros resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_lab/init.rb b/vendor/built_in_modules/personal_lab/init.rb index 0a645b91..076f3c01 100644 --- a/vendor/built_in_modules/personal_lab/init.rb +++ b/vendor/built_in_modules/personal_lab/init.rb @@ -2,7 +2,7 @@ module PersonalLab OrbitApp.registration "PersonalLab",:type=> 'ModuleApp' do module_label 'module_name.personal_lab' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_lab/plugin/profile",:front_path=>"panel/personal_lab/front_end/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab' + personal_plugin :enable => true, :app_name=>"Lab", :intro_app_name=>"PersonalLabIntro",:path=>"panel/personal_lab/plugin/profile",:front_path=>"panel/personal_lab/front_end/profile",:admin_path=>"/panel/personal_lab/back_end/labs",:i18n=>'module_name.personal_lab' end diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/personal_patent_intros_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/personal_patent_intros_controller.rb new file mode 100644 index 00000000..4a25dbf4 --- /dev/null +++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/personal_patent_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalPatent::BackEnd::PersonalPatentIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_patent_intro' + @app_type_name = 'personal_patent' + @reback_name = 'WritingPatent' + end + +end diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb index 3d957112..e83e3649 100644 --- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb +++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/writing_patents_controller.rb @@ -9,40 +9,19 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon end def index - - get_plugins + get_plugins - get_categorys("WritingPatentCategory",params[:writing_patent_category_ids]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - @writing_patent_categorys = get_categories_for_index("WritingPatentCategory") - @writing_patent_category_ids = @writing_patent_categorys.collect{|t| t.id.to_s} + [nil] - - - @writing_patents = (params[:sort] || @filter) ? get_sorted_and_filtered("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids) : get_viewable("writing_patent",:writing_patent_category_id.in => @writing_patent_category_ids) - @writing_patent_pages = @writing_patents.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @writing_patent_category_ids = WritingPatentCategory.all.collect{|t| t.id.to_s} + [nil] + @writing_patents = get_sorted_and_filtered("writing_patent", :writing_patent_category_id.in => @writing_patent_category_ids) respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @writing_patents } - format.js end end @@ -55,7 +34,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon @tags = get_tags @set_patent_type = WritingPatentCategory.new(:display => 'List') - @patent_type_url = panel_personal_patent_back_end_writing_patents_path + @patent_type_url = panel_personal_patent_back_end_writing_patents_path end @@ -124,47 +103,50 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon # POST /writing_patents.xml def create - if params[:writing_patent_category] - - @writing_patent_category = WritingPatentCategory.new(params[:writing_patent_category]) + if params[:writing_patent_category] + + @writing_patent_category = WritingPatentCategory.new(params[:writing_patent_category]) - respond_to do |format| - if @writing_patent_category.save - format.js { render 'create_writing_patent_setting' } - end - end - - else - - @patent_types = WritingPatentCategory.all - @tags = get_tags - - @writing_patent = WritingPatent.new(params[:writing_patent]) - - if params[:writing_patent][:user_id] - @writing_patent.create_user_id = params[:writing_patent][:user_id] - @writing_patent.update_user_id = params[:writing_patent][:user_id] + respond_to do |format| + if @writing_patent_category.save + format.js { render 'create_writing_patent_setting' } + end + end + else - @writing_patent.create_user_id = current_user.id - @writing_patent.update_user_id = current_user.id - end - respond_to do |format| - if @writing_patent.save + @patent_types = WritingPatentCategory.all + @tags = get_tags + + @writing_patent = WritingPatent.new(params[:writing_patent]) + + if params[:writing_patent][:user_id] + @writing_patent.create_user_id = params[:writing_patent][:user_id] + @writing_patent.update_user_id = params[:writing_patent][:user_id] + else + @writing_patent.create_user_id = current_user.id + @writing_patent.update_user_id = current_user.id + end + + respond_to do |format| + + if @writing_patent.save - if params[:writing_patent][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_patent][:user_id],:show_plugin_profile=>'Patent')) } + if params[:writing_patent][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:writing_patent][:user_id],:show_plugin_profile=>"WritingPatent")) } + else + format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } + end + + format.xml { render :xml => @writing_patent, :status => :created, :location => @writing_patent } else - format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } + format.html { render :action => "new" } + format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } end - format.xml { render :xml => @writing_patent, :status => :created, :location => @writing_patent } - else - format.html { render :action => "new" } - format.xml { render :xml => @writing_patent.errors, :status => :unprocessable_entity } end + end - end end @@ -190,12 +172,12 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon @writing_patent.update_user_id = current_user.id - params[:writing_patent][:tag_ids] ||=[] + params[:writing_patent][:tag_ids] ||=[] respond_to do |format| if @writing_patent.update_attributes(params[:writing_patent]) format.html { redirect_to(panel_personal_patent_back_end_writing_patents_url) } - # format.js { render 'toggle_enable' } + # format.js { render 'toggle_enable' } format.xml { head :ok } else format.html { render :action => "edit" } @@ -225,6 +207,29 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon end redirect_to panel_personal_patent_back_end_writing_patents_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @writing_patents = WritingPatent.any_in(:_id => params[:ids]) + + @writing_patents.each do |writing_patent| + + writing_patent.is_hidden = params[:disable] + + writing_patent.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingPatent")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_patent/app/models/personal_patent_intro.rb b/vendor/built_in_modules/personal_patent/app/models/personal_patent_intro.rb new file mode 100644 index 00000000..853cedde --- /dev/null +++ b/vendor/built_in_modules/personal_patent/app/models/personal_patent_intro.rb @@ -0,0 +1,4 @@ +class PersonalPatentIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb index 9de98bda..f1b8fd51 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form.html.erb @@ -1,203 +1,276 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'writing_patent[tag_ids][]', tag.id, @writing_patent.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'writing_patent[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      <%= t(:module) %>
      + -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :year ,t("personal_patent.year")%> - <%= select_year((@writing_patent.year ? @writing_patent.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_patent[year]'} ) %> -
      - -
      - <%= f.label :writing_patent_category ,t("personal_patent.writing_patent_category")%> - <%= f.select :writing_patent_category_id, @writing_patent_categorys.collect {|t| [ t.title, t.id ]} %> -
      - -
      - <%= f.label :publish_date ,t("personal_patent.publish_date")%> - <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - -
      - <%= f.label :patent_title ,t("personal_patent.patent_title")%> - <%= f.fields_for :patent_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.patent_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :authors ,t("personal_patent.authors")%> - <%= f.fields_for :authors_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@writing_patent.authors_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      - <% end %> - -
      + +
      -
      - <%= f.label :patent_no, t("personal_patent.patent_no") %> - <%= f.text_field :patent_no %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :patent_country, t("personal_patent.patent_country") %> - <%= f.text_field :patent_country %> -
      + <% end %> -
      - <%= f.label :url, t("personal_patent.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_patent.keywords") %> - <%= f.text_field :keywords %> -
      - -
      - <%= f.label :language, t("personal_patent.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_patent.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_patent.English") %> -
      + +
      + +
      + <%= select_year((@writing_patent.year ? @writing_patent.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_patent[year]', :class => "span1"} ) %> +
      +
      -
      - <%= f.label :note, t("personal_patent.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - - - - -
      - -
      - - - - - - - - - - - - - - - - - - <% @writing_patent.writing_patent_files.each_with_index do |writing_patent_file, i| %> - <%= f.fields_for :writing_patent_files, writing_patent_file do |f| %> - <%= render :partial => 'form_file', :object => writing_patent_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
      FileFile Name
      -
      - <%= hidden_field_tag 'plugin_file_field_count', @writing_patent.writing_patent_files.count %> - ADD/新增 -
      -
      - -
      - -
      - - - - - - -
      - - + +
      + +
      + <%= f.select :writing_patent_category_id, @writing_patent_categorys.collect {|t| [ t.title, t.id ]} %> +
      +
      - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - + +
      + +
      + <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.text_field :patent_no %> +
      +
      + + +
      + +
      + <%= f.text_field :patent_country %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_patent.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_patent.English") %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@writing_patent) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :patent_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_patent.patent_title"), value: (@writing_patent.patent_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :authors_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_patent.authors"), value: (@writing_patent.authors_translations[locale] rescue nil) %> + <% end %> +
      +
      + +
      + + <% end %> + + +
      + +
      + + + <% if @writing_patent && !@writing_patent.writing_patent_files.blank? %> +
      + <% @writing_patent.writing_patent_files.each_with_index do |writing_patent_file, i| %> + <%= f.fields_for :writing_patent_files, writing_patent_file do |f| %> + <%= render :partial => 'form_file', :object => writing_patent_file, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> +
      +
      + <% end %> + + +
      +
      +

      + <%= hidden_field_tag 'plugin_file_field_count', @writing_patent.writing_patent_files.count %> + <%= t(:add) %> +

      + +
      +
      + + + + +
      + + + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - + <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb index a91d6a85..fa9848e5 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_form_file.html.erb @@ -1,50 +1,45 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
      -
      - <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
      -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
      - -
      - <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
      -
      - <% end %> - -
      - - <% end %> - -
      - - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - +<% if form_file.new_record? %> +
      +<% else %> +
      + <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
      + + + + <% @site_valid_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb index 4e4d9ba3..965ee2ff 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb @@ -1,9 +1,4 @@ - - <% if (writing_patent.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', writing_patent.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= writing_patent.publish_date.strftime("%Y.%m") %> <%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %> @@ -19,7 +14,6 @@ <%= writing_patent.patent_no %> <%= writing_patent.patent_country %> <%= writing_patent.authors %> - <%= writing_patent.url %> <%= User.from_id(writing_patent.create_user_id).name rescue ''%> diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/edit.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/edit.html.erb index 5df22b43..964d6f5c 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/edit.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_patent.editing_personal_patent') %>

      - -<%= form_for @writing_patent, :url => panel_personal_patent_back_end_writing_patent_path(@writing_patent), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @writing_patent, url: panel_personal_patent_back_end_writing_patent_path(@writing_patent), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb index f033fe78..36624755 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/index.html.erb @@ -13,14 +13,12 @@ - - - - - - - - + + + + + + @@ -31,7 +29,7 @@
      <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_patent_back_end_writing_patent_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @writing_patent_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      + <%= paginate @writing_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
      diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/new.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/new.html.erb index 6910434a..f406f998 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/new.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/new.html.erb @@ -8,14 +8,8 @@
      -<%= flash_messages %> - -
      -

      <%= t('writing_patent.new_personal_patent') %>

      -<%= form_for @writing_patent, :url => panel_personal_patent_back_end_writing_patents_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> - +<%= form_for @writing_patent, url: panel_personal_patent_back_end_writing_patents_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb index 330913ec..62950247 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb @@ -15,7 +15,7 @@

      <%= t('add')%> - 專利類別 + <%= t("personal_patent.patent_category") %>

      diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/_profile.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/_profile.html.erb index 78f4a7f1..4b13020a 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/front_end/_profile.html.erb @@ -1,38 +1,48 @@ <% if @member - @writing_patents = WritingPatent.where(:create_user_id => @member.id).desc(:publish_date) - else - @writing_patents = WritingPatent.all.desc(:publish_date) - end + + @writing_patents = WritingPatent.where(is_hidden: false, :create_user_id => @member.id).desc(:publish_date) + + @writing_patent_intro = !PersonalPatentIntro.where(:user_id => @member.id).blank? ? PersonalPatentIntro.where(:user_id => @member.id).first : PersonalPatentIntro.new %> - -<% if !@writing_patents.blank? %> -
      <%= t('personal_patent.publication_date') %><%= t('personal_patent.patent_title') %><%= t('personal_patent.patent_no') %><%= t('personal_patent.patent_country') %><%= t('personal_patent.authors') %><%= t("personal_plugins.author") %>
      - - - - - - - - - <% @writing_patents.each do |writing_patent| %> - - - - - - - <% end %> + <% if @writing_patent_intro.brief_intro and !@writing_patent_intro.blank? %> - -
      <%= t('personal_patent.publication_date') %><%= t('personal_patent.patent_title') %>
      <%= writing_patent.publish_date.strftime("%Y.%m") %> - <%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %> -
      +
      + <%= @writing_patent_intro.text.html_safe rescue '' %> +
      -<% else %> + <% end %> - <%= t('nothing')%> + <% if ( !@writing_patent_intro.blank? and @writing_patent_intro.complete_list ) or @writing_patent_intro.blank? %> + + <% if !@writing_patents.blank? %> + + + + + + + + + + + <% @writing_patents.each do |writing_patent| %> + + + + + + + <% end %> + + +
      <%= t('personal_patent.publication_date') %><%= t('personal_patent.patent_title') %>
      <%= writing_patent.publish_date.strftime("%Y.%m") %> + <%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %> +
      + + <% end %> + + <% end %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/_profile.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/_profile.html.erb index a943682e..fd79473b 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,19 +24,29 @@ end - if @user - @writing_patents = WritingPatent.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @writing_patents = WritingPatent.where(:create_user_id => @user.id).desc(:publish_date).page(params[:page]).per(10) else - @writing_patents = WritingPatent.all.page(params[:page]).per(10) + @writing_patents = WritingPatent.where(is_hidden: false, :create_user_id => @user.id).desc(:publish_date).page(params[:page]).per(10) end - %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_patent_back_end_writing_patents_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_patent_back_end_writing_patents_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + <% if is_admin? %> + + <% end -%> @@ -38,7 +55,12 @@ <% @writing_patents.each do |writing_patent| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_patent.publication_date') %> <%= t('personal_patent.patent_title') %>
      + <%= check_box_tag 'to_change[]', writing_patent.id.to_s, false, :class => "list-check" %> + <%= writing_patent.publish_date.strftime("%Y.%m") %> <%= link_to writing_patent.patent_title, panel_personal_patent_front_end_writing_patent_path(writing_patent) %> @@ -50,11 +72,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_patent_back_end_personal_patent_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_patent_back_end_writing_patent_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_patent/config/routes.rb b/vendor/built_in_modules/personal_patent/config/routes.rb index 10e61fa0..8a0adca2 100644 --- a/vendor/built_in_modules/personal_patent/config/routes.rb +++ b/vendor/built_in_modules/personal_patent/config/routes.rb @@ -13,12 +13,15 @@ Rails.application.routes.draw do resources :writing_patents do collection do get 'delete' + get 'data_share' end match "writing_patent_category_quick_add" => "writing_patents#writing_patent_category_quick_add" ,:as => :writing_patent_category_quick_add match "writing_patent_category_quick_edit" => "writing_patents#writing_patent_category_quick_edit" ,:as => :writing_patent_category_quick_edit end - resources :writing_patent_categorys + + resources :personal_patent_intros + resources :writing_patent_categorys resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_patent/init.rb b/vendor/built_in_modules/personal_patent/init.rb index 9bdf738f..b06f389c 100644 --- a/vendor/built_in_modules/personal_patent/init.rb +++ b/vendor/built_in_modules/personal_patent/init.rb @@ -2,7 +2,7 @@ module PersonalPatent OrbitApp.registration "PersonalPatent",:type=> 'ModuleApp' do module_label 'module_name.personal_patent' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_patent/plugin/profile",:front_path=>"panel/personal_patent/front_end/profile",:admin_path=>"/panel/personal_patent/back_end/writing_patents",:i18n=>'module_name.personal_patent' + personal_plugin :enable => true, :app_name=>"WritingPatent", :intro_app_name=>"PersonalPatentIntro",:path=>"panel/personal_patent/plugin/profile",:front_path=>"panel/personal_patent/front_end/profile",:admin_path=>"/panel/personal_patent/back_end/writing_patents",:i18n=>'module_name.personal_patent' diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/personal_project_intros_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/personal_project_intros_controller.rb new file mode 100644 index 00000000..dab678f0 --- /dev/null +++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/personal_project_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalProject::BackEnd::PersonalProjectIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_project_intro' + @app_type_name = 'personal_project' + @reback_name = 'Project' + end + +end diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb index 0cd5e465..5042c78d 100644 --- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb +++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/projects_controller.rb @@ -10,40 +10,19 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll end def index - - get_plugins + get_plugins - get_categorys("ProjectCategory",params[:project_category_id]) - @filter = params[:filter] - new_filter = params[:new_filter] - - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - @project_categorys = get_categories_for_index("ProjectCategory") - @project_category_ids = @project_categorys.collect{|t| t.id.to_s} + [nil] - - - @projects = (params[:sort] || @filter) ? get_sorted_and_filtered("project",:project_category_id.in => @project_category_ids) : get_viewable("project",:project_category_id.in => @project_category_ids) - @project_pages = @projects.page params[:page] - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @project_category_ids = ProjectCategory.all.collect{|t| t.id.to_s} + [nil] + @projects = get_sorted_and_filtered("project", :project_category_id.in => @project_category_ids) respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @projects } - format.js end end @@ -51,12 +30,12 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll get_plugins - @project_types = ProjectCategory.all + @project_categorys = ProjectCategory.all @tags = get_tags @set_project_type = ProjectCategory.new(:display => 'List') - @project_type_url = panel_personal_project_back_end_projects_path + @project_type_url = panel_personal_project_back_end_projects_path end @@ -125,47 +104,47 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll # POST /projects.xml def create - if params[:project_category] - - @project_category = ProjectCategory.new(params[:project_category]) + if params[:project_category] + + @project_category = ProjectCategory.new(params[:project_category]) - respond_to do |format| - if @project_category.save - format.js { render 'create_project_setting' } - end - end - - else - - @project_types = ProjectCategory.all - @tags = get_tags - - @project = Project.new(params[:project]) - - if params[:project][:user_id] - @project.create_user_id = params[:project][:user_id] - @project.update_user_id = params[:project][:user_id] + respond_to do |format| + if @project_category.save + format.js { render 'create_project_setting' } + end + end + else - @project.create_user_id = current_user.id - @project.update_user_id = current_user.id - end - - respond_to do |format| - if @project.save - - if params[:project][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:project][:user_id],:show_plugin_profile=>'Research Project')) } - else - format.html { redirect_to(panel_personal_project_back_end_projects_url) } - end - - format.xml { render :xml => @project, :status => :created, :location => @project } + + @project_types = ProjectCategory.all + @tags = get_tags + + @project = Project.new(params[:project]) + + if params[:project][:user_id] + @project.create_user_id = params[:project][:user_id] + @project.update_user_id = params[:project][:user_id] else - format.html { render :action => "new" } - format.xml { render :xml => @project.errors, :status => :unprocessable_entity } + @project.create_user_id = current_user.id + @project.update_user_id = current_user.id + end + + respond_to do |format| + if @project.save + + if params[:project][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:project][:user_id],:show_plugin_profile=>"Project")) } + else + format.html { redirect_to(panel_personal_project_back_end_projects_url) } + end + + format.xml { render :xml => @project, :status => :created, :location => @project } + else + format.html { render :action => "new" } + format.xml { render :xml => @project.errors, :status => :unprocessable_entity } + end end end - end end @@ -191,7 +170,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll @project.update_user_id = current_user.id - params[:project][:tag_ids] ||=[] + params[:project][:tag_ids] ||=[] respond_to do |format| if @project.update_attributes(params[:project]) @@ -226,6 +205,29 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll end redirect_to panel_personal_project_back_end_projects_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @projects = Project.any_in(:_id => params[:ids]) + + @projects.each do |project| + + project.is_hidden = params[:disable] + + project.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Project")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_project/app/models/personal_project_intro.rb b/vendor/built_in_modules/personal_project/app/models/personal_project_intro.rb new file mode 100644 index 00000000..5ec5789f --- /dev/null +++ b/vendor/built_in_modules/personal_project/app/models/personal_project_intro.rb @@ -0,0 +1,4 @@ +class PersonalProjectIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb index 43fce2eb..9a8b30ad 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form.html.erb @@ -1,219 +1,296 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'project[tag_ids][]', tag.id, @project.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'project[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      <%= t(:module) %>
      + -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :year ,t("personal_project.year")%> - <%= select_year((@project.year ? @project.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'project[year]'} ) %> -
      - -
      - <%= f.label :project_category ,t("personal_project.project_category")%> - <%= f.select :project_category_id, @project_categorys.collect {|t| [ t.title, t.id ]} %> -
      - -
      - <%= f.label :period_start_date ,t("personal_project.period_start_date")%> - <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      - -
      - <%= f.label :period_end_date ,t("personal_project.period_end_date")%> - <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - -
      - <%= f.label :project_title ,t("personal_project.project_title")%> - <%= f.fields_for :project_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@project.project_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :job_title ,t("personal_project.job_title")%> - <%= f.fields_for :job_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@project.job_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :participator ,t("personal_project.participator")%> - <%= f.fields_for :participator_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@project.participator_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :unit ,t("personal_project.unit")%> - <%= f.fields_for :unit_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@project.unit_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      - <% end %> - -
      + +
      -
      - <%= f.label :url, t("personal_project.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_project.keywords") %> - <%= f.text_field :keywords %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :abstract, t("personal_project.abstract") %> - <%= f.text_field :abstract %> -
      - -
      - <%= f.label :language, t("personal_project.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_project.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_project.English") %> -
      + <% end %> -
      - <%= f.label :note, t("personal_project.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - - - - -
      - -
      - - - - - - - - - - - - - - - - - - <% @project.project_files.each_with_index do |project_file, i| %> - <%= f.fields_for :project_files, project_file do |f| %> - <%= render :partial => 'form_file', :object => project_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
      FileFile Name
      -
      - <%= hidden_field_tag 'plugin_file_field_count', @project.project_files.count %> - ADD/新增 -
      -
      - -
      - -
      - - - - - - -
      - - + +
      + +
      + <%= select_year((@project.year ? @project.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'project[year]',:class => 'span1'} ) %> +
      +
      - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - + +
      + +
      + <%= f.select :project_category_id, @project_categorys.collect {|t| [ t.title, t.id ]} %> +
      +
      + + +
      + +
      + <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1890, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_project.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_project.English") %> +
      +
      + + +
      + +
      + <%= f.text_field :abstract %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@project) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :project_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.project_title"), value: (@project.project_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :job_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.job_title"), value: (@project.job_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :participator_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.participator"), value: (@project.participator_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :unit_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_project.unit"), value: (@project.unit_translations[locale] rescue nil) %> + <% end %> +
      +
      + +
      + + <% end %> + + +
      + +
      + + + <% if @project && !@project.project_files.blank? %> +
      + <% @project.project_files.each_with_index do |project_file, i| %> + <%= f.fields_for :project_files, project_file do |f| %> + <%= render :partial => 'form_file', :object => project_file, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> +
      +
      + <% end %> + + +
      +
      +

      + <%= hidden_field_tag 'plugin_file_field_count', @project.project_files.count %> + <%= t(:add) %> +

      + +
      +
      + + + + +
      + + + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - + <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb index a91d6a85..fa9848e5 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_form_file.html.erb @@ -1,50 +1,45 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
      -
      - <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
      -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
      - -
      - <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
      -
      - <% end %> - -
      - - <% end %> - -
      - - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - +<% if form_file.new_record? %> +
      +<% else %> +
      + <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
      + + + + <% @site_valid_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project.html.erb index 95849b73..363cd47a 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_project.html.erb @@ -1,9 +1,4 @@ - - <% if (project.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', project.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %> <%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %> diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/edit.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/edit.html.erb index 5af1070d..69388dd8 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/edit.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_project.editing_personal_project') %>

      - -<%= form_for @project, :url => panel_personal_project_back_end_project_path(@project), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @project, url: panel_personal_project_back_end_project_path(@project), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb index 474589a6..a778f088 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/index.html.erb @@ -13,13 +13,12 @@ - - - - - - - + + + + + + @@ -28,8 +27,9 @@
      <%= t('personal_project.period') %><%= t('personal_project.project_title') %><%= t('personal_project.participator') %><%= t('personal_project.job_title') %><%= t('personal_project.unit') %><%= t("personal_plugins.author") %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), panel_personal_project_back_end_project_setting_path, :class => 'btn btn-primary pull-right' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_project_back_end_project_path, :class => 'btn btn-primary pull-right' %> -
      - <%= paginate @project_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> +
      + <%= paginate @projects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
      diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/new.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/new.html.erb index f58c98e0..909fc5a5 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/new.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/new.html.erb @@ -8,14 +8,8 @@
      -<%= flash_messages %> - -
      -

      <%= t('project.new_personal_project') %>

      -<%= form_for @project, :url => panel_personal_project_back_end_projects_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> - +<%= form_for @project, url: panel_personal_project_back_end_projects_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb index de1b0fe7..4d4c6fe4 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/project_setting.html.erb @@ -15,7 +15,7 @@

      <%= t('add')%> - 專利類別 + <%= t("personal_project.project_category") %>

      diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/_profile.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/_profile.html.erb index 2e7cd93d..14b37fd8 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/front_end/_profile.html.erb @@ -1,38 +1,48 @@ <% if @member - @projects = Project.where(:create_user_id => @member.id).desc(:period_start_date) - else - @projects = Project.all.page(params[:page]).per(10) - end + + @projects = Project.where(is_hidden: false, :create_user_id => @member.id).desc(:period_start_date) + + @project_intro = !PersonalProjectIntro.where(:user_id => @member.id).blank? ? PersonalProjectIntro.where(:user_id => @member.id).first : PersonalProjectIntro.new %> - -<% if !@projects.blank? %> - - - - - - - - - - <% @projects.each do |project| %> - - - - - - - <% end %> + <% if @project_intro.brief_intro and !@project_intro.blank? %> - -
      <%= t('personal_project.period') %><%= t('personal_project.project_title') %>
      <%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %> - <%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %> -
      +
      + <%= @project_intro.text.html_safe rescue '' %> +
      -<% else %> + <% end %> - <%= t('nothing')%> + <% if ( !@project_intro.blank? and @project_intro.complete_list ) or @project_intro.blank? %> + + <% if !@projects.blank? %> + + + + + + + + + + + <% @projects.each do |project| %> + + + + + + + <% end %> + + +
      <%= t('personal_project.period') %><%= t('personal_project.project_title') %>
      <%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %> + <%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %> +
      + + <% end %> + + <% end %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/_profile.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/_profile.html.erb index 8680f15b..36084706 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,18 +24,29 @@ end - if @user - @projects = Project.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @projects = Project.where(:create_user_id => @user.id).desc(:period_start_date).page(params[:page]).per(10) else - @projects = Project.all.page(params[:page]).per(10) + @projects = Project.where(is_hidden: false, :create_user_id => @user.id).desc(:period_start_date).page(params[:page]).per(10) end - %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_project_back_end_projects_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_project_back_end_projects_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -37,7 +55,12 @@ <% @projects.each do |project| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_project.period') %> <%= t('personal_project.project_title') %>
      + <%= check_box_tag 'to_change[]', project.id.to_s, false, :class => "list-check" %> + <%= project.period_start_date.strftime("%Y.%m") %> ~ <%= project.period_end_date.strftime("%Y.%m") %> <%= link_to project.project_title, panel_personal_project_front_end_project_path(project) %> @@ -49,11 +72,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_project_back_end_personal_project_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_project_back_end_project_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_project/config/routes.rb b/vendor/built_in_modules/personal_project/config/routes.rb index 907cf3de..c93cea3e 100644 --- a/vendor/built_in_modules/personal_project/config/routes.rb +++ b/vendor/built_in_modules/personal_project/config/routes.rb @@ -13,12 +13,15 @@ Rails.application.routes.draw do resources :projects do collection do get 'delete' + get 'data_share' end match "project_category_quick_add" => "projects#project_category_quick_add" ,:as => :project_category_quick_add match "project_category_quick_edit" => "projects#project_category_quick_edit" ,:as => :project_category_quick_edit end - resources :project_categorys + + resources :personal_project_intros + resources :project_categorys resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_project/init.rb b/vendor/built_in_modules/personal_project/init.rb index 914e1fd2..1bc47838 100644 --- a/vendor/built_in_modules/personal_project/init.rb +++ b/vendor/built_in_modules/personal_project/init.rb @@ -2,7 +2,7 @@ module PersonalProject OrbitApp.registration "PersonalProject",:type=> 'ModuleApp' do module_label 'module_name.personal_project' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_project/plugin/profile",:front_path=>"panel/personal_project/front_end/profile",:admin_path=>"/panel/personal_project/back_end/projects",:i18n=>'module_name.personal_project' + personal_plugin :enable => true, :app_name=>"Project", :intro_app_name=>"PersonalProjectIntro",:path=>"panel/personal_project/plugin/profile",:front_path=>"panel/personal_project/front_end/profile",:admin_path=>"/panel/personal_project/back_end/projects",:i18n=>'module_name.personal_project' diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/personal_research_intros_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/personal_research_intros_controller.rb new file mode 100644 index 00000000..2ae84df2 --- /dev/null +++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/personal_research_intros_controller.rb @@ -0,0 +1,10 @@ +class Panel::PersonalResearch::BackEnd::PersonalResearchIntrosController < Admin::PersonalPluginIntrosController + + def initialize + super + @app_type = 'personal_research_intro' + @app_type_name = 'personal_research' + @reback_name = 'Research' + end + +end diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb index d80f740b..b7c12ae8 100644 --- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb +++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/researchs_controller.rb @@ -5,35 +5,18 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro before_filter :authenticate_user! def index - - get_plugins - - @filter = params[:filter] - new_filter = params[:new_filter] + get_plugins - if @filter && params[:clear] - @filter.delete(params[:type]) - elsif @filter && new_filter - if @filter.has_key?(new_filter[:type]) && @filter[new_filter[:type]].include?(new_filter[:id].to_s) - @filter[new_filter[:type]].delete(new_filter[:id].to_s) - elsif @filter.has_key?(new_filter[:type]) - @filter[new_filter[:type]] << new_filter[:id].to_s - else - @filter.merge!({new_filter[:type] => [new_filter[:id].to_s]}) - end - elsif new_filter - @filter = {new_filter[:type] => [new_filter[:id].to_s]} - end - - # @researchs = (params[:sort] || @filter) ? get_sorted_and_filtered("research") : get_viewable("research",:journal_paper_type_id.in => @paper_type_ids) - @researchs = Research.all.page(params[:page]).per(10) - - @tags = get_tags + # @tags = get_tags + # @categories = get_categories_for_index + # @statuses = get_statuses + # category_ids = @categories.collect{|t| t.id} + @researchs = get_sorted_and_filtered("research") respond_to do |format| format.html # index.html.erb + format.js { } format.xml { render :xml => @researchs } - format.js end end @@ -77,25 +60,25 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro # POST /researchs.xml def create - @tags = get_tags + @tags = get_tags @research = Research.new(params[:research]) - if params[:research][:user_id] + if params[:research][:user_id] @research.create_user_id = params[:research][:user_id] @research.update_user_id = params[:research][:user_id] else - @research.create_user_id = current_user.id + @research.create_user_id = current_user.id @research.update_user_id = current_user.id end respond_to do |format| if @research.save - if params[:research][:user_id] - format.html { redirect_to(admin_users_new_interface_url(:id=>params[:research][:user_id],:show_plugin_profile=>'Research')) } + if params[:research][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:research][:user_id],:show_plugin_profile=>"Research")) } else - format.html { redirect_to(panel_personal_research_back_end_researchs_url) } + format.html { redirect_to(panel_personal_research_back_end_researchs_url) } end format.xml { render :xml => @research, :status => :created, :location => @research } @@ -114,12 +97,12 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro @research.update_user_id = current_user.id - params[:research][:tag_ids] ||=[] + params[:research][:tag_ids] ||=[] respond_to do |format| if @research.update_attributes(params[:research]) format.html { redirect_to(panel_personal_research_back_end_researchs_url) } - # format.js { render 'toggle_enable' } + # format.js { render 'toggle_enable' } format.xml { head :ok } else format.html { render :action => "edit" } @@ -148,6 +131,29 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro end redirect_to panel_personal_research_back_end_researchs_url(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]) end + + def data_share + + if params[:ids] + + @researchs = Research.any_in(:_id => params[:ids]) + + @researchs.each do |research| + + research.is_hidden = params[:disable] + + research.save + end + + end + + respond_to do |format| + + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Research")) } + + end + + end protected diff --git a/vendor/built_in_modules/personal_research/app/models/personal_research_intro.rb b/vendor/built_in_modules/personal_research/app/models/personal_research_intro.rb new file mode 100644 index 00000000..79cb9312 --- /dev/null +++ b/vendor/built_in_modules/personal_research/app/models/personal_research_intro.rb @@ -0,0 +1,4 @@ +class PersonalResearchIntro < PersonalPluginIntro + + +end diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb index 44d57453..7181a674 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form.html.erb @@ -1,193 +1,262 @@ <% # encoding: utf-8 %> +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/main-forms" %> + <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/main-list" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/module-area" %> +<% end %> <%= f.error_messages %> - - -
      + +
      -
      -
      - -
      -

      Tags

      -
      - <% @tags.each do |tag| %> - <%= content_tag :label,:class => "checkbox inline" do -%> - <%= check_box_tag 'research[tag_ids][]', tag.id, @research.tag_ids.include?(tag.id)%> - <%= tag.name %> - <%= hidden_field_tag 'research[tag_ids][]', '' %> - <% end %> - <% end %> -
      -
      - -
      - - - - + +
      <%= t(:module) %>
      + -
      -
      - - <% if !params[:user_id].blank? %> - -
      - <%= t("著作人")%> - <%= User.from_id(params[:user_id]).name rescue ''%> -
      - - <% end %> - -
      - <%= f.label :year ,t("personal_research.year")%> - <%= select_year((@research.year ? @research.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'research[year]'} ) %> -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> -
      - <%= f.label :research_title ,t("personal_research.research_title")%> - <%= f.fields_for :research_title_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@research.research_title_translations[locale] rescue nil) %> - <% end %> -
      - -
      - <%= f.label :extracted_chapters ,t("personal_research.extracted_chapters")%> - <%= f.fields_for :extracted_chapters_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_field locale, :class=>'post-title', :value => (@research.extracted_chapters_translations[locale] rescue nil) %> - <% end %> -
      + +
      -
      - <%= f.label :authors,t("web_resource.authors") %> - <%= f.fields_for :authors_translations do |f| %> - <%= I18nVariable.from_locale(locale) %> - <%= f.text_area locale, :size => "60x3", :value => (@research.authors_translations[locale] rescue nil) %> - <% end %> -
      - -
      + +
      - <% end %> - -
      - -
      - <%= f.label :publish_date ,t("personal_research.publish_date")%> - <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> -
      + <% if !params[:user_id].blank? %> + +
      + +
      + <%= User.from_id(params[:user_id]).name rescue ''%> +
      +
      -
      - <%= f.label :url, t("personal_research.url") %> - <%= f.text_field :url %> -
      - -
      - <%= f.label :keywords, t("personal_research.keywords") %> - <%= f.text_field :keywords %> -
      - -
      - <%= f.label :language, t("personal_research.language") %> - <%= f.radio_button :language, "Chinese" %> <%= t("personal_research.Chinese") %> - <%= f.radio_button :language, "English" %> <%= t("personal_research.English") %> -
      + <% end %> -
      - <%= f.label :note, t("personal_research.note") %> - <%= f.text_area :note, :size => "60x3" %> -
      - -
      - - - -
      - -
      - - - - - - - - - - - - - - - - - - <% @research.research_files.each_with_index do |research_file, i| %> - <%= f.fields_for :research_files, research_file do |f| %> - <%= render :partial => 'form_file', :object => research_file, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> - -
      FileFile Name
      -
      - <%= hidden_field_tag 'plugin_file_field_count', @research.research_files.count %> - ADD/新增 -
      -
      - -
      - -
      - - - - - - -
      - - + +
      + +
      + <%= select_year((@research.year ? @research.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'research[year]',:class => 'span1'} ) %> +
      +
      - -
      - <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> - <%= f.submit t('submit'), :class=>'btn btn-primary' %> - <%= link_to t('cancel'), get_go_back, :class=>"btn" %> -
      - + +
      + +
      + <%= f.date_select :publish_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month], :discard_day => true }, {:class => 'span1'} %> +
      +
      + + +
      + +
      + <%= f.text_field :url , :class => "span6" %> +
      +
      + + +
      + +
      + <%= f.text_field :keywords %> +
      +
      + + +
      + +
      + <%= f.radio_button :language, "Chinese" %> <%= t("personal_research.Chinese") %> + <%= f.radio_button :language, "English" %> <%= t("personal_research.English") %> +
      +
      + + +
      + +
      + <%= f.text_area :note, rows: 2, class: "input-block-level" %> +
      +
      + +
      + + + <% if show_form_status_field(@research) %> +
      + + +
      + +
      + +
      +
      + +
      + <% end %> + + +
      + + +
      + +
      + <% @tags.each do |tag| %> + + <% end %> +
      +
      + +
      + +
      + + +
      <%= t(:language) %>
      + + + +
      + + <% @site_valid_locales.each_with_index do |locale, i| %> + +
      "> + + +
      + +
      + <%= f.fields_for :research_title_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_research.research_title"), value: (@research.research_title_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :extracted_chapters_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_research.extracted_chapters"), value: (@research.extracted_chapters_translations[locale] rescue nil) %> + <% end %> +
      +
      + + +
      + +
      + <%= f.fields_for :authors_translations do |f| %> + <%= f.text_field locale, class: "input-block-level", placeholder: t("personal_research.authors"), value: (@research.authors_translations[locale] rescue nil) %> + <% end %> +
      +
      + +
      + + <% end %> + + +
      + +
      + + + <% if @research && !@research.research_files.blank? %> +
      + <% @research.research_files.each_with_index do |research_file, i| %> + <%= f.fields_for :research_files, research_file do |f| %> + <%= render :partial => 'form_file', :object => research_file, :locals => {:f => f, :i => i} %> + <% end %> + <% end %> +
      +
      + <% end %> + + +
      +
      +

      + <%= hidden_field_tag 'plugin_file_field_count', @research.research_files.count %> + <%= t(:add) %> +

      + +
      +
      + + + + +
      + + + +
      + + +
      + <%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %> + <%= f.submit t('submit'), class: 'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %> +
      <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "archive_plugin_form" %> - + <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb index a91d6a85..fa9848e5 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_form_file.html.erb @@ -1,50 +1,45 @@ -<% # encoding: utf-8 %> - - " class='list_item'> - -
      -
      - <%= f.file_field :file %> - <%= form_file.file.file ? ( link_to t(:view), form_file.file.url, {:class => 'btn', :target => '_blank', :title => t(:view)} ) : '' %> -
      -
      - - - -
      - - <% @site_valid_locales.each_with_index do |locale, i| %> - -
      "> - <%#= f.fields_for :i18n_variable, (form_file.new_record? ? form_file.build_i18n_variable : form_file.i18n_variable ) do |f| %> - <%= f.fields_for :file_title_translations do |f| %> -
      - -
      - <%= f.text_field locale, :class=>'post-file_title', :value => (form_file.file_title_translations[locale] rescue nil) %> -
      -
      - <% end %> - -
      - - <% end %> - -
      - - - - - - <% if form_file.new_record? %> - - <% else %> - <%= f.hidden_field :id %> - - <%= f.hidden_field :should_destroy, :value => nil, :class => 'should_destroy' %> - <% end %> - - - - - +<% if form_file.new_record? %> +
      +<% else %> +
      + <% if form_file.file.blank? %> + <%= t(:no_file) %> + <% else %> + <%= link_to content_tag(:i) + form_file.file_identifier, form_file.file.url, {:class => 'file-link file-type', :target => '_blank', :title => form_file.file_identifier} %> + <% end %> +<% end %> +
      + + + + <% @site_valid_locales.each_with_index do |locale, i| %> + <%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class => "input-medium", placeholder: t(:alternative), :value => (form_file.title_translations[locale] rescue nil) %> + <% end %> + + <% end %> + + + <% if form_file.new_record? %> + + + + <% else %> + + <%= f.hidden_field :id %> + + <%= f.hidden_field :_destroy, :value => nil, :class => 'should_destroy' %> + + <% end %> +
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_research.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_research.html.erb index 41a055f7..a9a3f6bc 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_research.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_research.html.erb @@ -1,9 +1,4 @@ - - <% if (research.create_user_id == current_user.id) || is_manager? %> - <%= check_box_tag 'to_delete[]', research.id, false, :class => "checkbox_in_list" %> - <% end -%> - <%= research.publish_date.strftime("%Y.%m") %> <%= link_to research.research_title , panel_personal_research_front_end_research_path(research) %> diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/edit.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/edit.html.erb index b905b840..2da6f051 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/edit.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/edit.html.erb @@ -8,8 +8,8 @@
      -

      <%= t('personal_research.editing_personal_research') %>

      - -<%= form_for @research, :url => panel_personal_research_back_end_research_path(@research), :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> +<%= form_for @research, url: panel_personal_research_back_end_research_path(@research), html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb index 22d57d3b..5c55084c 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/index.html.erb @@ -13,11 +13,10 @@ - - - - - + + + + @@ -27,7 +26,7 @@
      <%= link_to content_tag(:i, nil, :class => 'icon-plus icon-white') + t('announcement.add_new'), new_panel_personal_research_back_end_research_path, :class => 'btn btn-primary pull-right' %> -
      +
      <%= paginate @researchs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
      -
      +
      \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/new.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/new.html.erb index f6ef0ab3..df6dcc46 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/new.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/new.html.erb @@ -8,14 +8,8 @@ -<%= flash_messages %> - -
      -

      <%= t('research.new_personal_research') %>

      -<%= form_for @research, :url => panel_personal_research_back_end_researchs_path, :html => {:class => 'clear'} do |f| %> - <%= render :partial => 'form', :locals => {:f => f} %> -<% end %> -
      - -<%#= link_back %> - +<%= form_for @research, url: panel_personal_research_back_end_researchs_path, html: {class: "form-horizontal main-forms previewable"} do |f| %> +
      + <%= render partial: 'form', locals: {f: f} %> +
      +<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/_profile.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/_profile.html.erb index 5cbffba1..b17bda8c 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/_profile.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/front_end/_profile.html.erb @@ -1,38 +1,48 @@ <% if @member - @researchs = Research.where(:create_user_id => @member.id).desc(:publish_date) - else - @researchs = Research.all.desc(:publish_date) - end + + @researchs = Research.where(is_hidden: false, :create_user_id => @member.id).desc(:publish_date) + + @research_intro = !PersonalResearchIntro.where(:user_id => @member.id).blank? ? PersonalResearchIntro.where(:user_id => @member.id).first : PersonalResearchIntro.new %> - -<% if !@researchs.blank? %> -
      <%= t('personal_research.publication_date') %><%= t('personal_research.research_title') %><%= t('personal_research.url') %><%= t("personal_plugins.author") %>
      - - - - - - - - - <% @researchs.each do |research| %> - - - - - - - <% end %> + <% if @research_intro.brief_intro and !@research_intro.blank? %> - -
      <%= t('personal_research.publication_date') %><%= t('personal_research.research_title') %>
      <%= research.publish_date.strftime("%Y.%m") %> - <%= link_to research.research_title, panel_personal_research_front_end_research_path(research) %> -
      +
      + <%= @research_intro.text.html_safe rescue '' %> +
      -<% else %> + <% end %> - <%= t('nothing')%> + <% if ( !@research_intro.blank? and @research_intro.complete_list ) or @research_intro.blank? %> + + <% if !@researchs.blank? %> + + + + + + + + + + + <% @researchs.each do |research| %> + + + + + + + <% end %> + + +
      <%= t('personal_research.publication_date') %><%= t('personal_research.research_title') %>
      <%= research.publish_date.strftime("%Y.%m") %> + <%= link_to research.research_title, panel_personal_research_front_end_research_path(research) %> +
      + + <% end %> + + <% end %> <% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/_profile.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/_profile.html.erb index daa3bf77..f4458489 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/_profile.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/plugin/_profile.html.erb @@ -1,3 +1,10 @@ +<% content_for :page_specific_css do %> + <%= stylesheet_link_tag "lib/list-check" %> +<% end %> +<% content_for :page_specific_javascript do %> + <%= javascript_include_tag "lib/list-check" %> +<% end %> + <% @filter = params[:filter] new_filter = params[:new_filter] @@ -17,17 +24,29 @@ end - if @user - @researchs = Research.where(:create_user_id => @user.id).page(params[:page]).per(10) + if @user && is_admin? + @researchs = Research.where(:create_user_id => @user.id).desc(:publish_date).page(params[:page]).per(10) else - @researchs = Research.all.page(params[:page]).per(10) + @researchs = Research.where(is_hidden: false, :create_user_id => @user.id).desc(:publish_date).page(params[:page]).per(10) end %> +<% if is_admin? %> +
      +
      + <%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => data_share_panel_personal_research_back_end_researchs_path(:user_id => params[:id], :disable => 'true') ) %> + <%= link_to('Show', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-show", :rel => data_share_panel_personal_research_back_end_researchs_path(:user_id => params[:id], :disable => 'false') ) %> +
      +
      +<% end -%> + + <% if is_admin? %> + + <% end -%> @@ -36,7 +55,12 @@ <% @researchs.each do |research| %> - + "> + <% if is_admin? %> + + <% end -%>
      <%= t('personal_research.publication_date') %> <%= t('personal_research.research_title') %>
      + <%= check_box_tag 'to_change[]', research.id.to_s, false, :class => "list-check" %> + <%= research.publish_date.strftime("%Y.%m") %> <%= link_to research.research_title, panel_personal_research_front_end_research_path(research) %> @@ -48,11 +72,25 @@
      +<% if is_admin? %>
      + <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('personal_plugins.edit_brief_intro'), panel_personal_research_back_end_personal_research_intros_path(:user_id => @user.id), :class => 'btn btn-primary' %> <%= link_to content_tag(:i, nil, :class => 'icon-plus') + t('announcement.add_new'), new_panel_personal_research_back_end_research_path(:user_id => @user.id), :class => 'btn btn-primary' %>
      +<% end %> + + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_research/config/locales/en.yml b/vendor/built_in_modules/personal_research/config/locales/en.yml index e6eac756..ca9e5072 100644 --- a/vendor/built_in_modules/personal_research/config/locales/en.yml +++ b/vendor/built_in_modules/personal_research/config/locales/en.yml @@ -1,6 +1,6 @@ en: module_name: - personal_research: Research + personal_research: Research Project personal_research: paper_title : "Paper Title" research_title : "Research Title" diff --git a/vendor/built_in_modules/personal_research/config/routes.rb b/vendor/built_in_modules/personal_research/config/routes.rb index c753af28..36ca3ccd 100644 --- a/vendor/built_in_modules/personal_research/config/routes.rb +++ b/vendor/built_in_modules/personal_research/config/routes.rb @@ -13,12 +13,14 @@ Rails.application.routes.draw do resources :researchs do collection do get 'delete' + get 'data_share' end match "tag_quick_add" => "researchs#tag_quick_add" ,:as => :tag_quick_add match "tag_quick_edit" => "researchs#tag_quick_edit" ,:as => :tag_quick_edit end + resources :personal_research_intros resources :tags end namespace :front_end do diff --git a/vendor/built_in_modules/personal_research/init.rb b/vendor/built_in_modules/personal_research/init.rb index fdd0d11c..85e37112 100644 --- a/vendor/built_in_modules/personal_research/init.rb +++ b/vendor/built_in_modules/personal_research/init.rb @@ -2,7 +2,7 @@ module PersonalResearch OrbitApp.registration "PersonalResearch",:type=> 'ModuleApp' do module_label 'module_name.personal_research' base_url File.expand_path File.dirname(__FILE__) - personal_plugin :enable => true,:path=>"panel/personal_research/plugin/profile",:front_path=>"panel/personal_research/front_end/profile",:admin_path=>"/panel/personal_research/back_end/researchs",:i18n=>'module_name.personal_research' + personal_plugin :enable => true, :app_name=>"Research", :intro_app_name=>"PersonalResearchIntro",:path=>"panel/personal_research/plugin/profile",:front_path=>"panel/personal_research/front_end/profile",:admin_path=>"/panel/personal_research/back_end/researchs",:i18n=>'module_name.personal_research' diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb index c39b8812..2ae6a557 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb @@ -5,6 +5,7 @@ <% end %> <% content_for :page_specific_javascript do %> <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "lib/module-area" %> <% end %> <%= f.error_messages %>