# HG changeset patch # User Thierry Florac # Date 1507881692 -7200 # Node ID 801be6e0b3217fb3200d775eac652cefc8ee1b3c # Parent ce563bca346cd996f8e5e2f158f915a6d585fca0 Version 0.1.10 diff -r ce563bca346c -r 801be6e0b321 .installed.cfg --- a/.installed.cfg Fri Oct 13 09:54:36 2017 +0200 +++ b/.installed.cfg Fri Oct 13 10:01:32 2017 +0200 @@ -14,14 +14,14 @@ [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/ptweens + /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pshell + /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/proutes + /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pcreate /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pviews + /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/pdistreport - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/proutes - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/pcreate - /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/ptweens /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/py __buildout_signature__ = zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zc.buildout-2.9.3-py3.5.egg _b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin @@ -52,8 +52,8 @@ [i18n] __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 - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/polint __buildout_signature__ = zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zc.buildout-2.9.3-py3.5.egg _b = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin _d = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs @@ -87,7 +87,7 @@ __buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/sphinx /home/tflorac/Dropbox/src/PyAMS/pyams_skin/apidoc/build/Makefile /home/tflorac/Dropbox/src/PyAMS/pyams_skin/apidoc/build/make.bat -__buildout_signature__ = collective.recipe.sphinxbuilder-1.0-py3.5.egg zc.recipe.egg-2.0.3-py3.5.egg zc.buildout-2.9.3-py3.5.egg setuptools-33.1.1-py3.5.egg docutils-0.13.1-py3.5.egg Sphinx-1.6.2-py3.5.egg sphinxcontrib_websupport-1.0.1-py3.5.egg snowballstemmer-1.2.1-py3.5.egg six-e7e58fc36ac96295dcff9979007c0533 requests-e7e58fc36ac96295dcff9979007c0533 imagesize-0.7.1-py3.5.egg Babel-2.4.0-py3.5.egg alabaster-0.7.10-py3.5.egg Pygments-e7e58fc36ac96295dcff9979007c0533 Jinja2-e7e58fc36ac96295dcff9979007c0533 pytz-e7e58fc36ac96295dcff9979007c0533 +__buildout_signature__ = collective.recipe.sphinxbuilder-1.0-py3.5.egg zc.recipe.egg-2.0.3-py3.5.egg zc.buildout-2.9.3-py3.5.egg setuptools-33.1.1-py3.5.egg docutils-0.13.1-py3.5.egg Sphinx-1.6.2-py3.5.egg sphinxcontrib_websupport-1.0.1-py3.5.egg snowballstemmer-1.2.1-py3.5.egg six-b631ad1454a9f0e2bdac1167b5464291 requests-b631ad1454a9f0e2bdac1167b5464291 imagesize-0.7.1-py3.5.egg Babel-2.4.0-py3.5.egg alabaster-0.7.10-py3.5.egg Pygments-b631ad1454a9f0e2bdac1167b5464291 Jinja2-b631ad1454a9f0e2bdac1167b5464291 pytz-b631ad1454a9f0e2bdac1167b5464291 _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 @@ -103,7 +103,7 @@ [test] __buildout_installed__ = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/parts/test /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/test -__buildout_signature__ = zc.recipe.testrunner-2.0.0-py3.5.egg zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zope.testrunner-4.7.0-py3.5.egg zc.buildout-2.9.3-py3.5.egg zope.interface-4.4.1-py3.5-linux-x86_64.egg zope.exceptions-4.1.0-py3.5.egg six-e7e58fc36ac96295dcff9979007c0533 +__buildout_signature__ = zc.recipe.testrunner-2.0.0-py3.5.egg zc.recipe.egg-2.0.3-py3.5.egg setuptools-33.1.1-py3.5.egg zope.testrunner-4.7.0-py3.5.egg zc.buildout-2.9.3-py3.5.egg zope.interface-4.4.1-py3.5-linux-x86_64.egg zope.exceptions-4.1.0-py3.5.egg six-b631ad1454a9f0e2bdac1167b5464291 _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 @@ -115,85 +115,3 @@ location = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/parts/test recipe = zc.recipe.testrunner script = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/bin/test - -[buildout] -installed_develop_eggs = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-file.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/lingua.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-template.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-skin.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-pagelet.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-viewlet.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-i18n.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-catalog.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-form.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-utils.egg-link - -[buildout] -parts = i18n pyflakes sphinx test package - -[buildout] -parts = pyflakes sphinx test package i18n - -[buildout] -parts = sphinx test package i18n pyflakes - -[buildout] -parts = test package i18n pyflakes sphinx - -[buildout] -parts = package i18n pyflakes sphinx test - -[buildout] -installed_develop_eggs = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-file.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/lingua.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-template.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-skin.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-pagelet.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-viewlet.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-i18n.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-catalog.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-form.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-utils.egg-link - -[buildout] -parts = i18n pyflakes sphinx test package - -[buildout] -parts = pyflakes sphinx test package i18n - -[buildout] -parts = sphinx test package i18n pyflakes - -[buildout] -parts = test package i18n pyflakes sphinx - -[buildout] -parts = package i18n pyflakes sphinx test - -[buildout] -installed_develop_eggs = /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-file.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/lingua.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-template.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/tmpmrvm_1a0build - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-skin.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-pagelet.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-viewlet.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-i18n.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-catalog.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-form.egg-link - /home/tflorac/Dropbox/src/PyAMS/pyams_skin/develop-eggs/pyams-utils.egg-link - -[buildout] -parts = i18n pyflakes sphinx test package - -[buildout] -parts = pyflakes sphinx test package i18n - -[buildout] -parts = sphinx test package i18n pyflakes - -[buildout] -parts = test package i18n pyflakes sphinx - -[buildout] -parts = package i18n pyflakes sphinx test diff -r ce563bca346c -r 801be6e0b321 buildout.cfg --- a/buildout.cfg Fri Oct 13 09:54:36 2017 +0200 +++ b/buildout.cfg Fri Oct 13 10:01:32 2017 +0200 @@ -87,4 +87,4 @@ eggs = pyams_skin [test] [versions] -pyams_skin = 0.1.9 +pyams_skin = 0.1.10 diff -r ce563bca346c -r 801be6e0b321 docs/HISTORY.txt --- a/docs/HISTORY.txt Fri Oct 13 09:54:36 2017 +0200 +++ b/docs/HISTORY.txt Fri Oct 13 10:01:32 2017 +0200 @@ -1,6 +1,24 @@ History ======= +0.1.10 +------ + - handle CTRL key to open links in new window (MyAMS.js) + - added pre- and post- reload callbacks on JSON "reload" response + - add check in progress handler (MyAMS.js) + - added DOM sort helper (MyAMS.js) + - allow persistent divs in switcher fieldset (MyAMS.css) + - set minimum height for modal title (MyAMS.css) + - updated messages styles in message box (MyAMS.css) + - added option to change message status (MyAMS-notify.js) + - use "div" tags instead of "button" for menus and actions to prevent "Enter" key from + activating them + - added handles to orderable lists (MyAMS.css) + - added top and left negative margins classes (MyAMS.css) + - removed minimum height for TinyMCE editors + - add translation strings to Fancybox plug-in + - updated CSS + 0.1.9 ----- - added responsive classes for table header and body cells diff -r ce563bca346c -r 801be6e0b321 setup.py --- a/setup.py Fri Oct 13 09:54:36 2017 +0200 +++ b/setup.py Fri Oct 13 10:01:32 2017 +0200 @@ -25,7 +25,7 @@ README = os.path.join(DOCS, 'README.txt') HISTORY = os.path.join(DOCS, 'HISTORY.txt') -version = '0.1.9' +version = '0.1.10' long_description = open(README).read() + '\n\n' + open(HISTORY).read() tests_require = [] diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin.egg-info/PKG-INFO --- a/src/pyams_skin.egg-info/PKG-INFO Fri Oct 13 09:54:36 2017 +0200 +++ b/src/pyams_skin.egg-info/PKG-INFO Fri Oct 13 10:01:32 2017 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pyams-skin -Version: 0.1.9 +Version: 0.1.10 Summary: PyAMS base skin interfaces and classes Home-page: http://hg.ztfy.org/pyams/pyams_skin Author: Thierry Florac @@ -22,6 +22,24 @@ History ======= + 0.1.10 + ------ + - handle CTRL key to open links in new window (MyAMS.js) + - added pre- and post- reload callbacks on JSON "reload" response + - add check in progress handler (MyAMS.js) + - added DOM sort helper (MyAMS.js) + - allow persistent divs in switcher fieldset (MyAMS.css) + - set minimum height for modal title (MyAMS.css) + - updated messages styles in message box (MyAMS.css) + - added option to change message status (MyAMS-notify.js) + - use "div" tags instead of "button" for menus and actions to prevent "Enter" key from + activating them + - added handles to orderable lists (MyAMS.css) + - added top and left negative margins classes (MyAMS.css) + - removed minimum height for TinyMCE editors + - add translation strings to Fancybox plug-in + - updated CSS + 0.1.9 ----- - added responsive classes for table header and body cells diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin.egg-info/SOURCES.txt --- a/src/pyams_skin.egg-info/SOURCES.txt Fri Oct 13 09:54:36 2017 +0200 +++ b/src/pyams_skin.egg-info/SOURCES.txt Fri Oct 13 10:01:32 2017 +0200 @@ -45,6 +45,8 @@ src/pyams_skin/resources/.dropbox src/pyams_skin/resources/css/myams.css src/pyams_skin/resources/css/myams.min.css +src/pyams_skin/resources/css/myams.min.min.css +src/pyams_skin/resources/css/myams.min.min.min.css src/pyams_skin/resources/css/ext/bootstrap-3.3.2.css src/pyams_skin/resources/css/ext/bootstrap-3.3.2.min.css src/pyams_skin/resources/css/ext/bootstrap-modal.css @@ -56,6 +58,7 @@ src/pyams_skin/resources/css/ext/jquery-datetimepicker.min.css src/pyams_skin/resources/css/ext/jquery-fancybox-2.1.5.css src/pyams_skin/resources/css/ext/jquery-fancybox-2.1.5.min.css +src/pyams_skin/resources/css/ext/jquery-fancybox-2.1.5.min.min.css src/pyams_skin/resources/css/ext/jquery-imgareaselect.css src/pyams_skin/resources/css/ext/jquery-imgareaselect.min.css src/pyams_skin/resources/css/ext/jquery-mCustomScrollbar.css @@ -97,6 +100,7 @@ src/pyams_skin/resources/img/alpha.png src/pyams_skin/resources/img/de.png src/pyams_skin/resources/img/es.png +src/pyams_skin/resources/img/hidden.png src/pyams_skin/resources/img/hue.png src/pyams_skin/resources/img/logo.png src/pyams_skin/resources/img/mCSB_buttons.png @@ -285,6 +289,140 @@ src/pyams_skin/resources/img/mimetypes/x-office-address-book.png src/pyams_skin/resources/img/mimetypes/x-office-contact.png src/pyams_skin/resources/img/mimetypes/x-office-document.png +src/pyams_skin/resources/img/mimetypes/16x16/application-epub+zip.png +src/pyams_skin/resources/img/mimetypes/16x16/application-illustrator.png +src/pyams_skin/resources/img/mimetypes/16x16/application-javascript.png +src/pyams_skin/resources/img/mimetypes/16x16/application-msword-template.png +src/pyams_skin/resources/img/mimetypes/16x16/application-msword.png +src/pyams_skin/resources/img/mimetypes/16x16/application-octet-stream.png +src/pyams_skin/resources/img/mimetypes/16x16/application-pdf.png +src/pyams_skin/resources/img/mimetypes/16x16/application-pgp-encrypted.png +src/pyams_skin/resources/img/mimetypes/16x16/application-pgp-keys.png +src/pyams_skin/resources/img/mimetypes/16x16/application-pgp-signature.png +src/pyams_skin/resources/img/mimetypes/16x16/application-postscript.png +src/pyams_skin/resources/img/mimetypes/16x16/application-relaxng.png +src/pyams_skin/resources/img/mimetypes/16x16/application-rss+xml.png +src/pyams_skin/resources/img/mimetypes/16x16/application-rtf.png +src/pyams_skin/resources/img/mimetypes/16x16/application-sxw.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd-google-earth-kml.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.iccprofile.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.ms-access.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.ms-excel.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.ms-powerpoint.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.chart.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.database.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.formula-template.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.formula.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.graphics.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.image.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.presentation-template.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.presentation.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.spreadsheet-template.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.spreadsheet.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.text-master.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.oasis.opendocument.text-template.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.rn-realmedia.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.scribus.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.stardivision.mail.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.sun.xml.draw.template.png +src/pyams_skin/resources/img/mimetypes/16x16/application-vnd.wordperfect.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-7z-compressed.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-applix-word.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-ar.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-awk.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-bittorrent.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-blender.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-bzdvi.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-bzip.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-cd-image.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-cda.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-chm.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-compressed-tar.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-cue.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-deb.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-designer.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-desktop.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-egon.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-executable-script.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-font-afm.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-font-bdf.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-font-otf.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-font-ttf.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-java-applet.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-java-archive.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-k3b.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-kcsrc.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-kexi-connectiondata.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-kexiproject-shortcut.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-kgetlist.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-kplato.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-krita.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-kvtml.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-lyx.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-m4.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-marble.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-mswinurl.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-mswrite.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-nzb.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-perl.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-php.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-plasma.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-qet-element.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-qet-project.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-rpm.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-ruby.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-shellscript.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-shockwave-flash.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-skg.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-skgc.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-smb-server.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-smb-workgroup.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-srt.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-trash.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-troff-man.png +src/pyams_skin/resources/img/mimetypes/16x16/application-x-zerosize.png +src/pyams_skin/resources/img/mimetypes/16x16/application-xhtml+xml.png +src/pyams_skin/resources/img/mimetypes/16x16/application-xsd.png +src/pyams_skin/resources/img/mimetypes/16x16/audio-ac3.png +src/pyams_skin/resources/img/mimetypes/16x16/audio-midi.png +src/pyams_skin/resources/img/mimetypes/16x16/audio-x-speex+ogg.png +src/pyams_skin/resources/img/mimetypes/16x16/image-vnd.dgn.png +src/pyams_skin/resources/img/mimetypes/16x16/image-vnd.dwg.png +src/pyams_skin/resources/img/mimetypes/16x16/image-x-eps.png +src/pyams_skin/resources/img/mimetypes/16x16/image-x-vnd.trolltech.qpicture.png +src/pyams_skin/resources/img/mimetypes/16x16/inode-directory.png +src/pyams_skin/resources/img/mimetypes/16x16/message-news.png +src/pyams_skin/resources/img/mimetypes/16x16/message-partial.png +src/pyams_skin/resources/img/mimetypes/16x16/text-calendar.png +src/pyams_skin/resources/img/mimetypes/16x16/text-directory.png +src/pyams_skin/resources/img/mimetypes/16x16/text-mathml.png +src/pyams_skin/resources/img/mimetypes/16x16/text-rdf+xml.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-adasrc.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-bibtex.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-c++hdr.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-c++src.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-chdr.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-csharp.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-csrc.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-haskell.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-hex.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-ldif.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-lilypond.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-pascal.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-patch.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-po.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-python.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-qml.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-rpm-spec.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-sql.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-tcl.png +src/pyams_skin/resources/img/mimetypes/16x16/text-x-texinfo.png +src/pyams_skin/resources/img/mimetypes/16x16/unknown.png +src/pyams_skin/resources/img/mimetypes/16x16/x-kde-nsplugin-generated.png +src/pyams_skin/resources/img/mimetypes/16x16/x-media-podcast.png +src/pyams_skin/resources/img/mimetypes/16x16/x-office-address-book.png +src/pyams_skin/resources/img/mimetypes/16x16/x-office-contact.png +src/pyams_skin/resources/img/mimetypes/16x16/x-office-document.png src/pyams_skin/resources/img/pattern/overlay-pattern.png src/pyams_skin/resources/js/myams-dataTables.js src/pyams_skin/resources/js/myams-dataTables.min.js diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.mo Binary file src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.mo has changed diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.po --- a/src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.po Fri Oct 13 09:54:36 2017 +0200 +++ b/src/pyams_skin/locales/fr/LC_MESSAGES/pyams_skin.po Fri Oct 13 10:01:32 2017 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2016-10-10 15:01+0200\n" +"POT-Creation-Date: 2017-10-02 17:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -15,34 +15,38 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Lingua 3.8\n" -#: src/pyams_skin/configuration.py:62 src/pyams_skin/configuration.py:65 -#: src/pyams_skin/interfaces/configuration.py:60 +#: src/pyams_skin/configuration.py:65 src/pyams_skin/configuration.py:68 #: src/pyams_skin/interfaces/configuration.py:72 +#: src/pyams_skin/interfaces/configuration.py:84 msgid "Search..." msgstr "Rechercher..." -#: src/pyams_skin/table.py:63 +#: src/pyams_skin/table.py:64 msgid "Container elements" msgstr "Contenu" -#: src/pyams_skin/table.py:163 +#: src/pyams_skin/table.py:173 msgid "Name" msgstr "Nom" -#: src/pyams_skin/table.py:185 +#: src/pyams_skin/table.py:195 msgid "Properties" msgstr "Propriétés" -#: src/pyams_skin/table.py:240 +#: src/pyams_skin/table.py:277 +msgid "Click and drag to sort rows" +msgstr "Faire un cliquer/déposer pour trier les éléments" + +#: src/pyams_skin/table.py:290 msgid "Actions" msgstr "Actions" -#: src/pyams_skin/table.py:261 +#: src/pyams_skin/table.py:311 msgid "Delete object" msgstr "Supprimer l'objet" -#: src/pyams_skin/skin.py:39 -msgid "Default PyAMS skin" +#: src/pyams_skin/skin.py:136 +msgid "PyAMS base skin" msgstr "Skin PyAMS par défaut" #: src/pyams_skin/container.py:58 @@ -57,40 +61,15 @@ msgid "Back to previous page" msgstr "Revenir à la page précédente" -#: src/pyams_skin/templates/layout.pt:56 -msgid "Hide menu" -msgstr "Masquer le menu" - -#: src/pyams_skin/templates/layout.pt:72 -msgid "Update your profile to select an avatar..." -msgstr "Mettez à jour votre profil pour choisir un avatar..." - -#: src/pyams_skin/templates/layout.pt:87 -msgid "My shortcuts" -msgstr "Mes raccourcis" - -#: src/pyams_skin/templates/layout.pt:106 -msgid "Notifications" -msgstr "Notifications" - -#: src/pyams_skin/templates/layout.pt:164 -msgid "" -"<span><i class='text-warning fa fa-warning'></i> " -"WARNING: this will reset all your widgets status!</span>" -msgstr "" -"<span><i class='text-warning fa fa-warning'></i> " -"ATTENTION: ceci va réinitialiser tous les paramètres de vos widgets !!</" -"span>" - -#: src/pyams_skin/viewlet/toolbar/__init__.py:98 +#: src/pyams_skin/viewlet/toolbar/__init__.py:105 msgid "Add..." msgstr "Ajouter..." -#: src/pyams_skin/viewlet/toolbar/__init__.py:109 +#: src/pyams_skin/viewlet/toolbar/__init__.py:116 msgid "Actions..." msgstr "Actions..." -#: src/pyams_skin/viewlet/toolbar/__init__.py:153 +#: src/pyams_skin/viewlet/toolbar/__init__.py:175 msgid "Other actions..." msgstr "Autres actions..." @@ -107,97 +86,115 @@ msgid "<i class='fa fa-refresh fa-spin'></i>" msgstr "<i class='fa fa-refresh fa-spin'></i>" -#: src/pyams_skin/interfaces/configuration.py:124 -#: src/pyams_skin/interfaces/configuration.py:151 +#: src/pyams_skin/interfaces/configuration.py:43 +msgid "Inner package" +msgstr "Paquet interne" + +#: src/pyams_skin/interfaces/configuration.py:44 +msgid "This is another important package displayed in application version" +msgstr "Nom d'un autre paquet interne important qui peut être cité dans la version de l'application" + +#: src/pyams_skin/interfaces/configuration.py:47 +msgid "Inner package name" +msgstr "Nom du paquet interne" + +#: src/pyams_skin/interfaces/configuration.py:48 +msgid "Package name used to display application version" +msgstr "Nom de paquet utilisé pour l'affichage du numéro de version" + +#: src/pyams_skin/interfaces/configuration.py:140 +#: src/pyams_skin/interfaces/configuration.py:174 msgid "Title" msgstr "Titre" -#: src/pyams_skin/interfaces/configuration.py:125 +#: src/pyams_skin/interfaces/configuration.py:141 msgid "Application title displayed in title bar" msgstr "Titre de l'application affiché dans la barre de menu" -#: src/pyams_skin/interfaces/configuration.py:128 +#: src/pyams_skin/interfaces/configuration.py:144 +#: src/pyams_skin/interfaces/configuration.py:178 +msgid "Short title" +msgstr "Titre court" + +#: src/pyams_skin/interfaces/configuration.py:145 +#: src/pyams_skin/interfaces/configuration.py:179 +msgid "Application short title visible as title prefix" +msgstr "Titre court de l'application affiché en préfixe du titre" + +#: src/pyams_skin/interfaces/configuration.py:151 msgid "Description" msgstr "Description" -#: src/pyams_skin/interfaces/configuration.py:129 +#: src/pyams_skin/interfaces/configuration.py:152 msgid "Main application description" msgstr "Description principale de l'application ou du site" -#: src/pyams_skin/interfaces/configuration.py:132 +#: src/pyams_skin/interfaces/configuration.py:155 msgid "Author" msgstr "Auteur" -#: src/pyams_skin/interfaces/configuration.py:133 +#: src/pyams_skin/interfaces/configuration.py:156 msgid "Public author name" msgstr "Nom public de l'auteur" -#: src/pyams_skin/interfaces/configuration.py:136 -#: src/pyams_skin/interfaces/configuration.py:170 +#: src/pyams_skin/interfaces/configuration.py:159 +#: src/pyams_skin/interfaces/configuration.py:193 msgid "Icon" msgstr "Icône" -#: src/pyams_skin/interfaces/configuration.py:137 -#: src/pyams_skin/interfaces/configuration.py:171 +#: src/pyams_skin/interfaces/configuration.py:160 +#: src/pyams_skin/interfaces/configuration.py:194 msgid "Browser favourite icon" msgstr "Icône des favoris" -#: src/pyams_skin/interfaces/configuration.py:140 -#: src/pyams_skin/interfaces/configuration.py:174 +#: src/pyams_skin/interfaces/configuration.py:163 +#: src/pyams_skin/interfaces/configuration.py:197 msgid "Logo" msgstr "Logo" -#: src/pyams_skin/interfaces/configuration.py:141 -#: src/pyams_skin/interfaces/configuration.py:175 +#: src/pyams_skin/interfaces/configuration.py:164 +#: src/pyams_skin/interfaces/configuration.py:198 msgid "Image containing application logo" msgstr "Image contenant le logo de l'application ou du site" -#: src/pyams_skin/interfaces/configuration.py:152 +#: src/pyams_skin/interfaces/configuration.py:175 msgid "Application title visible in back-office" msgstr "Titre de l'application affiché dans la barre de menu" -#: src/pyams_skin/interfaces/configuration.py:155 -msgid "Short title" -msgstr "Titre court" - -#: src/pyams_skin/interfaces/configuration.py:156 -msgid "Application short title visible as title prefix" -msgstr "Titre court de l'application affiché en préfixe du titre" - -#: src/pyams_skin/interfaces/configuration.py:162 +#: src/pyams_skin/interfaces/configuration.py:185 msgid "Login header" msgstr "En-tête de connexion" -#: src/pyams_skin/interfaces/configuration.py:163 +#: src/pyams_skin/interfaces/configuration.py:186 msgid "This reStructuredText text will be displayed in login page header" msgstr "" "Ce texte au format reStructuredText sera affiché en en-tête de la fenêtre de " "connexion" -#: src/pyams_skin/interfaces/configuration.py:166 +#: src/pyams_skin/interfaces/configuration.py:189 msgid "Login footer" msgstr "Pied de page de connexion" -#: src/pyams_skin/interfaces/configuration.py:167 +#: src/pyams_skin/interfaces/configuration.py:190 msgid "This reStructuredText text will be displayed in login page footer" msgstr "" "Ce texte au format reStructuredText sera affiché en pied de la fenêtre de " "connexion" -#: src/pyams_skin/interfaces/configuration.py:178 +#: src/pyams_skin/interfaces/configuration.py:201 msgid "Display title icon?" msgstr "Afficher les icônes de titre ?" -#: src/pyams_skin/interfaces/configuration.py:179 +#: src/pyams_skin/interfaces/configuration.py:202 msgid "Should icons be displayed into content's title area ?" msgstr "" "Les icônes associées aux en-têtes de pages doivent-elles être affichées ?" -#: src/pyams_skin/interfaces/configuration.py:183 +#: src/pyams_skin/interfaces/configuration.py:206 msgid "Display shared tool title?" msgstr "Afficher le titre des outils ?" -#: src/pyams_skin/interfaces/configuration.py:184 +#: src/pyams_skin/interfaces/configuration.py:207 msgid "Should shared tool title be displayed into shared content's title area?" msgstr "" "Le titre des outils partagés doit-il être affiché dans les en-têtes de " @@ -223,7 +220,8 @@ #: src/pyams_skin/interfaces/__init__.py:73 msgid "You must select a custom skin or inherit from parent!" -msgstr "Vous devez choisir un thème spécifique ou hériter de celui du niveau parent" +msgstr "" +"Vous devez choisir un thème spécifique ou hériter de celui du niveau parent" #: src/pyams_skin/interfaces/extension.py:32 msgid "Front-office only" @@ -296,6 +294,26 @@ msgid "Mode(s) in which reports are activated" msgstr "Mode(s) pour le(s)quel(s) le service est activé" +#~ msgid "Hide menu" +#~ msgstr "Masquer le menu" + +#~ msgid "Update your profile to select an avatar..." +#~ msgstr "Mettez à jour votre profil pour choisir un avatar..." + +#~ msgid "My shortcuts" +#~ msgstr "Mes raccourcis" + +#~ msgid "Notifications" +#~ msgstr "Notifications" + +#~ msgid "" +#~ "<span><i class='text-warning fa fa-warning'></" +#~ "i> WARNING: this will reset all your widgets status!</span>" +#~ msgstr "" +#~ "<span><i class='text-warning fa fa-warning'></" +#~ "i> ATTENTION: ceci va réinitialiser tous les paramètres de vos " +#~ "widgets !!</span>" + #~ msgid "Presentation skin" #~ msgstr "Modèle de présentation" diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin/locales/pyams_skin.pot --- a/src/pyams_skin/locales/pyams_skin.pot Fri Oct 13 09:54:36 2017 +0200 +++ b/src/pyams_skin/locales/pyams_skin.pot Fri Oct 13 10:01:32 2017 +0200 @@ -1,12 +1,12 @@ -# +# # SOME DESCRIPTIVE TITLE # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , 2016. +# FIRST AUTHOR , 2017. #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2016-10-10 15:01+0200\n" +"POT-Creation-Date: 2017-10-02 17:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -16,34 +16,38 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Lingua 3.10.dev0\n" -#: ./src/pyams_skin/configuration.py:62 ./src/pyams_skin/configuration.py:65 -#: ./src/pyams_skin/interfaces/configuration.py:60 +#: ./src/pyams_skin/configuration.py:65 ./src/pyams_skin/configuration.py:68 #: ./src/pyams_skin/interfaces/configuration.py:72 +#: ./src/pyams_skin/interfaces/configuration.py:84 msgid "Search..." msgstr "" -#: ./src/pyams_skin/table.py:63 +#: ./src/pyams_skin/table.py:64 msgid "Container elements" msgstr "" -#: ./src/pyams_skin/table.py:163 +#: ./src/pyams_skin/table.py:173 msgid "Name" msgstr "" -#: ./src/pyams_skin/table.py:185 +#: ./src/pyams_skin/table.py:195 msgid "Properties" msgstr "" -#: ./src/pyams_skin/table.py:240 +#: ./src/pyams_skin/table.py:277 +msgid "Click and drag to sort rows" +msgstr "" + +#: ./src/pyams_skin/table.py:290 msgid "Actions" msgstr "" -#: ./src/pyams_skin/table.py:261 +#: ./src/pyams_skin/table.py:311 msgid "Delete object" msgstr "" -#: ./src/pyams_skin/skin.py:39 -msgid "Default PyAMS skin" +#: ./src/pyams_skin/skin.py:136 +msgid "PyAMS base skin" msgstr "" #: ./src/pyams_skin/container.py:58 @@ -58,37 +62,15 @@ msgid "Back to previous page" msgstr "" -#: ./src/pyams_skin/templates/layout.pt:56 -msgid "Hide menu" -msgstr "" - -#: ./src/pyams_skin/templates/layout.pt:72 -msgid "Update your profile to select an avatar..." -msgstr "" - -#: ./src/pyams_skin/templates/layout.pt:87 -msgid "My shortcuts" -msgstr "" - -#: ./src/pyams_skin/templates/layout.pt:106 -msgid "Notifications" -msgstr "" - -#: ./src/pyams_skin/templates/layout.pt:164 -msgid "" -"<span><i class='text-warning fa fa-warning'></i> " -"WARNING: this will reset all your widgets status!</span>" -msgstr "" - -#: ./src/pyams_skin/viewlet/toolbar/__init__.py:98 +#: ./src/pyams_skin/viewlet/toolbar/__init__.py:105 msgid "Add..." msgstr "" -#: ./src/pyams_skin/viewlet/toolbar/__init__.py:109 +#: ./src/pyams_skin/viewlet/toolbar/__init__.py:116 msgid "Actions..." msgstr "" -#: ./src/pyams_skin/viewlet/toolbar/__init__.py:153 +#: ./src/pyams_skin/viewlet/toolbar/__init__.py:175 msgid "Other actions..." msgstr "" @@ -105,92 +87,110 @@ msgid "<i class='fa fa-refresh fa-spin'></i>" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:124 -#: ./src/pyams_skin/interfaces/configuration.py:151 -msgid "Title" -msgstr "" - -#: ./src/pyams_skin/interfaces/configuration.py:125 -msgid "Application title displayed in title bar" -msgstr "" - -#: ./src/pyams_skin/interfaces/configuration.py:128 -msgid "Description" -msgstr "" - -#: ./src/pyams_skin/interfaces/configuration.py:129 -msgid "Main application description" +#: ./src/pyams_skin/interfaces/configuration.py:43 +msgid "Inner package" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:132 -msgid "Author" -msgstr "" - -#: ./src/pyams_skin/interfaces/configuration.py:133 -msgid "Public author name" +#: ./src/pyams_skin/interfaces/configuration.py:44 +msgid "This is another important package displayed in application version" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:136 -#: ./src/pyams_skin/interfaces/configuration.py:170 -msgid "Icon" +#: ./src/pyams_skin/interfaces/configuration.py:47 +msgid "Inner package name" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:137 -#: ./src/pyams_skin/interfaces/configuration.py:171 -msgid "Browser favourite icon" +#: ./src/pyams_skin/interfaces/configuration.py:48 +msgid "Package name used to display application version" msgstr "" #: ./src/pyams_skin/interfaces/configuration.py:140 #: ./src/pyams_skin/interfaces/configuration.py:174 -msgid "Logo" +msgid "Title" msgstr "" #: ./src/pyams_skin/interfaces/configuration.py:141 -#: ./src/pyams_skin/interfaces/configuration.py:175 -msgid "Image containing application logo" +msgid "Application title displayed in title bar" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:144 +#: ./src/pyams_skin/interfaces/configuration.py:178 +msgid "Short title" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:145 +#: ./src/pyams_skin/interfaces/configuration.py:179 +msgid "Application short title visible as title prefix" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:151 +msgid "Description" msgstr "" #: ./src/pyams_skin/interfaces/configuration.py:152 -msgid "Application title visible in back-office" +msgid "Main application description" msgstr "" #: ./src/pyams_skin/interfaces/configuration.py:155 -msgid "Short title" +msgid "Author" msgstr "" #: ./src/pyams_skin/interfaces/configuration.py:156 -msgid "Application short title visible as title prefix" +msgid "Public author name" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:162 -msgid "Login header" +#: ./src/pyams_skin/interfaces/configuration.py:159 +#: ./src/pyams_skin/interfaces/configuration.py:193 +msgid "Icon" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:160 +#: ./src/pyams_skin/interfaces/configuration.py:194 +msgid "Browser favourite icon" msgstr "" #: ./src/pyams_skin/interfaces/configuration.py:163 +#: ./src/pyams_skin/interfaces/configuration.py:197 +msgid "Logo" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:164 +#: ./src/pyams_skin/interfaces/configuration.py:198 +msgid "Image containing application logo" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:175 +msgid "Application title visible in back-office" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:185 +msgid "Login header" +msgstr "" + +#: ./src/pyams_skin/interfaces/configuration.py:186 msgid "This reStructuredText text will be displayed in login page header" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:166 +#: ./src/pyams_skin/interfaces/configuration.py:189 msgid "Login footer" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:167 +#: ./src/pyams_skin/interfaces/configuration.py:190 msgid "This reStructuredText text will be displayed in login page footer" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:178 +#: ./src/pyams_skin/interfaces/configuration.py:201 msgid "Display title icon?" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:179 +#: ./src/pyams_skin/interfaces/configuration.py:202 msgid "Should icons be displayed into content's title area ?" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:183 +#: ./src/pyams_skin/interfaces/configuration.py:206 msgid "Display shared tool title?" msgstr "" -#: ./src/pyams_skin/interfaces/configuration.py:184 +#: ./src/pyams_skin/interfaces/configuration.py:207 msgid "Should shared tool title be displayed into shared content's title area?" msgstr "" diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin/resources/img/hidden.png Binary file src/pyams_skin/resources/img/hidden.png has changed diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin/resources/js/myams.js --- a/src/pyams_skin/resources/js/myams.js Fri Oct 13 09:54:36 2017 +0200 +++ b/src/pyams_skin/resources/js/myams.js Fri Oct 13 10:01:32 2017 +0200 @@ -718,7 +718,9 @@ if (copied) { ams.skin.smallBox('success', { - title: ams.i18n.CLIPBOARD_COPY_OK, + title: text.length > 1 + ? ams.i18n.CLIPBOARD_TEXT_COPY_OK + : ams.i18n.CLIPBOARD_CHARACTER_COPY_OK, icon: 'fa fa-fw fa-info-circle font-xs align-top margin-top-10', timeout: 1000 }); @@ -1030,9 +1032,11 @@ break; case 'info': case 'success': - ams.form.resetChanged(form); - if (result.close_form !== false) { - ams.dialog.close(form); + if (form !== undefined) { + ams.form.resetChanged(form); + if (result.close_form !== false) { + ams.dialog.close(form); + } } break; case 'message': @@ -1041,29 +1045,47 @@ case 'notify': case 'callback': case 'callbacks': - ams.form.resetChanged(form); - if (result.close_form !== false) { - ams.dialog.close(form); + if (form !== undefined) { + ams.form.resetChanged(form); + if (result.close_form !== false) { + ams.dialog.close(form); + } } break; case 'modal': ams.dialog.open(result.location); break; case 'reload': - ams.form.resetChanged(form); - if (result.close_form !== false) { - ams.dialog.close(form); + if (form !== undefined) { + ams.form.resetChanged(form); + if (result.close_form !== false) { + ams.dialog.close(form); + } } url = result.location || window.location.hash; if (url.startsWith('#')) { url = url.substr(1); } - ams.skin.loadURL(url, result.target || target || '#content'); + var loadTarget = $(result.target || target || '#content'); + ams.skin.loadURL(url, loadTarget, { + preLoadCallback: ams.getFunctionByName(result.pre_reload) || function() { + $('[data-ams-pre-reload]', loadTarget).each(function() { + ams.executeFunctionByName($(this).data('ams-pre-reload')); + }); + }, + afterLoadCallback: ams.getFunctionByName(result.post_reload) || function () { + $('[data-ams-post-reload]', loadTarget).each(function () { + ams.executeFunctionByName($(this).data('ams-post-reload')); + }); + } + }); break; case 'redirect': - ams.form.resetChanged(form); - if (result.close_form === true) { - ams.dialog.close(form); + if (form !== undefined) { + ams.form.resetChanged(form); + if (result.close_form === true) { + ams.dialog.close(form); + } } url = result.location || window.location.href; if (result.window) { @@ -1170,6 +1192,9 @@ } if (result.events) { var event; + if (form === undefined) { + form = $(document); + } for (index =0; index < result.events.length; index++) { event = result.events[index]; if (typeof(event) === 'string') { @@ -1391,9 +1416,9 @@ */ init: function(element) { - // Store value of hidden inputs $('FORM', element).each(function() { var form = $(this); + // Store value of hidden inputs $('INPUT.select2[type="hidden"]', form).each(function() { var input = $(this); input.data('ams-select2-input-value', input.val()); @@ -2416,6 +2441,19 @@ */ MyAMS.helpers = { + /** Sort DOM elements into selected container */ + sort: function(container, attribute) { + if (!attribute) { + attribute = 'weight'; + } + var childs = container.children(); + childs.sort(function(a, b) { + return +$(a).data(attribute) - +$(b).data(attribute); + }).each(function() { + container.append(this); + }); + }, + /** Clear Select2 slection */ select2ClearSelection: function() { var source = $(this); @@ -2443,6 +2481,14 @@ } }, + /** Select2 'select-all' helper */ + select2SelectAllHelper: function() { + var source = $(this); + var parent = source.parents('label:first'); + var input = $('.select2', parent); + input.select2('data', input.data('ams-select2-data')); + }, + /** Select2 query results callback */ select2QueryUrlResultsCallback: function(data, page, context) { switch (data.status) { @@ -4030,7 +4076,7 @@ "advlist autosave autolink lists link image charmap print preview hr anchor pagebreak", "searchreplace wordcount visualblocks visualchars code fullscreen", "insertdatetime media nonbreaking save table contextmenu directionality", - "emoticons paste textcolor colorpicker textpattern" + "emoticons paste textcolor colorpicker textpattern autoresize" ], toolbar1: data.amsTinymceToolbar1 || "undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent", toolbar2: data.amsTinymceToolbar2 || "forecolor backcolor emoticons | charmap link image media | fullscreen preview print | code", @@ -4044,6 +4090,10 @@ image_class_list: data.amsTinymceImageClassList, link_list: ams.getFunctionByName(data.amsTinymceLinkList) || data.amsTinymceLinkList, link_class_list: data.amsTinymceLinkClassList, + height: 50, + min_height: 50, + autoresize_min_height: 50, + autoresize_max_height: 500, resize: true }; if (data.amsTinymceExternalPlugins) { @@ -4139,6 +4189,10 @@ fancyboxes.each(function() { var fancybox = $(this); var data = fancybox.data(); + var elements = fancybox; + if (data.amsFancyboxElements) { + elements = $(data.amsFancyboxElements, fancybox); + } var helpers = (data.amsFancyboxHelpers || '').split(/\s+/); if (helpers.length > 0) { for (var index=0; index < helpers.length; index++) { @@ -4165,18 +4219,52 @@ type: data.amsFancyboxType, padding: data.amsFancyboxPadding || 10, margin: data.amsFancyboxMargin || 10, + loop: data.amsFancyboxLoop, beforeLoad: ams.getFunctionByName(data.amsFancyboxBeforeLoad) || function() { - this.title = ams.executeFunctionByName(data.amsFancyboxTitleGetter, this) || $(this.element).attr('original-title') || $(this.element).attr('title'); + var title; + if (data.amsFancyboxTitleGetter) { + title = ams.executeFunctionByName(data.amsFancyboxTitleGetter, this); + } + if (!title) { + var content = $('*:first', this.element); + title = content.attr('original-title') || content.attr('title'); + if (!title) { + title = $(this.element).attr('original-title') || $(this.element).attr('title'); + } + } + this.title = title; }, + afterLoad: ams.getFunctionByName(data.amsFancyboxAfterLoad), helpers: { title: { type: 'inside' } } }; + if (helpers.length > 0) { + for (index = 0; index < helpers.length; index++) { + helper = helpers[index]; + switch (helper) { + case 'buttons': + dataOptions.helpers.buttons = { + position: data.amsFancyboxButtonsPosition || 'top' + }; + break; + case 'thumbs': + dataOptions.helpers.thumbs = { + width: data.amsFancyboxThumbsWidth || 50, + height: data.amsFancyboxThumbsHeight || 50 + }; + break; + case 'media': + dataOptions.helpers.media = true; + break; + } + } + } var settings = $.extend({}, dataOptions, data.amsFancyboxOptions); settings = ams.executeFunctionByName(data.amsFancyboxInitCallback, fancybox, settings) || settings; - var plugin = fancybox.fancybox(settings); + var plugin = elements.fancybox(settings); ams.executeFunctionByName(data.amsFancyboxAfterInitCallback, fancybox, plugin, settings); }); }); @@ -4472,6 +4560,9 @@ } else { tr.remove(); } + if (result.handle_json) { + MyAMS.ajax.handleJSON(result); + } } else { MyAMS.ajax.handleJSON(result); } @@ -4843,6 +4934,9 @@ dataType: 'html', cache: false, beforeSend: function() { + if (options && options.preLoadCallback) { + ams.executeFunctionByName(options.preLoadCallback, this); + } ams.skin.cleanContainer(container); container.html('

