diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-09 11:33:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-09 11:33:14 +0000 |
| commit | 179c77ccddcd8bd4df2f29d05b460c6365396d49 (patch) | |
| tree | 872b58682c59b2e3400fe841e541b5a8c9455db7 /phpBB/adm/style | |
| parent | c923e4191a28026a21c0ebb0dd2120c258d96229 (diff) | |
| download | forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.gz forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.bz2 forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.tar.xz forums-179c77ccddcd8bd4df2f29d05b460c6365396d49.zip | |
- do not include if there are no files fetched with glob()
- allow options for merged files on update (merge, new file, old file)
git-svn-id: file:///svn/phpbb/trunk@7848 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/install_update.html | 28 | ||||
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 7 |
2 files changed, 32 insertions, 3 deletions
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 6b361ec3f1..c9a8e4e6c1 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -185,10 +185,34 @@ <br /><span>{L_NUM_CONFLICTS}: {files.NUM_CONFLICTS}</span> <!-- ENDIF --> </dt> - <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> + <dd style="margin-left: 60%;"><!-- IF files.STATUS eq 'modified' --> <!-- ELSE --><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --><!-- ENDIF --></dd> <!-- IF files.S_CUSTOM --> <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> <!-- ENDIF --> + + <!-- IF files.STATUS eq 'modified' --> + </dl> + <dl> + <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt> + <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> + </dl> + <dl> + <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{files.FILENAME}]" value="1" /> {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="popup('{files.U_VIEW_NO_MERGE_NEW}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></dd> + </dl> + <dl> + <dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{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="popup('{files.U_VIEW_NO_MERGE_MOD}', 700, 500); return false;">{L_SHOW_DIFF_FINAL}</a>]<!-- ELSE --> <!-- ENDIF --></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 --> + <!-- IF files.STATUS eq 'conflict' --> </dl> <dl> @@ -218,7 +242,7 @@ <!-- ENDIF --> <!-- ENDIF --> - <!-- IF files.STATUS neq 'conflict' --></dl><!-- ENDIF --> + <!-- IF files.STATUS neq 'conflict' and files.STATUS neq 'modified' --></dl><!-- ENDIF --> <!-- ENDIF --> <!-- END files --> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 54242d94b4..799ca34292 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -42,11 +42,16 @@ function resize_panel() width: 99%; } +#diff_content { + padding: 30px 10px 10px; +} + <!-- IF DIFF_MODE neq 'side_by_side' and DIFF_MODE neq 'raw' --> div#codepanel { overflow: auto; width: 100%; height: 350px; + display: inline-block; } <!-- ELSE --> div#codepanel { @@ -230,7 +235,7 @@ table.hrdiff caption span { <div id="acp"> <div class="panel" id="codepanel"> <span class="corners-top"><span></span></span> - <div id="content"> + <div id="diff_content"> <div id="main"> <!-- IF S_DIFF_CONFLICT_FILE --> |