From 690d7f0a0221c71fd90aacf8cd3d3d08cd0de334 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Tue, 28 Jul 2015 19:56:03 +1000
Subject: [PATCH] When installing a theme don't install existing plugins Minor
 fix to callout in update popup

---
 modules/system/assets/ui/docs/callout.md        | 16 ++++++++++++++++
 modules/system/controllers/Updates.php          |  3 ++-
 modules/system/controllers/updates/_execute.htm |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/system/assets/ui/docs/callout.md b/modules/system/assets/ui/docs/callout.md
index 4b027a561..3ed0aa0a8 100644
--- a/modules/system/assets/ui/docs/callout.md
+++ b/modules/system/assets/ui/docs/callout.md
@@ -7,3 +7,19 @@ Allows the user to dismiss a callout message.
 - close.oc.callout - triggered when a node on the tree is moved.
 
 # 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>
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index 1d350dcb9..1662747a4 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -765,7 +765,8 @@ class Updates extends Controller
             foreach ((array) array_get($result, 'require') as $plugin) {
                 if (
                     ($name = array_get($plugin, 'code')) &&
-                    ($hash = array_get($plugin, 'hash'))
+                    ($hash = array_get($plugin, 'hash')) &&
+                    !PluginManager::instance()->hasPlugin($name)
                 ) {
                     $plugins[$name] = $hash;
                 }
diff --git a/modules/system/controllers/updates/_execute.htm b/modules/system/controllers/updates/_execute.htm
index 048781f76..9785a0554 100644
--- a/modules/system/controllers/updates/_execute.htm
+++ b/modules/system/controllers/updates/_execute.htm
@@ -24,7 +24,7 @@
 
     <script type="text/template" id="executeFailed">
         <div class="modal-body">
-            <div class="callout callout-danger">
+            <div class="callout callout-danger no-icon">
                 <div class="header">
                     <h3><?= e(trans('system::lang.updates.update_failed_label')) ?></h3>
                     <p>{{ reason }}</p>