Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clinicaltrials
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
david Chavalarias
clinicaltrials
Commits
c9378cbb
Commit
c9378cbb
authored
Jan 16, 2017
by
Romain Loth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
start normalizing topbar and adjust css
parent
dffcab0a
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
202 additions
and
103 deletions
+202
-103
index.html
index.html
+62
-47
search_filter.php
search_filter.php
+1
-1
comex_user.css
static/css/comex_user.css
+30
-8
whoswho.css
static/css/whoswho.css
+11
-15
whoswho.js
static/js/whoswho.js
+2
-2
alt_index.html
templates/alt_index.html
+12
-13
base_layout.html
templates/base_layout.html
+81
-10
login.html
templates/login.html
+1
-1
profile.html
templates/profile.html
+0
-2
registration_full_form.html
templates/registration_full_form.html
+1
-2
registration_short_form.html
templates/registration_short_form.html
+1
-2
No files found.
index.html
View file @
c9378cbb
<!DOCTYPE html>
<!DOCTYPE html
5
>
<html
lang=
"en"
>
<html
lang=
"en"
>
<head>
<head>
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
...
@@ -81,14 +81,25 @@
...
@@ -81,14 +81,25 @@
</script>
</script>
<script
type=
"text/javascript"
src=
"static/js/whoswho.js"
/></script>
<script
type=
"text/javascript"
src=
"static/js/whoswho.js"
/></script>
<div
class=
"topbar"
>
<div
class=
"topbar"
>
<div
class=
"topbar-inner"
>
<div
class=
"topbar-inner"
>
<div
class=
"container-fluid"
>
<div
class=
"container-fluid"
>
<ul
class=
"nav"
style=
"margin-top:5px;"
>
<ul
class=
"white nav navbar-nav navbar-left"
>
<li>
<li>
<a
class=
"topbarlink"
href=
"index.html"
><span
class=
"icon-home icon-white"
></i></a>
<a
class=
"brand"
href=
"https://iscpif.fr/"
>
</li>
<img
style=
"height:24px;"
src=
"static/img/logo_m_bleu-header.png"
</
a
>
<!-- MAIN SEARCH/REFINE NAVBAR -->
</li>
<li
id=
"mapping"
class=
"nav-legend"
>
<li>
<a
class=
"brand"
href=
"/"
>
<span
class=
"icon-home icon-white icon-large"
></span>
Community Explorer
</a>
</li>
<!-- MAIN SEARCH/REFINE NAVBAR -->
<li
id=
"mapping"
class=
"comex-nav-item"
>
<p
class=
'topbarlink'
>
<span>
<strong>
SELECT Keywords
</strong>
</span>
<span>
<strong>
SELECT Keywords
</strong>
</span>
<!-- <select id="categorya" class="small" style="background: rgb(220,255,220, 0.8);">
<!-- <select id="categorya" class="small" style="background: rgb(220,255,220, 0.8);">
<option selected="true">Keywords</option>
<option selected="true">Keywords</option>
...
@@ -104,7 +115,8 @@
...
@@ -104,7 +115,8 @@
<option>Organizations</option>
<option>Organizations</option>
<option>Countries</option>
<option>Countries</option>
</select> -->
</select> -->
</li>
</p>
</li>
<!--
<!--
<li class="dropdown">
<li class="dropdown">
<a class="dropdown-toggle"><strong>working on</strong> Optics, Econometrics</a>
<a class="dropdown-toggle"><strong>working on</strong> Optics, Econometrics</a>
...
@@ -118,54 +130,57 @@
...
@@ -118,54 +130,57 @@
</ul>
</ul>
</li>
</li>
-->
-->
<li
id=
"refine"
class=
"dropdown"
>
<li
id=
"refine"
class=
"dropdown comex-nav-item"
>
<a
class=
"btn-default nav-inline-selectable"
<a
class=
"btn-default nav-inline-selectable"
onclick=
'$(this).next(".dropdown-menu").toggle();'
style=
"padding-top: 1em"
>
refine
<i
class=
"caret"
></i></a>
onclick=
'$(this).next(".dropdown-menu").toggle();'
<ul
class=
"dropdown-menu"
>
>
refine
<i
class=
"caret"
></i></a>
<li>
<ul
class=
"dropdown-menu"
>
<a
id=
"addfiltercountry"
href=
"#"
<li>
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
<a
id=
"addfiltercountry"
href=
"#"
Filter by country
</a>
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
</li>
Filter by country
</a>
<li>
</li>
<a
id=
"addfilterkeyword"
href=
"#"
<li>
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
<a
id=
"addfilterkeyword"
href=
"#"
Filter by keyword
</a>
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
</li>
Filter by keyword
</a>
<li>
</li>
<a
id=
"addfiltertag"
href=
"#"
<li>
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
<a
id=
"addfiltertag"
href=
"#"
Filter by community tags
</a>
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
</li>
Filter by community tags
</a>
</li>
<!-- <li>
<!-- <li>
<a id="addfilterorganization" href="#"
<a id="addfilterorganization" href="#"
onclick='$(this).parents(".dropdown-menu").toggle();'>
onclick='$(this).parents(".dropdown-menu").toggle();'>
Filter by organization</a>
Filter by organization</a>
</li> -->
</li> -->
<li>
<li>
<a
id=
"addfilterlaboratory"
href=
"#"
<a
id=
"addfilterlaboratory"
href=
"#"
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
Filter by laboratory
</a>
Filter by laboratory
</a>
</li>
</li>
<!--<li>
<!--<li>
<a id="addcolor" href="#">Color by</a>
<a id="addcolor" href="#">Color by</a>
</li>-->
</li>-->
</ul>
</li>
<li>
<a
class=
"topbarlink"
id=
"print"
href=
"#"
>
<i
class=
"icon-arrow-right icon-white"
></i>
<strong>
CREATE DIRECTORY
</strong></a>
</li>
<li
style=
"margin-top: 10px;"
>
<span
style=
"color: #fff;"
>
<strong>
OR
</strong>
</span>
</li>
<li>
<a
class=
"topbarlink"
id=
"generate"
href=
"#"
>
<i
class=
"icon-arrow-right icon-white"
></i>
<strong>
MAP
</strong></a>
</li>
</ul>
</ul>
</li>
<li
class=
"comex-nav-item"
>
<a
class=
"topbarlink"
id=
"print"
href=
"#"
>
<i
class=
"icon-arrow-right icon-white"
></i>
<strong>
CREATE DIRECTORY
</strong></a>
</li>
<li
class=
"comex-nav-item"
>
<p
class=
"topbarlink"
>
<strong>
OR
</strong>
</p>
</li>
<li
class=
"comex-nav-item"
>
<a
class=
"topbarlink"
id=
"generate"
href=
"#"
>
<i
class=
"icon-arrow-right icon-white"
></i>
<strong>
MAP
</strong></a>
</li>
</ul>
<form
id=
"search-form"
class=
"js-search-form pull-right"
>
<form
id=
"search-form"
class=
"js-search-form pull-right"
>
<span
class=
"glass js-search-action"
><i></i></span>
<span
class=
"glass js-search-action"
><i></i></span>
<input
id=
"search"
class=
"input-small"
type=
"text"
name=
"q"
placeholder=
"Search"
>
<input
id=
"search"
class=
"input-small"
type=
"text"
name=
"q"
placeholder=
"Search"
>
...
...
search_filter.php
View file @
c9378cbb
<?php
<?php
/*
/*
* Génère le
gexf
des scholars à partir de la base mysql
* Génère le
json
des scholars à partir de la base mysql
*/
*/
include
(
"php_library/parametres.php"
);
include
(
"php_library/parametres.php"
);
include
(
"php_library/normalize.php"
);
include
(
"php_library/normalize.php"
);
...
...
static/css/comex_user.css
View file @
c9378cbb
...
@@ -19,6 +19,16 @@ body {
...
@@ -19,6 +19,16 @@ body {
line-height
:
.85em
;
line-height
:
.85em
;
}
}
.comex-nav-item
{
vertical-align
:
middle
;
line-height
:
2em
;
height
:
2em
;
margin-top
:
.2em
;
/* good for scaffolding
border: 2px solid white;
*/
}
/* main content for all new pages */
/* main content for all new pages */
div
.my-box
{
div
.my-box
{
...
@@ -138,19 +148,36 @@ input.readonly {
...
@@ -138,19 +148,36 @@ input.readonly {
/*text-align: center;*/
/*text-align: center;*/
}
}
/* form operation buttons for instance add middle name */
/* form operation buttons for instance add middle name
, remove box, etc
*/
.operation
{
.operation
{
color
:
#554
;
color
:
#554
;
cursor
:
pointer
;
}
.operation
:hover
{
color
:
#23A
;
text-shadow
:
.2px
.3px
#333
;
}
}
/* same on dark background */
.operation-light
{
color
:
#979797
;
cursor
:
pointer
;
}
.operation-light
:hover
{
color
:
rgb
(
170
,
255
,
120
);
text-shadow
:
.2px
.3px
#eee
;
}
.navlink
{
.navlink
,
.navlink
:focus
{
font-size
:
1.2em
;
font-size
:
1.2em
;
font-weight
:
bold
;
font-weight
:
bold
;
margin
:
3px
0
0
6px
;
margin
:
3px
0
0
6px
;
background-color
:
transparent
!important
;
}
}
.navlink
:hover
{
.navlink
:hover
{
color
:
white
;
background-color
:
transparent
!important
;
background-color
:
transparent
!important
;
}
}
...
@@ -191,7 +218,7 @@ input.readonly {
...
@@ -191,7 +218,7 @@ input.readonly {
input
#my-captcha
{
input
#my-captcha
{
height
:
5em
;
height
:
5em
;
font-size
:
.8
em
;
font-size
:
1
em
;
}
}
/* for code blocks or urls */
/* for code blocks or urls */
...
@@ -230,11 +257,6 @@ input#my-captcha{
...
@@ -230,11 +257,6 @@ input#my-captcha{
padding
:
.5em
;
padding
:
.5em
;
}
}
.operation
:hover
{
color
:
#23A
;
text-shadow
:
.5px
.5px
#333
,
-.5px
-.5px
#333
,
-.5px
.5px
#333
,
.5px
-.5px
#333
;
}
.tagbox-container
{
.tagbox-container
{
background-color
:
#eee
;
background-color
:
#eee
;
border-bottom
:
3px
solid
#ccc
;
border-bottom
:
3px
solid
#ccc
;
...
...
static/css/whoswho.css
View file @
c9378cbb
...
@@ -182,12 +182,12 @@ input.name {
...
@@ -182,12 +182,12 @@ input.name {
color
:
#000
!important
;
color
:
#000
!important
;
background-color
:
#fff
;
background-color
:
#fff
;
/*font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;*/
font-family
:
"Droid Sans"
,
Ubuntu
,
Calibri
,
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
text-shadow
:
none
!important
;
text-shadow
:
none
!important
;
font-weight
:
normal
;
font-weight
:
normal
;
padding
:
4px
!important
;
padding
:
2px
4px
!important
;
margin
:
.4em
1em
.3em
1em
;
margin
:
.4em
1em
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
@@ -212,13 +212,8 @@ input.name {
...
@@ -212,13 +212,8 @@ input.name {
}
}
.filter
{
.filter
{
line-height
:
18px
;
font-size
:
1em
;
vertical-align
:
middle
;
margin
:
.22em
0
0
.5em
;
font-size
:
13px
;
padding
:
0
!important
;
padding
:
0
!important
;
margin
:
.25em
0
0
0
!important
;
-webkit-transition
:
opacity
.5s
ease-in
;
-webkit-transition
:
opacity
.5s
ease-in
;
}
}
.filter
>
span
{
.filter
>
span
{
...
@@ -232,12 +227,13 @@ input.name {
...
@@ -232,12 +227,13 @@ input.name {
font-size
:
1em
;
font-size
:
1em
;
position
:
relative
;
position
:
relative
;
margin-top
:
-.3em
;
margin-top
:
-.3em
;
margin-right
:
1em
;
margin-right
:
.5em
;
float
:
right
;
right
:
.2em
;
color
:
#23A
;
display
:
inline
;
color
:
#333
!important
;
background-color
:
#979797
;
background-color
:
#979797
;
border-radius
:
1em
;
border-radius
:
0
1.2em
1.2em
0
;
padding
:
0
.4
em
;
padding
:
.32em
.4em
.37em
.2
em
;
cursor
:
pointer
;
cursor
:
pointer
;
opacity
:
1
;
opacity
:
1
;
}
}
static/js/whoswho.js
View file @
c9378cbb
...
@@ -63,10 +63,10 @@ $(document).ready(function() {
...
@@ -63,10 +63,10 @@ $(document).ready(function() {
id1
=
"filter"
+
id
;
id1
=
"filter"
+
id
;
id2
=
"combo"
+
id
;
id2
=
"combo"
+
id
;
id3
=
"close"
+
id
;
id3
=
"close"
+
id
;
header
=
"<li id=
\"
"
+
id1
+
"
\"
class=
\"
filter
\"
style=
\"
padding-top: 5px;
\"
>"
;
header
=
"<li id=
\"
"
+
id1
+
"
\"
class=
\"
comex-nav-item
filter
\"
style=
\"
padding-top: 5px;
\"
>"
;
labelization
=
"<span style=
\"
color: #fff;
\"
> "
+
label
+
" </span>"
;
labelization
=
"<span style=
\"
color: #fff;
\"
> "
+
label
+
" </span>"
;
input
=
"<input type=
\"
text
\"
id=
\"
"
+
id2
+
"
\"
class=
\"
medium filter"
+
type
+
"
\"
placeholder=
\"
"
+
type
+
"
\"
/>"
;
input
=
"<input type=
\"
text
\"
id=
\"
"
+
id2
+
"
\"
class=
\"
medium filter"
+
type
+
"
\"
placeholder=
\"
"
+
type
+
"
\"
/>"
;
closebox
=
"<div id=
\"
"
+
id3
+
"
\"
for=
\"
"
+
id1
+
"
\"
class=
\"
filter-close operation
\"
>x</div>"
closebox
=
"<div id=
\"
"
+
id3
+
"
\"
for=
\"
"
+
id1
+
"
\"
class=
\"
filter-close operation
-light
\"
>x</div>"
footer
=
"</li>;"
;
footer
=
"</li>;"
;
$
(
header
+
labelization
+
input
+
closebox
+
footer
).
insertBefore
(
"#refine"
);
$
(
header
+
labelization
+
input
+
closebox
+
footer
).
insertBefore
(
"#refine"
);
$
(
'#'
+
id3
).
click
(
closeThisBox
)
$
(
'#'
+
id3
).
click
(
closeThisBox
)
...
...
templates/alt_index.html
View file @
c9378cbb
...
@@ -9,13 +9,12 @@
...
@@ -9,13 +9,12 @@
<!-- for #mini-explorer -->
<!-- for #mini-explorer -->
<link
rel=
"stylesheet"
href=
"{{ url_for('static', filename='explorerlibs/jquery/jquery-ui.css') }}"
media=
"screen"
>
<!-- <link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/jquery/jquery-ui.css') }}" media="screen">
<link
rel=
"stylesheet"
href=
"{{ url_for('static', filename='explorerlibs/bootstrap/css/bootstrap.css') }}"
media=
"screen"
>
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/css2/freshslider.css') }}" media="screen">
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/css2/freshslider.css') }}" media="screen">
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/css2/custom.css') }}" media="screen">
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/css2/custom.css') }}" media="screen">
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/css2/sidebar.css') }}" media="screen">
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/css2/sidebar.css') }}" media="screen">
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/bootswatch/css/bootswatch.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/bootswatch/css/bootswatch.css') }}">
<link
rel=
"stylesheet"
href=
"{{ url_for('static', filename='explorerlibs/css2/font.css') }}"
type=
"text/css"
>
<link rel="stylesheet" href="{{ url_for('static', filename='explorerlibs/css2/font.css') }}" type="text/css">
-->
{% endblock %}
{% endblock %}
...
@@ -215,8 +214,8 @@
...
@@ -215,8 +214,8 @@
<!-- colored notebook section: EXPLORE -->
<!-- colored notebook section: EXPLORE
2 POSS: insert tina inline
-->
<div
class=
"row spacerrow"
>
</div>
<
!-- <
div class="row spacerrow"> </div>
<div class="row banner-row" style="background-color:#00B4E6">
<div class="row banner-row" style="background-color:#00B4E6">
<div class="spacer col-lg-1 col-md-1 hidden-sm-down"> </div>
<div class="spacer col-lg-1 col-md-1 hidden-sm-down"> </div>
<div class="col-lg-3 col-md-3 col-sm-10">
<div class="col-lg-3 col-md-3 col-sm-10">
...
@@ -236,6 +235,9 @@
...
@@ -236,6 +235,9 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-lg-7 col-md-7 col-sm-10 wwwpanel">
<div class="col-lg-7 col-md-7 col-sm-10 wwwpanel">
<div class="panel panel-default">
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-heading">
...
@@ -258,7 +260,6 @@
...
@@ -258,7 +260,6 @@
<div class="container container-fluid" id="mini-explorer">
<div class="container container-fluid" id="mini-explorer">
<!-- this is the tweakbar -->
<div id="defaultop" class="navbar navbar-default">
<div id="defaultop" class="navbar navbar-default">
<div class="navbar-collapse collapse navbar-responsive-collapse">
<div class="navbar-collapse collapse navbar-responsive-collapse">
<div id="left" style="margin:0em 2em;">
<div id="left" style="margin:0em 2em;">
...
@@ -345,8 +346,8 @@
...
@@ -345,8 +346,8 @@
</div>
</div>
</div>
<!-- /.nav-collapse -->
</div>
</div>
<!-- /.navbar -->
</div>
<div id="wrapper">
<div id="wrapper">
...
@@ -355,7 +356,6 @@
...
@@ -355,7 +356,6 @@
<div id="zonecentre">
<div id="zonecentre">
<!-- Page content -->
<div id="sigma-example"></div>
<div id="sigma-example"></div>
<div style="visibility: hidden;" id="sigma-othergraph"></div>
<div style="visibility: hidden;" id="sigma-othergraph"></div>
...
@@ -415,7 +415,6 @@
...
@@ -415,7 +415,6 @@
</div>
</div>
<!-- Sidebar -->
<div id="leftcolumn">
<div id="leftcolumn">
<div id="tips"></div>
<div id="tips"></div>
<div id="names"></div>
<div id="names"></div>
...
@@ -461,7 +460,7 @@
...
@@ -461,7 +460,7 @@
</div>
</div>
</div>
</div>
<div class="spacer col-lg-1 col-md-2 hidden-sm-down"> </div>
<div class="spacer col-lg-1 col-md-2 hidden-sm-down"> </div>
</div>
</div>
-->
...
@@ -486,7 +485,7 @@
...
@@ -486,7 +485,7 @@
<!-- for #mini-explorer -->
<!-- for #mini-explorer -->
<!--
<script src="{{ url_for('static', filename='explorerlibs/jquery/jquery-1.10.2.js') }}" type="text/javascript"></script>
<script src="{{ url_for('static', filename='explorerlibs/jquery/jquery-1.10.2.js') }}" type="text/javascript"></script>
<script src="{{ url_for('static', filename='explorerlibs/jquery/jquery-ui.js') }}" type="text/javascript"></script>
<script src="{{ url_for('static', filename='explorerlibs/jquery/jquery-ui.js') }}" type="text/javascript"></script>
<script src="{{ url_for('static', filename='explorerlibs/jquery/jquery.ba-dotimeout.min.js') }}" type="text/javascript"></script>
<script src="{{ url_for('static', filename='explorerlibs/jquery/jquery.ba-dotimeout.min.js') }}" type="text/javascript"></script>
...
@@ -525,6 +524,6 @@
...
@@ -525,6 +524,6 @@
<script src="{{ url_for('static', filename='tinawebJS/main.js') }}" type="text/javascript" language="javascript"></script>
<script src="{{ url_for('static', filename='tinawebJS/main.js') }}" type="text/javascript" language="javascript"></script>
<script type="text/javascript">
<script type="text/javascript">
$
(
'#tab-container'
).
easytabs
({
updateHash
:
false
});
$('#tab-container').easytabs({updateHash:false});
-->
</script>
</script>
{% endblock %}
{% endblock %}
templates/base_layout.html
View file @
c9378cbb
...
@@ -10,6 +10,9 @@
...
@@ -10,6 +10,9 @@
<link
type=
text/css
rel=
stylesheet
href=
"{{ url_for('static', filename='js/realperson/jquery.realperson.css') }}"
>
<link
type=
text/css
rel=
stylesheet
href=
"{{ url_for('static', filename='js/realperson/jquery.realperson.css') }}"
>
<link
type=
text/css
rel=
stylesheet
href=
"{{ url_for('static', filename='css/comex_user.css') }}"
>
<link
type=
text/css
rel=
stylesheet
href=
"{{ url_for('static', filename='css/comex_user.css') }}"
>
<!-- for topbar search/refine -->
<link
type=
text/css
rel=
stylesheet
href=
"{{ url_for('static', filename='css/whoswho.css') }}"
>
<!-- ## fonts ## -->
<!-- ## fonts ## -->
<link
type=
"text/css"
href=
"http://fonts.googleapis.com/css?family=Ubuntu"
rel=
"stylesheet"
>
<link
type=
"text/css"
href=
"http://fonts.googleapis.com/css?family=Ubuntu"
rel=
"stylesheet"
>
<link
type=
"text/css"
href=
"http://fonts.googleapis.com/css?family=Droid%20Sans"
rel=
"stylesheet"
>
<link
type=
"text/css"
href=
"http://fonts.googleapis.com/css?family=Droid%20Sans"
rel=
"stylesheet"
>
...
@@ -21,7 +24,11 @@
...
@@ -21,7 +24,11 @@
<!-- libs -->
<!-- libs -->
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/jquery/jquery-3.1.1.min.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/jquery/jquery-3.1.1.min.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/jquery-ui-1.12.1/jquery-ui.min.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/jquery-ui-1.12.1/jquery-ui.min.js') }}"
></script>
<!-- for topbar search/refine -->
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/utils.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/misc/underscore.min.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/jquery/jquery.highlight-3.js') }}"
></script>
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/whoswho.js') }}"
></script>
<!-- NB our js will be at the end -->
<!-- NB our js will be at the end -->
<!-- ## Piwik ## -->
<!-- ## Piwik ## -->
...
@@ -62,29 +69,92 @@
...
@@ -62,29 +69,92 @@
Community Explorer
Community Explorer
</a>
</a>
</li>
</li>
<!-- MAIN SEARCH/REFINE NAVBAR -->
<li
id=
"mapping"
class=
"comex-nav-item"
>
<p
class=
'topbarlink'
>
<strong>
SELECT Keywords AND Scholars
</strong>
</p>
</li>
<li
id=
"refine"
class=
"dropdown comex-nav-item"
>
<a
class=
"btn-default nav-inline-selectable"
style=
"padding-top: 1em"
onclick=
'$(this).next(".dropdown-menu").toggle();'
>
refine
<i
class=
"caret"
></i></a>
<ul
class=
"dropdown-menu"
>
<li>
<a
id=
"addfiltercountry"
href=
"#"
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
Filter by country
</a>
</li>
<li>
<a
id=
"addfilterkeyword"
href=
"#"
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
Filter by keyword
</a>
</li>
<li>
<a
id=
"addfiltertag"
href=
"#"
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
Filter by community tags
</a>
</li>
<li>
<a
id=
"addfilterlaboratory"
href=
"#"
onclick=
'$(this).parents(".dropdown-menu").toggle();'
>
Filter by laboratory
</a>
</li>
</ul>
</li>
<li
class=
"comex-nav-item"
>
<a
class=
"topbarlink"
id=
"print"
href=
"#"
>
<i
class=
"icon-arrow-right icon-white"
></i>
<strong>
CREATE DIRECTORY
</strong></a>
</li>
<li
class=
"comex-nav-item"
>
<p
class=
"topbarlink"
>
<strong>
OR
</strong>
</p>
</li>
<li
class=
"comex-nav-item"
>
<a
class=
"topbarlink"
id=
"generate"
href=
"#"
>
<i
class=
"icon-arrow-right icon-white"
></i>
<strong>
MAP
</strong></a>
</li>
</ul>
</ul>
<ul
class=
"white nav navbar-nav navbar-right"
>
<ul
class=
"white nav navbar-nav navbar-right"
>
{% if current_user and current_user.info %}
<!-- USER TOOLBARS (LOGIN/REGISTER/PROFILE/ETC) -->
<li
class=
"dropdown"
>
<a
href=
"#"
class=
"navlink dropdown-toggle"
data-toggle=
"dropdown"
role=
"button"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"glyphicon glyphicon-user"
></span>
User
<span
class=
"caret"
></span>
</a>
<ul
class=
"dropdown-menu"
>
{% if current_user.info %}
<li>
<li>
<a
class=
"navlink"
href=
"/services/user/profile"
>
Your Profile
</a>
<a
href=
"/services/user/profile"
>
Your Profile
</a>
</li>
</li>
<li>
<li>
<a
class=
"navlink"
href=
'/explorerjs.html?type="uid"&nodeidparam="{{ current_user.uid }}"'
>
Your Map
</a>
<a
href=
'/explorerjs.html?type="uid"&nodeidparam="{{ current_user.uid }}"'
>
Your Map
</a>
</li>
</li>
<li>
<li>
<a
class=
"navlink"
href=
'/print_scholar_directory.php?query={{ current_user.uid }}'
>
Your Neighboor Stats
</a>
<a
href=
'/print_scholar_directory.php?query={{ current_user.uid }}'
>
Your Neighboor Stats
</a>
</li>
</li>
<li>
<li>
<a
class=
"navlink"
href=
'/services/user/logout/'
>
Logout
</a>
<a
href=
'/services/user/logout/'
>
Logout
</a>
</li>
</li>
{% else %}
{% else %}
<li>
<li>
<a
class=
"navlink"
href=
"/services/user/register"
>
Register
</a>
<a
href=
"/services/user/register"
>
Register
</a>
</li>
</li>
<li>
<li>
<a
class=
"navlink"
href=
"/services/user/login"
>
Login
</a>
<a
href=
"/services/user/login"
>
Login
</a>
</li>
</li>
{% endif %}
{% endif %}
</ul>
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
...
@@ -137,6 +207,7 @@
...
@@ -137,6 +207,7 @@
</div>
</div>
<script
type=
"text/javascript"
src=
"{{ url_for('static', filename='js/bootstrap-native-1.1.min.js') }}"
></script>
<!-- for our js: end-of-page javascript imports -->
<!-- for our js: end-of-page javascript imports -->
{% block last_imports %}
{% block last_imports %}
{% endblock %}
{% endblock %}
...
...
templates/login.html
View file @
c9378cbb
...
@@ -84,7 +84,7 @@
...
@@ -84,7 +84,7 @@
<div
class=
"question input-group"
>
<div
class=
"question input-group"
>
<label
for=
"my-captcha"
class=
"smlabel input-group-addon"
>
Code
</label>
<label
for=
"my-captcha"
class=
"smlabel input-group-addon"
>
Code
</label>
<input
id=
"my-captcha"
name=
"my-captcha"
style=
"max-width:60%"
<input
id=
"my-captcha"
name=
"my-captcha"
style=
"max-width:60%"
type=
"text"
class=
"form-control input-lg"
placeholder=
"Enter the 5 letters
you see
beside =>"
type=
"text"
class=
"form-control input-lg"
placeholder=
"Enter the 5 letters beside =>"
onblur=
"cmxClt.makeBold(this)"
onfocus=
"cmxClt.makeNormal(this)"
>
onblur=
"cmxClt.makeBold(this)"
onfocus=
"cmxClt.makeNormal(this)"
>
<p
class=
"legend legend-float"
>
(A challenge for spam bots)
</p>
<p
class=
"legend legend-float"
>
(A challenge for spam bots)
</p>
</div>
</div>
...
...
templates/profile.html
View file @
c9378cbb
...
@@ -609,6 +609,4 @@
...
@@ -609,6 +609,4 @@
<script
src=
"{{ url_for('static', filename='js/comex_user_shared.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_shared.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_page_profile_controllers.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_page_profile_controllers.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_autocompletes.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_autocompletes.js') }}"
></script>
<!-- <script src="{{ url_for('static', filename='js/bootstrap-native.js') }}"></script> -->
<script
src=
"{{ url_for('static', filename='js/bootstrap-native-1.1.min.js') }}"
></script>
{% endblock %}
{% endblock %}
templates/registration_full_form.html
View file @
c9378cbb
...
@@ -551,7 +551,7 @@
...
@@ -551,7 +551,7 @@
<div
class=
"question input-group"
>
<div
class=
"question input-group"
>
<label
for=
"my-captcha"
class=
"smlabel input-group-addon"
>
Code
</label>
<label
for=
"my-captcha"
class=
"smlabel input-group-addon"
>
Code
</label>
<input
id=
"my-captcha"
name=
"my-captcha"
style=
"max-width:60%"
<input
id=
"my-captcha"
name=
"my-captcha"
style=
"max-width:60%"
type=
"text"
class=
"form-control input-lg"
placeholder=
"Enter the 5 letters
you see
beside =>"
type=
"text"
class=
"form-control input-lg"
placeholder=
"Enter the 5 letters beside =>"
onblur=
"cmxClt.makeBold(this)"
onfocus=
"cmxClt.makeNormal(this)"
>
onblur=
"cmxClt.makeBold(this)"
onfocus=
"cmxClt.makeNormal(this)"
>
<p
class=
"legend legend-float"
>
(A challenge for spam bots)
</p>
<p
class=
"legend legend-float"
>
(A challenge for spam bots)
</p>
</div>
</div>
...
@@ -603,5 +603,4 @@
...
@@ -603,5 +603,4 @@
<script
src=
"{{ url_for('static', filename='js/comex_user_shared_auth.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_shared_auth.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_page_reg_controllers.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_page_reg_controllers.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_autocompletes.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_autocompletes.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/bootstrap-native-1.1.min.js') }}"
></script>
{% endblock %}
{% endblock %}
templates/registration_short_form.html
View file @
c9378cbb
...
@@ -357,7 +357,7 @@
...
@@ -357,7 +357,7 @@
<div
class=
"question input-group"
>
<div
class=
"question input-group"
>
<label
for=
"my-captcha"
class=
"smlabel input-group-addon"
>
Code
</label>
<label
for=
"my-captcha"
class=
"smlabel input-group-addon"
>
Code
</label>
<input
id=
"my-captcha"
name=
"my-captcha"
style=
"max-width:60%"
<input
id=
"my-captcha"
name=
"my-captcha"
style=
"max-width:60%"
type=
"text"
class=
"form-control input-lg"
placeholder=
"Enter the 5 letters
you see
beside =>"
type=
"text"
class=
"form-control input-lg"
placeholder=
"Enter the 5 letters beside =>"
onblur=
"cmxClt.makeBold(this)"
onfocus=
"cmxClt.makeNormal(this)"
>
onblur=
"cmxClt.makeBold(this)"
onfocus=
"cmxClt.makeNormal(this)"
>
<p
class=
"legend legend-float"
>
(A challenge for spam bots)
</p>
<p
class=
"legend legend-float"
>
(A challenge for spam bots)
</p>
</div>
</div>
...
@@ -409,5 +409,4 @@
...
@@ -409,5 +409,4 @@
<script
src=
"{{ url_for('static', filename='js/comex_user_shared_auth.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_shared_auth.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_page_reg_controllers.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_page_reg_controllers.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_autocompletes.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/comex_user_autocompletes.js') }}"
></script>
<script
src=
"{{ url_for('static', filename='js/bootstrap-native-1.1.min.js') }}"
></script>
{% endblock %}
{% endblock %}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment