Fix super long workspace names: limit to 3 letters for badge, fix CSS…

… to adjust display.
pydio · Oct 16, 2015 · 3b6797d · 3b6797d
1 parent 07155af
commit 3b6797d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/core/src/plugins/gui.ajax/res/js/core/model/Repository.js b/core/src/plugins/gui.ajax/res/js/core/model/Repository.js
@@ -81,7 +81,7 @@ var Repository = (function () {
 		if (!this.badge) {
 			var letters = this.label.split(' ').map(function (word) {
 				return word.substr(0, 1);
-			}).join('');
+			}).slice(0, 3).join('');
 			this.badge = '<span class=\'letter_badge\'>' + letters + '</span>';
 		}
 		return this.badge;

diff --git a/core/src/plugins/gui.ajax/res/js/es6/model/Repository.es6 b/core/src/plugins/gui.ajax/res/js/es6/model/Repository.es6
@@ -68,7 +68,7 @@ class Repository {
     getHtmlBadge(){
         if(!this.label) return '';
         if(!this.badge){
-            var letters = this.label.split(" ").map(function(word){return word.substr(0,1)}).join("");
+            var letters = this.label.split(" ").map(function(word){return word.substr(0,1)}).slice(0,3).join("");
             this.badge = "<span class='letter_badge'>"+ letters +"</span>";
         }
         return this.badge;

diff --git a/core/src/plugins/gui.ajax/res/js/es6/util/LangUtils.es6 b/core/src/plugins/gui.ajax/res/js/es6/util/LangUtils.es6
@@ -30,10 +30,10 @@ class LangUtils{
                 if(results[i].match(e)){
                     matches.push({url: RegExp['$&'],
                         protocol: RegExp.$2,
-                        host:RegExp.$4,
-                        path:RegExp.$5,
-                        file:RegExp.$7,
-                        hash:RegExp.$8});
+                        host:RegExp.$3,
+                        path:RegExp.$4,
+                        file:RegExp.$6,
+                        hash:RegExp.$7});
                 }
             }
         }

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
@@ -6567,6 +6567,14 @@ div.horizontal_tabulator > div > div.horizontal_tabulator div.tabulatorContainer
     font-weight: lighter;
 }
 
+span.first-bread em {
+    display: inline-block;
+    width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 .breadcrumbs-one i.ajxp-goto{
     display: inline-block;
     cursor: pointer;

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css