Merge branch 'master' into piston-api

sso/services/wiki/__init__.py

@@ -82,10 +82,11 @@ class MediawikiService(BaseService):
         pwhash = self._gen_mw_hash(password)
         self._dbcursor.execute(self.SQL_ENABLE_USER, [pwhash, uid])
         self._db.connection.commit()
-        pass
+        return True
 
     def reset_password(self, uid, password):
         """ Reset the user's password """
-        self.enable_user(uid, password)
+        return self.enable_user(uid, password)
+        
 
 ServiceClass = 'MediawikiService'

templates/sso/profile.html

@@ -12,9 +12,9 @@
 </p>
 
 {% if eveaccounts %}
-<h2>Service Accounts</h2>
+<h2>External Service Accounts</h2>
-<p>This is a list of all your current service accounts, to create a login for 
+<p>This is a list of all your current external service accounts, to 
-a new service click the Add Service link</p>
+create a login for a service click the Add Service link</p>
 {% if srvaccounts %}
 <table>
 <thead>

templates/sso/serviceaccount/created.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Service Account{% endblock %}
+{% block title %}External Service Account{% endblock %}
 
 {% block content %}
 {% if error %}
@@ -12,6 +12,8 @@ this is incorrect please raise a bug on the tracker.
 <p>Your account on {{ account.service }} has been created. Your login details are as follows:</p>
 
 <table>
+<tr><td>Service:</td><td>{{ account.service.name }}</td></tr>
+<tr><td>Service URL:</td><td><a href="{{ account.service.url }}">{{ account.service.url }}</a></td></tr>
 <tr><td>Username:</td><td>{{ account.service_uid }}</td></tr>
 <tr><td>Password:</td><td>{{ account.password }}</td></tr>
 </table>

templates/sso/serviceaccount/index.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Add Service Account{% endblock %}
+{% block title %}Add External Service Account{% endblock %}
 
 {% block content %}
 <p>To add a service to your account, selec the service from the list below 

templates/sso/serviceaccount/noneavailable.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Service Account{% endblock %}
+{% block title %}External Service Account{% endblock %}
 
 {% block content %}
 <p>You have no services available to add to your account</p>

templates/sso/serviceaccount/reset.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Service Account Password Reset{% endblock %}
+{% block title %}External Service Account Password Reset{% endblock %}
 
 {% block content %}
 

templates/sso/serviceaccount/resetcomplete.html

@@ -1,12 +1,11 @@
 {% extends "base.html" %}
 
-{% block title %}Service Account{% endblock %}
+{% block title %}External Service Account{% endblock %}
 
 {% block content %}
 {% if error %}
 <div style="border: 1px solid #FF0000; background: #FF7D7D; width: 100%; text-align: center;">
-<b>Error:</b> Your account has not been created. Either you already have a user on this service or a error has occured. If you think 
+<b>Error:</b> A error occured resetting your account. Please raise a issue with the Web Team
-this is incorrect please raise a bug on the tracker.
 </div>
 {% else %}
 <p>Your account on {{ acc.service }} has been reset. Your login details are as follows:</p>