From 93909eeca0eeb74606dc70618e6f823bf4a87990 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Tue, 10 Sep 2013 17:27:43 +0800 Subject: [PATCH 01/27] Get data from database Conflicts: app/controllers/admin/import_data_controller.rb Conflicts: app/controllers/admin/import_data_controller.rb app/views/admin/import_data/get_teacher_data.html.erb --- .../admin/import_data_controller.rb | 94 +++++++++++++++++++ .../import_data/get_teacher_data.html.erb | 1 + 2 files changed, 95 insertions(+) create mode 100644 app/controllers/admin/import_data_controller.rb create mode 100644 app/views/admin/import_data/get_teacher_data.html.erb diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb new file mode 100644 index 000000000..bda2f9ed7 --- /dev/null +++ b/app/controllers/admin/import_data_controller.rb @@ -0,0 +1,94 @@ +# encoding: utf-8 + +require 'net/http' +require 'open-uri' + +class Admin::ImportDataController < OrbitBackendController + + def get_teacher_data + uri = URI("https://15fc4b.ngrok.com/teachers.xml") + #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} + #uri.query = URI.encode_www_form(params) + res = Net::HTTP.get_response(uri) + + + @teacher_data = Hash.from_xml(res.body) + @teachers = @teacher_data["objects"] + @i = 2000 + @teachers.each do |hash| + @roles = Role.all + @teacher = User.new + I18n.locale = :zh_tw + if hash['teacher_zh_tw'].blank? + @teacher.first_name = hash['teacher_en'] + elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? + @teacher.first_name = "Please Fill the Name" + else + @teacher.first_name = hash['teacher_zh_tw'] + end + I18n.locale = :en + if hash['teacher_en'].blank? + @teacher.first_name = hash['teacher_zh_tw'] + elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? + @teacher.first_name = "Please Fill the Name" + else + @teacher.first_name = hash['teacher_en'] + end + + #@teacher.first_name = hash['teacher_en'] + @teacher.ntu_seq = hash['ntu_seq'] + @teacher.role_ids = ["#{@roles.first.id}"] + @teacher.password = "testpass" + @i += 10 + if hash['email'].blank? + @teacher.email = "#{@i}@ntu.edu.tw" + Rails.logger.info"@@@@@@@@@@@@@@@@@@@@@"+@teacher.email.inspect + else + @teacher.email = hash['email'] + end + @teacher.user_id = hash['teacher_en'] + @teacher.save! + end + end + # def get_book_data + # uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp") + # params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} + # uri.query = URI.encode_www_form(params) + # res = Net::HTTP.get_response(uri) + + # teachers = User.all + + # teachers.each do |hash| + # if hash.ntu_seq.present? + # ntu_seq = hash.ntu_seq + # books_xml = Nokogiri::XML( \ + # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + # @books = books_xml.xpath("//Book").map do |book_node| + # { + # author: (book_node>"Authors").text, + # year: (book_node>"PublishYear").text, + # title: (book_node>"DocTitle").text, + # remarks: (book_node>"Remarks").text, + # publisher: (book_node>"Publisher").text, + # book_title: (book_node>"BookTitle").text + # } + # end + # if @books.present? + # @books.each do |b| + # @book = WritingBook.new + # @book.authors = b[:author] + # @book.paper_title = b[:title] + # @book.book_title = b[:book_title] + # @book.year = b[:year] + # @book.note = b[:remarks] + # @book.publisher = b[:publisher] + # @book.create_user_id = hash.id + # @book.save + # end + # else + # puts "No books by Teacher" + # end + # end + # end + #end +end diff --git a/app/views/admin/import_data/get_teacher_data.html.erb b/app/views/admin/import_data/get_teacher_data.html.erb new file mode 100644 index 000000000..980c42165 --- /dev/null +++ b/app/views/admin/import_data/get_teacher_data.html.erb @@ -0,0 +1 @@ +

Successfully Imported Teacher Data!

\ No newline at end of file From d2a07d9ffb84eb7b0e2d6f79f3953b8772d5168c Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 11 Sep 2013 09:54:07 +0800 Subject: [PATCH 02/27] Import Announcements, Journal Paper, Conference Data, book data Conflicts: app/models/user/user.rb --- .../admin/import_data_controller.rb | 234 ++++++++++++++---- app/models/user/user.rb | 2 + .../get_journal_paper_data.html.erb | 1 + 3 files changed, 193 insertions(+), 44 deletions(-) create mode 100644 app/views/admin/import_data/get_journal_paper_data.html.erb diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index bda2f9ed7..fbf0284b0 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -6,11 +6,11 @@ require 'open-uri' class Admin::ImportDataController < OrbitBackendController def get_teacher_data - uri = URI("https://15fc4b.ngrok.com/teachers.xml") + uri = URI("https://tp.rulingcom.com:33333/teachers.xml") + #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} #uri.query = URI.encode_www_form(params) res = Net::HTTP.get_response(uri) - @teacher_data = Hash.from_xml(res.body) @teachers = @teacher_data["objects"] @@ -42,53 +42,199 @@ class Admin::ImportDataController < OrbitBackendController @i += 10 if hash['email'].blank? @teacher.email = "#{@i}@ntu.edu.tw" - Rails.logger.info"@@@@@@@@@@@@@@@@@@@@@"+@teacher.email.inspect else @teacher.email = hash['email'] end - @teacher.user_id = hash['teacher_en'] + + if hash['teacher_zh_tw'].blank? + @teacher.user_id = hash['teacher_en'] + elsif hash['teacher_en'].blank? + @teacher.user_id = hash['teacher_zh_tw'] + end @teacher.save! end end - # def get_book_data - # uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp") - # params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} - # uri.query = URI.encode_www_form(params) - # res = Net::HTTP.get_response(uri) - - # teachers = User.all - # teachers.each do |hash| - # if hash.ntu_seq.present? - # ntu_seq = hash.ntu_seq - # books_xml = Nokogiri::XML( \ - # open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) - # @books = books_xml.xpath("//Book").map do |book_node| - # { - # author: (book_node>"Authors").text, - # year: (book_node>"PublishYear").text, - # title: (book_node>"DocTitle").text, - # remarks: (book_node>"Remarks").text, - # publisher: (book_node>"Publisher").text, - # book_title: (book_node>"BookTitle").text - # } - # end - # if @books.present? - # @books.each do |b| - # @book = WritingBook.new - # @book.authors = b[:author] - # @book.paper_title = b[:title] - # @book.book_title = b[:book_title] - # @book.year = b[:year] - # @book.note = b[:remarks] - # @book.publisher = b[:publisher] - # @book.create_user_id = hash.id - # @book.save - # end - # else - # puts "No books by Teacher" - # end - # end - # end - #end + def get_book_data + uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp") + params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} + uri.query = URI.encode_www_form(params) + res = Net::HTTP.get_response(uri) + + teachers = User.all + + teachers.each do |hash| + if hash.ntu_seq.present? + ntu_seq = hash.ntu_seq + books_xml = Nokogiri::XML( \ + open("http://ann.cc.ntu.edu.tw/Achv/xmlBook.asp?Seq=#{ntu_seq}")) + @books = books_xml.xpath("//Book").map do |book_node| + { + author: (book_node>"Authors").text, + year: (book_node>"PublishYear").text, + title: (book_node>"DocTitle").text, + remarks: (book_node>"Remarks").text, + publisher: (book_node>"Publisher").text, + book_title: (book_node>"BookTitle").text + } + end + if @books.present? + @books.each do |b| + @book = WritingBook.new + @book.authors = b[:author] + @book.paper_title = b[:title] + @book.book_title = b[:book_title] + @book.year = b[:year] + @book.note = b[:remarks] + @book.publisher = b[:publisher] + @book.create_user_id = hash.id + @book.save + end + else + puts "No books by Teacher" + end + end + end + end + + def get_conference_data + uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp") + params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} + uri.query = URI.encode_www_form(params) + res = Net::HTTP.get_response(uri) + + teachers = User.all + + teachers.each do |hash| + if hash.ntu_seq.present? + ntu_seq = hash.ntu_seq + conference_xml = Nokogiri::XML( \ + open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=C")) + #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml")) + @conference_papers = conference_xml.xpath("//Paper").map do |cp_node| + { + author: (cp_node>"Authors").text, + year: (cp_node>"PublishYear").text, + title: (cp_node>"PaperTitle").text, + conference: (cp_node>"PublishOn").text, + date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i], + location: (cp_node>"Location").text, + remarks: (cp_node>"Remarks").text + } + end + if @conference_papers.present? + @conference_papers.each do |b| + @conference_paper = WritingConference.new + @conference_paper.authors = b[:author] + if b[:title].blank? + @conference_paper.paper_title = b[:title] + else + @conference_paper.paper_title = "No Title Present" + end + @conference_paper.year = b[:year] + @conference_paper.note = b[:remarks] + @conference_paper.create_user_id = hash.id + @conference_paper.save! + end + else + puts "No conference by Teacher" + end + end + end + end + + + def get_journal_paper_data + uri = URI("http://ann.cc.ntu.edu.tw/Achv/xmlTeacherData.asp") + params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} + uri.query = URI.encode_www_form(params) + res = Net::HTTP.get_response(uri) + + teachers = User.all + + teachers.each do |hash| + if hash.ntu_seq.present? + ntu_seq = hash.ntu_seq + paper_xml = Nokogiri::XML( \ + #open("http://versatile.management.ntu.edu.tw/publication1/journal/#{ntuseq}.xml")) + open("http://ann.cc.ntu.edu.tw/Achv/xmlPaper.asp?Seq=#{ntu_seq}&type=J")) + @journal_papers = paper_xml.xpath("//Paper").map do |paper_node| + { + author: (paper_node>"Authors").text, + year: (paper_node>"PublishYear").text, + title: (paper_node>"PaperTitle").text, + journal: (paper_node>"PublishOn").text, + volume:(paper_node>"Volume").text, + volumeno:(paper_node>"VolumeNo").text, + beginpage:(paper_node>"BeginPage").text, + endpage:(paper_node>"EndPage").text, + subgroup:(paper_node>"subgroup").text, + remarks: (paper_node>"Remarks").text, + cate: ((paper_node>"subgroup")>"group").text + } + end + if @journal_papers.present? + @journal_papers.each do |b| + @journal_paper = WritingJournal.new + @journal_paper.authors = b[:author] + if b[:title].blank? + @journal_paper.paper_title = b[:title] + else + @journal_paper.paper_title = "No Title Present" + end + @journal_paper.year = b[:year] + @journal_paper.note = b[:remarks] + @journal_paper.vol_no = b[:volumeno] + @journal_paper.form_to_start = b[:beginpage] + @journal_paper.form_to_end = b[:endpage] + @journal_paper.create_user_id = hash.id + @journal_paper.save! + end + else + puts "No journal paper by Teacher" + end + end + end + end + + def get_announcement_data + uri = URI("https://tp.rulingcom.com:33333/announcements.xml") + + #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} + #uri.query = URI.encode_www_form(params) + res = Net::HTTP.get_response(uri) + + @announcement_data = Hash.from_xml(res.body) + @announcements = @announcement_data["objects"] + @announcements.each do |hash| + @bulletin = Bulletin.new + + I18n.locale = :zh_tw + if hash['announcement_title_zh_tw'].blank? + @bulletin.title = hash['announcement_title_en'] + @bulletin.text = hash['announcement_content_zh_tw'] + elsif hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank? + @bulletin.title = "Please Fill the Name" + @bulletin.text = hash['announcement_content_zh_tw'] + else + @bulletin.title = hash['announcement_title_zh_tw'] + @bulletin.text = hash['announcement_content_zh_tw'] + end + + I18n.locale = :en + if hash['announcement_title_en'].blank? + @bulletin.title = hash['announcement_zh_tw'] + @bulletin.text = hash['announcement_content_en'] + elsif hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank? + @bulletin.first_name = "Please Fill the Name" + @bulletin.text = hash['announcement_content_en'] + else + @bulletin.first_name = hash['announcement_title_en'] + @bulletin.text = hash['announcement_content_en'] + end + + @bulletin.save! + end + end + end diff --git a/app/models/user/user.rb b/app/models/user/user.rb index c8a682c89..7623874b9 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -18,6 +18,8 @@ class User field :office_tel field :cache_dept,type: Hash field :status_record,type: Hash + field :ntu_seq + #validates :ntu_seq, :uniqueness => true has_and_belongs_to_many :approving_apps, class_name: 'AuthApproval', inverse_of: 'authorized_users' has_and_belongs_to_many :managing_apps, class_name: 'AuthManager', inverse_of: 'authorized_users' diff --git a/app/views/admin/import_data/get_journal_paper_data.html.erb b/app/views/admin/import_data/get_journal_paper_data.html.erb new file mode 100644 index 000000000..cd34dce59 --- /dev/null +++ b/app/views/admin/import_data/get_journal_paper_data.html.erb @@ -0,0 +1 @@ +

Successfully Journal Paper Data!

\ No newline at end of file From e4514a353a70a7dc7c918c20a0352dc0ab2ceaf9 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 11 Sep 2013 10:38:56 +0800 Subject: [PATCH 03/27] Updated import data controller to check for blank user_id --- app/controllers/admin/import_data_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index fbf0284b0..c86df98b8 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -50,6 +50,8 @@ class Admin::ImportDataController < OrbitBackendController @teacher.user_id = hash['teacher_en'] elsif hash['teacher_en'].blank? @teacher.user_id = hash['teacher_zh_tw'] + else + @teacher.user_id = "Please Enter a User Name" end @teacher.save! end From 2a9948868f7d629c31c6539e5a1cf97646a891d7 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 11 Sep 2013 11:37:42 +0800 Subject: [PATCH 04/27] Updated import data controller to check the absense of title data --- .../admin/import_data_controller.rb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index c86df98b8..5b58e3122 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -14,25 +14,25 @@ class Admin::ImportDataController < OrbitBackendController @teacher_data = Hash.from_xml(res.body) @teachers = @teacher_data["objects"] - @i = 2000 + @i = 5000 @teachers.each do |hash| @roles = Role.all @teacher = User.new I18n.locale = :zh_tw - if hash['teacher_zh_tw'].blank? - @teacher.first_name = hash['teacher_en'] - elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? - @teacher.first_name = "Please Fill the Name" + if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? + @teacher.first_name = "Please Fill the Name" + elsif hash['teacher_zh_tw'].blank? && !hash['teacher_en'].blank? + @teacher.first_name = hash['teacher_en'] else - @teacher.first_name = hash['teacher_zh_tw'] + @teacher.first_name = hash['teacher_zh_tw'] end I18n.locale = :en - if hash['teacher_en'].blank? + if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? + @teacher.first_name = "Please Fill the Name" + elsif hash['teacher_en'].blank? && !hash['teacher_zh_tw'].blank? @teacher.first_name = hash['teacher_zh_tw'] - elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? - @teacher.first_name = "Please Fill the Name" else - @teacher.first_name = hash['teacher_en'] + @teacher.first_name = hash['teacher_en'] end #@teacher.first_name = hash['teacher_en'] From 6280fdfba0c1a38ae99ffa44390e45ee2a254055 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 11 Sep 2013 11:50:57 +0800 Subject: [PATCH 05/27] Updated route to get announcement data Conflicts: config/routes.rb --- config/routes.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/routes.rb b/config/routes.rb index 2263b3c77..86639e8c2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -200,6 +200,12 @@ Orbit::Application.routes.draw do get 'change_design' get 'preference' end + + get "import_data/get_teacher_data" + get "import_data/get_book_data" + get "import_data/get_conference_data" + get "import_data/get_journal_paper_data" + get "import_data/get_announcement_data" resources :tags do collection do From c8be884291e222b15eca5e474faf88f096663da5 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 11 Sep 2013 13:33:06 +0800 Subject: [PATCH 06/27] Updated import data controller --- app/controllers/admin/import_data_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index 5b58e3122..e223c5472 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -129,9 +129,9 @@ class Admin::ImportDataController < OrbitBackendController @conference_paper = WritingConference.new @conference_paper.authors = b[:author] if b[:title].blank? - @conference_paper.paper_title = b[:title] - else @conference_paper.paper_title = "No Title Present" + else + @conference_paper.paper_title = b[:title] end @conference_paper.year = b[:year] @conference_paper.note = b[:remarks] From f16d1908bee59c64228bb97a6ed4bc5295249b4c Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 11 Sep 2013 13:49:38 +0800 Subject: [PATCH 07/27] Updated import data controller to import data correctly --- app/controllers/admin/import_data_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index e223c5472..fccd0eb52 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -180,9 +180,9 @@ class Admin::ImportDataController < OrbitBackendController @journal_paper = WritingJournal.new @journal_paper.authors = b[:author] if b[:title].blank? - @journal_paper.paper_title = b[:title] + @journal_paper.paper_title = "No Title Present" else - @journal_paper.paper_title = "No Title Present" + @journal_paper.paper_title = b[:title] end @journal_paper.year = b[:year] @journal_paper.note = b[:remarks] From 249644e72c293572be2344f3f36eb7e3c00bef0c Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Fri, 13 Sep 2013 14:09:58 +0800 Subject: [PATCH 08/27] Added method for importing page data --- .../admin/import_data_controller.rb | 66 +++++++++++++++++++ app/controllers/admin/pages_controller.rb | 2 +- .../admin/import_data/get_page_data.html.erb | 1 + config/routes.rb | 2 + 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 app/views/admin/import_data/get_page_data.html.erb diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index fccd0eb52..b02899acc 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -4,6 +4,8 @@ require 'net/http' require 'open-uri' class Admin::ImportDataController < OrbitBackendController + helper Admin::PagePartsHelper + include Admin::FrontendWidgetInterface def get_teacher_data uri = URI("https://tp.rulingcom.com:33333/teachers.xml") @@ -238,5 +240,69 @@ class Admin::ImportDataController < OrbitBackendController @bulletin.save! end end + + def get_page_data + f = File.open("/home/rwub/orbit-db/ntu_mb/pages/management_pages.xml") + page_xml = Nokogiri::XML(f) + #open("http://versatile.management.ntu.edu.tw/publication1/conference/#{ntuseq}.xml")) + @pages = page_xml.xpath("//management-page").map do |cp_node| + { + menu_title: (cp_node>"menu-title").text, + content: (cp_node>"content").text + } + end + if @pages.present? + @pages.each do |b| + + get_variables_for_new + @page = Page.new + + @page.parent = "4f45f3b9e9d02c5db900005d" + @page.design = "50ac424983e75219d2000021" + @page.theme_id = "50ac424a83e75219d2000025" + @page.menu_enabled_for= ["en", "zh_tw", ""] + @page.enabled_for= ["en", "zh_tw", ""] + @page.is_published = false + if b[:menu_title].blank? + @page.title = "No Title Present" + @page.name = "No Name Present" + else + @page.title = b[:menu_title] + @page.name = b[:menu_title] + end + if b[:content].blank? + @page.content = "No Content Present" + else + @page.content = b[:content] + end + @page.save + end + else + puts "No Page Data" + end + end + + + def get_variables_for_new + @designs = Design.all.entries + @themes = Design.first.themes + @module_apps = ModuleApp.for_frontend_select + @app_frontend_urls = nil + @categories = nil + @tags = nil + @page_frontend_data_counts = nil + @frontend_styles = nil + @selected={ + :design => @designs.first, + :theme=> @themes.first, + :module_app=>nil,#@module_apps.first + :app_frontend_url=> nil, #@module_apps.first + :category=>nil, + :tag=>nil, + :page_frontend_data_count=>nil, + :frontend_style => nil + } + end + end diff --git a/app/controllers/admin/pages_controller.rb b/app/controllers/admin/pages_controller.rb index 7a966ffe9..b0fe41f21 100644 --- a/app/controllers/admin/pages_controller.rb +++ b/app/controllers/admin/pages_controller.rb @@ -95,7 +95,7 @@ class Admin::PagesController < Admin::ItemsController if @item.module_app && @item.module_app.key == 'page_content' @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id ) end - + if @item.save flash.now[:notice] = t('create.success.page') respond_to do |format| diff --git a/app/views/admin/import_data/get_page_data.html.erb b/app/views/admin/import_data/get_page_data.html.erb new file mode 100644 index 000000000..e3adf77ab --- /dev/null +++ b/app/views/admin/import_data/get_page_data.html.erb @@ -0,0 +1 @@ +

