~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/templates/branchmergeproposal-index.pt

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-12-09 09:23:38 UTC
  • mfrom: (14333.2.13 history-model)
  • Revision ID: launchpad@pqm.canonical.com-20111209092338-se7u5l0skqzaes1v
[r=jcsackett][bug=295214, 894836,
 898200] Keep sort button ob bug listing pages in sync with the
 displayed data

Show diffs side-by-side

added added

removed removed

Lines of Context:
184
184
    <div class="yui-g" tal:condition="view/pending_diff">
185
185
      <div class="pending-update" id="diff-pending-update">
186
186
        <h3>Updating diff...</h3>
187
 
        <p tal:condition="not: features/longpoll.merge_proposals.enabled">
 
187
        <p>
188
188
          An updated diff will be available in a few minutes. Reload to see the
189
189
          changes.
190
190
        </p>
191
 
        <p tal:condition="features/longpoll.merge_proposals.enabled">
192
 
          An updated diff is being calculated and will appear automatically when ready.
193
 
        </p>
194
191
      </div>
195
192
    </div>
196
193
    <div id="review-diff" tal:condition="view/preview_diff">