1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-24 23:25:24 +00:00

Refactor users page

This commit is contained in:
Retspen 2015-03-18 17:13:44 +02:00
parent d9303ff940
commit 02ae7336ea
20 changed files with 55 additions and 25 deletions

View file

@ -7,7 +7,7 @@ from django.db import models, migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('users', '0001_initial'), ('accounts', '0001_initial'),
] ]
operations = [ operations = [

View file

@ -7,7 +7,7 @@ from django.db import models, migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('users', '0002_userinstance_is_block'), ('accounts', '0002_userinstance_is_block'),
] ]
operations = [ operations = [

View file

@ -3,12 +3,23 @@ from django.http import HttpResponseRedirect
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import User from django.contrib.auth.models import User
from users.models import UserInstance from accounts.models import UserInstance
from instances.models import Instance from instances.models import Instance
from users.forms import UserAddForm from accounts.forms import UserAddForm
def users(request): def profile(request):
"""
:param request:
:return:
"""
if not request.user.is_authenticated():
return HttpResponseRedirect(reverse('index'))
return render(request, 'profile.html', locals())
def accounts(request):
""" """
:param request: :param request:
:return: :return:
@ -64,10 +75,10 @@ def users(request):
user_delete.delete() user_delete.delete()
return HttpResponseRedirect(request.get_full_path()) return HttpResponseRedirect(request.get_full_path())
return render(request, 'users.html', locals()) return render(request, 'accounts.html', locals())
def user(request, user_id): def account(request, user_id):
""" """
:param request: :param request:
:return: :return:
@ -110,4 +121,4 @@ def user(request, user_id):
add_user_inst.save() add_user_inst.save()
return HttpResponseRedirect(request.get_full_path()) return HttpResponseRedirect(request.get_full_path())
return render(request, 'user.html', locals()) return render(request, 'account.html', locals())

View file

@ -3,7 +3,7 @@ from django.core.urlresolvers import reverse
from django.shortcuts import render from django.shortcuts import render
from computes.models import Compute from computes.models import Compute
from instances.models import Instance from instances.models import Instance
from users.models import UserInstance from accounts.models import UserInstance
from computes.forms import ComputeAddTcpForm, ComputeAddSshForm, ComputeEditHostForm, ComputeAddTlsForm, ComputeAddSocketForm from computes.forms import ComputeAddTcpForm, ComputeAddSshForm, ComputeEditHostForm, ComputeAddTlsForm, ComputeAddSocketForm
from vrtManager.hostdetails import wvmHostDetails from vrtManager.hostdetails import wvmHostDetails
from vrtManager.connection import CONN_SSH, CONN_TCP, CONN_TLS, CONN_SOCKET, connection_manager from vrtManager.connection import CONN_SSH, CONN_TCP, CONN_TLS, CONN_SOCKET, connection_manager

View file

@ -7,7 +7,7 @@ from django.shortcuts import render
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from computes.models import Compute from computes.models import Compute
from instances.models import Instance from instances.models import Instance
from users.models import UserInstance from accounts.models import UserInstance
from vrtManager.hostdetails import wvmHostDetails from vrtManager.hostdetails import wvmHostDetails
from vrtManager.instance import wvmInstance, wvmInstances from vrtManager.instance import wvmInstance, wvmInstances
from vrtManager.connection import connection_manager from vrtManager.connection import connection_manager

View file

@ -19,7 +19,7 @@
<div class="panel {% if user.is_active %}panel-success{% else %}panel-danger{% endif %} panel-data"> <div class="panel {% if user.is_active %}panel-success{% else %}panel-danger{% endif %} panel-data">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title"> <h3 class="panel-title">
<a href="{% url 'user' user.id %}"><strong>{{ user.username }}</strong></a> <a href="{% url 'account' user.id %}"><strong>{{ user.username }}</strong></a>
<a data-toggle="modal" href="#editUser{{ user.id }}" class="pull-right" title="{% trans "Edit" %}"> <a data-toggle="modal" href="#editUser{{ user.id }}" class="pull-right" title="{% trans "Edit" %}">
<span class="glyphicon glyphicon-cog"></span> <span class="glyphicon glyphicon-cog"></span>
</a> </a>

View file

@ -16,11 +16,11 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> {{ request.user.username }} <b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> {{ request.user.username }} <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<a href="#"><i class="fa fa-fw fa-user"></i> Profile</a> <a href="{% url 'profile' %}"><i class="fa fa-fw fa-user"></i> Profile</a>
</li> </li>
<li class="divider"></li> <li class="divider"></li>
<li> <li>
<a href="#"><i class="fa fa-fw fa-power-off"></i> Log Out</a> <a href="{% url 'logout' %}"><i class="fa fa-fw fa-power-off"></i> Log Out</a>
</li> </li>
</ul> </ul>
</li> </li>

20
templates/profile.html Normal file
View file

@ -0,0 +1,20 @@
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "Logs" %}{% endblock %}
{% block content %}
<!-- Page Heading -->
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">{% trans "Profile" %}</h1>
</div>
</div>
<!-- /.row -->
{% include 'errors_block.html' %}
<div class="row">
<div class="col-lg-12">
</div>
</div>
{% endblock %}

View file

@ -37,8 +37,8 @@
{% for log in logs %} {% for log in logs %}
<tr> <tr>
<td>{{ forloop.counter }}</td> <td>{{ forloop.counter }}</td>
<td><a href="{% url 'user' log.user.id %}">{{ log.user }}</a></td> <td><a href="{% url 'account' log.user.id %}">{{ log.user }}</a></td>
<td><a href="{% url 'instance' log.instance.compute.id log.instanceg %}">{{ log.instance }}</a></td> <td><a href="{% url 'instance' log.instance.compute.id log.instance %}">{{ log.instance }}</a></td>
<td>{{ log.message }}</td> <td>{{ log.message }}</td>
<td style="width:120px;">{{ log.date|date:"M d H:i:s" }}</td> <td style="width:120px;">{{ log.date|date:"M d H:i:s" }}</td>
</tr> </tr>

View file

@ -10,8 +10,8 @@
<li {% class_active request "^/compute" %}{% class_active request "^/create" %}> <li {% class_active request "^/compute" %}{% class_active request "^/create" %}>
<a href="{% url 'computes' %}"><i class="fa fa-fw fa-tasks"></i> {% trans "Computes" %}</a> <a href="{% url 'computes' %}"><i class="fa fa-fw fa-tasks"></i> {% trans "Computes" %}</a>
</li> </li>
<li {% class_active request "^/user" %}> <li {% class_active request "^/account" %}>
<a href="{% url 'users' %}"><i class="fa fa-fw fa-users"></i> {% trans "Users" %}</a> <a href="{% url 'accounts' %}"><i class="fa fa-fw fa-users"></i> {% trans "Users" %}</a>
</li> </li>
<li {% class_active request "^/log" %}> <li {% class_active request "^/log" %}>
<a href="{% url 'showlogs' %}"><i class="fa fa-fw fa-list-alt"></i> {% trans "Logs" %}</a> <a href="{% url 'showlogs' %}"><i class="fa fa-fw fa-list-alt"></i> {% trans "Logs" %}</a>

View file

@ -23,7 +23,7 @@ INSTALLED_APPS = (
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'computes', 'computes',
'instances', 'instances',
'users', 'accounts',
'create', 'create',
'logs', 'logs',
) )

