Jelajahi Sumber

HUE-6888 [libopenid] Style clean-up of lib

Romain Rigaux 8 tahun lalu
induk
melakukan
948e872

+ 3 - 2
desktop/libs/libopenid/src/libopenid/backend.py

@@ -21,14 +21,17 @@ from __future__ import absolute_import
 
 
 import logging
 import logging
 import sys
 import sys
+
 from django.contrib.auth import logout as auth_logout
 from django.contrib.auth import logout as auth_logout
 from django.contrib.auth.models import User
 from django.contrib.auth.models import User
 from django_openid_auth.auth import OpenIDBackend as _OpenIDBackend
 from django_openid_auth.auth import OpenIDBackend as _OpenIDBackend
+
 from desktop.auth.backend import rewrite_user
 from desktop.auth.backend import rewrite_user
 from useradmin.models import get_profile, get_default_user_group, UserProfile
 from useradmin.models import get_profile, get_default_user_group, UserProfile
 
 
 from libopenid import metrics
 from libopenid import metrics
 
 
+
 LOG = logging.getLogger(__name__)
 LOG = logging.getLogger(__name__)
 
 
 
 
@@ -75,7 +78,6 @@ class OpenIDBackend(_OpenIDBackend):
         user.save()
         user.save()
 
 
 
 
-
   def get_user(self, user_id):
   def get_user(self, user_id):
     user = super(OpenIDBackend, self).get_user(user_id)
     user = super(OpenIDBackend, self).get_user(user_id)
     user = rewrite_user(user)
     user = rewrite_user(user)
@@ -89,4 +91,3 @@ class OpenIDBackend(_OpenIDBackend):
   def is_first_login_ever(cls):
   def is_first_login_ever(cls):
     """ Return true if no external user has ever logged in to Desktop yet. """
     """ Return true if no external user has ever logged in to Desktop yet. """
     return not UserProfile.objects.filter(creation_method=str(UserProfile.CreationMethod.EXTERNAL)).exists()
     return not UserProfile.objects.filter(creation_method=str(UserProfile.CreationMethod.EXTERNAL)).exists()
-

+ 5 - 8
desktop/libs/libopenid/src/libopenid/openid_settings.py

@@ -14,25 +14,22 @@
 # See the License for the specific language governing permissions and
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # limitations under the License.
 
 
-import django_openid_auth
-import desktop.conf
+
 import libopenid.conf
 import libopenid.conf
 import logging
 import logging
 
 
-from desktop.lib import security_util
+import django_openid_auth
+import desktop.conf
 
 
+from desktop.lib import security_util
 
 
 
 
 __all__ = ['OPENID_CONFIG', 'OPENID_CREATE_USERS', 'OPENID_SSO_SERVER_URL', 'OPENID_USE_EMAIL_FOR_USERNAME', 'OPENID_IDENTITY_URL_PREFIX']
 __all__ = ['OPENID_CONFIG', 'OPENID_CREATE_USERS', 'OPENID_SSO_SERVER_URL', 'OPENID_USE_EMAIL_FOR_USERNAME', 'OPENID_IDENTITY_URL_PREFIX']
 
 
 
 
-
-
-OPENID_CONFIG = {
-  
+OPENID_CONFIG = {  
   # set to 1 to output debugging information
   # set to 1 to output debugging information
   'debug': 1,
   'debug': 1,
-
 }
 }
 
 
 # openid sso endpoint url
 # openid sso endpoint url

+ 13 - 15
desktop/libs/libopenid/src/libopenid/templates/openid-login.html

@@ -1,4 +1,6 @@
 {% load i18n %}
 {% load i18n %}
+{% load static %}
+
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html lang="en">
 <html lang="en">
 <head>
 <head>
@@ -13,10 +15,9 @@
   <meta name="description" content="">
   <meta name="description" content="">
   <meta name="author" content="">
   <meta name="author" content="">
 
 
