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
d932653c
Commit
d932653c
authored
Jan 09, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(apps): minor progress on apps edit view
parent
9943b9a2
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
20 deletions
+54
-20
public/app/core/directives/misc.js
+3
-2
public/app/features/apps/partials/edit.html
+13
-17
public/app/features/panel/panel_directive.js
+1
-1
public/less/apps.less
+26
-0
public/less/gfbox.less
+5
-0
public/less/grafana.less
+1
-0
public/less/type.less
+5
-0
No files found.
public/app/core/directives/misc.js
View file @
d932653c
...
...
@@ -62,12 +62,13 @@ function (angular, coreModule, kbn) {
var
label
=
'<label for="'
+
scope
.
$id
+
model
+
'" class="checkbox-label">'
+
text
+
tip
+
'</label>'
;
var
template
=
'<input class="cr1" id="'
+
scope
.
$id
+
model
+
'" type="checkbox" '
+
var
template
=
'<input class="cr1" id="'
+
scope
.
$id
+
model
+
'" type="checkbox" '
+
' ng-model="'
+
model
+
'"'
+
ngchange
+
' ng-checked="'
+
model
+
'"></input>'
+
' <label for="'
+
scope
.
$id
+
model
+
'" class="cr1"></label>'
;
template
=
label
+
template
;
template
=
template
+
label
;
elem
.
replaceWith
(
$compile
(
angular
.
element
(
template
))(
scope
));
}
};
...
...
public/app/features/apps/partials/edit.html
View file @
d932653c
...
...
@@ -7,34 +7,30 @@
<div
class=
"page-container"
style=
"background: transparent; border: 0;"
>
<div
class=
"apps-side-box"
>
<img
class=
"apps-ide-box-logo"
src=
"{{ctrl.appModel.info.logos.large}}"
>
</img>
<div
class=
"apps-side-box-logo"
>
<img
src=
"{{ctrl.appModel.info.logos.large}}"
>
</div>
<ul
class=
"app-side-box-links"
>
<li>
By
<a
href=
"{{ctrl.appModel.info.author.url}}"
class=
"external-link"
target=
"_blank"
>
{{ctrl.appModel.info.author.name}}
</a>
</li>
<li
ng-repeat=
"link in ctrl.appModel.info.links"
>
<a
href=
"{{link.url}}"
>
{{link.name}}
</a>
<a
href=
"{{link.url}}"
class=
"external-link"
target=
"_blank"
>
{{link.name}}
</a>
</li>
</ul>
</div>
<div
class=
"page-wide"
ng-init=
"ctrl.init()"
>
<div
class=
"page-wide-margined"
ng-init=
"ctrl.init()"
>
<h2>
{{ctrl.appModel.name}}
</h2>
<em>
{{ctrl.appModel.info.description}}
</em>
<form
name=
"editForm"
>
<div
class=
"tight-form"
>
<ul
class=
"tight-form-list"
>
<li
class=
"tight-form-item"
>
<editor-checkbox
text=
"Enabled"
model=
"ctrl.appModel.enabled"
change=
"enabledChanged()"
></editor-checkbox>
</li>
<li
class=
"tight-form-item"
>
<editor-checkbox
text=
"Pinned"
model=
"ctrl.appModel.pinned"
change=
"enabledChanged()"
></editor-checkbox>
</li>
</ul>
<div
class=
"clearfix"
></div>
</div>
<div
class=
"form-inline"
>
<editor-checkbox
text=
"Enabled"
model=
"ctrl.appModel.enabled"
change=
"enabledChanged()"
></editor-checkbox>
<editor-checkbox
text=
"Pinned"
model=
"ctrl.appModel.pinned"
change=
"enabledChanged()"
></editor-checkbox>
</div>
<app-config-loader></app-config-loader>
</form>
</div>
</div>
public/app/features/panel/panel_directive.js
View file @
d932653c
...
...
@@ -90,7 +90,7 @@ function (angular, $, config) {
scope
.
target
.
refId
=
'A'
;
}
var
panelEl
=
angular
.
element
(
document
.
createElement
(
'metric-query-editor-'
+
ds
.
meta
.
type
));
var
panelEl
=
angular
.
element
(
document
.
createElement
(
'metric-query-editor-'
+
ds
.
meta
.
id
));
elem
.
append
(
panelEl
);
$compile
(
panelEl
)(
editorScope
);
});
...
...
public/less/apps.less
0 → 100644
View file @
d932653c
.apps-side-box {
float: left;
}
.apps-side-box-logo {
padding: 15px;
background: @grafanaPanelBackground;
width: 120px;
text-align: center;
img {
max-width: 100px;
}
margin-bottom: 10px;
}
.app-side-box-links {
list-style: none;
margin: 0;
li {
background: @grafanaPanelBackground;
margin-top: 4px;
padding-left: 10px;
line-height: 25px;
}
}
public/less/gfbox.less
View file @
d932653c
...
...
@@ -84,6 +84,11 @@
max-width: 1000px;
}
.page-wide-margined {
margin-left: 170px;
max-width: 1000px;
}
.admin-page {
max-width: 800px;
margin-left: 10px;
...
...
public/less/grafana.less
View file @
d932653c
...
...
@@ -21,6 +21,7 @@
@import "tabs.less";
@import "timepicker.less";
@import "alerting.less";
@import "apps.less";
@import "filter-controls.less";
@import "filter-list.less";
@import "filter-table.less";
...
...
public/less/type.less
View file @
d932653c
...
...
@@ -245,3 +245,8 @@ address {
font-style: normal;
line-height: @baseLineHeight;
}
a.external-link {
color: @blue;
text-decoration: underline;
}
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