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

diff --git a/portal/templates/_widget-login-manager.html b/portal/templates/_widget-login-manager.html
new file mode 100644 (file)
index 0000000..7c5f170
--- /dev/null
+++ b/portal/templates/_widget-login-manager.html
@@ -0,0 +1,26 @@
+<div class="well">
+       {% if state %}
+       <span class="help-block">{{ state }}</span>
+       {% endif %}
+       <form action="/login/" method="post" role="form">
+         {% csrf_token %}
+         {% if next %}
+         <input type="hidden" name="next" value="{{ next }}" />
+         {% endif %}
+       <div class="form-group">
+       <label for="username">Email address / Username</label>
+       <input type="email" class="form-control" name="username" placeholder="Enter Email / username">
+       </div>
+       <div class="form-group">
+       <label for="password">Password</label>
+       <input type="password" class="form-control" name="password" placeholder="Password">
+       </div>
+       <div class="login-submit">
+               <input class="btn btn-default" type="submit" value="Sign In" />
+               <span class="lost-password">&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="/portal/pass_reset/">Can't access your account?</a></span>
+       </div>
+       <div class="login-signup">
+               <a href="/portal/register">Try</a>, <a href="/portal/register">Sign Up</a> or <a href="/portal/join">Join</a>
+       </div>
+       </form>
+</div>

diff --git a/auth/templates/widget-login.html b/portal/templates/_widget-login-user.html
similarity index 100%
rename from auth/templates/widget-login.html
rename to portal/templates/_widget-login-user.html

diff --git a/ui/static/img/icon_support.png b/ui/static/img/icon_support.png
index 6c77efc..0e69ae7 100644 (file)
Binary files a/ui/static/img/icon_support.png and b/ui/static/img/icon_support.png differ

diff --git a/ui/templates/widget-topmenu.html b/ui/templates/widget-topmenu.html
index ee88601..cf0f32c 100644 (file)
--- a/ui/templates/widget-topmenu.html
+++ b/ui/templates/widget-topmenu.html
@@ -30,7 +30,7 @@
                        <li>INSTITUTION</li>
                        <li><a href="/portal/contact/">SUPPORT</a></li>
                        <li>|</li>
-                       <li>{{ username }}</li>
+                       <li><a href="/portal/account">{{ username }}</a></li>
                        <li><a id="logout" data-username="{{ username }}">LOGOUT</a></li>
                </ul>
                </div>