You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/03/06 12:41:30 UTC
[GitHub] neilcsmith-net closed pull request #9: [NETBEANS-429] Add the 'colorbox' jquery plugin, so images inside a '?
neilcsmith-net closed pull request #9: [NETBEANS-429] Add the 'colorbox' jquery plugin, so images inside a '?
URL: https://github.com/apache/incubator-netbeans-website/pull/9
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/netbeans.apache.org/LICENSE-colorbox b/netbeans.apache.org/LICENSE-colorbox
new file mode 100644
index 0000000..10057fc
--- /dev/null
+++ b/netbeans.apache.org/LICENSE-colorbox
@@ -0,0 +1,10 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Jack Moore
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/netbeans.apache.org/src/content/download/nb90/index.asciidoc b/netbeans.apache.org/src/content/download/nb90/index.asciidoc
index 3130b69..6f15b2b 100644
--- a/netbeans.apache.org/src/content/download/nb90/index.asciidoc
+++ b/netbeans.apache.org/src/content/download/nb90/index.asciidoc
@@ -66,28 +66,33 @@ Examples:
--
Here goes some text
-image:nb90-module-info.png[Adding module-info.java, title="Adding module-info.java, click to enlarge", role="left", link="nb90-module-info.png"]
+image:nb90-module-info.png[Adding module-info.java, title="Adding module-info.java", role="left", link="nb90-module-info.png"]
And some more text
-image:nb90-module-info-completion.png[Autocompletion in module-info.java, title="Autocompletion in module-info.java, click to enlarge", role="right", link="nb90-module-info-completion.png"]
+image:nb90-module-info-completion.png[Autocompletion in module-info.java, title="Autocompletion in module-info.java", role="right", link="nb90-module-info-completion.png"]
And even some more
--
+Note: When rendered into HTML, the images will automatically be wrapped around 'colorbox', so that they're enlarged when clicked.
+
////
==== Supporting JPMS (Jigsaw) to full extent
[.feature]
--
-image:nb90-module-info.png[Adding module-info.java, title="Adding module-info.java, click to enlarge", role="left", link="nb90-module-info.png"]
+image:nb90-module-info.png[Adding module-info.java, title="Adding module-info.java", role="left", link="nb90-module-info.png"]
NetBeans 9 supports link:http://openjdk.java.net/projects/jigsaw/spec/[JPMS (Jigsaw)] to full extent.
Modulepath was added as a crucial paradigm to NetBeans in addition to Classpath.
The standard NetBeans Java SE Project Type (Ant based) can be a single JDK9 module simply by adding a `module-info.java` file into the default package.
+--
-image:nb90-module-info-completion.png[Autocompletion in module-info.java, title="Autocompletion in module-info.java, click to enlarge", role="right", link="nb90-module-info-completion.png"]
+[.feature]
+--
+image:nb90-module-info-completion.png[Autocompletion in module-info.java, title="Autocompletion in module-info.java", role="right", link="nb90-module-info-completion.png"]
Of course, we provide full autocompletion for `module-info.java`
--
@@ -95,7 +100,7 @@ Of course, we provide full autocompletion for `module-info.java`
==== A brand new Java Modular Application project type
[.feature]
--
-image:nb90-new-multi-module.png[Java Modular Application, title="New Java Modular Application Project Type, click to enlarge", role="left", link="nb90-new-multi-module.png"]
+image:nb90-new-multi-module.png[Java Modular Application, title="New Java Modular Application Project Type", role="left", link="nb90-new-multi-module.png"]
We have added a new *Java Modular project* type. This allows to develop
several JDK9 modules in one NetBeans project (Ant based).
@@ -109,29 +114,36 @@ in the project will be compiled at once.
==== Java Shell support
[.feature]
--
+image:nb90-javashell.png[Java Shell Support, title="Java Shell Support", role="left", link="nb90-javashell.png"]
+
Java Shell is a new tool included in JDK9 defined in link:http://openjdk.java.net/jeps/222[JEP 222] to introduce REPL
(read-eval-print-loop) capabilities to Java.
-image:nb90-javashell.png[Java Shell Support, title="Java Shell Support, click to enlarge", role="left", link="nb90-javashell.png"]
-
NetBeans provides integrated console-like UI for the Java Shell, leveraing NetBeans editor capabilites.
NetBeans can support the tool with the user project configuration, so the Java
Shell is set up to work with project classes and libraries, providing autocompletion out of the box in
the editor.
+--
-image:nb90-shell-agent.png[Shell Agent Configuration, title="JShell acess configuration, click to enlarge", role="right", link="nb90-shell-agent.png"]
+[.feature]
+--
+image:nb90-shell-agent.png[Shell Agent Configuration, title="JShell acess configuration", role="right", link="nb90-shell-agent.png"]
Also NetBeans greatly extends the capabilities of the commandline tool.
NetBeans can execute the shell *as an agent*, similar to a debugging agent, on the
debugged or run application (currently only J2SE applications are supported,
both Ant and Maven-based).
+--
-image:nb90-shell-save.png[Saving JShell snippets, title="Saving JShell snippets, click to enlarge", role="left", link="nb90-shell-save.png"]
+[.feature]
+--
+image:nb90-shell-save.png[Saving JShell snippets, title="Saving JShell snippets", role="left", link="nb90-shell-save.png"]
Snippets written in JShell can be redefined and tested, even against a running
-code. When the prototype is ready, it can be saved to a regular java source file
-and integrated with the project.
+code.
+When the prototype is ready, it can be saved to a regular java source file
+and integrated with the project.
--
diff --git a/netbeans.apache.org/src/content/images/colorbox/border.png b/netbeans.apache.org/src/content/images/colorbox/border.png
new file mode 100644
index 0000000..c1cd1a2
Binary files /dev/null and b/netbeans.apache.org/src/content/images/colorbox/border.png differ
diff --git a/netbeans.apache.org/src/content/images/colorbox/controls.png b/netbeans.apache.org/src/content/images/colorbox/controls.png
new file mode 100644
index 0000000..259130c
Binary files /dev/null and b/netbeans.apache.org/src/content/images/colorbox/controls.png differ
diff --git a/netbeans.apache.org/src/content/images/colorbox/loading.gif b/netbeans.apache.org/src/content/images/colorbox/loading.gif
new file mode 100644
index 0000000..dba33c8
Binary files /dev/null and b/netbeans.apache.org/src/content/images/colorbox/loading.gif differ
diff --git a/netbeans.apache.org/src/content/images/colorbox/loading_background.png b/netbeans.apache.org/src/content/images/colorbox/loading_background.png
new file mode 100644
index 0000000..23a336b
Binary files /dev/null and b/netbeans.apache.org/src/content/images/colorbox/loading_background.png differ
diff --git a/netbeans.apache.org/src/content/images/colorbox/overlay.png b/netbeans.apache.org/src/content/images/colorbox/overlay.png
new file mode 100644
index 0000000..10362a4
Binary files /dev/null and b/netbeans.apache.org/src/content/images/colorbox/overlay.png differ
diff --git a/netbeans.apache.org/src/content/js/netbeans.js b/netbeans.apache.org/src/content/js/netbeans.js
index 0392f37..e665bb3 100644
--- a/netbeans.apache.org/src/content/js/netbeans.js
+++ b/netbeans.apache.org/src/content/js/netbeans.js
@@ -17,5 +17,13 @@
* under the License.
*/
-
-
+/*
+ * Seeks for all <a class='image'> inside <div class='openblock feature'> and adds colorbox to them.
+ */
+$(document).ready(function() {
+ $('.openblock.feature a.image').each(function (index) {
+ 'use strict'
+ var title = $(this).children('img').attr('title');
+ $(this).colorbox({opacity: 0.7, title : title, scalePhotos: true, maxWidth: "98%", maxHeight: "98%" });
+ });
+});
diff --git a/netbeans.apache.org/src/content/js/vendor/jquery.colorbox-min.js b/netbeans.apache.org/src/content/js/vendor/jquery.colorbox-min.js
new file mode 100644
index 0000000..b5109a2
--- /dev/null
+++ b/netbeans.apache.org/src/content/js/vendor/jquery.colorbox-min.js
@@ -0,0 +1,6 @@
+/*!
+ Colorbox 1.6.4
+ license: MIT
+ http://www.jacklmoore.com/colorbox
+*/
+(function(t,e,i){function n(i,n,o){var r=e.createElement(i);return n&&(r.id=Z+n),o&&(r.style.cssText=o),t(r)}function o(){return i.innerHeight?i.innerHeight:t(i).height()}function r(e,i){i!==Object(i)&&(i={}),this.cache={},this.el=e,this.value=function(e){var n;return void 0===this.cache[e]&&(n=t(this.el).attr("data-cbox-"+e),void 0!==n?this.cache[e]=n:void 0!==i[e]?this.cache[e]=i[e]:void 0!==X[e]&&(this.cache[e]=X[e])),this.cache[e]},this.get=function(e){var i=this.value(e);return t.isFunction(i)?i.call(this.el,this):i}}function h(t){var e=W.length,i=(A+t)%e;return 0>i?e+i:i}function a(t,e){return Math.round((/%/.test(t)?("x"===e?E.width():o())/100:1)*parseInt(t,10))}function s(t,e){return t.get("photo")||t.get("photoRegex").test(e)}function l(t,e){return t.get("retinaUrl")&&i.devicePixelRatio>1?e.replace(t.get("photoRegex"),t.get("retinaSuffix")):e}function d(t){"contains"in x[0]&&!x[0].contains(t.target)&&t.target!==v[0]&&(t.stopPropagation(),x.focus())}function c(t){c.str!==t&&(x.add(v).removeClass(c.str).addClass(t),c.str=t)}function g(e){A=0,e&&e!==!1&&"nofollow"!==e?(W=t("."+te).filter(function(){var i=t.data(this,Y),n=new r(this,i);return n.get("rel")===e}),A=W.index(_.el),-1===A&&(W=W.add(_.el),A=W.length-1)):W=t(_.el)}function u(i){t(e).trigger(i),ae.triggerHandler(i)}function f(i){var o;if(!G){if(o=t(i).data(Y),_=new r(i,o),g(_.get("rel")),!U){U=$=!0,c(_.get("className")),x.css({visibility:"hidden",display:"block",opacity:""}),I=n(se,"LoadedContent","width:0; height:0; overflow:hidden; visibility:hidden"),b.css({width:"",height:""}).append(I),j=T.height()+k.height()+b.outerHeight(!0)-b.height(),D=C.width()+H.width()+b.outerWidth(!0)-b.width(),N=I.outerHeight(!0),z=I.outerWidth(!0);var h=a(_.get("initialWidth"),"x"),s=a(_.get("initialHeight"),"y"),l=_.get("maxWidth"),f=_.get("maxHeight");_.w=Math.max((l!==!1?Math.min(h,a(l,"x")):h)-z-D,0),_.h=Math.max((f!==!1?Math.min(s,a(f,"y")):s)-N-j,0),I.css({width:"",height:_.h}),J.position(),u(ee),_.get("onOpen"),O.add(F).hide(),x.focus(),_.get("trapFocus")&&e.addEventListener&&(e.addEventListener("focus",d,!0),ae.one(re,function(){e.removeEventListener("focus",d,!0)})),_.get("returnFocus")&&ae.one(re,function(){t(_.el).focus()})}var p=parseFloat(_.get("opacity"));v.css({opacity:p===p?p:"",cursor:_.get("overlayClose")?"pointer":"",visibility:"visible"}).show(),_.get("closeButton")?B.html(_.get("close")).appendTo(b):B.appendTo("<div/>"),w()}}function p(){x||(V=!1,E=t(i),x=n(se).attr({id:Y,"class":t.support.opacity===!1?Z+"IE":"",role:"dialog",tabindex:"-1"}).hide(),v=n(se,"Overlay").hide(),L=t([n(se,"LoadingOverlay")[0],n(se,"LoadingGraphic")[0]]),y=n(se,"Wrapper"),b=n(se,"Content").append(F=n(se,"Title"),R=n(se,"Current"),P=t('<button type="button"/>').attr({id:Z+"Previous"}),K=t('<button type="button"/>').attr({id:Z+"Next"}),S=t('<button type="button"/>').attr({id:Z+"Slideshow"}),L),B=t('<button type="button"/>').attr({id:Z+"Close"}),y.append(n(se).append(n(se,"TopLeft"),T=n(se,"TopCenter"),n(se,"TopRight")),n(se,!1,"clear:left").append(C=n(se,"MiddleLeft"),b,H=n(se,"MiddleRight")),n(se,!1,"clear:left").append(n(se,"BottomLeft"),k=n(se,"BottomCenter"),n(se,"BottomRight"))).find("div div").css({"float":"left"}),M=n(se,!1,"position:absolute; width:9999px; visibility:hidden; display:none; max-width:none;"),O=K.add(P).add(R).add(S)),e.body&&!x.parent().length&&t(e.body).append(v,x.append(y,M))}function m(){function i(t){t.which>1||t.shiftKey||t.altKey||t.metaKey||t.ctrlKey||(t.preventDefault(),f(this))}return x?(V||(V=!0,K.click(function(){J.next()}),P.click(function(){J.prev()}),B.click(function(){J.close()}),v.click(function(){_.get("overlayClose")&&J.close()}),t(e).bind("keydown."+Z,function(t){var e=t.keyCode;U&&_.get("escKey")&&27===e&&(t.preventDefault(),J.close()),U&&_.get("arrowKey")&&W[1]&&!t.altKey&&(37===e?(t.preventDefault(),P.click()):39===e&&(t.preventDefault(),K.click()))}),t.isFunction(t.fn.on)?t(e).on("click."+Z,"."+te,i):t("."+te).live("click."+Z,i)),!0):!1}function w(){var e,o,r,h=J.prep,d=++le;if($=!0,q=!1,u(he),u(ie),_.get("onLoad"),_.h=_.get("height")?a(_.get("height"),"y")-N-j:_.get("innerHeight")&&a(_.get("innerHeight"),"y"),_.w=_.get("width")?a(_.get("width"),"x")-z-D:_.get("innerWidth")&&a(_.get("innerWidth"),"x"),_.mw=_.w,_.mh=_.h,_.get("maxWidth")&&(_.mw=a(_.get("maxWidth"),"x")-z-D,_.mw=_.w&&_.w<_.mw?_.w:_.mw),_.get("maxHeight")&&(_.mh=a(_.get("maxHeight"),"y")-N-j,_.mh=_.h&&_.h<_.mh?_.h:_.mh),e=_.get("href"),Q=setTimeout(function(){L.show()},100),_.get("inline")){var c=t(e).eq(0);r=t("<div>").hide().insertBefore(c),ae.one(he,function(){r.replaceWith(c)}),h(c)}else _.get("iframe")?h(" "):_.get("html")?h(_.get("html")):s(_,e)?(e=l(_,e),q=_.get("createImg"),t(q).addClass(Z+"Photo").bind("error."+Z,function(){h(n(se,"Error").html(_.get("imgError")))}).one("load",function(){d===le&&setTimeout(function(){var e;_.get("retinaImage")&&i.devicePixelRatio>1&&(q.height=q.height/i.devicePixelRatio,q.width=q.width/i.devicePixelRatio),_.get("scalePhotos")&&(o=function(){q.height-=q.height*e,q.width-=q.width*e},_.mw&&q.width>_.mw&&(e=(q.width-_.mw)/q.width,o()),_.mh&&q.height>_.mh&&(e=(q.height-_.mh)/q.height,o())),_.h&&(q.style.marginTop=Math.max(_.mh-q.height,0)/2+"px"),W[1]&&(_.get("loop")||W[A+1])&&(q.style.cursor="pointer",t(q).bind("click."+Z,function(){J.next()})),q.style.width=q.width+"px",q.style.height=q.height+"px",h(q)},1)}),q.src=e):e&&M.load(e,_.get("data"),function(e,i){d===le&&h("error"===i?n(se,"Error").html(_.get("xhrError")):t(this).contents())})}var v,x,y,b,T,C,H,k,W,E,I,M,L,F,R,S,K,P,B,O,_,j,D,N,z,A,q,U,$,G,Q,J,V,X={html:!1,photo:!1,iframe:!1,inline:!1,transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,opacity:.9,preloading:!0,className:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0,fastIframe:!0,open:!1,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp|jxr|svg)((#|\?).*)?$/i,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",returnFocus:!0,trapFocus:!0,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,rel:function(){return this.rel},href:function(){return t(this).attr("href")},title:function(){return this.title},createImg:function(){var e=new Image,i=t(this).data("cbox-img-attrs");return"object"==typeof i&&t.each(i,function(t,i){e[t]=i}),e},createIframe:function(){var i=e.createElement("iframe"),n=t(this).data("cbox-iframe-attrs");return"object"==typeof n&&t.each(n,function(t,e){i[t]=e}),"frameBorder"in i&&(i.frameBorder=0),"allowTransparency"in i&&(i.allowTransparency="true"),i.name=(new Date).getTime(),i.allowFullscreen=!0,i}},Y="colorbox",Z="cbox",te=Z+"Element",ee=Z+"_open",ie=Z+"_load",ne=Z+"_complete",oe=Z+"_cleanup",re=Z+"_closed",he=Z+"_purge",ae=t("<a/>"),se="div",le=0,de={},ce=function(){function t(){clearTimeout(h)}function e(){(_.get("loop")||W[A+1])&&(t(),h=setTimeout(J.next,_.get("slideshowSpeed")))}function i(){S.html(_.get("slideshowStop")).unbind(s).one(s,n),ae.bind(ne,e).bind(ie,t),x.removeClass(a+"off").addClass(a+"on")}function n(){t(),ae.unbind(ne,e).unbind(ie,t),S.html(_.get("slideshowStart")).unbind(s).one(s,function(){J.next(),i()}),x.removeClass(a+"on").addClass(a+"off")}function o(){r=!1,S.hide(),t(),ae.unbind(ne,e).unbind(ie,t),x.removeClass(a+"off "+a+"on")}var r,h,a=Z+"Slideshow_",s="click."+Z;return function(){r?_.get("slideshow")||(ae.unbind(oe,o),o()):_.get("slideshow")&&W[1]&&(r=!0,ae.one(oe,o),_.get("slideshowAuto")?i():n(),S.show())}}();t[Y]||(t(p),J=t.fn[Y]=t[Y]=function(e,i){var n,o=this;return e=e||{},t.isFunction(o)&&(o=t("<a/>"),e.open=!0),o[0]?(p(),m()&&(i&&(e.onComplete=i),o.each(function(){var i=t.data(this,Y)||{};t.data(this,Y,t.extend(i,e))}).addClass(te),n=new r(o[0],e),n.get("open")&&f(o[0])),o):o},J.position=function(e,i){function n(){T[0].style.width=k[0].style.width=b[0].style.width=parseInt(x[0].style.width,10)-D+"px",b[0].style.height=C[0].style.height=H[0].style.height=parseInt(x[0].style.height,10)-j+"px"}var r,h,s,l=0,d=0,c=x.offset();if(E.unbind("resize."+Z),x.css({top:-9e4,left:-9e4}),h=E.scrollTop(),s=E.scrollLeft(),_.get("fixed")?(c.top-=h,c.left-=s,x.css({position:"fixed"})):(l=h,d=s,x.css({position:"absolute"})),d+=_.get("right")!==!1?Math.max(E.width()-_.w-z-D-a(_.get("right"),"x"),0):_.get("left")!==!1?a(_.get("left"),"x"):Math.round(Math.max(E.width()-_.w-z-D,0)/2),l+=_.get("bottom")!==!1?Math.max(o()-_.h-N-j-a(_.get("bottom"),"y"),0):_.get("top")!==!1?a(_.get("top"),"y"):Math.round(Math.max(o()-_.h-N-j,0)/2),x.css({top:c.top,left:c.left,visibility:"visible"}),y[0].style.width=y[0].style.height="9999px",r={width:_.w+z+D,height:_.h+N+j,top:l,left:d},e){var g=0;t.each(r,function(t){return r[t]!==de[t]?(g=e,void 0):void 0}),e=g}de=r,e||x.css(r),x.dequeue().animate(r,{duration:e||0,complete:function(){n(),$=!1,y[0].style.width=_.w+z+D+"px",y[0].style.height=_.h+N+j+"px",_.get("reposition")&&setTimeout(function(){E.bind("resize."+Z,J.position)},1),t.isFunction(i)&&i()},step:n})},J.resize=function(t){var e;U&&(t=t||{},t.width&&(_.w=a(t.width,"x")-z-D),t.innerWidth&&(_.w=a(t.innerWidth,"x")),I.css({width:_.w}),t.height&&(_.h=a(t.height,"y")-N-j),t.innerHeight&&(_.h=a(t.innerHeight,"y")),t.innerHeight||t.height||(e=I.scrollTop(),I.css({height:"auto"}),_.h=I.height()),I.css({height:_.h}),e&&I.scrollTop(e),J.position("none"===_.get("transition")?0:_.get("speed")))},J.prep=function(i){function o(){return _.w=_.w||I.width(),_.w=_.mw&&_.mw<_.w?_.mw:_.w,_.w}function a(){return _.h=_.h||I.height(),_.h=_.mh&&_.mh<_.h?_.mh:_.h,_.h}if(U){var d,g="none"===_.get("transition")?0:_.get("speed");I.remove(),I=n(se,"LoadedContent").append(i),I.hide().appendTo(M.show()).css({width:o(),overflow:_.get("scrolling")?"auto":"hidden"}).css({height:a()}).prependTo(b),M.hide(),t(q).css({"float":"none"}),c(_.get("className")),d=function(){function i(){t.support.opacity===!1&&x[0].style.removeAttribute("filter")}var n,o,a=W.length;U&&(o=function(){clearTimeout(Q),L.hide(),u(ne),_.get("onComplete")},F.html(_.get("title")).show(),I.show(),a>1?("string"==typeof _.get("current")&&R.html(_.get("current").replace("{current}",A+1).replace("{total}",a)).show(),K[_.get("loop")||a-1>A?"show":"hide"]().html(_.get("next")),P[_.get("loop")||A?"show":"hide"]().html(_.get("previous")),ce(),_.get("preloading")&&t.each([h(-1),h(1)],function(){var i,n=W[this],o=new r(n,t.data(n,Y)),h=o.get("href");h&&s(o,h)&&(h=l(o,h),i=e.createElement("img"),i.src=h)})):O.hide(),_.get("iframe")?(n=_.get("createIframe"),_.get("scrolling")||(n.scrolling="no"),t(n).attr({src:_.get("href"),"class":Z+"Iframe"}).one("load",o).appendTo(I),ae.one(he,function(){n.src="//about:blank"}),_.get("fastIframe")&&t(n).trigger("load")):o(),"fade"===_.get("transition")?x.fadeTo(g,1,i):i())},"fade"===_.get("transition")?x.fadeTo(g,0,function(){J.position(0,d)}):J.position(g,d)}},J.next=function(){!$&&W[1]&&(_.get("loop")||W[A+1])&&(A=h(1),f(W[A]))},J.prev=function(){!$&&W[1]&&(_.get("loop")||A)&&(A=h(-1),f(W[A]))},J.close=function(){U&&!G&&(G=!0,U=!1,u(oe),_.get("onCleanup"),E.unbind("."+Z),v.fadeTo(_.get("fadeOut")||0,0),x.stop().fadeTo(_.get("fadeOut")||0,0,function(){x.hide(),v.hide(),u(he),I.remove(),setTimeout(function(){G=!1,u(re),_.get("onClosed")},1)}))},J.remove=function(){x&&(x.stop(),t[Y].close(),x.stop(!1,!0).remove(),v.remove(),G=!1,x=null,t("."+te).removeData(Y).removeClass(te),t(e).unbind("click."+Z).unbind("keydown."+Z))},J.element=function(){return t(_.el)},J.settings=X)})(jQuery,document,window);
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/scss/_vendor/colorbox/colorbox.scss b/netbeans.apache.org/src/content/scss/_vendor/colorbox/colorbox.scss
new file mode 100644
index 0000000..185023f
--- /dev/null
+++ b/netbeans.apache.org/src/content/scss/_vendor/colorbox/colorbox.scss
@@ -0,0 +1,58 @@
+/*
+ Colorbox Core Style:
+ The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden; -webkit-transform: translate3d(0,0,0);}
+#cboxWrapper {max-width:none;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0; padding:0; margin:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
+
+/*
+ User Style:
+ Change the following styles to modify the appearance of Colorbox. They are
+ ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#000; opacity: 0.9; filter: alpha(opacity = 90);}
+#colorbox{outline:0;}
+ #cboxTopLeft{width:14px; height:14px; background:url(/images/colorbox/controls.png) no-repeat 0 0;}
+ #cboxTopCenter{height:14px; background:url(/images/colorbox/border.png) repeat-x top left;}
+ #cboxTopRight{width:14px; height:14px; background:url(/images/colorbox/controls.png) no-repeat -36px 0;}
+ #cboxBottomLeft{width:14px; height:43px; background:url(/images/colorbox/controls.png) no-repeat 0 -32px;}
+ #cboxBottomCenter{height:43px; background:url(/images/colorbox/border.png) repeat-x bottom left;}
+ #cboxBottomRight{width:14px; height:43px; background:url(/images/colorbox/controls.png) no-repeat -36px -32px;}
+ #cboxMiddleLeft{width:14px; background:url(/images/colorbox/controls.png) repeat-y -175px 0;}
+ #cboxMiddleRight{width:14px; background:url(/images/colorbox/controls.png) repeat-y -211px 0;}
+ #cboxContent{background:#fff; overflow:visible;}
+ .cboxIframe{background:#fff;}
+ #cboxError{padding:50px; border:1px solid #ccc;}
+ #cboxLoadedContent{margin-bottom:5px;}
+ #cboxLoadingOverlay{background:url(/images/colorbox/loading_background.png) no-repeat center center;}
+ #cboxLoadingGraphic{background:url(/images/colorbox/loading.gif) no-repeat center center;}
+ #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;}
+ #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;}
+
+ /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+ #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; position:absolute; bottom:-29px; background:url(/images/colorbox/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;}
+
+ /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+ #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
+
+ #cboxPrevious{left:0px; background-position: -51px -25px;}
+ #cboxPrevious:hover{background-position:-51px 0px;}
+ #cboxNext{left:27px; background-position:-75px -25px;}
+ #cboxNext:hover{background-position:-75px 0px;}
+ #cboxClose{right:0; background-position:-100px -25px;}
+ #cboxClose:hover{background-position:-100px 0px;}
+
+ .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;}
+ .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;}
+ .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;}
+ .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;}
diff --git a/netbeans.apache.org/src/content/scss/components/_features.scss b/netbeans.apache.org/src/content/scss/components/_features.scss
index 5f129e4..4b6fd11 100644
--- a/netbeans.apache.org/src/content/scss/components/_features.scss
+++ b/netbeans.apache.org/src/content/scss/components/_features.scss
@@ -18,8 +18,8 @@
*/
.openblock.feature {
- padding: 1em;
- margin: 0.5em;
+ padding: 1em 0;
+ margin: 0.5em 0;
overflow: auto;
padding: 1em 0 0.5em 0;
@@ -43,17 +43,15 @@
.content {
.paragraph {
p {
- span.image, span.image.left {
- float: left;
- margin: 0 1em 0 0;
- max-width: 33%;
+ span.image {
+ margin: 0.5em 1em 0.5em 0;
+ max-width: 60%;
border: 1px solid $nb-link-color;
+ float: left;
}
span.image.right {
float: right;
- margin: 0 0 0 1em;
- max-width: 33%;
- border: 1px solid $nb-link-color;
+ margin: 0.5em 0 0.5em 1em;
}
}
}
diff --git a/netbeans.apache.org/src/content/scss/netbeans.scss b/netbeans.apache.org/src/content/scss/netbeans.scss
index 9c7786c..877d3ab 100644
--- a/netbeans.apache.org/src/content/scss/netbeans.scss
+++ b/netbeans.apache.org/src/content/scss/netbeans.scss
@@ -31,6 +31,8 @@
@include motion-ui-transitions;
@include motion-ui-animations;
+@import "_vendor/colorbox/colorbox";
+
@import "common/netbeans";
@import "components/footer";
diff --git a/netbeans.apache.org/src/content/templates/page-noaside.gsp b/netbeans.apache.org/src/content/templates/page-noaside.gsp
index 5583be1..489baa1 100644
--- a/netbeans.apache.org/src/content/templates/page-noaside.gsp
+++ b/netbeans.apache.org/src/content/templates/page-noaside.gsp
@@ -38,6 +38,7 @@
<script src="/js/vendor/jquery-3.2.1.min.js"></script>
<script src="/js/vendor/what-input.js"></script>
<script src="/js/vendor/foundation.min.js"></script>
+ <script src="/js/vendor/jquery.colorbox-min.js"></script>
<script src="/js/netbeans.js"></script>
<script>
<% // NOTE: Plain jquery stuff needs to be quoted in gsp pages %>
diff --git a/netbeans.apache.org/src/content/templates/page.gsp b/netbeans.apache.org/src/content/templates/page.gsp
index ac04364..4b569cd 100644
--- a/netbeans.apache.org/src/content/templates/page.gsp
+++ b/netbeans.apache.org/src/content/templates/page.gsp
@@ -17,13 +17,10 @@
specific language governing permissions and limitations
under the License.
-*/%>
-<%/*
-
page.gsp: A main area with a right aside for TOCs.
*/%>
-<!doctype html>
+<!DOCTYPE html>
<html class="no-js" lang="en" dir="ltr">
<%include "head.gsp"%>
<body>
@@ -37,6 +34,7 @@
<script src="/js/vendor/jquery-3.2.1.min.js"></script>
<script src="/js/vendor/what-input.js"></script>
+ <script src="/js/vendor/jquery.colorbox-min.js"></script>
<script src="/js/vendor/foundation.min.js"></script>
<script src="/js/netbeans.js"></script>
<script>
diff --git a/netbeans.apache.org/src/content/templates/wiki.gsp b/netbeans.apache.org/src/content/templates/wiki.gsp
index 4f0fafa..e62320a 100644
--- a/netbeans.apache.org/src/content/templates/wiki.gsp
+++ b/netbeans.apache.org/src/content/templates/wiki.gsp
@@ -40,6 +40,7 @@
<script src="/js/vendor/what-input.js"></script>
<script src="/js/vendor/foundation.min.js"></script>
<script src="/js/netbeans.js"></script>
+ <script src="/js/vendor/jquery.colorbox-min.js"></script>
<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
<script>
<% // NOTE: Plain jquery stuff needs to be quoted in gsp pages %>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists