From 4f5e7a0821605a9963e5d79a1d9107c88304fb9f Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Thu, 11 Jun 2015 15:35:18 +0200
Subject: [PATCH 01/12] login form

---
 js/components/ascribe_forms/form_login.js | 57 +++++++++++++++++++++++
 js/components/header.js                   | 17 ++++++-
 js/constants/api_urls.js                  |  7 ++-
 3 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 js/components/ascribe_forms/form_login.js

diff --git a/js/components/ascribe_forms/form_login.js b/js/components/ascribe_forms/form_login.js
new file mode 100644
index 00000000..c768211f
--- /dev/null
+++ b/js/components/ascribe_forms/form_login.js
@@ -0,0 +1,57 @@
+'use strict';
+
+import React from 'react';
+
+import apiUrls from '../../constants/api_urls';
+import FormMixin from '../../mixins/form_mixin';
+import InputText from './input_text';
+import ButtonSubmitOrClose from '../ascribe_buttons/button_submit_close';
+
+let LoginForm = React.createClass({
+    mixins: [FormMixin],
+
+
+    url() {
+        return apiUrls.users_login;
+    },
+    
+    getFormData() {
+        return {
+            email: this.refs.email.state.value,
+            password: this.refs.password.state.value
+        };
+    },
+
+    renderForm() {
+        return (
+            <form id="login_modal_content" role="form" onSubmit={this.submit}>
+                <input className="invisible" type="email" name="fake_consignee"/>
+                <input className="invisible" type="password" name="fake_password"/>
+                <InputText
+                    ref="email"
+                    placeHolder="Email"
+                    required="required"
+                    type="email"
+                    submitted={this.state.submitted}/>
+                <InputText
+                    ref="password"
+                    placeHolder="Password"
+                    required="required"
+                    type="password"
+                    submitted={this.state.submitted}/>
+                <div>
+                        Forgot your password&#63; <a className="button" href="#" id="request_reset_pwd_from_login_btn">Reset password</a>.
+                </div>
+                <div>
+                    Not a member yet&#63; <a className="button" href="#" id="signup_from_login_btn">Sign up</a>.
+                </div>
+                <ButtonSubmitOrClose
+                    text="LOGIN"
+                    onClose={this.props.onRequestHide}
+                    submitted={this.state.submitted} />
+            </form>
+        );
+    }
+});
+
+export default LoginForm;
\ No newline at end of file
diff --git a/js/components/header.js b/js/components/header.js
index 3df56afb..1c428419 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-import Router from 'react-router';
+//import Router from 'react-router';
 
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
@@ -11,9 +11,12 @@ import Navbar from 'react-bootstrap/lib/Navbar';
 import DropdownButton from 'react-bootstrap/lib/DropdownButton';
 import MenuItem from 'react-bootstrap/lib/MenuItem';
 
+import ModalWrapper from '../components/ascribe_modal/modal_wrapper';
+import LoginForm from '../components/ascribe_forms/form_login';
+
 import { getLangText } from '../utils/lang_utils';
 
