Skip to content

P
purescript-gargantext
Commit d410c7b7 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski
Browse files
Options

[bootstrap v4] fixes to node popup

parent a71358b9
Expand all Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 3101 deletions
dist/js/bootstrap.js deleted 100644 → 0
View file @ a71358b9
This diff is collapsed.
dist/js/bootstrap.min.js deleted 100644 → 0
View file @ a71358b9
This diff is collapsed.
dist/styles/bootstrap-theme.css deleted 100644 → 0
View file @ a71358b9
This diff is collapsed.
dist/styles/bootstrap-theme.min.css deleted 100644 → 0
View file @ a71358b9
This diff is collapsed.
dist/styles/sass.css
View file @ d410c7b7
......@@ -245,24 +245,25 @@ li#rename #rename-a {
display: flex;
flex-direction: colum;
}
#node-popup-tooltip .popup-container .panel {
#node-popup-tooltip .popup-container .card {
border: 1px solid rgba(0, 0, 0, 0.2);
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
margin-bottom: 0px;
width: 34rem;
}
#node-popup-tooltip .popup-container .panel .glyphicon-pencil {
#node-popup-tooltip .popup-container .card .fa-pencil {
color: black;
}
#node-popup-tooltip .popup-container .panel .panel-body {
#node-popup-tooltip .popup-container .card .card-body {
display: flex;
justify-content: center;
background-color: white;
border: none;
}
#node-popup-tooltip .popup-container .panel .panel-body .spacer {
#node-popup-tooltip .popup-container .card .card-body .spacer {
margin: 10px;
}
#node-popup-tooltip .popup-container .frame-search.panel {
#node-popup-tooltip .popup-container .frame-search.card {
border: 1px solid rgba(0, 0, 0, 0.2);
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
height: 600px;
......@@ -276,7 +277,7 @@ li#rename #rename-a {
background-color: white;
z-index: 1000;
}
#create-node-tooltip .panel-body input {
#create-node-tooltip .card-body input {
min-width: 200px;
}
......@@ -287,7 +288,7 @@ li#rename #rename-a {
background-color: white;
z-index: 1000;
}
#file-type-tooltip .panel-body select {
#file-type-tooltip .card-body select {
min-width: 200px;
}
......@@ -333,11 +334,6 @@ li#rename #rename-a {
margin: 0 !important;
}
.row-no-padding > [class*=col-] {
padding-left: 0 !important;
padding-right: 0 !important;
}
.tab-pane .reload-btn {
padding-right: 6px;
}
......
dist/styles/sass.css.map
View file @ d410c7b7
{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass"],"names":[],"mappings":"AAAA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAVA;EACA;EAEA;EASE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EAlCA;EACA;EAEA;EAiCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;;AACA;EACE;;AAER;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AC1FJ;EACE;;;AAOF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;AC1KF;EACE;;;AAGA;EACE;EACA;;AAEA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAER;EACE;;AAEE;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;EACA;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;ACrIR;EACE;;AAEA;EACE;;AACA;EACE;;AACJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EArDR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA2DM;EACE;EACA;EACA;EACA;EACA;EA7DR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAmEE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;ACtGV;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;EACA;EACA;;;AAKE;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;ACjDF;EACE;AACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA","file":"sass.css"}
\ No newline at end of file
{"version":3,"sourceRoot":"","sources":["../../src/sass/_menu.sass","../../src/sass/_context_menu.sass","../../src/sass/_graph.sass","../../src/sass/_login.sass","../../src/sass/_tree.sass","../../src/sass/_code_editor.sass","../../src/sass/_styles.sass","../../src/sass/_range_slider.sass"],"names":[],"mappings":"AAAA;AAEA;AACA;AACA;AACA;AACA;AAEA;EACI;EACA;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;;;AAEF;AACI;EACA;;;AAEJ;AACI;EACA;;;AAGJ;AACA;EACI;;;AAEJ;EACI;EACA;EACA;EACA;;;AAEJ;EACE;EACA;;;AAEF;EACE;;;AC7CF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;;;AClBF;EACE;;;AAEF;AAkCE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAxCA;EAVA;EACA;EAEA;EASE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEF;EACE;EACA;;AAGA;EACE;EACA;;AACN;EACE;;AACF;EACE;;AAEF;EAlCA;EACA;EAEA;EAiCE;EACA;;AACF;EACE;;AACF;EACE;;AAWF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;EACA;;AACA;EACE;;AAER;EACE;;AAEA;EACE;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AC1FJ;EACE;;;AAOF;EACE;;AACA;EACE;EACA;;;AAEJ;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAGF;EACE;;AAEE;EACE;EACA;;AACA;EACE;;;AAIJ;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AACF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACN;EACE;EACA;EACA;EACA;;;AAGN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;;AAGE;EACE;;;AAEN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;;;AAEJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAGF;EACE;;;AAEJ;EACI;EACA;;;AAGF;EACE;;;AAEJ;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;;ACvKF;EACE;;;AAGA;EACE;EACA;;AAEA;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AAER;EACE;;AAEE;EACE;;AACA;EACE;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;EACA;EACA;;AACF;EACE;;AACF;EACE;EACA;EACA;EAEA;EACA;EACA;;AAEA;EACE;;AACF;EACE;;AAGN;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AAIR;EACE;;AACF;EACE;;AACA;EACE;EACA;;AAEE;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAEV;EACE;;AACF;EACE;;AAEE;EACE;;AACF;EACE;;AACN;EACE;;AAEE;EACE;EACA;;;AAGR;EACE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAIF;EACE;;AAEA;EACE;;;ACrIR;EACE;;AAEA;EACE;;AACA;EACE;;AACJ;EACE;EACA;;;AAGF;EACE;EACA;EACA;;AACF;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EArDR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA2DM;EACE;EACA;EACA;EACA;EACA;EA7DR;EACA;EACA;EACA;EACA;EACA;EACA;EAlBA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAmEE;EACE;EACA;EACA;EACA;EACA;EACA;;AACF;EACE;EACA;EACA;;AACA;EACE;EACA;;AACF;EACE;EACA;;AACF;EACE;EACA;;AAGE;EACE;;AAEF;EACE;;;ACtGV;EACE;;AACF;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAGE;EACE;EACA;;AAEF;EACE;EACA;;;AAEV;EACE;;AACA;EACE;EACA;EACA;;;AAKE;EACE;EACA;;AACF;EACE;;AACA;EACE;;AACJ;EACE;;;AAER;EACE;;;AAEF;EACE;;;AAEF;EACE;;;ACjDF;EACE;AACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EAEA;EAEA;;AAEA;EACE;EAEA;EACA;EACA","file":"sass.css"}
\ No newline at end of file
src/Gargantext/Components/ContextMenu/ContextMenu.purs
View file @ d410c7b7
......@@ -48,7 +48,7 @@ contextMenuCpt = R.hooksComponentWithModule thisModule "contextMenu" cpt
R.useLayoutEffect2 root rect (contextMenuEffect onClose root)
let cs = [
HTML.div { className: "popover-content" }
[ HTML.div { className: "panel panel-default" }
[ HTML.div { className: "card" }
[ HTML.ul { className: "list-group" }
children
]
......
src/Gargantext/Components/DocsTable.purs
View file @ d410c7b7
......@@ -372,8 +372,8 @@ pagePaintRawCpt = R.hooksComponentWithModule thisModule "pagePaintRawCpt" cpt wh
}
where
sid = sessionId session
gi Star_1 = "glyphicon glyphicon-star"
gi _ = "glyphicon glyphicon-star-empty"
gi Star_1 = "fa fa-star"
gi _ = "fa fa-star-empty"
trashClassName Star_0 _ = "trash"
trashClassName _ true = "active"
trashClassName _ false = ""
......
src/Gargantext/Components/FacetsTable.purs
View file @ d410c7b7
......@@ -119,7 +119,7 @@ docViewCpt = R.hooksComponentWithModule thisModule "docView" cpt
[ pageLayout { deletions, frontends, totalRecords, container, session, path } ]
, H.div { className: "col-md-12" }
[ H.button { style: buttonStyle, on: { click: trashClick deletions } }
[ H.i { className: "glyphitem glyphicon glyphicon-trash"
[ H.i { className: "glyphitem fa fa-trash"
, style: { marginRight : "9px" }} []
, H.text "Delete document!" ] ] ] ]
where
......@@ -168,7 +168,7 @@ docViewGraphCpt = R.hooksComponentWithModule thisModule "docViewGraph" cpt
, H.div { className: "col-md-12" }
[ pageLayout { frontends, totalRecords, deletions, container, session, path }
, H.button { style: buttonStyle, on: { click: performClick } }
[ H.i { className: "glyphitem glyphicon glyphicon-trash"
[ H.i { className: "glyphitem fa fa-trash"
, style: { marginRight : "9px" } } []
, H.text "Delete document!"
]
......@@ -315,8 +315,8 @@ pageCpt = R.hooksComponentWithModule thisModule "page" cpt
colNames = T.ColumnName <$> [ "", "Date", "Title", "Source", "Authors", "Delete" ]
wrapColElts = const identity
-- TODO: how to interprete other scores?
gi Favorite = "glyphicon glyphicon-star-empty"
gi _ = "glyphicon glyphicon-star"
gi Favorite = "fa fa-star-empty"
gi _ = "fa fa-star"
isChecked id = Set.member id (fst deletions).pending
isDeleted (DocumentsView {id}) = Set.member id (fst deletions).deleted
pairUrl (Pair {id,label})
......
src/Gargantext/Components/Forest/Tree/Node.purs
View file @ d410c7b7
......@@ -228,7 +228,7 @@ nodeMainSpan = R.createElement nodeMainSpanCpt
fldr nt open = if open
then "fa fa-globe" -- <> color nt
else "fa fa-folder-globe" -- <> color nt
--else "glyphicon glyphicon-folder-close" <> color nt
--else "fa fa-folder-close" <> color nt
where
color GT.NodeUser = ""
color FolderPublic = ""
......
src/Gargantext/Components/Forest/Tree/Node/Action/Contact.purs
View file @ d410c7b7
......@@ -46,7 +46,7 @@ textInputBox p@{ boxName, boxAction, dispatch, isOpen: (true /\ setIsOpen), para
let {firstname, lastname} = params'
stateFirstname <- R.useState' firstname
stateLastname <- R.useState' lastname
pure $ H.div {className: "from-group row-no-padding"}
pure $ H.div {className: "from-group row"}
[ textInput stateFirstname firstname
, textInput stateLastname lastname
, submitBtn stateFirstname stateLastname
......@@ -65,7 +65,7 @@ textInputBox p@{ boxName, boxAction, dispatch, isOpen: (true /\ setIsOpen), para
}
]
submitBtn (val1 /\ _) (val2 /\ _) =
H.a {className: "btn glyphitem glyphicon glyphicon-ok col-md-2 pull-left"
H.a {className: "btn glyphitem fa fa-ok col-md-2 pull-left"
, type: "button"
, on: { click: \_ -> do
setIsOpen $ const false
......@@ -74,7 +74,7 @@ textInputBox p@{ boxName, boxAction, dispatch, isOpen: (true /\ setIsOpen), para
, title: "Submit"
} []
cancelBtn =
H.a {className: "btn text-danger glyphitem glyphicon glyphicon-remove col-md-2 pull-left"
H.a {className: "btn text-danger glyphitem fa fa-remove col-md-2 pull-left"
, on: { click: \_ -> setIsOpen $ const false }
, title: "Cancel"
, type: "button"
......
src/Gargantext/Components/Forest/Tree/Node/Action/Merge.purs
View file @ d410c7b7
......@@ -48,11 +48,11 @@ mergeNodeCpt = R.hooksComponentWithModule thisModule "mergeNode" cpt
, subTreeParams
, handed
}
, H.div { className:"panel panel-primary"}
, H.div { className:"card card-primary"}
[ H.text "Merge which list?"
, checkboxes [GT.MapTerm, GT.CandidateTerm, GT.StopTerm] options
]
, H.div { className:"panel panel-primary"}
, H.div { className:"card card-primary"}
[ H.text "Title"
, H.div {className: "checkbox"}
[checkbox merge, H.text "Merge data?"]
......
src/Gargantext/Components/Forest/Tree/Node/Action/Search/Frame.purs
View file @ d410c7b7
......@@ -67,7 +67,7 @@ divIframe props = R.createElement divIframeCpt props []
divIframeCpt = R.hooksComponentWithModule thisModule "divIframe" cpt
cpt { frameSource, iframeRef, search: search@(search' /\ _) } _ = do
pure $ H.div { className: "frame-search panel panel-default" }
pure $ H.div { className: "frame-search card" }
[ iframeWith { frameSource, iframeRef, search } ]
frameUrl :: FrameSource -> String
......
src/Gargantext/Components/Forest/Tree/Node/Action/Upload.purs
View file @ d410c7b7
......@@ -197,7 +197,7 @@ fileTypeViewCpt = R.hooksComponentWithModule thisModule "fileTypeView" cpt
, isDragOver: (_ /\ setIsDragOver)
, nodeType
} _ = pure
$ H.div tooltipProps [ H.div { className: "panel panel-default"}
$ H.div tooltipProps [ H.div { className: "card"}
[ panelHeading
, panelBody
, panelFooter
......@@ -212,12 +212,12 @@ fileTypeViewCpt = R.hooksComponentWithModule thisModule "fileTypeView" cpt
}
}
panelHeading =
H.div {className: "panel-heading"}
H.div {className: "card-header"}
[ H.div {className: "row"}
[ H.div {className: "col-md-10"}
[ H.h5 {} [H.text "Choose file type"] ]
, H.div {className: "col-md-2"}
[ H.a {className: "btn glyphitem glyphicon glyphicon-remove-circle"
[ H.a {className: "btn glyphitem fa fa-remove-circle"
, on: {click: \_ -> do
setDroppedFile $ const Nothing
setIsDragOver $ const false
......@@ -228,7 +228,7 @@ fileTypeViewCpt = R.hooksComponentWithModule thisModule "fileTypeView" cpt
]
panelBody =
H.div {className: "panel-body"}
H.div {className: "card-body"}
[ R2.select {className: "col-md-12 form-control"
, on: {change: onChange}
}
......@@ -243,7 +243,7 @@ fileTypeViewCpt = R.hooksComponentWithModule thisModule "fileTypeView" cpt
renderOption opt = H.option {} [ H.text $ show opt ]
panelFooter =
H.div {className: "panel-footer"}
H.div {className: "card-footer"}
[
case fileType of
Just ft ->
......
src/Gargantext/Components/Forest/Tree/Node/Box.purs
View file @ d410c7b7
......@@ -53,7 +53,7 @@ nodePopupView p = R.createElement nodePopupCpt p []
nodePopupCpt = R.hooksComponentWithModule thisModule "nodePopupView" cpt
cpt p _ = do
isOpen <- R.useState' false
renameIsOpen <- R.useState' false
nodePopupState@(nodePopup /\ setNodePopup)
<- R.useState' { action : Nothing
......@@ -65,20 +65,12 @@ nodePopupView p = R.createElement nodePopupCpt p []
search <- R.useState'
$ defaultSearch { node_id = Just p.id }
pure $ H.div tooltipProps $
pure $ H.div tooltipProps
[ H.div { className: "popup-container" }
[ H.div { className: "panel panel-default" }
[ H.div {className: ""}
[ H.div { className : "col-md-10 flex-between"}
[ H.h3 { className: GT.fldr p.nodeType true} []
-- TODO fix names
, H.text $ prettyNodeType p.nodeType
, H.p {className: "text-primary center"} [H.text p.name]
]
]
, panelHeading isOpen p
[ H.div { className: "card" }
[ panelHeading renameIsOpen p
, panelBody nodePopupState p
, mPanelAction nodePopupState p
, H.div { className: "card-footer" } [ mPanelAction nodePopupState p ]
]
]
]
......@@ -92,22 +84,29 @@ nodePopupView p = R.createElement nodePopupCpt p []
--, style: { top: y - 65.0, left: x + 10.0 }
}
panelHeading isOpen@(open /\ _) {dispatch, id, name, nodeType} =
H.div {className: "panel-heading"}
panelHeading renameIsOpen@(open /\ _) {dispatch, id, name, nodeType} =
H.div {className: "card-header"}
[ R2.row
[ H.div {className: "col-md-8 flex-end"}
[ textInputBox { boxAction: renameAction
[ H.div { className: "col-4" }
[ H.span { className: GT.fldr p.nodeType true} []
-- TODO fix names
, H.span { className: "h5" } [ H.text $ prettyNodeType p.nodeType ]
]
, H.div { className: "col-6" }
[ if open then
textInputBox { boxAction: renameAction
, boxName: "Rename"
, dispatch
, id
, text:name
, isOpen
, text: name
, isOpen: renameIsOpen
}
else
H.span { className: "text-primary center" } [H.text p.name]
]
, H.div {className: "flex-end"}
[ if edit then editIcon isOpen else H.div {} []
, H.div {className: "col-md-1"}
, H.div {className: "col-1"}
[ editIcon renameIsOpen ]
, H.div {className: "col-1"}
[ H.a { "type" : "button"
, className: glyphicon "window-close"
, on : { click: \e -> p.onPopoverClose
......@@ -118,27 +117,22 @@ nodePopupView p = R.createElement nodePopupCpt p []
]
]
]
]
where
SettingsBox {edit, doc, buttons} = settingsBox nodeType
editIcon :: R.State Boolean -> R.Element
editIcon (false /\ setIsOpen) =
H.div {className : "col-md-1"}
[ H.a { className: glyphicon "pencil"
editIcon (false /\ setIsOpen) = H.a { className: glyphicon "pencil"
, id : "rename1"
, title : "Rename"
, on: { click: \_ -> setIsOpen $ const true }
}
[]
]
} []
editIcon (true /\ _) = H.div {} []
panelBody :: R.State (Record ActionState)
-> Record NodePopupProps
-> R.Element
panelBody nodePopupState {dispatch: d, nodeType} =
H.div {className: "panel-body flex-space-between"}
H.div {className: "card-body flex-space-between"}
$ [ H.p { className: "spacer" } []
, H.div { className: "flex-center" }
[ buttonClick { action: doc
......@@ -155,7 +149,7 @@ nodePopupView p = R.createElement nodePopupCpt p []
]
-- FIXME trick to increase the size of the box
<> if A.length buttons < 2
then [H.div {className: "col-md-4"} []]
then [H.div {className: "col-4"} []]
else []
where
SettingsBox {edit, doc, buttons} = settingsBox nodeType
......@@ -165,10 +159,10 @@ nodePopupView p = R.createElement nodePopupCpt p []
-> R.Element
mPanelAction ({action: Nothing } /\ _) _ =
H.div {className:"center fa-hand-pointer-o"}
[ H.h4 {} [H.text " Select available actions of this node"]
, H.ul {} [ H.h5 {style:{color:"black"} , className: "fa-thumbs-o-up" } [H.text " Black: yes you can use it" ]
, H.h5 {style:{color:"orange"}, className: "fa-exclamation-triangle"} [H.text " Orange: almost useable" ]
, H.h5 {style:{color:"red"} , className: "fa-rocket" } [H.text " Red: development in progress" ]
[ H.h5 {} [H.text " Select available actions of this node"]
, H.ul {} [ H.div {style:{color:"black"} , className: "fa-thumbs-o-up" } [H.text " Black: yes you can use it" ]
, H.div {style:{color:"orange"}, className: "fa-exclamation-triangle"} [H.text " Orange: almost useable" ]
, H.div {style:{color:"red"} , className: "fa-rocket" } [H.text " Red: development in progress" ]
]
]
mPanelAction ({action: Just action} /\ _) props =
......@@ -202,7 +196,7 @@ buttonClickCpt :: R.Component ButtonClickProps
buttonClickCpt = R.hooksComponentWithModule thisModule "buttonClick" cpt
where
cpt {action: todo, state: (node@{action} /\ setNodePopup), nodeType} _ = do
pure $ H.div {className: "col-md-1"}
pure $ H.div {className: "col-1"}
[ H.a { style: (iconAStyle nodeType todo)
, className: glyphiconActive (glyphiconNodeAction todo)
(action == (Just todo) )
......
src/Gargantext/Components/Forest/Tree/Node/Tools.purs
View file @ d410c7b7
......@@ -21,7 +21,7 @@ import Gargantext.Ends (Frontends, url)
import Gargantext.Sessions (Session, sessionId)
import Gargantext.Types (ID, Name)
import Gargantext.Types as GT
import Gargantext.Utils (toggleSet)
import Gargantext.Utils (glyphicon, toggleSet)
import Gargantext.Utils.Reactix as R2
import Gargantext.Utils.ReactTooltip as ReactTooltip
......@@ -38,7 +38,7 @@ panel bodies submit =
H.div {} [ panelBody bodies, footer submit ]
where
panelBody bs =
H.div {className: "panel-body"}
H.div {className: "card-body"}
[ H.div { className: "row spacer" }
[ H.div { className: "col-md-12" } bs
-- TODO add type for text or form here
......@@ -46,7 +46,7 @@ panel bodies submit =
]
]
footer sb =
H.div {className: "panel-footer"}
H.div {className: "card-footer"}
[ H.div {} []
, H.div { className: "center"} [ sb ]
]
......@@ -67,20 +67,21 @@ textInputBox :: Record TextInputBoxProps -> R.Element
textInputBox p@{ boxName, boxAction, dispatch, isOpen: (true /\ setIsOpen) } = R.createElement el p []
where
el = R.hooksComponentWithModule thisModule (boxName <> "Box") cpt
cpt {id, text} _ = do
renameNodeName <- R.useState' text
pure $ H.div {className: "from-group row-no-padding"}
[ textInput renameNodeName
, submitBtn renameNodeName
renameNodeNameRef <- R.useRef text
pure $ H.div {className: "from-group row"}
[ textInput renameNodeNameRef
, submitBtn renameNodeNameRef
, cancelBtn
]
where
textInput (newName /\ setNewName) =
H.div {className: "col-md-8"}
[
inputWithEnter {
onEnter: submit newName
, onValueChanged: setNewName <<< const
textInput renameNodeNameRef =
H.div {className: "col-8"}
[ inputWithEnter {
onEnter: submit $ R.readRef renameNodeNameRef
, onValueChanged: R.setRef renameNodeNameRef
, autoFocus: false
, className: "form-control"
, defaultValue: text
......@@ -96,14 +97,14 @@ textInputBox p@{ boxName, boxAction, dispatch, isOpen: (true /\ setIsOpen) } = R
-- <<< R.unsafeEventValue }
-- }
]
submitBtn (newName /\ _) =
H.a {className: "btn glyphitem glyphicon glyphicon-ok col-md-2 pull-left"
submitBtn renameNodeNameRef =
H.a {className: "col-2 " <> glyphicon "floppy-o"
, type: "button"
, on: { click: submit newName }
, on: { click: submit $ R.readRef renameNodeNameRef }
, title: "Submit"
} []
cancelBtn =
H.a {className: "btn text-danger glyphitem glyphicon glyphicon-remove col-md-2 pull-left"
H.a {className: "text-danger col-2 " <> glyphicon "times"
, type: "button"
, on: { click: \_ -> setIsOpen $ const false }
, title: "Cancel"
......
src/Gargantext/Components/Lang/Landing/EnUS.purs
View file @ d410c7b7
......@@ -14,7 +14,7 @@ landingData = LandingData { name : "Gargantext"
blockTexts :: Array BlockText
blockTexts = [ BlockText { title : "Random sentences in Gargantua's Books chapters, historically true"
, href : "#"
, icon : "glyphicon glyphicon-random"
, icon : "fa fa-random"
, 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."
, 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
}
, BlockText { title : "Randomized words, semantically and syntaxically falses."
, href : "#"
, icon : "glyphicon glyphicon-random"
, icon : "fa fa-random"
, 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."
, 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
}
, BlockText { title : "Randomized letters, true or false ?"
, href : "#"
, icon : "glyphicon glyphicon-random"
, icon : "fa fa-random"
, 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."
, docButton : Button { title : "Your first map in less than 5 minutes"
......
src/Gargantext/Components/Lang/Landing/FrFR.purs
View file @ d410c7b7
......@@ -14,7 +14,7 @@ landingData = LandingData { name : "Gargantext"
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é."
, href : "#"
, icon : "glyphicon glyphicon-random"
, icon : "fa fa-random"
, titleText : "Historique"
, text : "Chapitre 1"
, 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
}
, BlockText { title : "Mots aléatoires."
, href : "#"
, icon : "glyphicon glyphicon-random"
, icon : "fa fa-random"
, 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."
, 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
}
, BlockText { title : "Lettres alétaoires, expérience"
, href : "#"
, icon : "glyphicon glyphicon-random"
, icon : "fa fa-random"
, 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."
, docButton : Button { title : "Your first map in less than 5 minutes"
......
src/Gargantext/Components/Login.purs
View file @ d410c7b7
......@@ -163,7 +163,7 @@ renderBackend state backend@(Backend {name}) =
]
where
iconLog = H.td {} [ H.a { on : {click}
--, className : "glyphitem glyphicon glyphicon-log-in"
--, className : "glyphitem fa fa-log-in"
, className : "fa fa-hand-o-right"
, title: "Log In"} []
]
......
src/Gargantext/Components/Modal.purs
View file @ d410c7b7
......@@ -34,7 +34,7 @@ modalCpt = R.hooksComponentWithModule thisModule "modal" cpt
pure $ R.createPortal
[ H.div { ref: root, className: "modal", data: {toggle: "popover", placement: "right"}}
[ H.div { className: "popover-content" }
[ H.div { className: "panel panel-default" }
[ H.div { className: "card" }
[ H.ul { className: "list-group" } children ]]]]
host
......
src/Gargantext/Components/NgramsTable.purs
View file @ d410c7b7
......@@ -211,7 +211,7 @@ tableContainerCpt { dispatch
then H.li {className: "list-group-item"}
[selectButtons true]
else H.div {} []
, H.div {id: "terms_table", className: "panel-body"}
, H.div {id: "terms_table", className: "card-body"}
[ H.table {className: "table able"}
[ H.thead {className: ""} [props.tableHead]
, H.tbody {} props.tableBody
......
src/Gargantext/Components/Nodes/Home.purs
View file @ d410c7b7
......@@ -336,7 +336,7 @@ docButton (Button b) =
, target: "blank"
, title: b.title
} [ H.span { aria: {hidden : true}
, className: "glyphicon glyphicon-hand-right"
, className: "fa fa-hand-right"
} []
, H.text b.text
]
......
src/sass/_login.sass
View file @ d410c7b7
......@@ -63,20 +63,21 @@ li#rename
.popup-container
display: flex
flex-direction: colum
.panel
.card
border: 1px solid rgba(0,0,0,0.2)
box-shadow: 0 2px 5px rgba(0,0,0,0.2)
margin-bottom: 0px
.glyphicon-pencil
width: 34rem
.fa-pencil
color: black
.panel-body
.card-body
display: flex
justify-content: center
background-color: white
border: none
.spacer
margin: 10px
.frame-search.panel
.frame-search.card
border: 1px solid rgba(0,0,0,0.2)
box-shadow: 0 2px 5px rgba(0,0,0,0.2)
height: 600px
......@@ -90,7 +91,7 @@ li#rename
background-color: white
z-index: 1000
.panel-body
.card-body
input
min-width: 200px
......@@ -101,7 +102,7 @@ li#rename
background-color: white
z-index: 1000
.panel-body
.card-body
select
min-width: 200px
......@@ -143,10 +144,6 @@ li#rename
padding: 0 !important
margin: 0 !important
.row-no-padding > [class*="col-"]
padding-left: 0 !important
padding-right: 0 !important
.tab-pane
.reload-btn
padding-right: 6px
......
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