Additions to show repo namegentoobrowse-1.1.0

4 files changed, 37 insertions, 21 deletions

diff --git a/gentoobrowse/css/general.css b/gentoobrowse/css/general.css
index ac64f9b..35a46c7 100644
--- a/gentoobrowse/css/general.css
+++ b/gentoobrowse/css/general.css
@@ -1070,3 +1070,13 @@ form.bs-docs-example {
 form#search input[type=search] {
 	width: 516px;
 }
+
+.ebuild-minor {
+  font-size: 11px;
+  font-weight: lighter;
+}
+
+.repo {
+  font-size: 9px;
+  font-weight: lighter;
+}
diff --git a/gentoobrowse/views/package.xml b/gentoobrowse/views/package.xml
index d063177..f4f6048 100644
--- a/gentoobrowse/views/package.xml
+++ b/gentoobrowse/views/package.xml
@@ -33,10 +33,11 @@
 	</project2:sqlrows>
 	<project2:sqlrows name="versions" datasource="postgres-web">
 		<sql>
-			SELECT e.ebuildid, e.version, e.moddate, e.slot, e.license
-			FROM ebuilds e
+			SELECT e.ebuildid, e.version, e.moddate, e.slot, e.license, r.name AS reponame
+			FROM ebuilds e, repos r
+			WHERE e.repoid = r.repoid
 			<filter name="pkg">
-				WHERE e.packageid = <param name="pkgid" />
+				AND e.packageid = <param name="pkgid" />
 			</filter>
 			ORDER BY versioninst desc
 		</sql>
@@ -157,12 +158,13 @@
 	</project2:sqlrows>
 	<project2:sqlrows name="changeLog" datasource="postgres-web">
 		<sql>
-			SELECT date, person, email, comment
-			FROM package_changelogs
+			SELECT date, person, email, comment, r.name AS reponame
+			FROM package_changelogs c, repos r
+			WHERE c.repoid = r.repoid
 			<filter name="pkg">
-				WHERE packageid = <param name="pkgid" />
+				AND packageid = <param name="pkgid" />
 			</filter>
-			ORDER BY date DESC, n DESC
+			ORDER BY date DESC, n DESC, c.repoid
 		</sql>
 	</project2:sqlrows>
 </block>
diff --git a/gentoobrowse/xslt/home.xslt b/gentoobrowse/xslt/home.xslt
index 0e138db..4d85870 100644
--- a/gentoobrowse/xslt/home.xslt
+++ b/gentoobrowse/xslt/home.xslt
@@ -8,7 +8,7 @@
 		<meta name="google-site-verification" content="f2uqzTiSxj7gbzzRzf4nOCB3WfQuWV9Knfjb9ju69jU" />
 		<meta name="description" content="List of newest released package ebuilds for Gentoo Linux" />
   </xsl:template>
-  
+
 	<xsl:template name="header">
 		<h1>Newest ebuilds</h1>
 		<p class="lead">
@@ -20,7 +20,7 @@
 	<xsl:template name="content">
 		<xsl:apply-templates select="/gentoo/newebuilds" />
   </xsl:template>
-  
+
 	<xsl:template match="/gentoo/newebuilds">
 		<div class="span3 bs-docs-sidebar">
 			<ul class="nav nav-list bs-docs-sidenav">
diff --git a/gentoobrowse/xslt/package.xslt b/gentoobrowse/xslt/package.xslt
index 94d67bb..09155d7 100644
--- a/gentoobrowse/xslt/package.xslt
+++ b/gentoobrowse/xslt/package.xslt
@@ -22,10 +22,10 @@
 				<xsl:value-of select="/gentoo/package/catname" />
 			</a>
 			/
-			<xsl:value-of select="/gentoo/package/pkgname" />		
+			<xsl:value-of select="/gentoo/package/pkgname" />
 		</h1>
 		<p class="lead">
-			<xsl:value-of select="/gentoo/package/description" />		
+			<xsl:value-of select="/gentoo/package/description" />
 			<xsl:if test="/gentoo/package/herd != 'no-herd' and /gentoo/package/herd != ''">
 				<small><xsl:text> </xsl:text>(<a>
 					<xsl:attribute name="href">/herd/<xsl:value-of select="/gentoo/package/herd" /></xsl:attribute>
@@ -35,7 +35,7 @@
 		</p>
 		<xsl:apply-templates select="/gentoo/package/urls" />
   </xsl:template>
-	
+
   <xsl:template name="content">
 		<div class="span3 bs-docs-sidebar">
 			<ul class="nav nav-list bs-docs-sidenav">
@@ -123,7 +123,7 @@
 					</img>
 				</xsl:if>
 				<p>
-					<xsl:value-of select="/gentoo/package/summary" />		
+					<xsl:value-of select="/gentoo/package/summary" />
 				</p>
 			</section>
 		</xsl:if>
@@ -175,13 +175,18 @@
 			<xsl:for-each select="version">
 				<p class="lead">
 					v<xsl:value-of select="version" />
+					<span class="ebuild-minor">
+					:: <xsl:value-of select="slot" />
+					:: <xsl:value-of select="reponame" />
+					</span>
 					<xsl:if test="../../maskstatus/mask[ebuildid=current()/ebuildid]">
-						<a class="text-warning" href="#masks">
-							<small>(Masked by set
-							<xsl:for-each select="../../maskstatus/mask[ebuildid=current()/ebuildid]">
-								<xsl:value-of select="setno" />
-							</xsl:for-each>)</small>
-						</a>
+						<small>
+							(<a class="text-warning" href="#masks">Masked by set
+								<xsl:for-each select="../../maskstatus/mask[ebuildid=current()/ebuildid]">
+									<xsl:value-of select="setno" />
+								</xsl:for-each>
+							</a>)
+						</small>
 					</xsl:if>
 				</p>
 				<dl class="dl-horizontal">
@@ -196,8 +201,6 @@
 							<xsl:value-of select="moddate/@time" />
 						</time>
 					</dd>
-					<dt>Slot</dt>
-					<dd><xsl:value-of select="slot" /></dd>
 					<xsl:if test="license"><xsl:text> </xsl:text>
 						<dt>License</dt>
 						<dd><xsl:value-of select="license" /></dd>
@@ -269,6 +272,7 @@
 								</xsl:attribute>
 								<xsl:value-of select="person" />
 							</a>
+							<span class="repo"> &#183; <xsl:value-of select="reponame" /></span>
 							<br />
 							<xsl:value-of select="comment" />
 						</dd>