diff --git a/application/views/scripts/schedule/schedule-show.phtml b/application/views/scripts/schedule/schedule-show.phtml index b854df484..5630d2598 100644 --- a/application/views/scripts/schedule/schedule-show.phtml +++ b/application/views/scripts/schedule/schedule-show.phtml @@ -1,5 +1,7 @@
- - +
+ + +
diff --git a/application/views/scripts/schedule/scheduled-content.phtml b/application/views/scripts/schedule/scheduled-content.phtml index 980ab27ea..2b06e0d7b 100644 --- a/application/views/scripts/schedule/scheduled-content.phtml +++ b/application/views/scripts/schedule/scheduled-content.phtml @@ -1,10 +1,11 @@ showContent) > 0) : ?> showContent as $pl) : ?>
  • "> -
    - - +
    +
    +
    +
    -
  • -

    Empty

    -
    No Playlists
    +
  • No Playlists
  • diff --git a/build/build.properties b/build/build.properties index 50915fb41..cd25e41b3 100644 --- a/build/build.properties +++ b/build/build.properties @@ -1,6 +1,6 @@ #Note: project.home is automatically generated by the propel-install script. #Any manual changes to this value will be overwritten. -project.home = /path/to/airtime +project.home = /home/naomi/dev-campcaster/campcaster project.build = ${project.home}/build #Database driver @@ -21,4 +21,4 @@ propel.phpconf.dir = ${propel.output.dir}/application/configs propel.sql.dir = ${project.build}/sql # set the name for the configuration file -propel.runtime.phpconf.file = propel-config.php +# set the name for the configuration file diff --git a/public/css/schedule.css b/public/css/schedule.css index aee64109e..3b4784ea0 100644 --- a/public/css/schedule.css +++ b/public/css/schedule.css @@ -5,3 +5,28 @@ div.ui-datepicker { font-size: 75%; } + +#schedule_playlist_dialog ul { + list-style-type: none; + float: left; + width: 400px; + height: 200px; + overflow: auto; +} + +#schedule_playlist_chosen li { + clear: left; +} + +#schedule_playlist_chosen li > div { + float: left; + margin: 0 5px 2px 0; +} + +#schedule_playlist_chosen li div.group_list { + clear: left; +} + +.sched_description { + font-size: 85%; +} diff --git a/public/js/airtime/schedule/schedule.js b/public/js/airtime/schedule/schedule.js index f50cd6aca..f5330e41a 100644 --- a/public/js/airtime/schedule/schedule.js +++ b/public/js/airtime/schedule/schedule.js @@ -255,7 +255,7 @@ function openScheduleDialog(show) { autoOpen: false, title: 'Schedule Playlist', width: 950, - height: 400, + height: 450, close: closeDialog, buttons: {"Ok": function() { dialog.remove();