saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugs fixed for plugins. .. and also css fixed

This commit is contained in:
Harry Bomrah 2013-08-06 15:55:14 +08:00 committed by saurabhbhatia
parent 7d288b4160
commit e3d9966f76
49 changed files with 128 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/desktop/orbitdesktop.js
View File

@ -262,7 +262,7 @@ var orbitDesktop = function(dom){
window.o[o.data_method][callback_method](responseText,statusText,xhr,$form); window.o[o.data_method][callback_method](responseText,statusText,xhr,$form);
} }
} }
if(notification != "") if(typeof notification == "string")
o.notify(notification,"success"); o.notify(notification,"success");
}, },
error:function(){ error:function(){

2
vendor/built_in_modules/personal_book/app/assets/javascripts/personal_book/desktop/personal_books.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalBook = function(target,url,cache){ // t
} }
} }
this.initializePersonalBook.bookDelete = function(data,dom){ this.initializePersonalBook.bookDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

2
vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb vendored
View File

@ -52,7 +52,7 @@ class Panel::PersonalBook::Desktop::PersonalBooksController < ApplicationControl
def update def update
params[:writing_book][:create_user_id] = current_user.id 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]) if @personal_book.update_attributes(params[:writing_book])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

2
vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb vendored
View File

@ -76,7 +76,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="books_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @writing_books.each do |w| %> <% @writing_books.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>

