From 8094ddc9670e700d8eb515b0aeae7e657a1fea5f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 6 Dec 2012 17:43:19 +0800 Subject: [PATCH 1/2] section fixed and some other fixes --- .../javascripts/desktop/journal_pages.js.erb | 2 +- app/assets/javascripts/orbitdesktop.js | 30 +-- app/views/desktop/settings/sections.html.erb | 190 ++++++++++++++++-- 3 files changed, 193 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb index eea4e901..5cb5e3c9 100644 --- a/app/assets/javascripts/desktop/journal_pages.js.erb +++ b/app/assets/javascripts/desktop/journal_pages.js.erb @@ -344,7 +344,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // fill: '.s_grid_con' }) $(".bt-cancel").click(function(){ - o.sub_menu_item($(div[content-type=menu] a[custom-load=acoauthor])); + o.sub_menu_item($("div[content-type=menu] a[custom-load=acoauthor]")); }) } diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 8176e66c..16591be7 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -233,6 +233,21 @@ var orbitDesktop = function(dom){ if(o.data_method != "") window.o[o.data_method](target,url,cache); } + try{ + if(!customload) + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); + else{ + if(submenuitem) + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]")); + else + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); + } + }catch(EX){} + + }) + }else{ + $(o.contentHolder).html(o.desktopData[o.currentface]); + try{ if(!customload) o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); else{ @@ -241,18 +256,7 @@ var orbitDesktop = function(dom){ else o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); } - - }) - }else{ - $(o.contentHolder).html(o.desktopData[o.currentface]); - if(!customload) - o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); - else{ - if(submenuitem) - o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[custom-load="+submenuitem+"]")); - else - o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); - } + }catch(EX){} cache = true; if(typeof o.data_method != "undefined"){ if(o.data_method != "") @@ -565,7 +569,6 @@ var orbitDesktop = function(dom){ loadApps(); }; this.initializeSectionsManager = function(target,url,cache){ // this is init function for section manager - var elementParent,element,slabel; var bindHandlers = function(){ // this is bind handler for section manager page var groupWrapperWidth = 0; @@ -641,6 +644,7 @@ var orbitDesktop = function(dom){ $.each(apps,function(i,app){ $li = $('

  • '+app.title+'

    • '); + $("ul#section"+yy).append($li); }) if(y==1){ diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index dcb92237..d8e8208e 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -1,18 +1,178 @@ -
    -
    -
    -
    -
    Section Names
    -
      -
      • -
      • -
      • -
      • -
    -
    sample desciption
    -
    - Confirm +
    +
    + +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    -
    \ No newline at end of file +
    \ No newline at end of file From c2285a34f6ad49aa017081bd285798808e8f3844 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 6 Dec 2012 18:50:24 +0800 Subject: [PATCH 2/2] stupid fix --- app/assets/javascripts/desktop/journal_pages.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb index 5cb5e3c9..d45d5985 100644 --- a/app/assets/javascripts/desktop/journal_pages.js.erb +++ b/app/assets/javascripts/desktop/journal_pages.js.erb @@ -344,7 +344,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // fill: '.s_grid_con' }) $(".bt-cancel").click(function(){ - o.sub_menu_item($("div[content-type=menu] a[custom-load=acoauthor]")); + o.sub_menu_item($("div[content-type=menu] a[custom-load=coauthor]")); }) }