From c9af8af7133e393f87b2388a73dad1ca7127c0f3 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Tue, 5 Mar 2019 13:52:26 +0100
Subject: [PATCH] various layout changes
---
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo | Bin 5956 -> 6022 bytes
.../odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po | 3 +
ckanext/odsh/public/odsh.css | 58 ++++++++++++++++--
ckanext/odsh/templates/package/edit_base.html | 13 +++-
.../snippets/package_basic_fields.html | 20 +++---
.../package/snippets/package_form.html | 29 +++++----
.../package/snippets/resource_item.html | 5 --
.../templates/package/view_edit_base.html | 55 +++++++++++++++++
8 files changed, 145 insertions(+), 38 deletions(-)
create mode 100644 ckanext/odsh/templates/package/view_edit_base.html
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo
index 576a6bd0debc01348d49798878a4f0a5227af050..df98f848b8ed36651acda1d0be0cca2610f49b6f 100644
GIT binary patch
delta 1630
zcmX@2*QQ^8Pl#nI0|Ns?0s{ks3<xuWcnB=R#=s!Nz`!8O#=yYMz`$U@22p3j#=yYJ
zz`zj6#=yYNz`zg>l}~45VBlw9U?^r|VBlh4U}$DzU=U<rVCZ9GU{GLSU|7J$z#z%M
zz;F;EUe9nFs_-q;fFDqUS=b>KbFnipuz?)F&cMLQz`&rw&cGnSz`&pf6?bQ6U=Uzn
zVDMvySQO9Bz#zuJz);8zaaadC#32*dAr77m)whtHfq{>qo`GQnI|G9#0|Uc$b_NDj
z1_p++><kPl3=9mP*%=r_7#J8NI2agY85kIJIT#pt85kJ6IUqiW<bW7h%mFfpfuWKE
zqP~Lz5>j(HAR)1mgMmScfq`Ks2Ll5O0|Ubq4h9Au1_p+kAbs@=3=GdW7#MUJ7#O~C
zKpdjX2{G7`lYxPQfq}uE6A}U*oDhrrq2h6z3=HB73=HX<5R2+LAr|yQ)lGqlFXn`V
z+-9i0y_}E`ImXGrP|wG}z;F?&@c}0!$euzKzJ=1?pyL0b4q@kl_>hl_fdQ0Uq_`kK
zFUJLOfB_c+gD?XFgDDrpL!Mj^hsJY3(m**EB&26>G1N0?GB7agg9^NWD&XU0V31>A
zV9@7=Xz=5PB)WWVNYwOjL!x9OHzX>~b2Bi=GcYi`gz`CgAZbS#N}KUOLco)Ufq{vE
zfgzX&qA!f6o`FG{fq|ibhk-$lfq|iihk?P1fq`K+4+Db*0|NsaF9X8_Mg|6ZUP#<u
z;DaQ-dwdWdeCLCR%ko3wR2xcL@I!p=$`475(NKO7KLdjr0|P?`Kg7Z7>-ixDoQEp7
z%MXd;&-{?6U=o0&ZY}{x8ju!%#GR4=#D}_2zJmY*gEA;_3NSDzF)%RX3qV3}5>($t
zD7`}flD76k`SnKyAgT6@03;+H3NSEeGcYjxg&LqK2nl)*L5Pb}1tD?YDhP>!iGq;0
zT`vgn@o^~st{^1HzY0Qv`oACpII1OuARcxW0;iFBhCm^R##A8&1|tRrhH4>*MeBqh
zE<Gm%G3bgABn0k3`A>x)iS4}*BuKvqK|CTY3<)^{VMwC15Qc=HmoUVfXega3401?4
z14BMkVXZJEHTMfcvfX5;!Z}cS8I;~249RZ0pa!23hB)*#)SQRH5Qlz-%Ks8(V9;P-
zVBi*kWOEY{1_pBm28JXN1_n7${+}fRNqjp+Ac^XQ2qb9vL?I!fBMR|hyeI>M76SuA
zn<xW=A_D`%Mp1}?mqj5_#wf<XU<fLx#2_IWF9z{>sTd@!w247HHd74Z(M4hm462}#
zX_*)#jt`14Fjz7$Fx(SkU~mSNeBzKei`mS{wt!JMFEKq;!6mUIu{gCvp*k-yH??;2
YGImi;0hh#*)V$)vk}8<!dV#5I0Ou^18vp<R
delta 1577
zcmZqEKcZKEPl#nI0|Ns?JOcxR3<Cp$2s4O>z&vaW3_=VH47_X%4BQM13<_)zbvkSe
z46F<c44!NZ4D1XH4E|90a5e@8eg+1HWHtr{E(QjMVm1Z_K?VkfIyMFd1qKF&32Y1u
zk_-$C8zJKL45y(A??MfD0X6sw)Z$-k3=C`_2e30RaDp7j&cGnSz`!8K4iPtJXJ8Ou
zU|_Ighgjs#&cGnXz`&5m4slooJH#Ok><|ZcL-kE$XJFuCsApi9!Op;-%D}*|oSlI|
zg@J+LEIR{(2m=GdCw2w~Sq26Mb`AyxUIqpRRSt;DjX59&`Eq~^U|<O5fT&O6fP_#v
z2P6cVIT#qE7#J8Pb1*QlFfcHz<6vOmVPIg`4ApmlgMmS}o`HekJO=}VC<6n-U#P*t
zoD2*c3=9mCoDd%>aY8K8go;~mGBAiUFfcfBLM)2pgjkRXRhI`9ujPb<ST9uHbWTV}
zEP$$8&B?$}4|3TqPDoJghblY{r7u9mZ$cgNkQ3s=7n}?Xpk(re6B6V<pbp^TVqg$v
zU|`_qf_O-o3*t~qE=b%5azR46h>L+ilYxO@1{Xs;IOq>S6};eLV31>AVBqA2Xwcw>
zBsNcONYtcpL!zXc8xj>OxfvMb85kH2L-~)nA&K=blosHDgn%*+0|OHS1A{IPM4tf<
z1A{aJ1A`Y&Jp+Rt0|P@E4+Dc20|UcU9tH*r1_p))JPZsI7#SEOc_DGXiVu?LcJM)b
zaFGup{+$mJr>y)CT8JOwb9sJ9A~c2aefSv|)EF2TlK3GG?&OE)Us(@Tu$><g$7lH=
zQE`VKlB%EZL(;%ken{N?;fMH;T>!$D5@29Z1|?1b1_mWib`*ewV2%JpUpJJVBmhaY
zGok$X0+2*ozf6FEL7RbrVK-Fca{)+@vk5|6sw@bJb7w(F(EAHQ;xtzf;?q_rf3_eb
zs5c8jf_SeWB#y5OLVU_71Wg-45Pix*3=BpL4D}3_LJ*5`gdi^L5rP;rNeJSDIZ*y$
zAxJ7;D+CG3O+pYK+!TU@*gGLeV*Dlq2{{g7h&hr_T3Hz45M5!2I%{E2BCcm(@D+w+
zw?L@EC@7r*rSpU#*{nhsVsM8r#Gx~x2F(|SICLXaeuppvg9ZZw!%1NV23=4&BFw;G
z4k|fCAW;(`0!ee_A`A?wp!~l~1QN7oM8HA9@Ja;YLs?M<1}z2#1{YBV21N!2hI~<o
zffGd`QMO-{fx(c0f#J0%BuHh&APzJZgQO7`F^I>)#Xvq~U`P;y6i6vzkSMMfV_*=q
lWME*JBgVks%)r2KO$-ueQkx~&7BFr;&o0Ed`L94H8vrK@gUkQ`
diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
index 1b053cfb..a830fe66 100644
--- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
+++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po
@@ -36,6 +36,9 @@ msgstr "Kategorien bearbeiten"
msgid "Manage Dataset"
msgstr "Datensatz bearbeiten"
+msgid "Manage Dataset {name}"
+msgstr "Datensatz {name} bearbeiten"
+
msgid "Organizations"
msgstr "Herausgeber"
diff --git a/ckanext/odsh/public/odsh.css b/ckanext/odsh/public/odsh.css
index 544d896b..63be49a1 100644
--- a/ckanext/odsh/public/odsh.css
+++ b/ckanext/odsh/public/odsh.css
@@ -118,7 +118,10 @@ font-size:18px;
color: #003064;
}
-.search-form h2, .odsh-dataset-heading h2 {
+.search-form h2,
+.odsh-dataset-heading h2,
+.odsh-dataset-heading span
+ {
margin-top: 0px;
font-size: 25px;
color: #003064;
@@ -366,6 +369,11 @@ label.rangesearch.disabled {
vertical-align: top;
}
+.is-table-row .row-fluid [class*="span"] {
+ float: none;
+ display: block;
+}
+
.pill {
background-color: #F6F7F9;
border-radius: 0px;
@@ -1083,16 +1091,18 @@ element.style {
}
.resource-icons {
- font-size: 28px;
+ font-size: 24px;
+ margin-left: 5px;
+ margin-top: 5px;
}
.resource-icons img {
width: 28px;
}
.icon{
background-repeat: no-repeat;
- background-size: 28px 28px;
- width: 28px;
- height: 28px;
+ background-size: 24px 24px;
+ width: 24px;
+ height: 24px;
padding-right: 10px;
}
.icon-edit{
@@ -1663,7 +1673,7 @@ a:hover.tooltips_cls span {
{
display: inline-block;
background-color: #dbdbdb;
- padding: 12px;
+ padding: 8px 20px;
border-radius: 10px;
margin-right:20px;
margin-top: 20px;
@@ -1672,9 +1682,45 @@ a:hover.tooltips_cls span {
{
color: black;
text-decoration: none;
+ font-size: 12px;
}
.tag-pill:hover
{
cursor: pointer;
+}
+
+.package-form-column
+{
+ width: 460px;
+}
+
+.dataset-edit-form .span6
+{
+ width:60%;
+}
+
+.dataset-edit-form .span6
+{
+ width:60%;
+}
+
+.dataset-edit-form .span6.inline-error
+{
+ width:30%;
+ display: inline-block;
+}
+.dataset-edit-form .control-group .row-fluid .span6
+{
+ display: inline-block;
+}
+.dataset-edit-form .row-fluid .span3
+{
+ display: inline-block;
+ width:28.5%;
+}
+
+span.clear {
+ clear: right;
+ display: block;
}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/package/edit_base.html b/ckanext/odsh/templates/package/edit_base.html
index 1ce1afcf..477564d5 100644
--- a/ckanext/odsh/templates/package/edit_base.html
+++ b/ckanext/odsh/templates/package/edit_base.html
@@ -14,12 +14,19 @@
{% endblock %}
{% block content_action %}
-{% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn', icon='eye' %}
{% endblock %}
{% block content_primary_nav %}
-{{ h.build_nav_icon('dataset_edit', _('Edit metadata'), id=pkg.name) }}
-{{ h.build_nav_icon('dataset_resources', _('Resources'), id=pkg.name) }}
+{% endblock %}
+
+
+{% block primary_content %}
+<div class="odsh-dataset-heading">
+ <span>Datensatz ＂{{pkg.name}}＂ bearbeiten</span>
+ {% link_for _('back'), controller='package', action='read', id=pkg.name, class_='btn pull-right', icon='arrow-left' %}
+<span class="clear"></span>
+</div>
+{{ super() }}
{% endblock %}
{% block secondary_content %}
diff --git a/ckanext/odsh/templates/package/snippets/package_basic_fields.html b/ckanext/odsh/templates/package/snippets/package_basic_fields.html
index 503a34f7..f461de15 100644
--- a/ckanext/odsh/templates/package/snippets/package_basic_fields.html
+++ b/ckanext/odsh/templates/package/snippets/package_basic_fields.html
@@ -1,5 +1,6 @@
{% import 'macros/form.html' as form %}
{% resource 'odsh/odsh_form.js' %}
+{% set dataset_is_draft = data.get('state', 'draft').startswith('draft') or data.get('state', 'none') == 'none' %}
<!-- field title -->
{% block package_basic_fields_title %}
@@ -10,16 +11,19 @@ is_required=true,placeholder=_('Enter title')) }}
{% endblock %}
{% block package_basic_fields_url %}
-{% set prefix = h.url_for(controller='package', action='read', id='') %}
-{% set domain = h.url_for(controller='package', action='read', id='', qualified=true) %}
-{% set domain = domain|replace("http://", "")|replace("https://", "") %}
-{% set attrs = {'data-module': 'slug-preview-slug', 'data-module-prefix': domain, 'data-module-placeholder': '<dataset>'}
- %}
+{% if(dataset_is_draft)%}
+ {% set prefix = h.url_for(controller='package', action='read', id='') %}
+ {% set domain = h.url_for(controller='package', action='read', id='', qualified=true) %}
+ {% set domain = domain|replace("http://", "")|replace("https://", "") %}
+ {% set attrs = {'data-module': 'slug-preview-slug', 'data-module-prefix': domain, 'data-module-placeholder': '<dataset>'}
+ %}
- <!-- field name -->
+ <!-- field name/url -->
{{ form.prepend('name', id='field-name', label=_('URL'), prepend=prefix,
value=data.name, error=errors.name, attrs=attrs, is_required=true) }}
- {% endblock %}
+ {% endif %}
+ {% endblock %}
+
<!-- field notes -->
{% block package_basic_fields_description %}
@@ -33,8 +37,6 @@ is_required=true,placeholder=_('Enter title')) }}
<input type="hidden" name="groups__0__id" value="{{ data.group_id }}" />
{% endif %}
- {% set dataset_is_draft = data.get('state', 'draft').startswith('draft') or data.get('state', 'none') == 'none'
- %}
{% set dataset_has_organization = data.owner_org or data.group_id %}
{% set organizations_available = h.organizations_available('create_dataset') %}
{% set user_is_sysadmin = h.check_access('sysadmin') %}
diff --git a/ckanext/odsh/templates/package/snippets/package_form.html b/ckanext/odsh/templates/package/snippets/package_form.html
index 9e5fe6a9..aea803a5 100644
--- a/ckanext/odsh/templates/package/snippets/package_form.html
+++ b/ckanext/odsh/templates/package/snippets/package_form.html
@@ -1,9 +1,8 @@
{% import 'macros/form.html' as form %}
{% set action = c.form_action or '' %}
+{% set form_style = c.form_style or c.action %}
-{# This provides a full page that renders a form for adding a dataset. It can
-then itself be extended to add/remove blocks of functionality. #}
-<form id="dataset-edit" class="dataset-form" method="post" action="{{ action }}" data-module="basic-form" novalidate>
+<form id="dataset-edit" class="dataset-form {% if(form_style=='edit') %} dataset-edit-form {%endif%} " method="post" action="{{ action }}" data-module="basic-form" novalidate>
{% block stages %}
{{ h.snippet('package/snippets/stages.html', stages=stage) }}
{% endblock %}
@@ -24,20 +23,20 @@ then itself be extended to add/remove blocks of functionality. #}
{% block form_actions %}
<div class="form-actions">
- {% block delete_button %}
- {% if h.check_access('package_delete', {'id': data.id}) and not data.state == 'deleted' %}
- <a class="btn btn-danger pull-left" href="{% url_for controller='package', action='delete', id=data.id %}"
- data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this dataset?') }}">{%
- block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
- {% endif %}
- {% endblock %}
- {% block save_button %}
<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>
+ {% block delete_button %}
+ {% if h.check_access('package_delete', {'id': data.id}) and not data.state == 'deleted' %}
+ <a class="btn btn-danger pull-left" href="{% url_for controller='package', action='delete', id=data.id %}"
+ data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this dataset?') }}">{%
+ block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+ {% endif %}
+ {% endblock %}
+ {% block save_button %}
+ <button class="btn btn-primary btn-arrow-right" type="submit" name="save">
+ {% block save_button_text %}{{
+ _('Next: Add Data')
+ }}{% endblock %}</button>
</div>
</div>
{% endblock %}
diff --git a/ckanext/odsh/templates/package/snippets/resource_item.html b/ckanext/odsh/templates/package/snippets/resource_item.html
index da1062e2..d2ee7839 100644
--- a/ckanext/odsh/templates/package/snippets/resource_item.html
+++ b/ckanext/odsh/templates/package/snippets/resource_item.html
@@ -17,11 +17,6 @@
</div>
</div>
<div class="row resource-description-container">
- <p class="description">
- {% if res.description %}
- {{ h.markdown_extract(h.get_translated(res, 'description'))}}
- {% endif %}
- </p>
</div>
<div class="resource-icons">
{% block resource_item_explore_links %}
diff --git a/ckanext/odsh/templates/package/view_edit_base.html b/ckanext/odsh/templates/package/view_edit_base.html
new file mode 100644
index 00000000..d8a9736f
--- /dev/null
+++ b/ckanext/odsh/templates/package/view_edit_base.html
@@ -0,0 +1,55 @@
+{% extends "package/resource_edit_base.html" %}
+
+{% set logged_in = true if c.userobj else false %}
+{% set res = c.resource %}
+
+{% block breadcrumb_edit_selected %}{% endblock %}
+
+{% block content_action %}
+ {% link_for _('All views'), controller='package', action='resource_views', id=pkg.name, resource_id=res.id, class_='btn', icon='arrow-left' %}
+ {% if res %}
+ {% set url = h.url_for(controller='package', action='resource_read', id=pkg.name, resource_id=res.id) ~ '?view_id=' ~ resource_view.id %}
+ <a href="{{ url }}" class="btn"><i class="fa fa-eye"></i> {{ _('View view') }}</a>
+ {% endif %}
+{% endblock %}
+
+{% block content_primary_nav %}{% endblock %}
+
+{% block primary_content_inner %}
+ {% block form %}{% endblock %}
+{% endblock %}
+
+{% block main_content %}
+ {% if h.resource_view_full_page(resource_view) %}
+ {{ self.flash() }}
+ {{ self.toolbar() }}
+ <div class="wrapper no-nav">
+ {{ self.primary_content() }}
+ </div>
+ {% else %}
+ {{ super() }}
+ {% endif %}
+
+ {% if to_preview and h.resource_view_display_preview(resource_view) %}
+ <div class="wrapper no-nav">
+ <section class="module module-narrow module-shallow">
+ <h2 class="module-heading">
+ <i class="fa fa-picture-o"></i> {{ _('View preview') }}
+ </h2>
+ <div class="module-content">
+ {% snippet 'package/snippets/resource_view.html', resource_view=resource_view, resource=resource, package=package, to_preview=True %}
+ </div>
+ </section>
+ </div>
+ {% endif %}
+{% endblock %}
+
+{% block secondary %}
+ {% if not h.resource_view_full_page(resource_view) %}
+ {{ super() }}
+ {% endif %}
+{% endblock %}
+
+{% block secondary_content %}
+ {% snippet 'package/snippets/view_help.html' %}
+{% endblock %}
--
GitLab