Merge branch 'master' of github.com:Graylog2/graylog2-web-interface

Author: dennisoelkers

app/assets/stylesheets/main.less

@@ -2093,4 +2093,9 @@ textarea.textarea-xlarge {
     left: auto;
     margin-left: 10px;
     right: 98%;
+}
+
+#add-existing-output {
+  position: relative;
+  top: -5px;
 }

app/views/streams/outputs/index.scala.html

@@ -15,35 +15,42 @@ <h1>
             <i class="icon icon-download-alt"></i>
             Outputs for Stream &raquo;@stream.getTitle&laquo;
         </h1>
-        Graylog2 nodes can forward messages of this stream via outputs. Launch or terminate as many outputs as you want here.
-        You can also reuse outputs for other streams. A global view of all configured outputs is <a href="@routes.OutputsController.index()">here</a>.
+        Graylog2 nodes can forward messages of streams via outputs. Launch or terminate as many outputs as you want here.
+        You can also reuse outputs that are already running for other streams.
+
+        A global view of all configured outputs is available <a href="@routes.OutputsController.index()">here</a>.
+
+        <br />
+        <i>Removing</i> an output removes it from this stream but is still in the list of available outputs
+        and <i>terminating</i> will stop it for all streams and remove it from all configurations and lists
+        completely.
     </div>
 
     @if(isPermitted(OUTPUTS_CREATE)) {
         <div class="output-new">
             <select id="input-type">
-                <option selected disabled>-- Select new output type --</option>
+                <option selected disabled>Select type of new output</option>
             @for((inputType,info) <- availableOutputs.toSeq.sortBy(_._2.name)) {
                 <option value="@inputType">@info.name</option>
             }
             </select>
 
-            <button id="configure-input" class="btn btn-success">Launch new input</button>
+            <button id="configure-input" class="btn btn-success">Launch new Output</button>
         </div>
 
         @views.html.system.outputs.partials.output_creation_forms.render(availableOutputs, routes.StreamOutputsController.create(stream.getId))
     }
-    @if(isPermitted(STREAM_OUTPUTS_CREATE)) {
+    @if(isPermitted(STREAM_OUTPUTS_CREATE) && otherOutputs.size > 0) {
         <div class="output-add">
             @helper.form(routes.StreamOutputsController.add(stream.getId)) {
                 <select name="outputId">
                     @if(otherOutputs.size > 0) {
-                        <option selected disabled>-- Select existing output --</option>
+                        <option selected disabled>Select existing output</option>
                         @for(output <- otherOutputs.toSeq.sortBy(_.getTitle)) {
                             <option value="@output.getId">@output.getTitle</option>
                         }
                     } else {
-                        <option disabled>-- No outputs available --</option>
+                        <option disabled>No outputs available</option>
                     }
                 </select>
 
@@ -60,7 +67,7 @@ <h2><i class="icon icon-cogs"></i> Configured outputs</h2>
                 @views.html.system.outputs.partials.output_summary.render(output, stream)
             }
         } else {
-            <div class="alert alert-info">There are no outputs for this stream. All messages will go to the default output only</div>
+            <div class="alert alert-info">There are no outputs for this stream. All messages will go to the default output only.</div>
         }
     </div>
 }

app/views/system/outputs/partials/output_creation_forms.scala.html

@@ -9,7 +9,7 @@
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             <h2>
                 <i class="icon-signin"></i>
-                Launch new input: <em>@info.name</em>
+                Launch new output: <em>@info.name</em>
             </h2>
         </div>
 
@@ -20,7 +20,7 @@ <h2>
                 <div class="modal-body">
 
                     <label>Title</label>
-                    <span class="help-block">Select a name of your new input that describes it.</span>
+                    <span class="help-block">Select a name of your new output that describes it.</span>
                     <input name="title" required="true" type="text" class="input-xlarge">
 
                     @for(field <- info.getRequestedConfiguration) {

app/views/system/outputs/partials/output_summary.scala.html

@@ -11,10 +11,11 @@
              
         @if(stream != null && isPermitted(STREAM_OUTPUTS_DELETE)) {
             <form action="@routes.StreamOutputsController.remove(stream.getId, output.getId)" method="POST">
-                <button class="btn btn-danger btn-mini"
+                <button class="btn btn-warning btn-mini"
                 type="submit"
-                data-confirm="Really remove output from stream?">
-                    Remove
+                data-confirm="Really remove output from stream?"
+                >
+                    Remove from stream
                 </button>
             </form>
         }