merged all branches

fixed clear errors

js/components/ascribe_forms/button_submit_close.js

@@ -3,11 +3,11 @@ import React from 'react';
 let ButtonSubmitOrClose = React.createClass({
     render() {
         if (this.props.submitted){
-            return (
+            //return (
-                <div className="modal-footer">
+            //    <div className="modal-footer">
-                    Loading
+            //        Loading
-                </div>
+            //    </div>
-            )
+            //)
         }
         return (
             <div className="modal-footer">

js/components/ascribe_forms/form_share_email.js

@@ -22,12 +22,16 @@ let ShareForm = React.createClass({
         }
     },
     renderForm() {
-        let message = "Hi,\n" +
+        let title = this.props.edition.title;
-                        "\n" +
+        let username = this.props.currentUser.username;
-                        "I am sharing \"" + this.props.edition.title + "\" with you.\n" +
+        let message =
-                        "\n" +
+`Hi,
-                        "Truly yours,\n" +
+
-                        this.props.currentUser.username;
+I am sharing \" ${title} \" with you.
+
+Truly yours,
+${username}`;
+
         return (
             <form id="share_modal_content" role="form" key="share_modal_content" onSubmit={this.submit}>
                 <InputText

js/mixins/alert_mixin.js

@@ -10,7 +10,11 @@ let AlertMixin = {
                         }.bind(this)
                     );
         this.setState({alerts: alerts, retry: this.state.retry + 1});
+    },
+    clearAlerts(){
+        this.setState({alerts: null});
     }
+
 };
 
 export default AlertMixin;

js/mixins/form_mixin.js

@@ -12,6 +12,9 @@ export const FormMixin = {
     },
     submit(e) {
         e.preventDefault();
+        for (var ref in this.refs){
+            this.refs[ref].clearAlerts();
+        }
         this.setState({submitted: true});
         fetch(this.url(), {
             method: 'post',