From b4cdd016dc97f2df608bb14d2088cb4ddbd32c35 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 24 Apr 2011 11:53:29 -0400
Subject: Third times the charm. Rethink unordered lists and bullets. Revert to
 turning them off by default and provide a new class, g-text, to define a list
 or a section of text as needing to display bullets.

---
 modules/g2_import/views/admin_g2_import.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 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 cf5e4755..2f4a1b28 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -112,8 +112,8 @@ $("document").ready(function() {
       </p>
       <? endif ?>
     </div>
-    <div id="g-admin-g2-import-notes">
-      <ul class="enumeration">
+    <div id="g-admin-g2-import-notes" class="g-text">
+      <ul>
         <li>
           <?= t("Gallery 3 does not support per-user / per-item permissions.  <b>Review permissions!</b>") ?>
         </li>
-- 
cgit v1.2.3


From 4e7524664a24dd2ca2309c9d67843a19e74b48e0 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 24 Apr 2011 23:04:50 -0700
Subject: Show the tabs after the page has loaded to prevent Firefox from
 rendering the unstyled page and then flashing.  Fixes #1705.

---
 modules/g2_import/views/admin_g2_import.html.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(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 2f4a1b28..9c4eb840 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -30,9 +30,13 @@ $("document").ready(function() {
       .tabs("select", 1)
       <? endif ?>
       ;
+
+      // Show the tabs after the page has loaded to prevent Firefox from rendering the
+      // unstyled page and then flashing.
+      $("#g-admin-g2-import-tabs").show();
     });
   </script>
-  <div id="g-admin-g2-import-tabs" class="g-block-content">
+  <div id="g-admin-g2-import-tabs" class="g-block-content" style="display: none">
     <ul>
       <li>
         <a href="#g-admin-g2-import-configure"><?= t("1. Configure Gallery2 path") ?></a>
-- 
cgit v1.2.3