diff --git a/ippisite/db.sqlite3 b/ippisite/db.sqlite3
index c402b0deb445d2f99fe2770fe9a61ab74aa480b2..bb7ca110e188bf4d34171a62e5c4e6f6eda80691 100644
Binary files a/ippisite/db.sqlite3 and b/ippisite/db.sqlite3 differ
diff --git a/ippisite/ippidb/static/banner.png b/ippisite/ippidb/static/banner.png
deleted file mode 100644
index d967462c745227ca51a54bf45e72f492d23ef95d..0000000000000000000000000000000000000000
Binary files a/ippisite/ippidb/static/banner.png and /dev/null differ
diff --git a/ippisite/ippidb/static/css/ippidb.css b/ippisite/ippidb/static/css/ippidb.css
index d0dc8179f2f82f60555100957d2193d0905cbada..a0135c7b5213afe6c62b1fc2d326cccf0dc982fe 100644
--- a/ippisite/ippidb/static/css/ippidb.css
+++ b/ippisite/ippidb/static/css/ippidb.css
@@ -205,6 +205,8 @@ div.tabs {
#mainnav{
overflow: hidden;
+ border-bottom: 1px solid #AEB7C0;
+ background-color: #F9F9F9;
}
.main-nav{
@@ -213,6 +215,7 @@ div.tabs {
position: relative;
width: 600px;
text-align: center;
+ height: 35px;
}
.main-nav ul {
@@ -233,7 +236,7 @@ div.tabs {
.main-nav ul li a{
font-size: 12px;
font-family: "BrandonGrotesqueBlk";
- color:#636060;
+ color:#000;
text-transform: uppercase;
text-decoration: none;
padding: 5px 0px;
@@ -294,6 +297,228 @@ div.tabs {
display: inline-block;
}
+/* -- Secondary Menu -- */
+
+.secondary-nav {
+background: #F0F3F4 none repeat scroll 0% 0%;
+padding: 15px 0px;
+text-align: center;
+}
+
+.secondary-nav ul {
+ list-style: outside none none;
+ margin: 0px;
+ padding: 0px;
+ border: 0px none;
+}
+
+.secondary-nav ul li {
+ margin: 0px 35px;
+ display: inline-block;
+}
+
+.secondary-nav ul li a {
+ font-size: 11px;
+ font-family: "BrandonGrotesqueBlk";
+ color:#414144;
+ text-transform: uppercase;
+ text-decoration: none;
+ padding: 0px 0px;
+ position: relative;
+ display: inline-block;
+}
+
+.secondary-nav ul li a:focus::after {
+ content: "";
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ height: 2px;
+ background: #414144 none repeat scroll 0% 0%;
+ text-decoration: none;
+}
+
+.secondary-nav ul li a:active::after {
+ content: "";
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ height: 2px;
+ background: #414144 none repeat scroll 0% 0%;
+ text-decoration: none;
+}
+
+.secondary-nav ul li a:hover::after {
+ content: "";
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ height: 2px;
+ background: #414144 none repeat scroll 0% 0%;
+ text-decoration: none;
+}
+
+/* -- Breadcrumb -- */
+
+
+.inner-wrap .breadcrumb:first-child {
+ margin-top: 10px;
+}
+
+.main__inner .breadcrumb {
+ position: absolute;
+ z-index: 1;
+ top: 10px;
+ left: 10px;
+ color: #fff;
+}
+
+.breadcrumb {
+ color: #C6C5C6;
+ max-width: 1200px;
+}
+
+.breadcrumb a {
+ color: #C6C5C6;
+ text-decoration: underline;
+}
+
+.breadcrumb span:last-child {
+ font-weight: bold;
+ color: #1D1D1B;
+}
+
+.breadcrumb > .breadcrumb-label {
+ position: absolute !important;
+ clip: rect(1px,1px,1px,1px);
+ padding: 0 !important;
+ border: 0 !important;
+ height: 1px !important;
+ width: 1px !important;
+ overflow: hidden;
+}
+
+.breadcrumb > .breadcrumb-label + div {
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+.main__inner .breadcrumb a {
+ color: #fff;
+ text-shadow: 1px 1px 3px rgba(0,0,0,0.5);
+}
+
+.breadcrumb span::before {
+ content: '>';
+ margin: 0 5px;
+}
+
+.main__inner .breadcrumb span:last-child {
+ font-weight: bold;
+ color: #fff;
+}
+
+/* -- Page Header -- */
+
+.adv-page__header{
+ margin-left: -50px;
+ margin-right: -50px;
+box-shadow: 0px 0px 0px 1500px rgba(0, 0, 0, 0.1) inset;
+min-height: 260px;
+line-height: 260px;
+background-repeat: no-repeat;
+background-size: cover;
+position: relative;
+text-align:center;
+background-image:url("https://research.pasteur.fr/wp-content/uploads/2015/03/Facebook-offers-its-Proxygen-server-on-Open-Source-Platform-for-developers-1000x300.jpg")
+
+}
+
+.header__inner {
+ display: inline-block;
+ vertical-align: middle;
+ line-height: 1.2;
+ min-width: 450px;
+font-size: 42px;
+ font-family: "BrandonGrotesqueBlk";
+ color:#fff;
+ text-transform: uppercase;
+}
+
+.node-fiche-page--full .node__title {
+ font-weight: 800;
+ text-transform: uppercase;
+ text-align: center;
+ line-height: 1.2;
+ margin: 0px;
+ font-size: 58px;
+ padding-top: 150px;
+ color: #FFF;
+}
+
+.node-fiche-page--full {
+ background-repeat: no-repeat;
+ background-position: 50% top;
+ background-size: 100% auto;
+ position: relative;
+ background-color: #fff;
+}
+
+.header__bg {
+ box-shadow: 0px 0px 0px 1500px rgba(0, 0, 0, 0.15) inset;
+ background-size: 100%;
+ background-repeat: no-repeat;
+}
+
+.node-fiche-page--full .header__bg {
+ position: absolute;
+}
+
+.node-fiche-page--full header {
+ position: relative;
+ min-height: 345px;
+}
+
+.node-fiche-page--full .content {
+ background: #FFF none repeat scroll 0% 0%;
+ padding: 15px 65px;
+}
+
+.page-title {
+ margin: 0px 0px 30px;
+ text-transform: uppercase;
+ text-align: center;
+ font-size: 42px;
+ line-height: 1.2;
+ color: #1D1D1B;
+ font-family:"BrandonGrotesqueBlk";
+}
+
+.page-intro {
+ color:#414144;
+ margin-top: 30px;
+ font-size: 20px;
+ font-weight: normal;
+ line-height: 1.4;
+ text-align: justify;
+ margin: 40px auto;
+ padding-top: 40px;
+}
+
+.page-intro ul {
+ margin-left: 30px;
+}
+
+.page-intro ul li {
+ font-size: 20px;
+ font-weight: normal;
+ line-height: 1.4;
+}
+
button {
font-family:"BrandonGrotesqueReg";
}
@@ -353,10 +578,20 @@ display:block;
text-decoration: none;
}
+/* FORMS */
+
+#Form{
+ width: 70%;
+ border: 1px solid;
+ padding: 10px;
+ min-height: 150px;
+}
+
/* CONTENT */
#content{
min-height: 400px;
+ margin-bottom: 50px;
}
diff --git a/ippisite/ippidb/static/ippidb.css b/ippisite/ippidb/static/ippidb.css
deleted file mode 100644
index fa3566f4d862c618a6eb4839136e974b2d1999f8..0000000000000000000000000000000000000000
--- a/ippisite/ippidb/static/ippidb.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#home div.jumbotron{
- background: url('/static/banner.png');
- background-repeat: no-repeat;
-}
diff --git a/ippisite/ippidb/templates/about.html b/ippisite/ippidb/templates/about.html
new file mode 100644
index 0000000000000000000000000000000000000000..9fbd80a864d1b6bbc0e53e54a1411fe47dc5875b
--- /dev/null
+++ b/ippisite/ippidb/templates/about.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+
+{% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
+
+{% block content %}
+Here some details on iPPI-DB website
+{% endblock %}
diff --git a/ippisite/ippidb/templates/add.html b/ippisite/ippidb/templates/add.html
new file mode 100644
index 0000000000000000000000000000000000000000..9b07f4084a9831e7a526de1b40988a7dedd2a955
--- /dev/null
+++ b/ippisite/ippidb/templates/add.html
@@ -0,0 +1,74 @@
+{% extends "base.html" %}
+
+
+{% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
+
+{% block content %}
+<div id="mainnav">
+ <nav class="secondary-nav">
+ <div class="inner-wrap">
+ <ul>
+ <li>
+ <a hfref="/admin/view">View Content</a>
+ </li>
+ <li>
+ <a href="/admin/add">Add New Content</a>
+ </li>
+ <li>
+ <a hfref="/admin/update">Update Content</a>
+ </li>
+ </ul>
+ </div>
+ </nav>
+</div>
+<div class="inner-wrap">
+ <nav class="breadcrumb" role="navigation">
+ <div id="breadcrumb-label" class="breadcrumb-label">Vous êtes ici</div>
+ <div aria-labelledby="breadcrumb-label">
+ Fonction Fil d'Arianne
+ </div>
+ </nav>
+ <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"> ADD NEW CONTENT </h1>
+ <div class="tabs"></div>
+ <div class="main__inner">
+ <div class="region region-content">
+ <div class="page-intro">
+ By selecting ADD NEW CONTENT you are about to add all or any of the following information to iPPI-DB:</br>
+ New publications, New pharmacological data, New PPI modulators, New PPI targets, New cytotoxic or pharmacokine2c data.</br>
+ Please prepare yourself to fill some information within this web application.</br>
+ To achieve this process, you need : </br>
+ <ul>
+ <li> Your bibliographic source (PubMed article or Patents), </li>
+ <li> Its ID number (e.g Pubmed ID), </li>
+ <li> And a reference PDB code that contains the structure of the macromolecular complex of the PPI target for which you have data. </li>
+ </ul>
+ E.g for a heterodimer, the structure needs to contain both partners. This will help you to describe the PPI architecture. </br>
+ Most of the information you need to provide will come both from the PDB structure, and the bibliographic source. The rest will be automatically filled and will just require your approval.
+ </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 id="Form">
+ ICI Formulaires
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </main><!-- .site-main -->
+ </div>
+ </div>
+ </div><!-- div main -->
+ </div>
+</div>
+{% endblock %}
diff --git a/ippisite/ippidb/templates/admin.html b/ippisite/ippidb/templates/admin.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc665f102e23d9c440808948bdca1a2579044c2d
--- /dev/null
+++ b/ippisite/ippidb/templates/admin.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+
+{% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
+
+{% block content %}
+Here the template of admin session
+{% endblock %}
diff --git a/ippisite/ippidb/templates/base.html b/ippisite/ippidb/templates/base.html
index a3ebba8e116852592fffc55dcda7f1e136f2153d..f170e24a9391cd5351b9e4589b159f8dc07c854b 100644
--- a/ippisite/ippidb/templates/base.html
+++ b/ippisite/ippidb/templates/base.html
@@ -19,7 +19,7 @@
<a href="https://www.pasteur.fr/fr">Research</a>
</li>
<li>
- <a hfre="https://www.pasteur.fr/en/education">Education</a>
+ <a hfref="https://www.pasteur.fr/en/education">Education</a>
</li>
<li>
<a href="https://www.pasteur.fr/en/international-en">International</a>
@@ -42,13 +42,14 @@
</div><!-- /.container-fluid -->
</div>
<div id="mainnav">
- <nav class="main-nav">
+ <nav class="main-nav">
+ <div>
<ul>
<li>
<a href="/">Home</a>
</li>
<li>
- <a hfre="/other">About</a>
+ <a href="/about">About</a>
</li>
<li>
<a href="/submit">Submit</a>
@@ -60,7 +61,8 @@
<a href="/admin">Admin</a>
</li>
</ul>
- </nav>
+ </div>
+ </nav>
</div>
<div id="content">
{% block content %}{% endblock %}
diff --git a/ippisite/ippidb/templates/index.html b/ippisite/ippidb/templates/index.html
index f81bcd9c66202eff27cd0ecb6583286d9884d5e0..4205a2c95dfa7c83369d11bd232737a28f6a0fa8 100644
--- a/ippisite/ippidb/templates/index.html
+++ b/ippisite/ippidb/templates/index.html
@@ -4,4 +4,5 @@
{% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
{% block content %}
+Welcome to the homepage
{% endblock %}
diff --git a/ippisite/ippidb/templates/submit.html b/ippisite/ippidb/templates/submit.html
new file mode 100644
index 0000000000000000000000000000000000000000..85717d14f229b415267c00d61e847e98c78438b0
--- /dev/null
+++ b/ippisite/ippidb/templates/submit.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+
+{% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
+
+{% block content %}
+Here you can submit request to iPPI-DB
+{% endblock %}
diff --git a/ippisite/ippidb/templates/tutorials.html b/ippisite/ippidb/templates/tutorials.html
new file mode 100644
index 0000000000000000000000000000000000000000..9d672e0b412d389cb4e5a16e06cc96f363a75d6e
--- /dev/null
+++ b/ippisite/ippidb/templates/tutorials.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+
+{% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
+
+{% block content %}
+Here all the tutorials to get a full iPPI-DB experience
+{% endblock %}
diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py
index 726f2d8ac9ba779b642c0a921ba4784d827b32cc..c693854ec388b5ac3a7d541fb7e1fca9b93a219c 100644
--- a/ippisite/ippidb/urls.py
+++ b/ippisite/ippidb/urls.py
@@ -1,6 +1,10 @@
from django.conf.urls import url
-from .views import index
+from . import views
urlpatterns = [
- url(r'^$', index, name='index')
+ url(r'^$', views.index, name='index'),
+ url(r'^about$', views.about, name='about'),
+ url(r'^submit$', views.submit, name='submit'),
+ url(r'^tutorials$', views.tutorials, name='tutorials'),
+ url(r'^admin/add$', views.add, name='add'),
]
diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py
index cbd3ce24117c5c796e0c5195ef27a6d3e6a16360..00ab3e13808c3587da6cb21247831ea52475991d 100644
--- a/ippisite/ippidb/views.py
+++ b/ippisite/ippidb/views.py
@@ -2,3 +2,17 @@ from django.shortcuts import render
def index(request):
return render(request, 'index.html')
+
+
+def about(request):
+ return render(request, 'about.html')
+
+def submit(request):
+ return render(request, 'submit.html')
+
+def tutorials(request):
+ return render(request, 'tutorials.html')
+
+def add(request):
+ return render(request, 'add.html')
+