From 201e8cdf7046937eef0e53542d777bf67c496054 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 21 Apr 2009 04:21:34 +0000
Subject: Highlight: we can now import photos and movies.

Notes:
* Don't store the g2->g3 map in the task; it gets too large and
  overflows the context column.
* Import album sort orders
* Try to treat duplication in the summary and description fields
  sensibly.
* Move the g2 import config page under the Settings menu
* Clean up the settings page slightly and send users to the
  maintenance page to do the actual import (not an optimal UI, but it
  works).
---
 modules/g2_import/views/admin_g2_import.html.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/g2_import/views')

diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 9b61b584..8b116ccd 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -12,9 +12,10 @@
 <div id="gAdminG2Import">
   <h1> <?= t("Import") ?> </h1>
   <div class="gSuccess">
-    <?= t("We've detected Gallery version: %version", array("version" => g2_import::version())) ?>
+    <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
   </div>
-  <a href="<?= url::site("admin/maintenance/start/g2_import::import?csrf=$csrf") ?>"
-     class="gPanelLink"><?= t("Begin Import") ?></a>
+
+  <?= t("You can perform an import on the <a href=\"%url\">maintenance page</a>",
+        array("url" => url::site("admin/maintenance"))) ?>
 </div>
 <? endif ?>
-- 
cgit v1.2.3