Remove unnecessary g2_import CSS (which we were loading on every page

-- doh!) and replace it with a new "enumeration" list style in the
admin_wind CSS.  Reshuffle the page a little bit to make it look cleaner.

4 files changed, 60 insertions, 110 deletions

diff --git a/modules/g2_import/css/g2_import.css b/modules/g2_import/css/g2_import.css
deleted file mode 100644
index d53564d7..00000000
--- a/modules/g2_import/css/g2_import.css
+++ /dev/null
@@ -1,30 +0,0 @@
-#g-admin-g2-import-notes {
-  padding-bottom: 20px;
-}
-
-#g-admin-g2-import-details {
-  padding-top: 20px;
-}
-
-#g-admin-g2-import-details .g-warning {
-  margin-top: 4px;
-}
-
-#g-admin-g2-import-details .g-info {
-  padding: 2px;
-  border: 1px solid #999;
-  margin-bottom: 10px;
-}
-
-#g-admin-g2-import-notes p,
-#g-admin-g2-import-details .g-info p {
-  padding: 0;
-  margin: 0;
-}
-
-#g-admin-g2-import-notes ul li,
-#g-admin-g2-import .g-info ul li {
-  padding-left: 0;
-  margin-left: 20px;
-  list-style-type: disc;
-}
diff --git a/modules/g2_import/helpers/g2_import_theme.php b/modules/g2_import/helpers/g2_import_theme.php
deleted file mode 100644
index 788253f9..00000000
--- a/modules/g2_import/helpers/g2_import_theme.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class g2_import_theme_Core {
-  static function head($theme) {
-    $theme->css("g2_import.css");
-  }
-
-  static function admin_head($theme) {
-    $theme->css("g2_import.css");
-  }
-}
\ No newline at end of file
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 7a6f88ce..a1ee53f6 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -6,27 +6,10 @@
   </p>
 
   <div class="g-block-content">
-    <div id="g-admin-g2-import-notes">
-      <h2> <?= t("Notes") ?> </h2>
-      </p>
-      <ul>
-        <li>
-          <?= t("Gallery 3 does not support per-user / per-item permissions.  <b>Review permissions after your import is done.</b>") ?>
-        </li>
-        <li>
-          <?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4.  Other formats will be skipped.") ?>
-        </li>
-        <li>
-          <?= t("Deactivating the <b>notification</b>, <b>search</b> and <b>exif</b> modules during your import will make it go faster.") ?>
-        </li>
-        <li>
-          <?= t("The eAccelerator and XCache PHP performance extensions are known to cause issues.  If you're using either of those and are having problems, please disable them while you do your import.  Add the following lines: <pre>%lines</pre> to gallery3/.htaccess and remove them when the import is done.", array("lines" => "\n\n  php_value eaccelerator.enable 0\n  php_value xcache.cacher off\n  php_value xcache.optimizer off\n\n")) ?>
-        </li>
-      </ul>
-    </div>
-
     <?= $form ?>
+  </div>
 
+  <div class="g-block-content">
     <? if (g2_import::is_initialized()): ?>
     <div id="g-admin-g2-import-details">
       <h2> <?= t("Import") ?> </h2>
@@ -51,59 +34,79 @@
                     "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
         </li>
         <? endif ?>
-      </ul>
 
-      <div class="g-message-block g-info">
-        <p>
+        <li class="g-info">
           <?= t("Your Gallery 2 has the following importable data in it") ?>
-        </p>
-        <ul>
-          <li>
-            <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
-          </li>
-          <li>
-            <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
-          </li>
-          <li>
-            <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
-          </li>
+          <ul>
+            <li>
+              <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
+            </li>
+            <li>
+              <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
+            </li>
+            <li>
+              <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
+            </li>
+            <li>
+              <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+            </li>
+            <li>
+              <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+            </li>
+            <li>
+              <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+            </li>
+            <li>
+              <?= t2("1 tagged photo/movie/album",
+                  "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+            </li>
+          </ul>
+        </li>
+      </ul>
+
+      <p>
+        <a class="g-button g-dialog-link ui-state-default ui-corner-all"
+           href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
+          <?= t("Begin import!") ?>
+        </a>
+      </p>
+    </div>
+
+    <div class="g-block-content">
+      <div id="g-admin-g2-import-notes">
+        <h2> <?= t("Notes") ?> </h2>
+        <ul class="enumeration">
           <li>
-            <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+            <?= t("Gallery 3 does not support per-user / per-item permissions.  <b>Review permissions after your import is done.</b>") ?>
           </li>
           <li>
-            <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+            <?= t("The only supported file formats are JPG, PNG and GIF, FLV and MP4.  Other formats will be skipped.") ?>
           </li>
           <li>
-            <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+            <?= t("Deactivating the <b>notification</b>, <b>search</b> and <b>exif</b> modules during your import will make it go faster.") ?>
           </li>
           <li>
-            <?= t2("1 tagged photo/movie/album",
-                "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+            <?= t("The eAccelerator and XCache PHP performance extensions are known to cause issues.  If you're using either of those and are having problems, please disable them while you do your import.  Add the following lines: <pre>%lines</pre> to gallery3/.htaccess and remove them when the import is done.", array("lines" => "\n\n  php_value eaccelerator.enable 0\n  php_value xcache.cacher off\n  php_value xcache.optimizer off\n\n")) ?>
           </li>
         </ul>
       </div>
-
-      <p>
-        <a class="g-button g-dialog-link ui-state-default ui-corner-all"
-           href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
-          <?= t("Begin import!") ?>
-        </a>
-      </p>
     </div>
 
-    <div>
-      <h2> <?= t("Migrating from Gallery 2") ?> </h2>
-      <p>
-        <?= t("Once your migration is complete, put this block at the top of your gallery2/.htaccess file and all Gallery 2 urls will be redirected to Gallery 3") ?>
-      </p>
+    <div class="g-block-content">
+      <div>
+        <h2> <?= t("Migrating from Gallery 2") ?> </h2>
+        <p>
+          <?= t("Once your migration is complete, put this block at the top of your gallery2/.htaccess file and all Gallery 2 urls will be redirected to Gallery 3") ?>
+        </p>
 
-      <textarea rows="2">&lt;IfModule mod_rewrite.c&gt;
+        <textarea rows="4" cols="60">&lt;IfModule mod_rewrite.c&gt;
   Options +FollowSymLinks
   RewriteEngine On
   RewriteBase <?= html::clean(g2_import::$g2_base_url) ?>
   RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?>   [QSA,L,R=301]
 &lt;/IfModule&gt;</textarea>
+      </div>
+      <? endif ?>
     </div>
-    <? endif ?>
   </div>
 </div>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index eda79b97..0d891149 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -222,6 +222,11 @@ th {
   background-color: #fff;
 }
 
+ul.enumeration li {
+  list-style-type: disc;
+  margin-left: 20px;
+}
+
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/