Merge pull request #127 from fballiano/updatesfabrizio

Removed newsletter and roadmap, updated installation guide and branch names
OpenMage · Sep 24, 2023 · 7bd3e56 · 7bd3e56
2 parents b5ede2e + dde1ba4
commit 7bd3e56
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 218 deletions.
diff --git a/_data/nav.json b/_data/nav.json
@@ -18,9 +18,5 @@
     {
         "label": "About Project",
         "url": "/magento-lts/about.html"
-    },
-    {
-        "label": "Newsletter",
-        "url": "/#newsletter"
     }
-]
+]
diff --git a/_data/nav_de.json b/_data/nav_de.json
@@ -18,9 +18,5 @@
     {
         "label": "Das Projekt",
         "url": "/de/magento-lts/about.html"
-    },
-    {
-        "label": "Newsletter",
-        "url": "/de/#newsletter"
     }
 ]
diff --git a/_data/versions.json b/_data/versions.json
@@ -1,5 +1,5 @@
 {
   "composer": {
-    "latestStableBranch": "19.4.6"
+    "latestStableBranch": "main"
   }
 }
diff --git a/de/index.html b/de/index.html
@@ -101,97 +101,6 @@ <h4 class="card-title">OpenMage LTS für Entwicklung</h4>
         </div>
     </div>
 
-    <div class="newsletter mt-3">
-        <div class="newsletter__bg bg-dark-gradient"></div>
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-4 text-center">
-                    <img class="newsletter__image" src="/assets/images/newsletter.png" alt="Newsletter">
-                </div>
-                <div class="col-lg-8 mt-2 mt-lg-5 mb-4" id="newsletter">
-                    <h2 class="newsletter__title title">Möchtest Du OpenMage in Deinem Posteingang haben?</h2>
-                    <p class="newsletter__subtitle">Sei der Erste, der über neue Wege, neue Bugfixes und Kooperationsangebote informiert wird. Wir sind ein guter Brieffreund. Versprochen.</p>
-                    <iframe class="mj-w-res-iframe" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://app.mailjet.com/widget/iframe/4iX1/iBI" width="100%"></iframe>
-                    <script type="text/javascript" src="https://app.mailjet.com/statics/js/iframeResizer.min.js"></script>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="roadmap">
-        <div class="container">
-            <h2 class="roadmap__title">
-                OpenMage LTS Roadmap
-            </h2>
-
-            <div class="roadmap__buttons row">
-                <div class="roadmap__button-wrapper roadmap__button-wrapper--left col-12 col-md-6">
-                    <a class="roadmap__button roadmap__button--goals btn btn-light" href="https://github.com/OpenMage/magento-lts/pulls?q=is%3Apr+is%3Aclosed">{% include icons/arrow-right.svg %} Erreichte Ziele</a>
-                </div>
-
-                <div class="roadmap__button-wrapper roadmap__button-wrapper--right col-12 col-md-6">
-                    <a class="roadmap__button roadmap__button--submit btn btn-light" href="https://github.com/OpenMage/magento-lts/issues/new/choose">Antrag stellen</a>
-                </div>
-            </div>
-
-            <div class="roadmap__steps row">
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/alert.svg" alt="Alert icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        PHP 7.4 Support
-                    </div>
-                    <div class="roadmap__steps-text">
-                        Unterstützt PHP 7.4, das sich noch im Review befindet, aber es sollte mit der nächsten Version fertig sein.
-                    </div>
-                    <div class="roadmap__steps-more">
-                        <a class="roadmap__steps-link" href="/de/blog.html">Lese mehr in unserem Blog</a>
-                    </div>
-                </div>
-
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/shield.svg" alt="Shield icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        Labor für Innovationen: Sicherheit
-                    </div>
-                    <div class="roadmap__steps-text">
-                        Verpflichtung zu Bug-Bounty-Programmen und Sicherheitsaudits, um eine sichere Code-Basis zu gewährleisten.
-                    </div>
-                </div>
-
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/repeat.svg" alt="Repeat icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        Labor für Innovationen: Tests
-                    </div>
-                    <div class="roadmap__steps-text">
-                        Fortsetzung des Aufbaus einer vollständigen Testsuite für OpenMage LTS.
-                    </div>
-                    <div class="roadmap__steps-more">
-                        <a class="roadmap__steps-link" href="/de/blog.html">Lese mehr in unserem Blog</a>
-                    </div>
-                </div>
-
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/alert.svg" alt="Alert icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        PHP 8 Support
-                    </div>
-                    <div class="roadmap__steps-text">
-                        Unterstützt PHP 8.0, das sich noch im Review befindet, aber es sollte mit der nächsten Version fertig sein.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="active-info bg-dark-gradient">
         <div class="container">
             <div class="row">
