-
-
-
-
-
-
-
-
-
- SELECT name, description FROM newsTag
- ORDER BY description
-
-
-
-
-
-
-
-
-
diff --git a/forms/news/news/style.css b/forms/news/news/style.css
index e8457eea..78f9dd40 100644
--- a/forms/news/news/style.css
+++ b/forms/news/news/style.css
@@ -2,5 +2,5 @@
.news .item .photo {
height: 80px;
width: 80px;
- border-radius: 50%;
+ border-radius: 10px;
}
diff --git a/js/hedera/gui.scss b/js/hedera/gui.scss
index fe811fa2..d9f73906 100644
--- a/js/hedera/gui.scss
+++ b/js/hedera/gui.scss
@@ -68,17 +68,14 @@ $navbar-height: 64px;
}
& > .action-bar {
flex: none;
- padding: 0;
- margin: 0;
height: 100%;
& > div {
- padding: 0;
- margin: 0;
height: 100%;
display: flex;
align-items: center;
- padding: 0 1em;
+ padding-right: $spacing-md;
+ padding-left: $spacing-sm;
gap: .5em;
& > * {
diff --git a/js/hedera/style.scss b/js/hedera/style.scss
index 2fe7bd0c..8cee5b84 100644
--- a/js/hedera/style.scss
+++ b/js/hedera/style.scss
@@ -114,6 +114,7 @@ select,
}
input[type=text],
input[type=password],
+input[type=file],
input[type=number],
textarea,
.input,
@@ -196,6 +197,12 @@ img.editable {
clear: both !important;
}
+/* Clickable */
+
+.clickable {
+ @extend %clickable;
+}
+
/* Box */
.box {
diff --git a/js/htk/field/image.js b/js/htk/field/image.js
index 4b0dbaf8..f6b3b51a 100644
--- a/js/htk/field/image.js
+++ b/js/htk/field/image.js
@@ -110,18 +110,18 @@ module.exports = new Class({
this.node.removeChild(this.editButton);
this.editButton = null;
}
-
if (this._editable) {
var button = this.createElement('button');
button.addEventListener('click', this._onEditClick.bind(this));
button.title = _('UpdateImage');
this.node.appendChild(button);
- var icon = new Htk.Icon({icon: 'add-photo'});
+ var icon = new Htk.Icon({name: 'add_a_photo'});
button.appendChild(icon.node);
this.editButton = button;
}
+ console.log(this.editable);
}
,_makeSrc: function(subdir) {
@@ -162,7 +162,8 @@ module.exports = new Class({
}
,_onClick: function(event) {
- if (!this._fullDir || !this._value || this._error)
+ if (!this._fullDir || !this._value || this._error
+ || event.defaultPrevented)
return;
event.preventDefault();
@@ -170,7 +171,8 @@ module.exports = new Class({
}
,_onEditClick: function(event) {
- event.stopPropagation();
+ if (event.defaultPrevented) return
+ event.preventDefault();
var editor = new Htk.ImageEditor({conn: this.conn});
editor.setData(this.value, this._directory);
diff --git a/js/htk/style/components.scss b/js/htk/style/components.scss
index 2372a5d3..35822fbd 100644
--- a/js/htk/style/components.scss
+++ b/js/htk/style/components.scss
@@ -357,6 +357,7 @@ td.cell-image .htk-image {
.htk-image {
position: relative;
overflow: hidden;
+ transition: opacity 250ms ease-out;
&.clickable:hover {
cursor: pointer;
@@ -371,17 +372,20 @@ td.cell-image .htk-image {
position: absolute;
top: 0;
left: 0;
- margin: 0;
- padding: .15em;
+ padding: 8px;
+ margin: 4px;
display: none;
+ background-color: rgba(255, 255, 255, .6);
+
+ &:hover {
+ background-color: rgba(255, 255, 255, .8);
+ }
}
&:hover > button {
display: block;
}
- & > button > img {
+ & > button > .htk-icon {
display: block;
- height: 1.2em;
- height: 1.2em;
}
}
diff --git a/js/htk/style/index.scss b/js/htk/style/index.scss
index 5885abaf..90999008 100644
--- a/js/htk/style/index.scss
+++ b/js/htk/style/index.scss
@@ -5,3 +5,4 @@
@import "./text";
@import "./width";
@import "./components";
+@import "./material-symbols";
diff --git a/js/htk/style/material-symbols.scss b/js/htk/style/material-symbols.scss
new file mode 100644
index 00000000..6c59713d
--- /dev/null
+++ b/js/htk/style/material-symbols.scss
@@ -0,0 +1,22 @@
+/* fallback */
+@font-face {
+ font-family: 'Material Symbols Rounded';
+ font-style: normal;
+ font-weight: 400;
+ src: url(./material-symbols.woff2) format('woff2');
+}
+.material-symbols-rounded {
+ font-family: 'Material Symbols Rounded';
+ font-weight: normal;
+ font-style: normal;
+ font-size: 24px;
+ line-height: 1;
+ letter-spacing: normal;
+ text-transform: none;
+ display: inline-block;
+ white-space: nowrap;
+ word-wrap: normal;
+ direction: ltr;
+ -moz-font-feature-settings: 'liga';
+ -moz-osx-font-smoothing: grayscale;
+}
diff --git a/js/htk/style/material-symbols.woff2 b/js/htk/style/material-symbols.woff2
new file mode 100644
index 00000000..e4c3b75c
Binary files /dev/null and b/js/htk/style/material-symbols.woff2 differ
diff --git a/js/htk/widget.js b/js/htk/widget.js
index 0e6cacdc..877dc2a8 100644
--- a/js/htk/widget.js
+++ b/js/htk/widget.js
@@ -27,6 +27,18 @@ module.exports = new Class({
,get: function() {
return this._node.className;
}
+ },
+ /**
+ * Title of the element.
+ */
+ title: {
+ type: String
+ ,set: function(x) {
+ this.node.title = x;
+ }
+ ,get: function() {
+ return this.node.title;
+ }
}
}
diff --git a/package.json b/package.json
index 6e2bfca1..4fe9febf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "hedera-web",
- "version": "1.407.72",
+ "version": "1.407.73",
"description": "Verdnatura web page",
"license": "GPL-3.0",
"repository": {
diff --git a/pages/main/ui.php b/pages/main/ui.php
index 7631cfb7..52806c58 100644
--- a/pages/main/ui.php
+++ b/pages/main/ui.php
@@ -15,7 +15,6 @@ $result = $db->query('SELECT name, content FROM metatag');
-