3 files changed, 3 insertions, 45 deletions
diff --git a/ishtar_common/templates/widgets/GramKilogramWidget.html b/ishtar_common/templates/widgets/GramKilogramWidget.html
deleted file mode 100644
index 27c066d13..000000000
--- a/ishtar_common/templates/widgets/GramKilogramWidget.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="input-group">
-    <input class="area_widget form-control" type="text"{{final_attrs|safe}}>
-    <div class="input-group-append">
-        <div class="input-group-text">
-            {{unit}} (<span id="kg_{{id}}">0</span>&nbsp;kg)
-        </div>
-    </div>
-</div>
-<script type="text/javascript"><!--//
-    function evaluate_{{safe_id}}(){
-        value = parseFloat($("#{{id}}").val());
-        if(!isNaN(value)){
-            value = value/1000;
-        } else {
-            value = 0;
-        }
-        $("#kg_{{id}}").html(value);
-    }
-    $("#{{id}}").keyup(evaluate_{{safe_id}});
-    $(document).ready(evaluate_{{safe_id}}());
-//--></script>
diff --git a/ishtar_common/templates/widgets/SquareMeterWidget.html b/ishtar_common/templates/widgets/SquareMeterWidget.html
deleted file mode 100644
index 09e93b425..000000000
--- a/ishtar_common/templates/widgets/SquareMeterWidget.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="input-group">
-    <input class="area_widget form-control" type="text"{{final_attrs|safe}}>
-    <div class="input-group-append">
-        <div class="input-group-text">
-            {{unit}} (<span id="ha_{{id}}">0</span>&nbsp;ha)
-        </div>
-    </div>
-</div>
-<script type="text/javascript"><!--//
-    function evaluate_{{safe_id}}(){
-        value = parseFloat($("#{{id}}").val());
-        if(!isNaN(value)){
-            value = value/10000;
-        } else {
-            value = 0;
-        }
-        $("#ha_{{id}}").html(value);
-    }
-    $("#{{id}}").keyup(evaluate_{{safe_id}});
-    $(document).ready(evaluate_{{safe_id}}());
-//--></script>
diff --git a/ishtar_common/templates/widgets/CentimeterMeterWidget.html b/ishtar_common/templates/widgets/UnitWidget.html
index 00c1614b5..46b883352 100644
--- a/ishtar_common/templates/widgets/CentimeterMeterWidget.html
+++ b/ishtar_common/templates/widgets/UnitWidget.html
@@ -2,7 +2,7 @@
     <input class="area_widget form-control" type="text"{{final_attrs|safe}}>
     <div class="input-group-append">
         <div class="input-group-text">
-            {{unit}} (<span id="meter_{{id}}">0</span>&nbsp;m)
+            {{unit1}} (<span id="subunit_{{id}}">0</span>&nbsp;{{unit2}})
         </div>
     </div>
 </div>
@@ -10,11 +10,11 @@
     function evaluate_{{safe_id}}(){
         value = parseFloat($("#{{id}}").val());
         if(!isNaN(value)){
-            value = value/100;
+            value = value/{{factor}};
         } else {
             value = 0;
         }
-        $("#meter_{{id}}").html(value);
+        $("#subunit_{{id}}").html(value);
     }
     $("#{{id}}").keyup(evaluate_{{safe_id}});
     $(document).ready(evaluate_{{safe_id}}());