diff options
-rw-r--r-- | src/static/css/admin.css | 7 | ||||
-rw-r--r-- | src/static/js/admin/plugins.js | 9 | ||||
-rw-r--r-- | src/templates/admin/plugins.html | 5 |
3 files changed, 2 insertions, 19 deletions
diff --git a/src/static/css/admin.css b/src/static/css/admin.css index 4669e4b9..0d947126 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -118,13 +118,6 @@ td, th { position: absolute;
bottom: 50px;
}
-#progress .historylink {
- float: right;
-}
-#progress .history {
- white-space: pre;
- font-family: monospace;
-}
.settings {
margin-top:10px;
width:100%;
diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index d0058522..ed38fc4e 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -68,10 +68,6 @@ $(document).ready(function () { } search(); }); - - $('#progress .showhistory').unbind('click').click(function() { - $("#progress .history").toggle() - }); } updateHandlers(); @@ -79,25 +75,22 @@ $(document).ready(function () { socket.on('progress', function (data) { if (data.progress > 0 && $('#progress').data('progress') > data.progress) return; - $("#progress .history").hide(); $("#progress").show(); $('#progress').data('progress', data.progress); var message = "Unknown status"; if (data.message) { - message = "<span class='status'>" + data.message.toString() + "</span>"; + message = data.message.toString(); } if (data.error) { data.progress = 1; } $("#progress .message").html(message); - $("#progress .history").append("<div>" + message + "</div>"); if (data.progress >= 1) { $("#progress").hide(); - $("#progress .history").html(''); if (data.error) { alert('An error occurred: '+data.error+' -- the server log might know more...'); diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 12f80158..a85db557 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -24,10 +24,7 @@ <li><a href="settings">Settings</a> </li>
<li><a href="plugins/info">Troubleshooting information</a> </li>
- <div id="progress">
- <p><img src="../static/img/loading.gif" alt=""/> <span class="message"></span> <a class="showhistory" href="javascript:void(0)">(show progress)</a></p>
- <div class="history"></div>
- </div>
+ <div id="progress"><img src="../static/img/loading.gif" alt=""/> <span class="message"></span></div>
</div>
<div class="innerwrapper">
|