Version 4.3.0
This commit is contained in:
1 parent
96997ddd8e
commit
fe1acf984a
1349 files changed
+116159
-67711
No files matched your search
@@ -1,30 +1,36 @@
|
||||
<ips:template parameters="$forms, $error" />
|
||||
<ips:template parameters="$error" />
|
||||
|
||||
{{if $error !== NULL}}
|
||||
<div class='ipsMessage ipsMessage_error'>
|
||||
{lang="$error"}
|
||||
</div>
|
||||
<br>
|
||||
{{endif}}
|
||||
|
||||
<div class='ipsColumns ipsColumns_collapsePhone'>
|
||||
<div class='ipsColumn ipsColumn_fluid ipsPad'>
|
||||
{{foreach $forms as $k => $form}}
|
||||
{{if $k === '_standard'}}
|
||||
{$form|raw}
|
||||
{{endif}}
|
||||
{{endforeach}}
|
||||
</div>
|
||||
{{if count ( $forms ) > 1}}
|
||||
<div class='ipsColumn ipsColumn_veryWide ipsPad'>
|
||||
<h2 class='ipsType_sectionHead'>{lang='sign_in_faster'}</h2>
|
||||
<p class='ipsType_normal ipsType_reset ipsType_light'>{lang='sign_in_connect'}</p>
|
||||
<br>
|
||||
{{foreach $forms as $k => $form}}
|
||||
{{if $k !== '_standard'}}
|
||||
{$form|raw}
|
||||
{{endif}}
|
||||
{{endforeach}}
|
||||
</div>
|
||||
{{endif}}
|
||||
</div>
|
||||
<form method="post">
|
||||
<input type="hidden" name="{$id}_submitted" value="1">
|
||||
<ul class='ipsForm ipsForm_vertical'>
|
||||
<li class="ipsFieldRow ipsClearfix">
|
||||
<label class="ipsFieldRow_label" for="auth">
|
||||
{lang="auth"}
|
||||
<span class="ipsFieldRow_required">{lang="required"}</span>
|
||||
</label>
|
||||
<div class="ipsFieldRow_content">
|
||||
<input type="text" placeholder="{lang="email_address"}" name="auth" id="auth" {{if isset( \IPS\Request::i()->auth )}}value="{request="auth"}"{{endif}}>
|
||||
</div>
|
||||
</li>
|
||||
<li class="ipsFieldRow ipsClearfix">
|
||||
<label class="ipsFieldRow_label" for="password">
|
||||
{lang="password"}
|
||||
<span class="ipsFieldRow_required">{lang="required"}</span>
|
||||
</label>
|
||||
<div class="ipsFieldRow_content">
|
||||
<input type="password" placeholder="{lang="password"}" name="password" id="password" {{if isset( \IPS\Request::i()->password )}}value="{request="password"}"{{endif}}>
|
||||
</div>
|
||||
</li>
|
||||
<li class=''>
|
||||
<button type='submit' class='ipsButton ipsButton_primary ipsButton_medium'>{lang="login"}</button>
|
||||
|
||||
<a href="{url="upgrader_login_help" ips="true"}" target="_blank" class="ipsType_blendLinks">{lang="help"}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</form>
|
||||
@@ -12,7 +12,7 @@
|
||||
{{endforeach}}
|
||||
{{if $uploadField}}
|
||||
<input type="hidden" name="MAX_FILE_SIZE" value="{$uploadField}">
|
||||
<input type="hidden" name="plupload" value="{expression="md5( uniqid() )"}">
|
||||
<input type="hidden" name="plupload" value="{expression="md5( mt_rand() )"}">
|
||||
{{endif}}
|
||||
{{if $error}}
|
||||
<div class="ipsMessage ipsMessage_error">
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<body class='ipsApp ipsApp_installer'>
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$('input[name="diagnostics_reporting_checkbox"]').attr("disabled","disabled");
|
||||
$('input[name="101079_diagnostics_reporting_checkbox"]').attr("disabled","disabled");
|
||||
});
|
||||
</script>
|
||||
<div id='elInstaller_wrap'>
|
||||
@@ -77,7 +77,7 @@
|
||||
<a href='{expression="\IPS\Settings::i()->base_url"}' class='ipsButton ipsButton_large ipsButton_primary'>{lang="go_to_suite"}</a>
|
||||
<a href='{expression="rtrim( \IPS\Settings::i()->base_url, '/' ) . '/' . \IPS\CP_DIRECTORY"}' class='ipsButton ipsButton_large ipsButton_normal'>{lang="go_to_acp"}</a>
|
||||
<br><br>
|
||||
<a href='http://ipbmafia.ru/files/file/1848-russkiy-yazyk-dlya-invision-community-42/' target="_blank" class='ipsButton ipsButton_large ipsButton_normal' style="background: red;">Russian lang pack</a>
|
||||
<a href='https://ipbmafia.ru/files/file/1848-russkiy-yazyk-dlya-invision-community/' target="_blank" class='ipsButton ipsButton_large ipsButton_normal' style="background: red;">Russian lang pack</a>
|
||||
<br><br>
|
||||
<a href="{expression="\IPS\Http\Url::ips('docs/docs')"}" target="_blank">{lang="suite_docs"}</a>
|
||||
</div>
|
||||
|
||||
@@ -1,6 +1,28 @@
|
||||
<ips:template parameters="$requirements, $designerMode" />
|
||||
<ips:template parameters="$requirements, $designerMode, $incorrectFiles" />
|
||||
{{$canProceed = TRUE;}}
|
||||
<section>
|
||||
{{if $incorrectFiles !== NULL}}
|
||||
{{if $incorrectFiles}}
|
||||
{{$canProceed = FALSE;}}
|
||||
<h2 class="ipsType_sectionHead">{lang="hc_files"}</h2>
|
||||
<br><br>
|
||||
<p class="ipsType_normal">{lang="hc_files_fail"}</p>
|
||||
<br>
|
||||
<a class="ipsButton ipsButton_primary" href="{url="client_area" ips="true"}" target="_blank">{lang="hc_files_fail2"}</a>
|
||||
<br><br>
|
||||
<p class="ipsType_normal">{lang="hc_files_fail3"}</p>
|
||||
<ul class="ipsPad ipsType_large ipsList_checks">
|
||||
{{foreach $incorrectFiles as $file}}
|
||||
<li class="fail">{$file}</li>
|
||||
{{endforeach}}
|
||||
</ul>
|
||||
{{else}}
|
||||
<h2 class="ipsType_sectionHead">{lang="hc_files"}</h2>
|
||||
<ul class="ipsPad ipsType_large ipsList_checks">
|
||||
<li class="success">{lang="hc_files_ok"}</li>
|
||||
</ul>
|
||||
{{endif}}
|
||||
{{endif}}
|
||||
{{if $designerMode}}
|
||||
<h2 class="ipsType_sectionHead">{lang="hc_designers_mode"}</h2>
|
||||
<ul class="ipsPad ipsType_large ipsList_checks">
|
||||
|
||||
@@ -23,5 +23,4 @@
|
||||
</section>
|
||||
<div class='ipsPad_double ipsType_center'>
|
||||
<a href='{url="controller=continueupgrade&key={$_SESSION['uniqueKey']}"}' class='ipsButton ipsButton_large ipsButton_primary ipsButton_positive'>{lang="continue_upgrade"}</a>
|
||||
<a href='{url="controller=systemcheck&key={$_SESSION['uniqueKey']}&skippreviousupgrade=1"}' class='ipsButton ipsButton_large ipsButton_primary'>{lang="start_fresh_upgrade"}</a>
|
||||
</div>
|
||||
@@ -8,12 +8,12 @@
|
||||
{{if $trace[3]['function'] == 'installDatabaseUpdates'}}
|
||||
<small>
|
||||
{expression="\IPS\ROOT_PATH"}/applications/{$trace[4]['args'][0][1]}/setup/upg_{$trace[3]['args'][0]}/queries.json{{if isset($_SESSION['lastJsonIndex'])}} - query #{$_SESSION['lastJsonIndex']}{{endif}}<br>
|
||||
<pre>{$exception->query}</pre>
|
||||
<pre>{{if $exception->query}}{$exception->query}{{else}}{$trace[0]['args'][0]}{{endif}}</pre>
|
||||
</small>
|
||||
{{else}}
|
||||
<small>
|
||||
{$trace[1]['file']}::{$trace[1]['line']}<br>
|
||||
<pre>{$exception->query}</pre>
|
||||
<pre>{{if $exception->query}}{$exception->query}{{else}}{$trace[0]['args'][0]}{{endif}}</pre>
|
||||
</small>
|
||||
{{endif}}
|
||||
{{else}}
|
||||
|
||||
Reference in new issue
Block a user