diff options
Diffstat (limited to '3rd_party/static/testapi-ui/components/guidelines')
3 files changed, 83 insertions, 162 deletions
diff --git a/3rd_party/static/testapi-ui/components/guidelines/guidelines.html b/3rd_party/static/testapi-ui/components/guidelines/guidelines.html index 6e138b8..5cf3cbd 100644 --- a/3rd_party/static/testapi-ui/components/guidelines/guidelines.html +++ b/3rd_party/static/testapi-ui/components/guidelines/guidelines.html @@ -2,55 +2,29 @@ <!-- Guideline Filters --> <div class="row"> - <div class="col-md-3"> - <strong>Version:</strong> - <!-- Slicing the version file name here gets rid of the '.json' file extension --> - <select ng-model="ctrl.version" - ng-change="ctrl.update()" - class="form-control" - ng-options="versionFile.slice(0,10) for versionFile in ctrl.versionList"> - </select> - </div> - <!-- - <div class="col-md-4"> - <strong>Target Program:</strong> - <span class="program-about"><a target="_blank" href="http://www.openstack.org/brand/interop/">About</a></span> - <select ng-model="ctrl.target" class="form-control" ng-change="ctrl.updateTargetCapabilities()"> - <option value="platform">OpenStack Powered Platform</option> - <option value="compute">OpenStack Powered Compute</option> - <option value="object">OpenStack Powered Object Storage</option> - </select> - </div> - --> + <div class="col-md-3"> + <strong>Version:</strong> + <!-- Slicing the version file name here gets rid of the '.json' file extension --> + <select ng-model="ctrl.version" + ng-change="ctrl.update()" + class="form-control" + ng-options="versionFile.slice(0,10) for versionFile in ctrl.versionList"> + </select> + </div> </div> <br /> -<!-- -<div ng-if="ctrl.guidelines"> - <strong>Guideline Status:</strong> - {{ctrl.guidelines.status | capitalize}} -</div> - -<div ng-show="ctrl.guidelines"> - <strong>Corresponding OpenStack Releases:</strong> - <ul class="list-inline"> - <li ng-repeat="release in ctrl.guidelines.releases"> - {{release | capitalize}} - </li> - </ul> -</div> ---> <strong>Capability Status:</strong> <div class="checkbox"> - <label> + <label> <input type="checkbox" ng-model="ctrl.showMandatory"> <span class="mandatory">Mandatory</span> - </label> - <label> + </label> + <label> <input type="checkbox" ng-model="ctrl.showOptional"> <span class="optional">Optional</span> - </label> + </label> </div> <!-- End Capability Filters --> @@ -60,11 +34,3 @@ <!-- Get the version-specific template --> <div nf-show="ctrl.data" ng-include src="ctrl.detailsTemplate"></div> - -<!-- -<div ng-show="ctrl.showError" class="alert alert-danger" role="alert"> - <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> - <span class="sr-only">Error:</span> - {{ctrl.error}} -</div> ---> diff --git a/3rd_party/static/testapi-ui/components/guidelines/partials/guidelineDetails.html b/3rd_party/static/testapi-ui/components/guidelines/partials/guidelineDetails.html index 05a1ef5..bf65a38 100644 --- a/3rd_party/static/testapi-ui/components/guidelines/partials/guidelineDetails.html +++ b/3rd_party/static/testapi-ui/components/guidelines/partials/guidelineDetails.html @@ -6,85 +6,39 @@ variable 'guidelines'. <h3 ng-show="ctrl.showMandatory">{{ctrl.data.mandatory.name}}</h3> <div ng-repeat="area in ctrl.data.mandatory.value" ng-show="ctrl.showMandatory"> - <h4>{{area.area_name}}</h4> - <ol class="capabilities"> - <li class="capability-list-item" ng-repeat="api in area.value"> - <span class="capability-name">{{api.api_name}}</span><br /> - Area: <em>{{area.area_name}}</em><br /> - Status: <span>Mandatory</span><br /> + <h4>{{area.area_name}}</h4> + <ol class="capabilities"> + <li class="capability-list-item" ng-repeat="api in area.value"> + <span class="capability-name">{{api.api_name}}</span><br /> + Area: <em>{{area.area_name}}</em><br /> + Status: <span>Mandatory</span><br /> - <a ng-click="showTests = !showTests">Tests ({{api.value.length}})</a> - <ul uib-collapse="!showTests"> - <li ng-repeat="test in api.value"> - <span ng-class="{'glyphicon glyphicon-flag text-warning': capability.flagged.indexOf(test) > -1}"></span> - {{test}} - </li> - </ul> - </li> - </ol> + <a ng-click="showTests = !showTests">Tests ({{api.value.length}})</a> + <ul uib-collapse="!showTests"> + <li ng-repeat="test in api.value"> + <span ng-class="{'glyphicon glyphicon-flag text-warning': capability.flagged.indexOf(test) > -1}"></span> + {{test}} + </li> + </ul> + </li> + </ol> </div> <h3 ng-show="ctrl.showOptional">{{ctrl.data.optional.name}}</h3> <div ng-repeat="area in ctrl.data.optional.value" ng-show="ctrl.showOptional"> - <h4>{{area.area_name}}</h4> - <ol class="capabilities"> - <li class="capability-list-item" ng-repeat="api in area.value"> - <span class="capability-name">{{api.api_name}}</span><br /> - Status: <span>Optional</span><br /> - - <a ng-click="showTests = !showTests">Tests ({{api.value.length}})</a> - <ul uib-collapse="!showTests"> - <li ng-repeat="test in api.value"> - <span ng-class="{'glyphicon glyphicon-flag text-warning': capability.flagged.indexOf(test) > -1}"></span> - {{test}} - </li> - </ul> - </li> - </ol> -</div> -<!-- -<ol ng-show="ctrl.data" class="capabilities"> - <li class="capability-list-item" ng-repeat="capability in ctrl.guidelines.capabilities | arrayConverter | filter:ctrl.filterStatus | orderBy:'id'"> - <span class="capability-name">{{capability.id}}</span><br /> - <em>{{capability.description}}</em><br /> - Status: <span class="{{ctrl.targetCapabilities[capability.id]}}">{{ctrl.targetCapabilities[capability.id]}}</span><br /> - <span ng-if="capability.project">Project: {{capability.project | capitalize}}<br /></span> - <a ng-click="showAchievements = !showAchievements">Achievements ({{capability.achievements.length}})</a><br /> - <ol uib-collapse="!showAchievements" class="list-inline"> - <li ng-repeat="achievement in capability.achievements"> - {{achievement}} - </li> - </ol> + <h4>{{area.area_name}}</h4> + <ol class="capabilities"> + <li class="capability-list-item" ng-repeat="api in area.value"> + <span class="capability-name">{{api.api_name}}</span><br /> + Status: <span>Optional</span><br /> - <a ng-click="showTests = !showTests">Tests ({{ctrl.getObjectLength(capability.tests)}})</a> - <ul uib-collapse="!showTests"> - <li ng-if="ctrl.guidelines.schema === '1.2'" ng-repeat="test in capability.tests"> - <span ng-class="{'glyphicon glyphicon-flag text-warning': capability.flagged.indexOf(test) > -1}"></span> - {{test}} - </li> - <li ng-if="ctrl.guidelines.schema > '1.2'" ng-repeat="(testName, testDetails) in capability.tests"> - <span ng-class="{'glyphicon glyphicon-flag text-warning': testDetails.flagged}" title="{{testDetails.flagged.reason}}"></span> - {{testName}} - <div class="test-detail" ng-if="testDetails.aliases"> - <strong>Aliases:</strong> - <ul><li ng-repeat="alias in testDetails.aliases">{{alias}}</li></ul> - </div> + <a ng-click="showTests = !showTests">Tests ({{api.value.length}})</a> + <ul uib-collapse="!showTests"> + <li ng-repeat="test in api.value"> + <span ng-class="{'glyphicon glyphicon-flag text-warning': capability.flagged.indexOf(test) > -1}"></span> + {{test}} </li> - </ul> - </li> -</ol> - -<div ng-show="ctrl.guidelines" class="criteria"> - <hr> - <h4><a ng-click="showCriteria = !showCriteria">Criteria</a></h4> - <div uib-collapse="showCriteria"> - <ul> - <li ng-repeat="(key, criterion) in ctrl.guidelines.criteria"> - <span class="criterion-name">{{criterion.name}}</span><br /> - <em>{{criterion.Description}}</em><br /> - Weight: {{criterion.weight}} - </li> - </ul> - </div> + </ul> + </li> + </ol> </div> ---> diff --git a/3rd_party/static/testapi-ui/components/guidelines/partials/testListModal.html b/3rd_party/static/testapi-ui/components/guidelines/partials/testListModal.html index 5b1d698..8e4a37d 100644 --- a/3rd_party/static/testapi-ui/components/guidelines/partials/testListModal.html +++ b/3rd_party/static/testapi-ui/components/guidelines/partials/testListModal.html @@ -1,46 +1,47 @@ <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" aria-hidden="true" ng-click="modal.close()">×</button> - <h4>Test List ({{modal.testListCount}})</h4> - <p>Use this test list with <a title="testapi-client" target="_blank"href="https://github.com/openstack/testapi-client">testapi-client</a> - to run only tests in the {{modal.version}} OpenStack Powered™ guideline from capabilities with the following statuses: - </p> - <ul class="list-inline"> - <li class="required" ng-if="modal.status.required"> Required</li> - <li class="advisory" ng-if="modal.status.advisory"> Advisory</li> - <li class="deprecated" ng-if="modal.status.deprecated"> Deprecated</li> - <li class="removed" ng-if="modal.status.removed"> Removed</li> - </ul> - <div class="checkbox checkbox-test-list"> - <label><input type="checkbox" ng-model="modal.aliases" ng-change="modal.updateTestListString()">Aliases</label> - <span class="glyphicon glyphicon-info-sign info-hover" aria-hidden="true" - title="Include test aliases as tests may have been renamed over time. It does not hurt to include these."></span> - - <label><input type="checkbox" ng-model="modal.flagged" ng-change="modal.updateTestListString()">Flagged</label> - <span class="glyphicon glyphicon-info-sign info-hover" aria-hidden="true" - title="Include flagged tests."> - </span> - </div> - <p ng-hide="modal.error"> Alternatively, get the test list directly from the API on your CLI:</p> - <code ng-hide="modal.error">wget "{{modal.testListUrl}}" -O {{modal.version}}-test-list.txt</code> + <div class="modal-header"> + <button type="button" class="close" aria-hidden="true" ng-click="modal.close()">×</button> + <h4>Test List ({{modal.testListCount}})</h4> + <p>Use this test list with + <a title="testapi-client" target="_blank"href="https://github.com/openstack/testapi-client">testapi-client</a> + to run only tests in the {{modal.version}} OpenStack Powered™ guideline from capabilities with the + following statuses: + </p> + <ul class="list-inline"> + <li class="required" ng-if="modal.status.required"> Required</li> + <li class="advisory" ng-if="modal.status.advisory"> Advisory</li> + <li class="deprecated" ng-if="modal.status.deprecated"> Deprecated</li> + <li class="removed" ng-if="modal.status.removed"> Removed</li> + </ul> + <div class="checkbox checkbox-test-list"> + <label><input type="checkbox" ng-model="modal.aliases" ng-change="modal.updateTestListString()">Aliases</label> + <span class="glyphicon glyphicon-info-sign info-hover" aria-hidden="true" + title="Include test aliases as tests may have been renamed over time. It does not hurt to include these."> + </span> + + <label><input type="checkbox" ng-model="modal.flagged" ng-change="modal.updateTestListString()">Flagged</label> + <span class="glyphicon glyphicon-info-sign info-hover" aria-hidden="true" + title="Include flagged tests."> + </span> </div> - <div class="modal-body tests-modal-content"> - <div cg-busy="{promise:modal.testListRequest,message:'Loading'}"></div> - <div ng-show="modal.error" class="alert alert-danger" role="alert"> - <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> - <span class="sr-only">Error:</span> - {{modal.error}} - </div> - <div class="form-group"> - <textarea class="form-control" rows="16" id="tests" wrap="off">{{modal.testListString}}</textarea> - </div> + <p ng-hide="modal.error"> Alternatively, get the test list directly from the API on your CLI:</p> + <code ng-hide="modal.error">wget "{{modal.testListUrl}}" -O {{modal.version}}-test-list.txt</code> + </div> + <div class="modal-body tests-modal-content"> + <div cg-busy="{promise:modal.testListRequest,message:'Loading'}"></div> + <div ng-show="modal.error" class="alert alert-danger" role="alert"> + <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> + <span class="sr-only">Error:</span> + {{modal.error}} </div> - <div class="modal-footer"> - <a target="_blank" href="{{modal.testListUrl}}" download="{{modal.version + '-test-list.txt'}}"> - <button class="btn btn-primary" ng-if="modal.testListCount > 0" type="button"> - Download - </button> - </a> - <button class="btn btn-primary" type="button" ng-click="modal.close()">Close</button> + <div class="form-group"> + <textarea class="form-control" rows="16" id="tests" wrap="off">{{modal.testListString}}</textarea> </div> + </div> + <div class="modal-footer"> + <a target="_blank" href="{{modal.testListUrl}}" download="{{modal.version + '-test-list.txt'}}"> + <button class="btn btn-primary" ng-if="modal.testListCount > 0" type="button">Download</button> + </a> + <button class="btn btn-primary" type="button" ng-click="modal.close()">Close</button> + </div> </div> |