tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Actions label unified

pull/221/head
Sebastian Stehle 8 years ago
parent
35353d51ca
commit
7042dbf6fe
9 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html
  2. 4
      src/Squidex/app/features/administration/pages/users/users-page.component.html
  3. 4
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  4. 4
      src/Squidex/app/features/content/shared/content-item.component.html
  5. 4
      src/Squidex/app/features/rules/pages/events/rule-events-page.component.html
  6. 4
      src/Squidex/app/features/rules/pages/rules/rules-page.component.html
  7. 8
      src/Squidex/app/features/settings/pages/clients/client.component.html
  8. 2
      src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
  9. 8
      src/Squidex/app/theme/_lists.scss

4
src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html
View File

@ -30,7 +30,7 @@
<th class="cell-auto-right"> <th class="cell-auto-right">
Position Position
</th> </th>
<th class="cell-options-lg"> <th class="cell-actions-lg">
Actions Actions
</th> </th>
</tr> </tr>
@ -49,7 +49,7 @@
<td class="cell-auto-right"> <td class="cell-auto-right">
<span>{{eventConsumer.position}}</span> <span>{{eventConsumer.position}}</span>
</td> </td>
<td class="cell-options-lg"> <td class="cell-actions-lg">
<button class="btn btn-link" (click)="reset(eventConsumer)" *ngIf="!eventConsumer.isResetting" title="Reset Event Consumer"> <button class="btn btn-link" (click)="reset(eventConsumer)" *ngIf="!eventConsumer.isResetting" title="Reset Event Consumer">
<i class="icon icon-reset"></i> <i class="icon icon-reset"></i>
</button> </button>

4
src/Squidex/app/features/administration/pages/users/users-page.component.html
View File

@ -44,7 +44,7 @@
<th class="cell-auto"> <th class="cell-auto">
Email Email
</th> </th>
<th class="cell-options"> <th class="cell-actions">
Actions Actions
</th> </th>
</tr> </tr>
@ -67,7 +67,7 @@
<td class="cell-auto"> <td class="cell-auto">
<span class="user-email table-cell">{{user.email}}</span> <span class="user-email table-cell">{{user.email}}</span>
</td> </td>
<td class="cell-options"> <td class="cell-actions">
<span *ngIf="user.id !== ctx.userId"> <span *ngIf="user.id !== ctx.userId">
<button class="btn btn-link" (click)="lock(user); $event.stopPropagation();" *ngIf="!user.isLocked" title="Lock User"> <button class="btn btn-link" (click)="lock(user); $event.stopPropagation();" *ngIf="!user.isLocked" title="Lock User">
<i class="icon icon-unlocked"></i> <i class="icon icon-unlocked"></i>

4
src/Squidex/app/features/content/pages/contents/contents-page.component.html
View File

@ -83,8 +83,8 @@
<th class="cell-user"> <th class="cell-user">
By By
</th> </th>
<th class="cell-options" *ngIf="!isReadOnly"> <th class="cell-actions" *ngIf="!isReadOnly">
Options Actions
</th> </th>
</tr> </tr>
</thead> </thead>

4
src/Squidex/app/features/content/shared/content-item.component.html
View File

@ -17,7 +17,7 @@
<td class="cell-user"> <td class="cell-user">
<img class="user-picture" [attr.title]="content.lastModifiedBy | sqxUserNameRef" [attr.src]="content.lastModifiedBy | sqxUserPictureRef" /> <img class="user-picture" [attr.title]="content.lastModifiedBy | sqxUserNameRef" [attr.src]="content.lastModifiedBy | sqxUserPictureRef" />
</td> </td>
<td class="cell-options" *ngIf="!isReadOnly"> <td class="cell-actions" *ngIf="!isReadOnly">
<div class="dropdown dropdown-options" *ngIf="content"> <div class="dropdown dropdown-options" *ngIf="content">
<button type="button" class="btn btn-link btn-decent" (click)="dropdown.toggle(); $event.stopPropagation()" [class.active]="dropdown.isOpen | async" #optionsButton> <button type="button" class="btn btn-link btn-decent" (click)="dropdown.toggle(); $event.stopPropagation()" [class.active]="dropdown.isOpen | async" #optionsButton>
<i class="icon-dots"></i> <i class="icon-dots"></i>
@ -44,7 +44,7 @@
</div> </div>
</div> </div>
</td> </td>
<td class="cell-options" *ngIf="isReference"> <td class="cell-actions" *ngIf="isReference">
<button type="button" class="btn btn-link btn-secondary" (click)="deleting.emit(); $event.stopPropagation()"> <button type="button" class="btn btn-link btn-secondary" (click)="deleting.emit(); $event.stopPropagation()">
<i class="icon-close"></i> <i class="icon-close"></i>
</button> </button>

4
src/Squidex/app/features/rules/pages/events/rule-events-page.component.html
View File

