Lots of Update
1. CSS to SCSS 2. Journal Paper update Conflicts: Gemfile.lock app/assets/javascripts/orbitdesktop.js app/assets/stylesheets/desktop/desktop-main.css vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
This commit is contained in:
devin authored and 
Matt K. Fu committed
1 parent
0f6f5aafce
commit
c8aa50ee87
38 files changed
+3206
-1533
No files matched your search
@@ -223,7 +223,7 @@ var orbitDesktop = function(dom){
|
||||
$(window).resize(function(){
|
||||
var ww = $(window).width();
|
||||
$("img#thmbackground").attr({"width":ww});
|
||||
if( $('.tinycanvas').length > 0 ){ $('.tinycanvas').tinyscrollbar_update(); }
|
||||
if( $('.tinycanvas').length > 0 ){ $('.tinycanvas').tinyscrollbar_update('relative'); }
|
||||
if($(o.contentHolder).find("div.app_frame").length > 0){
|
||||
$(o.contentHolder).find("div.app_frame").each(function(){
|
||||
var app_holder_height = $(this).height() - 72;
|
||||
@@ -286,9 +286,10 @@ var orbitDesktop = function(dom){
|
||||
};
|
||||
|
||||
this.layout_data = function(h){
|
||||
var $e;
|
||||
var column_container,layout, base_width , no_of_entries = 0, pagination_link , pagination_variable;
|
||||
var $e;
|
||||
var column_container,layout, base_width, total_width, gutter, no_of_entries = 0, pagination_link, pagination_variable;
|
||||
o.paging = true;
|
||||
gutter = (!isNaN(gutter)) ? gutter : 12;
|
||||
this.layout_data.generate_layout_html = function(l){
|
||||
$e = $("<div></div>");
|
||||
$e.html(l);
|
||||
@@ -300,6 +301,7 @@ var orbitDesktop = function(dom){
|
||||
total_columns++;
|
||||
temp_div.append(column_container.html());
|
||||
var entries = [];
|
||||
total_width = "auto";
|
||||
break;
|
||||
case "datalist":
|
||||
no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4);
|
||||
@@ -308,37 +310,35 @@ var orbitDesktop = function(dom){
|
||||
if(entries.length != 0){
|
||||
entries.each(function(i,li){
|
||||
if(x == 0){
|
||||
column = $("<div class='column type_datalist' style='width:"+base_width+"px'><ul></ul></div");
|
||||
column = $("<div class='column type_datalist' style='width:"+base_width+"px;margin-right:"+gutter+"px;padding-right:"+gutter+"px;'><ul></ul></div");
|
||||
total_columns++;
|
||||
}
|
||||
$(li).addClass("datalist_item").height(height_percentage+"%");
|
||||
$(li).wrapInner('<div class="inner"/>').addClass("datalist_item").height(height_percentage+"%");
|
||||
column.find("ul").eq(0).append(li);
|
||||
x++;
|
||||
if(x == no_of_entries){
|
||||
x = 0;
|
||||
temp_div.append(column);
|
||||
}
|
||||
})
|
||||
if(x != 0){
|
||||
temp_div.append(column);
|
||||
}
|
||||
}
|
||||
total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null;
|
||||
break;
|
||||
case "column":
|
||||
var entries = column_container.find("div[column=true]"),x = 0,column;
|
||||
if(entries.length!=0){
|
||||
entries.each(function(i,ul){
|
||||
column = $("<div class='column type_column' style='width:"+base_width+"px'></div");
|
||||
column = $("<div class='column type_column' style='width:"+base_width+"px;margin-right:"+gutter+"px;padding-right:"+gutter+"px;'></div");
|
||||
total_columns++;
|
||||
column.append(ul);
|
||||
x++;
|
||||
temp_div.append(column);
|
||||
})
|
||||
});
|
||||
}
|
||||
total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null;
|
||||
break;
|
||||
}
|
||||
var w = (!isNaN(base_width) ? base_width * total_columns : null);
|
||||
return {"markup":temp_div.html(),"width":w,"total":entries.length};
|
||||
// total_width = (!isNaN(base_width) ? ( base_width + 12 ) * total_columns : null);
|
||||
return {"markup":temp_div.html(),"width":total_width,"total":entries.length};
|
||||
}
|
||||
$("div[container=true]").html(h).find("div.overview").wrap('<div class="tinycanvas"><div class="viewport"></div></div>');
|
||||
$("div[container=true]").find("div.tinycanvas").prepend('<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>');
|
||||
@@ -646,7 +646,7 @@ var orbitDesktop = function(dom){
|
||||
if(tile.data_category == "app")
|
||||
$li = $('<li data-id="'+tile.id+'" class="widget" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'"><span class="tile '+tilecolor+' '+op+'"></span><a href="'+tile.data_content+'" class="appicon" onclick="return false;"><img src="'+o.iconPath+tile.data_content+'.png" alt="" ></a><h1 class="appname thmtxt">'+tile.title+'</h1></li>');
|
||||
else
|
||||
$li = $('<li data-id="'+tile.id+'" class="widget" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'" js-link="'+tile.js[0].url+'" css-link="'+tile.css.url+'"><span class="tile '+tilecolor+' '+op+'"></span><div class="appholder">Loading...</div><h1 class="appname thmtxt">'+tile.title+'</h1></li>');
|
||||
$li = $('<li data-id="'+tile.id+'" class="widget" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'" js-link="'+tile.js[0].url+'" css-link="'+tile.css.url+'"><span class="tile '+tilecolor+' '+op+'"></span><div class="appholder"><div class="thmtxt o-loading"><i class="icon-spinner icon-spin"></i> Loading</div></div><h1 class="appname thmtxt">'+tile.title+'</h1></li>');
|
||||
|
||||
row = row + y;
|
||||
|
||||
@@ -1448,15 +1448,12 @@ var orbitDesktop = function(dom){
|
||||
}
|
||||
|
||||
this.loadWallpaper = function(wallpaper){ // this is to load new wallpaper
|
||||
if(!wallpaper)wallpapernm = o.themesettings.background;else wallpapernm = wallpaper
|
||||
var ww = $(window).width();
|
||||
var wh = $(window).height();
|
||||
if(!wallpaper)
|
||||
$("img#thmbackground").attr({"src":"/"+o.themefolder+"/"+o.theme+"/images/"+wallpapernm,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"});
|
||||
else
|
||||
$("img#thmbackground").attr({"src":o.wallpaperPath+wallpaper,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"});
|
||||
|
||||
$("div#bgover").css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","width":ww,"height":wh});
|
||||
wallpapernm = (!wallpaper) ? o.themesettings.background : wallpaper;
|
||||
if(!wallpaper){
|
||||
$("img#thmbackground").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+wallpapernm);
|
||||
} else {
|
||||
$("img#thmbackground").attr("src",o.wallpaperPath+wallpaper);
|
||||
}
|
||||
};
|
||||
|
||||
this.loadIconCache = function(){ // this function load or refresh icon cache for the theme
|
||||
|
||||
@@ -201,6 +201,12 @@ var orbitDesktopAPI = function(){
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
this.use_select2 = function(){
|
||||
$('select:not(.select2-offscreen)').select2({
|
||||
minimumResultsForSearch: -1
|
||||
// minimumInputLength: -1
|
||||
});
|
||||
}
|
||||
};
|
||||
orbitDesktopAPI.prototype.notifyImgPath = "temp";
|
||||
|
||||
Reference in new issue
Block a user