When installing a theme don't install existing plugins
Minor fix to callout in update popup
This commit is contained in:
parent
bb4c2da404
commit
690d7f0a02
|
|
@ -7,3 +7,19 @@ Allows the user to dismiss a callout message.
|
||||||
- close.oc.callout - triggered when a node on the tree is moved.
|
- close.oc.callout - triggered when a node on the tree is moved.
|
||||||
|
|
||||||
# Example
|
# Example
|
||||||
|
|
||||||
|
<div class="callout fade in callout-success">
|
||||||
|
<div class="content">
|
||||||
|
<p>Something good happened</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="callout fade in callout-warning no-icon no-subheader">
|
||||||
|
<div class="header">
|
||||||
|
<h3>Warning warning</h3>
|
||||||
|
</div>
|
||||||
|
<div class="content">
|
||||||
|
<p>My arms are flailing wildly</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -765,7 +765,8 @@ class Updates extends Controller
|
||||||
foreach ((array) array_get($result, 'require') as $plugin) {
|
foreach ((array) array_get($result, 'require') as $plugin) {
|
||||||
if (
|
if (
|
||||||
($name = array_get($plugin, 'code')) &&
|
($name = array_get($plugin, 'code')) &&
|
||||||
($hash = array_get($plugin, 'hash'))
|
($hash = array_get($plugin, 'hash')) &&
|
||||||
|
!PluginManager::instance()->hasPlugin($name)
|
||||||
) {
|
) {
|
||||||
$plugins[$name] = $hash;
|
$plugins[$name] = $hash;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
<script type="text/template" id="executeFailed">
|
<script type="text/template" id="executeFailed">
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="callout callout-danger">
|
<div class="callout callout-danger no-icon">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<h3><?= e(trans('system::lang.updates.update_failed_label')) ?></h3>
|
<h3><?= e(trans('system::lang.updates.update_failed_label')) ?></h3>
|
||||||
<p>{{ reason }}</p>
|
<p>{{ reason }}</p>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue