From 680a524d72098803535f5024520c30870b41e31d Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 25 Sep 2019 16:28:59 +0200 Subject: [PATCH 1/6] remove css vars, use flex block instead of absolute aligned block --- .../admin/plugins/components/PluginEntry.js | 21 +++++-------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/scm-ui/src/admin/plugins/components/PluginEntry.js b/scm-ui/src/admin/plugins/components/PluginEntry.js index dbbce06d50..faeb44c493 100644 --- a/scm-ui/src/admin/plugins/components/PluginEntry.js +++ b/scm-ui/src/admin/plugins/components/PluginEntry.js @@ -2,7 +2,7 @@ import React from "react"; import injectSheet from "react-jss"; import type { Plugin } from "@scm-manager/ui-types"; -import { CardColumn } from "@scm-manager/ui-components"; +import {CardColumn, Icon} from "@scm-manager/ui-components"; import PluginAvatar from "./PluginAvatar"; import classNames from "classnames"; import PluginModal from "./PluginModal"; @@ -32,20 +32,10 @@ const styles = { cursor: "pointer", pointerEvents: "all", padding: "0.5rem", - border: "solid 1px var(--dark-25)", + border: "solid 1px #cdcdcd", // $dark-25 borderRadius: "4px", "&:hover": { - borderColor: "var(--dark-50)" - } - }, - topRight: { - position: "absolute", - right: 0, - top: 0 - }, - layout: { - "& .level": { - paddingBottom: "0.5rem" + borderColor: "#9a9a9a" // $dark-50 } }, actionbar: { @@ -100,10 +90,10 @@ class PluginEntry extends React.Component { createActionbar = () => { const { classes } = this.props; return ( -
+
{this.isInstallable() && ( this.toggleModal("showInstallModal")} > @@ -188,7 +178,6 @@ class PluginEntry extends React.Component { return ( <> this.toggleModal("showInstallModal") From efc4cfbdc545e7841b007d16e2e995dc7c51a2e0 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 25 Sep 2019 16:31:17 +0200 Subject: [PATCH 2/6] correct flex styling of cardColumn, no text overflow, movement by scaling browser and unpredictable behavior anymore --- .../packages/ui-components/src/CardColumn.js | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/CardColumn.js b/scm-ui-components/packages/ui-components/src/CardColumn.js index 58722c0cac..e464de5560 100644 --- a/scm-ui-components/packages/ui-components/src/CardColumn.js +++ b/scm-ui-components/packages/ui-components/src/CardColumn.js @@ -21,21 +21,22 @@ const styles = { flexFullHeight: { display: "flex", flexDirection: "column", + justifyContent: "space-between", alignSelf: "stretch" }, - content: { - display: "flex", - flexGrow: 1, - alignItems: "center", - justifyContent: "space-between" - }, footer: { display: "flex", - marginTop: "auto", - paddingBottom: "1.5rem" + paddingBottom: "1.5rem", }, - noBottomMargin: { - marginBottom: "0 !important" + topPart: { + display: "flex" + }, + contentRight: { + marginLeft: "auto" + }, + contentLeft: { + marginBottom: "0 !important", + overflow: "hidden" } }; @@ -91,25 +92,26 @@ class CardColumn extends React.Component { classes.flexFullHeight )} > -
+
-

+

{title}

{description}

+
{contentRight && contentRight} +
-
-
{footerLeft}
-
{footerRight}
-
+
+
{footerLeft}
+
{footerRight}
+
From 51b617c84a522689f623f686abc9e2471cede55f Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 25 Sep 2019 16:53:06 +0200 Subject: [PATCH 3/6] add missing spanish translations --- scm-ui/public/locales/es/admin.json | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/scm-ui/public/locales/es/admin.json b/scm-ui/public/locales/es/admin.json index 14abf626d6..db9fade43c 100644 --- a/scm-ui/public/locales/es/admin.json +++ b/scm-ui/public/locales/es/admin.json @@ -29,22 +29,36 @@ "installedNavLink": "Instalados", "availableNavLink": "Disponibles" }, - "installPending": "Instalar los complementos pendientes", + "executePending": "Ejecutar los complementos pendientes", "noPlugins": "No se han encontrado complementos.", "modal": { - "title": "Instalar complemento {{name}} ", + "title": { + "install": "Instalar complemento {{name}}", + "update": "Actualizar complemento {{name}}", + "uninstall": "Desinstalar complemento {{name}}" + }, "restart": "Reiniciar para activar", "install": "Instalar", + "update": "Actualizar", + "uninstall": "Desinstalar", + "installQueue": "Será instalado:", + "updateQueue": "Será actualizado:", + "uninstallQueue": "Será desinstalado:", "installAndRestart": "Instalar y reiniciar", + "updateAndRestart": "Actualizar y reiniciar", + "uninstallAndRestart": "Desinstalar y reiniciar", + "executeAndRestart": "Ejecutar y reiniciar", "abort": "Cancelar", "author": "Autor", "version": "Versión", + "currentVersion": "Versión instalada", + "newVersion": "Nueva versión", "dependencyNotification": "Con este complemento las siguientes dependencias serán instaladas si no lo han sido ya", "dependencies": "Dependencias", "successNotification": "Complemento instalado correctamente. Necesita recargar la página para ver los cambios:", "reload": "recargar ahora", "restartNotification": "Usted debería reiniciar scm-manager sólo si actualmente no hay nadie trabajando con el.", - "installPending": "Los siguientes complementos serán instalados y después de la instalación sdm-manager será reiniciado." + "executePending": "Se ejecutarán los siguientes cambios en el complemento y luego se reiniciará el contexto scm-manager." } }, "repositoryRole": { From 4592244c939a61ec2d5a91b8c02f993c7456dd38 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 25 Sep 2019 17:01:51 +0200 Subject: [PATCH 4/6] use Icon component, add actionbar button hover --- .../admin/plugins/components/PluginEntry.js | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scm-ui/src/admin/plugins/components/PluginEntry.js b/scm-ui/src/admin/plugins/components/PluginEntry.js index faeb44c493..fac20421bd 100644 --- a/scm-ui/src/admin/plugins/components/PluginEntry.js +++ b/scm-ui/src/admin/plugins/components/PluginEntry.js @@ -1,8 +1,9 @@ //@flow import React from "react"; import injectSheet from "react-jss"; +import { translate } from "react-i18next"; import type { Plugin } from "@scm-manager/ui-types"; -import {CardColumn, Icon} from "@scm-manager/ui-components"; +import { CardColumn, Icon } from "@scm-manager/ui-components"; import PluginAvatar from "./PluginAvatar"; import classNames from "classnames"; import PluginModal from "./PluginModal"; @@ -18,7 +19,8 @@ type Props = { refresh: () => void, // context props - classes: any + classes: any, + t: string => string }; type State = { @@ -31,6 +33,7 @@ const styles = { link: { cursor: "pointer", pointerEvents: "all", + marginBottom: "0 !important", padding: "0.5rem", border: "solid 1px #cdcdcd", // $dark-25 borderRadius: "4px", @@ -88,15 +91,15 @@ class PluginEntry extends React.Component { }; createActionbar = () => { - const { classes } = this.props; + const { classes, t } = this.props; return (
{this.isInstallable() && ( this.toggleModal("showInstallModal")} > - + )} {this.isUninstallable() && ( @@ -104,7 +107,7 @@ class PluginEntry extends React.Component { className={classNames(classes.link, "level-item")} onClick={() => this.toggleModal("showUninstallModal")} > - + )} {this.isUpdatable() && ( @@ -112,7 +115,7 @@ class PluginEntry extends React.Component { className={classNames(classes.link, "level-item")} onClick={() => this.toggleModal("showUpdateModal")} > - + )}
@@ -168,7 +171,7 @@ class PluginEntry extends React.Component { }; render() { - const { plugin, classes } = this.props; + const { plugin } = this.props; const avatar = this.createAvatar(plugin); const actionbar = this.createActionbar(); const footerRight = this.createFooterRight(plugin); @@ -199,4 +202,4 @@ class PluginEntry extends React.Component { } } -export default injectSheet(styles)(PluginEntry); +export default injectSheet(styles)(translate("admin")(PluginEntry)); From a09631173c2fa62717729babaa508ba8d6ceed61 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 25 Sep 2019 17:08:01 +0200 Subject: [PATCH 5/6] position content more to center of cardColumn --- scm-ui-components/packages/ui-components/src/CardColumn.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scm-ui-components/packages/ui-components/src/CardColumn.js b/scm-ui-components/packages/ui-components/src/CardColumn.js index e464de5560..5340d88a35 100644 --- a/scm-ui-components/packages/ui-components/src/CardColumn.js +++ b/scm-ui-components/packages/ui-components/src/CardColumn.js @@ -21,12 +21,12 @@ const styles = { flexFullHeight: { display: "flex", flexDirection: "column", - justifyContent: "space-between", + justifyContent: "space-around", alignSelf: "stretch" }, footer: { display: "flex", - paddingBottom: "1.5rem", + paddingBottom: "1rem", }, topPart: { display: "flex" From 12563bedb080cbd0eadd8a3ca876be15497e26c3 Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Thu, 26 Sep 2019 12:34:24 +0000 Subject: [PATCH 6/6] Close branch bugfix/ui_card_column