Make part12 nicer

part12/ElmHub.elm

@@ -37,7 +37,7 @@ type alias Model =
 type alias SearchOptions =
     { minStars : Int
     , minStarsError : Maybe String
-    , searchInDescription : Bool
+    , searchIn : String
     , userFilter : String
     }
 
@@ -57,7 +57,7 @@ initialModel =
     , options =
         { minStars = 0
         , minStarsError = Nothing
-        , searchInDescription = True
+        , searchIn = "name"
         , userFilter = ""
         }
     , tableState = Table.initialSort "Stars"
@@ -80,12 +80,12 @@ viewOptions opts =
     -- Debug.log "viewOptions was called" <|
     div [ class "search-options" ]
         [ div [ class "search-option" ]
-            [ label [ class "top-label" ] [ text "Minimum Stars" ]
+            [ label [ class "top-label" ] [ text "Search in" ]
-            , input
+            , select [ onChange SetSearchIn, value opts.searchIn ]
-                [ onBlurWithTargetValue SetMinStars
+                [ option [ value "name" ] [ text "Name" ]
-                , defaultValue (toString opts.minStars)
+                , option [ value "description" ] [ text "Description" ]
+                , option [ value "name,description" ] [ text "Name and Description" ]
                 ]
-                []
             ]
         , div [ class "search-option" ]
             [ label [ class "top-label" ] [ text "Owned by" ]
@@ -98,10 +98,14 @@ viewOptions opts =
                 []
             ]
         , div [ class "search-option" ]
-            [ viewMinStarsError opts.minStarsError ]
+            [ label [ class "top-label" ] [ text "Minimum Stars" ]
-        , label [ class "search-option" ]
+            , input
-            [ input [ type' "checkbox", checked opts.searchInDescription, onCheck SetSearchInDescription ] []
+                [ type' "text"
-            , text "Search in description"
+                , onBlurWithTargetValue SetMinStars
+                , defaultValue (toString opts.minStars)
+                ]
+                []
+            , viewMinStarsError opts.minStarsError
             ]
         ]
 
@@ -206,11 +210,11 @@ updateOptions optionsMsg options =
                 Err _ ->
                     { options
                         | minStarsError =
-                            Just "Please enter an integer!"
+                            Just "Must be an integer!"
                     }
 
-        SetSearchInDescription searchInDescription ->
+        SetSearchIn searchIn ->
-            { options | searchInDescription = searchInDescription }
+            { options | searchIn = searchIn }
 
         SetUserFilter userFilter ->
             { options | userFilter = userFilter }
@@ -269,7 +273,7 @@ viewSearchResult result =
 
 type OptionsMsg
     = SetMinStars String
-    | SetSearchInDescription Bool
+    | SetSearchIn String
     | SetUserFilter String
 
 
@@ -311,11 +315,8 @@ getQueryString model =
         ++ Auth.token
         ++ "&q="
         ++ model.query
-        ++ (if model.options.searchInDescription then
+        ++ "+in:"
-                "+in:name,description"
+        ++ model.options.searchIn
-            else
-                "+in:name"
-           )
         ++ "+stars:>="
         ++ (toString model.options.minStars)
         ++ "+language:elm"

part12/style.css

@@ -97,6 +97,7 @@ button:focus, input:focus {
   padding: 10px;
   margin-right: 24px;
   border-radius: 10px;
+  margin-top: 10px;
 }
 
 .error {
@@ -111,21 +112,22 @@ button:focus, input:focus {
 .search-input {
   display: block;
   float: left;
-  width: 50%;
+  width: 42%;
 }
 
 .search-options {
   position: relative;
   float: right;
-  width: 50%;
+  width: 58%;
   box-sizing: border-box;
-  padding: 20px;
+  padding-top: 20px;
 }
 
 .search-option {
   display: block;
   float: left;
-  width: 50%;
+  width: 30%;
+  margin-left: 16px;
   box-sizing: border-box;
 }