From 9776da8bf46486fee2931043680550baa18ffd38 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 14:39:57 +0200 Subject: [PATCH 1/4] Fixed playlist item width --- airtime_mvc/public/css/playlist_builder.css | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index 4da8dab42..e67e58384 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -21,7 +21,14 @@ .spl_fade_out { clear: left; } - +#spl_sortable > li { + width: 100%; + margin-bottom:-1px; + position:relative; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} /*#side_playlist button { float: left; font-size: 12px; @@ -48,12 +55,6 @@ margin-bottom:0; } -/*#side_playlist li { - width: 99.5%; - margin-bottom:-1px; - position:relative; -}*/ - #side_playlist li div.list-item-container, #side_playlist li div.list-item-container.ui-state-active { height:56px; border: none; From d888d1cb1cd422ff9751e920eb77f9ed58a0ac19 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 15:27:13 +0200 Subject: [PATCH 2/4] CC-4443: Context menu is not displayed correctly --- airtime_mvc/public/css/jquery.contextMenu.css | 303 +++++++++--------- 1 file changed, 154 insertions(+), 149 deletions(-) diff --git a/airtime_mvc/public/css/jquery.contextMenu.css b/airtime_mvc/public/css/jquery.contextMenu.css index dd6ad991f..1119feb8f 100644 --- a/airtime_mvc/public/css/jquery.contextMenu.css +++ b/airtime_mvc/public/css/jquery.contextMenu.css @@ -1,149 +1,154 @@ -/* - * jQuery contextMenu - Plugin for simple contextMenu handling - * - * Version: 1.5.2 - * - * Authors: Rodney Rehm, Addy Osmani (patches for FF) - * Web: http://medialize.github.com/jQuery-contextMenu/ - * - * Licensed under - * MIT License http://www.opensource.org/licenses/mit-license - * GPL v3 http://opensource.org/licenses/GPL-3.0 - * - */ - -.context-menu-list { - margin:0; - padding:0; - - min-width: 120px; - max-width: 250px; - display: inline-block; - position: absolute; - list-style-type: none; - - border: 1px solid #333333; - background: #f0f0f0; - - -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} - -.context-menu-item { - padding: 2px 5px; - background-color: #f0f0f0; - position: relative; - min-height: 18px; - -moz-user-select: -moz-none; -} - -.context-menu-item.icon { - padding: 2px 2px 2px 28px; -} - -.context-menu-separator { - padding-bottom:0; - border-bottom: 1px solid #DDD; - min-height: 2px; -} - -.context-menu-item > label { - -moz-user-select: text; -} - -.context-menu-item.hover { - cursor: pointer; - background-color: #ff5d1a; -} - -.context-menu-item.disabled { - color: #666; -} - -.context-menu-input.hover, -.context-menu-item.disabled.hover { - cursor: default; - background-color: #EEE; -} - -.context-menu-submenu:after { - content: ">"; - color: #666; - position: absolute; - top: 0; - right: 3px; - z-index: 1; -} - -/* icons - #protip: - In case you want to use sprites for icons (which I would suggest you do) have a look at - http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement - .context-menu-item.icon:before {} - */ -.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; } -.context-menu-item.icon-edit { background-image: url(images/icon_edit_cm.png); } -.context-menu-item.icon-cut { background-image: url(images/icon_cut_cm.png); } -.context-menu-item.icon-copy { background-image: url(images/icon_copy_cm.png); } -.context-menu-item.icon-paste { background-image: url(images/icon_paste_cm.png); } -.context-menu-item.icon-delete { background-image: url(images/icon_delete_cm.png); } -.context-menu-item.icon-quit { background-image: url(images/icon_door_cm.png); } -.context-menu-item.icon-soundcloud { background-image: url(images/icon_soundcloud_cm.png); } - -.context-menu-item.icon-download { background-image: url(images/icon_download_cm.png); } -.context-menu-item.icon-overview { background-image: url(images/icon_overview_cm.png); } -.context-menu-item.icon-play { background-image: url(images/icon_play_cm.png); } -.context-menu-item.icon-select-cursor { background-image: url(images/icon_select-cursor_cm.png); } -.context-menu-item.icon-add-playlist { background-image: url(images/icon_add_playlist_cm.png); } -.context-menu-item.icon-add-remove-content { background-image: url(images/icon_add_content_cm.png); } -.context-menu-item.icon-remove-all-content { background-image: url(images/icon_remove_all_content_cm.png); } - -/* vertically align inside labels */ -.context-menu-input > label > * { vertical-align: top; } - -/* position checkboxes and radios as icons */ -.context-menu-input > label > input[type="checkbox"], -.context-menu-input > label > input[type="radio"] { - margin-left: -17px; -} -.context-menu-input > label > span { - margin-left: 5px; -} - -.context-menu-input > label, -.context-menu-input > label > input[type="text"], -.context-menu-input > label > textarea, -.context-menu-input > label > select { - display: block; - width: 100%; - - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; - box-sizing: border-box; -} - -.context-menu-input > label > textarea { - height: 100px; -} -.context-menu-item > .context-menu-list { - display: none; - /* re-positioned by js */ - right: -5px; - top: 5px; -} - -.context-menu-item.hover > .context-menu-list { - display: block; -} - -.context-menu-accesskey { - text-decoration: underline; -} +/* + * jQuery contextMenu - Plugin for simple contextMenu handling + * + * Version: 1.5.2 + * + * Authors: Rodney Rehm, Addy Osmani (patches for FF) + * Web: http://medialize.github.com/jQuery-contextMenu/ + * + * Licensed under + * MIT License http://www.opensource.org/licenses/mit-license + * GPL v3 http://opensource.org/licenses/GPL-3.0 + * + */ + +.context-menu-list { + margin:0; + padding:0; + + min-width: 120px; + max-width: 250px; + display: inline-block; + position: absolute; + list-style-type: none; + + border: 1px solid #333333; + background: #f0f0f0; + + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} + +.context-menu-item { + padding: 2px 5px; + background-color: #f0f0f0; + position: relative; + min-height: 18px; + -moz-user-select: -moz-none; + display: block; + width: 100%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +.context-menu-item.icon { + padding: 2px 2px 2px 28px; +} + +.context-menu-separator { + padding-bottom:0; + border-bottom: 1px solid #DDD; + min-height: 2px; +} + +.context-menu-item > label { + -moz-user-select: text; +} + +.context-menu-item.hover { + cursor: pointer; + background-color: #ff5d1a; +} + +.context-menu-item.disabled { + color: #666; +} + +.context-menu-input.hover, +.context-menu-item.disabled.hover { + cursor: default; + background-color: #EEE; +} + +.context-menu-submenu:after { + content: ">"; + color: #666; + position: absolute; + top: 0; + right: 3px; + z-index: 1; +} + +/* icons + #protip: + In case you want to use sprites for icons (which I would suggest you do) have a look at + http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement + .context-menu-item.icon:before {} + */ +.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; } +.context-menu-item.icon-edit { background-image: url(images/icon_edit_cm.png); } +.context-menu-item.icon-cut { background-image: url(images/icon_cut_cm.png); } +.context-menu-item.icon-copy { background-image: url(images/icon_copy_cm.png); } +.context-menu-item.icon-paste { background-image: url(images/icon_paste_cm.png); } +.context-menu-item.icon-delete { background-image: url(images/icon_delete_cm.png); } +.context-menu-item.icon-quit { background-image: url(images/icon_door_cm.png); } +.context-menu-item.icon-soundcloud { background-image: url(images/icon_soundcloud_cm.png); } + +.context-menu-item.icon-download { background-image: url(images/icon_download_cm.png); } +.context-menu-item.icon-overview { background-image: url(images/icon_overview_cm.png); } +.context-menu-item.icon-play { background-image: url(images/icon_play_cm.png); } +.context-menu-item.icon-select-cursor { background-image: url(images/icon_select-cursor_cm.png); } +.context-menu-item.icon-add-playlist { background-image: url(images/icon_add_playlist_cm.png); } +.context-menu-item.icon-add-remove-content { background-image: url(images/icon_add_content_cm.png); } +.context-menu-item.icon-remove-all-content { background-image: url(images/icon_remove_all_content_cm.png); } + +/* vertically align inside labels */ +.context-menu-input > label > * { vertical-align: top; } + +/* position checkboxes and radios as icons */ +.context-menu-input > label > input[type="checkbox"], +.context-menu-input > label > input[type="radio"] { + margin-left: -17px; +} +.context-menu-input > label > span { + margin-left: 5px; +} + +.context-menu-input > label, +.context-menu-input > label > input[type="text"], +.context-menu-input > label > textarea, +.context-menu-input > label > select { + display: block; + width: 100%; + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + -o-box-sizing: border-box; + box-sizing: border-box; +} + +.context-menu-input > label > textarea { + height: 100px; +} +.context-menu-item > .context-menu-list { + display: none; + /* re-positioned by js */ + right: -5px; + top: 5px; +} + +.context-menu-item.hover > .context-menu-list { + display: block; +} + +.context-menu-accesskey { + text-decoration: underline; +} From 465de07ae08f611865a6190ee414e6b624c6f2ae Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 15:32:33 +0200 Subject: [PATCH 3/4] Minor cosmetic change of the liquidsoap status --- airtime_mvc/public/css/styles.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index ab5156c89..3917a35ca 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1373,7 +1373,11 @@ h2#scheduled_playlist_name span { } .simple-formblock .liquidsoap_status{ - width: 95%; + width: 100%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 4px 0 8px; } .simple-formblock dd.block-display { From f6d8e4b9574f4180a126cf99fd7c618ec1e4dcf5 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 16:17:05 +0200 Subject: [PATCH 4/4] CC-4078: Calendar -> Need better 'now-playing' icon --- airtime_mvc/public/css/images/icon_alert_cal.png | Bin 0 -> 1066 bytes .../public/css/images/icon_alert_cal_alt.png | Bin 0 -> 1072 bytes airtime_mvc/public/css/images/icon_play_cal.png | Bin 0 -> 1065 bytes airtime_mvc/public/css/styles.css | 8 +++----- 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 airtime_mvc/public/css/images/icon_alert_cal.png create mode 100644 airtime_mvc/public/css/images/icon_alert_cal_alt.png create mode 100644 airtime_mvc/public/css/images/icon_play_cal.png diff --git a/airtime_mvc/public/css/images/icon_alert_cal.png b/airtime_mvc/public/css/images/icon_alert_cal.png new file mode 100644 index 0000000000000000000000000000000000000000..9b64d6251fb38f9d346514e4d06ea9dcbac27d5d GIT binary patch literal 1066 zcmbVLzi-n(6t+}UpjD-cB7StJPEJQ+pIzIDt-7rfJ2Vn$t29zGbckbL8>_X?*jM6q zp>%?Q0f`C3P!M8*4GF|Rg%F4dftVQi1Aq}0;G8Cfq3VET`+mLed+&Ys-i?L1i$epW z0}R6qm1oUrI?`|8L_huGub*Di;XJYGWD&2BwjCkHaB&lXvTv`VDze?p%kR)6!}Pgc ztxoEdOPYgy&Q5K(#1AQ&VJ4@O(00}k0Zp{(1v>lf#Y+}=uFfvW6<7(2sO8OWMQCwr zuI6m5IjYM}Pl3rqqXa%8Hc0&SAl4F{?eJ=Jo^JCj=$Mc-o!t+rUReM|93dcc6Ille z0#FoAkYq&>E&veD8?I+L+@iH(*slOj&_t9(rC2#$fK8HubbG} z@KHd@rq0q6&h=bPRV@ozhEXt7*`j*pp;0Ilq>`Ca1)&I~9>-x=n1_lgOA`>96lsa7 zB3Q+oD9S=fG89AYVaq{G?7%@izaI75#fnE_wPJ*9f}%9tCXkmim77jsiQ3gw1 z;No_iUe125CW^c($SpuGuIuVF qcRoIoh+vw$wP8(Omb}?^2XRA? z-4sQHfqD=R%0%?&!HGlhF!kU`{{lhW)x!?HbnWyob}%G)FE8Kk_kG{*`@WU(PhQ`C5_9a#1p#B>eTT|digy?(>cu9Ib^B@>uI0XE!;#Sl&{ zPFC&3Ia_g<+-Z8etr7wcVvBBjO+QlGS*FXYl6`#4F?81i&t;jNpk~Z6T|gnEC3Y-j z1D>a4ndL=EmibXy0KC8fa?2@RR3%vz(sb`)h_}$0RV%vD^F_Y0OatRU<+xU>#kR&+ z6xKOjQIwcN5K_b<6?J@UwNrjH(r3_NWQT5mUF6d-qg6u-ILnYocT(^I)7&NYqn=Pi zGOld}9M1yI^Wwa^))B72zhUfY9aTF4kUy;BI;x@+i=e1!c}ymqbNidRXUw z6yr!RT-+M}v`YVo^k2N)ZG7^vJ37!O^AeK5*nG*P$xziwx>jv}tNs4GzD{i<&ul*& z8m`>D{OGN&R{L%JLui7E`hS literal 0 HcmV?d00001 diff --git a/airtime_mvc/public/css/images/icon_play_cal.png b/airtime_mvc/public/css/images/icon_play_cal.png new file mode 100644 index 0000000000000000000000000000000000000000..48069afff3a3542dc552b955da199bdce8aa177e GIT binary patch literal 1065 zcmbVLJ8aWX6g5<;AT&%2g#kTWAwVMj)pla5p|xY1MrzuUrfMXXI`(U0rS@~}SK?Lz z%BM(3Y#k6&DeoBQ`p)!q^G%oF;{#>VReY{q8yU-t+E#Iz4$ao4Jso zC@NbXH>zYjN50Ide)9h?d+!Gs&SSHVXV3y}+YzKR7d0R#`}QKNLfc(k-i0F+)#rM( zI<8kHR0sKto!T&o9}+Z0jf^It?X(~U4Y=q9Mf&H*Pc-n{B0VQnxJp=pO>cZHf-`HA zHD|5mC@wvE1B@gpA@Cu#LEX=4zEh)={8G)jtOoR>4Tu^m1$5y5d;!5oO3vy z2eQoYq9n`wbs%uOz;fi3bG)cZvMS_3_o0cm$X!sYhSl{&RzN@O+6AdmKk$d0m&pk}PtZ!SlQ+ z=#ng0B}1@8lQTr4(8HF47~6pZdwxCQw~HM<7OR#bXk!%B5L)V0z;qK~6gN=_N;49e z^8y#O