diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 047847ca..2a50c342 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 414504c2..49f10ff7 100644 --- a/app/views/desktop/allsections.html.erb +++ b/app/views/desktop/allsections.html.erb @@ -1,4 +1,4 @@ -
+
-
-
-
-
+
-
-
\ No newline at end of file diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb index 68e16a88..26c69583 100644 --- a/app/views/desktop/app_manager.html.erb +++ b/app/views/desktop/app_manager.html.erb @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb index be08bcd8..e4a1b853 100644 --- a/app/views/desktop/settings/themes.html.erb +++ b/app/views/desktop/settings/themes.html.erb @@ -5,9 +5,7 @@
  • Wallpaper
    • -
    -
    -
    +
    @@ -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 b9a9f3c0..21c845a8 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 1122e3b3..07260b2a 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 c0ce56af..1fc2679b 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 a29fcfdb..14a442d9 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 535b035c..9aff35aa 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 3966c36a..482ff302 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 bd5df00d..d52907c0 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 223f4cbe..199786ee 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" %> -
    +
    -
    + \ 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 a4d40d64..510946b5 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 @@
    -
    +