diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9e7c56ad0..1e9deeae5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,7 +32,7 @@ repos: hooks: - id: prettier files: \.(md|mdx|yml|yaml|js|jsx|ts|tsx|json|css)$ - exclude: ^legacy/public + exclude: ^legacy/public(?!/js/airtime) - repo: https://github.com/asottile/pyupgrade rev: v2.34.0 diff --git a/legacy/application/layouts/scripts/layout.phtml b/legacy/application/layouts/scripts/layout.phtml index 746148273..803dc682f 100644 --- a/legacy/application/layouts/scripts/layout.phtml +++ b/legacy/application/layouts/scripts/layout.phtml @@ -21,7 +21,10 @@ $scs = $this->SourceConnectionStatus(); ?> partial('partialviews/header.phtml', array( - "live_dj_switch" => $sss['live_dj'], "live_dj_connection" => $scs['live_dj'], "master_dj_switch" => $sss['master_dj'], "master_dj_connection" => $scs['master_dj'], + "live_dj_switch" => $sss['live_dj'], + "live_dj_connection" => $scs['live_dj'], + "master_dj_switch" => $sss['master_dj'], + "master_dj_connection" => $scs['master_dj'], "scheduled_play_switch" => $sss['scheduled_play'] )) ?>
-playlistID)): ?> - playlistID" ?> - playlistIndex" ?> -blockId)): ?> - - -uri)): ?> - - - audioFileTitle" ?> - audioFileArtist" ?> -showID)): ?> - showID" ?> - showIndex" ?> - + playlistID)) : ?> + playlistID" ?> + playlistIndex" ?> + blockId)) : ?> + + + uri)) : ?> + + + audioFileTitle" ?> + audioFileArtist" ?> + showID)) : ?> + showID" ?> + showIndex" ?> +
@@ -77,9 +77,11 @@
- ", - "") ?> + "" + ) ?>
diff --git a/legacy/application/views/scripts/dashboard/about.phtml b/legacy/application/views/scripts/dashboard/about.phtml index f7cac7198..ff636a5b4 100644 --- a/legacy/application/views/scripts/dashboard/about.phtml +++ b/legacy/application/views/scripts/dashboard/about.phtml @@ -1,28 +1,34 @@

-

- + " - . PRODUCT_NAME - . ""; -echo sprintf(_('%1$s %2$s, the open radio software for scheduling and remote station management.'), - $productSiteAnchor, - $this->airtime_version) -?> -
-
© -" - . COMPANY_NAME . " " . COMPANY_SUFFIX - . ""; -$licenseAnchor = "" - . LICENSE_VERSION - . ""; -echo sprintf(_('%1$s %2$s is distributed under the %3$s'), - $companySiteAnchor, PRODUCT_NAME, $licenseAnchor) -?> -

+ $productSiteAnchor = "" + . PRODUCT_NAME + . ""; + echo sprintf( + _('%1$s %2$s, the open radio software for scheduling and remote station management.'), + $productSiteAnchor, + $this->airtime_version + ) + ?> +
+
© + " + . COMPANY_NAME . " " . COMPANY_SUFFIX + . ""; + $licenseAnchor = "" + . LICENSE_VERSION + . ""; + echo sprintf( + _('%1$s %2$s is distributed under the %3$s'), + $companySiteAnchor, + PRODUCT_NAME, + $licenseAnchor + ) + ?> +



diff --git a/legacy/application/views/scripts/dashboard/help.phtml b/legacy/application/views/scripts/dashboard/help.phtml index c2736ed8e..2916caac9 100644 --- a/legacy/application/views/scripts/dashboard/help.phtml +++ b/legacy/application/views/scripts/dashboard/help.phtml @@ -1,24 +1,32 @@
-

-

+

+

-
    -
  1. -
  2. -
  3. -
  4. -
  5. - -
  6. +
      +
    1. +

      + +
    2. +
    3. +

      + +
    4. +
    5. +

      + +
    6. -
    -


    -"; -echo sprintf(_("For more detailed help, read the %suser manual%s."), - $userManualAnchorOpen, "") +

+


+ "; + echo sprintf( + _("For more detailed help, read the %suser manual%s."), + $userManualAnchorOpen, + "" + ) -?> -

+ ?> +

diff --git a/legacy/application/views/scripts/dashboard/stream-player.phtml b/legacy/application/views/scripts/dashboard/stream-player.phtml index 3da914a46..f8e00e963 100644 --- a/legacy/application/views/scripts/dashboard/stream-player.phtml +++ b/legacy/application/views/scripts/dashboard/stream-player.phtml @@ -1,99 +1,99 @@
-

- - - - - -
- + $("#combo-box").change(function(eventObject) { + var elem = $("#combo-box option:selected"); + setjPlayer(elem.attr("data-url"), elem.attr("data-type"), elem.attr("server-type")); + }); -
- -
-
-
+ $("#popup-link").click(function() { + $("#popup-share").show("slow"); + $("#popup-share-link").val($("#combo-box option:selected").attr("data-url")); + }); -
- diff --git a/legacy/application/views/scripts/embed/player.phtml b/legacy/application/views/scripts/embed/player.phtml index 75e7cd4de..92a98b536 100644 --- a/legacy/application/views/scripts/embed/player.phtml +++ b/legacy/application/views/scripts/embed/player.phtml @@ -2,11 +2,11 @@ - - - + + + - + -
player_style == "basic") echo "style='display:block;'"; else echo "style='display:none'"; ?>> -
+
player_style == "basic") echo "style='display:block;'"; + else echo "style='display:none'"; ?>> +
-
-

fff

-
- -
- -
- - +
+

fff

-

-
+
-
+
+ + +
+

-
-

-
    -
  • -
-
- +
-
-
+
-
player_style == "premium") echo "style='display:block;'"; else echo "style='display:none'"; ?>> -
-
+
+

+
    +
  • +
+
+ -
-

-
+
player_style == "premium") echo "style='display:block;'"; + else echo "style='display:none'"; ?>> +
+
-
- -
+
+

+
+
+ +
+ +
+ +
+ diff --git a/legacy/application/views/scripts/embed/weekly-program.phtml b/legacy/application/views/scripts/embed/weekly-program.phtml index 12b7f7262..ae052b726 100644 --- a/legacy/application/views/scripts/embed/weekly-program.phtml +++ b/legacy/application/views/scripts/embed/weekly-program.phtml @@ -2,16 +2,16 @@ - + -
- -
+
- + // Re-arraying data into a Handlebars-friendly format + for (var i = 0; i <= 6; i++) { + cleanSchedule.push(Object.values(importSchedule.weekDays)[i]); + } + + // Checker + Handlebars.registerHelper('noShowsCheck', function(obj) { + return obj.length == 0; + }); + + // Templating with Handlebars.js + var wpWidget = document.querySelector('#wpWidget').innerHTML; + var wpTemplate = Handlebars.compile(wpWidget); + var compiledHTML = wpTemplate(cleanSchedule); + document.querySelector('#wpBody').innerHTML = compiledHTML; + + // Tabs logic + $(document).ready(function() { + //initialize first day to active + $('.tabs').find("li").first().addClass("active"); + $('.schedule_content').find('.schedule_item').first().addClass("active"); + + $('.tabs li').click(function() { + //var tab_id = $(this).attr('data-tab'); + var tab_id = "day-" + $(this).find('span').text(); + + $('.tabs li').removeClass('active'); + $('.schedule_item').removeClass('active'); + + $(this).addClass('active'); + $("#" + tab_id).addClass('active'); + }); + }); + + diff --git a/legacy/application/views/scripts/error/error-400.phtml b/legacy/application/views/scripts/error/error-400.phtml index 036f8e71a..2c2ec4d96 100644 --- a/legacy/application/views/scripts/error/error-400.phtml +++ b/legacy/application/views/scripts/error/error-400.phtml @@ -1,17 +1,20 @@ + - - <?php echo _("An error has occurred.") ?> - headLink(); ?> + + <?php echo _("An error has occurred.") ?> + headLink(); ?> +
-

-

+

+

+ diff --git a/legacy/application/views/scripts/error/error-403.phtml b/legacy/application/views/scripts/error/error-403.phtml index 072bb475b..2cfb4bf89 100644 --- a/legacy/application/views/scripts/error/error-403.phtml +++ b/legacy/application/views/scripts/error/error-403.phtml @@ -1,17 +1,20 @@ + - - <?php echo _("An error has occurred.") ?> - headLink(); ?> + + <?php echo _("An error has occurred.") ?> + headLink(); ?> +
-

-

+

+

