x/tuskar-ui
Code Issues Proposed changes

finishing up styling of swift interface

Browse Source
This commit is contained in:
Jake Dahn 2011-07-19 14:42:41 -07:00
parent 0a46c215a3
commit d5fcb2dee7
9 changed files with 78 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django-openstack/django_openstack/dash/views/containers.py
View File

@ -62,7 +62,7 @@ class CreateContainer(forms.SelfHandlingForm):
def handle(self, request, data):
api.swift_create_container(data['name'])
messages.success(request, "Container was successfully created.")
return shortcuts.redirect(request.build_absolute_uri())
return shortcuts.redirect("dash_containers", request.user.tenant)
@login_required

2
openstack-dashboard/dashboard/templates/_delete_container.html
View File

@ -1,4 +1,4 @@
<form id="form_delete_{{container.name}}" class="form-delete" method="post">
<form id="form_delete_{{container.name}}" action="." class="form-delete" method="post">
{% csrf_token %}
{% for hidden in form.hidden_fields %}
{{hidden}}

2
openstack-dashboard/dashboard/templates/_delete_object.html
View File

@ -1,4 +1,4 @@
<form id="form_delete_{{ object.name }}" class="form-delete" method="post">
<form id="form_delete_{{ object.name }}" class="form-delete" action="." method="post">
{% csrf_token %}
{% for hidden in form.hidden_fields %}
{{hidden}}

2
openstack-dashboard/dashboard/templates/_object_list.html
View File

@ -1,4 +1,4 @@
<table id="objects" style="width: 100%">
<table id="objects" class="wide">
<tr>
<th>Name</th>
<th style="width: 100px;">Actions</th>

1
openstack-dashboard/dashboard/templates/dash_containers_create.html
View File

@ -14,7 +14,6 @@
<div class="dash_block">
<div class="left">
{% include '_container_form.html' with form=create_form %}
<h3><a href="{% url dash_containers request.user.tenant %}">&lt;&lt; Return to containers list</a></h3>
</div>
<div class="right">

42
openstack-dashboard/dashboard/templates/dash_object_copy.html
View File

@ -6,31 +6,27 @@
{% endwith %}
{% endblock %}
{% block main %}
<div id='page_header'>
<h2><span>Object Store:</span> Objects</h2>
<p class='desc'><span>&mdash;</span> Copy an object.</p>
</div>
{% block page_header %}
{% include "_page_header.html" with title="Copy Object" %}
{% endblock page_header %}
{% include "_messages.html" %}
{% block dash_main %}
<h3 class="container_name"><span>Container:</span> {{container_name}}</h3>
<div class="container-label">Container:</div>
<div class="container-name">{{ container_name }}</div>
<div style="clear: both;"></div>
<div class="main_content">
<div class="dash_block wide form">
<div class='title_block'>
<h3>Copy {{ object_name }}</h3>
</div>
<div class="left">
{% include '_copy_object.html' with form=copy_form greeting="HI" %}
<h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
</div>
<div class="right">
<h3>Description:</h3>
<p>You may make a new copy of an existing object to store in this or another container.</p>
</div>
<div class="dash_block wide form">
<div class="left">
<h3>Copy Object: '{{object_name}}'</h3>
{% include '_copy_object.html' with form=copy_form greeting="HI" %}
<h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
</div>
<div class="right">
<h3>Description:</h3>
<p>You may make a new copy of an existing object to store in this or another container.</p>
</div>
<div class="clear">&nbsp;</div>
</div>
{% endblock %}

39
openstack-dashboard/dashboard/templates/dash_objects.html
View File

