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

applied simplified brunchdetail design

Browse Source
This commit is contained in:
Florian Scholdei
2019-04-02 17:45:25 +02:00
parent 7c61efb20b
commit 81d25e74eb
4 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-ui/public/locales/de/repos.json
View File

@@ -61,9 +61,7 @@
} }
}, },
"branch": { "branch": {
"name": "Name", "name": "Name:",
"repository": "Repository",
"actions": "Aktionen",
"commits": "Commits", "commits": "Commits",
"sources": "Sources" "sources": "Sources"
}, },

4
scm-ui/public/locales/en/repos.json
View File

@@ -61,9 +61,7 @@
} }
}, },
"branch": { "branch": {
"name": "Name", "name": "Name:",
"repository": "Repository",
"actions": "Actions",
"commits": "Commits", "commits": "Commits",
"sources": "Sources" "sources": "Sources"
}, },

30
scm-ui/src/repos/branches/components/BranchDetailTable.js → scm-ui/src/repos/branches/components/BranchDetail.js
View File

@@ -21,31 +21,17 @@ const styles = {
} }
}; };
class BranchDetailTable extends React.Component<Props> { class BranchDetail extends React.Component<Props> {
render() { render() {
const { repository, branch, t } = this.props; const { repository, branch, t } = this.props;
return ( return (
<table className="table"> <div className="media">
<tbody> <div className="media-content subtitle"><strong>{t("branch.name")}</strong> {branch.name} {this.renderDefaultBranch()}</div>
<tr> <div className="media-right">
<th>{t("branch.name")}</th> <BranchButtonGroup repository={repository} branch={branch} />
<td> </div>
{branch.name} {this.renderDefaultBranch()} </div>
</td>
</tr>
<tr>
<th>{t("branch.repository")}</th>
<td>{repository.name}</td>
</tr>
<tr>
<th>{t("branch.actions")}</th>
<td>
<BranchButtonGroup repository={repository} branch={branch} />
</td>
</tr>
</tbody>
</table>
); );
} }
@@ -62,4 +48,4 @@ class BranchDetailTable extends React.Component<Props> {
} }
} }
export default injectSheet(styles)(translate("repos")(BranchDetailTable)); export default injectSheet(styles)(translate("repos")(BranchDetail));

4
scm-ui/src/repos/branches/containers/BranchView.js
View File

@@ -1,6 +1,6 @@
// @flow // @flow
import React from "react"; import React from "react";
import BranchDetailTable from "../components/BranchDetailTable"; import BranchDetail from "../components/BranchDetail";
import { ExtensionPoint } from "@scm-manager/ui-extensions"; import { ExtensionPoint } from "@scm-manager/ui-extensions";
import type { Repository, Branch } from "@scm-manager/ui-types"; import type { Repository, Branch } from "@scm-manager/ui-types";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -54,7 +54,7 @@ class BranchView extends React.Component<Props> {
return ( return (
<div> <div>
<BranchDetailTable repository={repository} branch={branch} /> <BranchDetail repository={repository} branch={branch} />
<hr /> <hr />
<div className="content"> <div className="content">
<ExtensionPoint <ExtensionPoint