From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 12 Feb 2013 14:09:20 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
X-Git-Tag: myslice-django-0.1-1~89
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=de93a901d06d0f4f666ff0fcafd1fa024da144e1

Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django

Conflicts:
	templates/view-login.html
---

de93a901d06d0f4f666ff0fcafd1fa024da144e1
diff --cc templates/view-login.html
index 80182efb,3edcff0c..5a5aeb45
--- a/templates/view-login.html
+++ b/templates/view-login.html
@@@ -5,12 -5,13 +5,12 @@@
  {% endblock content_related %}
  
  {% block content_main %}
 -</br>
 -<code>
 -This page is currently connected to the Manifold authentication backend, By default it is pointing to the Manifold API running at "demo.myslice.info", in case you want to point it to your own Manifold API, please edit engine/manifold_api.py.
 -</br></br>
 -And also, as a proof of concept, it uses a set of hardwired user accounts for testing purposes, see auth/backend.py for more details.
 -</code>
 -<p>Currently hard wired users:</p>
 +<code> This page is currently connected to two authentication systems:</code>
 +<ul>
- <li> A manifold server, located at <code>{{ manifold_url }}</code>, and</li>
++<li> A manifold server, located at <code>{{ manifold_url }}</code>, (configured in <code>myslice/config.py</code>), and</li>
 +<li>
- as a proof of concept, a set of hardwired user accounts, see auth/backend.py for more details. 
++as a proof of concept, a set of hardwired user accounts, see <code>auth/backend.py</code> for more details. 
 +Currently hard wired users are:
  <ul>
    {% for k,v in hard_wired_users.iteritems %}
    <li class='well'> Name= <code>{{ k }}</code>, Password= <code>{{ v }}</code> </li>