From 925afcc64cf995cbba19aad67ca48e4da5623803 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 13 Nov 2012 15:10:07 -0500 Subject: [PATCH 01/62] renamed links --- .../scripts/airtime-recorder/index.phtml | 2 +- .../scripts/audiopreview/audio-preview.phtml | 20 +++++++++---------- .../views/scripts/dashboard/about.phtml | 6 +++--- .../views/scripts/dashboard/help.phtml | 2 +- .../views/scripts/dashboard/index.phtml | 2 +- .../scripts/dashboard/stream-player.phtml | 6 +++--- .../views/scripts/error/denied.phtml | 2 +- .../views/scripts/error/error.phtml | 4 ++-- .../form/add-show-rebroadcast-absolute.phtml | 4 ++-- .../scripts/form/add-show-rebroadcast.phtml | 4 ++-- .../views/scripts/form/login.phtml | 4 ++-- .../views/scripts/form/preferences.phtml | 2 +- .../scripts/form/preferences_livestream.phtml | 10 +++++----- .../views/scripts/form/register-dialog.phtml | 4 ++-- .../views/scripts/form/showbuilder.phtml | 2 +- .../scripts/form/smart-block-criteria.phtml | 2 +- .../views/scripts/form/support-setting.phtml | 4 ++-- .../views/scripts/index/display.phtml | 2 +- .../views/scripts/index/main.phtml | 2 +- .../views/scripts/index/newfield.phtml | 2 +- .../views/scripts/library/edit-file-md.phtml | 2 +- .../library/get-file-metadata.ajax.phtml | 10 +++++----- .../views/scripts/library/library.phtml | 2 +- .../views/scripts/login/index.phtml | 2 +- .../views/scripts/login/logout.phtml | 2 +- .../views/scripts/login/password-change.phtml | 4 ++-- .../login/password-restore-after.phtml | 6 +++--- .../scripts/login/password-restore.phtml | 2 +- .../views/scripts/partialviews/header.phtml | 12 +++++------ .../views/scripts/partialviews/trialBox.phtml | 8 ++++---- .../views/scripts/playlist/playlist.phtml | 16 +++++++-------- .../views/scripts/playlist/smart-block.phtml | 16 +++++++-------- .../views/scripts/plupload/upload.phtml | 2 +- .../scripts/preference/directory-config.phtml | 2 +- .../views/scripts/preference/index.phtml | 6 +++--- .../scripts/preference/stream-setting.phtml | 10 +++++----- .../scripts/recorder/get-show-schedule.phtml | 2 +- .../views/scripts/recorder/index.phtml | 2 +- .../scripts/schedule/add-show-form.phtml | 12 +++++------ .../views/scripts/schedule/add-show.phtml | 2 +- .../schedule/cancel-current-show.phtml | 2 +- .../views/scripts/schedule/cancel-show.phtml | 2 +- .../views/scripts/schedule/clear-show.phtml | 2 +- .../views/scripts/schedule/delete-show.phtml | 2 +- .../views/scripts/schedule/event-feed.phtml | 2 +- .../scripts/schedule/make-context-menu.phtml | 2 +- .../views/scripts/schedule/move-show.phtml | 2 +- .../views/scripts/schedule/remove-group.phtml | 2 +- .../views/scripts/schedule/resize-show.phtml | 2 +- .../schedule/show-content-dialog.phtml | 12 +++++------ .../scripts/showbuilder/builderDialog.phtml | 4 ++-- .../views/scripts/systemstatus/index.phtml | 14 ++++++------- .../views/scripts/user/add-user.phtml | 6 +++--- .../views/scripts/user/get-hosts.phtml | 2 +- .../user/get-user-data-table-info.phtml | 2 +- .../views/scripts/user/index.phtml | 2 +- .../views/scripts/webstream/webstream.phtml | 14 ++++++------- 57 files changed, 140 insertions(+), 140 deletions(-) diff --git a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml index 0a04fb79c..28044500a 100644 --- a/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml +++ b/airtime_mvc/application/views/scripts/airtime-recorder/index.phtml @@ -1 +1 @@ -

View script for controller AirtimeRecorder and script/action name index
\ No newline at end of file +

View script for controller and script/action name index
diff --git a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml index f76249b9f..789be01b3 100644 --- a/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml +++ b/airtime_mvc/application/views/scripts/audiopreview/audio-preview.phtml @@ -19,19 +19,19 @@
@@ -66,8 +66,8 @@
- Update Required - To play the media you will need to either update your browser to a recent version or update your Flash plugin. + + To play the media you will need to either update your browser to a recent version or update your .
diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index b2ce0cb38..5a5ac1ace 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml @@ -1,8 +1,8 @@
-

