Commit b2dbf1c4 authored by Jimmy Gong's avatar Jimmy Gong Committed by Commit Bot

Update PPD file selection text

- Updates label of the PPD file selection for advanced printer dialog
  and for edit printer dialog.
- Learn More link will be updated to point to correct URL.

Bug: 939899
Test: End to End manual
Change-Id: Ie759ae625263ce5f758d3a045b72e1565efeec6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636396Reviewed-by: default avatarBailey Berro <baileyberro@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: jimmy gong <jimmyxgong@chromium.org>
Cr-Commit-Position: refs/heads/master@{#666100}
parent 60efceb8
...@@ -1483,7 +1483,7 @@ ...@@ -1483,7 +1483,7 @@
Manufacturer Manufacturer
</message> </message>
<message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SELECT_DRIVER" desc="Label for the file selector to manually select a PPD file from the user's file system."> <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_SELECT_DRIVER" desc="Label for the file selector to manually select a PPD file from the user's file system.">
Or specify your own driver: Or specify your printer PPD
</message> </message>
<message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_BUTTON_SELECT_DRIVER" desc="Text for the button which allows user to select a PPD file from the file system."> <message name="IDS_SETTINGS_PRINTING_CUPS_PRINTER_BUTTON_SELECT_DRIVER" desc="Text for the button which allows user to select a PPD file from the file system.">
Browse Browse
......
...@@ -170,9 +170,15 @@ ...@@ -170,9 +170,15 @@
value="{{activePrinter.ppdModel}}"> value="{{activePrinter.ppdModel}}">
</cr-searchable-drop-down> </cr-searchable-drop-down>
</div> </div>
<div id="ppdLabel" class="field-label">
<span>$i18n{selectDriver}</span>
<a href="$i18n{printingCUPSPrintPpdLearnMoreUrl}" target="_blank">
$i18n{learnMore}
</a>
</div>
<div class="settings-box two-line"> <div class="settings-box two-line">
<cr-input class="browse-file-input" readonly value="[[newUserPPD_]]" <cr-input class="browse-file-input" readonly value="[[newUserPPD_]]"
label="$i18n{selectDriver}" invalid="[[invalidPPD_]]" aria-labelledby="ppdLabel" invalid="[[invalidPPD_]]"
error-message="$i18n{selectDriverErrorMessage}" tabindex="-1"> error-message="$i18n{selectDriverErrorMessage}" tabindex="-1">
</cr-input> </cr-input>
<paper-button class="browse-button" on-click="onBrowseFile_"> <paper-button class="browse-button" on-click="onBrowseFile_">
......
...@@ -97,9 +97,15 @@ ...@@ -97,9 +97,15 @@
value="{{pendingPrinter_.ppdModel}}"> value="{{pendingPrinter_.ppdModel}}">
</cr-searchable-drop-down> </cr-searchable-drop-down>
</div> </div>
<div id="ppdLabel" class="field-label">
<span>$i18n{selectDriver}</span>
<a href="$i18n{printingCUPSPrintPpdLearnMoreUrl}" target="_blank">
$i18n{learnMore}
</a>
</div>
<div class="settings-box two-line"> <div class="settings-box two-line">
<cr-input class="browse-file-input" readonly tabindex="-1" <cr-input class="browse-file-input" readonly tabindex="-1"
value="[[userPPD_]]" label="$i18n{selectDriver}" value="[[userPPD_]]" aria-labelledby="ppdLabel"
error-message="$i18n{selectDriverErrorMessage}" error-message="$i18n{selectDriverErrorMessage}"
invalid="[[invalidPPD_]]"> invalid="[[invalidPPD_]]">
</cr-input> </cr-input>
......
...@@ -93,6 +93,11 @@ ...@@ -93,6 +93,11 @@
#search input[type='search'] { #search input[type='search'] {
font: inherit; font: inherit;
} }
.field-label {
padding-inline-start: 20px;
@apply --cr-form-field-label;
}
</style> </style>
</template> </template>
</dom-module> </dom-module>
...@@ -2142,6 +2142,9 @@ void AddPrintingStrings(content::WebUIDataSource* html_source) { ...@@ -2142,6 +2142,9 @@ void AddPrintingStrings(content::WebUIDataSource* html_source) {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
html_source->AddString("printingCUPSPrintLearnMoreUrl", html_source->AddString("printingCUPSPrintLearnMoreUrl",
GetHelpUrlWithBoard(chrome::kCupsPrintLearnMoreURL)); GetHelpUrlWithBoard(chrome::kCupsPrintLearnMoreURL));
html_source->AddString(
"printingCUPSPrintPpdLearnMoreUrl",
GetHelpUrlWithBoard(chrome::kCupsPrintPPDLearnMoreURL));
#endif #endif
} }
......
...@@ -285,6 +285,9 @@ const char kCrosScheme[] = "cros"; ...@@ -285,6 +285,9 @@ const char kCrosScheme[] = "cros";
const char kCupsPrintLearnMoreURL[] = const char kCupsPrintLearnMoreURL[] =
"https://support.google.com/chromebook?p=chromebook_printing"; "https://support.google.com/chromebook?p=chromebook_printing";
const char kCupsPrintPPDLearnMoreURL[] =
"https://support.google.com/chromebook?p=chromebook_printing";
const char kEasyUnlockLearnMoreUrl[] = const char kEasyUnlockLearnMoreUrl[] =
"https://support.google.com/chromebook/?p=smart_lock"; "https://support.google.com/chromebook/?p=smart_lock";
......
...@@ -230,6 +230,8 @@ extern const char kCrosScheme[]; ...@@ -230,6 +230,8 @@ extern const char kCrosScheme[];
extern const char kCupsPrintLearnMoreURL[]; extern const char kCupsPrintLearnMoreURL[];
extern const char kCupsPrintPPDLearnMoreURL[];
// The URL for the "Learn more" link the the Easy Unlock settings. // The URL for the "Learn more" link the the Easy Unlock settings.
extern const char kEasyUnlockLearnMoreUrl[]; extern const char kEasyUnlockLearnMoreUrl[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment