Skip to content

gargantext
gargantext
Commit c591705b authored by delanoe's avatar delanoe
Browse files
Options

modifié : menu.html 

In the corpus view (title, journals, terms), the navigation throught
buttons is not easy since, when user scroll down, buttons are not
visible (on top of the page).

The solution is fixing the navbar on top but there are some issue:
1) there is a conflict with jquery in the terms view so, we can not
click on titles or journals view any more
2) there is another conflict with bootstrap: click on username for
instance and we can not see the list items
3) aesthetic : the top navbar size is too large.
parent a8bbf5e2
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 43 deletions
templates/pages/menu.html
View file @ c591705b
......@@ -11,11 +11,6 @@
<div id="dafixedtop" 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">
<span class="icon-bar"></span>
<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/logoSmall.png"%}" title="Back to home."></a>
</div>
......@@ -30,19 +25,22 @@
<li><a href="/projects/" title="All your projects are here.">
<span class="glyphicon glyphicon-home" aria-hidden="true"></span>
Projects
</a></li>
</a>
</li>
{% endif %}
{% if project %}
<li><a href="/projects/{{project.id}}">
<span class="glyphicon glyphicon-book" aria-hidden="true"></span>
{{project.name}}
</a></li>
</a>
</li>
{% endif %}
{% if corpus %}
<li><a href="/projects/{{project.id}}/corpora/{{corpus.id}}">
<span class="glyphicon glyphicon-file" aria-hidden="true"></span>
{{corpus.name}}
</a></li>
</a>
</li>
{% endif %}
</ul>
......@@ -74,54 +72,71 @@
</ul>
</div>
</div>
</div>
<!--/.nav-collapse -->
{% block corpusBannerTop %}
{% if corpus %}
<div class="container theme-showcase">
<div class="jumbotron" style="margin-bottom:0">
<div id="corpusbar" class="row">
<div class="col-md-12">
<div class="btn-group btn-group-justified">
<center>
<!--
<a type="button" class="btn btn-default
href="/projects/{{project.id}}/corpora/{{ corpus.id }}/">Export corpus</a>
--!>
<!-- <li class="divider"></li> --!>
{% if corpus %}
<div class="container">
<ul class="nav nav-tabs navbar-static-top nav-justified">
<li>
<a type="button" class="btn btn-default {% if view == "titles" %} active {% endif %}"
href="/projects/{{project.id}}/corpora/{{ corpus.id }}/">Titles
</a>
</li>
<li>
<a type="button" class="btn btn-default {% if view == "journals" %} active {% endif %}"
href="/projects/{{project.id}}/corpora/{{ corpus.id }}/journals">Journals
</a>
{% for state in corpus.hyperdata.statuses %}
{% if state.action == "ngrams_extraction" %}
{% if state.complete %}
</li>
{% for state in corpus.hyperdata.statuses %}
{% if state.action == "ngrams_extraction" %}
{% if state.complete %}
<li>
<a type="button" class="btn btn-default
{% if view == "terms" %} active {% endif %}"
href="/projects/{{project.id}}/corpora/{{ corpus.id }}/terms">Terms</a>
</li>
<!-- <li class="divider"></li> --!>
<!-- FIXME a pop up for advanced mode of graphs --!>
<a type="button" class="btn btn-default "
data-url="/projects/{{project.id}}/corpora/{{ corpus.id }}/explorer?field1=ngrams&amp;field2=ngrams&amp;distance=conditional&amp;bridgeness=5" onclick='gotoexplorer(this)' >Graphs (Conditional)</a>
<a type="button" class="btn btn-default "
data-url="/projects/{{project.id}}/corpora/{{ corpus.id }}/explorer?field1=ngrams&amp;field2=ngrams&amp;distance=distributional&amp;bridgeness=5" onclick='gotoexplorer(this)' >Graphs (Distributional)</a>
{% endif %}
{% endif %}
{% endfor %}
</center>
</div>
</div>
</div>
<li class="dropdown">
<a type="button" class="btn btn-default ">
Graphs
</a>
</li>
<ul class="dropdown-menu">
<li>
<a tabindex="-1" type="button" class="btn btn-default "
href="/projects/{{project.id}}/corpora/{{ corpus.id }}/explorer?field1=ngrams&amp;field2=ngrams&amp;distance=conditional&amp;bridgeness=5" onclick='gotoexplorer(this)' >Graphs (Conditional)</a>
</li>
<li>
<a tabindex="-1" type="button" class="btn btn-default "
href="/projects/{{project.id}}/corpora/{{ corpus.id }}/explorer?field1=ngrams&amp;field2=ngrams&amp;distance=distributional&amp;bridgeness=5" onclick='gotoexplorer(this)' >Graphs (Distributional)</a>
</li>
</ul>
{% endif %}
{% endif %}
{% endfor %}
</ul>
</div>
{% endif %}
</div>
<!--/.nav-collapse -->
{% block corpusBannerTop %}
{% if corpus %}
<div class="container theme-showcase">
<div class="jumbotron" style="margin-bottom:0">
<br>
<br>
<!--
<a type="button" class="btn btn-default
href="/projects/{{project.id}}/corpora/{{ corpus.id }}/">Export corpus</a>
--!>
<!-- <li class="divider"></li> --!>
<div class="row">
<div class="col-md-4">
{% if project %}
......
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