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 Binary files a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo and b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo differ diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po index 86aa683e77208b754baed2d424ccb6a1bc00cea4..f3a8b8d5d031196195b8b68f22a1d0128a98e24d 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 Binary files /dev/null and b/ckanext/odsh/public/base/images/arrow-left-w.png differ 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 Binary files /dev/null and b/ckanext/odsh/public/base/images/arrow-right-b.png differ 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 Binary files /dev/null and b/ckanext/odsh/public/base/images/arrow-right-w.png differ diff --git a/ckanext/odsh/public/base/images/arrow-right.svg b/ckanext/odsh/public/base/images/arrow-right.svg index 09e90a64630e04aa57df57c445a32f5aa39d491f..a6e1c0447e2c03fdd5ad6c71ec4d6e3e854279b7 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 bdc0e270ba7ba191b73921b5fcc42aa3b2d15d1d..a730b3f16b5f909c14fcea59fd0b85c83832535c 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 4d18903ea2f3dfe75f88e1c7cbf50abbeb7b5524..0867b2118b575108a24a6140324586ddd9d99155 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 65c143ff996eaf2c105e22ff08f52251754b7a00..7c7a963fc11c7598adbd045290e7fe74297cb292 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>