-let Link = Router.Link;
+//let Link = Router.Link;
 
 let Header = React.createClass({
 
@@ -33,6 +36,9 @@ let Header = React.createClass({
     onChange(state) {
         this.setState(state);
     },
+    handleLoginSuccess(){
+        UserActions.fetchCurrentUser();
+    },
 
     render() {
         return (
@@ -44,6 +50,13 @@ let Header = React.createClass({
                     </a>
                 </Nav>
                 <Nav right>
+                    <ModalWrapper
+                        button={<div className='btn btn-default btn-sm'>LOGIN</div>}
+                        title='Log in to ascribe'
+                        handleSuccess={this.handleLoginSuccess}
+                        tooltip='Log in to ascribe'>
+                        <LoginForm />
+                    </ModalWrapper>
                     <DropdownButton eventKey="1" title={this.state.currentUser.username}>
                         <MenuItem eventKey="1" href="/art/account_settings/">{getLangText('Account Settings')}</MenuItem>
                         <li className="divider"></li>
diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js
index f8bffda4..cbde0f81 100644
--- a/js/constants/api_urls.js
+++ b/js/constants/api_urls.js
@@ -3,7 +3,6 @@
 import AppConstants from './application_constants';
 
 let apiUrls = {
-    'user': AppConstants.baseUrl + 'users/',
     'piece': AppConstants.baseUrl + 'pieces/${piece_id}',
     'pieces_list': AppConstants.baseUrl + 'pieces/',
     'piece_extradata': AppConstants.baseUrl + 'pieces/${piece_id}/extradata/',
@@ -22,9 +21,9 @@ let apiUrls = {
     'ownership_loans': AppConstants.baseUrl + 'ownership/loans/',
     'ownership_loans_confirm': AppConstants.baseUrl + 'ownership/loans/confirm/',
     'ownership_loans_deny': AppConstants.baseUrl + 'ownership/loans/deny/',
-
-    'note_notes': AppConstants.baseUrl + 'note/notes/'
-
+    'note_notes': AppConstants.baseUrl + 'note/notes/',
+    'user': AppConstants.baseUrl + 'users/',
+    'users_login': AppConstants.baseUrl + 'users/login/'
 };
 
 export default apiUrls;

From 5e7f7983e18cf1a665e6de580cb7ac26d98e0df7 Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Thu, 11 Jun 2015 15:57:19 +0200
Subject: [PATCH 02/12] application constants

---
 js/components/header.js               |  4 +--
 js/constants/api_urls.js              | 42 +++++++++++++--------------
 js/constants/application_constants.js |  4 +--
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/js/components/header.js b/js/components/header.js
index 8954104c..6c8145e6 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import React from 'react';
-//import Router from 'react-router';
+import Router from 'react-router';
 
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
@@ -16,7 +16,7 @@ import LoginForm from '../components/ascribe_forms/form_login';
 
 import { getLangText } from '../utils/lang_utils';
 
-//let Link = Router.Link;
+let Link = Router.Link;
 
 let Header = React.createClass({
 
diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js
index cbde0f81..1bc835cd 100644
--- a/js/constants/api_urls.js
+++ b/js/constants/api_urls.js
@@ -3,27 +3,27 @@
 import AppConstants from './application_constants';
 
 let apiUrls = {
-    'piece': AppConstants.baseUrl + 'pieces/${piece_id}',
-    'pieces_list': AppConstants.baseUrl + 'pieces/',
-    'piece_extradata': AppConstants.baseUrl + 'pieces/${piece_id}/extradata/',
-    'edition': AppConstants.baseUrl + 'editions/${bitcoin_id}/',
-    'editions_list': AppConstants.baseUrl + 'pieces/${piece_id}/editions/',
-    'edition_delete': AppConstants.baseUrl + 'editions/${edition_id}/',
-    'edition_remove_from_collection': AppConstants.baseUrl + 'ownership/shares/${edition_id}/',
-    'ownership_shares_mail': AppConstants.baseUrl + 'ownership/shares/mail/',
-    'ownership_transfers': AppConstants.baseUrl + 'ownership/transfers/',
-    'ownership_consigns': AppConstants.baseUrl + 'ownership/consigns/',
-    'ownership_consigns_confirm': AppConstants.baseUrl + 'ownership/consigns/confirm/',
-    'ownership_consigns_deny': AppConstants.baseUrl + 'ownership/consigns/deny/',
-    'ownership_unconsigns': AppConstants.baseUrl + 'ownership/unconsigns/',
-    'ownership_unconsigns_request': AppConstants.baseUrl + 'ownership/unconsigns/request/',
-    'ownership_unconsigns_deny': AppConstants.baseUrl + 'ownership/unconsigns/deny/',
-    'ownership_loans': AppConstants.baseUrl + 'ownership/loans/',
-    'ownership_loans_confirm': AppConstants.baseUrl + 'ownership/loans/confirm/',
-    'ownership_loans_deny': AppConstants.baseUrl + 'ownership/loans/deny/',
-    'note_notes': AppConstants.baseUrl + 'note/notes/',
-    'user': AppConstants.baseUrl + 'users/',
-    'users_login': AppConstants.baseUrl + 'users/login/'
+    'piece': AppConstants.apiEndpoint + 'pieces/${piece_id}',
+    'pieces_list': AppConstants.apiEndpoint + 'pieces/',
+    'piece_extradata': AppConstants.apiEndpoint + 'pieces/${piece_id}/extradata/',
+    'edition': AppConstants.apiEndpoint + 'editions/${bitcoin_id}/',
+    'editions_list': AppConstants.apiEndpoint + 'pieces/${piece_id}/editions/',
+    'edition_delete': AppConstants.apiEndpoint + 'editions/${edition_id}/',
+    'edition_remove_from_collection': AppConstants.apiEndpoint + 'ownership/shares/${edition_id}/',
+    'ownership_shares_mail': AppConstants.apiEndpoint + 'ownership/shares/mail/',
+    'ownership_transfers': AppConstants.apiEndpoint + 'ownership/transfers/',
+    'ownership_consigns': AppConstants.apiEndpoint + 'ownership/consigns/',
+    'ownership_consigns_confirm': AppConstants.apiEndpoint + 'ownership/consigns/confirm/',
+    'ownership_consigns_deny': AppConstants.apiEndpoint + 'ownership/consigns/deny/',
+    'ownership_unconsigns': AppConstants.apiEndpoint + 'ownership/unconsigns/',
+    'ownership_unconsigns_request': AppConstants.apiEndpoint + 'ownership/unconsigns/request/',
+    'ownership_unconsigns_deny': AppConstants.apiEndpoint + 'ownership/unconsigns/deny/',
+    'ownership_loans': AppConstants.apiEndpoint + 'ownership/loans/',
+    'ownership_loans_confirm': AppConstants.apiEndpoint + 'ownership/loans/confirm/',
+    'ownership_loans_deny': AppConstants.apiEndpoint + 'ownership/loans/deny/',
+    'note_notes': AppConstants.apiEndpoint + 'note/notes/',
+    'user': AppConstants.apiEndpoint + 'users/',
+    'users_login': AppConstants.apiEndpoint + 'users/login/'
 };
 
 export default apiUrls;
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index 3f2ca621..508eebda 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -5,9 +5,9 @@ let constants = {
 
     //FIXME: referring to a global variable in `window` is not
     //       super pro. What if we render stuff on the server?
-    'baseUrl': window.BASE_URL,
+    //'baseUrl': window.BASE_URL,
     'apiEndpoint': window.API_ENDPOINT,
-    //'baseUrl': 'http://staging.ascribe.io/api/',
+    'baseUrl': 'http://staging.ascribe.io/api/',
     'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000
     'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
         'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']

From 5e746295bc5040d6f585bf77fc3658a26ef06af9 Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Thu, 11 Jun 2015 16:24:37 +0200
Subject: [PATCH 03/12] application constants

---
 js/app.js                             | 8 ++++----
 js/constants/application_constants.js | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/app.js b/js/app.js
index 447ecc96..88809c50 100644
--- a/js/app.js
+++ b/js/app.js
@@ -15,15 +15,15 @@ let headers = {
     'Content-Type': 'application/json'
 };
 
-if (window.DEBUG) {
-    headers.Authorization = 'Basic ' + window.CREDENTIALS;
-}
+//if (window.DEBUG) {
+//    headers.Authorization = 'Basic ' + window.CREDENTIALS;
+//}
 
 fetch.defaults({
     urlMap: ApiUrls,
     http: {
         headers: headers,
-        credentials: 'same-origin'
+        credentials: 'include'
     },
     fatalErrorHandler: (err) => {
         console.log(err);
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index 508eebda..da7c8482 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -5,10 +5,10 @@ let constants = {
 
     //FIXME: referring to a global variable in `window` is not
     //       super pro. What if we render stuff on the server?
-    //'baseUrl': window.BASE_URL,
+    'baseUrl': window.BASE_URL,
     'apiEndpoint': window.API_ENDPOINT,
-    'baseUrl': 'http://staging.ascribe.io/api/',
-    'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000
+    //'baseUrl': 'http://staging.ascribe.io/api/',
+    //'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000
     'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
         'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']
 };

From fa97470e21ff5fa2dcc9eec0a2888ed49e55584e Mon Sep 17 00:00:00 2001
From: vrde <agranzot@gmail.com>
Date: Thu, 11 Jun 2015 17:07:27 +0200
Subject: [PATCH 04/12] Enable CORS on the frontend

---
 js/app.js                             | 6 +-----
 js/constants/application_constants.js | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/js/app.js b/js/app.js
index 447ecc96..7b2b485e 100644
--- a/js/app.js
+++ b/js/app.js
@@ -15,15 +15,11 @@ let headers = {
     'Content-Type': 'application/json'
 };
 
-if (window.DEBUG) {
-    headers.Authorization = 'Basic ' + window.CREDENTIALS;
-}
-
 fetch.defaults({
     urlMap: ApiUrls,
     http: {
         headers: headers,
-        credentials: 'same-origin'
+        credentials: 'cors'
     },
     fatalErrorHandler: (err) => {
         console.log(err);
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index 508eebda..498a26f0 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -7,7 +7,7 @@ let constants = {
     //       super pro. What if we render stuff on the server?
     //'baseUrl': window.BASE_URL,
     'apiEndpoint': window.API_ENDPOINT,
-    'baseUrl': 'http://staging.ascribe.io/api/',
+    'baseUrl': window.BASE_URL,
     'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000
     'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
         'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']

From 0f1108b14eb641c60a73c8b621745e499fb8b4f5 Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Thu, 11 Jun 2015 17:22:11 +0200
Subject: [PATCH 05/12] form password + signup

---
 js/app.js                                     |  2 +-
 .../ascribe_forms/form_password_reset.js      | 51 ++++++++++++
 .../form_password_reset_request.js            | 41 ++++++++++
 js/components/ascribe_forms/form_signup.js    | 80 +++++++++++++++++++
 js/constants/api_urls.js                      |  5 +-
 5 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 js/components/ascribe_forms/form_password_reset.js
 create mode 100644 js/components/ascribe_forms/form_password_reset_request.js
 create mode 100644 js/components/ascribe_forms/form_signup.js

diff --git a/js/app.js b/js/app.js
index 88809c50..2483fea9 100644
--- a/js/app.js
+++ b/js/app.js
@@ -23,7 +23,7 @@ fetch.defaults({
     urlMap: ApiUrls,
     http: {
         headers: headers,
-        credentials: 'include'
+        credentials: 'cors'
     },
     fatalErrorHandler: (err) => {
         console.log(err);
diff --git a/js/components/ascribe_forms/form_password_reset.js b/js/components/ascribe_forms/form_password_reset.js
new file mode 100644
index 00000000..8c2e4d61
--- /dev/null
+++ b/js/components/ascribe_forms/form_password_reset.js
@@ -0,0 +1,51 @@
+'use strict';
+
+import React from 'react';
+
+import apiUrls from '../../constants/api_urls';
+import FormMixin from '../../mixins/form_mixin';
+import InputText from './input_text';
+import ButtonSubmitOrClose from '../ascribe_buttons/button_submit_close';
+
+let PasswordResetForm = React.createClass({
+    mixins: [FormMixin],
+
+    url() {
+        return apiUrls.users_password_reset;
+    },
+    
+    getFormData() {
+        return {
+            email: this.props.email,
+            token: this.props.token,
+            password: this.refs.password.state.value,
+            password_confirm: this.refs.password_confirm.state.value
+        };
+    },
+
+    renderForm() {
+        return (
+            <form id="reset_password_modal_content" role="form" onSubmit={this.submit}>
+                <div>Reset the password for {this.props.email}:</div>
+                <InputText
+                    ref="password"
+                    placeHolder="Choose a password"
+                    required="required"
+                    type="password"
+                    submitted={this.state.submitted}/>
+                <InputText
+                    ref="password_confirm"
+                    placeHolder="Confirm password"
+                    required="required"
+                    type="password"
+                    submitted={this.state.submitted}/>
+                <ButtonSubmitOrClose
+                    text="RESET PASSWORD"
+                    onClose={this.props.onRequestHide}
+                    submitted={this.state.submitted} />
+            </form>
+        );
+    }
+});
+
+export default PasswordResetForm;
\ No newline at end of file
diff --git a/js/components/ascribe_forms/form_password_reset_request.js b/js/components/ascribe_forms/form_password_reset_request.js
new file mode 100644
index 00000000..f61e8b05
--- /dev/null
+++ b/js/components/ascribe_forms/form_password_reset_request.js
@@ -0,0 +1,41 @@
+'use strict';
+
+import React from 'react';
+
+import apiUrls from '../../constants/api_urls';
+import FormMixin from '../../mixins/form_mixin';
+import InputText from './input_text';
+import ButtonSubmitOrClose from '../ascribe_buttons/button_submit_close';
+
+let PasswordResetRequestForm = React.createClass({
+    mixins: [FormMixin],
+
+    url() {
+        return apiUrls.users_password_reset_request;
+    },
+    
+    getFormData() {
+        return {
+            email: this.refs.email.state.value
+        };
+    },
+
+    renderForm() {
+        return (
+            <form id="request_reset_password_modal_content" role="form" onSubmit={this.submit}>
+                <InputText
+                    ref="email"
+                    placeHolder="Email"
+                    required="required"
+                    type="email"
+                    submitted={this.state.submitted}/>
+                <ButtonSubmitOrClose
+                    text="RESET PASSWORD"
+                    onClose={this.props.onRequestHide}
+                    submitted={this.state.submitted} />
+            </form>
+        );
+    }
+});
+
+export default PasswordResetRequestForm;
\ No newline at end of file
diff --git a/js/components/ascribe_forms/form_signup.js b/js/components/ascribe_forms/form_signup.js
new file mode 100644
index 00000000..ba24b351
--- /dev/null
+++ b/js/components/ascribe_forms/form_signup.js
@@ -0,0 +1,80 @@
+'use strict';
+
+import React from 'react';
+
+import apiUrls from '../../constants/api_urls';
+import FormMixin from '../../mixins/form_mixin';
+import InputText from './input_text';
+import InputCheckbox from './input_checkbox';
+import ButtonSubmitOrClose from '../ascribe_buttons/button_submit_close';
+
+let SignupForm = React.createClass({
+    mixins: [FormMixin],
+
+    url() {
+        return apiUrls.users_signup;
+    },
+    
+    getFormData() {
+        return {
+            email: this.refs.email.state.value,
+            password: this.refs.password.state.value,
+            password_confirm: this.refs.password_confirm.state.value,
+            terms: this.refs.terms.state.value,
+            promo_code: this.refs.promo_code.state.value
+        };
+    },
+
+    renderForm() {
+        return (
+            <form id="signup_modal_content" role="form" onSubmit={this.submit}>
+                <input className="invisible" type="email" name="fake_consignee"/>
+                <input className="invisible" type="password" name="fake_password"/>
+                <InputText
+                    ref="email"
+                    placeHolder="Email"
+                    required="required"
+                    type="email"
+                    submitted={this.state.submitted}/>
+                <InputText
+                    ref="password"
+                    placeHolder="Choose a password"
+                    required="required"
+                    type="password"
+                    submitted={this.state.submitted}/>
+                <InputText
+                    ref="password_confirm"
+                    placeHolder="Confirm password"
+                    required="required"
+                    type="password"
+                    submitted={this.state.submitted}/>
+                <div>
+                    Your password must be at least 10 characters.
+                    This password is securing your digital property like a bank account.
+                    Store it in a safe place!
+                </div>
+                <InputCheckbox
+                    ref="terms"
+                    required="required"
+                    label={
+                        <div>
+                            I agree to the&nbsp;
+                            <a href="/terms" target="_blank"> Terms of Service</a>
+                        </div>}
+                />)
+                <InputText
+                    ref="promo_code"
+                    placeHolder="Promocode (Optional)"
+                    required=""
+                    type="text"
+                    submitted={this.state.submitted}/>
+                <ButtonSubmitOrClose
+                    text="JOIN US"
+                    onClose={this.props.onRequestHide}
+                    submitted={this.state.submitted} />
+            </form>
+        );
+    }
+});
+
+export default SignupForm;
\ No newline at end of file
diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js
index 1bc835cd..9c00812d 100644
--- a/js/constants/api_urls.js
+++ b/js/constants/api_urls.js
@@ -23,7 +23,10 @@ let apiUrls = {
     'ownership_loans_deny': AppConstants.apiEndpoint + 'ownership/loans/deny/',
     'note_notes': AppConstants.apiEndpoint + 'note/notes/',
     'user': AppConstants.apiEndpoint + 'users/',
-    'users_login': AppConstants.apiEndpoint + 'users/login/'
+    'users_login': AppConstants.apiEndpoint + 'users/login/',
+    'users_signup': AppConstants.apiEndpoint + 'users/',
+    'users_password_reset_request': AppConstants.apiEndpoint + 'users/request_reset_password/',
+    'users_password_reset': AppConstants.apiEndpoint + 'users/reset_password/'
 };
 
 export default apiUrls;

From aac8ae2a9e84bc9f86713cd2ad80b78717ccd494 Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Mon, 15 Jun 2015 11:02:49 +0200
Subject: [PATCH 06/12] merged master

---
 js/app.js                             | 3 ++-
 js/components/header.js               | 5 ++++-
 js/constants/application_constants.js | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/js/app.js b/js/app.js
index 7b2b485e..a3b61520 100644
--- a/js/app.js
+++ b/js/app.js
@@ -19,7 +19,8 @@ fetch.defaults({
     urlMap: ApiUrls,
     http: {
         headers: headers,
-        credentials: 'cors'
+        credentials: 'cors',
+        mode: 'cors-with-forced-preflight'
     },
     fatalErrorHandler: (err) => {
         console.log(err);
diff --git a/js/components/header.js b/js/components/header.js
index 6c8145e6..44c25bdb 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -6,6 +6,8 @@ import Router from 'react-router';
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
 
+import PieceListActions from '../actions/piece_list_actions';
+
 import Nav from 'react-bootstrap/lib/Nav';
 import Navbar from 'react-bootstrap/lib/Navbar';
 import DropdownButton from 'react-bootstrap/lib/DropdownButton';
@@ -38,6 +40,7 @@ let Header = React.createClass({
     },
     handleLoginSuccess(){
         UserActions.fetchCurrentUser();
+        PieceListActions.fetchPieceList(1, 10);
     },
 
     render() {
@@ -51,7 +54,7 @@ let Header = React.createClass({
                 </Nav>
                 <Nav right>
                     <ModalWrapper
-                        button={<div className='btn btn-default btn-sm'>LOGIN</div>}
+                        button={<Link className='btn btn-default btn-sm' to="pieces">LOGIN</Link>}
                         title='Log in to ascribe'
                         handleSuccess={this.handleLoginSuccess}
                         tooltip='Log in to ascribe'>
diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js
index 498a26f0..45c8ffa1 100644
--- a/js/constants/application_constants.js
+++ b/js/constants/application_constants.js
@@ -8,7 +8,7 @@ let constants = {
     //'baseUrl': window.BASE_URL,
     'apiEndpoint': window.API_ENDPOINT,
     'baseUrl': window.BASE_URL,
-    'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000
+    //'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000
     'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
         'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']
 };

From 07686f514f36c4fa5aeadc079b0112acd4c54018 Mon Sep 17 00:00:00 2001
From: vrde <agranzot@gmail.com>
Date: Mon, 15 Jun 2015 11:55:50 +0200
Subject: [PATCH 07/12] Fix (hopefully) CORS

---
 js/app.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/js/app.js b/js/app.js
index a3b61520..c50dd902 100644
--- a/js/app.js
+++ b/js/app.js
@@ -19,8 +19,7 @@ fetch.defaults({
     urlMap: ApiUrls,
     http: {
         headers: headers,
-        credentials: 'cors',
-        mode: 'cors-with-forced-preflight'
+        credentials: 'include'
     },
     fatalErrorHandler: (err) => {
         console.log(err);

From 66f8a6a1cafff04a70ac8f8be48a01699642422b Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Mon, 15 Jun 2015 12:36:27 +0200
Subject: [PATCH 08/12] login/logout functional

---
 js/components/header.js  | 39 ++++++++++++++++++++++++---------------
 js/constants/api_urls.js |  1 +
 sass/main.scss           |  4 ++++
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/js/components/header.js b/js/components/header.js
index 44c25bdb..1fdd41f9 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -6,10 +6,13 @@ import Router from 'react-router';
 import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
 
+import apiUrls from '../constants/api_urls.js';
+
 import PieceListActions from '../actions/piece_list_actions';
 
 import Nav from 'react-bootstrap/lib/Nav';
 import Navbar from 'react-bootstrap/lib/Navbar';
+import NavItem from 'react-bootstrap/lib/NavItem';
 import DropdownButton from 'react-bootstrap/lib/DropdownButton';
 import MenuItem from 'react-bootstrap/lib/MenuItem';
 
@@ -44,6 +47,26 @@ let Header = React.createClass({
     },
 
     render() {
+        let account = (
+            <ModalWrapper
+                button={<NavItem to="pieces">LOGIN</NavItem>}
+                title='Log in to ascribe'
+                handleSuccess={this.handleLoginSuccess}
+                tooltip='Log in to ascribe'>
+                <LoginForm />
+            </ModalWrapper>);
+        if (this.state.currentUser.username){
+            account = (
+                <DropdownButton eventKey="1" title={this.state.currentUser.username}>
+                        <MenuItem eventKey="1" href="/art/account_settings/">{getLangText('Account Settings')}</MenuItem>
+                        <li className="divider"></li>
+                        <MenuItem eventKey="2" href="/art/faq/">{getLangText('FAQ')}</MenuItem>
+                        <MenuItem eventKey="3" href="/art/terms/">{getLangText('Terms of Service')}</MenuItem>
+                        <MenuItem divider />
+                        <MenuItem eventKey="4" href={apiUrls.users_logout}>{getLangText('Log out')}</MenuItem>
+                  </DropdownButton>
+            );
+        }
         return (
             <Navbar>
                 <Nav>
@@ -53,21 +76,7 @@ let Header = React.createClass({
                     </Link>
                 </Nav>
                 <Nav right>
-                    <ModalWrapper
-                        button={<Link className='btn btn-default btn-sm' to="pieces">LOGIN</Link>}
-                        title='Log in to ascribe'
-                        handleSuccess={this.handleLoginSuccess}
-                        tooltip='Log in to ascribe'>
-                        <LoginForm />
-                    </ModalWrapper>
-                    <DropdownButton eventKey="1" title={this.state.currentUser.username}>
-                        <MenuItem eventKey="1" href="/art/account_settings/">{getLangText('Account Settings')}</MenuItem>
-                        <li className="divider"></li>
-                        <MenuItem eventKey="2" href="/art/faq/">{getLangText('FAQ')}</MenuItem>
-                        <MenuItem eventKey="3" href="/art/terms/">{getLangText('Terms of Service')}</MenuItem>
-                        <MenuItem divider />
-                        <MenuItem eventKey="4" href="/api/users/logout/">{getLangText('Log out')}</MenuItem>
-                  </DropdownButton>
+                    {account}
                 </Nav>
             </Navbar>
         );
diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js
index 9c00812d..e033599c 100644
--- a/js/constants/api_urls.js
+++ b/js/constants/api_urls.js
@@ -24,6 +24,7 @@ let apiUrls = {
     'note_notes': AppConstants.apiEndpoint + 'note/notes/',
     'user': AppConstants.apiEndpoint + 'users/',
     'users_login': AppConstants.apiEndpoint + 'users/login/',
+    'users_logout': AppConstants.apiEndpoint + 'users/logout/',
     'users_signup': AppConstants.apiEndpoint + 'users/',
     'users_password_reset_request': AppConstants.apiEndpoint + 'users/request_reset_password/',
     'users_password_reset': AppConstants.apiEndpoint + 'users/reset_password/'
diff --git a/sass/main.scss b/sass/main.scss
index 82a105b0..ad3e69e1 100644
--- a/sass/main.scss
+++ b/sass/main.scss
@@ -29,6 +29,10 @@ $BASE_URL: '<%= BASE_URL %>';
     border-top:0;
 }
 
+.navbar-right {
+    margin-right: 0;
+}
+
 .clear-paddings {
     padding-left:0;
     padding-right:0;

From 56d32efcc0138ea85bddfb02ca602406bdc5863c Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Mon, 15 Jun 2015 15:28:53 +0200
Subject: [PATCH 09/12] password reset modal switch problems

---
 js/components/ascribe_forms/form_login.js     | 12 +++++--
 js/components/ascribe_forms/form_signup.js    |  3 +-
 js/components/ascribe_modal/modal_login.js    | 32 +++++++++++++++++++
 .../modal_password_request_reset.js           | 30 +++++++++++++++++
 js/components/ascribe_modal/modal_signup.js   | 31 ++++++++++++++++++
 js/components/header.js                       | 30 +++++++++--------
 js/routes.js                                  |  3 +-
 7 files changed, 122 insertions(+), 19 deletions(-)
 create mode 100644 js/components/ascribe_modal/modal_login.js
 create mode 100644 js/components/ascribe_modal/modal_password_request_reset.js
 create mode 100644 js/components/ascribe_modal/modal_signup.js

diff --git a/js/components/ascribe_forms/form_login.js b/js/components/ascribe_forms/form_login.js
index c768211f..1a4f2672 100644
--- a/js/components/ascribe_forms/form_login.js
+++ b/js/components/ascribe_forms/form_login.js
@@ -7,6 +7,9 @@ import FormMixin from '../../mixins/form_mixin';
 import InputText from './input_text';
 import ButtonSubmitOrClose from '../ascribe_buttons/button_submit_close';
 
+import SignupModal from '../ascribe_modal/modal_signup';
+import PasswordResetRequestModal from '../ascribe_modal/modal_password_request_reset';
+
 let LoginForm = React.createClass({
     mixins: [FormMixin],
 
@@ -21,7 +24,6 @@ let LoginForm = React.createClass({
             password: this.refs.password.state.value
         };
     },
-
     renderForm() {
         return (
             <form id="login_modal_content" role="form" onSubmit={this.submit}>
@@ -40,10 +42,14 @@ let LoginForm = React.createClass({
                     type="password"
                     submitted={this.state.submitted}/>
                 <div>
-                        Forgot your password&#63; <a className="button" href="#" id="request_reset_pwd_from_login_btn">Reset password</a>.
+                    Forgot your password&#63;
+                    <PasswordResetRequestModal
+                        button={<a className="button" href="#"> Reset password</a>}/>
                 </div>
                 <div>
-                    Not a member yet&#63; <a className="button" href="#" id="signup_from_login_btn">Sign up</a>.
+                    Not a member yet&#63;
+                    <SignupModal
+                        button={<a className="button" href="#"> Sign up</a>}/>
                 </div>
                 <ButtonSubmitOrClose
                     text="LOGIN"
diff --git a/js/components/ascribe_forms/form_signup.js b/js/components/ascribe_forms/form_signup.js
index ba24b351..f46a0b64 100644
--- a/js/components/ascribe_forms/form_signup.js
+++ b/js/components/ascribe_forms/form_signup.js
@@ -60,8 +60,7 @@ let SignupForm = React.createClass({
                         <div>
                             I agree to the&nbsp;
                             <a href="/terms" target="_blank"> Terms of Service</a>
-                        </div>}
-                />)
+                        </div>}/>
                 <InputText
                     ref="promo_code"
                     placeHolder="Promocode (Optional)"
diff --git a/js/components/ascribe_modal/modal_login.js b/js/components/ascribe_modal/modal_login.js
new file mode 100644
index 00000000..fae1e2d7
--- /dev/null
+++ b/js/components/ascribe_modal/modal_login.js
@@ -0,0 +1,32 @@
+'use strict';
+
+import React from 'react';
+
+import ModalWrapper from './modal_wrapper';
+import LoginForm from '../ascribe_forms/form_login';
+
+import GlobalNotificationModel from '../../models/global_notification_model';
+import GlobalNotificationActions from '../../actions/global_notification_actions';
+
+let LoginModal = React.createClass({
+    handleLoginSuccess(){
+        this.props.handleSuccess();
+        let notificationText = 'Login successful';
+        let notification = new GlobalNotificationModel(notificationText, 'success');
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+
+    render() {
+        return (
+            <ModalWrapper
+                button={this.props.button}
+                title='Log in to ascribe'
+                handleSuccess={this.handleLoginSuccess}
+                tooltip='Log in to ascribe'>
+                <LoginForm />
+            </ModalWrapper>
+        );
+    }
+});
+
+export default LoginModal;
diff --git a/js/components/ascribe_modal/modal_password_request_reset.js b/js/components/ascribe_modal/modal_password_request_reset.js
new file mode 100644
index 00000000..17768f2c
--- /dev/null
+++ b/js/components/ascribe_modal/modal_password_request_reset.js
@@ -0,0 +1,30 @@
+'use strict';
+
+import React from 'react';
+
+import ModalWrapper from './modal_wrapper';
+import PasswordResetRequestForm from '../ascribe_forms/form_password_reset_request';
+
+import GlobalNotificationModel from '../../models/global_notification_model';
+import GlobalNotificationActions from '../../actions/global_notification_actions';
+
+let PasswordResetRequestModal = React.createClass({
+    handleResetSuccess(){
+        let notificationText = 'Request succesfully sent, check your email';
+        let notification = new GlobalNotificationModel(notificationText, 'success', 50000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+    render() {
+        return (
+            <ModalWrapper
+                button={this.props.button}
+                title='Reset your password'
+                handleSuccess={this.handleResetSuccess}
+                tooltip='Reset your password'>
+                <PasswordResetRequestForm />
+            </ModalWrapper>
+        );
+    }
+});
+
+export default PasswordResetRequestModal;
diff --git a/js/components/ascribe_modal/modal_signup.js b/js/components/ascribe_modal/modal_signup.js
new file mode 100644
index 00000000..0cd32a0a
--- /dev/null
+++ b/js/components/ascribe_modal/modal_signup.js
@@ -0,0 +1,31 @@
+'use strict';
+
+import React from 'react';
+
+import ModalWrapper from './modal_wrapper';
+import SignupForm from '../ascribe_forms/form_signup';
+
+import GlobalNotificationModel from '../../models/global_notification_model';
+import GlobalNotificationActions from '../../actions/global_notification_actions';
+
+let SignupModal = React.createClass({
+    handleSignupSuccess(response){
+        let notificationText = 'We sent an email to your address ' + response.user.email + ', please confirm.';
+        let notification = new GlobalNotificationModel(notificationText, 'success', 50000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+
+    render() {
+        return (
+            <ModalWrapper
+                button={this.props.button}
+                title='Create an account'
+                handleSuccess={this.handleSignupSuccess}
+                tooltip='Sign up to ascribe'>
+                <SignupForm />
+            </ModalWrapper>
+        );
+    }
+});
+
+export default SignupModal;
diff --git a/js/components/header.js b/js/components/header.js
index 1fdd41f9..9130b675 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -7,7 +7,6 @@ import UserActions from '../actions/user_actions';
 import UserStore from '../stores/user_store';
 
 import apiUrls from '../constants/api_urls.js';
-
 import PieceListActions from '../actions/piece_list_actions';
 
 import Nav from 'react-bootstrap/lib/Nav';
@@ -16,8 +15,9 @@ import NavItem from 'react-bootstrap/lib/NavItem';
 import DropdownButton from 'react-bootstrap/lib/DropdownButton';
 import MenuItem from 'react-bootstrap/lib/MenuItem';
 
-import ModalWrapper from '../components/ascribe_modal/modal_wrapper';
-import LoginForm from '../components/ascribe_forms/form_login';
+import LoginModal from '../components/ascribe_modal/modal_login';
+import SignupModal from '../components/ascribe_modal/modal_signup';
+
 
 import { getLangText } from '../utils/lang_utils';
 
@@ -41,20 +41,14 @@ let Header = React.createClass({
     onChange(state) {
         this.setState(state);
     },
-    handleLoginSuccess(){
+
+    refreshData(){
         UserActions.fetchCurrentUser();
         PieceListActions.fetchPieceList(1, 10);
     },
-
     render() {
-        let account = (
-            <ModalWrapper
-                button={<NavItem to="pieces">LOGIN</NavItem>}
-                title='Log in to ascribe'
-                handleSuccess={this.handleLoginSuccess}
-                tooltip='Log in to ascribe'>
-                <LoginForm />
-            </ModalWrapper>);
+        let account = null;
+        let signup = null;
         if (this.state.currentUser.username){
             account = (
                 <DropdownButton eventKey="1" title={this.state.currentUser.username}>
@@ -67,6 +61,15 @@ let Header = React.createClass({
                   </DropdownButton>
             );
         }
+        else {
+            account = (
+                <LoginModal
+                    button={<NavItem to="pieces">LOGIN</NavItem>}
+                    handleSuccess={this.refreshData}/>);
+            signup = (
+                <SignupModal
+                    button={<NavItem to="pieces">SIGNUP</NavItem>} />);
+        }
         return (
             <Navbar>
                 <Nav>
@@ -77,6 +80,7 @@ let Header = React.createClass({
                 </Nav>
                 <Nav right>
                     {account}
+                    {signup}
                 </Nav>
             </Navbar>
         );
diff --git a/js/routes.js b/js/routes.js
index 5232f0d3..10362199 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -6,7 +6,7 @@ import Router from 'react-router';
 import AscribeApp from './components/ascribe_app';
 import PieceList from './components/piece_list';
 import EditionContainer from './components/edition_container';
-
+import PasswordResetForm from './components/ascribe_forms/form_password_reset';
 import AppConstants from './constants/application_constants';
 
 let Route = Router.Route;
@@ -18,6 +18,7 @@ let routes = (
     <Route name="app" path={baseUrl} handler={AscribeApp}>
         <Route name="pieces" path="collection" handler={PieceList} />
         <Route name="edition" path="editions/:editionId" handler={EditionContainer} />
+        <Route name="password_reset" path="password_reset" handler={PasswordResetForm} />
 
         <Redirect from={baseUrl} to="pieces" />
         <Redirect from={baseUrl + '/'} to="pieces" />

From 8ceabda1c5d9058a2a59d5687c14f1a3403c759c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Mon, 15 Jun 2015 15:46:33 +0200
Subject: [PATCH 10/12] add queryparams modal

---
 js/components/login_modal_handler.js | 42 ++++++++++++++++++++++++++++
 js/routes.js                         |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 js/components/login_modal_handler.js

diff --git a/js/components/login_modal_handler.js b/js/components/login_modal_handler.js
new file mode 100644
index 00000000..e224cc60
--- /dev/null
+++ b/js/components/login_modal_handler.js
@@ -0,0 +1,42 @@
+'use strict';
+
+import React from 'react';
+
+import Button from 'react-bootstrap/lib/Button';
+import Modal from 'react-bootstrap/lib/Modal';
+import OverlayMixin from 'react-bootstrap/lib/OverlayMixin';
+
+let LoginModalHandler = React.createClass({
+  mixins: [OverlayMixin],
+
+  getInitialState() {
+    return {
+      isModalOpen: true
+    };
+  },
+
+  handleToggle() {
+    this.setState({
+      isModalOpen: !this.state.isModalOpen
+    });
+  },
+
+  render() {
+    if (!this.state.isModalOpen || !(this.props.query.login === '')) {
+      return <span/>;
+    }
+
+    return (
+      <Modal title='Modal heading' onRequestHide={this.handleToggle}>
+        <div className='modal-body'>
+          This modal is controlled by our custom trigger component.
+        </div>
+        <div className='modal-footer'>
+          <Button onClick={this.handleToggle}>Close</Button>
+        </div>
+      </Modal>
+    );
+  }
+});
+
+export default LoginModalHandler;
\ No newline at end of file
diff --git a/js/routes.js b/js/routes.js
index 10362199..3617cbbc 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -8,6 +8,7 @@ import PieceList from './components/piece_list';
 import EditionContainer from './components/edition_container';
 import PasswordResetForm from './components/ascribe_forms/form_password_reset';
 import AppConstants from './constants/application_constants';
+import LoginModalHandler from './components/login_modal_handler';
 
 let Route = Router.Route;
 let Redirect = Router.Redirect;
@@ -16,6 +17,7 @@ let baseUrl = AppConstants.baseUrl;
 
 let routes = (
     <Route name="app" path={baseUrl} handler={AscribeApp}>
+        <Route name="login" path="*" handler={LoginModalHandler} />
         <Route name="pieces" path="collection" handler={PieceList} />
         <Route name="edition" path="editions/:editionId" handler={EditionContainer} />
         <Route name="password_reset" path="password_reset" handler={PasswordResetForm} />

From cf3b7f234d935744f7f34e828cc2c9153dc6e37c Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Mon, 15 Jun 2015 16:56:17 +0200
Subject: [PATCH 11/12] password reset ok

---
 .../ascribe_buttons/button_submit.js          | 27 +++++++++++++++++
 .../ascribe_forms/form_password_reset.js      |  7 ++---
 js/components/password_reset_container.js     | 30 +++++++++++++++++++
 js/routes.js                                  |  7 ++---
 4 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 js/components/ascribe_buttons/button_submit.js
 create mode 100644 js/components/password_reset_container.js

diff --git a/js/components/ascribe_buttons/button_submit.js b/js/components/ascribe_buttons/button_submit.js
new file mode 100644
index 00000000..ef5999cd
--- /dev/null
+++ b/js/components/ascribe_buttons/button_submit.js
@@ -0,0 +1,27 @@
+'use strict';
+
+import React from 'react';
+
+let ButtonSubmitOrClose = React.createClass({
+    propTypes: {
+        submitted: React.PropTypes.bool.isRequired,
+        text: React.PropTypes.string.isRequired
+    },
+
+    render() {
+        if (this.props.submitted){
+            return (
+                <div className="modal-footer">
+                    <img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" />
+                </div>
+            );
+        }
+        return (
+            <div className="modal-footer">
+                <button type="submit" className="btn btn-ascribe-inv">{this.props.text}</button>
+            </div>
+        );
+    }
+});
+
+export default ButtonSubmitOrClose;
diff --git a/js/components/ascribe_forms/form_password_reset.js b/js/components/ascribe_forms/form_password_reset.js
index 8c2e4d61..60e9b077 100644
--- a/js/components/ascribe_forms/form_password_reset.js
+++ b/js/components/ascribe_forms/form_password_reset.js
@@ -5,7 +5,7 @@ import React from 'react';
 import apiUrls from '../../constants/api_urls';
 import FormMixin from '../../mixins/form_mixin';
 import InputText from './input_text';
-import ButtonSubmitOrClose from '../ascribe_buttons/button_submit_close';
+import ButtonSubmit from '../ascribe_buttons/button_submit';
 
 let PasswordResetForm = React.createClass({
     mixins: [FormMixin],
@@ -13,7 +13,7 @@ let PasswordResetForm = React.createClass({
     url() {
         return apiUrls.users_password_reset;
     },
-    
+
     getFormData() {
         return {
             email: this.props.email,
@@ -39,9 +39,8 @@ let PasswordResetForm = React.createClass({
                     required="required"
                     type="password"
                     submitted={this.state.submitted}/>
-                <ButtonSubmitOrClose
+                <ButtonSubmit
                     text="RESET PASSWORD"
-                    onClose={this.props.onRequestHide}
                     submitted={this.state.submitted} />
             </form>
         );
diff --git a/js/components/password_reset_container.js b/js/components/password_reset_container.js
new file mode 100644
index 00000000..2df20ef0
--- /dev/null
+++ b/js/components/password_reset_container.js
@@ -0,0 +1,30 @@
+'use strict';
+
+import React from 'react';
+import Router from 'react-router';
+
+import PasswordResetForm from './ascribe_forms/form_password_reset';
+
+import GlobalNotificationModel from '../models/global_notification_model';
+import GlobalNotificationActions from '../actions/global_notification_actions';
+
+let PasswordResetContainer = React.createClass({
+    mixins: [Router.Navigation],
+
+    handleSuccess(){
+        this.transitionTo('pieces');
+        let notification = new GlobalNotificationModel('password succesfully updated', 'success', 10000);
+        GlobalNotificationActions.appendGlobalNotification(notification);
+    },
+    render() {
+        return (
+            <PasswordResetForm
+                email={this.props.query.email}
+                token={this.props.query.token}
+                handleSuccess={this.handleSuccess}
+            />
+      );
+  }
+});
+
+export default PasswordResetContainer;
\ No newline at end of file
diff --git a/js/routes.js b/js/routes.js
index 3617cbbc..b5196a77 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -6,9 +6,9 @@ import Router from 'react-router';
 import AscribeApp from './components/ascribe_app';
 import PieceList from './components/piece_list';
 import EditionContainer from './components/edition_container';
-import PasswordResetForm from './components/ascribe_forms/form_password_reset';
+import PasswordResetContainer from './components/password_reset_container';
 import AppConstants from './constants/application_constants';
-import LoginModalHandler from './components/login_modal_handler';
+//import LoginModalHandler from './components/login_modal_handler';
 
 let Route = Router.Route;
 let Redirect = Router.Redirect;
@@ -17,10 +17,9 @@ let baseUrl = AppConstants.baseUrl;
 
 let routes = (
     <Route name="app" path={baseUrl} handler={AscribeApp}>
-        <Route name="login" path="*" handler={LoginModalHandler} />
         <Route name="pieces" path="collection" handler={PieceList} />
         <Route name="edition" path="editions/:editionId" handler={EditionContainer} />
-        <Route name="password_reset" path="password_reset" handler={PasswordResetForm} />
+        <Route name="password_reset" path="password_reset" handler={PasswordResetContainer} />
 
         <Redirect from={baseUrl} to="pieces" />
         <Redirect from={baseUrl + '/'} to="pieces" />

From 3784d53609fd893424c349e68874ab8064143504 Mon Sep 17 00:00:00 2001
From: ddejongh <dimi.dejonghe@gmail.com>
Date: Tue, 16 Jun 2015 10:02:55 +0200
Subject: [PATCH 12/12] code review

---
 gulpfile.js                                    |   2 +-
 img/ascribe_animated_large.gif                 | Bin 0 -> 24891 bytes
 img/ascribe_animated_medium.gif                | Bin 0 -> 5855 bytes
 img/ascribe_animated_small.gif                 | Bin 0 -> 2605 bytes
 js/components/ascribe_buttons/delete_button.js |   2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 img/ascribe_animated_large.gif
 create mode 100644 img/ascribe_animated_medium.gif
 create mode 100644 img/ascribe_animated_small.gif

diff --git a/gulpfile.js b/gulpfile.js
index 0d6ad42a..cd6bfea4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -63,7 +63,7 @@ gulp.task('js:build', function() {
     bundle(false);
 });
 
-gulp.task('serve', ['browser-sync', 'run-server', 'sass:build', 'sass:watch', 'copy'], function() {
+gulp.task('serve', ['browser-sync', 'run-server', 'lint:watch', 'sass:build', 'sass:watch', 'copy'], function() {
     bundle(true);
 });
 
diff --git a/img/ascribe_animated_large.gif b/img/ascribe_animated_large.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bb3c620d334cc005b24fe10b0136e158a49e284b
GIT binary patch
literal 24891
zcmeI4Rao46mac&$Xb1_}cyM<M?vS8?2m}dG1TS0z6dv5&t#B!z2%1p1Ye9lT;qDMz
zi^=TnKHcX$XD;T<bf4+nbx~LUx_+Pcx7PYT1toc55yMcl6tqKhw7a`IG&D5Y%lr7h
zp`oME-r=de)KHg`dGnHwi{~EtuTLDmerW&xXEY3CM0CjjE&;v$QEhnjd}9T!tVW{t
zd}yIXuY8_H`}V8RJ&7)c_6a1otroxqAP9Md8KAH-#G|1s@{+RJ9a}^OTp|?yz@S3~
zI@NfqW;)?u%kCFH;8YvA+by-V$&UaWZ@7*VV~sy&!Tx5%(xU-%oMHx53+JVfD1`=o
zBQp)<OUAkEW=_F!_Y2*=n6S7?naSC}oc^$_#8OK8VaH7c(hx3l?VeLY#34TTri@HD
zRiw|F$e4slLRGciD}Ao~URL_t)NP|GlC?Q2C2F8~zZq+o%Rs@-_AZJWIvj0xKrIcz
zz$#={jHYQf3!8Yxp*UpN>9fz^y`uGFKn`hn&6kA6=P(J0QS-E}$&Xy60ggzQP>_U=
zWhVKuv3AJhFO`LpJIvQ?MKZF7OCxaJp7}Eq8q5RQVH+|QBRM?b?Rv^iY~w`=pS`Af
ztP&>5^~%ZpXQbKaOLT{~8JNyS`l>SH`ZS1y651gy1M4rY6FCxnjr?fR*PWP0i;=H}
zRy-a-KXwEJCgtH>*co*@QGzKt$WCS&mHJiHJZ9Qn+gK{9?~7if0+V%wtTj0(1eI&!
zs8<B{oL%=OW91Hb<q-mUG27Zj%lc2xbags<awqgXNu3*;d0h{R#08HI7kl~j%*G(|
zi*@h{TkTt+>o4J<J7@Eg7hXR%ksdt(83rEv`jZR1r}(7Wo@aXs+3pu2lQe!f$c+Wl
z4R|-$4^Ol>AYf~p`Qv9wKkXc4+IK90!31I7XdSf;6&C=rmER_UA6wSxhjT5vy|5IA
zTma0_+81*qr@KOo0)#I~8T^mt%xHkG1Rt!pKNqxUOOTSaFpVRT%w0=Hk6K#`kc^!w
zh_P^FDO3eQc;;Sd8HwZvMxAPyCR8@EzDX%N42=ahqglSmveBd~&dGu+G2(>s!I+Yj
zVI`YM3w@`>Tmds~tQm$-U~l0k2#78}Po8eO<YQzKTXAtA?rOdo-SmsX!hX@6_?&hK
zZFyqhG%!OuPL!ik?12i>GD>vFHLIwFxM3T+i=2eDI*AHvmUS32ue5d)nlMnSkj7dD
z`4N_`OLRF0GYXAchHz4#ue)!0g6pma-V4EjEHT$POB0c&GalS#X`pfCT5FgnSAFs+
z(U;7DeNuL<M_8vArCMj?OF5+K**`Og(wFU7@z{4cJMe{c9o4zjL>$Ap;_LT{-Q?qs
zIz?7gG#ZV!wW=d0$4>cM%E_OR!lx4Oo;OkXT=LnoI`%uOxkDfRFf?s;sqMtOtrXza
z*TR2IeZU2C0)=Eml#DJ4Xw{h7=K1Rv4H0uZ3+zq`bG5QDoO51aWuvGK9R{ts8V747
zeOs2J0C73RC|Gz4t@fz`zO98@&7ZA$<iWr7XCZDMtZPJPoxz=Q)GpT8DygcsJKDUR
z=b=BS>Sn&K44omcj+%|LZ_%k;C+-OEKoULlEpLJjpDcLhZ_-gU{TOx9YciU|%52Jr
za=jBiT~zP66@2g)7-9UCJf9V32L8mUUns&rCj2KUg!_L`D7^I~y(_3<nbFl#{{95u
zi-sBFMjf5IPODi%qJ2#U5M$gqM(Z2a*oG^S7ISgp8&c4w6Z7Qelo0T7-?U);J2SG7
z(1OrO)=L~w2ur6hBs2`-9tS)#CjqjFsUV(MUZxGW_an9%-i9JX#lKo`gqNW|OWeIF
z#-!x*lJU~<zb$Km!)fFP&n0a2Y?1oS&^bxI*Q5mc)Jfdl!wq-fa%vIZyZetAz6~$(
z2HYnqG{XLFNEL$5=$@PMovs@h_DD!RVKcT(PKbt=E#qCBVLt=ARMyQ%<=jgTZd&w`
zt%1k+DPrb@i<hD5B>r;DBdzrtA1l3Ieu7Bjs<UboP-Rz{OvYPG#7aHzBP;R+O6N#+
z0v<FF?P)__H)ZK3YXW8k6bF;WmHFrOz{9ZlhAo%!*+#XV+%E{?p9XF2?ZoSkg)5Dk
zA}+bg!p^_Qw_gYgL0^#^8^P1NOfMS8Sb$>`e6C-5KRE7=CF?fS;a_7-k3(pqiEU1S
z*54|8?g;^eYRrAQSgle(Vyuo2JH6O9g5MJ@j}E>Tr+Vfrb~-a(?=sBVjE*>}^>9$B
z$f{U4+xej&_56aj@wy#ZaX`5ReiaLso_E}*eZJ_>aO;|_GQNbF^?3uXmHlbR;XFG)
zLr2)qi7YDF(C?W`_k1u3DKlNrsDx`y*pnkyBYT=OmUjVDB?8M~TyfuweFf@z>E2My
zusn!R#lfMCRo=WXwvamtA&ie|V={=QU{WyltbdDbiVs%mqe=O&ES#rjWa+jZs~^Q0
z9otw?V&<YLe~&rwJyX3|ybT6fUc6qv4wIyP?li51$r;W>w&A=I4cOgi4H$Zb?!uCr
z`BK?XL#MkQzcAAB18aJWE$-X2a8OuwNkUHllM*}STu5ov+9iuvWze>1W@*1WeKxFK
z3CLD<_5ld(AXGsPRkli&n3T^^s-#y$a)p<9d|ign)O`lHl-J3;vno-abEn{{pl=o}
zDP9#tSVK3@1dD1!My^)Mj;eI6--b{06z1%yUD7n-$$Kz146YAsfe7$l*$1w*m+m*=
z#D6_(-N77S`G%ja#jAU=ymQ!1>(61|Lq+ncs)O9MUe~|(3Q^WgcW*X*fL?*4a_}AJ
zCZCPZ2s?jU26SR<m@s_yIBJMcBH@PuJ={JH=lCqCjMWJEB}hAr?Br`8ZN^^90iS4j
z7t4ypeiu)2#z~t|Fe_!3(D1e3_|-h4P-nMngI-HQk{&~MHOPy(g_elF&V+#4n*pXE
zA$}n*?q57dz4m|-SU(zMAo&L2G1&ypc)L;#bTipjy&6Br*<9H;oSr<Lfvijt7JI81
zG4H#?-3leb4u%@m`G|2mciQR6&iA1t)HiXh2Lm_L2CUp}CwZgG*HaUDT=1lEyM@Lr
z#m{zJXX>$cC*p`4aQzju@}ORsy4|N~Rd8hZcIkX&*sU?CZK1{ghqVWKz%*L8mb5V?
zj|Wao<~g}=6GG<DH9KA5mpA>%sQ!Ks`zKN<Sxj_tQN7hiIUS+Dv8(Ah9fG@%k<WPJ
zMtgZzUviU`JkX}$TT^<#?&bMRKDMAghJ^y=iPLWcPbG4dY^3Kj@3}Ajsec!=ML`p*
z5RQBy&2RCYn=M_`21EnV&{TK(z^UxaQu9_h!#fjn#`*>-4K*TKJmZ{=R7^mIP@Gu;
z^7+Ur3!Z2}5ly`5L20<chq_H~w!9^7NCJ)0Bil5&UTJd@Rk1Ranp#U+YyO~k3_iR`
zJqjH2RIr-c-Fa>~9?EOLL>b@|JY8c>+7v0~YE4i)V3`%}qG|FdtO<yz?=I3Y_+A}f
zlPdhusbb=%kx*fqpkv`&Q%9CU<LSjhRT@}|8Q}oD<bf;LU8hM@x1J)^Vf!{CpOhk2
zpMs7nJHP}d=;kz%XI&(-?tLQI`ff>YwKDDS3$>Ok%?j4QxU)(VIl&}DTFaQMW;EG>
z%*w(`wgi^vbeKeSiYpOZ6H~1r56x2YqQts^dEOFGw^fr&uVTz7jv;xv=x(J{6Nkry
ztby@NvSf@&>Q}<~aVqab)_nk)7N*JO#M+c`G`M7DAr5>6jB<^AjP$9bBdhCKpD=Mu
zVn3c<u7G{}FITf)t>ZA~Sv4z><N&!sz*&K!b;UvQnpZ6Oil!g@-4qqWj2yG)1DPR7
z0L!rw!uo!*kS~7EOTj5n+~}OT?H6n%T9|CbT1^vdxfKyltdLA!aJT!n%RkyqZ>4-o
z5~ZyglOM>bo$N2+jG&k><B0EY!P~3Jf(UZeS4x&LnQcK3yH*2)o8^sd?G2m_#og?d
z^;eKyYd}{TqPX?u49}(^gvp(*iDy6TFu&*WnzIZ4$TYwH6a#4fHPxtWp@ov$6YBoZ
z?t-GAf4<?UJE7{;hkiDMM^!U=kB4T}Qw41PKGEyhV~3NaGe>yzyr;#7z$#YGRK>e*
zwj)8TvyRQu)#7|j&xglr3SKYNacL4+g;}>LnU$YT=!f4NPvtx+KdZ2&&e(3G?eW^2
zwMiGZ9CRBFwW)UL9dN2^hRs$&T*a)vc3<XBe|38n+zoU6A&}e<lkH5P_w{S4Ih^|=
z@oOZ+MoS1FEOB`YzudwGSYINdzGAHw7Vpea$40Q*3hq(ItJQfdVoM1pUxVs;Gc(0{
zbdUOVbHxv1r54_wj1T~CkAf5q#7^7HE4)tUb@9CymxT;Km$rC`Oqbh5fUK0Q7V4ir
zj~ZUz?RPwl_CXf7rnH<k?aQM_P)bR^mqu`|>fnqmZ0Ir7U`l=mHmEG#rzDcO(?8T=
zY*@e?xL<kSD+aVeL5mY>-mbrBMe+~uG!)|g0EnCInDg8{bbac6OcWCB1<_c3>VJq$
zI>&dXvrYkud#gBTPokUx_(YL*n)P@rl$1Jz!hULrl=&)|E|fQyB_og{Xaf*JI)S|u
zPHvf;7uEMOS2aKmgKX87@7)8+s4h5m9=WPnYr38qB&9PFU&CT8@wqZDBj$U^<3bH;
z`K<zT6Rzo8E>pheX6DvZ>fuT9YDr5`Hj+o{nb^=0=1i`$)TB&Bs`{ePfc8uCEN$;M
z8yU*Tkj~t_XS7=(+waMXvnx$-S$r=(&G>R>Gp)~-yjc7~lZ#h=Zdy_p#}<>*&yZ*7
zpA^O43H_3rY6_hPE|pfu!nToHMK#3adial+N_X=HM})SkN~>lp%OXDD71Y5ynRZhX
zesNB#i@af`nvv;v=bP?K8q?PoRUTZ8TaboCrfxy^vc?EBtg@5~D6ryb4&AkFlcXTK
zmB{_;^u1X6%=*K^P*Kl{n$eM-WbeIq19^VluymeW%AKO0wY#?Ij$H^t%&M>Wy4XB@
zjOteuwt~aE%e@s{4HiQ*J`Z(<CHXy_zVB}B{%oXzSy#65a!WXm(VDxSeAf_!JJ>(<
z`1oPsgNm14XU(m6n!(6;qf@tL*u<H?RW+qh9*2+qIZT_GvpTPCZSQ2%lU^0-?ki_?
zGT}wSHNUhFR4%+Ed9%O)3WTBS3p%>Sn$_aQ-1Fiuigd-9Dp-8UwH;hBFIGmU2+O=I
zt=sb=-(4;rqN>y9^v(uKkO%Wf0JHY3zo9?kcKrF^pnY8;BCkOso|HYhNLY#Qa@E^X
zewgBT&go9#Vo9aXbUQxTPBLXP9?E*PSAQpdbKrz?dIiKIDw;l%i?}^o-lzVu^8UaF
ztxOLTry-48I?%ycofEt`t;8&>a8-@VMrYk*!xL0>AshR+Yk$s2P-XY&zGwOar77+<
z#m9k;S82%29@#aUU3cF50Hmd2^X`(pcUvAx@BX(*8A|W|BfUeh?_ZI98~-=<S#<oF
zeYm23W}naQ@9dk$`o%r~0o^b5*~_+of3a`uqrS;6_AM{{Vjo`b+AsE*OSw$9QHVa_
zBr<2a+P%k=oa8Abak%X9Lh_=)DHS%eRSIUiHf}l)kKagFliHL0M4*E7`zn;Kdl~J9
zrlG!r$x?;(p1=p&nNpazw-vMf^|PC8@co^ykFfM(d|?<rFyon@Xn8&Mr+qku&HPQY
z+Kba~LB+6TwMvGh-y)Eh0sN2|i{@_bkbDb4`vPOR!|;ZH8s&d~yDdO55XC^0|NYhf
zR{zXE%0K%b{NMfW&kUrg_?>}t&BNQjGmw;f46BanG(?Q9kwB4O3fAH1;n&vT|0&iO
z9;vqMxr+oHQxStJ^e<m<2TF~xI7doWmM%%WnD?pZyf`$qlf1NwBv8KED9vo<*ylb#
zUN5HmSlxCE3^#9G9Y{UgyFBn=ZvZH{y==ws^Y_4hmAyk85|1wWn0CTy@xI472^M7K
z{p-<e3{wR$0!jN%o#{c?dkXECvdaFfH&Oh^$@bh#`p>-2!uv7ab#Qlb2hSPP5Fj?h
zKmUfB@%_!Z^bZd}Q1zc?e0YLf1F{uXuM62;9qrHOSzRL|SO;6D24wc1W;E)oNwd{c
z)koe!ck7VH$rT3xvBN%7LVysQp2qEhbTgUv3pV<Q=jL=#glJ|7^R!RT!{qG1&Pe9;
zfJS@ZOz>=~Tdw_pIJRNP_dTZEu<1xS+K8*1%|wu}XEp*eOFv~f2wRYT&Qi*ZH2*gV
zvsQ{Y5y)ExIaL^Tu7dHDFh$IJwm#Z;b<ujpH<Ve-Ysng#Ld%I9?!f$1;apbw02RSj
zT|2wN=Z1`L3%jzD3<*JNS!1VL%o&|ybj7d9{Va-O0vME;v)(ms0>kx*-Su>p1Q!Pi
znwQLH3w^tnE%03|+1R3C32cuGGF%|*vgZ<H8&OtlEIYY*k{GOxHB3v}rJt)rH?0&m
zVaU>gO7~O<Zh)rpb`|M;UEOM;Tp14gNKLD9p+(bD&LGLzltP{+I*$$TnzthtOfs$%
zqhT@Vj3a4GFl4at1cqR0`I$6QTESb$&T4(9ELPrfO>9*baRBe#4b8@#MYIOTm28LM
zg!fL`Rfjd~$B<dgR^(86ymIhtpMml9F;ZNo8!w%a@D04E>D5c*9k}6z*DiZ<c847`
za(lOxJmmZ?6Mn-77hjRDiNf{>FU7={q7>-5fW4wmfAU)Ic`^PqOrTRJ-KKV!)mY$6
z&or;8hVH<Ojl9?Rv#!z5eJI=oVaJ}yvFK_TS%c+rt0w?qLEL_6){9mlUkRdK160qp
z%4dCAQD@dy@QqNLogn~e%^y|ffXRDPUK#AxGgsj%ol3AdBCmQY5BTvm%1Oq8;mWP>
zXi)*CN|3C8sN3SoEgI)Z8+wuK^1g0l)R4i*UHO4Pg3l6x0ItP?#L1Fe$*>4RqMc;&
z=1P|MRd$(=m&f4%hSW6(Dm8fXb@D*q#eV5f3$lru<{B@1?dZG-O2*?b&K`<E;?|0}
zj_>E^-*d(y+~|{l?cX~}(=I$EPJr<!pejCbS`pYX!)kAWr;&3r+aW_DxNm(CpOdmI
z$V@R&5G2ZAfZ-u5y;hlrBH-T;@b7#u!ioLZ_s4{aPGs|QOk(TeDmFDoiF6K`nHsAe
zh+~5QmtVcp4&SLt+%|i&=fTX};_FwBO-8Yw3X02@$>yv*6!vaB=BeyV7}oF35aIh+
z$HeaA^6dSw(FhGVvpM66yAnJz))+)N!<^`tD>H|Dh9Kp(*7v&WZfX!*25Cl8V@W*Q
zc5G_rln9n=6rfuhswgGW(c9oUa88`nb%`RsJjxtx8CS9MnyQ1BY97={y8SFXM+(hq
z(i%7pq^xOR4WlapY_FTNvVG<YV!*z<)05Qqj^M7ceuP}Y%0VPX!0ezOTiw*2<enFq
z!IL(d05!a<5V{ars9U6^L08Ih1lGh<y1#J$=1P=-GbuyV;}PL}YqFb^JS;lPmo%=p
zJk$A6J(a-tNXNIKG;yU*WLM+#Tv%6=qk;7#@z2HUbxeR%+3RTpYFLGFJb=x6={;jd
zg@JcUIp+78r$RC8)d!W#wF2UB7#@GdWt+)$bpOdB2UEOyUBG2Fy&{Y8LfD8SW%(W?
zRpGRxBm<BZ_7oDr^p>qO<B^*TL}7-!fGn^55|a0Ay}uipblWfEtL;sP-2GAtQReUm
zew$&>8=#`FuIe5-G_-J#LF^{D8FeXDfdQpPW!i}>^O5Txbj+MjK82yz{}im>&q@ru
zGAe(4mS|>p3n*D^ifJ!BD9z5PV{9GUKb8Tn)Oql<HzErS{96l4_rXt(ufMe1k(1kd
z{We6;)J0u{ebi0J&7qg#nzdfu!&*A%&`T%AZraVxzT?m%ajeHbz?2(aIV5#GNHwA~
z%0bpfqO!s4BF&8NG#I%oX4vtF-^MxWy$7OZ^o1Pdr$l9s+gi<rDi`x<i55(*G_GqH
z->fAwy9>SrxXF16G&*6F#g9-WM%>dXK40vGKX*-+8~xca|L!Y1xuPtX-_z>58P<{W
z;u-F4Xwg~JE!VnUC{)0hA?OG+M7me$PN*YSli8IZmG$Or$hDV~_;tM`d3iH|qRZhj
z*D~K`U_)1|hLW1#!;@hwhH%Nk9#t>Z2@mMpnS{--#Mwmnffw6i@WI7p|LfuD-tF@t
z<Ld){f~=Ec3V;;goVub3c|AN&khr+(gY7VXXLJs0d}i-@>N|<ypw&7p@dfxKV($Kr
zjgqTZk3SKK_1qI7ty4`T2;hH`bE3!+c%1VXG_7lRitLWUK#}erN4o#fr*UjyXuF68
z^NQT7PbV?gS#Hq_UN>WDNQ3@`7z5wENcjccaF98*F9sJW+Gp64^K1}4k75o0i~QoF
z*O00rt^cF>pe1Kj#uS-gq7T~HgoJD#je=RaPagPi)Vbw4kU?1JF`mON=t6{t3Kyd=
z_ObHKw_<y9V&uGw=RGS|-F)Nl2vdzd29%K&B%t@dHwlTBw(w25glm}kNcgh)rX1+F
ztbnut#h=r%66?ty0*5wpe*1WZvEi;uxRw_$d0Nt*=8L&)rWG)PwveNWYdM<xo091A
zqXecJX0Se8KtT|fFRRJxblDF$#bTmYz}&DXm~^oeVB6x!mqO5Xsq=(RSDA9sghg5G
zpfY=;_GuUmMd3t0a=koX(t)E&W4^=^3RCW5tTc4MC`%f~7|<@DW6IvE;{mYSLdy5a
z8K9|cKj?EeL`%U@7bSQTRV}rBXfQ)^a_h!<Gm<@6rzpZM?*YL@MPx5!s7ai_{=fk^
z(NSwHlhaR(yOT`l<<H`YBNn?(LXQHT+zF~dyCjM{YkRT1W!>GcZc(8>`&EeB^Bb6}
zZ*2S3n`5f$c?ZOu257H6s|C0_cG+7=^2@5=QvAs)K8)m)0wYSyVz#ZaB%+R4PDA~c
z`07@#_)}B);F}Xh$%s#O`1c$H2k@iddwIzPZ_fLT6ICJciup|ySr2`fU7NmeFif|E
zov*LWN2FISm*dAijohN%cZ_sf_wvL)4?6v=mS>~D|7+@Ijz3gCcE_dB$;w8A^7&$4
zSM&3lMwcMSIIo~fq-2dc=M7zZ%OkPFACyv!Zi7<LjpITRZo=aeNh#OEF`-DWjc%=O
zuXDK1!P|>DkD;WCSzN8mtNz^4=IitxxwM<IXf^O{5ne(IGUYWc-JO!Hqflks4YoEP
zzYf7?iFY&?q>2n!ko$f=#Hb$hX*J_X_PFe@plF7o+3$zGe|Vaiz_zq`WJ8`7JHG>2
z7Vzn9Z<#s;Sr%}W(Xr6QM>DZemYLB7TS63adD+WTLrHeu6kaJKw~Jc@e$gyO^xB#M
zF00EN*8~x@F0GYE6dF&#`uEBW=WzDF4IxRiYo~2T=yNOEL*U|VS1+x<9vJmt8hsDD
zwy8hAO1696f7WeR)Pg~BXneLD#!{b$kxtWchiPf=<wGXm(15=Xnra59&8=)8(pux~
z7MW(-?_If}7{g=1nyhH?<I}?(oPJVPS|{X@`ZKn`FcfO?eDdM(z{{S8#OaZWdfZha
zPOLl?1Cm~cLni$mH8u!*&g0S|Z7ce5)lBB?$sJ2Lua=t8X>HbfaMQ>jp5X;&BEW_7
zJN3O`$MZT&hj!<RkH#}vi?nvyuiw5iXtD=gT*38c!k<NA3(e?SO(u;8hg0f*mpTXp
znMVO6Vg2$d&Gj3DTmI);kZL$=UA0<Gf4Az~#$%*>8fv>AexP=ZXug}TR}dvwxLVD|
z3-?@WEgidQY=2L3J0IGh+0-zpo+a_~P;csX5yVa*xf<`MjoiZ%&_T|UACNa(zwse%
zx+(3bh`W{Os<=DJJqJJA`SHJAnCO2!2KN1R4E*~UFe;3I3L~Jx2&gc^KX(}6pXkW#
z?>yl`z5D)uzWY$7^v5tIRN~-YJiPgbf778RRHzBne?0_>@~*!`(NUX4)MgR2Sww9X
z{|A(ApsvVJS7fLwGSn5>e{<o-KauPG;R*QvoRvp~ss0tiRHz`qe@EjH3V^62Jt|56
zPno1grAdDsd!QJIDopylFbO4r|B4cbY7_Y{HeRCq?+@UAsIoXzSsbb??l0Bis8U~4
RsV}P37gg%}4=wc-`!^1355E8a

literal 0
HcmV?d00001

diff --git a/img/ascribe_animated_medium.gif b/img/ascribe_animated_medium.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2b3994b64d546b8370def0846b7c966c101660f1
GIT binary patch
literal 5855
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

literal 0
HcmV?d00001

diff --git a/img/ascribe_animated_small.gif b/img/ascribe_animated_small.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7d249c1ea2e820af1430e626b688cab7bdf6c692
GIT binary patch
literal 2605
zcmZ?wbhEHb6l0KJ_`t~U|Nnmm1_s5SEUY37j0}qZx&2&2f}I@$T#fV$m>GdmIzY?-
zQp~{Q-@_}(^}K&l%7#@ItL-+wo!dBFc#`k4ME~P+?nKO5FFt#v?&=vP_igquZ?fw?
zy`jSSTY~b_u1>GNb=*txXRUEsVdcA4Y|Dp;JI`Nw+)3qSg<8vku%pTK<|&U`r@e2V
zfw&7~HyAKSc&xhkB=O|QS-cHAr(}hlcN8vBYD=wJ^<vAe+g7vQ7Ij7CT-V>zZ+pY1
z>Gt2cqcOgkE<(}U6_-ma^_(2~I{4I<M->6{ihe}RTJ}uEYHiuN<iO8mchatka$<Lc
z`>oSJcc42W#$(l`CrLm@w3_U$+8iJLrS`7*oDj{0>e`XP+QNF<&xo92X>5AFD`JA#
z4%XD;*Rnixeob*xzm$2&cYa8Y$gP;Ptr4j~RXJ&eK2dGl-~JrR-nQLhYW3M~S@R~q
zB7qGlG$5`BxN|n}&bb@kzrdZtoRqQZ;xkZaARH17cZf8|Az7E#UVm=o`r&(qK;fZ;
zO$ExIW*luW{=E6mGMCo@mbGT-jx)l4v=q5`8M!hD)Vi}a9oTEKe%IGcXXKLK{w(ki
zhJ_0=!a0qQ$bq<mDQ1qWr4({v$UVf-%4fN#@5_>R3zCj=Pc)j7RhcXOcb^AC=DxT<
z1Lj8)4mNDsH2KXuhnMGn#HhvFPP?`}CCSFE;N_;jGx{D)o$k(5a__^lU&-GcxS)}O
z)ACsASzg4jKsU~>`fHo9Rbl1jFOt;?uyo0e@Ol$4F?ilO?Q{Fg&X2F}{rL757zp5u
z!yH$!>caB`l$c0|$ArAzc7fcsTm1$S^J20V-?-SLc=6(nIS0C&G(HGQnXX*ALL}s_
z-j+S7d^;;I9a*pbadl*}yH=mk+h<ObO0CWE-UbO_2?*q*$rOzq5b!L?(0rhGsq%qW
zN|{^t_UZ5Mo?5miUU0h7rK}lu)H_O?_=Cl!R@y3Uc6{^gw~?5$U9(ut<ui-K)LD*d
z&Gx%?J|<5CmLPFPLIh5`Va35)jzc!y?duM6vLBGmzxY!j(=(~y#4p>>)q#c_9zUnq
zKQB4iBC*<hT}F%Ma#IblSv>c&E@wFdiy?4vgjO!NVa<}^7+F$wr>Ck^sgil?1+IB3
zt-80~dUeU*j``_B&mT*29+3wIykX&4c7_j&T<0Hu8l2I(E$mQ2>!!=QeAN9S-zFZs
z6#C)n&RA_&z%wG!Km#xh0Lvmem4XA}+X0JeWQ*yYz6WVGM=5OSQr;m)0*dYQDC!4U
bwTD*rAg4)ai-duJnI6pnG>6c;abyhu@l9n%

literal 0
HcmV?d00001

diff --git a/js/components/ascribe_buttons/delete_button.js b/js/components/ascribe_buttons/delete_button.js
index 0d37a236..0c34dbd2 100644
--- a/js/components/ascribe_buttons/delete_button.js
+++ b/js/components/ascribe_buttons/delete_button.js
@@ -48,7 +48,7 @@ let DeleteButton = React.createClass({
             btnDelete = <Button bsStyle="danger" bsSize="small">REMOVE FROM LIST</Button>;
         }
         else{
-            return <div></div>;
+            return null;
         }
         return (
             <ModalWrapper