diff --git a/app/assets/fonts/desktop/fontawesome-webfont.eot b/app/assets/fonts/desktop/fontawesome-webfont.eot new file mode 100755 index 00000000..3f669a7e Binary files /dev/null and b/app/assets/fonts/desktop/fontawesome-webfont.eot differ diff --git a/app/assets/fonts/desktop/fontawesome-webfont.svg b/app/assets/fonts/desktop/fontawesome-webfont.svg new file mode 100755 index 00000000..73c0ad9a --- /dev/null +++ b/app/assets/fonts/desktop/fontawesome-webfont.svg @@ -0,0 +1,175 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Designer : Dave Gandy +Foundry : Fort Awesome + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/desktop/fontawesome-webfont.svgz b/app/assets/fonts/desktop/fontawesome-webfont.svgz new file mode 100755 index 00000000..2a73cd7c Binary files /dev/null and b/app/assets/fonts/desktop/fontawesome-webfont.svgz differ diff --git a/app/assets/fonts/desktop/fontawesome-webfont.ttf b/app/assets/fonts/desktop/fontawesome-webfont.ttf new file mode 100755 index 00000000..4972eb45 Binary files /dev/null and b/app/assets/fonts/desktop/fontawesome-webfont.ttf differ diff --git a/app/assets/fonts/desktop/fontawesome-webfont.woff b/app/assets/fonts/desktop/fontawesome-webfont.woff new file mode 100755 index 00000000..6e4cb41f Binary files /dev/null and b/app/assets/fonts/desktop/fontawesome-webfont.woff differ 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 1cdc8339..1e406b91 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -115,6 +115,7 @@ var orbitDesktop = function(dom){ $(window).resize(function(){ var ww = $(window).width(); $("img#thmbackground").attr({"width":ww}); + if( $('.tinycanvas') ){ $('.tinycanvas').tinyscrollbar_update(); } }); var $widget_fn = $('.widget_fn'),$fn_des = $('.fn_des'); $widget_fn.hover(function(){ @@ -186,7 +187,6 @@ var orbitDesktop = function(dom){ .find('.scrollbar') .delay(1500) .addClass('op00', 500); - // simple dropdown menu var $sdm = $('.sdm'); @@ -461,6 +461,7 @@ var orbitDesktop = function(dom){ .find('.scrollbar') .delay(1500) .addClass('op00', 500); + var $sdm = $('.sdm'); if( !$sdm.children('.sdm_o') ){ @@ -759,7 +760,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){ @@ -815,7 +828,12 @@ var orbitDesktop = function(dom){ var list = function(){ // to open list part in journal papers page var bindHandlers = function(){ // to bind handlers for list page - + o.simple_drop_down(); + $('.tinycanvas') + .tinyscrollbar({ axis: 'x'}) + .find('.scrollbar') + .delay(1500) + .addClass('op00', 500); } $("div#settings div#panel_r").load("/desktop/journal_p_list",function(){ @@ -840,6 +858,7 @@ var orbitDesktop = function(dom){ }else{ $(o.contentHolder).html(o.desktopData[o.currentface]); bindHandlers(); + list(); } }; this.loadWallpaper = function(wallpaper){ // this is to load new wallpaper @@ -883,6 +902,18 @@ var orbitDesktop = function(dom){ o.notify("Wallpaper saving failed!!","imp",2); }) }; + this.simple_drop_down = function(){ + // simple dropdown menu + if( !$('.sdm').children('.sdm_o') ){ + return; + } else { + $('.sdm').hover(function(){ + $(this).stop(1,1).toggleClass('thmc2 thmtxt'); + }, function(){ + $(this).stop(1,1).toggleClass('thmc2 thmtxt'); + }); + } + } o.initialize(); } @@ -896,4 +927,4 @@ orbitDesktop.prototype.currentLanguage = "en"; orbitDesktop.prototype.currentUsername = "Harry"; var uselessfunction = function(){ $.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"}); -} \ No newline at end of file +} diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index 70a9b4b0..19e9a9e6 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -6,6 +6,7 @@ *= require bootstrap *= require bootstrap-orbit *= require jquery.miniColors + *= require font-awesome *= require desktopmain *= require desktopmedia */ \ No newline at end of file diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 406d6266..b3c9fa4a 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -229,11 +229,17 @@ a:focus { outline: none; } /* simple dropdown menu */ .sdm { position: relative; } -.sdm_t { cursor: default; } +.sdm_t { + cursor: default; + transition: all 0.3s ease; + -webkit-transition: all 0.3s ease; + -moz-transition: all 0.3s ease; +} .sdm:hover .sdm_o { display: block; } .sdm_o { display: none; position: absolute; + z-index: 9; left: 0; top: 60px; font-size: 15px; @@ -242,7 +248,7 @@ a:focus { outline: none; } .sdm_o li:first-child { border: none; } .sdm_o a { display: block; } .sdm_o .admtxt { display: block; line-height: 36px; } -.sdm_o .admtxt:hover { background-color: #F0F0F0; } +.sdm_o .admtxt:hover { background-color: #fcfcfc; } /* simple menu */ .s_menu { font-size: 15px; line-height: 36px; } @@ -386,7 +392,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 +453,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 +486,46 @@ 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 Page */ +#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; +} + +/* Journal Papers */ +#paper_list { + height: 456px; +} \ No newline at end of file diff --git a/app/assets/stylesheets/font-awesome.css.erb b/app/assets/stylesheets/font-awesome.css.erb new file mode 100755 index 00000000..07ffd91f --- /dev/null +++ b/app/assets/stylesheets/font-awesome.css.erb @@ -0,0 +1,239 @@ +/* Font Awesome + the iconic font designed for use with Twitter Bootstrap + ------------------------------------------------------- + The full suite of pictographic icons, examples, and documentation + can be found at: http://fortawesome.github.com/Font-Awesome/ + + License + ------------------------------------------------------- + The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0: + http://creativecommons.org/licenses/by/3.0/ A mention of + 'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable + source code is considered acceptable attribution (most common on the web). + If human readable source code is not available to the end user, a mention in + an 'About' or 'Credits' screen is considered acceptable (most common in desktop + or mobile software). + + Contact + ------------------------------------------------------- + Email: dave@davegandy.com + Twitter: http://twitter.com/fortaweso_me + Work: http://lemonwi.se co-founder + + */ + +@font-face { + font-family: 'FontAwesome'; + src: url(<%= asset_path "desktop/fontawesome-webfont.eot"%>); + src: url(<%= asset_path "desktop/fontawesome-webfont.eot?#iefix"%>) format('embedded-opentype'), url(<%= asset_path "desktop/fontawesome-webfont.woff" %>) format('woff'), url(<%= asset_path "desktop/fontawesome-webfont.ttf"%>) format('truetype'), url(<%= asset_path "desktop/fontawesome-webfont.svgz#FontAwesomeRegular"%>) format('svg'), url(<%= asset_path "desktop/fontawesome-webfont.svg#FontAwesomeRegular"%>) format('svg'); + font-weight: normal; + font-style: normal; +} +/* sprites.less reset */ +[class^="icon-"], [class*=" icon-"] { + display: inline; + width: auto; + height: auto; + line-height: inherit; + vertical-align: baseline; + background-image: none; + background-position: 0% 0%; + background-repeat: repeat; +} +li[class^="icon-"], li[class*=" icon-"] { + display: block; +} +/* Font Awesome styles + ------------------------------------------------------- */ +[class^="icon-"]:before, [class*=" icon-"]:before { + font-family: FontAwesome; + font-weight: normal; + font-style: normal; + display: inline-block; + text-decoration: inherit; +} +a [class^="icon-"], a [class*=" icon-"] { + display: inline-block; + text-decoration: inherit; +} +/* makes the font 33% larger relative to the icon container */ +.icon-large:before { + vertical-align: top; + font-size: 1.3333333333333333em; +} +.btn [class^="icon-"], .btn [class*=" icon-"] { + /* keeps button heights with and without icons the same */ + line-height: .9em; +} +li [class^="icon-"], li [class*=" icon-"] { + display: inline-block; + width: 1.25em; + text-align: center; +} +li .icon-large[class^="icon-"], li .icon-large[class*=" icon-"] { + /* 1.5 increased font size for icon-large * 1.25 width */ + width: 1.875em; +} +li[class^="icon-"], li[class*=" icon-"] { + margin-left: 0; + list-style-type: none; +} +li[class^="icon-"]:before, li[class*=" icon-"]:before { + text-indent: -2em; + text-align: center; +} +li[class^="icon-"].icon-large:before, li[class*=" icon-"].icon-large:before { + text-indent: -1.3333333333333333em; +} +/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen + readers do not read off random characters that represent icons */ +.icon-glass:before { content: "\f000"; } +.icon-music:before { content: "\f001"; } +.icon-search:before { content: "\f002"; } +.icon-envelope:before { content: "\f003"; } +.icon-heart:before { content: "\f004"; } +.icon-star:before { content: "\f005"; } +.icon-star-empty:before { content: "\f006"; } +.icon-user:before { content: "\f007"; } +.icon-film:before { content: "\f008"; } +.icon-th-large:before { content: "\f009"; } +.icon-th:before { content: "\f00a"; } +.icon-th-list:before { content: "\f00b"; } +.icon-ok:before { content: "\f00c"; } +.icon-remove:before { content: "\f00d"; } +.icon-zoom-in:before { content: "\f00e"; } + +.icon-zoom-out:before { content: "\f010"; } +.icon-off:before { content: "\f011"; } +.icon-signal:before { content: "\f012"; } +.icon-cog:before { content: "\f013"; } +.icon-trash:before { content: "\f014"; } +.icon-home:before { content: "\f015"; } +.icon-file:before { content: "\f016"; } +.icon-time:before { content: "\f017"; } +.icon-road:before { content: "\f018"; } +.icon-download-alt:before { content: "\f019"; } +.icon-download:before { content: "\f01a"; } +.icon-upload:before { content: "\f01b"; } +.icon-inbox:before { content: "\f01c"; } +.icon-play-circle:before { content: "\f01d"; } +.icon-repeat:before { content: "\f01e"; } + +/* \f020 is not a valid unicode character. all shifted one down */ +.icon-refresh:before { content: "\f021"; } +.icon-list-alt:before { content: "\f022"; } +.icon-lock:before { content: "\f023"; } +.icon-flag:before { content: "\f024"; } +.icon-headphones:before { content: "\f025"; } +.icon-volume-off:before { content: "\f026"; } +.icon-volume-down:before { content: "\f027"; } +.icon-volume-up:before { content: "\f028"; } +.icon-qrcode:before { content: "\f029"; } +.icon-barcode:before { content: "\f02a"; } +.icon-tag:before { content: "\f02b"; } +.icon-tags:before { content: "\f02c"; } +.icon-book:before { content: "\f02d"; } +.icon-bookmark:before { content: "\f02e"; } +.icon-print:before { content: "\f02f"; } + +.icon-camera:before { content: "\f030"; } +.icon-font:before { content: "\f031"; } +.icon-bold:before { content: "\f032"; } +.icon-italic:before { content: "\f033"; } +.icon-text-height:before { content: "\f034"; } +.icon-text-width:before { content: "\f035"; } +.icon-align-left:before { content: "\f036"; } +.icon-align-center:before { content: "\f037"; } +.icon-align-right:before { content: "\f038"; } +.icon-align-justify:before { content: "\f039"; } +.icon-list:before { content: "\f03a"; } +.icon-indent-left:before { content: "\f03b"; } +.icon-indent-right:before { content: "\f03c"; } +.icon-facetime-video:before { content: "\f03d"; } +.icon-picture:before { content: "\f03e"; } + +.icon-pencil:before { content: "\f040"; } +.icon-map-marker:before { content: "\f041"; } +.icon-adjust:before { content: "\f042"; } +.icon-tint:before { content: "\f043"; } +.icon-edit:before { content: "\f044"; } +.icon-share:before { content: "\f045"; } +.icon-check:before { content: "\f046"; } +.icon-move:before { content: "\f047"; } +.icon-step-backward:before { content: "\f048"; } +.icon-fast-backward:before { content: "\f049"; } +.icon-backward:before { content: "\f04a"; } +.icon-play:before { content: "\f04b"; } +.icon-pause:before { content: "\f04c"; } +.icon-stop:before { content: "\f04d"; } +.icon-forward:before { content: "\f04e"; } + +.icon-fast-forward:before { content: "\f050"; } +.icon-step-forward:before { content: "\f051"; } +.icon-eject:before { content: "\f052"; } +.icon-chevron-left:before { content: "\f053"; } +.icon-chevron-right:before { content: "\f054"; } +.icon-plus-sign:before { content: "\f055"; } +.icon-minus-sign:before { content: "\f056"; } +.icon-remove-sign:before { content: "\f057"; } +.icon-ok-sign:before { content: "\f058"; } +.icon-question-sign:before { content: "\f059"; } +.icon-info-sign:before { content: "\f05a"; } +.icon-screenshot:before { content: "\f05b"; } +.icon-remove-circle:before { content: "\f05c"; } +.icon-ok-circle:before { content: "\f05d"; } +.icon-ban-circle:before { content: "\f05e"; } + +.icon-arrow-left:before { content: "\f060"; } +.icon-arrow-right:before { content: "\f061"; } +.icon-arrow-up:before { content: "\f062"; } +.icon-arrow-down:before { content: "\f063"; } +.icon-share-alt:before { content: "\f064"; } +.icon-resize-full:before { content: "\f065"; } +.icon-resize-small:before { content: "\f066"; } +.icon-plus:before { content: "\f067"; } +.icon-minus:before { content: "\f068"; } +.icon-asterisk:before { content: "\f069"; } +.icon-exclamation-sign:before { content: "\f06a"; } +.icon-gift:before { content: "\f06b"; } +.icon-leaf:before { content: "\f06c"; } +.icon-fire:before { content: "\f06d"; } +.icon-eye-open:before { content: "\f06e"; } + +.icon-eye-close:before { content: "\f070"; } +.icon-warning-sign:before { content: "\f071"; } +.icon-plane:before { content: "\f072"; } +.icon-calendar:before { content: "\f073"; } +.icon-random:before { content: "\f074"; } +.icon-comment:before { content: "\f075"; } +.icon-magnet:before { content: "\f076"; } +.icon-chevron-up:before { content: "\f077"; } +.icon-chevron-down:before { content: "\f078"; } +.icon-retweet:before { content: "\f079"; } +.icon-shopping-cart:before { content: "\f07a"; } +.icon-folder-close:before { content: "\f07b"; } +.icon-folder-open:before { content: "\f07c"; } +.icon-resize-vertical:before { content: "\f07d"; } +.icon-resize-horizontal:before { content: "\f07e"; } + +.icon-bar-chart:before { content: "\f080"; } +.icon-twitter-sign:before { content: "\f081"; } +.icon-facebook-sign:before { content: "\f082"; } +.icon-camera-retro:before { content: "\f083"; } +.icon-key:before { content: "\f084"; } +.icon-cogs:before { content: "\f085"; } +.icon-comments:before { content: "\f086"; } +.icon-thumbs-up:before { content: "\f087"; } +.icon-thumbs-down:before { content: "\f088"; } +.icon-star-half:before { content: "\f089"; } +.icon-heart-empty:before { content: "\f08a"; } +.icon-signout:before { content: "\f08b"; } +.icon-linkedin-sign:before { content: "\f08c"; } +.icon-pushpin:before { content: "\f08d"; } +.icon-external-link:before { content: "\f08e"; } + +.icon-signin:before { content: "\f090"; } +.icon-trophy:before { content: "\f091"; } +.icon-github-sign:before { content: "\f092"; } +.icon-upload-alt:before { content: "\f093"; } +.icon-lemon:before { content: "\f094"; } diff --git a/app/views/desktop/journal_pages/list.html.erb b/app/views/desktop/journal_pages/list.html.erb index 4c4b0e21..4a3be4eb 100644 --- a/app/views/desktop/journal_pages/list.html.erb +++ b/app/views/desktop/journal_pages/list.html.erb @@ -1,6 +1,6 @@
-
[]
+
  • All
    • @@ -61,4 +61,12 @@
+
+
+
+
+
+ test +
+
\ 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