diff --git a/app/assets/images/connection/Thumbs.db b/app/assets/images/connection/Thumbs.db new file mode 100755 index 00000000..47897e3f Binary files /dev/null and b/app/assets/images/connection/Thumbs.db differ diff --git a/app/assets/images/connection/facebook.png b/app/assets/images/connection/facebook.png new file mode 100755 index 00000000..f8c4f219 Binary files /dev/null and b/app/assets/images/connection/facebook.png differ diff --git a/app/assets/images/connection/gmail.png b/app/assets/images/connection/gmail.png new file mode 100755 index 00000000..ec897f23 Binary files /dev/null and b/app/assets/images/connection/gmail.png differ diff --git a/app/assets/images/connection/twitter.png b/app/assets/images/connection/twitter.png new file mode 100755 index 00000000..a8071eea Binary files /dev/null and b/app/assets/images/connection/twitter.png differ diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 623f3f6b..d1b6b0d4 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -118,6 +118,7 @@ var orbitDesktop = function(dom){ $(window).resize(function(){ var ww = $(window).width(); $("img#thmbackground").attr({"width":ww}); + $('.tinycanvas').tinyscrollbar_update(); }); var $widget_fn = $('.widget_fn'),$fn_des = $('.fn_des'); $widget_fn.hover(function(){ @@ -189,7 +190,6 @@ var orbitDesktop = function(dom){ .find('.scrollbar') .delay(1500) .addClass('op00', 500); - // simple dropdown menu var $sdm = $('.sdm'); @@ -464,6 +464,7 @@ var orbitDesktop = function(dom){ .find('.scrollbar') .delay(1500) .addClass('op00', 500); + var $sdm = $('.sdm'); if( !$sdm.children('.sdm_o') ){ @@ -762,7 +763,19 @@ var orbitDesktop = function(dom){ if(usernm!="" && pwd!="") saveaccount(usernm,pwd,type,what); - }) + }); + + var $conlist = $('.s_form'), + conlist_w = $conlist.length * $conlist.outerWidth(true) + ($conlist.length - 1) * 25; + + $('#connection_setting').width(conlist_w); + + $('.tinycanvas') + .tinyscrollbar({ axis: 'x'}) + .find('.scrollbar') + .delay(1500) + .addClass('op00', 500); + } var saveaccount = function(usernm,pwd,type,what){ $.post("/desktop/save_account_info",{email:usernm,password:pwd,account:type,dowhat:what},function(result){ diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 406d6266..e902ae40 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -386,7 +386,7 @@ a:focus { outline: none; } .tinycanvas .track { height: 100%; width: 6px; position: relative; } .tinycanvas .thumb { height: 6px; width: 6px; cursor: pointer; overflow: hidden; position: absolute; top: 0; } .tinycanvas .thumb .end { overflow: hidden; height: 6px; width: 6px; } -.tinycanvas .disable{ display: none; } +.tinycanvas .scrollbar.disable{ display: none; } /* Orbit Notification */ #orbitnote { @@ -447,20 +447,25 @@ a:focus { outline: none; } } .diag_btn:hover { outline: solid 2px #fff; } .s_form { font-size: 15px; } -.s_form li { overflow: hidden; padding: 6px 0; margin-bottom: 12px; } +.s_form li { overflow: hidden; padding: 6px; margin-bottom: 12px; } .s_form label { font-size: 13px; display: inline-block; vertical-align: middle; width: 100px; margin-right: 24px; + color: #777; } .s_form input[type=text], .s_form input[type=password]{ outline: solid 3px #f6f6f6; border: solid 1px #eee; font-size: 18px; + font-family: Arial !important; margin: 0; padding: 6px; + transition: all 0.3s ease; + -webkit-transition: all 0.3s ease; + -moz-transition: all 0.3s ease; } .s_form input[type=text]:focus, .s_form input[type=password]:focus { background-color: #333; @@ -475,4 +480,40 @@ a:focus { outline: none; } } .g_col_w1 { width: 132px; } .g_col_w2 { width: 264px; } -.ui-sortable-placeholder { background-color: rgba(0,0,0,0.2); visibility: visible !important; } \ No newline at end of file +.ui-sortable-placeholder { background-color: rgba(0,0,0,0.2); visibility: visible !important; } + +#connection_setting { height: 492px; } +#connection_setting .s_form { + float: left; + margin: 0 12px 0 0; + padding-left: 24px; + height: 100%; + border-left: solid 1px #ddd; +} +#connection_setting .s_form:first-child { padding-left: 0; border: none; } +#connection_setting .s_form label { line-height: 30px; } +#connection_setting .s_form .c_icon, #connection_setting .s_form .c_name { + display: inline-block; + vertical-align: middle; +} +#connection_setting .s_form .c_name { padding: 0 12px; font-size: 18px; } +#connection_setting .s_form input[type=text], #connection_setting .s_form input[type=password] { width: 202px; } +#connection_setting .setting_btn { margin-left: 12px; } +#connection_setting .setting_btn.disable { background-color: #ddd; cursor: default; } +#connection_setting .c_status { + float: right; + padding: 6px; + font-size: 9px; + background-color: #eee; + color: #ccc; + font-family: Arial; + font-weight: bold; +} +#connection_setting .c_status_on { background-color: #51A351; color: #fff; } +#connection_setting .c_info { + font-size: 18px; + font-family: Arial; + padding: 7px 6px; + background-color: #fcfcfc; + cursor: default; +} \ No newline at end of file diff --git a/app/views/desktop/settings/connections.html.erb b/app/views/desktop/settings/connections.html.erb index 1ef4cab6..3619a583 100644 --- a/app/views/desktop/settings/connections.html.erb +++ b/app/views/desktop/settings/connections.html.erb @@ -1,10 +1,9 @@ - -
-
+
+
-
-
Connections
- +
+ + +
    +
  • No Connection
    • +

  • Facebook

    • +
    • +
    • +
  • +
    + Connecting +
    +
    • +
+
    +
  • No Connection
    • +

  • Twitter

    • +
    • +
    • +
  • +
    + Connect +
    +
    • +
+
    +
  • Connected
    • +

  • gmail

    • +
  • Harry
    • +
  • ••••••
    • +
  • +
    + Edit + Remove +
    +
    • +
diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index 32db370b..dcb92237 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -1,6 +1,5 @@ -
-
+
Section Names
@@ -16,4 +15,4 @@
- + \ No newline at end of file