entity spec looked up from catalog

refactors Brooklyn{AssemblyTemplateInstantiator,ComponentTemplateResolver} so 
that resolution is shared between the two.  this could be cleaned up further.
also applies some better debug/logging and html/underscore-template escaping.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/98884338
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/98884338
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/98884338

Branch: refs/heads/0.7.0-incubating
Commit: 98884338c8d6e3de409148c7b7b668083bba4db7
Parents: 7eff206
Author: Alex Heneveld <[email protected]>
Authored: Tue Apr 21 09:56:40 2015 +0100
Committer: Alex Heneveld <[email protected]>
Committed: Tue Apr 21 21:11:34 2015 +0100

----------------------------------------------------------------------
 .../tpl/app-add-wizard/create-step-template-entry.html       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/98884338/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/create-step-template-entry.html
----------------------------------------------------------------------
diff --git 
a/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/create-step-template-entry.html
 
b/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/create-step-template-entry.html
index d70fd9b..b72bb10 100644
--- 
a/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/create-step-template-entry.html
+++ 
b/usage/jsgui/src/main/webapp/assets/tpl/app-add-wizard/create-step-template-entry.html
@@ -18,16 +18,16 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<div class="template-lozenge frame" id="<%= id %>" data-name="<%= name %>" 
data-yaml="<%= planYaml %>">
+<div class="template-lozenge frame" id="<%- id %>" data-name="<%- name %>" 
data-yaml="<%- planYaml %>">
     <% if (iconUrl) { %>
     <div class="icon">
-        <img src="<%= iconUrl %>" alt="(icon)" />
+        <img src="<%- iconUrl %>" alt="(icon)" />
     </div>
     <% } %>
     <div class="blurb">
-        <div class="title"><%= name %></div>
+        <div class="title"><%- name %></div>
         <div class="description">
-            <%= description ? description : "" %>
+            <%- description ? description : "" %>
         </div>
     </div>
 </div>

Reply via email to