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

minor update

This commit is contained in:
devin chen 2013-04-16 15:48:14 +08:00 committed by Matt K. Fu
parent d3f0a10187
commit ead749cfed
8 changed files with 181 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ var orbitDesktop = function(dom){
this.themesettings = ""; this.themesettings = "";
this.theme = "4f8d3f493b67fcd05f086359"; this.theme = "4f8d3f493b67fcd05f086359";
this.transitionTime = 1000; this.transitionTime = 1000;
this.currenthtml = "desktop.html"; this.currenthtml = "home";
this.currentface = "home"; this.currentface = "home";
this.desktopData = {}; this.desktopData = {};
this.tp = ""; this.tp = "";
@ -378,8 +378,8 @@ var orbitDesktop = function(dom){
}; };
this.layout_data = function(h){ this.layout_data = function(h){
var $e; var $e;
var column_container,layout, base_width, total_width, gutter, no_of_entries = 0, pagination_link, pagination_variable; var column_container,layout, base_width , no_of_entries = 0, pagination_link , pagination_variable, gutter, total_width;
o.paging = true; o.paging = true;
gutter = (!isNaN(gutter)) ? gutter : 12; gutter = (!isNaN(gutter)) ? gutter : 12;
this.layout_data.generate_layout_html = function(l){ this.layout_data.generate_layout_html = function(l){
@ -393,6 +393,7 @@ var orbitDesktop = function(dom){
case "simple": case "simple":
total_columns++; total_columns++;
temp_div.append(column_container.html()); temp_div.append(column_container.html());
total_width = "auto";
break; break;
case "datalist": case "datalist":
no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4); no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4);
@ -411,7 +412,10 @@ var orbitDesktop = function(dom){
x = 0; x = 0;
temp_div.append(column); temp_div.append(column);
} }
}); })
if(x != 0){
temp_div.append(column);
}
} }
total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null; total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null;
break; break;
@ -419,17 +423,16 @@ var orbitDesktop = function(dom){
entries = column_container.find("div[column=true]"),x = 0,column; entries = column_container.find("div[column=true]"),x = 0,column;
if(entries.length!=0){ if(entries.length!=0){
entries.each(function(i,ul){ entries.each(function(i,ul){
column = $("<div class='column type_column' style='width:"+base_width+"px;margin-right:"+gutter+"px;padding-right:"+gutter+"px;'></div"); column = $("<div class='column type_column' style='width:"+base_width+"px;margin-right:"+gutter+"px;padding-right:"+gutter+"px;'></div");
total_columns++; total_columns++;
column.append(ul); column.append(ul);
x++; x++;
temp_div.append(column); temp_div.append(column);
}); })
total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null;
} }
total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null;
break; break;
default: default:
break; break;
} }
// total_width = (!isNaN(base_width) ? ( base_width + 12 ) * total_columns : null); // total_width = (!isNaN(base_width) ? ( base_width + 12 ) * total_columns : null);
@ -710,19 +713,7 @@ var orbitDesktop = function(dom){
dragged.removeClass("noClick"); dragged.removeClass("noClick");
}); });
var element = $('.gridster li'); o.appname_substr('.gridster li');
$.each(element, function(i){
if($(this).attr("data-category")=="app" && $(this).find('.text_wrapper').length < 1){
$(this).find('.appname').wrapInner('<span class="text_wrapper"/>');
var w = $(this).find('.text_wrapper').width();
if (w > 96){
var text = $(this).find('.text_wrapper').text();
slice = text.substr(0,12);
$(this).find('.text_wrapper').attr('title',text).text(slice+'...');
}
}
});
o.simple_drop_down(); o.simple_drop_down();
o.tinyscrollbar_ext({ o.tinyscrollbar_ext({
main: '.tinycanvas' main: '.tinycanvas'
@ -731,22 +722,43 @@ var orbitDesktop = function(dom){
var loadTiles = function(id){ //This will load tiles for a specific desktop .. id of section has to be passed here to load tiles var loadTiles = function(id){ //This will load tiles for a specific desktop .. id of section has to be passed here to load tiles
$("#desktop #group_wrapper").empty(); $("#desktop #group_wrapper").empty();
$.getJSON("/desktop/getgroups",{sectionid:id},function(tiles){ $.getJSON("/desktop/getgroups",{sectionid:id},function(tiles){
tiles.sort(o.sortJSON("position",true,parseInt)); // tiles.sort(o.sortJSON("position",true,parseInt));
var tilecolors = o.themesettings.tilecolor; var tilecolors = o.themesettings.tilecolor;
var totaltiles_in_a_row = 4; var totaltiles_in_a_row = 4;
var opacity = ["op07","op08","op09",""]; var opacity = ["op07","op08","op09",""];
var row = 1, col = 1, x = 1, y = 1; var row = 0, col = 1, x = 1, y = 1, total_x = 0, prev_y = 0;
var $group = $('<div class="grid gridster"></div>'); var $group = $('<div class="grid gridster"></div>');
var $ul = $('<ul></ul>'); var $ul = $('<ul></ul>');
$.each(tiles,function(i,tile){ $.each(tiles,function(i,tile){
if(row >= 4){
row = 1;
col++;
}
var shape = tile.shape.split(" "); var shape = tile.shape.split(" ");
x = parseInt(shape[0].substr(1,1)); // if(tile.title == "Weather")console.log("Big - row : " + tile.row + ", col : "+ tile.column);
y = parseInt(shape[1].substr(1,1)); // if(tile.title == "Google Scholar")console.log("Scholar - row : " + tile.row + ", col : "+ tile.column);
// if(total_x % 2 != 0)
// row = row - y;
// if(i == 7)tile.row = null;
if(tile.row){
row = tile.row;
col = tile.column;
x = parseInt(shape[0].substr(1,1));
y = parseInt(shape[1].substr(1,1));
}else{
x = parseInt(shape[0].substr(1,1));
if(total_x % 2 == 0){
row = row + y;
}else if(x == 1){
col++;
}
y = parseInt(shape[1].substr(1,1));
total_x = total_x + ( x * y );
prev_y = y;
if(total_x > 8){
row = 1;
total_x = 0;
col++;
}
}
var tilecolor = tilecolors[Math.floor(Math.random()*tilecolors.length)]; var tilecolor = tilecolors[Math.floor(Math.random()*tilecolors.length)];
var op = opacity[Math.floor(Math.random()*opacity.length)]; var op = opacity[Math.floor(Math.random()*opacity.length)];
var f = (tile.fullsize?"fullsize":null); var f = (tile.fullsize?"fullsize":null);
@ -757,7 +769,7 @@ var orbitDesktop = function(dom){
$li = $('<li data-id="'+tile.id+'" class="widget '+f+'" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'" js-link="'+tile.js[0].url+'" css-link="'+tile.css.url+'"><span class="tile '+tilecolor+' '+op+'"></span><div class="appholder"></div><h1 class="appname thmtxt">'+tile.title+'</h1></li>'); $li = $('<li data-id="'+tile.id+'" class="widget '+f+'" data-row="'+row+'" data-col="'+col+'" data-sizex="'+x+'" data-sizey="'+y+'" data-category="'+tile.data_category+'" data-content="'+tile.data_content+'" js-link="'+tile.js[0].url+'" css-link="'+tile.css.url+'"><span class="tile '+tilecolor+' '+op+'"></span><div class="appholder"></div><h1 class="appname thmtxt">'+tile.title+'</h1></li>');
} }
row = row + y;
$ul.append($li); $ul.append($li);
}); });
@ -805,6 +817,7 @@ var orbitDesktop = function(dom){
$("#desktop #section_list").append($('<li class="section_name" '+tempstyle+'><a class="admtxt hp hh1" onclick="return false;" href="'+section._id+'" >'+section.name+'</a></li>')); $("#desktop #section_list").append($('<li class="section_name" '+tempstyle+'><a class="admtxt hp hh1" onclick="return false;" href="'+section._id+'" >'+section.name+'</a></li>'));
}); });
bindSecondaryHandlers(); bindSecondaryHandlers();
o.simple_drop_down();
}else{ }else{
loadSectionList(); loadSectionList();
loadTiles(o.sectionId); loadTiles(o.sectionId);
@ -878,6 +891,7 @@ var orbitDesktop = function(dom){
}); });
return false; return false;
}); });
o.appname_substr('#group_wrapper .element');
} }
var loadApps = function(){ //this load apps for sorting and searching var loadApps = function(){ //this load apps for sorting and searching
$.getJSON("/desktop/getapplist",{desktopid:o.desktopId},function(appss){ $.getJSON("/desktop/getapplist",{desktopid:o.desktopId},function(appss){
@ -977,9 +991,9 @@ var orbitDesktop = function(dom){
}); });
$.post("/desktop/save_desktop_settings",{"save":"appnewsection","appid":ui.draggable.attr("id"),"newsectionid":$(this).data("content"),"desktopid":o.desktopId}); $.post("/desktop/save_desktop_settings",{"save":"appnewsection","appid":ui.draggable.attr("id"),"newsectionid":$(this).data("content"),"desktopid":o.desktopId});
if(o.sectionId == $(this).data("content") || o.sectionId == elementParent.attr("id")){ // if(o.sectionId == $(this).data("content") || o.sectionId == elementParent.attr("id")){
o.desktopData["home"]=""; o.desktopData["home"]="";
} // }
} }
$(this).find('span.tile').addClass('op06',400); $(this).find('span.tile').addClass('op06',400);
}, },
@ -991,6 +1005,10 @@ var orbitDesktop = function(dom){
}, },
accept: '.to_drop' accept: '.to_drop'
}); });
o.tinyscrollbar_ext({
main: '.tinycanvas',
});
o.appname_substr('#group_wrapper .element',9);
}; };
var loadApps = function(){ // this loads apps from db to in each sections var loadApps = function(){ // this loads apps from db to in each sections
$.getJSON("/desktop/getapplist",{desktopid:o.desktopId},function(appss){ $.getJSON("/desktop/getapplist",{desktopid:o.desktopId},function(appss){
@ -1583,6 +1601,35 @@ var orbitDesktop = function(dom){
}); });
}); });
} }
this.use_select2 = function(){
$('select:not(.select2-offscreen)').select2({
minimumResultsForSearch: -1
// minimumInputLength: -1
});
}
this.appname_substr = function(target,length){
var $target = $(target),
length = (length && typeof length == 'number') ? length : 12,
wrapper = '<span class="text_wrapper"/>',
w1, w2;
if(!$target && $target.find('.text_wrapper').length > 0){
return;
} else {
for(i = 0; i < $target.length; i++){
var $this = $target.eq(i);
if($this.find('.appname').text().length > length + 1){
$this.find('.appname').wrapInner(wrapper);
w1 = $this.find('.appname').width() - 24
w2 = $this.find('.text_wrapper').width();
if(w2 > w1){
var text = $this.find('.text_wrapper').text();
slice = text.substr(0,length);
$this.find('.text_wrapper').attr('title',text).text(slice+'...');
}
}
}
}
}
o.initialize(); o.initialize();
} }

