diff --git a/.gitignore b/.gitignore index 1b808faa..d72a4834 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,20 @@ !.gitignore -Gemfile.lock .bundle -db/*.sqlite3 -log/*.log -tmp/**/* -public/uploads/**/* -uploads/**/* -public/panel/**/* -public/index.html .DS_Store -solr/data/**/* -*.swp -*.pid -*.lck -public/assets -config/application.rb - .rvmrc -app/assets/javascripts/.DS_Store +Gemfile.lock +db/*.sqlite3 +log/*.log +public/assets +public/index.html +public/panel/**/* +public/uploads/**/* solr +tmp/**/* +uploads/**/* + +*.swp +*.pid +*.lck \ No newline at end of file diff --git a/Gemfile b/Gemfile index e752dc35..37fdd201 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'exception_notification' # Send error trace gem 'execjs' gem 'jquery-rails', '2.1.4' gem 'jquery-ui-rails' -gem "select2-rails" +gem "select2-rails", '3.3.1' gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git' # gem "memcached", "~> 1.4.3" diff --git a/app/assets/fonts/desktop/FontAwesome.otf b/app/assets/fonts/desktop/FontAwesome.otf new file mode 100755 index 00000000..64049bf2 Binary files /dev/null and b/app/assets/fonts/desktop/FontAwesome.otf differ diff --git a/app/assets/fonts/desktop/fontawesome-webfont.eot b/app/assets/fonts/desktop/fontawesome-webfont.eot index 89070c1e..7d81019e 100755 Binary files a/app/assets/fonts/desktop/fontawesome-webfont.eot 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 index 1245f92c..ba0afe5e 100755 --- a/app/assets/fonts/desktop/fontawesome-webfont.svg +++ b/app/assets/fonts/desktop/fontawesome-webfont.svg @@ -3,253 +3,282 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/fonts/desktop/fontawesome-webfont.ttf b/app/assets/fonts/desktop/fontawesome-webfont.ttf index c17e9f8d..d4617247 100755 Binary files a/app/assets/fonts/desktop/fontawesome-webfont.ttf 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 index 09f2469a..3c89ae09 100755 Binary files a/app/assets/fonts/desktop/fontawesome-webfont.woff and b/app/assets/fonts/desktop/fontawesome-webfont.woff differ diff --git a/app/assets/images/desktop/select2/select2.png b/app/assets/images/desktop/select2/select2.png new file mode 100755 index 00000000..1d804ffb Binary files /dev/null and b/app/assets/images/desktop/select2/select2.png differ diff --git a/app/assets/images/desktop/select2/select2x2.png b/app/assets/images/desktop/select2/select2x2.png new file mode 100755 index 00000000..4bdd5c96 Binary files /dev/null and b/app/assets/images/desktop/select2/select2x2.png differ diff --git a/app/assets/images/desktop/select2/spinner.gif b/app/assets/images/desktop/select2/spinner.gif new file mode 100755 index 00000000..5b33f7e5 Binary files /dev/null and b/app/assets/images/desktop/select2/spinner.gif differ diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index c06fc1bb..75273d61 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -223,7 +223,7 @@ var orbitDesktop = function(dom){ $(window).resize(function(){ var ww = $(window).width(); $("img#thmbackground").attr({"width":ww}); - if( $('.tinycanvas').length > 0 ){ $('.tinycanvas').tinyscrollbar_update(); } + if( $('.tinycanvas').length > 0 ){ $('.tinycanvas').tinyscrollbar_update('relative'); } if($(o.contentHolder).find("div.app_frame").length > 0){ $(o.contentHolder).find("div.app_frame").each(function(){ var app_holder_height = $(this).height() - 72; @@ -286,9 +286,10 @@ var orbitDesktop = function(dom){ }; this.layout_data = function(h){ - var $e; - var column_container,layout, base_width , no_of_entries = 0, pagination_link , pagination_variable; + var $e; + var column_container,layout, base_width, total_width, gutter, no_of_entries = 0, pagination_link, pagination_variable; o.paging = true; + gutter = (!isNaN(gutter)) ? gutter : 12; this.layout_data.generate_layout_html = function(l){ $e = $("
"); $e.html(l); @@ -300,6 +301,7 @@ var orbitDesktop = function(dom){ total_columns++; temp_div.append(column_container.html()); var entries = []; + total_width = "auto"; break; case "datalist": no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4); @@ -308,37 +310,35 @@ var orbitDesktop = function(dom){ if(entries.length != 0){ entries.each(function(i,li){ if(x == 0){ - column = $("
').addClass("datalist_item").height(height_percentage+"%"); column.find("ul").eq(0).append(li); x++; if(x == no_of_entries){ x = 0; - temp_div.append(column); - } - }) - if(x != 0){ temp_div.append(column); } } + total_width = (!isNaN(base_width)) ? (base_width + gutter*2 +1) * total_columns : null; break; case "column": var entries = column_container.find("div[column=true]"),x = 0,column; if(entries.length!=0){ entries.each(function(i,ul){ - column = $("
'); $("div[container=true]").find("div.tinycanvas").prepend('
'); @@ -646,7 +646,7 @@ var orbitDesktop = function(dom){ if(tile.data_category == "app") $li = $('
  • '+tile.title+'

  • '); else - $li = $('
  • Loading...

    '+tile.title+'

  • '); + $li = $('
  • Loading

    '+tile.title+'

  • '); row = row + y; @@ -1448,15 +1448,12 @@ var orbitDesktop = function(dom){ } this.loadWallpaper = function(wallpaper){ // this is to load new wallpaper - if(!wallpaper)wallpapernm = o.themesettings.background;else wallpapernm = wallpaper - var ww = $(window).width(); - var wh = $(window).height(); - if(!wallpaper) - $("img#thmbackground").attr({"src":"/"+o.themefolder+"/"+o.theme+"/images/"+wallpapernm,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"}); - else - $("img#thmbackground").attr({"src":o.wallpaperPath+wallpaper,"width":ww}).css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","height":"auto"}); - - $("div#bgover").css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","width":ww,"height":wh}); + wallpapernm = (!wallpaper) ? o.themesettings.background : wallpaper; + if(!wallpaper){ + $("img#thmbackground").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+wallpapernm); + } else { + $("img#thmbackground").attr("src",o.wallpaperPath+wallpaper); + } }; this.loadIconCache = function(){ // this function load or refresh icon cache for the theme diff --git a/app/assets/javascripts/orbitdesktopAPI.js b/app/assets/javascripts/orbitdesktopAPI.js index 66308860..c315b3f4 100644 --- a/app/assets/javascripts/orbitdesktopAPI.js +++ b/app/assets/javascripts/orbitdesktopAPI.js @@ -201,6 +201,12 @@ var orbitDesktopAPI = function(){ }); } } + }; + this.use_select2 = function(){ + $('select:not(.select2-offscreen)').select2({ + minimumResultsForSearch: -1 + // minimumInputLength: -1 + }); } }; orbitDesktopAPI.prototype.notifyImgPath = "temp"; diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index f3d3f91e..f797b068 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -13,7 +13,7 @@ *= require desktop/desktop-component *= require desktop/desktop-main *= require desktop/desktop-media + *= require desktop/desktop-select2 *= require desktop/desktop-timeline *= require orbit-bar - *= require select2 */ diff --git a/app/assets/stylesheets/desktop/_desktop-helper.scss b/app/assets/stylesheets/desktop/_desktop-helper.scss new file mode 100644 index 00000000..fda67a86 --- /dev/null +++ b/app/assets/stylesheets/desktop/_desktop-helper.scss @@ -0,0 +1,32 @@ +$gray: #ddd; + +@mixin font-main($font-size) { + font-family: "Source Sans Pro", sans-serif; + font-size: #{$font-size}px; + font-weight: 300; +} +@mixin font-sub($font-size) { + font-family: "Source Sans Pro", Arial, sans-serif; + font-size: #{$font-size}px; + font-weight: 300; +} +@mixin transition-type($property, $sec) { + -webkit-transition: #{$property} #{$sec}s ease; + -moz-transition: #{$property} #{$sec}s ease; + transition: #{$property} #{$sec}s ease; +} +@mixin box-sizing { + -webkit-box-sizing: border-box; /* webkit */ + -khtml-box-sizing: border-box; /* konqueror */ + -moz-box-sizing: border-box; /* firefox */ + -ms-box-sizing: border-box; /* ie */ + box-sizing: border-box; /* css3 */ +} +@mixin no-select { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} \ No newline at end of file diff --git a/app/assets/stylesheets/desktop/desktop-compatibility.css b/app/assets/stylesheets/desktop/desktop-compatibility.css index 27bd5c96..440a4a43 100644 --- a/app/assets/stylesheets/desktop/desktop-compatibility.css +++ b/app/assets/stylesheets/desktop/desktop-compatibility.css @@ -96,16 +96,16 @@ body { .desc { font-size: 13px; - color: #333; + font-weight: normal; line-height: 1.2em; - font-family: Arial, sans-serif; + color: #333; width: 100%; } .desc h1 { font-size: 21px; + font-weight: normal; padding: 16px 0; *padding: 10px 0; - font-family: Cuprum, sans-serif; color: #000; } diff --git a/app/assets/stylesheets/desktop/desktop-component.css b/app/assets/stylesheets/desktop/desktop-component.css index 6393da52..9a1615f8 100644 --- a/app/assets/stylesheets/desktop/desktop-component.css +++ b/app/assets/stylesheets/desktop/desktop-component.css @@ -1,425 +1,377 @@ +.noSelect { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +/* tinygrid */ +.s_grid_row { + overflow: hidden; + position: relative; + margin-bottom: 12px; } + .s_grid_row .s_grid { + float: left; + margin: 0 0 0 12px; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + .s_grid_row .s_grid:first-child { + margin-left: 0; } + .s_grid_row .s_grid_1 { + width: 24px; } + .s_grid_row .s_grid_2 { + width: 60px; } + .s_grid_row .s_grid_3 { + width: 96px; } + .s_grid_row .s_grid_4 { + width: 132px; } + .s_grid_row .s_grid_5 { + width: 168px; } + .s_grid_row .s_grid_6 { + width: 204px; } + .s_grid_row .s_grid_7 { + width: 240px; } + .s_grid_row .s_grid_8 { + width: 276px; } + .s_grid_row .s_grid_9 { + width: 312px; } + .s_grid_row .s_grid_10 { + width: 348px; } + .s_grid_row .s_grid_11 { + width: 384px; } + .s_grid_row .s_grid_12 { + width: 420px; } + .s_grid_row:last-child { + margin-bottom: 0; } + .s_grid_row .s_grid_h_1 { + height: 32px; } + .s_grid_row .s_grid_h_2 { + height: 76px; } + .s_grid_row .s_grid_h_3 { + height: 120px; } + .s_grid_row .s_grid_h_4 { + height: 164px; } + .s_grid_row .s_grid_h_5 { + height: 208px; } + .s_grid_row .s_grid_h_6 { + height: 252px; } + .s_grid_row .s_grid_h_7 { + height: 296px; } + .s_grid_row .s_grid_h_8 { + height: 340px; } + .s_grid_row .s_grid_h_9 { + height: 384px; } + .s_grid_row .s_grid_h_10 { + height: 428px; } + /* simple dropdown menu */ .sdm { - position: relative; -} -.sdm_t { - cursor: default; - -webkit-transition: all 0.3s ease; - -moz-transition: all 0.3s ease; - transition: all 0.3s ease; -} + position: relative; } + +.sdm_t { + cursor: default; + -webkit-transition: all 0.3s ease; + -moz-transition: all 0.3s ease; + transition: all 0.3s ease; } + .sdm:hover .sdm_o { - display: block; -} + display: block; } + .sdm_o { - display: none; - position: absolute; - z-index: 9; - left: 0; - top: 60px; - font-size: 15px; - } + display: none; + position: absolute; + z-index: 9; + left: 0; + top: 60px; + font-size: 15px; } + .sdm_o li { - border-top: solid 1px #f2f2f2; -} + border-top: solid 1px #f2f2f2; } + .sdm_o li:first-child { - border: none; -} + border: none; } + .sdm_o a { - display: block; -} + display: block; } + .sdm_o .admtxt { - display: block; - line-height: 36px; -} + display: block; + line-height: 36px; } /* simple dropdown menu with indicator */ .sdm_mdr .sdm_t { - padding-right: 12px; -} + padding-right: 12px; } + .sdm_mdr .mdr { - position: absolute; - right: 0; -} + position: absolute; + right: 0; } /* simple menu */ -.s_menu { - font-size: 15px; - line-height: 36px; -} +.s_menu { + font-size: 15px; + line-height: 36px; } + .s_menu li { - border-top: solid 1px #ddd; -} + border-top: solid 1px #dddddd; } + .s_menu li:first-child { - border: none; -} + border: none; } + .s_menu a { - display: block; -} + display: block; } /* simple tabs */ .s_tab { - font-size: 15px; - line-height: 36px; -} -.stb_h {} -.stb_v {} + font-size: 15px; + line-height: 36px; } + .s_tab ul { - overflow: hidden; -} + overflow: hidden; } + .s_tab li { - float: left; -} + float: left; } + .s_tab a { - display: block; -} + display: block; } + .s_tab .admbg { - background-color: #f0f0f0; -} + background-color: #f0f0f0; } + .st_c { - display: none; -} + display: none; } + .st_c:first-child { - display: block; -} + display: block; } /* simple form */ .s_form { - font-size: 15px; -} -.s_form li { - overflow: hidden; - padding: 6px; - margin-bottom: 12px; - position: relative; -} -.s_form .s_grid_row { - padding: 3px; - margin-bottom: 6px; -} -.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], -.s_form textarea{ - outline: solid 3px #f6f6f6; - border: solid 1px #eee; - font-size: 15px; - font-family: Arial !important; - margin: 0; - padding: 6px; - -webkit-transition: all 0.3s ease; - -moz-transition: all 0.3s ease; - transition: all 0.3s ease; -} -.s_form select { - font-family: Arial !important; - padding: 6px; height: auto; -} -.s_form input[type=file] { - margin: 0px; - vertical-align: baseline; -} -.s_form input[type=text]:focus, -.s_form input[type=password]:focus, -.s_form textarea:focus { - background-color: #333; - color: #fff; -} -.s_form textarea { - resize: none; -} + font-size: 15px; } + .s_form label { + font-size: 13px; + font-weight: normal; + display: inline-block; + vertical-align: middle; + width: 100px; + margin-right: 24px; + color: #777; } + .s_form label.s_grid { + line-height: 32px; } + .s_form input[type=text], + .s_form input[type=password], + .s_form select { + height: 32px; + margin-top: 0; + margin-bottom: 0; } + .s_form input[type=file] { + vertical-align: baseline; } + .s_form input[type=text], + .s_form input[type=password], + .s_form textarea { + border: solid 1px #dddddd; + font-size: 15px; + margin-top: 0; + margin-bottom: 0; + padding: 6px; + -webkit-transition: all 0.3s ease; + -moz-transition: all 0.3s ease; + transition: all 0.3s ease; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + .s_form input[type=text]:focus, + .s_form input[type=password]:focus, + .s_form textarea:focus { + background-color: #f7f7f7; } + .s_form textarea { + resize: none; } + .s_form textarea.full_height { + height: 456px; } + .s_form .s_table { + width: 100%; } + .s_form .s_table th, + .s_form .s_table td { + padding: 6px 0; } + .s_form .s_table th { + text-align: left; } + .s_form .s_table td { + vertical-align: middle; } + .s_form .s_table thead th { + border-bottom: solid 1px #eeeeee; } + .check_box_g { - padding: 4px 8px; - outline: solid 1px #eee; -} -.check_box_g > label { - font-size: 15px; - display: block; - padding: 4px 0; -} -.check_box_g li { - margin: 0 6px 6px 0; - padding: 0; -} -.check_box_g li, -.check_box_g li > * { - display: inline-block; - vertical-align: middle; -} -.check_box_g label { - width: auto; - margin: 0; -} -.check_box_g li label { - padding-left: 4px; - font-family: Arial; -} -.s_form .input_append { - position: absolute; - width: 30px; - height: 30px; - line-height: 30px; - right: 5px; - top: 5px; - display: block; - background-color: #fff; -} -.s_form.s_grid_con { - width: 416px; -} -.s_form .s_grid_row { - width: 410px; -} -.s_form .s_grid_row .s_grid:first-child { - margin-left: 0; -} -.s_form input[type=text].s_grid, -.s_form input[type=passowrd].s_grid, -.s_form textarea.s_grid, -.s_form label.s_grid, -.s_form select.s_grid { - margin-left: 10px; -} -.s_form input[type=text].s_grid_1, -.s_form input[type=passowrd].s_grid_1, -.s_form textarea.s_grid_1 { - width: 46px; -} -.s_form input[type=text].s_grid_2, -.s_form input[type=passowrd].s_grid_2, -.s_form textarea.s_grid_2 { - width: 116px; -} -.s_form input[type=text].s_grid_3, -.s_form input[type=passowrd].s_grid_3, -.s_form textarea.s_grid_3 { - width: 186px; -} -.s_form input[type=text].s_grid_4, -.s_form input[type=passowrd].s_grid_4, -.s_form textarea.s_grid_4 { - width: 256px; -} -.s_form input[type=text].s_grid_5, -.s_form input[type=passowrd].s_grid_5, -.s_form textarea.s_grid_5 { - width: 326px; -} -.s_form input[type=text].s_grid_6, -.s_form input[type=passowrd].s_grid_6, -.s_form textarea.s_grid_6 { - width: 396px; -} -.s_form select.s_grid_1 { - width: 60px; -} -.s_form select.s_grid_2 { - width: 130px; -} -.s_form select.s_grid_3 { - width: 200px; -} -.s_form select.s_grid_4 { - width: 270px; -} -.s_form select.s_grid_5 { - width: 340px; -} -.s_form select.s_grid_6 { - width: 410px; -} -.s_form label.s_grid { - line-height: 34px; -} -.s_form select.s_grid { - height: 26px; - margin-top: 4px; - margin-bottom: 4px; -} -.s_form textarea.full_height { - height: 436px; -} -.s_form .s_table { - width: 100%; -} -.s_form .s_table th, -.s_form .s_table td { - padding: 6px 0; -} -.s_form .s_table th { - text-align: left; -} -.s_form .s_table td { - vertical-align: middle; -} -.s_form .s_table thead th { - border-bottom: solid 1px #eee; -} + padding: 4px 8px; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + .check_box_g li { + margin: 0 6px 6px 0; + padding: 0; } + .check_box_g li, + .check_box_g li > * { + display: inline-block; + vertical-align: middle; } + .check_box_g label { + width: auto; + margin: 0; } + .check_box_g > label { + font-size: 15px; + display: block; + padding: 4px 0; } + .check_box_g li label { + padding-left: 4px; } /* tool bar */ .toolbar { - background-color: #f0f0f0; - font-size: 15px; - line-height: 36px; - position: relative; - z-index: 9; -} -.toolbar .sdm, .toolbar .fn_g { - display: inline-block; - vertical-align: top; -} -.toolbar .sdm_o { - top: 36px; - background-color: #f0f0f0; -} -.toolbar button { - border: none; - outline: none; - padding: 0 16px; - margin: 0; - font-family: inherit; - font-size: 15px; - vertical-align: top; -} -.toolbar .fn_btn { - display: inline-block; - vertical-align: top; -} + background-color: #f0f0f0; + font-size: 15px; + line-height: 36px; + position: relative; + z-index: 9; } -/* tinygrid */ -.s_grid_con { - width: 410px; -} -.s_grid_row { - overflow: hidden; - margin-bottom: 12px; -} -.s_grid_row .s_grid:first-child { - margin-left: 0; -} -.s_grid { - float: left; - margin: 0 0 0 10px; -} -.s_grid_con .s_grid_1 { - width: 60px; -} -.s_grid_con .s_grid_2 { - width: 130px; -} -.s_grid_con .s_grid_3 { - width: 200px; -} -.s_grid_con .s_grid_4 { - width: 270px; -} -.s_grid_con .s_grid_5 { - width: 340px; -} -.s_grid_con .s_grid_6 { - width: 410px; -} +.toolbar .sdm, .toolbar .fn_g { + display: inline-block; + vertical-align: top; } + +.toolbar .sdm_o { + top: 36px; + background-color: #f0f0f0; } + +.toolbar button { + border: none; + outline: none; + padding: 0 16px; + margin: 0; + font-family: inherit; + font-size: 15px; + vertical-align: top; } + +.toolbar .fn_btn { + display: inline-block; + vertical-align: top; } /* tiny scrollbar */ .tinycanvas { - overflow: hidden; - position: relative; - height: 100%; -} -.tinycanvas .viewport { - width: auto; - height: 100%; - overflow: hidden; - position: relative; -} -.tinycanvas .overview { - position: absolute; - left: 0; - top: 0; - min-width: 100%; - height: 100%; -} -.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; -} -.noSelect { - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none; -} -.tinycanvas .scrollbar { - position: absolute; - z-index: 9; - visibility: hidden; - opacity: 0; - -webkit-transition: opacity 0.3s ease; - -moz-transition: opacity 0.3s ease; - transition: opacity 0.3s ease; -} -.tinycanvas .scrollbar.dragging { - opacity: 1; - visibility: visible; -} -.tinycanvas .scrollbar.sb_h { - left: 0; - bottom: -6px; - height: 6px; -} -.tinycanvas .scrollbar.sb_v { - right: 0; - top: 0; - width: 6px; -} -.tinycanvas .scrollbar.disable, -.tinycanvas:hover .scrollbar.disable { - visibility: hidden !important; -} -.tinycanvas:hover .scrollbar { - visibility: visible; - opacity: 1; -} -.tinycanvas .overview > .column { - float: left; - border-left: solid 1px #eee; - padding: 0 12px; - height: 100%; -} -.tinycanvas .overview > .column:first-child { - padding-left: 0; - border-left: 0; -} -.tinycanvas .overview > .column > ul { - height: 100%; -} -.tinycanvas .overview > .column .datalist_item { - overflow: hidden; -} + overflow: hidden; + position: relative; + height: 100%; } + .tinycanvas .viewport { + width: auto; + height: 100%; + overflow: hidden; + position: relative; } + .tinycanvas .overview { + position: absolute; + left: 0; + top: 0; + min-width: 100%; + height: 100%; } + .tinycanvas .overview > .column { + float: left; + border-right: solid 1px #eeeeee; + padding: 0 12px 0 0; + margin: 0 12px 0 0; + height: 100%; } + .tinycanvas .overview > .column:last-child { + padding-right: 0; + margin-right: 0; + border-right: 0; } + .tinycanvas .overview > .column > ul { + height: 100%; } + .tinycanvas .overview > .column .datalist_item { + overflow: hidden; + padding-top: 3px; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + .tinycanvas .overview > .column .datalist_item:first-child { + padding-top: 0; } + .tinycanvas .overview > .column .datalist_item .inner { + position: relative; + width: 100%; + height: 100%; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + .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 .scrollbar { + position: absolute; + z-index: 9; + visibility: hidden; + opacity: 0; + -webkit-transition: opacity 0.3s ease; + -moz-transition: opacity 0.3s ease; + transition: opacity 0.3s ease; } + .tinycanvas .scrollbar.dragging { + opacity: 1; + visibility: visible; } + .tinycanvas .scrollbar.sb_h { + left: 0; + bottom: -6px; + height: 6px; } + .tinycanvas .scrollbar.sb_v { + right: 0; + top: 0; + width: 6px; } + .tinycanvas .scrollbar.disable, .tinycanvas:hover .scrollbar.disable { + visibility: hidden !important; } + .tinycanvas:hover .scrollbar { + visibility: visible; + opacity: 1; } + .toolbar + .tinycanvas, .s_tab + .tinycanvas { - height: 480px; -} \ No newline at end of file + height: 480px; } + +#panel_r .tinycanvas { + padding: 12px 0; } diff --git a/app/assets/stylesheets/desktop/desktop-font.css b/app/assets/stylesheets/desktop/desktop-font.css index d0a9ec09..858fd90a 100644 --- a/app/assets/stylesheets/desktop/desktop-font.css +++ b/app/assets/stylesheets/desktop/desktop-font.css @@ -1 +1 @@ -@import url(http://fonts.googleapis.com/css?family=Cuprum|Dosis:400,700|Roboto+Condensed:400,700); \ No newline at end of file +@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700|Oxygen:400,300,700); diff --git a/app/assets/stylesheets/desktop/desktop-main.css b/app/assets/stylesheets/desktop/desktop-main.css index d917679d..2894694e 100644 --- a/app/assets/stylesheets/desktop/desktop-main.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -2,7 +2,6 @@ v2.0 | 20110126 License: none (public domain) */ - html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -12,732 +11,824 @@ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; } + #container input, #container textarea, #container select, #container input:focus, #container textarea:focus { - border-radius: 0; - box-shadow: none; - font-family: inherit; -} + border-radius: 0; + box-shadow: none; + font-family: inherit; } + /* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { - display: block; -} + display: block; } + body { - line-height: 1; -} + line-height: 1; } + ol, ul { - list-style: none; -} + list-style: none; } + blockquote, q { - quotes: none; -} + quotes: none; } + blockquote:before, blockquote:after, q:before, q:after { - content: ''; - content: none; -} + content: ''; + content: none; } + table { - border-collapse: collapse; - border-spacing: 0; -} + border-collapse: collapse; + border-spacing: 0; } /* basic setting */ body { - font-family: Cuprum, Arial, "Sans Serif"; - font-size: 12px; - background-color: #000; - } -a, a:hover { text-decoration: none; color: #666; } -a:focus { outline: none; } -.clear { clear: both; } + font-family: "Source Sans Pro", sans-serif; + font-size: 12px; + font-weight: 300; + background-color: #000; } + +a, a:hover { + text-decoration: none; + color: #666; } + +a:focus { + outline: none; } + +.clear { + clear: both; } + +.clear:after { + display: table; + width: 100%; + content: ''; } + +.o-loading { + font-size: 13px; + font-weight: normal; } + .o-loading i { + font-size: 20px; } + +#thmbackground { + min-height: 100%; + min-width: 980px; + width: 100%; + height: auto; + position: fixed; + top: 0; + left: 0; + z-index: -1; } + +#bgover { + position: fixed; + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: -1; + width: 100%; + height: 100%; } /* box-sizing element */ .w1, .w2, .w4, .wh1, .wh2, .wh3, .w100, .pw, .h1, .h2, .h4, .hh1, .hh2, .hh3, .ph, .appholder, .appname, -.tinycanvas, -.tinycanvas .overview > .column, -.tinycanvas .overview > .column .datalist_item { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} +.tinycanvas { + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } /* Desktop Global Style */ -.admbg { background-color: #fff; } -.admbg2 { background-color: #ddd; } -.admtxt { color: #666; } -.admtxt:hover { color: #666; } +.admbg { + background-color: #fff; } + +.admbg2 { + background-color: #ddd; } + +.admtxt { + color: #666; } + +.admtxt:hover { + color: #666; } + .hfn { - font-size: 15px; - line-height: 36px; - float: left; - margin: 12px 12px 0 0; - position: relative; - } -.thmtxt { position: relative; } + font-size: 15px; + line-height: 36px; + float: left; + margin: 12px 12px 0 0; + position: relative; } + +.thmtxt { + position: relative; } + .ini_input { - margin: 0; - padding: 0; - border: 0; - } -.ini_input:focus { outline: none; } + margin: 0; + padding: 0; + border: 0; } + +.ini_input:focus { + outline: none; } /* - Opacity */ -.op10 { opacity: 1; } -.op09 { opacity: 0.9; } -.op08 { opacity: 0.8; } -.op07 { opacity: 0.7; } -.op06 { opacity: 0.6; } -.op05 { opacity: 0.5; } -.op04 { opacity: 0.4; } -.op03 { opacity: 0.3; } -.op02 { opacity: 0.2; } -.op01 { opacity: 0.1; } -.op00 { opacity: 0; } +.op00 { + opacity: 0; } + +.op01 { + opacity: 0.1; } + +.op02 { + opacity: 0.2; } + +.op03 { + opacity: 0.3; } + +.op04 { + opacity: 0.4; } + +.op05 { + opacity: 0.5; } + +.op06 { + opacity: 0.6; } + +.op07 { + opacity: 0.7; } + +.op08 { + opacity: 0.8; } + +.op09 { + opacity: 0.9; } + +.op10 { + opacity: 1; } /* - box set */ -.w1 { width: 120px; } -.w2 { width: 252px; } -.w4 { width: 512px; } -.wh1 { width: 36px; } -.wh2 { width: 60px; } -.wh3 { width: 84px; } -.w100 { width: 100%; } -.pw { width: 540px; } +.w1 { + width: 120px; } -.h1 { height: 120px; } -.h2 { height: 252px; } -.h4 { height: 512px; } -.hh1 { height: 36px; } -.hh2 { height: 60px; } -.hh3 { height: 84px; } -.ph { height: 516px; } +.w2 { + width: 252px; } + +.w4 { + width: 512px; } + +.wh1 { + width: 36px; } + +.wh2 { + width: 60px; } + +.wh3 { + width: 84px; } + +.w100 { + width: 100%; } + +.pw { + width: 540px; } + +.h1 { + height: 120px; } + +.h2 { + height: 252px; } + +.h4 { + height: 512px; } + +.hh1 { + height: 36px; } + +.hh2 { + height: 60px; } + +.hh3 { + height: 84px; } + +.ph { + height: 516px; } + +.hp { + padding-left: 12px; + padding-right: 12px; } + +.vp { + padding-top: 12px; + padding-bottom: 12px; } -.hp { padding-left: 12px; padding-right: 12px; } -.vp { padding-top: 12px; padding-bottom: 12px; } .element { - margin: 0 12px 12px 0; - float: left; - position: relative; - display:inline-block; - } -.group{ - float: left; - margin-right: 24px; -} + margin: 0 12px 12px 0; + float: left; + position: relative; } + +.group { + float: left; + margin-right: 24px; } /* desktop layout */ #container { - padding: 48px 0 0 156px; - } -#header { - padding: 0 0 12px 0; - min-width: 800px; - height: 72px; - } -#side { - width: 60px; - height: 516px; - position: absolute; - margin-right: 96px; - top: 120px; - left: 0; - z-index: 11; - } -#holder { - height: 516px; - width: auto; - position: relative; - } -#rwidget { - height: 516px; - } -.widget_fn { - display: block; - overflow: hidden; - } -.widget_icon { - display: block; - width: 30px; - height: 30px; - margin: 15px 0 0 15px; - } -.docklist {} -.docklist li { - position: relative; - } -.dock_child { - display: none; - overflow: hidden; - position: absolute; - left: 60px; - top: 0; - } -.docklist > li:hover .dock_child { display: block; } -.dock_item { float: left; } -.fn_des.admtxt { - line-height: 60px; - padding: 0 6px; - font-size: 15px; - position: absolute; - z-index: 9; - min-width: 48px; - text-align: center; - white-space: nowrap; - display: none; - } + padding: 48px 0 0 156px; } + +#header { + padding: 0 0 12px 0; + min-width: 800px; + height: 72px; } + +#side { + width: 60px; + height: 516px; + position: absolute; + margin-right: 96px; + top: 120px; + left: 0; + z-index: 11; } + +#holder { + height: 516px; + width: auto; + position: relative; } + +#rwidget { + height: 516px; } + +.widget_fn { + display: block; + overflow: hidden; } + +.widget_icon { + display: block; + width: 30px; + height: 30px; + margin: 15px 0 0 15px; } + +.docklist .d_cate { + position: relative; } + .docklist .d_cate .dock_child { + display: none; + overflow: hidden; + position: absolute; + left: 60px; + top: 0; } + .docklist .d_cate .dock_child .dock_item { + float: left; } +.docklist .d_cate:hover .dock_child { + display: block; } + +.fn_des.admtxt { + line-height: 60px; + padding: 0 6px; + font-size: 15px; + position: absolute; + z-index: 9; + min-width: 48px; + text-align: center; + white-space: nowrap; + display: none; } + +#search_app { + position: relative; + background-color: #fff; } + #search_app .form { + position: absolute; + left: 0; + top: 2px; + padding: 2px 12px; + width: 192px; + height: 28px; + line-height: 28px; + background: none; + border: 0; } + #search_app .submit { + position: absolute; + right: 2px; + top: 2px; + width: 32px; + height: 32px; + overflow: hidden; + text-indent: -999px; + cursor: pointer; } -#search_app { - position: relative; - background-color: #fff; -} -#search_app .form { - position: absolute; - left: 0; - top: 2px; - padding: 2px 12px; - width: 192px; - height: 28px; - line-height: 28px; - background: none; - border: 0; - } -#search_app .submit { - position: absolute; - right: 2px; - top: 2px; - width: 32px; - height: 32px; - overflow: hidden; - text-indent: -999px; - cursor: pointer; - } .section_label { - float: left; - width: 132px; - height:516px; - } -.section_label li { font-size: 15px; } -.section_label li:first-child { font-size: 21px; } + float: left; + width: 132px; + height: 516px; } + .section_label li { + font-size: 15px; } + .section_label li:first-child { + font-size: 18px; + font-weight: normal; } /* panel */ #panel_l { - background-color: #f0f0f0; - float: left; -} + background-color: #f0f0f0; + float: left; } + #panel_r { - margin-left: 252px; - position: relative; -} + margin-left: 252px; + position: relative; } /* Desktop Notification */ #orbitnote { - position: fixed; - top: 0; - left: 50%; - margin-left: -206px; - z-index: 99999; - width: 400px; - padding: 0 6px 6px 6px; - background-color: #000; - background-color: rgba(0,0,0,0.6); -} -.note_holder { - background-color: #f3f3f3; - border: solid 1px #fff; - border-top: none; - overflow: hidden; - padding: 24px 24px; -} -.note_type { float: left; } -.note_type img { display: block; } -.note_message { - color: #333; - margin: 10px 0 0 48px; - font-size: 15px; -} + position: fixed; + top: 0; + left: 50%; + margin-left: -206px; + z-index: 99999; + width: 400px; + padding: 0 6px 6px 6px; + background-color: #000; + background-color: rgba(0, 0, 0, 0.6); } + #orbitnote .note_holder { + background-color: #f3f3f3; + border: solid 1px white; + border-top: none; + overflow: hidden; + padding: 24px 24px; } + #orbitnote .note_holder .note_type { + float: left; } + #orbitnote .note_holder .note_type img { + display: block; } + #orbitnote .note_holder .note_message { + color: #333; + margin: 10px 0 0 48px; + font-size: 15px; + font-weight: normal; } /* Desktop Dialogue */ #orbitdiag { - position: fixed; - width: 100%; - height: 100%; - left: 0; - top: 0; - z-index: 12; -} -#orbitdiag .tile { background-color: #000; } -.diag_holder { background-color: #000; } -.diag_holder_inner { - width: 600px; - margin: 200px auto 0 auto; - position: relative; - padding: 30px 0; -} -.diag_message { - color: #fff; - font-size: 18px; - padding: 30px 0; -} -.diag_action { clear: both; text-align: right; } -.diag_btn { - display: inline-block; - line-height: 36px; - text-align: center; - font-size: 15px; - margin: 0 6px; -} -.diag_btn:hover { outline: solid 2px #fff; } + position: fixed; + width: 100%; + height: 100%; + left: 0; + top: 0; + z-index: 12; } + #orbitdiag .tile { + background-color: #000; } + #orbitdiag .diag_holder { + background-color: #000; } + #orbitdiag .diag_holder .diag_holder_inner { + width: 600px; + margin: 200px auto 0 auto; + position: relative; + padding: 30px 0; } + #orbitdiag .diag_holder .diag_holder_inner .diag_message { + color: #fff; + font-size: 18px; + padding: 30px 0; } + #orbitdiag .diag_holder .diag_holder_inner .diag_action { + clear: both; + text-align: right; } + #orbitdiag .diag_holder .diag_holder_inner .diag_btn { + display: inline-block; + margin: 0 6px; + text-align: center; + font-size: 15px; + font-weight: normal; + line-height: 36px; } + #orbitdiag .diag_holder .diag_holder_inner .diag_btn:hover { + outline: solid 2px white; } /* Tile */ .appname { - font-size: 15px; - line-height: 30px; - width: 100%; - height: 30px; - padding: 0 12px; - overflow: hidden; - cursor: default; - position: absolute; - left: 0; - bottom: 0; - z-index: 3; - } -[data-sizex="1"] .appname, .w1.h1 .appname { - text-align: center; -} -[data-sizey="2"] .appname { - font-size: 21px; -} -.hh2 .appname { - position: relative; - width: auto; - padding: 0; -} -.appicon { - display: block; - width: 60px; - height: 60px; - margin: 0 auto; - position: relative; - } -[data-sizex="1"] .appicon { - margin-top: 24px; -} -#sections .appicon { - width: 30px; - height: 30px; - float: left; - margin-right: 6px; -} + font-size: 13px; + line-height: 30px; + width: 100%; + height: 30px; + padding: 0 12px; + overflow: hidden; + cursor: default; + position: absolute; + left: 0; + bottom: 0; + z-index: 3; } + [data-sizex="1"] .appname, .w1.h1 .appname { + text-align: center; } + [data-sizey="2"] .appname { + font-size: 21px; + font-weight: normal; } + .hh2 .appname { + position: relative; + width: auto; + padding: 0; } + .fullsize .appname { + display: none; } + +.appicon { + display: block; + width: 60px; + height: 60px; + margin: 0 auto; + position: relative; } + [data-sizex="1"] .appicon { + margin-top: 24px; } + #sections .appicon { + width: 30px; + height: 30px; + float: left; + margin-right: 6px; } + .appholder { - position: relative; - z-index: 2; - padding: 12px; - padding-bottom: 30px; - width: 100%; - height: 100%; - overflow: hidden; - } -.fullsize .appholder { - position: absolute; - padding: 0; - left: 0; - top: 0; - } -.fullsize .appname { display: none; } -.dtitle { - font-size: 30px; - line-height: 60px; - float: left; - margin: 0 12px 0 0; - position: relative; - z-index: 9; - } + position: relative; + z-index: 2; + padding: 12px; + padding-bottom: 30px; + width: 100%; + height: 100%; + overflow: hidden; } + .fullsize .appholder { + position: absolute; + padding: 0; + left: 0; + top: 0; } + +.dtitle { + font-size: 30px; + line-height: 60px; + float: left; + margin: 0 12px 0 0; + position: relative; + z-index: 9; } + .tile { - display: block; - width: 100%; - height: 100%; - position: absolute; - left: 0; - top: 0; - } + display: block; + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; } + .widget.gs_w { - cursor: move; -} + cursor: move; } /* header drop menu */ -.sdm_mdr .sdm_o { top: 36px; } +.sdm_mdr .sdm_o { + top: 36px; } /* Setting Page */ -.theme_list {} -.theme_list .ssl_item, .stock_wallpaper .ssl_item { - display: inline-block; - vertical-align: top; - margin: 0 0 12px 0; - padding: 6px 0px; - width: 132px; - text-align: center; - cursor: pointer - } -.theme_thumb, .stock_wallpaper img { border: solid 1px #fff; width: 120px; margin: 0 auto; } -.theme_thumb img, .stock_wallpaper img { display: block; } -.theme_name { font-size: 15px; padding: 8px 6px; display: block; } -.theme_preview { width: 528px; height: 150px; line-height: 36px; font-size: 15px; } -.theme_plate { overflow: hidden; } -.theme_plate > div { float: left; margin-right: 12px; } -.theme_plate > div:first-child { margin-right: 48px;} -.stock_wallpaper { } -.stock_wallpaper .ssl_item { margin-bottom: 6px; } -.stock_wallpaper img { } +.theme_list .ssl_item, .stock_wallpaper .ssl_item { + display: inline-block; + vertical-align: top; + margin: 0 0 12px 0; + padding: 6px 0px; + width: 132px; + text-align: center; + cursor: pointer; } + +.theme_thumb, .stock_wallpaper img { + border: solid 1px white; + width: 120px; + margin: 0 auto; } + +.theme_thumb img, .stock_wallpaper img { + display: block; } + +.theme_name { + font-size: 15px; + padding: 8px 6px; + display: block; } + +.theme_preview { + width: 528px; + height: 150px; + line-height: 36px; + font-size: 15px; } + +.theme_plate { + overflow: hidden; } + .theme_plate > div { + float: left; + margin-right: 12px; } + .theme_plate > div:first-child { + margin-right: 48px; } + +.stock_wallpaper .ssl_item { + margin-bottom: 6px; } + +.s_title { + font-size: 21px; + font-weight: normal; + line-height: 60px; + text-align: left; } -.s_title { font-size: 15px; line-height: 60px; text-align: left; } .s_subtitle { - font-size: 13px; - line-height: 1.5em; - color: #ccc; - padding: 12px 0 24px 0; -} + font-size: 15px; + line-height: 1.5em; + color: #ccc; + padding: 12px 0 24px 0; } + .s_action { - padding: 24px 0; - margin-top: 12px; - overflow: hidden; - border-top: solid 1px #eee; - background-color: #fff; -} + padding: 24px 0; + margin-top: 12px; + overflow: hidden; + border-top: solid 1px #eeeeee; + background-color: #fff; } + .setting_btn { - display: block; - float: right; - font-size: 15px; - line-height: 36px; - text-align: center; - border: 0; -} + display: block; + float: right; + font-size: 15px; + font-weight: normal; + line-height: 36px; + text-align: center; + border: 0; } +.group_search { + float: left; + margin-right: 36px; } -.group_search{ - float: left; - margin-right: 36px; - -} -.search_result{ - float: left; - margin-right: 24px; - /*max-width: 340px;*/ -} -.g_sep { width: 11px; border-left: solid 1px #fff; } +.search_result { + float: left; + margin-right: 24px; + max-width: 340px; } +.g_sep { + width: 11px; + border-left: solid 1px white; } + +.grp { + height: 528px; + float: left; } + +.appgroup { + float: left; } -#group_wrapper {} -.grp { height:528px; float: left; } -.appgroup { float: left;} .g_col { - height: 516px; - float: left; -} -.g_col_w1 { width: 132px; } -.g_col_w2 { width: 264px; } -.ui-sortable-placeholder { background-color: rgba(0,0,0,0.2); visibility: visible !important; } + height: 516px; + float: left; } + +.g_col_w1 { + width: 132px; } + +.g_col_w2 { + width: 264px; } + +.ui-sortable-placeholder { + background-color: rgba(0, 0, 0, 0.2); + visibility: visible !important; } /* list item */ -.list_t_item { padding: 2px; overflow: hidden; } -.list_t_title { - font-size: 15px; - font-family: Arial; - margin-bottom: 6px; - color: #333; -} -.list_t_des { - font-size: 13px; - line-height: 1.5em; - color: #999; - font-family: Arial, sans-serif; - margin-bottom: 4px; -} +.list_t_item { + /*padding: 2px;*/ + overflow: hidden; } + +.list_t_title { + margin-bottom: 6px; + color: #333; + font-size: 15px; + font-weight: normal; } + +.list_t_des { + line-height: 1.5em; + color: #999; + margin-bottom: 4px; + font-size: 13px; } + +.list_item_function a { + display: inline-block; + padding: 4px; + font-size: 11px; + -webkit-text-size-adjust: none; } /* Connection Page */ -#connection_setting { height: 492px; } +#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; } + float: left; + margin: 0 12px 0 0; + padding-left: 24px; + height: 100%; + border-left: solid 1px #dddddd; } + +#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; } + 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; - -webkit-text-size-adjust: none; - transition: background-color 0.5s ease; - -moz-transition: background-color 0.5s ease; - -webkit-transition: background-color 0.5s ease; -} -#connection_setting .c_status_on { background-color: #51A351; color: #fff; } + float: right; + padding: 6px; + background-color: #eee; + color: #ccc; + font-size: 9px; + font-weight: normal; + -webkit-text-size-adjust: none; + -webkit-transition: background-color 0.5s ease; + -moz-transition: background-color 0.5s ease; + transition: background-color 0.5s ease; } + +#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; -} + padding: 7px 6px; + background-color: #fcfcfc; + cursor: default; + font-size: 18px; + font-weight: normal; } /* Journal Papers */ -#paper_list .g_col { - width: 410px; - height: 456px; - margin-left: 12px; - padding-left: 12px; - border-left: solid 1px #eee; -} -#paper_list .g_col:first-child { margin-left: 0; padding-left: 10px; border: none; } -#paper_list .list_t .list_t_item { padding-left: 30px; height: 86px; } -#paper_list .list_item_action { - font-size: 12px; - float: left; - margin-left: -30px; -} -#paper_list .list_item_function a { - display: inline-block; - padding: 4px; - font-family: Arial, sans-serif; - font-size: 11px; - -webkit-text-size-adjust: none; -} -.list_item_action a { - display: block; - width: 20px; - height: 20px; - line-height: 20px; - margin: 1px 1px 6px 1px; -} -.list_item_action .icon-star-empty { color: #999; font-size: 20px; } -.list_item_action .icon-star { color: #faa732; font-size: 20px; } -.list_item_action .icon-check-empty { color: #999; font-size: 20px; } -.list_item_action .icon-check { color: #333; font-size: 20px; } +[page-name="journal_p_list"] .list_t_item .inner { + padding-left: 30px; } -#paper_list .list_t_item.file_view { - height: 148px; -} -#paper_list .file_view .file { - display: inline-block; - width: 62px; - height: 50px; - text-align: center; -} -#paper_list .file_view .file:hover { - background-color: #ddd; -} -#paper_list .file_view .file img { - width: 24px; - display: block; - margin: 0 auto; - margin-top: 4px; -} -#paper_list .file_view .filetitle { - font-size: 11px; - -webkit-text-size-adjust: none; -} +[page-name="journal_p_list"] .list_item_action { + font-size: 12px; + float: left; + margin-left: -30px; } + +[page-name="journal_p_list"] .list_item_action a { + display: block; + width: 20px; + height: 20px; + line-height: 20px; + margin: 1px 1px 6px 1px; } + +[page-name="journal_p_list"] .list_item_action .icon-star-empty { + color: #999; + font-size: 20px; } + +[page-name="journal_p_list"] .list_item_action .icon-star { + color: #faa732; + font-size: 20px; } + +[page-name="journal_p_list"] .list_item_action .icon-check-empty { + color: #999; + font-size: 20px; } + +[page-name="journal_p_list"] .list_item_action .icon-check { + color: #333; + font-size: 20px; } + +[page-name="journal_p_list"] .list_t_item.file_view { + height: 148px; } + +[page-name="journal_p_list"] .file_view .file { + display: inline-block; + width: 62px; + height: 50px; + text-align: center; } + +[page-name="journal_p_list"] .file_view .file:hover { + background-color: #ddd; } + +[page-name="journal_p_list"] .file_view .file img { + width: 24px; + display: block; + margin: 0 auto; + margin-top: 4px; } + +[page-name="journal_p_list"] .file_view .filetitle { + font-size: 11px; + -webkit-text-size-adjust: none; } /* Journal Paper Add */ #paper_add .s_grid_con { - float: left; - height: 456px; - margin-left: 12px; - padding-left: 12px; - border-left: solid 1px #eee; -} -#paper_add .s_grid_con:first-child { margin-left: 0; padding-left: 0; border: none; } -#paper_add .f_w { width: 336px; } -#paper_add label { margin-right: 0; } + float: left; + height: 456px; + margin-left: 12px; + padding-left: 12px; + border-left: solid 1px #eeeeee; } + +#paper_add .s_grid_con:first-child { + margin-left: 0; + padding-left: 0; + border: none; } + +#paper_add .f_w { + width: 336px; } + +#paper_add label { + margin-right: 0; } /* Journal Journal list */ -#journal_list .g_col { - width: 416px; -} -#journal_list .g_col { - float: left; - height: 456px; - margin-left: 12px; - padding-left: 12px; - border-left: solid 1px #EEE; -} -#journal_list .g_col:first-child { - margin-left: 0; - padding-left: 0; - border: none; -} -#journal_list .g_col .list_t_item { - padding-left: 30px; - height: 86px; -} -#journal_list .list_item_action { - font-size: 12px; - float: left; - margin-left: -30px; -} -#journal_list .list_item_action i { - color: #999; - font-size: 20px; - display: block; - width: 20px; - height: 20px; - line-height: 20px; - margin: 1px 1px 6px 1px; -} -#journal_list .list_t_desc { - font-family: Arial, sans-serif; - font-size: 12px; - color: #999; -} +[page-name="journal_p_journal"] .datalist_item .inner { + padding-left: 30px; } + +[page-name="journal_p_journal"] .list_item_action { + font-size: 12px; + float: left; + margin-left: -30px; } + +[page-name="journal_p_journal"] .list_item_action i { + color: #999; + font-size: 20px; + display: block; + width: 20px; + height: 20px; + line-height: 20px; + margin: 1px 1px 6px 1px; } + +[page-name="journal_p_journal"] .list_t_desc { + font-family: Arial, sans-serif; + font-size: 12px; + color: #999; } /* Journal Co-Author */ -#co_author {} -#co_author .list_t_item { - height: 110px; -} -#co_author .list_item_function {} -#co_author .list_item_function a { - display: inline-block; - padding: 4px; - font-family: Arial, sans-serif; - font-size: 11px; - -webkit-text-size-adjust: none; -} -#co_author .g_col:first-child { - margin-left: 0; - padding-left: 10px; - border: none; -} -#co_author .g_col { - width: 300px; - height: 456px; - margin-left: 12px; - padding-left: 12px; - border-left: solid 1px #EEE; -} -#co_author .info { - font-family: Arial, sans-serif; -} -#co_author .info li { - margin-bottom: 8px; - color: #999; -} -#co_author .info .name { - font-size: 18px; - line-height: 24px; - color: #333; -} +[page-name="journal_p_coauthor"] .list_t_item { + height: 110px; } + +[page-name="journal_p_coauthor"] .list_item_function a { + display: inline-block; + padding: 4px; + font-family: Arial, sans-serif; + font-size: 11px; + -webkit-text-size-adjust: none; } + +[page-name="journal_p_coauthor"] .info { + font-family: Arial, sans-serif; } + +[page-name="journal_p_coauthor"] .info li { + margin-bottom: 8px; + color: #999; } + +[page-name="journal_p_coauthor"] .info .name { + font-size: 18px; + line-height: 24px; + color: #333; } + /* Journal Co-Author Relationship*/ -#co_author_relation_table .s_grid_con { - float: left; - width: 370px; - height: 456px; - margin-left: 12px; - padding-left: 12px; - border-left: solid 1px #EEE; -} -#co_author_relation_table .s_grid_con:first-child { - margin-left: 0; - padding-left: 0; - border: 0; -} -#co_author_relation_table .s_grid_row { - width: auto; - height: 64px; -} -#co_author_relation_table .edit_co_author_relation { - /*margin-left: -10px;*/ -} -#co_author_relation_table .list_item_function a { - display: inline-block; - padding: 4px; - font-family: Arial, sans-serif; - font-size: 11px; - -webkit-text-size-adjust: none; -} -#co_author_relation_table .form_space { - margin-bottom: 10px; - font-size: 18px; - font-family: Arial, sans-serif; -} +[page-name="journal_p_coauthor_relation"] .edit_co_author_relation { + /*margin-left: -10px;*/ } + +[page-name="journal_p_coauthor_relation"] .form_space { + margin-bottom: 10px; + font-size: 18px; + font-family: Arial, sans-serif; } + /* Journal New Co-Author */ #new_co_author label { - margin-right: 0; -} - + margin-right: 0; } /* App */ .app_frame { - margin: 48px 96px 48px 156px; - min-width: 800px; - min-height: 588px; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - z-index: 12; -} -.app_frame .app_holder { - background-color: #fff; - position: absolute; - width: 100%; -} -.app_frame #header .icon-remove { - display: block; - float: right; - line-height: 60px; - font-size: 20px; - cursor: pointer; -} + margin: 48px 96px 48px 156px; + min-width: 800px; + min-height: 588px; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 12; } -/* Timeline */ -#orbit #holder > .admbg { - background-color: #efefef; -} +.app_frame .app_holder { + background-color: #fff; + position: absolute; + width: 100%; } + +.app_frame #header .icon-remove { + display: block; + float: right; + line-height: 60px; + font-size: 20px; + cursor: pointer; } /*Tooltip popup */ .desktop_toolpopup { - position: absolute; - z-index: 10px; - display: none; - padding: 12px; - cursor: default; - background-color: #fff; -} -.desktop_toolpopup span { - margin: 3px 0 3px 0; -} -.desktop_toolpopup h3 { -} -.desktop_toolpopup h2 { - -} + position: absolute; + z-index: 10px; + display: none; + padding: 12px; + cursor: default; + background-color: #fff; } + .desktop_toolpopup span { + margin: 3px 0 3px 0; } diff --git a/app/assets/stylesheets/desktop/desktop-main.scss b/app/assets/stylesheets/desktop/desktop-main.scss new file mode 100644 index 00000000..6e8890fb --- /dev/null +++ b/app/assets/stylesheets/desktop/desktop-main.scss @@ -0,0 +1,790 @@ +@import "desktop-helper"; + +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +#container input, #container textarea, #container select, #container input:focus, #container textarea:focus { + border-radius: 0; + box-shadow: none; + font-family: inherit; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} + +/* basic setting */ +body { + @include font-main(12); + background-color: #000; + } +a, a:hover { text-decoration: none; color: #666; } +a:focus { outline: none; } +.clear { clear: both; } +.clear:after { + display: table; + width: 100%; + content: ''; +} +.o-loading { + font-size: 13px; + font-weight: normal; + + i { + font-size: 20px; + } +} +#thmbackground { + min-height: 100%; + min-width: 980px; + width: 100%; + height: auto; + position: fixed; + top: 0; + left: 0; + z-index: -1; +} +#bgover { + position: fixed; + top: 0; + left: 0; + bottom: 0; + right: 0; + z-index: -1; + width: 100%; + height: 100%; +} + +/* box-sizing element */ +.w1, .w2, .w4, .wh1, .wh2, .wh3, .w100, .pw, +.h1, .h2, .h4, .hh1, .hh2, .hh3, .ph, +.appholder, +.appname, +.tinycanvas/*, +.tinycanvas .overview > .column, +.tinycanvas .overview > .column .datalist_item*/ { + @include box-sizing; +} + +/* Desktop Global Style */ +.admbg { background-color: #fff; } +.admbg2 { background-color: #ddd; } +.admtxt { color: #666; } +.admtxt:hover { color: #666; } +.hfn { + font-size: 15px; + line-height: 36px; + float: left; + margin: 12px 12px 0 0; + position: relative; + } +.thmtxt { position: relative; } +.ini_input { + margin: 0; + padding: 0; + border: 0; + } +.ini_input:focus { outline: none; } + +/* - Opacity */ +@for $i from 0 through 10 { + $k: $i; + @if $k < 10 { + $k: 0#{$i}; + } + .op#{$k} { + opacity: $i * 0.1; + } +} + +/* - box set */ +.w1 { width: 120px; } +.w2 { width: 252px; } +.w4 { width: 512px; } +.wh1 { width: 36px; } +.wh2 { width: 60px; } +.wh3 { width: 84px; } +.w100 { width: 100%; } +.pw { width: 540px; } + +.h1 { height: 120px; } +.h2 { height: 252px; } +.h4 { height: 512px; } +.hh1 { height: 36px; } +.hh2 { height: 60px; } +.hh3 { height: 84px; } +.ph { height: 516px; } + +.hp { padding-left: 12px; padding-right: 12px; } +.vp { padding-top: 12px; padding-bottom: 12px; } +.element { + margin: 0 12px 12px 0; + float: left; + position: relative; + } +.group{ + float: left; + margin-right: 24px; +} + +/* desktop layout */ +#container { + padding: 48px 0 0 156px; + } +#header { + padding: 0 0 12px 0; + min-width: 800px; + height: 72px; + } +#side { + width: 60px; + height: 516px; + position: absolute; + margin-right: 96px; + top: 120px; + left: 0; + z-index: 11; + } +#holder { + height: 516px; + width: auto; + position: relative; + } +#rwidget { + height: 516px; + } +.widget_fn { + display: block; + overflow: hidden; + } +.widget_icon { + display: block; + width: 30px; + height: 30px; + margin: 15px 0 0 15px; + } +.docklist { + + .d_cate { + position: relative; + + .dock_child { + display: none; + overflow: hidden; + position: absolute; + left: 60px; + top: 0; + + .dock_item { + float: left; + } + } + } + & .d_cate:hover .dock_child { + display: block; + } +} +.fn_des.admtxt { + line-height: 60px; + padding: 0 6px; + font-size: 15px; + position: absolute; + z-index: 9; + min-width: 48px; + text-align: center; + white-space: nowrap; + display: none; +} + +#search_app { + position: relative; + background-color: #fff; + + .form { + position: absolute; + left: 0; + top: 2px; + padding: 2px 12px; + width: 192px; + height: 28px; + line-height: 28px; + background: none; + border: 0; + } + .submit { + position: absolute; + right: 2px; + top: 2px; + width: 32px; + height: 32px; + overflow: hidden; + text-indent: -999px; + cursor: pointer; + } +} +.section_label { + float: left; + width: 132px; + height:516px; + + li { + font-size: 15px; + } + li:first-child { + font-size: 18px; + font-weight: normal; + } +} + +/* panel */ +#panel_l { + background-color: #f0f0f0; + float: left; +} +#panel_r { + margin-left: 252px; + position: relative; +} + +/* Desktop Notification */ +#orbitnote { + position: fixed; + top: 0; + left: 50%; + margin-left: -206px; + z-index: 99999; + width: 400px; + padding: 0 6px 6px 6px; + background-color: #000; + background-color: rgba(0,0,0,0.6); + + .note_holder { + background-color: #f3f3f3; + border: solid 1px #fff; + border-top: none; + overflow: hidden; + padding: 24px 24px; + + .note_type { + float: left; + + img { + display: block; + } + } + .note_message { + color: #333; + margin: 10px 0 0 48px; + font-size: 15px; + font-weight: normal; + } + } +} + +/* Desktop Dialogue */ +#orbitdiag { + position: fixed; + width: 100%; + height: 100%; + left: 0; + top: 0; + z-index: 12; + + .tile { + background-color: #000; + } + .diag_holder { + background-color: #000; + + .diag_holder_inner { + width: 600px; + margin: 200px auto 0 auto; + position: relative; + padding: 30px 0; + + .diag_message { + color: #fff; + font-size: 18px; + padding: 30px 0; + } + .diag_action { + clear: both; + text-align: right; + } + .diag_btn { + display: inline-block; + margin: 0 6px; + text-align: center; + font-size: 15px; + font-weight: normal; + line-height: 36px; + + &:hover { + outline: solid 2px #fff; + } + } + } + } + +} + +/* Tile */ +.appname { + font-size: 13px; + line-height: 30px; + width: 100%; + height: 30px; + padding: 0 12px; + overflow: hidden; + cursor: default; + position: absolute; + left: 0; + bottom: 0; + z-index: 3; + + [data-sizex="1"] &, + .w1.h1 & { + text-align: center; + } + [data-sizey="2"] & { + font-size: 21px; + font-weight: normal; + } + .hh2 & { + position: relative; + width: auto; + padding: 0; + } + .fullsize & { + display: none; + } +} +.appicon { + display: block; + width: 60px; + height: 60px; + margin: 0 auto; + position: relative; + + [data-sizex="1"] & { + margin-top: 24px; + } + #sections & { + width: 30px; + height: 30px; + float: left; + margin-right: 6px; + } +} + + +.appholder { + position: relative; + z-index: 2; + padding: 12px; + padding-bottom: 30px; + width: 100%; + height: 100%; + overflow: hidden; + + .fullsize & { + position: absolute; + padding: 0; + left: 0; + top: 0; + } +} +.dtitle { + font-size: 30px; + line-height: 60px; + float: left; + margin: 0 12px 0 0; + position: relative; + z-index: 9; + } +.tile { + display: block; + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + } +.widget.gs_w { + cursor: move; +} + +/* header drop menu */ +.sdm_mdr .sdm_o { top: 36px; } + +/* Setting Page */ +.theme_list {} +.theme_list .ssl_item, .stock_wallpaper .ssl_item { + display: inline-block; + vertical-align: top; + margin: 0 0 12px 0; + padding: 6px 0px; + width: 132px; + text-align: center; + cursor: pointer + } +.theme_thumb, .stock_wallpaper img { + border: solid 1px #fff; + width: 120px; + margin: 0 auto; +} +.theme_thumb img, .stock_wallpaper img { + display: block; +} +.theme_name { + font-size: 15px; + padding: 8px 6px; + display: block; +} +.theme_preview { + width: 528px; + height: 150px; + line-height: 36px; + font-size: 15px; +} +.theme_plate { + overflow: hidden; + + > div { + float: left; + margin-right: 12px; + } + > div:first-child { + margin-right: 48px; + } +} +.stock_wallpaper { + .ssl_item { + margin-bottom: 6px; + } +} + +.s_title { + font-size: 21px; + font-weight: normal; + line-height: 60px; + text-align: left; +} +.s_subtitle { + font-size: 15px; + line-height: 1.5em; + color: #ccc; + padding: 12px 0 24px 0; +} +.s_action { + padding: 24px 0; + margin-top: 12px; + overflow: hidden; + border-top: solid 1px #eee; + background-color: #fff; +} +.setting_btn { + display: block; + float: right; + font-size: 15px; + font-weight: normal; + line-height: 36px; + text-align: center; + border: 0; +} + + +.group_search{ + float: left; + margin-right: 36px; + +} +.search_result{ + float: left; + margin-right: 24px; + max-width: 340px; +} +.g_sep { + width: 11px; + border-left: + solid 1px #fff; +} + + +#group_wrapper {} +.grp { + height:528px; + float: left; +} +.appgroup { + float: left; +} +.g_col { + height: 516px; + float: left; +} +.g_col_w1 { width: 132px; } +.g_col_w2 { width: 264px; } +.ui-sortable-placeholder { + background-color: rgba(0,0,0,0.2); + visibility: visible !important; +} + +/* list item */ +.list_t_item { /*padding: 2px;*/ overflow: hidden; } +.list_t_title { + margin-bottom: 6px; + color: #333; + font-size: 15px; + font-weight: normal; +} +.list_t_des { + line-height: 1.5em; + color: #999; + margin-bottom: 4px; + font-size: 13px; +} +.list_item_function a { + display: inline-block; + padding: 4px; + font-size: 11px; + -webkit-text-size-adjust: none; +} + +/* 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; + background-color: #eee; + color: #ccc; + font-size: 9px; + font-weight: normal; + -webkit-text-size-adjust: none; + @include transition-type("background-color",0.5); +} +#connection_setting .c_status_on { background-color: #51A351; color: #fff; } +#connection_setting .c_info { + padding: 7px 6px; + background-color: #fcfcfc; + cursor: default; + font-size: 18px; + font-weight: normal; +} + +/* Journal Papers */ +[page-name="journal_p_list"] .list_t_item .inner { padding-left: 30px; } +[page-name="journal_p_list"] .list_item_action { + font-size: 12px; + float: left; + margin-left: -30px; +} +[page-name="journal_p_list"] .list_item_action a { + display: block; + width: 20px; + height: 20px; + line-height: 20px; + margin: 1px 1px 6px 1px; +} +[page-name="journal_p_list"] .list_item_action .icon-star-empty { color: #999; font-size: 20px; } +[page-name="journal_p_list"] .list_item_action .icon-star { color: #faa732; font-size: 20px; } +[page-name="journal_p_list"] .list_item_action .icon-check-empty { color: #999; font-size: 20px; } +[page-name="journal_p_list"] .list_item_action .icon-check { color: #333; font-size: 20px; } + +[page-name="journal_p_list"] .list_t_item.file_view { + height: 148px; +} +[page-name="journal_p_list"] .file_view .file { + display: inline-block; + width: 62px; + height: 50px; + text-align: center; +} +[page-name="journal_p_list"] .file_view .file:hover { + background-color: #ddd; +} +[page-name="journal_p_list"] .file_view .file img { + width: 24px; + display: block; + margin: 0 auto; + margin-top: 4px; +} +[page-name="journal_p_list"] .file_view .filetitle { + font-size: 11px; + -webkit-text-size-adjust: none; +} + +/* Journal Paper Add */ +#paper_add .s_grid_con { + float: left; + height: 456px; + margin-left: 12px; + padding-left: 12px; + border-left: solid 1px #eee; +} +#paper_add .s_grid_con:first-child { margin-left: 0; padding-left: 0; border: none; } +#paper_add .f_w { width: 336px; } +#paper_add label { margin-right: 0; } + +/* Journal Journal list */ +[page-name="journal_p_journal"] .datalist_item .inner { + padding-left: 30px; +} +[page-name="journal_p_journal"] .list_item_action { + font-size: 12px; + float: left; + margin-left: -30px; +} +[page-name="journal_p_journal"] .list_item_action i { + color: #999; + font-size: 20px; + display: block; + width: 20px; + height: 20px; + line-height: 20px; + margin: 1px 1px 6px 1px; +} +[page-name="journal_p_journal"] .list_t_desc { + font-family: Arial, sans-serif; + font-size: 12px; + color: #999; +} + +/* Journal Co-Author */ +[page-name="journal_p_coauthor"] {} +[page-name="journal_p_coauthor"] .list_t_item { + height: 110px; +} +[page-name="journal_p_coauthor"] .list_item_function {} +[page-name="journal_p_coauthor"] .list_item_function a { + display: inline-block; + padding: 4px; + font-family: Arial, sans-serif; + font-size: 11px; + -webkit-text-size-adjust: none; +} +[page-name="journal_p_coauthor"] .info { + font-family: Arial, sans-serif; +} +[page-name="journal_p_coauthor"] .info li { + margin-bottom: 8px; + color: #999; +} +[page-name="journal_p_coauthor"] .info .name { + font-size: 18px; + line-height: 24px; + color: #333; +} +/* Journal Co-Author Relationship*/ +[page-name="journal_p_coauthor_relation"] .edit_co_author_relation { + /*margin-left: -10px;*/ +} +[page-name="journal_p_coauthor_relation"] .form_space { + margin-bottom: 10px; + font-size: 18px; + font-family: Arial, sans-serif; +} +/* Journal New Co-Author */ +#new_co_author label { + margin-right: 0; +} + + +/* App */ +.app_frame { + margin: 48px 96px 48px 156px; + min-width: 800px; + min-height: 588px; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 12; +} +.app_frame .app_holder { + background-color: #fff; + position: absolute; + width: 100%; +} +.app_frame #header .icon-remove { + display: block; + float: right; + line-height: 60px; + font-size: 20px; + cursor: pointer; +} + +/*Tooltip popup */ +.desktop_toolpopup { + position: absolute; + z-index: 10px; + display: none; + padding: 12px; + cursor: default; + background-color: #fff; + + span { + margin: 3px 0 3px 0; + } + h3 {} + h2 {} +} diff --git a/app/assets/stylesheets/desktop/desktop-select2.css b/app/assets/stylesheets/desktop/desktop-select2.css new file mode 100644 index 00000000..10b475b9 --- /dev/null +++ b/app/assets/stylesheets/desktop/desktop-select2.css @@ -0,0 +1,410 @@ +/* +Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 +*/ +.select2-container { + overflow: hidden; + display: inline-block; + /* inline-block for ie7 */ + zoom: 1; + *display: inline; + vertical-align: top; } + +.select2-container, +.select2-drop, +.select2-search, +.select2-search input { + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + +.select2-container .select2-choice { + display: block; + height: 30px; + padding: 0 0 0 8px; + overflow: hidden; + position: relative; + border: 1px solid #dddddd; + white-space: nowrap; + line-height: 30px; + color: #444; + text-decoration: none; + background-color: #fff; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.select2-container.select2-drop-above .select2-choice { + border-bottom-color: #dddddd; } + +.select2-container .select2-choice span { + margin-right: 26px; + display: block; + overflow: hidden; + white-space: nowrap; + -ms-text-overflow: ellipsis; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; } + +.select2-container .select2-choice abbr { + display: block; + width: 12px; + height: 12px; + position: absolute; + right: 26px; + top: 8px; + font-size: 1px; + text-decoration: none; + border: 0; + background: url("select2/select2.png") right top no-repeat; + cursor: pointer; + outline: 0; } + +.select2-container .select2-choice abbr:hover { + background-position: right -11px; + cursor: pointer; } + +.select2-drop-mask { + position: absolute; + left: 0; + top: 0; + z-index: 9998; + opacity: 0; } + +.select2-drop { + width: 100%; + margin-top: -1px; + position: absolute; + z-index: 9999; + top: 100%; + background: #fff; + color: #000; + border: 1px solid #dddddd; + border-top: 0; } + +.select2-drop.select2-drop-above { + margin-top: 1px; + border-top: 1px solid #dddddd; + border-bottom: 0; } + +.select2-container .select2-choice div { + display: block; + width: 20px; + height: 100%; + position: absolute; + right: 0; + top: 0; + background: #ccc; + -webkit-box-sizing: border-box; + /* webkit */ + -khtml-box-sizing: border-box; + /* konqueror */ + -moz-box-sizing: border-box; + /* firefox */ + -ms-box-sizing: border-box; + /* ie */ + box-sizing: border-box; + /* css3 */ } + +.select2-container .select2-choice div b { + display: block; + width: 100%; + height: 100%; + background: url("select2/select2.png") no-repeat 0 1px; } + +.select2-search { + display: inline-block; + width: 100%; + min-height: 26px; + margin: 0; + padding-left: 4px; + padding-right: 4px; + position: relative; + z-index: 10000; + white-space: nowrap; } + +.select2-search-hidden { + display: block; + position: absolute; + left: -10000px; } + +.select2-search input { + width: 100%; + height: auto !important; + min-height: 26px; + padding: 4px 20px 4px 5px; + margin: 0; + outline: 0; + font-family: sans-serif; + font-size: 1em; + border: 1px solid #dddddd; } + +.select2-drop.select2-drop-above .select2-search input { + margin-top: 4px; } + +.select2-search input.select2-active { + background: white image-url("select2-spinner.gif") no-repeat 100%; } + +.select2-container-active .select2-choice, +.select2-container-active .select2-choices { + outline: none; } + +.select2-dropdown-open .select2-choice { + border-bottom-color: transparent; + background-color: #eee; } + +.select2-dropdown-open .select2-choice div { + background: transparent; + border-left: none; + filter: none; } + +.select2-dropdown-open .select2-choice div b { + background-position: -18px 1px; } + +/* results */ +.select2-results { + max-height: 200px; + padding: 0 0 0 4px; + margin: 4px 4px 4px 0; + font-size: 13px; + position: relative; + overflow-x: hidden; + overflow-y: auto; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } + +.select2-results ul.select2-result-sub { + margin: 0; } + +.select2-results ul.select2-result-sub > li .select2-result-label { + padding-left: 20px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 40px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 60px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 80px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 100px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 110px; } + +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { + padding-left: 120px; } + +.select2-results li { + list-style: none; + display: list-item; + background-image: none; } + +.select2-results li.select2-result-with-children > .select2-result-label { + font-weight: bold; } + +.select2-results .select2-result-label { + padding: 4px 6px; + margin: 0; + cursor: pointer; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.select2-results .select2-highlighted { + background: #666; + color: #fff; } + +.select2-results li em { + background: #feffde; + font-style: normal; } + +.select2-results .select2-highlighted em { + background: transparent; } + +.select2-results .select2-highlighted ul { + background: white; + color: #000; } + +.select2-results .select2-no-results, +.select2-results .select2-searching, +.select2-results .select2-selection-limit { + background: #f4f4f4; + padding: 4px 7px; + font-weight: normal; + display: list-item; } + +/* +disabled look for disabled choices in the results dropdown +*/ +.select2-results .select2-disabled.select2-highlighted { + color: #666; + background: #f4f4f4; + display: list-item; + cursor: default; } + +.select2-results .select2-disabled { + background: #f4f4f4; + display: list-item; + cursor: default; } + +.select2-results .select2-selected { + display: none; } + +.select2-more-results.select2-active { + background: #f4f4f4 image-url("select2-spinner.gif") no-repeat 100%; } + +.select2-more-results { + background: #f4f4f4; + display: list-item; } + +/* disabled styles */ +.select2-container.select2-container-disabled .select2-choice { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #dddddd; + cursor: default; } + +.select2-container.select2-container-disabled .select2-choice div { + background-color: #f4f4f4; + background-image: none; + border-left: 0; } + +.select2-container.select2-container-disabled .select2-choice abbr { + display: none; } + +/* multiselect */ +.select2-container-multi .select2-choices { + height: auto !important; + height: 1%; + margin: 0; + padding: 0; + position: relative; + border: 1px solid #dddddd; + cursor: text; + overflow: hidden; + background-color: #fff; } + +.select2-locked { + padding: 3px 5px 3px 5px !important; } + +.select2-container-multi .select2-choices { + min-height: 26px; } + +.select2-container-multi.select2-container-active .select2-choices { + outline: none; } + +.select2-container-multi .select2-choices li { + float: left; + list-style: none; } + +.select2-container-multi .select2-choices .select2-search-field { + margin: 0; + padding: 0; + white-space: nowrap; } + +.select2-container-multi .select2-choices .select2-search-field input { + padding: 5px; + height: 30px; + font-family: sans-serif; + font-size: 100%; + color: #666; + outline: 0; + border: 0; + background: transparent !important; } + +.select2-container-multi .select2-choices .select2-search-field input.select2-active { + background: white image-url("select2-spinner.gif") no-repeat 100% !important; } + +.select2-default { + color: #999999 !important; } + +.select2-container-multi .select2-choices .select2-search-choice { + padding: 3px 5px 3px 18px; + margin: 3px 0 3px 5px; + position: relative; + line-height: 13px; + color: #333; + cursor: default; + border: 1px solid #dddddd; + background-color: #e4e4e4; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } + +.select2-container-multi .select2-choices .select2-search-choice span { + cursor: default; } + +.select2-container-multi .select2-choices .select2-search-choice-focus { + background: #d4d4d4; } + +.select2-search-choice-close { + display: block; + width: 12px; + height: 13px; + position: absolute; + right: 3px; + top: 4px; + font-size: 1px; + outline: none; + background: url("select2/select2.png") right top no-repeat; } + +.select2-container-multi .select2-search-choice-close { + left: 3px; } + +.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { + background-position: right -11px; } + +.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { + background-position: right -11px; } + +/* disabled styles */ +.select2-container-multi.select2-container-disabled .select2-choices { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #dddddd; + cursor: default; } + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { + padding: 3px 5px 3px 5px; + border: 1px solid #dddddd; + background-image: none; + background-color: #f4f4f4; } + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { + display: none; } + +/* end multiselect */ +.select2-result-selectable .select2-match, +.select2-result-unselectable .select2-match { + text-decoration: underline; } + +.select2-offscreen { + position: absolute; + left: -10000px; } + +/* Retina-ize icons */ +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { + .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b { + background-image: url("select2/select2x2.png") !important; + background-repeat: no-repeat !important; + background-size: 60px 40px !important; } + + .select2-search input { + background-position: 100% -21px !important; } } diff --git a/app/assets/stylesheets/desktop/desktop-select2.scss b/app/assets/stylesheets/desktop/desktop-select2.scss new file mode 100644 index 00000000..230f0d17 --- /dev/null +++ b/app/assets/stylesheets/desktop/desktop-select2.scss @@ -0,0 +1,443 @@ +@import "desktop-helper"; + +/* +Version: 3.3.1 Timestamp: Wed Feb 20 09:57:22 PST 2013 +*/ +.select2-container { + // position: relative; original setting from select2 + overflow: hidden; + display: inline-block; + /* inline-block for ie7 */ + zoom: 1; + *display: inline; + vertical-align: top; +} + +.select2-container, +.select2-drop, +.select2-search, +.select2-search input{ + @include box-sizing; +} + +.select2-container .select2-choice { + display: block; + height: 30px; + padding: 0 0 0 8px; + overflow: hidden; + position: relative; + border: 1px solid $gray; + white-space: nowrap; + line-height: 30px; + color: #444; + text-decoration: none; + background-color: #fff; + @include no-select; +} + +.select2-container.select2-drop-above .select2-choice { + border-bottom-color: $gray; +} + +.select2-container .select2-choice span { + margin-right: 26px; + display: block; + overflow: hidden; + + white-space: nowrap; + + -ms-text-overflow: ellipsis; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; +} + +.select2-container .select2-choice abbr { + display: block; + width: 12px; + height: 12px; + position: absolute; + right: 26px; + top: 8px; + + font-size: 1px; + text-decoration: none; + + border: 0; + background: url('select2/select2.png') right top no-repeat; + cursor: pointer; + outline: 0; +} +.select2-container .select2-choice abbr:hover { + background-position: right -11px; + cursor: pointer; +} + +.select2-drop-mask { + position: absolute; + left: 0; + top: 0; + z-index: 9998; + opacity: 0; +} + +.select2-drop { + width: 100%; + margin-top:-1px; + position: absolute; + z-index: 9999; + top: 100%; + + background: #fff; + color: #000; + border: 1px solid $gray; + border-top: 0; +} + +.select2-drop.select2-drop-above { + margin-top: 1px; + border-top: 1px solid $gray; + border-bottom: 0; +} + +.select2-container .select2-choice div { + display: block; + width: 20px; + height: 100%; + position: absolute; + right: 0; + top: 0; + background: #ccc; + @include box-sizing; +} + +.select2-container .select2-choice div b { + display: block; + width: 100%; + height: 100%; + background: url('select2/select2.png') no-repeat 0 1px; +} + +.select2-search { + display: inline-block; + width: 100%; + min-height: 26px; + margin: 0; + padding-left: 4px; + padding-right: 4px; + + position: relative; + z-index: 10000; + + white-space: nowrap; +} + +.select2-search-hidden { + display: block; + position: absolute; + left: -10000px; +} + +.select2-search input { + width: 100%; + height: auto !important; + min-height: 26px; + padding: 4px 20px 4px 5px; + margin: 0; + + outline: 0; + font-family: sans-serif; + font-size: 1em; + + border: 1px solid $gray; +} + +.select2-drop.select2-drop-above .select2-search input { + margin-top: 4px; +} + +.select2-search input.select2-active { + background: #fff image-url('select2-spinner.gif') no-repeat 100%; +} + +.select2-container-active .select2-choice, +.select2-container-active .select2-choices { + // border: 1px solid #5897fb; + outline: none; +} + +.select2-dropdown-open .select2-choice { + border-bottom-color: transparent; + background-color: #eee; +} + +.select2-dropdown-open .select2-choice div { + background: transparent; + border-left: none; + filter: none; +} +.select2-dropdown-open .select2-choice div b { + background-position: -18px 1px; +} + +/* results */ +.select2-results { + max-height: 200px; + padding: 0 0 0 4px; + margin: 4px 4px 4px 0; + font-size: 13px; + position: relative; + overflow-x: hidden; + overflow-y: auto; + -webkit-tap-highlight-color: rgba(0,0,0,0); +} + +.select2-results ul.select2-result-sub { + margin: 0; +} + +.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px } +.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px } +.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px } + +.select2-results li { + list-style: none; + display: list-item; + background-image: none; +} + +.select2-results li.select2-result-with-children > .select2-result-label { + font-weight: bold; +} + +.select2-results .select2-result-label { + padding: 4px 6px; + margin: 0; + cursor: pointer; + + @include no-select; +} + +.select2-results .select2-highlighted { + background: #666; + color: #fff; +} + +.select2-results li em { + background: #feffde; + font-style: normal; +} + +.select2-results .select2-highlighted em { + background: transparent; +} + +.select2-results .select2-highlighted ul { + background: white; + color: #000; +} + + +.select2-results .select2-no-results, +.select2-results .select2-searching, +.select2-results .select2-selection-limit { + background: #f4f4f4; + padding: 4px 7px; + font-weight: normal; + display: list-item; +} + +/* +disabled look for disabled choices in the results dropdown +*/ +.select2-results .select2-disabled.select2-highlighted { + color: #666; + background: #f4f4f4; + display: list-item; + cursor: default; +} +.select2-results .select2-disabled { + background: #f4f4f4; + display: list-item; + cursor: default; +} + +.select2-results .select2-selected { + display: none; +} + +.select2-more-results.select2-active { + background: #f4f4f4 image-url('select2-spinner.gif') no-repeat 100%; +} + +.select2-more-results { + background: #f4f4f4; + display: list-item; +} + +/* disabled styles */ + +.select2-container.select2-container-disabled .select2-choice { + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container.select2-container-disabled .select2-choice div { + background-color: #f4f4f4; + background-image: none; + border-left: 0; +} + +.select2-container.select2-container-disabled .select2-choice abbr { + display: none +} + + +/* multiselect */ + +.select2-container-multi .select2-choices { + height: auto !important; + height: 1%; + margin: 0; + padding: 0; + position: relative; + + border: 1px solid $gray; + cursor: text; + overflow: hidden; + + background-color: #fff; +} + +.select2-locked { + padding: 3px 5px 3px 5px !important; +} + +.select2-container-multi .select2-choices { + min-height: 26px; +} + +.select2-container-multi.select2-container-active .select2-choices { + // border: 1px solid #5897fb; + outline: none; +} +.select2-container-multi .select2-choices li { + float: left; + list-style: none; +} +.select2-container-multi .select2-choices .select2-search-field { + margin: 0; + padding: 0; + white-space: nowrap; +} + +.select2-container-multi .select2-choices .select2-search-field input { + padding: 5px; + // margin: 1px 0; + height: 30px; + font-family: sans-serif; + font-size: 100%; + color: #666; + outline: 0; + border: 0; + background: transparent !important; +} + +.select2-container-multi .select2-choices .select2-search-field input.select2-active { + background: #fff image-url('select2-spinner.gif') no-repeat 100% !important; +} + +.select2-default { + color: #999 !important; +} + +.select2-container-multi .select2-choices .select2-search-choice { + padding: 3px 5px 3px 18px; + margin: 3px 0 3px 5px; + position: relative; + + line-height: 13px; + color: #333; + cursor: default; + border: 1px solid $gray; + background-color: #e4e4e4; + @include no-select; +} +.select2-container-multi .select2-choices .select2-search-choice span { + cursor: default; +} +.select2-container-multi .select2-choices .select2-search-choice-focus { + background: #d4d4d4; +} + +.select2-search-choice-close { + display: block; + width: 12px; + height: 13px; + position: absolute; + right: 3px; + top: 4px; + font-size: 1px; + outline: none; + background: url('select2/select2.png') right top no-repeat; +} + +.select2-container-multi .select2-search-choice-close { + left: 3px; +} + +.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover { + background-position: right -11px; +} +.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close { + background-position: right -11px; +} + +/* disabled styles */ +.select2-container-multi.select2-container-disabled .select2-choices{ + background-color: #f4f4f4; + background-image: none; + border: 1px solid #ddd; + cursor: default; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice { + padding: 3px 5px 3px 5px; + border: 1px solid #ddd; + background-image: none; + background-color: #f4f4f4; +} + +.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close { + display: none; +} +/* end multiselect */ + + +.select2-result-selectable .select2-match, +.select2-result-unselectable .select2-match { + text-decoration: underline; +} + +.select2-offscreen { + position: absolute; + left: -10000px; +} + +/* Retina-ize icons */ + +@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) { + .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b { + background-image: url('select2/select2x2.png') !important; + background-repeat: no-repeat !important; + background-size: 60px 40px !important; + } + .select2-search input { + background-position: 100% -21px !important; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/desktop/desktop-timeline.css.erb b/app/assets/stylesheets/desktop/desktop-timeline.css.erb index 54977013..6c5a1096 100644 --- a/app/assets/stylesheets/desktop/desktop-timeline.css.erb +++ b/app/assets/stylesheets/desktop/desktop-timeline.css.erb @@ -1,6 +1,9 @@ #orbit .viewport { background: -1px 4px url(<%= asset_path "timeline/ruler.png" %>) repeat-x; } +#orbit #holder > .admbg { + background-color: #efefef; +} .time_nav a, .time_nav_c a { display: block; } diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index 66c5d18f..f568336a 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -2,10 +2,10 @@
    Section Names
    sample desciption
    diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index badbbdf4..f370c861 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -2,13 +2,13 @@
    Password Managment
    <%= form_for(resource, :as => resource_name, :url => users_passwd_path(resource_name), :html => { :method => :put, "form-type"=>"ajax_form" ,"callback-method"=>"passwordUpdate" }) do |f| %>
      -
    • <%= f.label :current_password %> +
    • <%= f.label :current_password %> <%= f.password_field :current_password %>
    • -
    • <%= f.label :password %> +
    • <%= f.label :password %> <%= f.password_field :password %>
    • -
    • <%= f.label :password_confirmation %> +
    • <%= f.label :password_confirmation %> <%= f.password_field :password_confirmation %>
    <%= f.submit "Update", :class => "setting_btn thmc1 thmtxt w1 hh1 hp" %>
    diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb index 5bbe30fe..dfa5f813 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb @@ -7,8 +7,8 @@
    • - <%= f.label :co_author, class: "s_grid s_grid_2" %> - <%= f.text_field :co_author, class: "s_grid_4 s_grid"%> + <%= f.label :co_author, class: "s_grid s_grid_4" %> + <%= f.text_field :co_author, class: "s_grid_8 s_grid"%>
    • - <%= f.label :email, class: "s_grid s_grid_2"%> - <%= f.text_field :email, class: "s_grid s_grid_4" %> + <%= f.label :email, class: "s_grid s_grid_4"%> + <%= f.text_field :email, class: "s_grid s_grid_8" %>
    • - <%= f.label :type, class: "s_grid s_grid_2"%> - <%= options_for_select( @conference_co_author_relations.map do |relation| [relation.relation, relation.id] diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb index 91af1497..eadc9b49 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb @@ -31,14 +31,14 @@
    --> -
    +
    • <%= f.fields_for :paper_title_translations do |f| %> <%= f.text_area locale, - class: "s_grid_6 s_grid", + class: "s_grid_12 s_grid_h_2 s_grid", size: "20x2", placeholder: t("personal_conference.paper_title"), value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %> @@ -49,18 +49,19 @@ <%= f.text_field locale, size: "20", placeholder: t("personal_conference.conference_title"), - class: "s_grid_6 s_grid", + class: "s_grid_12 s_grid", # "autocomplete-list" => "conference_title_autocomplete_list", value: (@writing_conference.conference_title_translations[locale.to_s] rescue nil) %> <% end %> - +
    • - <%= label_tag("", t("personal_conference.paper_type")) %> + <%= label_tag("", t("personal_conference.paper_type"), class: 's_grid s_grid_4') %> +
        <% @paper_types.each_with_index do |paper_type, i| %> -
      • +
      • <%= radio_button_tag "writing_conference[conference_paper_type_ids][]", paper_type.id, @writing_conference.conference_paper_type_ids.include?(paper_type.id), @@ -70,34 +71,33 @@ <% end %>
      -
    • -
    • - <%= f.text_field :keywords, size: "20", placeholder: t("personal_conference.keywords"), class: "s_grid_6 s_grid"%> -
    • -
    • -
      - <%= label_tag("", t("personal_conference.conference_time")) %> -
        -
      • - <%= label_tag("", t("personal_conference.period_start_date"), class: "s_grid_1 s_grid") %> - <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %> -
      • - -
      • - <%= label_tag("", t("personal_conference.period_end_date"), class: "s_grid_1 s_grid") %> - <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %> -
      • -
    • - <%= label_tag("", t("personal_conference.sponsor"), class: "s_grid_2 s_grid") %><%= f.text_field :sponsor, size: "20", placeholder: "Sponsor", class: "s_grid_4 s_grid"%> + <%= f.text_field :keywords, size: "20", placeholder: t("personal_conference.keywords"), class: "s_grid_12 s_grid"%>
    • - <%= label_tag("", t("personal_conference.location"), class: "s_grid_2 s_grid") %><%= f.text_field :location, size: "20", placeholder: "Location", class: "s_grid_4 s_grid"%> + <%= label_tag("", t("personal_conference.conference_time"), class: "s_grid s_grid_4") %> +
        +
      • + <%= label_tag("", t("personal_conference.period_start_date"), class: "s_grid_2 s_grid") %> + <%= f.date_select :period_start_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %> +
      • + +
      • + <%= label_tag("", t("personal_conference.period_end_date"), class: "s_grid_2 s_grid") %> + <%= f.date_select :period_end_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %> +
      • +
    • - <%= label_tag("", t("personal_conference.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%> + <%= label_tag("", t("personal_conference.sponsor"), class: "s_grid_4 s_grid") %><%= f.text_field :sponsor, size: "20", placeholder: "Sponsor", class: "s_grid_8 s_grid"%> +
    • +
    • + <%= label_tag("", t("personal_conference.location"), class: "s_grid_4 s_grid") %><%= f.text_field :location, size: "20", placeholder: "Location", class: "s_grid_8 s_grid"%> +
    • +
    • + <%= label_tag("", t("personal_conference.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_8 s_grid"%>
    @@ -106,7 +106,7 @@
    • <%= f.text_area :author_tokens, - class: "s_grid_6 s_grid", + class: "s_grid_12 s_grid", size: "20x2", placeholder: t("personal_conference.authors"), "data-pre" => generate_authors_name(@writing_conference.conference_co_author_ids) %> @@ -118,24 +118,24 @@ # "autocomplete-list" => "coauthor_autocomplete_list", value: (@writing_conference.authors_translations[locale.to_s] rescue nil) %> <%# end %> - +
    • - + <%= options_for_select( + @author_types.map do |author_type| + [author_type.title, author_type.id] + end + ) + %>
    • - @@ -143,20 +143,16 @@
    • - <%= label_tag("", t("personal_conference.publication_date"), class: "s_grid_3 s_grid") %> - <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %> + <%= label_tag("", t("personal_conference.publication_date"), class: "s_grid_6 s_grid") %> + <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_2 s_grid'} %>
    • - <%= f.label :year, t("personal_conference.year"), :class => "s_grid_2 s_grid" %> - <%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]', :class => "s_grid_4 s_grid"} ) %> + <%= f.label :year, t("personal_conference.year"), :class => "s_grid_4 s_grid" %> + <%= select_year((@writing_conference.year ? @writing_conference.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_conference[year]', :class => "s_grid_8 s_grid"} ) %>
    • -
    • >
    • - -
    • - <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_6 s_grid full_height"%> -
    • +
    • >
    @@ -168,13 +164,14 @@ <%= t("personal_conference.file")%> - <%= t("personal_conference.file_name")%> - <%= t("personal_conference.description") %> + <%= t("personal_conference.file_name")%> + <%= t("personal_conference.description") %> + - +
    <%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %> add @@ -194,13 +191,18 @@
    -
    -
  • -
      - <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_6 s_grid full_height"%> -
    +
      +
    • + <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_12 s_grid_h_10 s_grid"%>
    • -
  • + +
    +
    +
      +
    • + <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_12 s_grid_h_10 s_grid"%> +
    • +
    <% @conference_lists.each_with_index do |conference_list,i| %> -
    • @@ -29,7 +28,6 @@
      <%= level.join(",") %>
    -
    <% end %>
    +
    <%= render :partial => 'show_form'%> - diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb index f67a51ec..005c2341 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb @@ -7,8 +7,8 @@
    • - <%= f.label :co_author, class: "s_grid s_grid_2" %> - <%= f.text_field :co_author, class: "s_grid_4 s_grid"%> + <%= f.label :co_author, class: "s_grid s_grid_4" %> + <%= f.text_field :co_author, class: "s_grid_8 s_grid"%>
    • - <%= f.label :email, class: "s_grid s_grid_2"%> - <%= f.text_field :email, class: "s_grid s_grid_4" %> + <%= f.label :email, class: "s_grid s_grid_4"%> + <%= f.text_field :email, class: "s_grid s_grid_8" %>
    • - <%= f.label :type, class: "s_grid s_grid_2"%> - <%= options_for_select( @journal_co_author_relations.map do |relation| [relation.relation, relation.id] diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb index 876823ab..1061f56f 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb @@ -7,12 +7,13 @@ +
        <% @journal_co_authors.each_with_index do |co_author,i| %>
        • -
        • <%= co_author.co_author %>
        • +
        • <%= co_author.co_author %>
        • <%= @journal_co_author_relations.find(co_author.journal_co_author_relations_id).relation unless co_author.journal_co_author_relations_id.nil?%>
        diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb index 0d7f6702..dd266423 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb @@ -32,15 +32,15 @@
    --> -
    +
    • <%= f.fields_for :paper_title_translations do |f| %> <%= f.text_area locale, - class: "s_grid_6 s_grid", - size: "20x2", + class: "s_grid_12 s_grid s_grid_h_3", + size: "20x4", placeholder: t("personal_journal.paper_title"), value: (@writing_journal.paper_title_translations[locale.to_s] rescue nil) %> <% end %> @@ -50,15 +50,16 @@ <%= f.text_field locale, size: "20", placeholder: t("personal_journal.journal_title"), - class: "s_grid_6 s_grid", + class: "s_grid_12 s_grid", "autocomplete-list" => "journal_title_autocomplete_list", value: (@writing_journal.journal_title_translations[locale.to_s] rescue nil) %> <% end %> - +
    • -
      - <%= label_tag("", t("personal_journal.level_type")) %> + <%= label_tag("", t("personal_journal.level_type"), :class => 's_grid s_grid_4') %> +
      +
        <% @level_types.each_with_index do |level_type, i| %>
      • @@ -74,23 +75,23 @@
      • - <%= label_tag("", t("personal_journal.isbn"), class: "s_grid_2 s_grid") %><%= f.text_field :isbn, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%> + <%= 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.vol_no"), class: "s_grid_2 s_grid") %><%= f.text_field :vol_no, size: "20", placeholder: "829872987", class: "s_grid_4 s_grid"%> + <%= 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.issue_no"), class: "s_grid_2 s_grid") %><%= f.text_field :issue_no, size: "20", placeholder:"829872987", class: "s_grid_4 s_grid"%> + <%= 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.total_pages"), class: "s_grid_2 s_grid") %><%= f.text_field :total_pages, size: "20", placeholder:"20", class: "s_grid_4 s_grid"%> -
      • - -
      • - <%= label_tag("", t("personal_journal.total_pages"), class: "s_grid_2 s_grid") %><%= label_tag("", t("personal_journal.from"), class: "s_grid_1 s_grid") %><%= f.text_field :form_to_start, size: "10", placeholder: "1", 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_1 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"%> + <%= 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 :total_pages, size: "20", placeholder:"20", class: "s_grid_2 s_grid"%>
      @@ -100,7 +101,7 @@
      • <%= f.text_area :author_tokens, - class: "s_grid_6 s_grid", + class: "s_grid_12 s_grid", size: "20x2", placeholder: t("personal_journal.authors"), "data-pre" => generate_authors_name(@writing_journal.journal_co_author_ids) %> @@ -112,11 +113,11 @@ "autocomplete-list" => "coauthor_autocomplete_list", value: (@writing_journal.authors_translations[locale.to_s] rescue nil) %> <%# end %> - +
      • - <%= options_for_select( [t("personal_journal.author_type")] + @author_types.map do |author_type| @@ -125,7 +126,7 @@ )%> - <%= options_for_select( [t("personal_journal.level_type")] + @paper_types.map do |paper_type| @@ -135,31 +136,31 @@
      • - <%= label_tag("", t("personal_journal.publication_date"), class: "s_grid_3 s_grid") %> - <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year, :month, :day] }, {:class => 's_grid_1 s_grid'} %> + <%= label_tag("", t("personal_journal.publication_date"), class: "s_grid_4 s_grid") %> + <%= f.date_select :publication_date, {:use_month_numbers => true, :start_year => Time.now.year, :end_year => 1930, :order => [:year] }, {:class => 's_grid_4 s_grid'} %> + <%= f.date_select :publication_date, {:use_month_numbers => true, :order => [:month, :day] }, {:class => 's_grid_2 s_grid'} %>
      • - <%= f.text_field :keywords, size: "20", placeholder: t("personal_journal.keywords"), class: "s_grid_6 s_grid"%> + <%= f.text_area :keywords, size: "20x3", placeholder: t("personal_journal.keywords"), class: "s_grid_12 s_grid_h_2 s_grid"%>
      • - <%= f.label :year, t("personal_journal.year"), :class => "s_grid_2 s_grid" %> - <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_4 s_grid"} ) %> + <%= f.label :year, t("personal_journal.year"), :class => "s_grid_4 s_grid" %> + <%= select_year((@writing_journal.year ? @writing_journal.year.to_i : DateTime.now.year), {:start_year => DateTime.now.year, :end_year => 1930}, {:name => 'writing_journal[year]', :class => "s_grid_8 s_grid"} ) %>
      • - <%= f.label :language, t("personal_journal.language"),:class => "s_grid_2 s_grid" %> - <%= f.select :language, - WritingJournal::LANGUAGE_TYPES, - class: "s_grid s_grid_4" %> + <%= f.label :language, t("personal_journal.language"), :class => "s_grid s_grid_4" %> + <%= f.select :language, WritingJournal::LANGUAGE_TYPES,{} ,{:class => "s_grid s_grid_8"} %>
      • - > - + > +
      • - @@ -167,7 +168,7 @@
      • - <%= label_tag("", t("personal_journal.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%> + <%= 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"%>
      @@ -180,13 +181,14 @@ <%= t("personal_journal.file")%> - <%= t("personal_journal.file_name")%> - <%= t("personal_journal.description") %> + <%= t("personal_journal.file_name")%> + <%= t("personal_journal.description") %> + - +
      <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %> add @@ -210,7 +212,7 @@
      • - <%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_6 s_grid full_height"%> + <%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_12 s_grid s_grid_h_10"%>
      @@ -219,7 +221,7 @@
      • - <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_6 s_grid full_height"%> + <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_12 s_grid s_grid_h_10"%>
      diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb index dfbf9f22..646677d4 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form_file.html.erb @@ -2,15 +2,17 @@
      <% if form_file.new_record? %> - <%= f.file_field :file, class: "s_grid_2 s_grid" %> + <%= f.file_field :file, class: "s_grid_2" %> <% end %>
      - <%= f.text_field :title %> + <%= f.text_field :title, :class => 's_grid_4' %> + + <%= f.fields_for :file_title_translations do |f| %> <%= f.text_field locale, - class: 's_grid_3 s_grid', + class: 's_grid_4', value: (form_file.file_title_translations[locale] rescue nil) %> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb deleted file mode 100644 index ec23466d..00000000 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb +++ /dev/null @@ -1,86 +0,0 @@ -
      -
      -
      -
      - -
      -
      -
      -
      More
      -
      - -
      -
      -
      -
      Tag
      -
      - -
      -
      -
      -
      Status
      -
      - -
      -
      -
      -
      View
      -
      -
        -
      • <%= link_to "Journal", panel_personal_journal_desktop_journal_pages_path + "?view=journal_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • -
      • <%= link_to "Title", panel_personal_journal_desktop_journal_pages_path + "?view=paper_title", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • -
      • <%= link_to "File", panel_personal_journal_desktop_journal_pages_path + "?view=file", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • -
      • <%= link_to "Keywords", panel_personal_journal_desktop_journal_pages_path + "?view=keywords", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • -
      • <%= link_to "Abstract", panel_personal_journal_desktop_journal_pages_path + "?view=abstract", :class => "hp hh1 admtxt", "ajax-remote" => "get" %>
      • -
      -
      -
      -
      -
      Share
      -
      - -
      -
      -
      -
      New Share
      -
      - -
      -
      -
      -
      -
      -
      -
      - <% @writing_journals.each do |w| %> - <%= publication_record w, @view_by%> - <% end %> -
      - - diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb index 7f096484..40adca7f 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb @@ -13,14 +13,14 @@
    -
    +
    <% @journal_lists.each_with_index do |journal_list,i| %>
    • -
      - -
      +
      + +
      <% title, level = journal_list %>
      <%= title %>
      <%= level.join(",") %>