-  <link href="/static/desktop/ext/css/bootplus.css" rel="stylesheet">
-  <link href="/static/desktop/ext/css/font-awesome.min.css" rel="stylesheet">
-  <link href="/static/desktop/css/hue3.css" rel="stylesheet">
-  <link href="/static/desktop/css/hue3-extra.css" rel="stylesheet">
+  <link href="{% static 'desktop/ext/css/font-awesome.min.css' %}" rel="stylesheet">
+  <link href="{% static 'desktop/css/hue3.css' %}" rel="stylesheet">
+  <link href="{% static 'desktop/css/hue3-extra.css' %}" rel="stylesheet">
 
 
   <style type="text/css">
   <style type="text/css">
     body {
     body {
@@ -98,12 +99,11 @@
 <div class="footer"></div>
 <div class="footer"></div>
 
 
 <div class="navigator">
 <div class="navigator">
-  <a class="brand nav-tooltip pull-left" href="#"><img src="/static/desktop/art/hue-logo-mini-white.png"
-                                                       data-orig="/static/desktop/art/hue-logo-mini-white.png"
-                                                       data-hover="/static/desktop/art/hue-logo-mini-white-hover.png"/></a>
-  <ul class="nav nav-pills pull-left hide" id="visit">
-    <li><a title="{% trans "Visit gethue.com" %}" href="http://gethue.com">{% trans "Fell asleep? Visit us on gethue.com instead!" %} <i class="fa fa-external-link-circle"></i></a></li>
-  </ul>
+  <a class="brand nav-tooltip pull-left" href="#">
+    <img src="{% static 'desktop/art/hue-logo-mini-white.png' %}"
+			data-orig="{% static 'desktop/art/hue-logo-mini-white.png' %}"
+			data-hover="{% static 'desktop/art/hue-logo-mini-white-hover.png' %}"/>
+  </a>
 </div>
 </div>
 
 
 
 
@@ -112,8 +112,8 @@
     <div class="login-content">
     <div class="login-content">
       <form method="POST" action="{{ action }}" class="well">
       <form method="POST" action="{{ action }}" class="well">
         {% csrf_token %}
         {% csrf_token %}
-        <img id="logo" src="/static/desktop/art/hue-login-logo.png" data-orig="/static/desktop/art/hue-login-logo.png"
-             data-hover="/static/desktop/art/hue-login-logo-skew.png"/>
+        <img id="logo" src="{% static 'desktop/art/hue-login-logo.png' %}" data-orig="{% static 'desktop/art/hue-login-logo.png' %}"
+             data-hover="{% static 'desktop/art/hue-login-logo-skew.png' %}"/>
 
 
         {% if login_errors %}
         {% if login_errors %}
             <div class="alert alert-error" style="text-align: center">
             <div class="alert alert-error" style="text-align: center">
@@ -144,7 +144,7 @@
   </div>
   </div>
 </div>
 </div>
 
 
-<script src="/static/desktop/ext/js/jquery/jquery-2.1.1.min.js"></script>
+<script src="{% static 'desktop/ext/js/jquery/jquery-2.1.1.min.js' %}"></script>
 <script>
 <script>
   $(document).ready(function () {
   $(document).ready(function () {
     var _skew = -1;
     var _skew = -1;
@@ -168,5 +168,3 @@
 </script>
 </script>
 </body>
 </body>
 </html>
 </html>
-
-

+ 7 - 11
desktop/libs/libopenid/src/libopenid/views.py

@@ -15,20 +15,22 @@
 # See the License for the specific language governing permissions and
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # limitations under the License.
 
 
+import logging
+
 from django_openid_auth.views import login_begin as django_login_begin, login_complete
 from django_openid_auth.views import login_begin as django_login_begin, login_complete
 
 
 from desktop.lib.django_util import render
 from desktop.lib.django_util import render
 from django.core import urlresolvers
 from django.core import urlresolvers
-import libopenid.conf
-from libopenid.backend import OpenIDBackend
-from libopenid.forms import OpenIDLoginFormExt
 from django.conf import settings
 from django.conf import settings
-import logging
 from django.shortcuts import render_to_response
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.template import RequestContext
 
 
-__all__ = ['login_begin', 'login_complete']
+import libopenid.conf
+from libopenid.backend import OpenIDBackend
+from libopenid.forms import OpenIDLoginFormExt
+
 
 
+__all__ = ['login_begin', 'login_complete']
 
 
 
 
 def login_begin(request):
 def login_begin(request):
@@ -50,14 +52,8 @@ def login_begin(request):
           'hide_field': True
           'hide_field': True
        }, context_instance=RequestContext(request))
        }, context_instance=RequestContext(request))
 
 
-
-
   return django_login_begin(request, template_name='openid-login.html', form_class = OpenIDLoginFormExt)
   return django_login_begin(request, template_name='openid-login.html', form_class = OpenIDLoginFormExt)
 
 
 
 
-
-
-
-
 setattr(login_begin, 'login_notrequired', True)
 setattr(login_begin, 'login_notrequired', True)
 setattr(login_complete, 'login_notrequired', True)
 setattr(login_complete, 'login_notrequired', True)