From e3d9966f7617aed52fe0bfb958cf925d722d57bc Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 6 Aug 2013 15:55:14 +0800 Subject: [PATCH] bugs fixed for plugins. .. and also css fixed --- .../javascripts/desktop/orbitdesktop.js | 2 +- .../personal_book/desktop/personal_books.js | 2 +- .../desktop/personal_books_controller.rb | 2 +- .../desktop/personal_books/edit.html.erb | 2 +- .../desktop/personal_books/index.html.erb | 2 +- .../desktop/conference_pages.js | 2 +- .../desktop/personal_diploma.js | 2 +- .../personal_diploma/personal_diploma.css | 24 +++++++++---------- .../personal_diploma/personal_diploma.scss | 2 +- .../desktop/personal_diplomas_controller.rb | 2 +- .../desktop/personal_diplomas/edit.html.erb | 2 +- .../desktop/personal_diplomas/index.html.erb | 2 +- .../desktop/personal_experiences.js | 2 +- .../desktop/personal_experience.css | 24 +++++++++---------- .../desktop/personal_experience.scss | 2 +- .../personal_experiences_controller.rb | 2 +- .../personal_experiences/edit.html.erb | 2 +- .../personal_experiences/index.html.erb | 2 +- .../personal_honor/desktop/personal_honors.js | 2 +- .../personal_honor/desktop/personal_honor.css | 24 +++++++++---------- .../desktop/personal_honor.scss | 2 +- .../desktop/personal_honors_controller.rb | 2 +- .../desktop/personal_honors/edit.html.erb | 2 +- .../desktop/personal_honors/index.html.erb | 2 +- .../personal_journal/desktop/journal_pages.js | 2 +- .../personal_lab/desktop/personal_lab.js | 2 +- .../personal_lab/desktop/personal_lab.css | 24 +++++++++---------- .../personal_lab/desktop/personal_lab.scss | 2 +- .../desktop/personal_labs_controller.rb | 2 +- .../desktop/personal_labs/edit.html.erb | 2 +- .../desktop/personal_labs/index.html.erb | 2 +- .../desktop/personal_patent.js | 2 +- .../desktop/personal_patent.css | 24 +++++++++---------- .../desktop/personal_patent.scss | 2 +- .../desktop/personal_patents_controller.rb | 2 +- .../desktop/personal_patents/edit.html.erb | 2 +- .../desktop/personal_patents/index.html.erb | 2 +- .../desktop/personal_project.js | 2 +- .../desktop/personal_project.css | 24 +++++++++---------- .../desktop/personal_project.scss | 2 +- .../desktop/personal_projects_controller.rb | 2 +- .../desktop/personal_projects/edit.html.erb | 2 +- .../desktop/personal_projects/index.html.erb | 2 +- .../desktop/personal_research.js | 2 +- .../desktop/personal_research.css | 24 +++++++++---------- .../desktop/personal_research.scss | 2 +- .../desktop/personal_researchs_controller.rb | 2 +- .../desktop/personal_researchs/edit.html.erb | 2 +- .../desktop/personal_researchs/index.html.erb | 6 ++--- 49 files changed, 128 insertions(+), 128 deletions(-) diff --git a/app/assets/javascripts/desktop/orbitdesktop.js b/app/assets/javascripts/desktop/orbitdesktop.js index 09512bef2..c9c0452d2 100755 --- a/app/assets/javascripts/desktop/orbitdesktop.js +++ b/app/assets/javascripts/desktop/orbitdesktop.js @@ -262,7 +262,7 @@ var orbitDesktop = function(dom){ window.o[o.data_method][callback_method](responseText,statusText,xhr,$form); } } - if(notification != "") + if(typeof notification == "string") o.notify(notification,"success"); }, error:function(){ 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 86b313285..c220269e4 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 @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t } } this.initializePersonalBook.bookDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb index c81eda799..803634845 100644 --- a/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb +++ b/vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb @@ -52,7 +52,7 @@ class Panel::PersonalBook::Desktop::PersonalBooksController < ApplicationControl def update params[:writing_book][:create_user_id] = current_user.id - @personal_book = WritingBook.new(params[:writing_book]) + @personal_book = WritingBook.find(params[:id]) if @personal_book.update_attributes(params[:writing_book]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/edit.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/edit.html.erb index c574a4dce..78c1c3acd 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/edit.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @personal_book, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_book_desktop_personal_books_path(@personal_book) do |f| %> +<%= form_for @personal_book, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_book_desktop_personal_book_path(@personal_book) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb index c60e3743b..f79d1d30c 100644 --- a/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb +++ b/vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb @@ -76,7 +76,7 @@
-
+
<% @writing_books.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js index 7dd6c302a..4e06de1a6 100644 --- a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js +++ b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){ } } this.initializeConferencePapers.paperDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_diploma/app/assets/javascripts/personal_diploma/desktop/personal_diploma.js b/vendor/built_in_modules/personal_diploma/app/assets/javascripts/personal_diploma/desktop/personal_diploma.js index 8ec15670a..f1e054edc 100644 --- a/vendor/built_in_modules/personal_diploma/app/assets/javascripts/personal_diploma/desktop/personal_diploma.js +++ b/vendor/built_in_modules/personal_diploma/app/assets/javascripts/personal_diploma/desktop/personal_diploma.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalDiploma = function(target,url,cache){ / } } this.initializePersonalDiploma.diplomaDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.css b/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.css index f0c6ce6ea..eced2ae51 100644 --- a/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.css +++ b/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.css @@ -1,31 +1,31 @@ /* Books */ -[page-name="books_list"] .list_t_item .inner { +[page-name="diploma_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="books_list"] .list_item_action { +[page-name="diploma_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="books_list"] .list_item_action a { + [page-name="diploma_list"] .list_item_action a { display: block; width: 20px; height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="books_list"] .list_item_action .icon-star-empty { + [page-name="diploma_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-star { + [page-name="diploma_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check-empty { + [page-name="diploma_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check { + [page-name="diploma_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } -[page-name="books_list"] .file_view .list_t_des { +[page-name="diploma_list"] .file_view .list_t_des { overflow: hidden; } -[page-name="books_list"] .file_view .file { +[page-name="diploma_list"] .file_view .file { float: left; width: 120px; height: 50px; @@ -42,15 +42,15 @@ /* ie */ box-sizing: border-box; /* css3 */ } - [page-name="books_list"] .file_view .file:hover { + [page-name="diploma_list"] .file_view .file:hover { background-color: #f7f7f7; } - [page-name="books_list"] .file_view .file img { + [page-name="diploma_list"] .file_view .file img { width: 38px; height: 38px; position: absolute; left: 6px; top: 6px; } - [page-name="books_list"] .file_view .file .filetitle { + [page-name="diploma_list"] .file_view .file .filetitle { display: block; width: 100%; height: 38px; diff --git a/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.scss b/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.scss index ddafade97..93c818705 100644 --- a/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.scss +++ b/vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.scss @@ -1,7 +1,7 @@ @import "desktop-helper"; /* Books */ -[page-name="books_list"] { +[page-name="diploma_list"] { .list_t_item .inner { padding-left: 30px; } .list_item_action { font-size: 12px; diff --git a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/desktop/personal_diplomas_controller.rb b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/desktop/personal_diplomas_controller.rb index 3f658ba86..456efc8dd 100644 --- a/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/desktop/personal_diplomas_controller.rb +++ b/vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/desktop/personal_diplomas_controller.rb @@ -30,7 +30,7 @@ class Panel::PersonalDiploma::Desktop::PersonalDiplomasController < ApplicationC def update params[:diploma][:create_user_id] = current_user.id - @diploma = Diploma.new(params[:diploma]) + @diploma = Diploma.find(params[:id]) if @diploma.update_attributes(params[:diploma]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/edit.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/edit.html.erb index 596b0a3ae..58023af27 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/edit.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @diploma, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_diploma_desktop_personal_diplomas_path(@diploma) do |f| %> +<%= form_for @diploma, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_diploma_desktop_personal_diploma_path(@diploma) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb index 676d01408..a53e048c7 100644 --- a/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb +++ b/vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb @@ -75,7 +75,7 @@
-
+
<% @diplomas.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_experience/app/assets/javascripts/personal_experience/desktop/personal_experiences.js b/vendor/built_in_modules/personal_experience/app/assets/javascripts/personal_experience/desktop/personal_experiences.js index 732b61b9c..6f20c0224 100644 --- a/vendor/built_in_modules/personal_experience/app/assets/javascripts/personal_experience/desktop/personal_experiences.js +++ b/vendor/built_in_modules/personal_experience/app/assets/javascripts/personal_experience/desktop/personal_experiences.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalExperience = function(target,url,cache) } } this.initializePersonalExperience.experienceDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.css b/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.css index f0c6ce6ea..44ff2cb8d 100644 --- a/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.css +++ b/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.css @@ -1,31 +1,31 @@ /* Books */ -[page-name="books_list"] .list_t_item .inner { +[page-name="experience_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="books_list"] .list_item_action { +[page-name="experience_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="books_list"] .list_item_action a { + [page-name="experience_list"] .list_item_action a { display: block; width: 20px; height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="books_list"] .list_item_action .icon-star-empty { + [page-name="experience_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-star { + [page-name="experience_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check-empty { + [page-name="experience_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check { + [page-name="experience_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } -[page-name="books_list"] .file_view .list_t_des { +[page-name="experience_list"] .file_view .list_t_des { overflow: hidden; } -[page-name="books_list"] .file_view .file { +[page-name="experience_list"] .file_view .file { float: left; width: 120px; height: 50px; @@ -42,15 +42,15 @@ /* ie */ box-sizing: border-box; /* css3 */ } - [page-name="books_list"] .file_view .file:hover { + [page-name="experience_list"] .file_view .file:hover { background-color: #f7f7f7; } - [page-name="books_list"] .file_view .file img { + [page-name="experience_list"] .file_view .file img { width: 38px; height: 38px; position: absolute; left: 6px; top: 6px; } - [page-name="books_list"] .file_view .file .filetitle { + [page-name="experience_list"] .file_view .file .filetitle { display: block; width: 100%; height: 38px; diff --git a/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.scss b/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.scss index ddafade97..43f2bd9b5 100644 --- a/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.scss +++ b/vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.scss @@ -1,7 +1,7 @@ @import "desktop-helper"; /* Books */ -[page-name="books_list"] { +[page-name="experience_list"] { .list_t_item .inner { padding-left: 30px; } .list_item_action { font-size: 12px; diff --git a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/desktop/personal_experiences_controller.rb b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/desktop/personal_experiences_controller.rb index 4747ca8e4..21fca3996 100644 --- a/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/desktop/personal_experiences_controller.rb +++ b/vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/desktop/personal_experiences_controller.rb @@ -51,7 +51,7 @@ class Panel::PersonalExperience::Desktop::PersonalExperiencesController < Applic def update params[:experience][:create_user_id] = current_user.id - @experience = Experience.new(params[:experience]) + @experience = Experience.find(params[:id]) if @experience.update_attributes(params[:writing_book]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/edit.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/edit.html.erb index e261d86ca..48bbdad63 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/edit.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @experience, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_experience_desktop_personal_experiences_path(@personal_book) do |f| %> +<%= form_for @experience, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_experience_desktop_personal_experience_path(@experience) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb index 21caee33f..419211199 100644 --- a/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb +++ b/vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb @@ -76,7 +76,7 @@
-
+
<% @experiences.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_honor/app/assets/javascripts/personal_honor/desktop/personal_honors.js b/vendor/built_in_modules/personal_honor/app/assets/javascripts/personal_honor/desktop/personal_honors.js index e4d64469b..26b7ebec5 100644 --- a/vendor/built_in_modules/personal_honor/app/assets/javascripts/personal_honor/desktop/personal_honors.js +++ b/vendor/built_in_modules/personal_honor/app/assets/javascripts/personal_honor/desktop/personal_honors.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalHonor = function(target,url,cache){ // } } this.initializePersonalHonor.honorDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.css b/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.css index f0c6ce6ea..fe90d850e 100644 --- a/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.css +++ b/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.css @@ -1,31 +1,31 @@ /* Books */ -[page-name="books_list"] .list_t_item .inner { +[page-name="honor_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="books_list"] .list_item_action { +[page-name="honor_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="books_list"] .list_item_action a { + [page-name="honor_list"] .list_item_action a { display: block; width: 20px; height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="books_list"] .list_item_action .icon-star-empty { + [page-name="honor_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-star { + [page-name="honor_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check-empty { + [page-name="honor_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check { + [page-name="honor_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } -[page-name="books_list"] .file_view .list_t_des { +[page-name="honor_list"] .file_view .list_t_des { overflow: hidden; } -[page-name="books_list"] .file_view .file { +[page-name="honor_list"] .file_view .file { float: left; width: 120px; height: 50px; @@ -42,15 +42,15 @@ /* ie */ box-sizing: border-box; /* css3 */ } - [page-name="books_list"] .file_view .file:hover { + [page-name="honor_list"] .file_view .file:hover { background-color: #f7f7f7; } - [page-name="books_list"] .file_view .file img { + [page-name="honor_list"] .file_view .file img { width: 38px; height: 38px; position: absolute; left: 6px; top: 6px; } - [page-name="books_list"] .file_view .file .filetitle { + [page-name="honor_list"] .file_view .file .filetitle { display: block; width: 100%; height: 38px; diff --git a/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.scss b/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.scss index ddafade97..3d54ee3df 100644 --- a/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.scss +++ b/vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.scss @@ -1,7 +1,7 @@ @import "desktop-helper"; /* Books */ -[page-name="books_list"] { +[page-name="honor_list"] { .list_t_item .inner { padding-left: 30px; } .list_item_action { font-size: 12px; diff --git a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/desktop/personal_honors_controller.rb b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/desktop/personal_honors_controller.rb index f7b7e1b5e..14e2e9cce 100644 --- a/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/desktop/personal_honors_controller.rb +++ b/vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/desktop/personal_honors_controller.rb @@ -50,7 +50,7 @@ class Panel::PersonalHonor::Desktop::PersonalHonorsController < ApplicationContr def update params[:honor][:create_user_id] = current_user.id - @honor = Honor.new(params[:honor]) + @honor = Honor.find(params[:id]) if @honor.update_attributes(params[:honor]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/edit.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/edit.html.erb index 1ce89943d..53a557dc9 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/edit.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @honor, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_honor_desktop_personal_honors_path(@personal_book) do |f| %> +<%= form_for @honor, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_honor_desktop_personal_honor_path(@honor) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb index 924e82ab6..88502ffb0 100644 --- a/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb +++ b/vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb @@ -74,7 +74,7 @@
-
+
<% @honors.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js index 7ec8416cf..decdaf232 100644 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // } } this.initializeJournalPapers.paperDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_lab/app/assets/javascripts/personal_lab/desktop/personal_lab.js b/vendor/built_in_modules/personal_lab/app/assets/javascripts/personal_lab/desktop/personal_lab.js index a91b1ddc4..620ce978d 100644 --- a/vendor/built_in_modules/personal_lab/app/assets/javascripts/personal_lab/desktop/personal_lab.js +++ b/vendor/built_in_modules/personal_lab/app/assets/javascripts/personal_lab/desktop/personal_lab.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalLab = function(target,url,cache){ // th } } this.initializePersonalLab.labDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.css b/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.css index f0c6ce6ea..2f6d34d03 100644 --- a/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.css +++ b/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.css @@ -1,31 +1,31 @@ /* Books */ -[page-name="books_list"] .list_t_item .inner { +[page-name="lab_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="books_list"] .list_item_action { +[page-name="lab_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="books_list"] .list_item_action a { + [page-name="lab_list"] .list_item_action a { display: block; width: 20px; height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="books_list"] .list_item_action .icon-star-empty { + [page-name="lab_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-star { + [page-name="lab_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check-empty { + [page-name="lab_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check { + [page-name="lab_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } -[page-name="books_list"] .file_view .list_t_des { +[page-name="lab_list"] .file_view .list_t_des { overflow: hidden; } -[page-name="books_list"] .file_view .file { +[page-name="lab_list"] .file_view .file { float: left; width: 120px; height: 50px; @@ -42,15 +42,15 @@ /* ie */ box-sizing: border-box; /* css3 */ } - [page-name="books_list"] .file_view .file:hover { + [page-name="lab_list"] .file_view .file:hover { background-color: #f7f7f7; } - [page-name="books_list"] .file_view .file img { + [page-name="lab_list"] .file_view .file img { width: 38px; height: 38px; position: absolute; left: 6px; top: 6px; } - [page-name="books_list"] .file_view .file .filetitle { + [page-name="lab_list"] .file_view .file .filetitle { display: block; width: 100%; height: 38px; diff --git a/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.scss b/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.scss index ddafade97..5e3b36ba6 100644 --- a/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.scss +++ b/vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.scss @@ -1,7 +1,7 @@ @import "desktop-helper"; /* Books */ -[page-name="books_list"] { +[page-name="lab_list"] { .list_t_item .inner { padding-left: 30px; } .list_item_action { font-size: 12px; diff --git a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/desktop/personal_labs_controller.rb b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/desktop/personal_labs_controller.rb index 102a51df9..a73b45cd8 100644 --- a/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/desktop/personal_labs_controller.rb +++ b/vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/desktop/personal_labs_controller.rb @@ -50,7 +50,7 @@ class Panel::PersonalLab::Desktop::PersonalLabsController < ApplicationControlle def update params[:lab][:create_user_id] = current_user.id - @lab = Lab.new(params[:lab]) + @lab = Lab.find(params[:id]) if @lab.update_attributes(params[:lab]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/edit.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/edit.html.erb index d150519e9..92a06f065 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/edit.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @lab, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_lab_desktop_personal_labs_path(@lab) do |f| %> +<%= form_for @lab, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_lab_desktop_personal_lab_path(@lab) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb index bbe76633d..2a2f9a18f 100644 --- a/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb +++ b/vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb @@ -76,7 +76,7 @@
-
+
<% @labs.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_patent/app/assets/javascripts/personal_patent/desktop/personal_patent.js b/vendor/built_in_modules/personal_patent/app/assets/javascripts/personal_patent/desktop/personal_patent.js index a705043e8..213579249 100644 --- a/vendor/built_in_modules/personal_patent/app/assets/javascripts/personal_patent/desktop/personal_patent.js +++ b/vendor/built_in_modules/personal_patent/app/assets/javascripts/personal_patent/desktop/personal_patent.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalPatent = function(target,url,cache){ // } } this.initializePersonalPatent.patentDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.css b/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.css index f0c6ce6ea..ac05d80c5 100644 --- a/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.css +++ b/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.css @@ -1,31 +1,31 @@ /* Books */ -[page-name="books_list"] .list_t_item .inner { +[page-name="patent_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="books_list"] .list_item_action { +[page-name="patent_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="books_list"] .list_item_action a { + [page-name="patent_list"] .list_item_action a { display: block; width: 20px; height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="books_list"] .list_item_action .icon-star-empty { + [page-name="patent_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-star { + [page-name="patent_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check-empty { + [page-name="patent_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check { + [page-name="patent_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } -[page-name="books_list"] .file_view .list_t_des { +[page-name="patent_list"] .file_view .list_t_des { overflow: hidden; } -[page-name="books_list"] .file_view .file { +[page-name="patent_list"] .file_view .file { float: left; width: 120px; height: 50px; @@ -42,15 +42,15 @@ /* ie */ box-sizing: border-box; /* css3 */ } - [page-name="books_list"] .file_view .file:hover { + [page-name="patent_list"] .file_view .file:hover { background-color: #f7f7f7; } - [page-name="books_list"] .file_view .file img { + [page-name="patent_list"] .file_view .file img { width: 38px; height: 38px; position: absolute; left: 6px; top: 6px; } - [page-name="books_list"] .file_view .file .filetitle { + [page-name="patent_list"] .file_view .file .filetitle { display: block; width: 100%; height: 38px; diff --git a/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.scss b/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.scss index ddafade97..0a58f4484 100644 --- a/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.scss +++ b/vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.scss @@ -1,7 +1,7 @@ @import "desktop-helper"; /* Books */ -[page-name="books_list"] { +[page-name="patent_list"] { .list_t_item .inner { padding-left: 30px; } .list_item_action { font-size: 12px; diff --git a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/desktop/personal_patents_controller.rb b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/desktop/personal_patents_controller.rb index 262c991ec..ba54b84cf 100644 --- a/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/desktop/personal_patents_controller.rb +++ b/vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/desktop/personal_patents_controller.rb @@ -50,7 +50,7 @@ class Panel::PersonalPatent::Desktop::PersonalPatentsController < ApplicationCon def update params[:writing_patent][:create_user_id] = current_user.id - @patent = WritingPatent.new(params[:writing_patent]) + @patent = WritingPatent.find(params[:id]) if @patent.update_attributes(params[:writing_patent]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/edit.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/edit.html.erb index 2ca14a584..c56683e10 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/edit.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @patent, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_patent_desktop_personal_patents_path(@patent) do |f| %> +<%= form_for @patent, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_patent_desktop_personal_patent_path(@patent) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb index 35495f2b5..ef1202667 100644 --- a/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb +++ b/vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb @@ -75,7 +75,7 @@
-
+
<% @patents.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_project/app/assets/javascripts/personal_project/desktop/personal_project.js b/vendor/built_in_modules/personal_project/app/assets/javascripts/personal_project/desktop/personal_project.js index 4b7516970..4e3eda18b 100644 --- a/vendor/built_in_modules/personal_project/app/assets/javascripts/personal_project/desktop/personal_project.js +++ b/vendor/built_in_modules/personal_project/app/assets/javascripts/personal_project/desktop/personal_project.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalProject = function(target,url,cache){ / } } this.initializePersonalProject.projectDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.css b/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.css index f0c6ce6ea..5a7a1be96 100644 --- a/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.css +++ b/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.css @@ -1,31 +1,31 @@ /* Books */ -[page-name="books_list"] .list_t_item .inner { +[page-name="project_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="books_list"] .list_item_action { +[page-name="project_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="books_list"] .list_item_action a { + [page-name="project_list"] .list_item_action a { display: block; width: 20px; height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="books_list"] .list_item_action .icon-star-empty { + [page-name="project_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-star { + [page-name="project_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check-empty { + [page-name="project_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check { + [page-name="project_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } -[page-name="books_list"] .file_view .list_t_des { +[page-name="project_list"] .file_view .list_t_des { overflow: hidden; } -[page-name="books_list"] .file_view .file { +[page-name="project_list"] .file_view .file { float: left; width: 120px; height: 50px; @@ -42,15 +42,15 @@ /* ie */ box-sizing: border-box; /* css3 */ } - [page-name="books_list"] .file_view .file:hover { + [page-name="project_list"] .file_view .file:hover { background-color: #f7f7f7; } - [page-name="books_list"] .file_view .file img { + [page-name="project_list"] .file_view .file img { width: 38px; height: 38px; position: absolute; left: 6px; top: 6px; } - [page-name="books_list"] .file_view .file .filetitle { + [page-name="project_list"] .file_view .file .filetitle { display: block; width: 100%; height: 38px; diff --git a/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.scss b/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.scss index ddafade97..70e1fc19d 100644 --- a/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.scss +++ b/vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.scss @@ -1,7 +1,7 @@ @import "desktop-helper"; /* Books */ -[page-name="books_list"] { +[page-name="project_list"] { .list_t_item .inner { padding-left: 30px; } .list_item_action { font-size: 12px; diff --git a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/desktop/personal_projects_controller.rb b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/desktop/personal_projects_controller.rb index 9ad52a6b6..7695e6113 100644 --- a/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/desktop/personal_projects_controller.rb +++ b/vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/desktop/personal_projects_controller.rb @@ -50,7 +50,7 @@ class Panel::PersonalProject::Desktop::PersonalProjectsController < ApplicationC def update params[:project][:create_user_id] = current_user.id - @project = Project.new(params[:project]) + @project = Project.find(params[:id]) if @project.update_attributes(params[:project]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/edit.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/edit.html.erb index b5467098f..7b7d0b6ee 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/edit.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @project, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_project_desktop_personal_projects_path(@project) do |f| %> +<%= form_for @project, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_project_desktop_personal_project_path(@project) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb index 44928b00a..fcc007afb 100644 --- a/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb +++ b/vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb @@ -76,7 +76,7 @@
-
+
<% @projects.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_research/app/assets/javascripts/personal_research/desktop/personal_research.js b/vendor/built_in_modules/personal_research/app/assets/javascripts/personal_research/desktop/personal_research.js index 35a64eee0..4e5ac3587 100644 --- a/vendor/built_in_modules/personal_research/app/assets/javascripts/personal_research/desktop/personal_research.js +++ b/vendor/built_in_modules/personal_research/app/assets/javascripts/personal_research/desktop/personal_research.js @@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalResearch = function(target,url,cache){ } } this.initializePersonalResearch.researchDelete = function(data,dom){ - var parent = dom.parent().parent(); + var parent = dom.parent().parent().parent(); if(data.success){ parent.hide("slide",function(){parent.remove();}); o.notify(data.msg,"success"); diff --git a/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.css b/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.css index f0c6ce6ea..89cf67997 100644 --- a/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.css +++ b/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.css @@ -1,31 +1,31 @@ /* Books */ -[page-name="books_list"] .list_t_item .inner { +[page-name="research_list"] .list_t_item .inner { padding-left: 30px; } -[page-name="books_list"] .list_item_action { +[page-name="research_list"] .list_item_action { font-size: 12px; float: left; margin-left: -30px; } - [page-name="books_list"] .list_item_action a { + [page-name="research_list"] .list_item_action a { display: block; width: 20px; height: 20px; line-height: 20px; margin: 1px 1px 6px 1px; } - [page-name="books_list"] .list_item_action .icon-star-empty { + [page-name="research_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-star { + [page-name="research_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check-empty { + [page-name="research_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } - [page-name="books_list"] .list_item_action .icon-check { + [page-name="research_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } -[page-name="books_list"] .file_view .list_t_des { +[page-name="research_list"] .file_view .list_t_des { overflow: hidden; } -[page-name="books_list"] .file_view .file { +[page-name="research_list"] .file_view .file { float: left; width: 120px; height: 50px; @@ -42,15 +42,15 @@ /* ie */ box-sizing: border-box; /* css3 */ } - [page-name="books_list"] .file_view .file:hover { + [page-name="research_list"] .file_view .file:hover { background-color: #f7f7f7; } - [page-name="books_list"] .file_view .file img { + [page-name="research_list"] .file_view .file img { width: 38px; height: 38px; position: absolute; left: 6px; top: 6px; } - [page-name="books_list"] .file_view .file .filetitle { + [page-name="research_list"] .file_view .file .filetitle { display: block; width: 100%; height: 38px; diff --git a/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.scss b/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.scss index ddafade97..b631ff2df 100644 --- a/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.scss +++ b/vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.scss @@ -1,7 +1,7 @@ @import "desktop-helper"; /* Books */ -[page-name="books_list"] { +[page-name="research_list"] { .list_t_item .inner { padding-left: 30px; } .list_item_action { font-size: 12px; diff --git a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/desktop/personal_researchs_controller.rb b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/desktop/personal_researchs_controller.rb index f902fa509..f333fa687 100644 --- a/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/desktop/personal_researchs_controller.rb +++ b/vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/desktop/personal_researchs_controller.rb @@ -50,7 +50,7 @@ class Panel::PersonalResearch::Desktop::PersonalResearchsController < Applicatio def update params[:research][:create_user_id] = current_user.id - @research = Research.new(params[:research]) + @research = Research.find(params[:id]) if @research.update_attributes(params[:research]) render json: {success: true, msg: t('create_success')}.to_json else diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/edit.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/edit.html.erb index 082a2aa52..256ebf251 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/edit.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/edit.html.erb @@ -1,3 +1,3 @@ -<%= form_for @research, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_research_desktop_personal_researchs_path(@personal_book) do |f| %> +<%= form_for @research, html: { multipart: true, "form-type"=>"ajax_form", "callback-method"=>"formCallback"}, url: panel_personal_research_desktop_personal_research_path(@research) do |f| %> <%= render partial: 'form', locals: {:f => f} %> <%end%> diff --git a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb index 57b48b857..fbd3de4af 100644 --- a/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb +++ b/vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb @@ -41,8 +41,8 @@
View
    -
  • <%= link_to "Journal", panel_personal_research_desktop_personal_researchs_path + "?view=research_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
    • -
  • <%= link_to "Title", panel_personal_research_desktop_personal_researchs_path + "?view=extracted_chapters", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
    • +
  • <%= link_to "Title", panel_personal_research_desktop_personal_researchs_path + "?view=research_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
    • +
  • <%= link_to "Extracted Chapters", panel_personal_research_desktop_personal_researchs_path + "?view=extracted_chapters", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
  • <%= link_to "File", panel_personal_research_desktop_personal_researchs_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
  • <%= link_to "Keywords", panel_personal_research_desktop_personal_researchs_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
@@ -76,7 +76,7 @@
-
+
<% @researches.each do |w| %> <%= publication_record w, @view_by%> <% end %>