From 0c66f0f5d245c175c34090ea13cc34c2dfc7169b Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sat, 13 Apr 2019 16:29:53 -0600
Subject: [PATCH] Don't let the title attribute carry into child elements

---
 web/app/admin/bridges/bridges.component.html                | 2 +-
 web/app/admin/bridges/gitter/gitter.component.html          | 2 +-
 web/app/admin/bridges/irc/irc.component.html                | 2 +-
 web/app/admin/bridges/slack/slack.component.html            | 2 +-
 web/app/admin/bridges/telegram/telegram.component.html      | 2 +-
 web/app/admin/bridges/webhooks/webhooks.component.html      | 2 +-
 web/app/admin/custom-bots/custom-bots.component.html        | 2 +-
 web/app/admin/home/home.component.html                      | 2 +-
 .../admin/neb/add-selfhosted/add-selfhosted.component.html  | 2 +-
 web/app/admin/neb/edit/edit.component.html                  | 2 +-
 web/app/admin/neb/neb.component.html                        | 2 +-
 web/app/admin/sticker-packs/sticker-packs.component.html    | 2 +-
 web/app/admin/widgets/widgets.component.html                | 2 +-
 web/app/configs/stickerpicker/stickerpicker.component.html  | 6 +++---
 web/app/elements/ibox/ibox.component.html                   | 6 +++---
 web/app/elements/ibox/ibox.component.ts                     | 2 +-
 web/app/riot/riot-home/home.component.html                  | 2 +-
 17 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/web/app/admin/bridges/bridges.component.html b/web/app/admin/bridges/bridges.component.html
index 45b09ee..8faac99 100644
--- a/web/app/admin/bridges/bridges.component.html
+++ b/web/app/admin/bridges/bridges.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Bridges">
+    <my-ibox boxTitle="Bridges">
         <div class="my-ibox-content">
             <p>
                 Bridges provide a way for rooms to interact with and/or bring in events from a third party network. For
diff --git a/web/app/admin/bridges/gitter/gitter.component.html b/web/app/admin/bridges/gitter/gitter.component.html
index 501efdb..21bf206 100644
--- a/web/app/admin/bridges/gitter/gitter.component.html
+++ b/web/app/admin/bridges/gitter/gitter.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Gitter Bridge Configurations">
+    <my-ibox boxTitle="Gitter Bridge Configurations">
         <div class="my-ibox-content">
             <p>
                 <a href="https://github.com/matrix-org/matrix-appservice-gitter" target="_blank">matrix-appservice-gitter</a>
diff --git a/web/app/admin/bridges/irc/irc.component.html b/web/app/admin/bridges/irc/irc.component.html
index 798f093..bc03342 100644
--- a/web/app/admin/bridges/irc/irc.component.html
+++ b/web/app/admin/bridges/irc/irc.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="IRC Bridge Configurations">
+    <my-ibox boxTitle="IRC Bridge Configurations">
         <div class="my-ibox-content">
             <p>
                 <a href="https://github.com/matrix-org/matrix-appservice-irc" target="_blank">matrix-appservice-irc</a>
diff --git a/web/app/admin/bridges/slack/slack.component.html b/web/app/admin/bridges/slack/slack.component.html
index d2eba48..a31a6c4 100644
--- a/web/app/admin/bridges/slack/slack.component.html
+++ b/web/app/admin/bridges/slack/slack.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Slack Bridge Configurations">
+    <my-ibox boxTitle="Slack Bridge Configurations">
         <div class="my-ibox-content">
             <p>
                 <a href="https://github.com/matrix-org/matrix-appservice-slack" target="_blank">matrix-appservice-slack</a>
diff --git a/web/app/admin/bridges/telegram/telegram.component.html b/web/app/admin/bridges/telegram/telegram.component.html
index 3b56f70..401dc79 100644
--- a/web/app/admin/bridges/telegram/telegram.component.html
+++ b/web/app/admin/bridges/telegram/telegram.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Telegram Bridge Configurations">
+    <my-ibox boxTitle="Telegram Bridge Configurations">
         <div class="my-ibox-content">
             <p>
                 <a href="https://github.com/tulir/mautrix-telegram" target="_blank">mautrix-telegram</a>
diff --git a/web/app/admin/bridges/webhooks/webhooks.component.html b/web/app/admin/bridges/webhooks/webhooks.component.html
index f78ad23..765e410 100644
--- a/web/app/admin/bridges/webhooks/webhooks.component.html
+++ b/web/app/admin/bridges/webhooks/webhooks.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Webhooks Bridge Configuration">
+    <my-ibox boxTitle="Webhooks Bridge Configuration">
         <div class="my-ibox-content">
             <p>
                 <a href="https://github.com/turt2live/matrix-appservice-webhooks" target="_blank">matrix-appservice-webhooks</a>
diff --git a/web/app/admin/custom-bots/custom-bots.component.html b/web/app/admin/custom-bots/custom-bots.component.html
index cdf116b..f278587 100644
--- a/web/app/admin/custom-bots/custom-bots.component.html
+++ b/web/app/admin/custom-bots/custom-bots.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Custom bots">
+    <my-ibox boxTitle="Custom bots">
         <div class="my-ibox-content">
             <p>
                 Custom bots give you the ability to add your own bots to Dimension for users to add
