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

little update

This commit is contained in:
devin 2012-04-10 18:09:29 +08:00
parent 360e5228b7
commit ee85380ab2
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,14 +331,14 @@ var orbitDesktop = function(dom){
}); });
} }
if(!o.desktopData[o.currentface]){ // if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load("/desktop/"+target,function(){ $(o.contentHolder).empty().load("/desktop/"+target,function(){
bindHandlers(); bindHandlers();
}); });
}else{ // }else{
$(o.contentHolder).html(o.desktopData[o.currentface]); // $(o.contentHolder).html(o.desktopData[o.currentface]);
bindHandlers(); // bindHandlers();
} // }
}; };
this.loadWallpaper = function(wallpaper){ this.loadWallpaper = function(wallpaper){
if(!wallpaper)wallpaper = o.themesettings.background; if(!wallpaper)wallpaper = o.themesettings.background;

20
app/views/desktop/settings.html.erb
View File

@ -43,26 +43,26 @@
<div> <div>
<table cellpadding="0" cellspacing="0" border="0" width="528"> <table cellpadding="0" cellspacing="0" border="0" width="528">
<tr> <tr>
<th class="s_title hh3">Theme Color</th> <th class="s_title hh3" width="190px">Theme Color</th>
<th class="s_title hh3">Line Color</th> <th class="s_title hh3">Line Color</th>
<th class="s_title hh3">Text Color</th> <th class="s_title hh3" width="120px">Text Color</th>
<th class="s_title hh3">Background Color</th> <th class="s_title hh3" width="120px">Background Color</th>
</tr> </tr>
<tr> <tr>
<td> <td>
<input type="hidden" class="color-picker" value="#000000"> <input type="hidden" class="color-picker black" value="#000000">
<input type="hidden" class="color-picker" value="#0099cc"> <input type="hidden" class="color-picker black" value="#0099cc">
<input type="hidden" class="color-picker" value="#3366cc"> <input type="hidden" class="color-picker black" value="#3366cc">
</td> </td>
<td> <td>
<input type="hidden" class="color-picker" value="#ffffff"> <input type="hidden" class="color-picker black" value="#ffffff">
</td> </td>
<td> <td>
<input type="hidden" class="color-picker" value="#ffffff"> <input type="hidden" class="color-picker black" value="#ffffff">
<input type="hidden" class="color-picker" value="#ffffff"> <input type="hidden" class="color-picker black" value="#ffffff">
</td> </td>
<td> <td>
<input type="hidden" class="color-picker" value="#000000"> <input type="hidden" class="color-picker black" value="#000000">
</td> </td>
</tr> </tr>
</table> </table>

4
public/desktop_widgets/weather/index.html.erb
View File

@ -1,6 +1,6 @@
<div style='width: 180px; height: 150px; background-image: url( /desktop_widgets/weather/img/clouds_180x150_bg.jpg ); <div style='width: 100%; height: 100%; <!-- background-image: url( /desktop_widgets/weather/img/clouds_180x150_bg.jpg ); -->
background-repeat: no-repeat; background-color: #;' ><div id='NetweatherContainer' background-repeat: no-repeat; background-color: #;' ><div id='NetweatherContainer'
style='height: 138px;' ><script src='http://netweather.accuweather.com/adcbin/ style='height: 100%;' ><script src='http://netweather.accuweather.com/adcbin/
netweather_v2/netweatherV2ex.asp? netweather_v2/netweatherV2ex.asp?
partner=netweather&tStyle=normal&logo=1&zipcode=ASI|TW|TW018|HSINCHU| partner=netweather&tStyle=normal&logo=1&zipcode=ASI|TW|TW018|HSINCHU|
&lang=eng&size=8&theme=clouds&metric=0&target=_self'></script></div></div> &lang=eng&size=8&theme=clouds&metric=0&target=_self'></script></div></div>