+ diff --git a/legacy/application/views/scripts/error/error-404.phtml b/legacy/application/views/scripts/error/error-404.phtml index 7cb90f771..1cdc0ca1e 100644 --- a/legacy/application/views/scripts/error/error-404.phtml +++ b/legacy/application/views/scripts/error/error-404.phtml @@ -1,17 +1,20 @@ + - - <?php echo _("An error has occurred.") ?> - headLink(); ?> + + <?php echo _("An error has occurred.") ?> + headLink(); ?> +
-

-

+

+

+ diff --git a/legacy/application/views/scripts/error/error-500.phtml b/legacy/application/views/scripts/error/error-500.phtml index 4c8cb2516..440bea27a 100644 --- a/legacy/application/views/scripts/error/error-500.phtml +++ b/legacy/application/views/scripts/error/error-500.phtml @@ -1,17 +1,20 @@ + - - <?php echo _("An error has occurred.") ?> - headLink(); ?> + + <?php echo _("An error has occurred.") ?> + headLink(); ?> +
-

-

+

+

+ diff --git a/legacy/application/views/scripts/error/error.phtml b/legacy/application/views/scripts/error/error.phtml index 96f90c325..a0493c8fd 100644 --- a/legacy/application/views/scripts/error/error.phtml +++ b/legacy/application/views/scripts/error/error.phtml @@ -1,18 +1,20 @@ - - + + + - - <?php echo _("An error has occurred.") ?> - headLink(); ?> + + <?php echo _("An error has occurred.") ?> + headLink(); ?> +
-

escape($this->message)?>

-

+

escape($this->message) ?>

+

+ diff --git a/legacy/application/views/scripts/form/add-show-autoplaylist.phtml b/legacy/application/views/scripts/form/add-show-autoplaylist.phtml index 3f22104db..1cee68cd4 100644 --- a/legacy/application/views/scripts/form/add-show-autoplaylist.phtml +++ b/legacy/application/views/scripts/form/add-show-autoplaylist.phtml @@ -2,7 +2,7 @@
@@ -10,24 +10,24 @@
-
-

More information"); ?>

-
- -
-
- element->getElement('add_show_autoplaylist_id') ?> -
-
-
- +
+

More information"); ?>

+
+
- element->getElement('add_show_autoplaylist_repeat') ?> + element->getElement('add_show_autoplaylist_id') ?> +
+
+
+ +
+
+ element->getElement('add_show_autoplaylist_repeat') ?>
diff --git a/legacy/application/views/scripts/form/add-show-block.phtml b/legacy/application/views/scripts/form/add-show-block.phtml index 491b8000b..6ca18fd0c 100644 --- a/legacy/application/views/scripts/form/add-show-block.phtml +++ b/legacy/application/views/scripts/form/add-show-block.phtml @@ -1,6 +1,8 @@
- formLabel($this->element->getName(), - $this->element->getLabel()) ?> + formLabel( + $this->element->getName(), + $this->element->getLabel() + ) ?>
{$this->element->helper}( @@ -8,8 +10,8 @@ $this->element->getValue(), $this->element->getAttribs() ) ?> - element->hasErrors()) { - echo $this->formErrors($this->element->getMessages()); - } + element->hasErrors()) { + echo $this->formErrors($this->element->getMessages()); + } ?>
diff --git a/legacy/application/views/scripts/form/add-show-live-stream.phtml b/legacy/application/views/scripts/form/add-show-live-stream.phtml index abce2445d..438be1c5d 100644 --- a/legacy/application/views/scripts/form/add-show-live-stream.phtml +++ b/legacy/application/views/scripts/form/add-show-live-stream.phtml @@ -15,5 +15,5 @@ element->getElement("show_source_port")->render() ?> element->getElement("show_source_mount")->render() ?> -
+ diff --git a/legacy/application/views/scripts/form/add-show-rebroadcast-absolute.phtml b/legacy/application/views/scripts/form/add-show-rebroadcast-absolute.phtml index aea90510f..add873c5e 100644 --- a/legacy/application/views/scripts/form/add-show-rebroadcast-absolute.phtml +++ b/legacy/application/views/scripts/form/add-show-rebroadcast-absolute.phtml @@ -1,44 +1,48 @@
-
- -
-
-
    - -
  • 1) - && ($this->element->getElement('add_show_rebroadcast_date_absolute_'.$i)->getValue() == "" - && $this->element->getElement('add_show_rebroadcast_time_absolute_'.$i)->getValue() == "")){echo 'style=display:none';} ?>> - element->getElement('add_show_rebroadcast_date_absolute_'.$i) ?> - @ - element->getElement('add_show_rebroadcast_time_absolute_'.$i) ?> - 1): ?> - - - - - - element->getElement('add_show_rebroadcast_date_absolute_'.$i)->hasErrors()) - || ($this->element->getElement('add_show_rebroadcast_time_absolute_'.$i)->hasErrors())) : ?> -
      - element->getElement('add_show_rebroadcast_date_absolute_'.$i)->getMessages(), - $this->element->getElement('add_show_rebroadcast_time_absolute_'.$i)->getMessages() +
      + +
      +
      +
        + +
      • 1) + && ($this->element->getElement('add_show_rebroadcast_date_absolute_' . $i)->getValue() == "" + && $this->element->getElement('add_show_rebroadcast_time_absolute_' . $i)->getValue() == "") + ) { + echo 'style=display:none'; + } ?>> + element->getElement('add_show_rebroadcast_date_absolute_' . $i) ?> + @ + element->getElement('add_show_rebroadcast_time_absolute_' . $i) ?> + 1) : ?> + + + + + + element->getElement('add_show_rebroadcast_date_absolute_' . $i)->hasErrors()) + || ($this->element->getElement('add_show_rebroadcast_time_absolute_' . $i)->hasErrors()) + ) : ?> +
          + element->getElement('add_show_rebroadcast_date_absolute_' . $i)->getMessages(), + $this->element->getElement('add_show_rebroadcast_time_absolute_' . $i)->getMessages() ); - ?> + ?> - -
        • - -
        - -
      • - -
      - - - - -
      + +
    • + +
    + +
  • + +
+ + + + +
diff --git a/legacy/application/views/scripts/form/add-show-rebroadcast.phtml b/legacy/application/views/scripts/form/add-show-rebroadcast.phtml index a5743a0f4..0996b40dd 100644 --- a/legacy/application/views/scripts/form/add-show-rebroadcast.phtml +++ b/legacy/application/views/scripts/form/add-show-rebroadcast.phtml @@ -1,45 +1,49 @@
- +
    - -
  • 1) - && ($this->element->getElement('add_show_rebroadcast_date_'.$i)->getValue() == "" - && $this->element->getElement('add_show_rebroadcast_time_'.$i)->getValue() == "")){echo 'style=display:none';} ?>> - element->getElement('add_show_rebroadcast_date_'.$i) ?> - @ - element->getElement('add_show_rebroadcast_time_'.$i) ?> - 1): ?> - - - - - - element->getElement('add_show_rebroadcast_date_'.$i)->hasErrors()) - || ($this->element->getElement('add_show_rebroadcast_time_'.$i)->hasErrors())) : ?> -
      - element->getElement('add_show_rebroadcast_date_'.$i)->getMessages(), - $this->element->getElement('add_show_rebroadcast_time_'.$i)->getMessages() - ); - ?> + +
    • 1) + && ($this->element->getElement('add_show_rebroadcast_date_' . $i)->getValue() == "" + && $this->element->getElement('add_show_rebroadcast_time_' . $i)->getValue() == "") + ) { + echo 'style=display:none'; + } ?>> + element->getElement('add_show_rebroadcast_date_' . $i) ?> + @ + element->getElement('add_show_rebroadcast_time_' . $i) ?> + 1) : ?> + + + + + + element->getElement('add_show_rebroadcast_date_' . $i)->hasErrors()) + || ($this->element->getElement('add_show_rebroadcast_time_' . $i)->hasErrors()) + ) : ?> +
        + element->getElement('add_show_rebroadcast_date_' . $i)->getMessages(), + $this->element->getElement('add_show_rebroadcast_time_' . $i)->getMessages() + ); + ?> - -
      • - -
      - -
    • + +
    • + +
    + +
