key: | ");
+ buffer.AssignLiteral("\n"
+ " \n"
+ " key: | \n"
+ " ");
// 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");
-
+ buffer.AppendLiteral("\n"
+ " \n");
// temp vars for reporting
char timeBuf[255];
@@ -362,7 +371,8 @@ nsAboutCacheEntry::WriteCacheEntryDescription(nsIOutputStream *outputStream,
}
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
|