CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-21 21:32:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Place "autoscroll" option in a "Zulip Labs" section.

Browse Source 
(imported from commit 31e8d0b5c1454932398cf732c0c4ad0702e5274b)
This commit is contained in:
Waseem Daher 2013-12-16 10:25:26 -05:00
parent 1ca8804468
commit fa17fb0da1
3 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/ui.js
View File

@ -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) {

2
static/styles/zulip.css
View File

@ -2818,7 +2818,7 @@ li.expanded_subject {
#word-alert-settings {
margin-top: 15px;
margin-bottom: 30px;
margin-bottom: 15px;
}
.remove-alert-word,

67
templates/zerver/settings.html
View File

@ -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 %}