- - - - + + + +
diff --git a/legacy/application/views/scripts/form/add-show-style.phtml b/legacy/application/views/scripts/form/add-show-style.phtml index 86f42ff24..19935dd0b 100644 --- a/legacy/application/views/scripts/form/add-show-style.phtml +++ b/legacy/application/views/scripts/form/add-show-style.phtml @@ -1,6 +1,8 @@
- formLabel($this->element->getName(), - $this->element->getLabel()) ?> + formLabel( + $this->element->getName(), + $this->element->getLabel() + ) ?>
{$this->element->helper}( @@ -9,5 +11,7 @@ $this->element->getAttribs() ) ?> - element->hasErrors()) { echo $this->formErrors($this->element->getMessages());} ?> + element->hasErrors()) { + echo $this->formErrors($this->element->getMessages()); + } ?>
diff --git a/legacy/application/views/scripts/form/add-show-when.phtml b/legacy/application/views/scripts/form/add-show-when.phtml index f82fb8256..16bc92841 100644 --- a/legacy/application/views/scripts/form/add-show-when.phtml +++ b/legacy/application/views/scripts/form/add-show-when.phtml @@ -2,7 +2,7 @@
@@ -12,29 +12,30 @@
element->getElement('add_show_start_date') ?> element->getElement('add_show_start_time') ?>
- element->getElement('add_show_start_date')->hasErrors() || $this->element->getElement('add_show_start_time')->hasErrors()){ ?> -
    - element->getElement('add_show_start_date')->getMessages() as $error): ?> -
  • - - element->getElement('add_show_start_time')->getMessages() as $error): ?> -
  • - -
+ element->getElement('add_show_start_date')->hasErrors() || $this->element->getElement('add_show_start_time')->hasErrors()) { ?> +
    + element->getElement('add_show_start_date')->getMessages() as $error) : ?> +
  • + + element->getElement('add_show_start_time')->getMessages() as $error) : ?> +
  • + +
@@ -42,15 +43,15 @@ element->getElement('add_show_end_date_no_repeat') ?> element->getElement('add_show_end_time') ?> - element->getElement('add_show_end_date_no_repeat')->hasErrors() || $this->element->getElement('add_show_end_time')->hasErrors()){ ?> -
    - element->getElement('add_show_end_date_no_repeat')->getMessages() as $error): ?> -
  • - - element->getElement('add_show_end_time')->getMessages() as $error): ?> -
  • - -
+ element->getElement('add_show_end_date_no_repeat')->hasErrors() || $this->element->getElement('add_show_end_time')->hasErrors()) { ?> +
    + element->getElement('add_show_end_date_no_repeat')->getMessages() as $error) : ?> +
  • + + element->getElement('add_show_end_time')->getMessages() as $error) : ?> +
  • + +
element->getElement('add_show_duration') ?> - +
- element->getElement('add_show_duration')->hasErrors()){ ?> -
    - element->getElement('add_show_duration')->getMessages() as $error): ?> -
  • - -
+ element->getElement('add_show_duration')->hasErrors()) { ?> +
    + element->getElement('add_show_duration')->getMessages() as $error) : ?> +
  • + +
@@ -85,5 +86,5 @@
element->getElement('add_show_repeats') ?>
-
+ diff --git a/legacy/application/views/scripts/form/daterange.phtml b/legacy/application/views/scripts/form/daterange.phtml index 81d19489e..aee2901c7 100644 --- a/legacy/application/views/scripts/form/daterange.phtml +++ b/legacy/application/views/scripts/form/daterange.phtml @@ -3,7 +3,7 @@ element->getElement('his_time_start') ?> element->getElement('his_date_end') ?> element->getElement('his_time_end') ?> -
"> - +
"> +
diff --git a/legacy/application/views/scripts/form/edit-history-file.phtml b/legacy/application/views/scripts/form/edit-history-file.phtml index 709288569..a6b2e022d 100644 --- a/legacy/application/views/scripts/form/edit-history-file.phtml +++ b/legacy/application/views/scripts/form/edit-history-file.phtml @@ -1,37 +1,37 @@
-element ?> + element ?> -
+
- -
- getElement($name); ?> -
+ +
+ getElement($name); ?> +
-getSubForm('his_file_template') as $index=>$el): ?> - getName(); ?> + getSubForm('his_file_template') as $index => $el) : ?> + getName(); ?> -
- -
-
- - hasErrors()): ?> -
    - getMessages() as $error): ?> -
  • +
    + +
    +
    + + hasErrors()) : ?> +
      + getMessages() as $error) : ?> +
    • + +
    + +
    + + +
    + + getElement($name); ?> -
- -
- + -
- -getElement($name); ?> - -
- -
+
diff --git a/legacy/application/views/scripts/form/edit-history-item.phtml b/legacy/application/views/scripts/form/edit-history-item.phtml index 460d46242..e107c2f9d 100644 --- a/legacy/application/views/scripts/form/edit-history-item.phtml +++ b/legacy/application/views/scripts/form/edit-history-item.phtml @@ -1,86 +1,86 @@
-element ?> + element ?> -
+
- getErrorMessages() ?> - 0) : ?> -
    - -
  • + getErrorMessages() ?> + 0) : ?> +
      + +
    • + +
    + + + +
    + getElement($name); ?> +
    + + +
    + +
    +
    +
    +
    + getElement($name) ?> + + + +
    +
    + getElement($name)->hasErrors()) : ?> +
      + getElement($name)->getMessages() as $error) : ?> +
    • + +
    + +
    -
- - -
- getElement($name); ?> -
- - -
- -
-
-
-
- getElement($name) ?> - - - +
+
+
-
- getElement($name)->hasErrors()) : ?> -
    - getElement($name)->getMessages() as $error): ?> -
  • +
    + getElement("his_instance_select"); ?> + + + + + + +
    + + + getSubForm('his_item_template') as $index => $el) : ?> + getName(); ?> + +
    + +
    +
    + + hasErrors()) : ?> +
      + getMessages() as $error) : ?> +
    • + +
    + +
    + + +
    + + getElement($name); ?> -
- - - + -
-
- -
-
- getElement("his_instance_select"); ?> - - - - - - -
-
- -getSubForm('his_item_template') as $index=>$el): ?> - getName(); ?> - -
- -
-
- - hasErrors()): ?> -
    - getMessages() as $error): ?> -
  • - -
- -
- - -
- -getElement($name); ?> - -
- - + diff --git a/legacy/application/views/scripts/form/edit-user.phtml b/legacy/application/views/scripts/form/edit-user.phtml index 2051f720d..b9dda47bc 100644 --- a/legacy/application/views/scripts/form/edit-user.phtml +++ b/legacy/application/views/scripts/form/edit-user.phtml @@ -1,165 +1,165 @@

-
-
- element->getElement('cu_user_id') ?> -
- -
-
- element->getElement('cu_login') ?> - element->getElement('cu_login')->hasErrors()) : ?> -
    - element->getElement('cu_login')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_password') ?> - element->getElement('cu_password')->hasErrors()) : ?> -
    - element->getElement('cu_password')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_passwordVerify') ?> - element->getElement('cu_passwordVerify')->hasErrors()) : ?> -
    - element->getElement('cu_passwordVerify')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_first_name') ?> - element->getElement('cu_first_name')->hasErrors()) : ?> -
    - element->getElement('cu_first_name')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_last_name') ?> - element->getElement('cu_last_name')->hasErrors()) : ?> -
    - element->getElement('cu_last_name')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_email') ?> - element->getElement('cu_email')->hasErrors()) : ?> -
    - element->getElement('cu_email')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_cell_phone') ?> - element->getElement('cu_cell_phone')->hasErrors()) : ?> -
    - element->getElement('cu_cell_phone')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_skype') ?> - element->getElement('cu_skype')->hasErrors()) : ?> -
    - element->getElement('cu_skype')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_jabber') ?> - element->getElement('cu_jabber')->hasErrors()) : ?> -
    - element->getElement('cu_jabber')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_locale') ?> - element->getElement('cu_locale')->hasErrors()) : ?> -
    - element->getElement('cu_locale')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('cu_timezone') ?> - element->getElement('cu_timezone')->hasErrors()) : ?> -
    - element->getElement('cu_timezone')->getMessages() as $error): ?> -
  • - -
- -
- element->getElement('csrf') ?> -
- -
+
+
+ element->getElement('cu_user_id') ?> +
+ +
+
+ element->getElement('cu_login') ?> + element->getElement('cu_login')->hasErrors()) : ?> +
    + element->getElement('cu_login')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_password') ?> + element->getElement('cu_password')->hasErrors()) : ?> +
    + element->getElement('cu_password')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_passwordVerify') ?> + element->getElement('cu_passwordVerify')->hasErrors()) : ?> +
    + element->getElement('cu_passwordVerify')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_first_name') ?> + element->getElement('cu_first_name')->hasErrors()) : ?> +
    + element->getElement('cu_first_name')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_last_name') ?> + element->getElement('cu_last_name')->hasErrors()) : ?> +
    + element->getElement('cu_last_name')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_email') ?> + element->getElement('cu_email')->hasErrors()) : ?> +
    + element->getElement('cu_email')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_cell_phone') ?> + element->getElement('cu_cell_phone')->hasErrors()) : ?> +
    + element->getElement('cu_cell_phone')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_skype') ?> + element->getElement('cu_skype')->hasErrors()) : ?> +
    + element->getElement('cu_skype')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_jabber') ?> + element->getElement('cu_jabber')->hasErrors()) : ?> +
    + element->getElement('cu_jabber')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_locale') ?> + element->getElement('cu_locale')->hasErrors()) : ?> +
    + element->getElement('cu_locale')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('cu_timezone') ?> + element->getElement('cu_timezone')->hasErrors()) : ?> +
    + element->getElement('cu_timezone')->getMessages() as $error) : ?> +
  • + +
