Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

Move more buttons to the right

Browse Source
This commit is contained in:
Florian Scholdei
2019-12-11 15:40:37 +01:00
parent eff01c43c9
commit 59974b4aad
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-plugins/scm-git-plugin/src/main/js/RepositoryConfig.tsx
View File

@@ -1,7 +1,7 @@
import React, { FormEvent } from "react"; import React, { FormEvent } from "react";
import { WithTranslation, withTranslation } from "react-i18next"; import { WithTranslation, withTranslation } from "react-i18next";
import { Branch, Repository, Link } from "@scm-manager/ui-types"; import { Branch, Repository, Link } from "@scm-manager/ui-types";
import { apiClient, BranchSelector, ErrorPage, Loading, Subtitle, SubmitButton } from "@scm-manager/ui-components"; import { apiClient, BranchSelector, ErrorPage, Loading, Subtitle, Level, SubmitButton } from "@scm-manager/ui-components";
type Props = WithTranslation & { type Props = WithTranslation & {
repository: Repository; repository: Repository;
@@ -143,11 +143,15 @@ class RepositoryConfig extends React.Component<Props, State> {
} }
const submitButton = disabled ? null : ( const submitButton = disabled ? null : (
<Level
right={
<SubmitButton <SubmitButton
label={t("scm-git-plugin.repo-config.submit")} label={t("scm-git-plugin.repo-config.submit")}
loading={submitPending} loading={submitPending}
disabled={!this.state.selectedBranchName} disabled={!this.state.selectedBranchName}
/> />
}
/>
); );
if (!(loadingBranches || loadingDefaultBranch)) { if (!(loadingBranches || loadingDefaultBranch)) {

6
scm-ui/ui-webapp/src/repos/branches/components/BranchForm.tsx
View File

@@ -1,7 +1,7 @@
import React from "react"; import React from "react";
import { WithTranslation, withTranslation } from "react-i18next"; import { WithTranslation, withTranslation } from "react-i18next";
import { Repository, Branch, BranchRequest } from "@scm-manager/ui-types"; import { Repository, Branch, BranchRequest } from "@scm-manager/ui-types";
import { Select, InputField, SubmitButton, validation as validator } from "@scm-manager/ui-components"; import { Select, InputField, Level, SubmitButton, validation as validator } from "@scm-manager/ui-components";
import { orderBranches } from "../util/orderBranches"; import { orderBranches } from "../util/orderBranches";
type Props = WithTranslation & { type Props = WithTranslation & {
@@ -83,11 +83,15 @@ class BranchForm extends React.Component<Props, State> {
</div> </div>
<div className="columns"> <div className="columns">
<div className="column"> <div className="column">
<Level
right={
<SubmitButton <SubmitButton
disabled={disabled || !this.isValid()} disabled={disabled || !this.isValid()}
loading={loading} loading={loading}
label={t("branches.create.submit")} label={t("branches.create.submit")}
/> />
}
/>
</div> </div>
</div> </div>
</form> </form>