Skip to content

Commit

Permalink
more small changes
Browse files Browse the repository at this point in the history
  • Loading branch information
shmish111 committed Oct 23, 2020
1 parent 476629c commit ac90acb
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion marlowe-playground-client/src/Halogen/Monaco.purs
Expand Up @@ -30,7 +30,7 @@ data KeyBindings
derive instance genericKeyBindings :: Generic KeyBindings _

instance showKeyBindings :: Show KeyBindings where
show DefaultBindings = "Default"
show DefaultBindings = "Default Key Bindings"
show Vim = "Vim"
show Emacs = "Emacs"

Expand Down
9 changes: 7 additions & 2 deletions marlowe-playground-client/src/Help.purs
Expand Up @@ -37,7 +37,7 @@ toHTML helpType =
, p [ class_ (ClassName "help-body") ] [ bodyText helpType ]
]
where
headerText MarloweHelp = text "Modelling contracts in Marlowe"
headerText MarloweHelp = text "Simulation and analysis"

headerText InputComposerHelp = text "Input Composer"

Expand All @@ -49,7 +49,12 @@ toHTML helpType =

headerText EditorHelp = text "Marlowe Code Editor"

bodyText MarloweHelp = text "Marlowe is designed to support the execution of financial contracts on blockchain, and specifically to work on Cardano. Contracts are built by putting together a small number of constructs that in combination can be used to describe many different kinds of financial contract"
bodyText MarloweHelp =
div []
[ p_ [ text "In this pane you can simulate and analyse Marlowe contracts." ]
, p_ [ text "The main display area shows the contract that is still to be executed, so that this changes as the simulation moves forwards or backwards. Underneath this is shown the current state, including the currency in each of the contract’s accounts and the current slot. Other tabs in that section show logs, errors and warnings, as well as giving access to static analysis results." ]
, p_ [ text "Above this information are shown the actions available at this point in the simulation. An action is preformed by pressing the “+” button next to it; a single action is undone by pressing “Undo”; “Reset” will reset the simulation to the start." ]
]

bodyText InputComposerHelp = text "The Input Composer allows you to choose any of the possible inputs to add to a transaction"

Expand Down
6 changes: 3 additions & 3 deletions marlowe-playground-client/src/NewProject/State.purs
Expand Up @@ -5,7 +5,7 @@ import Data.Maybe (Maybe(..))
import Effect.Aff.Class (class MonadAff)
import Halogen (ClassName(..), ComponentHTML, HalogenM)
import Halogen.Classes (flex)
import Halogen.HTML (a, div, h2_, hr_, input, text)
import Halogen.HTML (button, div, h2_, hr_, input, text)
import Halogen.HTML.Events (onClick, onValueChange)
import Halogen.HTML.Properties (class_, classes, value)
import Marlowe (SPParams_)
Expand Down Expand Up @@ -34,12 +34,12 @@ render state =
[ input [ value (state ^. _projectName), onValueChange (Just <<< ChangeProjectName) ]
, hr_
, h2_ [ text "Choose your initial coding environment" ]
, div [ classes [ flex, ClassName "language-links" ] ] (map link [ Haskell, Javascript, Marlowe, Blockly ])
, div [ classes [ flex, ClassName "group", ClassName "open-buttons" ] ] (map link [ Haskell, Javascript, Marlowe, Blockly ])
, renderError (state ^. _error)
]
where
renderError Nothing = text ""

renderError (Just err) = div [ class_ (ClassName "error") ] [ text err ]

link lang = a [ onClick (const <<< Just $ CreateProject lang) ] [ text $ show lang ]
link lang = button [ onClick (const <<< Just $ CreateProject lang) ] [ text $ show lang ]
3 changes: 2 additions & 1 deletion marlowe-playground-client/static/css/panels.scss
Expand Up @@ -447,7 +447,8 @@ button.minus-btn:hover {
}

.editor-options select {
width: 6rem;
width: fit-content;
padding-right: 2rem;
}

.analysis-result-title {
Expand Down

0 comments on commit ac90acb

Please sign in to comment.