From 21ba20caa3ef0d166d893bc18146621e54581cd8 Mon Sep 17 00:00:00 2001 From: Steffen Wilberg Date: Fri, 2 Jul 2010 16:56:09 -0400 Subject: [PATCH] Bug 538813. Make about:cache and about:cache-entry pretty. r=bzbarsky --- netwerk/cache/nsDiskCacheDevice.cpp | 9 +- netwerk/cache/nsDiskCacheDeviceSQL.cpp | 9 +- netwerk/cache/nsMemoryCacheDevice.cpp | 9 +- netwerk/protocol/about/nsAboutCache.cpp | 140 ++++++++++++------ netwerk/protocol/about/nsAboutCacheEntry.cpp | 100 ++++++++----- toolkit/themes/pinstripe/global/jar.mn | 2 + .../themes/winstripe/global/aboutCache.css | 92 ++++++++++++ .../winstripe/global/aboutCacheEntry.css | 61 ++++++++ toolkit/themes/winstripe/global/jar.mn | 4 + 9 files changed, 331 insertions(+), 95 deletions(-) create mode 100644 toolkit/themes/winstripe/global/aboutCache.css create mode 100644 toolkit/themes/winstripe/global/aboutCacheEntry.css diff --git a/netwerk/cache/nsDiskCacheDevice.cpp b/netwerk/cache/nsDiskCacheDevice.cpp index c1015cd3c62d..84cd7e7def6f 100644 --- a/netwerk/cache/nsDiskCacheDevice.cpp +++ b/netwerk/cache/nsDiskCacheDevice.cpp @@ -190,7 +190,9 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) NS_ENSURE_ARG_POINTER(usageReport); nsCString buffer; - buffer.AssignLiteral("\n\nCache Directory:\n "); + buffer.AssignLiteral(" \n" + " Cache Directory:\n" + " "); nsCOMPtr cacheDir; nsAutoString path; mDevice->getCacheDirectory(getter_AddRefs(cacheDir)); @@ -200,8 +202,9 @@ NS_IMETHODIMP nsDiskCacheDeviceInfo::GetUsageReport(char ** usageReport) } else { buffer.AppendLiteral("directory unavailable"); } - buffer.AppendLiteral("\n\n"); - // buffer.Append("Files: XXX"); + buffer.AppendLiteral("\n" + " \n"); + *usageReport = ToNewCString(buffer); if (!*usageReport) return NS_ERROR_OUT_OF_MEMORY; diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.cpp b/netwerk/cache/nsDiskCacheDeviceSQL.cpp index 2dc2f6f7104a..e5a04763d572 100644 --- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp +++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp @@ -278,8 +278,9 @@ NS_IMETHODIMP nsOfflineCacheDeviceInfo::GetUsageReport(char ** usageReport) { nsCAutoString buffer; - buffer.AppendLiteral("\n\nCache Directory:\n "); - + buffer.AssignLiteral(" \n" + " Cache Directory:\n" + " "); nsILocalFile *cacheDir = mDevice->CacheDirectory(); if (!cacheDir) return NS_OK; @@ -290,7 +291,9 @@ nsOfflineCacheDeviceInfo::GetUsageReport(char ** usageReport) AppendUTF16toUTF8(path, buffer); else buffer.AppendLiteral("directory unavailable"); - buffer.AppendLiteral("\n\n"); + + buffer.AppendLiteral("\n" + " \n"); *usageReport = ToNewCString(buffer); if (!*usageReport) diff --git a/netwerk/cache/nsMemoryCacheDevice.cpp b/netwerk/cache/nsMemoryCacheDevice.cpp index 8efcc4ec9e81..0a16fe71367f 100644 --- a/netwerk/cache/nsMemoryCacheDevice.cpp +++ b/netwerk/cache/nsMemoryCacheDevice.cpp @@ -537,10 +537,13 @@ nsMemoryCacheDeviceInfo::GetUsageReport(char ** result) NS_ENSURE_ARG_POINTER(result); nsCString buffer; - buffer.AssignLiteral("\n\nInactive storage:\n "); + buffer.AssignLiteral(" \n" + " Inactive storage:\n" + " "); buffer.AppendInt(mDevice->mInactiveSize / 1024); - buffer.AppendLiteral(" KiB\n\n"); - + buffer.AppendLiteral(" KiB\n" + " \n"); + *result = ToNewCString(buffer); if (!*result) return NS_ERROR_OUT_OF_MEMORY; return NS_OK; diff --git a/netwerk/protocol/about/nsAboutCache.cpp b/netwerk/protocol/about/nsAboutCache.cpp index 1790c0939155..6eafda4364ac 100644 --- a/netwerk/protocol/about/nsAboutCache.cpp +++ b/netwerk/protocol/about/nsAboutCache.cpp @@ -20,9 +20,10 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alexey Chernyak (XHTML 1.1 conversion) * Henrik Gemal * Darin Fisher + * Alexey Chernyak (XHTML 1.1 conversion) + * Steffen Wilberg (new layout) * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -96,12 +97,17 @@ nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result) if (NS_FAILED(rv)) return rv; mBuffer.AssignLiteral( - "\n" - "\n" - "\n" - "\nInformation about the Cache Service\n\n" - "\n
\n"); + "\n" + "\n" + "\n" + " Information about the Cache Service\n" + " \n" + " \n" + "\n" + "\n" + "

