Skip to content

Commit e7b4cb1

Browse files
author
Leonid Vakulenko
committed
Team app v.1.0.11
* New features: * “API tokens” section with a list of issued Webasyst API tokens and the option to delete selected tokens. * Improvements: * Displaying of added and edited users in the Live Stream. * Sorting of users by names in “Access” section. * Sorting of apps by name in users and groups access settings. * Displaying of multi-line descriptions in users’ contact information.
1 parent b3ea688 commit e7b4cb1

33 files changed

+967
-739
lines changed

wa-apps/team/css/profile_info.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-apps/team/css/profile_info/profile_info.styl

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,12 @@ a.c-user-group-setup { margin-left: 10px; }
128128
.c-access-cb-all input { margin: 0 0.5em!important;vertical-align: middle;}
129129
.c-list-toolbar ul.menu-h.dropdown li:first-child { width: 250px;}
130130
.c-list-toolbar ul.menu-h.dropdown li:first-child ul li:first-child { width:auto;}
131-
.c-core-content .delete-subfield { margin: 0 0 0 .5em}
131+
132+
.c-core-content .delete-subfield,
133+
.t-dynamic-content .delete-subfield {
134+
margin: 0 0 0 .5em
135+
}
136+
132137
.contacts-data .thumbs { padding-left: 2px;}
133138
.contacts-data ul.thumbs .c-name-check a { vertical-align:top; max-width:80px; display:inline-block; overflow:hidden;}
134139
.contacts-data .paging { color: #444444; font-size: 0.92em; white-space: nowrap; overflow:hidden; margin-left: 10px;}
@@ -250,7 +255,10 @@ input.external-error {
250255
.fields .field .multifield-subfields .value .address-field { margin-bottom: 15px; }
251256
.fields .edit-mode .field .multifield-subfields { margin-bottom: -2px; }
252257
.fields .value.multifield-subfields-add-another { margin-bottom: 10px; }
253-
.fields .field .multifield-subfields .ext { font-size: 0.8em; }
258+
259+
.fields .field .multifield-subfields .ext { margin-left: 2px; font-size: 0.8em; }
260+
.fields .field[data-field-id="address"] .multifield-subfields .ext { margin-left: 0 }
261+
254262
.multifield-subfields>:only-child .delete-subfield,
255263
.in-place-editor .delete-subfield {
256264
display: none;
@@ -267,6 +275,15 @@ input.external-error {
267275
opacity 0
268276
cursor move
269277
}
278+
279+
.fields .field .multifield-subfields .field-composite-subfields-block {
280+
position relative
281+
}
282+
.fields .field .multifield-subfields .field-composite-subfields-block .sort-handler {
283+
position absolute
284+
margin-top 2px
285+
}
286+
270287
.fields .field[data-field-id="address"] .multifield-subfields .sort-handler {
271288
margin-top: 0px;
272289
}

wa-apps/team/css/styl/dialogs.styl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,9 @@
227227
margin: 0 4px 0 0;
228228
vertical-align: middle;
229229

230+
.c-access-cb-all.nm
231+
margin-left 0
232+
230233
.c-access-subcontrol-header
231234
td
232235
background: #fff !important
@@ -980,4 +983,4 @@
980983
.t-groups-wrapper
981984
max-height: 200px
982985
overflow auto
983-
overflow-x hidden
986+
overflow-x hidden

wa-apps/team/css/team.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-apps/team/js/compiled/team-external.min.js

Lines changed: 269 additions & 241 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-apps/team/js/compiled/team-external.min.js.map

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-apps/team/js/compiled/team.min.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-apps/team/js/compiled/team.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-apps/team/js/group.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,8 @@ var GroupEditDialog = ( function($) {
561561
that.$form.on("submit", function(event) {
562562
event.preventDefault();
563563
if (!that.is_locked) {
564-
that.$submitButton.parent().append("<i class=\"icon16 loading\"></i>");
564+
that.$form.find('.js-submit-loading').remove();
565+
that.$submitButton.parent().append("<i class='icon16 loading js-submit-loading'></i>");
565566
that.save();
566567
}
567568
});
@@ -572,6 +573,7 @@ var GroupEditDialog = ( function($) {
572573
var $field = $(this),
573574
has_error = $field.hasClass( that.has_error_class );
574575

576+
that.$form.find('.js-submit-loading').remove();
575577
if (has_error) {
576578
$field
577579
.removeClass(that.has_error_class)

wa-apps/team/js/map.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ var TeamMap = (function ($) {
1414

1515
// VARS
1616
that.provider = provider;
17-
if (['google', 'yandex'].indexOf(that.provider) < 0) {
18-
throw Error('Not supported map provider: %s'.replace('%s', that.provider));
17+
if (that.provider && ['google', 'yandex', 'disabled'].indexOf(that.provider) < 0) {
18+
console.error('Not supported map provider: %s'.replace('%s', that.provider));
1919
}
2020

2121
that.map_info = null;
@@ -34,6 +34,8 @@ var TeamMap = (function ($) {
3434
return that.googleRender(lat, lng);
3535
case 'yandex':
3636
return that.yandexRender(lat, lng);
37+
default:
38+
return;
3739
}
3840
};
3941

@@ -108,6 +110,13 @@ var TeamMap = (function ($) {
108110
return that.googleGeocode(query, success, fail);
109111
case 'yandex':
110112
return that.yandexGeocode(query, success, fail);
113+
default:
114+
if (fail) {
115+
fail();
116+
} else if (success) {
117+
success();
118+
}
119+
break;
111120
}
112121
};
113122

@@ -150,6 +159,8 @@ var TeamMap = (function ($) {
150159
var firstGeoObject = res.geoObjects.get(0);
151160
var coords = firstGeoObject.geometry.getCoordinates();
152161
success(coords[0], coords[1]);
162+
}, function (err) {
163+
fail(err);
153164
});
154165
};
155166

0 commit comments

Comments
 (0)