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

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

@@ -12,15 +12,18 @@ class ChangesetAvatar extends React.Component<Props> {
render() {
const { changeset } = this.props;
return (
<div className="image is-64x64">
<ExtensionPoint
name="repos.changeset-table.information"
renderAll={true}
props={{ changeset }}
>
<Image src="/images/blib.jpg" alt="Logo" />
</ExtensionPoint>
</div>
<ExtensionPoint
name="repos.changeset-table.information"
renderAll={true}
props={{ changeset }}
>
{/* extension should render something like this: */}
{/* <div className="image is-64x64"> */}
{/* <figure className="media-left"> */}
{/* <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} />;
return (
<article className={classNames("media", classes.inner)}>
<figure className="media-left">
<ChangesetAvatar changeset={changeset} />
</figure>
<ChangesetAvatar changeset={changeset} />
<div className={classNames("media-content", classes.withOverflow)}>
<div className="content">
<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 (
<div>
{this.renderTable()}
{this.renderList()}
{this.renderPaginator()}
</div>
);
}
renderTable = () => {
renderList = () => {
const branch = this.props.match.params.branch;
const { repository, changesets, branchNames, t } = this.props;
if (branchNames && branchNames.length > 0) {
return (
<div>
<label className="label">
{t("changesets.branchselector-label")}
</label>
<DropDown
options={branchNames}
preselectedOption={branch}
optionSelected={branch => this.branchChanged(branch)}
/>
<>
<div className={"box"}>
<label className="label">
{t("changesets.branchselector-label")}
</label>
<DropDown
options={branchNames}
preselectedOption={branch}
optionSelected={branch => this.branchChanged(branch)}
/>
</div>
<ChangesetList repository={repository} changesets={changesets} />
</div>
</>
);
}