Merge branch 'master' into app_to_src

frontend/src/admin/people/components/EditUserForm.react.js

@@ -77,21 +77,18 @@ export default class EditUserForm extends Component {
             <form onSubmit={this.formSubmitted.bind(this)} noValidate>
                 <div className="px4 pb2">
                     <FormField fieldName="first_name" formError={formError}>
-                        <FormLabel title="First name" fieldName="first_name" formError={formError}></FormLabel>
+                        <FormLabel title="First name" fieldName="first_name" formError={formError} offset={false}></FormLabel>
                         <input ref="firstName" className="Form-input full" name="name" defaultValue={(user) ? user.first_name : null} placeholder="Johnny" onChange={this.onChange.bind(this)} />
-
                     </FormField>
 
                     <FormField fieldName="last_name" formError={formError}>
-                        <FormLabel title="Last name" fieldName="last_name" formError={formError}></FormLabel>
+                        <FormLabel title="Last name" fieldName="last_name" formError={formError} offset={false}></FormLabel>
                         <input ref="lastName" className="Form-input full" name="name" defaultValue={(user) ? user.last_name : null} placeholder="Appleseed" required onChange={this.onChange.bind(this)} />
-
                     </FormField>
 
                     <FormField fieldName="email" formError={formError}>
-                        <FormLabel title="Email address" fieldName="email" formError={formError}></FormLabel>
+                        <FormLabel title="Email address" fieldName="email" formError={formError} offset={false}></FormLabel>
                         <input ref="email" className="Form-input full" name="email" defaultValue={(user) ? user.email : null} placeholder="youlooknicetoday@email.com" required onChange={this.onChange.bind(this)} />
-
                     </FormField>
                 </div>
 

frontend/src/setup/components/PreferencesStep.react.js

 import React, { Component, PropTypes } from "react";
 
 import MetabaseAnalytics from "metabase/lib/analytics";
+import MetabaseSettings from "metabase/lib/settings";
 import Toggle from "metabase/components/Toggle.react";
 
 import StepTitle from './StepTitle.react';
@@ -27,6 +28,7 @@ export default class PreferencesStep extends Component {
 
     render() {
         let { activeStep, allowTracking, setupComplete, stepNumber } = this.props;
+        const { tag } = MetabaseSettings.get('version');
 
         let stepText = 'Usage data preferences';
         if (setupComplete) {
@@ -41,7 +43,7 @@ export default class PreferencesStep extends Component {
                     <StepTitle title={stepText} number={stepNumber} />
                     <form onSubmit={this.formSubmitted.bind(this)} novalidate>
                         <div className="Form-field Form-offset">
-                            In order to help us improve Metabase, we'd like to collect certain data about usage through Google Analytics.  <a className="link" href="http://www.metabase.com/docs/latest/information-collection.html" target="_blank">Here's a full list of everything we track and why.</a>
+                            In order to help us improve Metabase, we'd like to collect certain data about usage through Google Analytics.  <a className="link" href={"http://www.metabase.com/docs/"+tag+"/information-collection.html"} target="_blank">Here's a full list of everything we track and why.</a>
                         </div>
 
                         <div className="Form-field Form-offset mr4">

frontend/src/setup/components/UserStep.react.js

@@ -120,10 +120,10 @@ export default class UserStep extends Component {
                 <section className="SetupStep SetupStep--active rounded full relative">
                     <StepTitle title={stepText} number={stepNumber} />
                     <form name="userForm" onSubmit={this.formSubmitted.bind(this)} noValidate className="mt2">
-                        <FormField className="Grid" fieldName="first_name" formError={formError}>
+                        <FormField className="Grid mb3" fieldName="first_name" formError={formError}>
                             <div>
                                 <FormLabel title="First name" fieldName="first_name" formError={formError}></FormLabel>
-                                <input ref="firstName" className="Form-input Form-offset full" name="name" defaultValue={(userDetails) ? userDetails.first_name : ""} placeholder="Johnny" onChange={this.onChange.bind(this)} />
+                                <input ref="firstName" className="Form-input Form-offset full" name="name" defaultValue={(userDetails) ? userDetails.first_name : ""} placeholder="Johnny" autoFocus={true} onChange={this.onChange.bind(this)} />
                                 <span className="Form-charm"></span>
                             </div>
                             <div>

frontend/src/user/user.controllers.js

+import MetabaseSettings from "metabase/lib/settings";
+
 var UserControllers = angular.module('metabase.user.controllers', ['metabase.forms']);
 
 UserControllers.controller('EditCurrentUser', ['$scope', function($scope) {
@@ -35,6 +37,8 @@ UserControllers.controller('AccountSettingsController', ['$scope', 'User',
 UserControllers.controller('PasswordUpdateController', ['$scope', 'User',
     function($scope, User) {
 
+        $scope.passwordComplexity = MetabaseSettings.passwordComplexity(true);
+
         $scope.save = function(passwordDetails) {
             $scope.$broadcast("form:reset");
 

resources/frontend_client/app/user/partials/password_edit.html

@@ -8,6 +8,7 @@
 
         <div class="Form-field" mb-form-field="password">
             <mb-form-label display-name="New password" field-name="password"></mb-form-label>
+            <span style="font-weight: 400;" class="Form-label Form-offset">{{passwordComplexity}}</span>
             <input class="Form-input Form-offset full" name="password" placeholder="Make sure its secure like the instructions above" type="password" ng-model="passwordDetails.password" required>
             <span class="Form-charm"></span>
         </div>

src/metabase/core.clj

@@ -75,14 +75,13 @@
 (defn- -init-create-setup-token
   "Create and set a new setup token, and open the setup URL on the user's system."
   []
-  (let [setup-token (setup/token-create)
+  (let [setup-token (setup/token-create)                    ; we need this here to create the initial token
         hostname    (or (config/config-str :mb-jetty-host) "localhost")
         port        (config/config-int :mb-jetty-port)
         setup-url   (str "http://"
                          (or hostname "localhost")
                          (when-not (= 80 port) (str ":" port))
-                         "/setup/init/"
-                         setup-token)]
+                         "/setup/")]
     (log/info (color/green "Please use the following url to setup your Metabase installation:\n\n"
                            setup-url
                            "\n\n"))))