From: Piotr Kuchciak Date: Thu, 30 Oct 2014 07:41:28 +0000 (+0100) Subject: WEBUI: cosmetic changes X-Git-Tag: v4.1~876^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=978e7f831e9daca79dd7209a0b7943ee4f5ac674;p=thirdparty%2Ftvheadend.git WEBUI: cosmetic changes -changed icon in Live TV Player: play, pause, stop -cosmetic in Live TV Player -changed icon for broadcast details and cosmetic name field, and add icon for buttons (Please add button STOP RECORD about button RECORD PROGRAM !!! and moved link PLAY about DVR PROFILE SELECT as BUTTON) -changed icon in details for finished recordings in DVR -changed windows size for broadcast details -add icon for title help window -changed icon tab EPG -changed icon tab DVR --- diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index 5f3d3cc39..dd0a3e287 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -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); diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js index eddb8c829..af8a2ec72 100644 --- a/src/webui/static/app/epg.js +++ b/src/webui/static/app/epg.js @@ -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, diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css index b57eea5fe..3a1bbb862 100644 --- a/src/webui/static/app/ext.css +++ b/src/webui/static/app/ext.css @@ -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; diff --git a/src/webui/static/app/tvheadend.js b/src/webui/static/app/tvheadend.js index ed29ff81e..3e6477a4f 100644 --- a/src/webui/static/app/tvheadend.js +++ b/src/webui/static/app/tvheadend.js @@ -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, }); diff --git a/src/webui/static/icons/broadcast_details.png b/src/webui/static/icons/broadcast_details.png new file mode 100644 index 000000000..87d4ac79a Binary files /dev/null and b/src/webui/static/icons/broadcast_details.png differ diff --git a/src/webui/static/icons/control_pause.png b/src/webui/static/icons/control_pause.png index da8c524c7..0b106fc94 120000 Binary files a/src/webui/static/icons/control_pause.png and b/src/webui/static/icons/control_pause.png differ diff --git a/src/webui/static/icons/control_play.png b/src/webui/static/icons/control_play.png index 33a5ccba0..40c53fbbb 120000 Binary files a/src/webui/static/icons/control_play.png and b/src/webui/static/icons/control_play.png differ diff --git a/src/webui/static/icons/control_stop.png b/src/webui/static/icons/control_stop.png index 420c17189..2bbb1f1cc 120000 Binary files a/src/webui/static/icons/control_stop.png and b/src/webui/static/icons/control_stop.png differ diff --git a/src/webui/static/icons/dvr.png b/src/webui/static/icons/dvr.png new file mode 100644 index 000000000..1495cd619 Binary files /dev/null and b/src/webui/static/icons/dvr.png differ diff --git a/src/webui/static/icons/epg.png b/src/webui/static/icons/epg.png new file mode 100644 index 000000000..d360b1624 Binary files /dev/null and b/src/webui/static/icons/epg.png differ