various layout changes

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"
 

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

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 &#65282;{{pkg.name}}&#65282; 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 %}

ckanext/odsh/templates/package/snippets/package_basic_fields.html

 {% 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') %}

ckanext/odsh/templates/package/snippets/package_form.html

 {% 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 %}

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 %}

ckanext/odsh/templates/package/view_edit_base.html

+{% 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 %}