[Testbot] Plone 5.0 - Python 2.7 - Build # 1426 - Fixed! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Tue Feb 11 10:58:59 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1426 - Fixed!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1426/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: mockup
Branch: refs/heads/master
Date: 2014-02-11T01:23:41-08:00
Author: David Glick (davisagli) <david at glicksoftware.com>
Commit: https://github.com/plone/mockup/commit/d49ab3618381474170d9c7b497c7c6b18153487c
add plone bundle
Files changed:
A js/bundles/plone.js
A js/bundles/plone_develop.js
A less/plone.less
M Gruntfile.js
M Makefile
M js/bundles/barceloneta.js
M js/config.js
M js/grunt.js
M less/barceloneta.less
D js/bundles/barceloneta_develop.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 654320c..e598506 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -46,6 +46,8 @@ module.exports = function(grunt) {
url: '++resource++wildcard.foldercontents-structure'
});
+ mockup.registerBundle('plone');
+
mockup.registerBundle('barceloneta', {
uglify: {
barceloneta: {
@@ -79,8 +81,12 @@ module.exports = function(grunt) {
}
}
}, {
- url: '++resource++plonetheme.barceloneta'
- });
+ url: '++resource++plonetheme.barceloneta',
+ exclude: ['jquery', 'mockup-registry', 'mockup-patterns-base']
+ },
+ // skip the uglify section; barceloneta has a custom dev loader, since it assumed the presence of the plone bundle
+ ['requirejs', 'less', 'copy', 'sed']
+ );
mockup.registerBundle('widgets');
diff --git a/Makefile b/Makefile
index a81e58d..9320c4a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,19 @@ BOWER = ./node_modules/.bin/bower
all: test-once bundle docs
-bundle: bundle-barceloneta bundle-widgets bundle-toolbar bundle-structure
+bundle: bundle-barceloneta bundle-widgets bundle-toolbar bundle-structure bundle-plone
# ----------------------------------------------------------------------- #
# cp build/widgets* path/to/plone.app.widgets/plone/app/widgets/static
# cp build/toolbar* path/to/plone.app.toolbar/plone/app/toolbar/static
# cp build/barceloneta* path/to/plonetheme.barceloneta/plonetheme/barceloneta/static
# cp build/structure* path/to/wildcard.foldercontents/wildcard/foldercontents/static
+ # cp build/plone* path/to/Products.CMFPlone/Products/CMFPlone/static
# ----------------------------------------------------------------------- #
+bundle-plone:
+ mkdir -p build
+ NODE_PATH=./node_modules $(GRUNT) bundle-plone
+
bundle-barceloneta:
mkdir -p build
NODE_PATH=./node_modules $(GRUNT) bundle-barceloneta
diff --git a/js/bundles/barceloneta.js b/js/bundles/barceloneta.js
index 3840106..989ee87 100644
--- a/js/bundles/barceloneta.js
+++ b/js/bundles/barceloneta.js
@@ -24,16 +24,7 @@
define([
'jquery',
'mockup-registry',
- 'mockup-patterns-base',
- 'mockup-bundles-widgets',
- 'mockup-patterns-livesearch',
- 'mockup-patterns-accessibility',
- 'mockup-patterns-autotoc',
- 'mockup-patterns-preventdoublesubmit',
- 'mockup-patterns-formautofocus',
- 'mockup-patterns-modal',
- 'bootstrap-dropdown',
- 'bootstrap-collapse'
+ 'mockup-patterns-base'
], function($, Registry, Base) {
"use strict";
diff --git a/js/bundles/barceloneta_develop.js b/js/bundles/barceloneta_develop.js
deleted file mode 100644
index 6fd88a4..0000000
--- a/js/bundles/barceloneta_develop.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function() {
- "use strict";
-
- domready(function() {
-
- var script1 = document.createElement('script');
- script1.setAttribute('type', 'text/javascript');
- script1.setAttribute('src', '/++resource++mockup/js/config.js');
- script1.onload = function() {
- requirejs.config({ baseUrl: '++resource++mockup/' });
- require(['mockup-bundles-barceloneta']);
- };
- document.getElementsByTagName("head")[0].appendChild(script1);
-
- var style1 = document.createElement('style');
- style1.setAttribute('type', 'text/less');
- style1.innerHTML = '@import (less) "/++resource++mockup/less/barceloneta.less"; @isBrowser: true; @pathPrefix: \'/++resource++mockup/less/\';';
- document.getElementsByTagName("head")[0].appendChild(style1);
-
- less.refresh();
-
- });
-
-}());
diff --git a/js/bundles/plone.js b/js/bundles/plone.js
new file mode 100644
index 0000000..b4d3fa5
--- /dev/null
+++ b/js/bundles/plone.js
@@ -0,0 +1,60 @@
+// Author: Rok Garbas
+// Contact: rok at garbas.si
+// Version: 1.0
+// Description:
+//
+// License:
+//
+// Copyright (C) 2010 Plone Foundation
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the Free Software Foundation, Inc., 51
+// Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+define([
+ 'jquery',
+ 'mockup-registry',
+ 'mockup-patterns-base',
+ 'mockup-bundles-widgets',
+ 'mockup-patterns-livesearch',
+ 'mockup-patterns-accessibility',
+ 'mockup-patterns-autotoc',
+ 'mockup-patterns-formunloadalert',
+ 'mockup-patterns-preventdoublesubmit',
+ 'mockup-patterns-formautofocus',
+ 'mockup-patterns-modal',
+ 'bootstrap-dropdown',
+ 'bootstrap-collapse'
+], function($, Registry, Base) {
+ "use strict";
+
+ // BBB: we need to hook pattern to classes which plone was using until now
+ var Plone = Base.extend({
+ name: "plone",
+ init: function() {
+ var self = this;
+
+ }
+
+ });
+
+ // initialize only if we are in top frame
+ if (window.parent === window) {
+ $(document).ready(function() {
+ $('body').addClass('pat-plone');
+ Registry.scan($('body'));
+ });
+ }
+
+ return Plone;
+});
diff --git a/js/bundles/plone_develop.js b/js/bundles/plone_develop.js
new file mode 100644
index 0000000..023d839
--- /dev/null
+++ b/js/bundles/plone_develop.js
@@ -0,0 +1,24 @@
+(function() {
+ "use strict";
+
+ domready(function() {
+
+ var script1 = document.createElement('script');
+ script1.setAttribute('type', 'text/javascript');
+ script1.setAttribute('src', '/++resource++mockup/js/config.js');
+ script1.onload = function() {
+ requirejs.config({ baseUrl: '++resource++mockup/' });
+ require(['mockup-bundles-plone', 'mockup-bundles-barceloneta']);
+ };
+ document.getElementsByTagName("head")[0].appendChild(script1);
+
+ var style1 = document.createElement('style');
+ style1.setAttribute('type', 'text/less');
+ style1.innerHTML = '@import (less) "/++resource++mockup/less/plone.less"; @isBrowser: true; @pathPrefix: \'/++resource++mockup/less/\';';
+ document.getElementsByTagName("head")[0].appendChild(style1);
+
+ less.refresh();
+
+ });
+
+}());
diff --git a/js/config.js b/js/config.js
index eb78508..beb9155 100644
--- a/js/config.js
+++ b/js/config.js
@@ -30,6 +30,7 @@ var requirejsOptions = {
'marked': 'bower_components/marked/lib/marked',
'mockup-bundles-barceloneta': 'js/bundles/barceloneta',
'mockup-bundles-docs': 'js/bundles/docs',
+ 'mockup-bundles-plone': 'js/bundles/plone',
'mockup-bundles-structure': 'js/bundles/structure',
'mockup-bundles-tiles': 'js/bundles/widgets',
'mockup-bundles-toolbar': 'js/bundles/toolbar',
diff --git a/js/grunt.js b/js/grunt.js
index 35921b1..e6b9a77 100644
--- a/js/grunt.js
+++ b/js/grunt.js
@@ -13,6 +13,7 @@ MockupGrunt.prototype = {
this.gruntConfig.requirejs[name].options = {
name: 'node_modules/requirejs/require.js',
include: ['mockup-bundles-' + name].concat(bundleOptions.extraInclude || []),
+ exclude: bundleOptions.exclude || [],
insertRequire: ['mockup-bundles-' + name],
out: bundleOptions.path + name + '.min.js'
};
diff --git a/less/barceloneta.less b/less/barceloneta.less
index 68ef422..b645a09 100644
--- a/less/barceloneta.less
+++ b/less/barceloneta.less
@@ -8,6 +8,41 @@
/*
+ * Toolbar styles
+ * --------------------------------------------------
+ */
+body {
+ padding-top: 70px;
+}
+.contentViews {
+ .nav();
+ .navbar-nav();
+}
+#contentActionMenus {
+ .nav();
+ .navbar-nav();
+}
+#portal-personaltools-wrapper .actionMenu {
+ .nav();
+ .navbar-nav();
+ @media (min-width: @grid-float-breakpoint) {
+ .pull-right();
+ }
+}
+.navbar-collapse {
+ @media (min-width: @grid-float-breakpoint) {
+ #portal-personaltools-wrapper .actionMenu:last-child {
+ margin-right: - at navbar-padding-horizontal;
+ }
+ }
+}
+
+.actionMenuSelected {
+ .dropdown-header();
+}
+
+
+/*
* Fonts
* --------------------------------------------------
*/
diff --git a/less/plone.less b/less/plone.less
new file mode 100644
index 0000000..b6f3a26
--- /dev/null
+++ b/less/plone.less
@@ -0,0 +1,5 @@
+ at import "mixins.less";
+ at import "widgets.less";
+ at import "pattern.livesearch.less";
+ at import "pattern.autotoc.less";
+ at import "pattern.modal.less";
Repository: mockup
Branch: refs/heads/master
Date: 2014-02-11T02:14:34-08:00
Author: Rok Garbas (garbas) <rok at garbas.si>
Commit: https://github.com/plone/mockup/commit/5d2ba93eec12547a1d98e5f74c941fb434ad19fa
Merge pull request #283 from plone/davisagli-plone-bundle
add plone bundle
Files changed:
A js/bundles/plone.js
A js/bundles/plone_develop.js
A less/plone.less
M Gruntfile.js
M Makefile
M js/bundles/barceloneta.js
M js/config.js
M js/grunt.js
M less/barceloneta.less
D js/bundles/barceloneta_develop.js
diff --git a/Gruntfile.js b/Gruntfile.js
index 654320c..e598506 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -46,6 +46,8 @@ module.exports = function(grunt) {
url: '++resource++wildcard.foldercontents-structure'
});
+ mockup.registerBundle('plone');
+
mockup.registerBundle('barceloneta', {
uglify: {
barceloneta: {
@@ -79,8 +81,12 @@ module.exports = function(grunt) {
}
}
}, {
- url: '++resource++plonetheme.barceloneta'
- });
+ url: '++resource++plonetheme.barceloneta',
+ exclude: ['jquery', 'mockup-registry', 'mockup-patterns-base']
+ },
+ // skip the uglify section; barceloneta has a custom dev loader, since it assumed the presence of the plone bundle
+ ['requirejs', 'less', 'copy', 'sed']
+ );
mockup.registerBundle('widgets');
diff --git a/Makefile b/Makefile
index a81e58d..9320c4a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,19 @@ BOWER = ./node_modules/.bin/bower
all: test-once bundle docs
-bundle: bundle-barceloneta bundle-widgets bundle-toolbar bundle-structure
+bundle: bundle-barceloneta bundle-widgets bundle-toolbar bundle-structure bundle-plone
# ----------------------------------------------------------------------- #
# cp build/widgets* path/to/plone.app.widgets/plone/app/widgets/static
# cp build/toolbar* path/to/plone.app.toolbar/plone/app/toolbar/static
# cp build/barceloneta* path/to/plonetheme.barceloneta/plonetheme/barceloneta/static
# cp build/structure* path/to/wildcard.foldercontents/wildcard/foldercontents/static
+ # cp build/plone* path/to/Products.CMFPlone/Products/CMFPlone/static
# ----------------------------------------------------------------------- #
+bundle-plone:
+ mkdir -p build
+ NODE_PATH=./node_modules $(GRUNT) bundle-plone
+
bundle-barceloneta:
mkdir -p build
NODE_PATH=./node_modules $(GRUNT) bundle-barceloneta
diff --git a/js/bundles/barceloneta.js b/js/bundles/barceloneta.js
index 3840106..989ee87 100644
--- a/js/bundles/barceloneta.js
+++ b/js/bundles/barceloneta.js
@@ -24,16 +24,7 @@
define([
'jquery',
'mockup-registry',
- 'mockup-patterns-base',
- 'mockup-bundles-widgets',
- 'mockup-patterns-livesearch',
- 'mockup-patterns-accessibility',
- 'mockup-patterns-autotoc',
- 'mockup-patterns-preventdoublesubmit',
- 'mockup-patterns-formautofocus',
- 'mockup-patterns-modal',
- 'bootstrap-dropdown',
- 'bootstrap-collapse'
+ 'mockup-patterns-base'
], function($, Registry, Base) {
"use strict";
diff --git a/js/bundles/barceloneta_develop.js b/js/bundles/barceloneta_develop.js
deleted file mode 100644
index 6fd88a4..0000000
--- a/js/bundles/barceloneta_develop.js
+++ /dev/null
@@ -1,24 +0,0 @@
-(function() {
- "use strict";
-
- domready(function() {
-
- var script1 = document.createElement('script');
- script1.setAttribute('type', 'text/javascript');
- script1.setAttribute('src', '/++resource++mockup/js/config.js');
- script1.onload = function() {
- requirejs.config({ baseUrl: '++resource++mockup/' });
- require(['mockup-bundles-barceloneta']);
- };
- document.getElementsByTagName("head")[0].appendChild(script1);
-
- var style1 = document.createElement('style');
- style1.setAttribute('type', 'text/less');
- style1.innerHTML = '@import (less) "/++resource++mockup/less/barceloneta.less"; @isBrowser: true; @pathPrefix: \'/++resource++mockup/less/\';';
- document.getElementsByTagName("head")[0].appendChild(style1);
-
- less.refresh();
-
- });
-
-}());
diff --git a/js/bundles/plone.js b/js/bundles/plone.js
new file mode 100644
index 0000000..b4d3fa5
--- /dev/null
+++ b/js/bundles/plone.js
@@ -0,0 +1,60 @@
+// Author: Rok Garbas
+// Contact: rok at garbas.si
+// Version: 1.0
+// Description:
+//
+// License:
+//
+// Copyright (C) 2010 Plone Foundation
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 2 of the License.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+// more details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the Free Software Foundation, Inc., 51
+// Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+define([
+ 'jquery',
+ 'mockup-registry',
+ 'mockup-patterns-base',
+ 'mockup-bundles-widgets',
+ 'mockup-patterns-livesearch',
+ 'mockup-patterns-accessibility',
+ 'mockup-patterns-autotoc',
+ 'mockup-patterns-formunloadalert',
+ 'mockup-patterns-preventdoublesubmit',
+ 'mockup-patterns-formautofocus',
+ 'mockup-patterns-modal',
+ 'bootstrap-dropdown',
+ 'bootstrap-collapse'
+], function($, Registry, Base) {
+ "use strict";
+
+ // BBB: we need to hook pattern to classes which plone was using until now
+ var Plone = Base.extend({
+ name: "plone",
+ init: function() {
+ var self = this;
+
+ }
+
+ });
+
+ // initialize only if we are in top frame
+ if (window.parent === window) {
+ $(document).ready(function() {
+ $('body').addClass('pat-plone');
+ Registry.scan($('body'));
+ });
+ }
+
+ return Plone;
+});
diff --git a/js/bundles/plone_develop.js b/js/bundles/plone_develop.js
new file mode 100644
index 0000000..023d839
--- /dev/null
+++ b/js/bundles/plone_develop.js
@@ -0,0 +1,24 @@
+(function() {
+ "use strict";
+
+ domready(function() {
+
+ var script1 = document.createElement('script');
+ script1.setAttribute('type', 'text/javascript');
+ script1.setAttribute('src', '/++resource++mockup/js/config.js');
+ script1.onload = function() {
+ requirejs.config({ baseUrl: '++resource++mockup/' });
+ require(['mockup-bundles-plone', 'mockup-bundles-barceloneta']);
+ };
+ document.getElementsByTagName("head")[0].appendChild(script1);
+
+ var style1 = document.createElement('style');
+ style1.setAttribute('type', 'text/less');
+ style1.innerHTML = '@import (less) "/++resource++mockup/less/plone.less"; @isBrowser: true; @pathPrefix: \'/++resource++mockup/less/\';';
+ document.getElementsByTagName("head")[0].appendChild(style1);
+
+ less.refresh();
+
+ });
+
+}());
diff --git a/js/config.js b/js/config.js
index eb78508..beb9155 100644
--- a/js/config.js
+++ b/js/config.js
@@ -30,6 +30,7 @@ var requirejsOptions = {
'marked': 'bower_components/marked/lib/marked',
'mockup-bundles-barceloneta': 'js/bundles/barceloneta',
'mockup-bundles-docs': 'js/bundles/docs',
+ 'mockup-bundles-plone': 'js/bundles/plone',
'mockup-bundles-structure': 'js/bundles/structure',
'mockup-bundles-tiles': 'js/bundles/widgets',
'mockup-bundles-toolbar': 'js/bundles/toolbar',
diff --git a/js/grunt.js b/js/grunt.js
index 35921b1..e6b9a77 100644
--- a/js/grunt.js
+++ b/js/grunt.js
@@ -13,6 +13,7 @@ MockupGrunt.prototype = {
this.gruntConfig.requirejs[name].options = {
name: 'node_modules/requirejs/require.js',
include: ['mockup-bundles-' + name].concat(bundleOptions.extraInclude || []),
+ exclude: bundleOptions.exclude || [],
insertRequire: ['mockup-bundles-' + name],
out: bundleOptions.path + name + '.min.js'
};
diff --git a/less/barceloneta.less b/less/barceloneta.less
index 68ef422..b645a09 100644
--- a/less/barceloneta.less
+++ b/less/barceloneta.less
@@ -8,6 +8,41 @@
/*
+ * Toolbar styles
+ * --------------------------------------------------
+ */
+body {
+ padding-top: 70px;
+}
+.contentViews {
+ .nav();
+ .navbar-nav();
+}
+#contentActionMenus {
+ .nav();
+ .navbar-nav();
+}
+#portal-personaltools-wrapper .actionMenu {
+ .nav();
+ .navbar-nav();
+ @media (min-width: @grid-float-breakpoint) {
+ .pull-right();
+ }
+}
+.navbar-collapse {
+ @media (min-width: @grid-float-breakpoint) {
+ #portal-personaltools-wrapper .actionMenu:last-child {
+ margin-right: - at navbar-padding-horizontal;
+ }
+ }
+}
+
+.actionMenuSelected {
+ .dropdown-header();
+}
+
+
+/*
* Fonts
* --------------------------------------------------
*/
diff --git a/less/plone.less b/less/plone.less
new file mode 100644
index 0000000..b6f3a26
--- /dev/null
+++ b/less/plone.less
@@ -0,0 +1,5 @@
+ at import "mixins.less";
+ at import "widgets.less";
+ at import "pattern.livesearch.less";
+ at import "pattern.autotoc.less";
+ at import "pattern.modal.less";
-------------------------------------------------------------------------------
More information about the Testbot
mailing list