Commit Graph

36 Commits

Author SHA1 Message Date
Akihiro Motoki eac3e7032a Drop Heat related code from horizon
Orchestration tab in the admin info panel needs a discussion.
It seems not to be covered by heat-dashboard yet.

blueprint heat-dashboard-split-out

Change-Id: I56e6edb1f2ac72e2f42d0e9f3291308e67f24cad
2017-12-05 07:38:55 +00:00
wei.ying fa3528933c Delete instance,volume,etc confirmation is missing name or ID
If click the name link and go into the details page for the instance, volume, etc.
And attempt to delete. It will pop up a message, but omit the name/id.
Need to add the property of 'data-display' in detail page.

Change-Id: I9c1966dc7942a27903237e2786edbcd2fbd936ea
Closes-Bug: #1680329
2017-04-07 22:58:50 +00:00
Rob Cresswell 560f23a1c9 Add default common template to python table views
Many of the Python table views are using identical (or nearly identical)
table templates. This patch adds a common template and makes it the
default for a DataTableView, which allows us to remove many similar
templates and redundant lines of code.

Change-Id: I1e4e15e695ee1f21f4d44f141a854e30f1e567a1
Closes-Bug: 1653986
2017-01-05 08:59:35 +00:00
Rob Cresswell fd92d8ec59 Fix remaining Django 1.9 test failures
This patch gets Horizon to a passing state in the Django 1.9 tests

Co-Authored-By: Itxaka <iserrano@redhat.com>
Co-Authored-By: Timur Sufiev <tsufiev@mirantis.com>
Change-Id: Icbc1a3c039de658faa9fba4a2cdd5027345fe94d
Partially-Implements: blueprint drop-dj17
2016-04-09 11:13:16 +00:00
Diana Whitten 2e793aa2dd Branding: Workflow cancel btn should be themable
Cancel buttons are quite hard coded in their styles, and most templates
are overriding the default modal-footer template.

This patch removes most of the straight duplications in the
modal-footer.

Co-Authored-By: Rob Cresswell <robert.cresswell@outlook.com>
Closes-bug: #1551455
Change-Id: I496381e3f512856ad37619108b45af3c1da800a5
2016-03-14 12:48:11 -07:00
Lucas Palm 52d936efac Fixed the width of the stack template detail box
On the "Template" tab of the Stack details page (Project --> Orchestration
--> Stacks --> Stack Details), the gray box that surrounds the template text
is just a bit too wide. The edges extend right up to the side of the enclosing
<div> element, making it look bad.

To fix this, the "status" and "row" classes were removed from the parent div
element.  The "Stack Template" header was also removed from the page because it is
redundant inside a tab that already implies that it is the stack's template.

Change-Id: Ic8b17caf947534b0ac13e06b221a0d48802fb563
Closes-Bug: #1533366
2016-01-14 15:42:04 +00:00
eric d69fe09bc7 Correcting heat resource drill down
Previous commit broken heat resource drill down:
f38ddf2032 (diff-15e3003726d7b90816528ee8248b000f)

This patch fixes the ID attribute, correctly specifies the template,
alters the page to match other detail page styles, and adds a UT to
prevent regression.

