Browse Source
Fix/invites (#521)
* Fix invites in clsutering
* Style fixes.
* Permission fixed.
pull/523/head
Sebastian Stehle
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
24 additions and
4 deletions
-
backend/src/Squidex.Web/Resources.cs
-
frontend/app/features/content/pages/content/content-event.component.html
-
frontend/app/features/content/pages/content/content-event.component.scss
-
frontend/app/shared/components/history/history-list.component.html
-
frontend/app/shared/components/history/history-list.component.scss
-
frontend/app/shell/pages/internal/search-menu.component.html
-
frontend/app/shell/pages/internal/search-menu.component.scss
|
|
|
@ -43,7 +43,7 @@ namespace Squidex.Web |
|
|
|
public bool CanDeleteSchema(string schema) => IsAllowedForSchema(P.AppSchemasDelete, schema); |
|
|
|
|
|
|
|
[Lazy] |
|
|
|
public bool CanCreateSchema => IsAllowed(P.AppSchemasUpdate); |
|
|
|
public bool CanCreateSchema => IsAllowed(P.AppSchemasCreate); |
|
|
|
|
|
|
|
// Contributors
|
|
|
|
[Lazy] |
|
|
|
|
|
|
|
@ -2,7 +2,7 @@ |
|
|
|
<div class="col-auto"> |
|
|
|
<img class="user-picture" title="{{event.actor | sqxUserNameRef}}" [src]="event.actor | sqxUserPictureRef" /> |
|
|
|
</div> |
|
|
|
<div class="col pl-2"> |
|
|
|
<div class="col pl-2 event-right"> |
|
|
|
<div class="event-message"> |
|
|
|
<span class="event-actor user-ref mr-1">{{event.actor | sqxUserNameRef:null}}</span> |
|
|
|
<span [innerHTML]="event | sqxHistoryMessage"></span> |
|
|
|
|
|
|
|
@ -20,6 +20,14 @@ |
|
|
|
font-weight: normal; |
|
|
|
margin: .25rem 0; |
|
|
|
} |
|
|
|
|
|
|
|
&-right { |
|
|
|
overflow: hidden; |
|
|
|
} |
|
|
|
|
|
|
|
&-message { |
|
|
|
overflow-wrap: break-word; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
.user-picture { |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<div class="col-auto"> |
|
|
|
<img class="user-picture" title="{{event.actor | sqxUserNameRef}}" [src]="event.actor | sqxUserPictureRef" /> |
|
|
|
</div> |
|
|
|
<div class="col pl-2"> |
|
|
|
<div class="col pl-2 event-right"> |
|
|
|
<div class="event-message"> |
|
|
|
<span class="user-ref">{{event.actor | sqxUserNameRef}}</span> |
|
|
|
<span [innerHTML]="event | sqxHistoryMessage"></span> |
|
|
|
|
|
|
|
@ -27,4 +27,12 @@ |
|
|
|
&-created { |
|
|
|
font-size: .75rem; |
|
|
|
} |
|
|
|
|
|
|
|
&-right { |
|
|
|
overflow: hidden; |
|
|
|
} |
|
|
|
|
|
|
|
&-message { |
|
|
|
overflow-wrap: break-word; |
|
|
|
} |
|
|
|
} |
|
|
|
@ -7,7 +7,7 @@ |
|
|
|
<ng-template let-result="$implicit"> |
|
|
|
<div class="row no-gutters"> |
|
|
|
<div class="col-auto pr-4"> |
|
|
|
<i class="icon-search-{{result.type}}"></i> |
|
|
|
<i class="search-icon icon-search-{{result.type}}"></i> |
|
|
|
</div> |
|
|
|
<div class="col truncate"> |
|
|
|
{{result.name}} |
|
|
|
|
|
|
|
@ -15,6 +15,10 @@ |
|
|
|
width: 300px; |
|
|
|
} |
|
|
|
|
|
|
|
.search-icon { |
|
|
|
font-size: 1.25rem; |
|
|
|
} |
|
|
|
|
|
|
|
.row { |
|
|
|
overflow: hidden; |
|
|
|
} |