Information about the Cache Service

\n"); outputStream->Write(mBuffer.get(), mBuffer.Length(), &bytesWritten); @@ -109,6 +115,12 @@ nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result) if (NS_FAILED(rv)) return rv; mStream = outputStream; + + // nsCacheService::VisitEntries calls nsMemoryCacheDevice::Visit, + // nsDiskCacheDevice::Visit and nsOfflineCacheDevice::Visit, + // each of which call + // 1. VisitDevice (for about:cache), + // 2. VisitEntry in a loop (for about:cache?device=disk etc.) rv = cacheService->VisitEntries(this); mBuffer.Truncate(); if (rv == NS_ERROR_NOT_AVAILABLE) { @@ -119,11 +131,12 @@ nsAboutCache::NewChannel(nsIURI *aURI, nsIChannel **result) } if (!mDeviceID.IsEmpty()) { - mBuffer.AppendLiteral("\n"); + mBuffer.AppendLiteral("\n"); } - mBuffer.AppendLiteral("
\n\n\n"); + mBuffer.AppendLiteral("\n" + "\n"); outputStream->Write(mBuffer.get(), mBuffer.Length(), &bytesWritten); - + nsCOMPtr inStr; rv = storageStream->NewInputStream(0, getter_AddRefs(inStr)); @@ -151,7 +164,7 @@ nsAboutCache::VisitDevice(const char *deviceID, nsICacheDeviceInfo *deviceInfo, PRBool *visitEntries) { - PRUint32 bytesWritten, value; + PRUint32 bytesWritten, value, entryCount; nsXPIDLCString str; *visitEntries = PR_FALSE; @@ -167,44 +180,79 @@ nsAboutCache::VisitDevice(const char *deviceID, mBuffer.AssignLiteral("

"); mBuffer.Append(str); - mBuffer.AppendLiteral("

