new logo

Author: bsab

templates/index.html

@@ -8,14 +8,14 @@
 
 {% block content %}
 
-    <div class="blue lighten-5">
+    <div class="white">
         <div class="row" style="margin-bottom: 0px">
             <div class="col m3">
             </div>
             <div class="col s12 m6">
                 <div class="card">
                     <div class="card-content" style="padding: 5px;">
-                        <h3 class="header center orange-text">Welcome to {{ ssid }}</h3>
+                        <h3 class="header center orange-text">Welcome to <b>{{ ssid }}</b></h3>
                     </div>
 
                 </div>
@@ -37,8 +37,9 @@ <h4 class="header col s12 light">Connected!</h4>
 
                     <div class="col s12 m4">
                         <div class="icon-block center">
-                            <img src="{%  static 'img/unlock.png' %}">
-                            <h5 class="light">You've got a {{ timeout }} minutes of free navigation!</h5>
+                            <img src="{{ logo }}">
+                            <h5 class="light">You've got {{ timeout }} minutes of free navigation!</h5>
+                            <h5 class="light">Close this page and enjoy!</h5>
                         </div>
                     </div>
                     <div class="col s12 m4">

templates/login.html

@@ -14,7 +14,8 @@
 
 {% block formbody %}
 
-    {% include form.logo %}
+    <p style="text-align:center"> <img src="{{ logo }}">  </p>
+    <br>
 
     <div style='text-align:center;margin-bottom: 30px'>
         <h6>Welcome to <b>{{ ssid }}</b> free WIFI</h6>

templates/registration.html

@@ -13,7 +13,8 @@
 {% block formtitle %}{% endblock %}
 
 {% block formbody %}
-    {% include form.logo %}
+
+    <p style="text-align:center"> <img src="{{ logo }}"></p><br>
 
    <div style='text-align:center;margin-bottom: 30px'>
         <h6>Register to <b>{{ ssid }}</b> free WIFI</h6>

unifi_portal/context_processor.py

@@ -2,6 +2,7 @@
 
 def unifi_context(request):
   ctx = {
+      'logo': settings.UNIFI_LOGO,
       'ssid': settings.UNIFI_SSID,
       'timeout': settings.UNIFI_TIMEOUT_MINUTES
   }

unifi_portal/forms.py

@@ -3,8 +3,9 @@
 from django.template import Template
 from django.contrib.auth.forms import User
 from django.contrib.auth.forms import AuthenticationForm
+from django.conf import settings
 
-from material import Layout, Row, Column, Fieldset, Span2, Span3, Span5, Span6, Span10
+from material import Layout, Row, Fieldset
 from . import form_mixin as forms
 
 class UnifiLoginForm(AuthenticationForm):
@@ -19,11 +20,6 @@ class UnifiLoginForm(AuthenticationForm):
     {% endform %}
     """)
 
-    logo = Template("""
-        <p style="text-align:center"> <img src="/static/img/DjangoUnifi.png">  </p>
-        <br>
-    """)
-
     social_buttons = Template("""
         <p style="text-align:center"><a href="/auth/login/facebook" class="waves-effect waves-light btn-large blue"><i class="fa fa-facebook" aria-hidden="true"></i> Sign in with facebook</a></p>
         <br>
@@ -69,11 +65,6 @@ class UnifiRegistrationForm(ModelForm):
     {% endform %}
     """)
 
-    logo = Template("""
-        <p style="text-align:center"> <img src="/static/img/DjangoUnifi.png">  </p>
-        <br>
-    """)
-
     buttons = Template("""
         <button class="waves-effect waves-light btn" type="submit">Submit</button>
     """)

unifi_portal/static/img/freewifi.png

@@ -14,7 +14,7 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME, login as auth_login, logout as auth_logout
 from django.contrib.auth.models import User
 from django.utils.decorators import method_decorator
-from django.views import View
+from django.views.generic import TemplateView
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_protect
 from django.views.decorators.debug import sensitive_post_parameters
@@ -26,7 +26,7 @@
 from unifi_portal.models import UnifiUser
 
 
-class UserAuthorizeView(SingleObjectMixin, View):
+class UserAuthorizeView(SingleObjectMixin, TemplateView):
     """ Authorize a guest based on parameters passed through the request. """
 
     template_name = 'index.html'
@@ -40,26 +40,26 @@ def get_user_profile_inst(self):
             up = None;
         return up;
 
-    def post(self, request, *args, **kwargs):
-        return HttpResponseForbidden();
+    def get_context_data(self, **kwargs):
+        """Update view context."""
+        #context = super(UserAuthorizeView, self).get_context_data(**kwargs)
+        context={}
 
-    def get(self, request, *args, **kwargs):
-        ctx = {}
         try:
-            _mac = request.GET.get('id', '')
-            _ap = request.GET.get('ap', '')
-            _url = request.GET.get('url', '')
-            # _t = request.GET.get('t', '')
+            _mac = self.request.GET.get('id', '')
+            _ap = self.request.GET.get('ap', '')
+            _url = self.request.GET.get('url', '')
+            # _t = self.request.GET.get('t', '')
             _t = settings.UNIFI_TIMEOUT_MINUTES
             _last_login = time.strftime("%c")
 
-            ctx = {
+            context.update({
                 'guest_mac': _mac,
                 'ap_mac': _ap,
                 'minutes': _t,
                 'url': _url,
                 'last_login': _last_login
-            }
+            })
 
             # Saving info on userprofile Model
             userprofile = self.get_user_profile_inst()
@@ -71,12 +71,27 @@ def get(self, request, *args, **kwargs):
             unifi_client = UnifiClient()
             unifi_client.send_authorization(_mac, _ap, _t)
 
-            if _url:
-                return HttpResponseRedirect(_url)
-        except:
+            #if _url:
+            #    return HttpResponseRedirect(_url)
+        except Exception as exp_debug:
+            print "EXCEPTION: " + str(exp_debug)
             pass
 
-        return render_to_response('index.html', ctx, RequestContext(request))
+        return context
+
+    def post(self, request, *args, **kwargs):
+        """Deny post requests."""
+        return HttpResponseForbidden();
+
+    def get(self, request, *args, **kwargs):
+        """Response with rendered html template."""
+        context = self.get_context_data()
+
+        if '_url' in context:
+            if context['_url']: #if i try to go on an url without wifi login
+                return HttpResponseRedirect(context['_url'])
+
+        return self.render_to_response(context)
 
     @method_decorator(login_required)
     def dispatch(self, request, *args, **kwargs):