diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-06 15:47:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-06 15:47:50 +0000 |
| commit | daeef71d813b68524e0630e2aadbf0870bb06800 (patch) | |
| tree | a2412ef750f51184f94e5e3c2cedf2cfcad732ba /phpBB/adm/style/install_update.html | |
| parent | cb505ce4b08d3ec1de1184474a673886dfdb212b (diff) | |
| download | forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.gz forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.bz2 forums-daeef71d813b68524e0630e2aadbf0870bb06800.tar.xz forums-daeef71d813b68524e0630e2aadbf0870bb06800.zip | |
some updater changes as well as tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@6714 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/install_update.html')
| -rw-r--r-- | phpBB/adm/style/install_update.html | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 19cf38c99b..be4fd0961b 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -128,7 +128,7 @@ function popup(url, width, height) <dd class="full" style="text-align: left;"><strong>{files.FILENAME}</strong></dd> <!-- ELSE --> <dt style="width: 60%;"> - <strong>{files.FILENAME}</strong> + <strong><!-- IF files.DIR_PART -->{files.DIR_PART}<br /><!-- ENDIF -->{files.FILE_PART}</strong> <!-- IF files.S_CUSTOM --> <br /><span><em>{L_FILE_USED}: </em>{files.CUSTOM_ORIGINAL}</span> <!-- ENDIF --> @@ -141,10 +141,33 @@ function popup(url, width, height) <dd style="margin-left: 60%;"><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</dd> <!-- ENDIF --> <!-- IF files.STATUS eq 'conflict' --> - <dd style="margin-left: 60%;"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NEW_FILE_OPTION}<br /><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_MOD_FILE_OPTION}</dd> + </dl> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="1" checked="checked" /> {L_MERGE_NO_MERGE_NEW_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_NEW}" onclick="popup('{files.U_VIEW_NO_MERGE_NEW}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="2" /> {L_MERGE_NO_MERGE_MOD_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NO_MERGE_MOD}" onclick="popup('{files.U_VIEW_NO_MERGE_MOD}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="3" /> {L_MERGE_NEW_FILE_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_NEW_FILE}" onclick="popup('{files.U_VIEW_NEW_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <dl> + <dt style="width: 60%"><input type="radio" class="radio" name="conflict[{files.FILENAME}]" value="4" /> {L_MERGE_MOD_FILE_OPTION}</dt> + <dd style="margin-left: 60%;">[<a href="{files.U_VIEW_MOD_FILE}" onclick="popup('{files.U_VIEW_MOD_FILE}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]</dd> + </dl> + <!-- IF not files.S_LAST_ROW --> + </fieldset> + + <fieldset> + <legend><img src="{T_IMAGE_PATH}file_{files.STATUS}.gif" alt="{files.L_STATUS}" /></legend> + <!-- ENDIF --> + <!-- ENDIF --> <!-- ENDIF --> - </dl> + <!-- IF files.STATUS neq 'conflict' --></dl><!-- ENDIF --> <!-- ENDIF --> <!-- END files --> |