Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'cosmetic' of git://github.com/PiterEL/tvheadend into a
  • Loading branch information
perexg committed Oct 30, 2014
2 parents 03578d3 + 978e7f8 commit eef6f42
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 8 deletions.
3 changes: 2 additions & 1 deletion src/webui/static/app/dvr.js
Expand Up @@ -26,6 +26,7 @@ tvheadend.dvrDetails = function(uuid) {

var win = new Ext.Window({
title: title,
iconCls: 'info',
layout: 'fit',
width: 400,
height: 300,
Expand Down Expand Up @@ -503,7 +504,7 @@ tvheadend.dvr = function(panel, index) {
activeTab: 0,
autoScroll: true,
title: 'Digital Video Recorder',
iconCls: 'drive',
iconCls: 'dvr',
items: [],
});
tvheadend.dvr_upcoming(p, 0);
Expand Down
12 changes: 7 additions & 5 deletions src/webui/static/app/epg.js
Expand Up @@ -161,18 +161,20 @@ tvheadend.epgDetails = function(event) {
valueField: 'key',
displayField: 'val',
name: 'config_name',
emptyText: '(default)',
emptyText: '(default DVR Profile)',
value: '',
editable: false
});

buttons.push(confcombo);
buttons.push(new Ext.Button({
handler: recordEvent,
iconCls: 'rec',
text: "Record program"
}));
buttons.push(new Ext.Button({
handler: recordSeries,
iconCls: 'autoRec',
text: event.serieslinkId ? "Record series" : "Autorec"
}));

Expand All @@ -187,8 +189,8 @@ tvheadend.epgDetails = function(event) {
var win = new Ext.Window({
title: 'Broadcast Details',
layout: 'fit',
width: 500,
height: 300,
width: 600,
height: 400,
constrainHeader: true,
buttons: buttons,
buttonAlign: 'center',
Expand Down Expand Up @@ -232,7 +234,7 @@ tvheadend.epg = function() {
dataIndex: 'actions',
actions: [
{
iconCls: 'info',
iconCls: 'broadcast_details',
qtip: 'Broadcast details',
cb: function(grid, rec, act, row) {
new tvheadend.epgDetails(grid.getStore().getAt(row).data);
Expand Down Expand Up @@ -748,7 +750,7 @@ tvheadend.epg = function() {
cm: epgCm,
plugins: [filter, actions],
title: 'Electronic Program Guide',
iconCls: 'newspaper',
iconCls: 'epg',
store: epgStore,
selModel: new Ext.ux.grid.livegrid.RowSelectionModel(),
view: epgView,
Expand Down
14 changes: 13 additions & 1 deletion src/webui/static/app/ext.css
Expand Up @@ -295,7 +295,7 @@
}

.completed {
background-image: url(../icons/tick.png) !important;
background-image: url(../icons/accept.png) !important;
}

.completedError {
Expand Down Expand Up @@ -454,6 +454,18 @@
background-image: url(../icons/reseticon.png) !important;
}

.dvr{
background-image: url(../icons/dvr.png) !important;
}

.epg{
background-image: url(../icons/epg.png) !important;
}

.broadcast_details{
background-image: url(../icons/broadcast_details.png) !important;
}

.x-linked {
display: inline-block;
background-image: url(../icons/linked.gif) !important;
Expand Down
3 changes: 2 additions & 1 deletion src/webui/static/app/tvheadend.js
Expand Up @@ -29,6 +29,7 @@ tvheadend.help = function(title, pagename) {

var win = new Ext.Window({
title: 'Help for ' + title,
iconCls: 'help',
layout: 'fit',
width: 900,
height: 400,
Expand Down Expand Up @@ -204,7 +205,7 @@ tvheadend.VideoPlayer = function(url) {
mode: 'local',
editable: false,
triggerAction: 'all',
emptyText: 'Select profile...',
emptyText: 'Select stream profile...',
store: tvheadend.profiles,
});

Expand Down
Binary file added src/webui/static/icons/broadcast_details.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/webui/static/icons/control_pause.png
Binary file not shown.
Binary file modified src/webui/static/icons/control_play.png
Binary file not shown.
Binary file modified src/webui/static/icons/control_stop.png
Binary file not shown.
Binary file added src/webui/static/icons/dvr.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/webui/static/icons/epg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit eef6f42

Please sign in to comment.