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

merged changes

Browse Source
This commit is contained in:
Philipp Czora
2018-10-04 17:12:56 +02:00
parent 35bbb44aaa 8e23a85e7c
commit 11d1575265
4 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-ui/src/repos/components/changesets/ChangesetAuthor.js
View File

@@ -11,7 +11,7 @@ export default class ChangesetAuthor extends React.Component<Props> {
render() { render() {
const { changeset } = this.props; const { changeset } = this.props;
return ( return (
<div> <>
{changeset.author.name}{" "} {changeset.author.name}{" "}
<a <a
className="is-hidden-mobile" className="is-hidden-mobile"
@@ -21,7 +21,7 @@ export default class ChangesetAuthor extends React.Component<Props> {
{changeset.author.mail} {changeset.author.mail}
&gt; &gt;
</a> </a>
</div> </>
); );
} }
} }

21
scm-ui/src/repos/components/changesets/ChangesetAvatar.js
View File

@@ -12,15 +12,18 @@ class ChangesetAvatar extends React.Component<Props> {
render() { render() {
const { changeset } = this.props; const { changeset } = this.props;
return ( return (
<div className="image is-64x64"> <ExtensionPoint
<ExtensionPoint name="repos.changeset-table.information"
name="repos.changeset-table.information" renderAll={true}
renderAll={true} props={{ changeset }}
props={{ changeset }} >
> {/* extension should render something like this: */}
<Image src="/images/blib.jpg" alt="Logo" /> {/* <div className="image is-64x64"> */}
</ExtensionPoint> {/* <figure className="media-left"> */}
</div> {/* <Image src="/some/image.jpg" alt="Logo" /> */}
{/* </figure> */}
{/* </div> */}
</ExtensionPoint>
); );
} }
} }

4
scm-ui/src/repos/components/changesets/ChangesetRow.js
View File

@@ -44,9 +44,7 @@ class ChangesetRow extends React.Component<Props> {
const authorLine = <ChangesetAuthor changeset={changeset} />; const authorLine = <ChangesetAuthor changeset={changeset} />;
return ( return (
<article className={classNames("media", classes.inner)}> <article className={classNames("media", classes.inner)}>
<figure className="media-left"> <ChangesetAvatar changeset={changeset} />
<ChangesetAvatar changeset={changeset} />
</figure>
<div className={classNames("media-content", classes.withOverflow)}> <div className={classNames("media-content", classes.withOverflow)}>
<div className="content"> <div className="content">
<p className="is-ellipsis-overflow"> <p className="is-ellipsis-overflow">

26
scm-ui/src/repos/containers/Changesets.js
View File

@@ -117,29 +117,31 @@ class Changesets extends React.PureComponent<State, Props> {
return ( return (
<div> <div>
{this.renderTable()} {this.renderList()}
{this.renderPaginator()} {this.renderPaginator()}
</div> </div>
); );
} }
renderTable = () => { renderList = () => {
const branch = this.props.match.params.branch; const branch = this.props.match.params.branch;
const { repository, changesets, branchNames, t } = this.props; const { repository, changesets, branchNames, t } = this.props;
if (branchNames && branchNames.length > 0) { if (branchNames && branchNames.length > 0) {
return ( return (
<div> <>
<label className="label"> <div className={"box"}>
{t("changesets.branchselector-label")} <label className="label">
</label> {t("changesets.branchselector-label")}
<DropDown </label>
options={branchNames} <DropDown
preselectedOption={branch} options={branchNames}
optionSelected={branch => this.branchChanged(branch)} preselectedOption={branch}
/> optionSelected={branch => this.branchChanged(branch)}
/>
</div>
<ChangesetList repository={repository} changesets={changesets} /> <ChangesetList repository={repository} changesets={changesets} />
</div> </>
); );
} }