Merge pull request #69 from pmannuel/pris

Update
pmannuel · Mar 3, 2017 · 9d741ce · 9d741ce
2 parents 64fc817 + 481174d
commit 9d741ce
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/apps/login_register/migrations/0001_initial.py b/apps/login_register/migrations/0001_initial.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-03-03 18:22
+
+# Generated by Django 1.10.5 on 2017-03-03 16:44
+
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/apps/main/templates/main/index.html b/apps/main/templates/main/index.html
@@ -113,7 +113,7 @@ <h5 style="margin-left:40px;">{{profile.user.firstname}} {{profile.user.lastname
                     </table>
                 </div>
                 {% else %}
-                <div style="text-align:center;height:100vh;" class="top-head">
+                <div style="text-align:center;height:93vh;" class="top-head">
                     <br>
                     <br>
                     <br>

diff --git a/apps/schedules/migrations/0001_initial.py b/apps/schedules/migrations/0001_initial.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.10.5 on 2017-03-03 18:22
+
+# Generated by Django 1.10.5 on 2017-03-03 16:44
+
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/apps/user_profile/migrations/0001_initial.py b/apps/user_profile/migrations/0001_initial.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
+
 # Generated by Django 1.10.5 on 2017-03-03 18:22
+
 from __future__ import unicode_literals
 
 from django.db import migrations, models

diff --git a/apps/user_profile/views.py b/apps/user_profile/views.py
@@ -1149,7 +1149,7 @@ def update_times(request):
         schedule.sun = sun
         schedule.save()
 
-    return redirect(reverse('user_profile:edit_profile', kwargs={'user_id': request.session['active_user_id']}))
+    return redirect(reverse('user_profile:index', kwargs={'user_id': request.session['active_user_id']}))
 
 def edit_profile(request, user_id):
     user_id = request.session.get('active_user_id')