You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/11/20 19:01:30 UTC
[airavata-django-portal] 02/06: Cleaning up base templates
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit c2b7c11d5698e25df0d39857fe7f0d341f2656dc
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Nov 20 09:30:03 2017 -0500
Cleaning up base templates
---
.../django_airavata_groups/groups_list.html | 14 --------------
django_airavata/templates/base-vue.html | 11 -----------
django_airavata/templates/base.html | 16 +++++++++-------
django_airavata/templates/main_base.html | 21 ---------------------
4 files changed, 9 insertions(+), 53 deletions(-)
diff --git a/django_airavata/apps/groups/templates/django_airavata_groups/groups_list.html b/django_airavata/apps/groups/templates/django_airavata_groups/groups_list.html
deleted file mode 100644
index 2fe3977..0000000
--- a/django_airavata/apps/groups/templates/django_airavata_groups/groups_list.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-{% extends 'main_base.html' %}
-
-{% block content %}
-
-<h1>Groups</h1>
-
-<ul>
- {% for group in groups %}
- <li>{{ group.name }}</li>
- {% endfor %}
-</ul>
-
-{% endblock content %}
\ No newline at end of file
diff --git a/django_airavata/templates/base-vue.html b/django_airavata/templates/base-vue.html
deleted file mode 100644
index 8f9f9d7..0000000
--- a/django_airavata/templates/base-vue.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "main_base.html" %}
-{% load static %}
-
-{% block scripts %}
-{{ block.super }}
-{% if debug %}
-<script src="{% static 'js/vue-2.4.0.dev.js' %}"></script>
-{% else %}
-<script src="{% static 'js/vue-2.4.0.min.js' %}"></script>
-{% endif %}
-{% endblock %}
\ No newline at end of file
diff --git a/django_airavata/templates/base.html b/django_airavata/templates/base.html
index 0fb53d4..7a0dd01 100644
--- a/django_airavata/templates/base.html
+++ b/django_airavata/templates/base.html
@@ -22,15 +22,17 @@
<header class=c-header>
{% block header %}
<div class=c-header__logo>
- <svg aria-labelledby=iu-logo xmlns=http://www.w3.org/2000/svg width=70 height=70 viewBox="0 0 70 70"><title
- id=iu-logo>IU logo</title>
- <polygon
- points="40.96 18.44 40.96 21.84 43.52 21.84 43.52 40.51 38.41 40.51 38.41 15.9 40.96 15.9 40.96 12.5 29.04 12.5 29.04 15.9 31.58 15.9 31.58 40.51 26.48 40.51 26.48 21.84 29.04 21.84 29.04 18.44 17.09 18.44 17.09 21.84 19.65 21.84 19.65 43.79 23.72 48.15 31.58 48.15 31.58 53.26 29.04 53.26 29.04 57.5 40.96 57.5 40.96 53.26 38.41 53.26 38.41 48.15 45.93 48.15 50.33 43.79 50.33 21.84 52.91 21.84 52.91 18.44 40.96 18.44"
- fill="#fff"/>
- </svg>
+ <a href="{% url 'home' %}">
+ <svg aria-labelledby=iu-logo xmlns=http://www.w3.org/2000/svg width=70 height=70 viewBox="0 0 70 70"><title
+ id=iu-logo>IU logo</title>
+ <polygon
+ points="40.96 18.44 40.96 21.84 43.52 21.84 43.52 40.51 38.41 40.51 38.41 15.9 40.96 15.9 40.96 12.5 29.04 12.5 29.04 15.9 31.58 15.9 31.58 40.51 26.48 40.51 26.48 21.84 29.04 21.84 29.04 18.44 17.09 18.44 17.09 21.84 19.65 21.84 19.65 43.79 23.72 48.15 31.58 48.15 31.58 53.26 29.04 53.26 29.04 57.5 40.96 57.5 40.96 53.26 38.41 53.26 38.41 48.15 45.93 48.15 50.33 43.79 50.33 21.84 52.91 21.84 52.91 18.44 40.96 18.44"
+ fill="#fff"/>
+ </svg>
+ </a>
</div>
{% endblock %}
- <div class=c-header__title><a href=#0>{% block title %}Django Airavata Gateway{% endblock %}</a></div>
+ <div class=c-header__title><a href="{% url 'home' %}">{% block title %}Django Airavata Gateway{% endblock %}</a></div>
{% if user.is_authenticated %}
<div class=c-header__controls>
<div class=dropdown><a href=#0 class="dropdown-toggle text-dark" id=dropdownMenuButton data-toggle=dropdown
diff --git a/django_airavata/templates/main_base.html b/django_airavata/templates/main_base.html
deleted file mode 100644
index 2f69c42..0000000
--- a/django_airavata/templates/main_base.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% load static %}
-{% block content %}
-<nav class=c-nav><a href="/admin" class="c-nav__item is-active" data-toggle=tooltip data-placement=right title=Dashboard><i
- class="fa fa-dashboard"></i> <span class=sr-only>Dashboard</span> </a><a href=#0 class=c-nav__item
- data-toggle=tooltip data-placement=right
- title=Experiments><i
- class="fa fa-flask"></i> <span class=sr-only>Dashboard</span> </a><a href=#0 class=c-nav__item data-toggle=tooltip
- data-placement=right title=Projects><i
- class="fa fa-folder-open"></i> <span class=sr-only>Dashboard</span> </a><a href=#0 class=c-nav__item
- data-toggle=tooltip data-placement=right
- title=Storage><i
- class="fa fa-floppy-o"></i> <span class=sr-only>Dashboard</span> </a><a href=#0 class=c-nav__item
- data-toggle=tooltip data-placement=right
- title="Admin Dashboard"><i
- class="fa fa-wrench"></i> <span class=sr-only>Admin Dashboard</span></a></nav>
-{% endblock %}
-{% block scripts %}
- <script src="{% static 'js/jquery-3.2.1.min.js' %}"></script>
- <script src="{% static 'bootstrap-3.3.7/js/bootstrap.min.js' %}"></script>
-{% endblock %}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.