[Openautomation-svn] SF.net SVN: openautomation:[290] CometVisu/trunk/visu

[<net...@us...>]

Revision: 290
          http://openautomation.svn.sourceforge.net/openautomation/?rev=290&view=rev
Author:   netzkind
Date:     2011-02-11 21:58:58 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
added attribute "type" for addresses

Modified Paths:
--------------
    CometVisu/trunk/visu/edit/style_edit.css
    CometVisu/trunk/visu/edit/visuconfig_edit.js
    CometVisu/trunk/visu/lib/templateengine.js

Modified: CometVisu/trunk/visu/edit/style_edit.css
===================================================================
--- CometVisu/trunk/visu/edit/style_edit.css	2011-02-06 18:53:51 UTC (rev 289)
+++ CometVisu/trunk/visu/edit/style_edit.css	2011-02-11 21:58:58 UTC (rev 290)
@@ -84,7 +84,7 @@
 
 #addMaster .multi_element {
     width: 90%;
-    height: 8em;
+    height: 10em;
     overflow: auto;
     border: 1px solid #444;
     -moz-border-radius: 3px;
@@ -122,7 +122,7 @@
     height: 1em;
 }
 
-.element .value, .element .transform, .element .readonly {
+.element .value, .element .transform, .element .readonly, .element .addresstype {
     font-weight: normal;
     height: 1em;
     font-size: small;
@@ -138,8 +138,25 @@
 
 .element .readonly {
     margin-left: .4em;
+    font-style: italic;
 }
 
+.element .addresstype {
+    float: left;
+    margin-left: .4em;
+    font-weight: bold;
+}
+
+.element .addresstype:before {
+    content: "(";
+}
+
+.element .addresstype:after {
+    content: ")";
+}
+
+
+
 .multi_element .element .edit {
 }
 

Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js	2011-02-06 18:53:51 UTC (rev 289)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js	2011-02-11 21:58:58 UTC (rev 290)
@@ -244,6 +244,16 @@
                     }
                 }
 
+                if ($e.hasClass("addresstype")) {
+                    element.find("label").html("addresstype");
+                    myElement.append($("<input class=\"add_addresstype\" />"));
+                    if (typeof $e.text() != "undefined") {
+                        // pre-set the value
+                        myElement.find(":input").val($e.text());
+                    }
+
+                }
+
                 if (element.find("select")[0]) {
                     var select = element.find("select");
                     select.change(function() {
@@ -272,6 +282,7 @@
                         objData.textContent = $e.find("input.add_address").val();
                         objData._attributes = {};
                         objData._attributes.transform = $e.find(".add_transform").val();
+                        objData._attributes.type = $e.find(".add_addresstype").val();
                         objData._attributes.readonly = $e.find(".add_readonly:checked").val();
 
                         // remove this item and insert a new one instead
@@ -401,6 +412,7 @@
                                 objData.textContent = "";
                                 objData._attributes = {};
                                 objData._attributes.transform = "";
+                                objData._attributes.type = "";
                                 objData._attributes.readonly = false;
 
                                 var elementDiv = createAddressEditorElement(objData);
@@ -578,6 +590,7 @@
                         $elements.each(function (index, e) {
                             $address = $("<address />")
                                 .attr("transform", $(e).data("transform"))
+                                .attr("addresstype", $(e).data("addresstype"))
                                 .attr("readonly", $(e).data("readonly") == true ? "true" : "false")
                                 .append($(e).data("address"));
                             dataObject.append($address);
@@ -730,6 +743,7 @@
 
                         myElement._attributes.transform = jQuery(element).attr("transform");
                         myElement._attributes.readonly  = jQuery(element).attr("readonly");
+                        myElement._attributes.type  = jQuery(element).attr("type") || "";
                         break;
                     default:
                         // mostly labels
@@ -884,15 +898,22 @@
     elementDiv.append("<div class=\"title\" />")
         .append("<div class=\"value editable\" />")
         .append("<div class=\"transform editable\" />")
+        .append("<div class=\"addresstype editable\" />")
         .append("<div class=\"readonly editable\" />");
     //myDiv.find(".title").append();
     var t = getAddressesObject();
     elementDiv.find(".title").append(t.find("option[value=" + element.textContent + "]").text());
     elementDiv.find(".value").append(element.textContent);
     elementDiv.find(".transform").append(element._attributes.transform);
+    if (element._attributes.type != "undefined" && element._attributes.type != "") {
+        elementDiv.find(".addresstype").append(element._attributes.type).show();
+    } else {
+        elementDiv.find(".addresstype").hide();
+    }
     elementDiv.find(".readonly").append(element._attributes.readonly == "true" ? "readonly" : "")
 
     elementDiv.data("transform", element._attributes.transform)
+        .data("addresstype", element._attributes.type)
         .data("readonly", element._attributes.readonly == "true" ? true : false)
         .data("address", element.textContent);
 

Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js	2011-02-06 18:53:51 UTC (rev 289)
+++ CometVisu/trunk/visu/lib/templateengine.js	2011-02-11 21:58:58 UTC (rev 290)
@@ -115,11 +115,10 @@
       $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;}</style>' );
       // do nothing
   } else {
-  var width = $( window ).width();
-  var height = $( window ).height() - $( '#top' ).outerHeight(true) - $( '#bottom' ).outerHeight(true) - 2;
-  $( '#main' ).css( 'width', width ).css( 'height', height );
-  $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;height:' + height + 'px;}</style>' );  
-
+      var width = $( window ).width();
+      var height = $( window ).height() - $( '#top' ).outerHeight(true) - $( '#bottom' ).outerHeight(true) - 2;
+      $( '#main' ).css( 'width', width ).css( 'height', height );
+      $( 'head' ).append( '<style type="text/css">.page{width:' + (width-0) + 'px;height:' + height + 'px;}</style>' );
   }
   main_scroll != undefined && main_scroll.seekTo( main_scroll.getIndex(), 0 ); // fix scroll
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.