Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
Paul Baranowski 2011-04-04 13:51:03 -04:00
commit 97b1ba2799
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
application/models/Shows.php
View file

@ -1010,7 +1010,7 @@ class Show_DAL {
{ {
global $CC_CONFIG, $CC_DBC; global $CC_CONFIG, $CC_DBC;
$sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id, si.record" $sql = "SELECT si.starts as start_timestamp, si.ends as end_timestamp, s.name, s.id, si.id as instance_id, si.record, s.url"
." FROM $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s" ." FROM $CC_CONFIG[showInstances] si, $CC_CONFIG[showTable] s"
." WHERE si.show_id = s.id" ." WHERE si.show_id = s.id"
." AND si.starts <= TIMESTAMP '$timeNow'" ." AND si.starts <= TIMESTAMP '$timeNow'"
@ -1088,7 +1088,8 @@ class Show_DAL {
." LEFT JOIN $CC_CONFIG[showTable] s" ." LEFT JOIN $CC_CONFIG[showTable] s"
." ON si.show_id = s.id" ." ON si.show_id = s.id"
." WHERE EXTRACT(DOW FROM si.starts) = $day" ." WHERE EXTRACT(DOW FROM si.starts) = $day"
." AND EXTRACT(WEEK FROM si.starts) = EXTRACT(WEEK FROM localtimestamp)"; ." AND EXTRACT(WEEK FROM si.starts) = EXTRACT(WEEK FROM localtimestamp)"
." ORDER BY si.starts";
//echo $sql; //echo $sql;

15
plugins/jquery.showinfo.js
View file

@ -41,9 +41,15 @@
for (var i=0; i<shows.length; i++){ for (var i=0; i<shows.length; i++){
tableString += tableString +=
"<tr>" + "<tr>" +
"<td class='time'>"+shows[i].getRange()+"</td>" + "<td class='time'>"+shows[i].getRange()+"</td>";
"<td><a href='#'>"+shows[i].getName()+"</a></td>" +
"</tr>"; var url = shows[i].getURL();
if (url.length > 0)
tableString += "<td><a href='"+shows[i].getURL()+"'>"+shows[i].getName()+"</a></td></tr>";
else
tableString += "<td>"+shows[i].getName()+"</td></tr>";
} }
tableString += "</tbody></table>"; tableString += "</tbody></table>";
@ -308,6 +314,9 @@ function Show(showData){
this.showData = showData; this.showData = showData;
} }
Show.prototype.getURL = function(){
return this.showData.url;
}
Show.prototype.getName = function(){ Show.prototype.getName = function(){
return this.showData.name; return this.showData.name;
} }