Skip to content

gargantext
gargantext
Commit 60ac8d42 authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'testing' into stable

parents d40218ac 7371ee67
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6227 additions and 18 deletions
gargantext_web/team.py
View file @ 60ac8d42
......@@ -18,7 +18,7 @@ def get_team():
'''
team = [
{ 'first_name' : 'Alexandre', 'last_name' : 'Delanoë', 'mail' : 'alexandre+gargantextATdelanoe.org', 'website' : 'http://alexandre.delanoe.org', 'picture' : 'alexandre.jpg'},
{ 'first_name' : 'David', 'last_name' : 'Chavalarias', 'mail' : '', 'website' : 'http://chavalarias.com', 'picture' : 'david.jpg'},
{ 'first_name' : 'David', 'last_name' : 'Chavalarias', 'mail' : 'david.chavalariasATiscpif.fr', 'website' : 'http://chavalarias.com', 'picture' : 'david.jpg'},
{ 'first_name' : 'Mathieu', 'last_name' : 'Rodic', 'mail' : '', 'website' : 'http://rodic.fr', 'picture' : 'mathieu.jpg'},
{ 'first_name' : 'Samuel', 'last_name' : 'Castillo J.', 'mail' : 'kaisleanATgmail.com', 'website' : 'http://www.pksm3.droppages.com', 'picture' : 'samuel.jpg'},
{ 'first_name' : 'Elias', 'last_name' : 'Showk', 'mail' : '', 'website' : 'https://github.com/elishowk', 'picture' : ''},
......@@ -35,7 +35,12 @@ def get_sponsors():
'''
sponsors = [
{ 'name' : 'Mines ParisTech', 'website' : 'http://mines-paristech.fr', 'picture' : 'logo.png'},
{ 'name' : 'Mines ParisTech', 'website' : 'http://mines-paristech.fr', 'picture' : 'mines.png', 'funds':''},
{ 'name' : 'Institut Pasteur', 'website' : 'http://www.pasteur.fr', 'picture' : 'pasteur.png', 'funds':''},
{ 'name' : 'Forccast', 'website' : 'http://forccast.hypotheses.org/', 'picture' : 'forccast.png', 'funds':''},
{ 'name' : 'ADEME', 'website' : 'http://www.ademe.fr', 'picture' : 'ademe.png', 'funds':''},
{ 'name' : 'EHESS', 'website' : 'http://www.ehess.fr', 'picture' : 'ehess.png', 'funds':''},
#{ 'name' : '', 'website' : '', 'picture' : '', 'funds':''},
# copy paste the line above and write your informations please
]
......
gargantext_web/urls.py
View file @ 60ac8d42
......@@ -19,6 +19,8 @@ urlpatterns = patterns('',
url(r'^auth/$', views.login_user),
url(r'^auth/logout/$', views.logout_user),
url(r'^img/logo.svg$', views.logo),
url(r'^css/bootstrap.css$', views.css),
# User Home view
url(r'^$', views.home),
......
gargantext_web/views.py
View file @ 60ac8d42
......@@ -27,7 +27,7 @@ from parsing.FileParsers import *
# SOME FUNCTIONS
from gargantext_web.settings import DEBUG
from gargantext_web.settings import DEBUG, STATIC_ROOT
from django.http import *
from django.shortcuts import render_to_response,redirect
from django.template import RequestContext
......@@ -56,6 +56,51 @@ def logout_user(request):
return HttpResponseRedirect('/')
# Redirect to a success page.
def logo(request):
template = get_template('logo.svg')
group = "mines"
#group = "cnrs"
if group == "cnrs":
color = "#093558"
else:
color = "#ff8080"
svg_data = template.render(Context({\
'color': color,\
}))
return HttpResponse(svg_data, mimetype="image/svg+xml")
def css(request):
template = get_template('bootstrap.css')
css = dict()
group = "mines"
#group = "cnrs"
if group == "mines":
css['color'] = '#666666'
css['background'] = '#f8f8f7'
css['a'] = '#bd2525'
css['focus'] = '#7d1818'
css['hr'] = '#eaafae'
css['text'] = '#a2a3a2'
css['form'] = '#a5817f'
css['help'] = '#a6a6a6'
else:
css['color'] = '#E2E7EB'
css['background'] = '#8C9DAD' #container background
css['a'] = '#093558'
css['focus'] = '#556F86'
css['hr'] = '#426A8A'
css['text'] = '#214A6D'
css['form'] = '#093558'
css['help'] = '#093558'
css_data = template.render(Context({\
'css': css,\
}))
return HttpResponse(css_data, mimetype="text/css")
def query_to_dicts(query_string, *query_args):
"""Run a simple query and produce a generator
that returns the results as a bunch of dictionaries
......@@ -102,15 +147,18 @@ def about(request):
'''
About Gargantext, the team and sponsors
'''
template = get_template('about.html')
user = request.user
date = datetime.datetime.now()
members = team.get_team()
template = get_template('about.html')
user = request.user
date = datetime.datetime.now()
members = team.get_team()
sponsors = team.get_sponsors()
html = template.render(Context({\
'user': user,\
'date': date,\
'team': members,\
'sponsors':sponsors,\
}))
return HttpResponse(html)
......
static/img/sponsors/iscpif.svg 0 → 100644
View file @ 60ac8d42
This diff is collapsed.
templates/about.html
View file @ 60ac8d42
......@@ -25,7 +25,9 @@
<div class="panel-heading">
<h2 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#collapseVersions">
<center>
<h2>Versions</h2>
</center>
</a>
</h2>
</div>
......@@ -61,7 +63,9 @@
<div class="panel-heading">
<h2 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#collapseCommunity">
<center>
<h2>Community</h2>
</center>
</a>
</h2>
</div>
......@@ -99,7 +103,9 @@
<div class="panel-heading">
<h2 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#collapseTeam">
<center>
<h2>Core team</h2>
</center>
</a>
</h2>
</div>
......@@ -135,12 +141,34 @@
</div>
</div>
</div>
{% endif %}
</div>
</div>
{% if sponsors %}
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">
<center>
<h2>Sponsors</h2>
<a href="http://www.cnrs.fr" target="_blank" >
<img src="{% static "img/sponsors/cnrs.png"%}" alt="CNRS" style="height:100px">
</a>
<a href="http://www.iscpif.fr" target="_blank" >
<img src="{% static "img/sponsors/iscpif.svg"%}" style="height:100px">
</a>
{% for sponsor in sponsors %}
<a href="{{ sponsor.website }}" target="_blank" >
<img src="{% static "img/sponsors/"%}{{ sponsor.picture }}" style="height:100px">
</a>
{% endfor %}
</center>
</div>
</div>
</div>
{% endif %}
</div>
......
templates/bootstrap.css 0 → 100644
View file @ 60ac8d42
This diff is collapsed.
static/img/logo.svg → templates/logo.svg
View file @ 60ac8d42
......@@ -66,7 +66,7 @@
inkscape:export-ydpi="454.50735"
inkscape:export-xdpi="454.50735"
inkscape:export-filename="/srv/gargantext/static/img/logo.png"
style="fill:#ff8080;fill-opacity:0.82014388"
style="fill:{{color}};fill-opacity:0.82014388"
id="g3835"
transform="matrix(0.2422549,0,0,0.23374214,-49.789462,-7.9055988)">
<path
......@@ -75,7 +75,7 @@
inkscape:export-filename="/home/alexandre/projets/gargantext.py/gargantext_core/shared/LogoSimple.png"
id="path3837"
d="m 206.24721,35.28586 0,129.5 67.78125,0 0,-8.625 c -9.86526,-0.47262 -18.57934,-2.63259 -25.5625,-6.28125 -18.65918,-9.74237 -29.875,-28.26535 -29.875,-49.1875 0,-31.71741 21.11877,-52.8149 55.4375,-55.1875 l 0,-10.21875 -67.78125,0 z m 67.78125,10.21875 0,8.5 c 1.74191,-0.16369 3.53543,-0.28125 5.37499,-0.28125 6.91081,0 13.295,1.44116 19.6875,4.15625 l 2.40625,2.875 2.59375,14.53125 9.6875,0 0,-25.375 c -11.40283,-3.03451 -22.61727,-4.65625 -33.15625,-4.65625 -2.24526,0 -4.44959,0.10177 -6.59374,0.25 z m 0,8.5 c -23.28864,2.18852 -37.65625,18.81513 -37.65625,45.562503 0,27.600037 14.44681,45.025437 37.65625,47.812497 l 0,-93.375 z m 0,93.375 0,8.78125 c 1.36224,0.0653 2.75177,0.0937 4.15624,0.0937 10.19344,0 22.1324,-1.88915 35.78125,-5.5625 l 0,-38.1875 2.9375,-2.21875 9.5,-0.8125 0,-6.5625 -43.21875,0 0,6.5625 12.28125,0.8125 2.9375,2.21875 0,33.21875 c -6.73804,1.4374 -12.61466,2.09375 -17.625,2.09375 -2.32322,0 -4.57592,-0.17643 -6.74999,-0.4375 z"
style="font-size:166.11251831px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#ff8080;fill-opacity:0.82014388;stroke:none;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
style="font-size:166.11251831px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:{{color}};fill-opacity:0.82014388;stroke:none;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
inkscape:connector-curvature="0" />
<path
inkscape:export-ydpi="100"
......@@ -90,7 +90,7 @@
sodipodi:cy="480.17926"
sodipodi:cx="-321.88605"
id="path3839"
style="fill:#ff8080;fill-opacity:0.82014388;stroke:none"
style="fill:{{color}};fill-opacity:0.82014388;stroke:none"
sodipodi:type="arc" />
</g>
</g>
......
templates/menu.html
View file @ 60ac8d42
......@@ -17,7 +17,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" style="line-height:15px; height:10px; padding: 10px 10px;" href="/"><img src="{% static "img/logo.svg" %}"></a>
<a class="navbar-brand" style="line-height:15px; height:10px; padding: 10px 10px;" href="/"><img src="/img/logo.svg"></a>
</div>
<div class="navbar-collapse collapse">
......@@ -40,19 +40,20 @@
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">:<i class="icon-user"></i> {{ user }}<i class="caret"></i>
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-user"></i> {{ user }}<i class="caret"></i>
</a>
<ul class="dropdown-menu">
<li><a tabindex="-1" href="/auth/">Login</a></li>
<li><a tabindex="-1" href="#">Profile</a></li>
<li><a tabindex="-1" href="http://www.iscpif.fr/tiki-index.php?page=gargantext_feedback" target="blank" >Report Feedback</a></li>
<li class="divider"></li>
{% if user.is_authenticated %}
<li><a tabindex="-1" href="/auth/logout">Logout</a></li>
{% else %}
<li><a tabindex="-1" href="/auth/">Login</a></li>
{% endif %}
</ul>
</li>
</ul>
</div>
</div>
</div>
......@@ -65,7 +66,8 @@
<hr>
<footer>
<p>Gargantext, version 1.0.6, Copyrights CNRS {{ date.year }}.</p>
<p>Gargantext, version 1.0.6, <a href="http://www.cnrs.fr" target="blank">Copyrights CNRS {{ date.year }}</a>,
<a href="http://www.gnu.org/licenses/agpl-3.0.html" target="blank">Licence aGPLCV3</a>.</p>
</footer>
......
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