developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compatibility page added and tinyscrollbar drag event fixed..

This commit is contained in:
Harry Bomrah 2013-03-12 15:23:38 +08:00 committed by chris
parent 478b54da26
commit 6c58a0f773
8 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile.lock
View File

@ -234,7 +234,6 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rb-readline (0.4.2)
rdoc (3.12.1)
json (~> 1.4)
redis (3.0.2)
@ -244,7 +243,6 @@ GEM
chinese_pinyin (>= 0.3.0)
redis (>= 2.1.1)
redis-namespace (>= 1.0.2)
ref (1.0.2)
resque (1.23.0)
multi_json (~> 1.0)
redis-namespace (~> 1.0)
@ -330,9 +328,6 @@ GEM
sunspot (= 1.3.3)
sunspot_solr (1.3.3)
terminal-table (1.4.5)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thor (0.17.0)
tilt (1.3.3)
tinymce-rails (3.5.8)
@ -378,7 +373,6 @@ DEPENDENCIES
jquery-rails (= 2.1.4)
jquery-ui-rails
kaminari!
libv8 (~> 3.11.8)
mime-types
mini_magick
mongo_session_store-rails3 (= 3.0.6)
@ -395,7 +389,6 @@ DEPENDENCIES
radius
rails (~> 3.2.9)
rake
rb-readline
redis (>= 2.1.1)
redis-namespace
redis-search
@ -417,7 +410,6 @@ DEPENDENCIES
sunspot-rails-tester
sunspot_mongo
sunspot_solr
therubyracer
tinymce-rails
uglifier
watchr

1
app/assets/javascripts/jquery.tinyscrollbar.js
View File

@ -217,6 +217,7 @@
oContent.obj.css( sDirection, -iScroll );
oThumb.obj.css( sDirection, iPosition.now );
}
options.onMove.call(this,get_destance_from_end());
}
function end()

5
app/assets/javascripts/orbitdesktop.js
View File

@ -604,12 +604,12 @@ var orbitDesktop = function(dom){
// }
// }
// });
o.simple_drop_down();
o.tinyscrollbar_ext({
main: '.tinycanvas'
})
o.simple_drop_down();
// $("div#group_wrapper ul li[data-category=app]").click(function(){
// o.appWindow({
// title : $(this).find("a").attr("href"),
@ -1441,6 +1441,7 @@ var orbitDesktop = function(dom){
}
var settings = {"axis":"x"};
if(typeof tinysettings != "undefined")
$.map(tinysettings,function(val,i){ settings[i] = val })
var count,baseWidth,fillArray,pxs;

4
app/controllers/desktop_controller.rb
View File

@ -11,6 +11,10 @@ class DesktopController< ApplicationController
@section = @desktop.sections.first
end
def compatibility
render :layout => "compatibility"
end
def desktop
render :layout => false
end

1
app/views/desktop/compatibility.html.erb Normal file
View File

@ -0,0 +1 @@
You have a bad browser ...!!!

15
app/views/layouts/compatibility.html.erb Normal file
View File

@ -0,0 +1,15 @@
<!DOCTYPE HTML>
<html>
<head>
<meta charset="utf-8">
<title>Error</title>
<%= stylesheet_link_tag "desktop" %>
<%= yield :page_specific_css %>
<%= csrf_meta_tag %>
</head>
<body>
<%= render 'layouts/orbit_bar' %>
<%= yield %>
</body>
</html>

7
app/views/layouts/desktop.html.erb
View File

@ -1,6 +1,13 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<noscript>
<meta http-equiv="refresh" content="0; URL=/compatibility">
</noscript>
<!--[if lte IE 8]>
<meta http-equiv="refresh" content="0; URL=/compatibility" />
<![endif]-->
<meta charset="utf-8">
<title><%= @title || APP_CONFIG['orbit'] %></title>
<!--[if lt IE 9]>

1
config/routes.rb
View File

@ -187,6 +187,7 @@ Orbit::Application.routes.draw do
end
end
match "compatibility" => "desktop#compatibility"
match "desktop" => "desktop#index"
match "/desktop/desktop" => "desktop#desktop"
match '/desktop/desktop'=>'desktop#desktop'