Drop non-working RSS subscription UI from web interface.

diff --git a/CHANGES.md b/CHANGES.md
index 9574a48ca305798672913a779b27a78fe3271292..7f1b871c3590d6b8abc8692dc746ec6002f656e9 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,7 @@ Changes in CUPS v2.2.9
 - Automatic debug logging of job errors did not work with systemd (Issue #5337)
 - The web interface did not list the IPP Everywhere "driver" (Issue #5338)
 - Authentication in the web interface did not work on macOS (rdar://41444473)
+- Dropped non-working RSS subscriptions UI from web interface templates.
 - Fixed a memory leak for some IPP (extension) syntaxes.
 
 

diff --git a/templates/admin.tmpl b/templates/admin.tmpl
index 101f960173b2371db02e542fffb045fef47f4f61..ae8339993beab04425691861fba50458b8663894 100644 (file)
--- a/templates/admin.tmpl
+++ b/templates/admin.tmpl
@@ -79,19 +79,3 @@
     </FORM>}
   </div>
 </div>
-
-<div class="row">
-  <H2 CLASS="title">RSS Subscriptions</H2>
-
-  <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Add RSS Subscription"></FORM>
-  </P>
-
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS Subscriptions">
-  <THEAD><TR><TH>Name</TH><TH>Events</TH><TH>Queue Name</TH></TR></THEAD>
-  <TBODY>{[notify_subscription_id]
-  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancel RSS Subscription"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:All Queues}</TD></TR>}
-  </TBODY>
-  </TABLE>:}
-</div>
\ No newline at end of file

diff --git a/templates/de/admin.tmpl b/templates/de/admin.tmpl
index fb2851a7011610d577eb21f6a83fdeb492e14853..c5fed72aa4c8ec589c32a5ff04a262756f08a6d2 100644 (file)
--- a/templates/de/admin.tmpl
+++ b/templates/de/admin.tmpl
@@ -79,19 +79,3 @@
     </FORM>}
   </div>
 </div>
-
-<div class="row">
-  <H2 CLASS="title">RSS-Abonnements</H2>
-
-  <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS-Abonnement hinzufügen"></FORM>
-  </P>
-
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS-Abonnements">
-  <THEAD><TR><TH>Name</TH><TH>Ereignis</TH><TH>Warteschlange</TH></TR></THEAD>
-  <TBODY>{[notify_subscription_id]
-  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS-Abonnement beenden"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Alle Warteschlangen}</TD></TR>}
-  </TBODY>
-  </TABLE>:}
-</div>

diff --git a/templates/es/admin.tmpl b/templates/es/admin.tmpl
index 097c65c025b5f2e55dad9aa5ed2ff12f863b1723..edc0adf71d815ed84171cfd4841274654787f852 100644 (file)
--- a/templates/es/admin.tmpl
+++ b/templates/es/admin.tmpl
@@ -79,19 +79,3 @@
     </FORM>}
   </div>
 </div>
-
-<div class="row">
-  <H2 CLASS="title">Subscripciones RSS</H2>
-
-  <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="A&ntilde;adir subscripci&oacute;n RSS"></FORM>
-  </P>
-
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Subscripciones RSS">
-  <THEAD><TR><TH>Nombre</TH><TH>Eventos</TH><TH>Nombre de la cola</TH></TR></THEAD>
-  <TBODY>{[notify_subscription_id]
-  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancelar subscripci&oacute;n RSS"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Todas las colas}</TD></TR>}
-  </TBODY>
-  </TABLE>:}
-</div>

diff --git a/templates/fr/admin.tmpl b/templates/fr/admin.tmpl
index 2fcd9c5280568dc888a77751351614e547aaf14c..6e8026553c6af9d72a3a896d31cf8ddeb6a98769 100644 (file)
--- a/templates/fr/admin.tmpl
+++ b/templates/fr/admin.tmpl
@@ -79,19 +79,3 @@
     </FORM>}
   </div>
 </div>
-
-<div class="row">
-  <H2 CLASS="title">Abonnements RSS</H2>
-
-  <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Ajouter un abonnement RSS"></FORM>
-  </P>
-
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Abonnements RSS">
-  <THEAD><TR><TH>Nom</TH><TH>Év&eacute;nements</TH><TH>Nom de la file</TH></TR></THEAD>
-  <TBODY>{[notify_subscription_id]
-  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Annuler l'abonnement RSS"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Toutes les files}</TD></TR>}
-  </TBODY>
-  </TABLE>:}
-</div>

