From e6c909a2f7eb139fa73f25cb6576e75c8d2aa6be Mon Sep 17 00:00:00 2001 From: "mozilla%kewis.ch" Date: Tue, 1 Jul 2008 14:07:56 +0000 Subject: [PATCH] Fix bug 442571 - Integrate "Create a new Calendar" into the account central pane. r=mschroeder, ui-r=christian git-svn-id: svn://10.0.0.236/trunk@252749 18797224-902f-48f8-a5cc-f745e15eee43 --- .../messenger-overlay-accountCentral.xul | 64 +++++++++++++++++++ mozilla/calendar/lightning/jar.mn | 3 + .../themes/pinstripe/accountCentral.css | 42 ++++++++++++ .../themes/winstripe/accountCentral.css | 46 +++++++++++++ .../en-US/chrome/lightning/lightning.dtd | 3 + 5 files changed, 158 insertions(+) create mode 100644 mozilla/calendar/lightning/content/messenger-overlay-accountCentral.xul create mode 100644 mozilla/calendar/lightning/themes/pinstripe/accountCentral.css create mode 100644 mozilla/calendar/lightning/themes/winstripe/accountCentral.css diff --git a/mozilla/calendar/lightning/content/messenger-overlay-accountCentral.xul b/mozilla/calendar/lightning/content/messenger-overlay-accountCentral.xul new file mode 100644 index 00000000000..5e3e410c9be --- /dev/null +++ b/mozilla/calendar/lightning/content/messenger-overlay-accountCentral.xul @@ -0,0 +1,64 @@ + + + + + + %lightningDTD; + %globalDTD; +]> + + + + + + + + + + + + diff --git a/mozilla/calendar/lightning/jar.mn b/mozilla/calendar/lightning/jar.mn index debc78d293c..722e2843c77 100644 --- a/mozilla/calendar/lightning/jar.mn +++ b/mozilla/calendar/lightning/jar.mn @@ -1,6 +1,7 @@ lightning.jar: % content lightning %content/lightning/ % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul +% overlay chrome://messenger/content/msgAccountCentral.xul chrome://lightning/content/messenger-overlay-accountCentral.xul % overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul % overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul @@ -31,6 +32,7 @@ lightning.jar: content/lightning/lightning-widgets.xml (content/lightning-widgets.xml) content/lightning/lightning-today-pane.js (content/lightning-today-pane.js) content/lightning/messenger-overlay-sidebar.css (content/messenger-overlay-sidebar.css) + content/lightning/messenger-overlay-accountCentral.xul (content/messenger-overlay-accountCentral.xul) content/lightning/messenger-overlay-sidebar.js (content/messenger-overlay-sidebar.js) * content/lightning/messenger-overlay-sidebar.xul (content/messenger-overlay-sidebar.xul) content/lightning/messenger-overlay-preferences.js (content/messenger-overlay-preferences.js) @@ -40,6 +42,7 @@ lightning.jar: content/lightning/toolkit-overlay-custombar.xul (content/toolkit-overlay-custombar.xul) #expand skin/classic/lightning/imip.css (themes/__THEME__/imip.css) #expand skin/classic/lightning/lightning.css (themes/__THEME__/lightning.css) +#expand skin/classic/lightning/accountCentral.css (themes/__THEME__/accountCentral.css) #expand skin/classic/lightning/lightning-widgets.css (themes/__THEME__/lightning-widgets.css) calendar.jar: diff --git a/mozilla/calendar/lightning/themes/pinstripe/accountCentral.css b/mozilla/calendar/lightning/themes/pinstripe/accountCentral.css new file mode 100644 index 00000000000..2c19214f75b --- /dev/null +++ b/mozilla/calendar/lightning/themes/pinstripe/accountCentral.css @@ -0,0 +1,42 @@ +/* ***** 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 Sun Microsystems code. + * + * The Initial Developer of the Original Code is + * Philipp Kewisch + * Portions created by the Initial Developer are Copyright (C) 2008 + * 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 ***** */ + +#lightning-newCalendar-row > hbox > label { + background: url(chrome://calendar/skin/cal-icon32.png) no-repeat !important; + padding-left: 50px; + font-size: 11px; + padding-top: 7px; +} diff --git a/mozilla/calendar/lightning/themes/winstripe/accountCentral.css b/mozilla/calendar/lightning/themes/winstripe/accountCentral.css new file mode 100644 index 00000000000..2787413f5d4 --- /dev/null +++ b/mozilla/calendar/lightning/themes/winstripe/accountCentral.css @@ -0,0 +1,46 @@ +/* ***** 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 Sun Microsystems code. + * + * The Initial Developer of the Original Code is + * Philipp Kewisch + * Portions created by the Initial Developer are Copyright (C) 2008 + * 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 ***** */ + +#lightning-newCalendar-row > hbox > label[chromedir="rtl"] { + background: url(chrome://calendar/skin/cal-icon32.png) right no-repeat !important; +} + +#lightning-newCalendar-row > hbox > label { + background: url(chrome://calendar/skin/cal-icon32.png) no-repeat !important; + padding-top: .55em; + padding-bottom: .55em; + -moz-padding-start: 45px; +} diff --git a/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd b/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd index 6d3aebb7016..443e1ff6c41 100644 --- a/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd +++ b/mozilla/calendar/locales/en-US/chrome/lightning/lightning.dtd @@ -106,3 +106,6 @@ + + +