diff options
| author | Marc Poulhiès <github@kataplop.net> | 2009-06-11 09:06:31 +0200 |
|---|---|---|
| committer | Marc Poulhiès <github@kataplop.net> | 2009-06-11 09:06:31 +0200 |
| commit | 7815315dbf98f87c4e115a09cb116ac0bc4ca62e (patch) | |
| tree | 700d62e41c666d282d3a7eb2287e187d841e45c0 /modules/gallery/views | |
| parent | 315969e24e3ce4cbf06e5160e4738c083b2338be (diff) | |
| parent | 68fd196d66e2d21f571ff3b5a673f18cd129abf9 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/kohana_error_page.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/permissions_browse.html.php | 2 | ||||
| -rw-r--r-- | modules/gallery/views/upgrader.html.php | 16 |
3 files changed, 18 insertions, 2 deletions
diff --git a/modules/gallery/views/kohana_error_page.php b/modules/gallery/views/kohana_error_page.php index d9bf9698..6bf48549 100644 --- a/modules/gallery/views/kohana_error_page.php +++ b/modules/gallery/views/kohana_error_page.php @@ -59,7 +59,7 @@ </head> <body> <? try { $user = user::active(); } catch (Exception $e) { } ?> - <? $admin = isset($user) && $user->admin ?> + <? $admin = php_sapi_name() == "cli" || isset($user) && $user->admin ?> <div class="big_box" id="framework_error"> <h1> <?= t("Dang... Something went wrong!") ?> diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php index 8bb2e830..36394877 100644 --- a/modules/gallery/views/permissions_browse.html.php +++ b/modules/gallery/views/permissions_browse.html.php @@ -27,7 +27,7 @@ <? if (!$htaccess_works): ?> <ul id="gMessage"> <li class="gError"> - <?= t("Oh no! Your server needs a configuration change in order for you to hide photos! Ask your server administrator to set <a %attrs><i>AllowOverride FileInfo Options</i></a> to fix this.", array("attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride\" target=\"_blank\"")) ?> + <?= t("Oh no! Your server needs a configuration change in order for you to hide photos! Ask your server administrator to enable <a %mod_rewrite_attrs>mod_rewrite</a> and set <a %apache_attrs><i>AllowOverride FileInfo Options</i></a> to fix this.", array("mod_rewrite_attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/mod_rewrite.html\" target=\"_blank\"", "apache_attrs" => "href=\"http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride\" target=\"_blank\"")) ?> </li> </ul> <? endif ?> diff --git a/modules/gallery/views/upgrader.html.php b/modules/gallery/views/upgrader.html.php index 6b9a0110..fa21e196 100644 --- a/modules/gallery/views/upgrader.html.php +++ b/modules/gallery/views/upgrader.html.php @@ -9,6 +9,9 @@ font-family: Trebuchet MS; font-size: 1.1em; } + h1 { + font-size: 1.4em; + } div#outer { width: 650px; background: white; @@ -93,11 +96,17 @@ .gray_on_done { opacity: <?= $done ? "0.5" : "1" ?>; } + pre { + display: inline; + margin: 0px; + padding: 0px; + } </style> <body> <div id="outer"> <img src="<?= url::file("modules/gallery/images/gallery.png") ?>" /> <div id="inner"> + <? if ($can_upgrade): ?> <? if ($done): ?> <div id="confirmation"> <div> @@ -158,6 +167,13 @@ <? endforeach ?> </p> <? endif ?> + <? else: // can_upgrade ?> + <h1> <?= t("Who are you?") ?> </h1> + <p> + <?= t("You're not logged in as an administrator, so we have to verify you to make sure it's ok for you to do an upgrade. To prove you can run an upgrade, create a file called %name in your <b>gallery3/var/tmp</b> directory.", array("name" => "<br/><b>$upgrade_token</b>")) ?> + </p> + <a href="<?= url::site("upgrader?") ?>"><?= t("Ok, I've done that") ?></a> + <? endif // can_upgrade ?> </div> <div id="footer"> <p> |