diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-01-02 08:42:14 -0800 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-01-02 08:42:14 -0800 |
| commit | 77cabb056faf451e7efcf89579bb168944dfcb99 (patch) | |
| tree | 5f0031d484a485c51f9a3bb3b442807c1828046f /modules/g2_import/views | |
| parent | 1b3d20a0fbb114423bf52ef8fc8b7c7aae150391 (diff) | |
| parent | 0be0111b74c2a971b9c79f1dad29791eabe763b2 (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.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php index 9a5e3f05..5bac9e9e 100644 --- a/modules/g2_import/views/admin_g2_import.html.php +++ b/modules/g2_import/views/admin_g2_import.html.php @@ -26,6 +26,7 @@ </li> </ul> </div> + <?= $form ?> <? if (g2_import::is_initialized()): ?> @@ -91,6 +92,21 @@ </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> + + <code> + <IfModule mod_rewrite.c><br/> + RewriteEngine On<br/> + RewriteBase <?= g2_import::$g2_base_url ?><br/> + RewriteRule ^(.*)$ <?= url::site("g2/map?path=\$1") ?> [QSA,L]<br/> + </IfModule><br/> + </code> + </div> <? endif ?> </div> </div> |