Merge branch 'master' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext

dist/css/Login.css

@@ -16,10 +16,6 @@
     border:3px solid white;
 }
 
-#funnyimg {
-    border:2px solid black;
-}
-
 #page-wrapper {
     margin-top : 96px;
 }

src/CorpusAnalysis.purs

@@ -5,7 +5,7 @@ import Data.Array (fold)
 import Network.HTTP.Affjax (AJAX)
 import Prelude (id, void)
 import Prelude hiding (div)
-import React.DOM (div, h3, hr, i, p, span, text)
+import React.DOM (div, h3, hr, i, p, span, text, input)
 import React.DOM.Props (className, style)
 import Tabview as Tab
 import Thermite (PerformAction, Render, Spec, defaultPerformAction, modifyState, simpleSpec)
@@ -18,8 +18,9 @@ initialState :: State
 initialState = Tab.initialState
 
 spec' :: forall eff props. Spec (dom :: DOM, console :: CONSOLE, ajax :: AJAX | eff) Tab.State props Tab.Action
-spec' = fold [corpusAnalysisSpec, Tab.tab1]
-
+spec' = fold [ corpusAnalysisSpec
+             , Tab.tab1
+             ]
 
 corpusAnalysisSpec :: forall props eff . Spec eff Tab.State props Tab.Action
 corpusAnalysisSpec = simpleSpec defaultPerformAction render
@@ -36,27 +37,23 @@ corpusAnalysisSpec = simpleSpec defaultPerformAction render
           ]
         ]
       , div [className "row"]
-        [ div [className "col-md-5"]
           [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}]
-            [ p []
-              [ i [className "fa fa-globe"] []
-              , text "IS Tex"
-              ]
-            , p []
-              [ i [className "fa fa-file-archive-o"] []
-              , text "bisphenol + A OR bpa"
-              ]
-            , p []
-              [ i [className "fa fa-calendar"] []
-              , text "Sept. 11 2017, 10:59 am,"
-              ]
-            , p []
-              [ i [className "fa fa-user"] []
-              , text "Authors (S): gargantext,"
-              ]
+            [ div [ className "col-md-8 content"]
+                  [ p [] [ i [className "fa fa-globe"] []
+                         , text " IsTex, PubMed, Hal"
+                         ]
+                  , p [] [ i [className "fab fa-searchengin"] []
+                         , text " Query: bisphenol + A OR bpa"
+                         ]
+                  ]
+            , div [ className "col-md-4 content"] 
+                  [ p [] [ i [className "fa fa-calendar"] []
+                         , text " Sept. 11 2017, 10:59 am"
+                         ]
+                  , p [] [ i [className "fa fa-user"] []
+                         , text " Author(s): gargantua"
+                         ]
+                  ]
             ]
-          ]
-        , div [className "col-md-6"]
-          []
         ]
       ]

src/DocView.purs

@@ -206,11 +206,14 @@ optps cv val = option [ selected (cv == val), value $ show val ] [text $ show va
 
 textDescription :: Int -> PageSizes -> Int -> ReactElement
 textDescription currPage pageSize totalRecords
-  = text $ "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords
+  =  div [className "row"]
+          [ div [className "col-md-12"]
+                [ text $ "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords ]
+          ]
     where
       start = (currPage - 1) * pageSizes2Int pageSize + 1
       end' = currPage * pageSizes2Int pageSize
-      end = if end' > totalRecords then totalRecords else end'
+      end  = if end' > totalRecords then totalRecords else end'
 
 
 pagination :: _ -> Int -> Int -> ReactElement

src/Landing.purs

@@ -83,7 +83,7 @@ layoutLanding' hd = simpleSpec performAction render
     render :: Render State props Action
     render dispatch _ state _ =
       [ div [ className "container1" ] [ jumboTitle hd false                 ]
-      , div [ className "container1" ] [ imageEnter hd (onClick \_ -> dispatch $ Enter)]
+      , div [ className "container1" ] [] -- put research here
       , div [ className "container1" ] [ blocksRandomText' hd                ]
       ]
 ------------------------------------------------------------------------
@@ -122,21 +122,22 @@ docButton (Button b) = a [ className "btn btn-outline-primary btn-sm spacing-cla
 jumboTitle :: LandingData -> Boolean -> ReactElement
 jumboTitle (LandingData hd) b = div jumbo
                    [ div [className "row"             ]
-                     [ div [className "col-md-4 content"]
-                       [ h1 [] [ text hd.name]
-                       , p  [] [ text hd.signature ]
-                       ]
-                     , div [className "col-md-4 content"] []
-                     , div [ className "col-md-4 content"]
-                           [ p [ className "right" ]
+                     [ div [ className "col-md-8 content"]
+                           [ p [ className "left" ]
                                [ div [_id "logo-designed" ]
-                               [ img [ src "images/logo.png"
-                                     , title hd.logoTitle
-                                     ]
-                               []
+                                 [ img [ src "images/logo.png"
+                                       , title hd.logoTitle
+                                       ] []
+                                 ]
+                               ]
+                           ]
+                     , div [ className "col-md-4 content"]
+                           [ img [ src "images/Gargantextuel.jpg"
+                                   , _id "funnyimg"
+                                   , title hd.imageTitle
+                                   ]
+                                   []
                            ]
-                         ]
-                       ]
                      ]
                    ]
                   where

src/NTree.purs

@@ -40,8 +40,8 @@ toggleNode sid a = a
 
 myCorpus :: Int -> String -> NTree (Tuple String String)
 myCorpus n name = NNode n false name
-    [ NLeaf (Tuple "Facets"    "#/docView")
-    , NLeaf (Tuple "Graph"     "#/docView")
+    [ NLeaf (Tuple "Facets"    "#/corpus")
+    , NLeaf (Tuple "Graph"     "#/corpus")
     , NLeaf (Tuple "Dashboard" "#/userPage")
     ]