--- a/.installed.cfg Fri Dec 14 15:28:41 2018 +0100
+++ b/.installed.cfg Fri Dec 14 18:33:40 2018 +0100
@@ -14,16 +14,16 @@
[package]
__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/fanstatic-compile
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pyams_upgrade
+ /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pviews
+ /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/proutes
+ /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pshell
+ /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/ptweens
+ /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pserve
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/prequest
- /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pviews
- /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/ptweens
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pcreate
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pdistreport
- /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pshell
- /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pserve
- /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/proutes
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/py
-__buildout_signature__ = zc.recipe.egg-f634d39fdc0b907ffce64cc8d2553c3f zc.buildout-f634d39fdc0b907ffce64cc8d2553c3f setuptools-f634d39fdc0b907ffce64cc8d2553c3f
+__buildout_signature__ = zc.recipe.egg-2895ff656acea2bbbe88efda99647a6a zc.buildout-2895ff656acea2bbbe88efda99647a6a setuptools-2895ff656acea2bbbe88efda99647a6a
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs
_e = /var/local/env/pyams/eggs
@@ -54,7 +54,7 @@
__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pybabel
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/polint
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pot-create
-__buildout_signature__ = zc.recipe.egg-f634d39fdc0b907ffce64cc8d2553c3f zc.buildout-f634d39fdc0b907ffce64cc8d2553c3f setuptools-f634d39fdc0b907ffce64cc8d2553c3f
+__buildout_signature__ = zc.recipe.egg-2895ff656acea2bbbe88efda99647a6a zc.buildout-2895ff656acea2bbbe88efda99647a6a setuptools-2895ff656acea2bbbe88efda99647a6a
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs
_e = /var/local/env/pyams/eggs
@@ -69,7 +69,7 @@
[pyflakes]
__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pyflakes
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pyflakes
-__buildout_signature__ = zc.recipe.egg-f634d39fdc0b907ffce64cc8d2553c3f zc.buildout-f634d39fdc0b907ffce64cc8d2553c3f setuptools-f634d39fdc0b907ffce64cc8d2553c3f
+__buildout_signature__ = zc.recipe.egg-2895ff656acea2bbbe88efda99647a6a zc.buildout-2895ff656acea2bbbe88efda99647a6a setuptools-2895ff656acea2bbbe88efda99647a6a
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs
_e = /var/local/env/pyams/eggs
@@ -86,7 +86,7 @@
[test]
__buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/parts/test
/home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/test
-__buildout_signature__ = six-f634d39fdc0b907ffce64cc8d2553c3f zc.recipe.testrunner-f634d39fdc0b907ffce64cc8d2553c3f zc.recipe.egg-f634d39fdc0b907ffce64cc8d2553c3f zc.buildout-f634d39fdc0b907ffce64cc8d2553c3f zope.exceptions-f634d39fdc0b907ffce64cc8d2553c3f zope.interface-f634d39fdc0b907ffce64cc8d2553c3f zope.testrunner-f634d39fdc0b907ffce64cc8d2553c3f setuptools-f634d39fdc0b907ffce64cc8d2553c3f
+__buildout_signature__ = six-2895ff656acea2bbbe88efda99647a6a zc.recipe.testrunner-2895ff656acea2bbbe88efda99647a6a zc.recipe.egg-2895ff656acea2bbbe88efda99647a6a zc.buildout-2895ff656acea2bbbe88efda99647a6a zope.exceptions-2895ff656acea2bbbe88efda99647a6a zope.interface-2895ff656acea2bbbe88efda99647a6a zope.testrunner-2895ff656acea2bbbe88efda99647a6a setuptools-2895ff656acea2bbbe88efda99647a6a
_b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin
_d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs
_e = /var/local/env/pyams/eggs
--- a/buildout.cfg Fri Dec 14 15:28:41 2018 +0100
+++ b/buildout.cfg Fri Dec 14 18:33:40 2018 +0100
@@ -80,4 +80,4 @@
eggs = pyams_skin [test]
[versions]
-pyams_skin = 0.1.28.2
+pyams_skin = 0.1.29
--- a/docs/HISTORY.txt Fri Dec 14 15:28:41 2018 +0100
+++ b/docs/HISTORY.txt Fri Dec 14 18:33:40 2018 +0100
@@ -1,6 +1,14 @@
History
=======
+0.1.29
+------
+ - added custom stylesheet and script file to skin settings
+ - updated static resources management
+ - added "require" extension to load MyAMS modules (MyAMS.js)
+ - added checks about activated modules (MyAMS.js)
+ - handle opening of a "data-ams-url" link in blank window (MyAMS.js)
+
0.1.28.2
--------
- updated TinyMCE production-mode resources...
--- a/gulpfile.js Fri Dec 14 15:28:41 2018 +0100
+++ b/gulpfile.js Fri Dec 14 18:33:40 2018 +0100
@@ -2,8 +2,7 @@
concat = require('gulp-concat');
var package = require("./package.json"),
- scripts = package.scripts,
- sources = scripts.sources;
+ scripts = package.scripts;
/** Fix pipe function */
@@ -36,13 +35,19 @@
// Gulp tasks
gulp.task('scripts', function() {
- return gulp.src(sources, {cwd: scripts.base})
+ return gulp.src(scripts.sources, {cwd: scripts.base})
.pipe(concat(scripts.target.replace(/{version}/, package.version)))
.pipe(gulp.dest(scripts.base));
});
-gulp.task('watch', function() {
- gulp.watch(sources, {cwd: scripts.base}, ['scripts']);
+gulp.task('scripts-core', function() {
+ return gulp.src(scripts.core_sources, {cwd: scripts.base})
+ .pipe(concat(scripts.core_target.replace(/{version}/, package.version)))
+ .pipe(gulp.dest(scripts.base));
});
-gulp.task('default', ['scripts', 'watch']);
+gulp.task('watch', function() {
+ gulp.watch(scripts.sources, {cwd: scripts.base}, ['scripts', 'scripts-core']);
+});
+
+gulp.task('default', ['scripts', 'scripts-core', 'watch']);
--- a/package.json Fri Dec 14 15:28:41 2018 +0100
+++ b/package.json Fri Dec 14 18:33:40 2018 +0100
@@ -6,6 +6,7 @@
"base": "./src/pyams_skin/resources/js/",
"sources": [
"myams-core.js",
+ "myams-i18n.js",
"myams-utf8.js",
"myams-menus.js",
"myams-event.js",
@@ -27,7 +28,13 @@
"myams-stats.js",
"myams-init.js"
],
- "target": "myams.js"
+ "target": "myams.js",
+ "core_sources": [
+ "myams-core.js",
+ "myams-i18n.js",
+ "myams-loader.js"
+ ],
+ "core_target": "myams-require.js"
},
"devDependencies": {
"gulp": "^3.9.1",
--- a/setup.py Fri Dec 14 15:28:41 2018 +0100
+++ b/setup.py Fri Dec 14 18:33:40 2018 +0100
@@ -25,7 +25,7 @@
README = os.path.join(DOCS, 'README.txt')
HISTORY = os.path.join(DOCS, 'HISTORY.txt')
-version = '0.1.28.2'
+version = '0.1.29'
long_description = open(README).read() + '\n\n' + open(HISTORY).read()
tests_require = []
--- a/src/pyams_skin.egg-info/PKG-INFO Fri Dec 14 15:28:41 2018 +0100
+++ b/src/pyams_skin.egg-info/PKG-INFO Fri Dec 14 18:33:40 2018 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pyams-skin
-Version: 0.1.28.2
+Version: 0.1.29
Summary: PyAMS base skin interfaces and classes
Home-page: http://hg.ztfy.org/pyams/pyams_skin
Author: Thierry Florac
@@ -22,6 +22,14 @@
History
=======
+ 0.1.29
+ ------
+ - added custom stylesheet and script file to skin settings
+ - updated static resources management
+ - added "require" extension to load MyAMS modules (MyAMS.js)
+ - added checks about activated modules (MyAMS.js)
+ - handle opening of a "data-ams-url" link in blank window (MyAMS.js)
+
0.1.28.2
--------
- updated TinyMCE production-mode resources...
--- a/src/pyams_skin.egg-info/SOURCES.txt Fri Dec 14 15:28:41 2018 +0100
+++ b/src/pyams_skin.egg-info/SOURCES.txt Fri Dec 14 18:33:40 2018 +0100
@@ -459,10 +459,14 @@
src/pyams_skin/resources/js/myams-graphs.min.js
src/pyams_skin/resources/js/myams-helpers.js
src/pyams_skin/resources/js/myams-helpers.min.js
+src/pyams_skin/resources/js/myams-i18n.js
+src/pyams_skin/resources/js/myams-i18n.min.js
src/pyams_skin/resources/js/myams-init.js
src/pyams_skin/resources/js/myams-init.min.js
src/pyams_skin/resources/js/myams-jsonrpc.js
src/pyams_skin/resources/js/myams-jsonrpc.min.js
+src/pyams_skin/resources/js/myams-loader.js
+src/pyams_skin/resources/js/myams-loader.min.js
src/pyams_skin/resources/js/myams-menus.js
src/pyams_skin/resources/js/myams-menus.min.js
src/pyams_skin/resources/js/myams-notify.js
@@ -471,6 +475,8 @@
src/pyams_skin/resources/js/myams-plugins-loader.min.js
src/pyams_skin/resources/js/myams-plugins.js
src/pyams_skin/resources/js/myams-plugins.min.js
+src/pyams_skin/resources/js/myams-require.js
+src/pyams_skin/resources/js/myams-require.min.js
src/pyams_skin/resources/js/myams-skin.js
src/pyams_skin/resources/js/myams-skin.min.js
src/pyams_skin/resources/js/myams-stats.js
Binary file src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.mo has changed
--- a/src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.po Fri Dec 14 15:28:41 2018 +0100
+++ b/src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.po Fri Dec 14 18:33:40 2018 +0100
@@ -208,13 +208,14 @@
#: src/pyams_skin/interfaces/__init__.py:84
msgid "Editor stylesheet"
-msgstr "Feuille de style HTML"
+msgstr "Feuille de style éditeur HTML"
#: src/pyams_skin/interfaces/__init__.py:85
msgid "Styles defined into this stylesheet will be available into HTML editor"
msgstr ""
-"Les styles définis dans cette feuille de style seront accessibles aux contributeurs au sein "
-"de l'éditeur HTML ; consultez la documentation pour connaître les contraintes qui s'appliquent"
+"Les styles définis dans cette feuille de style seront accessibles aux "
+"contributeurs au sein de l'éditeur HTML ; consultez la documentation pour "
+"connaître les contraintes qui s'appliquent"
#: src/pyams_skin/interfaces/__init__.py:88
msgid "Custom script"
@@ -225,8 +226,8 @@
"This custom javascript file will be used to add dynamic features to selected "
"theme"
msgstr ""
-"Ce fichier javascript pourra ajouter des fonctionnalités supplémentaires à celles proposées "
-"par le thème graphique sélectionné"
+"Ce fichier javascript pourra ajouter des fonctionnalités supplémentaires à "
+"celles proposées par le thème graphique sélectionné"
#: src/pyams_skin/interfaces/__init__.py:75
msgid "You must select a custom skin or inherit from parent!"