From f1ff4c3430974740a58cdd3e3c9cebad1a739ea8 Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-mail@date.by>
Date: Thu, 8 May 2014 14:57:26 +0400
Subject: [PATCH] ENH: Improve index page layout a bit

---
 common.css |  5 +++--
 index.xsl  | 30 +++++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/common.css b/common.css
index 5ee25ea..353d105 100644
--- a/common.css
+++ b/common.css
@@ -1080,8 +1080,9 @@ div#div_showfilters {
   float: left;
 }
 
-.platformicon{
-  margin-right: 5px;
+.icon {
+  margin-left: 1px;
+  margin-right: 1px;
 }
 
 .builddateelapsed {
diff --git a/index.xsl b/index.xsl
index e6c1ed6..d4c0028 100644
--- a/index.xsl
+++ b/index.xsl
@@ -150,10 +150,13 @@
       <td align="left">
       <xsl:if test="string-length(buildid)>0">
       <xsl:if test="string-length(buildplatform)>0">
-        <img class="platformicon" border="0">
+        <div style="float:left;">
+        <img class="icon" alt="platform">
             <xsl:attribute name="src">images/platform_<xsl:value-of select="buildplatform"/>.png</xsl:attribute>
         </img>
+        </div>
       </xsl:if>
+      <div style="float: left; margin: 0px 4px;">
       <a class="buildinfo">
         <xsl:if test="countbuildids=1">
         <xsl:attribute name="href">buildSummary.php?buildid=<xsl:value-of select="buildid"/>
@@ -170,27 +173,29 @@
 
         <xsl:value-of select="buildname"/>
       </a>
+      </div>
      </xsl:if>
      <xsl:if test="string-length(buildid)=0">
-       <xsl:value-of select="buildname"/>
+       <div style="float: left; margin: 0px 4px;"><xsl:value-of select="buildname"/></div>
      </xsl:if>
      <xsl:text>&#x20;</xsl:text>
 
+      <div style="float:left;">
       <xsl:if test="string-length(note)>0 and countbuildids=1">
-        <a class="advancedviewitem" title="View notes"><xsl:attribute name="href">viewNotes.php?buildid=<xsl:value-of select="buildid"/> </xsl:attribute><img src="images/document.png" alt="Notes" border="0"/></a>
+        <a class="advancedviewitem" title="View notes"><xsl:attribute name="href">viewNotes.php?buildid=<xsl:value-of select="buildid"/> </xsl:attribute><img src="images/document.png" alt="Notes" class="icon"/></a>
       </xsl:if>
 
       <xsl:if test="upload-file-count>0 and countbuildids=1">
       <a><xsl:attribute name="href">viewFiles.php?buildid=<xsl:value-of select="buildid"/> </xsl:attribute>
          <xsl:attribute name="title"><xsl:value-of select="upload-file-count" /> files uploaded with this build</xsl:attribute>
-      <img src="images/package.png" alt="Files" border="0"/></a>
+      <img src="images/package.png" alt="Files" class="icon"/></a>
       </xsl:if>
 
       <!-- If the build has errors or test failing -->
       <xsl:if test="(compilation/error > 0 or test/fail > 0) and countbuildids=1">
       <a href="javascript:;">
       <xsl:attribute name="onclick">javascript:buildinfo_click(<xsl:value-of select="buildid"/>)</xsl:attribute>
-      <img src="images/Info.png" alt="info" border="0"></img>
+      <img src="images/Info.png" alt="info" class="icon"></img>
       </a>
       </xsl:if>
 
@@ -198,7 +203,7 @@
       <xsl:if test="expected=1">
       <a>
       <xsl:attribute name="href">javascript:expectedinfo_click('<xsl:value-of select="siteid"/>','<xsl:value-of select="buildname"/>','<xsl:value-of select="expecteddivname"/>','<xsl:value-of select="/cdash/dashboard/projectid"/>','<xsl:value-of select="buildtype"/>','<xsl:value-of select="/cdash/dashboard/unixtimestamp"/>')</xsl:attribute>
-      <img src="images/Info.png" border="0" alt="info"></img>
+      <img src="images/Info.png" alt="info" class="icon"></img>
       </a>
       </xsl:if>
 
@@ -207,7 +212,7 @@
       <a name="Build Notes" class="jTip">
       <xsl:attribute name="id">buildnote_<xsl:value-of select="buildid"/></xsl:attribute>
       <xsl:attribute name="href">ajax/buildnote.php?buildid=<xsl:value-of select="buildid"/>&amp;width=350&amp;link=buildSummary.php%3Fbuildid%3D<xsl:value-of select="buildid"/></xsl:attribute>
-      <img src="images/note.png" border="0"></img>
+      <img src="images/note.png" alt="note" class="icon"></img>
       </a>
       </xsl:if>
 
@@ -215,7 +220,7 @@
       <xsl:if test="nerrorlog>0 and countbuildids=1">
       <a class="tooltip">
       <xsl:attribute name="title"><xsl:value-of select="nerrorlog"/> errors in the CDash log</xsl:attribute>
-      <xsl:attribute name="href">viewErrorLog.php?buildid=<xsl:value-of select="buildid"/>&amp;projectid=<xsl:value-of select="/cdash/dashboard/projectid"/>&amp;date=<xsl:value-of select="/cdash/dashboard/date"/></xsl:attribute><img src="images/warningsmall.png" alt="errorlogs" border="0"/></a>
+      <xsl:attribute name="href">viewErrorLog.php?buildid=<xsl:value-of select="buildid"/>&amp;projectid=<xsl:value-of select="/cdash/dashboard/projectid"/>&amp;date=<xsl:value-of select="/cdash/dashboard/date"/></xsl:attribute><img src="images/warningsmall.png" alt="errorlogs" class="icon"/></a>
       </xsl:if>
 
       <!-- If user is admin of the project propose to group this build -->
@@ -223,17 +228,17 @@
         <xsl:if test="string-length(buildid)>0">
         <a>
         <xsl:attribute name="href">javascript:buildgroup_click(<xsl:value-of select="buildid"/>)</xsl:attribute>
-        <img src="images/folder.png" border="0"></img>
+        <img src="images/folder.png" class="icon"></img>
         </a>
         </xsl:if>
         <xsl:if test="string-length(buildid)=0">
         <a>
         <xsl:attribute name="href">javascript:buildnosubmission_click('<xsl:value-of select="siteid"/>','<xsl:value-of select="buildname"/>','<xsl:value-of select="expecteddivname"/>','<xsl:value-of select="buildgroupid"/>','<xsl:value-of select="buildtype"/>')</xsl:attribute>
-        <img src="images/folder.png" border="0"></img>
+        <img src="images/folder.png" class="icon"></img>
         </a>
         </xsl:if>
       </xsl:if> <!-- end admin -->
-
+      </div>
 
 
       <xsl:if test="string-length(buildid)>0 and countbuildids=1">
@@ -271,7 +276,7 @@
         </xsl:choose>
       </xsl:attribute>
         <xsl:if test="countbuildids=1">
-        <xsl:if test="userupdates>0"><img src="images/yellowled.png" alt="star" title="I checked in some code for this build!"/></xsl:if><a>
+        <xsl:if test="userupdates>0"><img src="images/yellowled.png" height="10px" alt="star" title="I checked in some code for this build!"/><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></xsl:if><a>
         <xsl:attribute name="href">viewUpdate.php?buildid=<xsl:value-of select="buildid"/>
         </xsl:attribute>
           <xsl:value-of select="update/files"/>
@@ -280,7 +285,6 @@
         <xsl:if test="countbuildids!=1">
           <xsl:value-of select="update/files"/>
         </xsl:if>
-      <xsl:if test="update/defined=1"><xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text></xsl:if>
       </td>
 
       <td align="right" class="advancedviewitem">
-- 
1.8.4