Skip to content

E
ecommerce-ui
Commit 7510c06e authored by Sven Franck's avatar Sven Franck
Browse files
Options

add pagination back, hide breadcrumbs on small screens

parent 4d728fd3
Show whitespace changes
Inline Side-by-side
Showing with 74 additions and 26 deletions
css/css.css
View file @ 7510c06e
......@@ -338,8 +338,10 @@ html body form input.secure_form {
margin-top: -6px;
font-size: 1.2em;
}
.crumbs {
@media (max-width: 40em) {
.crumbs {
display: none;
}
}
/* ============================== status loader ============================== */
/* fadeout "heartbeat" transition with 1sec delay */
......
data/computer_overview.json
View file @ 7510c06e
......@@ -20,6 +20,15 @@
"slot": 1,
"text": "Created Servers",
"text_i18n": "portal_type_dict.computer_dict.text_dict.created_servers"
},
"pagination": {
"slot": 2,
"option_list": [
{"value": "8", "text": "8", "text_i18n":"portal_type_dict.computer_dict.text_dict.8"},
{"value": "16", "text": "16", "text_i18n":"portal_type_dict.computer_dict.text_dict.16"},
{"value": "32", "text": "32", "text_i18n":"portal_type_dict.computer_dict.text_dict.32"},
{"value": "64", "text": "64", "text_i18n":"portal_type_dict.computer_dict.text_dict.64"}
]
}
},
"scheme": [
......@@ -43,6 +52,14 @@
}
],
"children": [{
"type": "a",
"direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#servers/new"},
"attributes": {
"data-i18n": "portal_type_dict.computer_dict.text_dict.add",
"data-icon": "edit"
},
"logic": {"text":"New Server"}
}, {
"generate": "widget",
"type": "table",
"class_list": "table-stroke ui-responsive",
......@@ -54,14 +71,6 @@
"bottom_grid": 1
},
"children": []
}, {
"type": "a",
"direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#servers/new"},
"attributes": {
"data-i18n": "portal_type_dict.computer_dict.text_dict.add",
"data-icon": "edit"
},
"logic": {"text":"New Server"}
}]
}
data/computer_users.json
View file @ 7510c06e
......@@ -45,8 +45,7 @@
"direction": "horizontal"
},
"children": [
{"type": "input", "direct": {"value": "Reset", "className": "translate"}, "attributes": {"type": "reset", "data-i18n":"[value]portal_type_dict.computer_dict.text_dict.cancel"}},
{"type": "input", "direct": {"value": "Submit", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"update_scope", "data-icon":"save", "data-i18n":"[value]portal_type_dict.computer_dict.text_dict.submit", "data-theme": "slapos-black"}}
{"type": "input", "direct": {"value": "Update the allocation scope", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"update_scope", "data-icon":"check", "data-i18n":"[value]portal_type_dict.computer_dict.text_dict.update_scope", "data-theme": "slapos-black"}}
]
}]
}
......
data/computer_view.json
View file @ 7510c06e
......@@ -62,8 +62,7 @@
"direction": "horizontal"
},
"children": [
{"type": "input", "direct": {"value": "Reset", "className": "translate"}, "attributes": {"type": "reset", "data-i18n":"[value]portal_type_dict.computer_dict.text_dict.cancel"}},
{"type": "input", "direct": {"value": "Submit", "className": "action translate"}, "attributes": {"type": "submit", "data-action":"update_configuration", "data-i18n":"[value]portal_type_dict.computer_dict.text_dict.submit", "data-theme": "slapos-black"}}
{"type": "input", "direct": {"value": "Update", "className": "action translate"}, "attributes": {"type": "submit", "data-icon":"check", "data-action":"update_configuration", "data-i18n":"[value]portal_type_dict.computer_dict.text_dict.update", "data-theme": "slapos-black"}}
]
}]
}
......
data/invoice_overview.json
View file @ 7510c06e
......@@ -21,6 +21,15 @@
"slot": 1,
"text": "Invoice Overview",
"text_i18n": "portal_type_dict.invoice_dict.text_dict.overview"
},
"pagination": {
"slot": 2,
"option_list": [
{"value": "8", "text": "8", "text_i18n":"portal_type_dict.invoice_dict.text_dict.8"},
{"value": "16", "text": "16", "text_i18n":"portal_type_dict.invoice_dict.text_dict.16"},
{"value": "32", "text": "32", "text_i18n":"portal_type_dict.invoice_dict.text_dict.32"},
{"value": "64", "text": "64", "text_i18n":"portal_type_dict.invoice_dict.text_dict.64"}
]
}
},
"scheme": [
......
data/release_overview.json
View file @ 7510c06e
......@@ -16,6 +16,15 @@
"slot": 1,
"text": "Available Releases",
"text_i18n": "portal_type_dict.release_dict.text_dict.available_releases"
},
"pagination": {
"slot": 2,
"option_list": [
{"value": "8", "text": "8", "text_i18n":"portal_type_dict.release_dict.text_dict.8"},
{"value": "16", "text": "16", "text_i18n":"portal_type_dict.release_dict.text_dict.16"},
{"value": "32", "text": "32", "text_i18n":"portal_type_dict.release_dict.text_dict.32"},
{"value": "64", "text": "64", "text_i18n":"portal_type_dict.release_dict.text_dict.64"}
]
}
},
"scheme": [
......
data/service_overview.json
View file @ 7510c06e
......@@ -16,6 +16,15 @@
"slot": 1,
"text": "Installed Services",
"text_i18n": "portal_type_dict.service_dict.text_dict.installed_services"
},
"pagination": {
"slot": 2,
"option_list": [
{"value": "8", "text": "8", "text_i18n":"portal_type_dict.service_dict.text_dict.8"},
{"value": "16", "text": "16", "text_i18n":"portal_type_dict.service_dict.text_dict.16"},
{"value": "32", "text": "32", "text_i18n":"portal_type_dict.service_dict.text_dict.32"},
{"value": "64", "text": "64", "text_i18n":"portal_type_dict.service_dict.text_dict.64"}
]
}
},
"scheme": [
......@@ -39,6 +48,14 @@
}
],
"children": [{
"type": "a",
"direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#services/add"},
"attributes": {
"data-i18n": "portal_type_dict.service_dict.text_dict.add",
"data-icon": "edit"
},
"logic": {"text":"New service"}
}, {
"generate": "widget",
"type": "table",
"class_list": "table-stroke ui-responsive",
......@@ -50,14 +67,6 @@
"bottom_grid": 1
},
"children": []
}, {
"type": "a",
"direct": {"className":"translate ui-btn ui-icon-edit ui-btn-icon-left ui-corner-all ui-btn-inline ui-btn-slapos-black ui-link", "href": "#services/add"},
"attributes": {
"data-i18n": "portal_type_dict.service_dict.text_dict.add",
"data-icon": "edit"
},
"logic": {"text":"New service"}
}]
}
data/software_status.json
View file @ 7510c06e
......@@ -14,7 +14,16 @@
"caption": {
"slot": 1,
"text": "Installed Services",
"text_i18n":"portal_type_dict.software_dict.text_dict.no_software"
"text_i18n":"portal_type_dict.software_dict.text_dict.installed_services"
},
"pagination": {
"slot": 2,
"option_list": [
{"value": "8", "text": "8", "text_i18n":"portal_type_dict.invoice_dict.text_dict.8"},
{"value": "16", "text": "16", "text_i18n":"portal_type_dict.invoice_dict.text_dict.16"},
{"value": "32", "text": "32", "text_i18n":"portal_type_dict.invoice_dict.text_dict.32"},
{"value": "64", "text": "64", "text_i18n":"portal_type_dict.invoice_dict.text_dict.64"}
]
},
"no_items": {
"message":"No Software installed.",
......
js/erp5_loader.js
View file @ 7510c06e
......@@ -2652,6 +2652,7 @@
if (update) {
content.appendChild(no_content(props.no_items));
} else {
console.log(content)
content.querySelector("tbody").appendChild(no_content(props.no_items));
}
}
......@@ -3767,7 +3768,7 @@
}
} else {
if (input_config.logic.setFlux) {
input_config.direct.value = flux.cert[setter] || "Certificate is still active, please revoke existing one.";
input_config.direct.value = (flux & flux.cert) ? flux.cert[setter] : "Certificate is still active, please revoke existing one.";
} else {
input_config.direct.value = spec.data[setter] ||
(setter + util.uuid());
......
lang/en-EN/dict.json
View file @ 7510c06e
......@@ -232,9 +232,11 @@
"text_dict": {
"crt": "computer.crt",
"key": "computer.key",
"request_ssl": "Request SSL",
"request_ssl": "Request SSL Certificate",
"ssl_request_info": "Here you can request a new SSL certificate for computer.\nAfter presenting it please copy key and certificate and store in secure place.\nIn case of certificate compromise or lost please request it again.\nCertificate is not stored on Vifib.net servers",
"submit": "Submit",
"update": "Update",
"update_scope": "Update the allocation scope",
"cancel": "Cancel",
"status": "Status",
"search": "Search available servers",
......@@ -785,7 +787,7 @@
"text_dict": {
"software": "Software",
"release": "Release",
"no_software": "No software installed",
"installed_services": "Installed Services",
"add_software": "Install software",
"status": "Status",
"search": "Search available software",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7