diff options
author | Michael Sweet <michael.r.sweet@gmail.com> | 2016-05-25 17:33:36 -0400 |
---|---|---|
committer | Michael Sweet <michael.r.sweet@gmail.com> | 2016-05-25 17:33:36 -0400 |
commit | 9e6d7a0f879c7fb58209be4ba242b6131693964a (patch) | |
tree | 3eb3d35794ae40b9f3a7233ef749e89cf84ac2cb /templates | |
parent | dffa3c7438d26a8a96c7f4937d85a1467b833e8e (diff) | |
download | cups-9e6d7a0f879c7fb58209be4ba242b6131693964a.tar.gz |
Improve performance of web interface with large numbers of jobs (Issue #3819)
Also re-work web interface to not allow the order to be changed (since that
will negatively impact performance) but instead add first/last buttons to the
pager.
Diffstat (limited to 'templates')
-rw-r--r-- | templates/classes.tmpl | 2 | ||||
-rw-r--r-- | templates/de/classes.tmpl | 2 | ||||
-rw-r--r-- | templates/de/jobs.tmpl | 2 | ||||
-rw-r--r-- | templates/de/pager.tmpl | 5 | ||||
-rw-r--r-- | templates/de/printers.tmpl | 2 | ||||
-rw-r--r-- | templates/es/classes.tmpl | 2 | ||||
-rw-r--r-- | templates/es/jobs.tmpl | 2 | ||||
-rw-r--r-- | templates/es/pager.tmpl | 5 | ||||
-rw-r--r-- | templates/es/printers.tmpl | 2 | ||||
-rw-r--r-- | templates/ja/classes.tmpl | 2 | ||||
-rw-r--r-- | templates/ja/jobs.tmpl | 2 | ||||
-rw-r--r-- | templates/ja/pager.tmpl | 5 | ||||
-rw-r--r-- | templates/ja/printers.tmpl | 2 | ||||
-rw-r--r-- | templates/jobs.tmpl | 2 | ||||
-rw-r--r-- | templates/pager.tmpl | 5 | ||||
-rw-r--r-- | templates/printers.tmpl | 2 | ||||
-rw-r--r-- | templates/pt_BR/classes.tmpl | 2 | ||||
-rw-r--r-- | templates/pt_BR/jobs.tmpl | 2 | ||||
-rw-r--r-- | templates/pt_BR/pager.tmpl | 5 | ||||
-rw-r--r-- | templates/pt_BR/printers.tmpl | 2 | ||||
-rw-r--r-- | templates/ru/classes.tmpl | 2 | ||||
-rw-r--r-- | templates/ru/jobs.tmpl | 2 | ||||
-rw-r--r-- | templates/ru/pager.tmpl | 5 | ||||
-rw-r--r-- | templates/ru/printers.tmpl | 2 |
24 files changed, 36 insertions, 30 deletions
diff --git a/templates/classes.tmpl b/templates/classes.tmpl index 51e454fb1..d19f433c6 100644 --- a/templates/classes.tmpl +++ b/templates/classes.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Class List"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Queue Name <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Queue Name <SMALL>▼</SMALL>}</A></TH><TH>Description</TH><TH>Location</TH><TH>Members</TH><TH>Status</TH></TR> +<TR><TH>Queue Name</TH><TH>Description</TH><TH>Location</TH><TH>Members</TH><TH>Status</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/de/classes.tmpl b/templates/de/classes.tmpl index c04d02bda..9b4630496 100644 --- a/templates/de/classes.tmpl +++ b/templates/de/classes.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Class List"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Wartweschlange <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Warteschlange <SMALL>▼</SMALL>}</A></TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Mitglieder</TH><TH>Status</TH></TR> +<TR><TH>Wartweschlange</TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Mitglieder</TH><TH>Status</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/de/jobs.tmpl b/templates/de/jobs.tmpl index 3a5deeb13..709592607 100644 --- a/templates/de/jobs.tmpl +++ b/templates/de/jobs.tmpl @@ -1,7 +1,7 @@ {#job_id=0?: <TABLE CLASS="list" SUMMARY="Auftragsliste"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> ID <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>Name</TH><TH>Benutzer</TH><TH>Grösse</TH><TH>Seiten</TH><TH>Status</TH><TH>Steuerung</TH></TR> +<TR><TH>ID</TH><TH>Name</TH><TH>Benutzer</TH><TH>Grösse</TH><TH>Seiten</TH><TH>Status</TH><TH>Steuerung</TH></TR> </THEAD> <TBODY> {[job_id] diff --git a/templates/de/pager.tmpl b/templates/de/pager.tmpl index 1164045a3..2491b5921 100644 --- a/templates/de/pager.tmpl +++ b/templates/de/pager.tmpl @@ -1,6 +1,7 @@ <TABLE CLASS="inset" SUMMARY="Seitenverwaltung"> <TR> - <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Vorherige anzeigen"></FORM>: }</TD> - <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Nächste anzeigen ▶"></FORM>: }</TD> + <TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="◀◀ Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Vorherige anzeigen"></FORM>: }</TD> + <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Nächste anzeigen ▶"></FORM>: } + {LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last ▶▶"></FORM>:}</TD> </TR> </TABLE> diff --git a/templates/de/printers.tmpl b/templates/de/printers.tmpl index 360154fec..42be95bf5 100644 --- a/templates/de/printers.tmpl +++ b/templates/de/printers.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Druckerliste"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Queue Name <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Queue Name <SMALL>▼</SMALL>}</A></TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Marke und Modell</TH><TH>Status</TH></TR> +<TR><TH>Queue Name</TH><TH>Beschreibung</TH><TH>Ort</TH><TH>Marke und Modell</TH><TH>Status</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/es/classes.tmpl b/templates/es/classes.tmpl index 6fde7bf62..30d4adbfa 100644 --- a/templates/es/classes.tmpl +++ b/templates/es/classes.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Lista de clases"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Nombre de la cola <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Nombre de la cola <SMALL>▼</SMALL>}</A></TH><TH>Descripción</TH><TH>Ubicación</TH><TH>Miembros</TH><TH>Estado</TH></TR> +<TR><TH>Nombre de la cola</TH><TH>Descripción</TH><TH>Ubicación</TH><TH>Miembros</TH><TH>Estado</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/es/jobs.tmpl b/templates/es/jobs.tmpl index 00f01ba01..def2939e2 100644 --- a/templates/es/jobs.tmpl +++ b/templates/es/jobs.tmpl @@ -1,7 +1,7 @@ {#job_id=0?: <TABLE CLASS="list" SUMMARY="Lista de trabajos"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> ID <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>Nombre</TH><TH>Usuario</TH><TH>Tamaño</TH><TH>Páginas</TH><TH>Estado</TH><TH>Control</TH></TR> +<TR><TH>ID</TH><TH>Nombre</TH><TH>Usuario</TH><TH>Tamaño</TH><TH>Páginas</TH><TH>Estado</TH><TH>Control</TH></TR> </THEAD> <TBODY> {[job_id] diff --git a/templates/es/pager.tmpl b/templates/es/pager.tmpl index 5f27c1060..2b228cbda 100644 --- a/templates/es/pager.tmpl +++ b/templates/es/pager.tmpl @@ -1,6 +1,7 @@ <TABLE CLASS="inset" SUMMARY="Barra de paginación"> <TR> - <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Mostrar anteriores"></FORM>: }</TD> - <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Mostrar siguientes ▶"></FORM>: }</TD> + <TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="◀◀ Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Mostrar anteriores"></FORM>: }</TD> + <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Mostrar siguientes ▶"></FORM>: } + {LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last ▶▶"></FORM>:}</TD> </TR> </TABLE> diff --git a/templates/es/printers.tmpl b/templates/es/printers.tmpl index 6b97fd9e6..5d84b1ab7 100644 --- a/templates/es/printers.tmpl +++ b/templates/es/printers.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Lista de impresoras"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Nombre de la cola <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Nombre de la cola <SMALL>▼</SMALL>}</A></TH><TH>Descripción</TH><TH>Ubicación</TH><TH>Marca y modelo</TH><TH>Estado</TH></TR> +<TR><TH>Nombre de la cola</TH><TH>Descripción</TH><TH>Ubicación</TH><TH>Marca y modelo</TH><TH>Estado</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/ja/classes.tmpl b/templates/ja/classes.tmpl index 823a832a9..64cd8c005 100644 --- a/templates/ja/classes.tmpl +++ b/templates/ja/classes.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="クラスの一覧"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> キュー名 <SMALL>▲</SMALL>:<SMALL>▼</SMALL> キュー名 <SMALL>▼</SMALL>}</A></TH><TH>説明</TH><TH>場所</TH><TH>メンバー</TH><TH>状態</TH></TR> +<TR><TH>キュー名</TH><TH>説明</TH><TH>場所</TH><TH>メンバー</TH><TH>状態</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/ja/jobs.tmpl b/templates/ja/jobs.tmpl index b99143848..6904df4ee 100644 --- a/templates/ja/jobs.tmpl +++ b/templates/ja/jobs.tmpl @@ -1,7 +1,7 @@ {#job_id=0?: <TABLE CLASS="list" SUMMARY="ジョブの一覧"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> ID <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>名前</TH><TH>ユーザー</TH><TH>サイズ</TH><TH>ページ</TH><TH>状態</TH><TH>制御</TH></TR> +<TR><TH>ID</TH><TH>名前</TH><TH>ユーザー</TH><TH>サイズ</TH><TH>ページ</TH><TH>状態</TH><TH>制御</TH></TR> </THEAD> <TBODY> {[job_id] diff --git a/templates/ja/pager.tmpl b/templates/ja/pager.tmpl index ebba3a004..ff7e97641 100644 --- a/templates/ja/pager.tmpl +++ b/templates/ja/pager.tmpl @@ -1,6 +1,7 @@ <TABLE CLASS="inset" SUMMARY="Paging Bar"> <TR> - <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ 前を表示"></FORM>: }</TD> - <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="次を表示 ▶"></FORM>: }</TD> + <TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="◀◀ Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ 前を表示"></FORM>: }</TD> + <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="次を表示 ▶"></FORM>: } + {LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last ▶▶"></FORM>:}</TD> </TR> </TABLE> diff --git a/templates/ja/printers.tmpl b/templates/ja/printers.tmpl index a8caaffd2..70bbc8158 100644 --- a/templates/ja/printers.tmpl +++ b/templates/ja/printers.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="プリンターの一覧"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> キュー名 <SMALL>▲</SMALL>:<SMALL>▼</SMALL> キュー名 <SMALL>▼</SMALL>}</A></TH><TH>説明</TH><TH>場所</TH><TH>メーカーとモデル</TH><TH>状態</TH></TR> +<TR><TH>キュー名</TH><TH>説明</TH><TH>場所</TH><TH>メーカーとモデル</TH><TH>状態</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl index 75995d33c..2f6285594 100644 --- a/templates/jobs.tmpl +++ b/templates/jobs.tmpl @@ -1,7 +1,7 @@ {#job_id=0?: <TABLE CLASS="list" SUMMARY="Job List"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> ID <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>Name</TH><TH>User</TH><TH>Size</TH><TH>Pages</TH><TH>State</TH><TH>Control</TH></TR> +<TR><TH>ID</TH><TH>Name</TH><TH>User</TH><TH>Size</TH><TH>Pages</TH><TH>State</TH><TH>Control</TH></TR> </THEAD> <TBODY> {[job_id] diff --git a/templates/pager.tmpl b/templates/pager.tmpl index ebd688d51..76e01675d 100644 --- a/templates/pager.tmpl +++ b/templates/pager.tmpl @@ -1,6 +1,7 @@ <TABLE CLASS="inset" SUMMARY="Paging Bar"> <TR> - <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Show Previous"></FORM>: }</TD> - <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Show Next ▶"></FORM>: }</TD> + <TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="◀◀ Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Show Previous"></FORM>: }</TD> + <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Show Next ▶"></FORM>: } + {LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last ▶▶"></FORM>:}</TD> </TR> </TABLE> diff --git a/templates/printers.tmpl b/templates/printers.tmpl index e0a3228d0..a80763e0c 100644 --- a/templates/printers.tmpl +++ b/templates/printers.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Printer List"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Queue Name <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Queue Name <SMALL>▼</SMALL>}</A></TH><TH>Description</TH><TH>Location</TH><TH>Make and Model</TH><TH>Status</TH></TR> +<TR><TH>Queue Name</TH><TH>Description</TH><TH>Location</TH><TH>Make and Model</TH><TH>Status</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/pt_BR/classes.tmpl b/templates/pt_BR/classes.tmpl index ce1ff4ea8..7240151b5 100644 --- a/templates/pt_BR/classes.tmpl +++ b/templates/pt_BR/classes.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Class List"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Nome da fila <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Nome da fila <SMALL>▼</SMALL>}</A></TH><TH>Descrição</TH><TH>Localização</TH><TH>Membros</TH><TH>Estado</TH></TR> +<TR><TH>Nome da fila</TH><TH>Descrição</TH><TH>Localização</TH><TH>Membros</TH><TH>Estado</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/pt_BR/jobs.tmpl b/templates/pt_BR/jobs.tmpl index 772d63016..9f99dc766 100644 --- a/templates/pt_BR/jobs.tmpl +++ b/templates/pt_BR/jobs.tmpl @@ -1,7 +1,7 @@ {#job_id=0?: <TABLE CLASS="list" SUMMARY="Job List"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> ID <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>Nome</TH><TH>Usuário</TH><TH>Tamanho</TH><TH>Páginas</TH><TH>Estado</TH><TH>Controle</TH></TR> +<TR><TH>ID</TH><TH>Nome</TH><TH>Usuário</TH><TH>Tamanho</TH><TH>Páginas</TH><TH>Estado</TH><TH>Controle</TH></TR> </THEAD> <TBODY> {[job_id] diff --git a/templates/pt_BR/pager.tmpl b/templates/pt_BR/pager.tmpl index a94ed45bb..b388105cd 100644 --- a/templates/pt_BR/pager.tmpl +++ b/templates/pt_BR/pager.tmpl @@ -1,6 +1,7 @@ <TABLE CLASS="inset" SUMMARY="Barra de paginação"> <TR> - <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Mostrar anterior"></FORM>: }</TD> - <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Mostrar próximo ▶"></FORM>: }</TD> + <TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="◀◀ Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Mostrar anterior"></FORM>: }</TD> + <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Mostrar próximo ▶"></FORM>: } + {LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last ▶▶"></FORM>:}</TD> </TR> </TABLE> diff --git a/templates/pt_BR/printers.tmpl b/templates/pt_BR/printers.tmpl index 9331ab0b8..74e62a20d 100644 --- a/templates/pt_BR/printers.tmpl +++ b/templates/pt_BR/printers.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Lista de impressoras"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Nome da fila <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Nome da fila <SMALL>▼</SMALL>}</A></TH><TH>Descrição</TH><TH>Localização</TH><TH>Marca e modelo</TH><TH>Estado</TH></TR> +<TR><TH>Nome da fila</TH><TH>Descrição</TH><TH>Localização</TH><TH>Marca e modelo</TH><TH>Estado</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/ru/classes.tmpl b/templates/ru/classes.tmpl index 9b90b761c..a482ec7bb 100644 --- a/templates/ru/classes.tmpl +++ b/templates/ru/classes.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Список групп"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Наименование <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Наименование <SMALL>▼</SMALL>}</A></TH><TH>Описание</TH><TH>Расположение</TH><TH>Состав</TH><TH>Статус</TH></TR> +<TR><TH>Наименование</TH><TH>Описание</TH><TH>Расположение</TH><TH>Состав</TH><TH>Статус</TH></TR> </THEAD> <TBODY> {[printer_name] diff --git a/templates/ru/jobs.tmpl b/templates/ru/jobs.tmpl index ed320e857..0359c3458 100644 --- a/templates/ru/jobs.tmpl +++ b/templates/ru/jobs.tmpl @@ -1,7 +1,7 @@ {#job_id=0?: <TABLE CLASS="list" SUMMARY="Задания"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Номер <SMALL>▲</SMALL>:<SMALL>▼</SMALL> ID <SMALL>▼</SMALL>}</A></TH><TH>Название</TH><TH>Пользователь</TH><TH>Размер</TH><TH>Страниц</TH><TH>Статус</TH><TH>Управление</TH></TR> +<TR><TH>Номер</TH><TH>Название</TH><TH>Пользователь</TH><TH>Размер</TH><TH>Страниц</TH><TH>Статус</TH><TH>Управление</TH></TR> </THEAD> <TBODY> {[job_id] diff --git a/templates/ru/pager.tmpl b/templates/ru/pager.tmpl index 0d0459b16..14eac868c 100644 --- a/templates/ru/pager.tmpl +++ b/templates/ru/pager.tmpl @@ -1,6 +1,7 @@ <TABLE CLASS="inset" SUMMARY="Просмотр по страницам"> <TR> - <TD WIDTH="50%">{PREV?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Предыдущая"></FORM>: }</TD> - <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{?ORDER}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Следующая ▶"></FORM>: }</TD> + <TD WIDTH="50%">{PREV?{PREV>0?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="◀◀ Show First"></FORM> :}<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{PREV}"><INPUT TYPE="SUBMIT" VALUE="◀ Предыдущая"></FORM>: }</TD> + <TD WIDTH="50%" ALIGN="RIGHT">{NEXT?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{NEXT}"><INPUT TYPE="SUBMIT" VALUE="Следующая ▶"></FORM>: } + {LAST?<FORM ACTION="{THISURL}" METHOD="GET"><INPUT TYPE="HIDDEN" NAME="QUERY" VALUE="{?QUERY}"><INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{?WHICH_JOBS}"><INPUT TYPE="HIDDEN" NAME="FIRST" VALUE="{LAST}"><INPUT TYPE="SUBMIT" VALUE="Show Last ▶▶"></FORM>:}</TD> </TR> </TABLE> diff --git a/templates/ru/printers.tmpl b/templates/ru/printers.tmpl index 939835c19..d71c51e18 100644 --- a/templates/ru/printers.tmpl +++ b/templates/ru/printers.tmpl @@ -1,7 +1,7 @@ {#printer_name=0?: <TABLE CLASS="list" SUMMARY="Список принтеров"> <THEAD> -<TR><TH><A HREF="{THISURL}?QUERY={?QUERY}&WHICH_JOBS={?WHICH_JOBS}&FIRST={FIRST}&ORDER={ORDER=dec?asc:dec}">{ORDER=dec?<SMALL>▲</SMALL> Наименование <SMALL>▲</SMALL>:<SMALL>▼</SMALL> Наименование <SMALL>▼</SMALL>}</A></TH><TH>Описание</TH><TH>Расположение</TH><TH>Драйвер</TH><TH>Статус</TH></TR> +<TR><TH>Наименование</TH><TH>Описание</TH><TH>Расположение</TH><TH>Драйвер</TH><TH>Статус</TH></TR> </THEAD> <TBODY> {[printer_name] |