@@ -530,4 +439,4 @@ <h2 class="blog__title col">
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/de/magento-lts/changelog/magento1-openmage-20_0.html b/de/magento-lts/changelog/magento1-openmage-20_0.html
@@ -28,7 +28,7 @@ <h2 class="changelog-intro__title">
             <div class="row">
                 <div class="changelog-version__wrapper changelog-version__wrapper--branch-19 col-lg-6 col-xl-7">
                     <div class="changelog-version__title">
-                        Github Branch 1.9.4.x
+                        Github Branch v19
                     </div>
                     <p>
                         Bei der Version 19 wird es sich um eine LTS-Version mit unbegrenzter Lebensdauer, jedoch
@@ -51,7 +51,7 @@ <h2 class="changelog-intro__title">
 
                 <div class="changelog-version__wrapper changelog-version__wrapper--branch-20 col-lg-6 col-xl-5">
                     <div class="changelog-version__title">
-                        Github Branch 20.0.x
+                        Github Branch main
                     </div>
                     <p>
                         Die Version 20 wird nicht rückwärtskompatibel mit Magento sein.

diff --git a/index.html b/index.html
@@ -101,91 +101,6 @@ <h4 class="card-title">OpenMage LTS for developers</h4>
         </div>
     </div>
 
-    <div id="newsletter" class="newsletter mt-3">
-        <div class="newsletter__bg bg-dark-gradient"></div>
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-4 text-center">
-                    <img class="newsletter__image" src="/assets/images/newsletter.png" alt="Newsletter">
-                </div>
-                <div class="col-lg-8 mt-2 mt-lg-5 mb-4">
-                    <h2 class="newsletter__title title">Want OpenMage in your inbox?</h2>
-                    <p class="newsletter__subtitle">Be the first to know about new paths fresh bug fixes, and co-op offers. We’re a good penpal. Promise.</p>
-                    <iframe class="mj-w-res-iframe" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="https://app.mailjet.com/widget/iframe/4iX1/iBI" width="100%"></iframe>
-                    <script type="text/javascript" src="https://app.mailjet.com/statics/js/iframeResizer.min.js"></script>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="roadmap">
-        <div class="container">
-            <h2 class="roadmap__title">
-                OpenMage LTS Roadmap
-            </h2>
-
-            <div class="roadmap__buttons row">
-                <div class="roadmap__button-wrapper roadmap__button-wrapper--left col-12 col-md-6">
-                    <a class="roadmap__button roadmap__button--goals btn btn-light" href="https://github.com/OpenMage/magento-lts/pulls?q=is%3Apr+is%3Aclosed">{% include icons/arrow-right.svg %} completed goals</a>
-                </div>
-
-                <div class="roadmap__button-wrapper roadmap__button-wrapper--right col-12 col-md-6">
-                    <a class="roadmap__button roadmap__button--submit btn btn-light" href="https://github.com/OpenMage/magento-lts/issues/new/choose">Submit request</a>
-                </div>
-            </div>
-
-            <div class="roadmap__steps row">
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/alert.svg" alt="Alert icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        PHP 8.0 Support
-                    </div>
-                </div>
-
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/shield.svg" alt="Shield icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        Innovations Lab: Security
-                    </div>
-                    <div class="roadmap__steps-text">
-                        Committing to bug bounty programs and security audits to ensure a secure code base.
-                    </div>
-                </div>
-
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/repeat.svg" alt="Repeat icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        Innovations Lab: Tests
-                    </div>
-                    <div class="roadmap__steps-text">
-                        Continue to build out a full test suite for OpenMage LTS.
-                    </div>
-                    <div class="roadmap__steps-more">
-                        <a class="roadmap__steps-link" href="/blog.html">read more on our blog</a>
-                    </div>
-                </div>
-
-                <div class="roadmap__steps-item col-6 col-md-6 col-lg-3">
-                    <div class="roadmap__steps-icon-wrapper card-icon card-icon--big">
-                        <img class="card-icon__img" src="/assets/svg/alert.svg" alt="Alert icon" />
-                    </div>
-                    <div class="roadmap__steps-title">
-                        PHP 8.1 Support
-                    </div>
-                    <div class="roadmap__steps-text">
-                        PHP 8.1 support should be ready with the next release.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="active-info bg-dark-gradient">
         <div class="container">
             <div class="row">

diff --git a/magento-lts/changelog/magento1-openmage-20_0.html b/magento-lts/changelog/magento1-openmage-20_0.html
@@ -27,7 +27,7 @@ <h2 class="changelog-intro__title">
             <div class="row">
                 <div class="changelog-version__wrapper changelog-version__wrapper--branch-19 col-lg-6 col-xl-7">
                     <div class="changelog-version__title">
