diff --git a/django-openstack/django_openstack/auth/views.py b/django-openstack/django_openstack/auth/views.py index cad64106b..72ba285fe 100644 --- a/django-openstack/django_openstack/auth/views.py +++ b/django-openstack/django_openstack/auth/views.py @@ -50,7 +50,7 @@ def login(request): if handled: return handled - return shortcuts.render_to_response('login_required.html', { + return shortcuts.render_to_response('splash.html', { 'form': form, }, context_instance=template.RequestContext(request)) diff --git a/django-openstack/django_openstack/syspanel/views/users.py b/django-openstack/django_openstack/syspanel/views/users.py index 31b3595ea..0ae1380d8 100644 --- a/django-openstack/django_openstack/syspanel/views/users.py +++ b/django-openstack/django_openstack/syspanel/views/users.py @@ -39,7 +39,7 @@ class UserDeleteForm(forms.SelfHandlingForm): def handle(self, request, data): user_id = data['user'] api.user_delete(request, user_id) - messages.success(request, + messages.info(request, '%s was successfully deleted.' % user_id) return redirect(request.build_absolute_uri()) diff --git a/openstack-dashboard/dashboard/templates/_user_form.html b/openstack-dashboard/dashboard/templates/_user_form.html index b0534ccd8..68b1882c7 100644 --- a/openstack-dashboard/dashboard/templates/_user_form.html +++ b/openstack-dashboard/dashboard/templates/_user_form.html @@ -6,5 +6,5 @@ {{ field.errors }} {{ field }} {% endfor %} - + diff --git a/openstack-dashboard/media/dashboard/css/style.css b/openstack-dashboard/media/dashboard/css/style.css index c25be10a4..deb944ce6 100644 --- a/openstack-dashboard/media/dashboard/css/style.css +++ b/openstack-dashboard/media/dashboard/css/style.css @@ -1,3 +1,5 @@ +/* @override http://looce.com:8080/media/dashboard/css/style.css */ + @import url("reset.css"); @font-face { @@ -216,6 +218,17 @@ border: 1px solid #cbe0e8; -webkit-box-shadow: 0 0 10px rgba(0,0,0,0.2); } +#standalone #login_wrapper .status_box { + width: 335px; + margin: 0; + margin-bottom: 25px; +} +#standalone #login_wrapper h2 { + min-width: 65px; +} +#standalone #login_wrapper p { + width: 183px; +} .clear { clear: both; } @@ -370,7 +383,7 @@ input[readonly="readonly"] { padding-right: 21px; } -.search input[type="text"], .dash_block form input[type="text"], .dash_block form textarea{ +.search input[type="text"], .dash_block form input[type="text"], .dash_block form input[type="password"], .dash_block form textarea{ margin-left: -1px; border: 1px solid #ccc; height: 31px; @@ -385,7 +398,7 @@ input[readonly="readonly"] { margin-bottom: 15px; } -.search input[type="text"]:focus, .modal_window input:focus, .modal_window textarea:focus, .dash_block form input[type="text"]:focus { +.search input[type="text"]:focus, .modal_window input:focus, .modal_window textarea:focus, .dash_block form input[type="text"]:focus, .dash_block form input[type="password"]:focus { outline: none; box-shadow:0 0 3px #41bad4; -moz-box-shadow:0 0 3px #41bad4; @@ -1029,8 +1042,8 @@ ol li.first a { margin-bottom: 5px; } -.dash_block form input[type="text"] { - width: 284px; +.dash_block form input[type="text"],.dash_block form input[type="password"] { + width: 309px; } .modal_window .continue_link, .dash_block form input[type="submit"], .dash_block a.more { diff --git a/openstack-dashboard/media/dashboard/js/form_examples.js b/openstack-dashboard/media/dashboard/js/form_examples.js index 8b1e5866c..59de48a02 100644 --- a/openstack-dashboard/media/dashboard/js/form_examples.js +++ b/openstack-dashboard/media/dashboard/js/form_examples.js @@ -25,6 +25,11 @@ $(function(){ $("#tenant_form input#id__id").example("YetAnotherTenant"); $("#tenant_form textarea#id_description").example("One or two sentence description."); +// update/create tenant + $("#user_form input#id_id").example("username"); + $("#user_form input#id_email").example("email@example.com"); + $("#user_form input#id_password").example("password"); + // table search box $("input#table_search").example("Search...") }) \ No newline at end of file