Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 09:37:02 +00:00
Code Issues Releases Wiki Activity

ui: Move div.page into Page frame

Browse Source
This commit is contained in:
James Hillyerd
2018-12-15 20:36:39 -08:00
parent caec5e7c17
commit af3ed04100
8 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/HttpUtil.elm
View File

@@ -81,12 +81,12 @@ errorFlash error =
}
Http.NetworkError ->
{ title = "HTTP Network error"
{ title = "HTTP network error"
, table = []
}
Http.BadStatus res ->
{ title = "Bad HTTP status"
{ title = "HTTP response error"
, table = [ ( "Response Code", String.fromInt res ) ]
}

4
ui/src/Main.elm
View File

@@ -307,7 +307,7 @@ view model =
framePage :
ActivePage
-> (msg -> Msg)
-> { title : String, modal : Maybe (Html msg), content : Html msg }
-> { title : String, modal : Maybe (Html msg), content : List (Html msg) }
-> Document Msg
framePage page toMsg { title, modal, content } =
Document title
@@ -315,7 +315,7 @@ view model =
model.session
page
(Maybe.map (Html.map toMsg) modal)
(Html.map toMsg content)
(List.map (Html.map toMsg) content)
]
in
case model.page of

13
ui/src/Page/Home.elm
View File

@@ -45,16 +45,15 @@ update session msg model =
-- VIEW --
view : Session -> Model -> { title : String, modal : Maybe (Html msg), content : Html Msg }
view : Session -> Model -> { title : String, modal : Maybe (Html msg), content : List (Html Msg) }
view session model =
{ title = "Inbucket"
, modal = Nothing
, content =
div [ class "page" ]
[ Html.node "rendered-html"
[ class "greeting"
, property "content" (Encode.string model.greeting)
]
[]
[ Html.node "rendered-html"
[ class "greeting"
, property "content" (Encode.string model.greeting)
]
[]
]
}

5
ui/src/Page/Mailbox.elm
View File

@@ -444,12 +444,12 @@ updateOpenMessage session model id =
-- VIEW
view : Session -> Model -> { title : String, modal : Maybe (Html Msg), content : Html Msg }
view : Session -> Model -> { title : String, modal : Maybe (Html Msg), content : List (Html Msg) }
view session model =
{ title = model.mailboxName ++ " - Inbucket"
, modal = viewModal model.promptPurge
, content =
div [ class "page mailbox" ]
[ div [ class "mailbox" ]
[ aside [ class "message-list-controls" ]
[ input
[ type_ "search"
@@ -480,6 +480,7 @@ view session model =
text ""
]
]
]
}

43
ui/src/Page/Monitor.elm
View File

@@ -88,35 +88,34 @@ update session msg model =
-- VIEW
view : Session -> Model -> { title : String, modal : Maybe (Html msg), content : Html Msg }
view : Session -> Model -> { title : String, modal : Maybe (Html msg), content : List (Html Msg) }
view session model =
{ title = "Inbucket Monitor"
, modal = Nothing
, content =
div [ class "page" ]
[ h1 [] [ text "Monitor" ]
, p []
[ text "Messages will be listed here shortly after delivery. "
, em []
[ text
(if model.connected then
"Connected."
[ h1 [] [ text "Monitor" ]
, p []
[ text "Messages will be listed here shortly after delivery. "
, em []
[ text
(if model.connected then
"Connected."
else
"Disconnected!"
)
]
]
, table [ class "monitor" ]
[ thead []
[ th [] [ text "Date" ]
, th [ class "desktop" ] [ text "From" ]
, th [] [ text "Mailbox" ]
, th [] [ text "Subject" ]
]
, tbody [] (List.map (viewMessage session.zone) model.messages)
else
"Disconnected!"
)
]
]
, table [ class "monitor" ]
[ thead []
[ th [] [ text "Date" ]
, th [ class "desktop" ] [ text "From" ]
, th [] [ text "Mailbox" ]
, th [] [ text "Subject" ]
]
, tbody [] (List.map (viewMessage session.zone) model.messages)
]
]
}

9
ui/src/Page/Status.elm
View File

@@ -225,15 +225,14 @@ updateRemoteTotal metric value history =
-- VIEW --
view : Session -> Model -> { title : String, modal : Maybe (Html msg), content : Html Msg }
view : Session -> Model -> { title : String, modal : Maybe (Html msg), content : List (Html Msg) }
view session model =
{ title = "Inbucket Status"
, modal = Nothing
, content =
div [ class "page" ]
[ h1 [] [ text "Status" ]
, div [] (configPanel model.config :: metricPanels model)
]
[ h1 [] [ text "Status" ]
, div [] (configPanel model.config :: metricPanels model)
]
}

5
ui/src/Views/Page.elm
View File

@@ -37,7 +37,7 @@ type alias FrameControls msg =
}
frame : FrameControls msg -> Session -> ActivePage -> Maybe (Html msg) -> Html msg -> Html msg
frame : FrameControls msg -> Session -> ActivePage -> Maybe (Html msg) -> List (Html msg) -> Html msg
frame controls session page modal content =
div [ class "app" ]
[ header []
@@ -59,11 +59,10 @@ frame controls session page modal content =
]
]
]
, errorFlash controls session.flash
]
, div [ class "navbar-bg" ] [ text "" ]
, frameModal modal
, content
, div [ class "page" ] ([ errorFlash controls session.flash ] ++ content)
, footer []
[ div [ class "footer" ]
[ externalLink "https://www.inbucket.org" "Inbucket"

6
ui/src/main.css
View File

@@ -115,7 +115,9 @@ header {
.page {
grid-area: page;
min-height: 0; /* Allows scrolling in nested flex/grids. */
/* Explicit minimums required for sizing/scrolling in nested flex+grids. */
min-height: 0;
min-width: 0;
}
footer {
@@ -159,7 +161,6 @@ h1 {
}
.flash-table {
max-width: 90vw;
overflow: auto;
}
@@ -310,7 +311,6 @@ li.navbar-active span,
.mailbox {
display: grid;
grid-area: page;
grid-gap: 1px 20px;
grid:
"ctrl mesg" auto