aboutsummaryrefslogtreecommitdiffstats
path: root/admin/template/goto/upgrade.tpl
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-11-06 14:46:41 +0000
committerpatdenice <patdenice@piwigo.org>2008-11-06 14:46:41 +0000
commit5f1fe1d4f9b67b44b7166444de6034a4e6dadfdf (patch)
treea727e946f81f0b8815c86c17f9faf6ba246bc443 /admin/template/goto/upgrade.tpl
parent894a38a9bf7c30662a75af78f3674dfa82414674 (diff)
merge -c2836 from trunk to branch 2.0
- Webmaster or administrator can login to run upgrade. - Inserting upgrade line in mysql.inc.php still work. - Convert espagnol upgrade file to utf8. - Minor changes in upgrade processus. - Remove all comments in pclzip.lib.php. git-svn-id: http://piwigo.org/svn/branches/2.0@2837 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/template/goto/upgrade.tpl66
1 files changed, 52 insertions, 14 deletions
diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl
index c36d25b5a..222805d1b 100644
--- a/admin/template/goto/upgrade.tpl
+++ b/admin/template/goto/upgrade.tpl
@@ -12,17 +12,16 @@
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
{literal}
<style type="text/css">
-#theHeader { height: 105px; }
-
.content {
- width: 800px;
- min-height: 0px !important;
- margin: auto;
- padding: 25px;
- text-align: left;
+ width: 800px;
+ min-height: 0px !important;
+ margin: auto;
+ padding: 25px;
+ text-align: left;
}
-h2 { width: 770px !important; }
+table { margin: 0px; }
+td { padding: 3px 10px; }
</style>
{/literal}
<title>Piwigo {$RELEASE} - {'Upgrade'|@translate}</title>
@@ -36,17 +35,56 @@ h2 { width: 770px !important; }
{if isset($introduction)}
<h2>Piwigo {$RELEASE} - {'Upgrade'|@translate}</h2>
-<p>{'language'|@translate} &nbsp;
-<select name="language" onchange="document.location = 'upgrade.php?language='+this.options[this.selectedIndex].value;">
- {html_options options=$language_options selected=$language_selection}
-</select>
-</p>
+{if isset($errors)}
+<div class="errors">
+ <ul>
+ {foreach from=$errors item=error}
+ <li>{$error}</li>
+ {/foreach}
+ </ul>
+</div>
+{/if}
+
+<table>
+ <tr>
+ <td>{'language'|@translate}</td>
+ <td>
+ <select name="language" onchange="document.location = 'upgrade.php?language='+this.options[this.selectedIndex].value;">
+ {html_options options=$language_options selected=$language_selection}
+ </select>
+ </td>
+ </tr>
+</table>
<p>{'introduction message'|@translate|@sprintf:$introduction.CURRENT_RELEASE}</p>
+{if isset($login)}
+<p>{'upgrade login message'|@translate}</p>
+{/if}
+
+<form method="POST" action="{$introduction.F_ACTION}" name="upgrade_form">
+{if isset($login)}
+<table>
+ <tr>
+ <td>{'Username'|@translate}</td>
+ <td><input type="text" name="username" id="username" size="25" maxlength="40" style="width: 150px;" /></td>
+ </tr>
+ <tr>
+ <td>{'Password'|@translate}</td>
+ <td><input type="password" name="password" id="password" size="25" maxlength="25" style="width: 150px;" /></td>
+ </tr>
+</table>
+{/if}
<p style="text-align: center;">
-<a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}</b>
+<input class="submit" type="submit" name="submit" value="{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}"/>
</p>
+</form>
+<!--
+<p style="text-align: center;">
+<a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}</a>
+</p>
+-->
+
{/if}
{if isset($upgrade)}