Commit 579f9673 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[MERGE]

parents 5eac69cc b9afa577
...@@ -285,8 +285,8 @@ renderPage loaderDispatch { totalRecords, dispatch, listId ...@@ -285,8 +285,8 @@ renderPage loaderDispatch { totalRecords, dispatch, listId
} }
] ]
where where
fa true = "fas " gi true = "glyphicon glyphicon-star"
fa false = "far " gi false = "glyphicon glyphicon-star-empty"
isChecked _id = Set.member _id documentIdsToDelete isChecked _id = Set.member _id documentIdsToDelete
toDelete (DocumentsView {_id}) = Set.member _id documentIdsToDelete toDelete (DocumentsView {_id}) = Set.member _id documentIdsToDelete
isDeleted (DocumentsView {_id}) = Set.member _id documentIdsDeleted isDeleted (DocumentsView {_id}) = Set.member _id documentIdsDeleted
...@@ -295,7 +295,7 @@ renderPage loaderDispatch { totalRecords, dispatch, listId ...@@ -295,7 +295,7 @@ renderPage loaderDispatch { totalRecords, dispatch, listId
let isFav = isFavorite r in let isFav = isFavorite r in
{ row: { row:
[ div [] [ div []
[ a [ className $ fa isFav <> "fa-star" [ a [ className $ gi isFav
, if (toDelete $ DocumentsView r) then style {textDecoration : "line-through"} , if (toDelete $ DocumentsView r) then style {textDecoration : "line-through"}
else style {textDecoration : "none"} else style {textDecoration : "none"}
, onClick $ (\_-> dispatch $ MarkFavorites r._id (not isFav))] [] , onClick $ (\_-> dispatch $ MarkFavorites r._id (not isFav))] []
......
...@@ -363,8 +363,8 @@ renderPage loaderDispatch { totalRecords, dispatch, container ...@@ -363,8 +363,8 @@ renderPage loaderDispatch { totalRecords, dispatch, container
] ]
where where
-- TODO: how to interprete other scores? -- TODO: how to interprete other scores?
fa 0 = "far " gi 0 = "glyphicon glyphicon-star-empty"
fa _ = "fas " gi _ = "glyphicon glyphicon-star"
isChecked id = Set.member id documentIdsToDelete isChecked id = Set.member id documentIdsToDelete
isDeleted (DocumentsView {id}) = Set.member id documentIdsDeleted isDeleted (DocumentsView {id}) = Set.member id documentIdsDeleted
pairUrl (Pair {id,label}) pairUrl (Pair {id,label})
...@@ -379,7 +379,7 @@ renderPage loaderDispatch { totalRecords, dispatch, container ...@@ -379,7 +379,7 @@ renderPage loaderDispatch { totalRecords, dispatch, container
in in
{ row: { row:
[ div [] [ div []
[ a [ className $ fa score <> "fa-star" [ a [ className $ gi score
, onClick $ const $ dispatch $ MarkFavorites [id] , onClick $ const $ dispatch $ MarkFavorites [id]
] [] ] []
] ]
......
...@@ -14,7 +14,7 @@ landingData = LandingData { name : "Gargantext" ...@@ -14,7 +14,7 @@ landingData = LandingData { name : "Gargantext"
blockTexts :: Array BlockText blockTexts :: Array BlockText
blockTexts = [ BlockText { title : "Random sentences in Gargantua's Books chapters, historically true" blockTexts = [ BlockText { title : "Random sentences in Gargantua's Books chapters, historically true"
, href : "#" , href : "#"
, icon : "fas fa-random" , icon : "glyphicon glyphicon-random"
, titleText : "Historic" , titleText : "Historic"
, text : "Chapter 1.XV. How Gargantua was put under other schoolmasters. Chapter 2.XXII. How Panurge served a Parisian lady a trick that pleased her not very well. Chapter 3.XXXVII. How Pantagruel persuaded Panurge to take counsel of a fool. Chapter 4.LXI. How Gaster invented means to get and preserve corn. Chapter 5.XXXVIII. Of the temple's admirable pavement." , text : "Chapter 1.XV. How Gargantua was put under other schoolmasters. Chapter 2.XXII. How Panurge served a Parisian lady a trick that pleased her not very well. Chapter 3.XXXVII. How Pantagruel persuaded Panurge to take counsel of a fool. Chapter 4.LXI. How Gaster invented means to get and preserve corn. Chapter 5.XXXVIII. Of the temple's admirable pavement."
, docButton : Button { title : "Your first map in less than 5 minutes" , docButton : Button { title : "Your first map in less than 5 minutes"
...@@ -24,7 +24,7 @@ blockTexts = [ BlockText { title : "Random sentences in Gargantua's Books chapte ...@@ -24,7 +24,7 @@ blockTexts = [ BlockText { title : "Random sentences in Gargantua's Books chapte
} }
, BlockText { title : "Randomized words, semantically and syntaxically falses." , BlockText { title : "Randomized words, semantically and syntaxically falses."
, href : "#" , href : "#"
, icon : "fas fa-random" , icon : "glyphicon glyphicon-random"
, titleText : "Presentation" , titleText : "Presentation"
, text : "Autem nascetur iaculis, sedfusce enimsed cursus posuere consectetuer eu justo aliquammauris. Phasellus vero nisi porttitor elit quod, leo feliscras ultricies non tempor sagittis. Liberoduis facilisinam erat dapibusnam, lacus dui duis tristique volutpatut quis vestibulum magna. Nobis faucibusvestibulum dolores minim. Bibendumin malesuada adipiscing ante, mattis fames nequeetiam lorem. No diam id. Litora quisaenean commodo lobortisetiam neque, libero mollis scelerisque inceptos ullamcorper sea congue delenit possim." , text : "Autem nascetur iaculis, sedfusce enimsed cursus posuere consectetuer eu justo aliquammauris. Phasellus vero nisi porttitor elit quod, leo feliscras ultricies non tempor sagittis. Liberoduis facilisinam erat dapibusnam, lacus dui duis tristique volutpatut quis vestibulum magna. Nobis faucibusvestibulum dolores minim. Bibendumin malesuada adipiscing ante, mattis fames nequeetiam lorem. No diam id. Litora quisaenean commodo lobortisetiam neque, libero mollis scelerisque inceptos ullamcorper sea congue delenit possim."
, docButton : Button { title : "Your first map in less than 5 minutes" , docButton : Button { title : "Your first map in less than 5 minutes"
...@@ -34,7 +34,7 @@ blockTexts = [ BlockText { title : "Random sentences in Gargantua's Books chapte ...@@ -34,7 +34,7 @@ blockTexts = [ BlockText { title : "Random sentences in Gargantua's Books chapte
} }
, BlockText { title : "Randomized letters, true or false ?" , BlockText { title : "Randomized letters, true or false ?"
, href : "#" , href : "#"
, icon : "fas fa-random" , icon : "glyphicon glyphicon-random"
, titleText : "Tutoreil" , titleText : "Tutoreil"
, text : "Il paraît que l'rdore des lettres dans un mot n'a pas d'imtraopnce. La première et la dernière lettre doeivnt être à la bonne place. Le reste peut être dans un désordre total et on peut touojurs lire sans prolèbme. On ne lit donc pas chaque lettre en ellêem-me, mais le mot comme un tout. Un chaegmnent de référentiel et nous tranpossons ce résultat au texte luimê-me: l'rdore des mots est failbement important copamré au contexte du texte qui, lui, est copmté: comptexter avec Gargantext." , text : "Il paraît que l'rdore des lettres dans un mot n'a pas d'imtraopnce. La première et la dernière lettre doeivnt être à la bonne place. Le reste peut être dans un désordre total et on peut touojurs lire sans prolèbme. On ne lit donc pas chaque lettre en ellêem-me, mais le mot comme un tout. Un chaegmnent de référentiel et nous tranpossons ce résultat au texte luimê-me: l'rdore des mots est failbement important copamré au contexte du texte qui, lui, est copmté: comptexter avec Gargantext."
, docButton : Button { title : "Your first map in less than 5 minutes" , docButton : Button { title : "Your first map in less than 5 minutes"
......
...@@ -14,7 +14,7 @@ landingData = LandingData { name : "Gargantext" ...@@ -14,7 +14,7 @@ landingData = LandingData { name : "Gargantext"
blockTexts :: Array BlockText blockTexts :: Array BlockText
blockTexts = [ BlockText { title : "Phrases aléatoires issues de l'oeuvre de François Rabelais. L'ordre historique des chapitres est préservé." blockTexts = [ BlockText { title : "Phrases aléatoires issues de l'oeuvre de François Rabelais. L'ordre historique des chapitres est préservé."
, href : "#" , href : "#"
, icon : "fas fa-random" , icon : "glyphicon glyphicon-random"
, titleText : "Historique" , titleText : "Historique"
, text : "Chapitre 1" , text : "Chapitre 1"
, docButton : Button { title : "Your first map in less than 5 minutes" , docButton : Button { title : "Your first map in less than 5 minutes"
...@@ -24,7 +24,7 @@ blockTexts = [ BlockText { title : "Phrases aléatoires issues de l'oeuvre de Fr ...@@ -24,7 +24,7 @@ blockTexts = [ BlockText { title : "Phrases aléatoires issues de l'oeuvre de Fr
} }
, BlockText { title : "Mots aléatoires." , BlockText { title : "Mots aléatoires."
, href : "#" , href : "#"
, icon : "fas fa-random" , icon : "glyphicon glyphicon-random"
, titleText : "Presentation" , titleText : "Presentation"
, text : "Autem nascetur iaculis, sedfusce enimsed cursus posuere consectetuer eu justo aliquammauris. Phasellus vero nisi porttitor elit quod, leo feliscras ultricies non tempor sagittis. Liberoduis facilisinam erat dapibusnam, lacus dui duis tristique volutpatut quis vestibulum magna. Nobis faucibusvestibulum dolores minim. Bibendumin malesuada adipiscing ante, mattis fames nequeetiam lorem. No diam id. Litora quisaenean commodo lobortisetiam neque, libero mollis scelerisque inceptos ullamcorper sea congue delenit possim." , text : "Autem nascetur iaculis, sedfusce enimsed cursus posuere consectetuer eu justo aliquammauris. Phasellus vero nisi porttitor elit quod, leo feliscras ultricies non tempor sagittis. Liberoduis facilisinam erat dapibusnam, lacus dui duis tristique volutpatut quis vestibulum magna. Nobis faucibusvestibulum dolores minim. Bibendumin malesuada adipiscing ante, mattis fames nequeetiam lorem. No diam id. Litora quisaenean commodo lobortisetiam neque, libero mollis scelerisque inceptos ullamcorper sea congue delenit possim."
, docButton : Button { title : "Your first map in less than 5 minutes" , docButton : Button { title : "Your first map in less than 5 minutes"
...@@ -34,7 +34,7 @@ blockTexts = [ BlockText { title : "Phrases aléatoires issues de l'oeuvre de Fr ...@@ -34,7 +34,7 @@ blockTexts = [ BlockText { title : "Phrases aléatoires issues de l'oeuvre de Fr
} }
, BlockText { title : "Lettres alétaoires, expérience" , BlockText { title : "Lettres alétaoires, expérience"
, href : "#" , href : "#"
, icon : "fas fa-random" , icon : "glyphicon glyphicon-random"
, titleText : "Tutoreil" , titleText : "Tutoreil"
, text : "Il paraît que l'rdore des lettres dans un mot n'a pas d'imtraopnce. La première et la dernière lettre doeivnt être à la bonne place. Le reste peut être dans un désordre total et on peut touojurs lire sans prolèbme. On ne lit donc pas chaque lettre en ellêem-me, mais le mot comme un tout. Un chaegmnent de référentiel et nous tranpossons ce résultat au texte luimê-me: l'rdore des mots est failbement important copamré au contexte du texte qui, lui, est copmté: comptexter avec Gargantext." , text : "Il paraît que l'rdore des lettres dans un mot n'a pas d'imtraopnce. La première et la dernière lettre doeivnt être à la bonne place. Le reste peut être dans un désordre total et on peut touojurs lire sans prolèbme. On ne lit donc pas chaque lettre en ellêem-me, mais le mot comme un tout. Un chaegmnent de référentiel et nous tranpossons ce résultat au texte luimê-me: l'rdore des mots est failbement important copamré au contexte du texte qui, lui, est copmté: comptexter avec Gargantext."
, docButton : Button { title : "Your first map in less than 5 minutes" , docButton : Button { title : "Your first map in less than 5 minutes"
......
...@@ -337,7 +337,7 @@ tree params@{ngramsTable, ngramsStyle, ngramsEdit, ngramsClick} nd@{ngrams} = ...@@ -337,7 +337,7 @@ tree params@{ngramsTable, ngramsStyle, ngramsEdit, ngramsClick} nd@{ngrams} =
, i [ className "glyphicon glyphicon-pencil" , i [ className "glyphicon glyphicon-pencil"
, onClick $ const effect ] [] ] , onClick $ const effect ] [] ]
leaf = List.null cs leaf = List.null cs
icon = gray <> [className $ "fas fa-caret-" <> if open then "down" else "right"] icon = gray <> [className $ "glyphicon glyphicon-chevron-" <> if open then "down" else "right"]
open = not leaf || false {- TODO -} open = not leaf || false {- TODO -}
gray = if leaf then [style {color: "#adb5bd"}] else [] gray = if leaf then [style {color: "#adb5bd"}] else []
cs = ngramsTable ^.. ix ngrams <<< _NgramsElement <<< _children <<< folded cs = ngramsTable ^.. ix ngrams <<< _NgramsElement <<< _children <<< folded
...@@ -378,7 +378,7 @@ renderNgramsItem { ngramsTable, ngrams, ngramsElement, ngramsParent, dispatch } ...@@ -378,7 +378,7 @@ renderNgramsItem { ngramsTable, ngrams, ngramsElement, ngramsParent, dispatch }
then renderNgramsTree { ngramsTable, ngrams, ngramsStyle, ngramsClick, ngramsEdit } then renderNgramsTree { ngramsTable, ngrams, ngramsStyle, ngramsClick, ngramsEdit }
else else
a [onClick $ const $ dispatch $ ToggleChild true ngrams] a [onClick $ const $ dispatch $ ToggleChild true ngrams]
[ i [className "fas fa-plus"] [] [ i [className "glyphicon glyphicon-plus"] []
, span ngramsStyle [text $ " " <> ngrams] , span ngramsStyle [text $ " " <> ngrams]
] ]
, text $ show (ngramsElement ^. _NgramsElement <<< _occurrences) , text $ show (ngramsElement ^. _NgramsElement <<< _occurrences)
......
...@@ -107,18 +107,18 @@ renderTableHeaderLayout {title, desc, query, date, user} = ...@@ -107,18 +107,18 @@ renderTableHeaderLayout {title, desc, query, date, user} =
] ]
, div [className "row"] [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}] , div [className "row"] [ div [className "jumbotron1", style {padding : "12px 0px 20px 12px"}]
[ div [ className "col-md-8 content"] [ div [ className "col-md-8 content"]
[ p [] [ i [className "fa fa-globe"] [] [ p [] [ i [className "glyphicon glyphicon-globe"] []
, text $ " " <> desc , text $ " " <> desc
] ]
, p [] [ i [className "fab fa-searchengin"] [] , p [] [ i [className "glyphicon glyphicon-zoom-in"] []
, text $ " " <> query , text $ " " <> query
] ]
] ]
, div [ className "col-md-4 content"] , div [ className "col-md-4 content"]
[ p [] [ i [className "fa fa-calendar"] [] [ p [] [ i [className "glyphicon glyphicon-calendar"] []
, text $ " " <> date , text $ " " <> date
] ]
, p [] [ i [className "fa fa-user"] [] , p [] [ i [className "glyphicon glyphicon-user"] []
, text $ " " <> user , text $ " " <> user
] ]
] ]
......
...@@ -194,9 +194,9 @@ nodeOptionsCorp activated = case activated of ...@@ -194,9 +194,9 @@ nodeOptionsCorp activated = case activated of
-- on hover make other options available: -- on hover make other options available:
nodeOptionsView :: Boolean -> Array ReactElement nodeOptionsView :: Boolean -> Array ReactElement
nodeOptionsView activated = case activated of nodeOptionsView activated = case activated of
true -> [ i [className "fas fa-sync-alt" ] [] true -> [ i [className "glyphicon glyphicon-refresh" ] []
, i [className "fas fa-upload" ] [] , i [className "glyphicon glyphicon-upload" ] []
, i [className "fas fa-share-alt"] [] , i [className "glyphicon glyphicon-share"] []
] ]
false -> [] false -> []
...@@ -443,8 +443,6 @@ createNodeView _ _ = R.createElement el {} [] ...@@ -443,8 +443,6 @@ createNodeView _ _ = R.createElement el {} []
el = R.hooksComponent "CreateNodeView" cpt el = R.hooksComponent "CreateNodeView" cpt
cpt props _ = pure $ H.div {} [] cpt props _ = pure $ H.div {} []
--fileTypeView :: (Action -> Effect Unit) -> FTree -> R.Element --fileTypeView :: (Action -> Effect Unit) -> FTree -> R.Element
fileTypeView d (s@(NTree (LNode {id}) _) /\ _) (Just (DroppedFile {contents, fileType}) /\ setDroppedFile) (_ /\ setIsDragOver) = R.createElement el {} [] fileTypeView d (s@(NTree (LNode {id}) _) /\ _) (Just (DroppedFile {contents, fileType}) /\ setDroppedFile) (_ /\ setIsDragOver) = R.createElement el {} []
where where
......
...@@ -236,7 +236,7 @@ menuElements' = menuElements-- title, icon, text ...@@ -236,7 +236,7 @@ menuElements' = menuElements-- title, icon, text
[ -- =========================================================== [ -- ===========================================================
[ LiNav { title : "Quick start, tutorials and methodology" [ LiNav { title : "Quick start, tutorials and methodology"
, href : "https://iscpif.fr/gargantext/your-first-map/" , href : "https://iscpif.fr/gargantext/your-first-map/"
, icon : "fas fa-book" , icon : "glyphicon glyphicon-book"
, text : "Documentation" , text : "Documentation"
} }
, LiNav { title : "Report bug here" , LiNav { title : "Report bug here"
...@@ -260,7 +260,7 @@ menuElements' = menuElements-- title, icon, text ...@@ -260,7 +260,7 @@ menuElements' = menuElements-- title, icon, text
,------------------------------------------------------------ ,------------------------------------------------------------
[ LiNav { title : "More about us (you)" [ LiNav { title : "More about us (you)"
, href : "https://iscpif.fr" , href : "https://iscpif.fr"
, icon : "fas fa-question-circle" , icon : "glyphicon glyphicon-question-sign"
, text : "About" , text : "About"
} }
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment