diff --git a/media/group/Certificate - Yiqing Qu.pdf b/media/group/Certificate - Yiqing Qu.pdf new file mode 100644 index 0000000..e61c9db Binary files /dev/null and b/media/group/Certificate - Yiqing Qu.pdf differ diff --git a/media/group/Survey Design - Yiqing Qu.pdf b/media/group/Survey Design - Yiqing Qu.pdf new file mode 100644 index 0000000..054800b Binary files /dev/null and b/media/group/Survey Design - Yiqing Qu.pdf differ diff --git a/data/files/idata_files/wrfinput_d0x.nc b/media/group/wrfinput_group.nc similarity index 100% rename from data/files/idata_files/wrfinput_d0x.nc rename to media/group/wrfinput_group.nc diff --git a/data/files/idata_files/AT15-51.dbf b/media/idata_files/AT15-51.dbf similarity index 100% rename from data/files/idata_files/AT15-51.dbf rename to media/idata_files/AT15-51.dbf diff --git a/data/files/idata_files/AT15-51.shp b/media/idata_files/AT15-51.shp similarity index 100% rename from data/files/idata_files/AT15-51.shp rename to media/idata_files/AT15-51.shp diff --git a/data/files/idata_files/AT15-51.shx b/media/idata_files/AT15-51.shx similarity index 100% rename from data/files/idata_files/AT15-51.shx rename to media/idata_files/AT15-51.shx diff --git a/data/files/idata_files/Riv2.sbn b/media/idata_files/Riv2.sbn similarity index 100% rename from data/files/idata_files/Riv2.sbn rename to media/idata_files/Riv2.sbn diff --git a/data/files/idata_files/Riv2.sbx b/media/idata_files/Riv2.sbx similarity index 100% rename from data/files/idata_files/Riv2.sbx rename to media/idata_files/Riv2.sbx diff --git a/data/files/idata_files/Riv2.shp b/media/idata_files/Riv2.shp similarity index 100% rename from data/files/idata_files/Riv2.shp rename to media/idata_files/Riv2.shp diff --git a/data/files/idata_files/Riv2.shx b/media/idata_files/Riv2.shx similarity index 100% rename from data/files/idata_files/Riv2.shx rename to media/idata_files/Riv2.shx diff --git a/data/files/idata_files/maize_YieldPerHectare.tif b/media/idata_files/maize_YieldPerHectare.tif similarity index 100% rename from data/files/idata_files/maize_YieldPerHectare.tif rename to media/idata_files/maize_YieldPerHectare.tif diff --git a/media/idata_files/new_dir/IRB_Scavenger_Hunt.docx b/media/idata_files/new_dir/IRB_Scavenger_Hunt.docx new file mode 100644 index 0000000..3cc0ea3 Binary files /dev/null and b/media/idata_files/new_dir/IRB_Scavenger_Hunt.docx differ diff --git a/media/idata_files/new_dir/IRB_Scavenger_Hunt_jFV0Iau.docx b/media/idata_files/new_dir/IRB_Scavenger_Hunt_jFV0Iau.docx new file mode 100644 index 0000000..3cc0ea3 Binary files /dev/null and b/media/idata_files/new_dir/IRB_Scavenger_Hunt_jFV0Iau.docx differ diff --git a/media/idata_files/wrfinput_d0x.nc b/media/idata_files/wrfinput_d0x.nc new file mode 100644 index 0000000..36692bc Binary files /dev/null and b/media/idata_files/wrfinput_d0x.nc differ diff --git a/myportal/constants.py b/myportal/constants.py index bc2f849..1ec8093 100644 --- a/myportal/constants.py +++ b/myportal/constants.py @@ -2,10 +2,11 @@ from pathlib import Path GLOBUS_INDEX_NAME = "schema-org-index" +OLD_GLOBUS_INDEX_NAME = "schema-org-index-v1" RMQ_NAME = "geoedf-all" RMQ_HOST = 'rabbitmq-server' -RMQ_HOST_IP = '172.17.0.2' +RMQ_HOST_IP = '172.17.0.3' # RMQ_HOST = 'some-rabbit' RMQ_USER = 'guest' RMQ_PASS = 'guest' diff --git a/myportal/settings.py b/myportal/settings.py index 5503597..517e95a 100644 --- a/myportal/settings.py +++ b/myportal/settings.py @@ -58,7 +58,7 @@ # LOGIN_URL = '/login/globus' ACCOUNT_LOGOUT_REDIRECT_URL = '/accounts/login/' LOGIN_REDIRECT_URL = '/accounts/profile/' -ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https' +ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https' # todo local # This dictates which scopes will be requested on each user login SOCIAL_AUTH_GLOBUS_SCOPE = [ @@ -74,6 +74,39 @@ PROJECT_TITLE = 'GeoEDF Resource Data Portal' SEARCH_INDEXES = { 'schema-org-index': { + 'uuid': 'dfbccff7-36f8-43e2-9e6e-c38059184985', + 'name': 'GeoEDF Index', + 'template_override_dir': 'geoedf-index', + 'fields': [ + ('extension', fields.extension), + ('size_bytes', fields.size_bytes), + ('name', fields.name), + ('id', fields.identifier), + ], + 'facets': [ # limit of 3 facets + { + 'name': 'Creator', + 'field_name': 'schemaorgJson.creator.@list.name', + 'size': 10, + 'type': 'terms' + }, + { + 'name': 'Tags', + 'field_name': 'tags', + 'size': 10, + 'type': 'terms' + }, + { + 'name': 'Extension', + 'field_name': 'extension', + 'size': 10, + 'type': 'terms' + }, + + + ], + }, + 'schema-org-index-v1': { 'uuid': '15a6acc8-3a23-42ed-98cf-a32833acaae3', 'name': 'Schema.org Json Index', 'template_override_dir': 'schema-org-index', diff --git a/myportal/static/css/file-manager.css b/myportal/static/css/file-manager.css index 8aa0c4c..402cdfb 100644 --- a/myportal/static/css/file-manager.css +++ b/myportal/static/css/file-manager.css @@ -20,3 +20,11 @@ ul li { .modal { z-index: 99999 !important; } + +tr:hover { + background-color: #f5f5f5; +} + +i:hover { + cursor: pointer; +} \ No newline at end of file diff --git a/myportal/templates/file-management/file-manager.html b/myportal/templates/file-management/file-manager.html index 56792f8..409ee65 100644 --- a/myportal/templates/file-management/file-manager.html +++ b/myportal/templates/file-management/file-manager.html @@ -53,7 +53,7 @@ {{ directory.name }} - {% include 'includes/subdirectories.html' with directory=directory depth=depth|add:"3" %} + {% include 'file-management/subdirectories.html' with directory=directory depth=depth|add:"3" %} {% else %}
  • @@ -64,23 +64,220 @@
    -
    Upload File(s):
    -
    - - -
    - {% csrf_token %} - - -
    +
    +
    +
    Upload File(s):
    +
    + +
    + {% csrf_token %} + + + +
    +
    +
    +
    +
    Create Directory:
    +
    + + +
    +
    +
    +
    Actions:
    +
    + + + + + + + + +
    + +
    + + +
    + {% if files %} {{ files|length|json_script:"files-count" }}
    + @@ -88,12 +285,52 @@
    Upload File(s):
    + {% for dir in dirs %} + + + + + + + + + + {% endfor %} {% for file in files %} + @@ -106,11 +343,14 @@
    Upload File(s):
    - + - + + + + @@ -133,6 +373,19 @@
    File Name File Type Visibility Size Actions
    + + + + {{ dir.dirname }} + + directoryprivate{{ file.last_modified_time }} +
    + + + + + + + + + + +
    +
    + + - {{ file.filename }} + {% if file.filename|length > 25 %} + {{ file.filename|slice:":25" }}... + {% else %} + {{ file.filename }} + {% endif %} {{ file.filename|file_extension|cut:"."|upper }}