Merge branch 'master' of bitbucket.org:ascribe/onion

js/components/ascribe_buttons/button_submit.js

@@ -1,27 +0,0 @@
-'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;

js/components/ascribe_buttons/button_submit_close.js

@@ -1,32 +0,0 @@
-'use strict';
-
-import React from 'react';
-
-import AppConstants from '../../constants/application_constants';
-import { getLangText } from '../../utils/lang_utils.js'
-
-let ButtonSubmitOrClose = React.createClass({
-    propTypes: {
-        submitted: React.PropTypes.bool.isRequired,
-        text: React.PropTypes.string.isRequired,
-        onClose: React.PropTypes.func.isRequired
-    },
-
-    render() {
-        if (this.props.submitted){
-            return (
-                <div className="modal-footer">
-                    <img src={AppConstants.baseUrl + 'static/img/ascribe_animated_medium.gif'} />
-                </div>
-            );
-        }
-        return (
-            <div className="modal-footer">
-                <button type="submit" className="btn btn-ascribe-inv">{this.props.text}</button>
-                <button className="btn btn-ascribe-inv" onClick={this.props.onClose}>{getLangText('CLOSE')}</button>
-            </div>
-        );
-    }
-});
-
-export default ButtonSubmitOrClose;

js/components/ascribe_media/media_player.js

@@ -28,12 +28,20 @@ let Other = React.createClass({
     },
 
     render() {
-        let ext = this.props.url.split('.').pop();
+        let filename = this.props.url.split('/').pop();
+        let tokens = filename.split('.');
+        let preview;
+
+        if (tokens.length > 1) {
+            preview = '.' + tokens.pop();
+        } else {
+            preview = 'file';
+        }
 
         return (
             <Panel className="media-other">
                 <p className="text-center">
-                    .{ext}
+                    {preview}
                 </p>
             </Panel>
         );

sass/ascribe_media_player.scss

@@ -12,8 +12,13 @@
     }
 
     .media-other {
-        font-size: 500%;
         color: #cccccc;
+        font-size: 500%;
+        p {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
     }
 
     .audiojs {

sass/main.scss

@@ -184,31 +184,22 @@ hr {
         border: 1px solid $ascribe-brand-danger;
     }
 }
-.btn-ascribe, .btn-ascribe-inv {
+.btn-ascribe {
     border: 1px solid #444;
     line-height: 2em;
     margin-right: 1px;
     margin-left: 0 !important;
     font-family: sans-serif !important;
     border-radius: 0 !important;
-}
-
-.btn-ascribe, .btn-ascribe-inv:active, .btn-ascribe-inv:hover {
     color: #222 !important;
     background-color: #FFF;
 }
 
-.btn-ascribe:active, .btn-ascribe:hover, .btn-ascribe-inv {
+.btn-ascribe:active, .btn-ascribe:hover {
     color: #FFF !important;
     background-color: #444;
 }
 
-.btn-ascribe-inv:disabled, .btn-ascribe-inv:focus {
-    color: #444 !important;
-    background-color: #BBB !important;
-    border: 1px solid #444 !important;
-}
-
 .btn-ascribe-sm {
     font-size: 12px;
     line-height: 1.3em;