Desktop updates various
This commit is contained in:
parent
398432d0fc
commit
0ef76f9200
|
@ -7,6 +7,7 @@
|
||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require jquery-ui
|
//= require jquery-ui
|
||||||
|
//= require jquery.form
|
||||||
//= require jquery.tinyscrollbar
|
//= require jquery.tinyscrollbar
|
||||||
//= require jquery.miniColors.min
|
//= require jquery.miniColors.min
|
||||||
//= require bootstrap
|
//= require bootstrap
|
||||||
|
|
|
@ -2,6 +2,9 @@
|
||||||
//harry
|
//harry
|
||||||
//Inititialize function will initialize desktop
|
//Inititialize function will initialize desktop
|
||||||
|
|
||||||
|
//callback-method will be called after desktop controlled ajax call;
|
||||||
|
//container=true is the area where the view will be loaded
|
||||||
|
|
||||||
|
|
||||||
$.extend($.expr[':'], {
|
$.extend($.expr[':'], {
|
||||||
'containsi': function (elem, i, match, array) {
|
'containsi': function (elem, i, match, array) {
|
||||||
|
@ -82,7 +85,7 @@ var orbitDesktop = function(dom){
|
||||||
$(".docklist a").click(function(){
|
$(".docklist a").click(function(){
|
||||||
var target = $(this).attr("id");
|
var target = $(this).attr("id");
|
||||||
var url = $(this).attr("href");
|
var url = $(this).attr("href");
|
||||||
o.data_method = $(this).attr("data-method");
|
o.data_method = $(this).attr("callback-method");
|
||||||
if(o.currenthtml!=target){
|
if(o.currenthtml!=target){
|
||||||
if(o.desktopData[o.currentface] == "undefined")
|
if(o.desktopData[o.currentface] == "undefined")
|
||||||
o.desktopData[o.currentface] = "";
|
o.desktopData[o.currentface] = "";
|
||||||
|
@ -97,9 +100,11 @@ var orbitDesktop = function(dom){
|
||||||
if(o.data_method != "")
|
if(o.data_method != "")
|
||||||
window.o[o.data_method](target,url,cache);
|
window.o[o.data_method](target,url,cache);
|
||||||
}
|
}
|
||||||
|
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"));
|
||||||
});
|
});
|
||||||
}else{
|
}else{
|
||||||
$(o.contentHolder).html(o.desktopData[o.currentface]);
|
$(o.contentHolder).html(o.desktopData[o.currentface]);
|
||||||
|
o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]").trigger("click"));
|
||||||
cache = true;
|
cache = true;
|
||||||
if(typeof o.data_method != "undefined"){
|
if(typeof o.data_method != "undefined"){
|
||||||
if(o.data_method != "")
|
if(o.data_method != "")
|
||||||
|
@ -110,32 +115,11 @@ var orbitDesktop = function(dom){
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
$('body').on({
|
$('body').on({
|
||||||
click: function(){
|
click: function(){
|
||||||
if(!$(this).hasClass('active')){
|
o.sub_menu_item($(this));
|
||||||
var sub_data_method = $(this).attr('data-method');
|
|
||||||
if(sub_data_method){
|
|
||||||
$("#panel_r").load($(this).attr("href"),function(){
|
|
||||||
// o.simple_drop_down();
|
|
||||||
|
|
||||||
// o.tinyscrollbar_ext({
|
|
||||||
// main: '.tinycanvas',
|
|
||||||
// fill: '.s_grid_con'
|
|
||||||
// })
|
|
||||||
if(typeof o.data_method != "undefined"){
|
|
||||||
if(o.data_method != ""){
|
|
||||||
if(typeof sub_data_method != "undefined"){
|
|
||||||
if(sub_data_method != ""){
|
|
||||||
window.o[o.data_method][sub_data_method]();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
$('.s_menu a').removeClass('thmc1 thmtxt active');
|
|
||||||
$(this).addClass('thmc1 thmtxt active');
|
|
||||||
}
|
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
mouseenter: function(){
|
mouseenter: function(){
|
||||||
|
@ -147,7 +131,23 @@ var orbitDesktop = function(dom){
|
||||||
var t = $(this).hasClass('active') ? '' : 'thmc1 thmtxt';
|
var t = $(this).hasClass('active') ? '' : 'thmc1 thmtxt';
|
||||||
$(this).switchClass(t,'admtxt',0);
|
$(this).switchClass(t,'admtxt',0);
|
||||||
}
|
}
|
||||||
},'.s_menu a');
|
},'*[content-type=menu] a');
|
||||||
|
|
||||||
|
$("body").on("submit","form[type=ajax_form]",function(){
|
||||||
|
var callback_method = $(this).attr("callback-method");
|
||||||
|
var options = {
|
||||||
|
success:function(responseText, statusText, xhr, $form){
|
||||||
|
if(typeof callback_method != "undefined"){
|
||||||
|
if(callback_method != ""){
|
||||||
|
window.o[o.data_method][callback_method](responseText,statusText,xhr,$form);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$(this).ajaxSubmit(options);
|
||||||
|
return false;
|
||||||
|
})
|
||||||
|
|
||||||
$(window).resize(function(){
|
$(window).resize(function(){
|
||||||
var ww = $(window).width();
|
var ww = $(window).width();
|
||||||
$("img#thmbackground").attr({"width":ww});
|
$("img#thmbackground").attr({"width":ww});
|
||||||
|
@ -171,6 +171,26 @@ var orbitDesktop = function(dom){
|
||||||
$fn_des.stop(true, true).fadeOut();
|
$fn_des.stop(true, true).fadeOut();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
this.sub_menu_item = function(dom){
|
||||||
|
if(!dom.hasClass('active')){
|
||||||
|
var sub_data_method = dom.attr('callback-method');
|
||||||
|
if(sub_data_method){
|
||||||
|
$("div[container=true]").load(dom.attr("href"),function(){
|
||||||
|
if(typeof o.data_method != "undefined"){
|
||||||
|
if(o.data_method != ""){
|
||||||
|
if(typeof sub_data_method != "undefined"){
|
||||||
|
if(sub_data_method != ""){
|
||||||
|
window.o[o.data_method][sub_data_method]();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
$('*[content-type=menu] a').removeClass('thmc1 thmtxt active');
|
||||||
|
dom.addClass('thmc1 thmtxt active');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.initializeDesktop = function(target,url,cache){ //this is for initializing main desktops that are sections and tiles
|
this.initializeDesktop = function(target,url,cache){ //this is for initializing main desktops that are sections and tiles
|
||||||
if(!target)target = "desktop";
|
if(!target)target = "desktop";
|
||||||
|
@ -806,6 +826,14 @@ var orbitDesktop = function(dom){
|
||||||
|
|
||||||
};
|
};
|
||||||
this.initializeJournalPapers = function(target,url,cache){ // this init journal papers
|
this.initializeJournalPapers = function(target,url,cache){ // this init journal papers
|
||||||
|
this.initializeJournalPapers.formCallback = function(data){
|
||||||
|
if(data.success){
|
||||||
|
o.notify(data.msg,"success");
|
||||||
|
o.sub_menu_item($("div[content-type=menu] a").eq(0));
|
||||||
|
}else{
|
||||||
|
o.notify(data.msg,"alert");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.initializeJournalPapers.list = function(){ // to open list part in journal papers page
|
this.initializeJournalPapers.list = function(){ // to open list part in journal papers page
|
||||||
var journalData;
|
var journalData;
|
||||||
|
@ -817,7 +845,6 @@ var orbitDesktop = function(dom){
|
||||||
fill: '.list_t'
|
fill: '.list_t'
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
$("#journal_selection_options a").click(function(){
|
$("#journal_selection_options a").click(function(){
|
||||||
switch($(this).attr("href")){
|
switch($(this).attr("href")){
|
||||||
case "all":
|
case "all":
|
||||||
|
@ -849,10 +876,26 @@ var orbitDesktop = function(dom){
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
})
|
})
|
||||||
|
|
||||||
|
$("div[container=true]").on("click",".journal_paper_edit",function(){
|
||||||
|
$.ajax({
|
||||||
|
url : $(this).attr("href"),
|
||||||
|
type : "get",
|
||||||
|
success : function(data){
|
||||||
|
var prev_data = $("div[container=true]").html();
|
||||||
|
$("div[container=true]").html(data);
|
||||||
|
$(".bt-cancel").click(function(){
|
||||||
|
$("div[container=true]").html(prev_data);
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return false;
|
||||||
|
})
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var bindSecondaryHandlers = function(){
|
var bindSecondaryHandlers = function(){
|
||||||
$("#journal_p div#paper_list a").click(function(){
|
$("#journal_p div#paper_list a.icon-check-empty").click(function(){
|
||||||
if($(this).hasClass("icon-check-empty")){
|
if($(this).hasClass("icon-check-empty")){
|
||||||
$(this).switchClass("icon-check-empty","icon-check",0);
|
$(this).switchClass("icon-check-empty","icon-check",0);
|
||||||
} else if($(this) .hasClass("icon-check")) {
|
} else if($(this) .hasClass("icon-check")) {
|
||||||
|
@ -873,7 +916,7 @@ var orbitDesktop = function(dom){
|
||||||
li;
|
li;
|
||||||
$.each(journalData,function(i,journal){
|
$.each(journalData,function(i,journal){
|
||||||
$.each(journal.papers,function(j,paper){
|
$.each(journal.papers,function(j,paper){
|
||||||
li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div><div class="list_t_des">'+paper.title+'</div></li>');
|
li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+journal.title+'</div><div class="list_t_des">'+paper.title+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
|
||||||
column.find("ul").append(li);
|
column.find("ul").append(li);
|
||||||
if(counter%5==0){
|
if(counter%5==0){
|
||||||
$("#journal_p div#paper_list div.overview").append(column);
|
$("#journal_p div#paper_list div.overview").append(column);
|
||||||
|
@ -902,6 +945,7 @@ var orbitDesktop = function(dom){
|
||||||
var img = $('<div class="list_t_des"><a href="'+file.url+'" target="_blank" ><img src="'+file.icon+'" />'+thistitle+'</a></div>');
|
var img = $('<div class="list_t_des"><a href="'+file.url+'" target="_blank" ><img src="'+file.icon+'" />'+thistitle+'</a></div>');
|
||||||
li.append(img);
|
li.append(img);
|
||||||
})
|
})
|
||||||
|
li.append('<a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a>');
|
||||||
column.find("ul").append(li);
|
column.find("ul").append(li);
|
||||||
if(counter%5==0){
|
if(counter%5==0){
|
||||||
$("#journal_p div#paper_list div.overview").append(column);
|
$("#journal_p div#paper_list div.overview").append(column);
|
||||||
|
@ -920,7 +964,7 @@ var orbitDesktop = function(dom){
|
||||||
li;
|
li;
|
||||||
$.each(journalData,function(i,journal){
|
$.each(journalData,function(i,journal){
|
||||||
$.each(journal.papers,function(j,paper){
|
$.each(journal.papers,function(j,paper){
|
||||||
li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.keywords+'</div></li>');
|
li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.keywords+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
|
||||||
column.find("ul").append(li);
|
column.find("ul").append(li);
|
||||||
if(counter%5==0){
|
if(counter%5==0){
|
||||||
$("#journal_p div#paper_list div.overview").append(column);
|
$("#journal_p div#paper_list div.overview").append(column);
|
||||||
|
@ -940,7 +984,7 @@ var orbitDesktop = function(dom){
|
||||||
li;
|
li;
|
||||||
$.each(journalData,function(i,journal){
|
$.each(journalData,function(i,journal){
|
||||||
$.each(journal.papers,function(j,paper){
|
$.each(journal.papers,function(j,paper){
|
||||||
li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div></li>');
|
li = $('<li class="list_t_item"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
|
||||||
column.find("ul").append(li);
|
column.find("ul").append(li);
|
||||||
if(counter%5==0){
|
if(counter%5==0){
|
||||||
$("#journal_p div#paper_list div.overview").append(column);
|
$("#journal_p div#paper_list div.overview").append(column);
|
||||||
|
@ -959,7 +1003,7 @@ var orbitDesktop = function(dom){
|
||||||
li;
|
li;
|
||||||
$.each(journalData,function(i,journal){
|
$.each(journalData,function(i,journal){
|
||||||
$.each(journal.papers,function(j,paper){
|
$.each(journal.papers,function(j,paper){
|
||||||
li = $('<li class="list_t_item" style="height:auto;"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.abstract+'</div></li>');
|
li = $('<li class="list_t_item" style="height:auto;"><div class="list_item_action"><a href="" class="icon-check-empty"></a><a href="" class="icon-star-empty"></a></div><div class="list_t_title">'+paper.title+'</div><div class="list_t_des">'+paper.abstract+'</div><a class="journal_paper_edit" href="'+paper.url_edit+'">Edit</a></li>');
|
||||||
column.find("ul").append(li);
|
column.find("ul").append(li);
|
||||||
$("#journal_p div#paper_list div.overview").append(column);
|
$("#journal_p div#paper_list div.overview").append(column);
|
||||||
column = $('<div class="g_col list_t"><ul></ul></div>');
|
column = $('<div class="g_col list_t"><ul></ul></div>');
|
||||||
|
@ -969,12 +1013,15 @@ var orbitDesktop = function(dom){
|
||||||
bindSecondaryHandlers();
|
bindSecondaryHandlers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var getData = function(){
|
||||||
$.getJSON("/desktop/journal_pages/get_journals_json",function(journals){
|
$.getJSON("/desktop/journal_pages/get_journals_json",function(journals){
|
||||||
journalData = eval(journals);
|
journalData = eval(journals);
|
||||||
journalview();
|
journalview();
|
||||||
bindHandlers();
|
bindHandlers();
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
getData();
|
||||||
|
}
|
||||||
|
|
||||||
this.initializeJournalPapers.addpaper = function(){ // to open add pages in journal papers page
|
this.initializeJournalPapers.addpaper = function(){ // to open add pages in journal papers page
|
||||||
var bindHandlers = function(){ // to bind handlers for add page
|
var bindHandlers = function(){ // to bind handlers for add page
|
||||||
|
@ -987,8 +1034,6 @@ var orbitDesktop = function(dom){
|
||||||
}
|
}
|
||||||
bindHandlers();
|
bindHandlers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
this.initializeAppstore = function(target,url,cache){
|
this.initializeAppstore = function(target,url,cache){
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@ class Desktop::JournalPagesController < ApplicationController
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { render :layout => false}
|
format.html { render :layout => false}
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def edit
|
def edit
|
||||||
|
@ -44,14 +45,19 @@ class Desktop::JournalPagesController < ApplicationController
|
||||||
|
|
||||||
@writing_journal = WritingJournal.new(params[:writing_journal])
|
@writing_journal = WritingJournal.new(params[:writing_journal])
|
||||||
if @writing_journal.save
|
if @writing_journal.save
|
||||||
respond_to do |format|
|
# respond_to do |format|
|
||||||
format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully created.'}
|
# format.html { redirect_to desktop_journal_pages_url, :layout => false, notice: 'User was successfully created.'}
|
||||||
# format.json { render json: @writing_journal, status: :created, location: @writing_journal}
|
# # format.json { render json: @writing_journal, status: :created, location: @writing_journal}
|
||||||
# format.js
|
# # format.js
|
||||||
end
|
# end
|
||||||
|
render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
|
||||||
else
|
else
|
||||||
|
render :json => {"success"=>false,"msg"=>"Saving failed!"}
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
|
@ -79,19 +85,19 @@ class Desktop::JournalPagesController < ApplicationController
|
||||||
if not file.nil?
|
if not file.nil?
|
||||||
file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
|
file_type = MIME::Types.type_for(file).first.to_s.split("/")[1]
|
||||||
|
|
||||||
case file_type
|
# case file_type
|
||||||
when "jpg", "jpeg"
|
# when "jpg", "jpeg"
|
||||||
type = "jpg"
|
# type = "jpg"
|
||||||
when "text", "txt"
|
# when "text", "txt"
|
||||||
type = "txt"
|
# type = "txt"
|
||||||
when "pdf"
|
# when "pdf"
|
||||||
type = "pdf"
|
# type = "pdf"
|
||||||
when "png"
|
# when "png"
|
||||||
type = "png"
|
# type = "png"
|
||||||
else "readme"
|
# else "readme"
|
||||||
end
|
# end
|
||||||
|
|
||||||
file_type = "/assets/ft-icons/#{type}/#{type}-48_32.png"
|
file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png"
|
||||||
else
|
else
|
||||||
file_type = ""
|
file_type = ""
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,16 +8,16 @@
|
||||||
<div id="holder">
|
<div id="holder">
|
||||||
|
|
||||||
<div id="panel_l" class="ph">
|
<div id="panel_l" class="ph">
|
||||||
<div class="s_menu sm_v">
|
<div class="s_menu sm_v" content-type="menu">
|
||||||
<ul id='setting_left_nav'>
|
<ul id='setting_left_nav'>
|
||||||
<li><a href="<%= desktop_appstore_onlinestore_path %>" data-method="onlinestore" class="admtxt hh2 w2 hp" onclick='return false;'>Online Store</a></li>
|
<li><a href="<%= desktop_appstore_onlinestore_path %>" callback-method="onlinestore" class="admtxt hh2 w2 hp" onclick='return false;'>Online Store</a></li>
|
||||||
<li><a href="<%= desktop_appstore_widgets_path %>" data-method="widgets" class="admtxt hh2 w2 hp" onclick='return false;'>Widgets</a></li>
|
<li><a href="<%= desktop_appstore_widgets_path %>" callback-method="widgets" class="admtxt hh2 w2 hp" onclick='return false;'>Widgets</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Apps</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Apps</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Registeration</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Registeration</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="panel_r" class="ph pw admbg hp">
|
<div id="panel_r" container="true" class="ph pw admbg hp">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="holder">
|
<div id="holder">
|
||||||
<div id="panel_l" class="ph">
|
<div id="panel_l" class="ph">
|
||||||
<div class="s_menu sm_v">
|
<div class="s_menu sm_v" content-type="menu">
|
||||||
<ul id='setting_left_nav'>
|
<ul id='setting_left_nav'>
|
||||||
<li><a href="<%= desktop_publications_books_list_path %>" data-method="harry"class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
<li><a href="<%= desktop_publications_books_list_path %>" callback-method="harry"class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
||||||
<li><a href="<%= desktop_publications_books_add_path %>" data-method="addbook"class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
<li><a href="<%= desktop_publications_books_add_path %>" callback-method="addbook"class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Books</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Books</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="panel_r" class="ph pw admbg hp">
|
<div id="panel_r" container="true" class="ph pw admbg hp">
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,64 +1,64 @@
|
||||||
<div id="side">
|
<div id="side">
|
||||||
<div id="rwidget" class="wh3 thmc4">
|
<div id="rwidget" class="wh3 thmc4">
|
||||||
<ul class="docklist">
|
<ul class="docklist">
|
||||||
<li class="d_cate"><a data-method='initializeDesktop' href="desktop/" class="widget_fn wh3 hh3" id='d_desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
|
<li class="d_cate"><a callback-method='initializeDesktop' href="desktop/" class="widget_fn wh3 hh3" id='d_desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="Home" id="home_icon" width="30" height="30"/></span></a>
|
||||||
<ul class="dock_child hh3 thmc4" style="width: 180px;">
|
<ul class="dock_child hh3 thmc4" style="width: 180px;">
|
||||||
<li class="dock_item"><a data-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeAppSearch' href="<%= desktop_app_manager_path %>" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="App Manager" id="app_manager_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='initializeSectionsManager' href="<%= desktop_sections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeSectionsManager' href="<%= desktop_sections_path %>" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="All Sections" id="sections_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='initializeSettings' href="<%= desktop_settings_path %>" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeSettings' href="<%= desktop_settings_path %>" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="Settings" id="settings_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="d_cate"><a data-method='' href="" class="widget_fn wh3 hh3" id='d_publication' onclick="return false;"><span class="widget_icon"><img src="" alt="Publication" id="publication_icon" width="30" height="30"/></span></a>
|
<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_publication' onclick="return false;"><span class="widget_icon"><img src="" alt="Publication" id="publication_icon" width="30" height="30"/></span></a>
|
||||||
<ul class="dock_child hh3 thmc4" style="width: 180px;">
|
<ul class="dock_child hh3 thmc4" style="width: 180px;">
|
||||||
|
|
||||||
<li class="dock_item"><a data-method='initializeJournalPapers' href="<%= desktop_publications_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Journal Papers" id="journal_p_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeJournalPapers' href="<%= desktop_publications_journal_p_path %>" class="widget_fn wh3 hh3" id='d_journal_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Journal Papers" id="journal_p_icon" width="30" height="30"/></span></a></li>
|
||||||
|
|
||||||
<li class="dock_item"><a data-method='initializeSeminar' href="<%= desktop_publications_seminar_p_path %>" class="widget_fn wh3 hh3" id='d_seminar_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Seminar Papers" id="seminar_p_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeSeminar' href="<%= desktop_publications_seminar_p_path %>" class="widget_fn wh3 hh3" id='d_seminar_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Seminar Papers" id="seminar_p_icon" width="30" height="30"/></span></a></li>
|
||||||
|
|
||||||
<li class="dock_item"><a data-method='initializeContact' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_books' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeContact' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_books' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
|
||||||
|
|
||||||
<li class="dock_item"><a data-method='initializeContact' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_contacts' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeContact' href="<%= desktop_publications_books_path %>" class="widget_fn wh3 hh3" id='d_contacts' onclick="return false;"><span class="widget_icon"><img src="" alt="Books" id="books_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="d_cate"><a data-method='' href="" class="widget_fn wh3 hh3" id='d_research' onclick="return false;"><span class="widget_icon"><img src="" alt="Research" id="research_icon" width="30" height="30"/></span></a>
|
<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_research' onclick="return false;"><span class="widget_icon"><img src="" alt="Research" id="research_icon" width="30" height="30"/></span></a>
|
||||||
<ul class="dock_child hh3 thmc4" style="width: 240px;">
|
<ul class="dock_child hh3 thmc4" style="width: 240px;">
|
||||||
<li class="dock_item"><a data-method='initializeResearchDomain' href="<%= desktop_research_research_d_path %>" class="widget_fn wh3 hh3" id='d_research_d' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Domain" id="research_d_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeResearchDomain' href="<%= desktop_research_research_d_path %>" class="widget_fn wh3 hh3" id='d_research_d' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Domain" id="research_d_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='initializeResearchProject' href="<%= desktop_research_research_p_path %>" class="widget_fn wh3 hh3" id='d_research_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Project" id="research_p_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='initializeResearchProject' href="<%= desktop_research_research_p_path %>" class="widget_fn wh3 hh3" id='d_research_p' onclick="return false;"><span class="widget_icon"><img src="" alt="Research Project" id="research_p_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="" class="widget_fn wh3 hh3" id='d_patents' onclick="return false;"><span class="widget_icon"><img src="" alt="Patents" id="patents_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_patents' onclick="return false;"><span class="widget_icon"><img src="" alt="Patents" id="patents_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="labs" class="widget_fn wh3 hh3" id='d_labs' onclick="return false;"><span class="widget_icon"><img src="" alt="Labs" id="labs_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="labs" class="widget_fn wh3 hh3" id='d_labs' onclick="return false;"><span class="widget_icon"><img src="" alt="Labs" id="labs_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="d_cate"><a data-method='' href="" class="widget_fn wh3 hh3" id='d_experience' onclick="return false;"><span class="widget_icon"><img src="" alt="Experience" id="experience_icon" width="30" height="30"/></span></a>
|
<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_experience' onclick="return false;"><span class="widget_icon"><img src="" alt="Experience" id="experience_icon" width="30" height="30"/></span></a>
|
||||||
<ul class="dock_child hh3 thmc4" style="width: 300px;">
|
<ul class="dock_child hh3 thmc4" style="width: 300px;">
|
||||||
<li class="dock_item"><a data-method='' href="working" class="widget_fn wh3 hh3" id='d_working' onclick="return false;"><span class="widget_icon"><img src="" alt="Working" id="working_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="working" class="widget_fn wh3 hh3" id='d_working' onclick="return false;"><span class="widget_icon"><img src="" alt="Working" id="working_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="education" class="widget_fn wh3 hh3" id='d_education' onclick="return false;"><span class="widget_icon"><img src="" alt="Education" id="education_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="education" class="widget_fn wh3 hh3" id='d_education' onclick="return false;"><span class="widget_icon"><img src="" alt="Education" id="education_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="honors" class="widget_fn wh3 hh3" id='d_honors' onclick="return false;"><span class="widget_icon"><img src="" alt="Honors" id="honors_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="honors" class="widget_fn wh3 hh3" id='d_honors' onclick="return false;"><span class="widget_icon"><img src="" alt="Honors" id="honors_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="activities" class="widget_fn wh3 hh3" id='d_activities' onclick="return false;"><span class="widget_icon"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="activities" class="widget_fn wh3 hh3" id='d_activities' onclick="return false;"><span class="widget_icon"><img src="" alt="Activities" id="activities_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="clubs" class="widget_fn wh3 hh3" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="clubs" class="widget_fn wh3 hh3" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="Clubs" id="clubs_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="d_cate"><a data-method='' href="" class="widget_fn wh3 hh3" id='d_landt' onclick="return false;"><span class="widget_icon"><img src="" alt="Learning & Teaching" id="landt_icon" width="30" height="30"/></span></a>
|
<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_landt' onclick="return false;"><span class="widget_icon"><img src="" alt="Learning & Teaching" id="landt_icon" width="30" height="30"/></span></a>
|
||||||
<ul class="dock_child hh3 thmc4" style="width: 180px;">
|
<ul class="dock_child hh3 thmc4" style="width: 180px;">
|
||||||
<li class="dock_item"><a data-method='' href="courses" class="widget_fn wh3 hh3" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="courses" class="widget_fn wh3 hh3" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="Courses" id="courses_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="homework" class="widget_fn wh3 hh3" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="homework" class="widget_fn wh3 hh3" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="Homework" id="homework_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="certification" class="widget_fn wh3 hh3" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="certification" class="widget_fn wh3 hh3" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="Certification" id="certification_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="d_cate"><a data-method='' href="" class="widget_fn wh3 hh3" id='d_personal' onclick="return false;"><span class="widget_icon"><img src="" alt="Personal" id="personal_icon" width="30" height="30"/></span></a>
|
<li class="d_cate"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_personal' onclick="return false;"><span class="widget_icon"><img src="" alt="Personal" id="personal_icon" width="30" height="30"/></span></a>
|
||||||
<ul class="dock_child hh3 thmc4" style="width: 300px;">
|
<ul class="dock_child hh3 thmc4" style="width: 300px;">
|
||||||
<li class="dock_item"><a data-method='' href="mypage" class="widget_fn wh3 hh3" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="mypage" class="widget_fn wh3 hh3" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="myPage" id="mypage_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="blog" class="widget_fn wh3 hh3" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="blog" class="widget_fn wh3 hh3" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="Blog" id="blog_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="album" class="widget_fn wh3 hh3" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="album" class="widget_fn wh3 hh3" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="Album" id="album_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="calendar" class="widget_fn wh3 hh3" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="calendar" class="widget_fn wh3 hh3" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="Calendar" id="calendar_icon" width="30" height="30"/></span></a></li>
|
||||||
<li class="dock_item"><a data-method='' href="files" class="widget_fn wh3 hh3" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="files" class="widget_fn wh3 hh3" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="Files" id="files_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="d_cate"><a data-method='initializeOrbitTimeline' href="<%= desktop_orbit_orbit_path %>" class="widget_fn wh3 hh3" id='d_orbit' onclick="return false;"><span class="widget_icon"><img src="" alt="Orbit" id="orbit_icon" width="30" height="30"/></span></a>
|
<li class="d_cate"><a callback-method='initializeOrbitTimeline' href="<%= desktop_orbit_orbit_path %>" class="widget_fn wh3 hh3" id='d_orbit' onclick="return false;"><span class="widget_icon"><img src="" alt="Orbit" id="orbit_icon" width="30" height="30"/></span></a>
|
||||||
<ul class="dock_child hh3 thmc4" style="width: 60px;">
|
<ul class="dock_child hh3 thmc4" style="width: 60px;">
|
||||||
<li class="dock_item"><a data-method='' href="" class="widget_fn wh3 hh3" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
|
<li class="dock_item"><a callback-method='' href="" class="widget_fn wh3 hh3" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="Academia Connection" id="connection_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<li class="d_cate"><a data-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh3 hh3" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
|
<li class="d_cate"><a callback-method='initializeAppstore' href="<%= desktop_appstore_appstore_path %>" class="widget_fn wh3 hh3" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="AppStore" id="appstore_icon" width="30" height="30"/></span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="fn_des hh3 admbg admtxt"></div>
|
<div class="fn_des hh3 admbg admtxt"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="holder">
|
<div id="holder">
|
||||||
<div id="panel_l" class="ph">
|
<div id="panel_l" class="ph">
|
||||||
<div class="s_menu sm_v">
|
<div class="s_menu sm_v" content-type="menu">
|
||||||
<ul id='setting_left_nav'>
|
<ul id='setting_left_nav'>
|
||||||
<li><a href="<%= desktop_journal_pages_path %>" data-method="list" class="hh2 w2 hp active thmc1 thmtxt xx" onclick='return false;'>List</a></li>
|
<li><a href="<%= desktop_journal_pages_path %>" callback-method="list" load="true" class="hh2 w2 hp thmc1 thmtxt xx" onclick='return false;'>List</a></li>
|
||||||
<li><a href="<%= new_desktop_journal_page_path %>" data-method="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
|
<li><a href="<%= new_desktop_journal_page_path %>" callback-method="addpaper" class="admtxt hh2 w2 hp xx" onclick='return false;'>Add/Edit</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Journals</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="panel_r" class="ph pw admbg hp">
|
<div id="panel_r" container="true" class="ph pw admbg hp">
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
|
|
||||||
<div class="toolbar hh2">
|
<div class="toolbar hh2">
|
||||||
<div class="fn_g hp">
|
<div class="fn_g hp">
|
||||||
<%= button_tag "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
|
<%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %>
|
||||||
<%= button_tag "Cancel", name: "commit", value: "Cancel", class: "fn_btn hh2 thmc2 thmtxt" %>
|
<%#= button_tag "Cancel", name: "cancel", value: "Cancel", class: "fn_btn hh2 thmc2 thmtxt" %>
|
||||||
|
<%= content_tag(:button, "Cancel", :class=>"fn_btn hh2 bt-cancel thmc2 thmtxt") %>
|
||||||
</div>
|
</div>
|
||||||
<div class="hh2 hp sdm">
|
<div class="hh2 hp sdm">
|
||||||
<div class="sdm_t hh2">Entry Year</div>
|
<div class="sdm_t hh2">Entry Year</div>
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
<%= form_for @writing_journal, url: desktop_journal_page_path(@writing_journal) do |f| %>
|
<%= form_for @writing_journal, url: desktop_journal_page_path(@writing_journal),html: { multipart: true ,:type=>"ajax_form", "callback-method"=>"formCallback"} do |f| %>
|
||||||
<%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
|
<%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
|
||||||
<%end%>
|
<%end%>
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
<%= form_for @writing_journal, html: { multipart: true ,:type=>"ajax_form"} , url: desktop_journal_pages_path do |f| %>
|
<%= form_for @writing_journal, html: { multipart: true ,:type=>"ajax_form", "callback-method"=>"formCallback"} , url: desktop_journal_pages_path do |f| %>
|
||||||
<%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
|
<%= render partial: 'desktop/journal_pages/form', locals: {:f => f} %>
|
||||||
<%end%>
|
<%end%>
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="holder">
|
<div id="holder">
|
||||||
<div id="panel_l" class="ph">
|
<div id="panel_l" class="ph">
|
||||||
<div class="s_menu sm_v">
|
<div class="s_menu sm_v" content-type="menu">
|
||||||
<ul id='setting_left_nav'>
|
<ul id='setting_left_nav'>
|
||||||
<li><a href="<%= desktop_research_research_d_list_path %>" data-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
<li><a href="<%= desktop_research_research_d_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
||||||
<li><a href="<%= desktop_research_research_d_add_path %>" data-method="add_this" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
<li><a href="<%= desktop_research_research_d_add_path %>" callback-method="add_this" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Domains</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Domains</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="panel_r" class="ph pw admbg hp">
|
<div id="panel_r" container="true" class="ph pw admbg hp">
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="holder">
|
<div id="holder">
|
||||||
<div id="panel_l" class="ph">
|
<div id="panel_l" class="ph">
|
||||||
<div class="s_menu sm_v">
|
<div class="s_menu sm_v" content-type="menu">
|
||||||
<ul id='setting_left_nav'>
|
<ul id='setting_left_nav'>
|
||||||
<li><a href="<%= desktop_publications_research_p_list_path %>" data-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
<li><a href="<%= desktop_publications_research_p_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
||||||
<li><a href="<%= desktop_publications_research_p_add_path %>" data-method="add_this" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
<li><a href="<%= desktop_publications_research_p_add_path %>" callback-method="add_this" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Projects</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Projects</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="panel_r" class="ph pw admbg hp">
|
<div id="panel_r" container="true" class="ph pw admbg hp">
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="holder">
|
<div id="holder">
|
||||||
<div id="panel_l" class="ph">
|
<div id="panel_l" class="ph">
|
||||||
<div class="s_menu sm_v">
|
<div class="s_menu sm_v" content-type="menu">
|
||||||
<ul id='setting_left_nav'>
|
<ul id='setting_left_nav'>
|
||||||
<li><a href="<%= desktop_publications_seminar_p_list_path %>" data-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
<li><a href="<%= desktop_publications_seminar_p_list_path %>" callback-method="list" class="hh2 w2 hp active thmc1 thmtxt" onclick='return false;'>List</a></li>
|
||||||
<li><a href="<%= desktop_publications_seminar_p_add_path %>" data-method="addseminar" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
<li><a href="<%= desktop_publications_seminar_p_add_path %>" callback-method="addseminar" class="admtxt hh2 w2 hp" onclick='return false;'>Add/Edit</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Seminar</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Seminar</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Co-Authors</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Tags & Keywords</a></li>
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="panel_r" class="ph pw admbg hp">
|
<div id="panel_r" container="true" class="ph pw admbg hp">
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -7,17 +7,17 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="holder">
|
<div id="holder">
|
||||||
<div id="panel_l" class="ph">
|
<div id="panel_l" class="ph">
|
||||||
<div class="s_menu sm_v">
|
<div class="s_menu sm_v" content-type="menu">
|
||||||
<ul id='setting_left_nav'>
|
<ul id='setting_left_nav'>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Overview</a></li>
|
||||||
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Account</a></li>
|
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Account</a></li>
|
||||||
<li><a href="<%= desktop_sections_path %>" data-method="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
|
<li><a href="<%= desktop_sections_path %>" callback-method="sections" class="admtxt hh2 w2 hp" onclick='return false;'>Sections</a></li>
|
||||||
<li><a href="<%= desktop_themes_path %>" data-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
|
<li><a href="<%= desktop_themes_path %>" callback-method="themes" class="admtxt hh2 w2 hp" onclick='return false;'>Theme</a></li>
|
||||||
<li><a href="<%= desktop_connections_path %>" data-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>
|
<li><a href="<%= desktop_connections_path %>" callback-method="connection" class="admtxt hh2 w2 hp" onclick='return false;'>Connection</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="panel_r" class="ph pw admbg hp">
|
<div id="panel_r" container="true" class="ph pw admbg hp">
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
#encoding: utf-8
|
|
||||||
require 'mysql2'
|
|
||||||
|
|
||||||
$mid_site_connection
|
|
||||||
|
|
||||||
module MiddleSiteConnection
|
|
||||||
|
|
||||||
@mid_host = {
|
|
||||||
:host => 'mruling.nccu.edu.tw', #mruling.nccu.edu.tw or 127.0.0.1
|
|
||||||
:port => 3306, #3306 or 8005
|
|
||||||
:username => "rulingcom",
|
|
||||||
:password => "5w3iJQ9OJQMGhJibKP6YQje8",
|
|
||||||
:database => "RSS23_NCCU_MIDDLE",
|
|
||||||
:encoding => "UTF8"
|
|
||||||
}
|
|
||||||
|
|
||||||
def self.establish
|
|
||||||
$mid_site_connection = Mysql2::Client.new(@mid_host)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
|
@ -1,170 +0,0 @@
|
||||||
# encoding: utf-8
|
|
||||||
# require 'ruby-debug'
|
|
||||||
require "#{Rails.root}/config/initializers/middle_site_connection"
|
|
||||||
|
|
||||||
namespace :mid_site do
|
|
||||||
desc "mid_site Rake task"
|
|
||||||
attr_from_mid = %w{nccu_id psn_nam ut_cod up_ut_cod eml_adr off_tel_ext sta_num}
|
|
||||||
officer_posgrp_code = %w{02 06 10 05} #from RSS2
|
|
||||||
admin_role = nil
|
|
||||||
sub_role = nil
|
|
||||||
test_account_ldap_id ='139716'
|
|
||||||
MiddleSiteConnection.establish
|
|
||||||
|
|
||||||
task :sync => :environment do
|
|
||||||
info_profile = Info.first(conditions: {:key => 'profile'})
|
|
||||||
|
|
||||||
def find_or_create_sub_role(role,ut_query=[],key='')
|
|
||||||
sub_role = role.sub_roles.get_sub_role_from_key(key)
|
|
||||||
if sub_role.nil?
|
|
||||||
ut_data = ut_query.find{|ut_data| ut_data["ut_cod"] == key }
|
|
||||||
sub_role = role.sub_roles.create!(:key => key)
|
|
||||||
sub_role.title_translations ={"en" => (ut_data["ut_eng_m"] rescue ''), "zh_tw" => (ut_data["ut_chi_m"] rescue '')}
|
|
||||||
sub_role.save!
|
|
||||||
p "Created SubRole(key: #{key}): EN: #{sub_role.title_translations['en']}, CH: #{sub_role.title_translations['zh_tw']} ParentRole(#{role.key}): #{role.title_translations['en']}"
|
|
||||||
end
|
|
||||||
sub_role
|
|
||||||
end
|
|
||||||
|
|
||||||
users_from_mid = $mid_site_connection.query("SELECT #{attr_from_mid.join(',')} FROM rss_pautlst_ut WHERE posgrp_cod IN (#{officer_posgrp_code.join(',')})")
|
|
||||||
ut_data_from_mid = $mid_site_connection.query("SELECT ut_odr, ut_cod, up_ut_cod, ut_chi_m, ut_eng_m FROM rss_paunit WHERE ut_tpe = '1' AND ut_grp != '3' AND up_ut_cod != 'F00' ORDER BY ut_odr, ut_cod")
|
|
||||||
remote_list = users_from_mid.collect{|t| t["nccu_id"]}
|
|
||||||
|
|
||||||
#remove delete user sho has been deleted at remote first
|
|
||||||
local_need_remove = User.all.collect{|t| t.nccu_id rescue nil}.uniq.delete_if {|x| x == nil} - remote_list
|
|
||||||
desc "Going to delete User with IDs: #{local_need_remove.inspect}"
|
|
||||||
local_need_remove = User.excludes(nccu_ldap_uid: test_account_ldap_id ).collect{|t| t.nccu_ldap_uid rescue nil}.uniq.delete_if {|x| x == nil} - remote_list
|
|
||||||
AppManager.all.collect{|am| am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
|
|
||||||
desc "Deletion completed! \n"
|
|
||||||
|
|
||||||
#starting update user
|
|
||||||
desc "Updating and Newing Users"
|
|
||||||
|
|
||||||
users_from_mid.each do |mid_user|
|
|
||||||
ut_item = ut_data_from_mid.find{|ut_data| ut_data["ut_cod"] == mid_user["ut_cod"]}
|
|
||||||
up_ut_item = ut_data_from_mid.find{|ut_data| ut_data["ut_cod"] == mid_user["up_ut_cod"] }
|
|
||||||
local_user = User.find_or_initialize_by(:nccu_ldap_uid => mid_user["nccu_id"])
|
|
||||||
users_name_from_mid = $mid_site_connection.query("SELECT eng_nam_l,eng_nam_f,chi_nam_l,chi_nam_f FROM rss_zzperson_view WHERE nccu_id =#{mid_user["nccu_id"]}").first
|
|
||||||
|
|
||||||
|
|
||||||
first_name = AttributeValue.find_or_create_by( :user_id => local_user.id, :attribute_field_id => info_profile.attribute_fields[0].id, :key => 'first_name')
|
|
||||||
last_name = AttributeValue.find_or_create_by( :user_id => local_user.id, :attribute_field_id => info_profile.attribute_fields[1].id, :key => 'last_name')
|
|
||||||
|
|
||||||
first_name['en'] = users_name_from_mid["eng_nam_f"]
|
|
||||||
first_name['zh_tw'] = users_name_from_mid["chi_nam_f"]
|
|
||||||
first_name.save
|
|
||||||
|
|
||||||
last_name['en'] = users_name_from_mid["eng_nam_l"]
|
|
||||||
last_name['zh_tw'] = users_name_from_mid["chi_nam_l"]
|
|
||||||
last_name.save
|
|
||||||
|
|
||||||
|
|
||||||
user_model_mapper = Hash[:ut_cod => mid_user["ut_cod"] ,:up_ut_cod => mid_user["up_ut_cod"],:email => mid_user["eml_adr"],:off_tel_ext => mid_user["off_tel_ext"],:sta_num => mid_user["sta_num"]]
|
|
||||||
user_model_mapper[:admin] = false
|
|
||||||
local_user.update_attributes(user_model_mapper)
|
|
||||||
|
|
||||||
|
|
||||||
local_user.role = Role.find_or_create_by( :key => "department_admin",:build_in => true)
|
|
||||||
local_user.role.title_translations = {"en" => 'Department Admin', "zh_tw" => '系所使用者' }
|
|
||||||
|
|
||||||
|
|
||||||
unless local_user.ut_cod == local_user.up_ut_cod #if the ut_cod has additions info for up ut
|
|
||||||
local_user.sub_roles << find_or_create_sub_role(local_user.role,ut_data_from_mid,local_user.up_ut_cod)
|
|
||||||
end
|
|
||||||
|
|
||||||
local_user.sub_roles << find_or_create_sub_role(local_user.role,ut_data_from_mid,local_user.ut_cod)
|
|
||||||
|
|
||||||
local_user.save!
|
|
||||||
end
|
|
||||||
sys_users = User.all(conditions: {admin: false}).includes(:avatar).to_a
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
task :install_admin => :before_instll_admin do
|
|
||||||
admins_nccu_id = '2772'
|
|
||||||
info_profile = Info.first(conditions: {:key => 'profile'})
|
|
||||||
|
|
||||||
user_from_mid = $mid_site_connection.query("SELECT #{attr_from_mid.join(',')} FROM rss_pautlst_ut WHERE posgrp_cod IN (#{officer_posgrp_code.join(',')}) AND nccu_id = '#{admins_nccu_id}' limit 1")
|
|
||||||
admin_at_mid = user_from_mid.first
|
|
||||||
|
|
||||||
local_user = User.find_or_initialize_by(:nccu_ldap_uid => admin_at_mid["nccu_id"])
|
|
||||||
local_user.update_attributes(:email => admin_at_mid["eml_adr"], :admin => true, :role_id => admin_role.id, :sub_role_ids => [sub_role.id])
|
|
||||||
users_name_from_mid = $mid_site_connection.query("SELECT eng_nam_l,eng_nam_f,chi_nam_l,chi_nam_f FROM rss_zzperson_view WHERE nccu_id =#{admin_at_mid["nccu_id"]}").first
|
|
||||||
|
|
||||||
first_name = AttributeValue.find_or_create_by( :user_id => local_user.id, :attribute_field_id => info_profile.attribute_fields[0].id, :key => 'first_name')
|
|
||||||
last_name = AttributeValue.find_or_create_by( :user_id => local_user.id, :attribute_field_id => info_profile.attribute_fields[1].id, :key => 'last_name')
|
|
||||||
|
|
||||||
first_name['en'] = users_name_from_mid["eng_nam_f"]
|
|
||||||
first_name['zh_tw'] = users_name_from_mid["chi_nam_f"]
|
|
||||||
first_name.save
|
|
||||||
|
|
||||||
last_name['en'] = users_name_from_mid["eng_nam_l"]
|
|
||||||
last_name['zh_tw'] = users_name_from_mid["chi_nam_l"]
|
|
||||||
last_name.save
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
task :install_test => :before_instll_admin do
|
|
||||||
admins_nccu_id = '139716'
|
|
||||||
# admin_role = Role.find_or_create_by( key: 'administrator')
|
|
||||||
# sub_role = admin_role.sub_roles.find_or_create_by(:key => 'computer_center')
|
|
||||||
info_profile = Info.first(conditions: {:key => 'profile'})
|
|
||||||
|
|
||||||
user_from_mid = $mid_site_connection.query("SELECT #{attr_from_mid.join(',')} FROM rss_pautlst_ut WHERE nccu_id = '#{admins_nccu_id}' limit 1")
|
|
||||||
admin_at_mid = user_from_mid.first
|
|
||||||
user_first_name = admin_at_mid["psn_nam"].size > 3 ? admin_at_mid["psn_nam"][3..-1] : admin_at_mid["psn_nam"][1..-1]
|
|
||||||
user_last_name = admin_at_mid["psn_nam"].size > 3 ? admin_at_mid["psn_nam"][1..2] : admin_at_mid["psn_nam"][0]
|
|
||||||
local_user = User.find_or_initialize_by(:nccu_ldap_uid => admin_at_mid["nccu_id"])
|
|
||||||
local_user.update_attributes(:email => admin_at_mid["eml_adr"], :admin => true, :role_id => admin_role.id, :sub_role_ids => [sub_role.id])
|
|
||||||
|
|
||||||
AttributeValue.create( :user_id => local_user.id, :attribute_field_id => info_profile.attribute_fields[0].id, :key => 'first_name', :en => user_first_name, :zh_tw => user_first_name )
|
|
||||||
AttributeValue.create( :user_id => local_user.id, :attribute_field_id => info_profile.attribute_fields[1].id, :key => 'last_name', :en => user_last_name, :zh_tw => user_last_name )
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
task :before_instll_admin => :environment do
|
|
||||||
|
|
||||||
var_1 = {"en" => 'Administrator', "zh_tw" => '管理員' }
|
|
||||||
var_1_1 = {"en" => 'Computer Center', "zh_tw" => '計算機中心'}
|
|
||||||
|
|
||||||
admin_role = Role.find_or_create_by( :key => 'administrator',:built_in => true)
|
|
||||||
admin_role.title_translations =var_1
|
|
||||||
admin_role.save!
|
|
||||||
|
|
||||||
sub_role = admin_role.sub_roles.find_or_create_by(:key => 'computer_center', :built_in => true)
|
|
||||||
sub_role.title_translations =var_1_1
|
|
||||||
sub_role.save!
|
|
||||||
|
|
||||||
#var_1_1_1 = I18nVariable.create!( :document_class => 'Attribute', :key => 'field', :en => 'Field', :zh_tw => '領域', :parent_id => var_1_1.id )
|
|
||||||
#var_1_1_2 = I18nVariable.create!( :document_class => 'Attribute', :key => 'department', :en => 'Department', :zh_tw => '學系', :parent_id => var_1_1.id )
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
task :clean_local_account => :environment do
|
|
||||||
User.remote_account.each{|user| user.destroy}
|
|
||||||
end
|
|
||||||
|
|
||||||
task :claen_cc => [:clean_i18n_vars,:clean_admin_role_and_sub_role] do
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
task :clean_i18n_vars => :environment do
|
|
||||||
i18ns = I18nVariable.any_in( key: ['administrator','computer_center'])
|
|
||||||
i18ns.each { |var| var.destroy }
|
|
||||||
end
|
|
||||||
|
|
||||||
task :clean_ldap_users => :environment do
|
|
||||||
User.where(:nccu_ldap_uid.ne => nil ).each {|t| t.destroy}
|
|
||||||
end
|
|
||||||
|
|
||||||
task :clean_admin_role_and_sub_role => :environment do
|
|
||||||
data = Role.any_in( key: ['administrator','computer_center'])
|
|
||||||
data.each { |var| var.destroy }
|
|
||||||
|
|
||||||
data = SubRole.any_in( key: ['administrator','computer_center'])
|
|
||||||
data.each { |var| var.destroy }
|
|
||||||
|
|
||||||
end
|
|
||||||
end
|
|
Reference in New Issue