Don't let the title attribute carry into child elements

This commit is contained in:
Travis Ralston 2019-04-13 16:29:53 -06:00
parent 5a7997450d
commit 0c66f0f5d2
17 changed files with 21 additions and 21 deletions

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Bridges"> <my-ibox boxTitle="Bridges">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
Bridges provide a way for rooms to interact with and/or bring in events from a third party network. For Bridges provide a way for rooms to interact with and/or bring in events from a third party network. For

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Gitter Bridge Configurations"> <my-ibox boxTitle="Gitter Bridge Configurations">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
<a href="https://github.com/matrix-org/matrix-appservice-gitter" target="_blank">matrix-appservice-gitter</a> <a href="https://github.com/matrix-org/matrix-appservice-gitter" target="_blank">matrix-appservice-gitter</a>

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="IRC Bridge Configurations"> <my-ibox boxTitle="IRC Bridge Configurations">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
<a href="https://github.com/matrix-org/matrix-appservice-irc" target="_blank">matrix-appservice-irc</a> <a href="https://github.com/matrix-org/matrix-appservice-irc" target="_blank">matrix-appservice-irc</a>

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Slack Bridge Configurations"> <my-ibox boxTitle="Slack Bridge Configurations">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
<a href="https://github.com/matrix-org/matrix-appservice-slack" target="_blank">matrix-appservice-slack</a> <a href="https://github.com/matrix-org/matrix-appservice-slack" target="_blank">matrix-appservice-slack</a>

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Telegram Bridge Configurations"> <my-ibox boxTitle="Telegram Bridge Configurations">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
<a href="https://github.com/tulir/mautrix-telegram" target="_blank">mautrix-telegram</a> <a href="https://github.com/tulir/mautrix-telegram" target="_blank">mautrix-telegram</a>

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Webhooks Bridge Configuration"> <my-ibox boxTitle="Webhooks Bridge Configuration">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
<a href="https://github.com/turt2live/matrix-appservice-webhooks" target="_blank">matrix-appservice-webhooks</a> <a href="https://github.com/turt2live/matrix-appservice-webhooks" target="_blank">matrix-appservice-webhooks</a>

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Custom bots"> <my-ibox boxTitle="Custom bots">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
Custom bots give you the ability to add your own bots to Dimension for users to add Custom bots give you the ability to add your own bots to Dimension for users to add

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Configuration"> <my-ibox boxTitle="Configuration">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p>Parts of your configuration are displayed below. To change these values, edit your configuration and restart Dimension.</p> <p>Parts of your configuration are displayed below. To change these values, edit your configuration and restart Dimension.</p>

View File

@ -1,4 +1,4 @@
<my-ibox title="New self-hosted go-neb"> <my-ibox boxTitle="New self-hosted go-neb">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p>Self-hosted go-neb instances are powered by application services installed on your homeserver. The application service is responsible for creating the bots dynamically.</p> <p>Self-hosted go-neb instances are powered by application services installed on your homeserver. The application service is responsible for creating the bots dynamically.</p>

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="go-neb configuration"> <my-ibox boxTitle="go-neb configuration">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p>go-neb supports many different types of bots, each of which is listed below. Here you can configure which <p>go-neb supports many different types of bots, each of which is listed below. Here you can configure which
bots this go-neb instance should use.</p> bots this go-neb instance should use.</p>

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="go-neb configurations"> <my-ibox boxTitle="go-neb configurations">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p><a href="https://github.com/matrix-org/go-neb" target="_blank">go-neb</a> is a multi-purpose bot that can <p><a href="https://github.com/matrix-org/go-neb" target="_blank">go-neb</a> is a multi-purpose bot that can
provide various services, such as reaction GIFs and Github notifications. There are two options for provide various services, such as reaction GIFs and Github notifications. There are two options for

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Sticker Packs"> <my-ibox boxTitle="Sticker Packs">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p> <p>
Sticker packs provide a way to convey memes or feelings to others in a room. From here you're able Sticker packs provide a way to convey memes or feelings to others in a room. From here you're able

View File

@ -2,7 +2,7 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Widgets"> <my-ibox boxTitle="Widgets">
<div class="my-ibox-content"> <div class="my-ibox-content">
<p>Widgets are small webpages that can be embedded in a Matrix room. Here you can configure which widgets <p>Widgets are small webpages that can be embedded in a Matrix room. Here you can configure which widgets
Dimension will offer to users.</p> Dimension will offer to users.</p>

