Rename node journal usage class to avoid conflict

Refs #1083
graylog-labs · Mar 9, 2015 · b06b48e · b06b48e
1 parent cefd4b2
commit b06b48e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/assets/javascripts/periodicals.js b/app/assets/javascripts/periodicals.js
@@ -133,11 +133,12 @@ $(document).ready(function() {
 
     // Node journal usage.
     (function updateNodeJournalUsage() {
-        if ($(".node-journal-usage").length > 0) {
+        var nodeJournalInformation = $(".node-journal-information");
+        if (nodeJournalInformation.length > 0) {
             var interval = 1000;
             if (!assertUpdateEnabled(updateNodeJournalUsage)) return;
 
-            $(".node-journal-usage").each(function(i) {
+            nodeJournalInformation.each(function(i) {
                 var url = "/a/system/node/" + $(this).attr("data-node-id") + "/journal";
 
                 var thisJournal = $(this);
@@ -153,7 +154,7 @@ $(document).ready(function() {
                     },
                     complete: function() {
                         // Trigger next call of the whole function when we updated the last element.
-                        if (i == $(".node-journal-usage").length-1) {
+                        if (i == nodeJournalInformation.length-1) {
                             setTimeout(updateNodeJournalUsage, interval);
                         }
                     }

diff --git a/app/assets/stylesheets/graylog2.less b/app/assets/stylesheets/graylog2.less
@@ -1618,7 +1618,7 @@ form.node-processing-change input {
     width: 100%;
 }
 
-.node-journal-usage {
+.node-journal-information {
     display: inline;
 }
 

diff --git a/app/views/system/nodes/index.scala.html b/app/views/system/nodes/index.scala.html
@@ -168,7 +168,7 @@ <h3>
                 </div>
 
                 @if(nodes.get(jvm.getNodeId).getJournalInfo.enabled) {
-                    <div class="node-journal-usage" data-node-id="@jvm.getNodeId">
+                    <div class="node-journal-information" data-node-id="@jvm.getNodeId">
                         There are
                         <strong><span class="journal-uncommitted">@nodes.get(jvm.getNodeId).getJournalInfo().uncommittedJournalEntries</span>
                             unprocessed messages</strong>