mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop

Browse Source 
* EXreaction/ticket/9871-2:
  [ticket/9871] Can set current version to use instead of the phpBB version
  [ticket/9871] Fix indentation on comment
  [ticket/9871] Fix test name
  [ticket/9871] Split fast and slow version tests
  [ticket/9871] Option to force the stability when checking for updates
  [ticket/9871] Allow setting the host/file to load for the version class
  [ticket/9871] Restore get_remote_file_test
  [ticket/9871] Fix tests
  [ticket/9871] Typehint and comment on var types
  [ticket/9871] Mark test as slow
  [ticket/9871] Restore phpbb_version_compare
  [ticket/9871] Restore get_remote_file
  [ticket/9871] Use $request->variable instead of request_var
  [ticket/9871] Update version check file to use json format
This commit is contained in:
Joas Schilling
2014-03-14 14:04:30 +01:00
parent c743e28b94 60d2c1f400
commit 0aa23d203e
11 changed files with 737 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/adm/style/acp_main.html
View File

@@ -17,6 +17,7 @@
<!-- IF S_VERSIONCHECK_FAIL -->
<div class="errorbox notice">
<p>{L_VERSIONCHECK_FAIL}</p>
<p>{VERSIONCHECK_FAIL_REASON}</p>
<p><a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a> &middot; <a href="{U_VERSIONCHECK}">{L_MORE_INFORMATION}</a></p>
</div>
<!-- ELSEIF not S_VERSION_UP_TO_DATE -->

68
phpBB/adm/style/acp_update.html
View File

@@ -1,52 +1,46 @@
<!-- INCLUDE overall_header.html -->
<a id="maincontent"></a>
<!-- IF S_VERSION_CHECK -->
<h1>{L_VERSION_CHECK}</h1>
<h1>{L_VERSION_CHECK}</h1>
<p>{L_VERSION_CHECK_EXPLAIN}</p>
<p>{L_VERSION_CHECK_EXPLAIN}</p>
<!-- IF S_UP_TO_DATE and S_UP_TO_DATE_AUTO -->
<div class="successbox">
<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div>
<!-- ELSE -->
<div class="errorbox">
<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div>
<!-- ENDIF -->
<!-- IF S_UP_TO_DATE -->
<div class="successbox">
<p>{L_VERSION_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div>
<!-- ELSE -->
<div class="errorbox">
<p>{L_VERSION_NOT_UP_TO_DATE_ACP} - <a href="{U_VERSIONCHECK_FORCE}">{L_VERSIONCHECK_FORCE_UPDATE}</a></p>
</div>
<!-- ENDIF -->
<!-- IF NEXT_FEATURE_VERSION -->
<div class="errorbox">
<p>{UPGRADE_INSTRUCTIONS}</p>
</div>
<!-- ENDIF -->
<fieldset>
<legend></legend>
<fieldset>
<legend></legend>
<dl>
<dt><label>{L_CURRENT_VERSION}</label></dt>
<dd><strong><!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->{AUTO_VERSION}<!-- ELSE -->{CURRENT_VERSION}<!-- ENDIF --></strong></dd>
</dl>
<dl>
<dt><label>{L_LATEST_VERSION}</label></dt>
<dd><strong>{LATEST_VERSION}</strong></dd>
<dd><strong>{CURRENT_VERSION}</strong></dd>
</dl>
</fieldset>
<!-- BEGIN updates_available -->
<fieldset>
<legend></legend>
<dl>
<dt><label>{L_LATEST_VERSION}</label></dt>
<dd><strong>{updates_available.current}</strong></dd>
</dl>
<dl>
<dt><label>{L_RELEASE_ANNOUNCEMENT}</label></dt>
<dd><strong><a href="{updates_available.announcement}">{updates_available.announcement}</a></strong></dd>
</dl>
</fieldset>
<!-- END updates_available -->
<!-- IF S_UP_TO_DATE and not S_UP_TO_DATE_AUTO -->
{L_UPDATE_INSTRUCTIONS_INCOMPLETE}
<br /><br />
{UPDATE_INSTRUCTIONS}
<br /><br />
<!-- ENDIF -->
<!-- IF not S_UP_TO_DATE -->
{UPDATE_INSTRUCTIONS}
<br /><br />
<!-- ENDIF -->
<!-- IF not S_UP_TO_DATE -->
{UPDATE_INSTRUCTIONS}
<br /><br />
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->