design update

This commit is contained in:
Harry Bomrah 2012-08-21 19:36:49 +08:00
parent d6b24c6454
commit 94ee16ae01
7 changed files with 80 additions and 4 deletions

View File

@ -232,4 +232,12 @@ var orbitTimeline = function(dom){
} }
}) })
} }
this.ajaxEventPull = function(){
if(!t.update){
t.update = true;
$.getJSON("desktop_orbit/ajaxeventpull",{"from":t.fromdate},function(){
})
}
}
} }

View File

@ -0,0 +1,68 @@
.t_scale{
height:516px;
bottom:0;
}
#timline_marker{
width:100px;
height:140px;
opacity:0.4;
cursor: move;
border-style:solid;
border-width:5px;
border-radius:5px;
}
.t_scale{
border-style:solid;
border-width:2px;
border-radius:5px;
}
#t_container{
height:366px;
}
.scale_region{
height:516px;
border-style:solid;
border-width:0 2px 0 2px;
float: left;
margin-right:1px;
font-size:20px;
padding:5px;
}
.scale_region span{
display: block;
}
.month{
}
.year{
background-color: #c0bebe;
width:30px;
}
.bubble{
cursor: pointer;
width:300px;
height:30px;
border-style:solid;
border-width:5px;
float: left;
border-radius:5px;
margin-top: 10px;
margin-bottom:10px;
font-size:15px;
padding:5px;
text-align:justify;
display: none;
}
.month_heading{
text-align: center;
margin-bottom: 10px;
}
.bubble_list ul{
width:350px;
float:left;
}
.bubble_list ul li span.date{
font-weight:bolder;
float:right;
}

View File

@ -43,10 +43,10 @@ class DesktopOrbitController< ApplicationController
if(@fromdate[1] == 0) if(@fromdate[1] == 0)
@fromdate[1] = 12 @fromdate[1] = 12
@fromdate[0] = @fromdate[0] - 1 @fromdate[0] = @fromdate[0] - 1
end end
end end
render :json=>@data.to_json render :json=>@data.to_json
end end
end end

View File

@ -67,6 +67,7 @@ class DesktopPublicationsController< ApplicationController
paper.update_attributes(:user_id => current_user.id) paper.update_attributes(:user_id => current_user.id)
end end
b = Array.new b = Array.new
b << {"success"=>"true"} b << {"success"=>"true"}
render :json=>b.to_json render :json=>b.to_json
end end

View File

@ -9,7 +9,4 @@ class Paper
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 field :created_at, type: Date
belongs_to :journal belongs_to :journal
end end

View File

@ -25,6 +25,7 @@ class User
has_many :journals, :autosave => true, :dependent => :destroy has_many :journals, :autosave => true, :dependent => :destroy
has_many :papers, :autosave => true, :dependent => :destroy has_many :papers, :autosave => true, :dependent => :destroy
belongs_to :role belongs_to :role
has_and_belongs_to_many :sub_roles has_and_belongs_to_many :sub_roles
accepts_nested_attributes_for :attribute_values, :allow_destroy => true accepts_nested_attributes_for :attribute_values, :allow_destroy => true

View File

@ -213,6 +213,7 @@ Orbit::Application.routes.draw do
match '/desktop_appstore/widgets_settings'=>'desktop_appstore#widgets_settings' match '/desktop_appstore/widgets_settings'=>'desktop_appstore#widgets_settings'
match '/desktop_orbit/orbit' => 'desktop_orbit#orbit' match '/desktop_orbit/orbit' => 'desktop_orbit#orbit'
match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload' match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload'
match '/desktop_orbit/gettimelinespan' => 'desktop_orbit#gettimelinespan' match '/desktop_orbit/gettimelinespan' => 'desktop_orbit#gettimelinespan'