Commit e1bc6481 authored by Boris Kocherov's avatar Boris Kocherov

draft

parent b59c112e
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
return jIO.util.ajax({ return jIO.util.ajax({
url: url, url: url,
dataType: "json" dataType: "json"
}) });
}) })
.push(function (evt) { .push(function (evt) {
return evt.target.response; return evt.target.response;
...@@ -212,11 +212,12 @@ ...@@ -212,11 +212,12 @@
rJS(window) rJS(window)
.declareMethod("loadJSONSchema", function (url) { .declareMethod("loadJSONSchema", function (url) {
return getJSON(url) return getJSON(url);
.push(function (json) { // disable validating
var base_url = getBaseUrl(url); // .push(function (json) {
return validateJSONSchema(json, base_url); // var base_url = getBaseUrl(url);
}); // return validateJSONSchema(json, base_url);
// });
}) })
.declareMethod("loadSoftwareJSON", function (url) { .declareMethod("loadSoftwareJSON", function (url) {
...@@ -252,7 +253,7 @@ ...@@ -252,7 +253,7 @@
return getJSON(schema_url) return getJSON(schema_url)
.push(function (schema) { .push(function (schema) {
var base_url = getBaseUrl(schema_url); var base_url = getBaseUrl(schema_url);
return expandSchema(schema, schema, base_url) return expandSchema(schema, schema, base_url);
}) })
.push(function (loaded_schema) { .push(function (loaded_schema) {
return tv4.validateMultiple(generated_json, loaded_schema); return tv4.validateMultiple(generated_json, loaded_schema);
......
...@@ -43,7 +43,7 @@ div.slapos-parameter-dict-key .subfield:last-child { ...@@ -43,7 +43,7 @@ div.slapos-parameter-dict-key .subfield:last-child {
#software-type {padding: 10px 0 0;} #software-type {padding: 10px 0 0;}
#software-type .field[title='serialisation_type'] .input { padding-top: 0; } #software-type .field[title='serialisation_type'] .input { padding-top: 0; }
.subfield, #software-type .input{ .subfield, #software-type .input{
padding-top: 10px; padding-top: 3px;
} }
.subfield label, #software-type label { .subfield label, #software-type label {
...@@ -84,8 +84,8 @@ fieldset > .subfield > label { ...@@ -84,8 +84,8 @@ fieldset > .subfield > label {
background-image: -ms-linear-gradient(top, #3498db, #2980b9); background-image: -ms-linear-gradient(top, #3498db, #2980b9);
background-image: -o-linear-gradient(top, #3498db, #2980b9); background-image: -o-linear-gradient(top, #3498db, #2980b9);
background-image: linear-gradient(to bottom, #3498db, #2980b9); background-image: linear-gradient(to bottom, #3498db, #2980b9);
-webkit-border-radius: 4; -webkit-border-radius: 4px;
-moz-border-radius: 4; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
border: 1px solid #3498db; border: 1px solid #3498db;
color: #ffffff; color: #ffffff;
...@@ -157,12 +157,12 @@ label.slapos-parameter-dict-key { ...@@ -157,12 +157,12 @@ label.slapos-parameter-dict-key {
} }
div.slapos-parameter-dict-key { div.slapos-parameter-dict-key {
margin-top: 10px; /*margin-top: 10px;*/
margin-left: 6px; margin-left: 6px;
} }
.subfield { .subfield {
padding-top: 3px; /*padding-top: 3px;*/
} }
textarea.slapos-parameter { textarea.slapos-parameter {
...@@ -181,8 +181,8 @@ button.hidden-button { ...@@ -181,8 +181,8 @@ button.hidden-button {
background-image: -ms-linear-gradient(top, #3498db, #2980b9); background-image: -ms-linear-gradient(top, #3498db, #2980b9);
background-image: -o-linear-gradient(top, #3498db, #2980b9); background-image: -o-linear-gradient(top, #3498db, #2980b9);
background-image: linear-gradient(to bottom, #3498db, #2980b9); background-image: linear-gradient(to bottom, #3498db, #2980b9);
-webkit-border-radius: 28; -webkit-border-radius: 28px;
-moz-border-radius: 28; -moz-border-radius: 28px;
border-radius: 28px; border-radius: 28px;
font-family: Arial; font-family: Arial;
color: #ffffff; color: #ffffff;
......
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