GNOME.org
 

jhbuild r2243 - in trunk: . buildbot buildbot/public_html jhbuild/buildbot/status/web

Author: fpeters
Date: Fri Aug 15 09:50:46 2008
New Revision: 2243
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2243&view=rev

Log:
* buildbot/template.html, buildbot/public_html/lgo.css,
jhbuild/buildbot/status/web/__init__.py: cleaned up homepage HTML,
removing extra classes and moving stuff to CSS.



Removed:
   trunk/buildbot/public_html/buildbot.css
Modified:
   trunk/ChangeLog
   trunk/buildbot/public_html/lgo.css
   trunk/buildbot/template.html
   trunk/jhbuild/buildbot/status/web/__init__.py

Modified: trunk/buildbot/public_html/lgo.css
==============================================================================
--- trunk/buildbot/public_html/lgo.css	(original)
+++ trunk/buildbot/public_html/lgo.css	Fri Aug 15 09:50:46 2008
@@ -56,32 +56,6 @@
 	font-size: 100%;
 }
 
-ul.i18n,
-ul.toc {
-	padding: 0;
-	padding-left: 20px;
-	margin: 0;
-	margin-right: 10px;
-	list-style: none;
-}
-
-ul.i18n li,
-ul.toc li {
-	margin: 0;
-	margin-left: 1em;
-	padding: 0;
-	list-style: circle;
-}
-
-ul.toc li a {
-	text-decoration: none;
-	color: black;
-}
-
-ul.toc li a:hover {
-	text-decoration: underline;
-}
-
 #general {
 	list-style: none;
 	background: #2E3436 url(general_bg.png) 0 100% repeat-x;
@@ -196,59 +170,6 @@
 	padding-bottom: 8px;
 }
 
-
-
-div.articleinfo h1 {
-	padding-top: 1ex;
-	color: #3f3f3f;
-}
-
-div.articleinfo h3.abstract {
-	font-weight: normal;
-	border: 5px solid #eee;
-	padding: 1ex;
-	-moz-border-radius: 10px;
-	-khtml-border-radius: 10px;
-	font-size: 100%;
-	background: white;
-}
-
-div.articleinfo dd.affiliation {
-	color: #a4a4a4;
-	margin-bottom: 1ex;
-}
-
-div.articleinfo dl {
-	margin-left: 1em;
-}
-
-dl.doc-index {
-	margin-left: 1em;
-}
-
-dl.doc-index p {
-	margin: 0.5ex 0;
-}
-
-dl.doc-index dt {
-	margin-top: 2em;
-}
-
-dl.doc-index dd {
-	margin: 0em 1em 2em 1em;
-}
-
-dl.doc-index dt a {
-	border-bottom: 1px dotted #888;
-	text-decoration: none;
-	font-weight: bold;
-	font-size: 110%;
-}
-
-dl.doc-index dt a:hover {
-	border-bottom: 1px solid transparent;
-}
-
 div.body {
 	background-color: transparent;
 	border: none;
@@ -267,349 +188,50 @@
 	margin: 0 29ex 0 2ex;
 }
 
-h1.title {
-	font-size: 1.72em;
-	margin: 0; padding: 0;
-	color: #3f3f3f;
-}
-
-h1.title a {
-	color: inherit;
-	text-decoration: none;
-}
-
-div#language {
-	position: absolute;
-	right: 2em;
-	top: 6ex;
-}
-
-/* from goran css */
-
-#dev, #usr, #adm {
-	float: left;
-	margin: 20px 3% 0px 3%;
-	width: 42%;
-	padding: 5px;
-}
-
-div.sidebar #dev, div.sidebar #usr, div.sidebar #adm {
-	float: none;
-	width: 90%;
-	font-size: 90%;
-	margin-top: 0;
-}
-
-br.clear {
-	clear: both;
-}
-
-#dev p, #usr p, #adm p {
-	margin: 20px;
-}
-
-#usr h2 a, #usr h2 span,
-#dev h2 a, #dev h2 span,
-#adm h2 a, #adm h2 span {
-	display: block; width: 80%;
-	text-decoration: none;	
-	padding: 10px 20px;
-}
-#usr h2 a, #usr h2 span { color: #ffffff; }
-#dev h2 a, #dev h2 span { color: #2e3436; }
-#adm h2 a, #adm h2 span { color: #ffffff; }
-
-#usr h2, #dev h2, #adm h2 {
-	height: 40px;
-	font-size: 11pt;
-	-moz-border-radius: 10px;
-	-khtml-border-radius: 10px;
-	padding: 0px;
-	background: none;
-}
-
-#usr h2 { background: #729fcf url(user-icon.png) 95% no-repeat; }
-#dev h2 { background: #edd400 url(dev-icon.png) 95% no-repeat; }
-#adm h2 { background: #00b147 url(adm-icon.png) 95% no-repeat; }
-
-#updated h3 { margin-bottom: 15px; }
-
-div.sidebar h4 a {
-	text-decoration: none;
-	margin: 0px;
-}
-div.sidebar p.i18n {
-	margin-top: -15px;
-}
-
-div.sidebar fieldset { 
-	margin-top: 30px;
+a img {
 	border: none;
 }
 
-table#top {
-	margin: 1em auto;
-	clear: both;
-	border: 1px solid #faa;
-	background: #fee;
-	width: 95%;
-}
-
-div.book, div.chapter, div.refentry, div.sect1, div.index {
-	margin: 1em;
-}
-
-.synopsis, .classsynopsis 
-{
-	background: #eee;
-	border: solid 1px #aaa;
-	padding: 0.5em;
-}
-.programlisting 
-{
-	background: #eef;
-	border: solid 1px #aaf;
-	padding: 0.5em;
-}
-.variablelist 
-{
-	padding: 4px;
-	margin-left: 3em;
-}
-.variablelist td:first-child
-{
-	vertical-align: top;
-}
+/* Buildbot stuff */
 
