Skip to content

Commit 8608a7d

Browse files
authored
Merge branch 'develop' into PL-v4.4.4-pre.5
2 parents b1e2b9f + 5768c4d commit 8608a7d

File tree

86 files changed

+340
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+340
-284
lines changed

app/common/auth/password-reset-confirm.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<div ng-repeat="(error, value) in form.password.$error"
2727
ng-show="form.password.$dirty"
2828
class="alert error">
29-
<svg class="iconic">
29+
<svg class="iconic" role="img">
3030
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
3131
</svg>
3232
<p translate="{{'user.valid.password.' + error}}" translate-default="{{error}}"></p>

app/common/auth/register.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div ng-repeat="(error, value) in form.full_name.$error"
1616
ng-show="form.full_name.$dirty"
1717
class="alert error">
18-
<svg class="iconic">
18+
<svg class="iconic" role="img">
1919
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
2020
</svg>
2121
<p translate="{{'user.valid.full_name.' + error}}" translate-default="{{error}}"></p>
@@ -31,7 +31,7 @@
3131
<div ng-repeat="(error, value) in form.email.$error"
3232
ng-show="form.email.$dirty"
3333
class="alert error">
34-
<svg class="iconic">
34+
<svg class="iconic" role="img">
3535
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
3636
</svg>
3737
<p translate="{{'user.valid.email.' + error}}" translate-default="{{error}}"></p>
@@ -48,7 +48,7 @@
4848
<div ng-repeat="(error, value) in form.password.$error"
4949
ng-show="form.password.$dirty"
5050
class="alert error">
51-
<svg class="iconic">
51+
<svg class="iconic" role="img">
5252
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#warning"></use>
5353
</svg>
5454
<p translate="{{'user.valid.password.' + error}}" translate-default="{{error}}"></p>

app/common/configs/uib-pagination.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</li>
55
<li ng-if="::directionLinks" ng-class="{disabled: noPrevious()||ngDisabled}" class="prev">
66
<a ng-click="selectPage(page - 1, $event)">
7-
<svg class="iconic">
7+
<svg class="iconic" role="img">
88
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#chevron-left"></use>
99
</svg>
1010
<span class="hidden">Previous</span>
@@ -24,7 +24,7 @@
2424
</li>
2525
<li ng-if="::directionLinks" ng-class="{disabled: noNext()||ngDisabled}" class="next" >
2626
<a ng-click="selectPage(page + 1, $event)">
27-
<svg class="iconic">
27+
<svg class="iconic" role="img">
2828
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#chevron-right"></use>
2929
</svg>
3030
<span class="hidden">Next</span>

app/common/directives/add-category.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ng-disabled="categoryName.length === 0"
1313
ng-click="saveCategory($event);"
1414
>
15-
<svg class="iconic">
15+
<svg class="iconic" role="img">
1616
<use xlink:href="/img/iconic-sprite.svg#check"></use>
1717
</svg>
1818
<span class="hidden" translate="app.add">Add</span>
@@ -22,7 +22,7 @@
2222
class="button-beta button-flat"
2323
ng-click="showInputToggle()"
2424
>
25-
<svg class="iconic">
25+
<svg class="iconic" role="img">
2626
<use xlink:href="/img/iconic-sprite.svg#trash"></use>
2727
</svg>
2828
<span class="hidden" translate="category.delete">Delete</span>

app/common/directives/category-selector.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
</div>
4646
</div>
4747
<span class="form-field-toggle">
48-
<svg class="iconic">
48+
<svg class="iconic" role="img">
4949
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#chevron-bottom"></use>
5050
</svg>
5151
<span translate="nav.more">More</span>

app/common/directives/filter-system/filter-searchbar.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
ng-keyup="detectSubmit($event)"
1414
ng-value="model.q=''"
1515
>
16-
<svg class="iconic" ng-show="!form.q.$viewValue.length">
16+
<svg class="iconic" role="img" ng-show="!form.q.$viewValue.length">
1717
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#magnifying-glass"></use>
1818
</svg>
19-
<svg class="iconic" ng-click="onClear()" ng-show="form.q.$viewValue.length">
19+
<svg class="iconic" role="img" ng-click="onClear()" ng-show="form.q.$viewValue.length">
2020
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#circle-x"></use>
2121
</svg>
2222
</div>

app/common/directives/modal-container.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div ng-show="classVisible" class="modal" style="display: block;">
22
<div class="modal-window" ng-style="{ top : modalOffset }">
33
<button class="button-beta button-flat modal-trigger modal-trigger-close" ng-show="showCloseButton" ng-click="closeButtonClicked()">
4-
<svg class="iconic">
4+
<svg class="iconic" role="img">
55
<!-- TODO: fix icon to be settable -->
66
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#x"></use>
77
</svg>
88
<span class="hidden" translate>modal.button.close</span>
99
</button>
1010
<h3 class="modal-title" ng-if="title">
11-
<svg class="iconic" ng-if="icon">
11+
<svg class="iconic" role="img" ng-if="icon">
1212
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{{ icon }}"></use>
1313
</svg>
1414
<span class="label">

