openstack
/
horizon
Code Issues Proposed changes

revise settings doc with Font Awesome reference 

also, fix some old icon references

Change-Id: I31d6f0b1bad917f2a24c6b1791b6b378ee3b83b1
Closes-Bug: #1409184
This commit is contained in:
Cindy Lu 2015-01-20 15:50:20 -08:00
parent d027413351
commit 294a60e9ff
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/topics/settings.rst
View File

@ -375,8 +375,8 @@ the entire list.
Default: ``None``
A list of dictionaries to add optional categories to the image filters
in the Images & Snapshots panel, based on project ownership.
A list of dictionaries to add optional categories to the image fixed filters
in the Images panel, based on project ownership.
Each dictionary should contain a `tenant` attribute with the project
id, and optionally a `text` attribute specifying the category name, and
@ -385,6 +385,12 @@ icon names are based on the default icon theme provided by Bootstrap.
Example: ``[{'text': 'Official', 'tenant': '27d0058849da47c896d205e2fc25a5e8', 'icon': 'icon-ok'}]``
.. note::
Since the Kilo release, the Bootstrap icon library (e.g. 'icon-ok') has
been replaced with Font Awesome (e.g. 'fa-check').
``IMAGE_RESERVED_CUSTOM_PROPERTIES``
------------------------------------

2
openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/resource_types.html
View File

@ -19,7 +19,7 @@
placeholder="{% trans "Filter" %}"
name="resource_type_filter" ng-model="searchResource"
ng-change="filter_changed()"/>
<span class="glyphicon glyphicon-search form-control-feedback"></span>
<span class="fa fa-search form-control-feedback"></span>
</div>
</div>
</div>

2
openstack_dashboard/dashboards/project/images/images/tests.py
View File

@ -318,7 +318,7 @@ class OwnerFilterTests(test.TestCase):
@override_settings(IMAGES_LIST_FILTER_TENANTS=[{'name': 'Official',
'tenant': 'officialtenant',
'icon': 'icon-ok'}])
'icon': 'fa-check'}])
def test_filter(self):
self.mox.ReplayAll()
all_images = self.images.list()