+ +
+ element->getElement('csrf') ?> +
+ +
diff --git a/legacy/application/views/scripts/form/login.phtml b/legacy/application/views/scripts/form/login.phtml index f31d94b15..a624ae679 100644 --- a/legacy/application/views/scripts/form/login.phtml +++ b/legacy/application/views/scripts/form/login.phtml @@ -3,7 +3,7 @@
@@ -12,7 +12,7 @@
@@ -21,7 +21,7 @@
diff --git a/legacy/application/views/scripts/form/password-change.phtml b/legacy/application/views/scripts/form/password-change.phtml index 1d79b37c7..8c7c43528 100644 --- a/legacy/application/views/scripts/form/password-change.phtml +++ b/legacy/application/views/scripts/form/password-change.phtml @@ -2,34 +2,34 @@
element->getElement('password') ?>
- element->getElement('password')->hasErrors()): ?> -
    - element->getElement('password')->getMessages() as $error): ?> -
  • - -
+ element->getElement('password')->hasErrors()) : ?> +
    + element->getElement('password')->getMessages() as $error) : ?> +
  • + +
element->getElement('password_confirm') ?>
- element->getElement('password_confirm')->hasErrors()): ?> -
    - element->getElement('password_confirm')->getMessages() as $error): ?> -
  • - -
+ element->getElement('password_confirm')->hasErrors()) : ?> +
    + element->getElement('password_confirm')->getMessages() as $error) : ?> +
  • + +
 
diff --git a/legacy/application/views/scripts/form/password-restore.phtml b/legacy/application/views/scripts/form/password-restore.phtml index 3fd8143ea..9bdfe2764 100644 --- a/legacy/application/views/scripts/form/password-restore.phtml +++ b/legacy/application/views/scripts/form/password-restore.phtml @@ -2,15 +2,15 @@
-

+

-
-
- element->getElement('username') ?> -
+ +
+ element->getElement('username') ?> +
@@ -21,9 +21,9 @@
element->getElement('email') ?>
- element->getElement('email')->hasErrors()): ?> + element->getElement('email')->hasErrors()) : ?>
    - element->getElement('email')->getMessages() as $error): ?> + element->getElement('email')->getMessages() as $error) : ?>
@@ -36,8 +36,8 @@
- - + +
diff --git a/legacy/application/views/scripts/form/player.phtml b/legacy/application/views/scripts/form/player.phtml index 806b9b7b1..7fdf16c13 100644 --- a/legacy/application/views/scripts/form/player.phtml +++ b/legacy/application/views/scripts/form/player.phtml @@ -1,19 +1,15 @@
@@ -38,7 +34,8 @@ element->getElement('player_embed_src')->render(); ?> - element->getElement('player_display_track_metadata'); ?> + element->getElement('player_display_track_metadata'); + ?> diff --git a/legacy/application/views/scripts/form/preferences_general.phtml b/legacy/application/views/scripts/form/preferences_general.phtml index 11e907f95..66b06cac8 100644 --- a/legacy/application/views/scripts/form/preferences_general.phtml +++ b/legacy/application/views/scripts/form/preferences_general.phtml @@ -9,12 +9,12 @@ element->getElement('stationLogoRemove')->render() ?> - +
element->getView()->logoImg; - $src = "data:image/png;base64,".$logoImg; + $src = "data:image/png;base64," . $logoImg; ?>
diff --git a/legacy/application/views/scripts/form/preferences_livestream.phtml b/legacy/application/views/scripts/form/preferences_livestream.phtml index 517dcfa6b..b4be3e725 100644 --- a/legacy/application/views/scripts/form/preferences_livestream.phtml +++ b/legacy/application/views/scripts/form/preferences_livestream.phtml @@ -19,7 +19,7 @@   
element->getElement("master_source_port")->render() ?> @@ -32,12 +32,12 @@

- element->getElement("show_source_host")->render() ?> + element->getElement("show_source_host")->render() ?>   
element->getElement("show_source_port")->render() ?> diff --git a/legacy/application/views/scripts/form/preferences_tunein.phtml b/legacy/application/views/scripts/form/preferences_tunein.phtml index cd3e72630..1c62c6454 100644 --- a/legacy/application/views/scripts/form/preferences_tunein.phtml +++ b/legacy/application/views/scripts/form/preferences_tunein.phtml @@ -1,7 +1,7 @@
- element->getElement("enable_tunein")->hasErrors()) { + element->getElement("enable_tunein")->hasErrors()) { echo $this->element->getElement('enable_tunein')->renderErrors(); } ?> diff --git a/legacy/application/views/scripts/form/preferences_watched_dirs.phtml b/legacy/application/views/scripts/form/preferences_watched_dirs.phtml index a62468f91..b7b3a7cc5 100644 --- a/legacy/application/views/scripts/form/preferences_watched_dirs.phtml +++ b/legacy/application/views/scripts/form/preferences_watched_dirs.phtml @@ -6,17 +6,18 @@
element->getElement('storageFolder') ?> - "> - "> - element->getElement('storageFolder')->hasErrors()) : ?> + "> + "> + element->getElement('storageFolder')->hasErrors()) : ?>
    - element->getElement('storageFolder')->getMessages() as $error): ?> + element->getElement('storageFolder')->getMessages() as $error) : ?>
  • escape($error); ?>
-
getDirectory(); ?>
+
getDirectory(); ?>
@@ -24,11 +25,11 @@
element->getElement('watchedFolder') ?> - "> - "> - element->getElement('watchedFolder')->hasErrors()) : ?> + "> + "> + element->getElement('watchedFolder')->hasErrors()) : ?>
    - element->getElement('watchedFolder')->getMessages() as $error): ?> + element->getElement('watchedFolder')->getMessages() as $error) : ?>
  • escape($error); ?>
@@ -36,15 +37,15 @@
- 0): ?> - + 0) : ?> +
- getExistsFlag())?"":""?>getDirectory());?> - " class="ui-icon ui-icon-refresh"> - " class="ui-icon ui-icon-close"> + getExistsFlag()) ? "" : "" ?>getDirectory()); ?> + " class="ui-icon ui-icon-refresh"> + " class="ui-icon ui-icon-close">
- +
diff --git a/legacy/application/views/scripts/form/setup-lang-timezone.phtml b/legacy/application/views/scripts/form/setup-lang-timezone.phtml index 9fb120a0d..214a479aa 100644 --- a/legacy/application/views/scripts/form/setup-lang-timezone.phtml +++ b/legacy/application/views/scripts/form/setup-lang-timezone.phtml @@ -9,7 +9,7 @@ element->getElement('setup_timezone')->render(); ?>
-

+

