@@ -24,4 +24,4 @@ $(document).ready(function(){
});
});
});
-
\ No newline at end of file
+
diff --git a/config/locales/new_ui.en.yml b/config/locales/new_ui.en.yml
index b6f072b3c..c064a8836 100644
--- a/config/locales/new_ui.en.yml
+++ b/config/locales/new_ui.en.yml
@@ -16,6 +16,7 @@ en:
deselect_all: Deselect all
detail: Detail
edit_category: Edit Categorie
+ edit_order: Edit order
editing:
tag: Editing tag
file:
@@ -37,6 +38,7 @@ en:
no_date: No date
no_file: No file
path: Path
+ position: Position
previous: Previous
remove: Remove
remove_default: Remove default
diff --git a/config/locales/new_ui.zh_tw.yml b/config/locales/new_ui.zh_tw.yml
new file mode 100644
index 000000000..b6bdfd4ea
--- /dev/null
+++ b/config/locales/new_ui.zh_tw.yml
@@ -0,0 +1,73 @@
+zh_tw:
+ add_category: 新增類別
+ add_link: 新增連結
+ add_page: 新增頁面
+ add_to_default: 加入預設
+ alternative: 註解
+ approval_setting: 審核設定
+ authorization_: 授權
+ change: 更換
+ change_file: 更換檔案
+ create:
+ error:
+ category: 建立類別時發生錯誤
+ tag: 建立標籤時發生錯誤
+ delete_warning: 刪除後無法還原,您確定要刪除嗎?
+ deselect_all: 取消全選
+ detail: 細節
+ edit_category: 編輯類別
+ edit_order: 編輯排序
+ editing:
+ tag: 編輯標籤
+ file:
+ name: 檔案名稱
+ front_page:
+ name_language: 網站標題
+ select_template: 選擇樣版
+ select_themes: 選擇主題
+ select_module: 選擇模組
+ language: 語言
+ login_orbit: 登入 Orbit
+ merge: 合併
+ new:
+ tag: 新增標籤
+ next: 下一頁
+ no_app: 無模組
+ no_category: 無可用類別
+ no_data: 無資料
+ no_date: 無日期
+ no_file: 無檔案
+ path: 路徑
+ position: 排序
+ previous: 上一頁
+ remove: 移除
+ remove_default: 移除預設
+ restful_actions:
+ create: 建立
+ delete: 刪除
+ edit: 編輯
+ index: Index
+ new: 新增
+ show: Show
+ update: 更新
+ search:
+ tags: 搜尋標籤
+ select_all: 全選
+ select_file: 選擇檔案
+ select_image: 選擇圖片
+ sort_number: 排序數
+ tag:
+ add: 新增標籤
+ delete: 刪除標籤
+ new_name: 新標籤名稱
+ merge_help: 自訂新標籤名稱或點選下方標籤
+ merger: 合併標籤
+ remove_default: 移除預設標籤
+ warning:
+ delete: 刪除後無法還原,您確定要刪除嗎?
+ remove_default: 您確定要移除此預設標籤嗎?
+ update:
+ error:
+ tag: 更新類別時發生錯誤
+ tag: 更新標籤時發生錯誤
+ url_alt: 註解
diff --git a/config/routes.rb b/config/routes.rb
index 863ed9888..40a45c9d0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -233,6 +233,10 @@ Orbit::Application.routes.draw do
member do
get 'temp_edit'
end
+ collection do
+ get 'edit_order'
+ post 'update_order'
+ end
match "edit_passwd" => "users_new_interface#edit_passwd" ,:as => :edit_passwd
end
diff --git a/lib/tasks/new_ui.rake b/lib/tasks/new_ui.rake
index 70584a8db..84ed715c7 100644
--- a/lib/tasks/new_ui.rake
+++ b/lib/tasks/new_ui.rake
@@ -91,4 +91,8 @@ namespace :new_ui do
end
end
+ task :save_users => :environment do
+ User.all.each(&:save)
+ end
+
end
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 08a63fdb4..b744239ed 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializePersonalBook.bookDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 60ba0c274..a2b13336a 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
@@ -282,6 +282,7 @@ class Panel::PersonalBook::BackEnd::WritingBooksController < OrbitBackendControl
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingBook")) }
+ format.json { render json: {"success"=>true}.to_json}
end
diff --git a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb b/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
index 186b2d594..3c4b5fcb0 100644
--- a/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
+++ b/vendor/built_in_modules/personal_book/app/helpers/panel/personal_book/desktop/personal_books_helper.rb
@@ -2,23 +2,26 @@ module Panel::PersonalBook::Desktop::PersonalBooksHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ marker(publication.id) + \
content(publication, view) + \
edit_or_delete(publication)
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
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 f79d1d30c..9096e25f6 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
@@ -50,25 +50,10 @@
Share
-
-
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 6955dedb3..613a9dd20 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializeConferencePapers.paperDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 a6ae1f9ff..0ef42ba31 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
@@ -277,7 +277,7 @@ class Panel::PersonalConference::BackEnd::WritingConferencesController < OrbitBa
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingConference")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
index d22bfc18f..c09f6b2a3 100644
--- a/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
+++ b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb
@@ -2,23 +2,29 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
- content(publication, view) + \
- edit_or_delete(publication)
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ content_tag :div,
+ :class => "inner" do
+ marker(publication.id) + \
+ content(publication, view) + \
+ edit_or_delete(publication)
+ end
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
end
diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
index 79229ec1f..d61d3bf3b 100644
--- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
+++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
@@ -51,13 +51,10 @@
Share
-
@@ -69,13 +66,15 @@
-->
<% if @view_by.eql?"abstract" %>
-
+
<% else %>
-
+
<% end %>
+
<% @writing_conferences.each do |w| %>
<%= publication_record w, @view_by%>
<% end %>
+
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 70ba7d794..756b437e5 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializePersonalDiploma = function(target,url,cache){ /
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializePersonalDiploma.diplomaDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 cfbaae98c..09541dfbc 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
@@ -159,7 +159,7 @@ class Panel::PersonalDiploma::BackEnd::DiplomasController < OrbitBackendControll
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Diploma")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb b/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
index 6ca260616..b0e3eedff 100644
--- a/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
+++ b/vendor/built_in_modules/personal_diploma/app/helpers/panel/personal_diploma/desktop/personal_diplomas_helper.rb
@@ -2,23 +2,26 @@ module Panel::PersonalDiploma::Desktop::PersonalDiplomasHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ marker(publication.id) + \
content(publication, view) + \
edit_or_delete(publication)
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
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 a53e048c7..b35f9457a 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
@@ -47,27 +47,12 @@
-
+
Share
-
-
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 8a089d902..4ea54b77e 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializePersonalExperience = function(target,url,cache)
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializePersonalExperience.experienceDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 fd2470ac8..615847780 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
@@ -225,7 +225,7 @@ class Panel::PersonalExperience::BackEnd::ExperiencesController < OrbitBackendCo
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Experience")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb b/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb
index f78c6948f..b5d91e7e9 100644
--- a/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb
+++ b/vendor/built_in_modules/personal_experience/app/helpers/panel/personal_experience/desktop/personal_experiences_helper.rb
@@ -2,22 +2,25 @@ module Panel::PersonalExperience::Desktop::PersonalExperiencesHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ marker(publication.id) + \
content(publication, view) + \
edit_or_delete(publication)
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
+ "data-id" => id.to_s,
"toggle-onclick"=>"icon-check-empty icon-check",
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
+ "data-id" => id.to_s,
"toggle-onclick"=>"icon-star-empty icon-star",
"ajax-remote"=>"false")
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 419211199..bbcaf1f30 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
@@ -50,25 +50,10 @@
Share
-
-
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 608f0a357..18d17acb4 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializePersonalHonor = function(target,url,cache){ //
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializePersonalHonor.honorDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 210a2396f..025708240 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
@@ -226,7 +226,7 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Honor")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb b/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
index 3cdccddc7..bee7a81b0 100644
--- a/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
+++ b/vendor/built_in_modules/personal_honor/app/helpers/panel/personal_honor/desktop/personal_honors_helper.rb
@@ -2,23 +2,26 @@ module Panel::PersonalHonor::Desktop::PersonalHonorsHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ marker(publication.id) + \
content(publication, view) + \
edit_or_delete(publication)
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
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 88502ffb0..5c4175dfd 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
@@ -46,27 +46,12 @@
-
+
Share
-
-
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 cdbce8cbe..5da6a9dfc 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializeJournalPapers.paperDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 da0e76050..1c3998fd0 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
@@ -327,7 +327,7 @@ class Panel::PersonalJournal::BackEnd::WritingJournalsController < OrbitBackendC
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingJournal")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
index 490d77797..b7915faf4 100644
--- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
+++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
@@ -2,10 +2,15 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
- content(publication, view) + \
- edit_or_delete(publication)
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+
+ content_tag :div,
+ :class => "inner" do
+ marker(publication.id) + \
+ content(publication, view) + \
+ edit_or_delete(publication)
+ end
end
end
@@ -25,16 +30,18 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper
height
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
end
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
index 140974fed..3c2f5e7de 100644
--- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
+++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
@@ -32,10 +32,11 @@
-->
-
+
Share
-
-
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 4ea27d3d9..4313da15b 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializePersonalPatent = function(target,url,cache){ //
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializePersonalPatent.patentDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 e83e3649d..62345312a 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
@@ -226,7 +226,7 @@ class Panel::PersonalPatent::BackEnd::WritingPatentsController < OrbitBackendCon
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"WritingPatent")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb b/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb
index 024b8d648..b77c60c03 100644
--- a/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb
+++ b/vendor/built_in_modules/personal_patent/app/helpers/panel/personal_patent/desktop/personal_patents_helper.rb
@@ -2,23 +2,26 @@ module Panel::PersonalPatent::Desktop::PersonalPatentsHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ marker(publication.id) + \
content(publication, view) + \
edit_or_delete(publication)
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
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 ef1202667..6c6b01141 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
@@ -47,27 +47,12 @@
-
+
Share
-
-
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 3ae6097fd..419e07e0a 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializePersonalProject = function(target,url,cache){ /
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializePersonalProject.projectDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 5042c78d6..d5ae12eb7 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
@@ -224,7 +224,7 @@ class Panel::PersonalProject::BackEnd::ProjectsController < OrbitBackendControll
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Project")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb b/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb
index 1b47e9f54..9dce677e2 100644
--- a/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb
+++ b/vendor/built_in_modules/personal_project/app/helpers/panel/personal_project/desktop/personal_projects_helper.rb
@@ -2,23 +2,27 @@ module Panel::PersonalProject::Desktop::PersonalProjectsHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
+ "item" => "true",
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ marker(publication.id) + \
content(publication, view) + \
edit_or_delete(publication)
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
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 fcc007afb..216ad74e7 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
@@ -48,27 +48,12 @@
-
+
Share
-
-
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 a64bc13f5..aba31ba45 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
@@ -29,6 +29,7 @@ orbitDesktop.prototype.initializePersonalResearch = function(target,url,cache){
return false;
})
}
+ o.enableSharing("div.share_mode");
}
this.initializePersonalResearch.researchDelete = function(data,dom){
var parent = dom.parent().parent().parent();
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 b7c12ae8c..0460a0729 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
@@ -150,7 +150,7 @@ class Panel::PersonalResearch::BackEnd::ResearchsController < OrbitBackendContro
respond_to do |format|
format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Research")) }
-
+ format.json { render json: {"success"=>true}.to_json}
end
end
diff --git a/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb b/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb
index 4327faa66..0f86c564d 100644
--- a/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb
+++ b/vendor/built_in_modules/personal_research/app/helpers/panel/personal_research/desktop/personal_researchs_helper.rb
@@ -2,23 +2,27 @@ module Panel::PersonalResearch::Desktop::PersonalResearchsHelper
def publication_record publication, view
content_tag :li,
"item" => "true",
- :class => "list_t_item #{view.blank? ? '' : "#{view}_view" }" do
- marker + \
+ "item" => "true",
+ "data-id" => publication.id.to_s,
+ :class => "list_t_item #{view.blank? ? '' : "#{view}_view" } #{publication.is_hidden? ? "private" : "public" }" do
+ marker(publication.id) + \
content(publication, view) + \
edit_or_delete(publication)
end
end
- def marker
+ def marker id
content_tag :div,
:class => "list_item_action" do
content_tag(:a, "",:href=>"",
:class => "icon-check-empty",
"toggle-onclick"=>"icon-check-empty icon-check",
+ "data-id" => id.to_s,
"ajax-remote"=>"false") + \
content_tag(:a, "",:href=>"",
:class => "icon-star-empty",
"toggle-onclick"=>"icon-star-empty icon-star",
+ "data-id" => id.to_s,
"ajax-remote"=>"false")
end
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 fbd3de4af..3da2fcb64 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
@@ -50,25 +50,10 @@