@ -6,28 +6,23 @@
{% endwith %}
{% endblock %}
{% block main %}
<div id='page_header'>
<h2><span>Object Store:</span> Objects</h2>
<p class='desc'><span>&mdash;</span> Manage Objects.</p>
</div>
{% include "_messages.html" %}
<div class="container-label">Container:</div>
<div class="container-name">{{ container_name }}</div>
<div style="clear: both;"></div>
<div class='main_content'>
{% if objects %}
<div class='table_title wide'>
<h3>Objects</h3>
<div class='filter'>
{% include '_object_filter.html' with form=filter_form %}
</div>
</div>
{% block page_header %}
{% url dash_objects tenant_id container_name as refresh_link %}
{# to make searchable false, just remove it from the include statement #}
{% include "_page_header.html" with title="Objects" refresh_link=refresh_link searchable="true" %}
{% endblock page_header %}
{% include '_object_list.html' %}
{% block dash_main %}
<h3 class="container_name"><span>Container:</span> {{ container_name }}</h3>
{% if objects %}
{% include '_object_list.html' %}
{% else %}
<div class="message_box info">
<h2>Info</h2>
<p>There are currently no objects in the container {{container_name}}. You can upload a new object from the <a href='{% url dash_objects_upload request.user.tenant container_name %}'>Object Upload Page &gt;&gt;</a></p>
</div>
{% endif %}
<a class="action_link large-rounded" href="{% url dash_objects_upload request.user.tenant container_name %}">Upload New Object &gt;&gt;</a>
{% endif %}
<a href="{% url dash_objects_upload request.user.tenant container_name %}">Upload New Object &gt;&gt;</a>
</div>
{% endblock %}

40
openstack-dashboard/dashboard/templates/dash_objects_upload.html
View File

@ -6,31 +6,25 @@
{% endwith %}
{% endblock %}
{% block main %}
<div id='page_header'>
<h2><span>Object Store:</span> Objects</h2>
<p class='desc'><span>&mdash;</span> Upload an object.</p>
</div>
{% block page_header %}
{% include "_page_header.html" with title="Upload Objects" %}
{% endblock page_header %}
{% include "_messages.html" %}
{% block dash_main %}
<h3 class="container_name"><span>Container:</span> {{ container_name }}</h3>
<div class="container-label">Container:</div>
<div class="container-name">{{ container_name }}</div>
<div style="clear: both;"></div>
<div class="main_content">
<div class="dash_block wide form">
<div class='title_block'>
<h3>Upload Object</h3>
</div>
<div class="left">
{% include '_object_form.html' with form=upload_form %}
<h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
</div>
<div class="right">
<h3>Description:</h3>
<p>An object is the basic storage entity and any optional metadata that represents the files you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs.</p>
</div>
<div class="dash_block wide form">
<div class="left">
{% include '_object_form.html' with form=upload_form %}
<h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
</div>
<div class="right">
<h3>Description:</h3>
<p>An object is the basic storage entity and any optional metadata that represents the files you store in the OpenStack Object Storage system. When you upload data to OpenStack Object Storage, the data is stored as-is (no compression or encryption) and consists of a location (container), the object's name, and any metadata consisting of key/value pairs.</p>
</div>
<div class="clear">&nbsp;</div>
</div>
{% endblock %}

23
openstack-dashboard/media/dashboard/css/style.css
View File

@ -243,6 +243,7 @@ li.title h4{
color: #6a6a6a;
font: 18px;
margin: 30px 0 15px 0;
float: left;
}
#sidebar .sub_nav { width: 200px; }
@ -712,7 +713,6 @@ td#actions input[type="submit"]:hover { text-decoration: underline; }
input.example, textarea.example {color: #d9d9d9;}
.dash_block textarea { min-height: 150px; }
.dash_block form { float: left; }
.dash_block label {
width: 100%;
margin: 0 0 5px 0;
@ -761,7 +761,7 @@ input:focus, textarea:focus {
margin: 10px 0 10px 0;
}
.dash_block .left h3 {
.dash_block .left h3.success {
color: green;
padding: 20px 20px 20px 20px;
}
@ -857,3 +857,22 @@ input[readonly="readonly"] {
clear: both;
}
#alternate_links a:hover { color: #989898; }
/* Containers */
h3.container_name {
font-size: 24px;
margin: 0 0 25px 0 ;
}
h3 span, .left h3 { color: #6a6a6a; }
.left h3 {
font-size: 18px;
margin: 0 0 15px 0;
}
.left h3 a {
margin: 25px 0 0 0;
float: left;
}