More step cosmetic fixes

step_changes
Rick Carlino 2020-01-07 15:00:25 -06:00
parent a13272d6be
commit 7f0892d8b2
5 changed files with 22 additions and 31 deletions

View File

@ -297,7 +297,7 @@ export namespace ToolTips {
sequence or delete a weed after removing it.`);
export const REBOOT =
trim(`Power cycle FarmBot's onboard computer or microcontroller.`);
trim(`Power cycle FarmBot's onboard computer.`);
export const SET_SERVO_ANGLE =
trim(`Move a servo to the provided angle. An angle of 90 degrees

View File

@ -86,7 +86,7 @@
background: $brown;
}
&.send-message-step {
background: $red;
background: $brown;
}
&.find-home-step {
background: $blue;
@ -131,7 +131,7 @@
background: $brown;
}
&.emergency-stop-step {
background: $brown;
background: $red;
}
&.reboot-step {
background: $brown;
@ -188,7 +188,7 @@
background: $light_brown;
}
&.send-message-step {
background: $light_red;
background: $light_brown;
}
&.find-home-step {
background: $light_blue;
@ -251,7 +251,7 @@
background: $light_brown;
}
&.emergency-stop-step {
background: $light_brown;
background: $light_red;
}
&.reboot-step {
background: $light_brown;

View File

@ -48,16 +48,6 @@ export function StepButtonCluster(props: StepButtonProps) {
color="orange">
{t("CONTROL PERIPHERAL")}
</StepButton>,
<StepButton {...commonStepProps}
step={{
kind: "toggle_pin",
args: {
pin_number: NOTHING_SELECTED
}
}}
color="orange">
{t("TOGGLE PERIPHERAL")}
</StepButton>,
<StepButton {...commonStepProps}
step={{
kind: "read_pin",
@ -97,19 +87,19 @@ export function StepButtonCluster(props: StepButtonProps) {
message_type: MessageType.success
}
}}
color="red">
{t("SEND MESSAGE")}
</StepButton>,
<StepButton {...commonStepProps}
step={{ kind: "emergency_lock", args: {} }}
color="brown">
{t("E-STOP")}
{t("SEND MESSAGE")}
</StepButton>,
<StepButton {...commonStepProps}
step={{ kind: "reboot", args: { package: "farmbot_os" } }}
color="brown">
{t("REBOOT")}
</StepButton>,
<StepButton {...commonStepProps}
step={{ kind: "emergency_lock", args: {} }}
color="red">
{t("E-STOP")}
</StepButton>,
<StepButton{...commonStepProps}
step={{
kind: "find_home",
@ -204,7 +194,6 @@ export function StepButtonCluster(props: StepButtonProps) {
{t("Mark As...")}
</StepButton>
);
return <div>
<Row>
<div className="step-button-cluster">

View File

@ -21,7 +21,7 @@ export function TileEmergencyStop(props: StepParams) {
<Row>
<Col xs={12}>
<p>
{t("Unlocking a device requires user intervention")}
{t("Unlocking a device requires user intervention.")}
</p>
</Col>
</Row>

View File

@ -5,12 +5,11 @@ import { StepWrapper, StepHeader, StepContent } from "../step_ui/index";
import { t } from "../../i18next_wrapper";
import { ALLOWED_PACKAGES, SequenceBodyItem, Reboot } from "farmbot";
import { editStep } from "../../api/crud";
import { StepRadio } from "../step_ui/step_radio";
const PACKAGE_CHOICES = (): Record<ALLOWED_PACKAGES, string> => ({
"arduino_firmware": t("Just the Arduino"),
"farmbot_os": t("Entire system")
});
// import { StepRadio } from "../step_ui/step_radio";
// const PACKAGE_CHOICES = (): Record<ALLOWED_PACKAGES, string> => ({
// "arduino_firmware": t("Just the Arduino"),
// "farmbot_os": t("Entire system")
// });
function assertReboot(x: SequenceBodyItem): asserts x is Reboot {
if (x.kind !== "reboot") {
@ -52,11 +51,14 @@ export function TileReboot(props: StepParams) {
index={index}
confirmStepDeletion={props.confirmStepDeletion} />
<StepContent className={className}>
<StepRadio
<p>
{t(ToolTips.REBOOT)}
</p>
{/* <StepRadio
choices={Object.keys(PACKAGE_CHOICES())}
choiceLabelLookup={PACKAGE_CHOICES()}
currentChoice={currentStep.args.package as ALLOWED_PACKAGES}
onChange={editTheRebootStep(props)} />
onChange={editTheRebootStep(props)} /> */}
</StepContent>
</StepWrapper>;
}