diff --git a/legacy/application/views/scripts/form/showbuilder.phtml b/legacy/application/views/scripts/form/showbuilder.phtml index 69ecfaf97..86b769a51 100644 --- a/legacy/application/views/scripts/form/showbuilder.phtml +++ b/legacy/application/views/scripts/form/showbuilder.phtml @@ -9,8 +9,13 @@ element->getElement('sb_show_filter') ?> -element->getElement('sb_my_shows')):?> -element->getElement('sb_my_shows')->getLabel(); ?> -element->getElement('sb_my_shows'); ?> - + element->getElement('sb_my_shows')): + ?> + element->getElement('sb_my_shows')->getLabel(); + ?> + + element->getElement('sb_my_shows'); + ?> + diff --git a/legacy/application/views/scripts/form/smart-block-criteria.phtml b/legacy/application/views/scripts/form/smart-block-criteria.phtml index a8bd7af75..3700f5fd5 100644 --- a/legacy/application/views/scripts/form/smart-block-criteria.phtml +++ b/legacy/application/views/scripts/form/smart-block-criteria.phtml @@ -1,65 +1,66 @@
-
+
- criteriasLength; $i++) { - // modRowMap holds the number of modifier rows for each criteria element - // i.e. if we have 'Album contains 1' and 'Album contains 2' the modRowMap - // for Album is 2 - ?> - modRowMap[$i]; $j++) { - // determine if logic label should be 'and' or 'or' - if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = _('or'); - else $logicLabel = _('and'); + criteriasLength; $i++) { + // modRowMap holds the number of modifier rows for each criteria element + // i.e. if we have 'Album contains 1' and 'Album contains 2' the modRowMap + // for Album is 2 + ?> + modRowMap[$i]; $j++) { + // determine if logic label should be 'and' or 'or' + if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i] - 1) $logicLabel = _('or'); + else $logicLabel = _('and'); - $disabled = $this->element->getElement("sp_criteria_field_".$i."_".$j)->getAttrib('disabled') == 'disabled'?true:false; - // determine if the next row is disabled and only display the logic label if it isn't - if ($j == $this->modRowMap[$i]-1 && $i < 25) { - $n = $i+1; - $nextIndex = $n."_0"; - } elseif ($j+1 <= $this->modRowMap[$i]-1) { - $n = $j+1; - $nextIndex = $i."_".$n; + $disabled = $this->element->getElement("sp_criteria_field_" . $i . "_" . $j)->getAttrib('disabled') == 'disabled' ? true : false; + // determine if the next row is disabled and only display the logic label if it isn't + if ($j == $this->modRowMap[$i] - 1 && $i < 25) { + $n = $i + 1; + $nextIndex = $n . "_0"; + } elseif ($j + 1 <= $this->modRowMap[$i] - 1) { + $n = $j + 1; + $nextIndex = $i . "_" . $n; + } + $nextDisabled = $this->element->getElement("sp_criteria_field_" . $nextIndex)->getAttrib('disabled') == 'disabled' ? true : false; + ?> +
0) && */$disabled) { + echo 'style="display:none"'; + } ?> class="search-row-"> + element->getElement("sp_criteria_field_" . $i . "_" . $j) ?> + element->getElement("sp_criteria_modifier_" . $i . "_" . $j) /* @todo finish this */ ?> - } - $nextDisabled = $this->element->getElement("sp_criteria_field_".$nextIndex)->getAttrib('disabled') == 'disabled'?true:false; - ?> -
0) && */ $disabled) { - echo 'style="display:none"'; - }?> class="search-row-"> - element->getElement("sp_criteria_field_".$i."_".$j) ?> - element->getElement("sp_criteria_modifier_".$i."_".$j) /* @todo finish this */?> + element->getElement("sp_criteria_value_" . $i . "_" . $j) ?> + element->getElement("sp_criteria_datetime_select_" . $i . "_" . $j)->getAttrib("disabled") == "disabled" ? 'style="display:none;"' : "" ?>>element->getElement('sp_criteria_datetime_select_' . $i . "_" . $j) ?> - element->getElement("sp_criteria_value_".$i."_".$j) ?> - element->getElement("sp_criteria_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>>element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?> + class='modifier_add_link' id='modifier_add_'> + + + - class='modifier_add_link' id='modifier_add_'> - + - + element->getElement("sp_criteria_extra_" . $i . "_" . $j)->getAttrib("disabled") == "disabled" ? 'style="display:none;"' : "" ?>>element->getElement('sp_criteria_extra_' . $i . "_" . $j) ?> + element->getElement("sp_criteria_extra_datetime_select_" . $i . "_" . $j)->getAttrib("disabled") == "disabled" ? 'style="display:none;"' : "" ?>>element->getElement('sp_criteria_extra_datetime_select_' . $i . "_" . $j) ?> - element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>>element->getElement('sp_criteria_extra_'.$i."_".$j) ?> - element->getElement("sp_criteria_extra_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>>element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?> + + + + > + + - - - - > - - + element->getElement("sp_criteria_field_" . $i . "_" . $j)->hasErrors()) : ?> + element->getElement("sp_criteria_field_" . $i . "_" . $j)->getMessages() as $error) : ?> + + + + + +
+ - element->getElement("sp_criteria_field_".$i."_".$j)->hasErrors()) : ?> - element->getElement("sp_criteria_field_".$i."_".$j)->getMessages() as $error): ?> - - - - - -
- - - +
@@ -67,13 +68,13 @@
- element->getElement('sp_limit_value')?> + element->getElement('sp_limit_value') ?> element->getElement('sp_limit_options') ?> - element->getElement("sp_limit_value")->hasErrors()) : ?> - element->getElement("sp_limit_value")->getMessages() as $error): ?> + element->getElement("sp_limit_value")->hasErrors()) : ?> + element->getElement("sp_limit_value")->getMessages() as $error) : ?> - - + +
@@ -88,14 +89,16 @@
- element->getElement('sp_type')->getValue(); - foreach ($this->element->getElement('sp_type')->getMultiOptions() as $radio) : ?> + element->getElement('sp_type')->getValue(); + foreach ($this->element->getElement('sp_type')->getMultiOptions() as $radio) : ?> -
@@ -105,12 +108,12 @@
- element->getElement('sp_repeat_tracks')?> - element->getElement("sp_repeat_tracks")->hasErrors()) : ?> - element->getElement("sp_repeat_tracks")->getMessages() as $error): ?> + element->getElement('sp_repeat_tracks') ?> + element->getElement("sp_repeat_tracks")->hasErrors()) : ?> + element->getElement("sp_repeat_tracks")->getMessages() as $error) : ?> - - + + @@ -121,12 +124,12 @@
- element->getElement('sp_overflow_tracks')?> - element->getElement("sp_overflow_tracks")->hasErrors()) : ?> - element->getElement("sp_overflow_tracks")->getMessages() as $error): ?> + element->getElement('sp_overflow_tracks') ?> + element->getElement("sp_overflow_tracks")->hasErrors()) : ?> + element->getElement("sp_overflow_tracks")->getMessages() as $error) : ?> - - + + @@ -134,15 +137,15 @@
- +
element->getElement('sp_sort_options') ?> - element->getElement("sp_sort_options")->hasErrors()) : ?> - element->getElement("sp_sort_options")->getMessages() as $error): ?> + element->getElement("sp_sort_options")->hasErrors()) : ?> + element->getElement("sp_sort_options")->getMessages() as $error) : ?> - - + +
diff --git a/legacy/application/views/scripts/form/stream-setting-form.phtml b/legacy/application/views/scripts/form/stream-setting-form.phtml index 12e3570b9..e839afcc6 100644 --- a/legacy/application/views/scripts/form/stream-setting-form.phtml +++ b/legacy/application/views/scripts/form/stream-setting-form.phtml @@ -1,214 +1,214 @@ - stream_number; - ?> -

">stream_number?>

-
enabled == 0?'style="display: none;':''?> id="-config"> -
-
-
- liquidsoap_error_msg?> +stream_number; +?> +

">stream_number ?>

+
enabled == 0 ? 'style="display: none;' : '' ?> id="-config"> +
+
+
+ liquidsoap_error_msg ?>
-
- +
+
-
- element->getElement('enable')?> +
+ element->getElement('enable') ?>
-
- +
+
-
- element->getElement('mobile')?> +
+ element->getElement('mobile') ?>
-
- +
+
-
- element->getElement('type')?> +
+ element->getElement('type') ?>
-
- +
+
-
- element->getElement('bitrate')?> +
+ element->getElement('bitrate') ?>
- +
- element->getElement('host')?> - element->getElement('host')->hasErrors()) : ?> + element->getElement('host') ?> + element->getElement('host')->hasErrors()) : ?>
    - element->getElement('host')->getMessages() as $error): ?> + element->getElement('host')->getMessages() as $error) : ?>
- +
- element->getElement('port')?> - element->getElement('port')->hasErrors()) : ?> + element->getElement('port') ?> + element->getElement('port')->hasErrors()) : ?>
    - element->getElement('port')->getMessages() as $error): ?> + element->getElement('port')->getMessages() as $error) : ?>
-
- +
+
-
- element->getElement('output')?> +
+ element->getElement('output') ?>
-
- +
+
-
- element->getElement('channels')?> +
+ element->getElement('channels') ?>
- +
-
- -
-
- element->getElement('user')?> - element->getElement('user')->hasErrors()) : ?> -
    - element->getElement('user')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('pass')?> - element->getElement('pass')->hasErrors()) : ?> -
    - element->getElement('pass')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('admin_user')?> - element->getElement('admin_user')->hasErrors()) : ?> -
    - element->getElement('admin_user')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('admin_pass')?> - element->getElement('admin_pass')->hasErrors()) : ?> -
    - element->getElement('admin_pass')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- -
-
- element->getElement('name')?> - element->getElement('name')->hasErrors()) : ?> -
    - element->getElement('name')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('description')?> - element->getElement('description')->hasErrors()) : ?> -
    - element->getElement('description')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('url')?> - - element->getElement('url')->hasErrors()) : ?> -
    - element->getElement('url')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('genre')?> - element->getElement('genre')->hasErrors()) : ?> -
    - element->getElement('genre')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('mount')?> - element->getElement('mount')->hasErrors()) : ?> -
    - element->getElement('mount')->getMessages() as $error): ?> -
  • - -
