You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/07/01 13:50:21 UTC
svn commit: r1688630 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-example/tobago-example-demo/src/main/webapp/script/
tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/
to...
Author: lofwyr
Date: Wed Jul 1 11:50:21 2015
New Revision: 1688630
URL: http://svn.apache.org/r1688630
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
- flickering after submit fixed (was because of the overlay)
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js?rev=1688630&r1=1688629&r2=1688630&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/script/demo.js Wed Jul 1 11:50:21 2015
@@ -34,3 +34,12 @@ var initAlert = function () {
Tobago.registerListener(initAlert, Tobago.Phase.DOCUMENT_READY);
Tobago.registerListener(initAlert, Tobago.Phase.AFTER_UPDATE);
+
+/*
+var highlightLayout = function () {
+ jQuery(".tobago-in").css({});
+};
+
+Tobago.registerListener(highlightLayout, Tobago.Phase.DOCUMENT_READY);
+Tobago.registerListener(highlightLayout, Tobago.Phase.AFTER_UPDATE);
+*/
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css?rev=1688630&r1=1688629&r2=1688630&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css Wed Jul 1 11:50:21 2015
@@ -653,61 +653,6 @@ li.tobago-menu-markup-selected {
position: relative;
}
-.tobago-page-overlay {
- display: table;
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
-/* TODO: better z-index strategy */
- z-index: 10000;
-}
-
-.tobago-page-overlay-markup-wait {
- cursor: wait;
-}
-
-.tobago-page-overlay-markup-error {
- cursor: default;
-}
-
-.tobago-page-overlayCenter {
- display: table-cell;
- text-align: center;
- vertical-align: middle;
- width: 100%;
-/* TODO: better z-index strategy */
- z-index: 10000;
-}
-
-.tobago-page-overlayCenter img {
- position: relative;
-}
-
-.tobago-page-overlayWaitPreloadedImage,
-.tobago-page-overlayErrorPreloadedImage,
-.tobago-page-pngFixBlankImage,
-.tobago-page-overlayBackgroundImage {
- display: none;
-}
-
-.tobago-page-noscript {
- position: absolute;
- top: 100px;
- left: 100px;
- right: 100px;
- height: 50px;
- border: 1px solid black;
- padding: 30px;
- background-color: white;
- font-size: 15px;
-}
-
-.tobago-page-preventFrameAttacks {
- display: none;
-}
-
/* panel -------------------------------------------------------------- */
.tobago-panel {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js?rev=1688630&r1=1688629&r2=1688630&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-overlay.js Wed Jul 1 11:50:21 2015
@@ -56,11 +56,18 @@ Tobago.Config.set("Ajax", "waitOverlayDe
this.overlay.addClass("tobago-page-overlay-markup-wait");
}
- this.overlay.outerWidth(this.element.outerWidth());
- this.overlay.outerHeight(this.element.outerHeight());
- this.overlay.offset(this.element.offset());
+ if (this.element.is("body")) {
+ this.overlay.css({
+ position: "fixed",
+ zIndex: 1500 // greater than the bootstrap navbar
+ });
+ } else {
+ this.overlay.outerWidth(this.element.outerWidth());
+ this.overlay.outerHeight(this.element.outerHeight());
+ this.overlay.offset(this.element.offset());
+ }
- jQuery(".tobago-page-menuStore").append(this.overlay);
+ jQuery("body").append(this.overlay);
var wait = jQuery("<div>").addClass("tobago-page-overlayCenter");
this.overlay.append(wait);
@@ -91,29 +98,7 @@ Tobago.Config.set("Ajax", "waitOverlayDe
opacity: 0})
.show()
.delay(this.options.error ? 0 : waitOverlayDelay)
- .animate({opacity: '0.8'}, this.options.error ? 0 : 250, "linear", function () {
-
- // fix for IE6: reset the src attribute to enable animation
- if (Tobago.browser.isMsie6) {
- image.attr("src", image.attr("src"));
- }
- });
-
- // create an iframe for IE6
-
- if (Tobago.browser.isMsie6) {
- var iframe = jQuery("<iframe>").addClass("tobago-page-overlay-ie6bugfix");
- iframe.prop("frameBorder", 0);
- iframe.attr("src", Tobago.blankPage);
- iframe.css({
- position: 'absolute',
- top: '0px',
- left: '0px',
- width: this.overlay.width() + 'px',
- height: this.overlay.height() + 'px'
- });
- this.overlay.append(iframe);
- }
+ .animate({opacity: '0.8'}, this.options.error ? 0 : 250, "linear");
},
_setOption: function (key, value) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1688630&r1=1688629&r2=1688630&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Wed Jul 1 11:50:21 2015
@@ -295,26 +295,12 @@ var Tobago = {
onBeforeUnload: function() {
if (Tobago.transition) {
- jQuery(".tobago-page").overlay();
+ jQuery("body").overlay();
}
Tobago.transition = Tobago.oldTransition;
},
/**
- * @deprecated
- */
- createOverlay: function (element, error, ajax) {
- element.overlay({error: error, ajax: ajax});
- },
-
- /**
- * @deprecated
- */
- deleteOverlay:function (element) {
- element.overlay("destroy");
- },
-
- /**
* Wrapper function to call application generated onunload function
*/
onUnload: function() {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css?rev=1688630&r1=1688629&r2=1688630&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css Wed Jul 1 11:50:21 2015
@@ -105,6 +105,61 @@ body > form > .navbar-fixed-top + * {
margin-top: 50px; /* XXX */
}
+.tobago-page-overlay {
+ display: table;
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ /* TODO: better z-index strategy */
+ z-index: 500; /* less than the bootstrap navbar */
+}
+
+.tobago-page-overlay-markup-wait {
+ cursor: wait;
+}
+
+.tobago-page-overlay-markup-error {
+ cursor: default;
+}
+
+.tobago-page-overlayCenter {
+ display: table-cell;
+ text-align: center;
+ vertical-align: middle;
+ width: 100%;
+ /* TODO: better z-index strategy */
+ z-index: 500; /* less than the bootstrap navbar */
+}
+
+.tobago-page-overlayCenter img {
+ position: relative;
+}
+
+.tobago-page-overlayWaitPreloadedImage,
+.tobago-page-overlayErrorPreloadedImage,
+.tobago-page-pngFixBlankImage,
+.tobago-page-overlayBackgroundImage {
+ display: none;
+}
+
+.tobago-page-noscript {
+ position: absolute;
+ top: 100px;
+ left: 100px;
+ right: 100px;
+ height: 50px;
+ border: 1px solid black;
+ padding: 30px;
+ background-color: white;
+ font-size: 15px;
+}
+
+.tobago-page-preventFrameAttacks {
+ display: none;
+}
+
/* section ----------------------------------------------------------- */
/* to separate the icon from the rest of the title */