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-05-02 14:02:41 +08:00 committed by Matt K. Fu
parent d02806fa58
commit 1a7a199504
9 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/desktop.js
View File

@ -16,4 +16,4 @@
//= require orbitdesktop //= require orbitdesktop
//= require jquery.gridster //= require jquery.gridster
//= require desktop/books_pages //= require desktop/books_pages
//= require select2 //= require select2

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

@ -849,7 +849,7 @@ var orbitDesktop = function(dom){
if(i == 1){ if(i == 1){
$column = $('<div class="g_col g_col_w1"></div>'); $column = $('<div class="g_col g_col_w1"></div>');
} }
var $newelement = $('<div class="element w1 h1 hp vp thmc2">'+$(this).html()+'</div>'); var $newelement = $('<div class="element w1 h1 thmc2">'+$(this).html()+'</div>');
$column.append($newelement); $column.append($newelement);
if(i == 4){ if(i == 4){
$result.append($column); $result.append($column);
@ -899,6 +899,11 @@ var orbitDesktop = function(dom){
}); });
return false; return false;
}); });
$(window).on('keydown', function(){
if($('#searchbox').val() == 'Search'){
$('#searchbox').focus();
}
});
o.appname_substr('#group_wrapper .element'); o.appname_substr('#group_wrapper .element');
o.simple_switch(); o.simple_switch();
} }
@ -910,7 +915,7 @@ var orbitDesktop = function(dom){
$.each(apps,function(i,app){ $.each(apps,function(i,app){
var $app; var $app;
count++; count++;
$app = $('<div class="element w1 h1 hp vp thmc2" data-category="'+app.data_category+'" data-content="'+app.data_content+'"><span class="tile thmc2"></span><a href="'+app._id+'" class="appicon"><img src="'+o.iconPath+app.data_content+'.png" alt="" onclick="return false;"></a><h1 class="appname thmtxt">'+app.title+'</h1></div>'); $app = $('<div class="element w1 h1 thmc2" data-category="'+app.data_category+'" data-content="'+app.data_content+'"><span class="tile thmc2"></span><a href="'+app._id+'" class="appicon"><img src="'+o.iconPath+app.data_content+'.png" alt="" onclick="return false;"></a><h1 class="appname thmtxt">'+app.title+'</h1></div>');
if( count > 4 ){ if( count > 4 ){
count = 1, colindex+=1; count = 1, colindex+=1;
$('#app_list').append('<div class="g_col g_col_w1 col'+ colindex +'"/>'); $('#app_list').append('<div class="g_col g_col_w1 col'+ colindex +'"/>');

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

@ -319,7 +319,7 @@
-moz-transition: left 0.3s ease; -moz-transition: left 0.3s ease;
transition: left 0.3s ease; } transition: left 0.3s ease; }
.s_switch .s_switch_switcher input[type=checkbox]:checked + .s_switch_toggle { .s_switch .s_switch_switcher input[type=checkbox]:checked + .s_switch_toggle {
left: 32px; } left: 30px; }
/* tool bar */ /* tool bar */
.toolbar { .toolbar {

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

@ -309,7 +309,7 @@
@include transition-type(left,0.3); @include transition-type(left,0.3);
} }
&:checked + .s_switch_toggle { &:checked + .s_switch_toggle {
left: 32px; left: 30px;
} }
} }
} }

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

@ -468,7 +468,7 @@ a.admtxt.admbg2:hover {
height: 60px; height: 60px;
margin: 0 auto; margin: 0 auto;
position: relative; } position: relative; }
[data-sizex="1"] .appicon { [data-sizex="1"] .appicon, .w1.h1 .appicon {
margin-top: 24px; } margin-top: 24px; }
#sections .appicon { #sections .appicon {
width: 30px; width: 30px;

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

@ -442,7 +442,7 @@ a.admtxt.admbg2:hover {
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
[data-sizex="1"] & { [data-sizex="1"] &, .w1.h1 & {
margin-top: 24px; margin-top: 24px;
} }
#sections & { #sections & {

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

@ -95,6 +95,12 @@
orbitDesktop.prototype.currentUsername = "<%= @currentusername %>"; orbitDesktop.prototype.currentUsername = "<%= @currentusername %>";
//uselessfunction(); //uselessfunction();
var od = new orbitDesktop("#ajax_container"); var od = new orbitDesktop("#ajax_container");
if($.browser.msie){
if($.browser.version < 9){
$.fx.off = true;
o.notify("We turn off the animation (javascript) for you, but still you can turn it on",10);
}
}
o.notify("Welcome "+o.currentUsername+"!!","alert",3); o.notify("Welcome "+o.currentUsername+"!!","alert",3);
</script> </script>

4
app/views/desktop/settings/themes.html.erb
View File

@ -1,7 +1,7 @@
<div class="s_tab stb_h"> <div class="s_tab stb_h">
<ul> <ul>
<li><a href="#st1" class="hh1 hp thmtxt thmc2">Select Theme</a></li> <li><a href="#st1" class="hh1 hp thmtxt thmc2">Themes</a></li>
<li><a href="#st2" class="hh1 hp admtxt admbg">Custom Theme</a></li> <li><a href="#st2" class="hh1 hp admtxt admbg">Theme Color</a></li>
<li><a href="#st3" class="hh1 hp admtxt admbg">Wallpaper</a></li> <li><a href="#st3" class="hh1 hp admtxt admbg">Wallpaper</a></li>
</ul> </ul>
</div> </div>

14
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb vendored
View File

@ -76,23 +76,23 @@
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_journal.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_journal.isbn"), class: "s_grid_4 s_grid") %><%= f.text_field :isbn, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_journal.vol_no"), class: "s_grid_4 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_journal.vol_no"), class: "s_grid_4 s_grid") %><%= f.text_field :vol_no, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_journal.issue_no"), class: "s_grid_4 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_journal.issue_no"), class: "s_grid_4 s_grid") %><%= f.text_field :issue_no, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_4 s_grid") %> <%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_4 s_grid") %>
<%= f.text_field :form_to_start, size: "10", placeholder: "1", class: "s_grid_2 s_grid"%> <%= f.text_field :form_to_start, size: "10", class: "s_grid_2 s_grid"%>
<%= label_tag("", t("personal_journal.to"), class: "s_grid_1 s_grid") %> <%= label_tag("", t("personal_journal.to"), class: "s_grid_1 s_grid") %>
<%= f.text_field :form_to_end, size: "10", placeholder: "20", class: "s_grid_2 s_grid"%> <%= f.text_field :form_to_end, size: "10", class: "s_grid_2 s_grid"%>
<label class="s_grid_1 s_grid" for="">共</label> <label class="s_grid_1 s_grid" for="">共</label>
<%= f.text_field :total_pages, size: "20", placeholder:"20", class: "s_grid_2 s_grid"%> <%= f.text_field :total_pages, size: "20", class: "s_grid_2 s_grid"%>
</li> </li>
</ul> </ul>
</div> </div>
@ -171,7 +171,7 @@
</select> </select>
</li> </li>
<li class="s_grid_row"> <li class="s_grid_row">
<%= label_tag("", t("personal_journal.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%> <%= label_tag("", t("personal_journal.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
</li> </li>
</ul> </ul>
</div> </div>