Repository: ranger Updated Branches: refs/heads/master c213c9587 -> c324ece11
RANGER-1544: Misaligned input boxes and typo fixes Signed-off-by: Colm O hEigeartaigh <cohei...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c324ece1 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c324ece1 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c324ece1 Branch: refs/heads/master Commit: c324ece1144b90cff6e43bf9e2c40fcb07888e0a Parents: c213c95 Author: ANNA SHAVERDIAN <asha...@us.ibm.com> Authored: Mon May 8 11:13:00 2017 -0700 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon May 8 20:40:46 2017 +0100 ---------------------------------------------------------------------- security-admin/src/main/webapp/styles/xa.css | 7 ++- .../policies/RangerPolicyCreate_tmpl.html | 2 +- .../reports/UserAccessLayout_tmpl.html | 48 +++++++++++--------- 3 files changed, 33 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/c324ece1/security-admin/src/main/webapp/styles/xa.css ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css index 6cda421..06ef1d0 100644 --- a/security-admin/src/main/webapp/styles/xa.css +++ b/security-admin/src/main/webapp/styles/xa.css @@ -390,12 +390,17 @@ body { color:#4c504b; font-size:larger; } -.searchInfoUserAccsss{ +.searchInfoUserAccess{ margin-left:12px; color:#4c504b; font-size:large; margin-top:10px } +/* Report Search Info inputs */ +.reportSearchInfoInputs{ + position:absolute; + left:440px; +} /* overriding backgrid height property */ .backgrid td { http://git-wip-us.apache.org/repos/asf/ranger/blob/c324ece1/security-admin/src/main/webapp/templates/policies/RangerPolicyCreate_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/policies/RangerPolicyCreate_tmpl.html b/security-admin/src/main/webapp/templates/policies/RangerPolicyCreate_tmpl.html index 31252af..e5e4ce7 100644 --- a/security-admin/src/main/webapp/templates/policies/RangerPolicyCreate_tmpl.html +++ b/security-admin/src/main/webapp/templates/policies/RangerPolicyCreate_tmpl.html @@ -26,7 +26,7 @@ </div> <div class="alert alert-warning {{displayClass}}" data-id="policyInfoAlert"> <button type="button" class="close" data-dismiss="alert">×</button> - <i class="icon-info-sign searchInfoUserAccsss padding-right-10"></i>{{{infoMsg}}} + <i class="icon-info-sign searchInfoUserAccess padding-right-10"></i>{{{infoMsg}}} </div> <div data-id="r_form"></div> <div class="form-actions form-policy" class="row-fluid"> http://git-wip-us.apache.org/repos/asf/ranger/blob/c324ece1/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html b/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html index f428f3a..36a7a6e 100644 --- a/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html +++ b/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html @@ -17,30 +17,31 @@ <h3 class="wrap-header bold"> Reports </h3> <div class="wrap non-collapsible "> -<h3 class="wrap-header reportSearchHeader">Search Criteria - <span class="label label-yellow pull-right" data-js="searchResult" ></span> + <h3 class="wrap-header reportSearchHeader">Search Criteria + <span class="label label-yellow pull-right" data-js="searchResult"></span> </h3> <div class="wrap well "> <div class="row-fluid"> <div class="span12"> <div class="form-horizontal"> <div class="span12"> + <div class="pull-right"> + <i class="icon-info-sign searchInfoUserAccess" title="Search Filter Hints" + data-id="searchInfo"></i> + </div> <div class="control-group"> - <div class="span4"> + <div class="span4"> <label class="control-label">Policy Name</label> <div class="controls"> - <input type="text" name="policyName" data-js="policyName" autofocus > + <input type="text" name="policyName" data-js="policyName" autofocus> </div> </div> - <div class="span4"> + <div class="span4 reportSearchInfoInputs"> <label class="control-label control-label-align" for="policyType">Policy Type</label> <div class="controls controls-margin"> <input type="text" data-id="policyType"> </div> </div> - <div class="pull-right"> - <i class="icon-info-sign searchInfoUserAccsss" title="Search Filter Hints" data-id="searchInfo"></i> - </div> </div> <div class="control-group"> <div class="span4"> @@ -48,8 +49,8 @@ <div class="controls"> <input type=text data-id="component" name="componentType"> </div> - </div> - <div class="span4"> + </div> + <div class="span4 reportSearchInfoInputs"> <label class="control-label control-label-align">Resource</label> <div class="controls controls-margin"> <input type="text" name="resourceName" data-js="resourceName"> @@ -82,10 +83,11 @@ </div> - <div > + <div> <div class="control-group"> <div class="controls"> - <button type="button" class="btn btn-primary btn-small" data-js="searchBtn" name="searchPolicy"> + <button type="button" class="btn btn-primary btn-small" data-js="searchBtn" + name="searchPolicy"> <i class="icon-search"></i> Search </button> @@ -100,7 +102,8 @@ <div class="row-fluid"> <span> <div class="btn-group btn-right"> - <button type="button" data-name="downloadFormatBtn" class="btn btn-primary dropdown-toggle" title="Export all below policies" data-toggle="dropdown"> + <button type="button" data-name="downloadFormatBtn" class="btn btn-primary dropdown-toggle" + title="Export all below policies" data-toggle="dropdown"> <i class="icon-external-link-sign"></i> <span>Export</span> <span class="caret"> </span> @@ -114,16 +117,17 @@ </ul> </div> </span> - <a href="javascript:void(0)" data-id="downloadReport"></a> - </div> + <a href="javascript:void(0)" data-id="downloadReport"></a> + </div> <div class="row-fluid"> {{#each policyHeaderList}} - <h3 class="wrap-header bold reportSearchHeader" data-js="hdfsHeader" data-compHeader="{{this.serviceDefName}}"> {{capitaliseLetter this.serviceDefName}} - <span class="label label-yellow btn-right" data-js="hdfsSearchResult" ></span> - </h3> - <div class="wrap well position-relative" data-comp="{{this.serviceDefName}}"> - <div data-id="{{this.collName}}" class="hdfs-table showMoreLess"></div> - </div> + <h3 class="wrap-header bold reportSearchHeader" data-js="hdfsHeader" data-compHeader="{{this.serviceDefName}}"> + {{capitaliseLetter this.serviceDefName}} + <span class="label label-yellow btn-right" data-js="hdfsSearchResult"></span> + </h3> + <div class="wrap well position-relative" data-comp="{{this.serviceDefName}}"> + <div data-id="{{this.collName}}" class="hdfs-table showMoreLess"></div> + </div> {{/each}} </div> -</div> +</div> \ No newline at end of file
