Merge branch 'cosmetic' of git://github.com/PiterEL/tvheadend into a

This commit is contained in:
Jaroslav Kysela 2014-10-30 14:38:57 +01:00
commit eef6f429b4
10 changed files with 24 additions and 8 deletions

View file

@ -26,6 +26,7 @@ tvheadend.dvrDetails = function(uuid) {
var win = new Ext.Window({
title: title,
iconCls: 'info',
layout: 'fit',
width: 400,
height: 300,
@ -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);

View file

@ -161,7 +161,7 @@ tvheadend.epgDetails = function(event) {
valueField: 'key',
displayField: 'val',
name: 'config_name',
emptyText: '(default)',
emptyText: '(default DVR Profile)',
value: '',
editable: false
});
@ -169,10 +169,12 @@ tvheadend.epgDetails = function(event) {
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"
}));
@ -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',
@ -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);
@ -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,

View file

@ -295,7 +295,7 @@
}
.completed {
background-image: url(../icons/tick.png) !important;
background-image: url(../icons/accept.png) !important;
}
.completedError {
@ -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;

View file

@ -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,
@ -204,7 +205,7 @@ tvheadend.VideoPlayer = function(url) {
mode: 'local',
editable: false,
triggerAction: 'all',
emptyText: 'Select profile...',
emptyText: 'Select stream profile...',
store: tvheadend.profiles,
});

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 B

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 B

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 B

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 773 B