diff --git a/CHANGES.rst b/CHANGES.rst index 257032e2ac..1384a2e40d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,7 @@ Changelog **Added** +- #1523 Moved Installation Screens into core - #1520 JavaScripts/CSS Integration and Cleanup - #1517 Integrate senaite.core.spotlight - #1516 Consider analyses with result options or string in duplicate valid range @@ -33,7 +34,7 @@ Changelog - #1502 Improved DateTime Widget - #1490 Support Dexterity Behavior Fields in API - #1488 Support Dexterity Contents in Catalog Indexers -- #1486 Clean-up of indexes and metadata from `setup_catalog` +- #1486 Clean-up of indexes and metadata from `setup_catalog **Removed** diff --git a/bika/lims/configure.zcml b/bika/lims/configure.zcml index 926cdbd5ef..f2d2c8b4ae 100644 --- a/bika/lims/configure.zcml +++ b/bika/lims/configure.zcml @@ -11,12 +11,7 @@ - -// -// -// -// -// + @@ -30,6 +25,7 @@ + @@ -60,35 +56,38 @@ - - + for="*" + name="barcode_entry" + class="bika.lims.barcode.barcode_entry" + permission="zope.Public" + layer="bika.lims.interfaces.IBikaLIMS" + /> + + + + - + for="*" + name="js_warn" + class="bika.lims.utils.js_warn" + permission="zope.Public" + layer="bika.lims.interfaces.IBikaLIMS" + /> + + for="*" + name="js_err" + class="bika.lims.utils.js_err" + permission="zope.Public" + layer="bika.lims.interfaces.IBikaLIMS" + /> + /> + diff --git a/bika/lims/install/__init__.py b/bika/lims/install/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bika/lims/install/adapters.py b/bika/lims/install/adapters.py new file mode 100644 index 0000000000..06db65d3d6 --- /dev/null +++ b/bika/lims/install/adapters.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +from zope.component import queryMultiAdapter +from zope.interface import Interface +from ZPublisher.BaseRequest import DefaultPublishTraverse + + +class SenaiteAppTraverser(DefaultPublishTraverse): + def publishTraverse(self, request, name): + if name == "index_html": + view = queryMultiAdapter( + (self.context, request), + Interface, "senaite-overview") + if view is not None: + return view + return DefaultPublishTraverse.publishTraverse(self, request, name) diff --git a/bika/lims/install/configure.zcml b/bika/lims/install/configure.zcml new file mode 100644 index 0000000000..94cc879bad --- /dev/null +++ b/bika/lims/install/configure.zcml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bika/lims/install/images/favicon.ico b/bika/lims/install/images/favicon.ico new file mode 100644 index 0000000000..f823deab66 Binary files /dev/null and b/bika/lims/install/images/favicon.ico differ diff --git a/bika/lims/install/images/icon.png b/bika/lims/install/images/icon.png new file mode 100644 index 0000000000..53eee68132 Binary files /dev/null and b/bika/lims/install/images/icon.png differ diff --git a/bika/lims/install/images/logo.png b/bika/lims/install/images/logo.png new file mode 100644 index 0000000000..9dc2e723d7 Binary files /dev/null and b/bika/lims/install/images/logo.png differ diff --git a/bika/lims/install/templates/senaite-addsite.pt b/bika/lims/install/templates/senaite-addsite.pt new file mode 100644 index 0000000000..3f898901c1 --- /dev/null +++ b/bika/lims/install/templates/senaite-addsite.pt @@ -0,0 +1,138 @@ + + + + + + + Install SENAITE LIMS + + + + + +
+
+
+

+ + + Open Source LIMS Project +

+
+ + +
+
+
+ +
+ + +
+ The id of the site. This ends up as part of the URL.
+ No special characters are allowed. +
+
+ +
+ + +
+ A short title for the site. This will be shown in the title of the + browser window on each page. +
+
+ +
+ + +
+ The main language of the site. +
+ +
+ + + + + + + + + + + + + + +
+ + + +
+ +
+
+
+ + +
+
+
+
+ Meet the community, browse the code and get support on +
+ +
+
+ +
+
+
+ + + diff --git a/bika/lims/install/templates/senaite-overview.pt b/bika/lims/install/templates/senaite-overview.pt new file mode 100644 index 0000000000..5cd976846a --- /dev/null +++ b/bika/lims/install/templates/senaite-overview.pt @@ -0,0 +1,117 @@ + + + + + + + Welcome to SENAITE LIMS + + + + + +
+
+
+ +

+ + + Open Source LIMS Project +

+
+ + + +
+
+

Current SENAITE Installations

+
+
+ + + () + +
+
+ This site configuration is outdated and needs to be upgraded: +
+ + +
+
+
+
+
+
+ + + +
+
+
+

+ SENAITE is not installed yet. Click the button below to install it now: +

+ + +
+
+
+
+ + +
+
+
+
+ Meet the community, browse the code and get support on +
+ +
+
+ +
+
+
+ + +