Merge branch 'master' of github.com:ViderumGlobal/ckanext-requestdata

README.md

@@ -12,19 +12,19 @@ See the [Wiki](https://github.com/ViderumGlobal/ckanext-requestdata/wiki) for fu
 
 To install ckanext-requestdata:
 
-1. Activate your CKAN virtual environment, for example::
+1. Activate your CKAN virtual environment, for example:
 
      . /usr/lib/ckan/default/bin/activate
 
-2. Install the ckanext-requestdata Python package into your virtual environment::
+2. Install the ckanext-requestdata Python package into your virtual environment:
 
      pip install ckanext-requestdata
 
 3. Add ``requestdata`` to the ``ckan.plugins`` setting in your CKAN
    config file (by default the config file is located at
    ``/etc/ckan/default/production.ini``).
 
-4. Restart CKAN. For example if you've deployed CKAN with Apache on Ubuntu::
+4. Restart CKAN. For example if you've deployed CKAN with Apache on Ubuntu:
 
      sudo service apache2 reload
 
@@ -57,7 +57,7 @@ and do:
 git clone https://github.com/ViderumGlobal/ckanext-requestdata.git
 cd ckanext-requestdata
 python setup.py develop
-pip install -r requirements.txt
+pip install -r dev-requirements.txt
 ```
 
 ## Running the Tests

ckanext/requestdata/fanstatic/css/main.css

@@ -397,8 +397,4 @@ h3 {
 
 .additional-info h3 {
   margin-left: 5px;
-}
-
-.requested-data-message {
-  margin-top: 60px;
-}
+}

ckanext/requestdata/templates/package/snippets/resources_list.html

@@ -37,15 +37,17 @@ <h3 class="uppercase">{{ _('Data and Resources') }}</h3>
               >Request data</a>
           {% endtrans %}
     {% endif %}
-    <div class="container-subpanel">
+    {% if pkg.type == 'hdx-requestdata-metadata-only' %}
+      <div class="container-subpanel">
 
-      <div class="circle gray-bg"></div>
-      <div class="lines">
-        <div class="upper gray-bg"></div>
-        <div class="lower gray-bg"></div>
-      </div>
+        <div class="circle gray-bg"></div>
+        <div class="lines">
+          <div class="upper gray-bg"></div>
+          <div class="lower gray-bg"></div>
+        </div>
 
-    </div>
+      </div>
+    {% endif %}
 
     {% endblock %}
 </section>

dev-requirements.txt

@@ -0,0 +1,2 @@
+email_validator==1.0.2
+timeago==1.0.7