Change-Id: Ie3f76d6666f4e3154fbcb5808c8f8b841e650a02
Co-Authored-By: Rob Cresswell <robert.cresswell@outlook.com>
Closes-bug: #1531341
2016-01-07 14:42:29 -07:00
Rob Cresswell f2b2289b4a Drop Django 1.7 support
Django 1.7 support ends in December 2015
(https://www.djangoproject.com/download/#supported-versions), so it
will not be supported by Mitaka release.

This patch removes many of the deprecation warnings:-

`RedirectView.permanent` change:
https://docs.djangoproject.com/en/1.8/ref/class-based-views/base/

`url` change:
https://docs.djangoproject.com/en/1.8/internals/deprecation/
See version 1.5 notes for the url and ssi template tag change

`django.forms.utils` change:
https://docs.djangoproject.com/en/1.8/internals/deprecation/
See version 1.9 notes

`firstof` change:
https://docs.djangoproject.com/en/1.8/internals/deprecation/
See version 1.8 notes for cycle and firstof template tags

Change-Id: If546c087e73d189daa92e5bd63f0533fcf19089f
Partially-Implements: blueprint drop-dj17
2015-11-16 11:55:38 +00:00
Rob Cresswell f38ddf2032 Add breadcrumb to more details pages
This patch adds basic Breadcrumb nav to the detail pages for Data
Processing, Databases, Metadata Definitions and Routers.

Change-Id: I114e93799b957db39cbe0d4e49d3e6869bc9d92d
Partial-Bug: 1413823
2015-11-09 20:55:12 +00:00
Masco Kaliyamoorthy 453ac5254c Wrong url in stack preview detail page
In stack preview detail page, cancel button
redirecting to access and security table.

Change-Id: I50729b4dfd263e6380883c31be1d170b3efa5669
Closes-Bug: #1507515
2015-10-19 15:18:09 +05:30
Jenkins 9d744a4725 Merge "Clean modal forms in Orchestration Stacks" 2015-03-17 03:15:23 +00:00
Tatiana Ovchinnikova 1281fdd033 Clean modal forms in Orchestration Stacks
Refactoring orchestration stacks modals.
Based on merged patch: https://review.openstack.org/#/c/123472/

Partially-Implements: blueprint form-template-to-view

Change-Id: I59e4b0fd0d9acc0f2d40f1a384a1ff2ebbd7536d
2015-03-13 22:58:04 +03:00
Tatiana Ovchinnikova cab3912b69 Add "Preview Stack" action to Stacks table
This patch set adds "Preview Stack" button to Stacks table
to provide user with a possibility to preview stack without
creating it, as it is already implemented in CLI.

Partially implements blueprint: heat-ui-improvement

Change-Id: Idf92deb57f8213a403f102db467828087d91e79a
2015-03-13 15:35:47 +03:00
liyingjun 69d25c4ca3 Always show stack status reason in topology
Currently, only when the stack is in error status, the stack status
reason will be displayed, otherwise, there will be two line with
exactly same words, and this makes the enduser confuse. So fixes
this by changing to not show anything when stack in not in error
status.

Change-Id: Ifcd8def6b452ecccef9a8daa0e31504cffa2d6ad
Closes-bug: #1428580
2015-03-09 16:52:06 +08:00
Sam Betts 4e9c0c480f Reduce page title duplication in Stacks
Patch https://review.openstack.org/#/c/142802 adds a method of
reducing duplication of page title logic, this patch applies that change
to the project stacks views.

Change-Id: Icff6df155983adeedec59d3aacdd4a0b685cf9a3
Partial-Bug: 1413749
2015-02-11 16:37:20 +00:00
Sam Betts 1934a7eaa8 Reduced code duplication in creating page headers
The same line of code to add a page title to a template was repeated in
many templates, this patch moves that line into the base.html, and also
tries to standardize the way page titles are defined in the python.

Change-Id: I11367d3007ebae727ba45446076a31307d477995
Closes-Bug: 1399840
2015-02-11 10:45:23 +00:00
Christian Berendt 31f7f50ff1 Unify the syntax used for the {% ... %} delimter in Jinja2 templates
According to the Jinja2 documentation the preferred usage for
the syntax of the {% ... %} delimter is {% ... %}. This patch
changes all occurcens of {%... and ...%} to {% ... %}.

Change-Id: I49243a16b71237bea47bc29f11508e16e77e3621
2015-01-19 20:58:15 +01:00
Aaron Sahlin 4395851050 Fixed display issues on Details Page caused by bootstrap 3 update
Per UX suggestion applied Bootstrap 'dl-horizontal' styling plus
added css to left justify the labels on the details page.  Also
addeds col-sm-12 div inside all row divs in detail views, to achieve
proper bootstrap grid usage.

Closes-bug: #1349602
Change-Id: I337150c7a8c90cc838fac8cb89a552a0566789e3
2015-01-05 20:34:44 +00:00
nikunj2512 129614b0b7 Fixes Inconsistent usage of Detail / Details
This patch changes all the instances of "Detail" to "Details"

Change-Id: If593f248fc4efc4df7296e27c991241c4bdd5260
Closes-bug: #1396080
2014-12-11 21:22:18 +05:30
Doug Fish de20d7271a Create titles without concatenation
Several panels use the template filter "add" to concatenate data
and translatable text, for example
title=_("Volume Details: ")|add:volume.name|default:_("Volume Details:")

These need to be updated to use string formatting.  This is needed
because it's not clear when looking at the translations if any text
follows the translatable segment.  Dict based substitution has been
used to further clarify the messages for translators.

Change-Id: I54d07233d2003904468ef317c352126eb6bf5f70
Closes-bug: #1394573
2014-12-02 07:09:26 -06:00
Kahou Lei 520c29cdf0 place the word "Info" with "Information"
Update necessary html files.
Test it on GUI and unit tests passed

Change-Id: Ic1d66a68c9de45c52884109e360917c1eefbfac8
Closes-Bug: 1394315
2014-11-21 00:12:48 +00:00
Tatiana Ovchinnikova b6d5a749f1 'Stack Template' tab for Heat Stack Details page
Once you launch a stack from any template source (using raw data
or template file), there is no possibility to check this template
later from Horizon. This patch set adds 'Stack Template' tab to
Stack Details page.

Partially implements blueprint: heat-ui-improvement

Change-Id: I27fb687829f9c060ea55d81bcc0344a6e782da06
2014-11-11 10:56:52 +03:00
Gloria Gu 1b4b38aef2 fixed errors when run_tests.sh --makemessages
The change Ibf2036d5bbc4c478fcb912f6335104356e8f1317 causes
run_tests.sh --makemessages failure. Make the errors go way.

Closes-Bug: #1379054
Change-Id: I66b68099561bdd451321c7c31391f30827121e7c
2014-10-09 09:12:42 -07:00
Akihiro Motoki 637b3d59b9 Revert file permissions changed unexpectedly
commit a1e770dc10 changed the file
permissions from 644 to 755, but it is completely unnecessary
as they are template files.

Change-Id: Iab872ec9c56d204b3cccc63ec8852b210b8efcdf
2014-10-09 03:43:18 +09:00
Aaron Sahlin a1e770dc10 Add ':' inside translatable (Part 2 of 2)
Punctuation needs to be included in translation since punctuation differs
depending on the language.  Along with moving ':' also replaced &nbsp; with
blank space insde trans or transblock tag.The initial review grew too large,
so this patch has been broken into 2 reviews.  Part 2 will cover the files in
openstack_dashboard/dashboard/project while Part 1 coverered the rest.

Change-Id: Ibf2036d5bbc4c478fcb912f6335104356e8f1317
Partially-Closes-Bug: #1369445
2014-10-07 15:34:22 +00:00
Jenkins 05b853dd21 Merge "show correct link to compute instances in stack resource overview tab" 2014-10-07 08:47:08 +00:00
Miguel Grinberg e8f5dc442c show correct link to compute instances in stack resource overview tab
There are two related fixes in the stacks resource overview page.
First, any resource types for which horizon does not have a link for
were getting a URL of "None" in the uuid field, and with this
change the link is suppressed if it is None. The second part involves
adding compute resources to the resource mappings, so that the uuid
field for those links to the instance detail page.

Change-Id: Ib8d51b49ac51092a3d7db6d889f4427167e5adb0
Closes-Bug: 1322162
2014-08-21 23:12:21 +00:00
Ashish Chandra 80d05a5c3d Improve help messages on modals
Some general guidelines:
1. Removed contractions
2. Changed "Info" to "Information"
3. Removed the "From here you can..." at the beginning of messages.
4. Explained concepts to users instead of just reiterating the modal
title. Thanks Jeff Calcaterra!

Co-Authored-By: Cindy Lu <clu@us.ibm.com>
Closes-Bug: #1329984

Change-Id: I35af81953cafcbafc28c31b3ce305e8c5e21fe84
2014-08-27 16:12:18 -07:00
Jiri Tomasek 92146772b6 Update Twitter Bootstrap to version 3
Updated to bootstrap 3.2.0
back to v3.1.1
fix base-line-height variable
Revamped grid system
Replaced help-inline with help-block
Change .control-group to .form-group
Add column widths to horizontal form labels and .controls, remove .controls class
Datepicker form fix
Add btn-default to btn elements with no other color
Topbar switcher fix
Rename button sizes
Replace alert-error with alert-danger
Removed alert-block
Alerts fixing
Updated LinkAction and Action table actions to define icon, replaced btn-default icon with glyphicon
Replaced icons with glyphicons, removed btn-icon styling from horizon.scss
change Button Icons text in customizing docs
Fixed table header
Fix page_header h2 margin
Nav accordion fix
Tables fix
Modal fixes
added form-control class to input and selects
Forms fixes
Workflow modal fix
Fix quota bar
updated customizing docs
removed unused styling from horizon.scss
make datepicker form inline
fix table filter styling
added btn-danger to terminate instances button
fixed loading spinner
form fields and validations
Created bootstrap_form_field filter and template to render bootstrap forms properly
Style up the datepicker
Fixed failing test cases

Implements: blueprint bootstrap-update

Change-Id: Ic826849be1af7fc6bf06f97dd7a60fc54b862148
2014-07-28 16:13:21 +02:00
CristianFiorentino 198dba6a2d Introduces escaping in Horizon/Orchestration
1) Escape help_text a second time to avoid bootstrap tooltip XSS issue

