From 942ee12267a83a58d2b470aaad9489ddbb04d1ce Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sun, 9 Feb 2020 13:33:27 +0100
Subject: [PATCH 1/4] Moved install screens to core

---
 bika/lims/configure.zcml                      |   1 +
 bika/lims/install/__init__.py                 |   0
 bika/lims/install/adapters.py                 |  16 ++
 bika/lims/install/configure.zcml              |  44 ++++++
 bika/lims/install/images/favicon.ico          | Bin 0 -> 5430 bytes
 bika/lims/install/images/icon.png             | Bin 0 -> 5312 bytes
 bika/lims/install/images/logo.png             | Bin 0 -> 20816 bytes
 .../lims/install/templates/senaite-addsite.pt | 138 ++++++++++++++++++
 .../install/templates/senaite-overview.pt     | 117 +++++++++++++++
 9 files changed, 316 insertions(+)
 create mode 100644 bika/lims/install/__init__.py
 create mode 100644 bika/lims/install/adapters.py
 create mode 100644 bika/lims/install/configure.zcml
 create mode 100644 bika/lims/install/images/favicon.ico
 create mode 100644 bika/lims/install/images/icon.png
 create mode 100644 bika/lims/install/images/logo.png
 create mode 100644 bika/lims/install/templates/senaite-addsite.pt
 create mode 100644 bika/lims/install/templates/senaite-overview.pt

diff --git a/bika/lims/configure.zcml b/bika/lims/configure.zcml
index 926cdbd5ef..1636a875ce 100644
--- a/bika/lims/configure.zcml
+++ b/bika/lims/configure.zcml
@@ -30,6 +30,7 @@
   <include package=".content" />
   <include package=".controlpanel" />
   <include package=".exportimport" />