- -
+
+ +
+
+ element->getElement('user') ?> + element->getElement('user')->hasErrors()) : ?> +
    + element->getElement('user')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('pass') ?> + element->getElement('pass')->hasErrors()) : ?> +
    + element->getElement('pass')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('admin_user') ?> + element->getElement('admin_user')->hasErrors()) : ?> +
    + element->getElement('admin_user')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('admin_pass') ?> + element->getElement('admin_pass')->hasErrors()) : ?> +
    + element->getElement('admin_pass')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ +
+
+ element->getElement('name') ?> + element->getElement('name')->hasErrors()) : ?> +
    + element->getElement('name')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('description') ?> + element->getElement('description')->hasErrors()) : ?> +
    + element->getElement('description')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('url') ?> + + element->getElement('url')->hasErrors()) : ?> +
    + element->getElement('url')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('genre') ?> + element->getElement('genre')->hasErrors()) : ?> +
    + element->getElement('genre')->getMessages() as $error) : ?> +
  • + +
+ +
+
+ +
+
+ element->getElement('mount') ?> + element->getElement('mount')->hasErrors()) : ?> +
    + element->getElement('mount')->getMessages() as $error) : ?> +
  • + +
+ +
@@ -217,6 +217,6 @@
-
-
-
+
+
+
diff --git a/legacy/application/views/scripts/index/index.phtml b/legacy/application/views/scripts/index/index.phtml index d80a3660a..b84129df2 100644 --- a/legacy/application/views/scripts/index/index.phtml +++ b/legacy/application/views/scripts/index/index.phtml @@ -1,16 +1,16 @@ @@ -19,12 +19,12 @@
stationLogo === DEFAULT_LOGO_PLACEHOLDER) { - echo ""; + echo ""; } else { echo ""; } ?> - displayLoginButton): ?> + displayLoginButton) : ?> displayRssTab) {?> + if ($this->displayRssTab) { ?>
@@ -67,78 +67,79 @@
- diff --git a/legacy/application/views/scripts/library/edit-file-md.phtml b/legacy/application/views/scripts/library/edit-file-md.phtml index 475fd0739..fa26736d6 100644 --- a/legacy/application/views/scripts/library/edit-file-md.phtml +++ b/legacy/application/views/scripts/library/edit-file-md.phtml @@ -13,24 +13,24 @@
-

title); ?>

-

artist_name); ?>

+

title); ?>

+

artist_name); ?>

- diff --git a/legacy/application/views/scripts/library/get-file-metadata.ajax.phtml b/legacy/application/views/scripts/library/get-file-metadata.ajax.phtml index ed61cc420..1fde778c5 100644 --- a/legacy/application/views/scripts/library/get-file-metadata.ajax.phtml +++ b/legacy/application/views/scripts/library/get-file-metadata.ajax.phtml @@ -4,56 +4,122 @@ foreach ($this->md as $key => &$value) { $value = $this->escape($value); } ?> -type == "audioclip") : ?> -
- - - - - - - - - - - - - - - - - - - - - - -
md["MDATA_KEY_TITLE"]);?>
md["MDATA_KEY_CREATOR"]);?>
md["MDATA_KEY_SOURCE"]);?>
md["MDATA_KEY_TRACKNUMBER"]);?>
md["MDATA_KEY_DURATION"]);?>
md["MDATA_KEY_SAMPLERATE"]);?>
md["MDATA_KEY_BITRATE"]);?>
md["MDATA_KEY_MOOD"]);?>
md["MDATA_KEY_GENRE"]);?>
md["MDATA_KEY_YEAR"]);?>
md["MDATA_KEY_LABEL"]);?>
md["MDATA_KEY_BPM"]);?>
md["MDATA_KEY_COMPOSER"]);?>
md["MDATA_KEY_CONDUCTOR"]);?>
md["MDATA_KEY_COPYRIGHT"]);?>
md["MDATA_KEY_ISRC"]);?>
md["MDATA_KEY_URL"]);?>
md["MDATA_KEY_ARTWORK"]);?>
md["MDATA_KEY_ARTWORK_DATA"]);?>
md["MDATA_KEY_LANGUAGE"]);?>
md["MDATA_KEY_TRACK_TYPE"]);?>
md["MDATA_KEY_FILEPATH"]);?>
+type == "audioclip") : ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
md["MDATA_KEY_TITLE"]); ?>
md["MDATA_KEY_CREATOR"]); ?>
md["MDATA_KEY_SOURCE"]); ?>
md["MDATA_KEY_TRACKNUMBER"]); ?>
md["MDATA_KEY_DURATION"]); ?>
md["MDATA_KEY_SAMPLERATE"]); ?>
md["MDATA_KEY_BITRATE"]); ?>
md["MDATA_KEY_MOOD"]); ?>
md["MDATA_KEY_GENRE"]); ?>
md["MDATA_KEY_YEAR"]); ?>
md["MDATA_KEY_LABEL"]); ?>
md["MDATA_KEY_BPM"]); ?>
md["MDATA_KEY_COMPOSER"]); ?>
md["MDATA_KEY_CONDUCTOR"]); ?>
md["MDATA_KEY_COPYRIGHT"]); ?>
md["MDATA_KEY_ISRC"]); ?>
md["MDATA_KEY_URL"]); ?>
md["MDATA_KEY_ARTWORK"]); ?>
md["MDATA_KEY_ARTWORK_DATA"]); ?>
md["MDATA_KEY_LANGUAGE"]); ?>
md["MDATA_KEY_TRACK_TYPE"]); ?>
md["MDATA_KEY_FILEPATH"]); ?>
-type == "playlist" || $this->type == "block") : ?> -
- md["dc:title"]);?>
- md["dc:creator"]);?>
- type == "block" && $this->blType == "Dynamic") { ?> - block->getLength();?>
- - md["dcterms:extent"]);?>
+type == "playlist" || $this->type == "block") : ?> +
+ md["dc:title"]); ?>
+ md["dc:creator"]); ?>
+ type == "block" && $this->blType == "Dynamic") { ?> + block->getLength(); ?>
+ + md["dcterms:extent"]); ?>
+ + md["dc:description"]); ?> +
+ + type == "playlist") { ?> +
+ o
+ o
+ o
+ o +
+ - md["dc:description"]);?> -
-type == "playlist") { ?> -
-o
-o
-o
-o -
- - - - type == "playlist" || ($this->type == "block" && $this->blType == "Static")) {?> + type == "playlist" || ($this->type == "block" && $this->blType == "Static")) { ?> contents as &$item) { @@ -68,74 +134,75 @@ foreach ($this->md as $key => &$value) {
- contents as $row) : ?> - $titleMaxStrLen) { - $row["track_title"] = mb_substr($row["track_title"], 0, 34, 'UTF-8')."..."; - } - $artistMaxStrLen = 22; - if (mb_strlen($row["creator"], 'UTF-8') > $artistMaxStrLen) { - $row["creator"] = mb_substr($row["creator"], 0, 21, 'UTF-8')."..."; - } - ?> - isStatic(); ?> - '> - - - - - - - - - - - - - - - - - - + contents as $row) : ?> + $titleMaxStrLen) { + $row["track_title"] = mb_substr($row["track_title"], 0, 34, 'UTF-8') . "..."; + } + $artistMaxStrLen = 22; + if (mb_strlen($row["creator"], 'UTF-8') > $artistMaxStrLen) { + $row["creator"] = mb_substr($row["creator"], 0, 21, 'UTF-8') . "..."; + } + ?> + isStatic(); ?> + '> + + + + + + + + + + + + + + + + + +
getLength(); ?>
getLength(); ?>
blType == "Dynamic") { ?>
- contents["crit"] as &$criterias) : ?> - - contents["crit"] as &$criterias) : ?> + + $valMaxStrLen) { - $crit["value"] = substr($crit["value"], 0, 24)."..."; - } - $critMaxStrLen = 13; - if (strlen($crit["display_name"]) > $critMaxStrLen) { - $crit["display_name"] = substr($crit["display_name"], 0, 12)."..."; - } - $modMaxStrLen = 16; - if (strlen($crit["modifier"]) > $modMaxStrLen) { - $crit["modifier"] = substr($crit["modifier"], 0, 15)."..."; - } - ?> - - - - + $valMaxStrLen = 25; + if (strlen($crit["value"]) > $valMaxStrLen) { + $crit["value"] = substr($crit["value"], 0, 24) . "..."; + } + $critMaxStrLen = 13; + if (strlen($crit["display_name"]) > $critMaxStrLen) { + $crit["display_name"] = substr($crit["display_name"], 0, 12) . "..."; + } + $modMaxStrLen = 16; + if (strlen($crit["modifier"]) > $modMaxStrLen) { + $crit["modifier"] = substr($crit["modifier"], 0, 15) . "..."; + } + ?> + + + + - + + - @@ -146,11 +213,11 @@ foreach ($this->md as $key => &$value) { type == "stream") : ?> -
md["name"]);?>
-
md["length"]);?>
-
md["login"]);?>
-
md["description"]);?>
-
md["url"]);?>
+
md["name"]); ?>
+
md["length"]); ?>
+
md["login"]); ?>
+
md["description"]); ?>
+
md["url"]); ?>
diff --git a/legacy/application/views/scripts/library/index.phtml b/legacy/application/views/scripts/library/index.phtml index bb38286ca..6af0faa74 100644 --- a/legacy/application/views/scripts/library/index.phtml +++ b/legacy/application/views/scripts/library/index.phtml @@ -9,18 +9,18 @@ if ($this->showPlaylist) { $display = "display:none"; } ?> -
+
type == 'block') { - echo $this->render('playlist/smart-block.phtml'); - } else if ($this->type == 'playlist') { - echo $this->render('playlist/playlist.phtml'); - } else if ($this->type == 'stream') { - echo $this->render('webstream/webstream.phtml'); - } else { - echo $this->render('webstream/webstream.phtml'); - //throw new Exception("Unrecognized type: '{$this->type}'"); - } + echo $this->render('playlist/smart-block.phtml'); + } else if ($this->type == 'playlist') { + echo $this->render('playlist/playlist.phtml'); + } else if ($this->type == 'stream') { + echo $this->render('webstream/webstream.phtml'); + } else { + echo $this->render('webstream/webstream.phtml'); + //throw new Exception("Unrecognized type: '{$this->type}'"); + } -?> + ?>
diff --git a/legacy/application/views/scripts/library/publish-dialog.phtml b/legacy/application/views/scripts/library/publish-dialog.phtml index 2a3d01bbc..c0ef304a2 100644 --- a/legacy/application/views/scripts/library/publish-dialog.phtml +++ b/legacy/application/views/scripts/library/publish-dialog.phtml @@ -7,12 +7,12 @@
- + - + - + diff --git a/legacy/application/views/scripts/listenerstat/index.phtml b/legacy/application/views/scripts/listenerstat/index.phtml index ccbcc15f6..05f78c551 100644 --- a/legacy/application/views/scripts/listenerstat/index.phtml +++ b/legacy/application/views/scripts/listenerstat/index.phtml @@ -1,5 +1,5 @@
-

+

@@ -7,11 +7,13 @@ date_form; ?>
-

+

- errorStatus as $k=>$v) {?> -
'>

:

- + errorStatus as $k => $v) { ?> +
'> +

:

+
+
diff --git a/legacy/application/views/scripts/listenerstat/show.phtml b/legacy/application/views/scripts/listenerstat/show.phtml index 9a4ce82c9..5f185ad10 100644 --- a/legacy/application/views/scripts/listenerstat/show.phtml +++ b/legacy/application/views/scripts/listenerstat/show.phtml @@ -1,5 +1,5 @@
-

+

@@ -9,12 +9,12 @@
- - to
+ + to
contents["limit"]["value"] ?> contents["limit"]["modifier"] ?>
- - - - - - + + + + + + diff --git a/legacy/application/views/scripts/login/index.phtml b/legacy/application/views/scripts/login/index.phtml index 26c3f2d63..d2ef2977c 100644 --- a/legacy/application/views/scripts/login/index.phtml +++ b/legacy/application/views/scripts/login/index.phtml @@ -1,13 +1,13 @@ diff --git a/legacy/application/views/scripts/login/password-change.phtml b/legacy/application/views/scripts/login/password-change.phtml index 4088e9725..2595d8f40 100644 --- a/legacy/application/views/scripts/login/password-change.phtml +++ b/legacy/application/views/scripts/login/password-change.phtml @@ -3,7 +3,7 @@

diff --git a/legacy/application/views/scripts/login/password-restore-after.phtml b/legacy/application/views/scripts/login/password-restore-after.phtml index 2830cfab8..a0ea5b8b9 100644 --- a/legacy/application/views/scripts/login/password-restore-after.phtml +++ b/legacy/application/views/scripts/login/password-restore-after.phtml @@ -7,8 +7,8 @@
- - + +
diff --git a/legacy/application/views/scripts/menu.phtml b/legacy/application/views/scripts/menu.phtml index b3349cc56..e5d888618 100644 --- a/legacy/application/views/scripts/menu.phtml +++ b/legacy/application/views/scripts/menu.phtml @@ -1,6 +1,6 @@ diff --git a/legacy/application/views/scripts/partialviews/header.phtml b/legacy/application/views/scripts/partialviews/header.phtml index 80430e25f..988c8c636 100644 --- a/legacy/application/views/scripts/partialviews/header.phtml +++ b/legacy/application/views/scripts/partialviews/header.phtml @@ -9,25 +9,26 @@
-
+ +
- diff --git a/legacy/application/views/scripts/playlist/permission-denied.phtml b/legacy/application/views/scripts/playlist/permission-denied.phtml index 75a6ddcbe..dc89f0a45 100644 --- a/legacy/application/views/scripts/playlist/permission-denied.phtml +++ b/legacy/application/views/scripts/playlist/permission-denied.phtml @@ -1,5 +1,9 @@ -objType == "block") { $displayText = "smart block"; } else { $displayText = $this->escape($this->objType); } ?> +objType == "block") { + $displayText = "smart block"; +} else { + $displayText = $this->escape($this->objType); +} ?>