-div.other-languages ul, div.downloads ul {
-	list-style: none;
-	padding: 0 1em;
-	margin: 0;
+table.ProjectSummary tbody th {
+	text-align: left;
 }
 
-div.other-languages ul li, div.downloads ul li {
-	margin: 0;
-	padding: 0;
+table.ProjectSummary thead td {
+	text-align: center;
 }
 
-div.other-languages a, div.downloads a {
-	text-decoration: none;
+table.ProjectSummary tbody td {
+	border: 1px solid #888;
+	padding: 0 3px;
+	text-align: center;
 }
 
-div.other-languages a:hover, div.downloads a:hover {
-	text-decoration: underline;
-}
-
-ul.versions {
-	margin: 0;
-	padding: 0;
-	padding-left: 1em;
-}
-
-ul.versions li {
-	display: inline;
-	margin: 0 0.5ex;
-}
-
-h2.category {
-	background-position: center left;
-	background-repeat: no-repeat;
-	margin-top: 2em;
-	color: #006;
-	min-height: 32px;
-}
-
-h2.cat-accessibility-directory { padding-left: 40px; background-image: url(icons/accessibility-directory.png); }
-h2.cat-gnome-util { padding-left: 40px; background-image: url(icons/gnome-util.png); }
-h2.cat-gnome-joystick { padding-left: 40px; background-image: url(icons/gnome-joystick.png); }
-h2.cat-gnome-graphics { padding-left: 40px; background-image: url(icons/gnome-graphics.png); }
-h2.cat-gnome-globe { padding-left: 40px; background-image: url(icons/gnome-globe.png); }
-h2.cat-gnome-applications { padding-left: 40px; background-image: url(icons/gnome-applications.png); }
-h2.cat-gnome-other { padding-left: 40px; background-image: url(icons/gnome-other.png); }
-h2.cat-gnome-devel { padding-left: 40px; background-image: url(icons/gnome-devel.png); }
-h2.cat-gnome-multimedia { padding-left: 40px; background-image: url(icons/gnome-multimedia.png); }
-h2.cat-gnome-system { padding-left: 40px; background-image: url(icons/gnome-system.png); }
-
-h2.cat-gdp-documentation { padding-left: 40px; background-image: url(icons/gdp-32.png); }
-
-h3.subsection {
-	color: #006;
-	font-style: italic;
-	margin-left: 1ex;
-}
-
-span.lang-code {
-	font-size: 70%;
-	color: #666;
-}
-
-li.active-language {
-	font-weight: bold;
-	margin-bottom: 1ex;
-}
-
-p.no-translation {
-	font-style: italic;
-	color: #888;
-	font-size: 80%;
-}
-
-p.no-translation a {
-	text-decoration: none;
-}
-
-div.subindex {
-	margin: 2em 7em 1em 4em;
-	padding-left: 110px;
-	background-position: top left;
-	background-repeat: no-repeat;
-	min-height: 96px;
-}
-
-div.subindex p {
-	color: #666;
-}
-
-div.subindex h2 {
-	padding: 0;
-	margin: 0;
-}
-
-div.subindex h2 a {
-	text-decoration: inherit;
-	border-bottom: 1px dotted #888;
-}
-
-div.subindex h2 a:hover {
-	border-bottom: 1px solid black;
-}
-
-h1.subindex {
-	padding-left: 110px;
-	background-position: top left;
-	background-repeat: no-repeat;
-	line-height: 96px;
-	min-height: 96px;
-}
-
-#subindex-references { background-image: url(icons/api-96.png); }
-#subindex-guides { background-image: url(icons/guides-96.png); }
-#subindex-tools { background-image: url(icons/tools-96.png); }
-#subindex-gdp { background-image: url(icons/gdp-96.png); }
-
-div#search {
-	position: absolute;
-	text-align: right;
-	right: 1em;
-	top: 5em;
-	font-size: 75%;
-}
-
-form#symlookup {
-	margin: 2em 1em 2em 0em;
-	text-align: right;
-}
-
-input.searchTerms {
-	border: 1px solid #888888;
+table.ProjectSummary tbody td.feed {
+	border: none;
+	padding-right: 2px;
 }
 
-div#search input.searchTerms {
-	margin-right: 1ex;
+td.success {
+	background: #8f8;
 }
 
-input.searchButton {
-	background: white url(search_icon.gif) no-repeat scroll 2px center;
-	cursor: pointer;
-	padding: 1px 1px 1px 15px;
-	text-transform: none;
-	border: 1px solid #888888;
+td.failure {
+	background: #f88;
 }
-
-form#symlookup input.searchTerms {
-	width: 100%;
-	margin-bottom: 1ex;
+td.building {
+	background: #ff8;
 }
-
-p.other-versions {
-	font-size: 80%;
+td.idle {
 	color: #888;
+	background: #f8f8f8;
 }
-
-p.other-versions a {
-	text-decoration: none;
-}
-
-p.upcoming-deprecation {
-	padding: 0.5em 1em 0.5em 60px;
-	min-height: 48px;
-	border: solid 1px #e0e0df;
-	background-color: #fffff0;
-	background-position: 6px 0.5em;
-	background-repeat: no-repeat;
-	background-image: url(/skin/admon-warning.png);
-}
-
-p.canonical-ref {
-	padding: 0.5em 1em 0.5em 60px;
-	min-height: 48px;
-	border: solid 1px #e0e0df;
-	margin-right: 29ex;
-	background-color: #fffff0;
-	background-position: 6px 0.5em;
-	background-repeat: no-repeat;
-	background-image: url(/skin/admon-note.png);
-}
-
-ul.indextoc {
-	margin: 1em 0;
-	padding: 0 0 0 1em;
-	list-style: circle;
-}
-
-ul.indextoc ul {
-	padding: 0 0 0 1em;
+td.offline {
+	color: #000;
+	background: #f88;
 }
 
-ul.indextoc li {
-	font-weight: bold;
-}
-
-ul.indextoc li li {
-	font-weight: normal;
-}
-
-ul.indextoc ul {
-	margin-bottom: 1ex;
-}
-ul.indextoc a {
-	border-bottom: 1px dotted #888;
-	text-decoration: none;
-}
-
-div.downloads h4 {
-	min-height: 24px;
-	line-height: 24px;
-	background: transparent url(gnome-mime-application-x-archive.png) top left no-repeat;
-	padding-left: 26px;
-}
-
-div.downloads p.devhelp-note {
-	font-size: 80%;
-}
-
-div.downloads p.devhelp-note {
-	font-size: 80%;
-	color: #444;
-}
-
-span.module-more {
-	font-size: 75%;
-}
-
-dl.doc-index dt span.module-more a {
-	font-weight: normal;
-}
 
 /* From classic */
 td.Change, td.Time, td.Event {

Modified: trunk/buildbot/template.html
==============================================================================
--- trunk/buildbot/template.html	(original)
+++ trunk/buildbot/template.html	Fri Aug 15 09:50:46 2008
@@ -5,52 +5,8 @@
   <link rel="stylesheet" type="text/css" href="/lgo.css">
   <link rel="icon" type="image/png" href="/gnome-16.png">
   <link rel="SHORTCUT ICON" type="image/png" href="/gnome-16.png">
-
-<!--[if IE]>
-<style>
-div.body-sidebar { width: 100%; }
-</style>
-<![endif]-->
-
-<style type="text/css">
-table.ProjectSummary tbody th {
-	text-align: left;
-}
-td.success {
-	background: #8f8;
-}
-td.failure {
-	background: #f88;
-}
-td.building {
-	background: #ff8;
-}
-td.idle {
-	color: #888;
-	background: #f8f8f8;
-}
-td.offline {
-	color: #000;
-	background: #f88;
-}
-table.ProjectSummary tbody td {
-	border: 1px solid #888;
-	padding: 0 3px;
-}
-table.ProjectSummary tbody td.RSS {
-	border: none;
-	padding-right: 2px;
-}
-table.ProjectSummary tbody td.Atom {
-	border: none;
-	padding-right: 2px;
-}
-a img {
-	border: none;
-}
-</style>
-
-</head><body class="with-star">
+</head>
+<body class="with-star">
 <div id="page">
 <ul id="general">
 <li id="siteaction-gnome_home" class="home"><a href="http://www.gnome.org/";>Home</a></li>
@@ -71,13 +27,12 @@
     <li id="portaltab-2"><a href="http://live.gnome.org/BuildBrigade";><span>About</span></a></li>
   </ul>
  </div>
-
 </div>
 </div>
-<div class="body body-sidebar">
+<div class="body">
 
 @@GNOME_BUILDBOT_BODY@@
 
-</tbody>
-</table>
-</div></body></html>
+</div> <!-- end of .body -->
+</body>
+</html>

Modified: trunk/jhbuild/buildbot/status/web/__init__.py
==============================================================================
--- trunk/jhbuild/buildbot/status/web/__init__.py	(original)
+++ trunk/jhbuild/buildbot/status/web/__init__.py	Fri Aug 15 09:50:46 2008
@@ -48,30 +48,30 @@
         status = self.getStatus(request)
 
         result = ''
-        result += '<table class="ProjectSummary" border="0">\n'
+        result += '<table class="ProjectSummary">\n'
 
         # Headers
-        result += '<thead><tr><td class="empty">&nbsp;</td><td class="empty">&nbsp;</td><th>'+parent.moduleset+'</td>'
+        result += '<thead><tr><td>&nbsp;</td><td>&nbsp;</td><th>' + parent.moduleset + '</td>'
         for name in parent.slaves:
-                if len(name) > 25:
-                    name = name[:25] + "(...)"
-                result += '<td colspan="2" class="LeftBorder TopBorder header" align="center"><b>' + name + '</b></td>\n'
+            if len(name) > 25:
+                name = name[:25] + "(...)"
+            result += '<th colspan="2">' + name + '</th>\n'
         result += '</tr>\n'
-        result += '<tr><th></th><th></th><th><b>Project</b></td>\n'
+        result += '<tr><th></th><th></th><th>Project</td>\n'
         for i in range(len(parent.slaves)):
-                result += '<td class="BottomBorder LeftBorder header" align="center">Last-Build</td>\n'
-                result += '<td class="BottomBorder header" align="center">State</td>\n'
+            result += '<td>Last-Build</td>\n'
+            result += '<td>State</td>\n'
         result += '</tr></thead>\n'
 
         # Contents
 	result += '<tbody>'
         for module in parent.modules:
             result += '<tr>'
-            result += '<td class="Atom" align="center"><a href="'+module+'/atom">'
-            result += '<image src="/feed-atom.png" border="0" alt="Atom"></a></td>'
-            result += '<td class="RSS" align="center"><a href="'+module+'/rss">'
-            result += '<image src="/feed.png" border="0" alt="RSS"></a></td>\n'
-            result += '<th class="BottomBorder LeftBorder ProjectSummaryBuilder"><a href="'+module+'">'+module+'</a></td>'
+            result += '<td class="feed"><a href="%s/atom">' % module
+            result += '<img src="/feed-atom.png" alt="Atom"></a></td>'
+            result += '<td class="feed"><a href="%s/rss">' % module
+            result += '<img src="/feed.png" alt="RSS"></a></td>\n'
+            result += '<th><a href="%s">%s</a></td>' % (module, module)
 
             for slave in parent.slaves:
                 builder = status.getBuilder("%s-%s" % (module, slave))
@@ -84,9 +84,9 @@
                     class_ = build_get_class(builder.getLastFinishedBuild())
                 else:
                     class_ = ''
-                result += '<td align="center" class="BottomBorder LeftBorder '+class_+'">'+lastbuild+'</td>'
+                result += '<td class="%s">%s</td>' % (class_, lastbuild)
                 state, builds = builder.getState()
-                result += '<td align="center" class="BottomBorder '+state+'">'+state+'</td>'
+                result += '<td class="%s">%s</td>' % (state, state)
             result += '</tr>\n'
 	result += '</tbody>'
         result += '</table>'
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]