Skip to content

Commit

Permalink
MM-10074 - Updating modal title markup (mattermost#2790)
Browse files Browse the repository at this point in the history
  • Loading branch information
asaadmahmood authored and saturninoabril committed May 14, 2019
1 parent 505eaa6 commit 6111a59
Show file tree
Hide file tree
Showing 72 changed files with 249 additions and 129 deletions.
4 changes: 2 additions & 2 deletions components/__snapshots__/list_modal.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports[`components/ListModal should match snapshot 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
>
<span
className="name"
Expand Down Expand Up @@ -143,7 +143,7 @@ exports[`components/ListModal should match snapshot with title bar button 1`] =
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
>
<span
className="name"
Expand Down
4 changes: 2 additions & 2 deletions components/__snapshots__/post_deleted_modal.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`components/ChannelInfoModal should match snapshot when modal is not sho
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="postDeletedModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -112,7 +112,7 @@ exports[`components/ChannelInfoModal should match snapshot when modal is showing
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="postDeletedModalLabel"
>
<FormattedMessage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports[`components/AboutBuildModal should match snapshot for enterprise edition
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="aboutModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -280,7 +280,7 @@ exports[`components/AboutBuildModal should match snapshot for team edition 1`] =
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="aboutModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -512,7 +512,7 @@ exports[`components/AboutBuildModal should show ci if a ci build 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="aboutModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -756,7 +756,7 @@ exports[`components/AboutBuildModal should show dev if this is a dev build 1`] =
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="aboutModalLabel"
>
<FormattedMessage
Expand Down
5 changes: 4 additions & 1 deletion components/about_build_modal/about_build_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,10 @@ export default class AboutBuildModal extends React.PureComponent {
aria-labelledby='aboutModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='aboutModalLabel'>
<Modal.Title
componentClass='h1'
id='aboutModalLabel'
>
<FormattedMessage
id='about.title'
defaultMessage='About Mattermost'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports[`components/AccessHistoryModal should match snapshot when audits exist 1
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="accessHistoryModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -104,7 +104,7 @@ exports[`components/AccessHistoryModal should match snapshot when no audits exis
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="accessHistoryModalLabel"
>
<FormattedMessage
Expand Down
5 changes: 4 additions & 1 deletion components/access_history_modal/access_history_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,10 @@ export default class AccessHistoryModal extends React.PureComponent {
aria-labelledby='accessHistoryModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='accessHistoryModalLabel'>
<Modal.Title
componentClass='h1'
id='accessHistoryModalLabel'
>
<FormattedMessage
id='access_history.title'
defaultMessage='Access History'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports[`components/ActivityLogModal should match snapshot 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="activityLogModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -106,7 +106,7 @@ exports[`components/ActivityLogModal should match snapshot 2`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="activityLogModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -175,7 +175,7 @@ exports[`components/ActivityLogModal should match snapshot when submitRevoke is
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="activityLogModalLabel"
>
<FormattedMessage
Expand Down
5 changes: 4 additions & 1 deletion components/activity_log_modal/activity_log_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ export default class ActivityLogModal extends React.PureComponent {
aria-labelledby='activityLogModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='activityLogModalLabel'>
<Modal.Title
componentClass='h1'
id='activityLogModalLabel'
>
<FormattedMessage
id='activity_log.activeSessions'
defaultMessage='Active Sessions'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports[`components/AddGroupsToTeamModal should match snapshot 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
>
<FormattedMessage
defaultMessage="Add New Groups To {teamName} Team"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ export default class AddGroupsToTeamModal extends React.Component {
onExited={this.handleExit}
>
<Modal.Header closeButton={true}>
<Modal.Title>
<Modal.Title componentClass='h1'>
<FormattedMessage
id='add_groups_to_team.title'
defaultMessage='Add New Groups To {teamName} Team'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exports[`components/AddUserToChannelModal should match snapshot 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="addChannelModalLabel"
>
<FormattedMessage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,10 @@ export default class AddUserToChannelModal extends React.Component {
aria-labelledby='addChannelModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='addChannelModalLabel'>
<Modal.Title
componentClass='h1'
id='addChannelModalLabel'
>
<FormattedMessage
id='add_user_to_channel_modal.title'
defaultMessage='Add {name} to a channel'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ exports[`components/AddUsersToTeam should match snapshot 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="addTeamModalLabel"
>
<FormattedMessage
Expand Down
5 changes: 4 additions & 1 deletion components/add_users_to_team/add_users_to_team.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ export default class AddUsersToTeam extends React.Component {
aria-labelledby='addTeamModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='addTeamModalLabel'>
<Modal.Title
componentClass='h1'
id='addTeamModalLabel'
>
<FormattedMessage
id='add_users_to_team.title'
defaultMessage='Add New Members To {teamName} Team'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,10 @@ export default class ManageRolesModal extends React.PureComponent {
aria-labelledby='manageRolesModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='manageRolesModalLabel'>
<Modal.Title
componentClass='h1'
id='manageRolesModalLabel'
>
<FormattedMessage
id='admin.manage_roles.manageRolesTitle'
defaultMessage='Manage Roles'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports[`ManageTeamsModal should match snapshot init 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="manageTeamsModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -122,7 +122,7 @@ exports[`ManageTeamsModal should save data in state from api calls 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="manageTeamsModalLabel"
>
<FormattedMessage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,10 @@ export default class ManageTeamsModal extends React.Component {
aria-labelledby='manageTeamsModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='manageTeamsModalLabel'>
<Modal.Title
componentClass='h1'
id='manageTeamsModalLabel'
>
<FormattedMessage
id='admin.user_item.manageTeams'
defaultMessage='Manage Teams'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,10 @@ export default class ManageTokensModal extends React.PureComponent {
aria-labelledby='manageTokensModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='manageTokensModalLabel'>
<Modal.Title
componentClass='h1'
id='manageTokensModalLabel'
>
<FormattedMessage
id='admin.manage_tokens.manageTokensTitle'
defaultMessage='Manage Personal Access Tokens'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ export default class EditPostTimeLimitModal extends React.Component {
<Modal.Header
closeButton={true}
>
<Modal.Title id='editPostTimeModalLabel'>
<Modal.Title
componentClass='h1'
id='editPostTimeModalLabel'
>
<FormattedMessage
id='edit_post.time_limit_modal.title'
defaultMessage='Configure Global Edit Post Time Limit'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ export default class ResetEmailModal extends React.Component {
aria-labelledby='resetEmailModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='resetEmailModalLabel'>
<Modal.Title
componentClass='h1'
id='resetEmailModalLabel'
>
{title}
</Modal.Title>
</Modal.Header>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ export default class ResetPasswordModal extends React.Component {
aria-labelledby='resetPasswordModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='resetPasswordModalLabel'>
<Modal.Title
componentClass='h1'
id='resetPasswordModalLabel'
>
{title}
</Modal.Title>
</Modal.Header>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ exports[`components/ChangeURLModal should match snapshot, modal not showing 1`]
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="changeUrlModalLabel"
>
Change URL
Expand Down Expand Up @@ -178,7 +178,7 @@ exports[`components/ChangeURLModal should match snapshot, modal showing 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="changeUrlModalLabel"
>
Change URL
Expand Down Expand Up @@ -321,7 +321,7 @@ exports[`components/ChangeURLModal should match snapshot, on currentURL 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="changeUrlModalLabel"
>
Change URL
Expand Down Expand Up @@ -473,7 +473,7 @@ exports[`components/ChangeURLModal should match snapshot, on urlError 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="changeUrlModalLabel"
>
Change URL
Expand Down Expand Up @@ -625,7 +625,7 @@ exports[`components/ChangeURLModal should match snapshot, with a input 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="changeUrlModalLabel"
>
Change URL
Expand Down
7 changes: 6 additions & 1 deletion components/change_url_modal/change_url_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,12 @@ export default class ChangeURLModal extends React.PureComponent {
aria-labelledby='changeUrlModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='changeUrlModalLabel'>{this.props.title}</Modal.Title>
<Modal.Title
componentClass='h1'
id='changeUrlModalLabel'
>
{this.props.title}
</Modal.Title>
</Modal.Header>
<form
role='form'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ exports[`components/ChannelInfoModal should match snapshot 1`] = `
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="channelInfoModalLabel"
>
<FormattedMessage
Expand Down Expand Up @@ -126,7 +126,7 @@ exports[`components/ChannelInfoModal should match snapshot with channel props 1`
>
<ModalTitle
bsClass="modal-title"
componentClass="h4"
componentClass="h1"
id="channelInfoModalLabel"
>
<FormattedMessage
Expand Down
5 changes: 4 additions & 1 deletion components/channel_info_modal/channel_info_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ export default class ChannelInfoModal extends React.PureComponent {
aria-labelledby='channelInfoModalLabel'
>
<Modal.Header closeButton={true}>
<Modal.Title id='channelInfoModalLabel'>
<Modal.Title
componentClass='h1'
id='channelInfoModalLabel'
>
<FormattedMessage
id='channel_info.about'
defaultMessage='About'
Expand Down
Loading

0 comments on commit 6111a59

Please sign in to comment.