Browse Source

Solved bugs in Calc and sorted variable list in designer page.

Signed-off-by: chanhoonseng <chanhoonseng3101@gmail.com>
chanhoonseng 6 years ago
parent
commit
3c13d82843
3 changed files with 15 additions and 4 deletions
  1. 1 1
      core.py
  2. 13 2
      designer.html
  3. 1 1
      status.html

+ 1 - 1
core.py

@@ -161,7 +161,7 @@ class DesignerHandler(tornado.web.RequestHandler):
         data = {
             "cache": cache_data,
             "style": style_data,
-            "index": index_data,
+            "index": sorted(index_data),
         }
 
         if "background" in config:

+ 13 - 2
designer.html

@@ -1430,13 +1430,13 @@ function mysave(data) {
             	    header = {};
             	    header["title"] = $(".title", "#"+key).text();
             	    //header["color"] = $(".title", "#"+key).css("color");
-            	    header["size"] = $(".title", "#"+key).css("font-size");
+                    header["size"] = parseInt($(".title", "#"+key).css("font-size")) || 28;
             	    header["weight"] = $(".title", "#"+key).css("font-weight");
             
             	    unit = {};
             	    unit["title"] = $(".unit_title", "#"+key).text();
             	    //unit["color"] = $(".varval", "#"+key).css("color");
-            	    unit["size"] = $(".varval", "#"+key).css("font-size");
+                    unit["size"] = parseInt($(".varval", "#"+key).css("font-size")) || 28;
             	    unit["weight"] = $(".varval", "#"+key).css("font-weight");
                 }
             	tmp["header"] = header;
@@ -1634,6 +1634,17 @@ function highlight(mydata) {
         if ($("#"+varname).css("background-color") ) {
             $("#background_color").val($("#"+varname).css("background-color"));
         }
+        $("#elem_title_style").val("400");
+        var fontWeight = $("#"+varname + " .title").css("font-weight");
+        if (fontWeight == 'bold' || fontWeight == '700') {
+            $("#elem_title_style").val("700");
+        }
+
+        $("#elem_unit_style").val("400");
+        var fontWeight = $("#"+varname + " .varval").css("font-weight");
+        if (fontWeight == 'bold' || fontWeight == '700') {
+            $("#elem_unit_style").val("700");
+        }
 
 
      } else if (vartype == "icon") {

+ 1 - 1
status.html

@@ -27,7 +27,7 @@
     height:{{ data['style'][key]['height'] }}px;
     
 {% if "background_color" in data['style'][key] %}     
-  background-color="{{ data['style'][key]['background_color'] }}"
+  background-color:"{{ data['style'][key]['background_color'] }}'
 {% else%}
 {% end %}
 {% if "condition" in data['style'][key] %}