IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

ux(): minor style fixes to pages

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-01-15 15:51:30 +01:00
parent 36e8af05a2
commit 7ad72ba905
12 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/admin/partials/orgs.html
View File

@@ -4,7 +4,7 @@
</ul>
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide">
<h2>
Organizations

6
public/app/features/admin/partials/users.html
View File

@@ -5,11 +5,11 @@
</ul>
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide">
<h2>
<h1>
Users
</h2>
</h1>
<table class="filter-table form-inline">
<thead>

2
public/app/features/apps/partials/edit.html
View File

@@ -5,7 +5,7 @@
</ul>
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="apps-side-box">
<div class="apps-side-box-logo" >
<img src="{{ctrl.appModel.info.logos.large}}">

4
public/app/features/apps/partials/list.html
View File

@@ -4,9 +4,9 @@
</ul>
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide" ng-init="ctrl.init()">
<h2>Apps</h2>
<h1>Apps</h1>
<div ng-if="!ctrl.apps">
<em>No apps defined</em>

4
public/app/features/dashboard/partials/globalAlerts.html
View File

@@ -4,9 +4,9 @@
</ul>
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide">
<h2>Global alerts</h2>
<h1>Global alerts</h1>
<div class="filter-controls-filters">
<div class="tight-form last">

1
public/app/features/datasources/partials/list.html
View File

@@ -10,6 +10,7 @@
</a>
<h1>Data sources</h1>
<br>
<div ng-if="datasources.length === 0">
<em>No data sources defined</em>

6
public/app/features/org/partials/orgApiKeys.html
View File

@@ -4,11 +4,11 @@
</ul>
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide">
<h2>
<h1>
API Keys
</h2>
</h1>
<form name="addTokenrForm" class="form-inline tight-form last">
<ul class="tight-form-list">

161
public/app/features/org/partials/orgDetails.html
View File

@@ -1,98 +1,99 @@
<topnav icon="fa fa-fw fa-users" title="Organization" subnav="true">
<ul class="nav">
<li class="active"><a href="org">Info</a></li>
<li class="active"><a href="org">Preferences</a></li>
</ul>
</topnav>
<div class="page-container">
<div class="page">
<h2>Organization</h2>
<h1>Organization</h1>
<div class="tight-form-section">
<h5>Info</h5>
<section class="simple-box">
<h3 class="simple-box-header">Preferences</h3>
</section>
<form name="orgForm">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
Org. name
</li>
<li>
<input type="text" required ng-model="org.name" class="tight-form-input last" style="width: 475px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<form name="orgForm">
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
Name
</li>
<li>
<input type="text" required ng-model="org.name" class="tight-form-input last" style="width: 475px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<br>
<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
</form>
</div>
<br>
<button type="submit" class="pull-right btn btn-success" ng-click="update()">Update</button>
<br>
</form>
<div class="tight-form-section">
<h5>Address</h5>
<section class="simple-box">
<h3 class="simple-box-header">Address</h3>
</section>
<form name="addressForm">
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
Address 1
</li>
<li>
<input type="text" ng-model="address.address1" class="tight-form-input" style="width:193px">
</li>
<li class="tight-form-item" style="width: 75px">
Address 2
</li>
<li>
<input type="text" ng-model="address.address2" class="tight-form-input last" style="width:193px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
City
</li>
<li>
<input type="text" ng-model="address.city" class="tight-form-input" style="width: 193px">
</li>
<li class="tight-form-item" style="width: 75px">
Postal code
</li>
<li>
<input type="text" ng-model="address.zipCode" class="input-medium tight-form-input last" style="width: 193px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
State
</li>
<li>
<input type="text" ng-model="address.state" class="tight-form-input" style="width: 193px">
</li>
<li class="tight-form-item" style="width: 75px">
Country
</li>
<li>
<input type="text" ng-model="address.country" class="tight-form-input last" style="width: 193px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<br>
<button type="submit" class="pull-right btn btn-success" ng-click="updateAddress()">Update</button>
</form>
</div>
<form name="addressForm">
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
Address 1
</li>
<li>
<input type="text" ng-model="address.address1" class="tight-form-input" style="width:193px">
</li>
<li class="tight-form-item" style="width: 75px">
Address 2
</li>
<li>
<input type="text" ng-model="address.address2" class="tight-form-input last" style="width:193px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
City
</li>
<li>
<input type="text" ng-model="address.city" class="tight-form-input" style="width: 193px">
</li>
<li class="tight-form-item" style="width: 75px">
Postal code
</li>
<li>
<input type="text" ng-model="address.zipCode" class="input-medium tight-form-input last" style="width: 193px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 100px">
State
</li>
<li>
<input type="text" ng-model="address.state" class="tight-form-input" style="width: 193px">
</li>
<li class="tight-form-item" style="width: 75px">
Country
</li>
<li>
<input type="text" ng-model="address.country" class="tight-form-input last" style="width: 193px">
</li>
</ul>
<div class="clearfix"></div>
</div>
<br>
<button type="submit" class="pull-right btn btn-success" ng-click="updateAddress()">Update</button>
<br>
</form>
</div>
</div>

2
public/app/features/org/partials/orgUsers.html
View File

@@ -4,7 +4,7 @@
</ul>
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide">
<button class="btn btn-inverse pull-right" ng-click="openInviteModal()">

2
public/app/features/playlist/partials/playlists.html
View File

@@ -1,6 +1,6 @@
<topnav icon="fa fa-fw fa-list" title="Playlists"></topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide">
<button type="submit" class="btn btn-inverse pull-right" ng-click="createPlaylist()">

3
public/app/features/profile/partials/password.html
View File

@@ -1,6 +1,5 @@
<topnav title="{{contextSrv.user.name}}" section="Profile" icon="fa fa-user" subnav="true">
<topnav title="Profile" title-url="profile" icon="fa fa-user" subnav="true">
<ul class="nav">
<li><a href="profile">Overview</a></li>
<li class="active"><a href="profile/password">Change password</a></li>
</ul>
</topnav>

2
public/app/features/profile/partials/profile.html
View File

@@ -1,7 +1,7 @@
<topnav title="Account" title-url="profile" icon="fa fa-fw fa-user">
</topnav>
<div class="page-container" style="background: transparent; border: 0;">
<div class="page-container">
<div class="page-wide">
<h1>Account & Preferences</h1>