Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

GUI-466 case consistency for groups and policy gen tool #250

Merged
merged 4 commits into from

2 participants

This page is out of date. Refresh to see the latest.
View
6 koala/templates/groups/group_view.pt
@@ -10,7 +10,7 @@
ng-app="GroupPage" ng-controller="GroupPageCtrl" ng-init="initController(${group_users}, ${all_users})">
<metal:breadcrumbs metal:use-macro="layout.global_macros['breadcrumbs']">
<metal:crumbs metal:fill-slot="crumbs">
- <li><a href="${request.route_url('groups')}" i18n:translate="">IAM Groups</a></li>
+ <li><a href="${request.route_url('groups')}" i18n:translate="">IAM groups</a></li>
<li class="current">
<a tal:condition="group" href="#" ng-non-bindable="">${group.group_name}</a>
<a tal:condition="not group and group_route_id == 'new'" i18n:translate="">Create new group</a>
@@ -21,7 +21,7 @@
<metal:block metal:use-macro="layout.global_macros['notifications']" />
<div id="viewpage-title" class="large-12 columns">
- <span tal:condition="group"><h4 i18n:translate="">Detail for Group ${group.group_name}</h4></span>
+ <span tal:condition="group"><h4 i18n:translate="">Details for group ${group.group_name}</h4></span>
<span tal:condition="not group and group_route_id == 'new'"><h4 i18n:translate="">Create new group</h4></span>
</div>
@@ -115,7 +115,7 @@
<div class="row controls-wrapper readonly">
<div class="columns">
<button type="submit" class="button" id="save-changes-btn">
- <span tal:condition="group" i18n:translate="">Save changes</span>
+ <span tal:condition="group" i18n:translate="">Save Changes</span>
</button>
<a href="${request.route_url('groups')}"
class="cancel-link" i18n:translate="">Cancel</a>
View
21 koala/templates/groups/groups.pt
@@ -9,7 +9,7 @@
ng-init="initController('groups', '${initial_sort_key}', '${json_items_endpoint}')">
<metal:breadcrumbs metal:use-macro="layout.global_macros['breadcrumbs']">
<metal:crumbs metal:fill-slot="crumbs">
- <li class="current"><a href="#" i18n:translate="">IAM Groups</a></li>
+ <li class="current"><a href="#" i18n:translate="">IAM groups</a></li>
</metal:crumbs>
</metal:breadcrumbs>
<!-- Notifications -->
@@ -21,12 +21,12 @@
<div metal:use-macro="layout.global_macros['landing_page_datagrid']">
<div metal:fill-slot="new_button">
<a class="button" i18n:translate="" id="add-group-btn"
- href="${request.route_url('group_view', name='new')}">Create group</a>
+ href="${request.route_url('group_view', name='new')}">Create Group</a>
</div>
<div metal:fill-slot="tile_dropdown_button" tal:omit-tag="">
<a class="tiny secondary button dropdown right"><i class="fi-widget"></i></a>
<ul id="item-dropdown_{{ item.id }}" class="f-dropdown">
- <li><a i18n:translate="" ng-href="${prefix}/{{ item.group_name }}">Edit properties</a></li>
+ <li><a i18n:translate="" ng-href="${prefix}/{{ item.group_name }}">View details</a></li>
<li><a i18n:translate="" ng-click="revealModal('delete', item)">Delete</a></li>
</ul>
</div>
@@ -39,7 +39,7 @@
<a ng-click="linkGroup(item, '#group-users')">{{ item.user_count }}</a>
</div>
<div ng-show='item.policy_count > 0'>
- <span class="label" title="Policies" i18n:attributes="title" data-tooltip="">PE</span>
+ <span class="label" title="Permissions" i18n:attributes="title" data-tooltip="">PE</span>
<a ng-click="linkGroup(item, '#policy-list')">{{ item.policy_count }}</a>
</div>
</div>
@@ -61,7 +61,7 @@
<span class="actions">
<a class="tiny secondary button dropdown round"><i class="fi-widget"></i></a>
<ul id="item-dropdown_{{ item.id }}" class="f-dropdown">
- <li><a i18n:translate="" ng-href="${prefix}/{{ item.group_name }}">Edit properties</a></li>
+ <li><a i18n:translate="" ng-href="${prefix}/{{ item.group_name }}">View details</a></li>
<li>
<a i18n:translate="" ng-click="revealModal('delete', item)">Delete</a>
</li>
@@ -70,16 +70,9 @@
</td>
</metal:block>
</div>
- <div id="help-modal" class="reveal-modal medium" data-reveal="">
- <h3 i18n:translate="">Help</h3>
- <p>
- Need some content
- </p>
- <a class="close-reveal-modal">&#215;</a>
- </div>
<div id="group-dialogs">
<div id="delete-group-modal" class="reveal-modal small" data-reveal="">
- <h3 i18n:translate="">Delete Group</h3>
+ <h3 i18n:translate="">Delete group</h3>
<p>
<span i18n:translate="">Deleting a group also deletes all permissions associated with that group. Are you sure you want to delete group <strong>{{ group_name }}</strong></span>?
</p>
@@ -89,7 +82,7 @@
<div class="row">
<div class="small-4 columns">&nbsp;</div>
<div class="small-8 columns field inline">
- <input type="submit" class="button" value="Yes, delete" i18n:attributes="value" />
+ <input type="submit" class="button" value="Yes, Delete" i18n:attributes="value" />
</div>
</div>
</form>
View
6 koala/templates/panels/policy_list.pt
@@ -9,7 +9,7 @@
<div>
<div class="columns">
<a ng-href="${add_url}" class="button" id="add-policy-btn"
- title="Add policy" i18n:translate="">Add policy</a>
+ title="Add policy" i18n:translate="">Add Policy</a>
</div>
</div>
@@ -37,7 +37,7 @@
<div>&nbsp;</div>
<small id="json-error" class="error" style="display:none;" i18n:translate=""></small>
<button class="button" id="save-policy-btn" type="submit" i18n:translate="">
- Save changes
+ Save Changes
</button>
</form>
<a class="close-reveal-modal">&#215;</a>
@@ -52,7 +52,7 @@
<div class="row">
<div class="small-4 columns">&nbsp;</div>
<div class="small-8 columns field inline">
- <input type="submit" class="button" value="Yes, delete" i18n:attributes="value" />
+ <input type="submit" class="button" value="Yes, Delete" i18n:attributes="value" />
</div>
</div>
</form>
View
4 koala/templates/policies/iam_policy_wizard.pt
@@ -10,7 +10,7 @@
ng-init="initController(${controller_options})">
<metal:breadcrumbs metal:use-macro="layout.global_macros['breadcrumbs']">
<metal:crumbs metal:fill-slot="crumbs">
- <li class="current"><a href="#" i18n:translate="">Create IAM Policy</a></li>
+ <li class="current"><a href="#" i18n:translate="">Create IAM policy</a></li>
</metal:crumbs>
</metal:breadcrumbs>
<!-- Notifications -->
@@ -112,7 +112,7 @@
<div class="large-5 columns">
<!--! Preview Policy -->
<div id="policy-preview" ng-cloak="">
- <h6 class="title">View/Edit Policy</h6>
+ <h6 class="title">View/Edit policy</h6>
<form action="${request.route_url('iam_policy_create')}" id="iam-policy-form"
method="post" data-abide="abide" enctype="multipart/form-data">
${structure:create_form['csrf_token']}
View
40 koala/templates/policies/policy_generator.pt
@@ -97,7 +97,7 @@
Instance
</option>
<option value="vm_type" tal:condition="instance_condition">
- VM Type
+ VM type
</option>
<option value="image" tal:condition="image_condition">
Image
@@ -182,27 +182,21 @@
<div class="row">
<div class="small-6 columns">
<select class="condition-keys">
- <option value="AvailabilityZoneKey">AvailabilityZoneKey</option>
- <option value="EbsOptimizedKey">EbsOptimizedKey</option>
- <option value="InstanceProfileKey">InstanceProfileKey</option>
- <option value="InstanceTypeKey">InstanceTypeKey</option>
- <option value="PlacementGroupKey">PlacementGroupKey</option>
- <option value="RootDeviceTypeKey">RootDeviceTypeKey</option>
- <option value="TenancyKey">TenancyKey</option>
- <option value="RegionKey">RegionKey</option>
- <option value="TargetImageKey">TargetImageKey</option>
- <option value="ParentSnapshotKey">ParentSnapshotKey</option>
- <option value="VolumeIopsKey">VolumeIopsKey</option>
- <option value="VolumeSizeKey">VolumeSizeKey</option>
- <option value="VolumeTypeKey">VolumeTypeKey</option>
- <option value="VpcKey">VpcKey</option>
- <option value="ExpirationTime">ExpirationTime</option>
- <option value="KeepAlive">KeepAlive</option>
- <option value="MaxKeys">MaxKeys</option>
- <option value="CurrentTime">CurrentTime</option>
- <option value="ExternalIdKey">ExternalIdKey</option>
- <option value="QuotaKey">QuotaKey</option>
- <option value="SourceIp">SourceIp</option>
+ <option value="ec2:AvailabilityZone">Availability zone</option>
+ <option value="ec2:EbsOptimized">EBS optimized</option>
+ <option value="ec2:InstanceProfile">Instance profile</option>
+ <option value="ec2:InstanceType">Instance type</option>
+ <option value="ec2:PlacementGroup">Placement group</option>
+ <option value="ec2:RootDeviceType">Root device type</option>
+ <option value="ec2:Tenancy">Tenancy</option>
+ <option value="ec2:targetimage">Target image</option>
+ <option value="ec2:ParentSnapshot">Parent snapshot</option>
+ <option value="ec2:VolumeIops">Volume IOPS</option>
+ <option value="ec2:VolumeSize">Volume size</option>
+ <option value="ec2:VolumeType">Volume type</option>
+ <option value="ec2:CurrentTime">Current time</option>
+ <option value="ec2:ExternalId">External ID</option>
+ <option value="ec2:SourceIp">Source IP</option>
</select>
</div>
<div class="small-6 columns">
@@ -211,8 +205,6 @@
<option value="ArnNotEquals">ArnNotEquals</option>
<option value="ArnLike">ArnLike</option>
<option value="ArnNotLike">ArnNotLike</option>
- <option value="BinaryEquals">BinaryEquals</option>
- <option value="BinaryNotEquals">BinaryNotEquals</option>
<option value="StringEquals">StringEquals</option>
<option value="StringNotEquals">StringNotEquals</option>
<option value="StringEqualsIgnoreCase">StringEqualsIgnoreCase</option>
Something went wrong with that request. Please try again.