diff --git a/web/app/admin/home/home.component.html b/web/app/admin/home/home.component.html
index a34d9ee..95d51b1 100644
--- a/web/app/admin/home/home.component.html
+++ b/web/app/admin/home/home.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Configuration">
+    <my-ibox boxTitle="Configuration">
         <div class="my-ibox-content">
             <p>Parts of your configuration are displayed below. To change these values, edit your configuration and restart Dimension.</p>
 
diff --git a/web/app/admin/neb/add-selfhosted/add-selfhosted.component.html b/web/app/admin/neb/add-selfhosted/add-selfhosted.component.html
index b868a69..b39a3f4 100644
--- a/web/app/admin/neb/add-selfhosted/add-selfhosted.component.html
+++ b/web/app/admin/neb/add-selfhosted/add-selfhosted.component.html
@@ -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">
         <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>
 
diff --git a/web/app/admin/neb/edit/edit.component.html b/web/app/admin/neb/edit/edit.component.html
index 3d50063..50eb5fd 100644
--- a/web/app/admin/neb/edit/edit.component.html
+++ b/web/app/admin/neb/edit/edit.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="go-neb configuration">
+    <my-ibox boxTitle="go-neb configuration">
         <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
                 bots this go-neb instance should use.</p>
diff --git a/web/app/admin/neb/neb.component.html b/web/app/admin/neb/neb.component.html
index d08132b..726e88c 100644
--- a/web/app/admin/neb/neb.component.html
+++ b/web/app/admin/neb/neb.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="go-neb configurations">
+    <my-ibox boxTitle="go-neb configurations">
         <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
                 provide various services, such as reaction GIFs and Github notifications. There are two options for
diff --git a/web/app/admin/sticker-packs/sticker-packs.component.html b/web/app/admin/sticker-packs/sticker-packs.component.html
index cdd8f73..c50729a 100644
--- a/web/app/admin/sticker-packs/sticker-packs.component.html
+++ b/web/app/admin/sticker-packs/sticker-packs.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Sticker Packs">
+    <my-ibox boxTitle="Sticker Packs">
         <div class="my-ibox-content">
             <p>
                 Sticker packs provide a way to convey memes or feelings to others in a room. From here you're able
diff --git a/web/app/admin/widgets/widgets.component.html b/web/app/admin/widgets/widgets.component.html
index ed5c11b..9c823ac 100644
--- a/web/app/admin/widgets/widgets.component.html
+++ b/web/app/admin/widgets/widgets.component.html
@@ -2,7 +2,7 @@
     <my-spinner></my-spinner>
 </div>
 <div *ngIf="!isLoading">
-    <my-ibox title="Widgets">
+    <my-ibox boxTitle="Widgets">
         <div class="my-ibox-content">
             <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>
diff --git a/web/app/configs/stickerpicker/stickerpicker.component.html b/web/app/configs/stickerpicker/stickerpicker.component.html
index f7a6c81..026036f 100644
--- a/web/app/configs/stickerpicker/stickerpicker.component.html
+++ b/web/app/configs/stickerpicker/stickerpicker.component.html
@@ -2,12 +2,12 @@
     <my-spinner></my-spinner>
 </div>
 <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">
             <h5 style="text-align: center;">Sticker packs are not enabled on this Dimension instance.</h5>
         </div>
     </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">
             <form (submit)="importPack()" novalidate name="importForm">
                 <label class="label-block">
@@ -25,7 +25,7 @@
             </form>
         </div>
     </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="pack" *ngFor="let pack of packs trackById">
                 <img [src]="getThumbnailUrl(pack.avatarUrl, 120, 120)" width="120" height="120"/>
diff --git a/web/app/elements/ibox/ibox.component.html b/web/app/elements/ibox/ibox.component.html
index ba58e02..990e203 100644
--- a/web/app/elements/ibox/ibox.component.html
+++ b/web/app/elements/ibox/ibox.component.html
@@ -1,10 +1,10 @@
 <div class="ibox">
     <div class="ibox-title" (click)="isCollapsible ? (collapsed = !collapsed) : false"
          [ngClass]="[isCollapsible ? 'ibox-title-collapsible' : '']">
-        <h5 *ngIf="title">
-            {{ title }}
+        <h5 *ngIf="boxTitle">
+            {{ boxTitle }}
         </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>
         <i class="ibox-icon fa fa-chevron-down" *ngIf="isCollapsible"></i>
     </div>
diff --git a/web/app/elements/ibox/ibox.component.ts b/web/app/elements/ibox/ibox.component.ts
index e37fb5c..c705eb4 100644
--- a/web/app/elements/ibox/ibox.component.ts
+++ b/web/app/elements/ibox/ibox.component.ts
@@ -8,7 +8,7 @@ import { ANIMATION_FADE_IN_NOT_OUT } from "../../app.animations";
     animations: [ANIMATION_FADE_IN_NOT_OUT],
 })
 export class IboxComponent implements OnInit {
-    @Input() title: string;
+    @Input() boxTitle: string;
     @Input() isCollapsible: boolean;
     @Input() defaultCollapsed: boolean;
 
diff --git a/web/app/riot/riot-home/home.component.html b/web/app/riot/riot-home/home.component.html
index abd7ffd..2463704 100644
--- a/web/app/riot/riot-home/home.component.html
+++ b/web/app/riot/riot-home/home.component.html
@@ -35,7 +35,7 @@
     <!-- CATEGORIES               -->
     <!-- ------------------------ -->
     <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">
                 <my-integration-bag [integrations]="getIntegrationsIn(category)" (integrationClicked)="modifyIntegration($event)"></my-integration-bag>
             </div>