From 17f6a66cf63a90dd6b5069fc0e8d1220c1746fba Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 25 Sep 2019 09:15:33 +0200 Subject: [PATCH 1/3] add home icon to breadcrumb --- .../packages/ui-components/src/Breadcrumb.js | 37 ++++++++++++++----- scm-ui/public/locales/de/commons.json | 3 ++ scm-ui/public/locales/en/commons.json | 3 ++ scm-ui/public/locales/es/commons.json | 3 ++ 4 files changed, 36 insertions(+), 10 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/Breadcrumb.js b/scm-ui-components/packages/ui-components/src/Breadcrumb.js index 5b0f151c61..dacbd3ef4f 100644 --- a/scm-ui-components/packages/ui-components/src/Breadcrumb.js +++ b/scm-ui-components/packages/ui-components/src/Breadcrumb.js @@ -1,10 +1,12 @@ //@flow import React from "react"; -import {Link} from "react-router-dom"; -import type {Branch, Repository} from "@scm-manager/ui-types"; +import { Link } from "react-router-dom"; +import { translate } from "react-i18next"; import injectSheet from "react-jss"; -import {binder, ExtensionPoint} from "@scm-manager/ui-extensions"; import classNames from "classnames"; +import { binder, ExtensionPoint } from "@scm-manager/ui-extensions"; +import type { Branch, Repository } from "@scm-manager/ui-types"; +import Icon from "./Icon"; type Props = { repository: Repository, @@ -14,7 +16,10 @@ type Props = { revision: string, path: string, baseUrl: string, - classes: any + + // Context props + classes: any, + t: string => string }; const styles = { @@ -45,7 +50,7 @@ class Breadcrumb extends React.Component { if (paths.length - 1 === index) { return (
  • - + {path}
  • @@ -59,19 +64,20 @@ class Breadcrumb extends React.Component { }); return map; } - return
  • ; + return null; } render() { const { - classes, baseUrl, branch, defaultBranch, branches, revision, path, - repository + repository, + classes, + t } = this.props; return ( @@ -84,7 +90,18 @@ class Breadcrumb extends React.Component { )} aria-label="breadcrumbs" > -
      {this.renderPath()}
    +
      +
    • + + + +
    • + {this.renderPath()} +
    {binder.hasExtension("repos.sources.actionbar") && (
    @@ -112,4 +129,4 @@ class Breadcrumb extends React.Component { } } -export default injectSheet(styles)(Breadcrumb); +export default translate("commons")(injectSheet(styles)(Breadcrumb)); diff --git a/scm-ui/public/locales/de/commons.json b/scm-ui/public/locales/de/commons.json index cdbedd8b6b..c4175893de 100644 --- a/scm-ui/public/locales/de/commons.json +++ b/scm-ui/public/locales/de/commons.json @@ -23,6 +23,9 @@ "subtitle": "Ein unbekannter Fehler ist aufgetreten." } }, + "breadcrumb": { + "home": "Hauptseite" + }, "errorNotification": { "prefix": "Fehler", "loginLink": "Erneute Anmeldung", diff --git a/scm-ui/public/locales/en/commons.json b/scm-ui/public/locales/en/commons.json index 181fdc975c..1e232860b4 100644 --- a/scm-ui/public/locales/en/commons.json +++ b/scm-ui/public/locales/en/commons.json @@ -24,6 +24,9 @@ "subtitle": "Unknown error occurred" } }, + "breadcrumb": { + "home": "Main page" + }, "errorNotification": { "prefix": "Error", "loginLink": "You can login here again.", diff --git a/scm-ui/public/locales/es/commons.json b/scm-ui/public/locales/es/commons.json index e130ce8b17..06db500845 100644 --- a/scm-ui/public/locales/es/commons.json +++ b/scm-ui/public/locales/es/commons.json @@ -24,6 +24,9 @@ "subtitle": "Ha ocurrido un error desconocido" } }, + "breadcrumb": { + "home": "Página principal" + }, "errorNotification": { "prefix": "Error", "loginLink": "Aquí puede iniciar la sesión de nuevo.", From 885ba1bd6cadf7e420b73f79066a87f636bff1dd Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 25 Sep 2019 09:18:59 +0200 Subject: [PATCH 2/3] add styling for home icon --- scm-ui-components/packages/ui-components/src/Breadcrumb.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scm-ui-components/packages/ui-components/src/Breadcrumb.js b/scm-ui-components/packages/ui-components/src/Breadcrumb.js index dacbd3ef4f..74996accc0 100644 --- a/scm-ui-components/packages/ui-components/src/Breadcrumb.js +++ b/scm-ui-components/packages/ui-components/src/Breadcrumb.js @@ -33,6 +33,9 @@ const styles = { flexStart: { flex: "1" }, + homeIcon: { + lineHeight: "1.5rem" + }, buttonGroup: { alignSelf: "center", paddingRight: "1rem" @@ -94,6 +97,7 @@ class Breadcrumb extends React.Component {
  • Date: Wed, 25 Sep 2019 13:48:57 +0000 Subject: [PATCH 3/3] Close branch feature/breadcrumb_home