Merge lp:~danilo/linaro-android-frontend/bug-942671 into lp:linaro-android-frontend

[Данило Шеган]

Introduce the (static) introductory text for android-build, as requested by Zach.

[Paul Sokolovsky (pfalcon)]

My only concern is that this text appears a bit misplaced - android-build.linaro.org is (to the best of my knowledge) is internal engineering system, to which we just provide open access, but not exactly a frontend into Linaro public resources. IMHO, such text would look better somewhere on releases.linaro.org or snapshots.linaro.org.

Another issue is that the text is long. Nobody else but our engineers would suffer thru constant scrolling to get to real build results.

Well, I assume that these organizational issues were considered already. Implementation-wise, looks good.

review: Approve

[Данило Шеган (danilo)]

Thanks for the comment and review: while it is a service oriented to engineers, those are exactly who we want to cater to with the introductory text. And in case they ended up here by mistake, show them the way.

Zach has a big desire to make this the central point for Android. I, otoh, have a big desire to make it a central point for all of CI in Linaro. But until I am ready to make the call for the latter, I don't mind it serving his purpose better.

=== modified file 'android_build/templates/base.html'
--- android_build/templates/base.html	2012-02-02 09:06:13 +0000
+++ android_build/templates/base.html	2012-03-21 13:37:22 +0000
@@ -52,6 +52,7 @@
           </td>
           <td>
             <h1>Linaro Android Build Service</h1>
+            {% block introduction %}{% endblock %}
           </td>
         </tr>
       </table>

=== modified file 'android_build/templates/index.html'
--- android_build/templates/index.html	2011-03-07 23:37:06 +0000
+++ android_build/templates/index.html	2012-03-21 13:37:22 +0000
@@ -2,7 +2,118 @@
 {% block pagejs %}
 <script type="text/javascript" src="{{MEDIA_URL}}index.js"></script>
 {% endblock %}
+{% block introduction %}
+<h2>Welcome to android-build!</h2>
+
+<p>
+  All the instructions for how to use a build are listed on a build's
+  page. Thank you for using our builds. We really enjoy providing solid,
+  tested and easy-to-use Android builds to the community. If you run
+  into any problems please send a mail to
+  <a href="mailto:[e-mail]">[e-mail]</a> or to <a href="mailto:[e-mail]">[e-mail]</a>, we'll be happy to help.
+</p>
+
+<div style="float: right; font-size: 70%; width: 30em;">
+<h4>A note on naming</h4>
+
+<p>Each build is named what it is. If you take</p>
+
+<code><p>origen-ics-gcc46-samsunglt-stable-blob-12.02-release</p></code>
+
+<p>it breaks down like this:</p>
+
+<dl>
+<dt>origen</dt><dd>The board</dd>
+<dt>ics</dt><dd>Which Android its running</dd>
+<dt>gcc46</dt><dd>Which toolchain compiled it (stock Android uses gcc44, we have those builds too)</dd>
+<dt>samsunglt</dt><dd>the source of the kernel, this name refers to the Linaro Samsung Landing Team</dd>
+<dt>stable</dt><dd>If the kernel is a stable kernel or a tracking kernel</dd>
+<dt>blob</dt><dd>How the various enablement bits are deleivered, blob mean binary blobs which are horrible ;)</dd>
+<dt>12.02</dt><dd>release If its a release we postfix a release tag, builds without a release tag are tips</dt>
+</dl>
+</div>
+
+<div style="padding-top:1em;">
+<p>Users who are interested in tip builds with Linaro goodness should use:</p>
+
+<table>
+<tr><th>Versatile Express</th>
+    <td><a href="~linaro-android/vexpress-ics-gcc46-armlt-stable-open">
+            ~linaro-android/vexpress-ics-gcc46-armlt-stable-open</a></td></tr>
+
+<tr><th>Panda 4430 and 4460</th>
+    <td><a href="~linaro-android/panda-ics-gcc46-tilt-tracking-blob">
+            ~linaro-android/panda-ics-gcc46-tilt-tracking-blob</a></td></tr>
+
+<tr><th>iMX6</th>
+    <td><a href="~linaro-android/imx6-ics-gcc46-freescalelt-stable-open">
+            ~linaro-android/imx6-ics-gcc46-freescalelt-stable-open</a></td></tr>
+
+<tr><th>iMX53</th>
+    <td><a href="~linaro-android/imx53-ics-gcc46-freescalelt-stable-open">
+            ~linaro-android/imx53-ics-gcc46-freescalelt-stable-open</a></td></tr>
+
+<tr><th>Snowball</th>
+    <td><a href="~linaro-android/snowball-ics-gcc46-igloo-stable-blob">
+            ~linaro-android/snowball-ics-gcc46-igloo-stable-blob</a></td></tr>
+
+<tr><th>Origen</th>
+    <td><a href="~linaro-android/origen-ics-gcc46-samsunglt-stable-blob">
+            ~linaro-android/origen-ics-gcc46-samsunglt-stable-blob</a></td></tr>
+</table>
+</div>
+<div style="padding-top:1em;">
+<p>Users who would like the last release should use:</p>
+
+<table>
+<tr><th>Versatile Express</th>
+    <td><a href="
+https://android-build.linaro.org/builds/~linaro-android/vexpress-ics-gcc46-armlt-stable-open-12.02-release/#build=3">Build</a></td>
+    <td><a href="
+https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AkxwyUNxNaAadExQdHNxTnR5SFZCQzJnN1ZtQ2ZhWkE#gid=0">Testsheet</td></tr>
+
+<tr><th>Panda 4430 and 4460</th>
+    <td><a href="
+https://android-build.linaro.org/builds/~linaro-android/panda-ics-gcc46-tilt-tracking-blob-12.02-release/#build=1">Build</a></td>
+    <td><a href="
+https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AkxwyUNxNaAadGVWd3pZazdaRUU0MnRnWmgwbVhTR0E#gid=5">Testsheet</a></td>
+</tr>
+
+<tr><th>iMX6</th>
+    <td><a href="
+https://android-build.linaro.org/builds/~linaro-android/imx6-ics-gcc46-freescalelt-stable-open-12.02-release/#build=1">Build</a></td>
+    <td><a href="
+https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AkxwyUNxNaAadDE1MlJmY19PQzlJOUY5OXk0SWJYT1E#gid=2">Testsheet</a></td>
+</tr>
+
+
+<tr><th>iMX53</th>
+<td><a href="
+https://android-build.linaro.org/builds/~linaro-android/imx53-ics-gcc46-freescalelt-stable-open-12.02-release/#build=1">Build</a></td>
+    <td><a href="
+https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AkxwyUNxNaAadDE1MlJmY19PQzlJOUY5OXk0SWJYT1E#gid=3">Testsheet</a></td>
+</tr>
+
+<tr><th>Snowball</th>
+    <td><a href="
+https://android-build.linaro.org/builds/~linaro-android/snowball-ics-gcc46-igloo-stable-blob-12.02-release/#build=5">Build</a></td>
+    <td><a href="
+https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AkxwyUNxNaAadEF1NXVhT3dQWnZsTHBydnpiWVB4Umc#gid=3">Testsheet</a></td>
+</tr>
+
+<tr><th>Origen</th>
+    <td><a href="
+https://android-build.linaro.org/builds/~linaro-android/origen-ics-gcc46-samsunglt-stable-blob-12.02-release/#build=1">Build</a></td>
+    <td><a href="
+https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AkxwyUNxNaAadDRDVl9TSHUweUk3eG9ndk9sNGxUVnc#gid=2">Testsheet</a></td>
+</tr>
+</table>
+</div>
+
+
+{% endblock %}
 {% block content %}
+
 <a id="new-link" href="new">New Build…</a>
 <div id="build-tabs">
   <ul>