From 135334ff9d60d58cfb61f198fd41fcf1225fbcf5 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Tue, 25 Jun 2019 17:25:01 +0200
Subject: [PATCH] ODPSH-31: layout changes and sort oder
---
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo | Bin 8386 -> 8738 bytes
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po | 22 ++++++++-
ckanext/odsh/public/odsh.css | 40 +++++++++++++++-
ckanext/odsh/templates/datarequests/base.html | 2 +-
.../odsh/templates/datarequests/comment.html | 44 ++++++++++++++++++
.../odsh/templates/datarequests/index.html | 12 ++++-
ckanext/odsh/templates/datarequests/show.html | 35 +-------------
.../datarequests/snippets/comment_form.html | 2 +-
.../datarequests/snippets/comments.html | 9 +---
.../snippets/datarequest_item.html | 4 +-
.../snippets/datarequest_list.html | 3 --
.../snippets/custom_search_form.html | 26 +++++++++++
.../odsh/templates/snippets/search_form.html | 2 +
ckanext/odsh/tests/test_selenium.py | 4 ++
14 files changed, 153 insertions(+), 52 deletions(-)
create mode 100644 ckanext/odsh/templates/snippets/custom_search_form.html
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo
index 98510aaaa8b8077e816b5e300aabaeb12c971117..61e86088ccb091026d523f00b79b60f8a22e23a3 100644
GIT binary patch
delta 2582
zcmX@)xX7jco)F7a1_lO(J_ZH`83qQ19u^P}f&XwYFfcPPF#LtmjGPcYD<=a3NGT_j
z&&SEYAjH7HAjHYQz|X+IpvuX>z|FwGU<#!jIU(lzaxyTmGB7Y?aWXKlGceRM6mT*y
zh%+!SRB$pd@G>wkOn_>b2c=hWGBEHlFfeR`8hjLL@l`1Q7AFG(7Xt&sD^3OmK?Vkf
zubd1F3JeSk>|6{Ck_-$C8e9-@CoYJ(5H5(r;<-Q$sb^rw=7PAqkc)wVje&uog^PiK
zlYxPun~Q-#f`NfyDpY(O7XyO;0|UcWsDa107#PGD7#MDFfqla89%{jNu)z!rOxzIj
zIJhAm;OAyw5M^LskmF`xP-S3XFyUrk;H_t1V2I*oU{GOTV94NRU=U$oVCdy$V31{C
zU|7TrvETqmAp--$b#91{o^mrVa4;}1{D&IM!2|LM1A{mZ#3ET9h&ehu5RW)QX>T5g
z&qH}2QIyETz)%nJVIfpO7Y_r2H3I{~6dnc!DFz0H3p|iGe$B(cz{9}6@BwPUUmgYq
zT?PgQ9$tu#tau>~2;hY{EQ}Z8^LSo}gVLblrM!@+uH%K6JB^p29-LTaLj_htHEiI8
zxNtu�Tf02Hb?IdjzGQL+LlXkhuK_)&B=7&dmq0NB~NU@-Z+dGB7YmLHRa(^^mx8
z<b$}}6G{j1LByk>3X}ODKFZ*OB+`67NZP1{%1`5i1nq1-1_o^g28QK)kdVC02gxn`
z{E$Q_%nz|gl^^0Ty?TBI24MyU24j9mP`dL&f+&_Bl8Q_DA&F%gKLdj%0|UbzDE}E$
zo=1RzL5_ieL015x-bVnEc5($EX{B3$fkB>ufnh0>e^dZs@qGbEqOX4f75EM{=#K!z
zXVQWY1tx+J4eo*vhx!OYEKCrDIJjOAV)0Z#NK|bTWME)oU|=`^)puAB;*b-93=Gl?
z3=EG185pb>7#RKuGBD_Y^1r1J1A`YR^$RgDSTHa!Y!+f*n83)u@J0v{)U_gzw9qXA
zNlde$^ePcZkna?Ms5>eGNu-xWAP##V0`bT<5l9H~i$c_yibB*mi-H_f&%h8M3Nbhb
zDp3vPcZfpbY`Q2U->(#fq=8+c5DN~9LbB&|DF2-(1A`g^0|Sc~B*?YJAQpOyLDWZz
zLF~yFgQTrGF$M+!Q2uWdgBUzr43diHi9v#XC6vEMjDbO!fq~(;7z2Y60|UcrF-R2f
zi9_`1LTM9mNH(;F@*Tw?<$#Ac$fpbpvEq=#St$;2$Wn0zhI&xq*&+@pn=gw)T>b&d
z7m$Div91IpQCUhrq9R-Z5;Ex$ki=Rk0rBBPD1W&GB*gYhKtkYx1SD<TlYpd!7f|&~
zk_`3WGG9WHfgyx}fk90YlFF+kAsUxTLK59(Nr(l<B^elu7#JAtN<theAO-QUffU37
zGbu=jI6(RCQjo+OC<Td{FewHGTLuP(S}91#?3RM&{|izOAKj3Gxcn8=fZtG>RT|<`
zerbpg)TJSD=qL?wsHZeUf4DTn0h!W}d|x09iLw%D1_m7l28QX<kSIPP4JilC*GofO
zegjHBg3@oKAwK>l4GD4{8Ay>UBg4R8&cMLnCBwjAz`(%JBm;5qW*JDDI3feiRt%42
zAR!|p3vrl)ECaZD){=!d&{h_ruiizLfkA_Tfgw~DVnLlO#DX=l5CfmcLJVY<gJdHk
zIY?TFkb^`;nH(f&SIR;3Uyy?&vVU?642BF03|jIKkHpABg1kr`VsX1X*qnNX8S)Ga
zTA=z}9#S?xl!v&KSpkwL#S|b08!JE@mZ$(Rc%}lRh&`<U2}*WFNRSICLZU`Q5mJfC
zC_>CJSA=*VM3I5Pl7WGtN|AxV8C0!pQG_JAABvM_am?aW2q?-g$S+RJnXJz#sqB(i
zlB(cXoSd4Ml9`vz0Oq=+BKY}vshiz7pEHX2<twBlmLw_^Ky@pm<(KBAY}VyAWm7{F
zWT?(7%}q)zszuc?xkgZKbGD!oGiO<TQE_rcPGb7xb`e<(m&B6NT!qBawBnM~%=FZ}
z6p$-GB1v!ox74DN%*~5L0-2<}Q#11vK+epAo1&1OnpT>ZlDhe$m=ULpYf*Y?QeI{;
O!WA%);?&8K3M&D!B_k;S
delta 2265
zcmZ4Fa>%j%o)F7a1_lO(4h9AW83qQ17#0u@f#+~AFfcPPFwBM03!(H<4h9C0(v?vD
zIt~T~AqED9O&kmi{0s~XM>!Z6xEUB2u0rXD91!#0axgHkGB7Z3aWXKlGceRM2yikm
zh%+!SNN_?l7(i(oPKZGsoD2+H3=9kroD2+t3=9m(oD2*K3=9mVoD2+-3=9m@pyC^#
z>JCBmpXG#DbdwX}u=|`03~USx44*g|7&sXi7=CgxFi0@eGcYi7K_q0j7#IW?7#Nhf
zAQqW$F))ZRFfh1rfnCZF%LQ>rDi_4y0;s++E(QiZ1_p*&E(Qis1_p*6E(Qiw1_p*j
zTnr4n3=9k>xEL5z7#J9?aWOE6FfcIu=3-!wWnf?s;AUXpt!H3h(Bp>q#D<%JfrEj8
zA&eVhU_3X(qC6<Sgd1W&GdIKsGobV$Zb-<j;f93R4sMXo7#L1K<sWi0FjzA%Fudkw
zV31;9U{L3QM4b~414BIz0|SFQ55&R{9tH+oP!RJ#d@_*-;(+Bm5QnYhfrQjHsQSH7
z@iRP-D7*?a_$?2_A)lapCSHj7?7R?hF<yuV)OZ={!9F(Ng}BHPO4~tcXI@B<dq52c
zhKeUa>2xTa!^^;+$iTo*2<1=ag+$p5UWmgNK<SlG@l8;5yFlR&N)-EfA#rt#7ZP+=
zpbFmdLW1@aF9U-%0|Uc9UPw@C@j-G$8XqLBWbr{Ps^Nopq?M0>L70Jop^Fa^lJoc=
zA+&`Ll6cSXLDI<EdOijQO$G)AVSb2!Ek8s-GCu=@90LPG3zWZ@AChQ}@I%tdBYp-3
zc?JfCKTy7m0K{T50Z3}MhVuOcAm#)MKs;6imG6ei*UuAxxO6d8;dTLti?0bl9P&m0
z5?8!}3=B*R3=HCe5R0S)Ar6rjWMGhHU|_HmWMI%^U|<LpWMJ?DIb4u|!GeK-;k+ON
z!vsbK1`Z)e2+tITq=Dta;51RsupPo+I3^4U>Z`&Kg%5=p7(j{hy)eW<e}o}E5E6le
zl(q;&U7!d=UAzdyAvsWfhX~jLhN&VD{Yyk3*?AX~e^G>iK@F7upNl|(l1~(3pq?m1
zgN-P}fFMywVoDT+ln<GrkX%qD3Q3%eqL3i(f%4~zGB7AJFfgnVWnfTZU|={W3W<V`
zP<;Yo5dGp}3=FKG{4WO;P!WUVZ*4J%PaMP`i7rMA;*bt8h(XiEAVujmF^I!2i$Ox}
zvlt|e{1<}+v8*^Gaq5ag5}&;|#AD%5ey%tJLp`X(YZZt1e402Uu9t{I;&vTW!wIPT
zJ#hwx5C#T@H{y^)>nH)ymn{KFLzNN`3wk9O7>pPg7#2%F9C%FvQjUC+fSCVB0ulmj
zk_`3WvY1yAlBmQbL2<&sAS21ZV9UV3;4BFVkw!^K6ikzZ_-LLaBq}yYLJT|zrB6#j
ze0o(9;(@nNee6;Yhw@87^vg;?9H1`+D*qW67|f&~ab+dNz@Wpxzz{11iQ6tINWPvb
z1+i!zlwJX)H%UQ!yhjQW<d>u%CFmn51_pCb886MiV8Fn@;2{lhaHTXP3cI8sxn*U&
zG$d$lNJCt9Pa2Y#K1f4c$SecV$R)$TpuxbvAT0y2z(odPL6Ho^z*RC315e68a>oxD
zNLrASg+zsoEF@&}Wg+^f$wJar{SjFP215o0h7Yn3pD4*eg4{w5VzI9r#Gp7i1_mt#
z28J3rNKw074&u<0a*)J$M-F1}PdSLg)a4=O#>+!W%!%@lkUT37DLJpngQHZN;g&q4
zR(d24G3c*61A`?41A~+T1A{XI14D=cB(cp<nEZ=l*5pN;BAah<K4aW`o!f+Mvzw4M
Y^W+9m@y!QC{h2oFN*HiXZdRNR03T%1KL7v#
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 4a07dff1..8921df3a 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -428,4 +428,24 @@ msgid "Released"
msgstr "Veröffentlicht"
msgid "Suggester"
-msgstr "Vorschlagende"
\ No newline at end of file
+msgstr "Vorschlagende"
+
+msgid "Done"
+msgstr "Fertig"
+
+msgid "Data Proposal"
+msgstr "Datenvorschlag"
+
+msgid "No data proposal found"
+msgstr "Kein Datenvorschlag gefunden"
+
+msgid "{number} data proposal found"
+msgid_plural "{number} data proposals found"
+msgstr[0] "{number} Ergebnis"
+msgstr[1] "{number} Ergebnisse"
+
+msgid "Date Descending"
+msgstr "Datum absteigend"
+
+msgid "Date Ascending"
+msgstr "Datum aufsteigend"
\ No newline at end of file
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index 9b33a5d5..06f5f105 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -1965,6 +1965,12 @@ p.package-info-categorie
background-color: #003064;
}
+.label.label-closed
+{
+ color: white;
+ background-color: #DBDBDB;
+}
+
.datarequest-subtitle
{
font-size: 12px;
@@ -1990,7 +1996,8 @@ p.package-info-categorie
.odsh-comment-wrapper{
padding-left: 0px;
- max-width: 400px;
+ max-width: 470px;
+ margin-bottom: 25px;
}
.odsh-comment-wrapper .controls{
@@ -2030,4 +2037,35 @@ p.package-info-categorie
.datarequest .additional-info{
font-weight: normal;
font-size: 13px;
+ display: table-cell;
+ width: 220px;
+ padding-left: 25px;
+}
+.datarequest-primary {
+ display: table-cell;
+ width: 715px;
+}
+.datarequest .primary.span9 {
+ width: 960px;
+ padding-left: 0px;
+}
+.datarequest .additional-info .dataset-details{
+ display: inline-block;
+}
+.datarequest .additional-info .label{
+ margin: 8px;
+}
+.datarequest .dataset-meta
+{
+ padding-left: 25px;
+}
+
+.datarequest .dataset-heading
+{
+ max-width: 100%;
+}
+
+.datarequest .dataset-content .icon-comment
+{
+ margin-top: 10px;
}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/datarequests/base.html b/ckanext/odsh/templates/datarequests/base.html
index 3bcc18e5..933720ee 100644
--- a/ckanext/odsh/templates/datarequests/base.html
+++ b/ckanext/odsh/templates/datarequests/base.html
@@ -9,7 +9,7 @@
{% endblock %}
{% block breadcrumb_content %}
- <li class="active">{% link_for _('Data Requests'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
+ <li class="active">{% link_for _('Data Proposal'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
{% endblock %}
{% block main_content %}
diff --git a/ckanext/odsh/templates/datarequests/comment.html b/ckanext/odsh/templates/datarequests/comment.html
index d778bf81..5b550518 100644
--- a/ckanext/odsh/templates/datarequests/comment.html
+++ b/ckanext/odsh/templates/datarequests/comment.html
@@ -22,6 +22,15 @@
{% link_for _('Close'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='close', id=datarequest_id, class_='btn btn-danger', icon='lock' %}
{% endif %}
+<h2 class="page-heading">
+ {% block page_heading %}
+ {{c.datarequest.title}}
+ {% endblock %}
+</h2>
+
+<div class='datarequest-primary'>
+{{ h.render_markdown(h.get_translated(c.datarequest, 'description')) }}
+
{% snippet "datarequests/snippets/comments.html", comments=c.comments, datarequest=c.datarequest, errors=c.errors, errors_summary=c.errors_summary, updated_comment=c.updated_comment %}
{% if h.check_access('comment_datarequest', {'id':c.datarequest.id }) %}
@@ -37,5 +46,40 @@
{% snippet "datarequests/snippets/comment_form.html", datarequest=c.datarequest, errors=c.errors, errors_summary=c.errors_summary, offering=c.offering, initial_text=c.updated_comment.comment if create_comment_error, focus=create_comment_error, current_user=c.userobj %}
</div>
{% endif %}
+</div>
+
+<section class="additional-info">
+ {% block package_additional_info %}
+ <div>{{ _('Released') }}: {{ h.odsh_render_datetime(c.datarequest.open_time) }}</div>
+ <div>{{ _('Suggester') }}: {{ c.datarequest.user['display_name'] if c.datarequest.user else _('None') }}</div>
+ {#<td class="dataset-details" title="{{ c.datarequest.close_time }}">{{ h.time_ago_from_timestamp(c.datarequest.close_time) if c.datarequest.close_time else _('Not closed yet') }}</td>#}
+ <div >{{ _('Status') }}:
+ <div class="dataset-details">
+ {% if c.datarequest.get('closed', False) %}
+ <div class="label label-closed">
+ {% trans %}Closed{% endtrans %}
+ </div>
+ {% else %}
+ <div class="label label-open">
+ {% trans %}Open{% endtrans %}
+ </div>
+ {% endif %}
+ </div>
+ {#{% if c.datarequest.closed %}
+ <tr>
+ <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
+ <td class="dataset-details">
+ {% if c.datarequest.accepted_dataset %}
+ {% link_for c.datarequest.accepted_dataset['title'], controller='package', action='read', id=c.datarequest.accepted_dataset.get('id') %}
+ {% else %}
+ {{ _('None') }}
+ {% endif %}
+ </td>
+ </tr>
+ {% endif %}
+ #}
+ <div class='comment-count-wrapper'><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(c.datarequest.get('id', '')) }}</span> </div>
+ {% endblock %}
+</section>
{% endblock %}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/datarequests/index.html b/ckanext/odsh/templates/datarequests/index.html
index bde650ab..947e326e 100644
--- a/ckanext/odsh/templates/datarequests/index.html
+++ b/ckanext/odsh/templates/datarequests/index.html
@@ -4,7 +4,8 @@
<section class="module">
<div class="module-content">
{% block page_primary_action %}
- {% snippet 'snippets/custom_search_form.html', query=c.q, fields=(('organization', c.organization), ('state', c.state)), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=false, count=c.datarequest_count, no_title=True %}
+ <form id='datarequest-search-form' method="get" data-module="select-switch">
+ {% snippet 'snippets/custom_search_form.html', form_id='datarequest-search-form', query=c.q, fields=(('organization', c.organization), ('state', c.state)), sorting=c.filters, sorting_selected=c.sort, placeholder=_('Search Data Requests...'), no_bottom_border=false, count=c.datarequest_count, no_title=True, type='datarequest' %}
{{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page, q=c.q)}}
{% if h.check_access('create_datarequest') %}
<div class="add_request_container">
@@ -16,9 +17,16 @@
</section>
{% endblock %}
-{% block secondary_content %}
+{% block secondary%}
+{% endblock %}
+
+{#{% block secondary_content %}
{{ super() }}
{% for facet in c.facet_titles %}
{{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet) }}
{% endfor %}
+{% endblock %}#}
+
+{% block pre_wrap %}
+</form>
{% endblock %}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/datarequests/show.html b/ckanext/odsh/templates/datarequests/show.html
index 8f6ed711..72eba0b5 100644
--- a/ckanext/odsh/templates/datarequests/show.html
+++ b/ckanext/odsh/templates/datarequests/show.html
@@ -25,40 +25,7 @@
{{ h.build_nav_icon('show_datarequest', _('Data Request'), id=datarequest_id) }}
{% endblock %}
-{% block secondary_content %}
-<section class="additional-info">
- {% block package_additional_info %}
- <div>{{ _('Released') }}: {{ h.odsh_render_datetime(c.datarequest.open_time) }}</div>
- <div>{{ _('Suggester') }}: {{ c.datarequest.user['display_name'] if c.datarequest.user else _('None') }}</div>
- {#<td class="dataset-details" title="{{ c.datarequest.close_time }}">{{ h.time_ago_from_timestamp(c.datarequest.close_time) if c.datarequest.close_time else _('Not closed yet') }}</td>#}
- <div >{{ _('Status') }}:
- <div class="dataset-details">
- {% if c.datarequest.get('closed', False) %}
- <div class="datarequest-label label-closed">
- {% trans %}Closed{% endtrans %}
- </div>
- {% else %}
- <div class="label label-open">
- {% trans %}Open{% endtrans %}
- </div>
- {% endif %}
- </div>
- {#{% if c.datarequest.closed %}
- <tr>
- <th scope="row" class="dataset-label">{{ _('Accepted Dataset') }}</th>
- <td class="dataset-details">
- {% if c.datarequest.accepted_dataset %}
- {% link_for c.datarequest.accepted_dataset['title'], controller='package', action='read', id=c.datarequest.accepted_dataset.get('id') %}
- {% else %}
- {{ _('None') }}
- {% endif %}
- </td>
- </tr>
- {% endif %}
- #}
- <div class='comment-count-wrapper'><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(c.datarequest.get('id', '')) }}</span> </div>
- {% endblock %}
-</section>
+{% block secondary %}
{% endblock %}
{% block primary_content_inner %}
diff --git a/ckanext/odsh/templates/datarequests/snippets/comment_form.html b/ckanext/odsh/templates/datarequests/snippets/comment_form.html
index cbbea780..fedeb4e3 100644
--- a/ckanext/odsh/templates/datarequests/snippets/comment_form.html
+++ b/ckanext/odsh/templates/datarequests/snippets/comment_form.html
@@ -14,7 +14,7 @@
<div class="controls control-full control-large control-group {{ 'error' if errors and errors.get('Comment') and focus }} editor">
{% set markdown_tooltip = "<pre><p>__Bold text__ or _italic text_</p><p># title<br>## secondary title<br>### etc</p><p>* list<br>* of<br>* items</p><p>http://auto.link.ed/</p></pre><p><b><a href='http://daringfireball.net/projects/markdown/syntax' target='_blank'>Full markdown syntax</a></b></p><p class='muted'><b>Please note:</b> HTML tags are stripped out for security reasons</p>" %}
- <textarea name="comment" cols="20" rows="6" placeholder="{{ _('Add a new Comment') if not comment_id }}">{{ initial_text }}</textarea>
+ <textarea name="comment" cols="20" rows="9" placeholder="{{ _('Add a new Comment') if not comment_id }}">{{ initial_text }}</textarea>
</div>
<div class="comment-form-actions">
diff --git a/ckanext/odsh/templates/datarequests/snippets/comments.html b/ckanext/odsh/templates/datarequests/snippets/comments.html
index 8ac76155..56f89e81 100644
--- a/ckanext/odsh/templates/datarequests/snippets/comments.html
+++ b/ckanext/odsh/templates/datarequests/snippets/comments.html
@@ -1,10 +1,4 @@
-<h2 class="page-heading">
- {% block page_heading %}
- {{datarequest.title}}
- {% endblock %}
-</h2>
-{{ h.render_markdown(h.get_translated(datarequest, 'description')) }}
<h2 class='comments-heading'>{{_('Comments')}}:</h2>
@@ -16,4 +10,5 @@
<p class="empty">
{{ _('This data request has not been commented yet') }}
</p>
-{% endif %}
\ No newline at end of file
+{% endif %}
+
diff --git a/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html b/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html
index 310c114e..7c57d2eb 100644
--- a/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html
+++ b/ckanext/odsh/templates/datarequests/snippets/datarequest_item.html
@@ -9,8 +9,8 @@
<div class="dataset-heading ">
<div class="span1">
{% if datarequest.get('closed', False) %}
- <div class="datarequest-label label-closed">
- {% trans %}Closed{% endtrans %}
+ <div class="label label-closed">
+ {% trans %}Done{% endtrans %}
</div>
{% else %}
<div class="label label-open">
diff --git a/ckanext/odsh/templates/datarequests/snippets/datarequest_list.html b/ckanext/odsh/templates/datarequests/snippets/datarequest_list.html
index 841a8bfa..90c75c19 100644
--- a/ckanext/odsh/templates/datarequests/snippets/datarequest_list.html
+++ b/ckanext/odsh/templates/datarequests/snippets/datarequest_list.html
@@ -1,6 +1,3 @@
-{% set title= _('No Data Requests found') if datarequest_count == 0 else '%s datarequest found' % datarequest_count %}
-
-<!--<h2>{{ title }}</h2>!-->
{% block datarequest_search_results_list %}
{% if datarequests %}
diff --git a/ckanext/odsh/templates/snippets/custom_search_form.html b/ckanext/odsh/templates/snippets/custom_search_form.html
new file mode 100644
index 00000000..7e74adaf
--- /dev/null
+++ b/ckanext/odsh/templates/snippets/custom_search_form.html
@@ -0,0 +1,26 @@
+{% extends "snippets/search_form.html" %}
+
+{% block search_title %}
+
+ <h2>
+ {% set text_query = ungettext('{number} data request found for "{query}"', '{number} data requests found for "{query}"', count) %}
+ {% set text_query_none = _('No data requests found for "{query}"') %}
+ {% set text_no_query = ungettext('{number} data proposal found', '{number} data proposals found', count) %}
+ {% set text_no_query_none = _('No data proposal found') %}
+
+ {% if query %}
+ {%- if count -%}
+ {{ text_query.format(number=h.localised_number(count), query=query) }}
+ {%- else -%}
+ {{ text_query_none.format(query=query) }}
+ {%- endif -%}
+ {%- else -%}
+ {%- if count -%}
+ {{ text_no_query.format(number=h.localised_number(count)) }}
+ {%- else -%}
+ {{ text_no_query_none }}
+ {%- endif -%}
+ {%- endif -%}
+ </h2>
+
+{% endblock %}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/snippets/search_form.html b/ckanext/odsh/templates/snippets/search_form.html
index d9361460..52b85f3d 100644
--- a/ckanext/odsh/templates/snippets/search_form.html
+++ b/ckanext/odsh/templates/snippets/search_form.html
@@ -4,6 +4,8 @@
{% set sorting_label_prefix = _('Order by') %}
{% if type=='organization' %}
{% set sorting = sorting if sorting else [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %}
+{% elif type=='datarequest' %}
+{% set sorting = [(_('Date Ascending'), 'asc'), (_('Date Descending'), 'desc')] %}
{% else %}
{% set sorting = [
(_('Relevance'), 'score desc, metadata_modified desc'),
diff --git a/ckanext/odsh/tests/test_selenium.py b/ckanext/odsh/tests/test_selenium.py
index 84046eda..7c478c46 100644
--- a/ckanext/odsh/tests/test_selenium.py
+++ b/ckanext/odsh/tests/test_selenium.py
@@ -50,6 +50,10 @@ class TestSelenium:
assert 'dataset/'+title in TestSelenium.app.currentUrl()
+ # def test_search_order(self):
+ # TestSelenium.app.got_to_url('/dataset/')
+
+
@depends(after=test_create_dataset)
def test_edit_paths(self):
paths = ['/organization/edit/' + test_org,
--
GitLab