From c9a71db3f8f5cfa304b1747ec65e6bd75e9bafe0 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Tue, 4 Dec 2018 12:28:20 +0100
Subject: [PATCH] ODPSH-96: layout changes
---
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo | Bin 4856 -> 4848 bytes
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po | 2 +-
.../odsh/public/base/images/arrow-left-w.png | Bin 0 -> 263 bytes
.../odsh/public/base/images/arrow-right-b.png | Bin 0 -> 538 bytes
.../odsh/public/base/images/arrow-right-w.png | Bin 0 -> 257 bytes
.../odsh/public/base/images/arrow-right.svg | 2 +-
ckanext/odsh/public/odsh.css | 33 ++++++++++++++++++
.../package/snippets/package_form.html | 16 +++++----
.../package/snippets/resource_form.html | 10 +++---
9 files changed, 50 insertions(+), 13 deletions(-)
create mode 100644 ckanext/odsh/public/base/images/arrow-left-w.png
create mode 100644 ckanext/odsh/public/base/images/arrow-right-b.png
create mode 100644 ckanext/odsh/public/base/images/arrow-right-w.png
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo
index 12a5c1c94fe3e25078d66c4e902cdbd5eecd1737..40b4725c9886c5f325b80de9c9dac33db04bbf0c 100644
GIT binary patch
delta 740
zcmeyN`ayMr4O6{10|P?{Cj)~j0|P@2Cj)~V0|Ub(P6h@A1_p+WoD2+-3=9mHI2jl?
z85kJea56A3F)%QE<78maV_;zT$;rUr#lXOz!NtH}!N9;!%*DVkfsuh>4Hp9gF9QRE
zEe`{O1Oo$uHxC1YAp-+L3J=7dX*>}5Jv<Ec3_J`B45xS)!1Q$<1_n_E28Jg*3=Ap^
z3=F?`7#PGD7#QSvA>wAd3=C=v3=BTJ3=Hxh3wa?1O@_)Z<Yi#sV_;y|&db2S&cMKM
zjF*8yfPsPG94`X{8v_HweO?9zE(QjMXS@syLJSNHA9?E`0xWzG1^iH2jE{kVm4Sgl
z7Rp!VV_*<rU|`VVV_?u`U|_K4gM?Hz9|MC70|P@BAH+e+`4||u85kIj^D!{UGB7Y)
z=7Tu=BOe0;D5Tl>At5Qx&%mI?z`&qc&(FZ12#NxJNKlvYGcaf}FfdHuhxlw4KLdj>
z0|UbeeuzPL_!$_C7#J8n@k1<B6@WO@RRChJw*bT=p-_H|00RRH0|P^v03_tH1t1=o
zBmfDa`sD%)41x>{4C@6TL3I$S@sa?<0e7JCuLKwvm>C!t{s=HIa4;}{HG$Fury#^)
zVJIyt2r)-p5aJLEDBoU?fkA_TfgwPUfkBsnfuT|moEDrImJ33BbXE`&=b(rIr2$nT
zh(*>y5Q|-e7#J)W7#KW+7#N%x7#Ny_AR%>Z^G}up7Pidd;?mTV$=#gNn;SUg**7l~
H2xkHS>Z3=e
delta 742
zcmeyM`a^Yt4O6`=0|P?{Cj)~j0|P@5Cj)~V0|UbhP6h@A1_p-hoD2+-3=9l6I2jl?
z85kHoaWXJ4F)%Rv;bdUYV_;zT&&j~x#lXOz$Hl;4!N9;!$;H4hfsuh>6Bh#mF9QRE
zGY<oU1Oo#@AP)nBAp-+L77xUpIXn>gLp%)i3_J`B3>SD9!1P@n1_n_E28LHW3=Ap^
z3}97a3=9mayby64UIqp=1_p*8UIqqvkcGTpB@8p6^2>P{82A_%820iqFt9T)Fr49K
zU=UznV7S7|z`(}9!0?opfq{#Gf#D4=1A`C)1H*UTdWZlQA4GvDl$PORU|?lnU{Hqg
zHTf7AL>L$t4EPurv>6x}T=^g&RmjJ{Aj81GFo6%^ptXDq4BQM13}^Wm7(gL=lMmwX
z?|cjl;voO<LqbxOpMgP(fq_B4o}Yn1k%56BiXRfxHT(<=nhXpK)A%7iJHXGtAk4tP
zaE>2h&?9~Z1|tRrh9CS83$+Cx4)qp*7#t`7@klh3pCrJ*z{0@5kRt#Ixk3R322hC3
z5P*bG{dxfg20>6<3qXSEBvj)q0f+;hK;=IPFfcGPFfgzPGB9v3FfeckLM#-7($Y{`
zRS;s1z97UQ4p6?kAOnL20|P^ZAOnLg0|P^&AUG{JF{~Ga_~@!2B+fa6AU@R<f>`7%
z1hLphh=IY9fq@}Fh=IYGfq|h*2oh4~HveQvVBsk!P0GnE&WKM*EJ@uQ&uPWJdAdL(
F69B$UNeTb}
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 86aa683e..f3a8b8d5 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -130,7 +130,7 @@ msgid "Upload dataset"
msgstr "Hochladen"
msgid "another dataset"
-msgstr "weiterere Distribution"
+msgstr "weitere Distribution"
msgid "timerange"
msgstr "Zeitraum"
diff --git a/ckanext/odsh/public/base/images/arrow-left-w.png b/ckanext/odsh/public/base/images/arrow-left-w.png
new file mode 100644
index 0000000000000000000000000000000000000000..7a28e52497ae047c8adeba02a9730913957b745e
GIT binary patch
literal 263
zcmeAS@N?(olHy`uVBq!ia0vp@3=9mS9Bd2>40H2Rx)>N3I14-?iy0WWg+Q3`(%rg0
z3=9lAJzX3_EP8vV1o9p>;Bm2KYYgCM4B%)M;AjotXcgdSHsEMA;7EROGI(?3_269Z
zf0^%0PsTo(y~=Bmn4o6+nr=tO^1s*r-Bn?bVo+_e`4DzBbB*D~Qri~h6?L{uYu>GJ
zJaFz$k%O|mC`%c84v)i&hYjbBaLnDbBP%U;ClgysdF0FqviVH2S7x8#IFp{na5}T?
z_f?)LMs1GQ(vH0>br(oWKe$}swR*LxV2h;QH(O)n9J4R?djvA&D;TsA7Mo_*F)%PN
Nc)I$ztaD0e0stzwUWWhx
literal 0
HcmV?d00001
diff --git a/ckanext/odsh/public/base/images/arrow-right-b.png b/ckanext/odsh/public/base/images/arrow-right-b.png
new file mode 100644
index 0000000000000000000000000000000000000000..7de757a488c14a4d32ba5851c21d179e5597fd9b
GIT binary patch
literal 538
zcmeAS@N?(olHy`uVBq!ia0y~yVBle3U=ZP8V_;y|`QeTr0|Ns~v6E*A2L}g74M$1`
z0|NtRfk$L90|Va?5N4dJ%_q&kz#v)T8c`CQpH@<ySd_|8US6)3nU`IhoLG>mmtT}V
z`<;yx0|Vo9PZ!4!jfu6F_j_L{lwtdD{r47@dLG_K@(O;woy*;L1tmiI939;SOiaWs
zcJ8#8QX1s!=qw;AYI;S8MJdok<I3H{;K{7HihPbM9A&;|{z#is_T0Gk!DpNI&wtwN
zv0oUnuhUy0CO~FiE_=%qr<K1vmKd+-F7YaS;;QZF=dwxtT%w$%<~*&?V^P*Qi?&=i
z{O-HNls{7*O*r{y`8B2)k*}_XMIT`ZbN$=!=*6dN9=$t^c4!s3Z)}RwG=F}pecv@E
z4Zd2{-pSW4thfDs>&x?Z*O+EVtn9kudBtE!@!zS|r)B@|Pqg-WdbwiK$4kZg+qkW{
z7knw~+My*~zrAvan~Mog@7KAqc~iI#CAWMy^R#B+*26hZXM8X?{eErly3I;K#qF=3
z?un^#FX0xIj&1jSAG<ixd-K)0mHRsEE{Sg~xp3vhsb^oWc^G@|4XV{s{=F_vK3m24
z_x|9_h3&U&*#7C=FP!{)e=h$7%R8&zO|pthlCSHwxR?`c?CAB-eV6_v!JF(_GfwQ!
tjAFZ0(sy6z<(@T7-CfH3Q4=5X|97ZSH{<CmWME)m@O1TaS?83{1OV6x=-mJS
literal 0
HcmV?d00001
diff --git a/ckanext/odsh/public/base/images/arrow-right-w.png b/ckanext/odsh/public/base/images/arrow-right-w.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3acb29187d68a70204e30067a97f43cf3384edb
GIT binary patch
literal 257
zcmeAS@N?(olHy`uVBq!ia0y~yVBle3U=ZbCV_;w?TEoAEfq{Xuz$3Dlfq`2Hgc&d0
zt^32kz_8iV#WBR9w|CM--ev<H7ygz1&vM8rDwl}dSfFg+<(A0emcU}R<J8d=fklcD
zyZRgEFaD9IAj!xgvvub!*P<u;%O>eh%6R!_qO<nN3(P(*`9kVWEG%K?u-nTSD$HW?
zjUo6;Z|H=qunX^=dplH$ga)s)Y~J>;+;_K*k=WGb<vv+S+0n)CdAmP3n@;P~x0V0o
z9yasU+KpTZbrsXC_jAQdvfiv=DqDM|_Y(5~_5-husZ7^nh<EEcCt|6?$il$Dz~JfX
K=d#Wzp$P!(fL#Cp
literal 0
HcmV?d00001
diff --git a/ckanext/odsh/public/base/images/arrow-right.svg b/ckanext/odsh/public/base/images/arrow-right.svg
index 09e90a64..a6e1c044 100644
--- a/ckanext/odsh/public/base/images/arrow-right.svg
+++ b/ckanext/odsh/public/base/images/arrow-right.svg
@@ -1 +1 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 27"><defs><style>.cls-1{fill:#383636;}</style></defs><title>Artboard 1_1</title><polyline class="cls-1" points="15.86 12.68 15.88 12.68 7.15 2.76 4.28 2.76 12.95 12.68 4.28 22.6 7.15 22.6 15.86 12.69"/></svg>
\ No newline at end of file
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 27"><defs><style>.cls-1{fill:#0089ca;}</style></defs><title>Artboard 1_1</title><polyline class="cls-1" points="15.86 12.68 15.88 12.68 7.15 2.76 4.28 2.76 12.95 12.68 4.28 22.6 7.15 22.6 15.86 12.69"/></svg>
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index bdc0e270..a730b3f1 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -564,6 +564,39 @@ label:after {
padding-right: 28px;
color:white;
}
+.btn.btn-primary img{
+ height: 10px;
+}
+.btn.btn-primary.btn-arrow-right{
+ padding-left: 21px;
+}
+.btn.btn-primary.btn-arrow-right:before {
+ background-image: url(/base/images/arrow-right-w.png);
+ background-repeat: no-repeat;
+ background-size: 6px 10px;
+ background-position: 5px 2px;
+ display: inline-block;
+ width: 8px;
+ height: 12px;
+ content: "";
+ padding: 0 0 0 5px;
+}
+.btn.btn-arrow-right:before
+{
+ background-image: url(/base/images/arrow-right-b.png);
+ background-repeat: no-repeat;
+ background-size: 6px 10px;
+ background-position: 5px 2px;
+ display: inline-block;
+ width: 8px;
+ height: 12px;
+ content: "";
+ padding: 0 0 0 5px;
+}
+.btn.btn-arrow-right:hover:before
+{
+ background-image: url(/base/images/arrow-right-w.png);
+}
.slug-preview .btn.btn-mini:hover,
.js .image-upload .btn.hover,
diff --git a/ckanext/odsh/templates/package/snippets/package_form.html b/ckanext/odsh/templates/package/snippets/package_form.html
index 4d18903e..0867b211 100644
--- a/ckanext/odsh/templates/package/snippets/package_form.html
+++ b/ckanext/odsh/templates/package/snippets/package_form.html
@@ -32,13 +32,15 @@ then itself be extended to add/remove blocks of functionality. #}
{% endif %}
{% endblock %}
{% block save_button %}
- <div class="row-fluid">
- <div class="span6">
- <button class="btn btn-primary" type="submit" name="save">{% block save_button_text %}{{ _('Next: Add Data')
- }}{% endblock %}</button>
- </div>
- </div>
+ <div class="row-fluid">
+ <div class="span6">
+ <button class="btn btn-primary btn-arrow-right" type="submit" name="save">
+ {% block save_button_text %}{{
+ _('Next: Add Data')
+ }}{% endblock %}</button>
+ </div>
+ </div>
{% endblock %}
</div>
{% endblock %}
-</form>
+</form>
\ No newline at end of file
diff --git a/ckanext/odsh/templates/package/snippets/resource_form.html b/ckanext/odsh/templates/package/snippets/resource_form.html
index 65c143ff..7c7a963f 100644
--- a/ckanext/odsh/templates/package/snippets/resource_form.html
+++ b/ckanext/odsh/templates/package/snippets/resource_form.html
@@ -81,23 +81,25 @@
{% endblock %}
{% if stage %}
{% block previous_button %}
- <button class="btn" name="save" value="go-dataset" type="submit">{{ _('back') }}</button>
+ <button class="btn btn-arrow-right" name="save" value="go-dataset" type="submit">{{ _('back') }}</button>
{% endblock %}
{% block again_button %}
- <button class="btn float-right" name="save" value="again" type="submit">{{ _('another dataset') }}</button>
+ <button class="btn float-right btn-arrow-right" name="save" value="again" type="submit">{{_('another dataset')}}</button>
{% endblock %}
{% endif %}
</div>
<div class="form-actions">
{% if stage %}
{% block save_button %}
- <button class="btn btn-primary" name="save" value="go-metadata" type="submit">{% block save_button_text
+ <button class="btn btn-primary btn-arrow-right" name="save" value="go-metadata" type="submit">{% block
+ save_button_text
%}{{
_('Upload dataset') }}{% endblock %}</button>
{% endblock %}
{% else %}
{% block add_button %}
- <button class="btn btn-primary" name="save" value="go-dataset-complete" type="submit">{{ _('Add') }}</button>
+ <button class="btn btn-primary btn-arrow-right" name="save" value="go-dataset-complete" type="submit">{{
+ _('Add') }}</button>
{% endblock %}
{% endif %}
</div>
--
GitLab