Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua

Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb
This commit is contained in:
Joshua Milton 2012-07-04 18:31:00 +08:00
commit 6b9926539d
8 changed files with 252 additions and 224 deletions

View File

@ -14,11 +14,17 @@ var orbitTimeline = function(dom){
t.dom.html(t.timelineHtml); t.dom.html(t.timelineHtml);
$("div.scrollbar").hide(); $("div.scrollbar").hide();
t.constructTimeScale(function(timelineScale){ t.constructTimeScale(function(timelineScale){
console.log(timelineScale);
$("#timeline_scale").html(timelineScale); $("#timeline_scale").html(timelineScale);
var totalyearwidth =timelineScale.find(".year").length * 100;
var totalul = 0;
for(eve in t.events){ for(eve in t.events){
t.makeBubble(t.events[eve]); t.makeBubble(t.events[eve]);
totalul = $("#scale_wrapper ul").length
$(".t_scale").width((totalul*350) + totalyearwidth);
} }
$('.tinycanvas').tinyscrollbar({ axis: 'x'});
}); });
} }
this.constructTimeScale = function(callbackFn){ this.constructTimeScale = function(callbackFn){
@ -31,7 +37,8 @@ var orbitTimeline = function(dom){
var cur_mon = paper.created_at.substr(5,2); var cur_mon = paper.created_at.substr(5,2);
var cur_year = dt.getFullYear(); var cur_year = dt.getFullYear();
var cdt = paper.created_at.substr(0,7).replace("-",""); var cdt = paper.created_at.substr(0,7).replace("-","");
var bubbleData = {"fulldate" : t.monthList[parseInt(cur_mon)] +", " + dt.getDate() + ", " + cur_year,"title":paper.title,"jtitle":journal.title,"coauthors":paper.coauthors,"abstract":paper.abstract,"timestamp":cdt} var formname = (cur_mon.charAt(0) == "0"?cur_mon.charAt(1) : cur_mon)
var bubbleData = {"fulldate" : t.monthList[parseInt(formname)] +", " + dt.getDate() + ", " + cur_year,"title":paper.title,"jtitle":journal.title,"coauthors":paper.coauthors,"abstract":paper.abstract,"timestamp":cdt}
t.events.push(bubbleData); t.events.push(bubbleData);
if(cur_year != year){ if(cur_year != year){
year = cur_year; year = cur_year;
@ -39,7 +46,8 @@ var orbitTimeline = function(dom){
} }
if(cur_mon != mon){ if(cur_mon != mon){
mon = cur_mon; mon = cur_mon;
scale.append($("<div class='scale_region month' data-content='"+cdt+"'><div class='month_heading'>"+t.monthList[parseInt(mon)]+"</div><div class='bubble_list'></div></div>")) console.log(parseInt(cur_mon));
scale.append($("<div class='scale_region month' data-content='"+cdt+"'><div class='month_heading'>"+t.monthList[parseInt(formname)]+"</div><div class='bubble_list'></div></div>"))
} }
}); });
}) })

View File

@ -24,7 +24,7 @@ var orbitDesktop = function(dom){
this.transitionTime = 500; this.transitionTime = 500;
this.currenthtml = "desktop.html"; this.currenthtml = "desktop.html";
this.currentface = "home"; this.currentface = "home";
this.desktopData = {"home":"","settings":"","work":"","favorite":"","apps_manager":"","sections":"","journal_p":"","appstore":"","orbit":"","books":""}; this.desktopData = {"home":"","settings":"","work":"","favorite":"","apps_manager":"","sections":"","journal_p":"","appstore":"","orbit":""};
this.tp = ""; this.tp = "";
this.sectionList; this.sectionList;
this.initialize = function(){ this.initialize = function(){
@ -916,7 +916,6 @@ var orbitDesktop = function(dom){
var bindHandlers = function(){ var bindHandlers = function(){
var timeline = new orbitTimeline("timeline"); var timeline = new orbitTimeline("timeline");
timeline.initialize(); timeline.initialize();
$('.tinycanvas').tinyscrollbar({ axis: 'x'});
} }
if(!o.desktopData[o.currentface]){ if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load("/desktop_orbit/"+target,function(){ $(o.contentHolder).empty().load("/desktop_orbit/"+target,function(){
@ -1152,7 +1151,10 @@ var orbitDesktop = function(dom){
switch(tfunc){ switch(tfunc){
case 'widgets': case 'widgets':
widgets(); widgets();
break; break;
case 'onlinestore':
onlinestore();
break;
} }
$('.s_menu a').removeClass('thmc1 thmtxt active'); $('.s_menu a').removeClass('thmc1 thmtxt active');
$(this).addClass('thmc1 thmtxt active'); $(this).addClass('thmc1 thmtxt active');
@ -1297,15 +1299,22 @@ var orbitDesktop = function(dom){
}) })
}) })
} }
var onlinestore = function(){
var bindHandlers = function(){
}
$("div#apps_store div#panel_r").load("/desktop_appstore/onlinestore",function(){
bindHandlers();
})
}
if(!o.desktopData[o.currentface]){ if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load("/desktop_appstore/"+target,function(){ $(o.contentHolder).empty().load("/desktop_appstore/"+target,function(){
widgets(); onlinestore();
bindHandlers(); bindHandlers();
}); });
}else{ }else{
$(o.contentHolder).html(o.desktopData[o.currentface]); $(o.contentHolder).html(o.desktopData[o.currentface]);
widgets(); onlinestore();
bindHandlers(); bindHandlers();
} }
} }