\n
\n" - "\n"); + mBuffer.AppendLiteral("\n" + "
\n"); // Write out cache info + // Number of entries + mBuffer.AppendLiteral(" \n" + " \n" + " \n" + " \n"); - mBuffer.AppendLiteral("\n\n\n"); - value = 0; - deviceInfo->GetEntryCount(&value); - mBuffer.AppendLiteral("\n\n" - "\n\n\n"); + // Maximum storage size + mBuffer.AppendLiteral(" \n" + " \n" + " \n\n" - "\n\n\n" - "\n" + " \n"); + + // Storage in use + mBuffer.AppendLiteral(" \n" + " \n" + " \n\n"); + mBuffer.AppendLiteral(" KiB\n" + " \n"); deviceInfo->GetUsageReport(getter_Copies(str)); mBuffer.Append(str); - mBuffer.AppendLiteral("
Number of entries:"); + entryCount = 0; + deviceInfo->GetEntryCount(&entryCount); + mBuffer.AppendInt(entryCount); + mBuffer.AppendLiteral("
Number of entries:"); - mBuffer.AppendInt(value); - mBuffer.AppendLiteral("
Maximum storage size:
Maximum storage size:"); value = 0; deviceInfo->GetMaximumSize(&value); - mBuffer.AppendLiteral(""); mBuffer.AppendInt(value/1024); - mBuffer.AppendLiteral(" KiB
Storage in use:"); + mBuffer.AppendLiteral(" KiB
Storage in use:"); value = 0; deviceInfo->GetTotalSize(&value); mBuffer.AppendInt(value/1024); - mBuffer.AppendLiteral(" KiB
\n\n
"); - if (mDeviceID.IsEmpty()) { - mBuffer.AppendLiteral("\nList Cache Entries\n" - "
\n"); - } else { - *visitEntries = PR_TRUE; - mBuffer.AppendLiteral("
\n
\n");
+        if (mDeviceID.IsEmpty()) { // The about:cache case
+            if (entryCount != 0) { // Add the "List Cache Entries" link
+                mBuffer.AppendLiteral("  \n"
+                                      "    List Cache Entries\n"
+                                      "  \n");
+            }
+            mBuffer.AppendLiteral("\n");
+        } else { // The about:cache?device=disk etc. case
+            mBuffer.AppendLiteral("\n");
+            if (entryCount != 0) {
+                *visitEntries = PR_TRUE;
+                mBuffer.AppendLiteral("
\n"
+                                      "\n"
+                                      "  \n"
+                                      "   \n"
+                                      "   \n"
+                                      "   \n"
+                                      "   \n"
+                                      "   \n"
+                                      "  \n"
+                                      "  \n"
+                                      "    \n"
+                                      "      \n"
+                                      "      \n"
+                                      "      \n"
+                                      "      \n"
+                                      "      \n"
+                                      "    \n"
+                                      "  \n");
+            }
         }
-        
+
         mStream->Write(mBuffer.get(), mBuffer.Length(), &bytesWritten);
     }
 
@@ -246,45 +294,46 @@ nsAboutCache::VisitEntry(const char *deviceID,
     url += escapedKey; // key
 
     // Entry start...
+    mBuffer.AssignLiteral("  \n");
 
     // URI
-    mBuffer.AssignLiteral("           Key:");
     mBuffer.Append(escapedKey);
     nsMemory::Free(escapedKey);
-    mBuffer.AppendLiteral("");
+    mBuffer.AppendLiteral("\n");
 
     // Content length
     PRUint32 length = 0;
     entryInfo->GetDataSize(&length);
-
-    mBuffer.AppendLiteral("\n     Data size: ");
+    mBuffer.AppendLiteral("    \n");
 
     // Number of accesses
     PRInt32 fetchCount = 0;
     entryInfo->GetFetchCount(&fetchCount);
-
-    mBuffer.AppendLiteral("\n   Fetch count: ");
+    mBuffer.AppendLiteral("    \n");
 
     // vars for reporting time
     char buf[255];
     PRUint32 t;
 
     // Last modified time
-    mBuffer.AppendLiteral("\n Last modified: ");
+    mBuffer.AppendLiteral("    \n");
 
     // Expires time
-    mBuffer.AppendLiteral("\n       Expires: ");
+    mBuffer.AppendLiteral("    \n");
 
     // Entry is done...
-    mBuffer.AppendLiteral("\n\n");
+    mBuffer.AppendLiteral("  \n");
 
     mStream->Write(mBuffer.get(), mBuffer.Length(), &bytesWritten);
 
diff --git a/netwerk/protocol/about/nsAboutCacheEntry.cpp b/netwerk/protocol/about/nsAboutCacheEntry.cpp
index 16f7ed4af698..216310c58419 100644
--- a/netwerk/protocol/about/nsAboutCacheEntry.cpp
+++ b/netwerk/protocol/about/nsAboutCacheEntry.cpp
@@ -22,6 +22,7 @@
  * Contributor(s):
  *   Darin Fisher  (original author)
  *   Alexey Chernyak  (XHTML 1.1 conversion)
+ *   Steffen Wilberg  (new layout)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -125,7 +126,7 @@ nsAboutCacheEntry::NewChannel(nsIURI *uri, nsIChannel **result)
     if (NS_FAILED(rv)) return rv;
 
     return NS_NewInputStreamChannel(result, uri, stream,
-                                    NS_LITERAL_CSTRING("application/xhtml+xml"),
+                                    NS_LITERAL_CSTRING("text/html"),
                                     NS_LITERAL_CSTRING("utf-8"));
 }
 
