@@ -24,7 +24,9 @@ class Controller {
$this->initModel();
$this->action = (!empty($this->params['a'])) ? $this->params['a'] : 'index';
- $this->runAction($this->action, $this->params['id']);
+
+ $id = isset($this->params['id']) ? $this->params['id'] : null;
+ $this->runAction($this->action, $id);
}
include/controller.php
@@ -12,7 +12,7 @@ class View {
public function render($file)
{
$this->setAutoRender();
- if($this->vars) extract($this->vars);
+ if(isset($this->vars)) extract($this->vars);
if(preg_match('/^.*\.haml$/', $file, $matches) > 0) {
$this->Haml->display(VIEW_DIR . DS . $file);
} else {
include/view.php
@@ -34,7 +34,7 @@ function handleSearch(data) {
}
$("#results").html(li);
$("#loader").remove();
- $("#results li div.button").click(download);
+ $("#results li > a").click(download);
$('#results li').click(showDescription);
}
@@ -51,6 +51,8 @@ function download() {
dataType: 'json',
success: handleDownload
});
+
+ return false;
}
function handleDownload(data) {
@@ -104,19 +106,27 @@ function update(data) {
var html = '<div>Code: '+data.code+'</div>';
html += '<div>'+data.reason+'</div>';
} else {
- // build status report
- var html = '<fieldset><div class="title">Currently downloading: ' + data.currently_downloading[0].nzbName + '</div>';
- html += '<div class="loader">';
- html += '<div class="info">'+ data.percent_complete + '% complete</div>';
- html += '<div class="bar" style="width: ' + data.percent_complete + '%"></div></div></fieldset>';
+ // build status report
+ var html = '';
+ if(data.currently_downloading[0]) {
+ html += '<fieldset>';
+ html += '<div class="title">Currently downloading: ' + data.currently_downloading[0].nzbName + '</div>';
+ html += '<div class="loader">';
+ html += '<div class="info">'+ data.percent_complete + '% complete</div>';
+ html += '<div class="bar" style="width: ' + data.percent_complete + '%"></div></div></fieldset>';
+ }
html += '<h4 class="title">Queued Reports</h4>';
-
- html += '<ul id="queue">';
- for(var x in data.queued) {
- var report = data.queued[x];
- html += '<li>'+report['nzbName']+'<span>'+report['total_mb']+'MB</span></li>';
+ if(data.queued.length > 0) {
+ html += '<ul id="queue">';
+ for(var x in data.queued) {
+ var report = data.queued[x];
+ html += '<li>'+report['nzbName']+'<span>'+report['total_mb']+'MB</span></li>';
+ }
+ html += '</ul>';
+ } else {
+ html += '<fieldset><p>There are not any reports currently in the queue.</p></fieldset>';
}
- html += '</ul>';
+
}
$("#monitor").html($(html));
}
js/application.js
@@ -23,7 +23,7 @@ class Newz
if(!empty($uri_params)) {
$uri .= "&" . implode('&', $uri_params);
}
-#die($uri);
+
try {
$rss_php = new rss_php;
$rss_php->load($uri);
models/newz.php
tmp/cache/haml_c/.gitignore
@@ -1 +1 @@
-<?= json_encode($data) ?>
\ No newline at end of file
+<?php echo json_encode($data) ?>
\ No newline at end of file
views/layouts/json.phtml
d18cb9899cf3aed0a89e3213dee7bc215b84566b
Buckley Robinson
buck@bandicoot.home
http://github.com/buck2769/hellaphone/commit/9f571a23f017733d28a793c58bff868f9dbd531b
9f571a23f017733d28a793c58bff868f9dbd531b
2009-05-11T20:58:01-07:00
2009-05-11T20:58:01-07:00
downloads work
e728c22a711b5a9dd4dbaf82a60fb7e942a6f0db
Buckley Robinson
buck@bandicoot.home