From ae76893dae5538635c8f847b765b92ddb79e18e9 Mon Sep 17 00:00:00 2001 From: Jerry Russell Date: Sun, 10 Dec 2017 11:26:30 -0800 Subject: [PATCH 1/3] syncing libretime/libretime.git master to jerry924/libretime.git --- .../static/Screenshot161-Show_users.png | Bin 9774 -> 9773 bytes .../static/Screenshot162-Show_colours.png | Bin 27555 -> 27554 bytes .../static/Screenshot353-Contents_of_show.png | Bin 11722 -> 11721 bytes .../Screenshot357-Cancel_current_show.png | Bin 4548 -> 4547 bytes .../static/Screenshot451-Calendar.png | Bin 28165 -> 28164 bytes .../Screenshot452-Calendar_resolution.png | Bin 6927 -> 6925 bytes .../static/Screenshot453-Show_what.png | Bin 15311 -> 15309 bytes .../static/Screenshot454-Show_playlist.png | Bin 10469 -> 10466 bytes .../Screenshot457-Live_stream_input.png | Bin 23576 -> 23575 bytes .../Screenshot458-Record_and_rebroadcast.png | Bin 17261 -> 17260 bytes .../static/Screenshot459-Update_show.png | Bin 14692 -> 14691 bytes .../Screenshot488-Add_remove_content.png | Bin 9857 -> 9856 bytes .../static/Screenshot489-Show_Content.png | Bin 9538 -> 9537 bytes .../Screenshot490-Delete_this_instance.png | Bin 14493 -> 14492 bytes .../Screenshot526-Add_show_when_250.png | Bin 27733 -> 27731 bytes .../static/Screenshot527-negative_time250.png | Bin 15980 -> 15979 bytes .../static/Screenshot528-Link_shows_250.png | Bin 26614 -> 26613 bytes .../Screenshot529-repeat_type_monthly_250.png | Bin 26489 -> 26488 bytes .../Screenshot530-show_end_date_250.png | Bin 30666 -> 30664 bytes ...t583-Show_instance_description_vC9ooiT.png | Bin 19182 -> 19180 bytes .../static/Screenshot584-Show_logo.png | Bin 101176 -> 101173 bytes ...eenshot92-Record_and_rebroadcast_icons.png | Bin 15983 -> 15982 bytes 22 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/manual/calendar/static/Screenshot161-Show_users.png b/docs/manual/calendar/static/Screenshot161-Show_users.png index 374c33b5bf3b8cc1dcd25ce20e620fbdc42a1d4f..e64c418e9c0816bd02071b594c80100f9cd34324 100644 GIT binary patch delta 13 UcmZ4Iv(|^DGr-S%Bdeww03-MWYXATM delta 14 VcmZ4Mv(AULGr-TCcO#3Y8UQDx1b6@d diff --git a/docs/manual/calendar/static/Screenshot162-Show_colours.png b/docs/manual/calendar/static/Screenshot162-Show_colours.png index 28c474b2103f7888289c0795fd009ad38b47c966..4af76a316f873176b966fdbc402c48d2170e402e 100644 GIT binary patch delta 15 WcmZ2{opI51MwZS1KlhES^RfXnmj)*Q delta 16 XcmZ2VeKMM*Gr-S%BkNIJ04X5_WB>pF delta 14 VcmX>ZeJYx@Gr-TCcO%PDT>vd31#tiX diff --git a/docs/manual/calendar/static/Screenshot357-Cancel_current_show.png b/docs/manual/calendar/static/Screenshot357-Cancel_current_show.png index afdbe251eae0c2bc04c4a32980d36cbe41021af1..d9d9839a69668003e92c1f9c9cb182fc7c703e23 100644 GIT binary patch delta 13 UcmX@2d{~*KGr-S%BkO)a03(?M#sB~S delta 14 VcmX@Cd_#No1k(Tj diff --git a/docs/manual/calendar/static/Screenshot451-Calendar.png b/docs/manual/calendar/static/Screenshot451-Calendar.png index f21f0d4f2f9fb4c65a2872073922c00782d1cee1..ff3092fc750ce6d891e3f8029dcc6c598ef735c6 100644 GIT binary patch delta 14 VcmZp@!`O0%k)<=h&wU|l9snzq1xf$_ delta 15 WcmZposHP4DfT`$f_&3*;w)pBLF!*1=9ck delta 21 ccmeA*>o;TV4DfU3-N>RV$;i9eQ1T8V07Vl8>;M1& diff --git a/docs/manual/calendar/static/Screenshot453-Show_what.png b/docs/manual/calendar/static/Screenshot453-Show_what.png index c51d3f63f0dbc929b6b9e04c22aaf1348a292a7a..7d2fc7983f8e6d0c040c6ce3d61881bca9db05f2 100644 GIT binary patch delta 18 acmX?Kezu&YGr-S%BkLLI&6lMA$^!sVB?wjk delta 21 dcmX?Ge!iTwGr-TCcO%OgX-3}77o`8n0{~${2yXxY diff --git a/docs/manual/calendar/static/Screenshot454-Show_playlist.png b/docs/manual/calendar/static/Screenshot454-Show_playlist.png index 59ae093650ecc520cf07b894e929b06c4f72518d..4868935e62475c50028bda945663842bc8c0dc01 100644 GIT binary patch delta 22 dcmaDF_$ZL2Gr-S%A**um1$h7f diff --git a/docs/manual/calendar/static/Screenshot488-Add_remove_content.png b/docs/manual/calendar/static/Screenshot488-Add_remove_content.png index 4f5cbb1e93b071d7d881a33e6ed3d9eaa752b62f..e7167ea85b2e0136ddb13e9a0cee22617c80ade1 100644 GIT binary patch delta 13 UcmZqlZSZC34DfT`$XcTY03dt>W&i*H delta 14 VcmZqhZS-aB4DfU3-N;g-1^^?_1aklY diff --git a/docs/manual/calendar/static/Screenshot489-Show_Content.png b/docs/manual/calendar/static/Screenshot489-Show_Content.png index ab8d7618a9b504a034560c306caea3b6f1447ae8..8f31206cdf965be01ff3930036ce1f26bd284bc5 100644 GIT binary patch delta 13 UcmX@)b9RM=~1*!l5 diff --git a/docs/manual/calendar/static/Screenshot528-Link_shows_250.png b/docs/manual/calendar/static/Screenshot528-Link_shows_250.png index a2234d2744496e931cb6fece0704e0eba8722f21..0448029f52ada060d2114b222a3019ae035e8e4d 100644 GIT binary patch delta 15 Wcmex%p7HB>MwZS1KlhESAJYLnG6xI* delta 16 Xcmex*p7GmxM%K;%KX=}ZEFaSWLUjij diff --git a/docs/manual/calendar/static/Screenshot529-repeat_type_monthly_250.png b/docs/manual/calendar/static/Screenshot529-repeat_type_monthly_250.png index aa2829d835d981cb4339a8d30f092a917587c195..f162bacba08e38cc40bc9bb8f0886e5f4346e869 100644 GIT binary patch delta 15 Wcmex)j`7DiMwZS1KlhESCFuY>a0ZhA delta 16 Xcmexyj`8O?M%K;%KX=}ZEG6jxLAM5= diff --git a/docs/manual/calendar/static/Screenshot530-show_end_date_250.png b/docs/manual/calendar/static/Screenshot530-show_end_date_250.png index adbda5dac4843d3f3acbf0109b3b64b75a4c0d91..13de99878a10c2f861cae7bb3569e067866c8af5 100644 GIT binary patch delta 20 ccmX^0p7F$cMwZS1KlhES6SFr@&o<@(0ApteivR!s delta 23 fcmX@{p7GRsM%K;%KX=}ZEEBUCc{fkZHs%2Uc4P>o diff --git a/docs/manual/calendar/static/Screenshot583-Show_instance_description_vC9ooiT.png b/docs/manual/calendar/static/Screenshot583-Show_instance_description_vC9ooiT.png index 3d1846010b025bc6af90cdea2c08a76a1432251c..833431bfdd8abfef5b850e69991882614490244d 100644 GIT binary patch delta 20 ccmaDimGR9~MwZS1KlhESU3{A-@Wt5x09io?vH$=8 delta 23 ecmaDemGRwFM%K;%KX=}ZEM0tzyqo*@;%oqFG6%~5 diff --git a/docs/manual/calendar/static/Screenshot584-Show_logo.png b/docs/manual/calendar/static/Screenshot584-Show_logo.png index 4970b357936345a91ee1ab241c2c384fefd376a9..41fce1786b440380217a941c1cf40545d231f4c9 100644 GIT binary patch delta 26 icmdlnjcw~RHkQr+KlhES_IEbB-dQ+j`|}FMKp_B_RSR?g delta 31 ncmdlwjcvy?HrCDnKX=}ZEcSO8c{e-XSvZH0cl(nH#y}weyfzD% diff --git a/docs/manual/calendar/static/Screenshot92-Record_and_rebroadcast_icons.png b/docs/manual/calendar/static/Screenshot92-Record_and_rebroadcast_icons.png index f2d4be1766bfc73a7460964e710762fe87eef524..9af9a15e06c4668fa23fe750dfcec38ca519c988 100644 GIT binary patch delta 13 UcmaD~^R9-aGr-S%BWso&04~Y}rT_o{ delta 14 VcmaD?^S*|)Gr-TCcOy%d9RM>}1+xGE From 3c9bf4d554ea599ac6d4e3cbd2e70bcf1afdd9a7 Mon Sep 17 00:00:00 2001 From: Jerry Russell Date: Sun, 10 Dec 2017 11:30:55 -0800 Subject: [PATCH 2/3] Revert "syncing libretime/libretime.git master to jerry924/libretime.git" This reverts commit ae76893dae5538635c8f847b765b92ddb79e18e9. --- .../static/Screenshot161-Show_users.png | Bin 9773 -> 9774 bytes .../static/Screenshot162-Show_colours.png | Bin 27554 -> 27555 bytes .../static/Screenshot353-Contents_of_show.png | Bin 11721 -> 11722 bytes .../Screenshot357-Cancel_current_show.png | Bin 4547 -> 4548 bytes .../static/Screenshot451-Calendar.png | Bin 28164 -> 28165 bytes .../Screenshot452-Calendar_resolution.png | Bin 6925 -> 6927 bytes .../static/Screenshot453-Show_what.png | Bin 15309 -> 15311 bytes .../static/Screenshot454-Show_playlist.png | Bin 10466 -> 10469 bytes .../Screenshot457-Live_stream_input.png | Bin 23575 -> 23576 bytes .../Screenshot458-Record_and_rebroadcast.png | Bin 17260 -> 17261 bytes .../static/Screenshot459-Update_show.png | Bin 14691 -> 14692 bytes .../Screenshot488-Add_remove_content.png | Bin 9856 -> 9857 bytes .../static/Screenshot489-Show_Content.png | Bin 9537 -> 9538 bytes .../Screenshot490-Delete_this_instance.png | Bin 14492 -> 14493 bytes .../Screenshot526-Add_show_when_250.png | Bin 27731 -> 27733 bytes .../static/Screenshot527-negative_time250.png | Bin 15979 -> 15980 bytes .../static/Screenshot528-Link_shows_250.png | Bin 26613 -> 26614 bytes .../Screenshot529-repeat_type_monthly_250.png | Bin 26488 -> 26489 bytes .../Screenshot530-show_end_date_250.png | Bin 30664 -> 30666 bytes ...t583-Show_instance_description_vC9ooiT.png | Bin 19180 -> 19182 bytes .../static/Screenshot584-Show_logo.png | Bin 101173 -> 101176 bytes ...eenshot92-Record_and_rebroadcast_icons.png | Bin 15982 -> 15983 bytes 22 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/manual/calendar/static/Screenshot161-Show_users.png b/docs/manual/calendar/static/Screenshot161-Show_users.png index e64c418e9c0816bd02071b594c80100f9cd34324..374c33b5bf3b8cc1dcd25ce20e620fbdc42a1d4f 100644 GIT binary patch delta 14 VcmZ4Mv(AULGr-TCcO#3Y8UQDx1b6@d delta 13 UcmZ4Iv(|^DGr-S%Bdeww03-MWYXATM diff --git a/docs/manual/calendar/static/Screenshot162-Show_colours.png b/docs/manual/calendar/static/Screenshot162-Show_colours.png index 4af76a316f873176b966fdbc402c48d2170e402e..28c474b2103f7888289c0795fd009ad38b47c966 100644 GIT binary patch delta 16 XcmZ2ZeJYx@Gr-TCcO%PDT>vd31#tiX delta 13 UcmX>VeKMM*Gr-S%BkNIJ04X5_WB>pF diff --git a/docs/manual/calendar/static/Screenshot357-Cancel_current_show.png b/docs/manual/calendar/static/Screenshot357-Cancel_current_show.png index d9d9839a69668003e92c1f9c9cb182fc7c703e23..afdbe251eae0c2bc04c4a32980d36cbe41021af1 100644 GIT binary patch delta 14 VcmX@Cd_#No1k(Tj delta 13 UcmX@2d{~*KGr-S%BkO)a03(?M#sB~S diff --git a/docs/manual/calendar/static/Screenshot451-Calendar.png b/docs/manual/calendar/static/Screenshot451-Calendar.png index ff3092fc750ce6d891e3f8029dcc6c598ef735c6..f21f0d4f2f9fb4c65a2872073922c00782d1cee1 100644 GIT binary patch delta 15 WcmZpo;TV4DfU3-N>RV$;i9eQ1T8V07Vl8>;M1& delta 18 ZcmeA->osHP4DfT`$f_&3*;w)pBLF!*1=9ck diff --git a/docs/manual/calendar/static/Screenshot453-Show_what.png b/docs/manual/calendar/static/Screenshot453-Show_what.png index 7d2fc7983f8e6d0c040c6ce3d61881bca9db05f2..c51d3f63f0dbc929b6b9e04c22aaf1348a292a7a 100644 GIT binary patch delta 21 dcmX?Ge!iTwGr-TCcO%OgX-3}77o`8n0{~${2yXxY delta 18 acmX?Kezu&YGr-S%BkLLI&6lMA$^!sVB?wjk diff --git a/docs/manual/calendar/static/Screenshot454-Show_playlist.png b/docs/manual/calendar/static/Screenshot454-Show_playlist.png index 4868935e62475c50028bda945663842bc8c0dc01..59ae093650ecc520cf07b894e929b06c4f72518d 100644 GIT binary patch delta 27 hcmaD9_%x8UGr-TCcOi=yBkyJwF;gxeWvQ@|0|0z22Z{gy delta 22 dcmaDF_$ZL2Gr-S%A**um1$h7f delta 13 UcmaD-^tgznGr-S%BWt`R04&P|YybcN diff --git a/docs/manual/calendar/static/Screenshot488-Add_remove_content.png b/docs/manual/calendar/static/Screenshot488-Add_remove_content.png index e7167ea85b2e0136ddb13e9a0cee22617c80ade1..4f5cbb1e93b071d7d881a33e6ed3d9eaa752b62f 100644 GIT binary patch delta 14 VcmZqhZS-aB4DfU3-N;g-1^^?_1aklY delta 13 UcmZqlZSZC34DfT`$XcTY03dt>W&i*H diff --git a/docs/manual/calendar/static/Screenshot489-Show_Content.png b/docs/manual/calendar/static/Screenshot489-Show_Content.png index 8f31206cdf965be01ff3930036ce1f26bd284bc5..ab8d7618a9b504a034560c306caea3b6f1447ae8 100644 GIT binary patch delta 14 VcmX@;b;yggGr-TCcO#3fDgY^?1g`)9 delta 13 UcmX@)b9RM=~1*!l5 delta 13 UcmaD;^SXwmGr-S%BWt=H04{t5od5s; diff --git a/docs/manual/calendar/static/Screenshot528-Link_shows_250.png b/docs/manual/calendar/static/Screenshot528-Link_shows_250.png index 0448029f52ada060d2114b222a3019ae035e8e4d..a2234d2744496e931cb6fece0704e0eba8722f21 100644 GIT binary patch delta 16 Xcmex*p7GmxM%K;%KX=}ZEFaSWLUjij delta 15 Wcmex%p7HB>MwZS1KlhESAJYLnG6xI* diff --git a/docs/manual/calendar/static/Screenshot529-repeat_type_monthly_250.png b/docs/manual/calendar/static/Screenshot529-repeat_type_monthly_250.png index f162bacba08e38cc40bc9bb8f0886e5f4346e869..aa2829d835d981cb4339a8d30f092a917587c195 100644 GIT binary patch delta 16 Xcmexyj`8O?M%K;%KX=}ZEG6jxLAM5= delta 15 Wcmex)j`7DiMwZS1KlhESCFuY>a0ZhA diff --git a/docs/manual/calendar/static/Screenshot530-show_end_date_250.png b/docs/manual/calendar/static/Screenshot530-show_end_date_250.png index 13de99878a10c2f861cae7bb3569e067866c8af5..adbda5dac4843d3f3acbf0109b3b64b75a4c0d91 100644 GIT binary patch delta 23 fcmX@{p7GRsM%K;%KX=}ZEEBUCc{fkZHs%2Uc4P>o delta 20 ccmX^0p7F$cMwZS1KlhES6SFr@&o<@(0ApteivR!s diff --git a/docs/manual/calendar/static/Screenshot583-Show_instance_description_vC9ooiT.png b/docs/manual/calendar/static/Screenshot583-Show_instance_description_vC9ooiT.png index 833431bfdd8abfef5b850e69991882614490244d..3d1846010b025bc6af90cdea2c08a76a1432251c 100644 GIT binary patch delta 23 ecmaDemGRwFM%K;%KX=}ZEM0tzyqo*@;%oqFG6%~5 delta 20 ccmaDimGR9~MwZS1KlhESU3{A-@Wt5x09io?vH$=8 diff --git a/docs/manual/calendar/static/Screenshot584-Show_logo.png b/docs/manual/calendar/static/Screenshot584-Show_logo.png index 41fce1786b440380217a941c1cf40545d231f4c9..4970b357936345a91ee1ab241c2c384fefd376a9 100644 GIT binary patch delta 31 ncmdlwjcvy?HrCDnKX=}ZEcSO8c{e-XSvZH0cl(nH#y}weyfzD% delta 26 icmdlnjcw~RHkQr+KlhES_IEbB-dQ+j`|}FMKp_B_RSR?g diff --git a/docs/manual/calendar/static/Screenshot92-Record_and_rebroadcast_icons.png b/docs/manual/calendar/static/Screenshot92-Record_and_rebroadcast_icons.png index 9af9a15e06c4668fa23fe750dfcec38ca519c988..f2d4be1766bfc73a7460964e710762fe87eef524 100644 GIT binary patch delta 14 VcmaD?^S*|)Gr-TCcOy%d9RM>}1+xGE delta 13 UcmaD~^R9-aGr-S%BWso&04~Y}rT_o{ From 35e2f839bb490624c4e9e62fa417556a46ceadb1 Mon Sep 17 00:00:00 2001 From: jerry Date: Tue, 16 Jan 2018 17:49:33 -0800 Subject: [PATCH 3/3] Issue 350 - An improved fix that allows advanced search to be opened and also allows the schedule panel to be closed as it used to be prior to the earlier for for Issue 350. --- .../scripts/showbuilder/builderDialog.phtml | 4 ++-- airtime_mvc/public/css/dashboard.css | 23 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml index 4b6296bcb..b6e2317fa 100644 --- a/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml +++ b/airtime_mvc/application/views/scripts/showbuilder/builderDialog.phtml @@ -9,7 +9,7 @@

-
+
- \ No newline at end of file + diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index 23bfd6df5..1c575ea0a 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -289,12 +289,17 @@ thead th.ui-state-default:focus { top: 33px; } +#library_content > .panel-header-calendar { + top: 33px; +} + + .panel-header { position: absolute; top: 4px; right: 4px; left: 4px; - z-index: auto; /* Allows advanced mode expander to be visible in calendar schedule mode */ + z-index: 1; -webkit-flex: 1 100%; -moz-flex: 1 100%; @@ -303,6 +308,22 @@ thead th.ui-state-default:focus { flex: 1 100%; } +.panel-header-calendar { + position: absolute; + top: 4px; + right: 4px; + left: 4px; + z-index: auto; + + -webkit-flex: 1 100%; + -moz-flex: 1 100%; + -ms-flex: 1 100%; + -o-flex: 1 100%; + flex: 1 100%; +} + + + /* Timeline */ #show_builder {