Merge branch '8.x-1.x' into development

css/heartbeat.css

@@ -71,7 +71,7 @@
   right: 5px;
   top: 45%;
   color: transparent;
-  background: rgba(45, 45, 45, 0.5) url(/themes/kekistan/images/icons/forward.png) no-repeat 10px 10px;
+  background: rgba(45, 45, 45, 0.5) url(/modules/heartbeat/images/forward.png) no-repeat 10px 10px;
   background-size: 30px;
   width: 10px;
   height: 50px;
@@ -82,7 +82,7 @@
   left: 5px;
   top: 45%;
   color: transparent;
-  background: rgba(45, 45, 45, 0.5) url(/themes/kekistan/images/icons/backward.png) no-repeat 10px 10px;
+  background: rgba(45, 45, 45, 0.5) url(/modules/heartbeat/images/backward.png) no-repeat 10px 10px;
   background-size: 30px;
   width: 10px;
   height: 50px;
@@ -94,7 +94,7 @@
   right: 10%;
   width: 65px;
   height: 67px;
-  background: url(/themes/kekistan/images/icons/cross-circular-button-outline.png) no-repeat center center;
+  background: url(/modules/heartbeat/images/cross-circular-button-outline.png) no-repeat center center;
   color: transparent;
 }
 
@@ -163,8 +163,7 @@ Temporarily hiding all irrelevant content */
 #block-heartbeatblock .region-breadcrumb,
 #block-heartbeatblock #sidebar-first,
 #block-heartbeatblock .block-page-title-block,
-#block-heartbeatblock #block-kekistan-breadcrumbs,
-#block-heartbeatblock #block-kekistan-page-title { display: none}
+#block-heartbeatblock .contextual-region { display: none}
 
 
 #block-heartbeatblock #content {

js/heartbeat.js

@@ -254,10 +254,10 @@
         mainContainer = document.getElementById('main');
         loginBlock = document.createElement('div');
         loginBlock.innerHTML = response;
-        loginBlock.className = 'kekistan-login-block';
-        loginBlock.id = 'kekistan-login-block';
+        loginBlock.className = 'heartbeat-login-block';
+        loginBlock.id = 'heartbeat-login-block';
         closeBtn = document.createElement('div');
-        closeBtn.className = 'kekistan-login-block-close';
+        closeBtn.className = 'heartbeat-login-block-close';
         closeBtn.innerHTML = '✖';
         loginBlock.appendChild(closeBtn);
         mainContainer.appendChild(loginBlock);

modules/statusmessage/css/statusmessage.css

@@ -54,7 +54,7 @@
   min-height: 32px;
   content: "Jigga";
   margin-left: 4px;
-  background: url(/themes/kekistan/images/icons/mountains-picture.png) no-repeat;
+  background: url(/modules/heartbeat/modules/statusmessage/images/mountains-picture.png) no-repeat;
   background-size: contain;
 }
 
@@ -90,7 +90,7 @@
 
 .ui-dialog-title {
   background-size: contain;
-  background: url('/themes/kekistan/images/icons/alert.png') no-repeat;
+  background: url('/modules/heartbeat/modules/statusmessage/images/icons/alert.png') no-repeat;
   padding: 2px 2.5em;
 }
 

modules/statusmessage/src/Form/StatusForm.php

@@ -350,7 +350,6 @@ class StatusForm extends FormBase {
         ->condition('vid', [
           'twitter',
           'tags',
-          'kekistan'
         ], 'IN')
         ->execute();
 

modules/statusmessage/src/StatusHeartPost.php

@@ -193,7 +193,6 @@ class StatusHeartPost implements SharedContentInterface {
           ->condition('vid', [
             'twitter',
             'tags',
-            'kekistan'
           ], 'IN')
           ->execute();
 

modules/statusmessage/src/StatusYoutube.php

@@ -121,7 +121,6 @@ class StatusYoutube {
         ->condition('vid', [
           'twitter',
           'tags',
-          'kekistan'
         ], 'IN')
         ->execute();
 

src/Entity/Heartbeat.php

@@ -625,7 +625,7 @@ class Heartbeat extends RevisionableContentEntityBase implements HeartbeatInterf
       $tid = \Drupal::entityQuery("taxonomy_term")
         ->condition("name", trim($realHashtag))
         ->condition('vid', [
-          'twitter', 'tags', 'kekistan'
+          'twitter', 'tags'
         ], 'IN')
         ->execute();