Merge remote-tracking branch 'remotes/origin/AD-350-integrate-localization' into AD-416-account-settings-page-navbar

Conflicts:
	js/components/ascribe_forms/form.js
	js/components/settings_container.js
	sass/ascribe_settings.scss

js/components/ascribe_forms/form.js

@@ -10,6 +10,9 @@ import AlertDismissable from './alert';
 
 let Form = React.createClass({
     propTypes: {
+        url: React.PropTypes.string,
+        handleSuccess: React.PropTypes.func,
+        getFormData: React.PropTypes.func,
         children: React.PropTypes.oneOfType([
             React.PropTypes.object,
             React.PropTypes.array

js/components/settings_container.js

@@ -97,6 +97,24 @@ let AccountSettings = React.createClass({
                 show={true}
                 defaultExpanded={true}>
                 {content}
+                <Form
+                    url={AppConstants.serverUrl + 'api/users/set_language/'}>
+                    <Property
+                        name='language'
+                        label="Choose your Language"
+                        editable={true}>
+                        <select id="select-lang" name="language">
+                            <option value="fr">
+                                Fran&ccedil;ais
+                            </option>
+                            <option value="en"
+                                    selected="selected">
+                                English
+                            </option>
+                        </select>
+                    </Property>
+                    <hr />
+                </Form>
             </CollapsibleParagraph>
         );
     }

js/routes.js

@@ -19,7 +19,6 @@ let Route = Router.Route;
 let Redirect = Router.Redirect;
 let baseUrl = AppConstants.baseUrl;
 
-
 let routes = (
     <Route name="app" path={baseUrl} handler={AscribeApp}>
         <Route name="signup" path="signup" handler={SignupContainer} />

sass/ascribe_settings.scss

@@ -38,6 +38,10 @@
             color: #666;
         }
     }
+
+    &:hover{
+      border-left: 3px solid rgba(169, 68, 66, 1);
+    }
 }
 
 .is-fixed {
@@ -67,7 +71,7 @@
 
     cursor:pointer;
 
-    input, div, span, pre, textarea {
+    input, div, span, pre, textarea, select {
         font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     }
     span {
@@ -88,7 +92,7 @@
         }
     }
 
-    input, pre, textarea {
+    input, pre, textarea, select {
         font-weight: 400;
         font-size: 1.1em;
         width:100%;