diff --git a/templates/ja/admin.tmpl b/templates/ja/admin.tmpl
index 13d6f134977a2a7271d8dda0a1824327d098e135..3443297a79d809b8d66c7f32dc641464f1d327bb 100644 (file)
--- a/templates/ja/admin.tmpl
+++ b/templates/ja/admin.tmpl
@@ -79,19 +79,3 @@
     </FORM>}
   </div>
 </div>
-
-<div class="row">
-  <H2 CLASS="title">RSS 購読</H2>
-
-  <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="RSS 購読の追加"></FORM>
-  </P>
-
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="RSS 購読">
-  <THEAD><TR><TH>名前</TH><TH>イベント</TH><TH>キュー名</TH></TR></THEAD>
-  <TBODY>{[notify_subscription_id]
-  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="RSS 購読のキャンセル"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:すべてのキュー}</TD></TR>}
-  </TBODY>
-  </TABLE>:}
-</div>
\ No newline at end of file

diff --git a/templates/pt_BR/admin.tmpl b/templates/pt_BR/admin.tmpl
index b847bef9691af2c5c253079594a579615f81e32d..c7095e17c976eb1c6e13ff6a84226a9054eb42a1 100644 (file)
--- a/templates/pt_BR/admin.tmpl
+++ b/templates/pt_BR/admin.tmpl
@@ -79,19 +79,3 @@
     </FORM>}
   </div>
 </div>
-
-<div class="row">
-  <H2 CLASS="title">Inscri&ccedil;&otilde;es RSS</H2>
-
-  <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Adicionar inscri&ccedil;&atilde;o RSS"></FORM>
-  </P>
-
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Inscri&ccedil;&otilde;es RSS">
-  <THEAD><TR><TH>Nome</TH><TH>Eventos</TH><TH>Nome da fila</TH></TR></THEAD>
-  <TBODY>{[notify_subscription_id]
-  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Cancelar inscri&ccedil;&atilde;o RSS"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Todas as filas}</TD></TR>}
-  </TBODY>
-  </TABLE>:}
-</div>

diff --git a/templates/ru/admin.tmpl b/templates/ru/admin.tmpl
index 49a168cfc4806d8e8db59e171104d05b067096ba..a54e541ddbb7d36beafad32ccccf1e8860c4364d 100644 (file)
--- a/templates/ru/admin.tmpl
+++ b/templates/ru/admin.tmpl
@@ -66,7 +66,7 @@
     <P><A HREF="/admin/?ADVANCEDSETTINGS=YES">Дополнительные параметры <SMALL>&#x25b6;</SMALL></A><BR>
     <INPUT TYPE="HIDDEN" NAME="OP" VALUE="config-server">
     <INPUT TYPE="CHECKBOX" NAME="SHARE_PRINTERS" {?share_printers}> Разрешить совместный доступ к принтерам, подключенным к этой системе<BR>
-    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из 
+    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<INPUT TYPE="CHECKBOX" NAME="REMOTE_ANY" {?remote_any}> Разрешить печать из
     интернет<BR>
     <INPUT TYPE="CHECKBOX" NAME="REMOTE_ADMIN" {?remote_admin}> Разрешить удаленное администрирование<BR>
     {have_gssapi?<INPUT TYPE="CHECKBOX" NAME="KERBEROS" {?kerberos}> Разрешить аутентификацию Kerberos (<A HREF="/help/kerberos.html?TOPIC=Getting+Started">FAQ</A>)<BR>:}
@@ -78,20 +78,4 @@
 
     </FORM>}
   </div>
-</div>
-
-<div class="row">
-  <H2 CLASS="title">Подписка по RSS</H2>
-
-  <P>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription"><INPUT TYPE="SUBMIT" VALUE="Добавить подписку по RSS"></FORM>
-  </P>
-
-  {notify_subscription_id?<TABLE CLASS="list" SUMMARY="Подписки по RSS">
-  <THEAD><TR><TH>Название</TH><TH>События</TH><TH>Очередь</TH></TR></THEAD>
-  <TBODY>{[notify_subscription_id]
-  <TR><TD><A HREF="{notify_recipient_uri}">{notify_recipient_name}</A><BR>
-  <FORM ACTION="/admin/" METHOD="POST"><INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}"><INPUT TYPE="HIDDEN" NAME="OP" VALUE="cancel-subscription"><INPUT TYPE="HIDDEN" NAME="notify_subscription_id" VALUE="{notify_subscription_id}"><INPUT TYPE="SUBMIT" VALUE="Отменить подписку по RSS"></FORM>&nbsp;</TD><TD>{notify_events}</TD><TD NOWRAP>&nbsp;{notify_printer_name?{notify_printer_name}:Все очереди}</TD></TR>}
-  </TBODY>
-  </TABLE>:}
 </div>
\ No newline at end of file