From 97725db3f4f0bd8f33044335c57d930519e8efb6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 29 Jun 2014 22:13:33 +0200 Subject: [ticket/12779] Change order of file lists on automatic update Also allow collapsing all the groups and collapse categories without user interaction per default PHPBB3-12779 --- phpBB/adm/style/install_update.html | 210 ++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 102 deletions(-) (limited to 'phpBB/adm/style/install_update.html') diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index 2faa2bb6fa..898233f72d 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -184,72 +184,105 @@
- -

{L_FILES_UP_TO_DATE}

-

{L_FILES_UP_TO_DATE_EXPLAIN}

+ +

{L_FILES_DELETED}

+
» {L_TOGGLE_DISPLAY}
+

{L_FILES_DELETED_EXPLAIN}

-
- {L_STATUS_UP_TO_DATE} - +
+ {L_STATUS_DELETED} +
-
{up_to_date.FILENAME}
+
{deleted.DIR_PART}
{deleted.FILE_PART}
+
+ [{deleted.L_SHOW_DIFF}]{L_BINARY_FILE} +
- +
- -

{L_FILES_NEW}

-

{L_FILES_NEW_EXPLAIN}

+ +

{L_FILES_CONFLICT}

+
» {L_TOGGLE_DISPLAY}
+

{L_FILES_CONFLICT_EXPLAIN}

-
- {L_STATUS_NEW} - + +
+ {L_STATUS_CONFLICT}
-
{new.DIR_PART}
{new.FILE_PART} -
{L_FILE_USED}{L_COLON} {new.CUSTOM_ORIGINAL} -
-
- [{new.L_SHOW_DIFF}]{L_BINARY_FILE} -
- -
- +
{conflict.DIR_PART}
{conflict.FILE_PART} +
{L_FILE_USED}{L_COLON} {conflict.CUSTOM_ORIGINAL} +
{L_NUM_CONFLICTS}{L_COLON} {conflict.NUM_CONFLICTS} +
+
+ [{L_DOWNLOAD_CONFLICTS}]
{L_DOWNLOAD_CONFLICTS_EXPLAIN} + {L_BINARY_FILE} +
+ +
+
- + +
+
+
 
+
+ +
+
+
[{L_SHOW_DIFF_MODIFIED}]
+
+
+
+
[{L_SHOW_DIFF_MODIFIED}]
+
+
+
+
[{L_SHOW_DIFF_FINAL}]
+
+
+
+
[{L_SHOW_DIFF_FINAL}]
+
+
+ - -

{L_FILES_NOT_MODIFIED}

-
» {L_TOGGLE_DISPLAY}
-

{L_FILES_NOT_MODIFIED_EXPLAIN}

+ +

{L_FILES_NEW_CONFLICT}

+
» {L_TOGGLE_DISPLAY}
+

{L_FILES_NEW_CONFLICT_EXPLAIN}

-