Merge lp:~jcsackett/launchpad/trivially-add-sharing-ui-stuff into lp:launchpad

Proposed by j.c.sackett
Status: Merged
Approved by: j.c.sackett
Approved revision: no longer in the source branch.
Merged at revision: 14824
Proposed branch: lp:~jcsackett/launchpad/trivially-add-sharing-ui-stuff
Merge into: lp:launchpad
Diff against target: 81 lines (+64/-2)
1 file modified
lib/lp/registry/templates/product-sharing.pt (+64/-2)
To merge this branch: bzr merge lp:~jcsackett/launchpad/trivially-add-sharing-ui-stuff
Reviewer Review Type Date Requested Status
Ian Booth (community) Approve
Review via email: mp+93501@code.launchpad.net

Commit message

[r=wallyworld][bug=933792,933794][incr] Adds placeholder HTML for +sharing UI elements

Description of the change

Summary
=======
This branch just contains some placeholders for the thus far agreed upon
elements of the +sharing page's UI.

Implementation
==============
This branch just puts in the static, empty table and the side portlet
summarizing sharing data without the view populating the numbers.

There is other code in work to populate this data, but some of the data to
drive it is still in flux and I would rather get this landed to prevent
conflicts and blocking as purple team continues its work.

Tests
=====
There are no new tests; this branch just lands unchanging static HTML in some
templates, so there are no new moving parts to test.

QA
==
Make sure there's an empty table and side portlet on
qastaging.launchpad.dev/$product/+sharing

Lint
====
This branch is lint free.

To post a comment you must log in.
Revision history for this message
Ian Booth (wallyworld) wrote :

Good to land. I'm sure stuff will change as we progress but it's good to keep things moving by landing what we have.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/templates/product-sharing.pt'
2--- lib/lp/registry/templates/product-sharing.pt 2012-02-13 19:29:29 +0000
3+++ lib/lp/registry/templates/product-sharing.pt 2012-02-16 22:23:23 +0000
4@@ -3,13 +3,75 @@
5 xmlns:tal="http://xml.zope.org/namespaces/tal"
6 xmlns:metal="http://xml.zope.org/namespaces/metal"
7 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
8- metal:use-macro="view/macro:page/main_only"
9+ metal:use-macro="view/macro:page/main_side"
10 i18n:domain="launchpad"
11 >
12
13 <body>
14 <div metal:fill-slot="main">
15- Proprietary, embargoed security, or user-data information about this project is shared with these users and teams.
16+ <p>
17+ Proprietary, embargoed security, or user-data information about this
18+ project is shared with these users and teams.
19+ </p>
20+
21+ <table id="observer-table" class="disclosure listing">
22+ <thead>
23+ <tr>
24+ <th colspan="2" style="width: 33%">User or Team</th>
25+ <th colspan="2" style="width: ">Sharing <span class="help">(<a href="permissions_help.html" target="help" class="js-action help">help</a>)</span></th>
26+ <th colspan="1" style="width: ">Shared items</th>
27+ </tr>
28+ </thead>
29+ <tbody id="observer-table-body"></tbody>
30+ </table>
31+ </div>
32+
33+ <div metal:fill-slot="side" tal:define="overview_menu context/menu:overview">
34+ <tal:comment replace="nothing">
35+ XXX j.c.sackett 2012-02-16 The data in this portlet is static right now,
36+ as policy architecture (which determines the numbers to display) are in
37+ flux. Once they settle down, the view needs to populate some methods to
38+ set the numbers in this portlet.
39+ </tal:comment>
40+ <div id="portlet-disclosure-summary" class="first portlet">
41+ <p>
42+ Permavirgin is shared with <a href="#">0</a> users:
43+ </p>
44+
45+ <table>
46+ <thead>
47+ <tr>
48+ <td colspan="2"><strong>Embargoed Security:</strong></td>
49+ </tr>
50+ </thead>
51+ <tbody>
52+ <tr class="code-links">
53+ <td>Sharing everything with <a href="#">0</a> users</td>
54+ </tr>
55+ <tr class="code-links">
56+ <td>Sharing some things with <a href="#">0</a> users</td>
57+ </tr>
58+ </tbody>
59+ </table>
60+
61+ <p></p>
62+
63+ <table>
64+ <thead>
65+ <tr>
66+ <td colspan="2"><strong>User Data:</strong></td>
67+ </tr>
68+ </thead>
69+ <tbody>
70+ <tr class="code-links">
71+ <td>Sharing everything with <a href="#">0</a> users</td>
72+ </tr>
73+ <tr class="code-links">
74+ <td>Sharing some things with <a href="#">0</a> users</td>
75+ </tr>
76+ </tbody>
77+ </table>
78+ </div>
79 </div>
80 </body>
81 </html>