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

minor update

This commit is contained in:
devin chen 2013-04-10 17:05:12 +08:00 committed by Matt K. Fu
parent 4cbf2fd8b9
commit 989e5aa974
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,6 +712,19 @@ var orbitDesktop = function(dom){
dragged.removeClass("noClick"); dragged.removeClass("noClick");
}); });
var element = $('.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'
@ -791,7 +804,7 @@ var orbitDesktop = function(dom){
tempstyle = "style='display:none;'"; tempstyle = "style='display:none;'";
$("#desktop #section_heading").text(section.name); $("#desktop #section_heading").text(section.name);
} }
$("#desktop #section_list").append($('<li class="section_name" '+tempstyle+'><a class="admtxt hp w2 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();
}else{ }else{

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

@ -295,7 +295,7 @@ a:focus {
.fn_des.admtxt { .fn_des.admtxt {
line-height: 60px; line-height: 60px;
padding: 0 6px; padding: 0 12px;
font-size: 15px; font-size: 15px;
position: absolute; position: absolute;
z-index: 9; z-index: 9;
@ -416,7 +416,8 @@ a:focus {
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
z-index: 3; } z-index: 3;
white-space: nowrap; }
[data-sizex="1"] .appname, .w1.h1 .appname { [data-sizex="1"] .appname, .w1.h1 .appname {
text-align: center; } text-align: center; }
[data-sizey="2"] .appname { [data-sizey="2"] .appname {

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

@ -231,7 +231,7 @@ a:focus { outline: none; }
} }
.fn_des.admtxt { .fn_des.admtxt {
line-height: 60px; line-height: 60px;
padding: 0 6px; padding: 0 12px;
font-size: 15px; font-size: 15px;
position: absolute; position: absolute;
z-index: 9; z-index: 9;
@ -385,6 +385,7 @@ a:focus { outline: none; }
left: 0; left: 0;
bottom: 0; bottom: 0;
z-index: 3; z-index: 3;
white-space: nowrap;
[data-sizex="1"] &, [data-sizex="1"] &,
.w1.h1 & { .w1.h1 & {
@ -459,6 +460,11 @@ a:focus { outline: none; }
cursor: move; cursor: move;
overflow: hidden; overflow: hidden;
} }
// .app.gs_w:active {
// -webkit-transform: scale(0.9);
// -moz-transform: scale(0.9);
// transform: scale(0.9);
// }
/* header drop menu */ /* header drop menu */
.sdm_mdr .sdm_o { top: 36px; } .sdm_mdr .sdm_o { top: 36px; }

6
app/views/desktop/desktop.html.erb
View File

@ -2,13 +2,9 @@
<div id="content"> <div id="content">
<div id="header" class="hh2"> <div id="header" class="hh2">
<div class="dtitle w2 hh2 hp sdm"> <div class="dtitle w2 hh2 hp sdm">
<div class="thmtxth sdm_t" id="section_heading">Loading...</div> <div class="thmtxth sdm_t" id="section_heading"></div>
<div class="admbg sdm_o w2"> <div class="admbg sdm_o w2">
<ul id="section_list"> <ul id="section_list">
<!-- <li><a class="admtxt hp w2 hh2" href="">Campus</a></li>
<li><a class="admtxt hp w2 hh2" href="">Research</a></li>
<li><a class="admtxt hp w2 hh2" href="">Social</a></li>
<li><a class="admtxt hp w2 hh2" href="">Private</a></li> -->
</ul> </ul>
</div> </div>
</div> </div>