From 5591e33ef562509c0ef776e9cd979dd2e9c44e55 Mon Sep 17 00:00:00 2001
From: Boris Ponsioen <b.g.t.ponsioen@uva.nl>
Date: Mon, 16 Apr 2018 14:46:25 +0200
Subject: [PATCH] Changes metacore form slightly
---
metacore/admin.py | 15 ++++++-
metacore/services.py | 3 +-
metacore/templates/citable_list.html | 67 +++++++++++++++++++++++-----
3 files changed, 71 insertions(+), 14 deletions(-)
diff --git a/metacore/admin.py b/metacore/admin.py
index de98d15d1..5a7ae8d4e 100644
--- a/metacore/admin.py
+++ b/metacore/admin.py
@@ -1,6 +1,17 @@
from django.contrib import admin
+from .models import Citable, CitableWithDOI
from .services import get_crossref_test
# Register your models here.
-def import_data_from_crossref(modeladmin, request, queryset):
- get_crossref_test()
+# def import_data_from_crossref(modeladmin, request, queryset):
+# get_crossref_test()
+
+# class CitableAdmin(admin.ModelAdmin):
+# # list_display = ['title', 'status']
+# # ordering = ['title']
+# actions = [import_data_from_crossref]
+
+# def get_queryset(self, request):
+# return []
+
+# admin.site.register(Citable, CitableAdmin)
diff --git a/metacore/services.py b/metacore/services.py
index 7d0320a70..03ae9536b 100644
--- a/metacore/services.py
+++ b/metacore/services.py
@@ -108,5 +108,6 @@ def parse_crossref_citable(citable_item):
except BaseException as e:
print(e)
# raise
- except:
+ except e:
+ print("Error: ", e)
print(citable_item)
diff --git a/metacore/templates/citable_list.html b/metacore/templates/citable_list.html
index 23fdcb039..1740d90d2 100644
--- a/metacore/templates/citable_list.html
+++ b/metacore/templates/citable_list.html
@@ -6,30 +6,75 @@
{% block pagetitle %}: Metacore{% endblock pagetitle %}
{% block content %}
+<!-- <div class="row"> -->
+<!-- <div class="col-md-4"> -->
+<!-- <div class="card card-grey"> -->
+<!-- <div class="card-body min-height-190"> -->
+<!-- <h1 class="card-title">SciPost Metacore</h1> -->
+<!-- </div> -->
+<!-- </div> -->
+<!-- </div> -->
+<!-- <div class="col-md-4"> -->
+<!-- <div class="card card-grey"> -->
+<!-- <div class="card-body min-height-190"> -->
+<!-- <h2 class="card-title">Search Citables:</h2> -->
+<!-- <form action="{% url 'metacore:citable-list' %}" class="small" method="get"> -->
+<!-- <1!-- {{ form|bootstrap:'4,8,sm' }} --1> -->
+<!-- {{ form }} -->
+<!-- <input class="btn btn-sm btn-secondary" type="submit" value="Search"/> -->
+<!-- <a href="{% url 'metacore:citable-list' %}" class="btn btn-sm btn-secondary">Clear</a> -->
+<!-- </form> -->
+<!-- </div> -->
+<!-- </div> -->
+<!-- </div> -->
+<!-- <div class="col-md-4"> -->
+<!-- <div class="card card-grey"> -->
+<!-- <div class="card-body min-height-190"> -->
+<!-- </div> -->
+<!-- </div> -->
+<!-- </div> -->
+<!-- </div> -->
<div class="row">
- <div class="col-md-4">
- <div class="card card-grey">
- <div class="card-body min-height-190">
- <h1 class="card-title">SciPost Metacore</h1>
- </div>
- </div>
- </div>
- <div class="col-md-4">
+ <div class="col-md-6">
<div class="card card-grey">
<div class="card-body min-height-190">
<h2 class="card-title">Search Citables:</h2>
<form action="{% url 'metacore:citable-list' %}" class="small" method="get">
- <!-- {{ form|bootstrap:'4,8,sm' }} -->
- {{ form }}
+ <!-- {{ form|bootstrap:'2,6,lg' }} -->
+
+ <div class="fieldWrapper">
+ {{ form.omni.errors }}
+ <label for="{{ form.subject.id_for_label }}">Author and/or title (matches full words)</label>
+ {{ form.omni }}
+ </div>
+ <br/>
<input class="btn btn-sm btn-secondary" type="submit" value="Search"/>
<a href="{% url 'metacore:citable-list' %}" class="btn btn-sm btn-secondary">Clear</a>
+ <!-- <hr/> -->
+ <!-- <h3>Advanced search</h3> -->
+
+ <!-- {% for field in form %} -->
+ <!-- <div class="fieldWrapper"> -->
+ <!-- {% if field.id_for_label != 'id_omni' %} -->
+ <!-- {{ field.errors }} -->
+ <!-- {{ field.label_tag }} {{ field }} -->
+ <!-- {% if field.help_text %} -->
+ <!-- <p class="help">{{ field.help_text|safe }}</p> -->
+ <!-- {% endif %} -->
+ <!-- {% endif %} -->
+ <!-- </div> -->
+ <!-- {% endfor %} -->
+ <!-- <input class="btn btn-sm btn-secondary" type="submit" value="Search"/> -->
+ <!-- <a href="{% url 'metacore:citable-list' %}" class="btn btn-sm btn-secondary">Clear</a> -->
+
</form>
</div>
</div>
</div>
- <div class="col-md-4">
+ <div class="col-md-6">
<div class="card card-grey">
<div class="card-body min-height-190">
+ <h1 class="card-title">SciPost Metacore</h1>
</div>
</div>
</div>
--
GitLab