basic tweaks in styling in small resolutions, with graphs drawing updated in angular

This commit is contained in:
hamza zia 2013-01-26 21:54:17 +05:00
parent 3f767c0b84
commit 5c02174117
6 changed files with 25 additions and 8 deletions

View File

@ -27,7 +27,9 @@
<script src="js/libs/angular.js"></script> <script src="js/libs/angular.js"></script>
<script src="js/libs/jquery.flot.js"></script> <script src="js/libs/jquery.flot.js"></script>
<!-- We do manual resize currently
<script src="js/libs/jquery.flot.resize.js"></script> <script src="js/libs/jquery.flot.resize.js"></script>
-->
<!-- webui core --> <!-- webui core -->
<script src="js/init.js"></script> <script src="js/init.js"></script>
@ -216,7 +218,7 @@
<tr> <tr>
<td class="download-progress" colspan="2" data-toggle="collapse" data-target="[data-gid={{download.gid}}] .download-detail .collapse"> <td class="download-progress" colspan="2" data-toggle="collapse" data-target="[data-gid={{download.gid}}] .download-detail .collapse">
<div ng-show="hasStatus(download, 'active')" class="progress progress-striped active" style="width: 100%; margin: 0; padding: 0;"> <div ng-show="hasStatus(download, 'active')" class="progress progress-striped" style="width: 100%; margin: 0; padding: 0;">
<div class="bar" style="width: {{getProgress(download)}}%;"></div> <div class="bar" style="width: {{getProgress(download)}}%;"></div>
</div> </div>

View File

@ -1,5 +1,6 @@
.download-name { .download-name {
font-size: 12px; font-size: 12px;
word-wrap: break-word;
} }
.active-download, .waiting-download, .stopped-download, .download { .active-download, .waiting-download, .stopped-download, .download {
width: 100%; width: 100%;
@ -10,6 +11,13 @@
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05); box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05);
} }
/* fix table layout to break words */
@media (max-width: 767px) {
.active-download, .waiting-download, .stopped-download, .download {
table-layout: fixed;
}
}
.download-graph { .download-graph {
width: 80%; width: 80%;
margin-top: 5px; margin-top: 5px;
@ -26,6 +34,8 @@
} }
.stats li { .stats li {
padding: 5px; padding: 5px;
margin-top: 2px;
margin-bottom: 2px;
} }
.download-progress { .download-progress {

View File

@ -2,8 +2,10 @@
.modal { .modal {
position: absolute; position: absolute;
} }
@media all and (min-width: 980px) { @media (min-width: 980px) {
body { body {
padding-top: 60px; padding-top: 60px;
} }
} }

View File

@ -20,7 +20,8 @@ app.directive('dgraph', ['$', '$filter', function($, filter) {
start = new Date start = new Date
; ;
// jqplot doesnt draw graphs with no fixed height
// hack for the null height for flot elem
elem.height(elem.width() / 2); elem.height(elem.width() / 2);
var graph = $.plot(elem, [dconf, uconf], { var graph = $.plot(elem, [dconf, uconf], {
@ -38,10 +39,10 @@ app.directive('dgraph', ['$', '$filter', function($, filter) {
}); });
var draw = function() { var draw = function() {
var height = elem.height(); var width = elem.width();
if (height <= 0) return; if (width == 0) return;
elem.height(elem.width() / 2); elem.height(width / 2);
graph.setData([dconf, uconf]); graph.setData([dconf, uconf]);
graph.resize(); graph.resize();
@ -74,8 +75,10 @@ app.directive('dgraph', ['$', '$filter', function($, filter) {
var interval = setInterval(update, 1000); var interval = setInterval(update, 1000);
angular.element(window).bind('resize', draw);
elem.bind('$destroy', function() { elem.bind('$destroy', function() {
clearInterval(interval); clearInterval(interval);
}); });
}; };
}]); }]);

View File

@ -1,5 +1,5 @@
app.constant('$name', 'webui-aria2'); app.constant('$name', 'webui-aria2');
app.constant('$globalTimeout', 1000); app.constant('$globalTimeout', 5000);
app.value('$', $); app.value('$', $);
app.value('$_', _); app.value('$_', _);

View File

@ -20,7 +20,7 @@ app.factory('$jsoncall', ['$', '$json', '$base64', function($, JSON, base64) {
params: params && params.length ? this.encode(params) : undefined params: params && params.length ? this.encode(params) : undefined
}, },
success: function(data) { success: function(data) {
conn.avgTimeout = 3 * (new Date() - startTime); conn.avgTimeout = 2000 + 3 * (new Date() - startTime);
return success(data) return success(data)
}, },
error: error, error: error,