@@ -159,14 +160,17 @@ nsAboutCacheEntry::GetContentStream(nsIURI *uri, nsIInputStream **result)
     if (NS_FAILED(rv)) return rv;
 
     buffer.AssignLiteral(
-                  "\n"
-                  "\n"
-                  "\n"
-                  "\nCache entry information\n"
-                  "\n\n\n");
+      "\n"
+      "\n"
+      "\n"
+      "  Cache entry information\n"
+      "  \n"
+      "  \n"
+      "\n"
+      "\n"
+      "
Cache entry information
\n");
     outputStream->Write(buffer.get(), buffer.Length(), &n);
 
     if (descriptor)
@@ -177,7 +181,7 @@ nsAboutCacheEntry::GetContentStream(nsIURI *uri, nsIInputStream **result)
 
     buffer.AssignLiteral("\n\n");
     outputStream->Write(buffer.get(), buffer.Length(), &n);
-        
+
     nsCOMPtr inStr;
     PRUint32 size;
 
@@ -238,11 +242,14 @@ static void PrintTimeString(char *buf, PRUint32 bufsize, PRUint32 t_sec)
 
 #define APPEND_ROW(label, value) \
     PR_BEGIN_MACRO \
-    buffer.AppendLiteral("\n" \
+                         "    \n"); \
+    buffer.AppendLiteral("\n" \
+                         "  \n"); \
     PR_END_MACRO
 
 nsresult