Successfully Imported Page Data!

diff --git a/config/routes.rb b/config/routes.rb index 86639e8c2..b43d8a2af 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -206,6 +206,8 @@ Orbit::Application.routes.draw do get "import_data/get_conference_data" get "import_data/get_journal_paper_data" get "import_data/get_announcement_data" + get "import_data/get_page_data" + resources :tags do collection do From a93945cd457c713e1621de7cf082278bd423c2f6 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Sat, 14 Sep 2013 09:36:09 +0800 Subject: [PATCH 09/27] Updated import data with pages working --- app/controllers/admin/import_data_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index b02899acc..fd4e57a9f 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -251,6 +251,8 @@ class Admin::ImportDataController < OrbitBackendController content: (cp_node>"content").text } end + + @i = 0 if @pages.present? @pages.each do |b| @@ -275,6 +277,8 @@ class Admin::ImportDataController < OrbitBackendController else @page.content = b[:content] end + @i += 1 + Rails.logger.info"@@@@@@@@@@@@@@@@@@@@@@@@"+@i.inspect @page.save end else From 50bb2a870cb9a88d213dacae02349d958c033c6d Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Sat, 14 Sep 2013 12:58:20 +0800 Subject: [PATCH 10/27] Updated Import data with page data importing successfully --- app/controllers/admin/import_data_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index fd4e57a9f..2205a1792 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -252,8 +252,8 @@ class Admin::ImportDataController < OrbitBackendController } end - @i = 0 if @pages.present? + @i=0 @pages.each do |b| get_variables_for_new @@ -266,20 +266,20 @@ class Admin::ImportDataController < OrbitBackendController @page.enabled_for= ["en", "zh_tw", ""] @page.is_published = false if b[:menu_title].blank? - @page.title = "No Title Present" - @page.name = "No Name Present" + @page.title = 'No Title Present' + @i += 1 + @page.name = "#{@i}Page" else + @i += 1 @page.title = b[:menu_title] - @page.name = b[:menu_title] + @page.name = "#{@i}Page" end if b[:content].blank? @page.content = "No Content Present" else @page.content = b[:content] end - @i += 1 - Rails.logger.info"@@@@@@@@@@@@@@@@@@@@@@@@"+@i.inspect - @page.save + @page.save! end else puts "No Page Data" From d5357ea63cf0d13bb6d9afe068a0260d1a15fc63 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Mon, 16 Sep 2013 11:06:07 +0800 Subject: [PATCH 11/27] Updated import controller --- app/controllers/admin/import_data_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index 2205a1792..0718df9bf 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -184,7 +184,8 @@ class Admin::ImportDataController < OrbitBackendController if b[:title].blank? @journal_paper.paper_title = "No Title Present" else - @journal_paper.paper_title = b[:title] + title = b[:title].gsub! /"/ + @journal_paper.paper_title = title end @journal_paper.year = b[:year] @journal_paper.note = b[:remarks] From cd1d4356fb9d45a0d44c2f5ec4a169892d76b59e Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Mon, 16 Sep 2013 17:12:22 +0800 Subject: [PATCH 12/27] Updated import data to get complete teacher and announcement data --- .../admin/import_data_controller.rb | 73 +++++++++++++------ .../get_announcement_data.html.erb | 1 + .../admin/users_new_interface/index.html.erb | 1 + 3 files changed, 53 insertions(+), 22 deletions(-) create mode 100644 app/views/admin/import_data/get_announcement_data.html.erb diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index 0718df9bf..c4f25da1f 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -8,7 +8,7 @@ class Admin::ImportDataController < OrbitBackendController include Admin::FrontendWidgetInterface def get_teacher_data - uri = URI("https://tp.rulingcom.com:33333/teachers.xml") + uri = URI("https://localhost:8000/teachers.xml") #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} #uri.query = URI.encode_www_form(params) @@ -18,7 +18,8 @@ class Admin::ImportDataController < OrbitBackendController @teachers = @teacher_data["objects"] @i = 5000 @teachers.each do |hash| - @roles = Role.all + # @roles = Role.skip(1).first + @roles = Role.all @teacher = User.new I18n.locale = :zh_tw if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? @@ -33,13 +34,13 @@ class Admin::ImportDataController < OrbitBackendController @teacher.first_name = "Please Fill the Name" elsif hash['teacher_en'].blank? && !hash['teacher_zh_tw'].blank? @teacher.first_name = hash['teacher_zh_tw'] - else + elsif !hash['teacher_en'].blank? && hash['teacher_zh_tw'].blank? @teacher.first_name = hash['teacher_en'] end #@teacher.first_name = hash['teacher_en'] @teacher.ntu_seq = hash['ntu_seq'] - @teacher.role_ids = ["#{@roles.first.id}"] + @teacher.role_ids = ["#{@roles.skip(1).first.id}"] @teacher.password = "testpass" @i += 10 if hash['email'].blank? @@ -48,12 +49,12 @@ class Admin::ImportDataController < OrbitBackendController @teacher.email = hash['email'] end - if hash['teacher_zh_tw'].blank? - @teacher.user_id = hash['teacher_en'] + if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? + @teacher.user_id = "defaultuser" elsif hash['teacher_en'].blank? @teacher.user_id = hash['teacher_zh_tw'] - else - @teacher.user_id = "Please Enter a User Name" + elsif hash['teacher_zh_tw'] + @teacher.user_id = hash['teacher_en'] end @teacher.save! end @@ -85,13 +86,20 @@ class Admin::ImportDataController < OrbitBackendController if @books.present? @books.each do |b| @book = WritingBook.new + I18n.locale = :zh_tw @book.authors = b[:author] @book.paper_title = b[:title] @book.book_title = b[:book_title] - @book.year = b[:year] @book.note = b[:remarks] - @book.publisher = b[:publisher] - @book.create_user_id = hash.id + @book.publisher = b[:publisher] + I18n.locale = :en + @book.authors = b[:author] + @book.paper_title = b[:title] + @book.book_title = b[:book_title] + @book.note = b[:remarks] + @book.publisher = b[:publisher] + @book.year = b[:year] + @book.create_user_id = hash.id @book.save end else @@ -129,14 +137,23 @@ class Admin::ImportDataController < OrbitBackendController if @conference_papers.present? @conference_papers.each do |b| @conference_paper = WritingConference.new + I18n.locale = :zh_tw @conference_paper.authors = b[:author] if b[:title].blank? @conference_paper.paper_title = "No Title Present" else @conference_paper.paper_title = b[:title] end - @conference_paper.year = b[:year] @conference_paper.note = b[:remarks] + I18n.locale = :en + @conference_paper.authors = b[:author] + if b[:title].blank? + @conference_paper.paper_title = "No Title Present" + else + @conference_paper.paper_title = b[:title] + end + @conference_paper.note = b[:remarks] + @conference_paper.year = b[:year] @conference_paper.create_user_id = hash.id @conference_paper.save! end @@ -180,15 +197,23 @@ class Admin::ImportDataController < OrbitBackendController if @journal_papers.present? @journal_papers.each do |b| @journal_paper = WritingJournal.new + I18n.locale = :zh_tw @journal_paper.authors = b[:author] if b[:title].blank? @journal_paper.paper_title = "No Title Present" else - title = b[:title].gsub! /"/ - @journal_paper.paper_title = title + @journal_paper.paper_title = b[:title].first end - @journal_paper.year = b[:year] @journal_paper.note = b[:remarks] + I18n.locale = :en + @journal_paper.authors = b[:author] + if b[:title].blank? + @journal_paper.paper_title = "No Title Present" + else + @journal_paper.paper_title = b[:title].first + end + @journal_paper.note = b[:remarks] + @journal_paper.year = b[:year] @journal_paper.vol_no = b[:volumeno] @journal_paper.form_to_start = b[:beginpage] @journal_paper.form_to_end = b[:endpage] @@ -203,7 +228,7 @@ class Admin::ImportDataController < OrbitBackendController end def get_announcement_data - uri = URI("https://tp.rulingcom.com:33333/announcements.xml") + uri = URI("https://localhost:8000/announcements.xml") #params = {"UnitName" => "管理學院".encode('big5-uao'), "account" => "manage"} #uri.query = URI.encode_www_form(params) @@ -227,16 +252,20 @@ class Admin::ImportDataController < OrbitBackendController end I18n.locale = :en - if hash['announcement_title_en'].blank? + if hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank? + @bulletin.title = "Please Fill the Name" + @bulletin.text = hash['announcement_content_en'] + + elsif hash['announcement_title_en'].blank? @bulletin.title = hash['announcement_zh_tw'] @bulletin.text = hash['announcement_content_en'] - elsif hash['announcement_title_zh_tw'].blank? && hash['announcement_title_en'].blank? - @bulletin.first_name = "Please Fill the Name" - @bulletin.text = hash['announcement_content_en'] - else - @bulletin.first_name = hash['announcement_title_en'] + + elsif hash['announcement_title_zh_tw'].blank? + @bulletin.title = hash['announcement_title_en'] @bulletin.text = hash['announcement_content_en'] end + @bulletin.category_id = "51d2a16438178423c2000001" + @bulletin.is_pending = true @bulletin.save! end diff --git a/app/views/admin/import_data/get_announcement_data.html.erb b/app/views/admin/import_data/get_announcement_data.html.erb new file mode 100644 index 000000000..9751735f2 --- /dev/null +++ b/app/views/admin/import_data/get_announcement_data.html.erb @@ -0,0 +1 @@ +