View File

@ -8,6 +8,10 @@ class DesktopAppstoreController< ApplicationController
render "desktop/appstore/widgets", :layout => false render "desktop/appstore/widgets", :layout => false
end end
def onlinestore
render "desktop/appstore/onlinestore", :layout => false
end
def getuserwidgets def getuserwidgets
@widgets = current_user.desktop.desktop_widgets @widgets = current_user.desktop.desktop_widgets
@groups = Array.new @groups = Array.new

View File

@ -11,20 +11,8 @@ class DesktopPublicationsController< ApplicationController
render "desktop/journal_pages/add", :layout => false render "desktop/journal_pages/add", :layout => false
end end
def books
render "desktop/books", :layout => false
end
def books_list
render "desktop/books/list", :layout => false
end
def books_add
render "desktop/books/add", :layout => false
end
def create_journal def create_journal
Journal.create(user_id: current_user.id, title: "2012, Javascript") Journal.create(user_id: current_user.id, title: "Google")
b = Array.new b = Array.new
b << {"success"=>"true"} b << {"success"=>"true"}
render :json=>b.to_json render :json=>b.to_json
@ -39,4 +27,12 @@ class DesktopPublicationsController< ApplicationController
end end
render :json=>data.to_json render :json=>data.to_json
end end
def delete_journal
@journals = Journal.find("")
@journals.delete
b = Array.new
b << {"success"=>"true"}
render :json=>b.to_json
end
end end

View File

@ -7,6 +7,7 @@ class Paper
field :abstract, default: "The concept of microstructure engineering has gained increasingly attention with the goal to quantitatively link the operational parameters of an industrial process to the properties of its product. The key component of this concept is to accurately model the microstructure evolution along the processing path. Modelling of recrystallization in Cuinterconnects will be presented as an example of a conventional process model. Further, the potential of developing next generation process models will be discussed by using models across different length and time scale. The multi-scale modelling approach will be illustrated with a case study for phase transformation in Fe-Mn alloys." field :abstract, default: "The concept of microstructure engineering has gained increasingly attention with the goal to quantitatively link the operational parameters of an industrial process to the properties of its product. The key component of this concept is to accurately model the microstructure evolution along the processing path. Modelling of recrystallization in Cuinterconnects will be presented as an example of a conventional process model. Further, the potential of developing next generation process models will be discussed by using models across different length and time scale. The multi-scale modelling approach will be illustrated with a case study for phase transformation in Fe-Mn alloys."
field :level, default: "SCI" field :level, default: "SCI"
field :coauthors, default: "Allen, Shelly, Eric, Manson, Chris, Clara, Anna, Albee, Vincent, Devin, Chunchi, Ika, Jaoshua, Ray, Matt, Lin, Spen" field :coauthors, default: "Allen, Shelly, Eric, Manson, Chris, Clara, Anna, Albee, Vincent, Devin, Chunchi, Ika, Jaoshua, Ray, Matt, Lin, Spen"
field :created_at, type: Date, default: ->{12.months.ago}
belongs_to :journal belongs_to :journal

View File

@ -10,7 +10,7 @@
<div id="panel_l" class="ph"> <div id="panel_l" class="ph">
<div class="s_menu sm_v"> <div class="s_menu sm_v">
<ul id='setting_left_nav'> <ul id='setting_left_nav'>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Online Store</a></li> <li><a href="onlinestore" class="admtxt hh2 w2 hp" onclick='return false;'>Online Store</a></li>
<li><a href="widgets" class="admtxt hh2 w2 hp" onclick='return false;'>Widgets</a></li> <li><a href="widgets" class="admtxt hh2 w2 hp" onclick='return false;'>Widgets</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Apps</a></li> <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Apps</a></li>
<li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Registeration</a></li> <li><a href="" class="admtxt hh2 w2 hp" onclick='return false;'>Registeration</a></li>

View File

@ -0,0 +1,11 @@
<div class="s_title hh3">Online Store</div>
<div class="tinycanvas hp">
<div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
<div class="viewport">
<div class="overview vp">
<div class="overview" id="widget_list">
</div>
</div>
</div>
</div>

View File

@ -198,4 +198,3 @@ Orbit::Application.routes.draw do
root :to => 'pages#index' root :to => 'pages#index'
end end