Simon Hunt

Added title to Application View table and details panel.

Change-Id: Id225c3b315a0fd96dfad1e44138551f131bc54df
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 33
34 <properties> 34 <properties>
35 <onos.app.name>org.onosproject.drivermatrix</onos.app.name> 35 <onos.app.name>org.onosproject.drivermatrix</onos.app.name>
36 - <onos.app.title>Driver Behaviour Support Matrix App</onos.app.title> 36 + <onos.app.title>Driver Support Matrix</onos.app.title>
37 <onos.app.category>Utility</onos.app.category> 37 <onos.app.category>Utility</onos.app.category>
38 <onos.app.url>http://onosproject.org</onos.app.url> 38 <onos.app.url>http://onosproject.org</onos.app.url>
39 <onos.app.readme>Driver behaviour support matrix.</onos.app.readme> 39 <onos.app.readme>Driver behaviour support matrix.</onos.app.readme>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 31
32 <properties> 32 <properties>
33 <onos.app.name>org.onosproject.openflow</onos.app.name> 33 <onos.app.name>org.onosproject.openflow</onos.app.name>
34 - <onos.app.title>OpenFlow Southbound Meta App</onos.app.title> 34 + <onos.app.title>OpenFlow Meta App</onos.app.title>
35 <onos.app.category>Provider</onos.app.category> 35 <onos.app.category>Provider</onos.app.category>
36 <onos.app.requires> 36 <onos.app.requires>
37 org.onosproject.openflow-base, 37 org.onosproject.openflow-base,
......
...@@ -103,6 +103,16 @@ ...@@ -103,6 +103,16 @@
103 font-size: 12pt; 103 font-size: 12pt;
104 } 104 }
105 105
106 +#application-details-panel .top .app-title {
107 + width: 90%;
108 + height: 45px;
109 + font-size: 22pt;
110 + font-weight: bold;
111 + overflow: hidden;
112 + white-space: nowrap;
113 + padding: 0 12px 0 0;
114 +}
115 +
106 #application-details-panel .top div.left { 116 #application-details-panel .top div.left {
107 float: left; 117 float: left;
108 padding: 0 12px 0 0; 118 padding: 0 12px 0 0;
......
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
42 <tr> 42 <tr>
43 <td colId="state" class="table-icon" sortable></td> 43 <td colId="state" class="table-icon" sortable></td>
44 <td colId="icon" class="table-icon">Icon </td> 44 <td colId="icon" class="table-icon">Icon </td>
45 - <td colId="id" sortable col-width="250px">App ID </td> 45 + <td colId="title" sortable col-width="240px">Title </td>
46 + <td colId="id" sortable col-width="240px">App ID </td>
46 <td colId="version" sortable col-width="120px">Version </td> 47 <td colId="version" sortable col-width="120px">Version </td>
47 <td colId="category" sortable col-width="100px">Category </td> 48 <td colId="category" sortable col-width="100px">Category </td>
48 - <td colId="origin" sortable col-width="100px">Origin </td> 49 + <td colId="origin" sortable>Origin </td>
49 - <td colId="desc">Description </td>
50 </tr> 50 </tr>
51 </table> 51 </table>
52 </div> 52 </div>
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
68 </td> 68 </td>
69 <td><img data-ng-src="./rs/applications/{{app.icon}}/icon" 69 <td><img data-ng-src="./rs/applications/{{app.icon}}/icon"
70 height="28px" width="28px" /></td> 70 height="28px" width="28px" /></td>
71 + <td>{{app.title}}</td>
71 <td>{{app.id}}</td> 72 <td>{{app.id}}</td>
72 <td>{{app.version}}</td> 73 <td>{{app.version}}</td>
73 <td>{{app.category}}</td> 74 <td>{{app.category}}</td>
74 <td>{{app.origin}}</td> 75 <td>{{app.origin}}</td>
75 - <td>{{app.desc}}</td>
76 </tr> 76 </tr>
77 </table> 77 </table>
78 </div> 78 </div>
......
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
108 } 108 }
109 } 109 }
110 110
111 + ndiv('app-title');
111 ndiv('left app-icon'); 112 ndiv('left app-icon');
112 ndiv('right', 'app-props'); 113 ndiv('right', 'app-props');
113 ndiv('app-url'); 114 ndiv('app-url');
...@@ -156,6 +157,8 @@ ...@@ -156,6 +157,8 @@
156 var propsBody = top.select('.app-props').append('tbody'), 157 var propsBody = top.select('.app-props').append('tbody'),
157 url = details.url; 158 url = details.url;
158 159
160 + top.select('.app-title').text(details.title);
161 +
159 addIcon(top.select('.app-icon'), details.id); 162 addIcon(top.select('.app-icon'), details.id);
160 163
161 propOrder.forEach(function (prop, i) { 164 propOrder.forEach(function (prop, i) {
...@@ -263,7 +266,7 @@ ...@@ -263,7 +266,7 @@
263 sortParams: { 266 sortParams: {
264 firstCol: 'state', 267 firstCol: 'state',
265 firstDir: 'desc', 268 firstDir: 'desc',
266 - secondCol: 'id', 269 + secondCol: 'title',
267 secondDir: 'asc' 270 secondDir: 'asc'
268 } 271 }
269 }); 272 });
......