From 82b6be483a3dc24d84de04f8d9bc4c841b8406fb Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 28 Aug 2013 16:30:08 +0800 Subject: [PATCH] isotope embedded inside desktop kernel --- app/assets/javascripts/desktop/desktop.js | 1 + .../javascripts/desktop/orbitdesktop.js | 97 +++++++++++++------ app/assets/javascripts/jquery.isotope.min.js | 13 +++ .../stylesheets/desktop/desktop-component.css | 8 +- .../desktop/desktop-component.scss | 2 +- .../stylesheets/desktop/desktop-main.css | 8 +- .../stylesheets/desktop/desktop-main.scss | 2 +- .../stylesheets/desktop/desktop-media.css | 4 +- app/assets/stylesheets/desktop/desktop.css | 1 + app/assets/stylesheets/desktop/isotope.css | 72 ++++++++++++++ .../desktop/journal_pages_helper.rb | 16 +++ .../desktop/journal_pages/_form.html.erb | 38 ++------ .../desktop/journal_pages/index.html.erb | 4 +- 13 files changed, 197 insertions(+), 69 deletions(-) create mode 100644 app/assets/javascripts/jquery.isotope.min.js create mode 100644 app/assets/stylesheets/desktop/isotope.css diff --git a/app/assets/javascripts/desktop/desktop.js b/app/assets/javascripts/desktop/desktop.js index 2566a05ec..2890d85dc 100644 --- a/app/assets/javascripts/desktop/desktop.js +++ b/app/assets/javascripts/desktop/desktop.js @@ -17,4 +17,5 @@ //= require desktop/jquery.gridster //= require desktop/books_pages //= require select2 +//= require jquery.isotope.min.js //= require orbit_js_1.0.1-front-end diff --git a/app/assets/javascripts/desktop/orbitdesktop.js b/app/assets/javascripts/desktop/orbitdesktop.js index 94d845636..9b924a311 100755 --- a/app/assets/javascripts/desktop/orbitdesktop.js +++ b/app/assets/javascripts/desktop/orbitdesktop.js @@ -330,13 +330,9 @@ var orbitDesktop = function(dom){ }); $(window).resize(function(){ - // var ww = $(window).width(); - // $("img#thmbackground").attr({"width":ww}); - // if( $('.tinycanvas').length > 0 ){ - $('.tinycanvas').tinyscrollbar_update('relative'); - // } - if($(o.contentHolder).find("div.app_frame").length > 0){ - $(o.contentHolder).find("div.app_frame").each(function(){ + $('.tinycanvas').tinyscrollbar_update('relative'); + if($("body").find("div.app_frame").length > 0){ + $("body").find("div.app_frame").each(function(){ var app_holder_height = $(this).height() - 60; var app_holder_width = $(this).width(); $(this).find("div.app_holder").height(app_holder_height); @@ -361,14 +357,6 @@ var orbitDesktop = function(dom){ var extractLast = function( term ) { return split( term ).pop(); } - - - // $("body").on("keydown","*[autocomplete]", function( event ) { - // var autocompleteList = $(this).attr("autocomplete-list"); - // console.log($(this)); - - // }); - // }; this.layout_data = function(h){ @@ -460,13 +448,51 @@ var orbitDesktop = function(dom){ $("div[container=true] div.overview").html(f.markup); var settings = {main : ".tinycanvas"}; var tsettings = {}; + + var ist = function(){ + $('#holder').css('height', $('#container').height() - 72); + $('.tinycanvas').css('height', $('#panel_r').height() - 36); + var dom = $("*[isotope=true]").isotope({ + layoutMode: 'fitColumns', + onLayout: function($elems, instance){ + $elems.width(base_width); + setTimeout(function(){ + dom.isotope('reLayout',function(){ + $("div[container=true] div.overview").width(dom.width()); + o.tinyscrollbar.tinyscrollbar_update("relative"); + }) + },500); + } + }); + + + $(window).resize(function(){ + if($("*[isotope=true]").length > 0){ + $('#holder').css('height', $('#container').height() - 72); + $('.tinycanvas').css('height', $('#panel_r').height() - 36); + $(".isotope").isotope('reLayout',function(){ + $("div[container=true] div.overview").width($(".isotope").width()); + o.tinyscrollbar.tinyscrollbar_update("relative"); + }); + } + }); + $('.s_grid_h_full').parent().css('height','100%'); + + return dom; + } + + if($("*[isotope=true]").length > 0){ + var dom = ist(); + f.width = dom.width(); + } + if(f.width){ settings.fill = f.width; } if(pagination_variable){ var page_no = 1; - tsettings.onMove = function(x){ - if(x < 50){ + tsettings.onMove = function(e){ + if(e < 50){ if(!pagination_link) pagination_link = o.lastlink; if(o.paging){ @@ -477,6 +503,8 @@ var orbitDesktop = function(dom){ } } } + + // call other functions here o.tinyscrollbar_ext(settings,tsettings); o.simple_drop_down(); @@ -484,6 +512,7 @@ var orbitDesktop = function(dom){ o.use_select2(); o.check_simple_layout(); } + this.paging = true; this.pagination = function(link,variable,page_no){ var retvalue = null; @@ -492,17 +521,31 @@ var orbitDesktop = function(dom){ type : "get", success : function(html){ var f = o.layout_data.generate_layout_html(html); - // console.log(f.total) - if(f.total > 0){ - $("div[container=true] .overview").append(f.markup); - if(f.width){ - var w = $("div[container=true] .overview").width(); - $("div[container=true] .overview").width(w+f.width); + if($("*[isotope=true]").length > 0){ + var $ul = $(f.markup), + elems = $ul.children("li[item=true]"); + if(elems.length > 1) + o.paging = true; + else + o.paging = false; + $(".isotope").append(elems).isotope("appended",elems,function(){ + $(".isotope").isotope("reLayout",function(){ + $("div[container=true] div.overview").width($(".isotope").width()+50); + o.tinyscrollbar.tinyscrollbar_update("relative"); + }) + }); + }else{ + if(f.total > 0){ + $("div[container=true] .overview").append(f.markup); + if(f.width){ + var w = $("div[container=true] .overview").width(); + $("div[container=true] .overview").width(w+f.width); + } + o.tinyscrollbar.tinyscrollbar_update("relative"); + o.paging = true; + } else { + o.paging = false; } - o.tinyscrollbar.tinyscrollbar_update("relative"); - o.paging = true; - } else { - o.paging = false; } } }); diff --git a/app/assets/javascripts/jquery.isotope.min.js b/app/assets/javascripts/jquery.isotope.min.js new file mode 100644 index 000000000..ea4afadaf --- /dev/null +++ b/app/assets/javascripts/jquery.isotope.min.js @@ -0,0 +1,13 @@ +/** + * Isotope v1.5.25 + * An exquisite jQuery plugin for magical layouts + * http://isotope.metafizzy.co + * + * Commercial use requires one-time purchase of a commercial license + * http://isotope.metafizzy.co/docs/license.html + * + * Non-commercial use is licensed under the MIT License + * + * Copyright 2013 Metafizzy + */ +(function(a,b,c){"use strict";var d=a.document,e=a.Modernizr,f=function(a){return a.charAt(0).toUpperCase()+a.slice(1)},g="Moz Webkit O Ms".split(" "),h=function(a){var b=d.documentElement.style,c;if(typeof b[a]=="string")return a;a=f(a);for(var e=0,h=g.length;e"+d+"{#modernizr{height:3px}}"+"").appendTo("head"),f=b('
').appendTo("html");a=f.height()===3,f.remove(),e.remove()}return a},csstransitions:function(){return!!j}},l;if(e)for(l in k)e.hasOwnProperty(l)||e.addTest(l,k[l]);else{e=a.Modernizr={_version:"1.6ish: miniModernizr for Isotope"};var m=" ",n;for(l in k)n=k[l](),e[l]=n,m+=" "+(n?"":"no-")+l;b("html").addClass(m)}if(e.csstransforms){var o=e.csstransforms3d?{translate:function(a){return"translate3d("+a[0]+"px, "+a[1]+"px, 0) "},scale:function(a){return"scale3d("+a+", "+a+", 1) "}}:{translate:function(a){return"translate("+a[0]+"px, "+a[1]+"px) "},scale:function(a){return"scale("+a+") "}},p=function(a,c,d){var e=b.data(a,"isoTransform")||{},f={},g,h={},j;f[c]=d,b.extend(e,f);for(g in e)j=e[g],h[g]=o[g](j);var k=h.translate||"",l=h.scale||"",m=k+l;b.data(a,"isoTransform",e),a.style[i]=m};b.cssNumber.scale=!0,b.cssHooks.scale={set:function(a,b){p(a,"scale",b)},get:function(a,c){var d=b.data(a,"isoTransform");return d&&d.scale?d.scale:1}},b.fx.step.scale=function(a){b.cssHooks.scale.set(a.elem,a.now+a.unit)},b.cssNumber.translate=!0,b.cssHooks.translate={set:function(a,b){p(a,"translate",b)},get:function(a,c){var d=b.data(a,"isoTransform");return d&&d.translate?d.translate:[0,0]}}}var q,r;e.csstransitions&&(q={WebkitTransitionProperty:"webkitTransitionEnd",MozTransitionProperty:"transitionend",OTransitionProperty:"oTransitionEnd otransitionend",transitionProperty:"transitionend"}[j],r=h("transitionDuration"));var s=b.event,t=b.event.handle?"handle":"dispatch",u;s.special.smartresize={setup:function(){b(this).bind("resize",s.special.smartresize.handler)},teardown:function(){b(this).unbind("resize",s.special.smartresize.handler)},handler:function(a,b){var c=this,d=arguments;a.type="smartresize",u&&clearTimeout(u),u=setTimeout(function(){s[t].apply(c,d)},b==="execAsap"?0:100)}},b.fn.smartresize=function(a){return a?this.bind("smartresize",a):this.trigger("smartresize",["execAsap"])},b.Isotope=function(a,c,d){this.element=b(c),this._create(a),this._init(d)};var v=["width","height"],w=b(a);b.Isotope.settings={resizable:!0,layoutMode:"masonry",containerClass:"isotope",itemClass:"isotope-item",hiddenClass:"isotope-hidden",hiddenStyle:{opacity:0,scale:.001},visibleStyle:{opacity:1,scale:1},containerStyle:{position:"relative",overflow:"hidden"},animationEngine:"best-available",animationOptions:{queue:!1,duration:800},sortBy:"original-order",sortAscending:!0,resizesContainer:!0,transformsEnabled:!0,itemPositionDataEnabled:!1},b.Isotope.prototype={_create:function(a){this.options=b.extend({},b.Isotope.settings,a),this.styleQueue=[],this.elemCount=0;var c=this.element[0].style;this.originalStyle={};var d=v.slice(0);for(var e in this.options.containerStyle)d.push(e);for(var f=0,g=d.length;fg?1:f0&&(i=function(a,b){b.$el[d](b.style,f).one(q,k)},j=!1)}}b.each(this.styleQueue,i),j&&k(),this.styleQueue=[]},resize:function(){this["_"+this.options.layoutMode+"ResizeChanged"]()&&this.reLayout()},reLayout:function(a){this["_"+this.options.layoutMode+"Reset"](),this.layout(this.$filteredAtoms,a)},addItems:function(a,b){var c=this._getAtoms(a);this.$allAtoms=this.$allAtoms.add(c),b&&b(c)},insert:function(a,b){this.element.append(a);var c=this;this.addItems(a,function(a){var d=c._filter(a);c._addHideAppended(d),c._sort(),c.reLayout(),c._revealAppended(d,b)})},appended:function(a,b){var c=this;this.addItems(a,function(a){c._addHideAppended(a),c.layout(a),c._revealAppended(a,b)})},_addHideAppended:function(a){this.$filteredAtoms=this.$filteredAtoms.add(a),a.addClass("no-transition"),this._isInserting=!0,this.styleQueue.push({$el:a,style:this.options.hiddenStyle})},_revealAppended:function(a,b){var c=this;setTimeout(function(){a.removeClass("no-transition"),c.styleQueue.push({$el:a,style:c.options.visibleStyle}),c._isInserting=!1,c._processStyleQueue(a,b)},10)},reloadItems:function(){this.$allAtoms=this._getAtoms(this.element.children())},remove:function(a,b){this.$allAtoms=this.$allAtoms.not(a),this.$filteredAtoms=this.$filteredAtoms.not(a);var c=this,d=function(){a.remove(),b&&b.call(c.element)};a.filter(":not(."+this.options.hiddenClass+")").length?(this.styleQueue.push({$el:a,style:this.options.hiddenStyle}),this._sort(),this.reLayout(d)):d()},shuffle:function(a){this.updateSortData(this.$allAtoms),this.options.sortBy="random",this._sort(),this.reLayout(a)},destroy:function(){var a=this.usingTransforms,b=this.options;this.$allAtoms.removeClass(b.hiddenClass+" "+b.itemClass).each(function(){var b=this.style;b.position="",b.top="",b.left="",b.opacity="",a&&(b[i]="")});var c=this.element[0].style;for(var d in this.originalStyle)c[d]=this.originalStyle[d];this.element.unbind(".isotope").undelegate("."+b.hiddenClass,"click").removeClass(b.containerClass).removeData("isotope"),w.unbind(".isotope")},_getSegments:function(a){var b=this.options.layoutMode,c=a?"rowHeight":"columnWidth",d=a?"height":"width",e=a?"rows":"cols",g=this.element[d](),h,i=this.options[b]&&this.options[b][c]||this.$filteredAtoms["outer"+f(d)](!0)||g;h=Math.floor(g/i),h=Math.max(h,1),this[b][e]=h,this[b][c]=i},_checkIfSegmentsChanged:function(a){var b=this.options.layoutMode,c=a?"rows":"cols",d=this[b][c];return this._getSegments(a),this[b][c]!==d},_masonryReset:function(){this.masonry={},this._getSegments();var a=this.masonry.cols;this.masonry.colYs=[];while(a--)this.masonry.colYs.push(0)},_masonryLayout:function(a){var c=this,d=c.masonry;a.each(function(){var a=b(this),e=Math.ceil(a.outerWidth(!0)/d.columnWidth);e=Math.min(e,d.cols);if(e===1)c._masonryPlaceBrick(a,d.colYs);else{var f=d.cols+1-e,g=[],h,i;for(i=0;id&&(e.x=0,e.y=e.height),c._pushPosition(a,e.x,e.y),e.height=Math.max(e.y+g,e.height),e.x+=f})},_fitRowsGetContainerSize:function(){return{height:this.fitRows.height}},_fitRowsResizeChanged:function(){return!0},_cellsByRowReset:function(){this.cellsByRow={index:0},this._getSegments(),this._getSegments(!0)},_cellsByRowLayout:function(a){var c=this,d=this.cellsByRow;a.each(function(){var a=b(this),e=d.index%d.cols,f=Math.floor(d.index/d.cols),g=(e+.5)*d.columnWidth-a.outerWidth(!0)/2,h=(f+.5)*d.rowHeight-a.outerHeight(!0)/2;c._pushPosition(a,g,h),d.index++})},_cellsByRowGetContainerSize:function(){return{height:Math.ceil(this.$filteredAtoms.length/this.cellsByRow.cols)*this.cellsByRow.rowHeight+this.offset.top}},_cellsByRowResizeChanged:function(){return this._checkIfSegmentsChanged()},_straightDownReset:function(){this.straightDown={y:0}},_straightDownLayout:function(a){var c=this;a.each(function(a){var d=b(this);c._pushPosition(d,0,c.straightDown.y),c.straightDown.y+=d.outerHeight(!0)})},_straightDownGetContainerSize:function(){return{height:this.straightDown.y}},_straightDownResizeChanged:function(){return!0},_masonryHorizontalReset:function(){this.masonryHorizontal={},this._getSegments(!0);var a=this.masonryHorizontal.rows;this.masonryHorizontal.rowXs=[];while(a--)this.masonryHorizontal.rowXs.push(0)},_masonryHorizontalLayout:function(a){var c=this,d=c.masonryHorizontal;a.each(function(){var a=b(this),e=Math.ceil(a.outerHeight(!0)/d.rowHeight);e=Math.min(e,d.rows);if(e===1)c._masonryHorizontalPlaceBrick(a,d.rowXs);else{var f=d.rows+1-e,g=[],h,i;for(i=0;id&&(e.x=e.width,e.y=0),c._pushPosition(a,e.x,e.y),e.width=Math.max(e.x+f,e.width),e.y+=g})},_fitColumnsGetContainerSize:function(){return{width:this.fitColumns.width}},_fitColumnsResizeChanged:function(){return!0},_cellsByColumnReset:function(){this.cellsByColumn={index:0},this._getSegments(),this._getSegments(!0)},_cellsByColumnLayout:function(a){var c=this,d=this.cellsByColumn;a.each(function(){var a=b(this),e=Math.floor(d.index/d.rows),f=d.index%d.rows,g=(e+.5)*d.columnWidth-a.outerWidth(!0)/2,h=(f+.5)*d.rowHeight-a.outerHeight(!0)/2;c._pushPosition(a,g,h),d.index++})},_cellsByColumnGetContainerSize:function(){return{width:Math.ceil(this.$filteredAtoms.length/this.cellsByColumn.rows)*this.cellsByColumn.columnWidth}},_cellsByColumnResizeChanged:function(){return this._checkIfSegmentsChanged(!0)},_straightAcrossReset:function(){this.straightAcross={x:0}},_straightAcrossLayout:function(a){var c=this;a.each(function(a){var d=b(this);c._pushPosition(d,c.straightAcross.x,0),c.straightAcross.x+=d.outerWidth(!0)})},_straightAcrossGetContainerSize:function(){return{width:this.straightAcross.x}},_straightAcrossResizeChanged:function(){return!0}},b.fn.imagesLoaded=function(a){function h(){a.call(c,d)}function i(a){var c=a.target;c.src!==f&&b.inArray(c,g)===-1&&(g.push(c),--e<=0&&(setTimeout(h),d.unbind(".imagesLoaded",i)))}var c=this,d=c.find("img").add(c.filter("img")),e=d.length,f="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==",g=[];return e||h(),d.bind("load.imagesLoaded error.imagesLoaded",i).each(function(){var a=this.src;this.src=f,this.src=a}),c};var x=function(b){a.console&&a.console.error(b)};b.fn.isotope=function(a,c){if(typeof a=="string"){var d=Array.prototype.slice.call(arguments,1);this.each(function(){var c=b.data(this,"isotope");if(!c){x("cannot call methods on isotope prior to initialization; attempted to call method '"+a+"'");return}if(!b.isFunction(c[a])||a.charAt(0)==="_"){x("no such method '"+a+"' for isotope instance");return}c[a].apply(c,d)})}else this.each(function(){var d=b.data(this,"isotope");d?(d.option(a),d._init(c)):b.data(this,"isotope",new b.Isotope(a,this,c))});return this}})(window,jQuery); \ No newline at end of file diff --git a/app/assets/stylesheets/desktop/desktop-component.css b/app/assets/stylesheets/desktop/desktop-component.css index 228348e83..f16d8a951 100644 --- a/app/assets/stylesheets/desktop/desktop-component.css +++ b/app/assets/stylesheets/desktop/desktop-component.css @@ -1,4 +1,4 @@ -.noSelect { +.noSelect, .noSelect * { -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; @@ -220,7 +220,7 @@ .s_form .s_table td { vertical-align: middle; } .s_form .s_table thead th { - border-bottom: solid 1px #eeeeee; } + border-bottom: solid 1px #eee; } /* simple select */ .s_select_g { @@ -311,7 +311,7 @@ width: 16px; height: 20px; background-color: #000; - border: solid 2px white; + border: solid 2px #fff; cursor: pointer; -webkit-transition: left 0.3s ease; -moz-transition: left 0.3s ease; @@ -366,7 +366,7 @@ width: 100%; } .tinycanvas .overview > .column { float: left; - border-right: solid 1px #eeeeee; + border-right: solid 1px #eee; padding: 0 12px 0 0; margin: 0 12px 0 0; height: 100%; } diff --git a/app/assets/stylesheets/desktop/desktop-component.scss b/app/assets/stylesheets/desktop/desktop-component.scss index 501b48182..8dd99e876 100644 --- a/app/assets/stylesheets/desktop/desktop-component.scss +++ b/app/assets/stylesheets/desktop/desktop-component.scss @@ -1,6 +1,6 @@ @import "desktop-helper"; -.noSelect { +.noSelect, .noSelect * { @include no-select; } diff --git a/app/assets/stylesheets/desktop/desktop-main.css b/app/assets/stylesheets/desktop/desktop-main.css index ed610f56b..e9298769f 100644 --- a/app/assets/stylesheets/desktop/desktop-main.css +++ b/app/assets/stylesheets/desktop/desktop-main.css @@ -223,7 +223,8 @@ a.admtxt.admbg2:hover { width: 100%; } .pw { - width: 540px; } + /*width: 540px;*/ +} .h1 { height: 120px; } @@ -375,7 +376,8 @@ a.admtxt.admbg2:hover { background-color: #fff; margin-left: 252px; position: relative; - width: auto; } + width: calc(100% - 272px); +} /* Desktop Notification */ #orbitnote { @@ -798,7 +800,7 @@ a.admtxt.admbg2:hover { /*Tooltip popup */ .desktop_toolpopup { position: absolute; - z-index: 10px; + z-index: 10; display: none; padding: 12px; cursor: default; diff --git a/app/assets/stylesheets/desktop/desktop-main.scss b/app/assets/stylesheets/desktop/desktop-main.scss index e8f373141..6f6a4f481 100644 --- a/app/assets/stylesheets/desktop/desktop-main.scss +++ b/app/assets/stylesheets/desktop/desktop-main.scss @@ -824,7 +824,7 @@ a:focus { outline: none; } /*Tooltip popup */ .desktop_toolpopup { position: absolute; - z-index: 10px; + z-index: 10; display: none; padding: 12px; cursor: default; diff --git a/app/assets/stylesheets/desktop/desktop-media.css b/app/assets/stylesheets/desktop/desktop-media.css index e8fc7bfea..d7ded5d60 100644 --- a/app/assets/stylesheets/desktop/desktop-media.css +++ b/app/assets/stylesheets/desktop/desktop-media.css @@ -1,10 +1,10 @@ @media only screen and (min-width: 1240px){ - #panel_r.pw { width: 800px; } + /*#panel_r.pw { width: 800px; }*/ } @media only screen and (min-width: 1900px){ - #panel_r.pw { width: 1400px; } + /*#panel_r.pw { width: 1400px; }*/ } \ No newline at end of file diff --git a/app/assets/stylesheets/desktop/desktop.css b/app/assets/stylesheets/desktop/desktop.css index 5e8c46150..1fc63bf59 100644 --- a/app/assets/stylesheets/desktop/desktop.css +++ b/app/assets/stylesheets/desktop/desktop.css @@ -14,4 +14,5 @@ *= require desktop/desktop-media *= require desktop/desktop-select2 *= require desktop/desktop-timeline + *= require desktop/isotope.css */ diff --git a/app/assets/stylesheets/desktop/isotope.css b/app/assets/stylesheets/desktop/isotope.css new file mode 100644 index 000000000..b0e50d5a2 --- /dev/null +++ b/app/assets/stylesheets/desktop/isotope.css @@ -0,0 +1,72 @@ + #side { + height: auto; + min-height: 516px; + right: 0; + bottom: 12px; + } + #rwidget { + height: 100%; + } + #container { + padding: 0; + position: absolute; + top: 0; + right: 0; + bottom: 12px; + left: 0; + min-height: 588px; + } + #panel_l, #panel_r { + height: 100%; + } + .isotope { + height: 100%; + } + .isotope .s_grid_row { + width: 420px; + margin: 0 24px 12px 0; + } + .s_grid_row .s_grid_h_full { + height: 100%; + } + .list_t_item { + float: left; + display: inline; + } + .isotope, +.isotope .isotope-item { + /* change duration value to whatever you like */ + -webkit-transition-duration: 0.8s; + -moz-transition-duration: 0.8s; + -ms-transition-duration: 0.8s; + -o-transition-duration: 0.8s; + transition-duration: 0.8s; +} + +.isotope { + -webkit-transition-property: height, width; + -moz-transition-property: height, width; + -ms-transition-property: height, width; + -o-transition-property: height, width; + transition-property: height, width; +} + +.isotope .isotope-item { + -webkit-transition-property: -webkit-transform, opacity; + -moz-transition-property: -moz-transform, opacity; + -ms-transition-property: -ms-transform, opacity; + -o-transition-property: -o-transform, opacity; + transition-property: transform, opacity; +} + +/**** disabling Isotope CSS3 transitions ****/ + +.isotope.no-transition, +.isotope.no-transition .isotope-item, +.isotope .isotope-item.no-transition { + -webkit-transition-duration: 0s; + -moz-transition-duration: 0s; + -ms-transition-duration: 0s; + -o-transition-duration: 0s; + transition-duration: 0s; +} \ No newline at end of file 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 63310a5c9..490d77797 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 @@ -9,6 +9,22 @@ module Panel::PersonalJournal::Desktop::JournalPagesHelper end end + def get_height view + case view + when "journal_title" + height = "50px" + when "keywords" + height = "100px" + when "abstract" + height = "200px" + when "file" + height = "200px" + else + height = "50px" + end + height + end + def marker content_tag :div, :class => "list_item_action" do 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 254469791..140974fed 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 @@ -30,10 +30,8 @@
--> -
-
-
-
    +
    +
      <% @site_valid_locales.each_with_index do |locale, i| %> <% style = locale != I18n.locale.to_s ? 'style=display:none;' : "" %> <% data = "data-language=" + locale %> @@ -94,12 +92,7 @@ <%= f.text_field :total_pages, size: "20", class: "s_grid_2 s_grid"%> -
    -
    -
-
-
-
    +
  • <%= f.text_area :author_tokens, class: "s_grid_12 s_grid", @@ -173,12 +166,7 @@
  • <%= label_tag("", t("personal_journal.url"), class: "s_grid_4 s_grid") %><%= f.text_field :url, size: "20", class: "s_grid_8 s_grid"%>
    • -
-
-
-
-
-
    +
  • @@ -208,23 +196,13 @@
    • -
-
-
-
-
-
    +
  • - <%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_12 s_grid s_grid_h_10"%> + <%= f.text_area :note, size: "20x22", placeholder: t("personal_journal.note"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
    • -
-
-
-
-
-
    +
  • - <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_12 s_grid s_grid_h_10"%> + <%= f.text_area :abstract, size: "20x22", placeholder: t("personal_journal.abstract"), class: "s_grid_12 s_grid s_grid_h_10 s_grid_h_full"%>
diff --git a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb index 5a4c33dcb..35d7c2d1a 100644 --- a/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb +++ b/vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb @@ -77,8 +77,10 @@
-
+
+
    <% @writing_journals.each do |w| %> <%= publication_record w, @view_by%> <% end %> +
\ No newline at end of file