From e9c0f443b70fac753e38a9e8862b0e891808797f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 26 Feb 2013 11:47:05 +0800 Subject: [PATCH 01/29] Lot of changes in gridster --- app/assets/javascripts/jquery.gridster.js | 2 + app/assets/javascripts/orbitdesktop.js | 70 ++++++++++++++++--- app/assets/stylesheets/desktop.css | 1 + app/assets/stylesheets/desktop_font.css | 1 + app/assets/stylesheets/desktopmain.css | 78 +++++++++++++++------- app/assets/stylesheets/jquery.gridster.css | 6 +- app/assets/stylesheets/style.css.erb | 2 +- 7 files changed, 123 insertions(+), 37 deletions(-) create mode 100644 app/assets/stylesheets/desktop_font.css mode change 100755 => 100644 app/assets/stylesheets/jquery.gridster.css diff --git a/app/assets/javascripts/jquery.gridster.js b/app/assets/javascripts/jquery.gridster.js index 947f4bb2a..e8998514f 100755 --- a/app/assets/javascripts/jquery.gridster.js +++ b/app/assets/javascripts/jquery.gridster.js @@ -1328,6 +1328,7 @@ */ fn.draggable = function() { var self = this; + var draggable_options = $.extend(true, {}, this.options.draggable, { offset_left: this.options.widget_margins[0], start: function(event, ui) { @@ -3204,6 +3205,7 @@ max_rows += (+$(w).attr('data-sizey')); }); + this.cols = Math.max(min_cols, cols, this.options.min_cols); this.rows = Math.max(max_rows, this.options.min_rows); diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index a4f58b7c8..e1fded1fb 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -420,9 +420,10 @@ var orbitDesktop = function(dom){ $.getJSON("/desktop/getgroups",{sectionid:id},function(tiles){ tiles.sort(o.sortJSON("position",true,parseInt)); var tilecolors = o.themesettings.tilecolor; + var totaltiles_in_a_row = 4; var opacity = ["op05","op06","op07","op08","op09"]; var row = 1,col = 1,x = 1,y = 1; - var $group = $('
'); + var $group = $('
'); var $ul = $(''); $.each(tiles,function(i,tile){ @@ -436,21 +437,72 @@ var orbitDesktop = function(dom){ var tilecolor = tilecolors[Math.floor(Math.random()*tilecolors.length)]; var op = opacity[Math.floor(Math.random()*opacity.length)]; if(tile.data_category == "app") - $li = $('

  • '+tile.title+'

    • '); + $li = $('

  • '+tile.title+'

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

    '+tile.title+'

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

    '+tile.title+'

    • '); row = row + y; $ul.append($li); }) $group.append($ul); - console.log($group); $("div#desktop div#group_wrapper").append($group); - o.gridvar = $(".grid ul").gridster({ - widget_margins: [6, 6], - widget_base_dimensions: [120, 120] - }); + var dragged = null,draggable,lastpos = []; + o.gridvar = $(".grid ul").find("> li ").mousedown(function(e){ + !draggable; + dragged = $(this); + lastpos = []; + $(".grid ul li").each(function(){ + lastpos.push({"col":$(this).attr("data-col"),"row":$(this).attr("data-row")}) + }) + }).end() + .gridster({ + widget_margins: [6, 6], + widget_base_dimensions: [120, 120], + avoid_overlapped_widgets: true, + draggable : { + stop: function(event, ui){ + + var widgetchanged_col = dragged.attr("data-col"); + var total = 0; + // console.log(widgetchanged.col); + // console.log(o.gridvar.serialize_changed()); + $(".grid ul li[data-col="+widgetchanged_col+"]").each(function(i,w){ + var size = parseInt($(this).attr("data-sizey")); + if(!isNaN(size)){ + total += size; + } + }) + // other way to calculate the overflow is by top > height of div + if(total>totaltiles_in_a_row){ + revertbacktiles(); + }else{ + console.log(widgetchanged_col-1); + $(".grid ul li[data-col="+(widgetchanged_col-1)+"]").each(function(i,w){ + var sizey = parseInt($(this).attr("data-sizey")); + var sizex = parseInt($(this).attr("data-sizex")); + if(sizey==1){ + sizex = sizex - 1; + } + console.log(sizex); + + if(!isNaN(sizex)){ + total += sizex; + } + }) + if(total>totaltiles_in_a_row){ + revertbacktiles(); + } + } + } + } + }).data('gridster'); + var revertbacktiles = function(){ + lastpos.push({"col":"","row":""}); + $(".grid ul li").each(function(i){ + $(this).attr({"data-col":lastpos[i].col,"data-row":lastpos[i].row}); + }) + } bindHandlers(); o.initializeWidgets(); }) @@ -1219,7 +1271,7 @@ var orbitDesktop = function(dom){ }) }; this.initializeWidgets = function(){ // this function will initialize all the widgets in the desktop - var elements = $("#group_wrapper li.element"); + var elements = $("#group_wrapper li.widget"); $.each(elements,function(){ var widget = $(this); if(widget.attr("data-category")=="widget"){ diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index 346c21664..f3746eff1 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -2,6 +2,7 @@ *This is a manifest file that'll automatically include all the stylesheets available in this directory *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at *the top of the compiled file, but it's generally better to create a new file per style scope. + *= require desktop_font *= require style *= require bootstrap *= require bootstrap-orbit diff --git a/app/assets/stylesheets/desktop_font.css b/app/assets/stylesheets/desktop_font.css new file mode 100644 index 000000000..d0a9ec097 --- /dev/null +++ b/app/assets/stylesheets/desktop_font.css @@ -0,0 +1 @@ +@import url(http://fonts.googleapis.com/css?family=Cuprum|Dosis:400,700|Roboto+Condensed:400,700); \ No newline at end of file diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 54d856900..f2a5e0195 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -60,9 +60,30 @@ body { } a, a:hover { text-decoration: none; color: #666; } a:focus { outline: none; } + +/* box-sizing element */ +.appholder, .appname { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +.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; } + /* desktop layout */ #container { - margin: 48px 0 0 156px; + padding: 48px 0 0 156px; } #header { padding: 0 0 12px 0; @@ -117,6 +138,7 @@ a:focus { outline: none; } padding: 0 6px; font-size: 15px; position: absolute; + z-index: 9; min-width: 48px; text-align: center; white-space: nowrap; @@ -165,14 +187,28 @@ a:focus { outline: none; } .appname { font-size: 15px; - height: 30px; line-height: 30px; + width: 100%; + height: 30px; + padding: 0 12px; overflow: hidden; cursor: default; + position: absolute; + left: 0; + bottom: 0; z-index: 3; } -.w1.h1 .appname { text-align: center; } -.w2.h2 .appname { font-size: 21px; } +[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; @@ -180,6 +216,9 @@ a:focus { outline: none; } margin: 0 auto; position: relative; } +[data-sizex="1"] .appicon { + margin-top: 24px; +} #sections .appicon { width: 30px; height: 30px; @@ -189,16 +228,19 @@ a:focus { outline: none; } .appholder { position: relative; z-index: 2; - } -.holder_f .appholder { - position: absolute; + padding: 12px; + padding-bottom: 30px; width: 100%; height: 100%; + overflow: hidden; + } +.fullsize .appholder { + position: absolute; padding: 0; left: 0; top: 0; } -.holder_f .appname { display: none; } +.fullsize .appname { display: none; } .dtitle { font-size: 30px; line-height: 60px; @@ -209,18 +251,6 @@ a:focus { outline: none; } } /*.section_slc { width: 252px; }*/ -.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; } .tile { display: block; width: 100%; @@ -388,10 +418,10 @@ a:focus { outline: none; } .hp { padding-left: 12px; padding-right: 12px; } .vp { padding-top: 12px; padding-bottom: 12px; } .element { - /*margin: 0 12px 12px 0; - float: left;*/ - position: absolute; - /*display:inline-block;*/ + margin: 0 12px 12px 0; + float: left; + position: relative; + display:inline-block; } .group{ float: left; diff --git a/app/assets/stylesheets/jquery.gridster.css b/app/assets/stylesheets/jquery.gridster.css old mode 100755 new mode 100644 index c36d418a9..8441eac38 --- a/app/assets/stylesheets/jquery.gridster.css +++ b/app/assets/stylesheets/jquery.gridster.css @@ -37,9 +37,9 @@ .gridster .preview-holder { z-index: 1; position: absolute; - background-color: #fff; - border-color: #fff; - opacity: 0.3; + background-color: #000; + border-color: #000; + opacity: 0.2; } .gridster .player-revert { diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index f86c9a914..48f79d2a1 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -1,6 +1,6 @@ /*style*/ -@import url(http://fonts.googleapis.com/css?family=Cuprum); +/*@import url(http://fonts.googleapis.com/css?family=Cuprum);*/ @font-face{ font-family: 'WebSymbolsRegular'; src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>); From 912080482b313a1171d429ed3a6cebe3d7fc8292 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 27 Feb 2013 11:47:41 +0800 Subject: [PATCH 02/29] some changes for gridster --- app/assets/javascripts/orbitdesktop.js | 83 ++++++++++++++++---------- 1 file changed, 53 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index e1fded1fb..08fd33379 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -459,41 +459,55 @@ var orbitDesktop = function(dom){ .gridster({ widget_margins: [6, 6], widget_base_dimensions: [120, 120], - avoid_overlapped_widgets: true, + // avoid_overlapped_widgets: true, draggable : { stop: function(event, ui){ - - var widgetchanged_col = dragged.attr("data-col"); - var total = 0; - // console.log(widgetchanged.col); - // console.log(o.gridvar.serialize_changed()); - $(".grid ul li[data-col="+widgetchanged_col+"]").each(function(i,w){ - var size = parseInt($(this).attr("data-sizey")); - if(!isNaN(size)){ - total += size; - } - }) - // other way to calculate the overflow is by top > height of div - if(total>totaltiles_in_a_row){ - revertbacktiles(); - }else{ - console.log(widgetchanged_col-1); - $(".grid ul li[data-col="+(widgetchanged_col-1)+"]").each(function(i,w){ - var sizey = parseInt($(this).attr("data-sizey")); - var sizex = parseInt($(this).attr("data-sizex")); - if(sizey==1){ - sizex = sizex - 1; - } - console.log(sizex); + // var widgetchanged_col = dragged.attr("data-col"); + // var total = 0; + // // console.log(widgetchanged.col); + // // console.log(o.gridvar.serialize_changed()); + // $(".grid ul li[data-col="+widgetchanged_col+"]").each(function(i,w){ + // var size = parseInt($(this).attr("data-sizey")); + // if(!isNaN(size)){ + // total += size; + // } + // }) + // // other way to calculate the overflow is by top > height of div + // if(total>totaltiles_in_a_row){ + // revertbacktiles(); + // }else{ + // console.log(widgetchanged_col-1); + // $(".grid ul li[data-col="+(widgetchanged_col-1)+"]").each(function(i,w){ + // var sizey = parseInt($(this).attr("data-sizey")); + // var sizex = parseInt($(this).attr("data-sizex")); + // if(sizey==1){ + // sizex = sizex - 1; + // } + // console.log(sizex); - if(!isNaN(sizex)){ - total += sizex; + // if(!isNaN(sizex)){ + // total += sizex; + // } + // }) + // if(total>totaltiles_in_a_row){ + // revertbacktiles(); + // } + // } + + for (var i = 1; i <= 30; i++) { + // var celement = $(".grid ul .widget[data-col="+i+"]:last"); + $(".grid ul .widget[data-col="+i+"]").each(function(){ + var pos = $(this).position(); + if(pos){ + console.log(pos.top + $(this).height() + 6); + if((pos.top + $(this).height() + 6) > 550){ + revertbacktiles(); + + } } }) - if(total>totaltiles_in_a_row){ - revertbacktiles(); - } - } + + } } } }).data('gridster'); @@ -502,6 +516,15 @@ var orbitDesktop = function(dom){ $(".grid ul li").each(function(i){ $(this).attr({"data-col":lastpos[i].col,"data-row":lastpos[i].row}); }) + } + var remove_empty_columns = function(){ + for (var i = 1; i <= 30; i++) { + // var celement = $(".grid ul .widget[data-col="+i+"]:last"); + $(".grid ul .widget[data-col="+i+"]").each(function(){ + + }) + break; + } } bindHandlers(); o.initializeWidgets(); From c82e9a646d4c12fbae5d68234af39f22d1285038 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 27 Feb 2013 18:55:26 +0800 Subject: [PATCH 03/29] tinyscrollbar fixed --- app/assets/javascripts/orbitdesktop.js | 142 +++++++-------- app/views/desktop/allsections.html.erb | 164 +----------------- app/views/desktop/settings/sections.html.erb | 2 +- app/views/desktop/settings/themes.html.erb | 2 +- .../desktop/conference_pages/index.html.erb | 2 +- .../personal_journal/desktop/journal_pages.js | 162 +---------------- .../index.html.erb | 2 +- .../desktop/journal_co_authors/index.html.erb | 2 +- .../desktop/journal_pages/_form.html.erb | 22 ++- .../desktop/journal_pages/index.html.erb | 2 +- .../journal_pages/journal_type.html.erb | 2 +- 11 files changed, 100 insertions(+), 404 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 08fd33379..9ed399ae5 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -11,6 +11,12 @@ // content-holder = "jquery dom", the returned html of server will be put inside the dom mentioned in content-holder of a tag. this can be used in a tags as attributes //confirm-message ="Some message", this will prompt user with a confirm box and show the message before ajax call is made. +//for layout tinyscrollbar +//content-layout="datalist|column|simple" datalist is for data list from database.. column is usually for forms and some other pages.. simple is without any columns, the page will be displayed as it is.. base width will be considered the default width for tinyscrollbar +//base-width="300" this is the basic width of each column and in case of simple layout it ll be the final width +//per-column="5" this option is only for datalist layout.. this ll specify number of enteries per column.. default is 4 +//column="true" this option is only for column layout... the columns will be formed on this column=true attribute and it should be a div + $.extend($.expr[':'], { 'containsi': function (elem, i, match, array) { @@ -163,8 +169,10 @@ var orbitDesktop = function(dom){ if(typeof data == "string"){ if(ca) $(ca).html(data); - else - $("div[container=true]").html(data); + else{ + o.layout_data(data); + // $("div[container=true]").html(data); + } } if(exe) window.o[o.data_method][exe](data,$e); @@ -251,6 +259,51 @@ var orbitDesktop = function(dom){ }) }; + this.layout_data = function(h){ + var $e = $(h); + var column_container = $e.find("div.overview"); + var layout = column_container.attr("content-layout"), base_width = parseInt(column_container.attr("base-width")), no_of_entries,temp_div = $("
    "),total_columns=0; + switch (layout){ + case "simple": + total_columns++; + temp_div.append(column_container.html()); + break; + case "datalist": + no_of_entries = (typeof column_container.attr("per-column") != "undefined"? column_container.attr("per-column") : 4); + var entries = column_container.find("li"),x = 0; + entries.each(function(i,li){ + if(x == 0){ + column = $("
      -
      - -
      +
      + +
      diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index dcb922379..db3fc5065 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -1,7 +1,7 @@
      -
      +
      Section Names
        • diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb index fb1ac8a5a..04819a7c6 100644 --- a/app/views/desktop/settings/themes.html.erb +++ b/app/views/desktop/settings/themes.html.erb @@ -8,7 +8,7 @@
        -
        +
        <% @themes.each do |theme| %> diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb index e30c9e4a7..efc225db2 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb @@ -68,7 +68,7 @@
        -
        +
        <% @writing_conferences.each do |w| %> <%= publication_record w, @view_by%> <% end %> diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js index a3e89dabc..6a34ada28 100644 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js @@ -13,11 +13,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // var bindHandlers = function(){ // to bind handlers for list page o.simple_drop_down(); - o.tinyscrollbar_ext({ - main: '.tinycanvas', - fill: '.list_t' - }) - // $("#journal_selection_options a").click(function(){ // switch($(this).attr("href")){ // case "all": @@ -29,26 +24,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // // } // return false; // }) - // $("#journal_view_selection a").click(function(){ - // switch($(this).attr("href")){ - // case "journal": - // journalview(); - // break; - // case "keywords": - // keywordsview(); - // break; - // case "title": - // titleview(); - // break; - // case "abstract": - // abstractview(); - // break; - // case "file": - // fileview(); - // break; - // } - // return false; - // }) } var bindSecondaryHandlers = function(){ @@ -65,125 +40,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // return false; }) } - - - // var journalview = function(){ - // $("#journal_p div#paper_list div.overview").empty(); - // var column = $('
          '), - // counter = 1, - // li; - // $.each(journalData,function(i,journal){ - // $.each(journal.papers,function(j,paper){ - // li = $('
        • '+journal.title+'
          '+paper.title+'
          Edit Delete
          • '); - // column.find("ul").append(li); - // if(counter%5==0){ - // $("#journal_p div#paper_list div.overview").append(column); - // column = $('
            '); - // } - // counter++; - // }) - // }) - // $("#journal_p div#paper_list div.overview").append(column); - // bindSecondaryHandlers(); - // } - // var fileview = function(){ - // $("#journal_p div#paper_list div.overview").empty(); - // var column = $('
              '), - // counter = 1, - // li = null; - // $.each(journalData,function(i,journal){ - // $.each(journal.papers,function(j,paper){ - // li = null; - // li = $('
            • '); - // li.append('
              '+journal.title+'
              '); - // var file_list = li.find('.list_t_des'); - // $.each(paper.files,function(k,file){ - // var thistitle = file.title; - // if(!thistitle) - // thistitle = ""; - // thistitle = ( thistitle.length > 8 )? thistitle.substring(0,8)+'...' : thistitle; - // if(!file.title){ - // thistitle = "Untitled File"; - // } - // var img = $(''+thistitle+''); - // file_list.append(img); - // }) - // li.append('
              Edit Delete
              '); - // column.find("ul").append(li); - // if(counter%3==0){ - // $("#journal_p div#paper_list div.overview").append(column); - // column = $('
                '); - // } - // counter++; - // }) - // }) - // $("#journal_p div#paper_list div.overview").append(column); - // bindSecondaryHandlers(); - // } - // var keywordsview = function(){ - // $("#journal_p div#paper_list div.overview").empty(); - // var column = $('
                  '), - // counter = 1, - // li; - // $.each(journalData,function(i,journal){ - // $.each(journal.papers,function(j,paper){ - // li = $('
                • '+paper.title+'
                  '+paper.keywords+'
                  Edit Delete
                  • '); - // column.find("ul").append(li); - // if(counter%5==0){ - // $("#journal_p div#paper_list div.overview").append(column); - // column = $('
                    '); - // } - // counter++; - // }) - // }) - // $("#journal_p div#paper_list div.overview").append(column); - // bindSecondaryHandlers(); - // } - - // var titleview = function(){ - // $("#journal_p div#paper_list div.overview").empty(); - // var column = $('
                      '), - // counter = 1, - // li; - // $.each(journalData,function(i,journal){ - // $.each(journal.papers,function(j,paper){ - // li = $('
                    • '+paper.title+'
                      Edit Delete
                      • '); - // column.find("ul").append(li); - // if(counter%5==0){ - // $("#journal_p div#paper_list div.overview").append(column); - // column = $('
                        '); - // } - // counter++; - // }) - // }) - // $("#journal_p div#paper_list div.overview").append(column); - // bindSecondaryHandlers(); - // } - - // var abstractview = function(){ - // $("#journal_p div#paper_list div.overview").empty(); - // var column = $('
                          '), - // li; - // $.each(journalData,function(i,journal){ - // $.each(journal.papers,function(j,paper){ - // li = $('
                        • '+paper.title+'
                          '+paper.abstract+'
                          Edit Delete
                          • '); - // column.find("ul").append(li); - // $("#journal_p div#paper_list div.overview").append(column); - // column = $('
                            '); - // }) - // }) - // $("#journal_p div#paper_list div.overview").append(column); - // bindSecondaryHandlers(); - // } - - // var getData = function(){ - // $.getJSON("/panel/personal_journal/desktop/get_journals_json",function(journals){ - // journalData = eval(journals); - // journalview(); - // bindHandlers(); - // }) - // } - // getData(); } this.initializeJournalPapers.paperDelete = function(data,dom){ var parent = dom.parent().parent(); @@ -195,11 +51,6 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this.initializeJournalPapers.addpaper = function(){ // to open add pages in journal papers page var bindHandlers = function(){ // to bind handlers for add page o.simple_drop_down(); - - o.tinyscrollbar_ext({ - main: '.tinycanvas', - fill: '.s_grid_con' - }) } bindHandlers(); } @@ -207,10 +58,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this.initializeJournalPapers.journal = function(){ // to open add pages in journal papers page var bindHandlers = function(){ // to bind handlers for add page o.simple_drop_down(); - o.tinyscrollbar_ext({ - main: '.tinycanvas', - fill: '.g_col' - }) + } bindHandlers(); } @@ -226,13 +74,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this.initializeJournalPapers.coauthor = function(){ // to open add pages in coauthor page var bindHandlers = function(){ // to bind handlers for add page o.simple_drop_down(); - - o.tinyscrollbar_ext({ - main: '.tinycanvas', - fill: '.g_col' - }) - - } + } bindHandlers(); } this.initializeJournalPapers.coauthorRelationForm = function(data){ diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb index b96b97dde..ec6bf16a5 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb @@ -15,7 +15,7 @@
                            -
                            +
                            <%= render :partial => 'show_form'%>
                            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 c6ac18436..c15a5d523 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,7 +7,7 @@
                            -
                            +
                            <% @journal_co_authors.each_with_index do |co_author,i| %> <% if ( i % 4 ) == 0 %>
                            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 4fd939916..189e9590b 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 @@ -24,8 +24,9 @@
                            -
                            -
                            +
                            +
                            +
                            • <%= f.fields_for :paper_title_translations do |f| %> @@ -85,7 +86,9 @@
                            -
                            +
                            +
                            +
                            • <%= f.fields_for :authors_translations do |f| %> @@ -158,7 +161,9 @@
                            -
                            +
                            +
                            +
                            • @@ -189,14 +194,18 @@
                            -
                            +
                            +
                            +
                            • <%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_6 s_grid full_height"%>
                            -
                            +
                            +
                            +
                            • <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_6 s_grid full_height"%> @@ -204,6 +213,7 @@
                            +
                            + From 0c659e5a9b5310c62bb77da8f84a26ba95539713 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 4 Mar 2013 14:57:36 +0800 Subject: [PATCH 16/29] layout fix --- .../_show_form.html.erb | 14 +++++--------- .../_show_form.html.erb | 12 +++--------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb index 72566f1a9..b49cbe3bc 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb @@ -1,17 +1,13 @@ +
                              <% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %> - <% if ( i % 6 ) == 0 %> -
                              -
                                - <% end %> -
                              • + +
                              • <%= conference_co_author_relation.relation %>
                                <%= link_to 'Edit', edit_panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> <%= link_to 'Destroy', panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
                                • - <% if ( i % 6 ) == 5 %> -
                              -
                              - <% end %> + <% end %> +
                            \ No newline at end of file diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb index e43c6f17a..29801f0be 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb @@ -1,17 +1,11 @@ +
                              <% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %> - <% if ( i % 6 ) == 0 %> -
                              -
                                - <% end %> -
                              • +
                              • <%= journal_co_author_relation.relation %>
                                <%= link_to 'Edit', edit_panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> <%= link_to 'Destroy', panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %>
                                • - <% if ( i % 6 ) == 5 %> -
                              -
                              - <% end %> <% end %> +
                            From 8ade2c594961cb6bbd8273abf6c4fc2e92b72695 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 4 Mar 2013 16:21:35 +0800 Subject: [PATCH 17/29] fixed adding. --- .../personal_journal/desktop/journal_pages.js | 17 +++++++++++++++ .../desktop/journal_pages/_form.html.erb | 21 +++++-------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js index 6a34ada28..d22c7c7bb 100644 --- a/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js +++ b/vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js @@ -51,6 +51,23 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // this.initializeJournalPapers.addpaper = function(){ // to open add pages in journal papers page var bindHandlers = function(){ // to bind handlers for add page o.simple_drop_down(); + $('#add_plugin_file a.add').click(function(){ + var new_id = $(this).prev().attr('value'); + var old_id = new RegExp("new_writing_journal_files", "g"); + $(this).prev().attr('value', parseInt(new_id) + 1); + var x = get_html(old_id,new_id); + var newfield = $(x); + $(this).parents('table').append(newfield); + newfield.find('.action a.delete').click(function(){ + newfield.remove(); + }); + return false; + }); + + $('.action a.remove_existing_record').click(function(){ + $(this).next('.should_destroy').attr('value', 1); + $("tr#add_plugin_file_" + $(this).prev().attr('value')).hide(); + }); } bindHandlers(); } 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 f22d439ed..817567a02 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 @@ -179,7 +179,7 @@
                            <%= hidden_field_tag 'plugin_file_field_count', @writing_journal.writing_journal_files.count %> - add + add
                            @@ -222,21 +222,10 @@ From a6ca308a5ec3b7e3ec82fd92527f62d387d8edbd Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Mon, 4 Mar 2013 16:35:09 +0800 Subject: [PATCH 18/29] using refine tiny scroll bar js for personal plugin --- Gemfile.lock | 9 + .../desktop/conference_pages_controller.rb | 9 +- .../desktop/conference_pages_helper.rb | 11 +- .../_show_form.html.erb | 24 +- .../index.html.erb | 2 +- .../conference_co_authors/index.html.erb | 12 +- .../desktop/conference_pages/_form.html.erb | 396 +++++++++--------- .../conference_pages/conference_type.html.erb | 8 +- .../personal_conference/config/locales/en.yml | 4 +- .../config/locales/zh_tw.yml | 3 +- .../desktop/journal_pages_controller.rb | 31 +- .../desktop/journal_pages_helper.rb | 23 +- .../app/models/journal_co_author.rb | 1 + .../app/models/writing_journal.rb | 48 ++- .../_show_form.html.erb | 18 +- .../desktop/journal_co_authors/index.html.erb | 11 +- .../desktop/journal_pages/_form.html.erb | 243 +++++------ .../journal_pages/journal_type.html.erb | 30 +- .../personal_journal/config/locales/en.yml | 25 +- .../personal_journal/config/locales/zh_tw.yml | 25 +- 20 files changed, 511 insertions(+), 422 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 62118728a..2b459329b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,6 +141,7 @@ GEM jquery-rails railties (>= 3.1.0) json (1.7.7) + libv8 (3.11.8.13) mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) @@ -224,6 +225,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (10.0.3) + rb-readline (0.4.2) rdoc (3.12.1) json (~> 1.4) redis (3.0.2) @@ -233,6 +235,7 @@ GEM chinese_pinyin (>= 0.3.0) redis (>= 2.1.1) redis-namespace (>= 1.0.2) + ref (1.0.2) resque (1.23.0) multi_json (~> 1.0) redis-namespace (~> 1.0) @@ -313,6 +316,9 @@ GEM sunspot (= 1.3.3) sunspot_solr (1.3.3) terminal-table (1.4.5) + therubyracer (0.11.3) + libv8 (~> 3.11.8.12) + ref thor (0.17.0) tilt (1.3.3) tinymce-rails (3.5.8) @@ -357,6 +363,7 @@ DEPENDENCIES jquery-rails (= 2.1.4) jquery-ui-rails kaminari! + libv8 (~> 3.11.8) mime-types mini_magick mongo_session_store-rails3 (= 3.0.6) @@ -373,6 +380,7 @@ DEPENDENCIES radius rails (~> 3.2.9) rake + rb-readline redis (>= 2.1.1) redis-namespace redis-search @@ -393,6 +401,7 @@ DEPENDENCIES sunspot-rails-tester sunspot_mongo sunspot_solr + therubyracer tinymce-rails uglifier watchr diff --git a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb index 2c4f7cb5a..1dc4b6a5e 100644 --- a/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb +++ b/vendor/built_in_modules/personal_conference/app/controllers/panel/personal_conference/desktop/conference_pages_controller.rb @@ -24,6 +24,9 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio @paper_types = ConferencePaperType.all @author_types = ConferenceAuthorType.all + @conference_candidate = + WritingConference.where(create_user_id: current_user.id).map{|j|j.conference_title}.uniq + if (not params[:q].nil?) and (current_user.name.include?params[:q]) @user = [{ :id => 0, :name => current_user.name}] # self account name else @@ -55,7 +58,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio @writing_conference = WritingConference.new(params[:writing_conference]) if @writing_conference.save - render json: {success: true, msg: t('create.success.paper')}.to_json + render json: {success: true, msg: t('create_success')}.to_json else error_msg = @writing_conference.errors.full_messages.join("
                            ") render json: {success: false, msg: error_msg}.to_json @@ -67,7 +70,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio @writing_conference= WritingConference.find(params[:id]) if @writing_conference.update_attributes(params[:writing_conference]) - render json: {success: true, msg: t('update.success.paper')}.to_json + render json: {success: true, msg: t('update_success')}.to_json else error_msg = @writing_conference.errors.full_messages.join("
                            ") render json: {success: false, msg: error_msg}.to_json @@ -77,7 +80,7 @@ class Panel::PersonalConference::Desktop::ConferencePagesController < Applicatio def destroy @writing_conference = WritingConference.find(params[:id]) @writing_conference.destroy - render :json => {success: true, msg: t('delete.success.paper')} + render :json => {success: true, msg: t('delete_success')} end def conference_type diff --git a/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb index 8fb62ceff..4dcb8ce34 100644 --- a/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb +++ b/vendor/built_in_modules/personal_conference/app/helpers/panel/personal_conference/desktop/conference_pages_helper.rb @@ -1,6 +1,7 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper def publication_record publication, view content_tag :li, + "item" => "true", :class => "list_t_item" do marker + \ content(publication, view) + \ @@ -11,8 +12,14 @@ module Panel::PersonalConference::Desktop::ConferencePagesHelper def marker content_tag :div, :class => "list_item_action" - content_tag(:a, "", :class => "icon-check-empty") + \ - content_tag(:a, "", :class => "icon-star-empty") + content_tag(:a, "",:href=>"", + :class => "icon-check-empty", + "toggle-onclick"=>"icon-check-empty icon-check", + "ajax-remote"=>"false") + \ + content_tag(:a, "",:href=>"", + :class => "icon-star-empty", + "toggle-onclick"=>"icon-star-empty icon-star", + "ajax-remote"=>"false") end def content publication, view diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb index b49cbe3bc..8756c04ce 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb @@ -1,13 +1,11 @@ -
                              -<% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %> - -
                            • -
                              <%= conference_co_author_relation.relation %>
                              -
                              - <%= link_to 'Edit', edit_panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> - <%= link_to 'Destroy', panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %> -
                              -
                              • - -<% end %> -
                            \ No newline at end of file +
                              + <% @conference_co_author_relations.each_with_index do |conference_co_author_relation,i| %> +
                            • +
                              <%= conference_co_author_relation.relation %>
                              +
                              + <%= link_to t('edit'), edit_panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> + <%= link_to t('delete'), panel_personal_conference_desktop_conference_co_author_relation_path(conference_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %> +
                              +
                              • + <% end %> +
                            diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb index 54d78c119..5cb7cf0d0 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb @@ -15,7 +15,7 @@
                            -
                            +
                            <%= render :partial => 'show_form'%>
                            diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb index bc1e6bca8..ac2493b98 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/index.html.erb @@ -7,27 +7,23 @@
                            -
                            +
                            <% @conference_co_authors.each_with_index do |co_author,i| %> - <% if ( i % 4 ) == 0 %>
                              - <% end %> -
                            • +
                              • <%= co_author.co_author %>
                              • <%= @conference_co_author_relations.find(co_author.conference_co_author_relations_id).relation unless co_author.conference_co_author_relations_id.nil?%>
                              - <%= link_to 'Edit', edit_panel_personal_conference_desktop_conference_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> - <%= link_to 'Destroy', panel_personal_conference_desktop_conference_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>'Are you sure?', "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %> + <%= link_to t('edit'), edit_panel_personal_conference_desktop_conference_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> + <%= link_to t('delete'), panel_personal_conference_desktop_conference_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %>
                              • - <% if ( i % 4 ) == 3 %>
                            - <% end %> <% end %>
                            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 7a1c958c3..390762bd8 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 @@ -1,9 +1,8 @@
                            <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %> - <% if not @writing_conference.new_record? %> - <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %> + <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_conference_desktop_conference_pages_path, class: "ini_input hp hh2 thmadm thmtxt" %> <% end %>
                            @@ -25,219 +24,220 @@
                            -
                            -
                            -
                              -
                            • - <%= f.fields_for :paper_title_translations do |f| %> - <%= f.text_area locale, - class: "s_grid_6 s_grid", - size: "20x2", - placeholder: t("personal_conference.paper_title"), - value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %> - <% end %> -
                              • - -
                            • - <%= f.fields_for :conference_title_translations do |f| %> - <%= f.text_field locale, - size: "20", - placeholder: t("personal_conference.conference_title"), - class: "s_grid_6 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")) %> -
                                - <% @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), - id: "field-#{i}" - %><%= label_tag("field-#{i}", paper_type.title) %> -
                                • - <% 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"%> -
                              • - -
                            • - <%= 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.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%> -
                              • - -
                            -
                            +
                            +
                            +
                            • - <%= f.label :author_tokens, t("personal_conference.authors") %>
                              - <%= f.text_area :author_tokens, - class: "s_grid_6 s_grid", - size: "20x2", - placeholder: t("personal_conference.authors"), - "data-pre" => generate_authors_name(@writing_conference.conference_co_author_ids) %> - <%#= f.fields_for :authors_translations do |f| %> - <%#= f.text_area locale, + <%= f.fields_for :paper_title_translations do |f| %> + <%= f.text_area locale, + class: "s_grid_6 s_grid", + size: "20x2", + placeholder: t("personal_conference.paper_title"), + value: (@writing_conference.paper_title_translations[locale.to_s] rescue nil) %> + <% end %> +
                              • +
                            • + <%= f.fields_for :conference_title_translations do |f| %> + <%= f.text_field locale, + size: "20", + placeholder: t("personal_conference.conference_title"), + class: "s_grid_6 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")) %> +
                                + <% @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), + id: "field-#{i}" + %><%= label_tag("field-#{i}", paper_type.title) %> +
                                • + <% 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"%> +
                              • +
                            • + <%= 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.url"), class: "s_grid_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%> +
                              • + +
                            +
                            +
                            +
                            +
                              +
                            • + <%= f.label :author_tokens, t("personal_conference.authors") %>
                              + <%= f.text_area :author_tokens, class: "s_grid_6 s_grid", size: "20x2", placeholder: t("personal_conference.authors"), - # "autocomplete-list" => "coauthor_autocomplete_list", + "data-pre" => generate_authors_name(@writing_conference.conference_co_author_ids) %> + <%#= f.fields_for :authors_translations do |f| %> + <%#= f.text_area locale, + class: "s_grid_6 s_grid", + size: "20x2", + placeholder: t("personal_conference.authors"), + # "autocomplete-list" => "coauthor_autocomplete_list", value: (@writing_conference.authors_translations[locale.to_s] rescue nil) %> - <%# end %> - -
                              • + <%# end %> + + + +
                            • + +
                              • + +
                            • + +
                              • + +
                            • + <%= 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'} %> +
                              • + +
                            • + <%= 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"} ) %> +
                              • + +
                            • >
                            • - -
                              • - -
                            • - -
                              • - -
                            • - <%= 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'} %> -
                              • - -
                            • - <%= 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.text_area :abstract, size: "20x22", placeholder: t("personal_conference.abstract"), class: "s_grid_6 s_grid full_height"%> -
                              • -
                            + +
                          +
                          -
                          -
                            -
                          • - - - - - - - - - - - - - - - <% @writing_conference.writing_conference_files.each_with_index do |writing_conference_file, i| %> - <%= f.fields_for :writing_conference_files, writing_conference_file do |f| %> - <%= render :partial => 'form_file', :object => writing_conference_file, :locals => {:f => f, :i => i} %> +
                            +
                            +
                              +
                            • +
                            <%= t("personal_conference.file")%><%= t("personal_conference.file_name")%><%= t("personal_conference.description") %>
                            -
                            - <%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %> - add -
                            -
                            + + + + + + + + + + + + + + <% @writing_conference.writing_conference_files.each_with_index do |writing_conference_file, i| %> + <%= f.fields_for :writing_conference_files, writing_conference_file do |f| %> + <%= render :partial => 'form_file', :object => writing_conference_file, :locals => {:f => f, :i => i} %> + <% end %> <% end %> - <% end %> - -
                            <%= t("personal_conference.file")%><%= t("personal_conference.file_name")%><%= t("personal_conference.description") %>
                            +
                            + <%= hidden_field_tag 'plugin_file_field_count', @writing_conference.writing_conference_files.count %> + add +
                            +
                            -
                            • -
                          -
                          -
                        • -
                            - <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_6 s_grid full_height"%> -
                          -
                          • + + + +
                          +
                          +
                          +
                          +
                        • +
                            + <%= f.text_area :note, size: "20x22", placeholder: t("personal_conference.note"), class: "s_grid_6 s_grid full_height"%> +
                          +
                          • +
                          +
                          - -<%= stylesheet_link_tag "token-input-facebook" %> -<%= javascript_include_tag :defaults, "jquery.tokeninput" %> + <%= stylesheet_link_tag "token-input-facebook" %> + <%= javascript_include_tag :defaults, "jquery.tokeninput" %> - + - + - + diff --git a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb index a4fd58b24..1793aff79 100644 --- a/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb +++ b/vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/conference_type.html.erb @@ -16,13 +16,11 @@
                          -
                          +
                          <% @conference_lists.each_with_index do |conference_list,i| %> - <% if ( i % 5 ) == 0 %>
                            - <% end %> -
                          • +
                          • @@ -30,10 +28,8 @@
                            <%= title %>
                            <%= level.join(",") %>
                            • - <% if ( i % 5 ) == 4 %>
                          - <% end %> <% end %>
                          diff --git a/vendor/built_in_modules/personal_conference/config/locales/en.yml b/vendor/built_in_modules/personal_conference/config/locales/en.yml index 5fb77c184..d4cd006b2 100644 --- a/vendor/built_in_modules/personal_conference/config/locales/en.yml +++ b/vendor/built_in_modules/personal_conference/config/locales/en.yml @@ -28,11 +28,13 @@ en: file_name : "File Name" description : "File Description" + create_success : "Successfully Create" + update_success : "Successfully Update" + delete_success : "Successfully Delete" add: "Add" back: "Back" delete: "Delete" edit: "Edit" - no_: "No" nothing: "Nothing" show: "Show" sure?: "Are you sure?" diff --git a/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml index 177f9c03f..967d14d0c 100644 --- a/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_conference/config/locales/zh_tw.yml @@ -28,11 +28,12 @@ zh_tw: file_name : "檔案名稱" description : "描述" + create_success : "新增完成!!" + update_success : "更新完成!!" add: "新增" back: "返回" delete: "刪除" edit: "編輯" - no_: "No" nothing: "無" show: "顯示" sure?: "您肯定嗎?" diff --git a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb index eff597fbf..42210178a 100644 --- a/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb +++ b/vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb @@ -22,13 +22,24 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr @level_types = JournalLevelType.all @author_types = JournalAuthorType.all @paper_types= JournalPaperType.all - @journal_co_author_candidate = - JournalCoAuthor.where(name_id: current_user.id).map{|c|c.co_author} + #@journal_co_author_candidate = + # JournalCoAuthor.where(name_id: current_user.id).map{|c|c.co_author} @journal_candidate = WritingJournal.where(create_user_id: current_user.id).map{|j|j.journal_title}.uniq + if (not params[:q].nil?) and (current_user.name.include?params[:q]) + @user = [{ :id => 0, :name => current_user.name}] # self account name + else + @user = [] + end + + @co_authors = JournalCoAuthor.where(name_id: current_user.id, :co_author => /#{params[:q]}/) + @co_authors = [{ :id => params[:q], :name => params[:q] }] + # search string + @user + # self account name + @co_authors.map{|m| { :id => m.id, :name => m.co_author } } # match pattern respond_to do |format| format.html { render :layout => false} + format.json { render :json => @co_authors.to_json } end end @@ -48,7 +59,7 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr @writing_journal = WritingJournal.new(params[:writing_journal]) if @writing_journal.save - render json: {success: true, msg: t('create.success.paper')}.to_json + render json: {success: true, msg: t('create_success')}.to_json else error_msg = @writing_journal.errors.full_messages.join("
                          ") render json: {success: false, msg: error_msg}.to_json @@ -60,31 +71,23 @@ class Panel::PersonalJournal::Desktop::JournalPagesController < ApplicationContr @writing_journal= WritingJournal.find(params[:id]) if @writing_journal.update_attributes(params[:writing_journal]) - render json: {success: true, msg: t('update.success.paper')}.to_json + render json: {success: true, msg: t('update_success')}.to_json else error_msg = @writing_journal.errors.full_messages.join("
                          ") render json: {success: false, msg: error_msg}.to_json end end - def check_file_type file - if not file.nil? - file_type = MIME::Types.type_for(file).first.to_s.split("/")[1] - file_type = "/assets/ft-icons/#{file_type}/#{file_type}-48_32.png" - else - file_type = "" - end - end - def destroy @writing_journal = WritingJournal.find(params[:id]) @writing_journal.destroy - render :json => {success: true, msg: t('delete.success.paper')} + render :json => {success: true, msg: t('delete_success')} end def journal_type level_types = JournalLevelType.all all_journal_lists = WritingJournal.where(create_user_id: current_user.id) + all_journal_lists = all_journal_lists.asc(:journal_title) all_journal_lists = all_journal_lists.map do |j| [ j.journal_title, j.journal_level_type_ids.map do |type| diff --git a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb index 747d724a9..291f7fe9e 100644 --- a/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb +++ b/vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb @@ -6,15 +6,20 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper marker + \ content(publication, view) + \ edit_or_delete(publication) - end end def marker content_tag :div, :class => "list_item_action" - content_tag(:a, "",:href=>"", :class => "icon-check-empty", "toggle-onclick"=>"icon-check-empty icon-check", "ajax-remote"=>"false") + \ - content_tag(:a, "",:href=>"", :class => "icon-star-empty", "toggle-onclick"=>"icon-star-empty icon-star", "ajax-remote"=>"false") + content_tag(:a, "",:href=>"", + :class => "icon-check-empty", + "toggle-onclick"=>"icon-check-empty icon-check", + "ajax-remote"=>"false") + \ + content_tag(:a, "",:href=>"", + :class => "icon-star-empty", + "toggle-onclick"=>"icon-star-empty icon-star", + "ajax-remote"=>"false") end def content publication, view @@ -73,4 +78,16 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper file_type = "" end end + + def generate_authors_name ids + author_name = ids.map{|m| + if m == "0" + {:id => 0, :name => current_user.name} + else + {:id => m, :name => ConferenceCoAuthor.find(m).co_author} + end + } + + author_name.to_json + end end diff --git a/vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb b/vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb index 5d8617c7a..4edf44b2c 100644 --- a/vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb +++ b/vendor/built_in_modules/personal_journal/app/models/journal_co_author.rb @@ -8,6 +8,7 @@ class JournalCoAuthor field :email belongs_to :journal_co_author_relations + has_and_belongs_to_many :writing_journals VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/ validates :email, format: { with: VALID_EMAIL_REGEX }, diff --git a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb index 7374abbf4..8c721b64a 100644 --- a/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb +++ b/vendor/built_in_modules/personal_journal/app/models/writing_journal.rb @@ -12,6 +12,7 @@ class WritingJournal has_and_belongs_to_many :tags, :class_name => "PersonalJournalTag" has_and_belongs_to_many :journal_author_types has_and_belongs_to_many :journal_level_types + has_and_belongs_to_many :journal_co_authors has_many :writing_journal_files, :autosave => true, :dependent => :destroy belongs_to :journal_paper_type @@ -35,25 +36,44 @@ class WritingJournal accepts_nested_attributes_for :writing_journal_files, :allow_destroy => true after_save :save_writing_journal_files before_validation :add_http - before_save :save_co_author + #before_save :save_co_author validates :paper_title, :at_least_one => true validates :url, :format => /^(http|https):\/\/(([a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5})|((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))(:[0-9]{1,5})?(\/.*)?/i, :unless => Proc.new{self.url.blank?} - def save_co_author - authors_list = authors.split(",").map{|n| n.strip.gsub(/\s+/," ")}.reject{|n| n.empty? } - if new_record? - current_user = create_user_id - else - current_user = update_user_id - end + attr_reader :author_tokens - authors_db = JournalCoAuthor.where(:name_id => current_user).map(&:co_author) - authors_list.delete(User.find(current_user).name) - authors_list = authors_list.delete_if{|author| authors_db.include?author} - authors_list.each do |author| - JournalCoAuthor.new(:co_author => author, :name_id => current_user).save - end + def author_tokens=(ids) + authors_ids = ids.split(",").map{|id| + begin + JournalCoAuthor.find(m).id + rescue + if id != "0" + new_co_author = JournalCoAuthor.new(:co_author => id, :name_id => create_user_id) + new_co_author.save + new_co_author.id + else + id + end + end + } + self.journal_co_author_ids = authors_ids end + # old method + #def save_co_author + # authors_list = authors.split(",").map{|n| n.strip.gsub(/\s+/," ")}.reject{|n| n.empty? } + # if new_record? + # current_user = create_user_id + # else + # current_user = update_user_id + # end + + # authors_db = JournalCoAuthor.where(:name_id => current_user).map(&:co_author) + # authors_list.delete(User.find(current_user).name) + # authors_list = authors_list.delete_if{|author| authors_db.include?author} + # authors_list.each do |author| + # JournalCoAuthor.new(:co_author => author, :name_id => current_user).save + # end + #end def self.search( category_id = nil ) if category_id.to_s.size > 0 diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb index 29801f0be..4efbace0a 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb @@ -1,11 +1,11 @@
                            -<% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %> -
                          • -
                            <%= journal_co_author_relation.relation %>
                            -
                            - <%= link_to 'Edit', edit_panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> - <%= link_to 'Destroy', panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>'Are you sure?', "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %> -
                            -
                            • -<% end %> + <% @journal_co_author_relations.each_with_index do |journal_co_author_relation,i| %> +
                          • +
                            <%= journal_co_author_relation.relation %>
                            +
                            + <%= link_to t('edit'), edit_panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), :class => "bt-edit-type admbg2 admtxt", "content-holder"=>"#form_space_"+i.to_s, "ajax-remote"=>"get" %> + <%= link_to t('delete'), panel_personal_journal_desktop_journal_co_author_relation_path(journal_co_author_relation), "confirm-message"=>t('sure?'), "ajax-remote"=>"delete", :class=>"bt-delete admbg2 admtxt" %> +
                            +
                            • + <% end %>
                          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 0200dfe4a..fa6d19fa6 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 @@ -8,9 +8,9 @@
                          -
                            +
                              <% @journal_co_authors.each_with_index do |co_author,i| %> - +
                              • <%= co_author.co_author %>
                                • @@ -18,11 +18,10 @@
                              • <%= @journal_co_author_relations.find(co_author.journal_co_author_relations_id).relation unless co_author.journal_co_author_relations_id.nil?%>
                              - <%= link_to 'Edit', edit_panel_personal_journal_desktop_journal_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> - <%= link_to 'Destroy', panel_personal_journal_desktop_journal_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>'Are you sure?', "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %> + <%= link_to t('edit'), edit_panel_personal_journal_desktop_journal_co_author_path(co_author), :class => "bt-edit admbg2 admtxt", "ajax-remote"=>"get" %> + <%= link_to t('delete'), panel_personal_journal_desktop_journal_co_author_path(co_author), "ajax-remote"=>"delete", "confirm-message"=>t('sure?'), "callback-method"=>"paperDelete", :class=>"bt-delete admbg2 admtxt" %>
                              -
                              • - + <% end %>
                          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 817567a02..efe3fc7d1 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 @@ -1,8 +1,8 @@
                          - <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %> + <%= f.submit t("save"), name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %> <% if not @writing_journal.new_record? %> - <%= submit_tag "Cancel", :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh2 thmadm thmtxt" %> + <%= submit_tag t("cancel"), :type => "button", "ajax-remote" => "get", :href => panel_personal_journal_desktop_journal_pages_path, class: "ini_input hp hh2 thmadm thmtxt" %> <% end %>
                          @@ -25,10 +25,10 @@
                          -
                          -
                          -
                            -
                          • +
                            +
                            +
                              +
                            • <%= f.fields_for :paper_title_translations do |f| %> <%= f.text_area locale, class: "s_grid_6 s_grid", @@ -36,8 +36,8 @@ placeholder: t("personal_journal.paper_title"), value: (@writing_journal.paper_title_translations[locale.to_s] rescue nil) %> <% end %> -
                              • -
                            • +
                              • +
                            • <%= f.fields_for :journal_title_translations do |f| %> <%= f.text_field locale, size: "20", @@ -47,122 +47,128 @@ value: (@writing_journal.journal_title_translations[locale.to_s] rescue nil) %> <% end %> -
                              • -
                            • -
                              - <%= label_tag("", t("personal_journal.level_type")) %> -
                                - <% @level_types.each_with_index do |level_type, i| %> -
                              • - <%= check_box_tag "writing_journal[journal_level_type_ids][]", - level_type.id, - @writing_journal.journal_level_type_ids.include?(level_type.id), - id: "field-#{i}" - %><%= label_tag("field-#{i}", level_type.title) %> -
                                • - <% end %> -
                              -
                              -
                              • + +
                            • +
                              + <%= label_tag("", t("personal_journal.level_type")) %> +
                                + <% @level_types.each_with_index do |level_type, i| %> +
                              • + <%= check_box_tag "writing_journal[journal_level_type_ids][]", + level_type.id, + @writing_journal.journal_level_type_ids.include?(level_type.id), + id: "field-#{i}" + %><%= label_tag("field-#{i}", level_type.title) %> +
                                • + <% end %> +
                              +
                              +
                              • -
                            • +
                            • <%= 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.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.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.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"%> -
                              • -
                            +
                            • +
                          +
                          -
                          -
                          -
                          -
                            -
                          • - <%= f.fields_for :authors_translations do |f| %> - <%= f.text_area locale, +
                            +
                            +
                              +
                            • + <%= f.label :author_tokens, t("personal_journal.authors") %>
                              + <%= f.text_area :author_tokens, + class: "s_grid_6 s_grid", + size: "20x2", + placeholder: t("personal_journal.authors"), + "data-pre" => generate_authors_name(@writing_journal.journal_co_author_ids) %> + <%#= f.fields_for :authors_translations do |f| %> + <%#= f.text_area locale, class: "s_grid_6 s_grid", size: "20x2", placeholder: t("personal_journal.authors"), "autocomplete-list" => "coauthor_autocomplete_list", value: (@writing_journal.authors_translations[locale.to_s] rescue nil) %> - <% end %> + <%# end %> -
                              • -
                            • +
                              • +
                            • - + - -
                              • -
                            • - <%= 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'} %> -
                              • -
                            • - <%= f.text_field :keywords, size: "20", placeholder: t("personal_journal.keywords"), class: "s_grid_6 s_grid"%> -
                              • + + +
                            • + <%= 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'} %> +
                              • +
                            • + <%= f.text_field :keywords, size: "20", placeholder: t("personal_journal.keywords"), class: "s_grid_6 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_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 :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_2 s_grid" %> + <%= f.select :language, + WritingJournal::LANGUAGE_TYPES, + class: "s_grid s_grid_4" %> + +
                              • -
                            • -
                            • >
                              • - - -
                            • - -
                              • -
                            • - <%= 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_2 s_grid") %><%= f.text_field :url, size: "20", placeholder: "www.sample.com", class: "s_grid_4 s_grid"%> +
                            • +
                          +
                          -
                          +
                          • @@ -193,39 +199,36 @@
                            • +
                          -
                          -
                          -
                          -
                            -
                          • +
                            +
                            +
                              +
                            • <%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_6 s_grid full_height"%> -
                              • -
                            +
                            • +
                          +
                          -
                          -
                          -
                          -
                            -
                          • +
                            +
                            +
                              +
                            • <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_6 s_grid full_height"%> -
                              • -
                            +
                            • +
                          +
                          -
                          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 5dd581439..b9baa9ef7 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 @@ -17,24 +17,20 @@
                          - <% @journal_lists.each_with_index do |journal_list,i| %> - <% if ( i % 5 ) == 0 %> -
                          -
                            - <% end %> -
                          • -
                            - -
                            - <% title, level = journal_list %> -
                            <%= title %>
                            -
                            <%= level.join(",") %>
                            -
                            • - <% if ( i % 5 ) == 4 %> -
                          + <% @journal_lists.each_with_index do |journal_list,i| %> +
                          +
                            +
                          • +
                            +
                            - <% end %> - <% end %> + <% title, level = journal_list %> +
                            <%= title %>
                            +
                            <%= level.join(",") %>
                            +
                            • +
                          +
                          + <% end %>
                          diff --git a/vendor/built_in_modules/personal_journal/config/locales/en.yml b/vendor/built_in_modules/personal_journal/config/locales/en.yml index f692a937b..f009368d8 100644 --- a/vendor/built_in_modules/personal_journal/config/locales/en.yml +++ b/vendor/built_in_modules/personal_journal/config/locales/en.yml @@ -24,6 +24,25 @@ en: file : "File" file_name : "File name" description : "File Description" - add : "Add" - edit : "Edit" - delete : "Destory" + + create_success : "Successfully Create" + update_success : "Successfully Update" + delete_success : "Successfully Delete" + add: "Add" + back: "Back" + delete: "Delete" + edit: "Edit" + nothing: "Nothing" + show: "Show" + sure?: "Are you sure?" + update: "Update" + yes_: "Yes" + no_: "No" + cancel : "Cancel" + save: "save" + hintText: "Type in a search term" + noResultsText: "No results" + searchingText: "Searching…" + + error_msg: + time_series_illegal: "must be before end time" diff --git a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml index ed89a4d78..ef7a3cdd2 100644 --- a/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/personal_journal/config/locales/zh_tw.yml @@ -26,6 +26,25 @@ zh_tw: file : "檔案" file_name : "檔案名稱" description : "描述" - add : "新增" - edit : "編輯" - delete : "刪除" + + create_success : "新增完成!!" + update_success : "更新完成!!" + delete_success : "刪除成功!!" + add: "新增" + back: "返回" + delete: "刪除" + edit: "編輯" + nothing: "無" + show: "顯示" + sure?: "您肯定嗎?" + update: "更新" + yes_: "是" + no_: "否" + cancel : "取消" + save: "儲存" + hintText: "請輸入搜尋關鍵字" + noResultsText: "沒有相關的比對結果" + searchingText: "搜尋中…" + + error_msg: + time_series_illegal: "啟始時間必須早於結束時間" From 874648eacff713fe9326dba31fb194d102f103c4 Mon Sep 17 00:00:00 2001 From: Rueshyna Date: Mon, 4 Mar 2013 17:27:36 +0800 Subject: [PATCH 19/29] add Devin's css file for gallery --- .../gallery/app/assets/stylesheets/gallery_frontend.css | 4 ++-- .../gallery/app/assets/stylesheets/widget_gallery.css | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) mode change 100755 => 100644 vendor/built_in_modules/gallery/app/assets/stylesheets/gallery_frontend.css mode change 100755 => 100644 vendor/built_in_modules/gallery/app/assets/stylesheets/widget_gallery.css diff --git a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery_frontend.css b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery_frontend.css old mode 100755 new mode 100644 index 7e9b24211..f449178d5 --- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery_frontend.css +++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery_frontend.css @@ -231,7 +231,7 @@ .slidelist { position: absolute; bottom: 30px; - z-index: 99; + z-index: 98; width: 100%; height: 0; overflow: auto; @@ -251,7 +251,7 @@ border: solid 2px #fff; display: block; width: 120px; - height: 90px; + height: 96px; position: relative; box-shadow: 0 0 6px rgba(0,0,0,0.7); diff --git a/vendor/built_in_modules/gallery/app/assets/stylesheets/widget_gallery.css b/vendor/built_in_modules/gallery/app/assets/stylesheets/widget_gallery.css old mode 100755 new mode 100644 index df7bf2c2c..dd9f95947 --- a/vendor/built_in_modules/gallery/app/assets/stylesheets/widget_gallery.css +++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/widget_gallery.css @@ -32,9 +32,13 @@ .w1.c4 li { width: 23%; } .w1.c5 li { width: 18%; } .w1.c6 li { width: 14.6666%; } +.w1 li a { + -webkit-transition: opacity 0.3s ease; + -moz-transition: opacity 0.3s ease; + transition: opacity 0.3s ease; +} .w1 li a:hover { - box-shadow: 0 0 20px rgba(0,0,0,0.9); - outline: solid 4px #429DFF; + opacity: 0.8; position: relative; } .w1 li a img { From ee5fd18b648c691f1a666d898f62efcdfe040b2f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 4 Mar 2013 17:44:55 +0800 Subject: [PATCH 20/29] =?UTF-8?q?highlighting=20fixed=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/orbitdesktop.js | 17 +++++++++++++++-- .../desktop/journal_pages/_form.html.erb | 5 +---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index cc47a5073..12f194b1c 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -395,8 +395,21 @@ var orbitDesktop = function(dom){ // }) } - $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); - dom.addClass('thmc1 thmtxt active'); + // $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); + // dom.addClass('thmc1 thmtxt active'); + o.highlight_sub_menu_item(dom); + } + this.highlight_sub_menu_item = function(no){ + $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); + var dom; + if(typeof no == "number"){ + dom = $('*[content-type=menu] a').eq(no); + dom.addClass('thmc1 thmtxt active'); + }else if(typeof no == "object"){ + dom = no; + dom.addClass('thmc1 thmtxt active'); + } + return dom; } this.initializeDesktop = function(target,url,cache){ //this is for initializing main desktops that are sections and tiles 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 9163cc237..f8cdae36f 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 @@ -222,10 +222,7 @@ From b5abbc9ef006bd2e416adef4165bbbea9cf4b3cb Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 4 Mar 2013 17:44:55 +0800 Subject: [PATCH 21/29] =?UTF-8?q?highlighting=20fixed=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/orbitdesktop.js | 17 +++++++++++++++-- .../desktop/journal_pages/_form.html.erb | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index cc47a5073..12f194b1c 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -395,8 +395,21 @@ var orbitDesktop = function(dom){ // }) } - $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); - dom.addClass('thmc1 thmtxt active'); + // $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); + // dom.addClass('thmc1 thmtxt active'); + o.highlight_sub_menu_item(dom); + } + this.highlight_sub_menu_item = function(no){ + $('*[content-type=menu] a').removeClass('thmc1 thmtxt active'); + var dom; + if(typeof no == "number"){ + dom = $('*[content-type=menu] a').eq(no); + dom.addClass('thmc1 thmtxt active'); + }else if(typeof no == "object"){ + dom = no; + dom.addClass('thmc1 thmtxt active'); + } + return dom; } this.initializeDesktop = function(target,url,cache){ //this is for initializing main desktops that are sections and tiles 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 efe3fc7d1..6a30de417 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 @@ -229,6 +229,6 @@ From 4e24223c78286340d06c6cda075f96baadc81339 Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 5 Mar 2013 09:39:01 +0800 Subject: [PATCH 22/29] desktop CSS update --- app/assets/javascripts/orbitdesktop.js | 23 +- app/assets/stylesheets/desktop.css | 14 +- .../stylesheets/desktop/desktop-component.css | 407 +++++++++++++++ .../desktop-font.css} | 0 .../desktop-main.css} | 488 +++++------------- .../desktop-media.css} | 0 .../desktop-timeline.css.erb} | 0 app/assets/stylesheets/style.css.erb | 1 - app/views/desktop/allsections.html.erb | 4 +- app/views/desktop/app_manager.html.erb | 10 +- app/views/desktop/app_view1.html.erb | 6 +- app/views/desktop/appstore.html.erb | 12 +- .../desktop/appstore/onlinestore.html.erb | 2 +- app/views/desktop/appstore/widgets.html.erb | 2 +- app/views/desktop/books.html.erb | 22 +- app/views/desktop/books/add.html.erb | 46 +- app/views/desktop/books/list.html.erb | 70 +-- app/views/desktop/books/seminar.html.erb | 70 +-- app/views/desktop/desktop.html.erb | 4 +- app/views/desktop/index.html.erb | 82 +-- app/views/desktop/orbit.html.erb | 22 +- app/views/desktop/patents/add.html.erb | 46 +- app/views/desktop/patents/list.html.erb | 70 +-- app/views/desktop/research_d.html.erb | 22 +- .../desktop/research_domain/add.html.erb | 46 +- .../desktop/research_domain/list.html.erb | 70 +-- app/views/desktop/research_p.html.erb | 22 +- .../desktop/research_project/add.html.erb | 46 +- .../desktop/research_project/list.html.erb | 70 +-- app/views/desktop/settings.html.erb | 14 +- app/views/desktop/settings/sections.html.erb | 4 +- app/views/desktop/settings/themes.html.erb | 22 +- app/views/devise/registrations/edit.html.erb | 4 +- .../_form.html.erb | 4 +- .../index.html.erb | 8 +- .../conference_co_authors/_form.html.erb | 6 +- .../conference_co_authors/index.html.erb | 6 +- .../desktop/conference_pages/_form.html.erb | 26 +- .../conference_pages/conference_type.html.erb | 16 +- .../desktop/conference_pages/index.html.erb | 70 +-- .../desktop/conference_window.html.erb | 22 +- .../_form.html.erb | 4 +- .../index.html.erb | 8 +- .../desktop/journal_co_authors/_form.html.erb | 6 +- .../desktop/journal_co_authors/index.html.erb | 6 +- .../desktop/journal_pages/_form.html.erb | 26 +- .../desktop/journal_pages/index.html.erb | 84 +-- .../journal_pages/journal_type.html.erb | 16 +- .../desktop/journal_window.html.erb | 22 +- 49 files changed, 1115 insertions(+), 936 deletions(-) create mode 100644 app/assets/stylesheets/desktop/desktop-component.css rename app/assets/stylesheets/{desktop_font.css => desktop/desktop-font.css} (100%) rename app/assets/stylesheets/{desktopmain.css => desktop/desktop-main.css} (66%) rename app/assets/stylesheets/{desktopmedia.css => desktop/desktop-media.css} (100%) rename app/assets/stylesheets/{orbitTimeline.css.erb => desktop/desktop-timeline.css.erb} (100%) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index cc47a5073..d8a1ea4a7 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -285,7 +285,7 @@ var orbitDesktop = function(dom){ var entries = column_container.find("li[item=true]"),x = 0; entries.each(function(i,li){ if(x == 0){ - column = $("
                              '+section.name+'')); + $("div#desktop ul#section_list").append($('
                            • '+section.name+'
                              • ')); }) bindSecondaryHandlers(); }) @@ -697,7 +697,7 @@ var orbitDesktop = function(dom){ tempstyle = "style='display:none;'"; $("div#desktop span#section_heading").text(section.name); } - $("div#desktop ul#section_list").append($('
                            • '+section.name+'
                              • ')); + $("div#desktop ul#section_list").append($('
                            • '+section.name+'
                              • ')); }) bindSecondaryHandlers(); }else{ @@ -1346,10 +1346,10 @@ var orbitDesktop = function(dom){ var count,baseWidth,fillArray,pxs; if( typeof target.fill == 'string' ){ - fillArray = target.main.find(target.fill); - count = fillArray.length; - baseWidth = $(target.fill).eq(1).outerWidth(true); - target.main.find('.overview').width( baseWidth * count); + // fillArray = target.main.find(target.fill); + // count = fillArray.length; + // baseWidth = $(target.fill).eq(1).outerWidth(true); + // target.main.find('.overview').width( baseWidth * count); } else if( typeof target.fill == 'number' ){ target.main.find('.overview').width( target.fill ); @@ -1358,14 +1358,13 @@ var orbitDesktop = function(dom){ } else { o.notify('tinyscrollbar: setting width failed','imp',2); } - if(target.height) + if(target.height){ target.main.height(target.height); + } target.main .tinyscrollbar( tinysettings ) - .find('.scrollbar') - .delay(1500) - .addClass('op00', 500); + .find('.scrollbar'); }; this.simple_drop_down = function(){ // simple dropdown menu diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index f3746eff1..2ae194e5e 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -2,17 +2,17 @@ *This is a manifest file that'll automatically include all the stylesheets available in this directory *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at *the top of the compiled file, but it's generally better to create a new file per style scope. - *= require desktop_font - *= require style + *= require desktop/desktop-font *= require bootstrap *= require bootstrap-orbit *= require jquery.miniColors + *= require jquery.gridster *= require jquery-ui *= require font-awesome - *= require desktopmain - *= require desktopmedia - *= require orbitTimeline - *= require orbit-bar - *= require jquery.gridster *= require icons + *= require desktop/desktop-component + *= require desktop/desktop-main + *= require desktop/desktop-media + *= require desktop/desktop-timeline + *= require orbit-bar */ \ No newline at end of file diff --git a/app/assets/stylesheets/desktop/desktop-component.css b/app/assets/stylesheets/desktop/desktop-component.css new file mode 100644 index 000000000..49814067d --- /dev/null +++ b/app/assets/stylesheets/desktop/desktop-component.css @@ -0,0 +1,407 @@ +/* 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; +} +.sdm:hover .sdm_o { + display: block; +} +.sdm_o { + display: none; + position: absolute; + z-index: 9; + left: 0; + top: 60px; + font-size: 15px; + } +.sdm_o li { + border-top: solid 1px #f2f2f2; +} +.sdm_o li:first-child { + border: none; +} +.sdm_o a { + display: block; +} +.sdm_o .admtxt { + display: block; + line-height: 36px; +} + +/* simple dropdown menu with indicator */ +.sdm_mdr .sdm_t { + padding-right: 12px; +} +.sdm_mdr .mdr { + position: absolute; + right: 0; +} + +/* simple menu */ +.s_menu { + font-size: 15px; + line-height: 36px; +} +.s_menu li { + border-top: solid 1px #ddd; +} +.s_menu li:first-child { + border: none; +} +.s_menu a { + display: block; +} + +/* simple tabs */ +.s_tab { + font-size: 15px; + line-height: 36px; +} +.stb_h {} +.stb_v {} +.s_tab ul { + overflow: hidden; +} +.s_tab li { + float: left; +} +.s_tab a { + display: block; +} +.s_tab .admbg { + background-color: #f0f0f0; +} +.st_c { + display: none; +} +.st_c:first-child { + 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; +} +.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; +} + +/* 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; +} + +/* 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; +} + +/* 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; +} +.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.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; +} +.toolbar + .tinycanvas, +.s_tab + .tinycanvas { + height: 480px; +} \ No newline at end of file diff --git a/app/assets/stylesheets/desktop_font.css b/app/assets/stylesheets/desktop/desktop-font.css similarity index 100% rename from app/assets/stylesheets/desktop_font.css rename to app/assets/stylesheets/desktop/desktop-font.css diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktop/desktop-main.css similarity index 66% rename from app/assets/stylesheets/desktopmain.css rename to app/assets/stylesheets/desktop/desktop-main.css index f2a5e0195..a6eeee015 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -60,14 +60,21 @@ body { } a, a:hover { text-decoration: none; color: #666; } a:focus { outline: none; } +.clear { clear: both; } /* box-sizing element */ -.appholder, .appname { +.w1, .w2, .w4, .wh1, .wh2, .wh3, .w100, .pw, +.h1, .h2, .h4, .hh1, .hh2, .hh3, .ph, +.appholder, +.appname, +.tinycanvas, +.tinycanvas .overview > .column { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; } +/* Desktop Global Style */ .admbg { background-color: #fff; } .admbg2 { background-color: #ddd; } .admtxt { color: #666; } @@ -80,6 +87,56 @@ a:focus { outline: none; } position: relative; } .thmtxt { position: relative; } +.ini_input { + 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; } + +/* - 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; + display:inline-block; + } +.group{ + float: left; + margin-right: 24px; +} /* desktop layout */ #container { @@ -88,6 +145,7 @@ a:focus { outline: none; } #header { padding: 0 0 12px 0; min-width: 800px; + height: 72px; } #side { width: 60px; @@ -96,11 +154,9 @@ a:focus { outline: none; } margin-right: 96px; top: 120px; left: 0; - z-index: 10; + z-index: 11; } #holder { - /*overflow: hidden; - overflow-x: auto;*/ height: 516px; width: auto; position: relative; @@ -118,9 +174,7 @@ a:focus { outline: none; } height: 30px; margin: 15px 0 0 15px; } -.docklist { - - } +.docklist {} .docklist li { position: relative; } @@ -145,12 +199,6 @@ a:focus { outline: none; } display: none; } -.ini_input { - margin: 0; - padding: 0; - border: 0; - } -.ini_input:focus { outline: none; } #search_app { position: relative; background-color: #fff; @@ -184,7 +232,76 @@ a:focus { outline: none; } .section_label li { font-size: 15px; } .section_label li:first-child { font-size: 21px; } - +/* 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; } +.note_type img { display: block; } +.note_message { + color: #333; + margin: 10px 0 0 48px; + font-size: 15px; +} + +/* Desktop Dialogue */ +#orbitdiag { + position: fixed; + width: 100%; + height: 100%; + left: 0; + top: 0; + z-index: 10; +} +#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; } + +/* Tile */ .appname { font-size: 15px; line-height: 30px; @@ -249,8 +366,6 @@ a:focus { outline: none; } position: relative; z-index: 9; } -/*.section_slc { width: 252px; }*/ - .tile { display: block; width: 100%; @@ -260,85 +375,9 @@ a:focus { outline: none; } top: 0; } -/* panel */ -#panel_l { background-color: #f0f0f0; float: left; } -#panel_r { margin-left: 252px; position: relative;} - -/* simple dropdown menu */ -.sdm { position: relative; } -.sdm_t { - cursor: default; - transition: all 0.3s ease; - -webkit-transition: all 0.3s ease; - -moz-transition: all 0.3s ease; -} -.sdm:hover .sdm_o { display: block; } -.sdm_o { - display: none; - position: absolute; - z-index: 9; - left: 0; - top: 60px; - font-size: 15px; - } -.sdm_o li { border-top: solid 1px #f2f2f2; } -.sdm_o li:first-child { border: none; } -.sdm_o a { display: block; } -.sdm_o .admtxt { display: block; line-height: 36px; } - -/* with indicator */ -.sdm_mdr .sdm_t { - padding-right: 12px; -} -.sdm_mdr .mdr { - position: absolute; - right: 0; -} - -/* simple menu */ -.s_menu { font-size: 15px; line-height: 36px; } -.s_menu li { border-top: solid 1px #ddd; } -.s_menu li:first-child { border: none; } -.s_menu a { display: block; } - -/* simple tabs */ -.s_tab { font-size: 15px; line-height: 36px; } -.stb_h {} -.stb_v {} -.s_tab ul { overflow: hidden; } -.s_tab li { float: left; } -.s_tab a { display: block; } -.s_tab .admbg { background-color: #f0f0f0; } -.st_c { display: none; } -.st_c:first-child { display: block; } - /* header drop menu */ .sdm_mdr .sdm_o { top: 36px; } -/* 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; -} - /* Setting Page */ .theme_list {} .theme_list .ssl_item, .stock_wallpaper .ssl_item { @@ -384,51 +423,7 @@ a:focus { outline: none; } border: 0; } -/* theme color 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; } -/* box set */ -.w1 { width: 96px; } -.w2 { width: 228px; } -.w4 { width: 488px; } -.wh1 { width: 30px; } -.wh2 { width: 36px; } -.wh3 { width: 60px; } -.w100 { width: 100%; } -.pw { width: 540px; } - -.h1 { height: 96px; } -.h2 { height: 228px; } -.h4 { height: 488px; } -.hh1 { height: 30px; } -.hh2 { height: 36px; } -.hh3 { height: 60px; } -.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; - display:inline-block; - } -.group{ - float: left; - margin-right: 24px; - /*max-width: 800px;*/ - /*max-height:540px;*/ -} .group_search{ float: left; margin-right: 36px; @@ -442,226 +437,6 @@ a:focus { outline: none; } .g_sep { width: 11px; border-left: solid 1px #fff; } -.clear { clear: both; } - -/* 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%; } -.tinycanvas .scrollbar { position: absolute; z-index: 9; } -.tinycanvas .scrollbar.sb_h { left: 0; bottom: 0; height: 6px; } -.tinycanvas .scrollbar.sb_v { right: 0; top: 0; width: 6px; } -.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.disable{ display: none; } - -/* Orbit 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; -} - -/* Orbit Dialogue */ -#orbitdiag { - position: fixed; - width: 100%; - height: 100%; - left: 0; - top: 0; - z-index: 10; -} -#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; } - -/* 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; } - -/* simple slider */ -/*.s_slider { display: inline-block; float: none; vertical-align: middle; } -.s_slider > .s_grid { display: inline-block; float: none; vertical-align: middle; } -.s_slider_holder { - position: absolute; -} -.s_slider_c { - position: relative; - height: 6px; - background-color: #ddd; - margin-right: 5px; -} -.s_slider_c .ui-slider-handle { - position: absolute; - width: 10px; - height: 16px; - margin: -5px 0 0 0; - background-color: #333; -} -.s_slider_c .ui-slider-range { - position: absolute; - top: 0; - height: 100%; - background-color: red; - 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; - transition: all 0.3s ease; - -webkit-transition: all 0.3s ease; - -moz-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; } -.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 { /*float: none; display: inline-block;*/ 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; -} - - #group_wrapper {} .grp { height:528px; } .g_col { @@ -730,7 +505,6 @@ a:focus { outline: none; } } /* Journal Papers */ -#paper_list, #paper_add { height: 456px; } #paper_list .g_col { width: 410px; height: 456px; diff --git a/app/assets/stylesheets/desktopmedia.css b/app/assets/stylesheets/desktop/desktop-media.css similarity index 100% rename from app/assets/stylesheets/desktopmedia.css rename to app/assets/stylesheets/desktop/desktop-media.css diff --git a/app/assets/stylesheets/orbitTimeline.css.erb b/app/assets/stylesheets/desktop/desktop-timeline.css.erb similarity index 100% rename from app/assets/stylesheets/orbitTimeline.css.erb rename to app/assets/stylesheets/desktop/desktop-timeline.css.erb diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 48f79d2a1..d28c86e1c 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -1,6 +1,5 @@ /*style*/ -/*@import url(http://fonts.googleapis.com/css?family=Cuprum);*/ @font-face{ font-family: 'WebSymbolsRegular'; src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>); diff --git a/app/views/desktop/allsections.html.erb b/app/views/desktop/allsections.html.erb index 0d168253a..414504c2a 100644 --- a/app/views/desktop/allsections.html.erb +++ b/app/views/desktop/allsections.html.erb @@ -1,7 +1,7 @@
                              -