Successfully Imported Announcement 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 d639725ed..a87648fab 100644 --- a/app/views/admin/users_new_interface/index.html.erb +++ b/app/views/admin/users_new_interface/index.html.erb @@ -20,6 +20,7 @@ +
  • From f27f96b994e447e84ae3b36af3474f9572df4d1e Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 17 Sep 2013 11:30:30 +0800 Subject: [PATCH 13/27] commit for survey questions --- .../lib/member/textarea-lang-btn.js | 11 +- app/assets/stylesheets/lib/main-forms.css | 11 + .../assets/javascripts/jquery-ui-custom.js | 6 + .../survey/app/assets/javascripts/survey.js | 143 +++++++++++ .../survey/back_end/surveys/_form.html.erb | 232 ++++++++---------- .../back_end/surveys/_questions.html.erb | 192 +++++++++++++++ 6 files changed, 458 insertions(+), 137 deletions(-) create mode 100644 vendor/built_in_modules/survey/app/assets/javascripts/jquery-ui-custom.js create mode 100644 vendor/built_in_modules/survey/app/assets/javascripts/survey.js create mode 100644 vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb diff --git a/app/assets/javascripts/lib/member/textarea-lang-btn.js b/app/assets/javascripts/lib/member/textarea-lang-btn.js index a79b3ab41..cee2e5716 100644 --- a/app/assets/javascripts/lib/member/textarea-lang-btn.js +++ b/app/assets/javascripts/lib/member/textarea-lang-btn.js @@ -1,4 +1,4 @@ -$(function() { +function textareaResizable() { var $btnW = null, $textareaLangBtnGroup = $('.textarea-lang > .btn-group'), $textareaLang = $('.textarea-lang'), @@ -8,12 +8,12 @@ $(function() { $btnW = 4 $(this).find('.btn').each(function() { $btnW += $(this).outerWidth(true); - $(this).on('click', function() { + $(this).on(clickEvent, function() { var $id = $($(this).attr('href')); if($id.find('.ui-wrapper').height() < 96) { $id.find('.ui-wrapper').height(96) - } - }) + }; + }); }); }); $textarea.each(function() { @@ -26,4 +26,7 @@ $(function() { minWidth: $btnW+114, handles: "se", }); +}; +$(function() { + textareaResizable(); }); \ No newline at end of file diff --git a/app/assets/stylesheets/lib/main-forms.css b/app/assets/stylesheets/lib/main-forms.css index c8b5ace57..f8040157c 100644 --- a/app/assets/stylesheets/lib/main-forms.css +++ b/app/assets/stylesheets/lib/main-forms.css @@ -280,6 +280,17 @@ line-height: 26px; margin: 0; } +.main-forms .attributes-header h4 b { + padding: 0 1px; + border-style: dotted; + border-width: 0 2px; + border-color: #AAA; + margin-right: 5px; + cursor: move; +} +.main-forms .attributes-header h4 i { + cursor: pointer; +} .main-forms .field-type { background-color: #f5f5f5; border-radius: 5px; diff --git a/vendor/built_in_modules/survey/app/assets/javascripts/jquery-ui-custom.js b/vendor/built_in_modules/survey/app/assets/javascripts/jquery-ui-custom.js new file mode 100644 index 000000000..3fb1ff614 --- /dev/null +++ b/vendor/built_in_modules/survey/app/assets/javascripts/jquery-ui-custom.js @@ -0,0 +1,6 @@ +/*! jQuery UI - v1.10.3 - 2013-06-05 +* http://jqueryui.com +* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.tooltip.js +* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */ + +(function(e,t){function i(t,i){var a,n,r,o=t.nodeName.toLowerCase();return"area"===o?(a=t.parentNode,n=a.name,t.href&&n&&"map"===a.nodeName.toLowerCase()?(r=e("img[usemap=#"+n+"]")[0],!!r&&s(r)):!1):(/input|select|textarea|button|object/.test(o)?!t.disabled:"a"===o?t.href||i:i)&&s(t)}function s(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}var a=0,n=/^ui-id-\d+$/;e.ui=e.ui||{},e.extend(e.ui,{version:"1.10.3",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),scrollParent:function(){var t;return t=e.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,"position"))&&/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!t.length?e(document):t},zIndex:function(i){if(i!==t)return this.css("zIndex",i);if(this.length)for(var s,a,n=e(this[0]);n.length&&n[0]!==document;){if(s=n.css("position"),("absolute"===s||"relative"===s||"fixed"===s)&&(a=parseInt(n.css("zIndex"),10),!isNaN(a)&&0!==a))return a;n=n.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++a)})},removeUniqueId:function(){return this.each(function(){n.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(t){return i(t,!isNaN(e.attr(t,"tabindex")))},tabbable:function(t){var s=e.attr(t,"tabindex"),a=isNaN(s);return(a||s>=0)&&i(t,!a)}}),e("").outerWidth(1).jquery||e.each(["Width","Height"],function(i,s){function a(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===s?["Left","Right"]:["Top","Bottom"],r=s.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+s]=function(i){return i===t?o["inner"+s].call(this):this.each(function(){e(this).css(r,a(this,i)+"px")})},e.fn["outer"+s]=function(t,i){return"number"!=typeof t?o["outer"+s].call(this,t):this.each(function(){e(this).css(r,a(this,t,!0,i)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.support.selectstart="onselectstart"in document.createElement("div"),e.fn.extend({disableSelection:function(){return this.bind((e.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),e.extend(e.ui,{plugin:{add:function(t,i,s){var a,n=e.ui[t].prototype;for(a in s)n.plugins[a]=n.plugins[a]||[],n.plugins[a].push([i,s[a]])},call:function(e,t,i){var s,a=e.plugins[t];if(a&&e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType)for(s=0;a.length>s;s++)e.options[a[s][0]]&&a[s][1].apply(e.element,i)}},hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",a=!1;return t[s]>0?!0:(t[s]=1,a=t[s]>0,t[s]=0,a)}})})(jQuery);(function(e,t){var i=0,s=Array.prototype.slice,n=e.cleanData;e.cleanData=function(t){for(var i,s=0;null!=(i=t[s]);s++)try{e(i).triggerHandler("remove")}catch(a){}n(t)},e.widget=function(i,s,n){var a,r,o,h,l={},u=i.split(".")[0];i=i.split(".")[1],a=u+"-"+i,n||(n=s,s=e.Widget),e.expr[":"][a.toLowerCase()]=function(t){return!!e.data(t,a)},e[u]=e[u]||{},r=e[u][i],o=e[u][i]=function(e,i){return this._createWidget?(arguments.length&&this._createWidget(e,i),t):new o(e,i)},e.extend(o,r,{version:n.version,_proto:e.extend({},n),_childConstructors:[]}),h=new s,h.options=e.widget.extend({},h.options),e.each(n,function(i,n){return e.isFunction(n)?(l[i]=function(){var e=function(){return s.prototype[i].apply(this,arguments)},t=function(e){return s.prototype[i].apply(this,e)};return function(){var i,s=this._super,a=this._superApply;return this._super=e,this._superApply=t,i=n.apply(this,arguments),this._super=s,this._superApply=a,i}}(),t):(l[i]=n,t)}),o.prototype=e.widget.extend(h,{widgetEventPrefix:r?h.widgetEventPrefix:i},l,{constructor:o,namespace:u,widgetName:i,widgetFullName:a}),r?(e.each(r._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete r._childConstructors):s._childConstructors.push(o),e.widget.bridge(i,o)},e.widget.extend=function(i){for(var n,a,r=s.call(arguments,1),o=0,h=r.length;h>o;o++)for(n in r[o])a=r[o][n],r[o].hasOwnProperty(n)&&a!==t&&(i[n]=e.isPlainObject(a)?e.isPlainObject(i[n])?e.widget.extend({},i[n],a):e.widget.extend({},a):a);return i},e.widget.bridge=function(i,n){var a=n.prototype.widgetFullName||i;e.fn[i]=function(r){var o="string"==typeof r,h=s.call(arguments,1),l=this;return r=!o&&h.length?e.widget.extend.apply(null,[r].concat(h)):r,o?this.each(function(){var s,n=e.data(this,a);return n?e.isFunction(n[r])&&"_"!==r.charAt(0)?(s=n[r].apply(n,h),s!==n&&s!==t?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):t):e.error("no such method '"+r+"' for "+i+" widget instance"):e.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+r+"'")}):this.each(function(){var t=e.data(this,a);t?t.option(r||{})._init():e.data(this,a,new n(r,this))}),l}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"
    ",options:{disabled:!1,create:null},_createWidget:function(t,s){s=e(s||this.defaultElement||this)[0],this.element=e(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this.bindings=e(),this.hoverable=e(),this.focusable=e(),s!==this&&(e.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===s&&this.destroy()}}),this.document=e(s.style?s.ownerDocument:s.document||s),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(i,s){var n,a,r,o=i;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof i)if(o={},n=i.split("."),i=n.shift(),n.length){for(a=o[i]=e.widget.extend({},this.options[i]),r=0;n.length-1>r;r++)a[n[r]]=a[n[r]]||{},a=a[n[r]];if(i=n.pop(),s===t)return a[i]===t?null:a[i];a[i]=s}else{if(s===t)return this.options[i]===t?null:this.options[i];o[i]=s}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!t).attr("aria-disabled",t),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var a,r=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=a=e(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,a=this.widget()),e.each(n,function(n,o){function h(){return i||r.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?r[o]:o).apply(r,arguments):t}"string"!=typeof o&&(h.guid=o.guid=o.guid||h.guid||e.guid++);var l=n.match(/^(\w+)\s*(.*)$/),u=l[1]+r.eventNamespace,c=l[2];c?a.delegate(c,u,h):s.bind(u,h)})},_off:function(e,t){t=(t||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(t).undelegate(t)},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,r=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(r)&&r.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var r,o=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),r=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),r&&e.effects&&e.effects.effect[o]?s[t](n):o!==t&&s[o]?s[o](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}})})(jQuery);(function(e){var t=!1;e(document).mouseup(function(){t=!1}),e.widget("ui.mouse",{version:"1.10.3",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(i){if(!t){this._mouseStarted&&this._mouseUp(i),this._mouseDownEvent=i;var s=this,n=1===i.which,a="string"==typeof this.options.cancel&&i.target.nodeName?e(i.target).closest(this.options.cancel).length:!1;return n&&!a&&this._mouseCapture(i)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){s.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(i)&&this._mouseDelayMet(i)&&(this._mouseStarted=this._mouseStart(i)!==!1,!this._mouseStarted)?(i.preventDefault(),!0):(!0===e.data(i.target,this.widgetName+".preventClickEvent")&&e.removeData(i.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return s._mouseMove(e)},this._mouseUpDelegate=function(e){return s._mouseUp(e)},e(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),i.preventDefault(),t=!0,!0)):!0}},_mouseMove:function(t){return e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button?this._mouseUp(t):this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})})(jQuery);(function(t,e){function i(t,e,i){return[parseFloat(t[0])*(p.test(t[0])?e/100:1),parseFloat(t[1])*(p.test(t[1])?i/100:1)]}function s(e,i){return parseInt(t.css(e,i),10)||0}function n(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}t.ui=t.ui||{};var a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,c=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,d=/^\w+/,p=/%$/,f=t.fn.position;t.position={scrollbarWidth:function(){if(a!==e)return a;var i,s,n=t("
    "),o=n.children()[0];return t("body").append(n),i=o.offsetWidth,n.css("overflow","scroll"),s=o.offsetWidth,i===s&&(s=n[0].clientWidth),n.remove(),a=i-s},getScrollInfo:function(e){var i=e.isWindow?"":e.element.css("overflow-x"),s=e.isWindow?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.widths?"left":i>0?"right":"center",vertical:0>a?"top":n>0?"bottom":"middle"};u>p&&p>r(i+s)&&(h.horizontal="center"),d>m&&m>r(n+a)&&(h.vertical="middle"),h.important=o(r(i),r(s))>o(r(n),r(a))?"horizontal":"vertical",e.using.call(this,t,h)}),c.offset(t.extend(C,{using:l}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-o-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-o-a,(0>i||r(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>r(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-o-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,m=-2*e.offset[1];0>c?(s=t.top+p+f+m+e.collisionHeight-o-a,t.top+p+f+m>c&&(0>s||r(c)>s)&&(t.top+=p+f+m)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+m-h,t.top+p+f+m>u&&(i>0||u>r(i))&&(t.top+=p+f+m))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}},function(){var e,i,s,n,a,o=document.getElementsByTagName("body")[0],r=document.createElement("div");e=document.createElement(o?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},o&&t.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(a in s)e.style[a]=s[a];e.appendChild(r),i=o||document.documentElement,i.insertBefore(e,i.firstChild),r.style.cssText="position: absolute; left: 10.7432222px;",n=t(r).offset().left,t.support.offsetFractions=n>10&&11>n,e.innerHTML="",i.removeChild(e)}()})(jQuery);(function(e){e.widget("ui.draggable",e.ui.mouse,{version:"1.10.3",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"!==this.options.helper||/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(t){var i=this.options;return this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(e(i.iframeFix===!0?"iframe":i.iframeFix).each(function(){e("
    ").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(e(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offsetParent=this.helper.offsetParent(),this.offsetParentCssPosition=this.offsetParent.css("position"),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.offset.scroll=!1,e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_mouseDrag:function(t,i){if("fixed"===this.offsetParentCssPosition&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"original"!==this.options.helper||e.contains(this.element[0].ownerDocument,this.element[0])?("invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1):!1},_mouseUp:function(t){return e("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return s.parents("body").length||s.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s[0]===this.element[0]||/(fixed|absolute)/.test(s.css("position"))||s.css("position","absolute"),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.element.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;return n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):"document"===n.containment?(this.containment=[0,0,e(document).width()-this.helperProportions.width-this.margins.left,(e(document).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):n.containment.constructor===Array?(this.containment=n.containment,undefined):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t="hidden"!==i.css("overflow"),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=i),undefined):(this.containment=null,undefined)},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent;return this.offset.scroll||(this.offset.scroll={top:n.scrollTop(),left:n.scrollLeft()}),{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top)*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)*s}},_generatePosition:function(t){var i,s,n,a,o=this.options,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=t.pageX,l=t.pageY;return this.offset.scroll||(this.offset.scroll={top:r.scrollTop(),left:r.scrollLeft()}),this.originalPosition&&(this.containment&&(this.relative_container?(s=this.relative_container.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.lefti[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s]),"drag"===t&&(this.positionAbs=this._convertPositionTo("absolute")),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i){var s=e(this).data("ui-draggable"),n=s.options,a=e.extend({},i,{item:s.element});s.sortables=[],e(n.connectToSortable).each(function(){var i=e.data(this,"ui-sortable");i&&!i.options.disabled&&(s.sortables.push({instance:i,shouldRevert:i.options.revert}),i.refreshPositions(),i._trigger("activate",t,a))})},stop:function(t,i){var s=e(this).data("ui-draggable"),n=e.extend({},i,{item:s.element});e.each(s.sortables,function(){this.instance.isOver?(this.instance.isOver=0,s.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=this.shouldRevert),this.instance._mouseStop(t),this.instance.options.helper=this.instance.options._helper,"original"===s.options.helper&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",t,n))})},drag:function(t,i){var s=e(this).data("ui-draggable"),n=this;e.each(s.sortables,function(){var a=!1,o=this;this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(a=!0,e.each(s.sortables,function(){return this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this!==o&&this.instance._intersectsWith(this.instance.containerCache)&&e.contains(o.instance.element[0],this.instance.element[0])&&(a=!1),a})),a?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=e(n).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return i.helper[0]},t.target=this.instance.currentItem[0],this.instance._mouseCapture(t,!0),this.instance._mouseStart(t,!0,!0),this.instance.offset.click.top=s.offset.click.top,this.instance.offset.click.left=s.offset.click.left,this.instance.offset.parent.left-=s.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=s.offset.parent.top-this.instance.offset.parent.top,s._trigger("toSortable",t),s.dropped=this.instance.element,s.currentItem=s.element,this.instance.fromOutside=s),this.instance.currentItem&&this.instance._mouseDrag(t)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",t,this.instance._uiHash(this.instance)),this.instance._mouseStop(t,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),s._trigger("fromSortable",t),s.dropped=!1)})}}),e.ui.plugin.add("draggable","cursor",{start:function(){var t=e("body"),i=e(this).data("ui-draggable").options;t.css("cursor")&&(i._cursor=t.css("cursor")),t.css("cursor",i.cursor)},stop:function(){var t=e(this).data("ui-draggable").options;t._cursor&&e("body").css("cursor",t._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i){var s=e(i.helper),n=e(this).data("ui-draggable").options;s.css("opacity")&&(n._opacity=s.css("opacity")),s.css("opacity",n.opacity)},stop:function(t,i){var s=e(this).data("ui-draggable").options;s._opacity&&e(i.helper).css("opacity",s._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(){var t=e(this).data("ui-draggable");t.scrollParent[0]!==document&&"HTML"!==t.scrollParent[0].tagName&&(t.overflowOffset=t.scrollParent.offset())},drag:function(t){var i=e(this).data("ui-draggable"),s=i.options,n=!1;i.scrollParent[0]!==document&&"HTML"!==i.scrollParent[0].tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+i.scrollParent[0].offsetHeight-t.pageY=0;c--)r=p.snapElements[c].left,h=r+p.snapElements[c].width,l=p.snapElements[c].top,u=l+p.snapElements[c].height,r-m>v||g>h+m||l-m>y||b>u+m||!e.contains(p.snapElements[c].item.ownerDocument,p.snapElements[c].item)?(p.snapElements[c].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,t,e.extend(p._uiHash(),{snapItem:p.snapElements[c].item})),p.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(s=m>=Math.abs(l-y),n=m>=Math.abs(u-b),a=m>=Math.abs(r-v),o=m>=Math.abs(h-g),s&&(i.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:u,left:0}).top-p.margins.top),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r-p.helperProportions.width}).left-p.margins.left),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h}).left-p.margins.left)),d=s||n||a||o,"outer"!==f.snapMode&&(s=m>=Math.abs(l-b),n=m>=Math.abs(u-y),a=m>=Math.abs(r-g),o=m>=Math.abs(h-v),s&&(i.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:u-p.helperProportions.height,left:0}).top-p.margins.top),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r}).left-p.margins.left),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[c].snapping&&(s||n||a||o||d)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,t,e.extend(p._uiHash(),{snapItem:p.snapElements[c].item})),p.snapElements[c].snapping=s||n||a||o||d)}}),e.ui.plugin.add("draggable","stack",{start:function(){var t,i=this.data("ui-draggable").options,s=e.makeArray(e(i.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});s.length&&(t=parseInt(e(s[0]).css("zIndex"),10)||0,e(s).each(function(i){e(this).css("zIndex",t+i)}),this.css("zIndex",t+s.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i){var s=e(i.helper),n=e(this).data("ui-draggable").options;s.css("zIndex")&&(n._zIndex=s.css("zIndex")),s.css("zIndex",n.zIndex)},stop:function(t,i){var s=e(this).data("ui-draggable").options;s._zIndex&&e(i.helper).css("zIndex",s._zIndex)}})})(jQuery);(function(e){function t(e,t,i){return e>t&&t+i>e}e.widget("ui.droppable",{version:"1.10.3",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t=this.options,i=t.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(i)?i:function(e){return e.is(i)},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},e.ui.ddmanager.droppables[t.scope]=e.ui.ddmanager.droppables[t.scope]||[],e.ui.ddmanager.droppables[t.scope].push(this),t.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){for(var t=0,i=e.ui.ddmanager.droppables[this.options.scope];i.length>t;t++)i[t]===this&&i.splice(t,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){"accept"===t&&(this.accept=e.isFunction(i)?i:function(e){return e.is(i)}),e.Widget.prototype._setOption.apply(this,arguments)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var t=e.data(this,"ui-droppable");return t.options.greedy&&!t.options.disabled&&t.options.scope===s.options.scope&&t.accept.call(t.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(t,{offset:t.element.offset()}),t.options.tolerance)?(n=!0,!1):undefined}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(e,i,s){if(!i.offset)return!1;var n,a,o=(e.positionAbs||e.position.absolute).left,r=o+e.helperProportions.width,h=(e.positionAbs||e.position.absolute).top,l=h+e.helperProportions.height,u=i.offset.left,c=u+i.proportions.width,d=i.offset.top,p=d+i.proportions.height;switch(s){case"fit":return o>=u&&c>=r&&h>=d&&p>=l;case"intersect":return o+e.helperProportions.width/2>u&&c>r-e.helperProportions.width/2&&h+e.helperProportions.height/2>d&&p>l-e.helperProportions.height/2;case"pointer":return n=(e.positionAbs||e.position.absolute).left+(e.clickOffset||e.offset.click).left,a=(e.positionAbs||e.position.absolute).top+(e.clickOffset||e.offset.click).top,t(a,d,i.proportions.height)&&t(n,u,i.proportions.width);case"touch":return(h>=d&&p>=h||l>=d&&p>=l||d>h&&l>p)&&(o>=u&&c>=o||r>=u&&c>=r||u>o&&r>c);default:return!1}},e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions.height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions={width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight})}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e.data(this,"ui-droppable").options.scope===n}),a.length&&(s=e.data(a[0],"ui-droppable"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}}})(jQuery);(function(e){function t(e){return parseInt(e,10)||0}function i(e){return!isNaN(parseInt(e,10))}e.widget("ui.resizable",e.ui.mouse,{version:"1.10.3",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e("
    ").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("
    "),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=e(this.handles[i],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),e(this.handles[i]).length},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(i){var s,n,a,o=this.options,r=this.element.position(),h=this.element;return this.resizing=!0,/absolute/.test(h.css("position"))?h.css({position:"absolute",top:h.css("top"),left:h.css("left")}):h.is(".ui-draggable")&&h.css({position:"absolute",top:r.top,left:r.left}),this._renderProxy(),s=t(this.helper.css("left")),n=t(this.helper.css("top")),o.containment&&(s+=e(o.containment).scrollLeft()||0,n+=e(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:s,top:n},this.size=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalSize=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalPosition={left:s,top:n},this.sizeDiff={width:h.outerWidth()-h.width(),height:h.outerHeight()-h.height()},this.originalMousePosition={left:i.pageX,top:i.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,a=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===a?this.axis+"-resize":a),h.addClass("ui-resizable-resizing"),this._propagate("start",i),!0},_mouseDrag:function(t){var i,s=this.helper,n={},a=this.originalMousePosition,o=this.axis,r=this.position.top,h=this.position.left,l=this.size.width,u=this.size.height,c=t.pageX-a.left||0,d=t.pageY-a.top||0,p=this._change[o];return p?(i=p.apply(this,[t,c,d]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),this.position.top!==r&&(n.top=this.position.top+"px"),this.position.left!==h&&(n.left=this.position.left+"px"),this.size.width!==l&&(n.width=this.size.width+"px"),this.size.height!==u&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(n)||this._trigger("resize",t,this.ui()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&e.ui.hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(e){var t,s,n,a,o,r=this.options;o={minWidth:i(r.minWidth)?r.minWidth:0,maxWidth:i(r.maxWidth)?r.maxWidth:1/0,minHeight:i(r.minHeight)?r.minHeight:0,maxHeight:i(r.maxHeight)?r.maxHeight:1/0},(this._aspectRatio||e)&&(t=o.minHeight*this.aspectRatio,n=o.minWidth/this.aspectRatio,s=o.maxHeight*this.aspectRatio,a=o.maxWidth/this.aspectRatio,t>o.minWidth&&(o.minWidth=t),n>o.minHeight&&(o.minHeight=n),o.maxWidth>s&&(o.maxWidth=s),o.maxHeight>a&&(o.maxHeight=a)),this._vBoundaries=o},_updateCache:function(e){this.offset=this.helper.offset(),i(e.left)&&(this.position.left=e.left),i(e.top)&&(this.position.top=e.top),i(e.height)&&(this.size.height=e.height),i(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,s=this.size,n=this.axis;return i(e.height)?e.width=e.height*this.aspectRatio:i(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===n&&(e.left=t.left+(s.width-e.width),e.top=null),"nw"===n&&(e.top=t.top+(s.height-e.height),e.left=t.left+(s.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,s=this.axis,n=i(e.width)&&t.maxWidth&&t.maxWidthe.width,r=i(e.height)&&t.minHeight&&t.minHeight>e.height,h=this.originalPosition.left+this.originalSize.width,l=this.position.top+this.size.height,u=/sw|nw|w/.test(s),c=/nw|ne|n/.test(s);return o&&(e.width=t.minWidth),r&&(e.height=t.minHeight),n&&(e.width=t.maxWidth),a&&(e.height=t.maxHeight),o&&u&&(e.left=h-t.minWidth),n&&u&&(e.left=h-t.maxWidth),r&&c&&(e.top=l-t.minHeight),a&&c&&(e.top=l-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var e,t,i,s,n,a=this.helper||this.element;for(e=0;this._proportionallyResizeElements.length>e;e++){if(n=this._proportionallyResizeElements[e],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],t=0;i.length>t;t++)this.borderDif[t]=(parseInt(i[t],10)||0)+(parseInt(s[t],10)||0);n.css({height:a.height()-this.borderDif[0]-this.borderDif[2]||0,width:a.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("
    "),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).data("ui-resizable"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&e.ui.hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var i,s,n,a,o,r,h,l=e(this).data("ui-resizable"),u=l.options,c=l.element,d=u.containment,p=d instanceof e?d.get(0):/parent/.test(d)?c.parent().get(0):d;p&&(l.containerElement=e(p),/document/.test(d)||d===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(i=e(p),s=[],e(["Top","Right","Left","Bottom"]).each(function(e,n){s[e]=t(i.css("padding"+n))}),l.containerOffset=i.offset(),l.containerPosition=i.position(),l.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},n=l.containerOffset,a=l.containerSize.height,o=l.containerSize.width,r=e.ui.hasScroll(p,"left")?p.scrollWidth:o,h=e.ui.hasScroll(p)?p.scrollHeight:a,l.parentData={element:p,left:n.left,top:n.top,width:r,height:h}))},resize:function(t){var i,s,n,a,o=e(this).data("ui-resizable"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,c={top:0,left:0},d=o.containerElement;d[0]!==document&&/static/.test(d.css("position"))&&(c=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-c.left),u&&(o.size.height=o.size.width/o.aspectRatio),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio),o.position.top=o._helper?h.top:0),o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top,i=Math.abs((o._helper?o.offset.left-c.left:o.offset.left-c.left)+o.sizeDiff.width),s=Math.abs((o._helper?o.offset.top-c.top:o.offset.top-h.top)+o.sizeDiff.height),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a&&(i-=o.parentData.left),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio))},stop:function(){var t=e(this).data("ui-resizable"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).data("ui-resizable"),i=t.options,s=function(t){e(t).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):e.each(i.alsoResize,function(e){s(e)})},resize:function(t,i){var s=e(this).data("ui-resizable"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0},h=function(t,s){e(t).each(function(){var t=e(this),n=e(this).data("ui-resizable-alsoresize"),a={},o=s&&s.length?s:t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var i=(n[t]||0)+(r[t]||0);i&&i>=0&&(a[t]=i||null)}),t.css(a)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):e.each(n.alsoResize,function(e,t){h(e,t)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).data("ui-resizable"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).data("ui-resizable");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).data("ui-resizable");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t=e(this).data("ui-resizable"),i=t.options,s=t.size,n=t.originalSize,a=t.originalPosition,o=t.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,u=Math.round((s.width-n.width)/h)*h,c=Math.round((s.height-n.height)/l)*l,d=n.width+u,p=n.height+c,f=i.maxWidth&&d>i.maxWidth,m=i.maxHeight&&p>i.maxHeight,g=i.minWidth&&i.minWidth>d,v=i.minHeight&&i.minHeight>p;i.grid=r,g&&(d+=h),v&&(p+=l),f&&(d-=h),m&&(p-=l),/^(se|s|e)$/.test(o)?(t.size.width=d,t.size.height=p):/^(ne)$/.test(o)?(t.size.width=d,t.size.height=p,t.position.top=a.top-c):/^(sw)$/.test(o)?(t.size.width=d,t.size.height=p,t.position.left=a.left-u):(t.size.width=d,t.size.height=p,t.position.top=a.top-c,t.position.left=a.left-u)}})})(jQuery);(function(e){e.widget("ui.selectable",e.ui.mouse,{version:"1.10.3",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("
    ")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):undefined}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}})})(jQuery);(function(t){function e(t,e,i){return t>e&&e+i>t}function i(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))}t.widget("ui.sortable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var t=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===t.axis||i(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_setOption:function(e,i){"disabled"===e?(this.options[e]=i,this.widget().toggleClass("ui-sortable-disabled",!!i)):t.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(e,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,a.widgetName+"-item")===a?(s=t(this),!1):undefined}),t.data(e.target,a.widgetName+"-item")===a&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=t("").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!o.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=t.left,o=a+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>a&&o>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var i="x"===this.options.axis||e(this.positionAbs.top+this.offset.click.top,t.top,t.height),s="y"===this.options.axis||e(this.positionAbs.left+this.offset.click.left,t.left,t.width),n=i&&s,a=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return n?this.floating?o&&"right"===o||"down"===a?2:1:a&&("down"===a?2:1):!1},_intersectsWithSides:function(t){var i=e(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),s=e(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return this.floating&&a?"right"===a&&s||"left"===a&&!s:n&&("down"===n&&i||"up"===n&&!i)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){var i,s,n,a,o=[],r=[],h=this._connectWith();if(h&&e)for(i=h.length-1;i>=0;i--)for(n=t(h[i]),s=n.length-1;s>=0;s--)a=t.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&r.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(r.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),i=r.length-1;i>=0;i--)r[i][0].each(function(){o.push(this)});return t(o)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i]),s=n.length-1;s>=0;s--)a=t.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(u.push([t.isFunction(a.options.items)?a.options.items.call(a.element[0],e,{item:this.currentItem}):t(a.options.items,a.element),a]),this.containers.push(a));for(i=u.length-1;i>=0;i--)for(o=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",o),c.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?e.currentItem.children().each(function(){t(" ",e.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_contactContainers:function(s){var n,a,o,r,h,l,c,u,d,p,f=null,m=null;for(n=this.containers.length-1;n>=0;n--)if(!t.contains(this.currentItem[0],this.containers[n].element[0]))if(this._intersectsWith(this.containers[n].containerCache)){if(f&&t.contains(this.containers[n].element[0],f.element[0]))continue;f=this.containers[n],m=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",s,this._uiHash(this)),this.containers[n].containerCache.over=0);if(f)if(1===this.containers.length)this.containers[m].containerCache.over||(this.containers[m]._trigger("over",s,this._uiHash(this)),this.containers[m].containerCache.over=1);else{for(o=1e4,r=null,p=f.floating||i(this.currentItem),h=p?"left":"top",l=p?"width":"height",c=this.positionAbs[h]+this.offset.click[h],a=this.items.length-1;a>=0;a--)t.contains(this.containers[m].element[0],this.items[a].item[0])&&this.items[a].item[0]!==this.currentItem[0]&&(!p||e(this.positionAbs.top+this.offset.click.top,this.items[a].top,this.items[a].height))&&(u=this.items[a].item.offset()[h],d=!1,Math.abs(u-c)>Math.abs(u+this.items[a][l]-c)&&(d=!0,u+=this.items[a][l]),o>Math.abs(u-c)&&(o=Math.abs(u-c),r=this.items[a],this.direction=d?"up":"down"));if(!r&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[m])return;r?this._rearrange(s,r,null,!0):this._rearrange(s,null,this.containers[m].element,!0),this._trigger("change",s,this._uiHash()),this.containers[m]._trigger("change",s,this._uiHash(this)),this.currentContainer=this.containers[m],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[m]._trigger("over",s,this._uiHash(this)),this.containers[m].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,a=e.pageX,o=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.leftthis.containment[2]&&(a=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){this.reverting=!1;var i,s=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(i in this._storedCSS)("auto"===this._storedCSS[i]||"static"===this._storedCSS[i])&&(this._storedCSS[i]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||s.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(s.push(function(t){this._trigger("remove",t,this._uiHash())}),s.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),s.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),i=this.containers.length-1;i>=0;i--)e||s.push(function(t){return function(e){t._trigger("deactivate",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over&&(s.push(function(t){return function(e){t._trigger("out",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!e){for(this._trigger("beforeStop",t,this._uiHash()),i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}if(e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!e){for(i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})})(jQuery);(function(t){function e(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))}function i(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")}var s=0;t.widget("ui.tooltip",{version:"1.10.3",options:{content:function(){var e=t(this).attr("title")||"";return t("    ").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(e,i){var s=this;return"disabled"===e?(this[i?"_disable":"_enable"](),this.options[e]=i,void 0):(this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e)}),void 0)},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.is("[title]")&&e.data("ui-tooltip-title",e.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))})},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,a=e?e.type:null;return"string"==typeof s?this._open(e,t,s):(i=s.call(t[0],function(i){t.data("ui-tooltip-open")&&n._delay(function(){e&&(e.type=a),this._open(e,t,i)})}),i&&this._open(e,t,i),void 0)},_open:function(i,s,n){function a(t){l.of=t,o.is(":hidden")||o.position(l)}var o,r,h,l=t.extend({},this.options.position);if(n){if(o=this._find(s),o.length)return o.find(".ui-tooltip-content").html(n),void 0;s.is("[title]")&&(i&&"mouseover"===i.type?s.attr("title",""):s.removeAttr("title")),o=this._tooltip(s),e(s,o.attr("id")),o.find(".ui-tooltip-content").html(n),this.options.track&&i&&/^mouse/.test(i.type)?(this._on(this.document,{mousemove:a}),a(i)):o.position(t.extend({of:s},this.options.position)),o.hide(),this._show(o,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){o.is(":visible")&&(a(l.of),clearInterval(h))},t.fx.interval)),this._trigger("open",i,{tooltip:o}),r={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var i=t.Event(e);i.currentTarget=s[0],this.close(i,!0)}},remove:function(){this._removeTooltip(o)}},i&&"mouseover"!==i.type||(r.mouseleave="close"),i&&"focusin"!==i.type||(r.focusout="close"),this._on(!0,s,r)}},close:function(e){var s=this,n=t(e?e.currentTarget:this.element),a=this._find(n);this.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&n.attr("title",n.data("ui-tooltip-title")),i(n),a.stop(!0),this._hide(a,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),this.closing=!0,this._trigger("close",e,{tooltip:a}),this.closing=!1)},_tooltip:function(e){var i="ui-tooltip-"+s++,n=t("
    ").attr({id:i,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return t("
    ").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[i]=e,n},_find:function(e){var i=e.data("ui-tooltip-id");return i?t("#"+i):t()},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0),t("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))})}})})(jQuery); \ No newline at end of file diff --git a/vendor/built_in_modules/survey/app/assets/javascripts/survey.js b/vendor/built_in_modules/survey/app/assets/javascripts/survey.js new file mode 100644 index 000000000..e6f6f2c84 --- /dev/null +++ b/vendor/built_in_modules/survey/app/assets/javascripts/survey.js @@ -0,0 +1,143 @@ +// Check Questions Length +function checkQuestionsLength() { + var questionsLength = $('.questions > .attributes').length; + if(questionsLength == 1) { + $('.questions .delete').addClass('hide'); + } else { + $('.questions .delete').removeClass('hide'); + }; +}; + + +// Role Attribute Template Data +function setData(l, length, optionsI, className) { + if(!optionsI) { + optionsI = 0; + } + var id = "survey_survey_questions_attributes_", + name = "survey[survey_questions_attributes][", + optionID = l+"_survey_question_options_attributes_"+optionsI+"_name_translations_", + optionName = l+"][survey_question_options_attributes]["+optionsI+"][name_translations]", + radiogroupsID = l+"_survey_question_radiogroups_attributes_"+optionsI+"_name_translations_", + radiogroupsName = l+"][survey_question_radiogroups_attributes]["+optionsI+"][name_translations]"; + data = { + _l: l, + _length: length, + _className: className, + _destroy: [id+l+"_destroy", name+l+"][_destroy]"], + _sequence : [id+l+"_sequence",name+l+"][sequence]"], + _title_translations: [id+l+"_title_translations", name+l+"][title_translations]", "questions_title_"+l], + _description_translations: [id+l+"_description_translations", name+l+"][description_translations]", "questions_depiction_"+l], + _type: [id+l+"_type", name+l+"][type]"], + _is_required: [id+l+"_is_required", name+l+"][is_required]"], + _option: [id+optionID, name+optionName, "attributes_"+l+"_options_"+optionsI+"_"], + _radiogroups: [id+radiogroupsID, name+radiogroupsName, "attributes_"+l+"_radiogroups_"+optionsI+"_"], + _custom_option: [id+l+"_custom_option", name+l+"][custom_option]"] + }; + return data; +}; + +function inputAppendLength(element, length) { + if(length == 2) { + element.closest('.add-target').find('.remove-input').addClass('hide').prev().addClass('last'); + } + element.closest('.input-append').remove(); +} + +$(function() { + var l = $('.questions > .attributes').length || 0; + if($('#survey_redirect_mode').prop('checked')) { + $('.questions').fadeOut(300); + $('.redirect-url').fadeIn(300); + } else { + $('.questions').fadeIn(300); + $('.redirect-url').fadeOut(300); + }; + $('#survey_redirect_mode').change(function(event) { + if($(this).prop('checked')) { + $('.questions').fadeOut(300); + $('.redirect-url').fadeIn(300); + } else { + $('.questions').fadeIn(300); + $('.redirect-url').fadeOut(300); + } + }); + $('.field-type').each(function() { + $(this).children('.control-group').each(function() { + $(this).data().index = $(this).find('.input-append').length + }); + }); + $('.add-target').each(function() { + if($(this).children('.input-append').length == 1) { + $(this).find('.remove-input').addClass('hide').prev().addClass('last'); + }; + }); + $('.add-question').on(clickEvent, function(event) { + $('#template-survery').tmpl(setData(l, $('.questions > .attributes').length + 1)).appendTo($('.questions')); + checkQuestionsLength(); + textareaResizable(); // from textarea-lang-btn.js + l += 1; + }); + + $('.questions').on('change', '.type-selector', function(event) { + $(this).children("option:selected").each(function () { + var $fieldType = $(this).closest('.control-group').siblings('.field-type'), + _val = $(this).val(), + _index = $(this).closest('.attributes').data().index; + if(_val < 2) { + $fieldType.fadeOut(300); + } else { + $fieldType.fadeIn(300); + if(_val < 5) { + $fieldType.find('.rgl, hr').addClass('hide').siblings('.allow').removeClass('hide'); + } else { + $fieldType.find('.rgl, hr').removeClass('hide').siblings('.allow').addClass('hide'); + } + }; + }); + }); + + $('.questions').on('keyup', '.q-title', function(event) { + var $questionsTitle = $(this).closest('.attributes-body').siblings('.attributes-header').find('.questions-title'), + $tabPane = $(this).closest('.tab-content'); + $questionsTitle.text($tabPane.find('.active input[type="text"]').val()) + event.preventDefault(); + /* Act on the event */ + }); + + $('.questions').on(clickEvent, '.add-btn a, .remove-input, .delete, .attributes-header h4 i, .btn-group .btn', function(event) { + if($(this).hasClass('remove-input')){ + inputAppendLength($(this), $(this).closest('.add-target').children('.input-append').length); + } else if($(this).hasClass('delete')) { + $(this).closest('.attributes').fadeOut(300, function() { + $(this).remove(); + checkQuestionsLength(); + $('.questions > .attributes').each(function(index, el) { + $(this).find('h4').find('span').text(index + 1); + }); + }); + } else if($(this).hasClass('icon-caret-up') || $(this).hasClass('icon-caret-down')) { + if($(this).hasClass('icon-caret-up')) { + $(this).closest('.attributes-header').siblings('.attributes-body').slideUp(300) + $(this).addClass('icon-caret-down').removeClass('icon-caret-up'); + } else { + $(this).closest('.attributes-header').siblings('.attributes-body').slideDown(300) + $(this).addClass('icon-caret-up').removeClass('icon-caret-down'); + } + } else if($(this).parent().hasClass('btn-group')){ + var $questionsTitle = $(this).closest('.attributes-body').siblings('.attributes-header').find('.questions-title'), + $tabPane = $(this).closest('.btn-group').siblings('.tab-content'); + $questionsTitle.text($tabPane.find('div').not('.active').children('input[type="text"]').val()) + } else { + var _i = $('.questions .attributes').length, + _className = $(this).closest('.control-group').attr('class').match(/options|rgl/g)[0], + _index = $(this).closest('.attributes').data().index, + _length = $(this).closest('.add-btn').siblings('.input-append').length; + console.log(_i) + $('#template-survery-option').tmpl(setData(_index, "", _i, _className)).insertBefore($(this).closest('.add-btn')); + $(this).closest('.add-target').find('.input-append').find('.remove-input').removeClass('hide').prev().removeClass('last'); + } + event.preventDefault(); + }); + checkQuestionsLength(); +}); \ No newline at end of file diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb index 3ed4c021a..3d9dfa4f5 100644 --- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb +++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb @@ -1,102 +1,121 @@ <% content_for :page_specific_css do %> <%= stylesheet_link_tag "lib/main-forms" %> - <%= stylesheet_link_tag "lib/fileupload" %> + <%= stylesheet_link_tag "lib/wrap-nav" %> <%= stylesheet_link_tag "lib/main-list" %> <% end %> <% content_for :page_specific_javascript do %> - <%= javascript_include_tag "lib/bootstrap-fileupload" %> + <%= javascript_include_tag "jquery-ui-custom.js" %> <%= javascript_include_tag "lib/bootstrap-datetimepicker" %> <%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %> - <%= javascript_include_tag "lib/modal-preview" %> - <%= javascript_include_tag "lib/file-type" %> + <%= javascript_include_tag "lib/member/textarea-lang-btn.js" %> + <%= javascript_include_tag "lib/jquery.tmpl.min.js" %> + <%= javascript_include_tag "survey.js" %> <% end %> <%= f.error_messages %>
    -
    <%= t(:module) %>
    -     - -
    - - -
    -
    -
    - -
    - <%= f.datetime_picker :postdate, :no_label => true %> -
    -
    - -
    - -
    - <%= f.datetime_picker :deadline, :no_label => true %> -
    -
    - -
    -
    -
    -
    -
    - -
    - <%= f.check_box :redirect_mode %> -
    -
    -
    - -
    - <%= f.text_field :redirect_url %> -
    -
    -
    +
    +
    +

    Basic

    +
    +
    -
    -
    Language
    - - - -
    - <% @site_valid_locales.each_with_index do |locale, i| %> -
    "> -
    - <%= f.label :title , t('survey.question'), :class=>"control-label muted" %> -
    - <%= f.fields_for :title_translations do |f| %> - <%= f.text_field locale, :class=>'post-title', :value => (@survey.title_translations[locale] rescue nil) %> - <% end %> + +
    + +
    +
    +
    + <% @site_valid_locales.each_with_index do |locale, i| %> +
    " id="title_<%= locale %>"> + <%= f.fields_for :title_translations do |f| %> + <%= f.text_field locale, :class=>'span4', :value => (@survey.title_translations[locale] rescue nil), :placeholder => I18nVariable.from_locale(locale) %> + <% end %> +
    + <% end %> +
    +
    + <% @site_valid_locales.each_with_index do |locale, i| %> + " href="#title_<%= locale %>" data-toggle="tab"><%= I18nVariable.from_locale(locale) %> + <% end %> +
    +
    +
    +
    + +
    + +
    +
    +
    + <% @site_valid_locales.each_with_index do |locale, i| %> + " href="#textarea_<%= locale %>_0" data-toggle="tab"><%= I18nVariable.from_locale(locale) %> + <% end %>
    -
    -
    - <%= f.label :description ,t('survey.description'), :class => "control-label muted" %> - <%= f.fields_for :description_translations do |f| %> -
    -
    - <%= f.text_area locale, :style=>"width:100%", :class => 'ckeditor input-block-level', :value => (@survey.description_translations[locale] rescue nil) %> -
    -
    + <% @site_valid_locales.each_with_index do |locale, i| %> +
    " id="textarea_<%= locale %>_0"> + <%= f.fields_for :description_translations do |f| %> + <%= f.text_area locale, :class=>'resizable', :value => (@survey.description_translations[locale] rescue nil), :placeholder => I18nVariable.from_locale(locale), :rows=>"3" %> + <% end %> +
    <% end %> +
    +
    + +
    + +
    + <%= f.datetime_picker :postdate, :no_label => true %> +
    +
    + +
    + +
    + <%= f.datetime_picker :deadline, :no_label => true %> +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + <%= f.text_field :redirect_url, :class=>"input-xlarge", :placeholder=>"Redirect URL" %> +
    +
    + +
    + +
    + +
    + +
    + +
    + + <%= f.submit t('save'), :class=>'btn btn-primary' %> + <%= link_to t('cancel'), get_go_back, :class=>"btn" %>
    - <% end %> -
    -
    +<%= render :partial => "questions" %> +
    @@ -116,7 +135,6 @@
    <%= hidden_field_tag 'survey_question_field_count', @survey.survey_questions.count %> - <%= t(:add) %> <%= t('survey.question') %>
    @@ -124,57 +142,5 @@
    -
    - <%= hidden_field_tag 'page', params[:page] if !params[:page].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 "survey_form" %> - -<% end %> \ No newline at end of file diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb new file mode 100644 index 000000000..b6817a488 --- /dev/null +++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb @@ -0,0 +1,192 @@ + + + + + \ No newline at end of file From b5b416d5311e2cbdd5ab892cba8e838bb24c7410 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 17 Sep 2013 15:11:59 +0800 Subject: [PATCH 14/27] add page completed with attributes and reordering --- .../survey/app/assets/javascripts/survey.js | 16 +++++++++++++--- .../survey/back_end/surveys/_questions.html.erb | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/vendor/built_in_modules/survey/app/assets/javascripts/survey.js b/vendor/built_in_modules/survey/app/assets/javascripts/survey.js index e6f6f2c84..cce9ad63a 100644 --- a/vendor/built_in_modules/survey/app/assets/javascripts/survey.js +++ b/vendor/built_in_modules/survey/app/assets/javascripts/survey.js @@ -8,7 +8,6 @@ function checkQuestionsLength() { }; }; - // Role Attribute Template Data function setData(l, length, optionsI, className) { if(!optionsI) { @@ -104,6 +103,15 @@ $(function() { event.preventDefault(); /* Act on the event */ }); + $(".questions").sortable({ + update : function ( event, ui ){ + $(".questions .attributes").each( function ( i ){ + $( this ).find( "input.sequence" ).val( i ); + $( this ).find( "h4 span:eq(0)" ).text( i + 1 ); + $( this ).attr( "data-index", i ); + }) + } + }); $('.questions').on(clickEvent, '.add-btn a, .remove-input, .delete, .attributes-header h4 i, .btn-group .btn', function(event) { if($(this).hasClass('remove-input')){ @@ -113,7 +121,7 @@ $(function() { $(this).remove(); checkQuestionsLength(); $('.questions > .attributes').each(function(index, el) { - $(this).find('h4').find('span').text(index + 1); + $(this).find('h4').find('span:eq(0)').text(index + 1); }); }); } else if($(this).hasClass('icon-caret-up') || $(this).hasClass('icon-caret-down')) { @@ -129,13 +137,15 @@ $(function() { $tabPane = $(this).closest('.btn-group').siblings('.tab-content'); $questionsTitle.text($tabPane.find('div').not('.active').children('input[type="text"]').val()) } else { - var _i = $('.questions .attributes').length, + var _i = $(this).closest('.control-group').data('index') || 1, _className = $(this).closest('.control-group').attr('class').match(/options|rgl/g)[0], _index = $(this).closest('.attributes').data().index, _length = $(this).closest('.add-btn').siblings('.input-append').length; console.log(_i) $('#template-survery-option').tmpl(setData(_index, "", _i, _className)).insertBefore($(this).closest('.add-btn')); $(this).closest('.add-target').find('.input-append').find('.remove-input').removeClass('hide').prev().removeClass('last'); + _i += 1 + $(this).closest('.control-group').data('index', _i) } event.preventDefault(); }); diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb index b6817a488..1ab01ad43 100644 --- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb +++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb @@ -3,7 +3,7 @@
    Delete - +

    Q${_length}

    From dc8815d6198029ed3ba1867d62ef3c70b3cf17dd Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 18 Sep 2013 16:10:39 +0800 Subject: [PATCH 15/27] Fixed Pagination Errors in member module --- .../personal_book/back_end/writing_books_controller.rb | 3 ++- .../personal_book/app/models/writing_book.rb | 2 ++ .../personal_book/back_end/writing_books/index.html.erb | 2 +- .../back_end/writing_conferences_controller.rb | 2 +- .../personal_conference/app/models/writing_conference.rb | 2 ++ .../back_end/writing_conferences/index.html.erb | 2 +- .../personal_diploma/back_end/diplomas_controller.rb | 1 + .../personal_diploma/app/models/diploma.rb | 3 ++- .../personal_diploma/back_end/diplomas/index.html.erb | 2 +- .../back_end/experiences_controller.rb | 1 + .../personal_experience/app/models/experience.rb | 3 ++- .../back_end/experiences/_sort_headers.html.erb | 6 ------ .../back_end/experiences/index.html.erb | 2 +- .../panel/personal_honor/back_end/honors_controller.rb | 1 + .../built_in_modules/personal_honor/app/models/honor.rb | 2 ++ .../personal_honor/back_end/honors/_sort_headers.html.erb | 5 ----- .../panel/personal_honor/back_end/honors/index.html.erb | 2 +- .../back_end/writing_journals_controller.rb | 3 ++- .../personal_journal/app/models/writing_journal.rb | 3 ++- .../back_end/writing_journals/_sort_headers.html.erb | 5 ----- .../back_end/writing_journals/index.html.erb | 2 +- .../panel/personal_lab/back_end/labs_controller.rb | 1 + .../panel/personal_lab/plugin/labs_controller.rb | 2 +- vendor/built_in_modules/personal_lab/app/models/lab.rb | 2 ++ .../personal_lab/back_end/labs/_sort_headers.html.erb | 5 ----- .../views/panel/personal_lab/back_end/labs/index.html.erb | 2 +- .../back_end/writing_patents_controller.rb | 1 + .../personal_patent/app/models/writing_patent.rb | 2 ++ .../back_end/writing_patents/_sort_headers.html.erb | 8 -------- .../back_end/writing_patents/index.html.erb | 2 +- .../personal_project/back_end/projects_controller.rb | 3 ++- .../personal_project/app/models/project.rb | 2 ++ .../back_end/projects/_sort_headers.html.erb | 7 ------- .../personal_project/back_end/projects/index.html.erb | 2 +- .../personal_research/app/models/research.rb | 2 ++ .../back_end/researchs/_sort_headers.html.erb | 6 ------ 36 files changed, 42 insertions(+), 59 deletions(-) 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 60193c410..581acaeda 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 @@ -37,7 +37,8 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl # @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) + @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 diff --git a/vendor/built_in_modules/personal_book/app/models/writing_book.rb b/vendor/built_in_modules/personal_book/app/models/writing_book.rb index e273746f7..8e1de4963 100644 --- a/vendor/built_in_modules/personal_book/app/models/writing_book.rb +++ b/vendor/built_in_modules/personal_book/app/models/writing_book.rb @@ -36,6 +36,8 @@ class WritingBook field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId + + paginates_per 10 has_many :writing_book_files, :autosave => true, :dependent => :destroy 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 6a71d385a..d8537a9e5 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 @@ -28,6 +28,6 @@ <%= 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 @writing_books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @books, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 a91b1407c..20f587d71 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 @@ -38,7 +38,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa #@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 diff --git a/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb b/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb index b7504dbab..9031cfec7 100644 --- a/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb +++ b/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb @@ -32,6 +32,8 @@ class WritingConference field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId + paginates_per 10 + has_many :writing_conference_files, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :writing_conference_files, :allow_destroy => true 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 3126f05cf..5b9aad5c9 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 @@ -28,6 +28,6 @@ <%= 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 @writing_conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @conferences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 45b5ca938..8350641eb 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 @@ -27,6 +27,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll @diplomas = (params[:sort] || @filter) ? get_sorted_and_filtered("diploma") : get_viewable("diploma") + @diplomas_page = @diplomas.page params[:page] @tags = get_tags diff --git a/vendor/built_in_modules/personal_diploma/app/models/diploma.rb b/vendor/built_in_modules/personal_diploma/app/models/diploma.rb index 8cd4c5ce6..99cd64351 100644 --- a/vendor/built_in_modules/personal_diploma/app/models/diploma.rb +++ b/vendor/built_in_modules/personal_diploma/app/models/diploma.rb @@ -26,7 +26,8 @@ class Diploma field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId - + + paginates_per 10 # before_save :clean_checkboxs 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 e142916bf..4f4001808 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 @@ -28,6 +28,6 @@ <%= 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, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @diplomas_page, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 fe15d3292..079aab19b 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 @@ -36,6 +36,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo @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 diff --git a/vendor/built_in_modules/personal_experience/app/models/experience.rb b/vendor/built_in_modules/personal_experience/app/models/experience.rb index fda0ab8f5..e9e207406 100644 --- a/vendor/built_in_modules/personal_experience/app/models/experience.rb +++ b/vendor/built_in_modules/personal_experience/app/models/experience.rb @@ -28,7 +28,8 @@ class Experience field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId - + + paginates_per 10 # before_save :clean_checkboxs diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_sort_headers.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_sort_headers.html.erb index be4539f78..e69de29bb 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/back_end/experiences/_sort_headers.html.erb @@ -1,6 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_experience_back_end_experiences_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['date', 'date', 'span1', 'experience.date'], - ['organizationt_title', 'organizationt_title','span3', 'experience.organizationt_title'], - ['department', 'department','span3', 'experience.department'], - ['job_title', 'job_title','span3', 'experience.job_title'], - ['create_modified', 'create_user_id','span1-3', 'experience.create_modified']).html_safe %> \ No newline at end of file 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 8bb03f1e3..71b7e97c7 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 @@ -30,6 +30,6 @@ <%= 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 @experiences, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @experience_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 dd749ce1d..3bcf761ce 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 @@ -35,6 +35,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController @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 diff --git a/vendor/built_in_modules/personal_honor/app/models/honor.rb b/vendor/built_in_modules/personal_honor/app/models/honor.rb index c44f5aee4..fede2c5ad 100644 --- a/vendor/built_in_modules/personal_honor/app/models/honor.rb +++ b/vendor/built_in_modules/personal_honor/app/models/honor.rb @@ -26,6 +26,8 @@ class Honor field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId + + paginates_per 10 # before_save :clean_checkboxs diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_sort_headers.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_sort_headers.html.erb index cc392b5cf..e69de29bb 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/back_end/honors/_sort_headers.html.erb @@ -1,5 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_honor_back_end_honors_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['year', 'year', 'span1', 'honor.year'], - ['award_name', 'award_name','span3', 'honor.award_name'], - ['awarding_unit', 'awarding_unit','span3', 'honor.awarding_unit'], - ['create_modified', 'create_user_id','span1-3', 'honor.create_modified']).html_safe %> \ No newline at end of file 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 8f9335cf3..5a84d06eb 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 @@ -28,6 +28,6 @@
    <%= 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 @honors, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @honor_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 7ff654f91..1b4460ed4 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 @@ -37,7 +37,8 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC # @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_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 diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb index ab54d055b..ac81abc06 100644 --- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb +++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb @@ -35,7 +35,8 @@ class WritingJournal field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId - + + paginates_per 10 accepts_nested_attributes_for :writing_journal_files, :allow_destroy => true after_save :save_writing_journal_files diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_sort_headers.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_sort_headers.html.erb index 39722fc28..e69de29bb 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_sort_headers.html.erb @@ -1,5 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_journal_back_end_writing_journals_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['publication_date', 'publication_date', 'span1', 'writing_journal.publication_date'], - ['paper_title', 'paper_title','span3', 'writing_journal.paper_title'], - ['create_modified', 'create_user_id','span1-3', 'writing_journal.create_modified']).html_safe %> - \ 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 97cbb20a2..d5eebc3d8 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 @@ -28,6 +28,6 @@ <%= 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_journals, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @writing_journal_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 e7f6776cb..38f4063d6 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 @@ -35,6 +35,7 @@ class Panel::PersonalLab::BackEnd::LabsController < OrbitBackendController @labs = (params[:sort] || @filter) ? get_sorted_and_filtered("lab") : get_viewable("lab") + @lab_pages = @labs.page params[:page] @tags = get_tags diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb index 9c1f0e409..130427668 100644 --- a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb +++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/plugin/labs_controller.rb @@ -34,7 +34,7 @@ class Panel::PersonalLab::Plugin::LabsController < OrbitBackendController @labs = (params[:sort] || @filter) ? get_sorted_and_filtered("lab",:create_user_id => current_user.id) : get_viewable("lab", :create_user_id => current_user.id) - + @tags = get_tags respond_to do |format| diff --git a/vendor/built_in_modules/personal_lab/app/models/lab.rb b/vendor/built_in_modules/personal_lab/app/models/lab.rb index e924e1ae1..f5402729e 100644 --- a/vendor/built_in_modules/personal_lab/app/models/lab.rb +++ b/vendor/built_in_modules/personal_lab/app/models/lab.rb @@ -29,6 +29,8 @@ class Lab field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId + + paginates_per 10 has_many :lab_files, :autosave => true, :dependent => :destroy diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_sort_headers.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_sort_headers.html.erb index 4c21f0773..e69de29bb 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/back_end/labs/_sort_headers.html.erb @@ -1,5 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_lab_back_end_labs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['year', 'year', 'span1', 'lab.year'], - ['lab_title', 'lab_title','span3', 'lab.lab_title'], - ['location', 'location','span3', 'lab.location'], - ['create_modified', 'create_user_id','span1-3', 'lab.create_modified']).html_safe %> \ 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 f56812f96..ac59222a4 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 @@ -28,6 +28,6 @@
    <%= 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 @labs, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @lab_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 493416198..3d9571121 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 @@ -35,6 +35,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon @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 diff --git a/vendor/built_in_modules/personal_patent/app/models/writing_patent.rb b/vendor/built_in_modules/personal_patent/app/models/writing_patent.rb index f6c5ebf3b..533d1b9a6 100644 --- a/vendor/built_in_modules/personal_patent/app/models/writing_patent.rb +++ b/vendor/built_in_modules/personal_patent/app/models/writing_patent.rb @@ -29,6 +29,8 @@ class WritingPatent field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId + + paginates_per 10 has_many :writing_patent_files, :autosave => true, :dependent => :destroy diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb index a6dad620d..e69de29bb 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb @@ -1,8 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_patent_back_end_writing_patents_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['publish_date', 'publish_date', 'span1', 'writing_patent.publish_date'], - ['patent_title', 'patent_title','span3', 'writing_patent.patent_title'], - ['patent_no', 'patent_no','span3', 'writing_patent.patent_no'], - ['patent_country', 'patent_country','span3', 'writing_patent.patent_country'], - ['authors', 'authors','span3', 'writing_patent.authors'], - ['url', 'url','span3', 'writing_patent.url'], - ['create_modified', 'create_user_id','span1-3', 'writing_patent.create_modified']).html_safe %> \ 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 f5e09271c..f033fe787 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 @@ -32,6 +32,6 @@ <%= 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_patents, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @writing_patent_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    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 d712a9166..0cd5e4652 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 @@ -36,7 +36,8 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll @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 respond_to do |format| diff --git a/vendor/built_in_modules/personal_project/app/models/project.rb b/vendor/built_in_modules/personal_project/app/models/project.rb index bbe52c264..c53f86ef8 100644 --- a/vendor/built_in_modules/personal_project/app/models/project.rb +++ b/vendor/built_in_modules/personal_project/app/models/project.rb @@ -31,6 +31,8 @@ class Project field :note field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId + + paginates_per 10 has_many :project_files, :autosave => true, :dependent => :destroy diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_sort_headers.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_sort_headers.html.erb index d641ebbda..e69de29bb 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/back_end/projects/_sort_headers.html.erb @@ -1,7 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_project_back_end_projects_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['period', 'period', 'span1', 'project.period'], - ['project_title', 'project_title','span3', 'project.project_title'], - ['participator', 'participator','span3', 'project.participator'], - ['job_title', 'job_title','span3', 'project.job_title'], - ['unit', 'unit','span3', 'project.unit'], - ['create_modified', 'create_user_id','span1-3', 'project.create_modified']).html_safe %> \ 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 5b43573b1..474589a67 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 @@ -30,6 +30,6 @@
    <%= 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 @projects, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %> + <%= paginate @project_pages, :params => {:direction => params[:direction], :sort => params[:sort], :filter => @filter, :new_filter => nil} %>
    diff --git a/vendor/built_in_modules/personal_research/app/models/research.rb b/vendor/built_in_modules/personal_research/app/models/research.rb index f9ad4d6b4..ff37216ad 100644 --- a/vendor/built_in_modules/personal_research/app/models/research.rb +++ b/vendor/built_in_modules/personal_research/app/models/research.rb @@ -27,6 +27,8 @@ class Research field :create_user_id, :type => BSON::ObjectId field :update_user_id, :type => BSON::ObjectId + paginates_per 10 + has_many :research_files, :autosave => true, :dependent => :destroy accepts_nested_attributes_for :research_files, :allow_destroy => true diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_sort_headers.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_sort_headers.html.erb index a5cb6b470..e69de29bb 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_sort_headers.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/back_end/researchs/_sort_headers.html.erb @@ -1,6 +0,0 @@ -<%= render_sort_bar(true, delete_panel_personal_research_back_end_researchs_path(:direction => params[:direction], :sort => params[:sort], :sort_options => params[:sort_options]), - ['publish_date', 'publish_date', 'span1', 'research.publish_date'], - ['research_title', 'research_title','span3', 'research.research_title'], - ['url', 'url','span3', 'research.url'], - ['create_modified', 'create_user_id','span1-3', 'research.create_modified']).html_safe %> - \ No newline at end of file From 9613a523056defde3ab439e6434399a128cf39e2 Mon Sep 17 00:00:00 2001 From: Spen Date: Wed, 18 Sep 2013 17:31:53 +0800 Subject: [PATCH 16/27] Add Brief intro. for all personal plugins Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " ) Apply New UI to Member Plugin Edit Page Personal Plugin Summary fix Academic Info. list fix --- app/assets/javascripts/lib/list-check.js | 105 ++++ app/assets/stylesheets/lib/list-check.css | 28 + app/assets/stylesheets/lib/member.css | 11 +- app/assets/stylesheets/lib/wrap-nav.css | 3 + .../personal_plugin_intros_controller.rb | 83 +++ .../admin/users_new_interface_controller.rb | 4 +- app/models/user/personal_plugin_intro.rb | 28 + app/models/user/user.rb | 3 + .../personal_plugin_intros/index.html.erb | 117 ++++ .../_plugin_summary.html.erb | 90 +-- .../admin/users_new_interface/index.html.erb | 7 +- .../index_summary.html.erb | 8 +- .../index_thumbnail.html.erb | 8 +- .../admin/users_new_interface/show.html.erb | 6 +- app/views/layouts/member.html.erb | 4 +- config/locales/en.yml | 6 + config/locales/zh_tw.yml | 6 + config/mongoid.yml | 2 +- lib/orbit_app/plugin/registration.rb | 17 + .../member_lists/_show_roles.html.erb | 38 +- .../front_end/member_lists/show.html.erb | 63 +- .../personal_book_intros_controller.rb | 10 + .../back_end/writing_books_controller.rb | 111 ++-- .../app/models/personal_book_intro.rb | 4 + .../back_end/writing_books/_form.html.erb | 562 ++++++++++------- .../writing_books/_form_file.html.erb | 95 ++- .../writing_books/_writing_book.html.erb | 5 - .../back_end/writing_books/edit.html.erb | 10 +- .../back_end/writing_books/index.html.erb | 16 +- .../back_end/writing_books/new.html.erb | 18 +- .../writing_book_setting.html.erb | 4 +- .../personal_book/front_end/_profile.html.erb | 68 +- .../personal_book/plugin/_profile.html.erb | 48 +- .../personal_book/config/routes.rb | 9 +- vendor/built_in_modules/personal_book/init.rb | 2 +- .../personal_conference_intros_controller.rb | 10 + .../writing_conferences_controller.rb | 107 ++-- .../app/models/personal_conference_intro.rb | 4 + .../writing_conferences/_form.html.erb | 555 ++++++++++------- .../writing_conferences/_form_file.html.erb | 95 ++- .../_writing_conference.html.erb | 5 - .../writing_conferences/edit.html.erb | 10 +- .../writing_conferences/index.html.erb | 15 +- .../back_end/writing_conferences/new.html.erb | 16 +- .../writing_conference_setting.html.erb | 4 +- .../front_end/_profile.html.erb | 68 +- .../plugin/_profile.html.erb | 49 +- .../personal_conference/config/locales/en.yml | 2 +- .../personal_conference/config/routes.rb | 2 + .../personal_conference/init.rb | 2 +- .../back_end/diplomas_controller.rb | 73 ++- .../personal_diploma_intros_controller.rb | 10 + .../app/models/personal_diploma_intro.rb | 4 + .../back_end/diplomas/_diploma.html.erb | 5 - .../back_end/diplomas/_form.html.erb | 326 ++++++---- .../back_end/diplomas/edit.html.erb | 13 +- .../back_end/diplomas/index.html.erb | 15 +- .../back_end/diplomas/new.html.erb | 17 +- .../front_end/_profile.html.erb | 68 +- .../personal_diploma/plugin/_profile.html.erb | 46 +- .../personal_diploma/config/routes.rb | 2 + .../built_in_modules/personal_diploma/init.rb | 2 +- .../back_end/experiences_controller.rb | 79 +-- .../personal_experience_intros_controller.rb | 10 + .../app/models/personal_experience_intro.rb | 4 + .../back_end/experiences/_experience.html.erb | 5 - .../back_end/experiences/_form.html.erb | 321 ++++++---- .../back_end/experiences/edit.html.erb | 10 +- .../experiences/experience_setting.html.erb | 2 +- .../back_end/experiences/index.html.erb | 19 +- .../back_end/experiences/new.html.erb | 14 +- .../front_end/_profile.html.erb | 68 +- .../plugin/_profile.html.erb | 47 +- .../personal_experience/config/routes.rb | 4 +- .../personal_experience/init.rb | 2 +- .../back_end/honors_controller.rb | 78 +-- .../personal_honor_intros_controller.rb | 10 + .../app/models/personal_honor_intro.rb | 4 + .../back_end/honors/_form.html.erb | 238 ++++--- .../back_end/honors/_honor.html.erb | 5 - .../back_end/honors/edit.html.erb | 10 +- .../back_end/honors/honor_setting.html.erb | 2 +- .../back_end/honors/index.html.erb | 18 +- .../back_end/honors/new.html.erb | 16 +- .../front_end/_profile.html.erb | 71 ++- .../personal_honor/plugin/_profile.html.erb | 47 +- .../personal_honor/config/routes.rb | 4 +- .../built_in_modules/personal_honor/init.rb | 2 +- .../personal_journal_intros_controller.rb | 10 + .../back_end/writing_journals_controller.rb | 140 +++-- .../app/models/personal_journal_intro.rb | 4 + .../back_end/writing_journals/_form.html.erb | 586 ++++++++++-------- .../writing_journals/_form_file.html.erb | 95 ++- .../_writing_journal.html.erb | 8 +- .../back_end/writing_journals/edit.html.erb | 10 +- .../back_end/writing_journals/index.html.erb | 15 +- .../back_end/writing_journals/new.html.erb | 16 +- .../writing_journal_setting.html.erb | 6 +- .../front_end/_profile.html.erb | 73 ++- .../personal_journal/plugin/_profile.html.erb | 46 +- .../personal_journal/config/locales/en.yml | 2 +- .../personal_journal/config/routes.rb | 2 + .../built_in_modules/personal_journal/init.rb | 2 +- .../personal_lab/back_end/labs_controller.rb | 73 +-- .../personal_lab_intros_controller.rb | 10 + .../app/models/personal_lab_intro.rb | 4 + .../personal_lab/back_end/labs/_form.html.erb | 470 ++++++++------ .../back_end/labs/_form_file.html.erb | 95 ++- .../personal_lab/back_end/labs/_lab.html.erb | 5 - .../personal_lab/back_end/labs/edit.html.erb | 10 +- .../personal_lab/back_end/labs/index.html.erb | 19 +- .../personal_lab/back_end/labs/new.html.erb | 16 +- .../personal_lab/front_end/_profile.html.erb | 74 ++- .../personal_lab/plugin/_profile.html.erb | 47 +- .../personal_lab/config/routes.rb | 2 + vendor/built_in_modules/personal_lab/init.rb | 2 +- .../personal_patent_intros_controller.rb | 10 + .../back_end/writing_patents_controller.rb | 133 ++-- .../app/models/personal_patent_intro.rb | 4 + .../back_end/writing_patents/_form.html.erb | 449 ++++++++------ .../writing_patents/_form_file.html.erb | 95 ++- .../writing_patents/_writing_patent.html.erb | 6 - .../back_end/writing_patents/edit.html.erb | 10 +- .../back_end/writing_patents/index.html.erb | 18 +- .../back_end/writing_patents/new.html.erb | 16 +- .../writing_patent_setting.html.erb | 2 +- .../front_end/_profile.html.erb | 68 +- .../personal_patent/plugin/_profile.html.erb | 46 +- .../personal_patent/config/routes.rb | 5 +- .../built_in_modules/personal_patent/init.rb | 2 +- .../personal_project_intros_controller.rb | 10 + .../back_end/projects_controller.rb | 138 +++-- .../app/models/personal_project_intro.rb | 4 + .../back_end/projects/_form.html.erb | 487 +++++++++------ .../back_end/projects/_form_file.html.erb | 95 ++- .../back_end/projects/_project.html.erb | 5 - .../back_end/projects/edit.html.erb | 10 +- .../back_end/projects/index.html.erb | 18 +- .../back_end/projects/new.html.erb | 16 +- .../projects/project_setting.html.erb | 2 +- .../front_end/_profile.html.erb | 68 +- .../personal_project/plugin/_profile.html.erb | 47 +- .../personal_project/config/routes.rb | 5 +- .../built_in_modules/personal_project/init.rb | 2 +- .../personal_research_intros_controller.rb | 10 + .../back_end/researchs_controller.rb | 70 ++- .../app/models/personal_research_intro.rb | 4 + .../back_end/researchs/_form.html.erb | 427 +++++++------ .../back_end/researchs/_form_file.html.erb | 95 ++- .../back_end/researchs/_research.html.erb | 5 - .../back_end/researchs/edit.html.erb | 10 +- .../back_end/researchs/index.html.erb | 13 +- .../back_end/researchs/new.html.erb | 16 +- .../front_end/_profile.html.erb | 68 +- .../plugin/_profile.html.erb | 46 +- .../personal_research/config/locales/en.yml | 2 +- .../personal_research/config/routes.rb | 2 + .../personal_research/init.rb | 2 +- .../back_end/web_links/_form.html.erb | 1 + 159 files changed, 5145 insertions(+), 3453 deletions(-) create mode 100644 app/assets/javascripts/lib/list-check.js create mode 100644 app/assets/stylesheets/lib/list-check.css create mode 100644 app/controllers/admin/personal_plugin_intros_controller.rb create mode 100644 app/models/user/personal_plugin_intro.rb create mode 100644 app/views/admin/personal_plugin_intros/index.html.erb create mode 100644 vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/back_end/personal_book_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_book/app/models/personal_book_intro.rb create mode 100644 vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/back_end/personal_conference_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_conference/app/models/personal_conference_intro.rb create mode 100644 vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/back_end/personal_diploma_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_diploma/app/models/personal_diploma_intro.rb create mode 100644 vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/back_end/personal_experience_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_experience/app/models/personal_experience_intro.rb create mode 100644 vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/back_end/personal_honor_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_honor/app/models/personal_honor_intro.rb create mode 100644 vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/back_end/personal_journal_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_journal/app/models/personal_journal_intro.rb create mode 100644 vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/back_end/personal_lab_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_lab/app/models/personal_lab_intro.rb create mode 100644 vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/back_end/personal_patent_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_patent/app/models/personal_patent_intro.rb create mode 100644 vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/back_end/personal_project_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_project/app/models/personal_project_intro.rb create mode 100644 vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/back_end/personal_research_intros_controller.rb create mode 100644 vendor/built_in_modules/personal_research/app/models/personal_research_intro.rb diff --git a/app/assets/javascripts/lib/list-check.js b/app/assets/javascripts/lib/list-check.js new file mode 100644 index 000000000..c21899fda --- /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 000000000..5e5e05b52 --- /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 a2bf31955..5a9c6cf23 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 a1bb13f7f..806222627 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 000000000..2d726f551 --- /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 4f4e352f9..f7a1bdf45 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 000000000..8dec3b272 --- /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 7623874b9..0dee5dad2 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -40,12 +40,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 000000000..3c399fd5a --- /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 1c1c0589d..3b3ef767a 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 a87648fab..8b0ecee95 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'} %> @@ -35,8 +36,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 aaa34db5c..0bd2e4305 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 6b303c279..df37ddf57 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 07a59cfd9..bcdc4be1b 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 369ae32e7..e3936b194 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 f0f36b5c4..30916a865 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 fb3097390..a0978103d 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 49a7167ce..9e54f531e 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 a8a5d80c1..64b0d312b 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 833454fbf..7d8219a6b 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 1480f6038..3a77f0a6b 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 000000000..8e2b5adf1 --- /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 581acaeda..60ba0c274 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 000000000..a817ecf66 --- /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 b825470a1..851526fe9 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 a91d6a858..fa9848e55 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 d5bfa6d95..af5afc724 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 faed0f6d4..697bca050 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 d8537a9e5..7a91d6b04 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 af352ea52..b72d110f6 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 8d556a6ce..5ba71a480 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 c408c9c77..451ca3ca4 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 9a4674c24..d9df9f31e 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 3ce4b0345..ba824826e 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 8c9d8493c..1344198b3 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 000000000..bb7b75e93 --- /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 20f587d71..a6ae1f9ff 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 000000000..b977dfc17 --- /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 5c6a31dc8..eee673a34 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 a91d6a858..fa9848e55 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 3f8844966..efd509f56 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 d40d7ae68..b8cfcd6c6 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 5b9aad5c9..a36d4a8c6 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 f2664a90e..7938562f8 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 7e86f073f..84c110728 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 b50d81ede..e7fde7164 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 367ab55ac..081a3c581 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 a1792eda5..5e2ee5242 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 bf6466b77..f4185c074 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 6e5de97d9..1bbf7c6de 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 8350641eb..cfbaae98c 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 000000000..22b85034c --- /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 000000000..be90da99b --- /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 c01410092..bcba75361 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 4335e9c2b..f147f4d7a 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 d4c1224f8..146d940fd 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 4f4001808..a06b6ed69 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 ef4e00706..4c319168f 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 4fc4cc7fc..ebb10c201 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 4773de7ad..edae638a3 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 667ec1814..7dd03023d 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 8cd9f6c4e..aef73f712 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 079aab19b..fd2470ac8 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 000000000..0e4e3def6 --- /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 000000000..ce41eba66 --- /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 be437c79d..7cb777e7a 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 3f8ec027b..3c1e9e23b 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 bd9599340..140819bc4 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 cc0e281e2..2cd0fbe91 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 71b7e97c7..2b7c4b64d 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 d3956e7ef..547dc4d3d 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 9d85075d1..68ec0e5cb 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 05e5353b5..90da957b6 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 3cf826175..433d62708 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 148798bba..ad0a687df 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 3bcf761ce..210a2396f 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 000000000..f89e92f6e --- /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 000000000..967427f62 --- /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 bdd67f9d1..f6d21b421 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 3cbc99601..d03c49880 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 ff9924b11..44bf926ef 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 fc8156e38..0ede75f73 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 5a84d06eb..f9f160969 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 cad74a996..f35fcd52a 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 438bbae37..d400affd7 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 cbb9e3cfc..28e8658bb 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 ec5e90977..6e0333cfa 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 b6851e007..965d7156f 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 000000000..164cb9c1d --- /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 1b4460ed4..da0e76050 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 000000000..ebf8996e8 --- /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 24b63ca60..9fc636ea0 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 a91d6a858..fa9848e55 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 c2709e37a..09f7a44b9 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 be84f49e7..23c576afb 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 d5eebc3d8..b7db0dc6c 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 77bd655d7..256eb0242 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 3b56dc624..62514b69f 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 e3c740ada..9af050c7b 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 59961b00c..124439f28 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 fa2fffa14..2d2fc8cf8 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 5a03564d1..817f08cc3 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 cd85ea0a5..461f72578 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 38f4063d6..e1954e59d 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 000000000..7f0aebec6 --- /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 000000000..46ad26035 --- /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 7495d74c7..f9b83f18f 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 a91d6a858..fa9848e55 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 bbc52ae28..83cd99f38 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 f96423a10..86533007e 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 ac59222a4..0ef63d740 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 92b21a4c3..f46287713 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 18c4a9ac1..f6a2a6353 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 4598ef792..6bbc91765 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 29be7a874..fea3ceb7b 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 0a645b914..076f3c015 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 000000000..4a25dbf48 --- /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 3d9571121..e83e3649d 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 000000000..853cedde7 --- /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 9de98bda9..f1b8fd517 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 a91d6a858..fa9848e55 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 4e4d9ba3f..965ee2ff3 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 5df22b43d..964d6f5cf 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 f033fe787..366247557 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 6910434a8..f406f998b 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 330913ec8..62950247d 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 78f4a7f1c..4b13020a5 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 a943682ed..fd79473b4 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 10e61fa04..8a0adca21 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 9bdf738fe..b06f389cf 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 000000000..dab678f08 --- /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 0cd5e4652..5042c78d6 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 000000000..5ec5789ff --- /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 43fce2eb3..9a8b30ad4 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 a91d6a858..fa9848e55 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 95849b73d..363cd47aa 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 5af1070d6..69388dd8f 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 474589a67..a778f0888 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 f58c98e08..909fc5a5e 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 de1b0fe79..4d4c6fe4c 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 2e7cd93de..14b37fd82 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 8680f15b1..360847066 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 907cf3deb..c93cea3ed 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 914e1fd24..1bc478389 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 000000000..2ae84df26 --- /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 d80f740b7..b7c12ae8c 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 000000000..79cb93123 --- /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 44d57453d..7181a674c 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 a91d6a858..fa9848e55 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 41a055f74..a9a3f6bcb 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 b905b840d..2da6f051c 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 22d57d3bc..5c55084c6 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 f6ef0ab3e..df6dcc468 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 5cbffba18..b17bda8c9 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 daa3bf77b..f44584896 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 e6eac7560..ca9e50723 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 c753af289..36ca3ccd0 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 fdd0d11ca..85e371122 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 c39b88122..2ae6a5577 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 %> From f2a27c6b407e56cc44570520f650d81fa61808f7 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Mon, 23 Sep 2013 09:52:33 +0800 Subject: [PATCH 17/27] Updated Import method in teachers to make all false positives. --- .../admin/import_data_controller.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index c4f25da1f..7e3425c9d 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -22,20 +22,21 @@ class Admin::ImportDataController < OrbitBackendController @roles = Role.all @teacher = User.new I18n.locale = :zh_tw - if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? - @teacher.first_name = "Please Fill the Name" + if !hash['teacher_zh_tw'].blank? + @teacher.first_name = hash['teacher_zh_tw'] elsif hash['teacher_zh_tw'].blank? && !hash['teacher_en'].blank? @teacher.first_name = hash['teacher_en'] - else - @teacher.first_name = hash['teacher_zh_tw'] - end - I18n.locale = :en - if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? + elsif hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? @teacher.first_name = "Please Fill the Name" + end + + I18n.locale = :en + if !hash['teacher_en'].blank? + @teacher.first_name = hash['teacher_en'] elsif hash['teacher_en'].blank? && !hash['teacher_zh_tw'].blank? @teacher.first_name = hash['teacher_zh_tw'] - elsif !hash['teacher_en'].blank? && hash['teacher_zh_tw'].blank? - @teacher.first_name = hash['teacher_en'] + elsif hash['teacher_en'].blank? && hash['teacher_zh_tw'].blank? + @teacher.first_name = "Please Fill the Name" end #@teacher.first_name = hash['teacher_en'] From b535f2cf9c9c1497604ee42b40ef3c75e988b7b7 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Mon, 23 Sep 2013 16:18:07 +0800 Subject: [PATCH 18/27] Updated Data import and sync code --- app/controllers/admin/import_data_controller.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index 7e3425c9d..b82c14b52 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -41,13 +41,19 @@ class Admin::ImportDataController < OrbitBackendController #@teacher.first_name = hash['teacher_en'] @teacher.ntu_seq = hash['ntu_seq'] + @teacher.sid = hash['ntu_seq'] @teacher.role_ids = ["#{@roles.skip(1).first.id}"] @teacher.password = "testpass" @i += 10 - if hash['email'].blank? - @teacher.email = "#{@i}@ntu.edu.tw" + if !hash['email'].blank? + @user = User.where(email: "#{hash['email']}") + if @user.length == 0 + @teacher.email = hash['email'] + elsif @user.length > 0 + @teacher.email = "#{@i}duplicate@ntu.edu.tw" + end else - @teacher.email = hash['email'] + @teacher.email = "#{@i}@ntu.edu.tw" end if hash['teacher_zh_tw'].blank? && hash['teacher_en'].blank? @@ -211,7 +217,7 @@ class Admin::ImportDataController < OrbitBackendController if b[:title].blank? @journal_paper.paper_title = "No Title Present" else - @journal_paper.paper_title = b[:title].first + @journal_paper.paper_title = b[:title] end @journal_paper.note = b[:remarks] @journal_paper.year = b[:year] From d5bb2a1889db461f08ef8e34c1eaaf88412d07c2 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Tue, 24 Sep 2013 15:07:49 +0800 Subject: [PATCH 19/27] Updated Books,Conference, Journal to display properly in the frontend --- .../admin/import_data_controller.rb | 19 +++++++++++++++++-- config/mongoid.yml | 2 +- .../personal_book/app/models/writing_book.rb | 11 ++++++----- .../app/models/writing_conference.rb | 11 +++++------ .../app/models/writing_journal.rb | 4 ++-- 5 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index b82c14b52..cdd40c891 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -137,7 +137,8 @@ class Admin::ImportDataController < OrbitBackendController title: (cp_node>"PaperTitle").text, conference: (cp_node>"PublishOn").text, date: Date::MONTHNAMES[(cp_node>"PublishMonth").text.to_i], - location: (cp_node>"Location").text, + location: "#{(cp_node>"Country").text} #{(cp_node>"location").text}", + conference_title: (cp_node>"PublishOn").text, remarks: (cp_node>"Remarks").text } end @@ -151,6 +152,12 @@ class Admin::ImportDataController < OrbitBackendController else @conference_paper.paper_title = b[:title] end + if b[:conference_title].blank? + @conference_paper.conference_title = "No Title Present" + else + @conference_paper.conference_title = b[:conference_title] + end + @conference_paper.note = b[:remarks] I18n.locale = :en @conference_paper.authors = b[:author] @@ -159,9 +166,17 @@ class Admin::ImportDataController < OrbitBackendController else @conference_paper.paper_title = b[:title] end + if b[:conference_title].blank? + @conference_paper.conference_title = "No Title Present" + else + @conference_paper.conference_title = b[:conference_title] + end @conference_paper.note = b[:remarks] + + @conference_paper.location = b[:location] @conference_paper.year = b[:year] @conference_paper.create_user_id = hash.id + @conference_paper.save! end else @@ -209,7 +224,7 @@ class Admin::ImportDataController < OrbitBackendController if b[:title].blank? @journal_paper.paper_title = "No Title Present" else - @journal_paper.paper_title = b[:title].first + @journal_paper.paper_title = b[:title] end @journal_paper.note = b[:remarks] I18n.locale = :en diff --git a/config/mongoid.yml b/config/mongoid.yml index 9e54f531e..cddb6bb34 100644 --- a/config/mongoid.yml +++ b/config/mongoid.yml @@ -8,7 +8,7 @@ defaults: &defaults development: <<: *defaults - database: test_site + database: ntu_mb_orbit_test diff --git a/vendor/built_in_modules/personal_book/app/models/writing_book.rb b/vendor/built_in_modules/personal_book/app/models/writing_book.rb index 8e1de4963..4f75fc396 100644 --- a/vendor/built_in_modules/personal_book/app/models/writing_book.rb +++ b/vendor/built_in_modules/personal_book/app/models/writing_book.rb @@ -83,11 +83,12 @@ class WritingBook end def create_link - - title = ["\"#{self.extracted_chapters}\""] - title << self.book_title - title << self.publisher - title << self.pages + title = [] + # title = ["#{self.extracted_chapters}"] if self.extracted_chapters.present? + title << self.paper_title if self.paper_title.present? + title << self.book_title if self.book_title.present? + title << self.publisher if self.publisher.present? + title << self.pages if self.pages.present? # title << "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" title.join(', ') end diff --git a/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb b/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb index 9031cfec7..c6a708869 100644 --- a/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb +++ b/vendor/built_in_modules/personal_conference/app/models/writing_conference.rb @@ -84,12 +84,11 @@ class WritingConference end def create_link - - title = ["\"#{self.paper_title}\""] - title << self.conference_title - title << self.sponsor - title << self.location - title << "#{period_start_date}-#{period_end_date}" + title = ["#{self.paper_title}"] + title << self.conference_title if self.conference_title.present? + title << self.sponsor if self.sponsor.present? + title << self.location if self.location.present? + title << "#{period_start_date}-#{period_end_date}" if (self.period_start_date.present? && self.period_end_date.present?) # title << "(#{self.conference_paper_types.collect{|x| x.title}.join(', ')})" title.join(', ') diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb index ac81abc06..38c56754a 100644 --- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb +++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb @@ -90,8 +90,8 @@ class WritingJournal end def create_link - title = ["\"#{self.paper_title}\""] - title << self.journal_title + title = ["#{self.paper_title}"] + title << self.journal_title if self.journal_title.present? title.join(', ') title << ( !self.journal_level_types.blank? ? "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" : nil) title.join(', ') From e29b08d0dc4813d274079ee834967ffc449828a1 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Tue, 24 Sep 2013 17:13:00 +0800 Subject: [PATCH 20/27] Journal title being imported correctly now --- app/controllers/admin/import_data_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index cdd40c891..a9be3b28a 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -226,6 +226,7 @@ class Admin::ImportDataController < OrbitBackendController else @journal_paper.paper_title = b[:title] end + @journal_paper.journal_title = b[:journal] @journal_paper.note = b[:remarks] I18n.locale = :en @journal_paper.authors = b[:author] @@ -234,6 +235,7 @@ class Admin::ImportDataController < OrbitBackendController else @journal_paper.paper_title = b[:title] end + @journal_paper.journal_title = b[:journal] @journal_paper.note = b[:remarks] @journal_paper.year = b[:year] @journal_paper.vol_no = b[:volumeno] From 2a41e3440e13bcda30c7c73c700246a420d8a993 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 25 Sep 2013 12:58:37 +0800 Subject: [PATCH 21/27] Fixed Import data to import journal level types, fixed writing journal --- app/controllers/admin/import_data_controller.rb | 9 ++++++++- .../back_end/writing_books/_list_paper_type.html.erb | 2 +- .../personal_journal/app/models/writing_journal.rb | 4 +++- .../back_end/writing_journals/_list_level_type.html.erb | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/import_data_controller.rb b/app/controllers/admin/import_data_controller.rb index a9be3b28a..1f86544df 100644 --- a/app/controllers/admin/import_data_controller.rb +++ b/app/controllers/admin/import_data_controller.rb @@ -213,7 +213,7 @@ class Admin::ImportDataController < OrbitBackendController endpage:(paper_node>"EndPage").text, subgroup:(paper_node>"subgroup").text, remarks: (paper_node>"Remarks").text, - cate: ((paper_node>"subgroup")>"group").text + cate: ((paper_node>"subgroup")>"Group").text } end if @journal_papers.present? @@ -241,6 +241,13 @@ class Admin::ImportDataController < OrbitBackendController @journal_paper.vol_no = b[:volumeno] @journal_paper.form_to_start = b[:beginpage] @journal_paper.form_to_end = b[:endpage] + if !b[:cate].blank? + @level_type = JournalLevelType.where(:key => b[:cate]) + if @level_type.present? + @journal_paper.journal_level_type_ids = ["#{@level_type.first.id}"] + end + end + @journal_paper.create_user_id = hash.id @journal_paper.save! end diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_list_paper_type.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_list_paper_type.html.erb index 790804a49..8a1bb6e8d 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_list_paper_type.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/back_end/writing_books/_list_paper_type.html.erb @@ -5,7 +5,7 @@ <%= t('edit')%> - <%= link_to show_toggle_archive_btn(list_paper_type), + <%= link_to 'Delete', polymorphic_path([:panel, :personal_book, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %> \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb index 38c56754a..2ca38468d 100644 --- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb +++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb @@ -92,8 +92,10 @@ class WritingJournal def create_link title = ["#{self.paper_title}"] title << self.journal_title if self.journal_title.present? - title.join(', ') title << ( !self.journal_level_types.blank? ? "(#{self.journal_level_types.collect{|x| x.title}.join(', ')})" : nil) + title << "Volume No: "+self.vol_no if (self.vol_no.present? && self.vol_no != "0") + title << "From Page: "+self.form_to_start if (self.form_to_start.present? && self.form_to_start != "0") + title << "To Page: "+self.form_to_end if (self.form_to_end.present? && self.form_to_end != "0") title.join(', ') end diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_level_type.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_level_type.html.erb index 6768c0e4b..c66cbee87 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_level_type.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_level_type.html.erb @@ -5,7 +5,7 @@ <%= t('edit')%> - <%= link_to show_toggle_archive_btn(list_level_type), + <%= link_to "Delete", polymorphic_path([:panel, :personal_journal, :back_end, list_level_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %> \ No newline at end of file From 79c4cd20758f8840272f443cbaab7f2748fb66f3 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 25 Sep 2013 17:07:15 +0800 Subject: [PATCH 22/27] Fixed Personal Plugins tabs for en locale --- .../panel/member/front_end/member_lists/show.html.erb | 9 +++++---- .../back_end/writing_journals/_list_paper_type.html.erb | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) 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 3a77f0a6b..cabe4caf6 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 @@ -59,13 +59,14 @@ <% if !@intro_data.blank? %> <% if !@intro_data.brief_intro.blank? or !@intro_data.complete_list.blank? %> -
      • <%= plugin.name %>
        • +
      • <%= plugin.name %>
        • <% end %> <% else %> <% if !@data.blank? %> -
      • <%= plugin.name %>
        • + <%= plugin.name.gsub(' ', '') %> +
      • <%= plugin.name %>
        • <% end %> <% end %> @@ -86,7 +87,7 @@ <% 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 %> @@ -94,7 +95,7 @@ <% else %> <% if !@data.blank? %> -
        +
        <%= render :partial => @plugin_partial if !@plugin_partial.blank? %>
        <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_paper_type.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_paper_type.html.erb index 6a658b42d..74b761dab 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_paper_type.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/back_end/writing_journals/_list_paper_type.html.erb @@ -5,7 +5,7 @@ <%= t('edit')%> - <%= link_to show_toggle_archive_btn(list_paper_type), + <%= link_to 'Delete', polymorphic_path([:panel, :personal_journal, :back_end, list_paper_type]), :confirm => t('sure?'), :method => :delete, :remote => true,:class=>"archive_toggle action" %> \ No newline at end of file From 6fc47d7afd637d3c48da53015169646b01da8ce9 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Wed, 25 Sep 2013 17:33:05 +0800 Subject: [PATCH 23/27] Updated show to remove test code --- .../app/views/panel/member/front_end/member_lists/show.html.erb | 1 - 1 file changed, 1 deletion(-) 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 cabe4caf6..0d07bfcfb 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 @@ -65,7 +65,6 @@ <% else %> <% if !@data.blank? %> - <%= plugin.name.gsub(' ', '') %>
      • <%= plugin.name %>
        • <% end %> From c35d42d67101cc434c3e3f81f1940b04e40dec68 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 24 Sep 2013 11:30:39 +0800 Subject: [PATCH 24/27] external links and link widget fixed for development --- app/controllers/front_controller.rb | 2 +- .../web_resource/widget/web_links/_index.html.erb | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb index 02098f8a5..da6082976 100644 --- a/app/controllers/front_controller.rb +++ b/app/controllers/front_controller.rb @@ -73,7 +73,7 @@ class FrontController < ApplicationController res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page)) res << "'>" root = "/" - res << "#{page.title}" + res << "#{page.title}" if page.visible_children.size > 0 && current < menu.levels res << "" res << menu_level(page, current_page, current + 1, menu) diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb index 89608fc07..013718b56 100644 --- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb +++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb @@ -10,11 +10,13 @@
          <% wlcg["web_links"].each do |post| %> -
        • - <%= link_to post["title"], post["url"], {:target => '_blank', :title => post["title"], :class=>"o-links-title"} %> - <% if !post["is_hot"].blank? %><%= t('hot')%><% end %> -
          <%= post["context"] %>
          -
          • + <% if !web_link.title.empty? %> +
        • + <%= link_to post["title"], post["url"], {:target => '_blank', :title => post["title"], :class=>"o-links-title"} %> + <% if !post["is_hot"].blank? %><%= t('hot')%><% end %> +
          <%= post["context"] %>
          +
          • + <% end %> <% end %>
        From 42dcf0a2d290b5dca61cf6cab0f9fa112d6d9da1 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 23 Sep 2013 20:30:09 +0800 Subject: [PATCH 25/27] survey edit completed --- .../survey/app/assets/javascripts/survey.js | 140 +++++++++++++++--- .../survey/back_end/surveys_controller.rb | 18 ++- .../survey/back_end/surveys/_form.html.erb | 31 +--- .../back_end/surveys/_questions.html.erb | 91 +++++------- .../survey/back_end/surveys/edit.html.erb | 4 +- 5 files changed, 172 insertions(+), 112 deletions(-) diff --git a/vendor/built_in_modules/survey/app/assets/javascripts/survey.js b/vendor/built_in_modules/survey/app/assets/javascripts/survey.js index cce9ad63a..d21c192c1 100644 --- a/vendor/built_in_modules/survey/app/assets/javascripts/survey.js +++ b/vendor/built_in_modules/survey/app/assets/javascripts/survey.js @@ -24,14 +24,67 @@ function setData(l, length, optionsI, className) { _length: length, _className: className, _destroy: [id+l+"_destroy", name+l+"][_destroy]"], - _sequence : [id+l+"_sequence",name+l+"][sequence]"], + _sequence : [id+l+"_sequence",name+l+"][sequence]",length-1], _title_translations: [id+l+"_title_translations", name+l+"][title_translations]", "questions_title_"+l], _description_translations: [id+l+"_description_translations", name+l+"][description_translations]", "questions_depiction_"+l], _type: [id+l+"_type", name+l+"][type]"], - _is_required: [id+l+"_is_required", name+l+"][is_required]"], + _is_required: [id+l+"_is_required", name+l+"][is_required]",false], _option: [id+optionID, name+optionName, "attributes_"+l+"_options_"+optionsI+"_"], _radiogroups: [id+radiogroupsID, name+radiogroupsName, "attributes_"+l+"_radiogroups_"+optionsI+"_"], - _custom_option: [id+l+"_custom_option", name+l+"][custom_option]"] + _custom_option: [id+l+"_custom_option", name+l+"][custom_option]",false] + }; + return data; +}; + +function setEditData(l, length, d, optionsI, className) { + if(!optionsI) { + optionsI = 0; + } + var id = "survey_survey_questions_attributes_", + name = "survey[survey_questions_attributes][", + optionID = l+"_survey_question_options_attributes_"+optionsI+"_name_translations_", + optionName = l+"][survey_question_options_attributes]["+optionsI+"][name_translations]", + radiogroupsID = l+"_survey_question_radiogroups_attributes_"+optionsI+"_name_translations_", + radiogroupsName = l+"][survey_question_radiogroups_attributes]["+optionsI+"][name_translations]"; + data = { + _l: l, + _length: length, + _className: className, + _destroy: [id+l+"__destroy", name+l+"][_destroy]"], + _id: [id+l+"_id", name+l+"][id]",d._id], + _sequence : [id+l+"_sequence",name+l+"][sequence]",d.sequence], + _title_translations: [id+l+"_title_translations", name+l+"][title_translations]", "questions_title_"+l,d.title_translations], + _description_translations: [id+l+"_description_translations", name+l+"][description_translations]", "questions_depiction_"+l,d.description_translations], + _type: [id+l+"_type", name+l+"][type]",d.type], + _is_required: [id+l+"_is_required", name+l+"][is_required]",d.is_required], + _option: [id+optionID, name+optionName, "attributes_"+l+"_options_"+optionsI+"_"], + _radiogroups: [id+radiogroupsID, name+radiogroupsName, "attributes_"+l+"_radiogroups_"+optionsI+"_"], + _custom_option: [id+l+"_custom_option", name+l+"][custom_option]",d.custom_option] + }; + return data; +}; + +function setEditQuestionAttributes(l, length, d, optionsI, className) { + if(!optionsI) { + optionsI = 0; + } + var id = "survey_survey_questions_attributes_", + name = "survey[survey_questions_attributes][", + optionID = l+"_survey_question_options_attributes_"+optionsI+"_name_translations_", + optionName = l+"][survey_question_options_attributes]["+optionsI+"][name_translations]", + radiogroupsID = l+"_survey_question_radiogroups_attributes_"+optionsI+"_name_translations_", + radiogroupsName = l+"][survey_question_radiogroups_attributes]["+optionsI+"][name_translations]", + option_id = l+"][survey_question_options_attributes]["+optionsI+"][id]", + radiogroups_id = l+"][survey_question_radiogroups_attributes]["+optionsI+"][id]"; + data = { + _l: l, + _length: length, + _className: className, + _option: [id+optionID, name+optionName, "attributes_"+l+"_options_"+optionsI+"_", d.name_translations], + _radiogroups: [id+radiogroupsID, name+radiogroupsName, "attributes_"+l+"_radiogroups_"+optionsI+"_",d.name_translations], + _options_id: [name+option_id,d._id], + _radiogroups_id: [name+radiogroups_id,d._id] + }; return data; }; @@ -43,6 +96,47 @@ function inputAppendLength(element, length) { element.closest('.input-append').remove(); } +function editQuestion (dataArray){ + var l = $('.questions > .attributes').length || 0; + $.each(dataArray,function ( i, d ) { + console.log(d) + $('#template-survery').tmpl(setEditData(l, $('.questions > .attributes').length + 1, d)).appendTo($('.questions')); + checkQuestionsLength(); + textareaResizable(); // from textarea-lang-btn.js + if( d.type > 1 && d.type < 5 ){ + onQuestionTypeChanged( $(".questions .field-type:eq("+ i +")"), d.type ); + $.each(d.survey_question_options,function ( x, data ){ + $('#template-survery-option').tmpl(setEditQuestionAttributes( l, "", data, x, "options" )).insertBefore($(".questions .field-type:eq("+ i +") .options .add-btn")); + $(".questions .field-type:eq("+ i +") .options").data("index",x); + }) + } else if( d.type == 5 ) { + onQuestionTypeChanged( $(".questions .field-type:eq("+ i +")"), d.type ); + $.each(d.survey_question_radiogroups,function ( x, data ){ + $('#template-survery-option').tmpl(setEditQuestionAttributes( l, "", data, x, "rgl" )).insertBefore($(".questions .field-type:eq("+ i +") .rgl .add-btn")); + $(".questions .field-type:eq("+ i +") .options").data("index",x); + }) + $.each(d.survey_question_options,function ( x, data ){ + $('#template-survery-option').tmpl(setEditQuestionAttributes( l, "", data, x, "options" )).insertBefore($(".questions .field-type:eq("+ i +") .options .add-btn")); + $(".questions .field-type:eq("+ i +") .options").data("index",x); + }) + } + l++; + }) +} + +function onQuestionTypeChanged ( $fieldType, _val ){ + if(_val < 2) { + $fieldType.fadeOut(300); + } else { + $fieldType.fadeIn(300); + if(_val < 5) { + $fieldType.find('.rgl, hr').addClass('hide').siblings('.allow').removeClass('hide'); + } else { + $fieldType.find('.rgl, hr').removeClass('hide').siblings('.allow').addClass('hide'); + } + }; +} + $(function() { var l = $('.questions > .attributes').length || 0; if($('#survey_redirect_mode').prop('checked')) { @@ -79,22 +173,18 @@ $(function() { }); $('.questions').on('change', '.type-selector', function(event) { - $(this).children("option:selected").each(function () { - var $fieldType = $(this).closest('.control-group').siblings('.field-type'), - _val = $(this).val(), - _index = $(this).closest('.attributes').data().index; - if(_val < 2) { - $fieldType.fadeOut(300); - } else { - $fieldType.fadeIn(300); - if(_val < 5) { - $fieldType.find('.rgl, hr').addClass('hide').siblings('.allow').removeClass('hide'); - } else { - $fieldType.find('.rgl, hr').removeClass('hide').siblings('.allow').addClass('hide'); - } - }; - }); + var $fieldType = $(this).closest('.control-group').siblings('.field-type'), + _val = $(this).val(), + _index = $(this).closest('.attributes').data().index; + + onQuestionTypeChanged( $fieldType, _val ); }); + $('.questions').on(clickEvent, "input[type=checkbox]", function(){ + if( $( this ).is(":checked") ) + $( this ).parent().find( 'input[type=hidden]' ).val("1"); + else + $( this ).parent().find( 'input[type=hidden]' ).val("0"); + }) $('.questions').on('keyup', '.q-title', function(event) { var $questionsTitle = $(this).closest('.attributes-body').siblings('.attributes-header').find('.questions-title'), @@ -118,10 +208,13 @@ $(function() { inputAppendLength($(this), $(this).closest('.add-target').children('.input-append').length); } else if($(this).hasClass('delete')) { $(this).closest('.attributes').fadeOut(300, function() { - $(this).remove(); + $(this).hide(); + $( this ).find( '.should_destroy' ).val(1); checkQuestionsLength(); - $('.questions > .attributes').each(function(index, el) { - $(this).find('h4').find('span:eq(0)').text(index + 1); + $('.questions .attributes').each(function(index, el) { + $( this ).find( "input.sequence" ).val( index ); + $( this ).find( "h4 span:eq(0)" ).text( index + 1 ); + $( this ).attr( "data-index", index ); }); }); } else if($(this).hasClass('icon-caret-up') || $(this).hasClass('icon-caret-down')) { @@ -132,16 +225,15 @@ $(function() { $(this).closest('.attributes-header').siblings('.attributes-body').slideDown(300) $(this).addClass('icon-caret-up').removeClass('icon-caret-down'); } - } else if($(this).parent().hasClass('btn-group')){ + } else if($(this).hasClass('change-title')){ var $questionsTitle = $(this).closest('.attributes-body').siblings('.attributes-header').find('.questions-title'), $tabPane = $(this).closest('.btn-group').siblings('.tab-content'); $questionsTitle.text($tabPane.find('div').not('.active').children('input[type="text"]').val()) } else { - var _i = $(this).closest('.control-group').data('index') || 1, + var _i = $(this).closest('.control-group').data('index') || 0, _className = $(this).closest('.control-group').attr('class').match(/options|rgl/g)[0], _index = $(this).closest('.attributes').data().index, _length = $(this).closest('.add-btn').siblings('.input-append').length; - console.log(_i) $('#template-survery-option').tmpl(setData(_index, "", _i, _className)).insertBefore($(this).closest('.add-btn')); $(this).closest('.add-target').find('.input-append').find('.remove-input').removeClass('hide').prev().removeClass('last'); _i += 1 diff --git a/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb b/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb index ba4c2a76d..9052d26f4 100644 --- a/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb +++ b/vendor/built_in_modules/survey/app/controllers/panel/survey/back_end/surveys_controller.rb @@ -48,11 +48,27 @@ class Panel::Survey::BackEnd::SurveysController < OrbitBackendController def edit @survey = ::Survey.find(params[:id]) + @sqs = [] + @survey.survey_questions.each do |sq| + sq['title_translations'] = sq.title_translations + sq['description_translations'] = sq.description_translations + temp = [] + sq.survey_question_options.each do |sqo| + sqo['name_translations'] = sqo.name_translations + temp << sqo + end + temp = [] + sq.survey_question_radiogroups.each do |sqr| + sqr['name_translations'] = sqr.name_translations + temp << sqr + end + sq.survey_question_radiogroups = temp + @sqs << sq + end end def update @survey = ::Survey.find(params[:id]) - @survey.update_user_id = current_user.id respond_to do |format| diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb index 3d9dfa4f5..1b86a7489 100644 --- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb +++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb @@ -116,31 +116,6 @@ <%= render :partial => "questions" %> -
        - - - - - -
        -
        -
        -
        -
        - <% @survey.survey_questions.each_with_index do |survey_question, i| %> - <%= f.fields_for :survey_questions, survey_question do |f| %> - <%= render :partial => 'form_survey_question', :object => survey_question, :locals => {:f => f, :i => i} %> - <% end %> - <% end %> -
        -
        - <%= hidden_field_tag 'survey_question_field_count', @survey.survey_questions.count %> -
        -
        - -
        - -
        - -
        - + diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb index 1ab01ad43..151d29467 100644 --- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb +++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_questions.html.erb @@ -3,8 +3,11 @@
        Delete - -

        Q${_length}

        + + {{if _id}} + + {{/if}} +

        Q${_length} ${_title_translations[3].en}

        @@ -13,15 +16,15 @@
        - +
        - +
        - English - Chinese + English + Chinese
        @@ -35,10 +38,10 @@ Chinese
        - +
        - +
        @@ -46,13 +49,13 @@
        - + + + + + +
        @@ -64,23 +67,7 @@
        -
        -
        -
        - -
        -
        - -
        -
        -
        - English - Chinese - - - -
        -
        +

        Add @@ -95,23 +82,7 @@

        -
        -
        -
        - -
        -
        - -
        -
        -
        - English - Chinese - - - -
        -
        +

        Add @@ -123,8 +94,8 @@

        @@ -137,8 +108,8 @@
        @@ -153,12 +124,15 @@ diff --git a/vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js b/vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js index 739f98cb3..08a63fdb4 100644 --- a/vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js +++ b/vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js @@ -84,7 +84,13 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t uploadFiles(); languageSelect(); } - + this.initializePersonalBook.brief = function(){ + o.enablelanguageSelect(); + $("textarea.editor").ckeditor({ + height: 300, + width: $(".overview").width() - 20 + }); + } this.initializePersonalBook.coAuthorformCallback = function(data){ if(data.success){ diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/plugin_intros_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/plugin_intros_controller.rb new file mode 100644 index 000000000..aee4700a9 --- /dev/null +++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/plugin_intros_controller.rb @@ -0,0 +1,32 @@ +class Panel::PersonalBook::Desktop::PluginIntrosController < ApplicationController + + def index + @intro = PersonalBookIntro.where(:user_id => current_user.id.to_s).first + if @intro.blank? + @intro = PersonalBookIntro.new + render "new", :layout => false + else + render "edit", :layout => false + end + end + + def create + @intro = PersonalBookIntro.new(params[:personal_book_intro]) + @intro.user_id = current_user.id + if @intro.save + render :json => {"success" => true}.to_json + else + render :json => {"success" => false}.to_json + end + end + + def update + @intro = PersonalBookIntro.find(params[:id]) + if @intro.update_attributes(params[:personal_book_intro]) + render :json => {"success" => true}.to_json + else + render :json => {"success" => false}.to_json + end + end + +end \ No newline at end of file diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/books_window.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/books_window.html.erb index 4f299ab19..137e19da3 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/books_window.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/books_window.html.erb @@ -17,6 +17,7 @@