diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-25 19:34:21 -0400 |
| commit | 1a1fd4a3d6aa7f6b2338f7751f5f97a30a059a04 (patch) | |
| tree | f608874663d24f19ecf175ec556f2a330d47a726 /templates/public | |
| parent | 747a562ddca10e29dd003e8b3c59f8f384d1bc8d (diff) | |
| parent | cd7222047b41ac3efa389a22fdd22148d03c1d61 (diff) | |
Merge tag 'release_2014-03-22' into archweb-generic
Fix long filenames; local storage for filter prefs
Conflicts:
templates/public/download.html
Diffstat (limited to 'templates/public')
| -rw-r--r-- | templates/public/download.html | 2 | ||||
| -rw-r--r-- | templates/public/index.html | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/templates/public/download.html b/templates/public/download.html index 274d6cfd..9f67733e 100644 --- a/templates/public/download.html +++ b/templates/public/download.html @@ -28,7 +28,7 @@ <ul> {% if release.version %}<li><strong>Current Release:</strong> {{ release.version }}</li>{% endif %} {% if release.kernel_version %}<li><strong>Included Kernel:</strong> {{ release.kernel_version }}</li>{% endif %} - {% if release.file_size %}<li><strong>ISO Size:</strong> {{ release.file_size|filesizeformat }}</li>{% endif %} + {% if release.torrent_data %}<li><strong>ISO Size:</strong> {{ release.torrent.file_length|filesizeformat }}</li>{% endif %} <li><a href="{% wiki_url 'Installation_Guide' %}">Installation Guide</a></li> <li><strong>Resources:</strong> <ul> diff --git a/templates/public/index.html b/templates/public/index.html index bc0fae0c..d3cf797a 100644 --- a/templates/public/index.html +++ b/templates/public/index.html @@ -226,8 +226,19 @@ function setupTypeahead() { matcher: function(item) { return true; }, sorter: function(items) { return items; }, menu: '<ul class="pkgsearch-typeahead"></ul>', - items: 10 + items: 10, + updater: function(item) { + $('#pkgsearch-field').val(item); + $('#pkgsearch-form').submit(); + return item; + } }).attr('autocomplete', 'off'); + $('#pkgsearch-field').keyup(function(e) { + if (e.keyCode === 13 && + $('ul.pkgsearch-typeahead li.active').size() === 0) { + $('#pkgsearch-form').submit(); + } + }); } function setupKonami() { var konami = new Konami(function() { |