UI fixes

pydio · Mar 25, 2016 · 4da1e73 · 4da1e73
1 parent 680fc91
commit 4da1e73
Show file tree

Hide file tree

Showing 11 changed files with 192 additions and 167 deletions.
diff --git a/core/src/plugins/access.ajxp_home/res/home.css b/core/src/plugins/access.ajxp_home/res/home.css
@@ -369,6 +369,9 @@
 }
 #home_account_pane #ws_legend .repoInfoBadge.main .repoInfoBody {
   padding: 12px 16px;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
 }
 #home_account_pane #ws_legend .repoInfoBadge.main .repoInfoHeader {
   padding-right: 8px;
@@ -435,7 +438,7 @@
 #videos_pane a {
   text-decoration: none;
 }
-#videos_pane div.icon-remove-sign {
+#videos_pane div.mdi.mdi-close {
   float: right;
   font-size: 1em;
   margin-right: 11px;

diff --git a/core/src/plugins/access.ajxp_home/res/home.less b/core/src/plugins/access.ajxp_home/res/home.less
@@ -397,6 +397,9 @@
         }
         .repoInfoBody{
           padding: 12px 16px;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          overflow: hidden;
         }
         .repoInfoHeader{
           padding-right: 8px;
@@ -483,7 +486,7 @@
     text-decoration: none;
   }
 
-  div.icon-remove-sign{
+  div.mdi.mdi-close{
     float: right;
     font-size: 1em;
     margin-right: 11px;

diff --git a/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js b/core/src/plugins/access.ajxp_home/res/react/WelcomeComponents.js
@@ -100,7 +100,7 @@
                 <div className="video-player" style={{position:'absolute', top:0, left:0, right:0, bottom:0, zIndex:200000}}>
                     <div className="overlay" style={{position:'absolute', top:0, left:0, right:0, bottom:0, backgroundColor:'black', opacity:0.4}}></div>
                     <iframe src={this.props.videoSrc} style={{position:'absolute', top:'10%', left:'10%', width:'80%', height:'80%', border:'0'}}></iframe>
-                    <a className="icon-remove-circle" style={{position:'absolute', right:'8%', top:'7%', color:'white', textDecoration:'none'}} onClick={this.props.closePlayer}/>
+                    <a className="mdi mdi-close" style={{position:'absolute', right:'8%', top:'7%', color:'white', textDecoration:'none'}} onClick={this.props.closePlayer}/>
                 </div>
             );
         }
@@ -139,7 +139,7 @@
                 <span>
                 {videoPlayer}
                 <div id="videos_pane" className={this.props.open?"open":"closed"}>
-                    <div onClick={this.closePane} className="icon-remove-sign"></div>
+                    <div onClick={this.closePane} className="mdi mdi-close"></div>
                     <div className="tutorial_title">{MessageHash['user_home.56']}</div>
                     <div className="videoCards">
                         <VideoCard

diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.UserWidget.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.UserWidget.js
@@ -88,7 +88,8 @@ Class.create("UserWidget", {
                 }
 
                 if (imgSrc != '') {
-                    img = '<img src="'+imgSrc+'" alt="avatar" class="user_widget_mini">';
+                    var style = 'background-image: url(\''+imgSrc+'\')';
+                    img = '<div class="user_widget_mini" style="'+style+'"></div>';
                     label = '<i>' + img + displayName + '</i>';
                 }
 				var icon = this.options.iconClass || "icon-reorder";

diff --git a/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactPydioComponents.js b/core/src/plugins/gui.ajax/res/js/ui/reactjs/jsx/ReactPydioComponents.js
@@ -670,9 +670,13 @@
 
         render:function(){
             if(this.props.tooltip){
-                var style={};
-                if(this.state.show){
-                    style = {bottom: -10, top: 'inherit'};
+                var tooltipStyle={};
+                if(this.props.label){
+                    if(this.state.show){
+                        tooltipStyle = {bottom: -10, top: 'inherit'};
+                    }
+                }else{
+                    tooltipStyle = {position:'relative'};
                 }
                 var label;
                 if(this.props.label){
@@ -684,12 +688,12 @@
                     <span onMouseEnter={this.show} onMouseLeave={this.hide} style={style} className={this.props.className}>
                         {label}
                         {this.props.children}
-                        <ReactMUI.Tooltip label={this.props.tooltip} style={style} className={this.props.tooltipClassName} show={this.state.show}/>
+                        <ReactMUI.Tooltip label={this.props.tooltip} style={tooltipStyle} className={this.props.tooltipClassName} show={this.state.show}/>
                     </span>
                 );
             }else{
-                if(this.props.label) return <span>{this.props.label}</span>
-                else return <span>this.props.children</span>
+                if(this.props.label) return (<span>{this.props.label}</span>);
+                else return (<span>this.props.children</span>);
             }
         }