From e2550e6df11558ccd6e8b95f489c0988b34347af Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Fri, 26 Feb 2016 10:19:58 +0100
Subject: 1. pywrap:    - fix get_registers_list crash with bank != NULL    -
 set correct python version in cmake install step 2. html_server:    - merge
 set and get value boxes into one box    - add registers bank view mode    -
 read registers/properties values in bank/branch view mode 3. xml/test    -
 remove cmosis registers    - add multithread safe property example

---
 html_server/templates/property_info.html | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'html_server/templates/property_info.html')

diff --git a/html_server/templates/property_info.html b/html_server/templates/property_info.html
index ce974ac..4e7c92f 100644
--- a/html_server/templates/property_info.html
+++ b/html_server/templates/property_info.html
@@ -12,14 +12,14 @@
       
       $.getJSON(completePath, function(json){
                   checkError(json)
-                  var valFieldId = "#actVal"+prop.split('/').join("_")
-                  $(valFieldId).text(json.value)
+                  var valFieldId = "#set_val_" + prop.split('/').join("_")
+                  $(valFieldId).val(json.value)
                })
    }
    
    function setProperty(prop)
    {
-      var value = document.getElementById("set_val_" + prop).value;
+      var value = document.getElementById("set_val_" + prop.split('/').join("_")).value;
       if(value == "")
          return
       
@@ -34,7 +34,7 @@
                 })
    };
 </script>
-   
+
 <table class="infoTable">
    <tr class="infoTable">
       <td class="infoTable">Name</td>
@@ -55,24 +55,22 @@
          </td>
          <td class="infoTable">
             <table>
-               <tr>
-                  <td id = "actVal{{ property.path.replace('/', '_') }}" class="infoTable"> 
-                     {{ value }}
-                  </td>
-                  {% if 'R' in property.mode %}
-                  <td> 
-                     <input type="button" value="update" style="width:100%;height:100%" onclick="updateProperty('{{ property.path }}')">
-                  </td>
-                  {% endif %}
-               </tr>
-               {% if 'W' in property.mode %}
+               {% if 'R' in property.mode %}
                   <tr>
                      <td> 
-                           <input type="text" name="set_val_{{ property.path }}" id="set_val_{{ property.path }}" value="" />
+                           <input type="text"
+                                  name="set_val_{{ property.path.replace('/', '_') }}"
+                                  id="set_val_{{ property.path.replace('/', '_') }}"
+                                  value="{{ value[property.path] }}" />
                      </td>
+                     {% if 'W' in property.mode %}
                      <td> 
                            <input type="button" value="set" style="width:100%;height:100%" onclick="setProperty('{{ property.path }}')">
                      </td>
+                     {% endif %}
+                     <td> 
+                        <input type="button" value="update" style="width:100%;height:100%" onclick="updateProperty('{{ property.path }}')">
+                     </td>
                   </tr>
                {% endif %}
             </table>
-- 
cgit v1.2.3