You do not have permission to edit this .

- - + + diff --git a/legacy/application/views/scripts/playlist/playlist.phtml b/legacy/application/views/scripts/playlist/playlist.phtml index 84b060433..2aa44de97 100644 --- a/legacy/application/views/scripts/playlist/playlist.phtml +++ b/legacy/application/views/scripts/playlist/playlist.phtml @@ -7,17 +7,17 @@ if (isset($this->obj)) { obj)) : ?>
-

"unsavedName)) echo $this->unsavedName; - else echo $this->escape($this->obj->getName());?>"

+

"unsavedName)) echo $this->unsavedName; + else echo $this->escape($this->obj->getName()); ?>"

- - - + + +
- +
@@ -28,13 +28,14 @@ if (isset($this->obj)) {
- form; ?> + form; + ?>
-

length); ?>

-

+

length); ?>

+

@@ -67,8 +68,8 @@ if (isset($this->obj)) {
    - contents = $contents; - echo $this->render('playlist/update.phtml') ?> + contents = $contents; + echo $this->render('playlist/update.phtml') ?>
diff --git a/legacy/application/views/scripts/playlist/set-cue.phtml b/legacy/application/views/scripts/playlist/set-cue.phtml index f9940d34e..79cd4800a 100644 --- a/legacy/application/views/scripts/playlist/set-cue.phtml +++ b/legacy/application/views/scripts/playlist/set-cue.phtml @@ -1,18 +1,14 @@
-
- "> -
-
-
+
+ "> +
+
+
cueIn; ?>
-
-
+
+
cueOut; ?>
diff --git a/legacy/application/views/scripts/playlist/set-fade.phtml b/legacy/application/views/scripts/playlist/set-fade.phtml index ea3fa8ad1..d31fbf991 100644 --- a/legacy/application/views/scripts/playlist/set-fade.phtml +++ b/legacy/application/views/scripts/playlist/set-fade.phtml @@ -1,31 +1,23 @@
- "> + ">
- item1Type == 0) {?> -
-
- fadeOut; ?> -
-
- item2Url)) {?> -
-
- fadeIn; ?> -
-
- + item1Type == 0) { ?> +
+
+ fadeOut; ?> +
+
+ item2Url)) { ?> +
+
+ fadeIn; ?> +
+
+
diff --git a/legacy/application/views/scripts/playlist/smart-block.phtml b/legacy/application/views/scripts/playlist/smart-block.phtml index 47ce144bc..b16ff8998 100644 --- a/legacy/application/views/scripts/playlist/smart-block.phtml +++ b/legacy/application/views/scripts/playlist/smart-block.phtml @@ -7,23 +7,23 @@ if (isset($this->obj)) { obj)) : ?>
-

"unsavedName)) echo $this->unsavedName; - else echo $this->escape($this->obj->getName());?>"

+

"unsavedName)) echo $this->unsavedName; + else echo $this->escape($this->obj->getName()); ?>"