The "Description" parameter in a Heat template is used to populate
a help_text tooltip in the dynamically generated Heat form. Bootstrap
inserts this tooltip into the DOM using .html() which undoes any
escaping we do in Django (it should be using .text()).

This was fixed by forcing the help_text content to be escaped a second
time. The issue itself is mitigated in bootstrap.js release 2.0.3
(ours is currently 2.0.1).

2) Properly escape untrusted Heat template 'outputs'

The 'outputs' parameter in a Heat template was included in a Django
template with HTML autoescaping turned off. Malicious HTML content
could be included in a Heat template and would be rendered by Horizon
when details about a created stack were displayed.

This was fixed by not disabling autoescaping and explicitly escaping
untrusted values in any strings that are later marked "safe" to render
without further escaping.

Change-Id: Icd9f9d9ca77068b12227d77469773a325c840001
Closes-Bug: #1289033
Co-Authored-By: Kieran Spear <kispear@gmail.com>
2014-04-09 00:29:56 +09:00
Julie Pichon ff7049432b Handle "null" time values for Stacks
The timesince filter expects a date or datetime object, and would fail
when receiving an empty string. Create a new filter that returns the
string value "Never" under these circumstances.

Change-Id: I73f4dbb608fc143c3ac60d753e9e222762579e51
Closes-Bug: #1286959
2014-03-26 12:00:53 +00:00
Jordan OMara 7a66585e53 Adding resource link to resource detail page in Heat view
Change-Id: I155d0eec5d46be5df1c7d9ea090de39e56fe6c7d
Implements: blueprint heat-stack-detail-resources-column
2014-03-06 17:25:45 -05:00
Jordan OMara 015aff2630 Heat Stack update view/form
2 Part view for updating Heat Templates. The first page allows you to
select a new template for your stack. The second allows you to set new
template parameters for your stack. Like the launch stack workflow, this
is not a horizon workflow, but two separate forms.