@@ -259,8 +266,10 @@ nsAboutCacheEntry::WriteCacheEntryDescription(nsIOutputStream *outputStream,
     if (NS_FAILED(rv)) return rv;
 
     buffer.SetCapacity(4096);
-    buffer.AssignLiteral("
KeyData sizeFetch countLast modifiedExpires
 ");
     mBuffer.AppendInt(length);
-    mBuffer.AppendLiteral(" bytes");
+    mBuffer.AppendLiteral(" bytes");
     mBuffer.AppendInt(fetchCount);
+    mBuffer.AppendLiteral("");
     entryInfo->GetLastModified(&t);
     if (t) {
         PrintTimeString(buf, sizeof(buf), t);
         mBuffer.Append(buf);
     } else
         mBuffer.AppendLiteral("No last modified time");
+    mBuffer.AppendLiteral("");
     entryInfo->GetExpirationTime(&t);
     if (t < 0xFFFFFFFF) {
         PrintTimeString(buf, sizeof(buf), t);
@@ -292,9 +341,10 @@ nsAboutCache::VisitEntry(const char *deviceID,
     } else {
         mBuffer.AppendLiteral("No expiration time");
     }
+    mBuffer.AppendLiteral("
"); \
+    buffer.AppendLiteral("  
"); \
     buffer.AppendLiteral(label); \
-    buffer.AppendLiteral(":\n
"); \
+    buffer.AppendLiteral(":\n" \
+                         "    
"); \
     buffer.Append(value); \
-    buffer.AppendLiteral("
"
-                         "
key:");
+    buffer.AssignLiteral("\n"
+                         "  \n"
+                         "    \n"
+                         "    \n");
-
+    buffer.AppendLiteral("\n"
+                         "  \n");
 
     // temp vars for reporting
     char timeBuf[255];
@@ -362,7 +371,8 @@ nsAboutCacheEntry::WriteCacheEntryDescription(nsIOutputStream *outputStream,
     }
 
     buffer.AppendLiteral("
key:");
 
     // Test if the key is actually a URI
     nsCOMPtr uri;
@@ -286,8 +295,8 @@ nsAboutCacheEntry::WriteCacheEntryDescription(nsIOutputStream *outputStream,
     else
         buffer.Append(escapedStr);
     nsMemory::Free(escapedStr);
-    buffer.AppendLiteral("
\n"
-                         "
\n");
+                         "
\n"
+                         "
\n");
     // Meta Data
     // let's just look for some well known (HTTP) meta data tags, for now.
 
@@ -372,35 +382,41 @@ nsAboutCacheEntry::WriteCacheEntryDescription(nsIOutputStream *outputStream,
     if (!str2.IsEmpty())  APPEND_ROW("Client", str2);
 
 
-    mBuffer = &buffer;  // make it available for VisitMetaDataElement()
+    mBuffer = &buffer;  // make it available for VisitMetaDataElement().
+    // nsCacheEntryDescriptor::VisitMetaData calls
+    // nsCacheEntry.h VisitMetaDataElements, which returns
+    // nsCacheMetaData::VisitElements, which calls
+    // nsAboutCacheEntry::VisitMetaDataElement (below) in a loop.
     descriptor->VisitMetaData(this);
     mBuffer = nsnull;
 
-    buffer.AppendLiteral("
\n"
-                         "
\n
");
+    buffer.AppendLiteral("
\n");
     outputStream->Write(buffer.get(), buffer.Length(), &n);
 
     buffer.Truncate();
 
     // Provide a hexdump of the data
-    nsCOMPtr stream;
-    descriptor->OpenInputStream(0, getter_AddRefs(stream));
-    if (stream) {
-        PRUint32 hexDumpState = 0;
-        char chunk[4096];
-        while (dataSize) {
-            PRUint32 count = PR_MIN(dataSize, sizeof(chunk));
-            if (NS_FAILED(stream->Read(chunk, count, &n)) || n == 0)
-                break;
-            dataSize -= n;
-            HexDump(&hexDumpState, chunk, n, buffer);
+    if (dataSize) { // don't draw an 
 if the Data Size is 0.
+        nsCOMPtr stream;
+        descriptor->OpenInputStream(0, getter_AddRefs(stream));
+        if (stream) {
+            buffer.AssignLiteral("
\n"
+                                 "
");
+            PRUint32 hexDumpState = 0;
+            char chunk[4096];
+            while (dataSize) {
+                PRUint32 count = PR_MIN(dataSize, sizeof(chunk));
+                if (NS_FAILED(stream->Read(chunk, count, &n)) || n == 0)
+                    break;
+                dataSize -= n;
+                HexDump(&hexDumpState, chunk, n, buffer);
+                outputStream->Write(buffer.get(), buffer.Length(), &n);
+                buffer.Truncate();
+            }
+            buffer.AssignLiteral("
\n");
             outputStream->Write(buffer.get(), buffer.Length(), &n);
-            buffer.Truncate();
-        }
+      }
     }
-
-    buffer.AssignLiteral("
"); - outputStream->Write(buffer.get(), buffer.Length(), &n); return NS_OK; } @@ -468,15 +484,17 @@ nsAboutCacheEntry::VisitMetaDataElement(const char * key, const char * value, PRBool * keepGoing) { - mBuffer->AppendLiteral(""); + mBuffer->AppendLiteral(" \n" + " "); mBuffer->Append(key); - mBuffer->AppendLiteral(":\n
");
+    mBuffer->AppendLiteral(":\n"
+                           "    ");
     char* escapedValue = nsEscapeHTML(value);
     mBuffer->Append(escapedValue);
     nsMemory::Free(escapedValue);
-    mBuffer->AppendLiteral("
\n"); + mBuffer->AppendLiteral("\n" + " \n"); *keepGoing = PR_TRUE; return NS_OK; } - diff --git a/toolkit/themes/pinstripe/global/jar.mn b/toolkit/themes/pinstripe/global/jar.mn index 834256bd08a0..2831c11f9aac 100644 --- a/toolkit/themes/pinstripe/global/jar.mn +++ b/toolkit/themes/pinstripe/global/jar.mn @@ -3,6 +3,8 @@ toolkit.jar: skin/classic/global/10pct_transparent_grey.png skin/classic/global/50pct_transparent_grey.png skin/classic/global/about.css (../../winstripe/global/about.css) + skin/classic/global/aboutCache.css (../../winstripe/global/aboutCache.css) + skin/classic/global/aboutCacheEntry.css (../../winstripe/global/aboutCacheEntry.css) skin/classic/global/aboutMemory.css (../../winstripe/global/aboutMemory.css) skin/classic/global/aboutSupport.css (../../winstripe/global/aboutSupport.css) skin/classic/global/appPicker.css (../../winstripe/global/appPicker.css) diff --git a/toolkit/themes/winstripe/global/aboutCache.css b/toolkit/themes/winstripe/global/aboutCache.css new file mode 100644 index 000000000000..6bf7d20482f3 --- /dev/null +++ b/toolkit/themes/winstripe/global/aboutCache.css @@ -0,0 +1,92 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Steffen Wilberg . + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +h2 { + margin-top: 2em; +} + +table { + table-layout: fixed; + width: 100%; + margin-bottom: 1em; + padding: 0.5em 0; + -moz-border-radius: 10px; +} + +#disk { background-color: lightblue; } +#memory { background-color: lightgreen; } +#offline { background-color: plum; } + +th { + width: 14em; + white-space: nowrap; + text-align: right; +} + +td { + font-family: -moz-fixed; + word-wrap: break-word; +} + +#col-key { + width: 60%; +} +#col-dataSize, #col-fetchCount, +#col-lastModified, #col-expires { + width: 13%; +} + +#entries > tbody > tr:nth-child(odd) { + background: #fcfcfc; +} +#entries > tbody > tr:nth-child(even) { + background: #f4f4f4; +} + +#entries > tbody > tr > td { + padding: .5em 0; + text-align: center; +} + +#entries > thead > tr > th { + text-align: center; + white-space: normal; +} + +#entries > thead > tr > th:first-child, +#entries > tbody > tr > td:first-child { + text-align: left; +} diff --git a/toolkit/themes/winstripe/global/aboutCacheEntry.css b/toolkit/themes/winstripe/global/aboutCacheEntry.css new file mode 100644 index 000000000000..86bac256e6de --- /dev/null +++ b/toolkit/themes/winstripe/global/aboutCacheEntry.css @@ -0,0 +1,61 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Steffen Wilberg . + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +body { + display: table; +} + +table { + table-layout: fixed; + width: 100%; +} + +th { + width: 12em; + word-wrap: break-word; + vertical-align: top; + text-align: right; +} + +td { + display: block; + font-family: -moz-fixed; + white-space: pre-wrap; +} + +#td-key { + word-wrap: break-word; +} diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn index c8aabd49bead..c1bcfbf5ac6c 100644 --- a/toolkit/themes/winstripe/global/jar.mn +++ b/toolkit/themes/winstripe/global/jar.mn @@ -4,6 +4,8 @@ toolkit.jar: # NOTE: If you add a new file here, you'll need to add it to the aero # section at the bottom of this file skin/classic/global/about.css + skin/classic/global/aboutCache.css + skin/classic/global/aboutCacheEntry.css skin/classic/global/aboutMemory.css skin/classic/global/aboutSupport.css skin/classic/global/appPicker.css @@ -170,6 +172,8 @@ toolkit.jar: toolkit.jar: % skin global classic/1.0 %skin/classic/aero/global/ os=WINNT osversion>=6 skin/classic/aero/global/about.css + skin/classic/aero/global/aboutCache.css + skin/classic/aero/global/aboutCacheEntry.css skin/classic/aero/global/aboutMemory.css skin/classic/aero/global/aboutSupport.css skin/classic/aero/global/appPicker.css