Rework Menu and add translations

qortal-ui-core/language/de.json

@@ -21,6 +21,7 @@
       "korean":"Koreanisch"
    },
    "sidemenu":{
+      "minting":"PRÄGUNG",
       "mintingdetails":"PRÄGUNGSDETAILS",
       "becomeAMinter":"WERDE EIN MINTER",
       "wallets":"GELDBÖRSEN",
@@ -28,6 +29,7 @@
       "rewardshare":"BELOHNUNGSANTEIL",
       "nameregistration":"NAMENSREGISTRIERUNG",
       "websites":"WEBSEITEN",
+      "management":"MANAGEMENT",
       "datamanagement":"DATENMANAGEMENT",
       "qchat":"Q-CHAT",
       "groupmanagement":"GRUPPENMANAGEMENT",

qortal-ui-core/language/es.json

@@ -21,6 +21,7 @@
       "korean":"Coreano"
    },
    "sidemenu":{
+      "minting":"ACUÑACIÓN",
       "mintingdetails":"DETALLES DE ACUÑACIÓN",
       "becomeAMinter":"CONVIERTASE EN UN ACUÑADOR",
       "wallets":"MONEDEROS",
@@ -28,6 +29,7 @@
       "rewardshare":"RECOMPENSA COMPARTIDA",
       "nameregistration":"REGISTRO DE NOMBRE",
       "websites":"SITIOS WEB",
+      "management":"GESTIÓN",
       "datamanagement":"GESTIÓN DE DATOS",
       "qchat":"Q-CHAT",
       "groupmanagement":"GESTIÓN DE GRUPO",

qortal-ui-core/language/fr.json

@@ -21,6 +21,7 @@
       "korean":"Coréen"
    },
    "sidemenu":{
+      "minting":"MONNAIE",
       "mintingdetails":"DETAILS DE FRAPPE",
       "becomeAMinter":"DEVENIR UN FRAPPEUR",
       "wallets":"PORTEFEUILLES",
@@ -28,6 +29,7 @@
       "rewardshare":"PARTAGE DE RECOMPENCES",
       "nameregistration":"ENREGISTREMENT DE NOM",
       "websites":"SITES WEB",
+      "management":"GESTIÓN",
       "datamanagement":"GESTION DE DONNEES",
       "qchat":"Q-CHAT",
       "groupmanagement":"GESTION DE GROUPES",

qortal-ui-core/language/hindi.json

@@ -22,6 +22,7 @@
       "korean":"कोरियाई"
    },
    "sidemenu":{
+      "minting":"मिंटिंग",
       "mintingdetails":"खनन विवरण",
       "becomeAMinter":"एक मिन्टर बनें",
       "wallets":"वॉलेट",
@@ -29,6 +30,7 @@
       "rewardshare":"रिवॉर्ड शेयर",
       "nameregistration":"नाम पंजीकरण",
       "websites":"वेबसाइटों",
+      "management":"प्रबंधन",
       "datamanagement":"डेटा प्रबंधन",
       "qchat":"क्यू-चैट",
       "groupmanagement":"समूह प्रबंधन",

qortal-ui-core/language/hr.json

@@ -21,6 +21,7 @@
       "korean":"Korejski"
    },
    "sidemenu":{
+      "minting":"KOVANJE",
       "mintingdetails":"DETALJI O MINTANJU",
       "becomeAMinter":"POSTANI MINTER",
       "wallets":"NOVČANICI",
@@ -28,6 +29,7 @@
       "rewardshare":"NAGRADNI UDIO",
       "nameregistration":"REGISTRACIJA IMENA",
       "websites":"WEB STRANICE",
+      "management":"UPRAVLJANJE",
       "datamanagement":"UPRAVLJANJE PODACIMA",
       "qchat":"Q-ČAVRLJANJE",
       "groupmanagement":"UPRAVLJANJE GRUPAMA",

qortal-ui-core/language/hu.json

@@ -21,6 +21,7 @@
       "korean":"Koreai"
    },
    "sidemenu":{
+      "minting":"BÉRTÉS",
       "mintingdetails":"VERÉSI RÉSZLETEK",
       "becomeAMinter":"LEGYEN PÉNZVERÓ",
       "wallets":"PÉNZTÁRCA",
@@ -28,6 +29,7 @@
       "rewardshare":"JUTALOM RÉSZVÉNY",
       "nameregistration":"NÉV REGISZTRÁCIÓ",
       "websites":"WEBHELY",
+      "management":"MENEDZSMENT",
       "datamanagement":"ADATKEZELÉS",
       "qchat":"Q-CHAT",
       "groupmanagement":"CSOPORTKEZELÉS",

qortal-ui-core/language/it.json

@@ -21,6 +21,7 @@
       "korean":"Coreano"
    },
    "sidemenu":{
+      "minting":"CONIAZIONE",
       "mintingdetails":"DETTAGLI DI MINTING",
       "becomeAMinter":"DIVENTA UN MINATORE",
       "wallets":"PORTAFOGLI",
@@ -28,6 +29,7 @@
       "rewardshare":"QUOTA DI RICOMPENSA",
       "nameregistration":"REGISTRAZIONE DI NOME",
       "websites":"SITI",
+      "management":"GESTIONE",
       "datamanagement":"GESTIONE DATI",
       "qchat":"Q-CHAT",
       "groupmanagement":"GESTIONE DEI GRUPPI",

qortal-ui-core/language/ko.json

@@ -21,6 +21,7 @@
       "korean":"한국어"
    },
    "sidemenu":{
+      "minting":"주조",
       "mintingdetails":"민팅 세부정보",
       "becomeAMinter":"민터 되기",
       "wallets":"지갑",
@@ -28,6 +29,7 @@
       "rewardshare":"보상 공유",
       "nameregistration":"이름 등록",
       "websites":"웹사이트",
+      "management":"관리",
       "datamanagement":"데이터 관리",
       "qchat":"Q-CHAT",
       "groupmanagement":"그룹 관리",

qortal-ui-core/language/no.json

@@ -21,6 +21,7 @@
       "korean":"Koreansk"
    },
    "sidemenu":{
+      "minting":"UTBYTTE",
       "mintingdetails":"MINTEDETALJER",
       "becomeAMinter":"BLI EN MINTER",
       "wallets":"LOMMEBØKER",
@@ -28,6 +29,7 @@
       "rewardshare":"BELØNNINGSDEL",
       "nameregistration":"REGISTRERING AV NAVN",
       "websites":"NETTSIDER",
+      "management":"LEDELSE",
       "datamanagement":"DATA-ADMINISTRASJON",
       "qchat":"Q-CHAT",
       "groupmanagement":"GRUPPEADMINISTRASJON",

qortal-ui-core/language/pl.json

@@ -21,6 +21,7 @@
       "korean":"Koreański"
    },
    "sidemenu":{
+      "minting":"BICIE",
       "mintingdetails":"SZCZEGÓŁY MINTOWANIA",
       "becomeAMinter":"ZOSTAN MINTEREM",
       "wallets":"PORTFELE",
@@ -28,6 +29,7 @@
       "rewardshare":"UDZIAŁ W NAGRODZIE",
       "nameregistration":"REJESTRACJA IMIENIA",
       "websites":"STRONY INTERNETOWE",
+      "management":"KIEROWNICTWO",
       "datamanagement":"ZARZĄDZANIE DANYMI",
       "qchat":"Q-CHAT",
       "groupmanagement":"ZARZĄDZANIE GRUPAMI",

qortal-ui-core/language/pt.json

@@ -21,6 +21,7 @@
       "korean":"Coreano"
    },
    "sidemenu":{
+      "minting":"CARTEIRA",
       "mintingdetails":"DETALHES DA MINERAÇÃO",
       "becomeAMinter":"TORNE-SE UM MINERADOR",
       "wallets":"CARTEIRAS",
@@ -28,6 +29,7 @@
       "rewardshare":"PARTICIPAÇÃO NA RECOMPENSA",
       "nameregistration":"REGISTRO DE NOME",
       "websites":"SITES",
+      "management":"GESTÃO",
       "datamanagement":"GESTÃO DE DADOS",
       "qchat":"Q-CHAT",
       "groupmanagement":"GESTÃO DE GRUPOS",

qortal-ui-core/language/ro.json

@@ -21,6 +21,7 @@
       "korean":"Coreeana"
    },
    "sidemenu":{
+      "minting":"MONTAREA",
       "mintingdetails":"DETALII RECOMPENSARE MINTING)",
       "becomeAMinter":"DEVINO PRODUCATOR DE MONEDA",
       "wallets":"PORTOFELE",
@@ -28,6 +29,7 @@
       "rewardshare":"COTA RECOMPENSA",
       "nameregistration":"INREGISTRARE NUME",
       "websites":"WEBSITE-URI",
+      "management":"MANAGEMENT",
       "datamanagement":"GESTIONARE DATE",
       "qchat":"Q-CHAT",
       "groupmanagement":"GESTIONARE GRUP",

qortal-ui-core/language/rs.json

@@ -21,6 +21,7 @@
       "korean":"Korejski"
    },
    "sidemenu":{
+      "minting":"KOVANJE",
       "mintingdetails":"DETALJI MINTOVANJA",
       "becomeAMinter":"POSTANITE MINTER",
       "wallets":"NOVČANICI",
@@ -28,6 +29,7 @@
       "rewardshare":"UDEO U NAGRADI",
       "nameregistration":"REGISTRACIJA IMENA",
       "websites":"WEBSITEOVI",
+      "management":"MENADŽMENT",
       "datamanagement":"MENADŽMENT PODATAKA",
       "qchat":"Q-ĆASKANJE",
       "groupmanagement":"MENADŽMENT GRUPA",

qortal-ui-core/language/ru.json

@@ -21,6 +21,7 @@
       "korean":"Корейский"
    },
    "sidemenu":{
+      "minting":"ЧЕКАНКA",
       "mintingdetails":"ДЕТАЛИ ЧЕКАНКИ",
       "becomeAMinter":"СТАТЬ МИНТЕРОМ",
       "wallets":"КОШЕЛЬКИ",
@@ -28,6 +29,7 @@
       "rewardshare":"ДОЛЕВОЕ УЧАСТИЕ",
       "nameregistration":"РЕГИСТРАЦИЯ ИМЕНИ",
       "websites":"ВЕБ-САЙТЫ",
+      "management":"УПРАВЛЕНИЕ",
       "datamanagement":"УПРАВЛЕНИЕ ДАННЫМИ",
       "qchat":"Q-ЧАТ",
       "groupmanagement":"УПРАВЛЕНИЕ ГРУППАМИ",

qortal-ui-core/language/us.json

@@ -21,6 +21,7 @@
       "korean":"Korean"
    },
    "sidemenu":{
+      "minting":"MINTING",
       "mintingdetails":"MINTING DETAILS",
       "becomeAMinter":"BECOME A MINTER",
       "wallets":"WALLETS",
@@ -28,6 +29,7 @@
       "rewardshare":"REWARD SHARE",
       "nameregistration":"NAME REGISTRATION",
       "websites":"WEBSITES",
+      "management":"MANAGEMENT",
       "datamanagement":"DATA MANAGEMENT",
       "qchat":"Q-CHAT",
       "groupmanagement":"GROUP MANAGEMENT",

qortal-ui-core/language/zhc.json

@@ -21,6 +21,7 @@
       "korean":"韩语"
    },
    "sidemenu":{
+      "minting":"铸币",
       "mintingdetails":"铸币信息",
       "becomeAMinter":"成为一个铸币者",
       "wallets":"钱包",
@@ -28,6 +29,7 @@
       "rewardshare":"铸币密钥",
       "nameregistration":"注册名称",
       "websites":"网站",
+      "management":"管理",
       "datamanagement":"资料管理",
       "qchat":"Q-CHAT",
       "groupmanagement":"群组管理",

qortal-ui-core/language/zht.json

@@ -21,6 +21,7 @@
       "korean":"韓語"
    },
    "sidemenu":{
+      "minting":"鑄幣",
       "mintingdetails":"鑄幣信息",
       "becomeAMinter":"成為一個鑄幣者",
       "wallets":"錢包",
@@ -28,6 +29,7 @@
       "rewardshare":"鑄幣密鑰",
       "nameregistration":"註冊名稱",
       "websites":"網站",
+      "management":"管理",
       "datamanagement":"資料管理",
       "qchat":"Q-CHAT",
       "groupmanagement":"群組管理",

qortal-ui-core/src/components/app-view.js

@@ -5,6 +5,8 @@ import { translate, translateUnsafeHTML } from 'lit-translate'
 
 import '@polymer/paper-icon-button/paper-icon-button.js'
 import '@polymer/iron-icons/iron-icons.js'
+import '@polymer/app-layout/app-layout.js'
+import '@polymer/paper-ripple'
 
 import './wallet-profile.js'
 import './app-info.js'
@@ -12,10 +14,6 @@ import './sidenav-menu.js'
 import './show-plugin.js'
 import './qort-theme-toggle.js'
 import './language-selector.js'
-
-import '@polymer/app-layout/app-layout.js'
-import '@polymer/paper-ripple'
-
 import './settings-view/user-settings.js'
 import './logout-view/logout-view.js'
 

qortal-ui-core/src/components/sidenav-menu.js

@@ -9,8 +9,7 @@ import '@vaadin/icons';
 
 import '../functional-components/side-menu.js';
 import '../functional-components/side-menu-item.js';
-import '../functional-components/my-button.js';
-import './start-minting';
+
 class SidenavMenu extends connect(store)(LitElement) {
 	static get properties() {
 		return {
@@ -33,9 +32,7 @@ class SidenavMenu extends connect(store)(LitElement) {
 					--item-text-color: var(--nav-text-color);
 					--item-icon-color: var(--nav-icon-color);
 					--item-border-color: var(--nav-border-color);
-					--item-border-selected-color: var(
-						--nav-border-selected-color
-					);
+					--item-border-selected-color: var(--nav-border-selected-color);
 				}
 
 				.s-menu {
@@ -72,11 +69,9 @@ class SidenavMenu extends connect(store)(LitElement) {
 		return html`
 			<div class="s-menu">
 				<side-menu>
-					${this.renderNodeTypeMenu()} ${this.renderNodeManagement()}
+					${this.renderNodeTypeMenu()}
 				</side-menu>
-			</div>
-
-			<start-minting></start-minting>
+			</div>	
 		`;
 	}
 
@@ -121,19 +116,13 @@ class SidenavMenu extends connect(store)(LitElement) {
 					label="${translate('sidemenu.nameregistration')}"
 					href="/app/name-registration"
 				>
-					<vaadin-icon
-						icon="vaadin:user-check"
-						slot="icon"
-					></vaadin-icon>
+					<vaadin-icon icon="vaadin:user-check" slot="icon"></vaadin-icon>
 				</side-menu-item>
 				<side-menu-item
 					label="${translate('sidemenu.datamanagement')}"
 					href="/app/data-management"
 				>
-					<vaadin-icon
-						icon="vaadin:database"
-						slot="icon"
-					></vaadin-icon>
+					<vaadin-icon icon="vaadin:database" slot="icon"></vaadin-icon>
 				</side-menu-item>
 				<side-menu-item
 					label="${translate('sidemenu.qchat')}"
@@ -141,29 +130,35 @@ class SidenavMenu extends connect(store)(LitElement) {
 				>
 					<vaadin-icon icon="vaadin:chat" slot="icon"></vaadin-icon>
 				</side-menu-item>
+				${this.renderNodeManagement()}
 			`;
 		} else {
 			return html`
-				${isMinter
-					? html`<side-menu-item
-							label="${translate('sidemenu.mintingdetails')}"
-							href="/app/minting"
-					  >
-							<vaadin-icon
-								icon="vaadin:info-circle"
-								slot="icon"
-							></vaadin-icon>
-					  </side-menu-item>`
-					: html`<side-menu-item
-							label="${translate('sidemenu.becomeAMinter')}"
-							href="/app/become-minter"
-					  >
-							<vaadin-icon
-								icon="vaadin:info-circle"
-								slot="icon"
-							></vaadin-icon>
-					  </side-menu-item>`}
-
+				<side-menu-item
+					label="${translate('sidemenu.minting')}"
+					expanded
+				>
+					<vaadin-icon icon="vaadin:info-circle" slot="icon"></vaadin-icon>
+					${isMinter
+						? html`<side-menu-item
+								label="${translate('sidemenu.mintingdetails')}"
+								href="/app/minting"
+						  >
+								<vaadin-icon icon="vaadin:info-circle" slot="icon"></vaadin-icon>
+						</side-menu-item>`
+						: html`<side-menu-item
+								label="${translate('sidemenu.becomeAMinter')}"
+								href="/app/become-minter"
+						  >
+								<vaadin-icon icon="vaadin:thumbs-up" slot="icon"></vaadin-icon>
+						</side-menu-item>`}
+					<side-menu-item
+						label="${translate('sidemenu.rewardshare')}"
+						href="/app/reward-share"
+					>
+						<vaadin-icon icon="vaadin:share-square" slot="icon"></vaadin-icon>
+					</side-menu-item>
+				</side-menu-item>
 				<side-menu-item
 					label="${translate('sidemenu.wallets')}"
 					href="/app/wallet"
@@ -175,67 +170,50 @@ class SidenavMenu extends connect(store)(LitElement) {
 					label="${translate('sidemenu.tradeportal')}"
 					href="/app/trade-portal"
 				>
-					<vaadin-icon
-						icon="vaadin:bullets"
-						slot="icon"
-					></vaadin-icon>
+					<vaadin-icon icon="vaadin:bullets" slot="icon"></vaadin-icon>
 				</side-menu-item>
 				<side-menu-item
-					label="${translate('sidemenu.rewardshare')}"
-					href="/app/reward-share"
+					label="${translate('sidemenu.qchat')}"
+					href="/app/q-chat"
 				>
-					<vaadin-icon
-						icon="vaadin:share-square"
-						slot="icon"
-					></vaadin-icon>
+					<vaadin-icon icon="vaadin:chat" slot="icon"></vaadin-icon>
 				</side-menu-item>
 				<side-menu-item
 					label="${translate('sidemenu.nameregistration')}"
 					href="/app/name-registration"
 				>
-					<vaadin-icon
-						icon="vaadin:user-check"
-						slot="icon"
-					></vaadin-icon>
+					<vaadin-icon icon="vaadin:user-check" slot="icon"></vaadin-icon>
 				</side-menu-item>
 				<side-menu-item
 					label="${translate('sidemenu.websites')}"
 					href="/app/websites"
 				>
-					<vaadin-icon
-						icon="vaadin:desktop"
-						slot="icon"
-					></vaadin-icon>
-				</side-menu-item>
-				<side-menu-item
-					label="${translate('sidemenu.datamanagement')}"
-					href="/app/data-management"
-				>
-					<vaadin-icon
-						icon="vaadin:database"
-						slot="icon"
-					></vaadin-icon>
-				</side-menu-item>
-				<side-menu-item
-					label="${translate('sidemenu.qchat')}"
-					href="/app/q-chat"
-				>
-					<vaadin-icon icon="vaadin:chat" slot="icon"></vaadin-icon>
+					<vaadin-icon icon="vaadin:desktop" slot="icon" ></vaadin-icon>
 				</side-menu-item>
 				<side-menu-item
-					label="${translate('sidemenu.groupmanagement')}"
-					href="/app/group-management"
+					label="${translate('sidemenu.management')}"
+					expanded
 				>
-					<vaadin-icon icon="vaadin:group" slot="icon"></vaadin-icon>
+					<vaadin-icon icon="vaadin:cogs" slot="icon"></vaadin-icon>
+					<side-menu-item
+						label="${translate('sidemenu.datamanagement')}"
+						href="/app/data-management"
+					>
+						<vaadin-icon icon="vaadin:database" slot="icon"></vaadin-icon>
+					</side-menu-item>
+					<side-menu-item
+						label="${translate('sidemenu.groupmanagement')}"
+						href="/app/group-management"
+					>
+						<vaadin-icon icon="vaadin:group" slot="icon"></vaadin-icon>
+					</side-menu-item>
+					${this.renderNodeManagement()}
 				</side-menu-item>
 				<side-menu-item
 					label="${translate('sidemenu.puzzles')}"
 					href="/app/puzzles"
 				>
-					<vaadin-icon
-						icon="vaadin:puzzle-piece"
-						slot="icon"
-					></vaadin-icon>
+					<vaadin-icon icon="vaadin:puzzle-piece" slot="icon"></vaadin-icon>
 				</side-menu-item>
 			`;
 		}

qortal-ui-core/src/components/start-minting.js

@@ -20,7 +20,6 @@ class StartMinting extends connect(store)(LitElement) {
 			css`
 				.start-minting-wrapper {
 					position: absolute;
-					bottom: 130px;
 					left: 50%;
 					transform: translateX(calc(-50% - 10px));
 				}
@@ -30,7 +29,6 @@ class StartMinting extends connect(store)(LitElement) {
 
 	constructor() {
 		super();
-
 		this.addressInfo = {};
 		this.mintingAccountData = [];
 		this.errorMsg = '';

qortal-ui-core/src/components/wallet-profile.js

@@ -6,6 +6,8 @@ import { translate, translateUnsafeHTML } from 'lit-translate'
 import '@polymer/paper-toast'
 import '@material/mwc-icon-button'
 
+import './start-minting.js'
+
 class WalletProfile extends connect(store)(LitElement) {
     static get properties() {
         return {
@@ -88,6 +90,7 @@ class WalletProfile extends connect(store)(LitElement) {
                     <p id="blocksMinted">${translate("walletprofile.blocksminted")} - ${this.accountInfo.addressInfo.blocksMinted + this.accountInfo.addressInfo.blocksMintedAdjustment}</p>
                     <p id="address">${this.wallet.addresses[0].address}</p>
                 </div>
+                <start-minting></start-minting>
             </div>
             <paper-toast id="toast" horizontal-align="right" vertical-align="top" vertical-offset="64"></paper-toast>
         `

qortal-ui-core/src/functional-components/my-button.js

@@ -14,7 +14,6 @@ export class MyButton extends LitElement {
 			height: 100%;
 			margin: 0;
 			cursor: pointer;
-
 			min-width: 80px;
 			background-color: #03a9f4;
 			color: white;