' + ams.i18n.LOADING + '

'); if (container[0] === $('#content')[0]) { @@ -5499,7 +5593,7 @@ BAD_LOGIN_TITLE: "Bad login!", BAD_LOGIN_MESSAGE: "Your anthentication credentials didn't allow you to open a session; " + - "please check your credentials or contact administrator.", + "please check your credentials or contact administrator.", CONFIRM: "Confirm", CONFIRM_REMOVE: "Removing this content can't be undone. Do you confirm?", @@ -5515,7 +5609,8 @@ BTN_YES_NO: "[Yes][No]", CLIPBOARD_COPY: "Copy to clipboard with Ctrl+C, and Enter", - CLIPBOARD_COPY_OK: "Text copied to clipboard", + CLIPBOARD_CHARACTER_COPY_OK: "Character copied to clipboard", + CLIPBOARD_TEXT_COPY_OK: "Text copied to clipboard", FORM_CHANGED_WARNING: "Some changes were not saved. These updates will be lost if you leave this page.", DELETE_WARNING: "This change can't be undone. Are you sure that you want to delete this element?", @@ -5538,7 +5633,19 @@ SELECT2_FREETAG_PREFIX: "Free text: ", DT_COLUMNS: "Columns" - + } + + MyAMS.plugins.i18n = { + widgets: {}, + validate: {}, + datatables: {}, + fancybox: { + ERROR: "Can't load requested content.", + RETRY: "Please check URL or try again later.", + CLOSE: "Close", + NEXT: "Next", + PREVIOUS: "Previous" + } }; diff -r ce563bca346c -r 801be6e0b321 src/pyams_skin/resources/js/myams.min.js --- a/src/pyams_skin/resources/js/myams.min.js Fri Oct 13 09:54:36 2017 +0200 +++ b/src/pyams_skin/resources/js/myams.min.js Fri Oct 13 10:01:32 2017 +0200 @@ -1,1 +1,1 @@ -(function(d,c){var b=c.console;String.prototype.startsWith=function(h){var f=this.length,g=h.length;if(f0};if(d.scrollbarWidth===undefined){d.scrollbarWidth=function(){var g=d('
').appendTo("body");var h=g.children();var f=h.innerWidth()-h.height(99).innerWidth();g.remove();return f}}d.fn.extend({exists:function(){return d(this).length>0},objectOrParentWithClass:function(f){if(this.hasClass(f)){return this}else{return this.parents("."+f)}},listattr:function(g){var f=[];this.each(function(){f.push(d(this).attr(g))});return f},style:function(g,j,f){var i=this.get(0);if(typeof(i)==="undefined"){return}var h=this.get(0).style;if(typeof(g)!=="undefined"){if(typeof(j)!=="undefined"){f=typeof(f)!=="undefined"?f:"";h.setProperty(g,j,f);return this}else{return h.getPropertyValue(g)}}else{return h}},removeClassPrefix:function(f){this.each(function(h,j){var g=j.className.split(" ").map(function(i){return i.startsWith(f)?"":i});j.className=d.trim(g.join(" "))});return this},contextMenu:function(g){function f(j,l,i){var k=d(window)[l](),m=d(g.menuSelector)[l](),h=j;if(j+m>k&&m',openedSign:''};var g=d.extend({},h,f);var i=d(this);i.find("LI").each(function(){var j=d(this);if(j.find("UL").size()>0){j.find("A:first").append(""+g.closedSign+"");var k=j.find("A:first");if(k.attr("href")==="#"){k.click(function(){return false})}}});i.find("LI.active").each(function(){var j=d(this).parents("UL");var k=j.parent("LI");j.slideDown(g.speed);k.find("b:first").html(g.openedSign);k.addClass("open")});i.find("LI A").on("click",function(){var m=d(this);if(m.hasClass("active")){return}var j=m.attr("href").replace(/^#/,"");var l=m.parent().find("UL");if(g.accordion){var k=m.parent().parents("UL");var n=i.find("UL:visible");n.each(function(p){var r=true;k.each(function(s){if(k[s]===n[p]){r=false;return false}});if(r){if(l!==n[p]){var q=d(n[p]);if(j||!q.hasClass("active")){q.slideUp(g.speed,function(){d(this).parent("LI").removeClass("open").find("B:first").delay(g.speed).html(g.closedSign)})}}}})}var o=m.parent().find("UL:first");if(!j&&o.is(":visible")&&!o.hasClass("active")){o.slideUp(g.speed,function(){m.parent("LI").removeClass("open").find("B:first").delay(g.speed).html(g.closedSign)})}else{o.slideDown(g.speed,function(){m.parent("LI").addClass("open").find("B:first").delay(g.speed).html(g.openedSign)})}})}});d.UTF8={encode:function(g){g=g.replace(/\r\n/g,"\n");var f="";for(var i=0;i127)&&(h<2048)){f+=String.fromCharCode((h>>6)|192);f+=String.fromCharCode((h&63)|128)}else{f+=String.fromCharCode((h>>12)|224);f+=String.fromCharCode(((h>>6)&63)|128);f+=String.fromCharCode((h&63)|128)}}}return f},decode:function(f){var h="";var k=0,l=0,j=0,g=0;while(k191)&&(l<224)){j=f.charCodeAt(k+1);h+=String.fromCharCode(((l&31)<<6)|(j&63));k+=2}else{j=f.charCodeAt(k+1);g=f.charCodeAt(k+2);h+=String.fromCharCode(((l&15)<<12)|((j&63)<<6)|(g&63));k+=3}}}return h}};if(c.MyAMS===undefined){c.MyAMS={devmode:true,devext:"",lang:"en",throttleDelay:350,menuSpeed:235,navbarHeight:49,ajaxNav:true,enableWidgets:true,enableMobile:false,enableFastclick:false,warnOnFormChange:false,ismobile:(/iphone|ipad|ipod|android|blackberry|mini|windows\sce|palm/i.test(navigator.userAgent.toLowerCase()))}}var e=c.MyAMS;var a=e;e.baseURL=(function(){var f=d('script[src*="/myams.js"], script[src*="/myams.min.js"]');var g=f.attr("src");a.devmode=g.indexOf(".min.js")<0;a.devext=a.devmode?"":".min";return g.substring(0,g.lastIndexOf("/")+1)})();e.log=function(){if(b){b.log&&b.log(this,arguments)}};e.getQueryVar=function(h,i){if(h.indexOf("?")<0){return false}if(!h.endsWith("&")){h+="&"}var f=new RegExp(".*?[&\\?]"+i+"=(.*?)&.*");var g=h.replace(f,"$1");return g===h?false:g};e.rgb2hex=function(f){return"#"+d.map(f.match(/\b(\d+)\b/g),function(g){return("0"+parseInt(g).toString(16)).slice(-2)}).join("")};e.generateId=function(){function f(){return Math.floor((1+Math.random())*65536).toString(16).substring(1)}return f()+f()+f()+f()};e.generateUUID=function(){var g=new Date().getTime();var f="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(i){var h=(g+Math.random()*16)%16|0;g=Math.floor(g/16);return(i==="x"?h:(h&3|8)).toString(16)});return f};e.getObject=function(k,g){if(!k){return undefined}if(typeof(k)!=="string"){return k}var h=k.split(".");g=(g===undefined||g===null)?window:g;for(var f=0;f").attr({rel:"stylesheet",type:"text/css",href:i,"data-ams-id":j}).appendTo(h)}};e.event={stop:function(f){if(!f){f=window.event}if(f){if(f.stopPropagation){f.stopPropagation();f.preventDefault()}else{f.cancelBubble=true;f.returnValue=false}}}};e.browser={getInternetExplorerVersion:function(){var h=-1;if(navigator.appName==="Microsoft Internet Explorer"){var f=navigator.userAgent;var g=new RegExp("MSIE ([0-9]{1,}[.0-9]{0,})");if(g.exec(f)!==null){h=parseFloat(RegExp.$1)}}return h},checkVersion:function(){var g="You're not using Windows Internet Explorer.";var f=this.getInternetExplorerVersion();if(f>-1){if(f>=8){g="You're using a recent copy of Windows Internet Explorer."}else{g="You should upgrade your copy of Windows Internet Explorer."}}if(c.alert){c.alert(g)}},isIE8orlower:function(){var g="0";var f=this.getInternetExplorerVersion();if(f>-1){if(f>=9){g=0}else{g=1}}return g},copyToClipboard:function(g){function f(k){var i=false;if(window.clipboardData&&window.clipboardData.setData){i=clipboardData.setData("Text",k)}else{if(document.queryCommandSupported&&document.queryCommandSupported("copy")){var h=d("