Commit 6c17d073 authored by Mathieu Giraud's avatar Mathieu Giraud
Browse files

Merge branch 'server' of git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjil into server

Conflicts:
	browser/css/vidjil.less
	browser/index.html
	browser/js/database.js
	browser/js/main.js
	server/web2py/applications/Vidjil/views/default/patient.html
parents 16bde9d4 e261dd26
...@@ -167,6 +167,7 @@ ...@@ -167,6 +167,7 @@
</div> </div>
<div class="menu" id="database_menu" onmouseover="showSelector('dbSelector');" style="display:none"> database <div class="menu" id="database_menu" onmouseover="showSelector('dbSelector');" style="display:none"> database
<div id="dbSelector" class="selector"> <div id="dbSelector" class="selector">
<a class="buttonSelector" onclick="db.call('patient_list');">patient list</a> <a class="buttonSelector" onclick="db.call('patient_list');">patient list</a>
<a class="buttonSelector" onclick="db.call('standard_list');">standard list</a> <a class="buttonSelector" onclick="db.call('standard_list');">standard list</a>
......
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