From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 14 Feb 2014 18:11:35 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-1.1~335
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5091bb839a8553c77dc285c7df5618a1c86ae9e0;hp=36f0a2f013dc861c84f2f2781ccffa05228759a7;p=myslice.git

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
index 00000000..7c5f170e
--- /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 6c77efc4..0e69ae7e 100644
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 ee88601f..cf0f32c6 100644
--- 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>