From fa17fb0da18eeb020b4ee0edda067ac8b8bf8d48 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@zulip.com>
Date: Mon, 16 Dec 2013 10:25:26 -0500
Subject: [PATCH] Place "autoscroll" option in a "Zulip Labs" section.

(imported from commit 31e8d0b5c1454932398cf732c0c4ad0702e5274b)
---
 static/js/ui.js                |  2 +-
 static/styles/zulip.css        |  2 +-
 templates/zerver/settings.html | 67 +++++++++++++++++-----------------
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/static/js/ui.js b/static/js/ui.js
index 02d793972f..6da0b7917c 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -1145,7 +1145,7 @@ $(function () {
             dataType: 'json',
 
             success: function (resp, statusText, xhr, form) {
-                var message = "Updated UI settings!";
+                var message = "Updated Zulip Labs settings!";
                 var result = $.parseJSON(xhr.responseText);
 
                 if (result.autoscroll_forever !== undefined) {
diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 1cd6002298..5ff0d421eb 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -2818,7 +2818,7 @@ li.expanded_subject {
 
 #word-alert-settings {
     margin-top: 15px;
-    margin-bottom: 30px;
+    margin-bottom: 15px;
 }
 
 .remove-alert-word,
diff --git a/templates/zerver/settings.html b/templates/zerver/settings.html
index 29f92097bf..a55577208b 100644
--- a/templates/zerver/settings.html
+++ b/templates/zerver/settings.html
@@ -174,37 +174,6 @@
     </div>
 
     </form>
-    {% if show_autoscroll_forever_option %}
-    <form action="/json/ui_settings/change" method="post"
-          class="form-horizontal ui-settings">{% csrf_token %}
-
-    <div id="ui-settings" class="settings-section">
-      <div class="settings-section-title"><i class="icon-vector-desktop settings-section-icon"></i>User Interface</div>
-        <div class="alert" id="ui-settings-status"></div>
-    <div class="ui-settings-form">
-        <div class="control-group">
-          <div class="controls">
-            <input type="checkbox" name="autoscroll_forever" id="autoscroll_forever"
-              {% if user_profile.autoscroll_forever %}
-                checked="yes"
-              {% endif %} />
-          </div>
-          <label for="autoscroll_forever" class="control-label">
-            Auto-scroll forever
-          </label>
-        </div>
-        <div class="control-group">
-          <div class="controls ui-submission">
-            <input type="submit" name="change_settings" value="Save changes" class="btn btn-big btn-primary" />
-          </div>
-        </div>
-    </div>
-
-    </div>
-
-    </form>
-    {% endif %}
-
   </div>
 
     <div id="bot-settings" class="settings-section">
@@ -294,11 +263,43 @@
     </div>
     </div>
 
-
-
   <div id="word-alert-settings" class="settings-section">
     <div class="settings-section-title"><i class="icon-vector-book settings-section-icon"></i>Custom Word Alerts</div>
     <ul id="word-alerts">
     </ul>
   </div>
 
+    {% if show_autoscroll_forever_option %}
+    <form action="/json/ui_settings/change" method="post"
+          class="form-horizontal ui-settings">{% csrf_token %}
+
+    <div id="ui-settings" class="settings-section">
+      <div class="settings-section-title"><i class="icon-vector-beaker settings-section-icon"></i>Zulip Labs</div>
+        <div class="alert" id="ui-settings-status"></div>
+    <div class="ui-settings-form">
+      <p>
+        Zulip Labs is where you can try out some experimental new
+        features we're working on. Let us know what you think!
+      </p>
+        <div class="control-group">
+          <div class="controls">
+            <input type="checkbox" name="autoscroll_forever" id="autoscroll_forever"
+              {% if user_profile.autoscroll_forever %}
+                checked="yes"
+              {% endif %} />
+          </div>
+          <label for="autoscroll_forever" class="control-label">
+            Always auto-scroll to new messages
+          </label>
+        </div>
+        <div class="control-group">
+          <div class="controls ui-submission">
+            <input type="submit" name="change_settings" value="Save changes" class="btn btn-big btn-primary" />
+          </div>
+        </div>
+    </div>
+
+    </div>
+
+    </form>
+    {% endif %}