2
vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){
} }
} }
this.initializeConferencePapers.paperDelete = function(data,dom){ this.initializeConferencePapers.paperDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

2
vendor/built_in_modules/personal_diploma/app/assets/javascripts/personal_diploma/desktop/personal_diploma.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalDiploma = function(target,url,cache){ /
} }
} }
this.initializePersonalDiploma.diplomaDelete = function(data,dom){ this.initializePersonalDiploma.diplomaDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

24
vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.css vendored
View File

@ -1,31 +1,31 @@
/* Books */ /* Books */
[page-name="books_list"] .list_t_item .inner { [page-name="diploma_list"] .list_t_item .inner {
padding-left: 30px; } padding-left: 30px; }
[page-name="books_list"] .list_item_action { [page-name="diploma_list"] .list_item_action {
font-size: 12px; font-size: 12px;
float: left; float: left;
margin-left: -30px; } margin-left: -30px; }
[page-name="books_list"] .list_item_action a { [page-name="diploma_list"] .list_item_action a {
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin: 1px 1px 6px 1px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-star { [page-name="diploma_list"] .list_item_action .icon-star {
color: #faa732; color: #faa732;
font-size: 20px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-check { [page-name="diploma_list"] .list_item_action .icon-check {
color: #333; color: #333;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .file_view .list_t_des { [page-name="diploma_list"] .file_view .list_t_des {
overflow: hidden; } overflow: hidden; }
[page-name="books_list"] .file_view .file { [page-name="diploma_list"] .file_view .file {
float: left; float: left;
width: 120px; width: 120px;
height: 50px; height: 50px;
@ -42,15 +42,15 @@
/* ie */ /* ie */
box-sizing: border-box; box-sizing: border-box;
/* css3 */ } /* css3 */ }
[page-name="books_list"] .file_view .file:hover { [page-name="diploma_list"] .file_view .file:hover {
background-color: #f7f7f7; } background-color: #f7f7f7; }
[page-name="books_list"] .file_view .file img { [page-name="diploma_list"] .file_view .file img {
width: 38px; width: 38px;
height: 38px; height: 38px;
position: absolute; position: absolute;
left: 6px; left: 6px;
top: 6px; } top: 6px; }
[page-name="books_list"] .file_view .file .filetitle { [page-name="diploma_list"] .file_view .file .filetitle {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 38px;

2
vendor/built_in_modules/personal_diploma/app/assets/stylesheets/personal_diploma/personal_diploma.scss vendored
View File

@ -1,7 +1,7 @@
@import "desktop-helper"; @import "desktop-helper";
/* Books */ /* Books */
[page-name="books_list"] { [page-name="diploma_list"] {
.list_t_item .inner { padding-left: 30px; } .list_t_item .inner { padding-left: 30px; }
.list_item_action { .list_item_action {
font-size: 12px; font-size: 12px;

2
vendor/built_in_modules/personal_diploma/app/controllers/panel/personal_diploma/desktop/personal_diplomas_controller.rb vendored
View File

@ -30,7 +30,7 @@ class Panel::PersonalDiploma::Desktop::PersonalDiplomasController < ApplicationC
def update def update
params[:diploma][:create_user_id] = current_user.id params[:diploma][:create_user_id] = current_user.id
@diploma = Diploma.new(params[:diploma]) @diploma = Diploma.find(params[:id])
if @diploma.update_attributes(params[:diploma]) if @diploma.update_attributes(params[:diploma])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

2
vendor/built_in_modules/personal_diploma/app/views/panel/personal_diploma/desktop/personal_diplomas/index.html.erb vendored
View File

@ -75,7 +75,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="diploma_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @diplomas.each do |w| %> <% @diplomas.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>

2
vendor/built_in_modules/personal_experience/app/assets/javascripts/personal_experience/desktop/personal_experiences.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalExperience = function(target,url,cache)
} }
} }
this.initializePersonalExperience.experienceDelete = function(data,dom){ this.initializePersonalExperience.experienceDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

24
vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.css vendored
View File

@ -1,31 +1,31 @@
/* Books */ /* Books */
[page-name="books_list"] .list_t_item .inner { [page-name="experience_list"] .list_t_item .inner {
padding-left: 30px; } padding-left: 30px; }
[page-name="books_list"] .list_item_action { [page-name="experience_list"] .list_item_action {
font-size: 12px; font-size: 12px;
float: left; float: left;
margin-left: -30px; } margin-left: -30px; }
[page-name="books_list"] .list_item_action a { [page-name="experience_list"] .list_item_action a {
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin: 1px 1px 6px 1px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-star { [page-name="experience_list"] .list_item_action .icon-star {
color: #faa732; color: #faa732;
font-size: 20px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-check { [page-name="experience_list"] .list_item_action .icon-check {
color: #333; color: #333;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .file_view .list_t_des { [page-name="experience_list"] .file_view .list_t_des {
overflow: hidden; } overflow: hidden; }
[page-name="books_list"] .file_view .file { [page-name="experience_list"] .file_view .file {
float: left; float: left;
width: 120px; width: 120px;
height: 50px; height: 50px;
@ -42,15 +42,15 @@
/* ie */ /* ie */
box-sizing: border-box; box-sizing: border-box;
/* css3 */ } /* css3 */ }
[page-name="books_list"] .file_view .file:hover { [page-name="experience_list"] .file_view .file:hover {
background-color: #f7f7f7; } background-color: #f7f7f7; }
[page-name="books_list"] .file_view .file img { [page-name="experience_list"] .file_view .file img {
width: 38px; width: 38px;
height: 38px; height: 38px;
position: absolute; position: absolute;
left: 6px; left: 6px;
top: 6px; } top: 6px; }
[page-name="books_list"] .file_view .file .filetitle { [page-name="experience_list"] .file_view .file .filetitle {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 38px;

2
vendor/built_in_modules/personal_experience/app/assets/stylesheets/personal_experience/desktop/personal_experience.scss vendored
View File

@ -1,7 +1,7 @@
@import "desktop-helper"; @import "desktop-helper";
/* Books */ /* Books */
[page-name="books_list"] { [page-name="experience_list"] {
.list_t_item .inner { padding-left: 30px; } .list_t_item .inner { padding-left: 30px; }
.list_item_action { .list_item_action {
font-size: 12px; font-size: 12px;

2
vendor/built_in_modules/personal_experience/app/controllers/panel/personal_experience/desktop/personal_experiences_controller.rb vendored
View File

@ -51,7 +51,7 @@ class Panel::PersonalExperience::Desktop::PersonalExperiencesController < Applic
def update def update
params[:experience][:create_user_id] = current_user.id 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]) if @experience.update_attributes(params[:writing_book])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

2
vendor/built_in_modules/personal_experience/app/views/panel/personal_experience/desktop/personal_experiences/index.html.erb vendored
View File

@ -76,7 +76,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="experience_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @experiences.each do |w| %> <% @experiences.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>

2
vendor/built_in_modules/personal_honor/app/assets/javascripts/personal_honor/desktop/personal_honors.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalHonor = function(target,url,cache){ //
} }
} }
this.initializePersonalHonor.honorDelete = function(data,dom){ this.initializePersonalHonor.honorDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

24
vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.css vendored
View File

@ -1,31 +1,31 @@
/* Books */ /* Books */
[page-name="books_list"] .list_t_item .inner { [page-name="honor_list"] .list_t_item .inner {
padding-left: 30px; } padding-left: 30px; }
[page-name="books_list"] .list_item_action { [page-name="honor_list"] .list_item_action {
font-size: 12px; font-size: 12px;
float: left; float: left;
margin-left: -30px; } margin-left: -30px; }
[page-name="books_list"] .list_item_action a { [page-name="honor_list"] .list_item_action a {
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin: 1px 1px 6px 1px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-star { [page-name="honor_list"] .list_item_action .icon-star {
color: #faa732; color: #faa732;
font-size: 20px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-check { [page-name="honor_list"] .list_item_action .icon-check {
color: #333; color: #333;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .file_view .list_t_des { [page-name="honor_list"] .file_view .list_t_des {
overflow: hidden; } overflow: hidden; }
[page-name="books_list"] .file_view .file { [page-name="honor_list"] .file_view .file {
float: left; float: left;
width: 120px; width: 120px;
height: 50px; height: 50px;
@ -42,15 +42,15 @@
/* ie */ /* ie */
box-sizing: border-box; box-sizing: border-box;
/* css3 */ } /* css3 */ }
[page-name="books_list"] .file_view .file:hover { [page-name="honor_list"] .file_view .file:hover {
background-color: #f7f7f7; } background-color: #f7f7f7; }
[page-name="books_list"] .file_view .file img { [page-name="honor_list"] .file_view .file img {
width: 38px; width: 38px;
height: 38px; height: 38px;
position: absolute; position: absolute;
left: 6px; left: 6px;
top: 6px; } top: 6px; }
[page-name="books_list"] .file_view .file .filetitle { [page-name="honor_list"] .file_view .file .filetitle {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 38px;

2
vendor/built_in_modules/personal_honor/app/assets/stylesheets/personal_honor/desktop/personal_honor.scss vendored
View File

@ -1,7 +1,7 @@
@import "desktop-helper"; @import "desktop-helper";
/* Books */ /* Books */
[page-name="books_list"] { [page-name="honor_list"] {
.list_t_item .inner { padding-left: 30px; } .list_t_item .inner { padding-left: 30px; }
.list_item_action { .list_item_action {
font-size: 12px; font-size: 12px;

2
vendor/built_in_modules/personal_honor/app/controllers/panel/personal_honor/desktop/personal_honors_controller.rb vendored
View File

@ -50,7 +50,7 @@ class Panel::PersonalHonor::Desktop::PersonalHonorsController < ApplicationContr
def update def update
params[:honor][:create_user_id] = current_user.id params[:honor][:create_user_id] = current_user.id
@honor = Honor.new(params[:honor]) @honor = Honor.find(params[:id])
if @honor.update_attributes(params[:honor]) if @honor.update_attributes(params[:honor])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

2
vendor/built_in_modules/personal_honor/app/views/panel/personal_honor/desktop/personal_honors/index.html.erb vendored
View File

@ -74,7 +74,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="honor_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @honors.each do |w| %> <% @honors.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>

2
vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
} }
} }
this.initializeJournalPapers.paperDelete = function(data,dom){ this.initializeJournalPapers.paperDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

2
vendor/built_in_modules/personal_lab/app/assets/javascripts/personal_lab/desktop/personal_lab.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalLab = function(target,url,cache){ // th
} }
} }
this.initializePersonalLab.labDelete = function(data,dom){ this.initializePersonalLab.labDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

24
vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.css vendored
View File

@ -1,31 +1,31 @@
/* Books */ /* Books */
[page-name="books_list"] .list_t_item .inner { [page-name="lab_list"] .list_t_item .inner {
padding-left: 30px; } padding-left: 30px; }
[page-name="books_list"] .list_item_action { [page-name="lab_list"] .list_item_action {
font-size: 12px; font-size: 12px;
float: left; float: left;
margin-left: -30px; } margin-left: -30px; }
[page-name="books_list"] .list_item_action a { [page-name="lab_list"] .list_item_action a {
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin: 1px 1px 6px 1px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-star { [page-name="lab_list"] .list_item_action .icon-star {
color: #faa732; color: #faa732;
font-size: 20px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-check { [page-name="lab_list"] .list_item_action .icon-check {
color: #333; color: #333;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .file_view .list_t_des { [page-name="lab_list"] .file_view .list_t_des {
overflow: hidden; } overflow: hidden; }
[page-name="books_list"] .file_view .file { [page-name="lab_list"] .file_view .file {
float: left; float: left;
width: 120px; width: 120px;
height: 50px; height: 50px;
@ -42,15 +42,15 @@
/* ie */ /* ie */
box-sizing: border-box; box-sizing: border-box;
/* css3 */ } /* css3 */ }
[page-name="books_list"] .file_view .file:hover { [page-name="lab_list"] .file_view .file:hover {
background-color: #f7f7f7; } background-color: #f7f7f7; }
[page-name="books_list"] .file_view .file img { [page-name="lab_list"] .file_view .file img {
width: 38px; width: 38px;
height: 38px; height: 38px;
position: absolute; position: absolute;
left: 6px; left: 6px;
top: 6px; } top: 6px; }
[page-name="books_list"] .file_view .file .filetitle { [page-name="lab_list"] .file_view .file .filetitle {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 38px;

2
vendor/built_in_modules/personal_lab/app/assets/stylesheets/personal_lab/desktop/personal_lab.scss vendored
View File

@ -1,7 +1,7 @@
@import "desktop-helper"; @import "desktop-helper";
/* Books */ /* Books */
[page-name="books_list"] { [page-name="lab_list"] {
.list_t_item .inner { padding-left: 30px; } .list_t_item .inner { padding-left: 30px; }
.list_item_action { .list_item_action {
font-size: 12px; font-size: 12px;

2
vendor/built_in_modules/personal_lab/app/controllers/panel/personal_lab/desktop/personal_labs_controller.rb vendored
View File

@ -50,7 +50,7 @@ class Panel::PersonalLab::Desktop::PersonalLabsController < ApplicationControlle
def update def update
params[:lab][:create_user_id] = current_user.id params[:lab][:create_user_id] = current_user.id
@lab = Lab.new(params[:lab]) @lab = Lab.find(params[:id])
if @lab.update_attributes(params[:lab]) if @lab.update_attributes(params[:lab])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

2
vendor/built_in_modules/personal_lab/app/views/panel/personal_lab/desktop/personal_labs/index.html.erb vendored
View File

@ -76,7 +76,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="lab_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @labs.each do |w| %> <% @labs.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>

2
vendor/built_in_modules/personal_patent/app/assets/javascripts/personal_patent/desktop/personal_patent.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalPatent = function(target,url,cache){ //
} }
} }
this.initializePersonalPatent.patentDelete = function(data,dom){ this.initializePersonalPatent.patentDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

24
vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.css vendored
View File

@ -1,31 +1,31 @@
/* Books */ /* Books */
[page-name="books_list"] .list_t_item .inner { [page-name="patent_list"] .list_t_item .inner {
padding-left: 30px; } padding-left: 30px; }
[page-name="books_list"] .list_item_action { [page-name="patent_list"] .list_item_action {
font-size: 12px; font-size: 12px;
float: left; float: left;
margin-left: -30px; } margin-left: -30px; }
[page-name="books_list"] .list_item_action a { [page-name="patent_list"] .list_item_action a {
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin: 1px 1px 6px 1px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-star { [page-name="patent_list"] .list_item_action .icon-star {
color: #faa732; color: #faa732;
font-size: 20px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-check { [page-name="patent_list"] .list_item_action .icon-check {
color: #333; color: #333;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .file_view .list_t_des { [page-name="patent_list"] .file_view .list_t_des {
overflow: hidden; } overflow: hidden; }
[page-name="books_list"] .file_view .file { [page-name="patent_list"] .file_view .file {
float: left; float: left;
width: 120px; width: 120px;
height: 50px; height: 50px;
@ -42,15 +42,15 @@
/* ie */ /* ie */
box-sizing: border-box; box-sizing: border-box;
/* css3 */ } /* css3 */ }
[page-name="books_list"] .file_view .file:hover { [page-name="patent_list"] .file_view .file:hover {
background-color: #f7f7f7; } background-color: #f7f7f7; }
[page-name="books_list"] .file_view .file img { [page-name="patent_list"] .file_view .file img {
width: 38px; width: 38px;
height: 38px; height: 38px;
position: absolute; position: absolute;
left: 6px; left: 6px;
top: 6px; } top: 6px; }
[page-name="books_list"] .file_view .file .filetitle { [page-name="patent_list"] .file_view .file .filetitle {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 38px;

2
vendor/built_in_modules/personal_patent/app/assets/stylesheets/personal_patent/desktop/personal_patent.scss vendored
View File

@ -1,7 +1,7 @@
@import "desktop-helper"; @import "desktop-helper";
/* Books */ /* Books */
[page-name="books_list"] { [page-name="patent_list"] {
.list_t_item .inner { padding-left: 30px; } .list_t_item .inner { padding-left: 30px; }
.list_item_action { .list_item_action {
font-size: 12px; font-size: 12px;

2
vendor/built_in_modules/personal_patent/app/controllers/panel/personal_patent/desktop/personal_patents_controller.rb vendored
View File

@ -50,7 +50,7 @@ class Panel::PersonalPatent::Desktop::PersonalPatentsController < ApplicationCon
def update def update
params[:writing_patent][:create_user_id] = current_user.id 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]) if @patent.update_attributes(params[:writing_patent])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

2
vendor/built_in_modules/personal_patent/app/views/panel/personal_patent/desktop/personal_patents/index.html.erb vendored
View File

@ -75,7 +75,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="patent_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @patents.each do |w| %> <% @patents.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>

2
vendor/built_in_modules/personal_project/app/assets/javascripts/personal_project/desktop/personal_project.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalProject = function(target,url,cache){ /
} }
} }
this.initializePersonalProject.projectDelete = function(data,dom){ this.initializePersonalProject.projectDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

24
vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.css vendored
View File

@ -1,31 +1,31 @@
/* Books */ /* Books */
[page-name="books_list"] .list_t_item .inner { [page-name="project_list"] .list_t_item .inner {
padding-left: 30px; } padding-left: 30px; }
[page-name="books_list"] .list_item_action { [page-name="project_list"] .list_item_action {
font-size: 12px; font-size: 12px;
float: left; float: left;
margin-left: -30px; } margin-left: -30px; }
[page-name="books_list"] .list_item_action a { [page-name="project_list"] .list_item_action a {
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin: 1px 1px 6px 1px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-star { [page-name="project_list"] .list_item_action .icon-star {
color: #faa732; color: #faa732;
font-size: 20px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-check { [page-name="project_list"] .list_item_action .icon-check {
color: #333; color: #333;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .file_view .list_t_des { [page-name="project_list"] .file_view .list_t_des {
overflow: hidden; } overflow: hidden; }
[page-name="books_list"] .file_view .file { [page-name="project_list"] .file_view .file {
float: left; float: left;
width: 120px; width: 120px;
height: 50px; height: 50px;
@ -42,15 +42,15 @@
/* ie */ /* ie */
box-sizing: border-box; box-sizing: border-box;
/* css3 */ } /* css3 */ }
[page-name="books_list"] .file_view .file:hover { [page-name="project_list"] .file_view .file:hover {
background-color: #f7f7f7; } background-color: #f7f7f7; }
[page-name="books_list"] .file_view .file img { [page-name="project_list"] .file_view .file img {
width: 38px; width: 38px;
height: 38px; height: 38px;
position: absolute; position: absolute;
left: 6px; left: 6px;
top: 6px; } top: 6px; }
[page-name="books_list"] .file_view .file .filetitle { [page-name="project_list"] .file_view .file .filetitle {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 38px;

2
vendor/built_in_modules/personal_project/app/assets/stylesheets/personal_project/desktop/personal_project.scss vendored
View File

@ -1,7 +1,7 @@
@import "desktop-helper"; @import "desktop-helper";
/* Books */ /* Books */
[page-name="books_list"] { [page-name="project_list"] {
.list_t_item .inner { padding-left: 30px; } .list_t_item .inner { padding-left: 30px; }
.list_item_action { .list_item_action {
font-size: 12px; font-size: 12px;

2
vendor/built_in_modules/personal_project/app/controllers/panel/personal_project/desktop/personal_projects_controller.rb vendored
View File

@ -50,7 +50,7 @@ class Panel::PersonalProject::Desktop::PersonalProjectsController < ApplicationC
def update def update
params[:project][:create_user_id] = current_user.id params[:project][:create_user_id] = current_user.id
@project = Project.new(params[:project]) @project = Project.find(params[:id])
if @project.update_attributes(params[:project]) if @project.update_attributes(params[:project])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

2
vendor/built_in_modules/personal_project/app/views/panel/personal_project/desktop/personal_projects/index.html.erb vendored
View File

@ -76,7 +76,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="project_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @projects.each do |w| %> <% @projects.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>

2
vendor/built_in_modules/personal_research/app/assets/javascripts/personal_research/desktop/personal_research.js vendored
View File

@ -31,7 +31,7 @@ orbitDesktop.prototype.initializePersonalResearch = function(target,url,cache){
} }
} }
this.initializePersonalResearch.researchDelete = function(data,dom){ this.initializePersonalResearch.researchDelete = function(data,dom){
var parent = dom.parent().parent(); var parent = dom.parent().parent().parent();
if(data.success){ if(data.success){
parent.hide("slide",function(){parent.remove();}); parent.hide("slide",function(){parent.remove();});
o.notify(data.msg,"success"); o.notify(data.msg,"success");

24
vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.css vendored
View File

@ -1,31 +1,31 @@
/* Books */ /* Books */
[page-name="books_list"] .list_t_item .inner { [page-name="research_list"] .list_t_item .inner {
padding-left: 30px; } padding-left: 30px; }
[page-name="books_list"] .list_item_action { [page-name="research_list"] .list_item_action {
font-size: 12px; font-size: 12px;
float: left; float: left;
margin-left: -30px; } margin-left: -30px; }
[page-name="books_list"] .list_item_action a { [page-name="research_list"] .list_item_action a {
display: block; display: block;
width: 20px; width: 20px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
margin: 1px 1px 6px 1px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-star { [page-name="research_list"] .list_item_action .icon-star {
color: #faa732; color: #faa732;
font-size: 20px; } 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; color: #999;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .list_item_action .icon-check { [page-name="research_list"] .list_item_action .icon-check {
color: #333; color: #333;
font-size: 20px; } font-size: 20px; }
[page-name="books_list"] .file_view .list_t_des { [page-name="research_list"] .file_view .list_t_des {
overflow: hidden; } overflow: hidden; }
[page-name="books_list"] .file_view .file { [page-name="research_list"] .file_view .file {
float: left; float: left;
width: 120px; width: 120px;
height: 50px; height: 50px;
@ -42,15 +42,15 @@
/* ie */ /* ie */
box-sizing: border-box; box-sizing: border-box;
/* css3 */ } /* css3 */ }
[page-name="books_list"] .file_view .file:hover { [page-name="research_list"] .file_view .file:hover {
background-color: #f7f7f7; } background-color: #f7f7f7; }
[page-name="books_list"] .file_view .file img { [page-name="research_list"] .file_view .file img {
width: 38px; width: 38px;
height: 38px; height: 38px;
position: absolute; position: absolute;
left: 6px; left: 6px;
top: 6px; } top: 6px; }
[page-name="books_list"] .file_view .file .filetitle { [page-name="research_list"] .file_view .file .filetitle {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 38px;

2
vendor/built_in_modules/personal_research/app/assets/stylesheets/personal_research/desktop/personal_research.scss vendored
View File

@ -1,7 +1,7 @@
@import "desktop-helper"; @import "desktop-helper";
/* Books */ /* Books */
[page-name="books_list"] { [page-name="research_list"] {
.list_t_item .inner { padding-left: 30px; } .list_t_item .inner { padding-left: 30px; }
.list_item_action { .list_item_action {
font-size: 12px; font-size: 12px;

2
vendor/built_in_modules/personal_research/app/controllers/panel/personal_research/desktop/personal_researchs_controller.rb vendored
View File

@ -50,7 +50,7 @@ class Panel::PersonalResearch::Desktop::PersonalResearchsController < Applicatio
def update def update
params[:research][:create_user_id] = current_user.id params[:research][:create_user_id] = current_user.id
@research = Research.new(params[:research]) @research = Research.find(params[:id])
if @research.update_attributes(params[:research]) if @research.update_attributes(params[:research])
render json: {success: true, msg: t('create_success')}.to_json render json: {success: true, msg: t('create_success')}.to_json
else else

2
vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/edit.html.erb vendored
View File

@ -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} %> <%= render partial: 'form', locals: {:f => f} %>
<%end%> <%end%>

6
vendor/built_in_modules/personal_research/app/views/panel/personal_research/desktop/personal_researchs/index.html.erb vendored
View File

@ -41,8 +41,8 @@
<div class="sdm_t hh1">View</div> <div class="sdm_t hh1">View</div>
<div class="admbg sdm_o"> <div class="admbg sdm_o">
<ul id="journal_view_selection"> <ul id="journal_view_selection">
<li><%= link_to "Journal", panel_personal_research_desktop_personal_researchs_path + "?view=research_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li> <li><%= link_to "Title", panel_personal_research_desktop_personal_researchs_path + "?view=research_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
<li><%= link_to "Title", panel_personal_research_desktop_personal_researchs_path + "?view=extracted_chapters", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li> <li><%= link_to "Extracted Chapters", panel_personal_research_desktop_personal_researchs_path + "?view=extracted_chapters", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
<li><%= link_to "File", panel_personal_research_desktop_personal_researchs_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li> <li><%= link_to "File", panel_personal_research_desktop_personal_researchs_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
<li><%= link_to "Keywords", panel_personal_research_desktop_personal_researchs_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li> <li><%= link_to "Keywords", panel_personal_research_desktop_personal_researchs_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" => "get" %></li>
</ul> </ul>
@ -76,7 +76,7 @@
<div class="sdm_t hh1"><span class="icon-question-sign"></span></div> <div class="sdm_t hh1"><span class="icon-question-sign"></span></div>
</div> </div>
</div> </div>
<div class="overview" page-name="journal_p_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" > <div class="overview" page-name="research_list" content-layout="datalist" base-width="300" per-column="<%= @per_column.to_s %>" pagination-var="view=<%= @view_by %>&page" >
<% @researches.each do |w| %> <% @researches.each do |w| %>
<%= publication_record w, @view_by%> <%= publication_record w, @view_by%>
<% end %> <% end %>