View File

@ -2,12 +2,12 @@
<my-spinner></my-spinner> <my-spinner></my-spinner>
</div> </div>
<div *ngIf="!isLoading"> <div *ngIf="!isLoading">
<my-ibox title="Sticker Packs" *ngIf="packs.length <= 0"> <my-ibox boxTitle="Sticker Packs" *ngIf="packs.length <= 0">
<div class="my-ibox-content"> <div class="my-ibox-content">
<h5 style="text-align: center;">Sticker packs are not enabled on this Dimension instance.</h5> <h5 style="text-align: center;">Sticker packs are not enabled on this Dimension instance.</h5>
</div> </div>
</my-ibox> </my-ibox>
<my-ibox title="Add Sticker Packs" *ngIf="packs.length > 0 && customEnabled"> <my-ibox boxTitle="Add Sticker Packs" *ngIf="packs.length > 0 && customEnabled">
<div class="my-ibox-content"> <div class="my-ibox-content">
<form (submit)="importPack()" novalidate name="importForm"> <form (submit)="importPack()" novalidate name="importForm">
<label class="label-block"> <label class="label-block">
@ -25,7 +25,7 @@
</form> </form>
</div> </div>
</my-ibox> </my-ibox>
<my-ibox title="Sticker Packs" *ngIf="packs.length > 0"> <my-ibox boxTitle="Sticker Packs" *ngIf="packs.length > 0">
<div class="my-ibox-content"> <div class="my-ibox-content">
<div class="pack" *ngFor="let pack of packs trackById"> <div class="pack" *ngFor="let pack of packs trackById">
<img [src]="getThumbnailUrl(pack.avatarUrl, 120, 120)" width="120" height="120"/> <img [src]="getThumbnailUrl(pack.avatarUrl, 120, 120)" width="120" height="120"/>

View File

@ -1,10 +1,10 @@
<div class="ibox"> <div class="ibox">
<div class="ibox-title" (click)="isCollapsible ? (collapsed = !collapsed) : false" <div class="ibox-title" (click)="isCollapsible ? (collapsed = !collapsed) : false"
[ngClass]="[isCollapsible ? 'ibox-title-collapsible' : '']"> [ngClass]="[isCollapsible ? 'ibox-title-collapsible' : '']">
<h5 *ngIf="title"> <h5 *ngIf="boxTitle">
{{ title }} {{ boxTitle }}
</h5> </h5>
<ng-content select=".my-ibox-title" *ngIf="!title"></ng-content> <ng-content select=".my-ibox-title" *ngIf="!boxTitle"></ng-content>
<ng-content select=".my-ibox-addl-title"></ng-content> <ng-content select=".my-ibox-addl-title"></ng-content>
<i class="ibox-icon fa fa-chevron-down" *ngIf="isCollapsible"></i> <i class="ibox-icon fa fa-chevron-down" *ngIf="isCollapsible"></i>
</div> </div>

View File

@ -8,7 +8,7 @@ import { ANIMATION_FADE_IN_NOT_OUT } from "../../app.animations";
animations: [ANIMATION_FADE_IN_NOT_OUT], animations: [ANIMATION_FADE_IN_NOT_OUT],
}) })
export class IboxComponent implements OnInit { export class IboxComponent implements OnInit {
@Input() title: string; @Input() boxTitle: string;
@Input() isCollapsible: boolean; @Input() isCollapsible: boolean;
@Input() defaultCollapsed: boolean; @Input() defaultCollapsed: boolean;

View File

@ -35,7 +35,7 @@
<!-- CATEGORIES --> <!-- CATEGORIES -->
<!-- ------------------------ --> <!-- ------------------------ -->
<div *ngFor="let category of getCategories()"> <div *ngFor="let category of getCategories()">
<my-ibox *ngIf="getIntegrationsIn(category).length > 0" title="{{category}}" [isCollapsible]="true"> <my-ibox *ngIf="getIntegrationsIn(category).length > 0" boxTitle="{{category}}" [isCollapsible]="true">
<div class="my-ibox-content"> <div class="my-ibox-content">
<my-integration-bag [integrations]="getIntegrationsIn(category)" (integrationClicked)="modifyIntegration($event)"></my-integration-bag> <my-integration-bag [integrations]="getIntegrationsIn(category)" (integrationClicked)="modifyIntegration($event)"></my-integration-bag>
</div> </div>