diff of 78af208b6ea6286d0c1001d320cd493475a89e76
78af208b6ea6286d0c1001d320cd493475a89e76
diff --git a/elm-frontti/src/FeedManager.elm b/elm-frontti/src/FeedManager.elm
index 7f437f0..17a2041 100644
--- a/elm-frontti/src/FeedManager.elm
+++ b/elm-frontti/src/FeedManager.elm
@@ -5,14 +5,33 @@ import Html exposing (..)
import Html.Attributes exposing (..)
import Html.Events exposing (onInput, onClick)
import Button exposing (murja_button)
+import Article_view exposing (formatDateTime)
+import Time
-feedmanager feeds =
- ul [ class "feed-manager-container" ]
+feedmanager time_format zone feeds =
+ table [ class "feed-manager-container" ]
( feeds
|> List.map (\f ->
- li [ class "feed-manager" ]
- [ span [] [ text <| f.name ++ " ("
- , a [ href f.url] [ text f.url ]
- , text ")"]
- , murja_button [ onClick <| DeleteFeed f.id ]
- [ text "Delete feed" ]]))
+ let last_updated = ( f.items
+ |> List.map (Time.posixToMillis << .pubdate)
+ |> List.maximum) in
+ ( last_updated
+ , f))
+ |> List.sortBy ((\last_updated ->
+ case last_updated of
+ Just d -> d
+ Nothing -> 9999) << Tuple.first)
+ |> List.reverse
+ |> List.map (\tuple ->
+ let (last_updated, f) = tuple in
+ tr [ ]
+ [ td [] [ text <| f.name ++ " ("
+ , a [ href f.url] [ text f.url ]
+ , text ")"]
+ , td [] [ text <| "Last updated at " ++ ( last_updated
+ |> Maybe.map Time.millisToPosix
+ |> (Maybe.map <| formatDateTime time_format zone)
+ |> Maybe.withDefault "never")]
+ , td []
+ [ murja_button [ onClick <| DeleteFeed f.id ]
+ [ text "Delete feed" ]]]))
diff --git a/elm-frontti/src/FeedView.elm b/elm-frontti/src/FeedView.elm
index ae522ce..fb71e69 100644
--- a/elm-frontti/src/FeedView.elm
+++ b/elm-frontti/src/FeedView.elm
@@ -78,7 +78,7 @@ feeds feedReaderState show_archived settings zone fs new_feed metadata =
, ("FeedManager", "Manage feeds")])
(Dict.fromList [ ("PerFeed", perFeedView settings zone fs new_feed_state)
, ("SingleFeed", singleFeedView settings zone fs)
- , ("FeedManager", feedmanager fs)])
+ , ("FeedManager", feedmanager settings.time_format zone fs)])
, h3 [] [ text "Add new feed?"]
, label [ for "name" ] [ text "Feed name" ]
diff --git a/resources/css/murja.css b/resources/css/murja.css
index aaaa882..cf9f0ed 100644
--- a/resources/css/murja.css
+++ b/resources/css/murja.css
@@ -342,17 +342,7 @@ header {
}
.feed-manager-container {
- display: flex;
- flex-direction: column;
- justify-content: space-evenly;
- list-style: none;
-}
-
-.feed-manager {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- /* border: 2px solid #333; */
+ width: 100%;
}
@media only screen and (max-device-width:480px)