Skip to content

gargantext
gargantext
Commit f0cdf7d4 authored by Romain Loth's avatar Romain Loth
Browse files
Options

Merge branch 'unstable' of ssh://delanoe.org:1979/gargantext into romain

parents 2ca89c51 3740ad1f
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 112 deletions
gargantext_web/about.py
View file @ f0cdf7d4
...@@ -41,6 +41,18 @@ def get_team(): ...@@ -41,6 +41,18 @@ def get_team():
'picture' : 'samuel.jpg', 'picture' : 'samuel.jpg',
'role' : 'developer'}, 'role' : 'developer'},
{ 'first_name' : 'Maziyar', 'last_name' : 'Panahi',
'mail' : '',
'website' : '',
'picture' : 'maziyar.jpg',
'role' : 'developer'},
{ 'first_name' : 'Romain', 'last_name' : 'Loth',
'mail' : '',
'website' : '',
'role' : 'developer'},
{ 'first_name' : 'Alexandre', 'last_name' : 'Delanoë', { 'first_name' : 'Alexandre', 'last_name' : 'Delanoë',
'mail' : 'alexandre+gargantextATdelanoe.org', 'mail' : 'alexandre+gargantextATdelanoe.org',
'website' : 'http://alexandre.delanoe.org', 'website' : 'http://alexandre.delanoe.org',
......
static/img/team/convert.sh 0 → 100755
View file @ f0cdf7d4
#!/bin/bash
convert -density 10% -resize 10% $1 $2
templates/corpus/documents.html
View file @ f0cdf7d4
...@@ -48,77 +48,86 @@ th a { ...@@ -48,77 +48,86 @@ th a {
{% block content %} {% block content %}
<div class="container"> <div class="container">
<div class="container"> <div class="container">
<div class="jumbotron">
<div class="row"> <div class="row">
<div id="monthly-move-chart"> <div id="monthly-move-chart">
<center> <center>
<strong>Title</strong> (Blue bars: all, Green line: zoom) Blue bars: all, Green line for zooming : select a time range to zoom in
<a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();" <p align="center">
style="display: none;">reset</a> <a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
<div class="clearfix"></div>
</center> <a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();"
</div> style="display: none;">reset</a>
</div> <div class="clearfix"></div>
</center>
<div class="row"> </div>
<div id="monthly-volume-chart"></div> </div>
<p class="muted pull-left" style="margin-right: 15px;">Select a time range to zoom in</p> <div class="row">
</div> <div id="monthly-volume-chart"></div>
</div> </div>
<p align="center">
<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p> <div id="content_loader">
<br>
<center>
<img width="10%" src="{% static "img/ajax-loader.gif"%}"></img>
</center>
<br>
</div>
</div>
</div>
<input type="hidden" id="list_id" value="{{ list_id }}"></input> <input type="hidden" id="list_id" value="{{ list_id }}"></input>
<div class="container"> <div class="container">
<div class="jumbotron">
<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
<div class="panel panel-body">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
<p id="corpusdisplayer" onclick='Final_UpdateTable("click")' class="btn btn-primary btn-lg" style="width:200px; margin:0 auto; display:block;">Open Folder</h2></p>
</a>
</h4>
</div>
<div id="collapseOne" class="panel-collapse collapse no-transition" role="tabpanel">
<div class="panel-body">
<div id="div-table"></div>
<p align="right">
<button id="move2trash" class="btn btn-primary btn-lg" >Trash It!</button>
</p>
<div class="jumbotron">
</div> <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
<div class="panel panel-body">
<div class="panel-heading">
<h4 class="panel-title">
<a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
<p id="corpusdisplayer" onclick='Final_UpdateTable("click")'
class="btn btn-primary btn-lg" style="width:200px; margin:0 auto; display:block;">Open Folder</h2></p>
</a>
</h4>
</div>
<div id="collapseOne" class="panel-collapse collapse no-transition" role="tabpanel">
<div class="panel-body">
<div id="div-table"></div>
<p align="right">
<button id="move2trash" class="btn btn-primary btn-lg" >Trash It!</button>
</p>
</div>
</div>
</div>
</div>
</div> </div>
</div>
</div>
</div>
</div> </div>
<div id="filter_search" style="visibility:hidden"> <div id="filter_search" style="visibility:hidden">
<span style="font-size:70%;"> <span style="font-size:70%;">
<input title="Search in Titles" id="searchTI" name="searchTI" type="checkbox" checked onclick="return false">TI&nbsp; <input title="Search in Titles" id="searchTI" name="searchTI" type="checkbox" checked onclick="return false">TI&nbsp;
<input title="Search in Abstracts" id="searchAB" name="searchAB" type="checkbox">AB <input title="Search in Abstracts" id="searchAB" name="searchAB" type="checkbox">AB
</span>&nbsp;&nbsp; </span>&nbsp;&nbsp;
<select id="example-single-optgroups" onchange="SearchFilters(this);">
<!-- <optgroup label=""> --> <select id="example-single-optgroups" onchange="SearchFilters(this);">
<option id="filter_all" value="filter_all">All</option> <!-- <optgroup label=""> -->
<!-- <option id="filter_title" value="filter_title">Title</option> --> <option id="filter_all" value="filter_all">All</option>
<!-- <option id="filter_date" value="filter_date">Date</option> --> <!-- <option id="filter_title" value="filter_title">Title</option> -->
<!-- </optgroup> --> <!-- <option id="filter_date" value="filter_date">Date</option> -->
<!-- <optgroup label="Duplicates"> --> <!-- </optgroup> -->
<!-- <option value="filter_doi">By DOI</option> --> <!-- <optgroup label="Duplicates"> -->
<option id="filter_dupl-titles" value="filter_dupl-titles">Duplicates by Title</option> <!-- <option value="filter_doi">By DOI</option> -->
<!-- </optgroup> --> <option id="filter_dupl-titles" value="filter_dupl-titles">Duplicates by Title</option>
</select> <!-- </optgroup> -->
</select>
</div> </div>
...@@ -132,7 +141,6 @@ th a { ...@@ -132,7 +141,6 @@ th a {
{% endblock %} {% endblock %}
......
templates/corpus/journals.html
View file @ f0cdf7d4
...@@ -111,27 +111,39 @@ input[type=radio]:checked + label { ...@@ -111,27 +111,39 @@ input[type=radio]:checked + label {
{% block content %} {% block content %}
<div class="container">
<div class="container">
<div class="container">
<div class="row"> <div class="container">
<div class="jumbotron">
<center> <div class="row">
<div id="ScoresBox"></div> <br>(Blue bars: all, Green line: zoom) <div id="monthly-move-chart">
<a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();" <center>
style="display: none;">reset</a> <strong>Title</strong> (Blue bars: all, Green line: zoom)
<div class="clearfix"></div> Select a time range to zoom in
</center> <p align="center">
<div id="monthly-move-chart"></div> <a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
</div>
<a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();"
<div class="row"> style="display: none;">reset</a>
<div id="monthly-volume-chart"></div> <div class="clearfix"></div>
<p class="muted pull-left" style="margin-right: 15px;">Select a time range to zoom in</p> </center>
</div> </div>
</div> </div>
<p align="center"> <div class="row">
<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p> <div id="monthly-volume-chart"></div>
</div>
<div id="content_loader">
<br>
<center>
<img width="10%" src="{% static "img/ajax-loader.gif"%}"></img>
</center>
<br>
</div>
</div>
</div>
<div class="container"> <div class="container">
......
templates/corpus/menu.html
View file @ f0cdf7d4
...@@ -45,14 +45,10 @@ ...@@ -45,14 +45,10 @@
</ul> </ul>
'>Manage</a> '>Manage</a>
{% if number == 0 %} {% if number == 0 %}
<a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add documents</a></p> <a class="btn btn-primary btn-lg" role="button" href="/admin/documents/corpus/{{ corpus.id }}/">Add documents</a></p>
{% endif %} {% endif %}
</div> </div>
</div>
</div> </div>
<div class="btn-group btn-group-justified"> <div class="btn-group btn-group-justified">
...@@ -65,7 +61,6 @@ ...@@ -65,7 +61,6 @@
</center> </center>
</div> </div>
{% endblock %} {% endblock %}
...@@ -119,6 +114,8 @@ ...@@ -119,6 +114,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
function gotoexplorer(elem) { function gotoexplorer(elem) {
......
templates/corpus/terms.html
View file @ f0cdf7d4
...@@ -127,34 +127,39 @@ input[type=radio]:checked + label { ...@@ -127,34 +127,39 @@ input[type=radio]:checked + label {
{% block content %} {% block content %}
<div id="content_loader">
<br>
<center> <div class="container">
<img width="10%" src="{% static "img/ajax-loader.gif"%}"></img> <div class="container">
</center> <div class="jumbotron">
<br> <div class="row">
<div id="monthly-move-chart">
<center>
Blue bars: all, Green line for zooming : select a time range to zoom in
<p align="center">
<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
<a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();"
style="display: none;">reset</a>
<div class="clearfix"></div>
</center>
</div>
</div>
<div class="row">
<div id="monthly-volume-chart"></div>
</div>
<div id="content_loader">
<br>
<center>
<img width="10%" src="{% static "img/ajax-loader.gif"%}"></img>
</center>
<br>
</div>
</div>
</div> </div>
<div class="container">
<div class="container">
<div class="row">
<center>
<div id="ScoresBox"></div> <br>(Blue bars: all, Green line: zoom)
<a class="reset" href="javascript:volumeChart.filterAll();dc.redrawAll();"
style="display: none;">reset</a>
<div class="clearfix"></div>
</center>
<div id="monthly-move-chart"></div>
</div>
<div class="row">
<div id="monthly-volume-chart"></div>
<p class="muted pull-left" style="margin-right: 15px;">Select a time range to zoom in</p>
</div>
</div>
<p align="center">
<a class="btn btn-xs btn-default" role="button" href="/chart/corpus/{{ corpus.id }}/data.csv">Save</a></p>
<input type="hidden" id="list_id" value="{{ list_id }}"></input> <input type="hidden" id="list_id" value="{{ list_id }}"></input>
......
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