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

new feature in desktop for uploading wallpapers or putting url link

Browse Source
This commit is contained in:
harrybomrah authored and saurabhbhatia committed 2013-08-02 19:32:41 +08:00
1 parent 0f3a8414be
commit 42615f02ea
35 files changed
+97 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/desktop/settings/connections.html.erb
+1
View File
@@ -3,6 +3,7 @@
<a href="" onclick="window.open('<%= @url %>','login_window','height=250,width=400,titlebar=0,statusbar=0,location=0');return false;">Connect FaceBook</a>
<a href="/facebook/get_friends" ajax-remote="get" >Get Friends</a>
<a href="/facebook/disconnect" ajax-remote="get" >Disconnect from facebook</a>
<!-- <ul class="s_form w2 hp" id="facebook_connection">
<li><span class="c_status">No Connection</span></li>
<li><img src="/assets/connection/facebook.png" alt="" class="c_icon"><h1 class="c_name">Facebook</h1></li>
app/views/desktop/settings/themes.html.erb
+18 -12
View File
@@ -3,6 +3,7 @@
<li><a href="#st1" class="hh1 hp thmc2 thmtxt" data-active="true">Themes</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="#st4" class="hh1 hp admtxt admbg">Upload Wallpaper</a></li>
</ul>
</div>
@@ -61,22 +62,27 @@
</div>
<div id="st3" class="st_c">
<div class="stock_wallpaper ssl">
<div class="sb1 ssl_item"><img src="/assets/stockBackground/thumb/1.jpg" alt="1.jpg"></div>
<div class="sb2 ssl_item"><img src="/assets/stockBackground/thumb/2.jpg" alt="2.jpg"></div>
<div class="sb3 ssl_item"><img src="/assets/stockBackground/thumb/3.jpg" alt="3.jpg"></div>
<div class="sb4 ssl_item"><img src="/assets/stockBackground/thumb/4.jpg" alt="4.jpg"></div>
<div class="sb5 ssl_item"><img src="/assets/stockBackground/thumb/5.jpg" alt="5.jpg"></div>
<div class="sb6 ssl_item"><img src="/assets/stockBackground/thumb/6.jpg" alt="6.jpg"></div>
<div class="sb7 ssl_item"><img src="/assets/stockBackground/thumb/7.jpg" alt="7.jpg"></div>
<div class="sb8 ssl_item"><img src="/assets/stockBackground/thumb/8.jpg" alt="8.jpg"></div>
<div class="sb9 ssl_item"><img src="/assets/stockBackground/thumb/9.jpg" alt="9.jpg"></div>
<div class="sb10 ssl_item"><img src="/assets/stockBackground/thumb/10.jpg" alt="10.jpg"></div>
<div class="sb11 ssl_item"><img src="/assets/stockBackground/thumb/11.jpg" alt="11.jpg"></div>
<div class="sb12 ssl_item"><img src="/assets/stockBackground/thumb/12.jpg" alt="12.jpg"></div>
<% @wallpapers.each do |wallpaper| %>
<% if wallpaper.type == "file" %>
<div class="sb1 ssl_item"><img src="<%= wallpaper.file.thumb %>" data-type="<%= wallpaper.type %>" data-link="<%= wallpaper.file %>"></div>
<% elsif wallpaper.type == "url" %>
<div class="sb1 ssl_item"><img src="<%= wallpaper.link %>" data-type="<%= wallpaper.type %>" data-link="<%= wallpaper.link %>"></div>
<% end %>
<% end %>
</div>
<!-- <div class="s_action">
<div href="" class="setting_btn thmc1 thmtxt w1 hh1 hp" onclick="o.tempFunc();return false;">Confirm</a>
</div> -->
<div class="clear"></div>
</div>
<div id="st4" class="st_c">
<form action="<%= desktop_wallpaper_upload_path %>" method="post" form-type="ajax_form" notification="Wallpaper uploaded successfully!!!">
<label>Image Link</label><input type="text" name="imagelink" />
Or
<label>Upload from computer</label><input type="file" name="imagefile" />
<input type="submit" class="fn_btn ini_input hp hh1 thmc2 thmtxt" value="Save" />
<input type="reset" class="fn_btn ini_input hp hh1 thmc2 thmtxt" value="Clear" />
</form>
</div>
</div>
app/views/js/register_fb.js.erb
+1
View File
@@ -0,0 +1 @@
window.close();