@ -36,7 +36,7 @@
<th class="cell-time"> <th class="cell-time">
Created Created
</th> </th>
<th class="cell-options"> <th class="cell-actions">
</th> </th>
</tr> </tr>
@ -57,7 +57,7 @@
<td class="cell-time"> <td class="cell-time">
<small class="item-modified">{{event.created | sqxFromNow}}</small> <small class="item-modified">{{event.created | sqxFromNow}}</small>
</td> </td>
<td class="cell-options"> <td class="cell-actions">
<button type="button" class="btn btn-secondary table-items-edit-button" [class.active]="selectedEventId === event.id" (click)="selectEvent(event.id)"> <button type="button" class="btn btn-secondary table-items-edit-button" [class.active]="selectedEventId === event.id" (click)="selectEvent(event.id)">
<i class="icon-settings"></i> <i class="icon-settings"></i>
</button> </button>

4
src/Squidex/app/features/rules/pages/rules/rules-page.component.html
View File

@ -60,10 +60,10 @@
</span> </span>
</span> </span>
</td> </td>
<td class="cell-options"> <td class="cell-actions">
<sqx-toggle [ngModel]="rule.isEnabled" (ngModelChange)="toggleRule(rule)"></sqx-toggle> <sqx-toggle [ngModel]="rule.isEnabled" (ngModelChange)="toggleRule(rule)"></sqx-toggle>
</td> </td>
<td class="cell-options"> <td class="cell-actions">
<button type="button" class="btn btn-link btn-danger" <button type="button" class="btn btn-link btn-danger"
(sqxConfirmClick)="deleteRule(rule)" (sqxConfirmClick)="deleteRule(rule)"
confirmTitle="Delete rule" confirmTitle="Delete rule"

8
src/Squidex/app/features/settings/pages/clients/client.component.html
View File

@ -30,7 +30,7 @@
<div class="col col-auto"> <div class="col col-auto">
<button class="btn btn-secondary" (click)="createToken(client)">Create Token</button> <button class="btn btn-secondary" (click)="createToken(client)">Create Token</button>
</div> </div>
<div class="col col-auto cell-options"> <div class="col col-auto cell-actions">
<button type="button" class="btn btn-link btn-danger" <button type="button" class="btn btn-link btn-danger"
(sqxConfirmClick)="revoking.emit()" (sqxConfirmClick)="revoking.emit()"
confirmTitle="Revoke client" confirmTitle="Revoke client"
@ -46,7 +46,7 @@
<div class="col"> <div class="col">
<input readonly class="form-control" value="{{ctx.appName}}:{{client.id}}" #inputName /> <input readonly class="form-control" value="{{ctx.appName}}:{{client.id}}" #inputName />
</div> </div>
<div class="col col-auto cell-options"> <div class="col col-auto cell-actions">
<button type="button" class="btn btn-primary btn-link" [sqxCopy]="inputName"> <button type="button" class="btn btn-primary btn-link" [sqxCopy]="inputName">
<i class="icon-copy"></i> <i class="icon-copy"></i>
</button> </button>
@ -59,7 +59,7 @@
<div class="col"> <div class="col">
<input readonly class="form-control" [attr.value]="client.secret" #inputSecret /> <input readonly class="form-control" [attr.value]="client.secret" #inputSecret />
</div> </div>
<div class="col col-auto cell-options"> <div class="col col-auto cell-actions">
<button type="button" class="btn btn-primary btn-link" [sqxCopy]="inputSecret"> <button type="button" class="btn btn-primary btn-link" [sqxCopy]="inputSecret">
<i class="icon-copy"></i> <i class="icon-copy"></i>
</button> </button>
@ -72,7 +72,7 @@
<div class="col"> <div class="col">
<input readonly class="form-control" value="{{ctx.appName}}:{{client.id}}" #inputName /> <input readonly class="form-control" value="{{ctx.appName}}:{{client.id}}" #inputName />
</div> </div>
<div class="col col-auto cell-options"> <div class="col col-auto cell-actions">
</div> </div>
</div> </div>
</div> </div>

2
src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
View File

@ -35,7 +35,7 @@
<option *ngFor="let permission of usersPermissions" [ngValue]="permission">{{permission}}</option> <option *ngFor="let permission of usersPermissions" [ngValue]="permission">{{permission}}</option>
</select> </select>
</td> </td>
<td class="cell-options"> <td class="cell-actions">
<button type="button" class="btn btn-link btn-danger" [disabled]="userId === contributor.contributorId" (click)="removeContributor(contributor)"> <button type="button" class="btn btn-link btn-danger" [disabled]="userId === contributor.contributorId" (click)="removeContributor(contributor)">
<i class="icon-bin2"></i> <i class="icon-bin2"></i>
</button> </button>

8
src/Squidex/app/theme/_lists.scss
View File

@ -209,11 +209,11 @@
width: 180px; width: 180px;
} }
&-options { &-actions {
width: 70px; width: 70px;
} }
&-options-lg { &-actions-lg {
width: 150px; width: 150px;
} }
@ -223,8 +223,8 @@
} }
&-auto-right, &-auto-right,
&-options, &-actions,
&-options-lg { &-actions-lg {
text-align: right; text-align: right;
} }
} }

Write Preview
Loading…
Cancel
Save