Skip to content

Commit

Permalink
AdminCP -> Control Panel
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Welch <[email protected]>
  • Loading branch information
khalwat committed Nov 19, 2018
1 parent 40da962 commit 23ad437
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Added multiple output paths and URLs for different media types

### Changed
* Moved to a modern webpack build config for the AdminCP
* Moved to a modern webpack build config for the Control Panel
* Added install confetti

## 1.1.3 - 2018.03.02
Expand All @@ -33,7 +33,7 @@
## 1.1.0 - 2018.02.02
### Added
* Transcoder now supports the transcoding of remote video & audio files
* Added the ability to generate a thumbnail for videos in the AdminCP Assets index
* Added the ability to generate a thumbnail for videos in the Control Panel Assets index

### Changed
* Cleaned up the exception handling
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ To install Transcoder, follow these steps:
1. Install with Composer via `composer require nystudio107/craft-transcoder` from your project directory
2. Install plugin in the Craft Control Panel under Settings > Plugins

You can also install Transcoder via the **Plugin Store** in the Craft AdminCP.
You can also install Transcoder via the **Plugin Store** in the Craft Control Panel.

Transcoder works on Craft 3.x.

Expand All @@ -40,7 +40,7 @@ The Transcoder plugin allows you to transcode any video or animated gif (local o

It can also transcode audio files to any bitrate & sample rate, to a variety of file formats. It can even extract audio tracks from video files.

Transcoder also allows you to get a thumbnail of a video in any size and at any timecode, and can extract information about audio/video files such. It also automatically adds video thumbnails in the Assets index in the AdminCP.
Transcoder also allows you to get a thumbnail of a video in any size and at any timecode, and can extract information about audio/video files such. It also automatically adds video thumbnails in the Assets index in the Control Panel.

Finally, it lets you download an arbitrary file (such as the transcoded video) via a special download link.

Expand Down Expand Up @@ -127,7 +127,7 @@ The file format setting `videoEncoder` is preset to what you'll need to generate

![Screenshot](resources/screenshots/admin-cp-video-thumbnails.png)

Transcoder will also automatically add video thumbnails in the AdminCP Asset index.
Transcoder will also automatically add video thumbnails in the Control Panel Asset index.

### Generating a Transcoded Audio File

Expand Down Expand Up @@ -256,7 +256,7 @@ The file format setting `videoEncoder` is preset to what you'll need to generate

![Screenshot](resources/screenshots/admin-cp-video-thumbnails.png)

Transcoder will also automatically add video thumbnails in the AdminCP Asset index.
Transcoder will also automatically add video thumbnails in the Control Panel Asset index.

### Getting Transcoding Progress

Expand Down
2 changes: 1 addition & 1 deletion src/Transcoder.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ function (RegisterUrlRulesEvent $event) {
'UrlManager::EVENT_REGISTER_SITE_URL_RULES',
__METHOD__
);
// Register our AdminCP routes
// Register our Control Panel routes
$event->rules = array_merge(
$event->rules,
$this->customFrontendRoutes()
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assetbundles/transcoder/src/css/app.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* https://github.com/tailwindcss/tailwindcss/blob/master/css/preflight.css
*/
/**
* We don't want these in the AdminCP
* We don't want these in the Control Panel
* @import "tailwindcss/preflight";
*/

Expand Down
2 changes: 1 addition & 1 deletion src/services/Transcode.php
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ public function getGifFilename($filePath, $gifOptions): string
}

/**
* Handle generated a thumbnail for the AdminCP
* Handle generated a thumbnail for the Control Panel
*
* @param AssetThumbEvent $event
*
Expand Down

0 comments on commit 23ad437

Please sign in to comment.