← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~wgrant/launchpad/product-index-code-stab into lp:launchpad

 

William Grant has proposed merging lp:~wgrant/launchpad/product-index-code-stab into lp:launchpad.

Commit message:
Move branch link, languages and VCS bits of Product:+index to a new "Code" portlet.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/product-index-code-stab/+merge/289866

Move branch link, languages and VCS bits of Product:+index to a new "Code" portlet.

Now the "Browse the code" link isn't hidden in the middle of a blur of text. The licence section is also now 50% rather than 25% width, eliminating fugly wrapping. And the development focus series edit widget is now in the "Series and milestones" portlet.

I shuffled Bugs and contributors to the right column and FAQs to the left to balance them out a bit more in the common case.

This is preparation for a more minor adjustment to support linking to a default Git repository, not just a Bazaar branch. The increased width in the new portlet will also allow the clone URL to be shown on the project page, shock horror.

http://people.canonical.com/~wgrant/launchpad/product-index-code-old.png
http://people.canonical.com/~wgrant/launchpad/product-index-code-new.png
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/product-index-code-stab into lp:launchpad.
=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2015-09-16 13:30:33 +0000
+++ lib/lp/registry/templates/product-index.pt	2016-03-23 07:54:24 +0000
@@ -106,39 +106,11 @@
                 <dt>Driver:</dt>
                 <dd tal:content="structure view/driver_widget" />
               </dl>
-
-              <dl id="dev-focus"
-                  tal:define="dev_focus context/development_focus;
-                              trunk dev_focus/branch;
-                              trunk_visible trunk/required:launchpad.View|nothing">
-                <dt>Development focus:</dt>
-                <dd>
-                  <p>
-                  <a tal:attributes="href dev_focus/fmt:url"
-                     tal:content="string:${dev_focus/name} series" />&nbsp;
-                  <a tal:replace="structure overview_menu/edit/fmt:icon" /></p>
-                  <p tal:condition="trunk_visible">
-                    <a tal:replace="structure trunk/fmt:link" />&nbsp;
-                    <a tal:replace="structure dev_focus/menu:overview/set_branch/fmt:icon" />
-                    <br/>
-                    <a tal:replace="structure trunk/menu:context/source/fmt:link"/>
-                  </p>
-                </dd>
-              </dl>
-
-              <dl id="product-languages"
-                tal:condition="view/show_programming_languages">
-                <dt>Programming Languages:</dt>
-                <dd tal:content="structure view/languages_edit_widget" />
-              </dl>
-
-              <dl id="product-vcs" tal:condition="context/inferred_vcs">
-                <dt>Version control system:</dt>
-                <dd tal:content="context/inferred_vcs/title">Git</dd>
-              </dl>
-
+            </div>
+
+            <div>
               <dl id="licences">
-                <dt>Licences:</dt>
+                <dt>Licence:</dt>
                 <dd>
                   <tal:licenses repeat="license context/licenses">
                     <tal:license replace="license/title">GPL</tal:license><tal:comma
@@ -188,8 +160,10 @@
               metal:use-macro="context/@@+timeline-macros/timeline-iframe" />
 
             <p id="development-focus">
-              <a tal:replace="structure context/development_focus/fmt:link" />
-              is the current focus of development
+              <a tal:attributes="href context/development_focus/fmt:url"
+                tal:content="string:${context/development_focus/name} series" />
+                is the current focus of development.
+              <a tal:replace="structure overview_menu/edit/fmt:icon" />
             </p>
 
             <ul class="horizontal">
@@ -214,25 +188,59 @@
 
       <div class="yui-g">
         <div class="yui-u first">
+          <div id="code-info" class="portlet">
+            <h2>
+              <span class="see-all"><a
+                tal:attributes="href context/fmt:url:code">
+                All code</a></span>
+              Code
+            </h2>
+
+            <dl id="dev-focus"
+                tal:define="trunk context/development_focus/branch;
+                            trunk_visible trunk/required:launchpad.View|nothing"
+                tal:condition="trunk_visible">
+              <dt>Development focus:</dt>
+              <dd>
+                <a tal:replace="structure trunk/fmt:link" />&nbsp;
+                <a tal:replace="structure context/menu:overview/configure_code/fmt:icon" />
+                <br/>
+                <a tal:replace="structure trunk/menu:context/source/fmt:link"/>
+              </dd>
+            </dl>
+
+            <div class="two-column-list">
+              <dl id="product-vcs" tal:condition="context/inferred_vcs">
+                <dt>Version control system:</dt>
+                <dd tal:content="context/inferred_vcs/title">Git</dd>
+              </dl>
+
+              <dl id="product-languages"
+                tal:condition="view/show_programming_languages">
+                <dt>Programming languages:</dt>
+                <dd tal:content="structure view/languages_edit_widget" />
+              </dl>
+            </div>
+          </div>
+
+          <div tal:content="structure context/@@+portlet-latestquestions"
+            tal:condition="context/answers_usage/enumvalue:LAUNCHPAD" />
+
           <div tal:content="structure context/@@+portlet-listfaqs"
             tal:condition="context/answers_usage/enumvalue:LAUNCHPAD" />
+          <div tal:content="structure context/@@+portlet-packages" />
+        </div>
 
+        <div class="yui-u">
           <div tal:content="structure context/@@+portlet-latestbugs"
             tal:condition="context/bug_tracking_usage/enumvalue:LAUNCHPAD" />
 
-          <div tal:content="structure context/@@+portlet-top-contributors" />
-
-          <div tal:content="structure context/@@+portlet-packages" />
-        </div>
-
-        <div class="yui-u">
-          <div tal:content="structure context/@@+portlet-latestquestions"
-            tal:condition="context/answers_usage/enumvalue:LAUNCHPAD" />
-
           <div tal:content="structure context/@@+portlet-latestspecs"
             tal:condition="context/blueprints_usage/enumvalue:LAUNCHPAD" />
 
           <div tal:content="structure context/@@+portlet-coming-sprints" />
+
+          <div tal:content="structure context/@@+portlet-top-contributors" />
         </div>
         <div class="yui-u">
           <div id="structural-subscription-content-box"></div>


Follow ups