diff --git a/www/js/views/ProjectViews.js b/www/js/views/ProjectViews.js index 508de72b..3f8e9655 100644 --- a/www/js/views/ProjectViews.js +++ b/www/js/views/ProjectViews.js @@ -705,7 +705,7 @@ define(function (require) { { hint: true, highlight: true, - minLength: 1 + minLength: 2 }, { name: 'languages', @@ -723,7 +723,7 @@ define(function (require) { return data.attributes.name; }, source: this.languageMatches(this.theLangs), - limit: 25, + limit: 200, templates: { empty: ['
No languages found
'].join('\n'), pending: ['
Searching...
'].join('\n'), @@ -734,16 +734,22 @@ define(function (require) { strSuggestion += data.attributes.localname strSuggestion += ' (' + data.attributes.tag + ')'; strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0]; + strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : ""; strSuggestion += ''; } else if (data.attributes.localnames != null && data.attributes.localnames.length > 0) { strSuggestion += data.attributes.localnames[0]; strSuggestion += ' (' + data.attributes.tag + ')'; strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0]; + strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : ""; strSuggestion += ''; } else if (data.attributes.name != null && data.attributes.name.length > 0) { - strSuggestion += data.attributes.name + ' (' + data.attributes.tag + ')'; + strSuggestion += data.attributes.name + ' (' + data.attributes.tag + ')'; + strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : ""; + strSuggestion += ''; } else { - strSuggestion += data.attributes.names[0] + ' (' + data.attributes.tag + ')'; + strSuggestion += data.attributes.names[0] + ' (' + data.attributes.tag + ')'; + strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : ""; + strSuggestion += ''; } // close out and return the suggestion strSuggestion += '';; @@ -778,7 +784,7 @@ define(function (require) { { hint: true, highlight: true, - minLength: 1 + minLength: 2 }, { name: 'languages', @@ -796,7 +802,7 @@ define(function (require) { return data.attributes.name; }, source: this.languageMatches(this.theLangs), - limit: 25, + limit: 200, templates: { empty: ['
No languages found
'].join('\n'), pending: ['
Searching...
'].join('\n'), @@ -807,16 +813,22 @@ define(function (require) { strSuggestion += data.attributes.localname strSuggestion += ' (' + data.attributes.tag + ')'; strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0]; + strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : ""; strSuggestion += ''; } else if (data.attributes.localnames != null && data.attributes.localnames.length > 0) { strSuggestion += data.attributes.localnames[0]; strSuggestion += ' (' + data.attributes.tag + ')'; strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0]; + strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : ""; strSuggestion += ''; } else if (data.attributes.name != null && data.attributes.name.length > 0) { - strSuggestion += data.attributes.name + ' (' + data.attributes.tag + ')'; + strSuggestion += data.attributes.name + ' (' + data.attributes.tag + ')'; + strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : ""; + strSuggestion += ''; } else { - strSuggestion += data.attributes.names[0] + ' (' + data.attributes.tag + ')'; + strSuggestion += data.attributes.names[0] + ' (' + data.attributes.tag + ')'; + strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : ""; + strSuggestion += ''; } // close out and return the suggestion strSuggestion += '';; diff --git a/www/res/css/styles.css b/www/res/css/styles.css index d8dd330c..44bc4ee3 100755 --- a/www/res/css/styles.css +++ b/www/res/css/styles.css @@ -1370,7 +1370,7 @@ div.preview div.pile { .subtext { display: block; font-size: 0.6rem; - color: #999; + color: #555; } .topcoat-checkbox__checkmark { margin-right: 6px; @@ -1905,27 +1905,9 @@ typeahead styles } #scrollable-dropdown-menu .tt-menu { - max-height: 175px; + max-height: max(175px, calc(100vh - 300px)); /* available space - keyboard (vertical), or 175px if that's too small */ overflow-y: auto; } -.tt-menu::-webkit-scrollbar { - background-color: rgb(221, 225, 225); - width: 12px; -} -.tt-menu::-webkit-scrollbar-thumb { - background-color: #ccc; - border-radius: 10px; - -moz-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -} -.tt-menu::-webkit-scrollbar-track { - background-color: rgb(221, 225, 225); - border-radius: 10px; - -moz-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); - box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -} .tt-menu { background-color: #fff; diff --git a/www/tpl/ProjectSourceLanguage.html b/www/tpl/ProjectSourceLanguage.html index 5fa949e9..559adba0 100644 --- a/www/tpl/ProjectSourceLanguage.html +++ b/www/tpl/ProjectSourceLanguage.html @@ -1,4 +1,4 @@ -
+
diff --git a/www/tpl/ProjectTargetLanguage.html b/www/tpl/ProjectTargetLanguage.html index 19ad0a55..545183ce 100644 --- a/www/tpl/ProjectTargetLanguage.html +++ b/www/tpl/ProjectTargetLanguage.html @@ -1,4 +1,4 @@ -
+