diff options
author | Stas Vilchik <vilchiks@gmail.com> | 2015-02-20 15:29:29 +0100 |
---|---|---|
committer | Stas Vilchik <vilchiks@gmail.com> | 2015-02-20 15:29:29 +0100 |
commit | 6b8ab49546c0a45c08e7d7d82ad01e61cbf8fa53 (patch) | |
tree | aa731f4ca87a82610babacc89c858da2395a42dc | |
parent | 66345cec4b27b479e1113287c752edd150d609d3 (diff) | |
download | sonarqube-6b8ab49546c0a45c08e7d7d82ad01e61cbf8fa53.tar.gz sonarqube-6b8ab49546c0a45c08e7d7d82ad01e61cbf8fa53.zip |
apply web service api feedback
6 files changed, 41 insertions, 6 deletions
diff --git a/server/sonar-web/src/main/hbs/api-documentation/api-documentation-action.hbs b/server/sonar-web/src/main/hbs/api-documentation/api-documentation-action.hbs index d728667dc60..8194aa3b0db 100644 --- a/server/sonar-web/src/main/hbs/api-documentation/api-documentation-action.hbs +++ b/server/sonar-web/src/main/hbs/api-documentation/api-documentation-action.hbs @@ -4,7 +4,7 @@ </h3> <span class="subtitle"> {{#if since}}Since {{since}}{{#if internal}} -{{/if}}{{/if}} - {{#if internal}}<span class="internal">For internal use only</span>{{/if}} + {{#if internal}}<span class="badge">For internal use only</span>{{/if}} </span> <p>{{{description}}}</p> {{#if params}} diff --git a/server/sonar-web/src/main/hbs/api-documentation/api-documentation-layout.hbs b/server/sonar-web/src/main/hbs/api-documentation/api-documentation-layout.hbs index 1d9d56e7be6..2527222fad2 100644 --- a/server/sonar-web/src/main/hbs/api-documentation/api-documentation-layout.hbs +++ b/server/sonar-web/src/main/hbs/api-documentation/api-documentation-layout.hbs @@ -1,6 +1,10 @@ <div class="search-navigator-side search-navigator-side-light"> <div class="search-navigator-filters"> <h1 class="page-title">Web Service API</h1> + <div class="page-actions"> + <input id="api-documentation-show-internals" type="checkbox"> + <label for="api-documentation-show-internals">Show Internals</label> + </div> </div> <div class="api-documentation-results panel"></div> </div> diff --git a/server/sonar-web/src/main/hbs/api-documentation/api-documentation-web-service.hbs b/server/sonar-web/src/main/hbs/api-documentation/api-documentation-web-service.hbs index d5c585b4f4f..2e47c41cc68 100644 --- a/server/sonar-web/src/main/hbs/api-documentation/api-documentation-web-service.hbs +++ b/server/sonar-web/src/main/hbs/api-documentation/api-documentation-web-service.hbs @@ -1,5 +1,7 @@ -<h3 class="list-group-item-heading">{{path}}</h3> +<h3 class="list-group-item-heading"> + {{path}} + {{#if internal}} + <span class="badge">internal</span> + {{/if}} +</h3> <p class="list-group-item-text">{{{description}}}</p> -{{#if internal}} - <p class="note">internal</p> -{{/if}} diff --git a/server/sonar-web/src/main/hbs/nav/nav-shortcuts-help.hbs b/server/sonar-web/src/main/hbs/nav/nav-shortcuts-help.hbs index 27a774e6137..f62f5325f4d 100644 --- a/server/sonar-web/src/main/hbs/nav/nav-shortcuts-help.hbs +++ b/server/sonar-web/src/main/hbs/nav/nav-shortcuts-help.hbs @@ -8,7 +8,7 @@ <a href="http://www.sonarqube.org/documentation" target="sonar_doc">Documentation</a> - <a href="http://www.sonarqube.org/support" target="support">Get Support</a> - <a href="http://sonar-plugins.codehaus.org" target="plugins">Plugins</a> - - <a href="<%= ApplicationController.root_context -%>/api_documentation">Web Service API</a> + <a href="{{link '/api_documentation'}}">Web Service API</a> </div> <div class="shortcuts-section"> diff --git a/server/sonar-web/src/main/less/components.less b/server/sonar-web/src/main/less/components.less index c64d9930a42..a20381805dc 100644 --- a/server/sonar-web/src/main/less/components.less +++ b/server/sonar-web/src/main/less/components.less @@ -21,3 +21,4 @@ @import "components/bubble-popup"; @import "components/list-groups"; @import "components/panels"; +@import "components/badges"; diff --git a/server/sonar-web/src/main/less/components/badges.less b/server/sonar-web/src/main/less/components/badges.less new file mode 100644 index 00000000000..f0b6c34b2e2 --- /dev/null +++ b/server/sonar-web/src/main/less/components/badges.less @@ -0,0 +1,28 @@ +@import (reference) "../variables"; +@import (reference) "../mixins"; + +.badge { + display: inline-block; + min-width: 10px; + padding: 2px 7px; + font-size: 11px; + font-weight: 300; + color: #fff; + line-height: 12px; + vertical-align: baseline; + white-space: nowrap; + text-align: center; + background-color: @blue; + + &:empty { display: none; } + + .list-group-item > &, + .list-group-item-heading > & { + float: right; + } + + .list-group-item > & + &, + .list-group-item-heading > & + & { + margin-right: 5px; + } +} |