Merge branch 'master' of github.com:grafana/grafana

public/app/features/org/partials/newOrg.html

 <navbar title="Organization" icon="icon-gf icon-gf-users">
 <navbar title="Organization" icon="icon-gf icon-gf-users">
 </navbar>
 </navbar>
 
 
-<div class="page-container">
-	<div class="page">
+<div class="page-container" ng-form="playlistEditForm">
+	<div class="page-header">
+		<h1>New Organization</h1>
+	</div>
 
 
-		<h2 style="margin-top: 30px;">Add Organization</h2>
+	<p class="playlist-description">Each organization contains their own dashboards, data sources and configuration, and cannot be shared between orgs. While users may belong to more than one, mutiple organization are most frequently used in multi-tenant deployments. </p>
 
 
-		<form name="form" class="gf-form-group">
-			<div class="gf-form">
-				<span class="gf-form-label width-10">Org. name</span>
-				<input type="text" ng-model="newOrg.name" required class="gf-form-input" placeholder="organization name">
-			</div>
-			<br>
-			<div class="gf-form-buttons-row">
-				<button class="btn btn-success pull-right" ng-click="createOrg()">Create</button>
-			</div>
-		</form>
+	<div class="gf-form-group">
+		<div class="gf-form">
+			<span class="gf-form-label width-10">Org. name</span>
+			<input type="text" ng-model="newOrg.name" required class="gf-form-input max-width-21" placeholder="organization name">
+		</div>
+		<br>
+		<div class="gf-form-buttons-row">
+			<button class="btn btn-success" ng-click="createOrg()">Create</button>
+		</div>
 	</div>
 	</div>
 </div>
 </div>
-

public/app/features/org/partials/orgDetails.html

@@ -3,7 +3,7 @@
 
 
 <div class="page-container">
 <div class="page-container">
 	<div class="page-header">
 	<div class="page-header">
-		<h1>Preferences</h1>
+		<h1>Org Preferences</h1>
 	</div>
 	</div>
 
 
 	<h3 class="page-heading">General</h3>
 	<h3 class="page-heading">General</h3>