Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
ef52d956
Commit
ef52d956
authored
Sep 28, 2017
by
Matt Bostock
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make URL capitalisation consistent in UI
URL is an acronym, it should be all caps.
parent
a286ffa5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
public/app/features/plugins/partials/ds_http_settings.html
+5
-5
No files found.
public/app/features/plugins/partials/ds_http_settings.html
View file @
ef52d956
...
...
@@ -5,19 +5,19 @@
<div
class=
"gf-form-group"
>
<div
class=
"gf-form-inline"
>
<div
class=
"gf-form max-width-30"
>
<span
class=
"gf-form-label width-7"
>
U
rl
</span>
<span
class=
"gf-form-label width-7"
>
U
RL
</span>
<input
class=
"gf-form-input"
type=
"text"
ng-model=
'current.url'
placeholder=
"{{suggestUrl}}"
bs-typeahead=
"getSuggestUrls"
min-length=
"0"
ng-pattern=
"/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/"
required
></input>
<info-popover
mode=
"right-absolute"
>
<p>
Specify a complete HTTP
url
(for example http://your_server:8080)
</p>
<p>
Specify a complete HTTP
URL
(for example http://your_server:8080)
</p>
<span
ng-show=
"current.access === 'direct'"
>
Your access method is
<em>
Direct
</em>
, this means the
url
Your access method is
<em>
Direct
</em>
, this means the
URL
needs to be accessible from the browser.
</span>
<span
ng-show=
"current.access === 'proxy'"
>
Your access method is currently
<em>
Proxy
</em>
, this means the
url
Your access method is currently
<em>
Proxy
</em>
, this means the
URL
needs to be accessible from the grafana backend.
</span>
</info-popover>
...
...
@@ -30,7 +30,7 @@
<div
class=
"gf-form-select-wrapper gf-form-select-wrapper--has-help-icon max-width-24"
>
<select
class=
"gf-form-input"
ng-model=
"current.access"
ng-options=
"f for f in ['direct', 'proxy']"
></select>
<info-popover
mode=
"right-absolute"
>
Direct =
url
is used directly from browser
<br>
Direct =
URL
is used directly from browser
<br>
Proxy = Grafana backend will proxy the request
</info-popover>
</div>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment