Commit aaefccf1 authored by Vangelis Koukis's avatar Vangelis Koukis
Browse files

Merge branch 'ui-refactor'

parents 2970a89e 4696df73
......@@ -7,12 +7,12 @@ html {
}
.overlay .content {
background: url("./meta-wiz-inner-bg.png") repeat-x scroll 0 0;
background: url("../images/meta-wiz-inner-bg.png") repeat-x scroll 0 0;
border: 1px solid #aaa;
}
.create-vm .flavor-options-cont .flavor-options li {
background: url("./meta-wiz-inner-bg.png") repeat-x scroll 0 0;
background: url("../images/meta-wiz-inner-bg.png") repeat-x scroll 0 0;
cursor: pointer;
}
......
......@@ -1304,7 +1304,7 @@
parse_meta: function(img) {
_.each(this.meta_keys_as_attrs, _.bind(function(key){
img[key] = this.get_meta_key(img, key);
img[key] = this.get_meta_key(img, key) || "";
}, this));
return img;
},
......
......@@ -173,6 +173,7 @@
}
synnefo.util.truncate = function(string, size, append, words) {
if (string === undefined) { return "" };
if (string.length <= size) {
return string;
}
......
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