developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'desktop_devin' into desktop_harry

Browse Source
This commit is contained in:
Harry Bomrah committed 2012-04-05 14:29:04 +08:00
2 parents 4250c26c88 e0f5583f43
commit a0d5e847e0
47 files changed
+282 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/javascripts/desktop.js
+1
View File
@@ -7,6 +7,7 @@
//= require jquery
//= require jquery_ujs
//= require jquery-ui
//= require jquery.tinyscrollbar.min
//= require bootstrap
//= require orbitdesktopAPI
//= require orbitdesktop
app/assets/javascripts/orbitdesktop.js
+68 -5
View File
@@ -33,7 +33,7 @@ var orbitDesktop = function(dom){
};
this.bindDesktopEvents = function(){
$("a#app_manager").click(function(){
$("a#d_app_manager").click(function(){
var target = $(this).attr("href");
if(o.currenthtml!=target){
o.desktopData[o.currentface] = $(o.contentHolder).html();
@@ -42,7 +42,7 @@ var orbitDesktop = function(dom){
});
}
});
$("a#desktop").click(function(){
$("a#d_desktop").click(function(){
var target = $(this).attr("href");
if(o.currenthtml!=target){
o.desktopData[o.currentface] = $(o.contentHolder).html();
@@ -51,7 +51,7 @@ var orbitDesktop = function(dom){
});
}
});
$("a#sections").click(function(){
$("a#d_sections").click(function(){
var target = $(this).attr("href");
if(o.currenthtml!=target){
o.desktopData[o.currentface] = $(o.contentHolder).html();
@@ -122,6 +122,7 @@ var orbitDesktop = function(dom){
}
});
$('#holder').tinyscrollbar({ axis: 'x'});
}
if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load("/desktop/"+target,function(){
@@ -174,9 +175,10 @@ var orbitDesktop = function(dom){
$(".group_search").html(allApps);
return false;
})
$('#holder').tinyscrollbar({ axis: 'x'});
}
if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load("desktop_pages/"+target,function(){
$(o.contentHolder).empty().load("/desktop/"+target,function(){
bindHandlers();
});
}else{
@@ -213,9 +215,10 @@ var orbitDesktop = function(dom){
$(".section_label ul li:not(:nth-child(1)) span.tile").hover(function(){
$(this).toggleClass("op06");
})//.mouseleave(function(){$(this).addClass("op06");});
$('#holder').tinyscrollbar({ axis: 'x'});
};
if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load("desktop_pages/"+target,function(){
$(o.contentHolder).empty().load("/desktop/"+target,function(){
bindHandlers();
});
}else{
@@ -239,9 +242,69 @@ var orbitDesktop = function(dom){
$("#home_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.home);
$("#app_manager_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.app_manager);
$("#sections_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.sections);
$("#settings_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.settings);
$("#publication_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.publication);
$("#journal_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.journal_p);
$("#seminar_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.seminar_p);
$("#books_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.books);
$("#research_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research);
$("#research_d_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research_d);
$("#research_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research_p);
$("#patents_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.patents);
$("#labs_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.labs);
$("#experience_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.experience);
$("#working_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.working);
$("#education_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.education);
$("#honors_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.honors);
$("#activities_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.activities);
$("#clubs_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.clubs);
$("#landt_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.landt);
$("#courses_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.courses);
$("#homework_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.homework);
$("#certification_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.certification);
$("#personal_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.personal);
$("#mypage_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.mypage);
$("#blog_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.blog);
$("#album_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.album);
$("#calendar_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.calendar);
$("#files_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.files);
$("#orbit_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.orbit);
$("#connection_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.connection);
$("#appstore_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.appstore);
}
o.initialize();
}
orbitDesktop.prototype.themefolder = "themes";
// devin
(function(){
$(document).ready(function(){
var $widget_fn = $('.widget_fn'),
$fn_des = $('.fn_des');
$widget_fn.hover(function(){
var fn_name = $(this).find('img').attr('alt'),
nth = $(this).parents('.d_cate').index(),
des_left = $('.dock_child').eq(nth).width();
$(this).addClass('thmc1');
$fn_des
.text(fn_name)
.css({
'top':nth * 60,
'left': des_left + 60
})
.stop(true, true)
.fadeIn();
}, function(){
$(this).removeClass('thmc1');
$fn_des.stop(true, true).fadeOut();
});
});
}());
app/assets/stylesheets/desktop.css
+1 -2
View File
@@ -2,9 +2,8 @@
*This is a manifest file that'll automatically include all the stylesheets available in this directory
*and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
*the top of the compiled file, but it's generally better to create a new file per style scope.
*= require reset
*= require style
*= require bootstrap
*= require bootstrap
*= require bootstrap-orbit
*= require desktopmain
*/
app/assets/stylesheets/desktopmain.css
+100 -20
View File
@@ -1,5 +1,57 @@
@import url(http://fonts.googleapis.com/css?family=Cuprum);
@import url(reset.css);
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
#container input, #container textarea, #container select, #container input:focus, #container textarea:focus {
border-radius: 0;
box-shadow: none;
font: inherit;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
/* basic setting */
body {
@@ -7,7 +59,7 @@ body {
font-size: 12px;
background-color: #000;
}
a { text-decoration: none; }
a, a:hover { text-decoration: none; }
/* desktop layout */
#container {
margin: 72px 0 0 156px;
@@ -22,16 +74,17 @@ a { text-decoration: none; }
position: absolute;
top: 144px;
left: 0;
z-index: 999;
z-index: 9;
}
#holder {
overflow: hidden;
overflow-x: auto;
/*overflow: hidden;
overflow-x: auto;*/
height: 540px;
width: auto;
position: relative;
}
#rwidget {
height: 516px;
overflow: hidden;
}
.widget_fn {
display: block;
@@ -43,6 +96,32 @@ a { text-decoration: none; }
height: 30px;
margin: 15px 0 0 15px;
}
.docklist {
}
.docklist li {
position: relative;
}
.dock_child {
display: none;
overflow: hidden;
position: absolute;
left: 60px;
top: 0;
}
.docklist > li:hover .dock_child { display: block; }
.dock_item { float: left; }
.fn_des.admtxt {
line-height: 60px;
padding: 0 6px;
font-size: 15px;
position: absolute;
min-width: 48px;
text-align: center;
white-space: nowrap;
display: none;
}
.ini_input {
margin: 0;
padding: 0;
@@ -82,7 +161,7 @@ a { text-decoration: none; }
float: left;
margin: 0 12px 0 0;
position: relative;
z-index: 99;
z-index: 9;
}
.dtitle:hover {
/* $(this).addClass( .thmc1 or .thmc2 ); */
@@ -102,6 +181,7 @@ a { text-decoration: none; }
.section_slc li:hover { background-color: #F0F0F0; }
.admbg { background-color: #fff; }
.admtxt { color: #666; }
.admtxt:hover { color: #666; }
.hfn {
font-size: 15px;
line-height: 36px;
@@ -174,6 +254,19 @@ a { text-decoration: none; }
.clear { clear: both; }
/* tiny scrollbar */
#holder .viewport { width: auto; height: 516px; overflow: hidden; position: relative; }
#holder .overview { position: absolute; left: 0; top: 0; }
#holder .scrollbar {
position: absolute;
bottom: 0;
left: 0;
height: 12px;
}
#holder .track { height: 100%; width: 12px; position: relative; }
#holder .thumb { height: 12px; width: 12px; cursor: pointer; overflow: hidden; position: absolute; top: 0; }
#holder .thumb .end { overflow: hidden; height: 12px; width: 12px; }
#holder .disable{ display: none; }
/* Orbit Notification */
#orbitnote {
@@ -202,19 +295,6 @@ a { text-decoration: none; }
font-size: 15px;
}
/* fake Orbit bar */
#orbitbar {
height: 28px;
border-radius: 0px;
padding-top: 2px;
padding-bottom: 1px;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8);
background-image: -webkit-linear-gradient(top, #444, #111);
position: absolute;
z-index: 9999;
top: 0;
width: 100%;
}
#group_wrapper{
}
app/assets/stylesheets/style.css.erb
+1
View File
@@ -1,3 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Cuprum);
@font-face{
font-family: 'WebSymbolsRegular';
src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>);