-                        Github Branch 1.9.4.x
+                        Github Branch v19
                     </div>
                     <p>
                         The Version 19 will be an LTS Version with indefinite Lifetime, but at least 5 Years. It will
@@ -49,7 +49,7 @@ <h2 class="changelog-intro__title">
 
                 <div class="changelog-version__wrapper changelog-version__wrapper--branch-20 col-lg-6 col-xl-5">
                     <div class="changelog-version__title">
-                        Github Branch 20.0.x
+                        Github Branch main
                     </div>
                     <p>
                         The Version 20 will not be backward compatible with magento. It is an independent project in
@@ -71,4 +71,4 @@ <h2 class="changelog-intro__title">
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/magento-lts/install.html b/magento-lts/install.html
@@ -65,39 +65,62 @@ <h2 class="graphic-info__title">Install via composer</h2>
     <div class="container">
         <div class="row">
             <div class="install-instructions__item col-lg-10 offset-lg-1 col-xl-6 offset-xl-0">
-                <h3 class="install-instructions__title">aydin-hassan/magento-core-composer-installer</h3>
+                <h3 class="install-instructions__title">Step 1: Create a new composer project</h3>
                 <div class="install-instructions__code">
-<pre><code>{
-    "require": {
-        "aydin-hassan/magento-core-composer-installer": "*",
-        "openmage/magento-lts": "{{ site.data.versions.composer.latestStableBranch }}"
-    },
-    "extra": {
-        "magento-core-package-type": "magento-source",
-        "magento-root-dir": "htdocs"
-    }
-}</code></pre>
+                    <pre><code>composer init</code></pre>
                 </div>
             </div>
-        
+
             <div class="install-instructions__item col-lg-10 offset-lg-1 col-xl-6 offset-xl-0">
-                <h3 class="install-instructions__title">aoepeople/composer-installers</h3>
+                <h3 class="install-instructions__title">Step 2: Configure composer. The below options are required. You can <a href="https://github.com/AydinHassan/magento-core-composer-installer#configuration" target=_blank>see all options here</a>.</h3>
                 <div class="install-instructions__code">
-<pre><code>{
-    "require": {
-        "aoepeople/composer-installers": "*",
-        "openmage/magento-lts": "{{ site.data.versions.composer.latestStableBranch }}"
-    }
-}
-</code></pre>
+                    <pre><code>
+# Allow composer to apply patches to dependencies of magento-lts
+composer config --json extra.enable-patching true
+
+# Configure Magento core composer installer to use magento-lts as the Magento source package
+composer config extra.magento-core-package-type magento-source
+
+# Configure the root directory that magento-lts will be installed to, such as "pub", "htdocs", or "www"
+composer config extra.magento-root-dir pub
+                    </code></pre>
                 </div>
-
-                <p class="install-instructions__warning">
-                    <strong>Warning</strong>
-                    Note: switching to AOEs composer installer will wipe your htdocs folder, it’s not just copying the magento-lts files.
-                    If you already symlink local.xml, media and var folder - then just go ahead.
-                </p>
             </div>
+
+            <div class="install-instructions__item col-lg-10 offset-lg-1 col-xl-6 offset-xl-0">
+                <h3 class="install-instructions__title">Step 3: Require magento-core-composer-installer</h3>
+                <div class="install-instructions__code">
+                    <pre><code>
+# PHP 7
+composer require "aydin-hassan/magento-core-composer-installer":"~2.0.0"
+
+# PHP 8
+composer require "aydin-hassan/magento-core-composer-installer":"^2.1.0"
+                    </code></pre>
+                </div>
+                <p>Note: be sure to select y if composer asks you to trust aydin-hassan/magento-core-composer-installer.</p>
+            </div>
+
+            <div class="install-instructions__item col-lg-10 offset-lg-1 col-xl-6 offset-xl-0">
+                <h3 class="install-instructions__title">Step 4: Require the appropriate version of magento-lts</h3>
+                <div class="install-instructions__code">
+                    <pre><code>
+# Latest tagged v20 series release
+composer require "openmage/magento-lts":"^20.0.0"
+
+# Legacy v19 tagged release (Magento 1.9.4.x drop-in replacement supported until April 4, 2025)
+composer require "openmage/magento-lts":"^19.4.0"
+
+# Latest on "main" development branch
+composer require "openmage/magento-lts":"dev-main"
+
+# Latest on "next" development branch
+composer require "openmage/magento-lts":"dev-next"
+                    </code></pre>
+                </div>
+                <p>Note: be sure to select y if composer asks you to trust magento-hackathon/magento-composer-installer or cweagans/composer-patches.</p>
+            </div>
+
         </div>
     </div>
 </div>