Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#6371 get rid of the OK button #6487

Merged
merged 17 commits into from
Jan 5, 2018
Merged

#6371 get rid of the OK button #6487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aa812c9
#6371 remove OK button from template
Dec 11, 2017
0751551
commit contains following changes:
Dec 11, 2017
32bded7
Merge branch 'master' of https://github.com/twosigma/beakerx into luk…
Dec 11, 2017
8c9833f
#6371 remove invalid if statement
Dec 11, 2017
f694f3e
Merge branch 'master' of https://github.com/twosigma/beakerx into luk…
Dec 13, 2017
bcec8f2
#6371 use _.debounce, implement synchronization indicator
Dec 13, 2017
c0e5d56
Merge branch 'master' of https://github.com/twosigma/beakerx into luk…
Dec 14, 2017
56c1cfe
#6371 change sync indicator place in template
Dec 14, 2017
282f3d3
#6371 fix losing focus after sync, and tabing issue
Dec 14, 2017
6e4d2e2
Merge branch 'master' of github.com:twosigma/beakerx into lukasz/6371
piorek Dec 20, 2017
4ff0099
#6371 sync empty values; add only missing inputs when loading settings
piorek Dec 20, 2017
2365c1d
Merge branch 'master' of github.com:twosigma/beakerx into lukasz/6371
piorek Dec 21, 2017
eb15abb
#6371 fix code style (jscs)
piorek Dec 21, 2017
b592d54
#6371 do not send invalid heap size
piorek Dec 21, 2017
cd50fa5
Merge branch 'master' of github.com:twosigma/beakerx into lukasz/6371
piorek Jan 5, 2018
fc3c977
#6371 add additional check when validating heap size
piorek Jan 5, 2018
92974a2
#6371 do not sync data when heap size is invalid
piorek Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions beakerx/beakerx/static/html/settings_tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@
#beakerx_info .beakerx_site_link img {
height: 35px;
}

#sync_indicator .saving {
color: #f0ad4e;
}

#sync_indicator .saved {
color: #5cb85c;
}
</style>
<div id="beakerx_env_toolbar" class="list_toolbar row">
<div class="col-xs-12 no-padding">
Expand Down Expand Up @@ -73,8 +81,11 @@
<div class="col-xs-8">
<div class="pull-right">
<label for="add_option_jvm_sett">add option: </label>
<button type="button" id="add_option_jvm_sett" title="" class="btn btn-default btn-xs"
data-original-title="add new"><i class="fa fa-plus"></i></button>
<button type="button"
id="add_option_jvm_sett"
class="btn btn-default btn-xs"
data-original-title="add new">
<i class="fa fa-plus"></i>
</button>
</div>
</div>
Expand All @@ -83,10 +94,12 @@
</div>
</fieldset>
<div class="form-group text-primary">
<span>Result: java </span><span id="result"></span>
<span id="sync_indicator">
<span class="saving hidden"><i class="fa fa-spinner"></i></span>
<span class="saved hidden"><i class="fa fa-check"></i></span>
</span><span>Result: java </span><span id="result"></span>
</div>
<div id="errors" style="color: red"></div>
<button type="button" id="jvm_settings_submit" class="btn btn-primary">OK</button>
</form>
</div>
</div>
Loading