View file

@ -2,11 +2,11 @@ from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'), url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}, name='login'),
url(r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}, name='logout'), url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'}, name='logout'),
url(r'^accounts/profile/$', 'accounts.views.profile', name='profile'),
url(r'^login/$', 'django.contrib.auth.views.login'), url(r'^accounts/$', 'accounts.views.accounts', name='accounts'),
url(r'^logout/$', 'django.contrib.auth.views.logout'), url(r'^accounts/profile/(\d+)/$', 'accounts.views.account', name='account'),
url(r'^$', 'instances.views.index', name='index'), url(r'^$', 'instances.views.index', name='index'),
url(r'^instances$', 'instances.views.instances', name='instances'), url(r'^instances$', 'instances.views.instances', name='instances'),
@ -26,8 +26,7 @@ urlpatterns = patterns('',
url(r'^compute/secret/(\d+)/$', 'secrets.views.secrets', name='secrets'), url(r'^compute/secret/(\d+)/$', 'secrets.views.secrets', name='secrets'),
url(r'^users/$', 'users.views.users', name='users'),
url(r'^user/(\d+)/$', 'users.views.user', name='user'),
url(r'^console/$', 'console.views.console', name='console'), url(r'^console/$', 'console.views.console', name='console'),
url(r'^create/(\d+)/$', 'create.views.create_instance', name='create_instance'), url(r'^create/(\d+)/$', 'create.views.create_instance', name='create_instance'),