From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Wed, 1 Jun 2022 04:48:31 +0000 (+0200)
Subject: choose-device.tmpl: Add device uri into title of found network printer
X-Git-Tag: v2.4.3~173^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23cef1c1374accc5d256b00b8afddffe645e4586;p=thirdparty%2Fcups.git

choose-device.tmpl: Add device uri into title of found network printer

There can be many printers on the same network with the same printer
model, which causes confusion for users about which one to add. This PR
adds a title for every found network printer, which contains the
printer's device uri. The title is shown when user hover the mouse over
the found entry.

Partially fixes #393, thanks to Pro-pra for the PR!
---

diff --git a/templates/choose-device.tmpl b/templates/choose-device.tmpl
index 27c872625c..6ce77340a3 100644
--- a/templates/choose-device.tmpl
+++ b/templates/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>
diff --git a/templates/da/choose-device.tmpl b/templates/da/choose-device.tmpl
index b1ab9fda35..17e1ce33f9 100644
--- a/templates/da/choose-device.tmpl
+++ b/templates/da/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Ukendt?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Ukendt?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>
diff --git a/templates/de/choose-device.tmpl b/templates/de/choose-device.tmpl
index 0cd3f85593..bb4e75505e 100644
--- a/templates/de/choose-device.tmpl
+++ b/templates/de/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>
diff --git a/templates/es/choose-device.tmpl b/templates/es/choose-device.tmpl
index feea2e9d80..ff904d11b5 100644
--- a/templates/es/choose-device.tmpl
+++ b/templates/es/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>
diff --git a/templates/fr/choose-device.tmpl b/templates/fr/choose-device.tmpl
index 9319328542..505ad3cd8f 100644
--- a/templates/fr/choose-device.tmpl
+++ b/templates/fr/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>
diff --git a/templates/ja/choose-device.tmpl b/templates/ja/choose-device.tmpl
index 30bdc3bbe8..05dcca4807 100644
--- a/templates/ja/choose-device.tmpl
+++ b/templates/ja/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>
diff --git a/templates/pt_BR/choose-device.tmpl b/templates/pt_BR/choose-device.tmpl
index fa8f74bd0e..441bedb727 100644
--- a/templates/pt_BR/choose-device.tmpl
+++ b/templates/pt_BR/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>
diff --git a/templates/ru/choose-device.tmpl b/templates/ru/choose-device.tmpl
index 539c60136b..8b0bf9cfb9 100644
--- a/templates/ru/choose-device.tmpl
+++ b/templates/ru/choose-device.tmpl
@@ -25,7 +25,7 @@ VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
 <TD>
 {[device_uri]{device_class=network?{device_uri~[a-z]+://?<INPUT TYPE="RADIO" NAME="DEVICE_URI" ID="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}"
 VALUE="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">
-<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
+<LABEL FOR="{device_uri}{?device_make_and_model!Unknown?|{device_make_and_model}:}" title="{device_uri}">{device_info} {?device_make_and_model!Unknown?({device_make_and_model}):}</LABEL><BR>
 :}:}}
 </TD>
 </TR>