About

+

-Airtime airtime_version ?>, the open radio software for scheduling and remote station management.
-© 2012 Sourcefabric o.p.s. Airtime is distributed under the GNU GPL v.3 + airtime_version ?>, the open radio software for scheduling and remote station management.
+© 2012 o.p.s. Airtime is distributed under the GNU GPL v.3


diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml index 3e5d68553..425d04568 100644 --- a/airtime_mvc/application/views/scripts/dashboard/help.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml @@ -10,6 +10,6 @@
  • Select your media from the left pane and drag them to your show in the right pane.
  • Then you're good to go!
    -For more detailed help, read the user manual.

    +For more detailed help, read the .

    diff --git a/airtime_mvc/application/views/scripts/dashboard/index.phtml b/airtime_mvc/application/views/scripts/dashboard/index.phtml index e5b885fc7..abb67f7f4 100644 --- a/airtime_mvc/application/views/scripts/dashboard/index.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/index.phtml @@ -1 +1 @@ -

    View script for controller Dashboard and script/action name index
    \ No newline at end of file +

    View script for controller and script/action name index
    diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml index ce4faa068..dbf5d052e 100644 --- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml @@ -1,5 +1,5 @@
    -

    Live stream

    +

    @@ -67,7 +67,9 @@
    - To play the media you will need to either update your browser to a recent version or update your . + ", + "") ?>
    diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index 12f355d4f..a844ec398 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml @@ -1,8 +1,21 @@

    -airtime_version ?>
    -© 2012 GNU GPL v.3 +", + "", + $this->airtime_version, + "
    ") +?> +
    © 2012 +", + "", + "", + "") +?>


    diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml index ffa080e47..66857c7cd 100644 --- a/airtime_mvc/application/views/scripts/dashboard/help.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml @@ -1,15 +1,17 @@
    -

    Welcome to Airtime!

    -

    Here's how you can get started using Airtime to automate your broadcasts:

    +

    +

      -
    1. Begin by adding your files to the library using the "Add Media" menu button. You can drag and drop your files to this window too.
    2. -
    3. Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins and program managers can add shows.
    4. -
    5. Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting "Add / Remove Content".
    6. -
    7. +
    8. +
    9. +
    10. .
    11. +
    -

    Then you're good to go!
    -For more detailed help, read the

    +


    +", + "") ?>

    diff --git a/airtime_mvc/application/views/scripts/dashboard/index.phtml b/airtime_mvc/application/views/scripts/dashboard/index.phtml index 4b4a74137..e69de29bb 100644 --- a/airtime_mvc/application/views/scripts/dashboard/index.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/index.phtml @@ -1 +0,0 @@ -

    diff --git a/airtime_mvc/application/views/scripts/error/denied.phtml b/airtime_mvc/application/views/scripts/error/denied.phtml index 6217eb227..e69de29bb 100644 --- a/airtime_mvc/application/views/scripts/error/denied.phtml +++ b/airtime_mvc/application/views/scripts/error/denied.phtml @@ -1 +0,0 @@ -

    diff --git a/airtime_mvc/application/views/scripts/error/error.phtml b/airtime_mvc/application/views/scripts/error/error.phtml index a58862e11..07326ad50 100644 --- a/airtime_mvc/application/views/scripts/error/error.phtml +++ b/airtime_mvc/application/views/scripts/error/error.phtml @@ -7,8 +7,8 @@
    -

    Page not found!

    -

    Looks like the page you were looking for doesn't exist!

    +

    +

    diff --git a/airtime_mvc/application/views/scripts/form/daterange.phtml b/airtime_mvc/application/views/scripts/form/daterange.phtml index 3d3f4bb63..b3435e284 100644 --- a/airtime_mvc/application/views/scripts/form/daterange.phtml +++ b/airtime_mvc/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') ?> -
    +
    ">
    \ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml index 46c394ce3..e21347cb3 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml @@ -105,7 +105,8 @@
    -
    @@ -148,7 +149,8 @@
    -
    diff --git a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml index 20bcc92c9..30efe4b0b 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml @@ -41,7 +41,7 @@
    @@ -56,7 +56,7 @@
    diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml index bbbda42d6..234047161 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml @@ -40,8 +40,8 @@
    getExistsFlag())?"":""?>getDirectory();?> - - + class="ui-icon ui-icon-refresh"> + " class="ui-icon ui-icon-close">
    diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml index 287cc4fc2..a6ee40f6d 100644 --- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml +++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml @@ -3,11 +3,10 @@
    - Help Airtime improve by letting us know how you are using it. This info - will be collected regularly in order to enhance your user experience. -

    - Click "Yes, help Airtime" and we'll make sure the features you use are - constantly improving. +
    ") ?>
    - Click the box below to advertise your station on - . - In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback. + ", + "")?>
    -type == "audioclip"): ?> +type == "audioclip"): ?>
    @@ -67,7 +67,9 @@
    - To play the media you will need to either update your browser to a recent version or update your . + ", + "") ?>
    diff --git a/airtime_mvc/application/views/scripts/dashboard/about.phtml b/airtime_mvc/application/views/scripts/dashboard/about.phtml index 12f355d4f..a844ec398 100644 --- a/airtime_mvc/application/views/scripts/dashboard/about.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/about.phtml @@ -1,8 +1,21 @@

    -airtime_version ?>
    -© 2012 GNU GPL v.3 +", + "", + $this->airtime_version, + "
    ") +?> +
    © 2012 +", + "", + "", + "") +?>


    diff --git a/airtime_mvc/application/views/scripts/dashboard/help.phtml b/airtime_mvc/application/views/scripts/dashboard/help.phtml index ffa080e47..66857c7cd 100644 --- a/airtime_mvc/application/views/scripts/dashboard/help.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/help.phtml @@ -1,15 +1,17 @@
    -

    Welcome to Airtime!

    -

    Here's how you can get started using Airtime to automate your broadcasts:

    +

    +

      -
    1. Begin by adding your files to the library using the "Add Media" menu button. You can drag and drop your files to this window too.
    2. -
    3. Create a show by going to "Calendar" in the menu bar, and then clicking the "+ Show" icon. This can be either a one-time or repeating show. Only admins and program managers can add shows.
    4. -
    5. Add media to the show by going to your show in the Schedule calendar, left-clicking on it and selecting "Add / Remove Content".
    6. -
    7. +
    8. +
    9. +
    10. .
    11. +
    -

    Then you're good to go!
    -For more detailed help, read the

    +


    +", + "") ?>

    diff --git a/airtime_mvc/application/views/scripts/dashboard/index.phtml b/airtime_mvc/application/views/scripts/dashboard/index.phtml index 4b4a74137..e69de29bb 100644 --- a/airtime_mvc/application/views/scripts/dashboard/index.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/index.phtml @@ -1 +0,0 @@ -

    diff --git a/airtime_mvc/application/views/scripts/error/denied.phtml b/airtime_mvc/application/views/scripts/error/denied.phtml index 6217eb227..e69de29bb 100644 --- a/airtime_mvc/application/views/scripts/error/denied.phtml +++ b/airtime_mvc/application/views/scripts/error/denied.phtml @@ -1 +0,0 @@ -

    diff --git a/airtime_mvc/application/views/scripts/error/error.phtml b/airtime_mvc/application/views/scripts/error/error.phtml index a58862e11..07326ad50 100644 --- a/airtime_mvc/application/views/scripts/error/error.phtml +++ b/airtime_mvc/application/views/scripts/error/error.phtml @@ -7,8 +7,8 @@
    -

    Page not found!

    -

    Looks like the page you were looking for doesn't exist!

    +

    +

    diff --git a/airtime_mvc/application/views/scripts/form/daterange.phtml b/airtime_mvc/application/views/scripts/form/daterange.phtml index 3d3f4bb63..b3435e284 100644 --- a/airtime_mvc/application/views/scripts/form/daterange.phtml +++ b/airtime_mvc/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') ?> -
    +
    ">
    \ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml index 46c394ce3..e21347cb3 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml @@ -105,7 +105,8 @@
    -
    @@ -148,7 +149,8 @@
    -
    diff --git a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml index 20bcc92c9..30efe4b0b 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml @@ -41,7 +41,7 @@
    @@ -56,7 +56,7 @@
    diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml index bbbda42d6..234047161 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml @@ -40,8 +40,8 @@
    getExistsFlag())?"":""?>getDirectory();?> - - + class="ui-icon ui-icon-refresh"> + " class="ui-icon ui-icon-close">
    diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml index 287cc4fc2..a6ee40f6d 100644 --- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml +++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml @@ -3,11 +3,10 @@
    - Help Airtime improve by letting us know how you are using it. This info - will be collected regularly in order to enhance your user experience. -

    - Click "Yes, help Airtime" and we'll make sure the features you use are - constantly improving. +
    ") ?>
    - Click the box below to advertise your station on - . - In order to promote your station, "Send support feedback" must be enabled. This data will be collected in addition to the support feedback. + ", + "")?>