From 8f65284932154c3944b7697149aa84bac4d660a4 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 20 Nov 2012 17:20:05 +0800 Subject: [PATCH] Desktop updates various --- app/assets/javascripts/desktop.js | 1 + app/assets/javascripts/orbitdesktop.js | 127 ++++++++++++------ .../desktop/journal_pages_controller.rb | 42 +++--- app/views/desktop/appstore.html.erb | 8 +- app/views/desktop/books.html.erb | 8 +- app/views/desktop/index.html.erb | 66 ++++----- app/views/desktop/journal_p.html.erb | 8 +- .../desktop/journal_pages/_form.html.erb | 5 +- app/views/desktop/journal_pages/edit.html.erb | 2 +- app/views/desktop/journal_pages/new.html.erb | 2 +- app/views/desktop/research_d.html.erb | 8 +- app/views/desktop/research_p.html.erb | 8 +- app/views/desktop/seminar_p.html.erb | 8 +- app/views/desktop/settings.html.erb | 10 +- 14 files changed, 178 insertions(+), 125 deletions(-) diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index 7bfcb0b5..37c654c7 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -7,6 +7,7 @@ //= require jquery //= require jquery_ujs //= require jquery-ui +//= require jquery.form //= require jquery.tinyscrollbar //= require jquery.miniColors.min //= require bootstrap diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 2aca179b..de5500ea 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -2,6 +2,9 @@ //harry //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[':'], { 'containsi': function (elem, i, match, array) { @@ -82,7 +85,7 @@ var orbitDesktop = function(dom){ $(".docklist a").click(function(){ var target = $(this).attr("id"); 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.desktopData[o.currentface] == "undefined") o.desktopData[o.currentface] = ""; @@ -95,47 +98,28 @@ var orbitDesktop = function(dom){ $(o.contentHolder).empty().load(url,function(){ if(typeof o.data_method != "undefined"){ 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{ $(o.contentHolder).html(o.desktopData[o.currentface]); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]").trigger("click")); cache = true; if(typeof o.data_method != "undefined"){ if(o.data_method != "") - window.o[o.data_method](target,url,cache); + window.o[o.data_method](target,url,cache); } } }); } return false; }) + + $('body').on({ click: function(){ - if(!$(this).hasClass('active')){ - 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'); - } + o.sub_menu_item($(this)); return false; }, mouseenter: function(){ @@ -147,7 +131,23 @@ var orbitDesktop = function(dom){ var t = $(this).hasClass('active') ? '' : 'thmc1 thmtxt'; $(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(){ var ww = $(window).width(); $("img#thmbackground").attr({"width":ww}); @@ -171,6 +171,26 @@ var orbitDesktop = function(dom){ $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 if(!target)target = "desktop"; @@ -806,6 +826,14 @@ var orbitDesktop = function(dom){ }; 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 var journalData; @@ -817,7 +845,6 @@ var orbitDesktop = function(dom){ fill: '.list_t' }) - $("#journal_selection_options a").click(function(){ switch($(this).attr("href")){ case "all": @@ -849,10 +876,26 @@ var orbitDesktop = function(dom){ } 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(){ - $("#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")){ $(this).switchClass("icon-check-empty","icon-check",0); } else if($(this) .hasClass("icon-check")) { @@ -873,7 +916,7 @@ var orbitDesktop = function(dom){ li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+journal.title+'
    '+paper.title+'
    • '); + li = $('
  • '+journal.title+'
    '+paper.title+'
    Edit
    • '); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -902,6 +945,7 @@ var orbitDesktop = function(dom){ var img = $('
    '+thistitle+'
    '); li.append(img); }) + li.append('Edit'); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -920,7 +964,7 @@ var orbitDesktop = function(dom){ li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+paper.title+'
    '+paper.keywords+'
    • '); + li = $('
  • '+paper.title+'
    '+paper.keywords+'
    Edit
    • '); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -940,7 +984,7 @@ var orbitDesktop = function(dom){ li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+paper.title+'
    • '); + li = $('
  • '+paper.title+'
    Edit
    • '); column.find("ul").append(li); if(counter%5==0){ $("#journal_p div#paper_list div.overview").append(column); @@ -959,7 +1003,7 @@ var orbitDesktop = function(dom){ li; $.each(journalData,function(i,journal){ $.each(journal.papers,function(j,paper){ - li = $('
  • '+paper.title+'
    '+paper.abstract+'
    • '); + li = $('
  • '+paper.title+'
    '+paper.abstract+'
    Edit
    • '); column.find("ul").append(li); $("#journal_p div#paper_list div.overview").append(column); column = $('
    '); @@ -969,11 +1013,14 @@ var orbitDesktop = function(dom){ bindSecondaryHandlers(); } - $.getJSON("/desktop/journal_pages/get_journals_json",function(journals){ - journalData = eval(journals); - journalview(); - bindHandlers(); - }) + var getData = function(){ + $.getJSON("/desktop/journal_pages/get_journals_json",function(journals){ + journalData = eval(journals); + journalview(); + bindHandlers(); + }) + } + getData(); } this.initializeJournalPapers.addpaper = function(){ // to open add pages in journal papers page @@ -987,8 +1034,6 @@ var orbitDesktop = function(dom){ } bindHandlers(); } - - }; this.initializeAppstore = function(target,url,cache){ diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb index 7dd5c4b7..34ae69b0 100644 --- a/app/controllers/desktop/journal_pages_controller.rb +++ b/app/controllers/desktop/journal_pages_controller.rb @@ -21,6 +21,7 @@ class Desktop::JournalPagesController < ApplicationController respond_to do |format| format.html { render :layout => false} end + end def edit @@ -44,14 +45,19 @@ class Desktop::JournalPagesController < ApplicationController @writing_journal = WritingJournal.new(params[:writing_journal]) if @writing_journal.save - respond_to do |format| - 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.js - end + # respond_to do |format| + # 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.js + # end + render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json else + render :json => {"success"=>false,"msg"=>"Saving failed!"} end - end + + end + render :json => {"success"=>true,"msg"=>"Paper successfully saved!"}.to_json + end def update @@ -79,19 +85,19 @@ class Desktop::JournalPagesController < ApplicationController if not file.nil? file_type = MIME::Types.type_for(file).first.to_s.split("/")[1] - case file_type - when "jpg", "jpeg" - type = "jpg" - when "text", "txt" - type = "txt" - when "pdf" - type = "pdf" - when "png" - type = "png" - else "readme" - end + # case file_type + # when "jpg", "jpeg" + # type = "jpg" + # when "text", "txt" + # type = "txt" + # when "pdf" + # type = "pdf" + # when "png" + # type = "png" + # else "readme" + # end - file_type = "/assets/ft-icons/#{type}/#{type}-48_32.png" + file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png" else file_type = "" end diff --git a/app/views/desktop/appstore.html.erb b/app/views/desktop/appstore.html.erb index d0a4d5b7..4aeca5da 100644 --- a/app/views/desktop/appstore.html.erb +++ b/app/views/desktop/appstore.html.erb @@ -8,16 +8,16 @@
    -
    +
    -
    +
    diff --git a/app/views/desktop/books.html.erb b/app/views/desktop/books.html.erb index 6e8dd0dc..b2c703ea 100644 --- a/app/views/desktop/books.html.erb +++ b/app/views/desktop/books.html.erb @@ -11,10 +11,10 @@
    -
    +
    -
    +
    diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 701e5c08..b3f78780 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -1,64 +1,64 @@
      -
    • Home +
    • Home
        -
      • App Manager
        • -
      • All Sections
        • -
      • Settings
        • +
      • App Manager
        • +
      • All Sections
        • +
      • Settings
      • -
    • Publication +
    • Publication
        -
      • Journal Papers
        • +
      • Journal Papers
        • -
      • Seminar Papers
        • +
      • Seminar Papers
        • -
      • Books
        • +
      • Books
        • -
      • Books
        • +
      • Books
      • -
    • Research +
    • Research
        -
      • Research Domain
        • -
      • Research Project
        • -
      • Patents
        • -
      • Labs
        • +
      • Research Domain
        • +
      • Research Project
        • +
      • Patents
        • +
      • Labs
      • -
    • Experience +
    • Experience
        -
      • Working
        • -
      • Education
        • -
      • Honors
        • -
      • Activities
        • -
      • Clubs
        • +
      • Working
        • +
      • Education
        • +
      • Honors
        • +
      • Activities
        • +
      • Clubs
      • -
    • Learning & Teaching +
    • Learning & Teaching
        -
      • Courses
        • -
      • Homework
        • -
      • Certification
        • +
      • Courses
        • +
      • Homework
        • +
      • Certification
      • -
    • Personal +
    • Personal
        -
      • myPage
        • -
      • Blog
        • -
      • Album
        • -
      • Calendar
        • -
      • Files
        • +
      • myPage
        • +
      • Blog
        • +
      • Album
        • +
      • Calendar
        • +
      • Files
      • -
    • Orbit +
    • Orbit
        -
      • Academia Connection
        • +
      • Academia Connection
      • -
    • AppStore
      • +
    • AppStore
    diff --git a/app/views/desktop/journal_p.html.erb b/app/views/desktop/journal_p.html.erb index 868136c4..1fc404a5 100644 --- a/app/views/desktop/journal_p.html.erb +++ b/app/views/desktop/journal_p.html.erb @@ -11,10 +11,10 @@
    -
    +
    -
    +
    diff --git a/app/views/desktop/journal_pages/_form.html.erb b/app/views/desktop/journal_pages/_form.html.erb index a87f2d72..e321a717 100644 --- a/app/views/desktop/journal_pages/_form.html.erb +++ b/app/views/desktop/journal_pages/_form.html.erb @@ -1,8 +1,9 @@
    - <%= button_tag "Save", name: "commit", value: "Save", class: "fn_btn hh2 thmc2 thmtxt" %> - <%= button_tag "Cancel", name: "commit", value: "Cancel", class: "fn_btn hh2 thmc2 thmtxt" %> + <%= f.submit "Save", name: "commit", value: "Save", 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") %>
    Entry Year
    diff --git a/app/views/desktop/journal_pages/edit.html.erb b/app/views/desktop/journal_pages/edit.html.erb index 1e331bf4..e0f0837c 100644 --- a/app/views/desktop/journal_pages/edit.html.erb +++ b/app/views/desktop/journal_pages/edit.html.erb @@ -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} %> <%end%> diff --git a/app/views/desktop/journal_pages/new.html.erb b/app/views/desktop/journal_pages/new.html.erb index db2fb548..c402e295 100644 --- a/app/views/desktop/journal_pages/new.html.erb +++ b/app/views/desktop/journal_pages/new.html.erb @@ -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} %> <%end%> diff --git a/app/views/desktop/research_d.html.erb b/app/views/desktop/research_d.html.erb index e96691d3..c74f0469 100644 --- a/app/views/desktop/research_d.html.erb +++ b/app/views/desktop/research_d.html.erb @@ -11,10 +11,10 @@
    -
    +
    -
    +
    diff --git a/app/views/desktop/research_p.html.erb b/app/views/desktop/research_p.html.erb index 085d3af4..2d38c05c 100644 --- a/app/views/desktop/research_p.html.erb +++ b/app/views/desktop/research_p.html.erb @@ -11,10 +11,10 @@
    -
    +
    -
    +
    diff --git a/app/views/desktop/seminar_p.html.erb b/app/views/desktop/seminar_p.html.erb index 59b086df..c79939cf 100644 --- a/app/views/desktop/seminar_p.html.erb +++ b/app/views/desktop/seminar_p.html.erb @@ -11,10 +11,10 @@
    -
    +
    -
    +
    diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 333dbfe0..df754325 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -7,17 +7,17 @@