Implements: blueprint heat-stack-update

Change-Id: I2854e9e4bb578be5187ef962808b93f11ac6b1f1
2014-03-04 12:06:31 -05:00
Steve Baker c208701f58 Rename heat logical_resource_id to resource_name
This attribute has been renamed in the heat API.

Fixes bug: 1216903

Change-Id: Ia29c0d1a7af8988cf69094bdfbdd7f439078dc7e
2013-08-27 14:13:56 +12:00
Tim Schnell 8914ed95fc Adding Heat Resource Topology to Horizon
Change-Id: Ie9f2040850df3d7f1fcefe68430e9103c972f80f
Implements: blueprint heat-ui-resource-topology
2013-07-16 18:33:11 -05:00
Steve Baker 1f71152b4b Implementation of a Heat stacks UI.
This change implements a UI to launch, manage and delete Heat stacks.

The launch screens are implemented with a set of chained forms where
the second form is dynamically built from the template in the first step.

A significant portion of this change was derived from
the work Dan Radez <dradez@redhat.com> did on thermal:
https://github.com/steveb/heat-horizon

UX flow revisions and basic test cases by Gabriel Hurley.

Implements blueprint: heat-ui

Change-Id: I294e93bed6da9dd3553e8b4a6a1c09b7c165a555
2013-07-03 03:48:31 -07:00