Skip to content

gargantext
gargantext
Commit ae23856c authored by PkSM3's avatar PkSM3
Browse files
Options

merge conflict fixed?

parents d0003ef9 eec56527
Hide whitespace changes
Inline Side-by-side
Showing with 6324 additions and 46 deletions
analysis/diachronic_specificity.py
View file @ ae23856c
......@@ -10,6 +10,8 @@ NodeType = models.NodeType.sa
NodeNgram = models.Node_Ngram.sa
NodeNodeNgram = models.NodeNgramNgram.sa
Ngram = models.Ngram.sa
Node_Metadata = models.Node_Metadata.sa
Metadata = models.Metadata.sa
Node = models.Node.sa
Corpus = models.Corpus.sa
......@@ -36,7 +38,7 @@ def result2dict(query):
return(results)
def diachronic_specificity(corpus_id, string, order=True):
def diachronic_specificity(corpus_id, terms, order=True):
'''
Take as parameter Corpus primary key and text of ngrams.
Result is a dictionnary.
......@@ -44,33 +46,44 @@ def diachronic_specificity(corpus_id, string, order=True):
Values are measure to indicate diachronic specificity.
Nowadays, the measure is rather simple: distance of frequency of period from mean of frequency of all corpus.
'''
corpus = session.query(Node).get(int(corpus_id))
ngram = session.query(Ngram).filter(Ngram.terms == string).first()
ngram_frequency_query = session.query(Node.metadata['publication_year'], func.count('*')) .join(NodeNgram, Node.id == NodeNgram.node_id) .filter( NodeNgram.ngram == ngram) .filter(Node.parent_id == corpus.id) .group_by(Node.metadata['publication_year']).all()
ngram_frequency_query = (session
.query(Node.metadata['publication_year'], func.count('*'))
.join(NodeNgram, Node.id == NodeNgram.node_id)
.join(Ngram, Ngram.id == NodeNgram.ngram_id)
.filter(Ngram.terms == terms)
.filter(Node.parent_id == corpus_id)
.group_by(Node.metadata['publication_year'])
)
document_year_sum_query = session.query(Node.metadata['publication_year'], func.count('*')) .filter(Node.parent_id == corpus.id) .group_by(Node.metadata['publication_year']).all()
document_year_sum_query = (session
.query(Node.metadata['publication_year'], func.count('*'))
.filter(Node.parent_id == corpus_id)
.group_by(Node.metadata['publication_year'])
)
document_filterByngram_year = result2dict(ngram_frequency_query)
document_all_year = result2dict(document_year_sum_query)
document_filterByngram_year = dict(ngram_frequency_query.all())
document_all_year = dict(document_year_sum_query.all())
#print(document_all_year)
data = dict()
for year in document_all_year.keys():
data[year] = document_filterByngram_year.get(year, 0) / document_all_year[year]
relative_terms_count = dict()
for year, total in document_all_year.items():
terms_count = document_filterByngram_year.get(year, 0)
relative_terms_count[year] = terms_count / total
mean = np.mean(list(data.values()))
mean = np.mean(list(relative_terms_count.values()))
data_dict = dict(zip(data.keys(), list(map(lambda x: x - mean, data.values()))))
relative_terms_count = {
key: (value - mean)
for key, value in relative_terms_count.items()
}
if order == True:
return collections.OrderedDict(sorted(data_dict.items()))
return collections.OrderedDict(sorted(relative_terms_count.items()))
else:
return data_dict
return relative_terms_count
# For tests
#diachronic_specificity(102750, "bayer", order=True)
# diachronic_specificity(102750, "bayer", order=True)
# diachronic_specificity(26128, "bee", order=True)
gargantext_web/team.py
View file @ ae23856c
......@@ -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 @ ae23856c
......@@ -20,6 +20,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 @ ae23856c
......@@ -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)
......@@ -435,12 +483,18 @@ def corpus(request, project_id, corpus_id):
print(chart)
except Exception as error:
print(error)
try:
processing = corpus.metadata['Processing']
except:
processing = 0
html = t.render(Context({\
'user': user,\
'date': date,\
'project': project,\
'corpus' : corpus,\
'processing' : processing,\
# 'documents': documents,\
'number' : number,\
'dates' : chart,\
......
init/README.rst
View file @ ae23856c
......@@ -153,4 +153,10 @@ $ sudo aptitude install tmux
$ tmux -c ./manage.py celery worker --loglevel=info
$ python manage.py runserver
Versions on git
---------------
stable branch : current version for production server with nginx config (and tina branch for tina/apache server)
testing branch : current version for users' tests
unstable branch : current version for developers
init_cooc.py 0 → 100644
View file @ ae23856c
# Without this, we couldn't use the Django environment
import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gargantext_web.settings")
os.environ.setdefault("DJANGO_HSTORE_GLOBAL_REGISTER", "False")
# We're gonna use all the models!
from node.models import User, NodeType, Node
user = User.objects.get(username = 'contro2015.lait')
# Reset: all data
try:
typeDoc = NodeType.objects.get(name='Cooccurrence')
except Exception as error:
print(error)
Node.objects.filter(user=user, type=typeDoc).all().delete()
exit()
node/models.py
View file @ ae23856c
......@@ -243,6 +243,8 @@ class Node(CTENode):
print("LOG::TIME: In workflow() parse_resources()")
start = time.time()
self.metadata['Processing'] = 1
self.save()
self.parse_resources()
end = time.time()
print ("LOG::TIME: parse_resources() [s]",(end - start))
......@@ -266,6 +268,8 @@ class Node(CTENode):
print("LOG::TIME: In workflow() / do_tfidf()")
print("In workflow() END")
self.metadata['Processing'] = 0
self.save()
class Node_Metadata(models.Model):
node = models.ForeignKey(Node, on_delete=models.CASCADE)
......
static/img/sponsors/iscpif.svg 0 → 100644
View file @ ae23856c
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
version="1.1"
width="511.12845"
height="355.98499"
id="svg3774">
<defs
id="defs3776" />
<metadata
id="metadata3779">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
transform="translate(-107.29293,-265.79825)"
id="layer1">
<polygon
points="1123.74,171.359 1123.74,402 826.552,496.744 656.028,370.777 656.028,181.934 826.552,140.759 "
transform="translate(-505.31864,125.03925)"
id="polygon346"
style="fill:#20b2e3" />
<g
transform="translate(-505.31864,125.03925)"
id="g348">
<path
d="m 948.689,262.616 c 0,1.485 0.265,1.827 0.662,1.987 0.29,0.104 0.663,0.104 0.978,0.078 v 0.373 c -0.766,0.45 -1.693,0.714 -2.938,0.714 -1.245,0 -1.695,-0.688 -1.906,-1.615 -0.873,0.555 -1.984,1.615 -3.574,1.615 -2.488,0 -3.602,-1.75 -3.602,-3.627 0,-1.35 0.555,-2.38 2.541,-2.938 1.801,-0.476 3.973,-1.087 4.58,-1.722 v -1.532 c 0,-1.646 -0.689,-2.411 -1.744,-2.411 -1.035,0 -1.828,0.662 -2.279,3.016 -0.133,0.559 -0.451,0.771 -0.98,0.771 -0.607,0 -1.721,-0.372 -1.721,-1.402 0,-1.351 1.855,-2.996 5.296,-2.996 4.263,0 4.688,2.064 4.688,3.601 v 6.088 z m -3.259,-4.419 c -0.58,0.29 -1.59,0.714 -2.407,1.165 -0.929,0.423 -1.272,1.055 -1.272,2.25 0,1.505 0.714,2.805 2.013,2.805 0.636,0 1.667,-0.368 1.667,-1.853 v -4.367 z"
id="path350"
style="fill:#1b171b" />
<path
d="m 956.161,263.568 c 0,1.087 0.108,1.17 2.066,1.299 v 0.584 h -6.964 v -0.584 c 1.456,-0.078 1.563,-0.212 1.563,-1.299 v -8.02 c 0,-0.952 -0.213,-1.19 -0.635,-1.273 l -0.797,-0.104 v -0.502 l 4.398,-0.719 0.289,2.385 c 1.562,-1.64 2.277,-2.411 3.309,-2.411 1.059,0 1.643,0.662 1.643,1.614 0,0.9 -0.662,1.961 -1.643,1.961 -0.396,0 -0.688,-0.186 -0.926,-0.398 -0.531,-0.476 -0.875,-0.713 -1.324,-0.713 -0.608,0 -0.98,0.584 -0.98,2.012 v 6.168 z"
id="path352"
style="fill:#1b171b" />
<path
d="m 963.448,255.574 c 0,-1.004 -0.184,-1.19 -0.662,-1.273 l -0.742,-0.129 v -0.502 l 4.635,-0.719 0.104,0.083 v 10.534 c 0,1.139 0.109,1.196 1.563,1.299 v 0.584 h -6.433 v -0.584 c 1.402,-0.078 1.535,-0.16 1.535,-1.299 v -7.994 z m 1.642,-7.651 c 1.084,0 1.721,0.794 1.721,1.72 0,0.955 -0.662,1.749 -1.746,1.749 -1.086,0 -1.724,-0.793 -1.724,-1.749 0,-0.926 0.638,-1.72 1.724,-1.72 h 0.025 z"
id="path354"
style="fill:#1b171b" />
<path
d="m 977.51,257.028 c -0.449,-1.93 -1.72,-3.466 -3.07,-3.466 -1.164,0 -1.774,0.714 -1.774,1.827 0,1.298 1.087,1.826 2.62,2.411 2.25,0.875 3.576,1.775 3.576,3.917 0,2.571 -2.014,4.051 -4.896,4.051 -1.377,0 -3.023,-0.342 -3.814,-1.029 l -0.293,-3.71 h 0.557 c 0.582,2.065 2.014,4.129 3.68,4.129 1.086,0 1.96,-0.553 1.96,-1.877 0,-1.216 -0.9,-1.905 -2.565,-2.567 -2.148,-0.849 -3.498,-1.935 -3.498,-3.839 0,-2.463 1.773,-3.948 4.553,-3.948 1.247,0 2.518,0.264 3.498,0.822 v 3.28 h -0.534 z"
id="path356"
style="fill:#1b171b" />
<path
d="m 928.133,284.548 c 0,1.273 0.16,1.434 1.934,1.511 v 0.584 H 922.6 v -0.584 c 1.854,-0.078 1.932,-0.187 1.932,-1.511 v -13.261 c 0,-1.298 -0.078,-1.434 -1.932,-1.537 v -0.584 h 7.467 v 0.584 c -1.748,0.104 -1.934,0.187 -1.934,1.537 v 13.261 z"
id="path358"
style="fill:#1b171b" />
<path
d="m 932.561,270.015 c 0,-1.004 -0.186,-1.242 -0.637,-1.325 l -0.874,-0.129 v -0.533 l 4.817,-0.476 0.029,0.026 v 17.213 c 0,1.107 0.105,1.165 1.559,1.268 v 0.584 h -6.457 v -0.584 c 1.453,-0.078 1.562,-0.161 1.562,-1.268 v -14.776 z"
id="path360"
style="fill:#1b171b" />
<path
d="m 942.413,280.104 c -0.025,2.856 0.768,5.376 3.389,5.376 1.828,0 2.861,-0.823 3.653,-2.572 l 0.45,0.212 c -0.791,2.226 -2.275,3.84 -5.189,3.84 -4.501,0 -5.823,-2.83 -5.823,-6.406 0,-3.523 1.563,-6.437 5.903,-6.437 4.738,0 5.219,3.312 5.219,5.06 0,0.688 -0.373,0.926 -1.273,0.926 h -6.329 z m 3.388,-0.662 c 0.637,0 0.822,-0.238 0.822,-0.926 0,-1.615 -0.266,-3.762 -1.986,-3.762 -1.826,0 -2.225,2.836 -2.225,4.688 h 3.389 z"
id="path362"
style="fill:#1b171b" />
<path
d="m 964.745,268.664 -1.035,-0.129 v -0.532 l 4.926,-0.45 0.051,0.052 v 17.157 c 0,1.112 0.16,1.221 1.641,1.299 v 0.584 h -4.949 v -1.35 c -1.35,1.056 -2.754,1.666 -3.759,1.666 -3.048,0 -4.819,-2.09 -4.819,-6.168 0,-2.224 0.688,-4 1.826,-5.086 1.139,-1.056 2.594,-1.588 4.422,-1.588 0.9,0 1.748,0.135 2.33,0.399 v -4.527 c -0.002,-1.063 -0.212,-1.275 -0.634,-1.327 z m 0.632,8.63 c 0,-0.579 0,-1.081 -0.211,-1.479 -0.293,-0.584 -0.928,-1.061 -1.959,-1.061 -1.748,0 -2.889,1.615 -2.889,5.589 0,3.099 1.141,5.267 2.939,5.267 0.875,0 1.457,-0.264 1.775,-0.849 0.29,-0.393 0.344,-0.926 0.344,-1.479 v -5.988 z"
id="path364"
style="fill:#1b171b" />
<path
d="m 975.206,280.104 c -0.025,2.856 0.771,5.376 3.389,5.376 1.83,0 2.861,-0.823 3.656,-2.572 l 0.449,0.212 c -0.793,2.226 -2.275,3.84 -5.189,3.84 -4.501,0 -5.822,-2.83 -5.822,-6.406 0,-3.523 1.562,-6.437 5.903,-6.437 4.739,0 5.216,3.312 5.216,5.06 0,0.688 -0.373,0.926 -1.273,0.926 h -6.329 z m 3.388,-0.662 c 0.637,0 0.824,-0.238 0.824,-0.926 0,-1.615 -0.266,-3.762 -1.988,-3.762 -1.826,0 -2.225,2.836 -2.225,4.688 h 3.389 z"
id="path366"
style="fill:#1b171b" />
<path
d="m 1002.225,269.166 v 4.559 h -0.586 c -0.791,-2.861 -1.479,-3.813 -4.154,-3.813 h -1.748 c -0.74,0 -0.902,0.155 -0.902,0.926 v 6.778 h 3.152 c 1.748,0 2.064,-0.741 2.438,-2.541 h 0.582 v 5.821 h -0.582 c -0.373,-1.801 -0.689,-2.54 -2.438,-2.54 h -3.152 v 6.193 c 0,1.325 0.162,1.408 2.332,1.511 v 0.584 h -7.861 v -0.584 c 1.717,-0.104 1.93,-0.187 1.93,-1.511 v -13.261 c 0,-1.351 -0.078,-1.434 -1.93,-1.537 v -0.584 h 12.919 z"
id="path368"
style="fill:#1b171b" />
<path
d="m 1008.717,284.761 c 0,1.086 0.107,1.169 2.064,1.299 v 0.584 h -6.964 v -0.584 c 1.46,-0.078 1.563,-0.212 1.563,-1.299 v -8.02 c 0,-0.952 -0.213,-1.19 -0.635,-1.273 l -0.794,-0.104 v -0.501 l 4.396,-0.719 0.292,2.385 c 1.56,-1.64 2.276,-2.411 3.306,-2.411 1.062,0 1.643,0.663 1.643,1.615 0,0.9 -0.658,1.96 -1.643,1.96 -0.395,0 -0.688,-0.186 -0.926,-0.398 -0.527,-0.476 -0.875,-0.714 -1.324,-0.714 -0.605,0 -0.979,0.584 -0.979,2.013 v 6.167 z"
id="path370"
style="fill:#1b171b" />
<path
d="m 1024.874,283.809 c 0,1.485 0.266,1.826 0.662,1.987 0.293,0.103 0.662,0.103 0.98,0.077 v 0.372 c -0.768,0.451 -1.697,0.715 -2.938,0.715 -1.247,0 -1.696,-0.688 -1.909,-1.614 -0.872,0.553 -1.984,1.614 -3.572,1.614 -2.488,0 -3.602,-1.749 -3.602,-3.627 0,-1.351 0.557,-2.38 2.543,-2.939 1.801,-0.475 3.971,-1.086 4.578,-1.722 v -1.532 c 0,-1.645 -0.688,-2.411 -1.748,-2.411 -1.029,0 -1.826,0.662 -2.275,3.016 -0.13,0.559 -0.451,0.771 -0.979,0.771 -0.611,0 -1.723,-0.373 -1.723,-1.403 0,-1.351 1.855,-2.996 5.297,-2.996 4.264,0 4.686,2.064 4.686,3.601 v 6.091 z m -3.258,-4.419 c -0.58,0.29 -1.588,0.714 -2.407,1.164 -0.929,0.424 -1.271,1.055 -1.271,2.251 0,1.505 0.714,2.804 2.014,2.804 0.633,0 1.664,-0.367 1.664,-1.853 v -4.366 z"
id="path372"
style="fill:#1b171b" />
<path
d="m 1040.264,284.844 c 0,1.138 0.105,1.112 1.562,1.216 v 0.584 h -6.328 v -0.584 c 1.061,-0.078 1.428,-0.052 1.428,-1.19 v -6.913 c 0,-1.64 -0.739,-2.489 -2.09,-2.489 -1.113,0 -1.906,0.61 -2.25,1.273 -0.162,0.341 -0.238,0.9 -0.238,1.453 v 6.675 c 0,1.138 0.371,1.086 1.4,1.19 v 0.584 h -6.301 v -0.584 c 1.459,-0.078 1.562,-0.187 1.562,-1.325 v -7.942 c 0,-1.03 -0.158,-1.242 -0.634,-1.298 l -0.794,-0.13 v -0.501 l 4.42,-0.719 0.346,1.775 c 1.613,-0.978 2.752,-1.801 4.262,-1.801 2.516,0 3.654,1.537 3.654,3.922 v 6.804 z"
id="path374"
style="fill:#1b171b" />
<path
d="m 1054.198,283.069 c -0.766,2.83 -2.939,3.865 -5.242,3.865 -3.6,0 -5.689,-2.116 -5.689,-6.276 0,-3.865 2.037,-6.54 6.191,-6.54 2.387,0 4.527,1.061 4.527,2.675 0,1.061 -1.086,1.485 -1.877,1.485 -0.611,0 -1.007,-0.238 -1.113,-0.796 -0.289,-1.692 -0.637,-2.728 -1.881,-2.728 -1.297,0 -2.33,1.775 -2.33,5.216 0,3.652 1.404,5.511 3.311,5.511 1.428,0 2.805,-0.508 3.705,-2.598 l 0.398,0.186 z"
id="path376"
style="fill:#1b171b" />
<path
d="m 1059.237,280.104 c -0.025,2.856 0.766,5.376 3.389,5.376 1.826,0 2.859,-0.823 3.653,-2.572 l 0.45,0.212 c -0.794,2.226 -2.277,3.84 -5.189,3.84 -4.502,0 -5.826,-2.83 -5.826,-6.406 0,-3.523 1.562,-6.437 5.902,-6.437 4.74,0 5.22,3.312 5.22,5.06 0,0.688 -0.37,0.926 -1.271,0.926 h -6.328 z m 3.388,-0.662 c 0.634,0 0.822,-0.238 0.822,-0.926 0,-1.615 -0.268,-3.762 -1.986,-3.762 -1.828,0 -2.225,2.836 -2.225,4.688 h 3.389 z"
id="path378"
style="fill:#1b171b" />
<path
d="m 934.647,248.875 c -1.219,-0.74 -2.596,-0.9 -4.58,-0.9 h -7.494 v 0.582 c 1.855,0.106 1.959,0.187 1.959,1.511 v 13.262 c 0,0.176 -0.004,0.327 -0.008,0.463 l 1.467,-1.619 h 0.605 l 1.521,1.637 c -0.008,-0.14 -0.01,-0.294 -0.01,-0.481 v -4.92 c 0.371,0.051 0.979,0.103 1.535,0.103 2.064,0 3.521,-0.341 4.631,-1.06 1.404,-0.817 2.334,-2.22 2.334,-4.393 10e-4,-1.986 -0.716,-3.416 -1.96,-4.185 z m -4.926,9.001 c -1.029,0 -1.613,-0.212 -1.613,-1.138 v -7.202 c 0,-0.713 0.078,-0.925 1.43,-0.925 1.881,0 3.359,1.456 3.359,4.526 0,2.623 -0.662,4.739 -3.176,4.739 z"
id="path380"
style="fill:#1b171b" />
<path
d="m 929.696,267.743 -3.072,-1.666 c -0.237,-0.16 -0.475,-0.187 -0.715,0 l -2.967,1.666 -0.289,-0.398 3.338,-3.679 h 0.605 l 3.416,3.679 -0.316,0.398 z"
id="path382"
style="fill:#1b171b" />
<g
id="g384">
<path
d="m 840.281,227.729 c 0,2.353 0.192,2.64 2.928,2.736 v 1.536 h -16.657 v -1.536 c 2.688,-0.096 2.928,-0.384 2.928,-2.736 v -22.658 c 0,-2.353 -0.24,-2.688 -2.928,-2.784 v -1.488 h 16.657 v 1.488 c -2.736,0.096 -2.928,0.432 -2.928,2.784 v 22.658 z"
id="path386" />
<path
d="m 857.128,207.135 0.624,3.264 c 2.785,-1.872 4.272,-3.36 7.633,-3.36 5.088,0 7.488,2.976 7.488,7.632 v 13.105 c 0,2.448 0.289,2.544 2.688,2.688 V 232 h -14.545 v -1.536 c 1.536,-0.192 1.728,-0.48 1.728,-1.824 v -13.345 c 0,-3.216 -0.912,-4.272 -2.256,-4.272 -1.536,0 -2.496,1.152 -2.496,4.561 v 12.433 c 0,1.344 0.24,2.256 1.729,2.448 v 1.536 h -14.545 v -1.536 c 2.448,-0.144 2.688,0.144 2.688,-2.304 v -16.033 c 0,-1.296 -0.24,-1.824 -1.008,-1.968 l -1.393,-0.24 v -1.536 l 11.665,-1.249 z"
id="path388" />
<path
d="m 877.334,222.641 h 1.633 c 1.536,3.84 4.801,8.208 8.113,8.208 1.631,0 2.832,-0.72 2.832,-2.784 0,-1.872 -1.729,-3.072 -5.041,-4.512 -3.889,-1.632 -7.201,-3.312 -7.201,-8.497 0,-5.137 3.841,-8.017 10.562,-8.017 2.544,0 5.616,0.528 7.921,1.68 v 7.249 h -1.584 c -1.488,-4.033 -3.937,-7.105 -6.385,-7.105 -1.584,0 -2.832,0.816 -2.832,2.592 0,1.68 1.392,2.736 5.809,4.513 4.607,1.872 6.768,3.504 6.768,7.92 0,5.568 -3.984,8.737 -10.944,8.737 -2.448,0 -6.624,-0.48 -8.881,-2.064 l -0.77,-7.92 z"
id="path390" />
<path
d="m 911.848,209.872 v 14.497 c 0,3.408 0.624,4.801 2.592,4.801 0.673,0 1.104,-0.144 1.681,-0.336 l 0.336,1.344 c -2.832,1.536 -5.089,2.448 -7.872,2.448 -4.369,0 -6.816,-1.68 -6.816,-6.385 v -16.369 h -2.449 v -2.208 h 2.688 l 6.001,-5.713 h 3.84 v 5.713 h 4.032 v 2.208 h -4.033 z"
id="path392" />
<path
d="m 929.799,207.135 0.193,0.144 v 20.498 c 0,2.448 0.239,2.544 2.688,2.688 v 1.536 h -15.745 v -1.536 c 2.448,-0.144 2.688,-0.24 2.688,-2.688 v -15.649 c 0,-1.296 -0.24,-1.824 -1.008,-1.968 l -1.393,-0.24 v -1.536 l 12.577,-1.249 z m -9.84,-4.8 c 0,-2.256 1.824,-3.984 4.704,-3.984 2.929,0 4.753,1.728 4.753,3.984 0,2.256 -1.824,3.984 -4.753,3.984 -2.879,0 -4.704,-1.728 -4.704,-3.984 z"
id="path394" />
<path
d="m 946.36,209.872 v 14.497 c 0,3.408 0.623,4.801 2.592,4.801 0.672,0 1.104,-0.144 1.68,-0.336 l 0.336,1.344 c -2.832,1.536 -5.088,2.448 -7.872,2.448 -4.368,0 -6.816,-1.68 -6.816,-6.385 v -16.369 h -2.448 v -2.208 h 2.688 l 6.001,-5.713 h 3.841 v 5.713 h 4.032 v 2.208 h -4.034 z"
id="path396" />
<path
d="m 969.063,228.929 c -0.815,0.576 -3.552,3.696 -7.2,3.696 -4.944,0 -7.968,-1.92 -7.968,-7.633 v -13.297 c 0,-1.296 -0.289,-1.872 -1.057,-1.968 l -1.344,-0.24 v -1.536 l 12.192,-0.576 0.288,0.192 v 16.994 c 0,2.736 1.008,4.128 2.256,4.128 1.393,0 2.449,-0.672 2.449,-5.376 v -11.617 c 0,-1.296 -0.289,-1.872 -1.057,-1.968 l -1.344,-0.24 v -1.536 l 12.193,-0.576 0.336,0.192 v 20.209 c 0,2.448 0.239,2.544 2.688,2.688 v 1.536 h -11.713 l -0.719,-3.072 z"
id="path398" />
<path
d="m 995.462,209.872 v 14.497 c 0,3.408 0.624,4.801 2.593,4.801 0.672,0 1.104,-0.144 1.68,-0.336 l 0.336,1.344 c -2.832,1.536 -5.088,2.448 -7.873,2.448 -4.367,0 -6.816,-1.68 -6.816,-6.385 v -16.369 h -2.447 v -2.208 h 2.688 l 6,-5.713 h 3.841 v 5.713 h 4.032 v 2.208 h -4.034 z"
id="path400" />
<path
d="m 852.907,275.777 c 0,2.448 0.24,2.544 2.688,2.688 v 1.536 H 843.69 l -0.432,-2.304 c -2.64,1.968 -4.752,2.928 -7.009,2.928 -5.953,0 -9.265,-4.368 -9.265,-12.625 0,-9.649 5.568,-12.961 12.673,-12.961 1.392,0 2.544,0.192 3.121,0.384 v -4.705 c 0,-1.344 -0.24,-1.872 -1.008,-2.016 l -1.392,-0.192 v -1.536 l 12.385,-1.056 0.145,0.096 v 29.763 z m -10.178,-15.505 c 0,-3.312 -1.44,-3.36 -2.208,-3.36 -1.488,0 -2.976,2.784 -2.976,10.129 0,7.537 1.776,9.985 3.504,9.985 1.248,0 1.729,-1.249 1.729,-2.448 l -0.049,-14.306 z"
id="path402" />
<path
d="m 868.216,267.76 c 0.048,5.088 1.681,8.737 5.616,8.737 3.217,0 4.993,-0.576 6.529,-3.888 l 1.248,0.672 c -1.824,5.856 -6.24,7.345 -11.329,7.345 -8.545,0 -12.625,-3.648 -12.625,-12.673 0,-8.401 4.56,-12.913 12.865,-12.913 11.521,0 11.616,7.776 11.616,10.272 0,1.632 -0.432,2.448 -2.063,2.448 h -11.857 z m 2.929,-2.064 c 1.248,-0.096 1.632,-0.24 1.632,-2.16 0,-1.632 0,-6.673 -2.16,-6.673 -1.92,0 -2.4,4.849 -2.4,9.025 l 2.928,-0.192 z"
id="path404" />
<path
d="m 884.104,270.641 h 1.632 c 1.536,3.84 4.8,8.208 8.112,8.208 1.633,0 2.832,-0.72 2.832,-2.784 0,-1.872 -1.728,-3.072 -5.04,-4.512 -3.888,-1.632 -7.2,-3.312 -7.2,-8.497 0,-5.137 3.84,-8.017 10.561,-8.017 2.545,0 5.617,0.528 7.921,1.68 v 7.249 h -1.585 c -1.487,-4.033 -3.936,-7.105 -6.384,-7.105 -1.584,0 -2.833,0.816 -2.833,2.592 0,1.68 1.393,2.736 5.809,4.513 4.609,1.872 6.77,3.504 6.77,7.92 0,5.568 -3.984,8.737 -10.945,8.737 -2.448,0 -6.625,-0.48 -8.881,-2.064 l -0.769,-7.92 z"
id="path406" />
<path
d="m 846.378,306.496 c -2.256,-6 -4.417,-8.689 -7.537,-8.689 -1.968,0 -3.984,0.816 -3.984,3.889 0,2.496 2.64,4.464 5.953,5.856 7.105,3.072 9.552,4.944 9.552,10.752 0,5.569 -3.408,10.465 -13.057,10.465 -2.976,0 -7.393,-0.815 -10.129,-2.64 l -0.672,-9.313 h 1.776 c 2.833,6.193 5.329,10.081 9.361,10.081 2.4,0 3.888,-1.344 3.888,-3.792 0,-1.872 -0.432,-3.889 -5.28,-6 -7.969,-3.408 -9.649,-6.192 -9.649,-11.137 0,-6.241 4.417,-9.937 12.097,-9.937 3.504,0 6.865,0.672 9.504,1.776 v 8.689 h -1.823 z"
id="path408" />
<path
d="m 876.858,305.2 c -1.729,0 -2.112,0.24 -2.832,1.824 -1.44,3.072 -4.656,12.29 -7.345,19.538 -2.304,6.192 -3.937,10.753 -8.497,10.753 -2.544,0 -4.368,-1.392 -4.368,-3.408 0,-2.064 1.728,-3.937 3.601,-3.937 1.056,0 1.344,0.385 2.016,1.057 0.672,0.672 1.297,1.248 2.064,1.248 1.2,0 1.776,-1.248 1.152,-2.688 -2.592,-5.712 -8.113,-18.049 -10.081,-22.178 -0.769,-1.584 -1.008,-2.016 -2.88,-2.208 v -1.536 h 15.984 v 1.536 l -1.584,0.192 c -0.912,0.096 -0.959,0.672 -0.576,1.728 1.201,3.504 2.881,7.249 4.32,10.801 h 0.193 c 1.199,-4.176 2.496,-9.073 2.879,-10.993 0.193,-1.008 0.049,-1.44 -0.768,-1.536 l -1.729,-0.192 v -1.536 h 8.449 v 1.535 z"
id="path410" />
<path
d="m 876.184,318.641 h 1.632 c 1.536,3.84 4.8,8.208 8.112,8.208 1.633,0 2.832,-0.72 2.832,-2.784 0,-1.872 -1.728,-3.072 -5.04,-4.513 -3.888,-1.632 -7.2,-3.312 -7.2,-8.496 0,-5.137 3.84,-8.017 10.561,-8.017 2.545,0 5.617,0.528 7.921,1.68 v 7.249 h -1.585 c -1.487,-4.033 -3.936,-7.105 -6.384,-7.105 -1.584,0 -2.833,0.816 -2.833,2.592 0,1.68 1.393,2.736 5.809,4.513 4.609,1.872 6.77,3.504 6.77,7.921 0,5.568 -3.984,8.736 -10.945,8.736 -2.448,0 -6.625,-0.48 -8.881,-2.064 l -0.769,-7.92 z"
id="path412" />
<path
d="m 910.697,305.872 v 14.497 c 0,3.408 0.624,4.801 2.593,4.801 0.672,0 1.104,-0.145 1.68,-0.336 l 0.336,1.344 c -2.832,1.536 -5.088,2.448 -7.873,2.448 -4.367,0 -6.816,-1.68 -6.816,-6.385 v -16.369 h -2.447 v -2.208 h 2.688 l 6,-5.713 h 3.841 v 5.713 h 4.032 v 2.208 h -4.034 z"
id="path414" />
<path
d="m 926.825,315.76 c 0.048,5.089 1.68,8.737 5.616,8.737 3.216,0 4.993,-0.576 6.528,-3.889 l 1.248,0.672 c -1.824,5.856 -6.24,7.345 -11.328,7.345 -8.545,0 -12.625,-3.648 -12.625,-12.673 0,-8.401 4.56,-12.913 12.864,-12.913 11.521,0 11.617,7.776 11.617,10.272 0,1.632 -0.433,2.448 -2.063,2.448 h -11.857 z m -1.969,-17.233 c -1.199,-0.96 -1.872,-1.536 -1.872,-2.496 0,-1.296 1.585,-2.448 2.784,-2.448 0.721,0 1.488,0.528 2.16,2.208 l 2.305,5.856 -0.864,0.624 -4.513,-3.744 z m 4.896,15.169 c 1.248,-0.096 1.633,-0.24 1.633,-2.16 0,-1.632 0,-6.673 -2.16,-6.673 -1.92,0 -2.4,4.849 -2.4,9.025 l 2.927,-0.192 z"
id="path416" />
<path
d="m 954.424,303.135 0.624,3.312 c 2.88,-1.92 4.56,-3.408 8.017,-3.408 2.977,0 5.616,1.2 6.672,3.6 3.025,-2.208 4.801,-3.6 8.258,-3.6 4.896,0 7.296,2.976 7.296,7.632 v 13.105 c 0,2.448 0.288,2.545 2.688,2.688 V 328 h -14.545 v -1.536 c 1.535,-0.192 1.728,-0.48 1.728,-1.824 v -13.585 c 0,-2.592 -0.815,-4.033 -2.353,-4.033 -1.344,0 -2.399,1.152 -2.399,4.561 v 13.057 c 0,1.344 0.192,1.632 1.728,1.824 V 328 h -13.824 v -1.536 c 1.535,-0.192 1.728,-0.48 1.728,-1.824 v -13.585 c 0,-2.592 -0.769,-4.033 -2.353,-4.033 -1.344,0 -2.4,1.152 -2.4,4.561 v 13.057 c 0,1.344 0.24,1.632 1.729,1.824 V 328 h -14.545 v -1.536 c 2.448,-0.144 2.688,-0.24 2.688,-2.688 v -15.649 c 0,-1.296 -0.239,-1.824 -1.008,-1.968 l -1.392,-0.24 v -1.536 l 11.663,-1.248 z"
id="path418" />
<path
d="m 1000.551,315.76 c 0.049,5.089 1.68,8.737 5.617,8.737 3.216,0 4.992,-0.576 6.528,-3.889 l 1.248,0.672 c -1.824,5.856 -6.241,7.345 -11.329,7.345 -8.545,0 -12.625,-3.648 -12.625,-12.673 0,-8.401 4.561,-12.913 12.865,-12.913 11.521,0 11.617,7.776 11.617,10.272 0,1.632 -0.433,2.448 -2.064,2.448 h -11.857 z m 2.929,-2.064 c 1.248,-0.096 1.632,-0.24 1.632,-2.16 0,-1.632 0,-6.673 -2.16,-6.673 -1.92,0 -2.4,4.849 -2.4,9.025 l 2.928,-0.192 z"
id="path420" />
<path
d="m 1016.438,318.641 h 1.633 c 1.536,3.84 4.801,8.208 8.113,8.208 1.631,0 2.832,-0.72 2.832,-2.784 0,-1.872 -1.729,-3.072 -5.041,-4.513 -3.889,-1.632 -7.201,-3.312 -7.201,-8.496 0,-5.137 3.841,-8.017 10.562,-8.017 2.544,0 5.616,0.528 7.921,1.68 v 7.249 h -1.584 c -1.488,-4.033 -3.937,-7.105 -6.385,-7.105 -1.584,0 -2.832,0.816 -2.832,2.592 0,1.68 1.392,2.736 5.809,4.513 4.607,1.872 6.768,3.504 6.768,7.921 0,5.568 -3.984,8.736 -10.944,8.736 -2.448,0 -6.624,-0.48 -8.881,-2.064 l -0.77,-7.92 z"
id="path422" />
<path
d="m 853.05,354.591 c -1.344,-3.984 -3.744,-8.784 -7.776,-8.784 -6.433,0 -7.201,10.32 -7.201,14.401 0,5.712 1.056,14.785 7.44,14.785 4.272,0 5.76,-3.601 8.161,-9.313 h 1.68 l -0.768,8.929 c -3.023,1.633 -6.721,2.16 -10.369,2.16 -6.097,0 -10.225,-1.008 -13.201,-3.744 -2.832,-2.544 -4.272,-7.057 -4.272,-12.289 0,-4.752 1.104,-9.217 3.984,-12.145 2.784,-2.881 6.529,-4.561 14.113,-4.561 2.592,0 7.729,0.672 9.889,1.968 v 8.593 h -1.68 z"
id="path424" />
<path
d="m 871.577,376.625 c -9.938,0 -13.537,-5.089 -13.537,-12.77 0,-7.729 3.6,-12.816 13.537,-12.816 9.937,0 13.537,5.088 13.537,12.816 0,7.682 -3.6,12.77 -13.537,12.77 z m 0,-1.776 c 2.256,0 2.977,-4.368 2.977,-11.041 0,-6.336 -0.721,-10.753 -2.977,-10.753 -2.496,0 -2.977,4.801 -2.977,10.753 0,6.337 0.481,11.041 2.977,11.041 z"
id="path426" />
<path
d="m 899.321,351.135 0.624,3.312 c 2.88,-1.92 4.56,-3.408 8.017,-3.408 2.977,0 5.616,1.2 6.672,3.6 3.025,-2.208 4.801,-3.6 8.258,-3.6 4.896,0 7.296,2.976 7.296,7.633 v 13.104 c 0,2.448 0.288,2.545 2.688,2.688 V 376 h -14.545 v -1.536 c 1.535,-0.192 1.728,-0.48 1.728,-1.824 v -13.585 c 0,-2.593 -0.815,-4.032 -2.353,-4.032 -1.344,0 -2.399,1.151 -2.399,4.561 v 13.057 c 0,1.344 0.192,1.632 1.728,1.824 v 1.536 h -13.824 v -1.536 c 1.535,-0.192 1.728,-0.48 1.728,-1.824 v -13.585 c 0,-2.593 -0.769,-4.032 -2.353,-4.032 -1.344,0 -2.4,1.151 -2.4,4.561 v 13.057 c 0,1.344 0.24,1.632 1.729,1.824 v 1.536 H 887.37 v -1.536 c 2.448,-0.144 2.688,-0.24 2.688,-2.688 v -15.649 c 0,-1.296 -0.239,-1.824 -1.008,-1.968 l -1.392,-0.24 v -1.536 l 11.663,-1.25 z"
id="path428" />
<path
d="m 946.024,351.135 0.768,3.601 c 1.633,-1.296 3.648,-3.696 7.105,-3.696 8.209,0 8.929,8.593 8.929,11.761 0,7.104 -2.208,13.825 -13.105,13.825 -1.104,0 -2.017,-0.144 -2.832,-0.432 v 4.32 c 0,2.448 0.144,2.496 3.024,2.688 v 1.536 h -15.842 v -1.536 c 2.448,-0.096 2.736,-0.191 2.736,-2.688 v -24.387 c 0,-1.296 -0.288,-1.824 -1.057,-1.968 l -1.344,-0.24 v -1.536 l 11.618,-1.248 z m 0.864,20.162 c 0,2.496 0.912,3.6 2.208,3.6 2.881,0 3.168,-5.856 3.168,-10.513 0,-3.84 -0.287,-9.36 -3.119,-9.36 -1.633,0 -2.257,1.439 -2.257,3.36 v 12.913 z"
id="path430" />
<path
d="m 964.934,376.001 v -1.536 c 2.448,-0.144 2.736,-0.24 2.736,-2.688 v -25.058 c 0,-1.345 -0.288,-1.872 -1.057,-2.017 l -1.344,-0.191 v -1.537 l 12.289,-1.056 0.192,0.192 v 29.666 c 0,2.448 0.288,2.545 2.736,2.688 V 376 h -15.552 z"
id="path432" />
<path
d="m 993.014,363.76 c 0.049,5.089 1.68,8.737 5.617,8.737 3.216,0 4.992,-0.576 6.528,-3.889 l 1.248,0.672 c -1.824,5.856 -6.241,7.345 -11.329,7.345 -8.545,0 -12.625,-3.648 -12.625,-12.673 0,-8.401 4.561,-12.913 12.865,-12.913 11.521,0 11.617,7.776 11.617,10.272 0,1.633 -0.433,2.448 -2.064,2.448 h -11.857 z m 2.929,-2.064 c 1.248,-0.096 1.632,-0.239 1.632,-2.16 0,-1.632 0,-6.672 -2.16,-6.672 -1.92,0 -2.4,4.848 -2.4,9.024 l 2.928,-0.192 z"
id="path434" />
<path
d="m 1022.199,353.2 -1.248,0.144 c -0.624,0.097 -0.673,0.336 -0.288,1.104 l 2.256,4.368 h 0.192 c 0.912,-1.488 1.632,-2.88 2.399,-4.368 0.385,-0.72 0.337,-0.912 -0.383,-1.008 l -1.921,-0.24 v -1.536 h 9.217 v 1.536 c -1.872,-0.048 -2.496,0.432 -3.408,1.344 -1.488,1.488 -2.88,2.977 -5.089,5.856 2.209,3.744 4.417,8.641 6.865,12.241 0.912,1.344 1.488,1.632 3.168,1.824 v 1.536 h -16.465 v -1.536 l 1.392,-0.192 c 0.72,-0.096 0.912,-0.576 0.576,-1.2 l -2.832,-5.424 h -0.097 c -0.576,0.96 -1.535,3.024 -2.88,5.473 -0.336,0.672 0,1.104 0.624,1.151 l 1.824,0.192 v 1.536 h -9.457 v -1.536 c 2.064,-0.144 2.736,-0.48 3.697,-1.632 2.016,-2.4 3.312,-4.032 5.328,-6.913 -1.969,-3.216 -3.984,-8.064 -6.097,-11.232 -0.816,-1.152 -1.152,-1.345 -2.929,-1.488 v -1.536 h 15.554 v 1.536 z"
id="path436" />
<path
d="m 1043.845,363.76 c 0.048,5.089 1.681,8.737 5.616,8.737 3.217,0 4.993,-0.576 6.529,-3.889 l 1.248,0.672 c -1.824,5.856 -6.24,7.345 -11.329,7.345 -8.545,0 -12.625,-3.648 -12.625,-12.673 0,-8.401 4.56,-12.913 12.865,-12.913 11.521,0 11.616,7.776 11.616,10.272 0,1.633 -0.432,2.448 -2.063,2.448 h -11.857 z m 2.929,-2.064 c 1.248,-0.096 1.632,-0.239 1.632,-2.16 0,-1.632 0,-6.672 -2.16,-6.672 -1.92,0 -2.4,4.848 -2.4,9.024 l 2.928,-0.192 z"
id="path438" />
<path
d="m 1059.733,366.641 h 1.632 c 1.536,3.84 4.8,8.208 8.112,8.208 1.633,0 2.832,-0.72 2.832,-2.784 0,-1.872 -1.728,-3.072 -5.04,-4.513 -3.888,-1.632 -7.2,-3.312 -7.2,-8.496 0,-5.137 3.84,-8.017 10.561,-8.017 2.545,0 5.617,0.527 7.921,1.68 v 7.249 h -1.585 c -1.487,-4.032 -3.936,-7.104 -6.384,-7.104 -1.584,0 -2.833,0.815 -2.833,2.592 0,1.681 1.393,2.736 5.809,4.513 4.609,1.872 6.77,3.504 6.77,7.921 0,5.568 -3.984,8.736 -10.945,8.736 -2.448,0 -6.625,-0.48 -8.881,-2.064 l -0.769,-7.921 z"
id="path440" />
</g>
</g>
<path
d="m 154.00436,444.65625 c -13.116,-0.812 -24.945,4.313 -35.16,15.231 -13.298,14.212 -13.048,24.169 -9.418,41.998 2.381,11.685 9.314,22.964 19.027,30.947 11.294,9.284 24.562,11.672 38.37,6.907 15.217,-5.255 29.772,-20.292 35.403,-36.567 6.123,-17.743 1.415,-33.827 -12.927,-44.125 -12.347,-8.868 -24.222,-13.708 -35.295,-14.391"
id="path2650_1_"
style="fill:#214867" />
<path
d="m 137.87236,490.91625 h -3.345 l -0.007,0.094 c -0.025,0.648 -0.411,6.34 -5.503,6.34 -4.556,0 -6.866,-4.078 -6.869,-12.124 0.002,-8.043 2.313,-12.129 6.869,-12.129 5.179,0 5.495,6.09 5.503,6.341 l 0.007,0.094 h 3.345 c 0.31,0 0.608,-0.123 0.822,-0.345 0.205,-0.214 0.314,-0.487 0.299,-0.775 -0.071,-1.573 -0.878,-9.453 -10.024,-9.453 -7.391,0 -11.299,5.625 -11.299,16.25 0,10.65 3.908,16.277 11.299,16.277 8.803,0 9.898,-7.195 10.024,-9.396 0.022,-0.304 -0.083,-0.595 -0.299,-0.821 -0.213,-0.222 -0.512,-0.353 -0.822,-0.353"
id="path2696_1_"
style="fill:#ffffff" />
<path
d="m 186.42336,483.29425 0,0 -2.883,-1.255 c -2.771,-1.216 -3.754,-2.405 -3.754,-4.529 0,-2.778 2.026,-4.637 5.046,-4.637 1.785,-10e-4 3.25,0.368 5.033,2.185 l 0.099,0.102 1.538,-1.405 c 0.89,-0.831 0.631,-1.575 0.26,-2.052 -1.503,-1.77 -3.907,-2.745 -6.787,-2.743 -5.544,0 -9.568,3.621 -9.568,8.607 0,4.897 3.09,6.949 6.425,8.431 l 2.937,1.312 c 2.959,1.328 4.365,2.455 4.365,5.3 0,3.877 -3.503,4.914 -5.576,4.914 -1.78,0 -3.761,-0.381 -6.199,-3.142 l -0.095,-0.109 -1.603,1.404 c -0.822,0.729 -0.831,1.348 -0.027,2.381 2.207,2.834 5.443,3.43 7.766,3.43 5.026,0 10.113,-3.089 10.113,-8.987 0,-5.108 -2.831,-7.377 -7.09,-9.207"
id="path2698_1_"
style="fill:#ffffff" />
<path
d="m 160.30136,478.26825 c 0,-5.021 -4.068,-9.276 -9.092,-9.276 -2.362,0 -4.515,0.9 -6.13,2.377 v -1.728 h -3.026 c -0.909,0 -1.257,0.599 -1.257,1.28 v 29.305 c 0,0.822 0.501,1.262 1.245,1.262 h 3.022 v -23.041 c 0,-3.028 2.457,-5.483 5.487,-5.483 3.022,0 5.479,2.455 5.479,5.483 v 23.045 h 3.005 c 0.836,0 1.267,-0.464 1.267,-1.262 0,0.002 0,-21.932 0,-21.962"
id="path2700_1_"
style="fill:#ffffff" />
<path
d="m 175.92436,471.18525 c 0.157,-0.199 0.256,-0.445 0.256,-0.711 0,-0.503 -0.328,-0.93 -0.781,-1.082 -0.875,-0.296 -1.807,-0.452 -2.777,-0.452 -2.361,0 -4.511,0.898 -6.129,2.375 v -1.729 h -3.025 c -0.911,0 -1.261,0.596 -1.261,1.28 v 29.3 c 0,0.826 0.505,1.266 1.248,1.266 h 3.023 v -23.041 c 0,-3.031 2.455,-5.486 5.486,-5.486 0.792,0 1.542,0.173 2.222,0.477 l 1.75,-2.191"
id="path2702_1_"
style="fill:#ffffff" />
<line
style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linecap:round"
x1="150.71237"
y1="479.35223"
x2="150.71237"
y2="534.01025"
id="line485" />
</g>
</svg>
static/js/gargantext.angular.js
View file @ ae23856c
......@@ -381,7 +381,7 @@ gargantext.controller("GraphController", function($scope, $http, $element) {
y: {key: 'y', type: 'linear', type: 'numeric'},
},
tension: 1.0,
lineMode: 'bundle',
lineMode: 'linear',
tooltip: {mode: 'scrubber', formatter: function(x, y, series) {
var grouping = groupings.datetime[$scope.groupingKey];
return grouping.representation(x) + ' → ' + y;
......@@ -442,6 +442,13 @@ gargantext.controller("GraphController", function($scope, $http, $element) {
angular.forEach(results, function(result, r){
var x = grouping.truncate(result[0]);
var y = parseFloat(result[1]);
if (dataObject[x] === undefined) {
var row = [];
angular.forEach($scope.datasets, function(){
row.push(0);
});
dataObject[x] = row;
}
dataObject[x][datasetIndex] += y;
});
});
......
templates/about.html
View file @ ae23856c
......@@ -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>
......@@ -35,15 +37,20 @@
<ul>
<li>Version 1.0</li>
<ul>
<li>Beta Version </li>
<li>Licence of Gargantext is GPL v3+ </li>
<li>[Start] Beta Version </li>
<li>[Law] Licence of Gargantext is GPL v3+ </li>
</ul>
<li>Version 1.0.5</li>
<ul>
<li>Bug resolution: xml zipped from Mac</li>
<li>Bug resolution: french accents in filenames</li>
<li>Bug resolution: [Import] xml zipped from Mac</li>
<li>Bug resolution: [Import] french accents in filenames</li>
<li>New features: [Advanced chart] ngrams completion</li>
<li>New features: button to delete all duplicates</li>
<li>New features: [Duplicates management] button to delete all duplicates</li>
</ul>
<li>Version 1.0.6</li>
<ul>
<li>Bug resolution: [Advanced chart] one can make comparisons with different corpora at different scales</li>
<li>Bug resolution: [Graph] Graph link can not be executed until workflow is finished.</li>
</ul>
</ul>
</div>
......@@ -56,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>
......@@ -94,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>
......@@ -130,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 @ ae23856c
This source diff could not be displayed because it is too large. You can view the blob instead.
templates/chart.html
View file @ ae23856c
......@@ -294,7 +294,7 @@
<br/>
Interpolation:
<select ng-model="graph.options.lineMode">
<option ng-repeat="mode in ['bundle', 'linear']" value="{{ mode }}">{{ mode }}</option>
<option ng-repeat="mode in ['linear', 'bundle']" value="{{ mode }}">{{ mode }}</option>
</select>
<span ng-if="graph.options.lineMode != 'linear'">
with a tension of
......
templates/corpus.html
View file @ ae23856c
......@@ -131,7 +131,11 @@
<div class="col-md-4">
<div class="jumbotron">
<h3><a href="/project/{{project.id}}/corpus/{{ corpus.id }}/explorer">Graph</a></h3>
{% if processing == "1" %}
<h3> <img width="20px" src="{% static "js/libs/img2/loading-bar.gif" %}"></img> Graph (later)</h3>
{% else %}
<h3><a href="/project/{{project.id}}/corpus/{{ corpus.id }}/explorer">Graph</a></h3>
{% endif %}
<ol>
<li>Visualize</li>
<li>Explore</li>
......
static/img/logo.svg → templates/logo.svg
View file @ ae23856c
......@@ -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 @ ae23856c
......@@ -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">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.5, 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>
......
templates/tests/mvc.html
View file @ ae23856c
......@@ -295,7 +295,7 @@
<br/>
Interpolation:
<select ng-model="graph.options.lineMode">
<option ng-repeat="mode in ['bundle', 'linear']" value="{{ mode }}">{{ mode }}</option>
<option ng-repeat="mode in ['linear', 'bundle']" value="{{ mode }}">{{ mode }}</option>
</select>
<span ng-if="graph.options.lineMode != 'linear'">
with a tension of
......
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