33
app/assets/javascripts/orbitdesktopAPI.js
View File

@ -8,32 +8,37 @@ var orbitDesktopAPI = function(){
//msg (string) : message to display //msg (string) : message to display
//type (string : success, imp, alert //type (string : success, imp, alert
//time (int) : duration for notification in seconds //time (int) : duration for notification in seconds
var $notify = $("#orbitnote"); var $notify = $('#orbitnote'),
var img, n_height; ani_method = { direction: 'up',easing: 'easeInOutQuint' },
img, n_height;
if(!type)type=""; if(!type)type="";
switch(type){ switch(type){
case "alert": case "alert":
img = "note_alert.png"; img = "exclamation-sign";
break; break;
case "imp": case "imp":
img = "note_imp.png"; img = "warning-sign";
break; break;
case "success": case "success":
img = "note_success.png"; img = "ok";
break; break;
default: default:
img = "note_alert.png"; img = "exclamation-sign";
break; break;
} }
$notify.find("img#note_img").attr("src",o.notifyImgPath+img); if( !time || time > 20) time = 5000; else time = time*1000;
$notify.find(".note_message").html(msg);
n_height = $notify.outerHeight(); var sign = '<div class="note_type"><span class="sign icon-'+ img +'"></span></div>',
if(!time)time=5000; else time=time*1000; message = '<div class="note_message">'+ msg +'</div>',
$notify item = '<div class="note_holder admbg">'+ sign + message +'</div>';
.css({'top':-n_height, 'display':'block', 'opacity':0})
.animate({top:0,opacity:1},200) $(item)
.prependTo($notify)
.stop(1,1)
.toggle('slide', ani_method, 300)
.delay(time) .delay(time)
.animate({top:-n_height,opacity:0},200); .toggle('slide', ani_method, 800);
$notify.find('.note_holder:hidden').remove();
}; };
this.executeFunc = function(func,callbackFn){ this.executeFunc = function(func,callbackFn){
//takes 2 arguments //takes 2 arguments

1
app/assets/stylesheets/desktop/desktop-component.css
View File

@ -162,7 +162,6 @@
font-size: 15px; } font-size: 15px; }
.s_form label { .s_form label {
font-size: 13px; font-size: 13px;
font-weight: bold;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: 100px; width: 100px;

1
app/assets/stylesheets/desktop/desktop-component.scss
View File

@ -135,7 +135,6 @@
// basic style // basic style
label { label {
font-size: 13px; font-size: 13px;
font-weight: bold;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
width: 100px; width: 100px;

59
app/assets/stylesheets/desktop/desktop-main.css
View File

@ -251,7 +251,9 @@ a:focus {
#header { #header {
padding: 0 0 12px 0; padding: 0 0 12px 0;
min-width: 800px; min-width: 800px;
height: 72px; } height: 72px;
position: relative;
z-index: 2; }
#side { #side {
width: 60px; width: 60px;
@ -265,7 +267,8 @@ a:focus {
#holder { #holder {
height: 516px; height: 516px;
width: auto; width: auto;
position: relative; } position: relative;
z-index: 1; }
#rwidget { #rwidget {
height: 516px; } height: 516px; }
@ -350,25 +353,45 @@ a:focus {
position: fixed; position: fixed;
top: 0; top: 0;
left: 50%; left: 50%;
margin-left: -206px; margin-left: -200px;
z-index: 99999; z-index: 99999;
width: 400px; width: 400px;
padding: 0 6px 6px 6px; -webkit-transition: height 2s ease;
background-color: #000; -moz-transition: height 2s ease;
background-color: rgba(0, 0, 0, 0.6); } transition: height 2s ease; }
#orbitnote .note_holder { #orbitnote .note_holder {
background-color: #f3f3f3;
border: solid 1px white;
border-top: none;
overflow: hidden; overflow: hidden;
padding: 24px 24px; } padding: 36px;
border: solid 2px #dddddd;
border-top: 0;
display: none; }
#orbitnote .note_holder .note_type { #orbitnote .note_holder .note_type {
float: left; } display: inline-block;
#orbitnote .note_holder .note_type img { vertical-align: middle;
display: block; } width: 60px;
height: 60px;
color: #fff; }
#orbitnote .note_holder .note_type .sign {
display: block;
font-size: 40px;
width: 40px;
height: 40px;
padding: 10px;
border-radius: 30px;
text-align: center; }
#orbitnote .note_holder .note_type .sign.icon-ok {
background-color: #5BB75B; }
#orbitnote .note_holder .note_type .sign.icon-exclamation-sign {
background-color: #DA4F49; }
#orbitnote .note_holder .note_type .sign.icon-warning-sign {
background-color: #FAA732; }
#orbitnote .note_holder .note_message { #orbitnote .note_holder .note_message {
color: #333; color: #333;
margin: 10px 0 0 48px; display: inline-block;
vertical-align: middle;
word-wrap: break-word;
width: 240px;
margin: 0 0 0 20px;
font-size: 15px; } font-size: 15px; }
/* Desktop Dialogue */ /* Desktop Dialogue */
@ -378,7 +401,8 @@ a:focus {
height: 100%; height: 100%;
left: 0; left: 0;
top: 0; top: 0;
z-index: 12; } z-index: 12;
display: none; }
#orbitdiag .tile { #orbitdiag .tile {
background-color: #000; } background-color: #000; }
#orbitdiag .diag_holder { #orbitdiag .diag_holder {
@ -480,6 +504,11 @@ a:focus {
cursor: move; cursor: move;
overflow: hidden; } overflow: hidden; }
.gs_w.dragging {
-webkit-transform: scale(0.92);
-moz-transform: scale(0.92);
transform: scale(0.92); }
/* header drop menu */ /* header drop menu */
.sdm_mdr .sdm_o { .sdm_mdr .sdm_o {
top: 36px; } top: 36px; }

47
app/assets/stylesheets/desktop/desktop-main.scss
View File

@ -180,6 +180,8 @@ a:focus { outline: none; }
padding: 0 0 12px 0; padding: 0 0 12px 0;
min-width: 800px; min-width: 800px;
height: 72px; height: 72px;
position: relative;
z-index: 2;
} }
#side { #side {
width: 60px; width: 60px;
@ -194,6 +196,7 @@ a:focus { outline: none; }
height: 516px; height: 516px;
width: auto; width: auto;
position: relative; position: relative;
z-index: 1;
} }
#rwidget { #rwidget {
height: 516px; height: 516px;
@ -295,30 +298,46 @@ a:focus { outline: none; }
position: fixed; position: fixed;
top: 0; top: 0;
left: 50%; left: 50%;
margin-left: -206px; margin-left: -200px;
z-index: 99999; z-index: 99999;
width: 400px; width: 400px;
padding: 0 6px 6px 6px; @include transition-type(height,2);
background-color: #000;
background-color: rgba(0,0,0,0.6);
.note_holder { .note_holder {
background-color: #f3f3f3;
border: solid 1px #fff;
border-top: none;
overflow: hidden; overflow: hidden;
padding: 24px 24px; padding: 36px;
border: solid 2px $gray;
border-top: 0;
display: none;
.note_type { .note_type {
float: left; display: inline-block;
vertical-align: middle;
width: 60px;
height: 60px;
color: #fff;
img { .sign {
display: block; display: block;
font-size: 40px;
width: 40px;
height: 40px;
padding: 10px;
border-radius: 30px;
text-align: center;
&.icon-ok { background-color: #5BB75B; }
&.icon-exclamation-sign { background-color: #DA4F49; }
&.icon-warning-sign { background-color: #FAA732; }
} }
} }
.note_message { .note_message {
color: #333; color: #333;
margin: 10px 0 0 48px; display: inline-block;
vertical-align: middle;
word-wrap: break-word;
width: 240px;
margin: 0 0 0 20px;
font-size: 15px; font-size: 15px;
// font-weight: normal; // font-weight: normal;
} }
@ -333,6 +352,7 @@ a:focus { outline: none; }
left: 0; left: 0;
top: 0; top: 0;
z-index: 12; z-index: 12;
display: none;
.tile { .tile {
background-color: #000; background-color: #000;
@ -460,6 +480,11 @@ a:focus { outline: none; }
cursor: move; cursor: move;
overflow: hidden; overflow: hidden;
} }
.gs_w.dragging {
-webkit-transform: scale(0.92);
-moz-transform: scale(0.92);
transform: scale(0.92);
}
// .app.gs_w:active { // .app.gs_w:active {
// -webkit-transform: scale(0.9); // -webkit-transform: scale(0.9);
// -moz-transform: scale(0.9); // -moz-transform: scale(0.9);

9
app/views/desktop/index.html.erb
View File

@ -73,13 +73,8 @@
<img src="" id="thmbackground" /> <img src="" id="thmbackground" />
<div id="bgover" ></div> <div id="bgover" ></div>
<div id="orbitnote" style="display:none;"> <div id="orbitnote"></div>
<div class="note_holder"> <div id="orbitdiag">
<div class="note_type"><img id='note_img' alt=""/></div>
<div class="note_message">Check the Notifications section for more information.</div>
</div>
</div>
<div id="orbitdiag" style="display: none;">
<div class="tile op07"></div> <div class="tile op07"></div>
<div class="diag_holder"> <div class="diag_holder">
<div class="diag_holder_inner"> <div class="diag_holder_inner">

2
config/mongoid.yml
View File

@ -8,7 +8,7 @@ defaults: &defaults
development: development:
<<: *defaults <<: *defaults
database: production_7 database: test_site
test: test:
<<: *defaults <<: *defaults
database: test_site database: test_site