Homepage|Build Repository: Updated Build Repository; more semantic ma…

…rkup, styling
skyjake · Jul 13, 2013 · c582230 · c582230
1 parent bb683f0
commit c582230
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 73 deletions.
diff --git a/web/plugins/buildrepository/buildevent.class.php b/web/plugins/buildrepository/buildevent.class.php
@@ -246,7 +246,7 @@ public function genFancyBadge($isActive=TRUE)
 
         $html .= "<div class=\"{$cssClass}\">"
                 . ($this->uniqueId > 0? htmlspecialchars($this->uniqueId) : '&nbsp;')
-                ."<span class=\"startdate\">". htmlspecialchars(date('d M Y', $this->startDate)) .'</span></div>';
+                ."<span class=\"startdate\">". htmlspecialchars(date('F j, Y', $this->startDate)) .'</span></div>';
 
         //if($isActive && $this->uniqueId > 0)
         {

diff --git a/web/plugins/buildrepository/buildrepository.php b/web/plugins/buildrepository/buildrepository.php
@@ -399,48 +399,45 @@ private function populateStaticPackages(&$packages)
          * expect to edit this file in order to change these...
          */
 
-        if(0) /// @todo Enable once the 1.9.10-1 (stable) build event drops out the feed.
-        {
-            $pack = PackageFactory::newDistribution(PID_WIN_X86, 'Doomsday', Version::fromString('1.9.10'),
-                                                    'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1.exe/download',
-                                                    NULL/*no fallback download uri*/,
-                                                    false/*not an autobuilder packaged*/);
-            $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
-            $pack->setReleaseDate(strtotime('January 6, 2013'));
-            $packages[] = $pack;
-
-            $pack = PackageFactory::newDistribution(PID_MAC10_4_X86_PPC, 'Doomsday', Version::fromString('1.9.10'),
-                                                    'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1.dmg/download',
-                                                    NULL/*no fallback download uri*/,
-                                                    false/*not an autobuilder packaged*/);
-            $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
-            $pack->setReleaseDate(strtotime('January 6, 2013'));
-            $packages[] = $pack;
-
-            $pack = PackageFactory::newDistribution(PID_MAC10_6_X86_X86_64, 'Doomsday', Version::fromString('1.9.10'),
-                                                    'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1_64bit.dmg/download',
-                                                    NULL/*no fallback download uri*/,
-                                                    false/*not an autobuilder packaged*/);
-            $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
-            $pack->setReleaseDate(strtotime('January 6, 2013'));
-            $packages[] = $pack;
-
-            $pack = PackageFactory::newDistribution(PID_LINUX_X86, 'Doomsday', Version::fromString('1.9.10'),
-                                                    'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1_i386.deb/download',
-                                                    NULL/*no fallback download uri*/,
-                                                    false/*not an autobuilder packaged*/);
-            $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
-            $pack->setReleaseDate(strtotime('January 6, 2013'));
-            $packages[] = $pack;
-
-            $pack = PackageFactory::newDistribution(PID_LINUX_X86_64, 'Doomsday', Version::fromString('1.9.10'),
-                                                    'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1_amd64.deb/download',
-                                                    NULL/*no fallback download uri*/,
-                                                    false/*not an autobuilder packaged*/);
-            $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
-            $pack->setReleaseDate(strtotime('January 6, 2013'));
-            $packages[] = $pack;
-        }
+        $pack = PackageFactory::newDistribution(PID_WIN_X86, 'Doomsday', Version::fromString('1.9.10'),
+                                                'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1.exe/download',
+                                                NULL/*no fallback download uri*/,
+                                                false/*not an autobuilder packaged*/);
+        $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
+        $pack->setReleaseDate(strtotime('January 6, 2013'));
+        $packages[] = $pack;
+
+        $pack = PackageFactory::newDistribution(PID_MAC10_4_X86_PPC, 'Doomsday', Version::fromString('1.9.10'),
+                                                'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1.dmg/download',
+                                                NULL/*no fallback download uri*/,
+                                                false/*not an autobuilder packaged*/);
+        $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
+        $pack->setReleaseDate(strtotime('January 6, 2013'));
+        $packages[] = $pack;
+
+        $pack = PackageFactory::newDistribution(PID_MAC10_6_X86_X86_64, 'Doomsday', Version::fromString('1.9.10'),
+                                                'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1_64bit.dmg/download',
+                                                NULL/*no fallback download uri*/,
+                                                false/*not an autobuilder packaged*/);
+        $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
+        $pack->setReleaseDate(strtotime('January 6, 2013'));
+        $packages[] = $pack;
+
+        $pack = PackageFactory::newDistribution(PID_LINUX_X86, 'Doomsday', Version::fromString('1.9.10'),
+                                                'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1_i386.deb/download',
+                                                NULL/*no fallback download uri*/,
+                                                false/*not an autobuilder packaged*/);
+        $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
+        $pack->setReleaseDate(strtotime('January 6, 2013'));
+        $packages[] = $pack;
+
+        $pack = PackageFactory::newDistribution(PID_LINUX_X86_64, 'Doomsday', Version::fromString('1.9.10'),
+                                                'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.9.10/deng-inst-1.9.10-1_amd64.deb/download',
+                                                NULL/*no fallback download uri*/,
+                                                false/*not an autobuilder packaged*/);
+        $pack->setReleaseNotesUri('http://dengine.net/dew/index.php?title=Doomsday_version_1.9.10-1');
+        $pack->setReleaseDate(strtotime('January 6, 2013'));
+        $packages[] = $pack;
 
         $pack = PackageFactory::newDistribution(PID_WIN_X86, 'Doomsday', Version::fromString('1.8.6'),
                                                 'http://sourceforge.net/projects/deng/files/Doomsday%20Engine/1.8.6/deng-inst-1.8.6.exe/download',
@@ -1006,11 +1003,11 @@ private function outputPackageRedirect(&$pack)
 ?><meta http-equiv="REFRESH" content="2;url=<?php echo $downloadUri; ?>"><?php
 
         // Generate page content.
-?><div id="builds"><?php
+?><div id="contentbox"><?php
 
-?><p>Redirecting to the download for <em><?php echo htmlspecialchars($pack->composeFullTitle()); ?></em>. Your package should begin to download automatically within a few seconds, if not please use this <a href="<?php echo $downloadUri; ?>" title="<?php echo htmlspecialchars('Download '. $pack->composeFullTitle()); ?>">direct link</a> instead.</p><?php
+?><div class="block"><section class="overview"><p>Redirecting to the download for <em><?php echo htmlspecialchars($pack->composeFullTitle()); ?></em>. Your package should begin to download automatically within a few seconds, if not please use this <a href="<?php echo $downloadUri; ?>" title="<?php echo htmlspecialchars('Download '. $pack->composeFullTitle()); ?>">direct link</a> instead.</p></section></div><?php
 
-?><p>Not what you wanted? Here are some alternatives:</p><?php
+?><div class="block"><article><header><h1>Not what you wanted?</h1><p>Here are some alternatives</p></header><?php
 
         // Alternative packages:
 ?><div class="centered"><?php
@@ -1031,7 +1028,7 @@ private function outputPackageRedirect(&$pack)
         includeHTML('alternativepages', self::$name);
 
         // End of page content.
-?></div><?php
+?></article></div></div><?php
 
         $fc->endPage();
     }
@@ -1247,7 +1244,7 @@ private function outputBuildCommitLog(&$build)
 
         if(count($build->commits))
         {
-?><div id="buildcommits"><a name="commitindex"></a><h3><?php echo count($build->commits); ?> Commits</h3>
+?><section><h1><?php echo count($build->commits); ?> Commits</h1></section>
 <script type="text/javascript">
 jQuery(document).ready(function() {
   jQuery(".commit").hide();
@@ -1259,8 +1256,6 @@ private function outputBuildCommitLog(&$build)
 </script><?php
 
                 outputCommitLog($build);
-
-?></div><?php
         }
     }
 
@@ -1274,7 +1269,7 @@ private function outputEventDetail(&$event)
     {
         if(!$event instanceof BuildEvent) throw new Exception('outputEventDetail: Invalid build argument, BuildEvent expected');
 
-?><div class="buildevent"><?php
+?><div class="block"><div class="buildevent"><?php
 
         // Display an overview of the event.
 ?><div id="buildoverview"><?php
@@ -1287,6 +1282,10 @@ private function outputEventDetail(&$event)
         // Display a stream navigation widget.
         $this->outputBuildStreamNavigation($event);
 
+?></div></div><?php
+
+?><div id="commitindex" class="block"><?php
+
         // Display the full commit log.
         $this->outputBuildCommitLog($event);
 
@@ -1537,24 +1536,7 @@ private function includeEventMatrix()
      */
     private function outputEventIndex()
     {
-?><div class="buildevents_outer"><table><thead><tr><th></th><th><?php
-
-?>Version<?php
-
-?></th></tr></thead><?php
-
-?><tbody><tr><td><?php
-
-        // Output stream info
-        includeHTML('streaminfo', self::$name);
-
-?></td><td><?php
-
-        $this->includeEventMatrix();
-
-?></td></tr></tbody></table></div><?php
-
-?><div class="buildsoverview"><span id="roadmap_badge"><a href="dew/index.php?title=Roadmap" title="Read the Roadmap at the Wiki">Roadmap</a></span><?php
+?><div class="block"><section class="overview"><?php
 
         // Output an overview of the build system.
         includeHTML('overview', self::$name);
@@ -1572,7 +1554,25 @@ private function outputEventIndex()
                                  TRUE/*unstable filter*/, TRUE/*only downloadables*/,
                                  -1/*no result limit*/, $packageListTitle);
 
-?></div><?php
+?></section></div><?php
+
+?><div class="buildevents_outer"><table><thead><tr><th></th><th><?php
+
+?>Version<?php
+
+?></th><th><a href="dew/index.php?title=Roadmap" title="Read the Roadmap at the Wiki">Roadmap</a></th></tr></thead><?php
+
+?><tbody><tr><td><?php
+
+        // Output stream info
+        includeHTML('streaminfo', self::$name);
+
+?></td><td><?php
+
+        $this->includeEventMatrix();
+
+?></td></tr></tbody></table></div><?php
+
     }
 
     /**
@@ -1605,7 +1605,7 @@ public function execute($args=NULL)
         $fc->outputHeader($pageTitle);
         $fc->beginPage($pageTitle);
 
-?><div id="builds"><?php
+?><div id="contentbox"><?php
 
         if($build instanceof BuildEvent)
         {

diff --git a/web/plugins/buildrepository/commitutils.php b/web/plugins/buildrepository/commitutils.php
@@ -167,7 +167,7 @@ function outputCommitJumpList2(&$groups)
         $commitCount = count($group);
         $tagLinkTitle = "Jump to commits tagged '$groupName'";
 
-?><li><span class="commit-count"><?php echo htmlspecialchars($commitCount); ?></span><a href="#<?php echo $groupName; ?>" title="<?php echo htmlspecialchars($tagLinkTitle); ?>"><?php echo htmlspecialchars($groupName); ?></a></li><?php
+?><li><label title="Number of commits with this tag"><span class="commit-count"><?php echo htmlspecialchars($commitCount); ?></span></label><a href="#<?php echo $groupName; ?>" title="<?php echo htmlspecialchars($tagLinkTitle); ?>"><?php echo htmlspecialchars($groupName); ?></a></li><?php
     }
 ?></ol><?php
 }

diff --git a/web/plugins/buildrepository/html/alternativepages.html b/web/plugins/buildrepository/html/alternativepages.html
@@ -1 +1 @@
-<p>Can't see what you're looking for? You might try the <a href="builds" title="Automated build repository">build repository</a>, or navigate to our <a href="/" title="View the homepage">homepage</a> and start your quest over.</p>
+<p>Can't see what you're looking for? You might try the <a href="builds" title="Automated build repository">build repository</a>, or navigate to the <a href="/" title="View the dengine.net front page">front page</a> and start your quest over.</p>