From 9931eb7f61c3c6944e6bf92ec4d53afff697703a Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 6 Mar 2013 11:32:53 +0800 Subject: [PATCH 01/35] all none fixed --- app/assets/javascripts/orbitdesktop.js | 5 ++++- .../desktop/conference_pages/_form.html.erb | 5 +++-- .../personal_journal/desktop/journal_pages.js | 20 +++++++++++++++---- .../desktop/journal_pages/_form.html.erb | 11 ++++++++-- .../desktop/journal_pages/index.html.erb | 4 ++-- 5 files changed, 34 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 744654776..047847ca7 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -164,13 +164,16 @@ var orbitDesktop = function(dom){ var $e = $(this); var t = $e.attr("ajax-remote"); var classes_to_toggle = $e.attr("toggle-onclick"); + var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : ""); if(classes_to_toggle){ $e.toggleClass(classes_to_toggle); } if(t == "false"){ + if(exe){ + window.o[o.data_method][exe](null,$e); + } return false; } - var exe = $e.attr("callback-method"); // (typeof $e.attr("callback-method") == "function"? $e.attr("callback-method") : ""); var ca = $e.attr("content-holder"); var a = function(){ diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb index 608eee5b6..c0ce56af7 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb @@ -1,8 +1,9 @@
- <%= f.submit t("save"), name: "commit", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %> + <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %> + <% if not @writing_conference.new_record? %> - <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %> + <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "bt-cancel ini_input hp hh1 thmadm thmtxt" %> <% end %>
diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js index fd0a6acd0..0157b4e7c 100644 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js @@ -57,10 +57,12 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // return false; }); - $('.action a.remove_existing_record').click(function(){ - $(this).next('.should_destroy').attr('value', 1); - $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide(); - }); + + $('.action a.remove_existing_record').click(function(){ + $(this).next('.should_destroy').attr('value', 1); + $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide(); + }); + } bindHandlers(); } @@ -102,4 +104,14 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // o.notify(data.msg,"alert"); } } + this.initializeJournalPapers.allnone = function(d,o){ + switch(o.attr("href")){ + case "all": + $("div.overview a.icon-check-empty").removeClass("icon-check-empty").addClass("icon-check"); + break; + case "none": + $("div.overview a.icon-check").removeClass("icon-check").addClass("icon-check-empty"); + break; + } + } }; diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb index 497bae714..a4d40d640 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb @@ -1,8 +1,10 @@
- <%= f.submit t("save"), name: "commit", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %> + + <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh1 thmc2 thmtxt" %> <% if not @writing_journal.new_record? %> - <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %> + <%= submit_tag "Cancel", :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh1 thmadm thmtxt" %> + <% end %>
@@ -188,7 +190,12 @@
<%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %> +<<<<<<< Updated upstream add +======= + add + +>>>>>>> Stashed changes
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb index d82ff4f08..4a78a5060 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb @@ -3,8 +3,8 @@
From 20ac4f1ac0ecfd08d56ae7ff5b8ed228d96d299d Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 6 Mar 2013 12:08:08 +0800 Subject: [PATCH 02/35] all none for conf done --- .../personal_conference/desktop/conference_pages.js | 10 ++++++++++ .../desktop/conference_pages/index.html.erb | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js index eaefe0f5f..96a235cf2 100644 --- a/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js +++ b/vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js @@ -102,5 +102,15 @@ orbitDesktop.prototype.initializeConferencePapers = function(target,url,cache){ o.notify(data.msg,"alert"); } } + this.initializeConferencePapers.allnone = function(d,o){ + switch(o.attr("href")){ + case "all": + $("div.overview a.icon-check-empty").removeClass("icon-check-empty").addClass("icon-check"); + break; + case "none": + $("div.overview a.icon-check").removeClass("icon-check").addClass("icon-check-empty"); + break; + } + } }; diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb index 5b27892a9..535b035ce 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb @@ -3,8 +3,8 @@
From 906e522a6a2a64c8631b95c952a25f02f65e48ec Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 6 Mar 2013 19:04:33 +0800 Subject: [PATCH 03/35] Major tinyscrollbar update --- app/assets/javascripts/orbitdesktop.js | 60 +++++++++++-------- app/views/desktop/allsections.html.erb | 9 +-- app/views/desktop/app_manager.html.erb | 31 ++++------ .../desktop/settings/connections.html.erb | 7 +-- app/views/desktop/settings/sections.html.erb | 6 +- app/views/desktop/settings/themes.html.erb | 6 +- .../index.html.erb | 7 ++- .../conference_co_authors/index.html.erb | 8 +-- .../desktop/conference_pages/_form.html.erb | 8 +-- .../conference_pages/conference_type.html.erb | 7 ++- .../desktop/conference_pages/index.html.erb | 8 +-- .../desktop/journal_pages_helper.rb | 1 + .../index.html.erb | 7 ++- .../desktop/journal_co_authors/index.html.erb | 7 ++- .../desktop/journal_pages/_form.html.erb | 15 ++--- .../desktop/journal_pages/index.html.erb | 6 +- .../journal_pages/journal_type.html.erb | 7 +-- 17 files changed, 91 insertions(+), 109 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 047847ca7..2a50c3426 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -4,13 +4,14 @@ //callback-method will be called after desktop controlled ajax call //container=true is the area where the view will be loaded -//load = true is used to load the list element by default +//load = true is used to load the submenu item by default //response-type = "json"|"script"|"xml|html" default is json //autocomplete-list = "listname" an array from which autocomplete will be attached to its respective input or textarea //ajax-remote="get/delete/post/false" this will automatically bind the with remote ajax call. By default if the resposne is html, it ll be inserted in container=true, false option will not make any calls and also stop page refresh // content-holder = "jquery dom", the returned html of server will be put inside the dom mentioned in content-holder of a tag. this can be used in a tags as attributes //confirm-message ="Some message", this will prompt user with a confirm box and show the message before ajax call is made. //"toggle-onclick" = "classes to get toggle" this will toggle classes on toggle when a tags are clicked. +//"delete-item" = "true" this will remove its respective item from the list. //for layout tinyscrollbar @@ -181,16 +182,22 @@ var orbitDesktop = function(dom){ type : t, url : $e.attr("href"), success : function(data){ - if(typeof data == "string"){ - if(ca) - $(ca).html(data); - else{ - o.layout_data(data); - // $("div[container=true]").html(data); + if(typeof data == "string"){ + if(ca) + $(ca).html(data); + else{ + o.layout_data(data); + // $("div[container=true]").html(data); + } + } + if(exe) + window.o[o.data_method][exe](data,$e); + if(t == "delete"){ + if($e.attr("delete-item")=="true"){ + var li_to_delete = $e.parentsUntil("li[item=true]").find("li[item=true]"); + li_to_delete.slideUp(); + } } - } - if(exe) - window.o[o.data_method][exe](data,$e); } }); } @@ -275,8 +282,9 @@ var orbitDesktop = function(dom){ }; this.layout_data = function(h){ - var $e = $(h); - var column_container = $e.find("div.overview"); + var $e = $("
"); + $e.html(h); + var column_container = $e.find("div.overview"); var layout = column_container.attr("content-layout"), base_width = parseInt(column_container.attr("base-width")), no_of_entries,temp_div = $("
"),total_columns=0; switch (layout){ case "simple": @@ -284,13 +292,15 @@ var orbitDesktop = function(dom){ temp_div.append(column_container.html()); break; case "datalist": - no_of_entries = (typeof column_container.attr("per-column") != "undefined"? column_container.attr("per-column") : 4); + no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4); + var height_percentage = 100/no_of_entries; var entries = column_container.find("li[item=true]"),x = 0; entries.each(function(i,li){ if(x == 0){ column = $("
    '); + $("div[container=true]").find("div.tinycanvas").prepend('
    '); $("div[container=true] div.overview").html(temp_div.html()); if(isNaN(base_width)){ o.tinyscrollbar_ext({ @@ -342,19 +352,19 @@ var orbitDesktop = function(dom){ var cache = false; if(!o.desktopData[o.currentface]){ - $(o.contentHolder).empty().load(url,function(){ + $(o.contentHolder).empty().load(url,function(data){ if(typeof o.data_method != "undefined"){ 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]")); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data); 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]")); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data); } }catch(EX){} @@ -363,12 +373,12 @@ var orbitDesktop = function(dom){ $(o.contentHolder).html(o.desktopData[o.currentface]); try{ if(!customload) - o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]")); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data); 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]")); + o.sub_menu_item($(o.contentHolder).find("*[content-type=menu] a[load=true]"),data); } }catch(EX){} cache = true; @@ -380,7 +390,7 @@ var orbitDesktop = function(dom){ }); } } - this.sub_menu_item = function(dom){ + this.sub_menu_item = function(dom,data){ var sub_data_method = dom.attr('callback-method'); if(sub_data_method){ $.ajax({ @@ -399,13 +409,12 @@ var orbitDesktop = function(dom){ } } }) - // $("div[container=true]").load(dom.attr("href"),function(data){ - - // }) + o.highlight_sub_menu_item(dom); } + if(dom.length == 0) + o.layout_data(data); // $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); // dom.addClass('thmc1 thmtxt active'); - o.highlight_sub_menu_item(dom); } this.highlight_sub_menu_item = function(no){ $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); @@ -732,7 +741,6 @@ var orbitDesktop = function(dom){ }; this.initializeAppSearch = function(target,url,cache){ //this is application search ie is app manager initialization - var searchArray,allApps; var bindHandlers = function(){ // bind handler for app manager page var gn = $('.g_col').length, diff --git a/app/views/desktop/allsections.html.erb b/app/views/desktop/allsections.html.erb index 414504c2a..49f10ff75 100644 --- a/app/views/desktop/allsections.html.erb +++ b/app/views/desktop/allsections.html.erb @@ -1,4 +1,4 @@ -
    + -
    -
    -
    +
    @@ -82,5 +80,3 @@
    -
    -
    \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb index b9a9f3c02..21c845a88 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb @@ -12,11 +12,12 @@
    -
    +
    <%= render :partial => 'show_form'%>
    -
    + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb index aba28c137..8a16a4bf7 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb @@ -4,9 +4,9 @@ <%= link_to "New Type", panel_personal_conference_desktop_conference_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh1 thmc2 thmtxt", "ajax-remote"=>"get" %>
    -
    +
    <% @conference_co_authors.each_with_index do |co_author,i| %>
    @@ -26,5 +26,5 @@
    <% end %>
    -
    - + diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb index c0ce56af7..1fc2679be 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb @@ -22,7 +22,7 @@
    -
    +
    @@ -206,8 +206,8 @@
    -
    - + <%= stylesheet_link_tag "token-input-facebook" %> <%= javascript_include_tag :defaults, "jquery.tokeninput" %> diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb index a29fcfdb8..14a442d95 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb @@ -13,9 +13,9 @@
    -
    +
    <% @conference_lists.each_with_index do |conference_list,i| %>
    @@ -32,5 +32,6 @@
    <% end %>
    -
    + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb index 535b035ce..9aff35aa3 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb @@ -65,13 +65,13 @@
    -
    +
    <% @writing_conferences.each do |w| %> <%= publication_record w, @view_by%> <% end %>
    -
    - + diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb index 75f7bd6a0..d703e9638 100644 --- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb +++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb @@ -56,6 +56,7 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper "ajax-remote" => "delete", "confirm-message" => t("sure?"), "callback-method" => "paperDelete", + "delete-item" => "true", :class => "journal_paper_delete admbg2 admtxt", :href => panel_personal_journal_desktop_journal_page_path(publication)) end diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb index bd5df00d7..d52907c04 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb @@ -12,11 +12,12 @@ -
    +
    <%= render :partial => 'show_form'%>
    -
    + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb index c89d1a00f..b91eb1250 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb @@ -4,9 +4,9 @@ <%= link_to "New Type", panel_personal_journal_desktop_journal_co_author_relations_path, :class=>"bt-new-type fn_btn hp hh1 thmc2 thmtxt", "ajax-remote"=>"get" %> -
    +
      <% @journal_co_authors.each_with_index do |co_author,i| %> @@ -24,5 +24,6 @@ <% end %>
    -
    + \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb index a4d40d640..510946b5c 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb @@ -23,7 +23,7 @@
    -
    +
    @@ -190,12 +190,9 @@
    <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %> -<<<<<<< Updated upstream - add -======= - add ->>>>>>> Stashed changes + add +
    @@ -232,9 +229,9 @@
    -
    + - -