mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-14 22:05:44 +00:00
Checked in patch for bug 269009: Make "New Calendar..." dialog more intuitive
This commit is contained in:
mostafah%oeone.com
parent
59a800a938
commit
f7e12ddbb8
@ -166,7 +166,7 @@ calendarManager.prototype.launchNewOrOpenCalendarFileDialog = function calMan_la
|
||||
args.CalendarObject = ThisCalendarObject;
|
||||
|
||||
// open the dialog modally
|
||||
openDialog("chrome://calendar/content/localCalDialog.xul", "caAddServer", "chrome,modal", args );
|
||||
openDialog("chrome://calendar/content/localCalDialog.xul", "caAddServer", "chrome,titlebar,modal", args );
|
||||
}
|
||||
|
||||
/*
|
||||
@ -203,7 +203,7 @@ calendarManager.prototype.launchEditCalendarDialog = function calMan_launchEditC
|
||||
args.CalendarObject = ThisCalendarObject;
|
||||
|
||||
// open the dialog modally
|
||||
openDialog("chrome://calendar/content/localCalDialog.xul", "caEditServer", "chrome,modal", args );
|
||||
openDialog("chrome://calendar/content/localCalDialog.xul", "caEditServer", "chrome,titlebar,modal", args );
|
||||
}
|
||||
|
||||
|
||||
@ -235,7 +235,7 @@ calendarManager.prototype.launchAddRemoteCalendarDialog = function calMan_launch
|
||||
args.CalendarObject = ThisCalendarObject;
|
||||
|
||||
// open the dialog modally
|
||||
openDialog("chrome://calendar/content/serverDialog.xul", "caAddServer", "chrome,modal", args );
|
||||
openDialog("chrome://calendar/content/serverDialog.xul", "caAddServer", "chrome,titlebar,modal", args );
|
||||
|
||||
}
|
||||
|
||||
@ -272,7 +272,7 @@ calendarManager.prototype.launchEditRemoteCalendarDialog = function calMan_launc
|
||||
args.CalendarObject = ThisCalendarObject;
|
||||
|
||||
// open the dialog modally
|
||||
openDialog("chrome://calendar/content/serverDialog.xul", "caEditServer", "chrome,modal", args );
|
||||
openDialog("chrome://calendar/content/serverDialog.xul", "caEditServer", "chrome,titlebar,modal", args );
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@
|
||||
onload="loadCalendarServerDialog()"
|
||||
persist="screenX screenY"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
width="600"
|
||||
width="500"
|
||||
xmlns:nc="http://home.netscape.com/NC-rdf#">
|
||||
|
||||
<!-- width 600 for long path names; height set by onload sizeToContent() -->
|
||||
@ -111,7 +111,6 @@
|
||||
</row>
|
||||
|
||||
<!-- Color -->
|
||||
//added by Dallas
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" pack="end">
|
||||
<description>&calendar.server.dialog.color.label;</description>
|
||||
@ -124,18 +123,15 @@
|
||||
</hbox>
|
||||
</row>
|
||||
|
||||
<!-- File Picker Button -->
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" pack="end"/>
|
||||
<hbox flex="1">
|
||||
<description flex="1">&calendar.local.calendar.dialog.help.label;</description>
|
||||
</hbox>
|
||||
<separator class="groove" orient="horizontal" flex="1"/>
|
||||
<separator class="groove" orient="horizontal" flex="1"/>
|
||||
</row>
|
||||
|
||||
<!-- Location -->
|
||||
|
||||
<!-- Local Calendar File Location -->
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" pack="end">
|
||||
<description>&calendar.server.dialog.location.label;</description>
|
||||
<description>&calendar.server.dialog.local.location.label;</description>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<textbox id="server-path-textbox" flex="1" />
|
||||
@ -143,31 +139,44 @@
|
||||
label="&calendar.server.dialog.browse.label;"/>
|
||||
</hbox>
|
||||
</row>
|
||||
|
||||
<!-- Explain the following form elements -->
|
||||
<row align="center">
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" pack="end"/>
|
||||
<hbox flex="1">
|
||||
<description flex="1">&calendar.local.calendar.dialog.help.label;</description>
|
||||
</hbox>
|
||||
</row>
|
||||
|
||||
<row align="center">
|
||||
<separator class="groove" orient="horizontal" flex="1"/>
|
||||
<separator class="groove" orient="horizontal" flex="1"/>
|
||||
</row>
|
||||
|
||||
<!-- Remote Calendar File Location -->
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" pack="end"/>
|
||||
<hbox flex="1">
|
||||
<description flex="1">&calendar.local.calendar.dialog.optional.label;</description>
|
||||
</hbox>
|
||||
</row>
|
||||
|
||||
<!-- Remote File Location -->
|
||||
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" pack="end">
|
||||
<description>&calendar.server.dialog.location.label;</description>
|
||||
</hbox>
|
||||
<textbox id="server-remotepath-textbox" flex="1" />
|
||||
|
||||
</row>
|
||||
|
||||
<!-- Publish Automatically -->
|
||||
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" pack="end"/>
|
||||
<hbox>
|
||||
<checkbox id="server-publish-checkbox"/>
|
||||
<description flex="1">&calendar.server.dialog.publish.label;</description>
|
||||
</hbox>
|
||||
<separator flex="1"/>
|
||||
<separator flex="1"/>
|
||||
</row>
|
||||
|
||||
<!-- Auto-Publish Checkbox -->
|
||||
<row align="center">
|
||||
<hbox class="field-label-box-class" align="end" pack="end">
|
||||
<checkbox id="server-publish-checkbox"/>
|
||||
</hbox>
|
||||
<description flex="1">&calendar.server.dialog.publish.label;</description>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
|
||||
@ -428,18 +428,18 @@
|
||||
<!ENTITY calendar.server.dialog.title.new "New Calendar File">
|
||||
<!ENTITY calendar.server.dialog.title.open "Open Calendar File">
|
||||
<!ENTITY calendar.server.dialog.title.edit "Edit Calendar">
|
||||
<!ENTITY calendar.server.dialog.name.label "Name">
|
||||
<!ENTITY calendar.server.dialog.publish.label "Publish changes automatically? For remote calendars, this will download a new version before you add, edit or delete an event. It will then perform your action, and upload the new file to the server.">
|
||||
<!ENTITY calendar.server.dialog.location.label "Location">
|
||||
<!ENTITY calendar.server.dialog.local.location.label "Local File Location">
|
||||
<!ENTITY calendar.server.dialog.browse.label "Browse For Local File…">
|
||||
<!ENTITY calendar.local.calendar.dialog.help.label "You can optionally specify a file location where the calendar should be created.">
|
||||
<!ENTITY calendar.server.dialog.name.label "Calendar Name:">
|
||||
<!ENTITY calendar.server.dialog.publish.label "Automatically publish your changes to the remote calendar? When enabled, a fresh version of the calendar is downloaded before applying any change you make. Your changes are then applied and the calendar is uploaded back to the server.">
|
||||
<!ENTITY calendar.server.dialog.location.label "Remote Server URL:">
|
||||
<!ENTITY calendar.server.dialog.local.location.label "Local File Location:">
|
||||
<!ENTITY calendar.server.dialog.browse.label "Browse…">
|
||||
<!ENTITY calendar.server.dialog.help.label "You can enter a local file path, or a remote file path like http://www.mozilla.org/projects/calendar/caldata/CanadaHolidays.ics">
|
||||
<!ENTITY calendar.local.calendar.dialog.help.label "Use this to specify where on your computer the calendar file is stored. This is optional.">
|
||||
<!ENTITY calendar.local.calendar.dialog.optional.label "These optional settings are used when publishing this calendar to a remote location.">
|
||||
|
||||
<!-- Calendar Coloring -->
|
||||
<!ENTITY calendar.server.dialog.color.label "Color">
|
||||
<!ENTITY calendar.server.dialog.color.label "Color:">
|
||||
|
||||
<!ENTITY calendar.local.calendar.dialog.optional.label "The following fields are optional, and are used for publishing the calendar to a remote location.">
|
||||
|
||||
<!-- Calendar Publish Dialog -->
|
||||
<!ENTITY calendar.publish.dialog.title "Publish Calendar">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user