From a3b482fa138e2da0d3b2c6046b11363474aa1247 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Tue, 9 Jun 2020 21:10:49 +0200 Subject: [PATCH] Fix some icons --- .../webapp/src/main/elm/Comp/ItemDetail.elm | 41 ++++++--- modules/webapp/src/main/elm/Data/Icons.elm | 84 +++++++++++++++++++ .../src/main/elm/Page/ManageData/View.elm | 17 ++-- 3 files changed, 124 insertions(+), 18 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail.elm b/modules/webapp/src/main/elm/Comp/ItemDetail.elm index d5b20791..26fd79de 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail.elm @@ -1820,7 +1820,7 @@ renderEditForm settings model = [ div [ class "ui form" ] [ div [ class "field" ] [ label [] - [ i [ class "tags icon" ] [] + [ Icons.tagsIcon , text "Tags" ] , Html.map TagDropdownMsg (Comp.Dropdown.view settings model.tagModel) @@ -1838,11 +1838,17 @@ renderEditForm settings model = ] ] , div [ class "field" ] - [ label [] [ text "Direction" ] + [ label [] + [ Icons.directionIcon + , text "Direction" + ] , Html.map DirDropdownMsg (Comp.Dropdown.view settings model.directionModel) ] , div [ class " field" ] - [ label [] [ text "Date" ] + [ label [] + [ Icons.dateIcon + , text "Date" + ] , div [ class "ui action input" ] [ Html.map ItemDatePickerMsg (Comp.DatePicker.viewTime @@ -1857,7 +1863,10 @@ renderEditForm settings model = , renderItemDateSuggestions model ] , div [ class " field" ] - [ label [] [ text "Due Date" ] + [ label [] + [ Icons.dueDateIcon + , text "Due Date" + ] , div [ class "ui action input" ] [ Html.map DueDatePickerMsg (Comp.DatePicker.viewTime @@ -1871,30 +1880,42 @@ renderEditForm settings model = , renderDueDateSuggestions model ] , h4 [ class "ui dividing header" ] - [ i [ class "tiny envelope outline icon" ] [] + [ Icons.correspondentIcon , text "Correspondent" ] , div [ class "field" ] - [ label [] [ text "Organization" ] + [ label [] + [ Icons.organizationIcon + , text "Organization" + ] , Html.map OrgDropdownMsg (Comp.Dropdown.view settings model.corrOrgModel) , renderOrgSuggestions model ] , div [ class "field" ] - [ label [] [ text "Person" ] + [ label [] + [ Icons.personIcon + , text "Person" + ] , Html.map CorrPersonMsg (Comp.Dropdown.view settings model.corrPersonModel) , renderCorrPersonSuggestions model ] , h4 [ class "ui dividing header" ] - [ i [ class "tiny comment outline icon" ] [] + [ Icons.concernedIcon , text "Concerning" ] , div [ class "field" ] - [ label [] [ text "Person" ] + [ label [] + [ Icons.personIcon + , text "Person" + ] , Html.map ConcPersonMsg (Comp.Dropdown.view settings model.concPersonModel) , renderConcPersonSuggestions model ] , div [ class "field" ] - [ label [] [ text "Equipment" ] + [ label [] + [ Icons.equipmentIcon + , text "Equipment" + ] , Html.map ConcEquipMsg (Comp.Dropdown.view settings model.concEquipModel) , renderConcEquipSuggestions model ] diff --git a/modules/webapp/src/main/elm/Data/Icons.elm b/modules/webapp/src/main/elm/Data/Icons.elm index 13d63503..bade841f 100644 --- a/modules/webapp/src/main/elm/Data/Icons.elm +++ b/modules/webapp/src/main/elm/Data/Icons.elm @@ -5,10 +5,24 @@ module Data.Icons exposing , concernedIcon , correspondent , correspondentIcon + , date + , dateIcon + , direction + , directionIcon , dueDate , dueDateIcon , editNotes , editNotesIcon + , equipment + , equipmentIcon + , organization + , organizationIcon + , person + , personIcon + , tag + , tagIcon + , tags + , tagsIcon ) import Html exposing (Html, i) @@ -35,6 +49,16 @@ correspondentIcon = i [ class correspondent ] [] +date : String +date = + "calendar outline icon" + + +dateIcon : Html msg +dateIcon = + i [ class date ] [] + + dueDate : String dueDate = "bell icon" @@ -63,3 +87,63 @@ addFiles = addFilesIcon : Html msg addFilesIcon = i [ class addFiles ] [] + + +tag : String +tag = + "tag icon" + + +tagIcon : Html msg +tagIcon = + i [ class tag ] [] + + +tags : String +tags = + "tags icon" + + +tagsIcon : Html msg +tagsIcon = + i [ class tags ] [] + + +direction : String +direction = + "exchange icon" + + +directionIcon : Html msg +directionIcon = + i [ class direction ] [] + + +person : String +person = + "user icon" + + +personIcon : Html msg +personIcon = + i [ class person ] [] + + +organization : String +organization = + "factory icon" + + +organizationIcon : Html msg +organizationIcon = + i [ class organization ] [] + + +equipment : String +equipment = + "box icon" + + +equipmentIcon : Html msg +equipmentIcon = + i [ class equipment ] [] diff --git a/modules/webapp/src/main/elm/Page/ManageData/View.elm b/modules/webapp/src/main/elm/Page/ManageData/View.elm index ed9586af..fabdc56b 100644 --- a/modules/webapp/src/main/elm/Page/ManageData/View.elm +++ b/modules/webapp/src/main/elm/Page/ManageData/View.elm @@ -4,6 +4,7 @@ import Comp.EquipmentManage import Comp.OrgManage import Comp.PersonManage import Comp.TagManage +import Data.Icons as Icons import Data.UiSettings exposing (UiSettings) import Html exposing (..) import Html.Attributes exposing (..) @@ -25,28 +26,28 @@ view settings model = [ classActive (model.currentTab == Just TagTab) "link icon item" , onClick (SetTab TagTab) ] - [ i [ class "tag icon" ] [] + [ Icons.tagIcon , text "Tag" ] , div [ classActive (model.currentTab == Just EquipTab) "link icon item" , onClick (SetTab EquipTab) ] - [ i [ class "box icon" ] [] + [ Icons.equipmentIcon , text "Equipment" ] , div [ classActive (model.currentTab == Just OrgTab) "link icon item" , onClick (SetTab OrgTab) ] - [ i [ class "factory icon" ] [] + [ Icons.organizationIcon , text "Organization" ] , div [ classActive (model.currentTab == Just PersonTab) "link icon item" , onClick (SetTab PersonTab) ] - [ i [ class "user icon" ] [] + [ Icons.personIcon , text "Person" ] ] @@ -77,7 +78,7 @@ view settings model = viewTags : Model -> List (Html Msg) viewTags model = [ h2 [ class "ui header" ] - [ i [ class "ui tag icon" ] [] + [ Icons.tagIcon , div [ class "content" ] [ text "Tags" ] @@ -89,7 +90,7 @@ viewTags model = viewEquip : Model -> List (Html Msg) viewEquip model = [ h2 [ class "ui header" ] - [ i [ class "ui box icon" ] [] + [ Icons.equipmentIcon , div [ class "content" ] [ text "Equipment" ] @@ -101,7 +102,7 @@ viewEquip model = viewOrg : UiSettings -> Model -> List (Html Msg) viewOrg settings model = [ h2 [ class "ui header" ] - [ i [ class "ui factory icon" ] [] + [ Icons.organizationIcon , div [ class "content" ] [ text "Organizations" ] @@ -113,7 +114,7 @@ viewOrg settings model = viewPerson : UiSettings -> Model -> List (Html Msg) viewPerson settings model = [ h2 [ class "ui header" ] - [ i [ class "ui user icon" ] [] + [ Icons.personIcon , div [ class "content" ] [ text "Person" ]