This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-mft-portal.git
The following commit(s) were added to refs/heads/master by this push:
new f6973cf added move to homescreen
new 12a829e Merge pull request #17 from akhil-8607/akhil
f6973cf is described below
commit f6973cf5cb4a04990559efc08e40a60c4f6eee4a
Author: Akhil Nagulavancha <[email protected]>
AuthorDate: Wed Jul 22 05:41:38 2020 -0400
added move to homescreen
---
airavata_mft/apps/workspace/package-lock.json | 11 +----------
airavata_mft/apps/workspace/urls.py | 5 +++--
airavata_mft/templates/base.html | 4 ++--
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/airavata_mft/apps/workspace/package-lock.json
b/airavata_mft/apps/workspace/package-lock.json
index e1187d9..3ff0dd8 100644
--- a/airavata_mft/apps/workspace/package-lock.json
+++ b/airavata_mft/apps/workspace/package-lock.json
@@ -3124,16 +3124,7 @@
"dev": true
},
"common": {
- "version": "file:../../static/common",
- "requires": {
- "@fortawesome/fontawesome-free": "^5.6.3",
- "bootstrap": "^4.3.1",
- "bootstrap-vue": "2.0.0-rc.26",
- "clipboard": "^2.0.4",
- "core-js": "^3.6.4",
- "jquery": "^3.5.0",
- "vue": "^2.6.11"
- }
+ "version": "file:../../static/common"
},
"commondir": {
"version": "1.0.1",
diff --git a/airavata_mft/apps/workspace/urls.py
b/airavata_mft/apps/workspace/urls.py
index 185749e..85c8f64 100644
--- a/airavata_mft/apps/workspace/urls.py
+++ b/airavata_mft/apps/workspace/urls.py
@@ -1,7 +1,8 @@
from . import views
from django.conf.urls import url
+app_name='workspace'
urlpatterns = [
- url(r'^storage/$', views.storage),
- url(r'^storage/(?P<storage_id>[^/]+)/$', views.resources)
+ url(r'^storage/$', views.storage,name="storages"),
+ url(r'^storage/(?P<storage_id>[^/]+)/$', views.resources,name="resources")
]
\ No newline at end of file
diff --git a/airavata_mft/templates/base.html b/airavata_mft/templates/base.html
index 6e66c8b..4aa2ecb 100644
--- a/airavata_mft/templates/base.html
+++ b/airavata_mft/templates/base.html
@@ -14,7 +14,7 @@
<nav class="navbar navbar-light header shadow-sm">
<div class="container-fluid">
<div class="col-2">
- <a class="navbar-brand" href="#">
+ <a class="navbar-brand" href = "{% url
'workspace:storages' %}">
<div class="row">
<div class="col-5">
<img
class="logo" src="{% static 'images/airavata-logo.png' %}">
@@ -56,7 +56,7 @@
<div class="row">
<div class="col-2"
style="padding-top: 1.5%">
<nav class="nav
flex-column">
- <a
class="c-nav__item selected-nav" href="#">
+ <a
class="c-nav__item selected-nav" href= "{% url 'workspace:storages' %}">
<i
class="fa fa-database nav-icon"></i>Storage Units
</a>
<a
class="c-nav__item" href="#">
