diff --git a/tabellio/searchform/batch_macros.pt b/tabellio/searchform/batch_macros.pt index 665b29e..2f7b213 100644 --- a/tabellio/searchform/batch_macros.pt +++ b/tabellio/searchform/batch_macros.pt @@ -22,7 +22,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. + tal:attributes="href python: '%s?%s#%s' % (url , mq( batchlinkparams, {batch.b_start_str:p.first} ), batch.b_start_str)"> « Previous @@ -42,7 +42,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. + tal:attributes="href python: '%s?%s#%s' % (url , mq( batchlinkparams, {batch.b_start_str:n.first} ), batch.b_start_str)"> Next n @@ -67,7 +67,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. 1 + tal:attributes="href python: '%s?%s#%s' % (url, batch.pageurl(batchlinkparams,1), batch.b_start_str);">1 … @@ -84,7 +84,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. tal:define="page python:linklist[0]; query python:linklist[1];" tal:content="page" - tal:attributes="href python: '%s?%s' % (url,query)" > + tal:attributes="href python: '%s?%s#%s' % (url,query, batch.b_start_str)" > … @@ -99,7 +99,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. tal:define="page python:linklist[0]; query python:linklist[1];" tal:content="page" - tal:attributes="href python: '%s?%s' % (url,query)" > + tal:attributes="href python: '%s?%s#%s' % (url,query, batch.b_start_str)" > @@ -119,7 +119,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. tal:define="page python:linklist[0]; query python:linklist[1];" tal:content="page" - tal:attributes="href python: '%s?%s' % (url,query)" > + tal:attributes="href python: '%s?%s#%s' % (url,query, batch.b_start_str)" > @@ -134,7 +134,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. tal:define="page python:linklist[0]; query python:linklist[1];" tal:content="page" - tal:attributes="href python: '%s?%s' % (url,query)" > + tal:attributes="href python: '%s?%s#%s' % (url,query,batch.b_start_str)" > @@ -147,7 +147,7 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. … 3457 @@ -163,6 +163,5 @@ template with a tal:define="batch_base_url YOUR_BASE_URL" tales expression. Abonnez-vous au flux de cette recherche - diff --git a/tabellio/searchform/simple.pt b/tabellio/searchform/simple.pt index 08b7404..40855b1 100644 --- a/tabellio/searchform/simple.pt +++ b/tabellio/searchform/simple.pt @@ -19,11 +19,15 @@ doc_results view/doc_results; event_results view/event_results; b_size python:5; b_size request/b_size | b_size; - b_start python:0;b_start request/b_start | b_start; - deputy_batch python:Batch(list(deputy_results), b_size, int(b_start), orphan=1); - page_batch python:Batch(list(page_results), b_size, int(b_start), orphan=1); - doc_batch python:Batch(list(doc_results), b_size, int(b_start), orphan=1); - event_batch python:Batch(list(event_results), b_size, int(b_start), orphan=1); + b_start python:0; + b_deputy_start python:0;b_deputy_start request/b_deputy_start | b_start; + b_page_start python:0;b_page_start request/b_page_start | b_start; + b_doc_start python:0;b_doc_start request/b_doc_start | b_start; + b_event_start python:0;b_event_start request/b_event_start | b_start; + deputy_batch python:Batch(list(deputy_results), b_size, int(b_deputy_start), orphan=1, b_start_str='b_deputy_start'); + page_batch python:Batch(list(page_results), b_size, int(b_page_start), orphan=1, b_start_str='b_page_start'); + doc_batch python:Batch(list(doc_results), b_size, int(b_doc_start), orphan=1, b_start_str='b_doc_start'); + event_batch python:Batch(list(event_results), b_size, int(b_event_start), orphan=1, b_start_str='b_event_start'); ">
-

Députés

+

Députés

Nombre de résultats : Filtre avancé @@ -66,7 +70,7 @@
-

Documents et dossiers

+

Documents et dossiers

Nombre de résultats : Filtre avancé @@ -90,7 +94,7 @@
-

Événements

+

Événements

Nombre de résultats : Filtre avancé @@ -113,7 +117,7 @@
-

Ailleurs sur le site

+

Ailleurs sur le site

Nombre de résultats :