From 91519e8b439d7e503d993f59ab2001ec796544ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 6 May 2018 22:09:19 +0200 Subject: [PATCH] Remove speaker pictures from schedule. --- schedule/src/Decoders.elm | 2 -- schedule/src/Models.elm | 2 -- schedule/src/Views/SpeakerDetail.elm | 25 +++++-------------------- src/program/models.py | 4 ---- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/schedule/src/Decoders.elm b/schedule/src/Decoders.elm index b574794c..c96eda13 100644 --- a/schedule/src/Decoders.elm +++ b/schedule/src/Decoders.elm @@ -46,8 +46,6 @@ speakerDecoder = |> required "name" string |> required "slug" string |> required "biography" string - |> optional "large_picture_url" (nullable string) Nothing - |> optional "small_picture_url" (nullable string) Nothing eventDecoder : Decoder Event diff --git a/schedule/src/Models.elm b/schedule/src/Models.elm index 9f60f394..1381dca3 100644 --- a/schedule/src/Models.elm +++ b/schedule/src/Models.elm @@ -69,8 +69,6 @@ type alias Speaker = { name : String , slug : SpeakerSlug , biography : String - , largePictureUrl : Maybe String - , smallPictureUrl : Maybe String } diff --git a/schedule/src/Views/SpeakerDetail.elm b/schedule/src/Views/SpeakerDetail.elm index 4c13f2b7..c54248d9 100644 --- a/schedule/src/Views/SpeakerDetail.elm +++ b/schedule/src/Views/SpeakerDetail.elm @@ -22,33 +22,18 @@ speakerDetailView speakerSlug model = model.speakers |> List.filter (\speaker -> speaker.slug == speakerSlug) |> List.head - - image = - case speaker of - Just speaker -> - case speaker.smallPictureUrl of - Just smallPictureUrl -> - [ img [ src smallPictureUrl ] [] ] - - Nothing -> - [] - - Nothing -> - [] in case speaker of Just speaker -> div [] - ([ a [ onClick BackInHistory, classList [ ( "btn", True ), ( "btn-default", True ) ] ] + [ a [ onClick BackInHistory, classList [ ( "btn", True ), ( "btn-default", True ) ] ] [ i [ classList [ ( "fa", True ), ( "fa-chevron-left", True ) ] ] [] , text " Back" ] - , h3 [] [ text speaker.name ] - , div [] [ Markdown.toHtml [] speaker.biography ] - , speakerEvents speaker model - ] - ++ image - ) + , h3 [] [ text speaker.name ] + , div [] [ Markdown.toHtml [] speaker.biography ] + , speakerEvents speaker model + ] Nothing -> div [] [ text "Unknown speaker..." ] diff --git a/src/program/models.py b/src/program/models.py index 04503f5b..6118345c 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -659,10 +659,6 @@ class Speaker(CampRelatedModel): 'biography': self.biography, } - if self.picture_small and self.picture_large: - data['large_picture_url'] = self.get_large_picture_url() - data['small_picture_url'] = self.get_small_picture_url() - return data