+  <include package=".install" />
   <include package=".interfaces" />
   <include package=".jsonapi" />
   <include package=".locales" />
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..4e309ff30b
--- /dev/null
+++ b/bika/lims/install/configure.zcml
@@ -0,0 +1,44 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    i18n_domain="senaite.core">
+
+  <include package="plone.app.controlpanel" file="permissions.zcml" />
+
+  <!-- SENAITE install screen -->
+  <browser:page
+      for="OFS.interfaces.IApplication"
+      name="senaite-addsite"
+      class="Products.CMFPlone.browser.admin.AddPloneSite"
+      permission="zope2.ViewManagementScreens"
+      template="templates/senaite-addsite.pt"/>
+
+  <!-- ZOPE root overview screen -->
+  <browser:page
+      for="OFS.interfaces.IApplication"
+      name="senaite-overview"
+      class="Products.CMFPlone.browser.admin.Overview"
+      permission="zope.Public"
+      template="templates/senaite-overview.pt"/>
+
+  <!-- App traverser to show the overview screen -->
+  <adapter
+      for="OFS.interfaces.IApplication
+           zope.publisher.interfaces.browser.IBrowserRequest"
+      factory=".adapters.SenaiteAppTraverser"/>
+
+  <!-- browser resources used in templates -->
+  <browser:resource
+      file="images/logo.png"
+      name="senaite-logo.png"/>
+
+  <browser:resource
+      file="images/icon.png"
+      name="senaite-icon.png"/>
+
+  <browser:resource
+      file="images/favicon.ico"
+      name="favicon.ico"/>
+
+</configure>
diff --git a/bika/lims/install/images/favicon.ico b/bika/lims/install/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f823deab663ad63920d603c3f3e12b1aff347173
GIT binary patch
literal 5430
zcmeH~Pe@cj9LL8$s6@0PAtI8Ch=_EEhzJo35$PbEqLYL~hb1~iL<h+ZVbVc8bm$Ny
zA`u=WI!LG3gQRqbh=@*NDiKS_DiRip)91@N@EqT||FR(V3m<0Q@BRL~H#2W`)|fI=
zZfa`{ZPdgnjcGH+M5F2J=h(-vwPT};N7_!4ugVD+fI%Q*UOJ2S8?d`9(sn{NHR3P{
zic7+6xC!eZ+cY$RuNn+@U=vdC1RB7pp3Y;?y)77mBj7YfNBQUBj5CI`r?ACAzRKtH
zh|Vvla)tw1jpYx}Gdd}L8*+))y!?;x8o%J2a2YC%k^laq*fb{}p${}hVd}y70pvRo
zaL}AwgKwaFFQE;bTIkGz?j;}wit(jS?jdL{h593)=hgdZoz+1$skWX$^~4;sLq5_N
zT!4PaG#<v1J=JZ@#<(%73&xCZ81wXJIJzgFWF#G<SUpq}&V%-&LsC6?wKx22RZ;K;
zd<X4Ew;-1_id#|AeD#4_t6Bq&&-5=s#yRC)F={3F1-N>d+E@5=6jR8H)weSW`fh?X
zwP#PlW6(Dgyr=64I1YtM-|--Pg<x*==iwZ<u|7@zHTZrBY%$P!$yLhP1&iS4TfsH}
zVS9|?F2NG`aqqG9f_q-Np*n%}8E9;SIkZpRhhvaU`VNL*6M{L^*IwBIVN&fa@MC7M
zWr_*Q<7`cIrXcKHPCBPRt1T;7`yJOkf%}DaI|=mXQZ`?~`WlC$zC#h$T7T={-Y;8y
z&7J1)Pf6=ldu6G9dJIbAzkg)~*MDjKmA=1!x&P?*u5teoE!a{=WD;`S|Kyi|>yXdc
z0rx%9zIzqcz|~e8w*NF>&vbUs?_fFPqb{7^La?s-dX`oQlji)OvqPr1U@n~_ropf4
z&M>+Bt}4eAgq<Bmu!o(4l=m)#oqJ}mw?ID9cx#^gvxDAi1+G9P$nP>Nf&b3#3?rXH
zr5b~<27Z1$TRg;`z!rmI)-K_Dq%qgnYaadQaM${eFb4YG4oj^ho&{IawR6}y4y&k_
zSM%8mI@f=Kekf*+2`@;R-<pCVcZ007Gi>d4v$f0B*4`_#wjyp*kz{wWITcwR-l_g#
f?SoZo7xF<dirsGBj-;xS-O6d>73mtPrJCqBI|RN5

literal 0
HcmV?d00001

diff --git a/bika/lims/install/images/icon.png b/bika/lims/install/images/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..53eee681325dd138321cc936d20e67d2831a0c12
GIT binary patch
literal 5312
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

literal 0
HcmV?d00001

diff --git a/bika/lims/install/images/logo.png b/bika/lims/install/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dc2e723d7c051f851e3f4fcdce0d689cd6baa98
GIT binary patch
literal 20816
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

literal 0
HcmV?d00001

diff --git a/bika/lims/install/templates/senaite-addsite.pt b/bika/lims/install/templates/senaite-addsite.pt
new file mode 100644
index 0000000000..f182955397
--- /dev/null
+++ b/bika/lims/install/templates/senaite-addsite.pt
@@ -0,0 +1,138 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      i18n:domain="senaite.lims">
+
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title i18n:translate="">Install SENAITE LIMS</title>
+  <link rel="stylesheet" type="text/css"
+        tal:attributes="href string:${context/absolute_url}/++resource++senaite.core.bootstrap.static/css/bootstrap.min.css"
+        href="bootstrap.min.css" />
+  <link href="favicon.ico" rel="icon" type="image/x-icon"
+        tal:attributes="href string:${context/absolute_url}/++resource++favicon.ico"/>
+</head>
+<body>
+
+  <div class="container">
+    <div class="row">
+      <div class="col-sm-6 col-sm-offset-3">
+        <h1>
+          <!-- SENAITE LOGO -->
+          <img src="senaite-logo.png"
+               width="250"
+               tal:attributes="src string:${context/absolute_url}/++resource++senaite-logo.png" />
+          <small class="lead">Open Source LIMS Project</small>
+        </h1>
+        <hr/>
+
+        <!-- SENAITE install form -->
+        <div class="row">
+          <div class="col-sm-12">
+            <form class="form"
+                  action="/"
+                  method="post"
+                  tal:attributes="action string:${context/absolute_url}/@@senaite-addsite"
+                  tal:define="profiles view/profiles;
+                              base_profiles profiles/base;
+                              default_profile profiles/default;
+                              extension_profiles profiles/extensions;
+                              advanced request/advanced|nothing;">
+
+              <div class="form-group">
+                <label for="site_id" i18n:translate="">Path identifier</label>
+                <input class="form-control" type="text" name="site_id" id="site_id"
+                       tal:attributes="value request/site_id|nothing" />
+                <div class="help-block" i18n:translate="">
+                  The id of the site. This ends up as part of the URL.<br />
+                  No special characters are allowed.
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label for="title" i18n:translate="label_title">Title</label>
+                <input class="form-control" type="text" name="title" value="SENAITE" />
+                <div class="help-block" i18n:translate="">
+                  A short title for the site. This will be shown in the title of the
+                  browser window on each page.
+                </div>
+              </div>
+
+              <div class="form-group">
+                <label for="default_language" i18n:translate="">Language</label>
+                <select class="form-control"
+                        name="default_language"
+                        tal:define="browser_language view/browser_language;
+                               languages python:view.languages(browser_language)">
+                  <option value="en"
+                          tal:repeat="lang languages"
+                          tal:attributes="value python:lang[0];
+                                 selected python:lang[0]==browser_language"
+                          tal:content="python: lang[1]">
+                    English
+                  </option>
+                </select>
+                <div class="help-block" i18n:translate="">
+                  The main language of the site.
+                </div>
+
+              </div>
+
+              <tal:extensionprofiles condition="extension_profiles">
+                <tal:addons tal:repeat="info extension_profiles">
+                  <tal:info tal:define="selected info/selected|nothing">
+                    <tal:normal tal:condition="python: not selected or advanced">
+                      <input type="checkbox" name="extension_ids:list" value=""
+                             style="display:none;"
+                             tal:attributes="value info/id;
+                                   id info/id;
+                                   checked info/selected|nothing;" />
+                    </tal:normal>
+                    <tal:hidden tal:condition="python: selected and not advanced">
+                      <input type="hidden" name="extension_ids:list" value=""
+                             tal:attributes="value info/id;
+                                   checked info/selected|nothing;" />
+                    </tal:hidden>
+                  </tal:info>
+                </tal:addons>
+              </tal:extensionprofiles>
+
+              <div>
+                <input type="hidden" name="extension_ids:list" value="senaite.lims:default" />
+                <input type="hidden" name="form.submitted:boolean" value="True" />
+                <input  class="btn btn-primary btn-xl" type="submit" name="submit" value="Install SENAITE LIMS"
+                        i18n:attributes="value;" />
+              </div>
+
+            </form>
+          </div>
+        </div>
+
+        <!-- Community Links -->
+        <div class="row">
+          <div class="col-sm-12">
+            <hr/>
+            <div i18n:translate="" class="lead">
+              Meet the community, browse the code and get support on
+            </div>
+            <ul class="list list-inline list-justified">
+              <li><a class="btn btn-default" href="https://www.senaite.com" title="Website" target="_blank">Website</a></li>
+              <li><a class="btn btn-default" href="https://community.senaite.com" title="SENAITE community" target="_blank">Community Site</a></li>
+              <li><a class="btn btn-default" href="https://gitter.im/senaite/Lobby" title="Gitter Chat" target="_blank">Gitter Chat</a></li>
+              <li><a class="btn btn-default" href="https://github.com/senaite" title="GitHub" target="_blank">GitHub</a></li>
+              <li><a class="btn btn-default" href="https://twitter.com/senaitelims" title="Twitter" target="_blank">Twitter</a></li>
+            </ul>
+          </div>
+        </div>
+
+      </div> <!-- col-sm-6 col-sm-offset-3 -->
+    </div> <!-- /row -->
+  </div> <!-- /container -->
+
+</body>
+</html>
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 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      i18n:domain="senaite.lims">
+
+<head>
+  <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title i18n:translate="">Welcome to SENAITE LIMS</title>
+  <link rel="stylesheet" type="text/css"
+        tal:attributes="href string:${context/absolute_url}/++resource++bootstrap.min.css"
+        href="bootstrap.min.css" />
+  <link href="favicon.ico" rel="icon" type="image/x-icon"
+        tal:attributes="href string:${context/absolute_url}/++resource++favicon.ico"/>
+</head>
+<body tal:define="sites view/sites">
+
+  <div class="container">
+    <div class="row">
+      <div class="col-sm-6 col-sm-offset-3">
+
+        <h1>
+          <!-- SENAITE LOGO -->
+          <img src="senaite-logo.png"
+               width="250"
+               tal:attributes="src string:${context/absolute_url}/++resource++senaite-logo.png" />
+          <small class="lead">Open Source LIMS Project</small>
+        </h1>
+        <hr/>
+
+        <!-- Found 1 SENAITE installation -->
+        <tal:block tal:condition="sites">
+          <div class="row">
+            <div class="col-sm-12">
+              <p class="lead text-muted" i18n:translate="">Current SENAITE Installations</p>
+              <div class="list-group">
+                <div class="list-group-item" tal:repeat="site sites">
+                  <img class="img"
+                       height="16"
+                       style="vertical-align:middle;"
+                       tal:attributes="src string:${site/absolute_url}/++resource++senaite-icon.png"/>
+                  <a href="#"
+                     tal:attributes="href site/absolute_url"
+                     title="Go to your SENAITE installation"
+                     i18n:attributes="title;">
+                    <span tal:replace="site/title"/> (<span tal:replace="site/id"/>)
+                  </a>
+                  <form action=""
+                        method="get"
+                        class="form-inline"
+                        tal:condition="python:view.outdated(site)"
+                        tal:attributes="action python:view.upgrade_url(site)">
+                    <div i18n:translate="" class="help-block">
+                      This site configuration is outdated and needs to be upgraded:
+                    </div>
+                    <input tal:condition="not:view/can_manage"
+                           type="hidden" name="came_from"
+                           tal:attributes="value python:view.upgrade_url(site, can_manage=True)"/>
+                    <input type="submit"
+                           class="btn btn-xs btn-success"
+                           value="Upgrade&hellip;"
+                           i18n:attributes="value label_upgrade_hellip" />
+                  </form>
+                </div>
+              </div>
+            </div>
+          </div>
+        </tal:block>
+
+        <!-- SENAITE not installed -->
+        <tal:block tal:condition="not:sites">
+          <div class="row">
+            <div class="col-sm-12">
+              <form id="add-senaite-site"
+                    method="get"
+                    action="#"
+                    tal:attributes="action string:${context/absolute_url}/@@senaite-addsite">
+                <p i18n:translate="" class="">
+                  SENAITE is not installed yet. Click the button below to install it now:
+                </p>
+                <input type="hidden" name="site_id" value="senaite" />
+                <input type="submit"
+                       class="btn btn-xl btn-primary"
+                       i18n:attributes="value"
+                       value="Install SENAITE LIMS" />
+              </form>
+            </div>
+          </div>
+        </tal:block>
+
+        <!-- Community Links -->
+        <div class="row">
+          <div class="col-sm-12">
+            <hr/>
+            <div i18n:translate="" class="lead">
+              Meet the community, browse the code and get support on
+            </div>
+            <ul class="list list-inline list-justified">
+              <li><a class="btn btn-default" href="https://www.senaite.com" title="Website" target="_blank">Website</a></li>
+              <li><a class="btn btn-default" href="https://community.senaite.com" title="SENAITE community" target="_blank">Community Site</a></li>
+              <li><a class="btn btn-default" href="https://gitter.im/senaite/Lobby" title="Gitter Chat" target="_blank">Gitter Chat</a></li>
+              <li><a class="btn btn-default" href="https://github.com/senaite" title="GitHub" target="_blank">GitHub</a></li>
+              <li><a class="btn btn-default" href="https://twitter.com/senaitelims" title="Twitter" target="_blank">Twitter</a></li>
+            </ul>
+          </div>
+        </div>
+
+      </div> <!-- col-sm-6 col-sm-offset-3 -->
+    </div> <!-- /row -->
+  </div> <!-- /container -->
+
+</body>
+</html>

From 0b4c441c1cc8ffe69ca9978a595ca5d6c79c7cb1 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sun, 9 Feb 2020 13:33:50 +0100
Subject: [PATCH 2/4] ZCML cleanup

---
 bika/lims/configure.zcml | 67 ++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/bika/lims/configure.zcml b/bika/lims/configure.zcml
index 1636a875ce..f2d2c8b4ae 100644
--- a/bika/lims/configure.zcml
+++ b/bika/lims/configure.zcml
@@ -11,12 +11,7 @@
 
   <i18n:registerTranslations directory="locales" />
 
-<includeDependencies package="." />
-//  <include package="jarn.jsi18n" />
-//  <include package="plone.app.z3cform" />
-//  <include package="Products.TinyMCE" />
-//  <include package="Products.CMFCore" />
-//  <include package="collective.monkeypatcher" />
+  <includeDependencies package="." />
 
   <five:registerPackage package="." initialize=".initialize" />
 
@@ -61,35 +56,38 @@
 
   <!-- jquery redirects here when values are entered into 'document' context (barcodes) -->
   <browser:page
-    for="*"
-    name="barcode_entry"
-    class="bika.lims.barcode.barcode_entry"
-    permission="zope.Public"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
-
-  <!-- Put javascript errors in Plone log -->
+      for="*"
+      name="barcode_entry"
+      class="bika.lims.barcode.barcode_entry"
+      permission="zope.Public"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
+  <!-- XXX: to be removed
+       Put javascript errors in Plone log -->
+  <browser:page
+      for="*"
+      name="js_log"
+      class="bika.lims.utils.js_log"
+      permission="zope.Public"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
   <browser:page
-    for="*"
-    name="js_log"
-    class="bika.lims.utils.js_log"
-    permission="zope.Public"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
-   <browser:page
-    for="*"
-    name="js_warn"
-    class="bika.lims.utils.js_warn"
-    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"
+      />
+
   <browser:page
-    for="*"
-    name="js_err"
-    class="bika.lims.utils.js_err"
-    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"
+      />
 
   <browser:resource
       file="skins/bika/senaite-core-logo.png"
@@ -104,5 +102,6 @@
   <utility
       provides="bika.lims.interfaces.INumberGenerator"
       factory=".numbergenerator.NumberGenerator"
-  />
+      />
+
 </configure>

From 5255a270f03079b028c180242e1aec2a53788d50 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sun, 9 Feb 2020 13:40:53 +0100
Subject: [PATCH 3/4] Added browser resource for bootstrap.min.css

---
 bika/lims/install/configure.zcml               | 4 ++++
 bika/lims/install/templates/senaite-addsite.pt | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bika/lims/install/configure.zcml b/bika/lims/install/configure.zcml
index 4e309ff30b..94cc879bad 100644
--- a/bika/lims/install/configure.zcml
+++ b/bika/lims/install/configure.zcml
@@ -29,6 +29,10 @@
       factory=".adapters.SenaiteAppTraverser"/>
 
   <!-- browser resources used in templates -->
+  <browser:resource
+      file="../browser/bootstrap/static/css/bootstrap.min.css"
+      name="bootstrap.min.css"/>
+
   <browser:resource
       file="images/logo.png"
       name="senaite-logo.png"/>
diff --git a/bika/lims/install/templates/senaite-addsite.pt b/bika/lims/install/templates/senaite-addsite.pt
index f182955397..3f898901c1 100644
--- a/bika/lims/install/templates/senaite-addsite.pt
+++ b/bika/lims/install/templates/senaite-addsite.pt
@@ -12,7 +12,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title i18n:translate="">Install SENAITE LIMS</title>
   <link rel="stylesheet" type="text/css"
-        tal:attributes="href string:${context/absolute_url}/++resource++senaite.core.bootstrap.static/css/bootstrap.min.css"
+        tal:attributes="href string:${context/absolute_url}/++resource++bootstrap.min.css"
         href="bootstrap.min.css" />
   <link href="favicon.ico" rel="icon" type="image/x-icon"
         tal:attributes="href string:${context/absolute_url}/++resource++favicon.ico"/>

From 5c5e0ca7b33b0f169e367602c1da7e2d0866f2b7 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Sun, 9 Feb 2020 13:45:13 +0100
Subject: [PATCH 4/4] Changelog updated

---
 CHANGES.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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**