- - - + + +
- +
+ if (isset($this->unsavedName)) echo $this->unsavedName; + else echo $this->escape($this->obj->getName()); + ?>">
@@ -34,9 +34,9 @@ if (isset($this->obj)) {
+ if (isset($this->unsavedDesc)) echo $this->unsavedDesc; + else echo $this->obj->getDescription(); + ?>
@@ -44,17 +44,17 @@ if (isset($this->obj)) {
-

length); ?>

-

+

length); ?>

+

- form->getElement('generate_button');?> + form->getElement('generate_button'); ?>
- form->getElement('shuffle_button');?> + form->getElement('shuffle_button'); ?>
    contents = $contents; - echo $this->render('playlist/update.phtml') ?> + echo $this->render('playlist/update.phtml') ?>
@@ -91,9 +93,10 @@ if (isset($this->obj)) {
- + - -
- + +
+ diff --git a/legacy/application/views/scripts/playlist/update.phtml b/legacy/application/views/scripts/playlist/update.phtml index 49689d446..2d28c0acd 100644 --- a/legacy/application/views/scripts/playlist/update.phtml +++ b/legacy/application/views/scripts/playlist/update.phtml @@ -5,164 +5,163 @@ $isPlaylist = ($this->obj instanceof Application_Model_Playlist); if ($isSmartBlock && $this->showPoolCount) { ?>
- poolCount; echo ngettext(" track matches your search criteria.", " tracks match your search criteria.", $this->poolCount); - ?> + ?> poolCount > 0) { ?> - +
- - -obj->isStatic())) { - echo _("
This is only a preview of possible content generated by the smart block based upon the above criteria.");} -?> -isStatic(); - $fileUrl = null; -} -else if ($item['type'] == 1) { - $fileUrl = null; -} -else if ($item['type'] == 0) { - $audiofile = Application_Model_StoredFile::RecallById($item['item_id']); - $fileUrl = $audiofile->getFileUrl(); -} + + obj->isStatic())) { + echo _("
This is only a preview of possible content generated by the smart block based upon the above criteria."); + } + ?> + isStatic(); + $fileUrl = null; + } else if ($item['type'] == 1) { + $fileUrl = null; + } else if ($item['type'] == 0) { + $audiofile = Application_Model_StoredFile::RecallById($item['item_id']); + $fileUrl = $audiofile->getFileUrl(); + } -if (($i < count($items) -1) && ($items[$i+1]['type'] == 0)) { - $nextAudiofile = Application_Model_StoredFile::RecallById($items[$i+1]['item_id']); - $nextFileUrl = $nextAudiofile->getFileUrl(); -} -?> -
  • " unqid=""> -
    + if (($i < count($items) - 1) && ($items[$i + 1]['type'] == 0)) { + $nextAudiofile = Application_Model_StoredFile::RecallById($items[$i + 1]['item_id']); + $nextFileUrl = $nextAudiofile->getFileUrl(); + } + ?> +
  • " unqid=""> +
    - -
    " data-mime-type=""> - + +
    " data-mime-type=""> + +
    + +
    "> + +
    + +
    " blocktype=""> + +
    + +
    + +
    + +
    + + + + + " id="expand_block_"> + + + + + " id="expand_block_"> + + + + + +
    +
    + + +
    + + + + " class="ui-icon ui-icon-closethick">
    - -
    "> - -
    - -
    " blocktype=""> - -
    - -
    - -
    - -
    - - - - - " id="expand_block_"> - - - - - " id="expand_block_"> - - - - - -
    -
    - - -
    - + + + + + - + - " class="ui-icon ui-icon-closethick"> -
    - - - - - - - - - - - -
  • - - + + + + + + -
    -obj instanceof Application_Model_Block) { - if ($this->obj->isStatic()) { - echo _("Choose some search criteria above and click Generate to create this playlist."); +
    + obj instanceof Application_Model_Block) { + if ($this->obj->isStatic()) { + echo _("Choose some search criteria above and click Generate to create this playlist."); + } else { + echo _("A track list will be generated when you schedule this smart block into a show."); + } } else { - echo _("A track list will be generated when you schedule this smart block into a show."); + echo _("Drag tracks here from your library to add them to the playlist"); } - } else { - echo _("Drag tracks here from your library to add them to the playlist"); - } -?> -
    + ?> +
    diff --git a/legacy/application/views/scripts/playouthistory/dialog.phtml b/legacy/application/views/scripts/playouthistory/dialog.phtml index 440203443..a0d386c14 100644 --- a/legacy/application/views/scripts/playouthistory/dialog.phtml +++ b/legacy/application/views/scripts/playouthistory/dialog.phtml @@ -1 +1 @@ -form; ?> +form; diff --git a/legacy/application/views/scripts/playouthistory/index.phtml b/legacy/application/views/scripts/playouthistory/index.phtml index 9b507a859..1811c3859 100644 --- a/legacy/application/views/scripts/playouthistory/index.phtml +++ b/legacy/application/views/scripts/playouthistory/index.phtml @@ -1,22 +1,22 @@
    -

    +

    date_form; ?>
      - userType != UTYPE_HOST): ?> -
    • -
    • + userType != UTYPE_HOST) : ?> +
    • +
    - userType != UTYPE_HOST): ?> -
    -
    -
    -
    -
    -
    + userType != UTYPE_HOST) : ?> +
    +
    +
    +
    +
    +
    diff --git a/legacy/application/views/scripts/playouthistorytemplate/index.phtml b/legacy/application/views/scripts/playouthistorytemplate/index.phtml index 9e9b89cca..23c29e284 100644 --- a/legacy/application/views/scripts/playouthistorytemplate/index.phtml +++ b/legacy/application/views/scripts/playouthistorytemplate/index.phtml @@ -1,65 +1,69 @@
    -

    +

    -

    +
    +

    +


    -

    +
    +

    +
    diff --git a/legacy/application/views/scripts/playouthistorytemplate/template-contents.phtml b/legacy/application/views/scripts/playouthistorytemplate/template-contents.phtml index e12dd8389..7769a7108 100644 --- a/legacy/application/views/scripts/playouthistorytemplate/template-contents.phtml +++ b/legacy/application/views/scripts/playouthistorytemplate/template-contents.phtml @@ -1,44 +1,38 @@ -template_type == Application_Service_HistoryService::TEMPLATE_TYPE_FILE): ?> -

    - -

    +template_type == Application_Service_HistoryService::TEMPLATE_TYPE_FILE) : ?> +

    + +

    - +
      - template_fields as $field): ?> + template_fields as $field) : ?> - + -
    • " - data-id="" - data-name="" - data-label="" - data-type="" - data-filemd="" - class=""> - - - required_fields)): ?> - - - - -
    • - +
    • " data-id="" data-name="" data-label="" data-type="" data-filemd="" class=""> + + + required_fields)) : ?> + + + + +
    • + - +
    @@ -46,41 +40,38 @@

    :

      - fileMD as $md): ?> + fileMD as $md) : ?> - + -
    • " - data-name="" - data-type="" - data-label=""> - - -
    • - +
    • " data-name="" data-type="" data-label=""> + + +
    • +
    - template_type !== Application_Service_HistoryService::TEMPLATE_TYPE_FILE): ?> -
    - "> - - -
    - + template_type !== Application_Service_HistoryService::TEMPLATE_TYPE_FILE) : ?> +
    + "> + + +
    +
    - template_id, $this->configured)): ?> - - - + template_id, $this->configured)) : ?> + + +
    diff --git a/legacy/application/views/scripts/podcast/featureupgrade-page.phtml b/legacy/application/views/scripts/podcast/featureupgrade-page.phtml index afd5a7e3e..58c89ec62 100644 --- a/legacy/application/views/scripts/podcast/featureupgrade-page.phtml +++ b/legacy/application/views/scripts/podcast/featureupgrade-page.phtml @@ -1,4 +1,5 @@
    - +
    diff --git a/legacy/application/views/scripts/podcast/featureupgrade-pane.phtml b/legacy/application/views/scripts/podcast/featureupgrade-pane.phtml index 0a7706ed9..be8f07b0e 100644 --- a/legacy/application/views/scripts/podcast/featureupgrade-pane.phtml +++ b/legacy/application/views/scripts/podcast/featureupgrade-pane.phtml @@ -1,4 +1,5 @@ - +
    diff --git a/legacy/application/views/scripts/podcast/podcast.phtml b/legacy/application/views/scripts/podcast/podcast.phtml index d008ade42..ae74dad09 100644 --- a/legacy/application/views/scripts/podcast/podcast.phtml +++ b/legacy/application/views/scripts/podcast/podcast.phtml @@ -6,10 +6,10 @@
    - +