summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Klehr <mklehr@gmx.net>2013-03-26 19:22:04 +0100
committerMarcel Klehr <mklehr@gmx.net>2013-03-26 19:22:04 +0100
commit2393dcd65259e232006ad5c956f19eeee60370e7 (patch)
treeb83930e5806cca69efacc06edbf08003ee9d16dd
parentf75a839cd093480684f2a0790b67dd9bd7324197 (diff)
downloadetherpad-lite-2393dcd65259e232006ad5c956f19eeee60370e7.zip
Disable search until registry is loaded and fix sorting by version
... and always display a scrollbar.
-rw-r--r--src/static/css/admin.css2
-rw-r--r--src/static/js/admin/plugins.js1
-rw-r--r--src/templates/admin/plugins.html4
3 files changed, 4 insertions, 3 deletions
diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 56019129..3108655e 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -43,7 +43,7 @@ div.innerwrapper {
box-shadow: 0px 1px 10px rgba(0, 0, 0, 0.2);
margin: auto;
max-width: 1150px;
- min-height: 100%;
+ min-height: 101%;/*always display a scrollbar*/
}
h1 {
diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js
index 21edee6b..53e16ff3 100644
--- a/src/static/js/admin/plugins.js
+++ b/src/static/js/admin/plugins.js
@@ -130,6 +130,7 @@ $(document).ready(function () {
if(!data.results.length) search.end = true;
$(".search-results .nothing-found").hide()
$(".search-results .fetching").hide()
+ $("#search-query").removeAttr('disabled')
console.log('got search results', data)
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 8ca24644..fe1f607a 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -69,7 +69,7 @@
<h2>Available plugins</h2>
<form>
- <input type="text" name="search" placeholder="Search for plugins to install" id="search-query">
+ <input type="text" name="search" disabled placeholder="Search for plugins to install" id="search-query">
</form>
<table>
@@ -77,7 +77,7 @@
<tr>
<th class="sort up" data-label="name">Name</th>
<th class="sort none" data-label="description">Description</th>
- <th class="sort none" data-label="Version">Version</th>
+ <th class="sort none" data-label="version">Version</th>
<td></td>
</tr>
</thead>