Merge branch 'desktop_devin' into desktop_joshua

app/assets/javascripts/orbitTimeline.js

@@ -14,11 +14,17 @@ var orbitTimeline = function(dom){
 		t.dom.html(t.timelineHtml);
 		$("div.scrollbar").hide();
 		t.constructTimeScale(function(timelineScale){
+			console.log(timelineScale);
 			$("#timeline_scale").html(timelineScale);
+			var totalyearwidth =timelineScale.find(".year").length * 100;
+			var totalul = 0;
 			for(eve in t.events){
-
 				t.makeBubble(t.events[eve]);
+				totalul = $("#scale_wrapper ul").length
+				$(".t_scale").width((totalul*350) + totalyearwidth);
 			}
+			
+			$('.tinycanvas').tinyscrollbar({ axis: 'x'});
 		});		
 	}
 	this.constructTimeScale = function(callbackFn){
@@ -31,7 +37,8 @@ var orbitTimeline = function(dom){
 					var cur_mon = paper.created_at.substr(5,2);
 					var cur_year = dt.getFullYear();
 					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);
 					if(cur_year != year){
 						year = cur_year;
@@ -39,7 +46,8 @@ var orbitTimeline = function(dom){
 					} 
 					if(cur_mon != 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>"))					
 					}
 				});
 			})

app/assets/javascripts/orbitdesktop.js

@@ -907,7 +907,6 @@ var orbitDesktop = function(dom){
 		var bindHandlers = function(){
 			var timeline = new orbitTimeline("timeline");
 			timeline.initialize();
-				$('.tinycanvas').tinyscrollbar({ axis: 'x'});
 		}
 		if(!o.desktopData[o.currentface]){
 			$(o.contentHolder).empty().load("/desktop_orbit/"+target,function(){
@@ -1144,6 +1143,9 @@ var orbitDesktop = function(dom){
 							case 'widgets':
 								widgets();
 								break;
+							case 'onlinestore':
+								onlinestore();
+								break;
 						}
 						$('.s_menu a').removeClass('thmc1 thmtxt active');
 						$(this).addClass('thmc1 thmtxt active');
@@ -1288,15 +1290,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]){
 			$(o.contentHolder).empty().load("/desktop_appstore/"+target,function(){
-				widgets();
+				onlinestore();
 				bindHandlers();
 			});
 		}else{
 			$(o.contentHolder).html(o.desktopData[o.currentface]);
-			widgets();
+			onlinestore();
 			bindHandlers();
 		}
 	}

app/controllers/desktop_appstore_controller.rb

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

app/controllers/desktop_publications_controller.rb

@@ -12,7 +12,7 @@ class DesktopPublicationsController< ApplicationController
   	end
 
   	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 << {"success"=>"true"}
     	render :json=>b.to_json
@@ -27,4 +27,12 @@ class DesktopPublicationsController< ApplicationController
   		end
   		render :json=>data.to_json
   	end
+
+    def delete_journal
+      @journals = Journal.find("")
+      @journals.delete
+      b = Array.new
+      b << {"success"=>"true"}
+      render :json=>b.to_json
+    end
 end

app/models/paper.rb

@@ -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 :level, default: "SCI"
  	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
 

app/views/desktop/appstore.html.erb

@@ -10,7 +10,7 @@
 				<div id="panel_l" class="ph">
 					<div class="s_menu sm_v">
 						<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="" 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>

app/views/desktop/appstore/onlinestore.html.erb

@@ -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>

config/routes.rb

@@ -164,12 +164,14 @@ Orbit::Application.routes.draw do
 
   match '/desktop_appstore/appstore'=>'desktop_appstore#appstore'
   match '/desktop_appstore/widgets'=>'desktop_appstore#widgets'
+  match '/desktop_appstore/onlinestore'=>'desktop_appstore#onlinestore'
   match '/desktop_appstore/getuserwidgets'=>'desktop_appstore#getuserwidgets'
   match '/desktop_appstore/widgets_settings'=>'desktop_appstore#widgets_settings'
 
   match '/desktop_orbit/orbit' => 'desktop_orbit#orbit'
   match '/desktop_orbit/getevents' => 'desktop_orbit#getevents'
    #match '/desktop_orbit/getevents' => 'desktop_publications#create_journal'
+  #match '/desktop_orbit/getevents' => 'desktop_publications#delete_journal'
 
   match '/desktop/temp_func/'=>'desktop#temp_func'