Commit 3ef8eb75 authored by Mathieu Rodic's avatar Mathieu Rodic

[CODE] rewrote HTML templates

applied proper indentation and nesting
parent a20dbe4f
<html>
<body>
<head>
<link rel="stylesheet" type="text/css" href="/static/css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="/static/css/morris.css">
</head>
<body>
<div id="grp-container">
<!-- HEADER -->
<header id="grp-header" class="">
<!-- NAVIGATION -->
<div id="grp-navigation">
<h1 id="grp-admin-title">Gargantext</h1>
......@@ -19,13 +18,9 @@
</div>
</header>
<!-- CONTENT -->
<article id="grp-content" class="">
<!-- CONTENT TITLE -->
<header id="grp-content-title">
<br><br><br>
......@@ -35,7 +30,6 @@
<div class="jumbotron">
<!-- CONTENT-CONTAINER -->
<div id="grp-content-container">
<div class="g-d-c g-d-10 g-centered">
<form action="" method="post"><input type='hidden' name='csrfmiddlewaretoken' value='Yopwc8YatA3C68kSevZX9upoXdIcZzPn' />
<fieldset class="grp-module grp-module-login">
......@@ -43,9 +37,6 @@
<span class="grp-current-page">Login</span>
</h2a>
<div class="grp-module">
{% block main %}
<div id="login">
{% csrf_token %}
......@@ -60,8 +51,8 @@
<label class="control-label" for="password">Password</label>
<input type="password" name="password" id="password" placeholder="Password">
</div>
</div>
{% endblock %}
</div>
</fieldset>
<div class="grp-module grp-submit-row">
......@@ -71,15 +62,14 @@
</div>
</form>
</div>
{% endblock %}
</div>
</div>
</div>
</article>
</div>
</div>
</div>
......
......@@ -36,8 +36,8 @@
<div class="panel-body">
<div class="container">
<ul>
<li>Version 2.0</li>
<li>
Version 2.0
<ul>
<li>[NAME] Red Lemon</li>
<li>[NLP] Turbo Parser, MELT</li>
......@@ -46,8 +46,9 @@
<li>[FEATURE] Lexical Graph with temporal filter</li>
<li>[FEATURE] Graph bi-Partite</li>
</ul>
<li>Versions from 1.0 to 1.9</li>
</li>
<li>
Versions from 1.0 to 1.9
<ul>
<li>[NAME] Rose Bonbon</li>
<li>[Law] Licence of Gargantext is (and will be for next versions) AGPL</li>
......@@ -55,14 +56,16 @@
<li>[FEATURE] Advanced Chart</li>
<li>[FEATURE] Remove duplicates</li>
</ul>
<li>Versions from 0.1 to 0.9</li>
</li>
<li>
Versions from 0.1 to 0.9
<ul>
<li>[NAME] Black Salade</li>
<li>[Law] Licence of Gargantext is GPL v3+ </li>
<li>[NLP] NLTK, TreeTagger</li>
<li>[FEATURE] Graph Explorer</li>
</ul>
</li>
</ul>
</div>
</div>
......@@ -84,16 +87,21 @@
<div class="panel-body">
<div class="container">
<ul>
<li>Mailing-lists</li>
<li>
Mailing-lists
<ul>
<li>User mailing-list: soon</li>
<li>Devel mailing-list: soon</li>
</ul>
<li>Code and repository access</li>
</li>
<li>
Code and repository access
<ul>
<li>You are free to participate. Present yourself on mailing-lists or irc.</li>
</ul>
<li>IRC</li>
</li>
<li>
IRC
<ul>
<li>#gargantext on OFTC:</li>
<li>
......@@ -101,6 +109,7 @@
<p>If the window is too small, just click <a href="http://webchat.oftc.net/?channels=#gargantext">here</a></p>
</li>
</ul>
</li>
</ul>
</div>
</div>
......@@ -150,16 +159,15 @@
</div>
</div>
</div>
{% endif %}
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">
<center>
<h2>Institutional, research and financial support</h2>
<h2 class="panel-title">Institutional, research and financial support</h2>
<h3>Host institutions</h3>
<a href="http://www.cnrs.fr" target="_blank" >
......@@ -201,6 +209,7 @@
</center>
</div>
</div>
</div>
</div>
......
......@@ -46,7 +46,6 @@
<div class="content">
<center>
<img src="{% static "img/Gargantextuel-212x300.jpg"%}" title="Gargantextuel drawn by Cecile Meadel" style="border:2px solid black">
<!--
<h2>Introduction Video</h2>
<video width="320" height="240" controls>
......@@ -66,26 +65,26 @@
<div class="container">
<div class="row">
<div class="row">
<div class="col-md-4 content">
<div class="col-md-4 content">
<h3><a href="#" title="Random sentences in Gargantua's Books chapters, historically true">Historic</a></h3>
<p> {{ paragraph_gargantua }}</p>
</div>
<div class="col-md-4 content">
<h3><a href="#" title="Randomized words, semantically and syntaxically falses." >Presentation</a></h3>
<div class="col-md-4 content">
<h3><a href="#" title="Randomized words, semantically and syntaxically falses." >Presentation</a></h3>
<p> {{ paragraph_lorem }}
</p>
</div>
<div class="col-md-4 content">
<h3><a href="#" title="Randomized letters, true or false ?">Tutoreil</a></h3>
<div class="col-md-4 content">
<h3><a href="#" title="Randomized letters, true or false ?">Tutoreil</a></h3>
<p>
{{ paragraph_tutoreil }}
<!-- Why not French ? -->
<!-- find Cambridge source which inspired this --!>
<!-- find Cambridge source which inspired this -->
</p>
</div>
......
......@@ -18,11 +18,6 @@
<h1>Gargantext in maintenance</h1>
<h2>Thanks for your comprehension</h2>
</div>
</div>
{% endblock %}
<html>
{% load staticfiles %}
<head>
<link rel="shortcut icon" href="{% static "/favicon.ico"%}">
{% load staticfiles %}
<head>
<link rel="shortcut icon" href="{% static "/favicon.ico" %}">
{% block css %}
{% endblock %}
</head>
</head>
<body>
<!-- Fixed navbar -->
<body>
<!-- Fixed navbar -->
<div id="dafixedtop" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-inner">
......@@ -33,14 +32,14 @@
{% if corpus %}
<li><a href="/project/{{project.id}}/corpus/{{corpus.id}}">{{corpus.name}}</a></li>
{% endif %}
</ul>
<ul class="nav pull-right">
<li class="dropdown">
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" title="That is your login"><i class="icon-user"></i> {{ user }}<i class="caret"></i>
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" title="That is your login">
<i class="icon-user"></i>
{{ user }}
<i class="caret"></i>
</a>
<ul class="dropdown-menu">
<li><a tabindex="-1" href="http://www.iscpif.fr/tiki-index.php?page=gargantext_feedback" title="Send us a message (bug, thanks, congrats...)">Report Feedback</a></li>
......@@ -56,67 +55,68 @@
</div>
</div>
</div>
<!--/.nav-collapse -->
{% block corpusBannerTop %}
{% endblock %}
{% block content %}
{% endblock %}
{% block corpusBannerBottom %}
{% endblock %}
<!--/.nav-collapse -->
{% block corpusBannerTop %}
{% endblock %}
<hr>
{% block content %}
{% endblock %}
<footer>
<p>Gargantext, version 2.0, <a href="http://www.cnrs.fr" target="blank" title="Institution that enables this project.">Copyrights CNRS {{ date.year }}</a>,
<a href="http://www.gnu.org/licenses/agpl-3.0.html" target="blank" title="Legal instructions of the project.">Licence aGPLV3</a>.</p>
</footer>
{% block corpusBannerBottom %}
{% endblock %}
<hr>
<!-- Place at the end of the document so the pages load faster -->
{% load staticfiles %}
<footer>
<p>
Gargantext, version 2.0,
<a href="http://www.cnrs.fr" target="blank" title="Institution that enables this project.">
Copyrights CNRS {{ date.year }}
</a>
<a href="http://www.gnu.org/licenses/agpl-3.0.html" target="blank" title="Legal instructions of the project.">
Licence aGPLV3
</a>
.
</p>
</footer>
<!--
<!-- Place at the end of the document so the pages load faster -->
{% load staticfiles %}
<script src="{% static "js/easy/jquery.easypiechart.js"%}"></script>
<script type="text/javascript">
$(function() {
<!--
<script type="text/javascript" src="{% static "js/easy/jquery.easypiechart.js"%}"></script>
<script type="text/javascript">
$(function() {
$('.chart').easyPieChart({
//your configuration goes here
size : 50
});
});
</script>
<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
-->
});
</script>
<script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
-->
<script src="{% static "js/bootstrap/bootstrap.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/bootstrap/bootstrap.min.js" %}"></script>
<script>$(function () { $("[data-toggle='popover']").popover({
html:true,
<script type="text/javascript">
$(function () { $("[data-toggle='popover']").popover({
html: true,
title: function() {
return $("#popover-head").html();
},
content: function() {
return $("#popover-content").html();
}
});});</script>
});});
</script>
{% if debug == False %}
<!-- Piwik -->
<script type="text/javascript">
{% if debug == False %}
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
......@@ -127,10 +127,14 @@ $(function() {
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//piwik.iscpif.fr/piwik.php?idsite=2" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
{% endif %}
</script>
<noscript>
<p>
<img src="//piwik.iscpif.fr/piwik.php?idsite=2" style="border:0;" alt="" />
</p>
</noscript>
<!-- End Piwik Code -->
{% endif %}
</body>
</body>
</html>
......@@ -41,6 +41,7 @@
<div class="container">
<div class="row">
{% if projects %}
{% for project in projects %}
<!--<div class="col-md-offset-7 col-md-4 content" style="background-color:grey">!-->
......@@ -73,7 +74,6 @@
<!--<div class="col-md-offset-7 col-md-4 content" style="background-color:grey">!-->
<div class="col-md-3 content">
<h3><a href="/project/{{ project.id }}">{{ project.name }}</a>
<button type="button" class="btn btn-xs btn-default" data-container="body" data-toggle="popover" data-placement="bottom"
data-content='
<ul>
......@@ -82,20 +82,17 @@
<li><a href="/delete/{{ project.id }}">Delete</a></li>
</ul>
'>Manage</button>
</h3>
<h4>{{ project.subtitle }}<h4>
</div>
{% endfor %}
{% endif %}
</div>
</div>
</div>
<div id="sharemodal" class="modal fade">
<div id="sharemodal" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
......@@ -107,22 +104,17 @@
<div class="modal-body form-horizontal">
<h4>List of available groups:</h4>
<div id="groups_list">here show the groups</div>
<div class="modal-footer">
<button id="closesharemodal" type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button id="send_share" type="button" class="btn btn-primary" >Share<span id="simpleloader"></span></button>
</div>
</div>
</div>
</div>
</div>
</div>
<style>
<style type="text/css">
label {
padding:10px;
margin:0 0 10px;
......@@ -132,10 +124,10 @@
background:#eee;
cursor:pointer;
}
</style>
</style>
<script>
<script type="text/javascript">
function getCookie(name) {
var cookieValue = null;
if (document.cookie && document.cookie != '') {
......@@ -208,6 +200,6 @@
});
}
</script>
</script>
{% endblock %}
{% endblock %}
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