brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [24/50] [abbrv] brooklyn-ui git commit: include entity icon on app-explorer summary page
Date Mon, 01 Feb 2016 17:52:08 GMT
include entity icon on app-explorer summary page


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

Branch: refs/heads/0.6.0
Commit: 1e4f73bef0f3352c8875d72c6995bdc4f60051ff
Parents: 3f0d54a
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Sep 17 00:14:18 2013 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Sep 18 09:30:06 2013 +0100

----------------------------------------------------------------------
 .../main/webapp/assets/tpl/apps/summary.html    | 31 +++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/1e4f73be/usage/jsgui/src/main/webapp/assets/tpl/apps/summary.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/apps/summary.html b/usage/jsgui/src/main/webapp/assets/tpl/apps/summary.html
index 8012a41..030d453 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/apps/summary.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/apps/summary.html
@@ -1,17 +1,27 @@
 <div class="app-summary">
 
-  <div class="name">
-    <h2><%= entity.get('name') %></h2>
+ <div id="title-and-info-row">
+  <% if (entity.getLinkByName('iconUrl')) { %>
+  <div style="display: inline-block; vertical-align: top; padding-top: 12px;">
+    <img src="<%= entity.getLinkByName('iconUrl') %>"
+        style="max-width: 128px; max-height: 128px;"/>
   </div>
+  <% } %>
 
-  <div class="inforow">
-<!-- 
+  <div style="display: inline-block; vertical-align: top;">
+  
+   <div class="name" style="margin-bottom: 12px;">
+     <h2><%= entity.get('name') %></h2>
+   </div>
+
+   <div class="inforow">
+    <!-- 
     <div class="left">
         TODO nice big icon for status here; derived as:
         running (with optional overlay if service-not-(yet)-up)
         starting, stopping, stopped, on-fire (all with optional overlay if service-up)
     </div>
--->
+     -->
     <div class="right">
         <div class="info-name-value id">
             <div class="name">ID</div>
@@ -34,20 +44,21 @@
         </div>
         <!-- TODO parent, app, children -->
     </div>
+   </div>
   </div>
-
-
+ </div>
+ 
   <!-- TODO
     map
   -->
 
   <!-- TODO hide the json -->  
   <div class="toggler-region json">
-    <div class="toggler-header">
-      <div class="toggler-icon icon-chevron-down"></div>
+    <div class="toggler-header user-hidden">
+      <div class="toggler-icon icon-chevron-left"></div>
       <div><b>JSON</b></div>
     </div>
-    <div class="for-textarea">
+    <div class="for-textarea hide">
       <textarea id="json-textrea" readonly="readonly"><%= entityJson %></textarea>
     </div>
   </div>


Mime
View raw message