Skip to content

Commit

Permalink
Separated r3 professional entry from license menu
Browse files Browse the repository at this point in the history
  • Loading branch information
r3-gabriel committed Sep 10, 2024
1 parent b149efe commit 53df6da
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 19 deletions.
12 changes: 9 additions & 3 deletions www/comps/admin/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,15 @@ let MyAdmin = {
</router-link>
<!-- REI3 Professional -->
<router-link class="entry clickable separator" tag="div" to="/admin/license">
<img src="images/key.png" />
<div class="entry isTitle separator" tag="div">
<img src="images/icon_naked.png" />
<span>{{ licenseTitle }}</span>
</div>
<!-- activation -->
<router-link class="entry clickable" tag="div" to="/admin/license">
<img src="images/key.png" />
<span>{{ capApp.navigationActivation }}</span>
</router-link>
<!-- customizing -->
Expand Down Expand Up @@ -174,7 +180,7 @@ let MyAdmin = {
if(s.$route.path.includes('custom')) return s.capApp.navigationCustom;
if(s.$route.path.includes('docs')) return s.capApp.navigationDocs;
if(s.$route.path.includes('files')) return s.capApp.navigationFiles;
if(s.$route.path.includes('license')) return s.capApp.navigationLicense;
if(s.$route.path.includes('license')) return s.capApp.navigationActivation;
if(s.$route.path.includes('logins')) return s.capApp.navigationLogins;
if(s.$route.path.includes('login-templates')) return s.capApp.navigationLoginTemplates;
if(s.$route.path.includes('logs')) return s.capApp.navigationLogs;
Expand Down
2 changes: 1 addition & 1 deletion www/comps/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ table td.maximum{
box-sizing:border-box;
outline:none;
}
.navigation .entry.isTitle{
.navigation .entry.isTitle.grow{
flex:1 1 auto;
}
.navigation .entry.inactive{
Expand Down
14 changes: 7 additions & 7 deletions www/comps/builder/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,49 +184,49 @@ let MyBuilder = {
<!-- module sub component navigation header -->
<div class="navigation-entities-header" v-if="subMenu">
<router-link class="entry isTitle clickable"
<router-link class="entry isTitle grow clickable"
v-if="navigation === 'forms'"
:to="'/builder/forms/'+module.id"
>
<img src="images/fileText.png" />
<span>{{ capGen.forms }}</span>
</router-link>
<router-link class="entry isTitle clickable"
<router-link class="entry isTitle grow clickable"
v-if="navigation === 'roles'"
:to="'/builder/roles/'+module.id"
>
<img src="images/personMultiple.png" />
<span>{{ capGen.roles }}</span>
</router-link>
<router-link class="entry isTitle clickable"
<router-link class="entry isTitle grow clickable"
v-if="navigation === 'relations'"
:to="'/builder/relations/'+module.id"
>
<img src="images/database.png" />
<span>{{ capGen.relations }}</span>
</router-link>
<router-link class="entry isTitle clickable"
<router-link class="entry isTitle grow clickable"
v-if="navigation === 'collections'"
:to="'/builder/collections/'+module.id"
>
<img src="images/tray.png" />
<span>{{ capGen.collections }}</span>
</router-link>
<router-link class="entry isTitle clickable"
<router-link class="entry isTitle grow clickable"
v-if="navigation === 'apis'"
:to="'/builder/apis/'+module.id"
>
<img src="images/api.png" />
<span>{{ capGen.apis }}</span>
</router-link>
<router-link class="entry isTitle clickable"
<router-link class="entry isTitle grow clickable"
v-if="navigation === 'pg-functions'"
:to="'/builder/pg-functions/'+module.id"
>
<img src="images/codeDatabase.png" />
<span>{{ capGen.pgFunctions }}</span>
</router-link>
<router-link class="entry isTitle clickable"
<router-link class="entry isTitle grow clickable"
v-if="navigation === 'js-functions'"
:to="'/builder/js-functions/'+module.id"
>
Expand Down
Binary file added www/images/icon_naked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/de_de
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"Systemaufgaben (global)",
"systemTasksNode":"Systemaufgaben (Clusterknoten)"
},
"navigationActivation":"Aktivierung",
"navigationBackups":"Sicherungen",
"navigationCaptionMap":"Übersetzungen",
"navigationCluster":"Cluster",
"navigationConfig":"System",
"navigationCustom":"Anpassungen",
"navigationFiles":"Dateien",
"navigationLdaps":"LDAP-Anmeldungen",
"navigationLicense":"REI3 Professional",
"navigationLicense":"Professional",
"navigationLogins":"Anmeldungen",
"navigationLoginTemplates":"Anmeldevorlagen",
"navigationLogs":"Logs",
Expand Down
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/en_us
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"System tasks (global)",
"systemTasksNode":"System tasks (cluster nodes)"
},
"navigationActivation":"Activation",
"navigationBackups":"Backups",
"navigationCaptionMap":"Translations",
"navigationCluster":"Cluster",
"navigationConfig":"System",
"navigationCustom":"Customizing",
"navigationFiles":"Files",
"navigationLdaps":"LDAP-Logins",
"navigationLicense":"REI3 Professional",
"navigationLicense":"Professional",
"navigationLogins":"Logins",
"navigationLoginTemplates":"Login templates",
"navigationLogs":"Logs",
Expand Down
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/fr_fr
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"Tâches système (globales)",
"systemTasksNode":"Tâches système (nœuds de cluster)"
},
"navigationActivation":"Activation",
"navigationBackups":"Sauvegardes",
"navigationCaptionMap":"Translations",
"navigationCluster":"Cluster",
"navigationConfig":"Système",
"navigationCustom":"Personnalisation",
"navigationFiles":"Fichiers",
"navigationLdaps":"Connexions LDAP",
"navigationLicense":"REI3 Professional",
"navigationLicense":"Professional",
"navigationLogins":"Connexions",
"navigationLoginTemplates":"Modèles de connexion",
"navigationLogs":"Journaux",
Expand Down
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/hu_hu
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"Rendszerfeladatok (globális)",
"systemTasksNode":"Rendszerfeladatok (Klaszter csomópont)"
},
"navigationActivation":"Activation",
"navigationBackups":"Mentések",
"navigationCaptionMap":"Translations",
"navigationCluster":"Klaszter",
"navigationConfig":"Rendszer",
"navigationCustom":"Egyedi",
"navigationFiles":"Fájlok",
"navigationLdaps":"LDAP Bejelentkezések",
"navigationLicense":"REI3 Professional",
"navigationLicense":"Professional",
"navigationLogins":"Bejelentkezések",
"navigationLoginTemplates":"Bejelentkezési Sablonok",
"navigationLogs":"Naplók",
Expand Down
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/it_it
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"System tasks (global)",
"systemTasksNode":"System tasks (cluster nodes)"
},
"navigationActivation":"Activation",
"navigationBackups":"Backups",
"navigationCaptionMap":"Translations",
"navigationCluster":"Cluster",
"navigationConfig":"Sistema",
"navigationCustom":"Personalizzazione",
"navigationFiles":"Files",
"navigationLdaps":"LDAP-Logins",
"navigationLicense":"REI3 Professional",
"navigationLicense":"Professional",
"navigationLogins":"Logins",
"navigationLoginTemplates":"Login templates",
"navigationLogs":"Logs",
Expand Down
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/lv_lv
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"Sistēmas uzdevumi (globālie)",
"systemTasksNode":"Sistēmas uzdevumi (klastra mezgli)"
},
"navigationActivation":"Activation",
"navigationBackups":"Rezerves kopijas",
"navigationCaptionMap":"Translations",
"navigationCluster":"Klasters",
"navigationConfig":"Sistēma",
"navigationCustom":"Pielāgošana",
"navigationFiles":"Faili",
"navigationLdaps":"LDAP pieteikšanās",
"navigationLicense":"REI3 Professional",
"navigationLicense":"Professional",
"navigationLogins":"Pieteikšanās",
"navigationLoginTemplates":"Pieteikšanās veidnes",
"navigationLogs":"Žurnāli",
Expand Down
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/ro_ro
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"System tasks (global)",
"systemTasksNode":"System tasks (cluster nodes)"
},
"navigationActivation":"Activation",
"navigationBackups":"Backups",
"navigationCaptionMap":"Translations",
"navigationCluster":"Cluster",
"navigationConfig":"Sistem",
"navigationCustom":"Personalizare",
"navigationFiles":"Files",
"navigationLdaps":"Autentificări-LDAP",
"navigationLicense":"REI3 Professional",
"navigationLicense":"Professional",
"navigationLogins":"Autentificări",
"navigationLoginTemplates":"Login templates",
"navigationLogs":"Jurnale",
Expand Down
3 changes: 2 additions & 1 deletion www/langs/REPLACE_BY_BUILD/zh_cn
Original file line number Diff line number Diff line change
Expand Up @@ -692,14 +692,15 @@
"systemTasks":"系统任务(全局)",
"systemTasksNode":"系统任务(集群节点)"
},
"navigationActivation":"Activation",
"navigationBackups":"备份",
"navigationCaptionMap":"翻译",
"navigationCluster":"集群",
"navigationConfig":"系统",
"navigationCustom":"定制",
"navigationFiles":"文件",
"navigationLdaps":"LDAP 登录",
"navigationLicense":"REI3 专业版",
"navigationLicense":"专业版",
"navigationLogins":"登录",
"navigationLoginTemplates":"登录模板",
"navigationLogs":"日志",
Expand Down

0 comments on commit 53df6da

Please sign in to comment.