Commit 10f81eaf authored by Administrator's avatar Administrator

removing nested class

parent 9ec0a248
......@@ -5,16 +5,16 @@ from nested_inlines.admin import NestedModelAdmin, NestedStackedInline, NestedTa
from documents.models import Database, Language, Project, Corpus, Document
class DocumentInLine(NestedStackedInline):
class DocumentInLine(admin.StackedInline):
model = Document
extra = 0
class CorpusInLine(NestedStackedInline):
class CorpusInLine(admin.StackedInline):
model = Corpus
extra = 0
inlines = [DocumentInLine,]
class ProjectAdmin(NestedModelAdmin):
class ProjectAdmin(admin.ModelAdmin):
exclude = ('analyst',)
list_display = ('title', 'date', 'analyst')
inlines = [CorpusInLine,]
......
{% extends "menu.html" %}
{% block css %}
{% load staticfiles %}
<link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
<link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
{% endblock %}
{% block content %}
<div class="container theme-showcase" role="main">
<div class="jumbotron">
<p class="right"> <img src="{{ MEDIA_URL }}{{author.picture_id.url }}" height="130" width="115" style="float:right" /></a><br/> </p>
<h1>{{ author.firstName }} {{ author.lastName }}</h1>
<div class="row">
<div class="col-md-4">
<p>
{{ profession.title }}
{{ profession.abstract }}
</p>
</div>
<div class="col-md-4">
<p>
</p>
</div>
<div class="col-md-4">
<p>
</p>
</div>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-md-4">
{% if book or article or blogPost %}
<h2>Last publications</h2>
{% if book %}
<h3>Book</h3>
{{ book.title }}
{% if book.url %}
<a class="btn btn-xs btn-default" href={{ book.url }} role="button">More...</a>
{% endif %}
{% endif %}
{% if article %}
<h3>Article</h3>
<p> {{ article.title }}
{% if article.url %}}
<a class="btn btn-xs btn-default" href={{ article.url }} role="button">More...</a>
{% endif %}
</p>
{% endif %}
{% if blogPost %}
<h3>Blog</h3>
<p> {{ blogPost.title }}
{% if blogPost.url %}
<a class="btn btn-xs btn-default" href="{{ blogPost.url}}" role="button">More...</a>
{% endif %}
</p>
{% endif %}
{% endif %}
</div>
<div class="col-md-4">
{% if projects %}
<h2>Current projects</h2>
{% for project in projects %}
<h3>{{ project.title }}</h3>
<p>
{{ project.abstract }}
{% if project.url %}
<a class="btn btn-xs btn-default" href="{{ project.url }}" role="button">More...</a>
{% endif %}
</p>
{% endfor %}
{% endif %}
</div>
<div class="col-md-4">
{% if conference or seminar or workshop or course %}
<h2>Next talks</h2>
{% if conference %}
<h3>Conference</h3>
<p>{{ conference.title }}</p>
{% endif %}
{% if seminar %}
<h3>Seminar</h3>
<! if english or french !>
<p>{{ seminar.title }}</p>
{% endif %}
{% if workshop %}
<h3>Workshop</h3>
<p>{{ workshop.title }}</p>
{% endif %}
{% if course %}
<h3>Course</h3>
<p>{{ course.title }}</p>
{% endif %}
{% endif %}
</div>
</div>
</div>
{% endblock %}
......@@ -8,7 +8,7 @@
<body>
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-inner">
<button class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
......@@ -16,7 +16,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">About</a>
<a class="navbar-brand" href="/">Gargantext</a>
</div>
<div class="navbar-collapse collapse">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment