aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--modern/src/settings/CalendarsPage.js8
-rw-r--r--modern/src/settings/CommandsPage.js12
-rw-r--r--modern/src/settings/ComputedAttributesPage.js14
-rw-r--r--modern/src/settings/DriversPage.js10
-rw-r--r--modern/src/settings/GroupsPage.js6
-rw-r--r--modern/src/settings/MaintenancesPage.js12
-rw-r--r--modern/src/settings/NotificationsPage.js12
-rw-r--r--modern/src/settings/UsersPage.js12
8 files changed, 43 insertions, 43 deletions
diff --git a/modern/src/settings/CalendarsPage.js b/modern/src/settings/CalendarsPage.js
index a3ff51d5..3f4aa3d3 100644
--- a/modern/src/settings/CalendarsPage.js
+++ b/modern/src/settings/CalendarsPage.js
@@ -12,8 +12,8 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
- width: theme.spacing(1),
- padding: theme.spacing(0, 1),
+ width: '1%',
+ paddingRight: theme.spacing(1),
},
}));
@@ -39,17 +39,17 @@ const CalendarsPage = () => {
<Table>
<TableHead>
<TableRow>
- <TableCell className={classes.columnAction} />
<TableCell>{t('sharedName')}</TableCell>
+ <TableCell className={classes.columnAction} />
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
+ <TableCell>{item.name}</TableCell>
<TableCell className={classes.columnAction} padding="none">
<CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" setTimestamp={setTimestamp} />
</TableCell>
- <TableCell>{item.name}</TableCell>
</TableRow>
))}
</TableBody>
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.js
index dd1559d9..397263d0 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.js
@@ -14,8 +14,8 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
- width: theme.spacing(1),
- padding: theme.spacing(0, 1),
+ width: '1%',
+ paddingRight: theme.spacing(1),
},
}));
@@ -41,21 +41,21 @@ const CommandsPage = () => {
<Table>
<TableHead>
<TableRow>
- <TableCell className={classes.columnAction} />
<TableCell>{t('sharedDescription')}</TableCell>
<TableCell>{t('sharedType')}</TableCell>
<TableCell>{t('commandSendSms')}</TableCell>
+ <TableCell className={classes.columnAction} />
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
- <TableCell className={classes.columnAction} padding="none">
- <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" setTimestamp={setTimestamp} />
- </TableCell>
<TableCell>{item.description}</TableCell>
<TableCell>{t(prefixString('command', item.type))}</TableCell>
<TableCell>{formatBoolean(item.textChannel, t)}</TableCell>
+ <TableCell className={classes.columnAction} padding="none">
+ <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" setTimestamp={setTimestamp} />
+ </TableCell>
</TableRow>
))}
</TableBody>
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index b754f9fe..c8e07b71 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -13,8 +13,8 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
- width: theme.spacing(1),
- padding: theme.spacing(0, 1),
+ width: '1%',
+ paddingRight: theme.spacing(1),
},
}));
@@ -41,25 +41,25 @@ const ComputedAttributesPage = () => {
<Table>
<TableHead>
<TableRow>
- {administrator && <TableCell className={classes.columnAction} />}
<TableCell>{t('sharedDescription')}</TableCell>
<TableCell>{t('sharedAttribute')}</TableCell>
<TableCell>{t('sharedExpression')}</TableCell>
<TableCell>{t('sharedType')}</TableCell>
+ {administrator && <TableCell className={classes.columnAction} />}
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
+ <TableCell>{item.description}</TableCell>
+ <TableCell>{item.attribute}</TableCell>
+ <TableCell>{item.expression}</TableCell>
+ <TableCell>{item.type}</TableCell>
{administrator && (
<TableCell className={classes.columnAction} padding="none">
<CollectionActions itemId={item.id} editPath="/settings/attribute" endpoint="attributes/computed" setTimestamp={setTimestamp} />
</TableCell>
)}
- <TableCell>{item.description}</TableCell>
- <TableCell>{item.attribute}</TableCell>
- <TableCell>{item.expression}</TableCell>
- <TableCell>{item.type}</TableCell>
</TableRow>
))}
</TableBody>
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.js
index c4de30e9..b66f9f9a 100644
--- a/modern/src/settings/DriversPage.js
+++ b/modern/src/settings/DriversPage.js
@@ -12,8 +12,8 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
- width: theme.spacing(1),
- padding: theme.spacing(0, 1),
+ width: '1%',
+ paddingRight: theme.spacing(1),
},
}));
@@ -39,19 +39,19 @@ const DriversPage = () => {
<Table>
<TableHead>
<TableRow>
- <TableCell className={classes.columnAction} />
<TableCell>{t('sharedName')}</TableCell>
<TableCell>{t('deviceIdentifier')}</TableCell>
+ <TableCell className={classes.columnAction} />
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
+ <TableCell>{item.name}</TableCell>
+ <TableCell>{item.uniqueId}</TableCell>
<TableCell className={classes.columnAction} padding="none">
<CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" setTimestamp={setTimestamp} />
</TableCell>
- <TableCell>{item.name}</TableCell>
- <TableCell>{item.uniqueId}</TableCell>
</TableRow>
))}
</TableBody>
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js
index 7526563b..1ec63b0c 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.js
@@ -13,7 +13,7 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
width: '1%',
- padding: theme.spacing(0, 1),
+ paddingRight: theme.spacing(1),
},
}));
@@ -39,17 +39,17 @@ const GroupsPage = () => {
<Table>
<TableHead>
<TableRow>
- <TableCell className={classes.columnAction} />
<TableCell>{t('sharedName')}</TableCell>
+ <TableCell className={classes.columnAction} />
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
+ <TableCell>{item.name}</TableCell>
<TableCell className={classes.columnAction} padding="none">
<CollectionActions itemId={item.id} editPath="/settings/group" endpoint="groups" setTimestamp={setTimestamp} />
</TableCell>
- <TableCell>{item.name}</TableCell>
</TableRow>
))}
</TableBody>
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js
index d4a06fd2..6f752b32 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.js
@@ -15,8 +15,8 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
- width: theme.spacing(1),
- padding: theme.spacing(0, 1),
+ width: '1%',
+ paddingRight: theme.spacing(1),
},
}));
@@ -62,23 +62,23 @@ const MaintenacesPage = () => {
<Table>
<TableHead>
<TableRow>
- <TableCell className={classes.columnAction} />
<TableCell>{t('sharedName')}</TableCell>
<TableCell>{t('sharedType')}</TableCell>
<TableCell>{t('maintenanceStart')}</TableCell>
<TableCell>{t('maintenancePeriod')}</TableCell>
+ <TableCell className={classes.columnAction} />
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
- <TableCell className={classes.columnAction} padding="none">
- <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" setTimestamp={setTimestamp} />
- </TableCell>
<TableCell>{item.name}</TableCell>
<TableCell>{item.type}</TableCell>
<TableCell>{convertAttribute(item.type, item.start)}</TableCell>
<TableCell>{convertAttribute(item.type, item.period)}</TableCell>
+ <TableCell className={classes.columnAction} padding="none">
+ <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" setTimestamp={setTimestamp} />
+ </TableCell>
</TableRow>
))}
</TableBody>
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.js
index ae463dd3..5f8c5512 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.js
@@ -14,8 +14,8 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
- width: theme.spacing(1),
- padding: theme.spacing(0, 1),
+ width: '1%',
+ paddingRight: theme.spacing(1),
},
}));
@@ -52,23 +52,23 @@ const NotificationsPage = () => {
<Table>
<TableHead>
<TableRow>
- <TableCell className={classes.columnAction} />
<TableCell>{t('notificationType')}</TableCell>
<TableCell>{t('notificationAlways')}</TableCell>
<TableCell>{t('sharedAlarms')}</TableCell>
<TableCell>{t('notificationNotificators')}</TableCell>
+ <TableCell className={classes.columnAction} />
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
- <TableCell className={classes.columnAction} padding="none">
- <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" setTimestamp={setTimestamp} />
- </TableCell>
<TableCell>{t(prefixString('event', item.type))}</TableCell>
<TableCell>{formatBoolean(item.always, t)}</TableCell>
<TableCell>{formatList('alarm', item.attributes.alarms)}</TableCell>
<TableCell>{formatList('notificator', item.notificators)}</TableCell>
+ <TableCell className={classes.columnAction} padding="none">
+ <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" setTimestamp={setTimestamp} />
+ </TableCell>
</TableRow>
))}
</TableBody>
diff --git a/modern/src/settings/UsersPage.js b/modern/src/settings/UsersPage.js
index 8f3aca46..adbbcbda 100644
--- a/modern/src/settings/UsersPage.js
+++ b/modern/src/settings/UsersPage.js
@@ -13,8 +13,8 @@ import CollectionActions from './components/CollectionActions';
const useStyles = makeStyles((theme) => ({
columnAction: {
- width: theme.spacing(1),
- padding: theme.spacing(0, 1),
+ width: '1%',
+ paddingRight: theme.spacing(1),
},
}));
@@ -40,23 +40,23 @@ const UsersPage = () => {
<Table>
<TableHead>
<TableRow>
- <TableCell className={classes.columnAction} />
<TableCell>{t('sharedName')}</TableCell>
<TableCell>{t('userEmail')}</TableCell>
<TableCell>{t('userAdmin')}</TableCell>
<TableCell>{t('sharedDisabled')}</TableCell>
+ <TableCell className={classes.columnAction} />
</TableRow>
</TableHead>
<TableBody>
{items.map((item) => (
<TableRow key={item.id}>
- <TableCell className={classes.columnAction} padding="none">
- <CollectionActions itemId={item.id} editPath="/settings/user" endpoint="users" setTimestamp={setTimestamp} />
- </TableCell>
<TableCell>{item.name}</TableCell>
<TableCell>{item.email}</TableCell>
<TableCell>{formatBoolean(item.administrator, t)}</TableCell>
<TableCell>{formatBoolean(item.disabled, t)}</TableCell>
+ <TableCell className={classes.columnAction} padding="none">
+ <CollectionActions itemId={item.id} editPath="/settings/user" endpoint="users" setTimestamp={setTimestamp} />
+ </TableCell>
</TableRow>
))}
</TableBody>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-03 22:30:50 +0000