summaryrefslogtreecommitdiff
path: root/modules/g2_import/views
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2011-04-27 19:30:00 -0700
committerTim Almdal <tnalmdal@shaw.ca>2011-04-27 19:30:00 -0700
commit4e20e71d0375ed65d75dbdb12113f737db90b3e7 (patch)
tree51d15ed4ac3ee4f44886f94ed8c3197c76d050ac /modules/g2_import/views
parent7f48671186a4bf3a4745cd7a31b48a891dd83078 (diff)
parent7577d02fe2f2c37a79caf6a32b246f5a046c917a (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/g2_import/views')
-rw-r--r--modules/g2_import/views/admin_g2_import.html.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index cf5e4755..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>
@@ -112,8 +116,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>