imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2859 from jryans/redesign-debug-logs

Browse source 
Use Field component in bug report dialog
This commit is contained in:
J. Ryan Stinnett 2019-04-01 18:33:22 +01:00 • committed by GitHub
commit d92336fc16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

37
res/css/views/dialogs/_BugReportDialog.scss
View file

@ -14,39 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_BugReportDialog_field_container { .mx_BugReportDialog .mx_Field {
display: flex; flex: 1;
}
.mx_BugReportDialog_field_label {
flex-basis: 150px;
text-align: right;
padding-top: 9px;
padding-right: 4px;
line-height: 18px;
} }
.mx_BugReportDialog_field_input { .mx_BugReportDialog_field_input {
flex-grow: 1; // TODO: We should really apply this to all .mx_Field inputs.
// See https://github.com/vector-im/riot-web/issues/9344.
/* taken from mx_ChatInviteDialog_inputContainer */ flex: 1;
border-radius: 3px;
border: solid 1px $input-border-color;
font-size: 14px;
padding-left: 4px;
padding-right: 4px;
padding-top: 7px;
padding-bottom: 7px;
margin-bottom: 4px;
}
.mx_BugReportDialog_field_input[type="text" i] {
padding-top: 9px;
padding-bottom: 9px;
} }

54
src/components/views/dialogs/BugReportDialog.js
View file

@ -108,6 +108,7 @@ export default class BugReportDialog extends React.Component {
const Loader = sdk.getComponent("elements.Spinner"); const Loader = sdk.getComponent("elements.Spinner");
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog'); const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const DialogButtons = sdk.getComponent('views.elements.DialogButtons'); const DialogButtons = sdk.getComponent('views.elements.DialogButtons');
const Field = sdk.getComponent('elements.Field');
let error = null; let error = null;
if (this.state.err) { if (this.state.err) {
@ -154,36 +155,29 @@ export default class BugReportDialog extends React.Component {
}, },
) } ) }
</b></p> </b></p>
<div className="mx_BugReportDialog_field_container"> <Field
<label id="mx_BugReportDialog_issueUrl"
htmlFor="mx_BugReportDialog_issueUrl" type="text"
className="mx_BugReportDialog_field_label" className="mx_BugReportDialog_field_input"
> label={_t("GitHub issue")}
{ _t("What GitHub issue are these logs for?") } onChange={this._onIssueUrlChange}
</label> value={this.state.issueUrl}
<input placeholder="https://github.com/vector-im/riot-web/issues/..."
id="mx_BugReportDialog_issueUrl" />
type="text" <Field
className="mx_BugReportDialog_field_input" className="mx_BugReportDialog_field_input"
onChange={this._onIssueUrlChange} element="textarea"
value={this.state.issueUrl} label={_t("Notes")}
placeholder="https://github.com/vector-im/riot-web/issues/..." rows={5}
/> onChange={this._onTextChange}
</div> value={this.state.text}
<div className="mx_BugReportDialog_field_container"> placeholder={_t(
<label "If there is additional context that would help in " +
htmlFor="mx_BugReportDialog_notes_label" "analysing the issue, such as what you were doing at " +
className="mx_BugReportDialog_field_label" "the time, room IDs, user IDs, etc., " +
> "please include those things here.",
{ _t("Notes:") } )}
</label> />
<textarea
className="mx_BugReportDialog_field_input"
rows={5}
onChange={this._onTextChange}
value={this.state.text}
/>
</div>
{progress} {progress}
{error} {error}
</div> </div>

5
src/i18n/strings/en_EN.json
View file

@ -1042,8 +1042,9 @@
"Failed to send logs: ": "Failed to send logs: ", "Failed to send logs: ": "Failed to send logs: ",
"Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.", "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.": "Debug logs contain application usage data including your username, the IDs or aliases of the rooms or groups you have visited and the usernames of other users. They do not contain messages.",
"Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.", "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.": "Before submitting logs, you must <a>create a GitHub issue</a> to describe your problem.",
"What GitHub issue are these logs for?": "What GitHub issue are these logs for?", "GitHub issue": "GitHub issue",
"Notes:": "Notes:", "Notes": "Notes",
"If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.",
"Send logs": "Send logs", "Send logs": "Send logs",
"Unable to load commit detail: %(msg)s": "Unable to load commit detail: %(msg)s", "Unable to load commit detail: %(msg)s": "Unable to load commit detail: %(msg)s",
"Unavailable": "Unavailable", "Unavailable": "Unavailable",