Skip to content

TagSpaces is an offline, open source, document manager with tagging support

small ui improvements in the enrty properties

Ilian Sapundshiev11d042a467c0
diff --git a/app/components/EntryContainer.js b/app/components/EntryContainer.js
index 2dd0dc8b5..281669bed 100644
--- a/app/components/EntryContainer.js
+++ b/app/components/EntryContainer.js
@@ -150,7 +150,14 @@ const styles = theme => ({
right: 0,
backgroundColor: theme.palette.background.default,
boxShadow: '-15px 0px 24px 3px ' + theme.palette.background.default
- }
+ },
+ entryNavigationSection: {
+ position: 'absolute',
+ top: 55,
+ right: 0,
+ backgroundColor: theme.palette.background.default,
+ boxShadow: '-15px 0px 24px 3px ' + theme.palette.background.default
+ }
});
type Props = {
@@ -727,13 +734,6 @@ class EntryContainer extends React.Component<Props, State> {
>
<FileDownloadIcon />
</IconButton>
- <IconButton
- title={i18n.t('core:reloadFile')}
- aria-label={i18n.t('core:reloadFile')}
- onClick={this.reloadDocument}
- >
- <RefreshIcon />
- </IconButton>
{ !this.props.isReadOnlyMode && (
<IconButton
aria-label={i18n.t('core:duplicateFile')}
@@ -754,24 +754,33 @@ class EntryContainer extends React.Component<Props, State> {
<DeleteIcon />
</IconButton>
)}
+ <IconButton
+ title={i18n.t('core:reloadFile')}
+ aria-label={i18n.t('core:reloadFile')}
+ onClick={this.reloadDocument}
+ >
+ <RefreshIcon />
+ </IconButton>
+ </div>
+ <div className={classes.entryNavigationSection} >
+ <IconButton
+ title={i18n.t('core:openPrevFileTooltip')}
+ aria-label={i18n.t('core:openPrevFileTooltip')}
+ data-tid="fileContainerPrevFile"
+ onClick={this.openPrevFile}
+ >
+ <ArrowLeftIcon />
+ </IconButton>
+ <IconButton
+ title={i18n.t('core:openNextFileTooltip')}
+ aria-label={i18n.t('core:openNextFileTooltip')}
+ data-tid="fileContainerNextFile"
+ onClick={this.openNextFile}
+ style={{ marginRight: 5 }}
+ >
+ <ArrowRightIcon />
+ </IconButton>
</div>
- <IconButton
- title={i18n.t('core:openPrevFileTooltip')}
- aria-label={i18n.t('core:openPrevFileTooltip')}
- data-tid="fileContainerPrevFile"
- onClick={this.openPrevFile}
- >
- <ArrowLeftIcon />
- </IconButton>
- <IconButton
- title={i18n.t('core:openNextFileTooltip')}
- aria-label={i18n.t('core:openNextFileTooltip')}
- data-tid="fileContainerNextFile"
- onClick={this.openNextFile}
- style={{ marginRight: 5 }}
- >
- <ArrowRightIcon />
- </IconButton>
</div>
);
diff --git a/app/components/EntryProperties.js b/app/components/EntryProperties.js
index 59a68e22b..79f755b6b 100644
--- a/app/components/EntryProperties.js
+++ b/app/components/EntryProperties.js
@@ -95,7 +95,7 @@ const styles = theme => ({
color: theme.palette.text.primary
},
field: {
- color: theme.palette.primary.contrastText + ' !important'
+ color: theme.palette.text.disabled + ' !important'
},
entryItem: {
width: '100%',
@@ -603,17 +603,15 @@ class EntryProperties extends Component<Props, State> {
</div>
<div className="grid-item" />
</div>
- <Paper elevation={2} className={classes.tags}>
- <TagDropContainer entryPath={path}>
- <TagsSelect isReadOnlyMode={isReadOnlyMode} tags={tags} handleChange={this.handleChange} />
- </TagDropContainer>
- </Paper>
+ <TagDropContainer entryPath={path}>
+ <TagsSelect isReadOnlyMode={isReadOnlyMode} tags={tags} handleChange={this.handleChange} />
+ </TagDropContainer>
</div>
<div className={classes.entryItem}>
<div className={classes.fluidGrid}>
<div className="grid-item">
- <Typography variant="caption" className={classNames(classes.entryLabel, classes.header)} style={{ display: 'block' }}>
+ <Typography variant="caption" className={classNames(classes.header, classes.header)} style={{ display: 'block' }}>
{i18n.t('core:filePropertiesDescription')}
</Typography>
</div>
@@ -658,26 +656,28 @@ class EntryProperties extends Component<Props, State> {
onChange={e => this.handleInputChange(e)}
/>
) : (
- <Paper elevation={2} style={{ padding: 5 }}>
- <Typography
- className={classes.header}
- style={{ display: 'block' }}
- role="button"
- id="descriptionArea"
- placeholder={Pro ? 'Click to add description' : i18n.t('core:addDescription')}
- dangerouslySetInnerHTML={{
- __html:
- description !== ''
- ? marked(DOMPurify.sanitize(description))
- : Pro ? 'Click to add description' : i18n.t('core:addDescription')
- }}
- onClick={() => {
- if (!isEditDescription) {
- this.toggleEditDescriptionField();
- }
- }}
- />
- </Paper>
+ <Typography
+ style={{
+ display: 'block',
+ padding: 2,
+ marginBottom: 5
+ }}
+ className={classes.field}
+ role="button"
+ id="descriptionArea"
+ // placeholder={Pro ? 'Click to add description' : i18n.t('core:addDescription')}
+ dangerouslySetInnerHTML={{
+ __html:
+ description !== ''
+ ? marked(DOMPurify.sanitize(description))
+ : Pro ? 'Click to add description' : i18n.t('core:addDescription')
+ }}
+ onClick={() => {
+ if (!isEditDescription) {
+ this.toggleEditDescriptionField();
+ }
+ }}
+ />
)}
</FormControl>
</div>
@@ -778,7 +778,7 @@ class EntryProperties extends Component<Props, State> {
<div className={classes.entryItem}>
<div className={classes.fluidGrid}>
- <Typography variant="caption" className={classNames(classes.entryLabel, classes.header)} style={{ display: 'block' }}>
+ <Typography variant="caption" className={classNames(classes.header)} style={{ display: 'block' }}>
{i18n.t('core:filePath')}
</Typography>
{isFile && !isReadOnlyMode && (
@@ -808,7 +808,7 @@ class EntryProperties extends Component<Props, State> {
<div className={classes.entryItem}>
<div className={classes.fluidGrid}>
- <Typography variant="caption" className={classNames(classes.entryLabel, classes.header)} style={{ display: 'block' }}>
+ <Typography variant="caption" className={classNames(classes.header)} style={{ display: 'block' }}>
{i18n.t('core:thumbnail')}
</Typography>
{!isReadOnlyMode && (
diff --git a/app/components/TagsSelect.js b/app/components/TagsSelect.js
index 257457e10..d8d9ec210 100644
--- a/app/components/TagsSelect.js
+++ b/app/components/TagsSelect.js
@@ -269,7 +269,7 @@ const TagsSelect = (props: Props) => {
}} */
value={tags}
onChange={handleChange}
- placeholder={i18n.t('core:searchTags')}
+ placeholder={i18n.t('core:dropHere')}
isMulti
formatCreateLabel={(label) => label}
// isSearchable