app/common/directives/modal.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<div ng-show="classVisible" class="modal" style="display: block;">
22
<div class="modal-window" ng-style="{ top : modalOffset }">
33
<button class="button-beta button-flat modal-trigger modal-trigger-close" ng-show="showCloseButton" ng-click="closeModal()">
4-
<svg class="iconic">
4+
<svg class="iconic" role="img">
55
<!-- TODO: fix icon to be settable -->
66
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#x"></use>
77
</svg>
88
<span class="hidden" translate>modal.button.close</span>
99
</button>
1010
<h3 class="modal-title" ng-if="title">
11-
<svg class="iconic" ng-if="icon">
11+
<svg class="iconic" role="img" ng-if="icon">
1212
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="{{iconPath}}"></use>
1313
</svg>
1414
<span class="label">

app/common/directives/mode-bar/mode-bar.directive.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function (
5151
});
5252

5353
ConfigEndpoint.get({id: 'site'}, function (site) {
54-
$scope.canRegister = !site.private;
54+
$scope.canRegister = !site.private && !site.disable_registration;
5555
});
5656
}
5757

app/common/directives/mode-bar/mode-bar.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ul class="deployment-menu">
77
<li ui-sref-active="{ 'active' : 'posts.map' }">
88
<a ui-sref="posts.map.all" ui-sref-opts="{reload:true}" class="view-map">
9-
<svg class="iconic">
9+
<svg class="iconic" role="img">
1010
<use xlink:href="/img/iconic-sprite.svg#map-marker"></use>
1111
</svg>
1212
<translate>views.map</translate>
@@ -15,7 +15,7 @@
1515

1616
<li ui-sref-active="active">
1717
<a ui-sref="posts.data" ui-sref-opts="{reload:true}" class="view-data">
18-
<svg class="iconic">
18+
<svg class="iconic" role="img">
1919
<use xlink:href="/img/iconic-sprite.svg#list-rich"></use>
2020
</svg>
2121
<translate>views.data</translate>
@@ -24,7 +24,7 @@
2424

2525
<li ng-if="isActivityAvailable || hasManageSettingsPermission()" ui-sref-active="active" data-message="customize">
2626
<a ui-sref="activity">
27-
<svg class="iconic">
27+
<svg class="iconic" role="img">
2828
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#pulse"></use>
2929
</svg>
3030
<translate>views.activity</translate>
@@ -33,15 +33,15 @@
3333

3434
<li>
3535
<button class="more-menu-trigger" ng-class="{ active : moreActive }" ng-click="showMore($event)">
36-
<svg class="iconic">
36+
<svg class="iconic" role="img">
3737
<use xlink:href="/img/iconic-sprite.svg#ellipses"></use>
3838
</svg>
3939
<translate>nav.more</translate>
4040
</button>
4141
<ul>
4242
<li data-message="customize" ng-show="hasManageSettingsPermission()" ng-class="{active: $state.includes('settings')}">
4343
<a ui-sref="settings.list">
44-
<svg class="iconic">
44+
<svg class="iconic" role="img">
4545
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="/img/iconic-sprite.svg#cog"></use>
4646
</svg>
4747
<translate>nav.settings</translate>
@@ -66,7 +66,7 @@
6666

6767
<li ng-hide="currentUser">
6868
<button ng-click="login()" data-modal="login">
69-
<svg class="iconic">
69+
<svg class="iconic" role="img">
7070
<use xlink:href="/img/iconic-sprite.svg#account-login"></use>
7171
</svg>
7272
<translate translate="nav.login">Log in</translate>
@@ -82,7 +82,7 @@
8282

8383
<li ng-show="!currentUser && canRegister">
8484
<button ng-click="register()" data-modal="signup">
85-
<svg class="iconic">
85+
<svg class="iconic" role="img">
8686
<use xlink:href="/img/iconic-sprite.svg#person"></use>
8787
</svg>
8888
<translate translate="nav.register">Sign up</translate>
@@ -91,7 +91,7 @@
9191

9292
<li ng-show="currentUser">
9393
<button ng-click="logout()" data-modal="login">
94-
<svg class="iconic">
94+
<svg class="iconic" role="img">
9595
<use xlink:href="/img/iconic-sprite.svg#account-logout"></use>
9696
</svg>
9797
<span class="label" translate="nav.logout">Log out</span>

0 commit comments

Comments
 (0)