From fe27bd1eb34efe95da6ffe8b6f6c137fe8a18306 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 22 Dec 2008 03:41:33 +0000
Subject: Change the way that we track modules.

Each module now has a "module.info" file that has information about
the module, including the core.  We can display the installed version,
and the version in the code.

Also take a first shot at a modules admin page.
---
 core/views/admin_modules.html.php    | 19 +++++++++++++++++++
 core/views/welcome_syscheck.html.php | 21 ++++++++++++---------
 2 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 core/views/admin_modules.html.php

(limited to 'core/views')

diff --git a/core/views/admin_modules.html.php b/core/views/admin_modules.html.php
new file mode 100644
index 00000000..d0a0f613
--- /dev/null
+++ b/core/views/admin_modules.html.php
@@ -0,0 +1,19 @@
+<? defined("SYSPATH") or die("No direct script access."); ?>
+<div id="gModules">
+  <table>
+    <tr>
+      <th> <?= _("Installed") ?> </th>
+      <th> <?= _("Name") ?> </th>
+      <th> <?= _("Version") ?> </th>
+      <th> <?= _("Description") ?> </th>
+    </tr>
+    <? foreach ($available as $module_name => $module_info):  ?>
+    <tr>
+      <td> <?= form::checkbox($module_name, '', module::is_installed($module_name)) ?> </td>
+      <td> <?= _($module_info["name"]) ?> </td>
+      <td> <?= module::get_version($module_name) ?> </td>
+      <td> <?= _($module_info["description"]) ?> </td>
+    </tr>
+    <? endforeach ?>
+  </table>
+</div>
diff --git a/core/views/welcome_syscheck.html.php b/core/views/welcome_syscheck.html.php
index e46a179b..2908f8bd 100644
--- a/core/views/welcome_syscheck.html.php
+++ b/core/views/welcome_syscheck.html.php
@@ -18,7 +18,7 @@
 
 <? if (empty($errors)): ?>
 <div class="block">
-  <? if (empty($modules['core'])): ?>
+  <? if (!module::is_installed("core")): ?>
   <p class="success">
     Your system is ready, but Gallery is not yet installed.
   </p>
@@ -32,25 +32,28 @@
   <table style="width: 400px">
     <tr>
       <th align="left">Name</th>
-      <th align="left">Version</th>
+      <th align="left">Installed</th>
+      <th align="left">Available</th>
       <th align="left">Action</th>
     </tr>
     <tr class="core">
       <td> <b> core </b> </td>
-      <td> <b> <?= $modules["core"] ?> </b> </td>
+      <td> <b> <?= module::get_version("core") ?> </b> </td>
+      <td> <b> <?= module::get_version("core") ?> </b> </td>
       <td> <b> <?= html::anchor("welcome/uninstall/core", "reset install") ?> </b> </td>
     </tr>
-    <? foreach ($modules as $module_name => $module_version): ?>
+    <? foreach ($modules as $module_name => $info): ?>
     <? if ($module_name == "core") continue; ?>
     <tr>
       <td><?= $module_name ?></td>
-      <td><?= empty($module_version) ? "" : $module_version ?></td>
+      <td><?= $info->installed ?></td>
+      <td><?= $info->version ?></td>
       <td>
-        <? if (empty($module_version)): ?>
-          <?= html::anchor("welcome/install/{$module_name}", "install") ?>
+        <? if ($info->installed): ?>
+        <?= html::anchor("welcome/uninstall/{$module_name}", "uninstall") ?>
         <? else: ?>
-          <?= html::anchor("welcome/uninstall/{$module_name}", "uninstall") ?>
-        <? endif; ?>
+        <?= html::anchor("welcome/install/{$module_name}", "install") ?>
+        <? endif ?>
       </td>
     </tr>
     <? endforeach; ?>
-- 
cgit v1.2.3