Packager now does a clean reinstall of just the packages we want, then

rebuilds the install.sql and init_var.php files accordingly.

2 files changed, 4 insertions, 34 deletions

diff --git a/core/views/welcome.html.php b/core/views/welcome.html.php
index 27aa6184..be801163 100644
--- a/core/views/welcome.html.php
+++ b/core/views/welcome.html.php
@@ -295,7 +295,10 @@
                 <input type="hidden" name="type" value="album"/>
               </form>
             </fieldset>
-            <?= $package ?>
+            <fieldset>
+              <legend>Packaging</legend>
+              <a href="<?= url::site("welcome/package") ?>">Make Package</a>
+            </fieldset>
             <? if (module::is_installed("rearrange")): ?>
             <fieldset>
               <legend>Rearrange</legend>
diff --git a/core/views/welcome_package.html.php b/core/views/welcome_package.html.php
deleted file mode 100644
index 6996dda6..00000000
--- a/core/views/welcome_package.html.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script>
-$("document").ready(function() {
-  ajaxify_package_form();
-});
-
-function ajaxify_package_form() {
-  $("#gPackageSQL").ajaxForm({
-    dataType: "json",
-    success: function(data) {
-      if (data.result == "success") {
-        $("#gSuccessMsg").html(data.message);
-        $("#gSuccessMsg").removeClass("gHide");
-        $("#gFailMsg").addClass("gHide");
-      } else {
-        $("#gFailMsg").html(data.message);
-        $("#gFailMsg").removeClass("gHide");
-        $("#gSuccessMsg").addClass("gHide");
-      }
-    }
-  });
-};
-
-</script>
-<fieldset>
-  <legend>Create install.sql</legend>
-  <p>Press the button to extract the initial database configuration.</p>
-  <form id="gPackageSQL" action="<?= url::site("welcome/package") ?>" method="POST">
-    <input type="Submit" value="Package" />
-    <div id="gSuccessMsg" class="success gHide"></div>
-    <div id="gFailMsg" class="error gHide"></div>
-  </form>
-</fieldset>