diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-14 21:26:07 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-14 21:26:07 +0000 |
| commit | 15dcba000da61ff9212f0acf9a1a31732d836399 (patch) | |
| tree | 079e0ca29d18fe9b8aa0b7f3789232cca10a7582 /phpBB/adm/style | |
| parent | b3dbe946cd7a08bef28da98aee5859c4cb4afc67 (diff) | |
| download | forums-15dcba000da61ff9212f0acf9a1a31732d836399.tar forums-15dcba000da61ff9212f0acf9a1a31732d836399.tar.gz forums-15dcba000da61ff9212f0acf9a1a31732d836399.tar.bz2 forums-15dcba000da61ff9212f0acf9a1a31732d836399.tar.xz forums-15dcba000da61ff9212f0acf9a1a31732d836399.zip | |
ok, fought #14735 with the help from paul.
git-svn-id: file:///svn/phpbb/trunk@8189 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/install_update.html | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 2dbc0c7c47..c9059d8801 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -2,6 +2,17 @@ <script type="text/javascript"> // <![CDATA[ + function popup(url, width, height, name) + { + if (!name) + { + name = '_popup'; + } + + window.open(url.replace(/&/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width); + return false; + } + function diff_popup(url) { popup(url, 950, 600, '_diff'); @@ -52,7 +63,7 @@ <p>{L_UPDATE_SUCCESS_EXPLAIN}</p> <fieldset class="submit-buttons"> - <input class="button1" type="submit" name="submit" value="{L_CHECK_FILES_AGAIN}" /> + <input class="button1" type="submit" name="check_again" value="{L_CHECK_FILES_AGAIN}" /> </fieldset> </form> @@ -245,10 +256,6 @@ <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt> <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> </dl> - <dl> - <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</label></dt> - <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="diff_popup(this.href); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> - </dl> <!-- IF not files.S_BINARY --> <dl> <dt style="width: 60%"><label><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</label></dt> |