diff --git a/ippisite/ippidb/static/css/main.css b/ippisite/ippidb/static/css/main.css
index 874b916252ef500a5d33de14f06e022d1b869457..171ebc86a28024a998576fec99a8b26ca9c1120d 100644
--- a/ippisite/ippidb/static/css/main.css
+++ b/ippisite/ippidb/static/css/main.css
@@ -147,9 +147,9 @@ div.hidden {
.main-nav {
margin: 0 auto;
position: relative;
- width: max-content;
text-align: center;
- height: 35px;
+ text-wrap: balance;
+ height: auto;
}
.main-nav ul {
@@ -157,6 +157,7 @@ div.hidden {
margin: 0px;
padding: 0px;
border: 0px none;
+ width: auto;
}
.main-nav ul li {
@@ -165,6 +166,7 @@ div.hidden {
display: inline-block;
vertical-align: middle;
margin: 0px 30px;
+ width: 6rem;
}
.main-nav ul li a {
diff --git a/ippisite/ippidb/templates/FAQ.html b/ippisite/ippidb/templates/FAQ.html
index be6d8864084c0e944fffd626f4818303bf645139..e41ca8d686cbf039994de32746d68c067cedeef2 100644
--- a/ippisite/ippidb/templates/FAQ.html
+++ b/ippisite/ippidb/templates/FAQ.html
@@ -1,72 +1,81 @@
-{% extends "index.html" %}
+{% extends "base.html" %}
{% block title %}iPPI-DB FAQ{% endblock %}
{% block extra_css %}
-<link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
+<link rel="stylesheet" href="/static/css/font.css">
+<link rel="stylesheet" href="/static/css/main.css">
{% endblock %}
{% block content %}
<div class="inner-wrap">
- <div class="container-fluid p-5">
- <h1 class="page-title"> FAQ </h1>
- <div class="row m-2">
- <div class="col-sm-6">
- <h2 class="text-center">COMPOUNDS</h2>
- </div>
- <div class="col-sm-6">
- <h2 class="text-center">PROTEIN INTERACTION EXPLORER</h2>
- </div>
- </div>
- <div class="row m-2">
- <div class="col-6">
- <div id="accordion_compounds">
- {% for faq in faq_list %}
- {% if faq.type == 'compounds' %}
- <div class="card">
- <div class="card-header" id="heading{{ faq.id }}">
- <h5 class="mb-0">
- <button style="white-space: normal;" class="btn btn-link collapsed"
- data-toggle="collapse" data-target="#collapse{{ faq.id }}" aria-expanded="false"
- aria-controls="collapse{{ faq.id }}">
- {{ faq.question }}
- </button>
- </h5>
+ <div id="main-wrapper" class="page">
+ <div id="main">
+ <div class="content mt-3" class="main-content">
+ <div class="section">
+ <main role="main">
+ <h1 class="page-title"> FAQ </h1>
+ <div class="row m-4">
+ <div class="col-sm-6">
+ <h2 class="text-center">COMPOUNDS</h2>
+ </div>
+ <div class="col-sm-6">
+ <h2 class="text-center">PROTEIN INTERACTION EXPLORER</h2>
+ </div>
</div>
+ <div class="row m-4">
+ <div class="col-6">
+ <div id="accordion_compounds">
+ {% for faq in faq_list %}
+ {% if faq.type == 'compounds' %}
+ <div class="card">
+ <div class="card-header" id="heading{{ faq.id }}">
+ <h5 class="mb-0">
+ <button style="white-space: normal;" class="btn btn-link collapsed"
+ data-toggle="collapse" data-target="#collapse{{ faq.id }}"
+ aria-expanded="false" aria-controls="collapse{{ faq.id }}">
+ {{ faq.question }}
+ </button>
+ </h5>
+ </div>
- <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}"
- data-parent="#accordion_compounds">
- <div class="card-body">
- {{ faq.answer }}
+ <div id="collapse{{ faq.id }}" class="collapse"
+ aria-labelledby="heading{{ faq.id }}" data-parent="#accordion_compounds">
+ <div class="card-body">
+ {{ faq.answer }}
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ {% endfor %}
+ </div>
</div>
- </div>
- </div>
- {% endif %}
- {% endfor %}
- </div>
- </div>
- <div class="col-6">
- <div id="accordion_pie">
- {% for faq in faq_list %}
- {% if faq.type == 'pie' %}
- <div class="card">
- <div class="card-header" id="heading{{ faq.id }}">
- <h5 class="mb-0">
- <button style="white-space: normal;" class="btn btn-link collapsed"
- data-toggle="collapse" data-target="#collapse{{ faq.id }}" aria-expanded="false"
- aria-controls="collapse{{ faq.id }}">
- {{ faq.question }}
- </button>
- </h5>
- </div>
+ <div class="col-6">
+ <div id="accordion_pie">
+ {% for faq in faq_list %}
+ {% if faq.type == 'pie' %}
+ <div class="card">
+ <div class="card-header" id="heading{{ faq.id }}">
+ <h5 class="mb-0">
+ <button style="white-space: normal;" class="btn btn-link collapsed"
+ data-toggle="collapse" data-target="#collapse{{ faq.id }}"
+ aria-expanded="false" aria-controls="collapse{{ faq.id }}">
+ {{ faq.question }}
+ </button>
+ </h5>
+ </div>
- <div id="collapse{{ faq.id }}" class="collapse" aria-labelledby="heading{{ faq.id }}"
- data-parent="#accordion_pie">
- <div class="card-body">
- {{ faq.answer }}
+ <div id="collapse{{ faq.id }}" class="collapse"
+ aria-labelledby="heading{{ faq.id }}" data-parent="#accordion_pie">
+ <div class="card-body">
+ {{ faq.answer }}
+ </div>
+ </div>
+ </div>
+ {% endif %}
+ {% endfor %}
+ </div>
</div>
</div>
- </div>
- {% endif %}
- {% endfor %}
+ </main>
</div>
</div>
</div>
diff --git a/ippisite/ippidb/templates/about-pie.html b/ippisite/ippidb/templates/about-pie.html
new file mode 100644
index 0000000000000000000000000000000000000000..eed8ffa25bbb1a7100a1b528decb54feb8707d5c
--- /dev/null
+++ b/ippisite/ippidb/templates/about-pie.html
@@ -0,0 +1,50 @@
+{% extends "index.html" %}
+
+
+{% block title %}about Protein Interaction{% endblock %}
+
+{% block content %}
+<div class="inner-wrap">
+ <div id="main-wrapper" class="page">
+ <div id="main">
+ <div id="content" class="main-content">
+ <div class="section">
+ <main role="main">
+ <h1 class="page-title"> {% block pagetitle %}GENERAL INFORMATION{% endblock%} </h1>
+ <div class="tabs"></div>
+ <div class="main__inner">
+ <div class="region region-content">
+ <div class="page-intro">
+ </div>
+ <div class="color-wrap">
+ <div class="region region-content">
+ <div class="block block-system block-system-main">
+ <div class="content">
+ <div class="view-content">
+ <div class="row">
+ <ul style="columns: 2;" class="list-unstyled mx-auto">
+ <li>Number of pockets: {{ cavitiescount }}</li>
+ <li>Number of orthosteric pockets: {{ orthocount }}</li>
+ <li>Number of liganded orthosteric competitive pockets:
+ {{ ortho_comp }}</li>
+ <li>Number of liganded orthosteric non competitive pockets:
+ {{ ortho_nocomp }}</li>
+ <li>Number of allosteric pockets: {{ allostcount }}</li>
+ <li>Number of proteins: {{ proteincount }}</li>
+ <li>Number of organisms: {{ organismcount }}</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </main><!-- .site-main -->
+ </div>
+ </div>
+ </div><!-- div main -->
+ </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/ippisite/ippidb/templates/about.html b/ippisite/ippidb/templates/about.html
index 8780cf41f934c0f523f81374fe51ba17b42e06b7..236bdc9258b1618c9165a608d33509903678f6e6 100644
--- a/ippisite/ippidb/templates/about.html
+++ b/ippisite/ippidb/templates/about.html
@@ -4,33 +4,33 @@
<script src="/static/chartjs/Chart.bundle.js"></script>
<script src="/static/js/ippidb-charts.js" type="text/javascript"></script>
{% endblock %}
-
+
{% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
{% block content %}
<div id="mainnav">
- <nav class="secondary-nav">
- <ul>
- <li>
- <a href="/about-general">General</a>
- </li>
- <li>
- <a href="/about-pharmacology">Pharmacology</a>
- </li>
- <li>
- <a href="/about-le-lle">Efficiency plot</a>
- </li>
- <li>
- <a href="/about-physicochemistry">Physicochemistry</a>
- </li>
- <li>
- <a href="/about-pca">Chemical space</a>
- </li>
- <li>
- <a href="/about-contributors">Contributors</a>
- </li>
- </ul>
- </nav>
+ <nav class="secondary-nav">
+ <ul>
+ <li>
+ <a href="/about-compound-general">General</a>
+ </li>
+ <li>
+ <a href="/about-pharmacology">Pharmacology</a>
+ </li>
+ <li>
+ <a href="/about-le-lle">Efficiency plot</a>
+ </li>
+ <li>
+ <a href="/about-physicochemistry">Physicochemistry</a>
+ </li>
+ <li>
+ <a href="/about-pca">Chemical space</a>
+ </li>
+ <li>
+ <a href="/about-contributors">Contributors</a>
+ </li>
+ </ul>
+ </nav>
</div>
<div class="inner-wrap">
@@ -50,8 +50,8 @@
<div class="block block-system block-system-main">
<div class="content">
<div class="view-content">
-{% block view_content %}
-{% endblock %}
+ {% block view_content %}
+ {% endblock %}
</div>
</div>
</div>
@@ -65,4 +65,4 @@
</div><!-- div main -->
</div>
</div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ippisite/ippidb/templates/base.html b/ippisite/ippidb/templates/base.html
index c149e70c33dca52857d42aec0bcb218c246b4b93..4286ee6dece7a9c23388c9e04c6d579c6d83ad20 100644
--- a/ippisite/ippidb/templates/base.html
+++ b/ippisite/ippidb/templates/base.html
@@ -20,7 +20,7 @@
</script>
{% endif %}
- <link rel="icon" href="/static/images/favicon.png" type="image/x-icon"/>
+ <link rel="icon" href="/static/images/favicon.png" type="image/x-icon" />
<link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="/static/css/fonts.css">
<link rel="stylesheet" href="/static/css/main.css">
@@ -51,7 +51,7 @@
{% if gacode %}
<div id="consent" class="fixed-bottom pl-5 pr-5 pt-2 pb-2 text-light bg-dark text-center">
By using the site you are agreeing to the use of third party cookies for statistical purposes. You can read more
- about our policy <a href="/about-general/#terms-privacy"><b>here</b></a>.
+ about our policy <a href="/about-compounds-general/#terms-privacy"><b>here</b></a>.
<button id="consentBtn" class="btn btn-dark ml-2" type="button" aria-label="Accept">Accept
</button>
</div>
@@ -89,20 +89,23 @@
</nav>
<div id="mainnav">
<nav class="main-nav">
- <div style="display: inline-block;">
- <ul>
+ <div>
+ <ul style="display: inline-block;">
<li>
<a href="{% url 'index' %}">Home</a>
</li>
<li>
- <a href="{% url 'general' %}">About</a>
+ <a href="{% url 'compound_list' %}">Query compounds</a>
</li>
<li>
- <a href="{% url 'compound_list' %}">Query compounds</a>
+ <a href="{% url 'general' %}">About compounds</a>
</li>
<li>
<a href="{% url 'cavities' %}">Protein Interaction Explorer</a>
</li>
+ <li>
+ <a href="{% url 'aboutpi' %}">About Protein Interaction</a>
+ </li>
<li>
<a href="{% url 'tutorials' %}">Tutorials</a>
</li>
@@ -134,7 +137,7 @@
{% endfor %}
</div>
{% endif %}
- {% block content %}{% endblock %}
+ {% block content %}{% endblock %}
</div> <!-- end main -->
<footer class="main-footer">
<div class="inner-wrap">
@@ -160,19 +163,22 @@
<nav>
<ul>
<li>
- <a href="/about-general">About</a>
+ <a href="/compounds">Query compounds</a>
</li>
<li>
- <a href="/compounds">Query compounds</a>
+ <a href="/about-compounds-general">About Compounds</a>
</li>
<li>
<a href="/targetcentric">Protein Interaction Explorer</a>
</li>
+ <li>
+ <a href="/about-pi-general">About Protein Interaction</a>
+ </li>
<li>
<a href="/tutorials">Tutorials</a>
</li>
<li>
- <a href="{% url 'admin-session'%}">{% trans 'Admin_session_title' %}</a>
+ <a href="{% url 'admin-session'%}">Contribute</a>
</li>
</ul>
</nav>
diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py
index f689530c11375665b9bb28525ea7ceae36c31fb4..2321a1d7656580246a1116ceacc628d3dd427db3 100644
--- a/ippisite/ippidb/urls.py
+++ b/ippisite/ippidb/urls.py
@@ -63,7 +63,9 @@ urlpatterns = [
re_path(r"^credits/$", views.credits, name="credits"),
re_path(r"^citation/$", views.citation, name="citation"),
re_path(r"^news/$", views.news, name="news"),
- re_path(r"^about-general/$", views.about_general, name="general"),
+ re_path(r"^about-pi-general/$", views.about_pi_general, name="aboutpi"),
+
+ re_path(r"^about-compounds-general/$", views.about_general, name="general"),
re_path(r"^about-pharmacology/$", views.about_pharmacology, name="pharmacology"),
re_path(r"^about-le-lle/$", views.about_le_lle, name="le_lle"),
re_path(
diff --git a/ippisite/ippidb/views/__init__.py b/ippisite/ippidb/views/__init__.py
index 92733be7a4b329eb108900491abd51c0b6961e6e..1a8ee369256bc83ae507dfd39464798d2d5b0d97 100644
--- a/ippisite/ippidb/views/__init__.py
+++ b/ippisite/ippidb/views/__init__.py
@@ -31,6 +31,7 @@ from .targetcentric import (
JobViewSet,
pocketome_html,
LinkedPDBViewSet,
+ about_pi_general,
)
from .contribute import ippidb_wizard_view, ContributionDetailView
from .compound_query import (
@@ -127,6 +128,7 @@ __all__ = [
about_pca,
about_pharmacology,
about_physicochemistry,
+ about_pi_general,
ContributorListView,
ContributorDetailView,
PdbViewSet,
diff --git a/ippisite/ippidb/views/targetcentric.py b/ippisite/ippidb/views/targetcentric.py
index 419b06ff9e547bed369713664742e9e1600d2682..0daea906542eb381ece4920231893300db512871 100644
--- a/ippisite/ippidb/views/targetcentric.py
+++ b/ippisite/ippidb/views/targetcentric.py
@@ -580,3 +580,28 @@ class SummaryView(TemplateView):
"""
template_name = "summary-table.html"
+
+
+def about_pi_general(request):
+ context = {}
+ cavitiescount = Cavity.objects.all().count()
+ proteincount = (
+ Chain.objects.all().values("protein__uniprot_id").distinct().count()
+ )
+ organismcount = (
+ Chain.objects.all().values("protein__organism__name").distinct().count()
+ )
+ orthocount = Cavity.objects.filter(type='orthosteric').count()
+ allostcount = Cavity.objects.filter(type='liganded_allosteric').count()
+ ortho_comp = Cavity.objects.filter(type='liganded_orthosteric_competitive').count()
+ ortho_nocomp = Cavity.objects.filter(type='liganded_orthosteric_noncompetitive').count()
+
+ context["cavitiescount"] = cavitiescount
+ context["proteincount"] = proteincount
+ context["organismcount"] = organismcount
+ context["orthocount"] = orthocount
+ context["allostcount"] = allostcount
+ context["ortho_comp"] = ortho_comp
+ context["ortho_nocomp"] = ortho_nocomp
+
+ return render(request, "about-pie.html", context=context)
\ No newline at end of file