diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index b036b97e4..000000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,158 +0,0 @@ -# Contributing to October CMS - -Thank you for your interest in contributing to the October CMS project. We appreciate any assistance that community members and users of October CMS are willing to provide. You can contribute to the project in several different ways: - -- [Reporting a Security Vulnerability](#reporting-a-security-vulnerability) -- [Reporting an issue with October CMS](#reporting-an-issue-with-octobercms) - - [Reporting an issue with an October CMS plugin](#reporting-an-issue-with-an-octobercms-plugin) -- [Making a Feature Request](#making-a-feature-request) -- [Making a Pull Request](#making-a-pull-request) -- [Testing Pull Requests](#testing-a-pull-request) - -## Reporting a Security Vulnerability - -Please review [our security policy](https://github.com/octobercms/october/security/policy) on how to report security vulnerabilities. Please do not report security vulnerabilities on GitHub. - -## Reporting an issue with October CMS - ->**NOTE:** If your issue is related to an October CMS plugin, please see the [Reporting an issue with an October CMS plugin](#reporting-an-issue-with-an-octobercms-plugin) section below. - -We work hard to process bugs that are reported, to assist with this please ensure the following details are always included: - -- **Summary**: Make sure your summary reflects what the problem is and where it is. Provide as much detail as possible, the more information we have to work with the more likely it is that your problem can be solved. - -- **Installed build and plugins**: Please provide the build number of October CMS that is exhibiting the fault, and the version numbers of any installed and active plugins on your installation. You may retrieve this information by logging in to the Backend and navigating to *Settings* and then *Updates & Plugins*. - -- **Reproduce steps**: Clearly mention the steps to reproduce the bug. - -- **Expected behavior**: Describe how October CMS should behave on above mentioned steps. - -- **Actual behavior**: What is the actual result on running above steps i.e. the bug behavior - **include any error messages**. - -If possible, please provide any screenshots or GIFs of the issue occurring to provide us with additional context to determine the cause of the issue. - ->**NOTE**: If you're reporting an issue that you intend to fix yourself, you can skip the Issue step and just submit a Pull Request that fixes the issue (along with a detailed description of the original problem) instead. - -#### Here's how to report an issue on GitHub - -1. **Register for an account on [GitHub](https://github.com),** if you don't already have one. - -2. **Search for similar issues.** Perhaps someone has already reported your issue! If so, please add clarification and/or more information to the **existing** issue. - -3. **Create a new issue.** If you don't find any similar issues, you can report your issue via the ["issues" tab](https://github.com/octobercms/october/issues) once you've logged in. - -4. **Monitor your issue and respond to questions.** It may be necessary to provide additional information upon request or you might be asked if the issue still occurs after an update. - -5. **Close your issue.** In case you notice that the issue doesn't occur anymore, you can close the issue yourself (don't forget to add a note saying that the issue is resolved and ideally any additional information on how it was resolved). - -If you find out your bug is actually a duplicate of another bug and only notice that after you created it, please also close your bug with a short reference to the other issue that was there before. - -#### Reporting an issue with an October CMS plugin - ->Please don't use the main GitHub for reporting issues with plugins. - -If you have found a bug in a plugin, the best place to report it is with the [plugin author](https://octobercms.com/plugins). - -If you are unable to contact the plugin author and the issue prevents the plugin from being used correctly, please feel free to email `hello@octobercms.com`, mentioning the plugin name, URL and the issue found. We will then determine if the plugin needs to be delisted. - -#### Escalation process - -We do our best to attend to all reported issues. If you have an important issue that requires attention, consider submitting a bounty using the [October CMS Bounty Program](https://www.bountysource.com/teams/october). - -## Making a Feature Request - ->**NOTE:** Please don't use GitHub issues for suggesting a new feature. If you have a feature idea, the best place to suggest it is the [October CMS website forum](https://octobercms.com/forum/chan/feature-requests). - -Only use GitHub if you are planning on contributing a new feature and developing it. If you want to discuss your idea first, before "officially" posting it anywhere, you can always join us on [Discord](https://discord.gg/gEKgwSZ). - -#### GitHub feature requests - -Feature Requests submitted as GitHub Issues specifically mean *"I'd like to see this feature, I'm going to be working on some code to implement it."* It is more like a Pre-Pull Request, in which a developer signifies that he or she wants to see a feature implemented that they think would be really great, and they're committed to coding it. - -It's a great way to launch discussions on the developer side of things because both the core team and the community developer get a chance to talk about the technical side of the feature implementation. It's a great way to exchange ideas about how the logic could work in code. - -## Making a Pull Request - -Your contributions to the project are very welcome. If you would like to fix a bug or propose a new feature, you can submit a Pull Request. - -To help us merge your Pull Request, please make sure you follow these points: - -- Describe the problem clearly in the Pull Request description -- Please make your fix on the `develop` branch. This makes merging much easier. -- Do not edit compiled core asset files such as `october.css`, `storm.js`, `framework.css`, `framework.combined.js`, `framework-min.js`, etc. directly. Instead, edit the relevant source / non-minified / non-combined LESS / JS files. For third-party vendor files, you should update both the **.min** and **non-min** versions. Afterwards, run `php artisan october:util compile assets` from the project root to compile all the source asset files; and then commit the changes. For a list of options available for the `compile assets` command, see https://octobercms.com/docs/console/commands#october-util-command -- For any change that you make, **please also add a test case(s)** in the `tests/unit` directory. This helps us understand the issue and make sure that it will stay fixed forever. - -Thank you for your contributions! - -#### Best practices - -It is ideal to keep your development branch or fork synchronised with the core October CMS `develop` branch when submitting Pull Requests, as this minimises the possibility of merge conflicts. - -To keep in sync with October CMS, add the core OctoberCMS repository as a Git remote (ie. `upstream`) and pull changes from the OctoberCMS repository into your local `develop` branch as often as possible: - -``` -git remote add upstream git@github.com:octobercms/october.git -git fetch upstream -git checkout develop -git pull upstream develop -``` - -This ensures that your local `develop` branch matches October CMS. When developing a pull request, it is best to use your own development branch. For example, creating a fix to improve spelling on a language file could be made into a branch called `lang-en-spelling-fixes`, which can be branched off from the `develop` branch. - -``` -git checkout -b lang-en-spelling-fixes develop -``` - -When you wish to update your development branch with the latest changes from the `develop` branch, it is just a simple merge: - -``` -git merge develop -``` - -This will merge all the latest changes from the October CMS `develop` branch into your development branch. - -#### Resolving merge conflicts - -Occassionally, you may encounter a merge conflict with your Pull Request. This most commonly occurs if another change made to the October CMS repository was made to a file that your Pull Request has also changed. - -It is the responsibility of the author of the Pull Request to resolve any merge conflicts before their Pull Request is accepted. - -You should ensure that your local copy of October CMS is synchronised with the `develop` branch in the October CMS repository. Please follow the [steps above](#best-practices) to synchronise the repositories. - -If Git reports that your changes have conflicts, you will need to resolve the changes in a way that includes the changes from the OctoberCMS repository as well as implementing your Pull Request's changes. See GitHub's guide to [resolving a merge conflict](https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line) for tips on resolving conflicts. - -#### PSR Coding standards - -Please ensure that your Pull Request satisfies the following coding standards: - -- [PSR 2 Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md) -- [PSR 1 Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md) -- [PSR 0 Coding Style Guide](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md) - -To validate your changes against our coding standards, you may run `./vendor/bin/phpcs -nq --extensions="php"` in your development folder. - -#### Team rules - -The October CMS team follows the [developer guidelines](https://octobercms.com/docs/help/developer-guide) as much as possible. - -## Testing a Pull Request - -Although we aim to test all pull requests made to the October CMS repository, the maintainers of October CMS are volunteers and may not be able to promptly attend to all pull requests. - -To help speed things up, any assistance with testing Pull Requests and fixes will be very appreciated. The best Pull Requests to test are those that are tagged as [**Testing Needed**](https://github.com/octobercms/october/pulls?q=is%3Apr+is%3Aopen+label%3A%22Testing+Needed%22) in the repository. - -To test a Pull Request, you can use the steps below in a terminal or command-line interface to create a fresh installation of October CMS with the changes made in the Pull Request, ready to test. In this example, we have a user called `qwerty123` that has created a pull request with an ID of `#4509`. - -1. Check out a copy of the October CMS repository to a folder that you can view in your web browser: `git clone git@github.com:octobercms/october.git`. This will add the files into a subfolder called `october`. - -2. Then, go to the `october` subfolder and check out **@qwerty123**'s changes in a branch in your local repository: `git fetch origin pull/4509/head:pr-4509`. This will pull their changes into a branch called `pr-4509`. You will then need to check out the branch: `git checkout pr-4509`. - -3. Next, get the Composer dependencies: `composer update`. - -4. Next run `git checkout pr-4509` again in case composer overwrote the changes. - -5. Next, run `php artisan october:env` to create a `.env` file in your folder. This will contain the configuration values for the database and site. - -6. Finally, once you've populated that file with your database and site details, run `php artisan october:up` to install the necessary database tables. - -At this point, you should have a working copy of the Pull Request ready to test. diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index a29ace930..000000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,4 +0,0 @@ -# These are supported funding model platforms -custom: ['https://octobercms.com/premium-support'] -open_collective: octobercms -github: LukeTowers diff --git a/.github/ISSUE_TEMPLATE/0_IMMEDIATE_SUPPORT.md b/.github/ISSUE_TEMPLATE/0_IMMEDIATE_SUPPORT.md index 96219a5f4..795741003 100644 --- a/.github/ISSUE_TEMPLATE/0_IMMEDIATE_SUPPORT.md +++ b/.github/ISSUE_TEMPLATE/0_IMMEDIATE_SUPPORT.md @@ -1,15 +1,13 @@ --- name: "🚨 Immediate Support" -about: 'I use October and it just broke! Help me!' +about: 'I use Winter and it just broke! Help me!' --- This repository is only for reporting reproducible bugs or problems. If you need support, please use the following options: -- Slack: https://octobercms.slack.com (Get an invite: https://octobercms-slack.herokuapp.com/) -- Live chat (IRC): https://octobercms.com/chat - **Note:** Not as active as Slack -- Forum: https://octobercms.com/forum -- Stack Overflow: https://stackoverflow.com/questions/tagged/octobercms +- Slack: https://discord.gg/D5MFSPH6Ux +- Stack Overflow: https://stackoverflow.com/questions/tagged/wintercms -If you rely on OctoberCMS for your business consider purchasing a paid support plan! Send an email to octobercms@luketowers.ca to get started. +If you rely on Winter CMS for your business consider purchasing a paid support plan! Send an email to wintercms@luketowers.ca to get started. Thanks! \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/1_BUG_REPORT.md b/.github/ISSUE_TEMPLATE/1_BUG_REPORT.md index 4b8883732..78370ce42 100644 --- a/.github/ISSUE_TEMPLATE/1_BUG_REPORT.md +++ b/.github/ISSUE_TEMPLATE/1_BUG_REPORT.md @@ -1,10 +1,10 @@ --- name: "🐛 Bug Report" -about: 'Report a general OctoberCMS issue. See our policy below if reporting a security issue.' +about: 'Report a general Winter CMS issue. See our policy below if reporting a security issue.' labels: 'Status: Review Needed, Type: Unconfirmed Bug' --- -- OctoberCMS Build: ### +- Winter CMS Build: ### - PHP Version: - Database Engine: - Plugins Installed: diff --git a/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md b/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md index a2e76acef..ef8cff905 100644 --- a/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md +++ b/.github/ISSUE_TEMPLATE/2_MARKETPLACE_SUPPORT.md @@ -1,6 +1,6 @@ --- name: "🛒 Marketplace Support" -about: 'For reporting any issues with the marketplace, send an email to hello@octobercms.com' +about: 'For reporting any issues with the marketplace, send an email to wintercms@luketowers.ca' --- All marketplace support issues will be addressed through email support. diff --git a/.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md b/.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md index a76dd57b1..b46117f98 100644 --- a/.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md +++ b/.github/ISSUE_TEMPLATE/3_GENERAL_SUPPORT.md @@ -1,12 +1,11 @@ --- name: "⚠️ General Support" -about: 'This repository is only for reporting bugs or problems. If you need help using OctoberCMS, see: https://octobercms.com/support' +about: 'This repository is only for reporting bugs or problems. If you need help using Winter CMS, see: https://wintercms.com/support' --- This repository is only for reporting bugs or problems. If you need support, please use the following options: -- Forum: https://octobercms.com/forum -- Slack: https://octobercms.slack.com (Get an invite: https://octobercms-slack.herokuapp.com/) -- Stack Overflow: https://stackoverflow.com/questions/tagged/octobercms +- Discord: https://discord.gg/D5MFSPH6Ux +- Stack Overflow: https://stackoverflow.com/questions/tagged/wintercms Thanks! \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md index 2d1234dec..bf44de6e0 100644 --- a/.github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md +++ b/.github/ISSUE_TEMPLATE/4_FEATURE_REQUEST.md @@ -3,4 +3,4 @@ name: "💡 Feature Request" about: 'For ideas or feature requests, make a PR or talk to the core members on Slack' --- -If you would like to propose new features, please make a pull request. Alternatively, you may message the core team on the OctoberCMS Slack. \ No newline at end of file +If you would like to propose new features, please make a pull request. Alternatively, you may message the core team on the Winter CMS Slack. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/5_DOCUMENTATION.md b/.github/ISSUE_TEMPLATE/5_DOCUMENTATION.md index 850a288d5..63cb19231 100644 --- a/.github/ISSUE_TEMPLATE/5_DOCUMENTATION.md +++ b/.github/ISSUE_TEMPLATE/5_DOCUMENTATION.md @@ -1,9 +1,9 @@ --- name: "📚 Documentation Issue" -about: 'For documentation issues, see: https://github.com/octobercms/docs/issues' +about: 'For documentation issues, see: https://github.com/wintercms/docs/issues' --- -The OctoberCMS documentation has its own dedicated repository. Please open your documentation-related issue at https://github.com/octobercms/docs/issues. +The Winter CMS documentation has its own dedicated repository. Please open your documentation-related issue at https://github.com/wintercms/docs/issues. > **NOTE:** Since documentation issues are not reviewed very often, it's best to simply make a pull request to correct the issue you have found!** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 9e3335ad9..000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,7 +0,0 @@ - \ No newline at end of file diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index a42e0ca76..d1bf7729c 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -17,14 +17,14 @@ jobs: This issue will be closed and archived in 3 days, as there has been no activity in the last 60 days. If this issue is still relevant or you would like to see it actioned, please respond and we will re-open this issue. - - If this issue is critical to your business, consider joining the [Premium Support Program](https://octobercms.com/premium-support) where a Service Level Agreement is offered. + + If this issue is critical to your business, consider joining the [Premium Support Program](https://wintercms.com/premium-support) where a Service Level Agreement is offered. stale-pr-message: > This pull request will be closed and archived in 3 days, as there has been no activity in the last 60 days. If this is still being worked on, please respond and we will re-open this pull request. - - If this pull request is critical to your business, consider joining the [Premium Support Program](https://octobercms.com/premium-support) where a Service Level Agreement is offered. + + If this pull request is critical to your business, consider joining the [Premium Support Program](https://wintercms.com/premium-support) where a Service Level Agreement is offered. stale-issue-label: 'Status: Archived' stale-pr-label: 'Status: Archived' exempt-issue-label: 'Status: In Progress' diff --git a/.github/workflows/code-quality-pr.yaml b/.github/workflows/code-quality-pr.yaml index a63b5013b..d831730cb 100644 --- a/.github/workflows/code-quality-pr.yaml +++ b/.github/workflows/code-quality-pr.yaml @@ -8,14 +8,33 @@ jobs: runs-on: ubuntu-latest name: PHP steps: + - name: Cancel previous incomplete runs + uses: styfle/cancel-workflow-action@0.8.0 + with: + access_token: ${{ github.token }} + - name: Checkout changes uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install PHP and PHP Code Sniffer + + - name: Install PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.3' - tools: phpcs + php-version: 7.2 + extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip + + - name: Install Composer dependencies + run: composer install --no-interaction --no-progress --no-suggest + + - name: Reset Winter modules and library + run: | + git reset --hard HEAD + rm -rf ./vendor/winter/storm + wget https://github.com/wintercms/storm/archive/develop.zip -O ./vendor/winter/develop.zip + unzip ./vendor/winter/develop.zip -d ./vendor/winter + mv ./vendor/winter/storm-develop ./vendor/winter/storm + composer dump-autoload + - name: Run code quality checks - run: ./.github/workflows/utilities/phpcs-pr ${{ github.base_ref }} + run: | + git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" && git fetch + ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }} HEAD) \ No newline at end of file diff --git a/.github/workflows/code-quality-push.yaml b/.github/workflows/code-quality-push.yaml index 8c036b312..19412855c 100644 --- a/.github/workflows/code-quality-push.yaml +++ b/.github/workflows/code-quality-push.yaml @@ -3,23 +3,41 @@ name: Code Quality on: push: branches: - - 1.0 - - 1.1 - - develop + - '1.1' + - 'develop' jobs: codeQuality: runs-on: ubuntu-latest name: PHP steps: + - name: Cancel previous incomplete runs + uses: styfle/cancel-workflow-action@0.8.0 + with: + access_token: ${{ github.token }} + - name: Checkout changes uses: actions/checkout@v2 - with: - fetch-depth: 0 - - name: Install PHP and PHP Code Sniffer + + - name: Install PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.3' - tools: phpcs + php-version: 7.2 + extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip + + - name: Install Composer dependencies + run: composer install --no-interaction --no-progress --no-suggest + + - name: Reset Winter modules and library + run: | + git reset --hard HEAD + rm -rf ./vendor/winter/storm + wget https://github.com/wintercms/storm/archive/develop.zip -O ./vendor/winter/develop.zip + unzip ./vendor/winter/develop.zip -d ./vendor/winter + mv ./vendor/winter/storm-develop ./vendor/winter/storm + composer dump-autoload + - name: Run code quality checks - run: ./.github/workflows/utilities/phpcs-push ${{ github.sha }} + run: | + git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" && git fetch + ./vendor/bin/phpcs --colors -nq --report="full" --extensions="php" $(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }} HEAD) \ No newline at end of file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0ec65aff1..4e8e90ec8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,8 +3,8 @@ name: Tests on: push: branches: - - 1.0 - - 1.1 + - '1.0' + - '1.1' - develop pull_request: @@ -39,8 +39,13 @@ jobs: name: ${{ matrix.operatingSystem }} / PHP ${{ matrix.phpVersion }} env: extensions: curl, fileinfo, gd, mbstring, openssl, pdo, pdo_sqlite, sqlite3, xml, zip - key: october-cms-cache-v1 + key: winter-cms-cache-develop steps: + - name: Cancel previous incomplete runs + uses: styfle/cancel-workflow-action@0.8.0 + with: + access_token: ${{ github.token }} + - name: Checkout changes uses: actions/checkout@v2 @@ -63,13 +68,8 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.phpVersion }} - tools: composer:v1 extensions: ${{ env.extensions }} - - name: Switch library dependency - if: github.ref == 'refs/heads/develop' || github.base_ref == 'develop' - run: php ./.github/workflows/utilities/library-switcher "dev-develop as 1.1" - - name: Setup dependency cache id: composercache run: echo "::set-output name=dir::$(composer config cache-files-dir)" @@ -82,24 +82,24 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Install Composer dependencies - run: composer install --no-interaction --no-progress --no-suggest --no-scripts + run: composer install --no-interaction --no-progress --no-scripts --no-suggest - - name: Reset October modules - run: | - git reset --hard HEAD - composer dumpautoload - - - name: Run post-update Composer scripts - run: php artisan package:discover - - - name: Reset October modules + - name: Reset Winter modules and library run: | git reset --hard HEAD - composer dumpautoload + rm -rf ./vendor/winter/storm + wget https://github.com/wintercms/storm/archive/develop.zip -O ./vendor/winter/develop.zip + unzip ./vendor/winter/winter.zip -d ./vendor/winter + mv ./vendor/winter/storm-develop ./vendor/winter/storm + composer dump-autoload + - name: Run post-update Composer scripts + run: php artisan package:discover - name: Setup problem matchers for PHPUnit if: matrix.phpVersion == '7.4' run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Run tests - run: ./vendor/bin/phpunit --prepend ./vendor/october/rain/src/Support/helpers.php + - name: Run Linting and Tests + run: | + ./vendor/bin/parallel-lint --exclude vendor --exclude storage --exclude tests/fixtures/plugins/testvendor/goto/Plugin.php . + ./vendor/bin/phpunit \ No newline at end of file diff --git a/.github/workflows/utilities/library-switcher b/.github/workflows/utilities/library-switcher deleted file mode 100755 index 1e29eb7d5..000000000 --- a/.github/workflows/utilities/library-switcher +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env php - ($line[3] === 'warning'), - 'message' => $line[4], - 'line' => $line[1], - ]; - } - - // Render report - echo "\e[0;31mFound " - . ((count($lines) === 1) - ? '1 issue' - : count($lines) . ' issues') - . " with code quality.\e[0m"; - echo "\n"; - - foreach ($files as $file => $errors) { - echo "\n"; - echo "\e[1;37m" . str_replace('"', '', $file) . "\e[0m"; - echo "\n\n"; - - foreach ($errors as $error) { - echo "\e[2m" . str_pad(' L' . $error['line'], 7) . " | \e[0m"; - if ($error['warning'] === false) { - echo "\e[0;31mERR:\e[0m "; - } else { - echo "\e[1;33mWARN:\e[0m "; - } - echo $error['message']; - echo "\n"; - } - } - exit(1); -} diff --git a/.github/workflows/utilities/phpcs-push b/.github/workflows/utilities/phpcs-push deleted file mode 100755 index 08c9d7fb5..000000000 --- a/.github/workflows/utilities/phpcs-push +++ /dev/null @@ -1,77 +0,0 @@ -#!/usr/bin/env php - ($line[3] === 'warning'), - 'message' => $line[4], - 'line' => $line[1], - ]; - } - - // Render report - echo "\e[0;31mFound " - . ((count($lines) === 1) - ? '1 issue' - : count($lines) . ' issues') - . " with code quality.\e[0m"; - echo "\n"; - - foreach ($files as $file => $errors) { - echo "\n"; - echo "\e[1;37m" . str_replace('"', '', $file) . "\e[0m"; - echo "\n\n"; - - foreach ($errors as $error) { - echo "\e[2m" . str_pad(' L' . $error['line'], 7) . " | \e[0m"; - if ($error['warning'] === false) { - echo "\e[0;31mERR:\e[0m "; - } else { - echo "\e[1;33mWARN:\e[0m "; - } - echo $error['message']; - echo "\n"; - } - } - exit(1); -} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2a2c0cf..63319241d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1 +1 @@ -View the changelog on the [OctoberCMS website](https://octobercms.com/changelog) +View the changelog on the [meta repository](https://github.com/wintercms/meta/tree/master/release-notes) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index bacdb2061..000000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,5 +0,0 @@ -# Code of Conduct - -We promise to extend courtesy and respect to everyone opening an issue. We expect anyone using the bug trackers to do the same. - -All reported issues to this project are valuable. Please act with respect and avoid demeaning, condescending, racist, sexist and other inappropriate language and conduct. Please ensure comments stay professional and constructive. \ No newline at end of file diff --git a/LICENSE b/LICENSE index 5d1797ce7..7b47a3b13 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) OctoberCMS +Copyright (c) 2013-2021.03.01 October CMS +Copyright (c) 2021 Winter CMS Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index b470bd45c..abfc8780d 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ php artisan october:install ## Learning October -The best place to learn October is by [reading the documentation](https://octobercms.com/docs), [watching some screencasts](https://octobercms.com/support/topic/screencast) or [following some tutorials](https://octobercms.com/support/articles/tutorials). +The best place to learn October is by [reading the documentation](https://wintercms.com/docs), [watching some screencasts](https://wintercms.com/support/topic/screencast) or [following some tutorials](https://wintercms.com/support/articles/tutorials). You may also watch these introductory videos for [beginners](https://vimeo.com/79963873) and [advanced users](https://vimeo.com/172202661). @@ -58,12 +58,12 @@ You can communicate with us using the following mediums: * [Follow us on Twitter](https://twitter.com/octobercms) for announcements and updates. * [Follow us on Facebook](https://facebook.com/octobercms) for announcements and updates. -* [Join the Official Forum](https://octobercms.com/forum) to engage with the community. -* [Join us on Discord](https://octobercms.com/chat) to chat with us. +* [Join the Official Forum](https://wintercms.com/forum) to engage with the community. +* [Join us on Discord](https://wintercms.com/chat) to chat with us. ### Premium Support -October CMS can provide premium support for a monthly fee. Find out more via the [Premium Support Program](https://octobercms.com/premium-support). +Winter CMS can provide premium support for a monthly fee. Find out more via the [Premium Support Program](https://wintercms.com/premium-support). ## Contributing @@ -79,12 +79,12 @@ Please follow the following guides and code standards: ### Code of Conduct -In order to ensure that the October CMS community is welcoming to all, please review and abide by the [Code of Conduct](CODE_OF_CONDUCT.md). +In order to ensure that the Winter CMS community is welcoming to all, please review and abide by the [Code of Conduct](https://github.com/wintercms/.github/CODE_OF_CONDUCT.md). ## License -The October CMS platform is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). +The Winter CMS platform is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). ## Security Vulnerabilities -Please review [our security policy](https://github.com/octobercms/october/security/policy) on how to report security vulnerabilities. +Please review [our security policy](https://github.com/wintercms/winter/security/policy) on how to report security vulnerabilities. diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index c49606fa5..000000000 --- a/SECURITY.md +++ /dev/null @@ -1,11 +0,0 @@ -# Security Policy - -**PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, [SEE BELOW](#reporting-a-vulnerability).** - -## Supported Versions - -October is evergreen, no one version is singled out for security fixes because there is no way to update just one version. Builds are continually released and security fixes will always be available in the latest build. - -## Reporting a Vulnerability - -If you discover a security vulnerability within OctoberCMS, please send an email to Luke Towers at octobercms@luketowers.ca and Samuel Georges at hello@octobercms.com. All security vulnerabilities will be promptly addressed. diff --git a/artisan b/artisan old mode 100644 new mode 100755 diff --git a/bootstrap/app.php b/bootstrap/app.php index cc0ec8d58..10e92d3cd 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -11,7 +11,7 @@ | */ -$app = new October\Rain\Foundation\Application( +$app = new Winter\Storm\Foundation\Application( realpath(__DIR__.'/../') ); @@ -28,17 +28,17 @@ $app = new October\Rain\Foundation\Application( $app->singleton( Illuminate\Contracts\Http\Kernel::class, - October\Rain\Foundation\Http\Kernel::class + Winter\Storm\Foundation\Http\Kernel::class ); $app->singleton( Illuminate\Contracts\Console\Kernel::class, - October\Rain\Foundation\Console\Kernel::class + Winter\Storm\Foundation\Console\Kernel::class ); $app->singleton( Illuminate\Contracts\Debug\ExceptionHandler::class, - October\Rain\Foundation\Exception\Handler::class + Winter\Storm\Foundation\Exception\Handler::class ); /* diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php index 6533c54ca..0b57e5e2f 100644 --- a/bootstrap/autoload.php +++ b/bootstrap/autoload.php @@ -13,7 +13,7 @@ define('LARAVEL_START', microtime(true)); | */ -$helperPath = __DIR__.'/../vendor/october/rain/src/Support/helpers.php'; +$helperPath = __DIR__.'/../vendor/winter/storm/src/Support/helpers.php'; if (!file_exists($helperPath)) { echo 'Missing vendor files, try running "composer install" or use the Wizard installer.'.PHP_EOL; diff --git a/config/app.php b/config/app.php index d0178f422..02574e331 100644 --- a/config/app.php +++ b/config/app.php @@ -28,7 +28,7 @@ return [ | any other location as required by the application or its packages. */ - 'name' => 'October CMS', + 'name' => 'Winter CMS', /* |-------------------------------------------------------------------------- diff --git a/config/cache.php b/config/cache.php index 251771724..8c851ce5f 100644 --- a/config/cache.php +++ b/config/cache.php @@ -76,7 +76,7 @@ return [ | */ - 'prefix' => 'october', + 'prefix' => 'winter', /* |-------------------------------------------------------------------------- @@ -85,7 +85,7 @@ return [ | | This option controls the cache key used by the CMS when storing generated | PHP from the theme PHP sections. Recommended to change this when multiple - | servers running OctoberCMS are connected to the same cache server to + | servers running Winter CMS are connected to the same cache server to | prevent conflicts. | */ diff --git a/config/cms.php b/config/cms.php index 60ab5e494..4da7fd4a7 100644 --- a/config/cms.php +++ b/config/cms.php @@ -18,7 +18,7 @@ return [ | Bleeding edge updates |-------------------------------------------------------------------------- | - | If you are developing with October, it is important to have the latest + | If you are developing with Winter, it is important to have the latest | code base. Set this value to 'true' to tell the platform to download | and use the development copies of core files and plugins. | @@ -300,14 +300,14 @@ return [ | temporaryUrlTTL to a value in seconds to define a validity period. This | is only used for the 'uploads' config when using a supported cloud disk | - | NOTE: If you have installed October in a subfolder, are using local + | NOTE: If you have installed Winter in a subfolder, are using local | storage and are not using a linkPolicy of 'force' you should include | the path to the subfolder in the `path` option for these storage | configurations. | - | Example: October is installed under https://localhost/projects/october. - | You should then specify `/projects/october/storage/app/uploads` as the - | path for the uploads disk and `/projects/october/storage/app/media` as + | Example: Winter is installed under https://localhost/projects/winter. + | You should then specify `/projects/winter/storage/app/uploads` as the + | path for the uploads disk and `/projects/winter/storage/app/media` as | the path for the media disk. */ @@ -339,7 +339,7 @@ return [ | Convert Line Endings |-------------------------------------------------------------------------- | - | Determines if October should convert line endings from the windows style + | Determines if Winter should convert line endings from the windows style | \r\n to the unix style \n. | */ diff --git a/config/cookie.php b/config/cookie.php index 9b624ae71..f286fe5a6 100644 --- a/config/cookie.php +++ b/config/cookie.php @@ -7,7 +7,7 @@ return [ | Cookies that should not be encrypted |-------------------------------------------------------------------------- | - | OctoberCMS encrypts/decrypts cookies by default. You can specify cookies + | Winter CMS encrypts/decrypts cookies by default. You can specify cookies | that should not be encrypted or decrypted here. This is useful, for | example, when you want to pass data from frontend to server side backend | via cookies, and vice versa. diff --git a/config/database.php b/config/database.php index a06bc7586..025084c41 100644 --- a/config/database.php +++ b/config/database.php @@ -133,10 +133,10 @@ return [ | Use DB configuration for testing |-------------------------------------------------------------------------- | - | When running plugin tests OctoberCMS by default uses SQLite in memory. + | When running plugin tests Winter CMS by default uses SQLite in memory. | You can override this behavior by setting `useConfigForTesting` to true. | - | After that OctoberCMS will take DB parameters from the config. + | After that Winter CMS will take DB parameters from the config. | If file `/config/testing/database.php` exists, config will be read from it, | but remember that when not specified it will use parameters specified in | `/config/database.php`. diff --git a/config/develop.php b/config/develop.php index 2c1cbc642..377744a5a 100644 --- a/config/develop.php +++ b/config/develop.php @@ -8,7 +8,7 @@ return [ |-------------------------------------------------------------------------- | | Enabling this will load all individual backend asset files, instead of - | loading the compiled asset files generated by `october:util compile + | loading the compiled asset files generated by `winter:util compile | assets`. This is useful only for development purposes, and should not be | enabled in production. Please note that enabling this will make the | Backend load a LOT of individual asset files. diff --git a/config/mail.php b/config/mail.php index 4c471d568..d61395884 100644 --- a/config/mail.php +++ b/config/mail.php @@ -55,7 +55,7 @@ return [ | */ - 'from' => ['address' => 'noreply@domain.tld', 'name' => 'OctoberCMS'], + 'from' => ['address' => 'noreply@example.com', 'name' => 'Winter CMS'], /* |-------------------------------------------------------------------------- diff --git a/config/session.php b/config/session.php index 8e2f8fa57..bb3f8b5a4 100644 --- a/config/session.php +++ b/config/session.php @@ -109,7 +109,7 @@ return [ | */ - 'cookie' => 'october_session', + 'cookie' => 'winter_session', /* |-------------------------------------------------------------------------- @@ -147,7 +147,7 @@ return [ | the HTTP protocol. You are free to modify this option if needed. | */ - + 'http_only' => true, /* diff --git a/config/testing/cms.php b/config/testing/cms.php index 8267ac3e4..18e483f9c 100644 --- a/config/testing/cms.php +++ b/config/testing/cms.php @@ -80,7 +80,7 @@ return [ | Convert Line Endings |-------------------------------------------------------------------------- | - | Determines if October should convert line endings from the windows style + | Determines if Winter should convert line endings from the windows style | \r\n to the unix style \n. | */ diff --git a/index.php b/index.php index 9c4d23a06..3ce7b10e1 100644 --- a/index.php +++ b/index.php @@ -1,8 +1,8 @@ registerBundle('~/modules/backend/assets/less/october.less'); - $combiner->registerBundle('~/modules/backend/assets/js/october.js'); + $combiner->registerBundle('~/modules/backend/assets/less/winter.less'); + $combiner->registerBundle('~/modules/backend/assets/js/winter.js'); $combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js'); $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js'); $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/less/mediamanager.less'); @@ -98,7 +98,7 @@ class ServiceProvider extends ModuleServiceProvider protected function registerBackendNavigation() { BackendMenu::registerCallback(function ($manager) { - $manager->registerMenuItems('October.Backend', [ + $manager->registerMenuItems('Winter.Backend', [ 'dashboard' => [ 'label' => 'backend::lang.dashboard.menu_label', 'icon' => 'icon-dashboard', @@ -116,6 +116,7 @@ class ServiceProvider extends ModuleServiceProvider 'order' => 200 ] ]); + $manager->registerOwnerAlias('Winter.Backend', 'October.Backend'); }); } @@ -138,7 +139,7 @@ class ServiceProvider extends ModuleServiceProvider protected function registerBackendPermissions() { BackendAuth::registerCallback(function ($manager) { - $manager->registerPermissions('October.Backend', [ + $manager->registerPermissions('Winter.Backend', [ 'backend.access_dashboard' => [ 'label' => 'system::lang.permissions.view_the_dashboard', 'tab' => 'system::lang.permissions.name', @@ -186,6 +187,7 @@ class ServiceProvider extends ModuleServiceProvider 'roles' => UserRole::CODE_DEVELOPER, ], ]); + $manager->registerPermissionOwnerAlias('Winter.Backend', 'October.Backend'); }); } @@ -219,7 +221,7 @@ class ServiceProvider extends ModuleServiceProvider protected function registerBackendSettings() { SettingsManager::instance()->registerCallback(function ($manager) { - $manager->registerSettingItems('October.Backend', [ + $manager->registerSettingItems('Winter.Backend', [ 'branding' => [ 'label' => 'backend::lang.branding.menu_label', 'description' => 'backend::lang.branding.menu_description', @@ -270,6 +272,7 @@ class ServiceProvider extends ModuleServiceProvider 'order' => 920 ] ]); + $manager->registerOwnerAlias('Winter.Backend', 'October.Backend'); }); } } diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/winter.css similarity index 98% rename from modules/backend/assets/css/october.css rename to modules/backend/assets/css/winter.css index 5703da3d0..7f0622b6c 100644 --- a/modules/backend/assets/css/october.css +++ b/modules/backend/assets/css/winter.css @@ -246,13 +246,21 @@ html.mobile .control-scrollbar {overflow:auto;-webkit-overflow-scrolling:touch} .control-scrollpanel .control-scrollbar.vertical >.scrollbar-scrollbar {right:0} .tooltip .tooltip-inner {text-align:left;padding:5px 8px} .tooltip.in {opacity:1;filter:alpha(opacity=100)} -.oc-logo-white {background-image:url(../images/october-logo-white.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:contain} -.oc-logo {background-image:url(../images/october-logo.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:contain} +.wn-logo-white, +.oc-logo-white {background-image:url(../images/winter-logo-white.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:contain} +.wn-logo, +.oc-logo {background-image:url(../images/winter-logo.svg);background-position:50% 50%;background-repeat:no-repeat;background-size:contain} +.layout.control-tabs.wn-logo-transparent:not(.has-tabs), .layout.control-tabs.oc-logo-transparent:not(.has-tabs), +.flex-layout-column.wn-logo-transparent:not(.has-tabs), .flex-layout-column.oc-logo-transparent:not(.has-tabs), -.layout-cell.oc-logo-transparent {background-size:50% auto;background-repeat:no-repeat;background-image:url(../images/october-logo.svg);background-position:50% 50%;position:relative} +.layout-cell.wn-logo-transparent, +.layout-cell.oc-logo-transparent {background-size:50% auto;background-repeat:no-repeat;background-image:url(../images/winter-logo.svg);background-position:50% 50%;position:relative} +.layout.control-tabs.wn-logo-transparent:not(.has-tabs):after, .layout.control-tabs.oc-logo-transparent:not(.has-tabs):after, +.flex-layout-column.wn-logo-transparent:not(.has-tabs):after, .flex-layout-column.oc-logo-transparent:not(.has-tabs):after, +.layout-cell.wn-logo-transparent:after, .layout-cell.oc-logo-transparent:after {content:'';display:table-cell;position:absolute;left:0;top:0;height:100%;width:100%;background:rgba(249,249,249,0.7)} .report-widget {padding:15px;background:white;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;font-size:13px} .report-widget h3 {font-size:14px;color:#7e8c8d;text-transform:uppercase;font-weight:600;margin-top:0;margin-bottom:30px} @@ -679,10 +687,9 @@ nav#layout-mainmenu .toolbar-item:before {left:-12px} nav#layout-mainmenu .toolbar-item:after {right:-12px} nav#layout-mainmenu .toolbar-item.scroll-active-before:before {color:#fff} nav#layout-mainmenu .toolbar-item.scroll-active-after:after {color:#fff} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action {margin:0} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action:first-child {margin-left:21px} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action i {font-size:20px} -nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-quick-action a {position:relative;padding:0 10px;top:-1px} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview {margin:0 0 0 21px} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview i {font-size:20px} +nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-preview a {position:relative;padding:0 10px;top:-1px} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account {margin-right:0} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account >a {padding:0 15px 0 10px;font-size:13px;position:relative} nav#layout-mainmenu ul.mainmenu-toolbar li.mainmenu-account.highlight >a {z-index:600} @@ -707,8 +714,8 @@ nav#layout-mainmenu ul li .mainmenu-accountmenu li:first-child a:active:after {c nav#layout-mainmenu ul li .mainmenu-accountmenu li.divider {height:1px;width:100%;background-color:#e0e0e0} nav#layout-mainmenu.navbar-mode-inline, nav#layout-mainmenu.navbar-mode-inline_no_icons {height:60px} -nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-quick-action a, -nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-quick-action a {height:60px;line-height:60px} +nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-preview a, +nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-preview a {height:60px;line-height:60px} nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-toolbar li.mainmenu-account >a, nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-toolbar li.mainmenu-account >a {height:60px;line-height:60px} nav#layout-mainmenu.navbar-mode-inline ul li .mainmenu-accountmenu, @@ -731,7 +738,7 @@ nav#layout-mainmenu.navbar-mode-inline ul.mainmenu-nav li:last-child, nav#layout-mainmenu.navbar-mode-inline_no_icons ul.mainmenu-nav li:last-child {margin-right:0} nav#layout-mainmenu.navbar-mode-inline_no_icons .nav-icon {display:none !important} nav#layout-mainmenu.navbar-mode-tile {height:78px} -nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-quick-action a {height:78px;line-height:78px} +nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-preview a {height:78px;line-height:78px} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-toolbar li.mainmenu-account >a {height:78px;line-height:78px} nav#layout-mainmenu.navbar-mode-tile ul li .mainmenu-accountmenu {top:88px} nav#layout-mainmenu.navbar-mode-tile ul.mainmenu-nav li a {position:relative;width:65px;height:65px} @@ -750,14 +757,14 @@ nav#layout-mainmenu .menu-toggle .menu-toggle-title {margin-left:10px} nav#layout-mainmenu .menu-toggle:hover .menu-toggle-icon {opacity:1} body.mainmenu-open nav#layout-mainmenu .menu-toggle-icon {opacity:1} nav#layout-mainmenu.navbar-mode-collapse {padding-left:0;height:45px} -nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-quick-action a {height:45px;line-height:45px} +nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-preview a {height:45px;line-height:45px} nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-account >a {height:45px;line-height:45px} nav#layout-mainmenu.navbar-mode-collapse ul li .mainmenu-accountmenu {top:55px} nav#layout-mainmenu.navbar-mode-collapse ul.mainmenu-toolbar li.mainmenu-account >a {padding-right:0} nav#layout-mainmenu.navbar-mode-collapse ul li .mainmenu-accountmenu:after {right:13px} nav#layout-mainmenu.navbar-mode-collapse ul.nav {display:none} nav#layout-mainmenu.navbar-mode-collapse .menu-toggle {display:inline-block;color:#fff !important} -@media (max-width:769px) {nav#layout-mainmenu.navbar {padding-left:0;height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-quick-action a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu {top:55px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {padding-right:0 }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after {right:13px }nav#layout-mainmenu.navbar ul.nav {display:none }nav#layout-mainmenu.navbar .menu-toggle {display:inline-block;color:#fff !important }} +@media (max-width:769px) {nav#layout-mainmenu.navbar {padding-left:0;height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-preview a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {height:45px;line-height:45px }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu {top:55px }nav#layout-mainmenu.navbar ul.mainmenu-toolbar li.mainmenu-account >a {padding-right:0 }nav#layout-mainmenu.navbar ul li .mainmenu-accountmenu:after {right:13px }nav#layout-mainmenu.navbar ul.nav {display:none }nav#layout-mainmenu.navbar .menu-toggle {display:inline-block;color:#fff !important }} .mainmenu-collapsed {position:absolute;height:100%;top:0;left:0;margin:0;background:#000} .mainmenu-collapsed >div {display:block;height:100%} .mainmenu-collapsed >div ul.mainmenu-nav li a {position:relative;width:65px;height:65px} @@ -850,6 +857,7 @@ body.outer {background:#2b3e50} body.outer .layout >.layout-row.layout-head {text-align:center;background:#f9f9f9} body.outer .layout >.layout-row.layout-head >.layout-cell {height:40%;padding:50px 0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;vertical-align:middle;position:relative} body.outer .layout >.layout-row.layout-head >.layout-cell:after {content:'';display:block;width:0;height:0;border-left:28px solid transparent;border-right:28px solid transparent;border-top:20px solid #f9f9f9;border-bottom-width:0;position:absolute;bottom:-20px;left:50%;margin-left:-28px} +body.outer .layout >.layout-row.layout-head >.layout-cell h1.wn-logo, body.outer .layout >.layout-row.layout-head >.layout-cell h1.oc-logo {font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;display:inline-block;width:100%;max-width:450px;height:170px;min-height:72px} body.outer .layout >.layout-row >.layout-cell {vertical-align:top} body.outer .layout >.layout-row >.layout-cell .outer-form-container {margin:0 auto;width:436px;padding:40px 0} @@ -1095,9 +1103,12 @@ body.breadcrumb-fancy .control-breadcrumb li:last-child:before, .fancy-layout .form-buttons .btn {padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background:transparent;color:#fff;font-weight:normal;-webkit-box-shadow:none;box-shadow:none;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease} .fancy-layout .form-buttons .btn:hover {opacity:1;filter:alpha(opacity=100)} .fancy-layout .form-buttons .btn:last-child {margin-right:0} +.fancy-layout .form-buttons .btn[class^="wn-icon-"]:before, +.fancy-layout .form-buttons .btn[class*=" wn-icon-"]:before, .fancy-layout .form-buttons .btn[class^="oc-icon-"]:before, .fancy-layout .form-buttons .btn[class*=" oc-icon-"]:before {opacity:1} -.fancy-layout form.oc-data-changed .btn.save {opacity:1;filter:alpha(opacity=100)} +.fancy-layout form.oc-data-changed .btn.save, +.fancy-layout form.wn-data-changed .btn.save {opacity:1;filter:alpha(opacity=100)} .fancy-layout .field-codeeditor {border:none !important;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} .fancy-layout .field-codeeditor .editor-code {-webkit-border-radius:0;-moz-border-radius:0;border-radius:0} .fancy-layout .field-richeditor {border:none;border-left:1px solid #d1d6d9 !important} diff --git a/modules/backend/assets/images/favicon.png b/modules/backend/assets/images/favicon.png index 6af9b71b9..2a14a9fec 100644 Binary files a/modules/backend/assets/images/favicon.png and b/modules/backend/assets/images/favicon.png differ diff --git a/modules/backend/assets/images/logo.svg b/modules/backend/assets/images/logo.svg new file mode 100644 index 000000000..9d202b97c --- /dev/null +++ b/modules/backend/assets/images/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/backend/assets/images/october-leaf.svg b/modules/backend/assets/images/october-leaf.svg deleted file mode 100644 index 6f4cfdbc3..000000000 --- a/modules/backend/assets/images/october-leaf.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - october-leaf - Created with Sketch. - - - - - - - \ No newline at end of file diff --git a/modules/backend/assets/images/october-logo-text.png b/modules/backend/assets/images/october-logo-text.png deleted file mode 100644 index 365dfb439..000000000 Binary files a/modules/backend/assets/images/october-logo-text.png and /dev/null differ diff --git a/modules/backend/assets/images/october-logo-transparent.svg b/modules/backend/assets/images/october-logo-transparent.svg deleted file mode 100644 index fd79425d0..000000000 --- a/modules/backend/assets/images/october-logo-transparent.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - -]> - - - - - - - - - - - diff --git a/modules/backend/assets/images/october-logo-white.svg b/modules/backend/assets/images/october-logo-white.svg deleted file mode 100644 index 122438598..000000000 --- a/modules/backend/assets/images/october-logo-white.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - -]> - - - - - - - - - - - diff --git a/modules/backend/assets/images/october-logo.svg b/modules/backend/assets/images/october-logo.svg deleted file mode 100644 index b4121e44f..000000000 --- a/modules/backend/assets/images/october-logo.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - -]> - - - - - - - - - - - diff --git a/modules/backend/assets/images/winter-logo-white.svg b/modules/backend/assets/images/winter-logo-white.svg new file mode 100644 index 000000000..e072730fe --- /dev/null +++ b/modules/backend/assets/images/winter-logo-white.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/backend/assets/images/winter-logo.svg b/modules/backend/assets/images/winter-logo.svg new file mode 100644 index 000000000..18c85e7db --- /dev/null +++ b/modules/backend/assets/images/winter-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/modules/backend/assets/images/wordmark.png b/modules/backend/assets/images/wordmark.png new file mode 100644 index 000000000..3b2280df6 Binary files /dev/null and b/modules/backend/assets/images/wordmark.png differ diff --git a/modules/backend/assets/js/backend.js b/modules/backend/assets/js/backend.js index d21803df7..a9d1c941d 100644 --- a/modules/backend/assets/js/backend.js +++ b/modules/backend/assets/js/backend.js @@ -1,5 +1,5 @@ /* - * October General Utilities + * Winter General Utilities */ /* @@ -19,10 +19,12 @@ $.ajaxPrefilter(function(options) { * Path helpers */ +if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn -$.oc.backendUrl = function(url) { +$.wn.backendUrl = function(url) { var backendBasePath = $('meta[name="backend-base-path"]').attr('content') if (!backendBasePath) @@ -164,10 +166,12 @@ assetManager = new AssetManager(); /* * String escape */ +if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn -$.oc.escapeHtmlString = function(string) { +$.wn.escapeHtmlString = function(string) { var htmlEscapes = { '&': '&', '<': '<', @@ -186,7 +190,7 @@ $.oc.escapeHtmlString = function(string) { /* * Inverse Click Event (not used) * - * Calls the handler function if the user has clicked outside the object + * Calls the handler function if the user has clicked outside the object * and not on any of the elements in the exception list. */ /* diff --git a/modules/backend/assets/js/october.js b/modules/backend/assets/js/october.js deleted file mode 100644 index 17fd9d38d..000000000 --- a/modules/backend/assets/js/october.js +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This is a bundle file, you can compile this in two ways: - * (1) Using your favorite JS combiner - * (2) Using CLI command: - * php artisan october:util compile assets - * - * @see october-min.js - * - -=require vendor/jquery.touchwipe.js -=require vendor/jquery.autoellipsis.js -=require vendor/jquery.waterfall.js -=require vendor/jquery.cookie.js -=require ../vendor/dropzone/dropzone.js -=require ../vendor/sweet-alert/sweet-alert.js -=require ../vendor/jcrop/js/jquery.Jcrop.js -=require ../../../system/assets/vendor/prettify/prettify.js -=require ../../widgets/mediamanager/assets/js/mediamanager-global.js - -=require october.lang.js -=require october.alert.js -=require october.scrollpad.js -=require october.verticalmenu.js -=require october.navbar.js -=require october.sidenav.js -=require october.scrollbar.js -=require october.filelist.js -=require october.layout.js -=require october.sidepaneltab.js -=require october.simplelist.js -=require october.treelist.js -=require october.sidenav-tree.js -=require october.datetime.js - -=require backend.js -*/ diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/winter-min.js similarity index 98% rename from modules/backend/assets/js/october-min.js rename to modules/backend/assets/js/winter-min.js index 41cba9726..d3636fa18 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/winter-min.js @@ -523,9 +523,9 @@ $.Jcrop.Loader(this,function(){$(this).css({display:'block',visibility:'hidden'} else window.setTimeout(completeCheck,50);} $img.bind('load.jcloader',completeCheck).bind('error.jcloader',function(e){$img.unbind('.jcloader');if($.isFunction(error))error.call(img);});if(img.complete&&$.isFunction(success)){$img.unbind('.jcloader');success.call(img);}};$.Jcrop.defaults={allowSelect:true,allowMove:true,allowResize:true,trackDocument:true,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:0.6,bgFade:false,borderOpacity:0.4,handleOpacity:0.5,handleSize:null,aspectRatio:0,keySupport:true,createHandles:['n','s','e','w','nw','ne','se','sw'],createDragbars:['n','s','e','w'],createBorders:['n','s','e','w'],drawBorders:true,dragEdges:true,fixedSupport:true,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}};}(jQuery));!function(){var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;(function(){function S(a){function d(e){var b=e.charCodeAt(0);if(b!==92)return b;var a=e.charAt(1);return(b=r[a])?b:"0"<=a&&a<="7"?parseInt(e.substring(1),8):a==="u"||a==="x"?parseInt(e.substring(2),16):e.charCodeAt(1)}function g(e){if(e<32)return(e<16?"\\x0":"\\x")+e.toString(16);e=String.fromCharCode(e);return e==="\\"||e==="-"||e==="]"||e==="^"?"\\"+e:e}function b(e){var b=e.substring(1,e.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),e=[],a=b[0]==="^",c=["["];a&&c.push("^");for(var a=a?1:0,f=b.length;a122||(l<65||h>90||e.push([Math.max(65,h)|32,Math.min(l,90)|32]),l<97||h>122||e.push([Math.max(97,h)&-33,Math.min(l,122)&-33]))}}e.sort(function(e,a){return e[0]-a[0]||a[1]-e[1]});b=[];f=[];for(a=0;ah[0]&&(h[1]+1>h[0]&&c.push("-"),c.push(g(h[1])));c.push("]");return c.join("")}function s(e){for(var a=e.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),c=a.length,d=[],f=0,h=0;f=2&&e==="["?a[f]=b(l):e!=="\\"&&(a[f]=l.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return a.join("")}for(var x=0,m=!1,j=!1,k=0,c=a.length;k=5&&"lang-"===w.substring(0,5))&&!(t&&typeof t[1]==="string"))f=!1,w="src";f||(r[z]=w)}h=c;c+=z.length;if(f){f=t[1];var l=z.indexOf(f),B=l+f.length;t[2]&&(B=z.length-t[2].length,l=B-f.length);w=w.substring(5);H(j+h,z.substring(0,l),g,k);H(j+h+l,f,I(w,f),k);H(j+h+B,z.substring(B),g,k)}else k.push(j+h,w)}a.g=k}var b={},s;(function(){for(var g=a.concat(d),j=[],k={},c=0,i=g.length;c=0;)b[n.charAt(e)]=r;r=r[1];n=""+r;k.hasOwnProperty(n)||(j.push(r),k[n]=q)}j.push(/[\S\s]/);s=S(j)})();var x=d.length;return g}function v(a){var d=[],g=[];a.tripleQuotedStrings?d.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?d.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,q,"'\"`"]):d.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&g.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var b=a.hashComments;b&&(a.cStyleComments?(b>1?d.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):d.push(["com",/^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),g.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/,q])):d.push(["com",/^#[^\n\r]*/,q,"#"]));a.cStyleComments&&(g.push(["com",/^\/\/[^\n\r]*/,q]),g.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));if(b=a.regexLiterals){var s=(b=b>1?"":"\n\r")?".":"[\\S\\s]";g.push(["lang-regex",RegExp("^(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*("+("/(?=[^/*"+b+"])(?:[^/\\x5B\\x5C"+b+"]|\\x5C"+s+"|\\x5B(?:[^\\x5C\\x5D"+b+"]|\\x5C"+ s+")*(?:\\x5D|$))+/")+")")])}(b=a.types)&&g.push(["typ",b]);b=(""+a.keywords).replace(/^ | $/g,"");b.length&&g.push(["kwd",RegExp("^(?:"+b.replace(/[\s,]+/g,"|")+")\\b"),q]);d.push(["pln",/^\s+/,q," \r\n\t\u00a0"]);b="^.[^\\s\\w.$@'\"`/\\\\]*";a.regexLiterals&&(b+="(?!s*/)");g.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",RegExp(b),q]);return C(d,g)}function J(a,d,g){function b(a){var c=a.nodeType;if(c==1&&!x.test(a.className))if("br"===a.nodeName)s(a),a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)b(a);else if((c==3||c==4)&&g){var d=a.nodeValue,i=d.match(m);if(i)c=d.substring(0,i.index),a.nodeValue=c,(d=d.substring(i.index+i[0].length))&&a.parentNode.insertBefore(j.createTextNode(d),a.nextSibling),s(a),c||a.parentNode.removeChild(a)}}function s(a){function b(a,c){var d=c?a.cloneNode(!1):a,e=a.parentNode;if(e){var e=b(e,1),g=a.nextSibling;e.appendChild(d);for(var i=g;i;i=g)g=i.nextSibling,e.appendChild(i)}return d}for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),d;(d=a.parentNode)&&d.nodeType===1;)a=d;c.push(a)}for(var x=/(?:^|\s)nocode(?:\s|$)/,m=/\r\n?|\n/,j=a.ownerDocument,k=j.createElement("li");a.firstChild;)k.appendChild(a.firstChild);for(var c=[k],i=0;i=0;){var b=d[g];F.hasOwnProperty(b)?D.console&&console.warn("cannot override language handler %s",b):F[b]=a}}function I(a,d){if(!a||!F.hasOwnProperty(a))a=/^\s*=l&&(b+=2);g>=B&&(r+=2)}}finally{if(f)f.style.display=h}}catch(u){D.console&&console.log(u&&u.stack||u)}}var D=window,y=["break,continue,do,else,for,if,return,while"],E=[[y,"auto,case,char,const,default,double,enum,extern,float,goto,inline,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],M=[E,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,delegate,dynamic_cast,explicit,export,friend,generic,late_check,mutable,namespace,nullptr,property,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],N=[E,"abstract,assert,boolean,byte,extends,final,finally,implements,import,instanceof,interface,null,native,package,strictfp,super,synchronized,throws,transient"],O=[N,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where"],E=[E,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],P=[y,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],Q=[y,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],W=[y,"as,assert,const,copy,drop,enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv,pub,pure,ref,self,static,struct,true,trait,type,unsafe,use"],y=[y,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],R=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/,V=/\S/,X=v({keywords:[M,O,E,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",P,Q,y],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),F={};p(X,["default-code"]);p(C([],[["pln",/^[^]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);p(C([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);p(C([],[["atv",/^[\S\s]+/]]),["uq.val"]);p(v({keywords:M,hashComments:!0,cStyleComments:!0,types:R}),["c","cc","cpp","cxx","cyc","m"]);p(v({keywords:"null,true,false"}),["json"]);p(v({keywords:O,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:R}),["cs"]);p(v({keywords:N,cStyleComments:!0}),["java"]);p(v({keywords:y,hashComments:!0,multiLineStrings:!0}),["bash","bsh","csh","sh"]);p(v({keywords:P,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),["cv","py","python"]);p(v({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:2}),["perl","pl","pm"]);p(v({keywords:Q,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb","ruby"]);p(v({keywords:E,cStyleComments:!0,regexLiterals:!0}),["javascript","js"]);p(v({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes",hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);p(v({keywords:W,cStyleComments:!0,multilineStrings:!0}),["rc","rs","rust"]);p(C([],[["str",/^[\S\s]+/]]),["regex"]);var Y=D.PR={createSimpleLexer:C,registerLangHandler:p,sourceDecorator:v,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ",prettyPrintOne:D.prettyPrintOne=function(a,d,g){var b=document.createElement("div");b.innerHTML="
"+a+"
";b=b.firstChild;g&&J(b,g,!0);K({h:d,j:g,c:b,i:1});return b.innerHTML},prettyPrint:D.prettyPrint=function(a,d){function g(){for(var b=D.PR_SHOULD_USE_CONTINUATION?c.now()+250:Infinity;i1) dragPerc=1 var scrollPos=dragPerc*contentSize;this.scrollContentElement[scrollAttr]=scrollPos} @@ -761,8 +765,10 @@ navbar=$(this),nav=$('ul.nav',navbar),collapseMode=navbar.hasClass('navbar-mode- nav.verticalMenu($('a.menu-toggle',navbar),{breakpoint:collapseMode?Infinity:769}) $('li.with-tooltip:not(.active) > a',navbar).tooltip({container:'body',placement:'bottom',template:''}).on('show.bs.tooltip',function(e){if(isMobile)e.preventDefault()}) var dragScroll=$('[data-control=toolbar]',navbar).data('oc.dragScroll') -if(dragScroll){dragScroll.goToElement($('ul.nav > li.active',navbar),undefined,{'duration':0})}})})})(jQuery);+function($){"use strict";if($.oc===undefined) -$.oc={} +if(dragScroll){dragScroll.goToElement($('ul.nav > li.active',navbar),undefined,{'duration':0})}})})})(jQuery);+function($){"use strict";if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn var SideNav=function(element,options){this.options=options this.$el=$(element) this.$list=$('ul',this.$el) @@ -798,15 +804,15 @@ var options=$.extend({},SideNav.DEFAULTS,$this.data(),typeof option=='object'&&o if(!data)$this.data('oc.sideNav',(data=new SideNav(this,options))) if(typeof option=='string')result=data[option].apply(data,args) if(typeof result!='undefined')return false -if($.oc.sideNav===undefined) -$.oc.sideNav=data}) +if($.wn.sideNav===undefined) +$.wn.sideNav=data}) return result?result:this} $.fn.sideNav.Constructor=SideNav $.fn.sideNav.noConflict=function(){$.fn.sideNav=old return this} -$(document).ready(function(){$('[data-control="sidenav"]').sideNav()})}(window.jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype +$(document).ready(function(){$('[data-control="sidenav"]').sideNav()})}(window.jQuery);+function($){"use strict";var Base=$.wn.foundation.base,BaseProto=Base.prototype var Scrollbar=function(element,options){var -$el=this.$el=$(element),el=$el.get(0),self=this,options=this.options=options||{},sizeName=this.sizeName=options.vertical?'height':'width',isNative=$('html').hasClass('mobile'),isTouch=this.isTouch=Modernizr.touchevents,isScrollable=this.isScrollable=false,isLocked=this.isLocked=false,eventElementName=options.vertical?'pageY':'pageX',dragStart=0,startOffset=0;$.oc.foundation.controlUtils.markDisposable(element) +$el=this.$el=$(element),el=$el.get(0),self=this,options=this.options=options||{},sizeName=this.sizeName=options.vertical?'height':'width',isNative=$('html').hasClass('mobile'),isTouch=this.isTouch=Modernizr.touchevents,isScrollable=this.isScrollable=false,isLocked=this.isLocked=false,eventElementName=options.vertical?'pageY':'pageX',dragStart=0,startOffset=0;$.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.$el.one('dispose-control',this.proxy(this.dispose)) if(isNative){return} @@ -968,12 +974,12 @@ data[option].apply(data,methodArgs)}})} $.fn.fileList.Constructor=FileList $.fn.fileList.noConflict=function(){$.fn.fileList=old return this} -$(document).ready(function(){$('[data-control=filelist]').fileList()})}(window.jQuery);(function($){var OctoberLayout=function(){this.$accountMenuOverlay=null} -OctoberLayout.prototype.setPageTitle=function(title){var $title=$('title') +$(document).ready(function(){$('[data-control=filelist]').fileList()})}(window.jQuery);(function($){var WinterLayout=function(){this.$accountMenuOverlay=null} +WinterLayout.prototype.setPageTitle=function(title){var $title=$('title') if(this.pageTitleTemplate===undefined) this.pageTitleTemplate=$title.data('titleTemplate') $title.text(this.pageTitleTemplate.replace('%s',title))} -OctoberLayout.prototype.updateLayout=function(title){var $children,$el,fixedWidth,margin +WinterLayout.prototype.updateLayout=function(title){var $children,$el,fixedWidth,margin $('[data-calculate-width]').each(function(){$children=$(this).children() if($children.length>0){fixedWidth=0 $children.each(function(){$el=$(this) @@ -983,7 +989,7 @@ $el.data('oc.layoutMargin',margin)} fixedWidth+=$el.get(0).offsetWidth+margin}) $(this).width(fixedWidth) $(this).trigger('oc.widthFixed')}})} -OctoberLayout.prototype.toggleAccountMenu=function(el){var self=this,$el=$(el),$parent=$(el).parent(),$menu=$el.next() +WinterLayout.prototype.toggleAccountMenu=function(el){var self=this,$el=$(el),$parent=$(el).parent(),$menu=$el.next() $el.tooltip('hide') if($menu.hasClass('active')){self.$accountMenuOverlay.remove() $parent.removeClass('highlight') @@ -995,13 +1001,15 @@ $menu.addClass('active') self.$accountMenuOverlay.one('click',function(){self.$accountMenuOverlay.remove() $menu.removeClass('active') $parent.removeClass('highlight')})}} +if($.wn===undefined) +$.wn={} if($.oc===undefined) -$.oc={} -$.oc.layout=new OctoberLayout() -$(document).ready(function(){$.oc.layout.updateLayout() -window.setTimeout($.oc.layout.updateLayout,100)}) -$(window).on('resize',function(){$.oc.layout.updateLayout()}) -$(window).on('oc.updateUi',function(){$.oc.layout.updateLayout()})})(jQuery);+function($){"use strict";var SidePanelTab=function(element,options){this.options=options +$.oc=$.wn +$.wn.layout=new WinterLayout() +$(document).ready(function(){$.wn.layout.updateLayout() +window.setTimeout($.wn.layout.updateLayout,100)}) +$(window).on('resize',function(){$.wn.layout.updateLayout()}) +$(window).on('oc.updateUi',function(){$.wn.layout.updateLayout()})})(jQuery);+function($){"use strict";var SidePanelTab=function(element,options){this.options=options this.$el=$(element) this.init()} SidePanelTab.prototype.init=function(){var self=this @@ -1041,7 +1049,7 @@ self.$el.on('close.oc.sidePanel',function(){self.hideSidePanel()})} this.updateActiveTab()} SidePanelTab.prototype.displayTab=function(menuItem){var menuItemId=$(menuItem).data('menu-item') this.visibleItemId=menuItemId -if($.oc.sideNav!==undefined){$.oc.sideNav.setActiveItem(menuItemId)} +if($.wn.sideNav!==undefined){$.wn.sideNav.setActiveItem(menuItemId)} this.$sidePanelItems.each(function(){var $el=$(this) $el.toggleClass('hide',$el.data('content-id')!=menuItemId)}) $(window).trigger('resize')} @@ -1058,9 +1066,9 @@ this.updateActiveTab()} SidePanelTab.prototype.updatePanelPosition=function(){if(!this.panelFixed()||Modernizr.touchevents){this.$el.height($(document).height()-this.mainNavHeight)} else{this.$el.css('height','')} if(this.panelVisible&&$(window).width()>this.options.breakpoint&&this.panelFixed()){this.hideSidePanel()}} -SidePanelTab.prototype.updateActiveTab=function(){if($.oc.sideNav===undefined){return} -if(!this.panelVisible&&($(window).width()':'>','"':'"',"'":''','/':'/'},htmlEscaper=/[&<>"'\/]/g +img.src=source})}};return o;};assetManager=new AssetManager();if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn +$.wn.escapeHtmlString=function(string){var htmlEscapes={'&':'&','<':'<','>':'>','"':'"',"'":''','/':'/'},htmlEscaper=/[&<>"'\/]/g return(''+string).replace(htmlEscaper,function(match){return htmlEscapes[match];})} if(!!window.MSInputMethodContext&&!!document.documentMode){$(window).on('resize',function(){fixMediaManager() fixSidebar()}) diff --git a/modules/backend/assets/js/october.alert.js b/modules/backend/assets/js/winter.alert.js similarity index 74% rename from modules/backend/assets/js/october.alert.js rename to modules/backend/assets/js/winter.alert.js index 11d9e64c0..6a3558db2 100644 --- a/modules/backend/assets/js/october.alert.js +++ b/modules/backend/assets/js/winter.alert.js @@ -4,26 +4,28 @@ * Displays alert and confirmation dialogs * * JavaScript API: - * $.oc.alert() - * $.oc.confirm() + * $.wn.alert() + * $.wn.confirm() * * Dependences: * - Sweet Alert - * - Translations (october.lang.js) + * - Translations (winter.lang.js) */ (function($){ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - $.oc.alert = function alert(message) { + $.wn.alert = function alert(message) { swal({ title: message, confirmButtonClass: 'btn-primary' }) } - $.oc.confirm = function confirm(message, callback) { + $.wn.confirm = function confirm(message, callback) { swal({ title: message, @@ -42,7 +44,7 @@ $(window).on('ajaxErrorMessage', function(event, message){ if (!message) return - $.oc.alert(message) + $.wn.alert(message) // Prevent the default alert() message event.preventDefault() @@ -51,7 +53,7 @@ $(window).on('ajaxErrorMessage', function(event, message){ $(window).on('ajaxConfirmMessage', function(event, message){ if (!message) return - $.oc.confirm(message, function(isConfirm){ + $.wn.confirm(message, function(isConfirm){ isConfirm ? event.promise.resolve() : event.promise.reject() @@ -74,14 +76,14 @@ $(document).ready(function(){ window.sweetAlert = window.swal = function(message, callback) { if (typeof message === 'object') { // Do not override if texts are provided - message.confirmButtonText = message.confirmButtonText || $.oc.lang.get('alert.confirm_button_text') - message.cancelButtonText = message.cancelButtonText || $.oc.lang.get('alert.cancel_button_text') + message.confirmButtonText = message.confirmButtonText || $.wn.lang.get('alert.confirm_button_text') + message.cancelButtonText = message.cancelButtonText || $.wn.lang.get('alert.cancel_button_text') } else { message = { title: message, - confirmButtonText: $.oc.lang.get('alert.confirm_button_text'), - cancelButtonText: $.oc.lang.get('alert.cancel_button_text') + confirmButtonText: $.wn.lang.get('alert.confirm_button_text'), + cancelButtonText: $.wn.lang.get('alert.cancel_button_text') } } diff --git a/modules/backend/assets/js/october.datetime.js b/modules/backend/assets/js/winter.datetime.js similarity index 98% rename from modules/backend/assets/js/october.datetime.js rename to modules/backend/assets/js/winter.datetime.js index ae4299669..8bab57a33 100644 --- a/modules/backend/assets/js/october.datetime.js +++ b/modules/backend/assets/js/winter.datetime.js @@ -27,14 +27,14 @@ * */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var DateTimeConverter = function (element, options) { this.$el = $(element) this.options = options || {} - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } diff --git a/modules/backend/assets/js/october.filelist.js b/modules/backend/assets/js/winter.filelist.js similarity index 100% rename from modules/backend/assets/js/october.filelist.js rename to modules/backend/assets/js/winter.filelist.js diff --git a/modules/backend/assets/js/october.flyout.js b/modules/backend/assets/js/winter.flyout.js similarity index 98% rename from modules/backend/assets/js/october.flyout.js rename to modules/backend/assets/js/winter.flyout.js index 1d5c9b15a..e98701361 100644 --- a/modules/backend/assets/js/october.flyout.js +++ b/modules/backend/assets/js/winter.flyout.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype // SCROLLPAD CLASS DEFINITION @@ -188,7 +188,7 @@ var old = $.fn.flyout $.fn.flyout = function (option) { - var args = Array.prototype.slice.call(arguments, 1), + var args = Array.prototype.slice.call(arguments, 1), result = undefined this.each(function () { @@ -199,7 +199,7 @@ if (typeof option == 'string') result = data[option].apply(data, args) if (typeof result != 'undefined') return false }) - + return result ? result : this } diff --git a/modules/backend/assets/js/winter.js b/modules/backend/assets/js/winter.js new file mode 100644 index 000000000..f05a4bced --- /dev/null +++ b/modules/backend/assets/js/winter.js @@ -0,0 +1,35 @@ +/* + * This is a bundle file, you can compile this by running + * + * php artisan winter:util compile assets + * + * @see winter-min.js + * + +=require vendor/jquery.touchwipe.js +=require vendor/jquery.autoellipsis.js +=require vendor/jquery.waterfall.js +=require vendor/jquery.cookie.js +=require ../vendor/dropzone/dropzone.js +=require ../vendor/sweet-alert/sweet-alert.js +=require ../vendor/jcrop/js/jquery.Jcrop.js +=require ../../../system/assets/vendor/prettify/prettify.js +=require ../../widgets/mediamanager/assets/js/mediamanager-global.js + +=require winter.lang.js +=require winter.alert.js +=require winter.scrollpad.js +=require winter.verticalmenu.js +=require winter.navbar.js +=require winter.sidenav.js +=require winter.scrollbar.js +=require winter.filelist.js +=require winter.layout.js +=require winter.sidepaneltab.js +=require winter.simplelist.js +=require winter.treelist.js +=require winter.sidenav-tree.js +=require winter.datetime.js + +=require backend.js +*/ diff --git a/modules/backend/assets/js/october.lang.js b/modules/backend/assets/js/winter.lang.js similarity index 81% rename from modules/backend/assets/js/october.lang.js rename to modules/backend/assets/js/winter.lang.js index 92ed770e9..cefd1468e 100644 --- a/modules/backend/assets/js/october.lang.js +++ b/modules/backend/assets/js/winter.lang.js @@ -2,13 +2,15 @@ * Client side translations */ +if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn -if ($.oc.langMessages === undefined) - $.oc.langMessages = {} +if ($.wn.langMessages === undefined) + $.wn.langMessages = {} -$.oc.lang = (function(lang, messages) { +$.wn.lang = (function(lang, messages) { lang.load = function(locale) { if (messages[locale] === undefined) { @@ -47,4 +49,4 @@ $.oc.lang = (function(lang, messages) { return lang -})($.oc.lang || {}, $.oc.langMessages); \ No newline at end of file +})($.wn.lang || {}, $.wn.langMessages); \ No newline at end of file diff --git a/modules/backend/assets/js/october.layout.js b/modules/backend/assets/js/winter.layout.js similarity index 80% rename from modules/backend/assets/js/october.layout.js rename to modules/backend/assets/js/winter.layout.js index 3f0af1c8a..d2276c767 100644 --- a/modules/backend/assets/js/october.layout.js +++ b/modules/backend/assets/js/winter.layout.js @@ -1,9 +1,9 @@ (function($){ - var OctoberLayout = function() { + var WinterLayout = function() { this.$accountMenuOverlay = null } - OctoberLayout.prototype.setPageTitle = function(title) { + WinterLayout.prototype.setPageTitle = function(title) { var $title = $('title') if (this.pageTitleTemplate === undefined) @@ -12,7 +12,7 @@ $title.text(this.pageTitleTemplate.replace('%s', title)) } - OctoberLayout.prototype.updateLayout = function(title) { + WinterLayout.prototype.updateLayout = function(title) { var $children, $el, fixedWidth, margin $('[data-calculate-width]').each(function(){ @@ -38,7 +38,7 @@ }) } - OctoberLayout.prototype.toggleAccountMenu = function(el) { + WinterLayout.prototype.toggleAccountMenu = function(el) { var self = this, $el = $(el), $parent = $(el).parent(), @@ -65,20 +65,22 @@ } } + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - $.oc.layout = new OctoberLayout() + $.wn.layout = new WinterLayout() $(document).ready(function(){ - $.oc.layout.updateLayout() + $.wn.layout.updateLayout() - window.setTimeout($.oc.layout.updateLayout, 100) + window.setTimeout($.wn.layout.updateLayout, 100) }) $(window).on('resize', function() { - $.oc.layout.updateLayout() + $.wn.layout.updateLayout() }) $(window).on('oc.updateUi', function() { - $.oc.layout.updateLayout() + $.wn.layout.updateLayout() }) })(jQuery); \ No newline at end of file diff --git a/modules/backend/assets/js/october.navbar.js b/modules/backend/assets/js/winter.navbar.js similarity index 94% rename from modules/backend/assets/js/october.navbar.js rename to modules/backend/assets/js/winter.navbar.js index 25c9b7d50..37c1cde8f 100644 --- a/modules/backend/assets/js/october.navbar.js +++ b/modules/backend/assets/js/winter.navbar.js @@ -5,8 +5,8 @@ * - If the content doesn't fit the navbar, it can be dragged left and right. * * Dependences: - * - DragScroll (october.dragscroll.js) - * - VerticalMenu (october.verticalmenu.js) + * - DragScroll (winter.dragscroll.js) + * - VerticalMenu (winter.verticalmenu.js) */ (function($){ diff --git a/modules/backend/assets/js/october.scrollbar.js b/modules/backend/assets/js/winter.scrollbar.js similarity index 97% rename from modules/backend/assets/js/october.scrollbar.js rename to modules/backend/assets/js/winter.scrollbar.js index c99628ba6..39b6e116f 100644 --- a/modules/backend/assets/js/october.scrollbar.js +++ b/modules/backend/assets/js/winter.scrollbar.js @@ -1,20 +1,20 @@ /* - * Creates a scrollbar in a container. - * + * Creates a scrollbar in a container. + * * Note the element must have a height set for vertical, * and a width set for horizontal. - * + * * Data attributes: * - data-control="scrollbar" - enables the scrollbar plugin * * JavaScript API: * $('#area').scrollbar() * - * Dependences: + * Dependences: * - Mouse Wheel plugin (mousewheel.js) */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var Scrollbar = function (element, options) { @@ -33,7 +33,7 @@ dragStart = 0, startOffset = 0; - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) @@ -199,7 +199,7 @@ self.endScrollTimeout = undefined } - self.endScrollTimeout = setTimeout(function() { + self.endScrollTimeout = setTimeout(function() { $el.trigger('oc.scrollEnd') self.endScrollTimeout = undefined }, 50) @@ -315,8 +315,8 @@ offset = 0, animated = false, params = { - duration: 300, - queue: false, + duration: 300, + queue: false, complete: function(){ if (callback !== undefined) callback() diff --git a/modules/backend/assets/js/october.scrollpad.js b/modules/backend/assets/js/winter.scrollpad.js similarity index 92% rename from modules/backend/assets/js/october.scrollpad.js rename to modules/backend/assets/js/winter.scrollpad.js index 8e2be6293..3935f2453 100644 --- a/modules/backend/assets/js/october.scrollpad.js +++ b/modules/backend/assets/js/winter.scrollpad.js @@ -1,13 +1,13 @@ /* * ScrollPad plugin. * - * This plugin creates a scrollable area with features similar (but more limited) - * to october.scrollbar.js, with virtual scroll bars. This plugin is more lightweight + * This plugin creates a scrollable area with features similar (but more limited) + * to winter.scrollbar.js, with virtual scroll bars. This plugin is more lightweight * in terms of calculations and more responsive. It doesn't use scripting for scrolling, - * instead it uses the native scrolling and listens for the onscroll event to update + * instead it uses the native scrolling and listens for the onscroll event to update * the virtual scroll bars. * - * The plugin is partially based on Trackpad Scroll Emulator + * The plugin is partially based on Trackpad Scroll Emulator * https://github.com/jnicol/trackpad-scroll-emulator, cleaned up for the better CPU and * memory (DOM references) management. * @@ -15,12 +15,12 @@ *
*
*
- * The content goes here. The two wrapping + * The content goes here. The two wrapping * DIV elements are required. *
*
*
- * + * * Data attributes: * - data-control="scrollpad" - enables the plugin. * - data-direction="vertical|horizontal" - sets the scrolling direction. @@ -38,7 +38,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype // SCROLLPAD CLASS DEFINITION @@ -63,7 +63,7 @@ this.init() - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) } Scrollpad.prototype = Object.create(BaseProto) @@ -157,7 +157,7 @@ document.body.removeChild(testerElement) - // Some magic for FireFox, see + // Some magic for FireFox, see // https://github.com/jnicol/trackpad-scroll-emulator/blob/master/jquery.trackpad-scroll-emulator.js if (width === innerWidth && navigator.userAgent.toLowerCase().indexOf('firefox') > -1) return this.scrollbarSize = 17 @@ -221,15 +221,15 @@ if (this.updateScrollbarTimer !== null) return - this.updateScrollbarTimer = setTimeout(this.proxy(this.displayScrollbar), 10) + this.updateScrollbarTimer = setTimeout(this.proxy(this.displayScrollbar), 10) } Scrollpad.prototype.onStartDrag = function(ev) { - $.oc.foundation.event.stop(ev) - - var pageCoords = $.oc.foundation.event.pageCoordinates(ev), + $.wn.foundation.event.stop(ev) + + var pageCoords = $.wn.foundation.event.pageCoordinates(ev), eventOffset = this.options.direction == 'vertical' ? pageCoords.y : pageCoords.x, - handleCoords = $.oc.foundation.element.absolutePosition(this.dragHandleElement), + handleCoords = $.wn.foundation.element.absolutePosition(this.dragHandleElement), handleOffset = this.options.direction == 'vertical' ? handleCoords.top : handleCoords.left this.dragOffset = eventOffset - handleOffset @@ -239,15 +239,15 @@ } Scrollpad.prototype.onMouseMove = function(ev) { - $.oc.foundation.event.stop(ev) + $.wn.foundation.event.stop(ev) var eventCoordsAttr = this.options.direction == 'vertical' ? 'y' : 'x', elementCoordsAttr = this.options.direction == 'vertical' ? 'top' : 'left', offsetAttr = this.options.direction == 'vertical' ? 'offsetHeight' : 'offsetWidth', scrollAttr = this.options.direction == 'vertical' ? 'scrollTop' : 'scrollLeft' - var eventOffset = $.oc.foundation.event.pageCoordinates(ev)[eventCoordsAttr], - scrollbarOffset = $.oc.foundation.element.absolutePosition(this.scrollbarElement)[elementCoordsAttr], + var eventOffset = $.wn.foundation.event.pageCoordinates(ev)[eventCoordsAttr], + scrollbarOffset = $.wn.foundation.element.absolutePosition(this.scrollbarElement)[elementCoordsAttr], dragPos = eventOffset - scrollbarOffset - this.dragOffset, scrollbarSize = this.scrollbarElement[offsetAttr], contentSize = this.contentElement[offsetAttr], @@ -260,7 +260,7 @@ this.scrollContentElement[scrollAttr] = scrollPos } - + Scrollpad.prototype.onEndDrag = function(ev) { document.removeEventListener('mousemove', this.proxy(this.onMouseMove)) document.removeEventListener('mouseup', this.proxy(this.onEndDrag)) @@ -276,7 +276,7 @@ var old = $.fn.scrollpad $.fn.scrollpad = function (option) { - var args = Array.prototype.slice.call(arguments, 1), + var args = Array.prototype.slice.call(arguments, 1), result = undefined this.each(function () { @@ -287,7 +287,7 @@ if (typeof option == 'string') result = data[option].apply(data, args) if (typeof result != 'undefined') return false }) - + return result ? result : this } diff --git a/modules/backend/assets/js/october.sidenav-tree.js b/modules/backend/assets/js/winter.sidenav-tree.js similarity index 100% rename from modules/backend/assets/js/october.sidenav-tree.js rename to modules/backend/assets/js/winter.sidenav-tree.js diff --git a/modules/backend/assets/js/october.sidenav.js b/modules/backend/assets/js/winter.sidenav.js similarity index 90% rename from modules/backend/assets/js/october.sidenav.js rename to modules/backend/assets/js/winter.sidenav.js index 292caab93..714305902 100644 --- a/modules/backend/assets/js/october.sidenav.js +++ b/modules/backend/assets/js/winter.sidenav.js @@ -1,22 +1,24 @@ /* * Side Navigation - * + * * Data attributes: * - data-control="sidenav" - enables the side navigation plugin * * JavaScript API: * $('#nav').sideNav() - * $.oc.sideNav.setCounter('cms/partials', 5); - sets the counter value for a particular menu item - * $.oc.sideNav.increaseCounter('cms/partials', 5); - increases the counter value for a particular menu item - * $.oc.sideNav.dropCounter('cms/partials'); - drops the counter value for a particular menu item + * $.wn.sideNav.setCounter('cms/partials', 5); - sets the counter value for a particular menu item + * $.wn.sideNav.increaseCounter('cms/partials', 5); - increases the counter value for a particular menu item + * $.wn.sideNav.dropCounter('cms/partials'); - drops the counter value for a particular menu item * - * Dependences: - * - Drag Scroll (october.dragscroll.js) + * Dependences: + * - Drag Scroll (winter.dragscroll.js) */ +function ($) { "use strict"; + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn // SIDENAV CLASS DEFINITION // ============================ @@ -113,8 +115,8 @@ if (typeof option == 'string') result = data[option].apply(data, args) if (typeof result != 'undefined') return false - if ($.oc.sideNav === undefined) - $.oc.sideNav = data + if ($.wn.sideNav === undefined) + $.wn.sideNav = data }) return result ? result : this diff --git a/modules/backend/assets/js/october.sidepaneltab.js b/modules/backend/assets/js/winter.sidepaneltab.js similarity index 97% rename from modules/backend/assets/js/october.sidepaneltab.js rename to modules/backend/assets/js/winter.sidepaneltab.js index 2a5eba766..319127143 100644 --- a/modules/backend/assets/js/october.sidepaneltab.js +++ b/modules/backend/assets/js/winter.sidepaneltab.js @@ -115,8 +115,8 @@ this.visibleItemId = menuItemId - if ($.oc.sideNav !== undefined) { - $.oc.sideNav.setActiveItem(menuItemId) + if ($.wn.sideNav !== undefined) { + $.wn.sideNav.setActiveItem(menuItemId) } this.$sidePanelItems.each(function() { @@ -166,15 +166,15 @@ } SidePanelTab.prototype.updateActiveTab = function() { - if ($.oc.sideNav === undefined) { + if ($.wn.sideNav === undefined) { return } if (!this.panelVisible && ($(window).width() < this.options.breakpoint || !this.panelFixed())) { - $.oc.sideNav.unsetActiveItem() + $.wn.sideNav.unsetActiveItem() } else { - $.oc.sideNav.setActiveItem(this.visibleItemId) + $.wn.sideNav.setActiveItem(this.visibleItemId) } } diff --git a/modules/backend/assets/js/october.simplelist.js b/modules/backend/assets/js/winter.simplelist.js similarity index 100% rename from modules/backend/assets/js/october.simplelist.js rename to modules/backend/assets/js/winter.simplelist.js diff --git a/modules/backend/assets/js/october.tabformexpandcontrols.js b/modules/backend/assets/js/winter.tabformexpandcontrols.js similarity index 97% rename from modules/backend/assets/js/october.tabformexpandcontrols.js rename to modules/backend/assets/js/winter.tabformexpandcontrols.js index 499886966..f1195f0c2 100644 --- a/modules/backend/assets/js/october.tabformexpandcontrols.js +++ b/modules/backend/assets/js/winter.tabformexpandcontrols.js @@ -1,11 +1,11 @@ /* - * Extends the fancy tabs layout with expand controls in the tab - * form sections. See main Builder page for example. + * Extends the fancy tabs layout with expand controls in the tab + * form sections. See main Builder page for example. * TODO: A similar layout is used in the CMS, Pages and Builder areas, * but only Builder uses this class. */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var TabFormExpandControls = function ($tabsControlElement, options) { @@ -159,5 +159,5 @@ onInitTab: null } - $.oc.tabFormExpandControls = TabFormExpandControls + $.wn.tabFormExpandControls = TabFormExpandControls }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/assets/js/october.treelist.js b/modules/backend/assets/js/winter.treelist.js similarity index 96% rename from modules/backend/assets/js/october.treelist.js rename to modules/backend/assets/js/winter.treelist.js index c0aaa5043..10290ac0a 100644 --- a/modules/backend/assets/js/october.treelist.js +++ b/modules/backend/assets/js/winter.treelist.js @@ -5,15 +5,15 @@ * - handle - class name to use as a handle * - nested - set to false if sorting should be kept within each OL container, if using * a handle it should be focused enough to exclude nested handles. - * + * * Events: * - move.oc.treelist - triggered when a node on the tree is moved. - * + * * Dependences: - * - Sortable Plugin (october.sortable.js) + * - Sortable Plugin (winter.sortable.js) */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var TreeListWidget = function (element, options) { @@ -22,7 +22,7 @@ Base.call(this) - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) this.init() } @@ -125,7 +125,7 @@ // TREELIST WIDGET DATA-API // ============== - + $(document).render(function(){ $('[data-control="treelist"]').treeListWidget(); }) diff --git a/modules/backend/assets/js/october.treeview.js b/modules/backend/assets/js/winter.treeview.js similarity index 98% rename from modules/backend/assets/js/october.treeview.js rename to modules/backend/assets/js/winter.treeview.js index f443429c1..f2cef65bb 100644 --- a/modules/backend/assets/js/october.treeview.js +++ b/modules/backend/assets/js/winter.treeview.js @@ -9,11 +9,11 @@ * - open.oc.treeview - this event is triggered on the list element when an item is clicked. * * Dependences: - * - Tree list (october.treelist.js) + * - Tree list (winter.treelist.js) * */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var TreeView = function (element, options) { @@ -24,7 +24,7 @@ Base.call(this) - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) this.init() } diff --git a/modules/backend/assets/js/october.verticalmenu.js b/modules/backend/assets/js/winter.verticalmenu.js similarity index 98% rename from modules/backend/assets/js/october.verticalmenu.js rename to modules/backend/assets/js/winter.verticalmenu.js index 79ecc2892..442ac552a 100644 --- a/modules/backend/assets/js/october.verticalmenu.js +++ b/modules/backend/assets/js/winter.verticalmenu.js @@ -1,11 +1,11 @@ /* - * Creates a vertical responsive menu. + * Creates a vertical responsive menu. * * JavaScript API: * $('#menu').verticalMenu() * - * Dependences: - * - Drag Scroll (october.dragscroll.js) + * Dependences: + * - Drag Scroll (winter.dragscroll.js) */ +function ($) { "use strict"; diff --git a/modules/backend/assets/less/controls/common.less b/modules/backend/assets/less/controls/common.less index 542c6e3a6..2c8ac6592 100644 --- a/modules/backend/assets/less/controls/common.less +++ b/modules/backend/assets/less/controls/common.less @@ -3,7 +3,7 @@ // -------------------------------------------------- // -// The scroll panel can host a scrollbar control. It has a right border that covers +// The scroll panel can host a scrollbar control. It has a right border that covers // the scrollbar to satisfy the design requirements. // .control-scrollpanel { @@ -30,26 +30,26 @@ // Logos // -.oc-logo-white { - background-image: url(../images/october-logo-white.svg); +.wn-logo-white, .oc-logo-white { + background-image: url(../images/winter-logo-white.svg); background-position: 50% 50%; background-repeat: no-repeat; background-size: contain; } -.oc-logo { - background-image: url(../images/october-logo.svg); +.wn-logo, .oc-logo { + background-image: url(../images/winter-logo.svg); background-position: 50% 50%; background-repeat: no-repeat; background-size: contain; } -.layout.control-tabs.oc-logo-transparent:not(.has-tabs), -.flex-layout-column.oc-logo-transparent:not(.has-tabs), -.layout-cell.oc-logo-transparent { +.layout.control-tabs.wn-logo-transparent:not(.has-tabs), .layout.control-tabs.oc-logo-transparent:not(.has-tabs), +.flex-layout-column.wn-logo-transparent:not(.has-tabs), .flex-layout-column.oc-logo-transparent:not(.has-tabs), +.layout-cell.wn-logo-transparent, .layout-cell.oc-logo-transparent { background-size: 50% auto; background-repeat: no-repeat; - background-image: url(../images/october-logo.svg); + background-image: url(../images/winter-logo.svg); background-position: 50% 50%; position: relative; diff --git a/modules/backend/assets/less/controls/simplelist.less b/modules/backend/assets/less/controls/simplelist.less index 919ff4958..355ff28a3 100644 --- a/modules/backend/assets/less/controls/simplelist.less +++ b/modules/backend/assets/less/controls/simplelist.less @@ -11,7 +11,7 @@ // With icons (no bullets): //
//
    -//
  • Hello friend
    • +//
  • Hello friend
    • //
//
// diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less index 37a258761..c9af9d7d8 100644 --- a/modules/backend/assets/less/layout/fancylayout.less +++ b/modules/backend/assets/less/layout/fancylayout.less @@ -619,6 +619,8 @@ body.breadcrumb-fancy .control-breadcrumb, margin-right: 0; } + &[class^="wn-icon-"], + &[class*=" wn-icon-"], &[class^="oc-icon-"], &[class*=" oc-icon-"] { &:before { @@ -628,7 +630,8 @@ body.breadcrumb-fancy .control-breadcrumb, } } - form.oc-data-changed { + form.oc-data-changed, + form.wn-data-changed { .btn.save { .opacity(1); } diff --git a/modules/backend/assets/less/layout/outerlayout.less b/modules/backend/assets/less/layout/outerlayout.less index 1fd47da2f..34aa5132a 100644 --- a/modules/backend/assets/less/layout/outerlayout.less +++ b/modules/backend/assets/less/layout/outerlayout.less @@ -26,6 +26,7 @@ body.outer { margin-left: -28px; } + h1.wn-logo, h1.oc-logo { .hide-text(); display: inline-block; diff --git a/modules/backend/assets/less/october.less b/modules/backend/assets/less/winter.less similarity index 100% rename from modules/backend/assets/less/october.less rename to modules/backend/assets/less/winter.less diff --git a/modules/backend/assets/vendor/dropzone/dropzone.js b/modules/backend/assets/vendor/dropzone/dropzone.js index 476c0550d..702fd10d6 100644 --- a/modules/backend/assets/vendor/dropzone/dropzone.js +++ b/modules/backend/assets/vendor/dropzone/dropzone.js @@ -1,5 +1,5 @@ /** - * DropZone V5.5.1 (non-minified) for testing on October CMS + * DropZone V5.5.1 (non-minified) for testing on Winter CMS */ "use strict"; diff --git a/modules/backend/assets/vendor/jcrop/OCTOBER-README.md b/modules/backend/assets/vendor/jcrop/WINTER-README.md similarity index 100% rename from modules/backend/assets/vendor/jcrop/OCTOBER-README.md rename to modules/backend/assets/vendor/jcrop/WINTER-README.md diff --git a/modules/backend/assets/vendor/jcrop/js/jquery.Jcrop.js b/modules/backend/assets/vendor/jcrop/js/jquery.Jcrop.js index feed10e92..eabc21257 100755 --- a/modules/backend/assets/vendor/jcrop/js/jquery.Jcrop.js +++ b/modules/backend/assets/vendor/jcrop/js/jquery.Jcrop.js @@ -1,6 +1,6 @@ /** * jquery.Jcrop.js v0.9.12 - * jQuery Image Cropping Plugin - released under MIT License + * jQuery Image Cropping Plugin - released under MIT License * Author: Kelly Hallman * http://github.com/tapmodo/Jcrop * Copyright (c) 2008-2013 Tapmodo Interactive LLC {{{ @@ -171,7 +171,7 @@ if ((ord === 'move') && !options.allowMove) { return false; } - + // Fix position of crop area when dragged the very first time. // Necessary when crop image is in a hidden element when page is loaded. docOffset = getPos($img); @@ -304,12 +304,12 @@ $origimg.width($origimg[0].width); $origimg.height($origimg[0].height); } else { - // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). + // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). var tempImage = new Image(); tempImage.src = $origimg[0].src; $origimg.width(tempImage.width); $origimg.height(tempImage.height); - } + } var $img = $origimg.clone().removeAttr('id').css(img_css).show(); @@ -327,8 +327,8 @@ var boundx = $img.width(), boundy = $img.height(), - - + + $div = $('
').width(boundx).height(boundy).addClass(cssClass('holder')).css({ position: 'relative', backgroundColor: options.bgColor @@ -340,24 +340,24 @@ var $img2 = $('
'), - $img_holder = $('
') + $img_holder = $('
') .width('100%').height('100%').css({ zIndex: 310, position: 'absolute', overflow: 'hidden' }), - $hdl_holder = $('
') - .width('100%').height('100%').css('zIndex', 320), + $hdl_holder = $('
') + .width('100%').height('100%').css('zIndex', 320), - $sel = $('
') + $sel = $('
') .css({ position: 'absolute', zIndex: 600 }).dblclick(function(){ var c = Coords.getFixed(); options.onDblClick.call(api,c); - }).insertBefore($img).append($img_holder, $hdl_holder); + }).insertBefore($img).append($img_holder, $hdl_holder); if (img_mode) { @@ -393,7 +393,7 @@ // }}} // }}} // Internal Modules {{{ - // Touch Module {{{ + // Touch Module {{{ var Touch = (function () { // Touch support detection function adapted (under MIT License) // from code by Jeffrey Sambells - http://github.com/iamamused/ @@ -533,8 +533,8 @@ // This function could use some optimization I think... var aspect = options.aspectRatio, min_x = options.minSize[0] / xscale, - - + + //min_y = options.minSize[1]/yscale, max_x = options.maxSize[0] / xscale, max_y = options.maxSize[1] / yscale, @@ -1050,7 +1050,7 @@ { seehandles = false; $hdl_holder.hide(); - } + } //}}} function animMode(v) //{{{ { @@ -1061,13 +1061,13 @@ animating = false; enableHandles(); } - } + } //}}} function done() //{{{ { animMode(false); refresh(); - } + } //}}} // Insert draggable elements {{{ // Insert border divs for outline @@ -1084,7 +1084,7 @@ //}}} // This is a hack for iOS5 to support drag/move touch functionality - // Hack OctoberCMS - the event handler was moved to the Touch module. + // Hack Winter CMS - the event handler was moved to the Touch module. // The closure used before was handling a reference to the target object, // preventing it from removing from DOM after the control is destroyed. $(document).bind('touchstart.jcrop-ios', Touch.fixTouchSupport); @@ -1124,7 +1124,7 @@ done: done }; }()); - + //}}} // Tracker Module {{{ var Tracker = (function () { @@ -1147,7 +1147,7 @@ $(document) .bind('mousemove.jcrop',trackMove) .bind('mouseup.jcrop',trackUp); - } + } //}}} function toBack() //{{{ { @@ -1155,13 +1155,13 @@ zIndex: 290 }); $(document).unbind('.jcrop'); - } + } //}}} function trackMove(e) //{{{ { onMove(mouseAbs(e)); return false; - } + } //}}} function trackUp(e) //{{{ { diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php index 01bef3b0c..2d0b04d71 100644 --- a/modules/backend/behaviors/FormController.php +++ b/modules/backend/behaviors/FormController.php @@ -8,7 +8,7 @@ use Event; use Redirect; use Backend; use Backend\Classes\ControllerBehavior; -use October\Rain\Router\Helper as RouterHelper; +use Winter\Storm\Router\Helper as RouterHelper; use ApplicationException; use Exception; @@ -33,8 +33,8 @@ use Exception; * values as either a YAML file, located in the controller view directory, * or directly as a PHP array. * - * @see http://octobercms.com/docs/backend/forms Back-end form documentation - * @package october\backend + * @see http://wintercms.com/docs/backend/forms Back-end form documentation + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class FormController extends ControllerBehavior @@ -89,7 +89,7 @@ class FormController extends ControllerBehavior protected $context; /** - * @var \October\Rain\Database\Model|\October\Rain\Halcyon\Model The initialized model used by the form. + * @var \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model The initialized model used by the form. */ protected $model; @@ -116,7 +116,7 @@ class FormController extends ControllerBehavior * to this behavior via this method as the first argument. * * @see \Backend\Widgets\Form - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model $model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model $model * @param string $context Form context * @return void */ @@ -186,7 +186,7 @@ class FormController extends ControllerBehavior /** * Prepares commonly used view data. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model $model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model $model */ protected function prepareVars($model) { @@ -303,7 +303,7 @@ class FormController extends ControllerBehavior * @param int $recordId Record identifier * @param string $context Form context * @return \Illuminate\Http\RedirectResponse|void - * @throws \October\Rain\Exception\ApplicationException if the provided recordId is not found + * @throws \Winter\Storm\Exception\ApplicationException if the provided recordId is not found */ public function update_onSave($recordId = null, $context = null) { @@ -340,7 +340,7 @@ class FormController extends ControllerBehavior * * @param int $recordId Record identifier * @return \Illuminate\Http\RedirectResponse|void - * @throws \October\Rain\Exception\ApplicationException if the provided recordId is not found + * @throws \Winter\Storm\Exception\ApplicationException if the provided recordId is not found * @throws Exception if there is no primary key on the model */ public function update_onDelete($recordId = null) @@ -408,7 +408,7 @@ class FormController extends ControllerBehavior * @see \Backend\Widgets\Form * @param array $options Render options * @return string Rendered HTML for the form. - * @throws \October\Rain\Exception\ApplicationException if the Form Widget isn't set + * @throws \Winter\Storm\Exception\ApplicationException if the Form Widget isn't set */ public function formRender($options = []) { @@ -424,7 +424,7 @@ class FormController extends ControllerBehavior * The model will be provided by one of the page actions or AJAX * handlers via the `initForm` method. * - * @return \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @return \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formGetModel() { @@ -446,7 +446,7 @@ class FormController extends ControllerBehavior /** * Internal method used to prepare the form model object. * - * @return \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @return \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ protected function createModel() { @@ -459,7 +459,7 @@ class FormController extends ControllerBehavior * the model primary key. * * @param string $context Redirect context, eg: create, update, delete - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model $model The active model to parse in it's ID and attributes. + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model $model The active model to parse in it's ID and attributes. * @return \Illuminate\Http\RedirectResponse */ public function makeRedirect($context = null, $model = null) @@ -562,7 +562,7 @@ class FormController extends ControllerBehavior * formRenderPreview() ?> * * @return string The form HTML markup. - * @throws \October\Rain\Exception\ApplicationException if the Form Widget isn't set + * @throws \Winter\Storm\Exception\ApplicationException if the Form Widget isn't set */ public function formRenderPreview() { @@ -591,7 +591,7 @@ class FormController extends ControllerBehavior * formRenderOutsideFields() ?> * * @return string HTML markup - * @throws \October\Rain\Exception\ApplicationException if the Form Widget isn't set + * @throws \Winter\Storm\Exception\ApplicationException if the Form Widget isn't set */ public function formRenderOutsideFields() { @@ -620,7 +620,7 @@ class FormController extends ControllerBehavior * formRenderPrimaryTabs() ?> * * @return string HTML markup - * @throws \October\Rain\Exception\ApplicationException if the Form Widget isn't set + * @throws \Winter\Storm\Exception\ApplicationException if the Form Widget isn't set */ public function formRenderPrimaryTabs() { @@ -701,7 +701,7 @@ class FormController extends ControllerBehavior /** * Called before the creation or updating form is saved. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formBeforeSave($model) { @@ -709,7 +709,7 @@ class FormController extends ControllerBehavior /** * Called after the creation or updating form is saved. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formAfterSave($model) { @@ -717,7 +717,7 @@ class FormController extends ControllerBehavior /** * Called before the creation form is saved. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formBeforeCreate($model) { @@ -725,7 +725,7 @@ class FormController extends ControllerBehavior /** * Called after the creation form is saved. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formAfterCreate($model) { @@ -733,7 +733,7 @@ class FormController extends ControllerBehavior /** * Called before the updating form is saved. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formBeforeUpdate($model) { @@ -741,7 +741,7 @@ class FormController extends ControllerBehavior /** * Called after the updating form is saved. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formAfterUpdate($model) { @@ -749,7 +749,7 @@ class FormController extends ControllerBehavior /** * Called after the form model is deleted. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formAfterDelete($model) { @@ -759,8 +759,8 @@ class FormController extends ControllerBehavior * Finds a Model record by its primary identifier, used by update actions. This logic * can be changed by overriding it in the controller. * @param string $recordId - * @return \October\Rain\Database\Model|\October\Rain\Halcyon\Model - * @throws \October\Rain\Exception\ApplicationException if the provided recordId is not found + * @return \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model + * @throws \Winter\Storm\Exception\ApplicationException if the provided recordId is not found */ public function formFindModelObject($recordId) { @@ -791,7 +791,7 @@ class FormController extends ControllerBehavior /** * Creates a new instance of a form model. This logic can be changed * by overriding it in the controller. - * @return \October\Rain\Database\Model|\October\Rain\Halcyon\Model + * @return \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model */ public function formCreateModelObject() { @@ -850,8 +850,8 @@ class FormController extends ControllerBehavior /** * Extend supplied model used by create and update actions, the model can * be altered by overriding it in the controller. - * @param \October\Rain\Database\Model|\October\Rain\Halcyon\Model $model - * @return \October\Rain\Database\Model|\October\Rain\Halcyon\Model|void + * @param \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model $model + * @return \Winter\Storm\Database\Model|\Winter\Storm\Halcyon\Model|void */ public function formExtendModel($model) { @@ -860,7 +860,7 @@ class FormController extends ControllerBehavior /** * Extend the query used for finding the form model. Extra conditions * can be applied to the query, for example, $query->withTrashed(); - * @param \October\Rain\Database\Builder|\October\Rain\Halcyon\Builder $query + * @param \Winter\Storm\Database\Builder|\Winter\Storm\Halcyon\Builder $query * @return void */ public function formExtendQuery($query) diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php index 0af1497ac..7419d7a85 100644 --- a/modules/backend/behaviors/ImportExportController.php +++ b/modules/backend/behaviors/ImportExportController.php @@ -31,7 +31,7 @@ use Exception; * values as either a YAML file, located in the controller view directory, * or directly as a PHP array. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class ImportExportController extends ControllerBehavior @@ -149,7 +149,7 @@ class ImportExportController extends ControllerBehavior return $response; } - $this->addJs('js/october.import.js', 'core'); + $this->addJs('js/winter.import.js', 'core'); $this->addCss('css/import.css', 'core'); $this->controller->pageTitle = $this->controller->pageTitle @@ -168,7 +168,7 @@ class ImportExportController extends ControllerBehavior return $response; } - $this->addJs('js/october.export.js', 'core'); + $this->addJs('js/winter.export.js', 'core'); $this->addCss('css/export.css', 'core'); $this->controller->pageTitle = $this->controller->pageTitle diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php index 903fb71fd..936bd0045 100644 --- a/modules/backend/behaviors/ListController.php +++ b/modules/backend/behaviors/ListController.php @@ -21,7 +21,7 @@ use Backend\Classes\ControllerBehavior; * values as either a YAML file, located in the controller view directory, * or directly as a PHP array. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class ListController extends ControllerBehavior @@ -290,7 +290,7 @@ class ListController extends ControllerBehavior /** * Bulk delete records. * @return void - * @throws \October\Rain\Exception\ApplicationException when the parent definition is missing. + * @throws \Winter\Storm\Exception\ApplicationException when the parent definition is missing. */ public function index_onDelete() { @@ -370,7 +370,7 @@ class ListController extends ControllerBehavior * Renders the widget collection. * @param string $definition Optional list definition. * @return string Rendered HTML for the list. - * @throws \October\Rain\Exception\ApplicationException when there are no list widgets set. + * @throws \Winter\Storm\Exception\ApplicationException when there are no list widgets set. */ public function listRender($definition = null) { @@ -491,9 +491,9 @@ class ListController extends ControllerBehavior /** * Controller override: Extend supplied model - * @param \October\Rain\Database\Model $model + * @param \Winter\Storm\Database\Model $model * @param string|null $definition - * @return \October\Rain\Database\Model + * @return \Winter\Storm\Database\Model */ public function listExtendModel($model, $definition = null) { @@ -503,7 +503,7 @@ class ListController extends ControllerBehavior /** * Controller override: Extend the query used for populating the list * before the default query is processed. - * @param \October\Rain\Database\Builder $query + * @param \Winter\Storm\Database\Builder $query * @param string|null $definition */ public function listExtendQueryBefore($query, $definition = null) @@ -513,7 +513,7 @@ class ListController extends ControllerBehavior /** * Controller override: Extend the query used for populating the list * after the default query is processed. - * @param \October\Rain\Database\Builder $query + * @param \Winter\Storm\Database\Builder $query * @param string|null $definition */ public function listExtendQuery($query, $definition = null) @@ -533,7 +533,7 @@ class ListController extends ControllerBehavior /** * Controller override: Extend the query used for populating the filter * options before the default query is processed. - * @param \October\Rain\Database\Builder $query + * @param \Winter\Storm\Database\Builder $query * @param array $scope */ public function listFilterExtendQuery($query, $scope) @@ -542,7 +542,7 @@ class ListController extends ControllerBehavior /** * Returns a CSS class name for a list row (). - * @param \October\Rain\Database\Model $record The populated model used for the column + * @param \Winter\Storm\Database\Model $record The populated model used for the column * @param string|null $definition List definition (optional) * @return string|void CSS class name */ @@ -552,7 +552,7 @@ class ListController extends ControllerBehavior /** * Replace a table column value (...) - * @param \October\Rain\Database\Model $record The populated model used for the column + * @param \Winter\Storm\Database\Model $record The populated model used for the column * @param string $columnName The column name to override * @param string|null $definition List definition (optional) * @return string|void HTML view diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php index 88ef54ff4..f17b6d759 100644 --- a/modules/backend/behaviors/RelationController.php +++ b/modules/backend/behaviors/RelationController.php @@ -5,7 +5,7 @@ use Lang; use Request; use Form as FormHelper; use Backend\Classes\ControllerBehavior; -use October\Rain\Database\Model; +use Winter\Storm\Database\Model; use ApplicationException; /** @@ -23,7 +23,7 @@ use ApplicationException; * values as either a YAML file, located in the controller view directory, * or directly as a PHP array. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class RelationController extends ControllerBehavior @@ -223,7 +223,7 @@ class RelationController extends ControllerBehavior { parent::__construct($controller); - $this->addJs('js/october.relation.js', 'core'); + $this->addJs('js/winter.relation.js', 'core'); $this->addCss('css/relation.css', 'core'); /* @@ -824,18 +824,18 @@ class RelationController extends ControllerBehavior if ($this->viewMode == 'single') { $config->showCheckboxes = false; $config->recordOnClick = sprintf( - "$.oc.relationBehavior.clickManageListRecord(':%s', '%s', '%s')", + "$.wn.relationBehavior.clickManageListRecord(':%s', '%s', '%s')", $this->relationModel->getKeyName(), $this->relationGetId(), $this->relationGetSessionKey() ); } elseif ($config->showCheckboxes) { - $config->recordOnClick = "$.oc.relationBehavior.toggleListCheckbox(this)"; + $config->recordOnClick = "$.wn.relationBehavior.toggleListCheckbox(this)"; } elseif ($isPivot) { $config->recordOnClick = sprintf( - "$.oc.relationBehavior.clickManagePivotListRecord(':%s', '%s', '%s')", + "$.wn.relationBehavior.clickManagePivotListRecord(':%s', '%s', '%s')", $this->relationModel->getKeyName(), $this->relationGetId(), $this->relationGetSessionKey() @@ -1416,7 +1416,7 @@ class RelationController extends ControllerBehavior * Provides an opportunity to manipulate the field configuration. * @param object $config * @param string $field - * @param \October\Rain\Database\Model $model + * @param \Winter\Storm\Database\Model $model */ public function relationExtendConfig($config, $field, $model) { @@ -1426,7 +1426,7 @@ class RelationController extends ControllerBehavior * Provides an opportunity to manipulate the view widget. * @param Backend\Classes\WidgetBase $widget * @param string $field - * @param \October\Rain\Database\Model $model + * @param \Winter\Storm\Database\Model $model */ public function relationExtendViewWidget($widget, $field, $model) { @@ -1436,7 +1436,7 @@ class RelationController extends ControllerBehavior * Provides an opportunity to manipulate the manage widget. * @param Backend\Classes\WidgetBase $widget * @param string $field - * @param \October\Rain\Database\Model $model + * @param \Winter\Storm\Database\Model $model */ public function relationExtendManageWidget($widget, $field, $model) { @@ -1446,7 +1446,7 @@ class RelationController extends ControllerBehavior * Provides an opportunity to manipulate the pivot widget. * @param Backend\Classes\WidgetBase $widget * @param string $field - * @param \October\Rain\Database\Model $model + * @param \Winter\Storm\Database\Model $model */ public function relationExtendPivotWidget($widget, $field, $model) { @@ -1456,7 +1456,7 @@ class RelationController extends ControllerBehavior * Provides an opportunity to manipulate the manage filter widget. * @param \Backend\Widgets\Filter $widget * @param string $field - * @param \October\Rain\Database\Model $model + * @param \Winter\Storm\Database\Model $model */ public function relationExtendManageFilterWidget($widget, $field, $model) { @@ -1466,7 +1466,7 @@ class RelationController extends ControllerBehavior * Provides an opportunity to manipulate the view filter widget. * @param \Backend\Widgets\Filter $widget * @param string $field - * @param \October\Rain\Database\Model $model + * @param \Winter\Storm\Database\Model $model */ public function relationExtendViewFilterWidget($widget, $field, $model) { diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php index 4b9681972..35e31cf71 100644 --- a/modules/backend/behaviors/ReorderController.php +++ b/modules/backend/behaviors/ReorderController.php @@ -20,7 +20,7 @@ use Backend\Classes\ControllerBehavior; * values as either a YAML file, located in the controller view directory, * or directly as a PHP array. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class ReorderController extends ControllerBehavior @@ -57,8 +57,8 @@ class ReorderController extends ControllerBehavior /** * @var string Reordering mode: - * - simple: October\Rain\Database\Traits\Sortable - * - nested: October\Rain\Database\Traits\NestedTree + * - simple: Winter\Storm\Database\Traits\Sortable + * - nested: Winter\Storm\Database\Traits\NestedTree */ protected $sortMode; @@ -99,7 +99,7 @@ class ReorderController extends ControllerBehavior public function reorder() { - $this->addJs('js/october.reorder.js', 'core'); + $this->addJs('js/winter.reorder.js', 'core'); $this->controller->pageTitle = $this->controller->pageTitle ?: Lang::get($this->getConfig('title', 'backend::lang.reorder.default_title')); @@ -259,7 +259,7 @@ class ReorderController extends ControllerBehavior /** * Extend the query used for finding reorder records. Extra conditions * can be applied to the query, for example, $query->withTrashed(); - * @param October\Rain\Database\Builder $query + * @param Winter\Storm\Database\Builder $query * @return void */ public function reorderExtendQuery($query) diff --git a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php index 93f99c1ae..bc683d600 100644 --- a/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php +++ b/modules/backend/behaviors/importexportcontroller/TranscodeFilter.php @@ -11,7 +11,7 @@ stream_filter_register(TranscodeFilter::FILTER_NAME . "*", TranscodeFilter::clas */ class TranscodeFilter extends php_user_filter { - const FILTER_NAME = 'october.csv.transcode.'; + const FILTER_NAME = 'winter.csv.transcode.'; protected $encodingFrom = 'auto'; diff --git a/modules/backend/behaviors/importexportcontroller/assets/js/october.export.js b/modules/backend/behaviors/importexportcontroller/assets/js/winter.export.js similarity index 91% rename from modules/backend/behaviors/importexportcontroller/assets/js/october.export.js rename to modules/backend/behaviors/importexportcontroller/assets/js/winter.export.js index b6f8dd58b..6c95050c7 100644 --- a/modules/backend/behaviors/importexportcontroller/assets/js/october.export.js +++ b/modules/backend/behaviors/importexportcontroller/assets/js/winter.export.js @@ -18,5 +18,5 @@ } - $.oc.exportBehavior = new ExportBehavior; + $.wn.exportBehavior = new ExportBehavior; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/assets/js/october.import.js b/modules/backend/behaviors/importexportcontroller/assets/js/winter.import.js similarity index 99% rename from modules/backend/behaviors/importexportcontroller/assets/js/october.import.js rename to modules/backend/behaviors/importexportcontroller/assets/js/winter.import.js index 6c2eb9e2b..ef6a38578 100644 --- a/modules/backend/behaviors/importexportcontroller/assets/js/october.import.js +++ b/modules/backend/behaviors/importexportcontroller/assets/js/winter.import.js @@ -145,5 +145,5 @@ } } - $.oc.importBehavior = new ImportBehavior; + $.wn.importBehavior = new ImportBehavior; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm index 9dfbf6622..c7d232a4e 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_column_sample_form.htm @@ -11,7 +11,7 @@
    -
  • +
    • diff --git a/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm index f98f261f6..47ab7e6a8 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_export_form.htm @@ -24,7 +24,7 @@ diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm index 00eeef412..256d8ee9e 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_db_columns.htm @@ -19,5 +19,5 @@
\ No newline at end of file diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm index b221e5487..d64883ced 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_file_columns.htm @@ -13,14 +13,14 @@ data-delay="300" data-placement="right" title="" - onclick="$.oc.importBehavior.ignoreFileColumn(this)" + onclick="$.wn.importBehavior.ignoreFileColumn(this)" > @@ -40,5 +40,5 @@
diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm index 220879dff..daa43fe2c 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_form.htm @@ -24,7 +24,7 @@ diff --git a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm index f7b3e0b9d..db503c474 100644 --- a/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm +++ b/modules/backend/behaviors/importexportcontroller/partials/_import_toolbar.htm @@ -2,15 +2,15 @@ + class="btn btn-sm btn-secondary wn-icon-eye disabled" + onclick="$.wn.importBehavior.showIgnoredColumns()"> + class="btn btn-sm btn-secondary wn-icon-bullseye" + onclick="$.wn.importBehavior.autoMatchColumns()">
diff --git a/modules/backend/behaviors/relationcontroller/assets/js/october.relation.js b/modules/backend/behaviors/relationcontroller/assets/js/winter.relation.js similarity index 98% rename from modules/backend/behaviors/relationcontroller/assets/js/october.relation.js rename to modules/backend/behaviors/relationcontroller/assets/js/winter.relation.js index 126e39284..5af54ebee 100644 --- a/modules/backend/behaviors/relationcontroller/assets/js/october.relation.js +++ b/modules/backend/behaviors/relationcontroller/assets/js/winter.relation.js @@ -96,5 +96,5 @@ } - $.oc.relationBehavior = new RelationBehavior; + $.wn.relationBehavior = new RelationBehavior; }(window.jQuery); diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_add.htm b/modules/backend/behaviors/relationcontroller/partials/_button_add.htm index 6939b3bc3..08da269f2 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_add.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_add.htm @@ -3,6 +3,6 @@ data-size="huge" data-handler="onRelationButtonAdd" href="javascript:;" - class="btn btn-sm btn-secondary oc-icon-plus"> + class="btn btn-sm btn-secondary wn-icon-plus"> trans($relationLabel)])) ?> diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_create.htm b/modules/backend/behaviors/relationcontroller/partials/_button_create.htm index d7d3569df..b2080b102 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_create.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_create.htm @@ -3,6 +3,6 @@ data-size="huge" data-handler="onRelationButtonCreate" href="javascript:;" - class="btn btn-sm btn-secondary oc-icon-file"> + class="btn btn-sm btn-secondary wn-icon-file"> trans($relationLabel)])) ?> diff --git a/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm b/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm index d8fd4ff6b..5e7b02039 100644 --- a/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm +++ b/modules/backend/behaviors/relationcontroller/partials/_button_delete.htm @@ -1,22 +1,22 @@
diff --git a/modules/backend/classes/AuthManager.php b/modules/backend/classes/AuthManager.php index 85a59ae2f..982a71e54 100644 --- a/modules/backend/classes/AuthManager.php +++ b/modules/backend/classes/AuthManager.php @@ -2,16 +2,16 @@ use Config; use System\Classes\PluginManager; -use October\Rain\Auth\Manager as RainAuthManager; -use October\Rain\Exception\SystemException; +use Winter\Storm\Auth\Manager as StormAuthManager; +use Winter\Storm\Exception\SystemException; /** * Back-end authentication manager. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ -class AuthManager extends RainAuthManager +class AuthManager extends StormAuthManager { protected static $instance; @@ -47,6 +47,11 @@ class AuthManager extends RainAuthManager */ protected $permissions = []; + /** + * @var array List of owner aliases. ['Aliased.Owner' => 'Real.Owner'] + */ + protected $aliases = []; + /** * @var array List of registered permission roles. */ @@ -94,14 +99,32 @@ class AuthManager extends RainAuthManager */ public function registerPermissions($owner, array $definitions) { + // Resolve alias + $owner = $this->aliases[$owner] ?? $owner; + foreach ($definitions as $code => $definition) { - $permission = (object)array_merge(self::$permissionDefaults, array_merge($definition, [ + $permission = (object) array_merge(self::$permissionDefaults, array_merge($definition, [ 'code' => $code, 'owner' => $owner ])); $this->permissions[] = $permission; } + + // Clear the permission cache + $this->permissionCache = false; + } + + /** + * Register a permission owner alias + * + * @param string $owner The owner to register an alias for. Example: Real.Owner + * @param string $alias The alias to register. Example: Aliased.Owner + * @return void + */ + public function registerPermissionOwnerAlias(string $owner, string $alias) + { + $this->aliases[$alias] = $owner; } /** @@ -116,6 +139,9 @@ class AuthManager extends RainAuthManager throw new SystemException('Unable to remove permissions before they are loaded.'); } + // Resolve alias + $owner = $this->aliases[$owner] ?? $owner; + $ownerPermissions = array_filter($this->permissions, function ($permission) use ($owner) { return $permission->owner === $owner; }); @@ -125,6 +151,9 @@ class AuthManager extends RainAuthManager unset($this->permissions[$key]); } } + + // Clear the permission cache + $this->permissionCache = false; } /** diff --git a/modules/backend/classes/BackendController.php b/modules/backend/classes/BackendController.php index 33a312652..88d6ff3f5 100644 --- a/modules/backend/classes/BackendController.php +++ b/modules/backend/classes/BackendController.php @@ -9,7 +9,7 @@ use Config; use Request; use Response; use Illuminate\Routing\Controller as ControllerBase; -use October\Rain\Router\Helper as RouterHelper; +use Winter\Storm\Router\Helper as RouterHelper; use System\Classes\PluginManager; use Closure; @@ -23,12 +23,12 @@ use Closure; * for the `Posts` controller inside the `Acme.Blog` plugin. * * @see Backend\Classes\Controller Base class for back-end controllers - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class BackendController extends ControllerBase { - use \October\Rain\Extension\ExtendableTrait; + use \Winter\Storm\Extension\ExtendableTrait; /** * @var array Behaviors implemented by this controller. diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php index a0790ed2e..a9d73f13c 100644 --- a/modules/backend/classes/Controller.php +++ b/modules/backend/classes/Controller.php @@ -15,10 +15,10 @@ use BackendAuth; use Backend\Models\UserPreference; use Backend\Models\Preference as BackendPreference; use Backend\Widgets\MediaManager; -use October\Rain\Exception\AjaxException; -use October\Rain\Exception\SystemException; -use October\Rain\Exception\ValidationException; -use October\Rain\Exception\ApplicationException; +use Winter\Storm\Exception\AjaxException; +use Winter\Storm\Exception\SystemException; +use Winter\Storm\Exception\ValidationException; +use Winter\Storm\Exception\ApplicationException; use Illuminate\Database\Eloquent\MassAssignmentException; use Illuminate\Http\RedirectResponse; use Illuminate\Routing\Controller as ControllerBase; @@ -27,7 +27,7 @@ use Illuminate\Routing\Controller as ControllerBase; * The Backend base controller class, used by Backend controllers. * The base controller services back end pages. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Controller extends ControllerBase @@ -40,7 +40,7 @@ class Controller extends ControllerBase use \System\Traits\SecurityController; use \Backend\Traits\ErrorMaker; use \Backend\Traits\WidgetMaker; - use \October\Rain\Extension\ExtendableTrait; + use \Winter\Storm\Extension\ExtendableTrait; /** * @var array Behaviors implemented by this controller. @@ -432,7 +432,7 @@ class Controller extends ControllerBase return null; } - if ($handler = Request::header('X_OCTOBER_REQUEST_HANDLER')) { + if ($handler = Request::header('X_WINTER_REQUEST_HANDLER')) { return trim($handler); } @@ -457,7 +457,7 @@ class Controller extends ControllerBase /* * Validate the handler partial list */ - if ($partialList = trim(Request::header('X_OCTOBER_REQUEST_PARTIALS'))) { + if ($partialList = trim(Request::header('X_WINTER_REQUEST_PARTIALS'))) { $partialList = explode('&', $partialList); foreach ($partialList as $partial) { @@ -491,7 +491,7 @@ class Controller extends ControllerBase * framework.js knows to redirect the browser and not the request! */ if ($result instanceof RedirectResponse) { - $responseContents['X_OCTOBER_REDIRECT'] = $result->getTargetUrl(); + $responseContents['X_WINTER_REDIRECT'] = $result->getTargetUrl(); $result = null; } /* @@ -505,7 +505,7 @@ class Controller extends ControllerBase * Detect assets */ if ($this->hasAssetsDefined()) { - $responseContents['X_OCTOBER_ASSETS'] = $this->getAssetPaths(); + $responseContents['X_WINTER_ASSETS'] = $this->getAssetPaths(); } /* @@ -532,7 +532,7 @@ class Controller extends ControllerBase Flash::error($ex->getMessage()); $responseContents = []; $responseContents['#layout-flash-messages'] = $this->makeLayoutPartial('flash_messages'); - $responseContents['X_OCTOBER_ERROR_FIELDS'] = $ex->getFields(); + $responseContents['X_WINTER_ERROR_FIELDS'] = $ex->getFields(); throw new AjaxException($responseContents); } catch (MassAssignmentException $ex) { diff --git a/modules/backend/classes/ControllerBehavior.php b/modules/backend/classes/ControllerBehavior.php index 1df06bd48..9b7dbee16 100644 --- a/modules/backend/classes/ControllerBehavior.php +++ b/modules/backend/classes/ControllerBehavior.php @@ -2,14 +2,14 @@ use Lang; use ApplicationException; -use October\Rain\Extension\ExtensionBase; +use Winter\Storm\Extension\ExtensionBase; use System\Traits\ViewMaker; -use October\Rain\Html\Helper as HtmlHelper; +use Winter\Storm\Html\Helper as HtmlHelper; /** * Controller Behavior base class * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class ControllerBehavior extends ExtensionBase diff --git a/modules/backend/classes/FilterScope.php b/modules/backend/classes/FilterScope.php index bf5d062fb..6a58852ae 100644 --- a/modules/backend/classes/FilterScope.php +++ b/modules/backend/classes/FilterScope.php @@ -1,12 +1,12 @@ 'Real.Owner'] + */ + protected $aliases = []; + /** * @var MainMenuItem[] List of registered items. */ @@ -223,6 +228,18 @@ class NavigationManager $this->addMainMenuItems($owner, $definitions); } + /** + * Register an owner alias + * + * @param string $owner The owner to register an alias for. Example: Real.Owner + * @param string $alias The alias to register. Example: Aliased.Owner + * @return void + */ + public function registerOwnerAlias(string $owner, string $alias) + { + $this->aliases[$alias] = $owner; + } + /** * Dynamically add an array of main menu items * @param string $owner @@ -609,8 +626,8 @@ class NavigationManager } /** - * Sets the navigation context. - * The function sets the navigation owner. + * Sets the navigation context owner. + * * @param string $owner Specifies the navigation owner in the format Vendor/Module */ public function setContextOwner($owner) @@ -618,6 +635,14 @@ class NavigationManager $this->contextOwner = $owner; } + /** + * Gets the navigation context owner + */ + public function getContextOwner() + { + return $this->aliases[$this->contextOwner] ?? $this->contextOwner; + } + /** * Specifies a code of the main menu item in the current navigation context. * @param string $mainMenuItemCode Specifies the main menu item code @@ -639,7 +664,7 @@ class NavigationManager return (object)[ 'mainMenuCode' => $this->contextMainMenuItemCode, 'sideMenuCode' => $this->contextSideMenuItemCode, - 'owner' => $this->contextOwner + 'owner' => $this->getContextOwner(), ]; } @@ -660,7 +685,7 @@ class NavigationManager */ public function isMainMenuItemActive($item) { - return $this->contextOwner === $item->owner && $this->contextMainMenuItemCode === $item->code; + return $this->getContextOwner() === $item->owner && $this->contextMainMenuItemCode === $item->code; } /** @@ -691,7 +716,7 @@ class NavigationManager return true; } - return $this->contextOwner === $item->owner && $this->contextSideMenuItemCode === $item->code; + return $this->getContextOwner() === $item->owner && $this->contextSideMenuItemCode === $item->code; } /** @@ -716,6 +741,7 @@ class NavigationManager */ public function getContextSidenavPartial($owner, $mainMenuItemCode) { + $owner = $this->aliases[$owner] ?? $owner; $key = $owner.$mainMenuItemCode; return $this->contextSidenavPartials[$key] ?? null; @@ -752,6 +778,6 @@ class NavigationManager */ protected function makeItemKey($owner, $code) { - return strtoupper($owner).'.'.strtoupper($code); + return strtoupper($this->aliases[$owner] ?? $owner).'.'.strtoupper($code); } } diff --git a/modules/backend/classes/ReportWidgetBase.php b/modules/backend/classes/ReportWidgetBase.php index d37e180d1..ac7b091d8 100644 --- a/modules/backend/classes/ReportWidgetBase.php +++ b/modules/backend/classes/ReportWidgetBase.php @@ -4,7 +4,7 @@ * Report Widget base class * Report widgets are used inside the ReportContainer. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class ReportWidgetBase extends WidgetBase diff --git a/modules/backend/classes/Skin.php b/modules/backend/classes/Skin.php index e46865c3f..b64b83c0d 100644 --- a/modules/backend/classes/Skin.php +++ b/modules/backend/classes/Skin.php @@ -2,13 +2,13 @@ use File; use Config; -use October\Rain\Router\Helper as RouterHelper; +use Winter\Storm\Router\Helper as RouterHelper; /** * Skin Base class * Used for defining skins. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ abstract class Skin diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php index 3444b91ad..91f1ec57a 100644 --- a/modules/backend/classes/WidgetBase.php +++ b/modules/backend/classes/WidgetBase.php @@ -1,13 +1,13 @@ $formWidgetInfo]. @@ -240,7 +240,7 @@ class WidgetManager * Manually registers report widget for consideration. Usage: * * WidgetManager::registerReportWidgets(function ($manager) { - * $manager->registerReportWidget('RainLab\GoogleAnalytics\ReportWidgets\TrafficOverview', [ + * $manager->registerReportWidget('Winter\GoogleAnalytics\ReportWidgets\TrafficOverview', [ * 'name' => 'Google Analytics traffic overview', * 'context' => 'dashboard' * ]); diff --git a/modules/backend/composer.json b/modules/backend/composer.json index c199e9fe1..951735316 100644 --- a/modules/backend/composer.json +++ b/modules/backend/composer.json @@ -1,9 +1,9 @@ { - "name": "october/backend", - "type": "october-module", - "description": "Backend module for October CMS", - "homepage": "https://octobercms.com", - "keywords": ["october cms", "october", "backend"], + "name": "winter/wn-backend-module", + "type": "winter-module", + "description": "Backend module for Winter CMS", + "homepage": "https://wintercms.com", + "keywords": ["winter cms", "winter", "backend"], "license": "MIT", "authors": [ { @@ -18,7 +18,7 @@ }, { "name": "Luke Towers", - "email": "octobercms@luketowers.ca", + "email": "wintercms@luketowers.ca", "homepage": "https://luketowers.ca", "role": "Maintainer" } diff --git a/modules/backend/controllers/AccessLogs.php b/modules/backend/controllers/AccessLogs.php index 512048faf..8e437e8db 100644 --- a/modules/backend/controllers/AccessLogs.php +++ b/modules/backend/controllers/AccessLogs.php @@ -8,7 +8,7 @@ use System\Classes\SettingsManager; /** * Access Logs controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class AccessLogs extends Controller @@ -37,8 +37,8 @@ class AccessLogs extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.Backend', 'access_logs'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.Backend', 'access_logs'); } public function index_onRefresh() diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php index 003df9955..abe182250 100644 --- a/modules/backend/controllers/Auth.php +++ b/modules/backend/controllers/Auth.php @@ -13,12 +13,12 @@ use ApplicationException; use ValidationException; use Exception; use Config; -use October\Rain\Foundation\Http\Middleware\CheckForTrustedHost; +use Winter\Storm\Foundation\Http\Middleware\CheckForTrustedHost; /** * Authentication controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ diff --git a/modules/backend/controllers/Files.php b/modules/backend/controllers/Files.php index adc5bcf32..ad9fd2b56 100644 --- a/modules/backend/controllers/Files.php +++ b/modules/backend/controllers/Files.php @@ -16,7 +16,7 @@ use Exception; * Used for delivering protected system files, and generating URLs * for accessing them. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ diff --git a/modules/backend/controllers/Index.php b/modules/backend/controllers/Index.php index 75a18eb3a..008ec1634 100644 --- a/modules/backend/controllers/Index.php +++ b/modules/backend/controllers/Index.php @@ -8,7 +8,7 @@ use Backend\Widgets\ReportContainer; /** * Dashboard controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -29,7 +29,7 @@ class Index extends Controller { parent::__construct(); - BackendMenu::setContextOwner('October.Backend'); + BackendMenu::setContextOwner('Winter.Backend'); $this->addCss('/modules/backend/assets/css/dashboard/dashboard.css', 'core'); } diff --git a/modules/backend/controllers/Media.php b/modules/backend/controllers/Media.php index e8c8941bb..7a3a743e0 100644 --- a/modules/backend/controllers/Media.php +++ b/modules/backend/controllers/Media.php @@ -7,7 +7,7 @@ use Backend\Widgets\MediaManager; /** * Backend Media Manager * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Media extends Controller @@ -24,7 +24,7 @@ class Media extends Controller { parent::__construct(); - BackendMenu::setContext('October.Backend', 'media', true); + BackendMenu::setContext('Winter.Backend', 'media', true); $this->pageTitle = 'backend::lang.media.menu_label'; $manager = new MediaManager($this, 'manager'); diff --git a/modules/backend/controllers/Preferences.php b/modules/backend/controllers/Preferences.php index 1a9e25828..cce20becb 100644 --- a/modules/backend/controllers/Preferences.php +++ b/modules/backend/controllers/Preferences.php @@ -11,7 +11,7 @@ use Backend\Models\Preference as PreferenceModel; /** * Editor Settings controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -42,8 +42,8 @@ class Preferences extends Controller $this->addJs('/modules/backend/formwidgets/codeeditor/assets/js/build-min.js', 'core'); $this->addJs('/modules/backend/assets/js/preferences/preferences.js', 'core'); - BackendMenu::setContext('October.System', 'system', 'mysettings'); - SettingsManager::setContext('October.Backend', 'preferences'); + BackendMenu::setContext('Winter.System', 'system', 'mysettings'); + SettingsManager::setContext('Winter.Backend', 'preferences'); } public function index() diff --git a/modules/backend/controllers/UserGroups.php b/modules/backend/controllers/UserGroups.php index ed5e4d3e2..e73c9a56e 100644 --- a/modules/backend/controllers/UserGroups.php +++ b/modules/backend/controllers/UserGroups.php @@ -7,7 +7,7 @@ use System\Classes\SettingsManager; /** * Backend user groups controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -43,7 +43,7 @@ class UserGroups extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'users'); - SettingsManager::setContext('October.System', 'administrators'); + BackendMenu::setContext('Winter.System', 'system', 'users'); + SettingsManager::setContext('Winter.System', 'administrators'); } } diff --git a/modules/backend/controllers/UserRoles.php b/modules/backend/controllers/UserRoles.php index bed79dbe9..cddc0b67e 100644 --- a/modules/backend/controllers/UserRoles.php +++ b/modules/backend/controllers/UserRoles.php @@ -9,7 +9,7 @@ use System\Classes\SettingsManager; /** * Backend user groups controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -45,8 +45,8 @@ class UserRoles extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'users'); - SettingsManager::setContext('October.System', 'administrators'); + BackendMenu::setContext('Winter.System', 'system', 'users'); + SettingsManager::setContext('Winter.System', 'administrators'); /* * Only super users can access diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php index 3aa4f7e32..15bd175c6 100644 --- a/modules/backend/controllers/Users.php +++ b/modules/backend/controllers/Users.php @@ -14,7 +14,7 @@ use System\Classes\SettingsManager; /** * Backend user controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -59,8 +59,8 @@ class Users extends Controller $this->requiredPermissions = null; } - BackendMenu::setContext('October.System', 'system', 'users'); - SettingsManager::setContext('October.System', 'administrators'); + BackendMenu::setContext('Winter.System', 'system', 'users'); + SettingsManager::setContext('Winter.System', 'administrators'); } /** @@ -168,7 +168,7 @@ class Users extends Controller */ public function myaccount() { - SettingsManager::setContext('October.Backend', 'myaccount'); + SettingsManager::setContext('Winter.Backend', 'myaccount'); $this->pageTitle = 'backend::lang.myaccount.menu_label'; return $this->update($this->user->id, 'myaccount'); diff --git a/modules/backend/controllers/accesslogs/_list_toolbar.htm b/modules/backend/controllers/accesslogs/_list_toolbar.htm index 5f9c7802e..81bfa643b 100644 --- a/modules/backend/controllers/accesslogs/_list_toolbar.htm +++ b/modules/backend/controllers/accesslogs/_list_toolbar.htm @@ -3,7 +3,7 @@ href="javascript:;" data-request="onRefresh" data-load-indicator="" - class="btn btn-primary oc-icon-refresh"> + class="btn btn-primary wn-icon-refresh">
diff --git a/modules/backend/controllers/auth/reset.htm b/modules/backend/controllers/auth/reset.htm index 6761a369f..279a899a7 100644 --- a/modules/backend/controllers/auth/reset.htm +++ b/modules/backend/controllers/auth/reset.htm @@ -6,7 +6,7 @@
-
+
-
+
-
+
-

+

diff --git a/modules/backend/controllers/usergroups/_list_toolbar.htm b/modules/backend/controllers/usergroups/_list_toolbar.htm index b1d2b38bc..bccd9620a 100644 --- a/modules/backend/controllers/usergroups/_list_toolbar.htm +++ b/modules/backend/controllers/usergroups/_list_toolbar.htm @@ -1,8 +1,8 @@

diff --git a/modules/backend/controllers/usergroups/update.htm b/modules/backend/controllers/usergroups/update.htm index 9efd8e6c2..fa1462dd3 100644 --- a/modules/backend/controllers/usergroups/update.htm +++ b/modules/backend/controllers/usergroups/update.htm @@ -38,7 +38,7 @@
- + diff --git a/modules/backend/formwidgets/fileupload/partials/_image_multi.htm b/modules/backend/formwidgets/fileupload/partials/_image_multi.htm index e5ae76334..2ff40928a 100644 --- a/modules/backend/formwidgets/fileupload/partials/_image_multi.htm +++ b/modules/backend/formwidgets/fileupload/partials/_image_multi.htm @@ -14,7 +14,7 @@ - + diff --git a/modules/backend/formwidgets/fileupload/partials/_image_single.htm b/modules/backend/formwidgets/fileupload/partials/_image_single.htm index a9cba6b03..dd47f6e25 100644 --- a/modules/backend/formwidgets/fileupload/partials/_image_single.htm +++ b/modules/backend/formwidgets/fileupload/partials/_image_single.htm @@ -18,7 +18,7 @@ href="javascript:;" style="" class="upload-button"> - + diff --git a/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css b/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css index c2f36b0de..256f68980 100644 --- a/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css +++ b/modules/backend/formwidgets/markdowneditor/assets/css/markdowneditor.css @@ -40,6 +40,7 @@ .field-markdowneditor.disabled .ace_scroller {cursor:not-allowed} .field-markdowneditor.disabled .control-toolbar.editor-toolbar .toolbar-item .btn {cursor:not-allowed;color:#bdbdbd} .field-markdowneditor.disabled .control-toolbar.editor-toolbar .toolbar-item .btn:hover {background-color:transparent;color:#bdbdbd} +.field-markdowneditor.disabled .control-toolbar.editor-toolbar .toolbar-item .btn.wn-autumn-button, .field-markdowneditor.disabled .control-toolbar.editor-toolbar .toolbar-item .btn.oc-autumn-button {color:#bdbdbd !important} .field-markdowneditor .editor-preview {color:#515c5d;font-family:"Helvetica",sans-serif;line-height:180%} .field-markdowneditor .editor-preview h1, diff --git a/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js b/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js index 881cab6fb..108a9e46b 100644 --- a/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js +++ b/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js @@ -1,5 +1,5 @@ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var MarkdownEditor = function (element, options) { @@ -18,7 +18,7 @@ this.editorPadding = 15 this.updatesPaused = false - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } @@ -181,7 +181,7 @@ $buttons = $('
'), $fixedButtons = $('
') - $.each($.oc.markdownEditorButtons, function(code, button) { + $.each($.wn.markdownEditorButtons, function(code, button) { $button = self.makeToolbarButton(code, button) if (button.fixed) { @@ -213,7 +213,7 @@ var $dropdown = $('
    '), $childButton - $dropdown.attr('data-dropdown-title', $.oc.lang.get(button.label)) + $dropdown.attr('data-dropdown-title', $.wn.lang.get(button.label)) $.each(button.dropdown, function(code, childButton) { $childButton = $('').attr({ 'href': 'javascript:;', @@ -231,7 +231,7 @@ $childButton.addClass(childButton.cssClass) } - $childButton.text($.oc.lang.get(childButton.label)) + $childButton.text($.wn.lang.get(childButton.label)) $dropdown.append($childButton) $childButton.wrap('
  • ') @@ -253,7 +253,7 @@ if (!this.options.disabled) { $button.attr({ - 'title': $.oc.lang.get(button.label), + 'title': $.wn.lang.get(button.label), 'data-control': "tooltip", 'data-placement': "bottom", 'data-container': "body", @@ -533,7 +533,7 @@ MarkdownEditor.prototype.launchMediaManager = function(onSuccess) { var self = this - new $.oc.mediaManager.popup({ + new $.wn.mediaManager.popup({ alias: 'ocmediamanager', cropAndInsertButton: true, onInsert: function(items) { @@ -737,10 +737,12 @@ // BUTTON DEFINITIONS // ================= + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - $.oc.markdownEditorButtons = { + $.wn.markdownEditorButtons = { formatting: { label: 'markdowneditor.formatting', @@ -748,49 +750,49 @@ dropdown: { quote: { label: 'markdowneditor.quote', - cssClass: 'oc-button oc-icon-quote-right', + cssClass: 'wn-button wn-icon-quote-right', action: 'formatBlockMulti', template: '> $1' }, code: { label: 'markdowneditor.code', - cssClass: 'oc-button oc-icon-code', + cssClass: 'wn-button wn-icon-code', action: 'formatBlock', template: '\n```\n$1\n```\n' }, header1: { label: 'markdowneditor.header1', - cssClass: 'oc-button oc-icon-header', + cssClass: 'wn-button wn-icon-header', action: 'formatBlock', template: '# $1' }, header2: { label: 'markdowneditor.header2', - cssClass: 'oc-button oc-icon-header', + cssClass: 'wn-button wn-icon-header', action: 'formatBlock', template: '## $1' }, header3: { label: 'markdowneditor.header3', - cssClass: 'oc-button oc-icon-header', + cssClass: 'wn-button wn-icon-header', action: 'formatBlock', template: '### $1' }, header4: { label: 'markdowneditor.header4', - cssClass: 'oc-button oc-icon-header', + cssClass: 'wn-button wn-icon-header', action: 'formatBlock', template: '#### $1' }, header5: { label: 'markdowneditor.header5', - cssClass: 'oc-button oc-icon-header', + cssClass: 'wn-button wn-icon-header', action: 'formatBlock', template: '##### $1' }, header6: { label: 'markdowneditor.header6', - cssClass: 'oc-button oc-icon-header', + cssClass: 'wn-button wn-icon-header', action: 'formatBlock', template: '###### $1' } @@ -840,13 +842,13 @@ }, medialink: { label: 'mediamanager.insert_link', - cssClass: 'oc-autumn-button oc-icon-link', + cssClass: 'wn-autumn-button wn-icon-link', action: 'formatMediaManager', template: '[$1]($2)' }, mediaimage: { label: 'mediamanager.insert_image', - cssClass: 'oc-autumn-button oc-icon-image', + cssClass: 'wn-autumn-button wn-icon-image', action: 'formatMediaManager', template: '![$1]($2)' }, diff --git a/modules/backend/formwidgets/markdowneditor/assets/less/markdowneditor.less b/modules/backend/formwidgets/markdowneditor/assets/less/markdowneditor.less index 0948f3440..aacd12b97 100644 --- a/modules/backend/formwidgets/markdowneditor/assets/less/markdowneditor.less +++ b/modules/backend/formwidgets/markdowneditor/assets/less/markdowneditor.less @@ -193,6 +193,7 @@ color: #bdbdbd; } } + .btn.wn-autumn-button, .btn.oc-autumn-button { color: #bdbdbd!important; } diff --git a/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js b/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js index 6ed188929..60030f955 100644 --- a/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js +++ b/modules/backend/formwidgets/mediafinder/assets/js/mediafinder.js @@ -13,14 +13,14 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var MediaFinder = function (element, options) { this.$el = $(element) this.options = options || {} - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } @@ -93,7 +93,7 @@ MediaFinder.prototype.onClickFindButton = function() { var self = this - new $.oc.mediaManager.popup({ + new $.wn.mediaManager.popup({ alias: 'ocmediamanager', cropAndInsertButton: true, onInsert: function(items) { diff --git a/modules/backend/formwidgets/mediafinder/partials/_image_single.htm b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm index a28e94bf1..ab72d1db1 100644 --- a/modules/backend/formwidgets/mediafinder/partials/_image_single.htm +++ b/modules/backend/formwidgets/mediafinder/partials/_image_single.htm @@ -9,7 +9,7 @@ - + diff --git a/modules/backend/formwidgets/permissioneditor/assets/js/permissioneditor.js b/modules/backend/formwidgets/permissioneditor/assets/js/permissioneditor.js index d5716b369..41e0ef488 100644 --- a/modules/backend/formwidgets/permissioneditor/assets/js/permissioneditor.js +++ b/modules/backend/formwidgets/permissioneditor/assets/js/permissioneditor.js @@ -1,6 +1,6 @@ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var PermissionEditor = function() { diff --git a/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js b/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js index 6081110c2..ceecb3681 100644 --- a/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js +++ b/modules/backend/formwidgets/recordfinder/assets/js/recordfinder.js @@ -14,7 +14,7 @@ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype // RECORDFINDER CLASS DEFINITION @@ -24,7 +24,7 @@ this.$el = $(element) this.options = options || {} - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } @@ -44,7 +44,7 @@ this.$el = null - // In some cases options could contain callbacks, + // In some cases options could contain callbacks, // so it's better to clean them up too. this.options = null diff --git a/modules/backend/formwidgets/repeater/assets/js/repeater.js b/modules/backend/formwidgets/repeater/assets/js/repeater.js index d4e31a48e..234409a8e 100644 --- a/modules/backend/formwidgets/repeater/assets/js/repeater.js +++ b/modules/backend/formwidgets/repeater/assets/js/repeater.js @@ -11,7 +11,7 @@ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype // FIELD REPEATER CLASS DEFINITION @@ -22,7 +22,7 @@ this.$el = $(element) this.$sortable = $(options.sortableContainer, this.$el) - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } diff --git a/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js b/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js index 7f6695a99..b7424ccdb 100644 --- a/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js +++ b/modules/backend/formwidgets/richeditor/assets/js/build-plugins-min.js @@ -1,39 +1,39 @@ -(function($){$.FroalaEditor.PLUGINS.mediaManager=function(editor){function onInsertFile(){new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_empty_insert')) +(function($){$.FroalaEditor.PLUGINS.mediaManager=function(editor){function onInsertFile(){new $.wn.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){$.wn.alert($.wn.lang.get('mediamanager.invalid_file_empty_insert')) return} -if(items.length>1){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert')) +if(items.length>1){$.wn.alert($.wn.lang.get('mediamanager.invalid_file_single_insert')) return} var link,text=editor.selection.text(),textIsEmpty=$.trim(text)==='' for(var i=0,len=items.length;i'+text+'');var $file=editor.$el.find('#fr-inserted-file');$file.removeAttr('id');editor.undo.saveStep() this.hide()}})} -function onInsertImage(){var $currentImage=editor.image.get(),selection=editor.selection.get(),range=editor.selection.ranges(0);new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:true,onInsert:function(items){editor.selection.clear();selection.addRange(range);if(!items.length){$.oc.alert($.oc.lang.get('mediamanager.invalid_image_empty_insert')) +function onInsertImage(){var $currentImage=editor.image.get(),selection=editor.selection.get(),range=editor.selection.ranges(0);new $.wn.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:true,onInsert:function(items){editor.selection.clear();selection.addRange(range);if(!items.length){$.wn.alert($.wn.lang.get('mediamanager.invalid_image_empty_insert')) return} var imagesInserted=0 -for(var i=0,len=items.length;i1){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert')) +if(items.length>1){$.wn.alert($.wn.lang.get('mediamanager.invalid_file_single_insert')) return} var item=items[0] -if(item.documentType!=='video'){$.oc.alert($.oc.lang.get('mediamanager.invalid_video_invalid_insert','The file "'+item.title+'" is not a video.')) +if(item.documentType!=='video'){$.wn.alert($.wn.lang.get('mediamanager.invalid_video_invalid_insert','The file "'+item.title+'" is not a video.')) return} var $richEditorNode=editor.$el.closest('[data-control="richeditor"]') $richEditorNode.richEditor('insertVideo',item.publicUrl,item.title) this.hide()}})} -function onInsertAudio(){new $.oc.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){$.oc.alert($.oc.lang.get('mediamanager.invalid_audio_empty_insert')) +function onInsertAudio(){new $.wn.mediaManager.popup({alias:'ocmediamanager',cropAndInsertButton:false,onInsert:function(items){if(!items.length){$.wn.alert($.wn.lang.get('mediamanager.invalid_audio_empty_insert')) return} -if(items.length>1){$.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert')) +if(items.length>1){$.wn.alert($.wn.lang.get('mediamanager.invalid_file_single_insert')) return} var item=items[0] -if(item.documentType!=='audio'){$.oc.alert($.oc.lang.get('mediamanager.invalid_audio_invalid_insert','The file "'+item.title+'" is not an audio file.')) +if(item.documentType!=='audio'){$.wn.alert($.wn.lang.get('mediamanager.invalid_audio_invalid_insert','The file "'+item.title+'" is not an audio file.')) return} var $richEditorNode=editor.$el.closest('[data-control="richeditor"]') $richEditorNode.richEditor('insertAudio',item.publicUrl,item.title) @@ -146,13 +146,13 @@ editor.events.on('keydown',_onKeydown) editor.events.on('destroy',_destroy,true) editor.$el.on('keydown','figure',_onFigureKeydown)} function _destroy(){editor.$el.off('keydown','figure',_onFigureKeydown)} -return{_init:_init,insert:insertElement,insertVideo:insertVideo,insertAudio:insertAudio}}})(jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype +return{_init:_init,insert:insertElement,insertVideo:insertVideo,insertAudio:insertAudio}}})(jQuery);+function($){"use strict";var Base=$.wn.foundation.base,BaseProto=Base.prototype var RichEditor=function(element,options){this.options=options this.$el=$(element) this.$textarea=this.$el.find('>textarea:first') this.$form=this.$el.closest('form') this.editor=null -$.oc.foundation.controlUtils.markDisposable(element) +$.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init()} RichEditor.prototype=Object.create(BaseProto) @@ -163,7 +163,7 @@ if(!this.$textarea.attr('id')){this.$textarea.attr('id','element-'+Math.random() this.initFroala()} RichEditor.prototype.initFroala=function(){var froalaOptions={editorClass:'control-richeditor',language:this.options.editorLang,fullPage:this.options.fullpage,pageLinksHandler:this.options.linksHandler,uploadHandler:this.options.uploadHandler,aceEditorVendorPath:this.options.aceVendorPath,toolbarSticky:false} if(this.options.toolbarButtons){froalaOptions.toolbarButtons=this.options.toolbarButtons.split(',')} -else{froalaOptions.toolbarButtons=$.oc.richEditorButtons} +else{froalaOptions.toolbarButtons=$.wn.richEditorButtons} froalaOptions.imageStyles=this.options.imageStyles?this.options.imageStyles:{'oc-img-rounded':'Rounded','oc-img-bordered':'Bordered'} froalaOptions.linkStyles=this.options.linkStyles?this.options.linkStyles:{'oc-link-green':'Green','oc-link-strong':'Thick'} froalaOptions.paragraphStyles=this.options.paragraphStyles?this.options.paragraphStyles:{'oc-text-gray':'Gray','oc-text-bordered':'Bordered','oc-text-spaced':'Spaced','oc-text-uppercase':'Uppercase'} @@ -273,6 +273,8 @@ $.fn.richEditor.Constructor=RichEditor $.fn.richEditor.noConflict=function(){$.fn.richEditor=old return this} $(document).render(function(){$('[data-control="richeditor"]').richEditor()}) +if($.wn===undefined) +$.wn={} if($.oc===undefined) -$.oc={} -$.oc.richEditorButtons=['paragraphFormat','paragraphStyle','quote','bold','italic','align','formatOL','formatUL','insertTable','insertLink','insertImage','insertVideo','insertAudio','insertFile','insertHR','fullscreen','html']}(window.jQuery); \ No newline at end of file +$.oc=$.wn +$.wn.richEditorButtons=['paragraphFormat','paragraphStyle','quote','bold','italic','align','formatOL','formatUL','insertTable','insertLink','insertImage','insertVideo','insertAudio','insertFile','insertHR','fullscreen','html']}(window.jQuery); \ No newline at end of file diff --git a/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js b/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js index 5924d560d..aa67cf875 100644 --- a/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js +++ b/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js @@ -1,8 +1,7 @@ /* - * This is a bundle file, you can compile this in two ways: - * (1) Using your favorite JS combiner - * (2) Using CLI command: - * php artisan october:util compile assets + * This is a bundle file, you can compile this by running + * + * php artisan winter:util compile assets * * @see build-plugins-min.js * diff --git a/modules/backend/formwidgets/richeditor/assets/js/build.js b/modules/backend/formwidgets/richeditor/assets/js/build.js index 659191861..7327992d1 100644 --- a/modules/backend/formwidgets/richeditor/assets/js/build.js +++ b/modules/backend/formwidgets/richeditor/assets/js/build.js @@ -1,8 +1,7 @@ /* - * This is a bundle file, you can compile this in two ways: - * (1) Using your favorite JS combiner - * (2) Using CLI command: - * php artisan october:util compile assets + * This is a bundle file, you can compile this by running + * + * php artisan winter:util compile assets * * @see build-min.js * diff --git a/modules/backend/formwidgets/richeditor/assets/js/plugins/mediamanager.js b/modules/backend/formwidgets/richeditor/assets/js/plugins/mediamanager.js index 3fe9de382..424227aa1 100644 --- a/modules/backend/formwidgets/richeditor/assets/js/plugins/mediamanager.js +++ b/modules/backend/formwidgets/richeditor/assets/js/plugins/mediamanager.js @@ -3,17 +3,17 @@ $.FroalaEditor.PLUGINS.mediaManager = function (editor) { function onInsertFile() { - new $.oc.mediaManager.popup({ + new $.wn.mediaManager.popup({ alias: 'ocmediamanager', cropAndInsertButton: false, onInsert: function(items) { if (!items.length) { - $.oc.alert($.oc.lang.get('mediamanager.invalid_file_empty_insert')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_file_empty_insert')) return } if (items.length > 1) { - $.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_file_single_insert')) return } @@ -49,15 +49,15 @@ selection = editor.selection.get(), range = editor.selection.ranges(0); - new $.oc.mediaManager.popup({ + new $.wn.mediaManager.popup({ alias: 'ocmediamanager', cropAndInsertButton: true, onInsert: function(items) { editor.selection.clear(); selection.addRange(range); - + if (!items.length) { - $.oc.alert($.oc.lang.get('mediamanager.invalid_image_empty_insert')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_image_empty_insert')) return } @@ -65,7 +65,7 @@ for (var i=0, len=items.length; i 1) { - $.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_file_single_insert')) return } var item = items[0] if (item.documentType !== 'video') { - $.oc.alert($.oc.lang.get('mediamanager.invalid_video_invalid_insert', 'The file "'+item.title+'" is not a video.')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_video_invalid_insert', 'The file "'+item.title+'" is not a video.')) return } @@ -117,24 +117,24 @@ } function onInsertAudio() { - new $.oc.mediaManager.popup({ + new $.wn.mediaManager.popup({ alias: 'ocmediamanager', cropAndInsertButton: false, onInsert: function(items) { if (!items.length) { - $.oc.alert($.oc.lang.get('mediamanager.invalid_audio_empty_insert')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_audio_empty_insert')) return } if (items.length > 1) { - $.oc.alert($.oc.lang.get('mediamanager.invalid_file_single_insert')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_file_single_insert')) return } var item = items[0] if (item.documentType !== 'audio') { - $.oc.alert($.oc.lang.get('mediamanager.invalid_audio_invalid_insert', 'The file "'+item.title+'" is not an audio file.')) + $.wn.alert($.wn.lang.get('mediamanager.invalid_audio_invalid_insert', 'The file "'+item.title+'" is not an audio file.')) return } diff --git a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js index 230ff8f85..2d322945c 100755 --- a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js +++ b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js @@ -11,7 +11,7 @@ * - Froala Editor (froala_editor.js) */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype // RICHEDITOR CLASS DEFINITION @@ -24,7 +24,7 @@ this.$form = this.$el.closest('form') this.editor = null - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) @@ -90,7 +90,7 @@ froalaOptions.toolbarButtons = this.options.toolbarButtons.split(',') } else { - froalaOptions.toolbarButtons = $.oc.richEditorButtons + froalaOptions.toolbarButtons = $.wn.richEditorButtons } froalaOptions.imageStyles = this.options.imageStyles @@ -178,7 +178,7 @@ froalaOptions.shortcutsEnabled = ['show', 'bold', 'italic', 'underline', 'indent', 'outdent', 'undo', 'redo'] - // Ensure that October recognizes AJAX requests from Froala + // Ensure that Winter recognizes AJAX requests from Froala froalaOptions.requestHeaders = { 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content'), 'X-Requested-With': 'XMLHttpRequest' @@ -457,10 +457,12 @@ // BUTTON DEFINITIONS // ================= + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - $.oc.richEditorButtons = [ + $.wn.richEditorButtons = [ 'paragraphFormat', 'paragraphStyle', 'quote', diff --git a/modules/backend/formwidgets/richeditor/assets/vendor/froala/js/languages/hu.js b/modules/backend/formwidgets/richeditor/assets/vendor/froala/js/languages/hu.js index ac954d547..60dba5336 100644 --- a/modules/backend/formwidgets/richeditor/assets/vendor/froala/js/languages/hu.js +++ b/modules/backend/formwidgets/richeditor/assets/vendor/froala/js/languages/hu.js @@ -330,7 +330,7 @@ $.FE.LANGUAGE['hu'] = { "Clean": "Tisztítás", "Word Paste Detected": "Word beillesztés észlelhető", - // October CMS + // Winter CMS "Insert Audio": "Audió beillesztése", "Insert File": "Fájl beillesztése" }, diff --git a/modules/backend/helpers/Backend.php b/modules/backend/helpers/Backend.php index de9cae563..de5a8b6b1 100644 --- a/modules/backend/helpers/Backend.php +++ b/modules/backend/helpers/Backend.php @@ -6,7 +6,7 @@ use Html; use Config; use Request; use Redirect; -use October\Rain\Router\Helper as RouterHelper; +use Winter\Storm\Router\Helper as RouterHelper; use System\Helpers\DateTime as DateTimeHelper; use Backend\Classes\Skin; use Backend\Helpers\Exception\DecompileException; @@ -14,7 +14,7 @@ use Backend\Helpers\Exception\DecompileException; /** * Backend Helper * - * @package october\backend + * @package winter\wn-backend-module * @see \Backend\Facades\Backend * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm index 6b0bb19f5..2fef95676 100644 --- a/modules/backend/layouts/_head.htm +++ b/modules/backend/layouts/_head.htm @@ -17,7 +17,7 @@ // Styles $styles = [ Url::asset('modules/system/assets/ui/storm.css'), - Backend::skinAsset('assets/css/october.css'), + Backend::skinAsset('assets/css/winter.css'), ]; // Scripts @@ -28,15 +28,15 @@ ]; if (Config::get('develop.decompileBackendAssets', false)) { $scripts = array_merge($scripts, Backend::decompileAsset('modules/system/assets/ui/storm.js')); - $scripts = array_merge($scripts, Backend::decompileAsset('assets/js/october.js', true)); + $scripts = array_merge($scripts, Backend::decompileAsset('assets/js/winter.js', true)); } else { $scripts = array_merge($scripts, [Url::asset('modules/system/assets/ui/storm-min.js')]); - $scripts = array_merge($scripts, [Backend::skinAsset('assets/js/october-min.js')]); + $scripts = array_merge($scripts, [Backend::skinAsset('assets/js/winter-min.js')]); } $scripts = array_merge($scripts, [ Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js'), - Backend::skinAsset('assets/js/october.flyout.js'), - Backend::skinAsset('assets/js/october.tabformexpandcontrols.js'), + Backend::skinAsset('assets/js/winter.flyout.js'), + Backend::skinAsset('assets/js/winter.tabformexpandcontrols.js'), ]); ?> diff --git a/modules/backend/layouts/auth.htm b/modules/backend/layouts/auth.htm index 344e11e37..8624007fb 100644 --- a/modules/backend/layouts/auth.htm +++ b/modules/backend/layouts/auth.htm @@ -14,14 +14,14 @@ $coreBuild = System\Models\Parameter::get('system::core.build', 1); $styles = [ Url::asset('modules/system/assets/ui/storm.css'), - Backend::skinAsset('assets/css/october.css'), + Backend::skinAsset('assets/css/winter.css'), ]; $scripts = [ Backend::skinAsset('assets/js/vendor/jquery.min.js'), Backend::skinAsset('assets/js/vendor/jquery-migrate.min.js'), Url::asset('modules/system/assets/js/framework.js'), Url::asset('modules/system/assets/ui/storm-min.js'), - Backend::skinAsset('assets/js/october-min.js'), + Backend::skinAsset('assets/js/winter-min.js'), Url::to('modules/backend/assets/js/auth/auth.js'), Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js'), ]; @@ -67,7 +67,7 @@
    -

    +

    diff --git a/modules/backend/models/AccessLog.php b/modules/backend/models/AccessLog.php index 9ca8be6e8..92e39c31b 100644 --- a/modules/backend/models/AccessLog.php +++ b/modules/backend/models/AccessLog.php @@ -6,7 +6,7 @@ use Request; /** * Model for logging access to the back-end * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class AccessLog extends Model diff --git a/modules/backend/models/BrandSetting.php b/modules/backend/models/BrandSetting.php index bdd20bd22..22c6ba048 100644 --- a/modules/backend/models/BrandSetting.php +++ b/modules/backend/models/BrandSetting.php @@ -14,13 +14,13 @@ use Exception; /** * Brand settings that affect all users * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class BrandSetting extends Model { use \System\Traits\ViewMaker; - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; /** * @var array Behaviors implemented by this model. diff --git a/modules/backend/models/EditorSetting.php b/modules/backend/models/EditorSetting.php index b44081b16..6d414758e 100644 --- a/modules/backend/models/EditorSetting.php +++ b/modules/backend/models/EditorSetting.php @@ -9,13 +9,13 @@ use Exception; /** * Editor settings that affect all users * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class EditorSetting extends Model { use \System\Traits\ViewMaker; - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; /** * @var array Behaviors implemented by this model. diff --git a/modules/backend/models/ExportModel.php b/modules/backend/models/ExportModel.php index e6a767e80..21f5a658f 100644 --- a/modules/backend/models/ExportModel.php +++ b/modules/backend/models/ExportModel.php @@ -12,7 +12,7 @@ use SplTempFileObject; /** * Model used for exporting data * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ abstract class ExportModel extends Model diff --git a/modules/backend/models/ImportModel.php b/modules/backend/models/ImportModel.php index 09c1bf426..47bf78a55 100644 --- a/modules/backend/models/ImportModel.php +++ b/modules/backend/models/ImportModel.php @@ -10,12 +10,12 @@ use League\Csv\Statement as CsvStatement; /** * Model used for importing data * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ abstract class ImportModel extends Model { - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; /** * The attributes that aren't mass assignable. diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php index 9eb5d6b1d..2a133afef 100644 --- a/modules/backend/models/Preference.php +++ b/modules/backend/models/Preference.php @@ -13,12 +13,12 @@ use DateTimeZone; /** * Backend preferences for the backend user * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Preference extends Model { - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; const DEFAULT_THEME = 'twilight'; diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php index 46259792b..f18977b6c 100644 --- a/modules/backend/models/User.php +++ b/modules/backend/models/User.php @@ -4,17 +4,17 @@ use Mail; use Event; use Backend; use BackendAuth; -use October\Rain\Auth\Models\User as UserBase; +use Winter\Storm\Auth\Models\User as UserBase; /** * Administrator user model * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class User extends UserBase { - use \October\Rain\Database\Traits\SoftDelete; + use \Winter\Storm\Database\Traits\SoftDelete; /** * @var string The database table used by the model. diff --git a/modules/backend/models/UserGroup.php b/modules/backend/models/UserGroup.php index e9be8127e..88dc67eee 100644 --- a/modules/backend/models/UserGroup.php +++ b/modules/backend/models/UserGroup.php @@ -1,11 +1,11 @@
    diff --git a/modules/backend/skins/Standard.php b/modules/backend/skins/Standard.php index c77cda382..7d17f153b 100644 --- a/modules/backend/skins/Standard.php +++ b/modules/backend/skins/Standard.php @@ -2,14 +2,14 @@ use File; use Backend\Classes\Skin; -use October\Rain\Router\Helper as RouterHelper; +use Winter\Storm\Router\Helper as RouterHelper; /** * Standard skin information file. * * This skin uses the default paths always, there is no lookup required. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/backend/traits/CollapsableWidget.php b/modules/backend/traits/CollapsableWidget.php index 3fd907869..31a22db37 100644 --- a/modules/backend/traits/CollapsableWidget.php +++ b/modules/backend/traits/CollapsableWidget.php @@ -4,7 +4,7 @@ * Collapsable Widget Trait * Adds collapse/expand item features to back-end widgets * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/backend/traits/ErrorMaker.php b/modules/backend/traits/ErrorMaker.php index 3d807c7e6..d5099c85f 100644 --- a/modules/backend/traits/ErrorMaker.php +++ b/modules/backend/traits/ErrorMaker.php @@ -6,7 +6,7 @@ use System\Classes\ErrorHandler; * Error Maker Trait * Adds exception based methods to a class, goes well with `System\Traits\ViewMaker`. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ trait ErrorMaker diff --git a/modules/backend/traits/FormModelSaver.php b/modules/backend/traits/FormModelSaver.php index 221d900fd..1c475eea6 100644 --- a/modules/backend/traits/FormModelSaver.php +++ b/modules/backend/traits/FormModelSaver.php @@ -2,14 +2,14 @@ use Str; use Backend\Classes\FormField; -use October\Rain\Halcyon\Model as HalcyonModel; +use Winter\Storm\Halcyon\Model as HalcyonModel; /** * Implements special logic for processing form data, typically from from postback, and * filling the model attributes and attributes of any related models. This is a * customized, safer and simplified version of `$model->push()`. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ trait FormModelSaver @@ -30,7 +30,7 @@ trait FormModelSaver * $modelToSave->save(); * } * - * @param \October\Rain\Database\Model $model Model to fill. + * @param \Winter\Storm\Database\Model $model Model to fill. * @param array $saveData Attribute values to fill model. * @return array The collection of models to save. */ @@ -45,7 +45,7 @@ trait FormModelSaver /** * Sets a data collection to a model attributes, relations are also set. * - * @param \October\Rain\Database\Model $model Model to fill. + * @param \Winter\Storm\Database\Model $model Model to fill. * @param array $saveData Attribute values to fill model. * @return void */ @@ -91,7 +91,7 @@ trait FormModelSaver * Removes an array of attributes from the model. If the model implements * the Purgeable trait, this is preferred over the internal logic. * - * @param \October\Rain\Database\Model $model Model to adjust. + * @param \Winter\Storm\Database\Model $model Model to adjust. * @param array $attributesToPurge Attribute values to remove from the model. * @return void */ diff --git a/modules/backend/traits/FormModelWidget.php b/modules/backend/traits/FormModelWidget.php index 0186301c7..d53a0d6af 100644 --- a/modules/backend/traits/FormModelWidget.php +++ b/modules/backend/traits/FormModelWidget.php @@ -9,7 +9,7 @@ use Exception; * * Special logic for for form widgets that use a database stored model. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/backend/traits/InspectableContainer.php b/modules/backend/traits/InspectableContainer.php index 39bf65b02..a089518f9 100644 --- a/modules/backend/traits/InspectableContainer.php +++ b/modules/backend/traits/InspectableContainer.php @@ -8,7 +8,7 @@ use ApplicationException; * Inspectable Container Trait * Extension for controllers that can host inspectable widgets (Components, etc.) * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/backend/traits/PreferenceMaker.php b/modules/backend/traits/PreferenceMaker.php index 728329059..fe6e8d331 100644 --- a/modules/backend/traits/PreferenceMaker.php +++ b/modules/backend/traits/PreferenceMaker.php @@ -130,7 +130,7 @@ trait PreferenceMaker /** * Specifies the model used for storing the user preferences. * - * @return October\Rain\Database\Model + * @return Winter\Storm\Database\Model */ protected function getPreferenceStorage() { diff --git a/modules/backend/traits/SearchableWidget.php b/modules/backend/traits/SearchableWidget.php index 5c1866eea..e63bf7ed2 100644 --- a/modules/backend/traits/SearchableWidget.php +++ b/modules/backend/traits/SearchableWidget.php @@ -6,7 +6,7 @@ use Str; * Searchable Widget Trait * Adds search features to back-end widgets * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/backend/traits/SelectableWidget.php b/modules/backend/traits/SelectableWidget.php index 78e76afa9..5cefb5210 100644 --- a/modules/backend/traits/SelectableWidget.php +++ b/modules/backend/traits/SelectableWidget.php @@ -6,7 +6,7 @@ use Input; * Selectable Widget Trait * Adds item selection features to back-end widgets * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/backend/traits/SessionMaker.php b/modules/backend/traits/SessionMaker.php index 9483c2e4c..d327cd0c7 100644 --- a/modules/backend/traits/SessionMaker.php +++ b/modules/backend/traits/SessionMaker.php @@ -9,7 +9,7 @@ use Session; * Adds session management based methods to a controller class, or a class * that contains a `$controller` property referencing a controller. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ trait SessionMaker diff --git a/modules/backend/traits/UploadableWidget.php b/modules/backend/traits/UploadableWidget.php index d1895d8f4..18e5aaaf9 100644 --- a/modules/backend/traits/UploadableWidget.php +++ b/modules/backend/traits/UploadableWidget.php @@ -7,13 +7,13 @@ use Request; use Response; use ApplicationException; use System\Classes\MediaLibrary; -use October\Rain\Filesystem\Definitions as FileDefinitions; +use Winter\Storm\Filesystem\Definitions as FileDefinitions; /** * Uploadable Widget Trait * Adds media library upload features to back-end widgets * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ trait UploadableWidget diff --git a/modules/backend/traits/WidgetMaker.php b/modules/backend/traits/WidgetMaker.php index a26a8ab29..4a36f85a3 100644 --- a/modules/backend/traits/WidgetMaker.php +++ b/modules/backend/traits/WidgetMaker.php @@ -10,7 +10,7 @@ use SystemException; * Adds widget based methods to a controller class, or a class that * contains a `$controller` property referencing a controller. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ trait WidgetMaker diff --git a/modules/backend/widgets/Filter.php b/modules/backend/widgets/Filter.php index 7b3a8b40e..ad4bd4a89 100644 --- a/modules/backend/widgets/Filter.php +++ b/modules/backend/widgets/Filter.php @@ -15,7 +15,7 @@ use BackendAuth; * Filter Widget * Renders a container used for filtering things. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Filter extends WidgetBase diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php index 07898e5ae..753425647 100644 --- a/modules/backend/widgets/Form.php +++ b/modules/backend/widgets/Form.php @@ -7,8 +7,8 @@ use Backend\Classes\FormField; use Backend\Classes\WidgetBase; use Backend\Classes\WidgetManager; use Backend\Classes\FormWidgetBase; -use October\Rain\Database\Model; -use October\Rain\Html\Helper as HtmlHelper; +use Winter\Storm\Database\Model; +use Winter\Storm\Html\Helper as HtmlHelper; use ApplicationException; use Exception; use BackendAuth; @@ -17,7 +17,7 @@ use BackendAuth; * Form Widget * Used for building back end forms and renders a form. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Form extends WidgetBase @@ -160,7 +160,7 @@ class Form extends WidgetBase */ protected function loadAssets() { - $this->addJs('js/october.form.js', 'core'); + $this->addJs('js/winter.form.js', 'core'); } /** @@ -579,12 +579,12 @@ class Form extends WidgetBase * * Event::listen('backend.form.extendFields', function ((\Backend\Widgets\Form) $formWidget) { * // Only for the User controller - * if (!$formWidget->getController() instanceof \RainLab\User\Controllers\Users) { + * if (!$formWidget->getController() instanceof \Winter\User\Controllers\Users) { * return; * } * * // Only for the User model - * if (!$formWidget->model instanceof \RainLab\User\Models\User) { + * if (!$formWidget->model instanceof \Winter\User\Models\User) { * return; * } * @@ -605,12 +605,12 @@ class Form extends WidgetBase * * $formWidget->bindEvent('form.extendFields', function () use ((\Backend\Widgets\Form $formWidget)) { * // Only for the User controller - * if (!$formWidget->getController() instanceof \RainLab\User\Controllers\Users) { + * if (!$formWidget->getController() instanceof \Winter\User\Controllers\Users) { * return; * } * * // Only for the User model - * if (!$formWidget->model instanceof \RainLab\User\Models\User) { + * if (!$formWidget->model instanceof \Winter\User\Models\User) { * return; * } * @@ -1254,7 +1254,7 @@ class Form extends WidgetBase * * Example usage: * - * $model->bindEvent('model.form.filterFields', function ((\Backend\Widgets\Form) $formWidget, (stdClass) $fields, (string) $context) use (\October\Rain\Database\Model $model) { + * $model->bindEvent('model.form.filterFields', function ((\Backend\Widgets\Form) $formWidget, (stdClass) $fields, (string) $context) use (\Winter\Storm\Database\Model $model) { * if ($model->source_type == 'http') { * $fields->source_url->hidden = false; * $fields->git_branch->hidden = true; diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php index 42fce727e..e7a83873d 100644 --- a/modules/backend/widgets/Lists.php +++ b/modules/backend/widgets/Lists.php @@ -22,7 +22,7 @@ use BackendAuth; * List Widget * Used for building back end lists, renders a list of model objects * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Lists extends WidgetBase @@ -239,7 +239,7 @@ class Lists extends WidgetBase */ protected function loadAssets() { - $this->addJs('js/october.list.js', 'core'); + $this->addJs('js/winter.list.js', 'core'); } /** diff --git a/modules/backend/widgets/MediaManager.php b/modules/backend/widgets/MediaManager.php index a4e06b7d7..6e49b8b77 100644 --- a/modules/backend/widgets/MediaManager.php +++ b/modules/backend/widgets/MediaManager.php @@ -15,14 +15,14 @@ use ApplicationException; use Backend\Classes\WidgetBase; use System\Classes\MediaLibrary; use System\Classes\MediaLibraryItem; -use October\Rain\Database\Attach\Resizer; -use October\Rain\Filesystem\Definitions as FileDefinitions; +use Winter\Storm\Database\Attach\Resizer; +use Winter\Storm\Filesystem\Definitions as FileDefinitions; use Form as FormHelper; /** * Media Manager widget. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class MediaManager extends WidgetBase diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php index add008ecf..492aa9f7e 100644 --- a/modules/backend/widgets/ReportContainer.php +++ b/modules/backend/widgets/ReportContainer.php @@ -15,7 +15,7 @@ use ApplicationException; * Report Container Widget * Creates an area hosting report widgets. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class ReportContainer extends WidgetBase @@ -46,7 +46,7 @@ class ReportContainer extends WidgetBase * * defaultWidgets: * trafficOverview: - * class: RainLab\GoogleAnalytics\ReportWidgets\TrafficOverview + * class: Winter\GoogleAnalytics\ReportWidgets\TrafficOverview * sortOrder: 1 * configuration: * title: 'Traffic overview' diff --git a/modules/backend/widgets/Search.php b/modules/backend/widgets/Search.php index 8e554fb21..1f0e5d9ec 100644 --- a/modules/backend/widgets/Search.php +++ b/modules/backend/widgets/Search.php @@ -7,7 +7,7 @@ use Backend\Classes\WidgetBase; * Search Widget * Used for building a toolbar, Renders a search container. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Search extends WidgetBase diff --git a/modules/backend/widgets/Table.php b/modules/backend/widgets/Table.php index 198f93295..0d4d8f480 100644 --- a/modules/backend/widgets/Table.php +++ b/modules/backend/widgets/Table.php @@ -6,7 +6,7 @@ use Lang; use Input; use Request; use Backend\Classes\WidgetBase; -use October\Rain\Html\Helper as HtmlHelper; +use Winter\Storm\Html\Helper as HtmlHelper; use SystemException; /** @@ -14,7 +14,7 @@ use SystemException; * * Represents an editable tabular control. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Table extends WidgetBase diff --git a/modules/backend/widgets/Toolbar.php b/modules/backend/widgets/Toolbar.php index 7d028eefa..58c2aa55f 100644 --- a/modules/backend/widgets/Toolbar.php +++ b/modules/backend/widgets/Toolbar.php @@ -6,7 +6,7 @@ use Backend\Classes\WidgetBase; * Toolbar Widget * Used for building a toolbar, renders a toolbar. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class Toolbar extends WidgetBase diff --git a/modules/backend/widgets/form/assets/js/october.form.js b/modules/backend/widgets/form/assets/js/winter.form.js similarity index 99% rename from modules/backend/widgets/form/assets/js/october.form.js rename to modules/backend/widgets/form/assets/js/winter.form.js index ea72278dd..71a625354 100644 --- a/modules/backend/widgets/form/assets/js/october.form.js +++ b/modules/backend/widgets/form/assets/js/winter.form.js @@ -5,7 +5,7 @@ * - Nil */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var FormWidget = function (element, options) { @@ -19,7 +19,7 @@ this.dependantUpdateInterval = 300 this.dependantUpdateTimers = {} - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } diff --git a/modules/backend/widgets/lists/assets/js/october.list.js b/modules/backend/widgets/lists/assets/js/winter.list.js similarity index 96% rename from modules/backend/widgets/lists/assets/js/october.list.js rename to modules/backend/widgets/lists/assets/js/winter.list.js index ad30498ec..c2bb07baa 100644 --- a/modules/backend/widgets/lists/assets/js/october.list.js +++ b/modules/backend/widgets/lists/assets/js/winter.list.js @@ -119,16 +119,18 @@ // LIST WIDGET HELPERS // ================= + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - $.oc.listToggleChecked = function(el) { + $.wn.listToggleChecked = function(el) { $(el) .closest('[data-control="listwidget"]') .listWidget('toggleChecked', el) } - $.oc.listGetChecked = function(el) { + $.wn.listGetChecked = function(el) { return $(el) .closest('[data-control="listwidget"]') .listWidget('getChecked') diff --git a/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js index cef2f0fd7..c6559c004 100644 --- a/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js +++ b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser-min.js @@ -1,7 +1,7 @@ -+function($){"use strict";if($.oc.mediaManager===undefined) -$.oc.mediaManager={} -var Base=$.oc.foundation.base,BaseProto=Base.prototype ++function($){"use strict";if($.wn.mediaManager===undefined) +$.wn.mediaManager={} +var Base=$.wn.foundation.base,BaseProto=Base.prototype var MediaManager=function(element,options){this.$el=$(element) this.$form=this.$el.closest('form') this.options=options @@ -160,8 +160,8 @@ element=this.$form if(this.navigationAjax!==null){try{this.navigationAjax.abort()} catch(e){} this.releaseNavigationAjax()} -$.oc.stripeLoadIndicator.show() -this.navigationAjax=element.request(this.options.alias+'::'+handler,{data:data}).always(function(){$.oc.stripeLoadIndicator.hide()}).done(this.proxy(this.afterNavigate)).always(this.proxy(this.releaseNavigationAjax))} +$.wn.stripeLoadIndicator.show() +this.navigationAjax=element.request(this.options.alias+'::'+handler,{data:data}).always(function(){$.wn.stripeLoadIndicator.hide()}).done(this.proxy(this.afterNavigate)).always(this.proxy(this.releaseNavigationAjax))} MediaManager.prototype.releaseNavigationAjax=function(){this.navigationAjax=null} MediaManager.prototype.navigateToItem=function($item){if(!$item.length||!$item.data('path').length) return @@ -266,7 +266,7 @@ if(placeholderContainer) placeholderContainer.innerHTML=thumbnailInfo.markup}} MediaManager.prototype.placeholdersUpdated=function(){this.activeThumbnailQueueLength-- this.handleThumbnailQueue()} -MediaManager.prototype.getRelativePosition=function(element,pageX,pageY,startPosition){var absolutePosition=startPosition!==undefined?startPosition:$.oc.foundation.element.absolutePosition(element,true) +MediaManager.prototype.getRelativePosition=function(element,pageX,pageY,startPosition){var absolutePosition=startPosition!==undefined?startPosition:$.wn.foundation.element.absolutePosition(element,true) return{x:(pageX-absolutePosition.left),y:(pageY-absolutePosition.top+this.scrollContentElement.scrollTop)}} MediaManager.prototype.createSelectionMarker=function(){if(this.selectionMarker) return @@ -307,7 +307,7 @@ MediaManager.prototype.uploadQueueComplete=function(){this.$el.find('[data-comma this.$el.find('[data-command="close-uploader"]').removeClass('hide') this.refresh()} MediaManager.prototype.uploadSending=function(file,xhr,formData){formData.append('path',this.$el.find('[data-type="current-folder"]').val()) -xhr.setRequestHeader('X-OCTOBER-REQUEST-HANDLER',this.options.uploadHandler)} +xhr.setRequestHeader('X-WINTER-REQUEST-HANDLER',this.options.uploadHandler)} MediaManager.prototype.uploadCancelAll=function(){this.dropzone.removeAllFiles(true) this.hideUploadUi()} MediaManager.prototype.updateUploadBar=function(templateName,classNames){var fileNumberLabel=this.$el.get(0).querySelector('[data-label="file-number-and-progress"]'),successTemplate=fileNumberLabel.getAttribute('data-'+templateName+'-template'),progressBar=this.$el.get(0).querySelector('[data-control="upload-progress-bar"]') @@ -315,14 +315,14 @@ fileNumberLabel.innerHTML=successTemplate;progressBar.setAttribute('class',class MediaManager.prototype.uploadSuccess=function(){this.updateUploadBar('success','progress-bar progress-bar-success');} MediaManager.prototype.uploadError=function(file,message){this.updateUploadBar('error','progress-bar progress-bar-danger');if(file.xhr.status===413){message='Server rejected the file because it was too large, try increasing post_max_size';} if(!message){message='Error uploading file'} -$.oc.alert(message)} +$.wn.alert(message)} MediaManager.prototype.cropSelectedImage=function(callback){var selectedItems=this.getSelectedItems(true) if(selectedItems.length!=1){alert(this.options.selectSingleImage) return} if(selectedItems[0].getAttribute('data-document-type')!=='image'){alert(this.options.selectionNotImage) return} var path=selectedItems[0].getAttribute('data-path') -new $.oc.mediaManager.imageCropPopup(path,{alias:this.options.alias,onDone:callback})} +new $.wn.mediaManager.imageCropPopup(path,{alias:this.options.alias,onDone:callback})} MediaManager.prototype.onImageCropped=function(result){this.$el.trigger('popupcommand',['insert-cropped',result])} MediaManager.prototype.clearSearchTrackInputTimer=function(){if(this.searchTrackInputTimer===null) return @@ -338,30 +338,30 @@ this.lastSearchValue=value this.clearSearchTrackInputTimer() this.searchTrackInputTimer=window.setTimeout(this.proxy(this.updateSearchResults),300)} MediaManager.prototype.deleteItems=function(){var items=this.$el.get(0).querySelectorAll('[data-type="media-item"].selected') -if(!items.length){$.oc.alert(this.options.deleteEmpty) +if(!items.length){$.wn.alert(this.options.deleteEmpty) return} -$.oc.confirm(this.options.deleteConfirm,this.proxy(this.deleteConfirmation))} +$.wn.confirm(this.options.deleteConfirm,this.proxy(this.deleteConfirmation))} MediaManager.prototype.deleteConfirmation=function(confirmed){if(!confirmed) return var items=this.$el.get(0).querySelectorAll('[data-type="media-item"].selected'),paths=[] for(var i=0,len=items.length;i2||Math.abs(deltaY)>2)){this.createSelectionMarker() this.selectionMarker.setAttribute('class','') @@ -479,9 +479,9 @@ return result?result:this} $.fn.mediaManager.Constructor=MediaManager $.fn.mediaManager.noConflict=function(){$.fn.mediaManager=old return this} -$(document).on('render',function(){$('div[data-control=media-manager]').mediaManager()})}(window.jQuery);+function($){"use strict";if($.oc.mediaManager===undefined) -$.oc.mediaManager={} -var Base=$.oc.foundation.base,BaseProto=Base.prototype +$(document).on('render',function(){$('div[data-control=media-manager]').mediaManager()})}(window.jQuery);+function($){"use strict";if($.wn.mediaManager===undefined) +$.wn.mediaManager={} +var Base=$.wn.foundation.base,BaseProto=Base.prototype var MediaManagerImageCropPopup=function(path,options){this.$popupRootElement=null this.$popupElement=null this.selectionSizeLabel=null @@ -574,8 +574,8 @@ break case'normal':this.jCrop.setOptions({aspectRatio:0,minSize:[0,0],maxSize:[0,0],allowResize:true}) break}} MediaManagerImageCropPopup.prototype.cropAndInsert=function(){var data={img:$(this.imageArea).find('img').attr('src'),selection:this.jCrop.tellSelect()} -$.oc.stripeLoadIndicator.show() -this.$popupElement.find('form').request(this.options.alias+'::onCropImage',{data:data}).always(function(){$.oc.stripeLoadIndicator.hide()}).done(this.proxy(this.onImageCropped))} +$.wn.stripeLoadIndicator.show() +this.$popupElement.find('form').request(this.options.alias+'::onCropImage',{data:data}).always(function(){$.wn.stripeLoadIndicator.hide()}).done(this.proxy(this.onImageCropped))} MediaManagerImageCropPopup.prototype.onImageCropped=function(response){this.hide() if(this.options.onDone!==undefined){this.options.onDone(response)}} MediaManagerImageCropPopup.prototype.showResizePopup=function(){this.$popupElement.find('button[data-command=resize]').popup({content:this.$popupElement.find('[data-control="resize-template"]').html(),zIndex:1220})} @@ -597,8 +597,8 @@ $otherInput.val(Math.round(value))} MediaManagerImageCropPopup.prototype.onResizeDimensionChanged=function(ev){var $target=$(ev.target) $target.val(this.fixDimensionValue($target.val()))} MediaManagerImageCropPopup.prototype.onResizeSubmit=function(ev){var data={cropSessionKey:this.$popupElement.find('input[name=cropSessionKey]').val(),path:this.$popupElement.find('input[name=path]').val()} -$.oc.stripeLoadIndicator.show() -$(ev.target).request(this.options.alias+'::onResizeImage',{data:data}).always(function(){$.oc.stripeLoadIndicator.hide()}).done(this.proxy(this.imageResized)) +$.wn.stripeLoadIndicator.show() +$(ev.target).request(this.options.alias+'::onResizeImage',{data:data}).always(function(){$.wn.stripeLoadIndicator.hide()}).done(this.proxy(this.imageResized)) ev.preventDefault() return false} MediaManagerImageCropPopup.prototype.imageResized=function(response){this.$popupElement.find('button[data-command=resize]').popup('hide') @@ -662,4 +662,4 @@ case'undo-resizing':this.undoResizing() break}} MediaManagerImageCropPopup.prototype.onSelectionChanged=function(c){this.updateSelectionSizeLabel(c.w,c.h)} MediaManagerImageCropPopup.DEFAULTS={alias:undefined,onDone:undefined} -$.oc.mediaManager.imageCropPopup=MediaManagerImageCropPopup}(window.jQuery); \ No newline at end of file +$.wn.mediaManager.imageCropPopup=MediaManagerImageCropPopup}(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js index 7cdb81ccc..be0f27540 100644 --- a/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js +++ b/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js @@ -1,8 +1,7 @@ /* - * This is a bundle file, you can compile this in two ways: - * (1) Using your favorite JS combiner - * (2) Using CLI command: - * php artisan october:util compile assets + * This is a bundle file, you can compile this by running + * + * php artisan winter:util compile assets * * @see build-min.js * diff --git a/modules/backend/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js index a63130775..b740c12f3 100644 --- a/modules/backend/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js +++ b/modules/backend/widgets/mediamanager/assets/js/mediamanager.imagecroppopup.js @@ -3,10 +3,10 @@ */ +function ($) { "use strict"; - if ($.oc.mediaManager === undefined) - $.oc.mediaManager = {} + if ($.wn.mediaManager === undefined) + $.wn.mediaManager = {} - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var MediaManagerImageCropPopup = function(path, options) { @@ -235,7 +235,7 @@ selection: this.jCrop.tellSelect() } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$popupElement .find('form') @@ -243,7 +243,7 @@ data: data }) .always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) .done(this.proxy(this.onImageCropped)) } @@ -316,11 +316,11 @@ path: this.$popupElement.find('input[name=path]').val() } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() $(ev.target).request(this.options.alias+'::onResizeImage', { data: data }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }).done(this.proxy(this.imageResized)) ev.preventDefault() @@ -381,7 +381,7 @@ this.$popupElement.find('form').request(this.options.alias+'::onEndCroppingSession') // Release clickedElement reference inside redactor.js - // If we don't do it, the image editor popup DOM elements + // If we don't do it, the image editor popup DOM elements // won't be removed from the memory. $(document).trigger('mousedown') @@ -476,5 +476,5 @@ onDone: undefined } - $.oc.mediaManager.imageCropPopup = MediaManagerImageCropPopup + $.wn.mediaManager.imageCropPopup = MediaManagerImageCropPopup }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/mediamanager/assets/js/mediamanager.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager.js index 178d91569..7c64e47df 100644 --- a/modules/backend/widgets/mediamanager/assets/js/mediamanager.js +++ b/modules/backend/widgets/mediamanager/assets/js/mediamanager.js @@ -2,14 +2,14 @@ * Media manager control class * * Dependences: - * - Scrollpad (october.scrollpad.js) + * - Scrollpad (winter.scrollpad.js) */ +function ($) { "use strict"; - if ($.oc.mediaManager === undefined) - $.oc.mediaManager = {} + if ($.wn.mediaManager === undefined) + $.wn.mediaManager = {} - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype // MEDIA MANAGER CLASS DEFINITION @@ -382,11 +382,11 @@ this.releaseNavigationAjax() } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.navigationAjax = element.request(this.options.alias+'::' + handler, { data: data }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) .done(this.proxy(this.afterNavigate)) .always(this.proxy(this.releaseNavigationAjax)) @@ -676,7 +676,7 @@ // MediaManager.prototype.getRelativePosition = function(element, pageX, pageY, startPosition) { - var absolutePosition = startPosition !== undefined ? startPosition : $.oc.foundation.element.absolutePosition(element, true) + var absolutePosition = startPosition !== undefined ? startPosition : $.wn.foundation.element.absolutePosition(element, true) return { x: (pageX - absolutePosition.left), // There is no horizontal scroll @@ -796,7 +796,7 @@ MediaManager.prototype.uploadSending = function(file, xhr, formData) { formData.append('path', this.$el.find('[data-type="current-folder"]').val()) - xhr.setRequestHeader('X-OCTOBER-REQUEST-HANDLER', this.options.uploadHandler) + xhr.setRequestHeader('X-WINTER-REQUEST-HANDLER', this.options.uploadHandler) } MediaManager.prototype.uploadCancelAll = function() { @@ -827,7 +827,7 @@ message = 'Error uploading file' } - $.oc.alert(message) + $.wn.alert(message) } // @@ -849,7 +849,7 @@ var path = selectedItems[0].getAttribute('data-path') - new $.oc.mediaManager.imageCropPopup(path, { + new $.wn.mediaManager.imageCropPopup(path, { alias: this.options.alias, onDone: callback }) @@ -905,11 +905,11 @@ var items = this.$el.get(0).querySelectorAll('[data-type="media-item"].selected') if (!items.length) { - $.oc.alert(this.options.deleteEmpty) + $.wn.alert(this.options.deleteEmpty) return } - $.oc.confirm(this.options.deleteConfirm, this.proxy(this.deleteConfirmation)) + $.wn.confirm(this.options.deleteConfirm, this.proxy(this.deleteConfirmation)) } MediaManager.prototype.deleteConfirmation = function(confirmed) { @@ -934,11 +934,11 @@ paths: paths } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$form.request(this.options.alias+'::onDeleteItem', { data: data }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }).done(this.proxy(this.afterNavigate)) } @@ -964,11 +964,11 @@ path: this.$el.find('[data-type="current-folder"]').val() } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$form.request(this.options.alias+'::onCreateFolder', { data: data }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }).done(this.proxy(this.folderCreated)) ev.preventDefault() @@ -985,7 +985,7 @@ var items = this.$el.get(0).querySelectorAll('[data-type="media-item"].selected') if (!items.length) { - $.oc.alert(this.options.moveEmpty) + $.wn.alert(this.options.moveEmpty) return } @@ -1033,11 +1033,11 @@ data.files.push(path) } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$form.request(this.options.alias+'::onMoveItems', { data: data }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }).done(this.proxy(this.itemsMoved)) ev.preventDefault() @@ -1142,9 +1142,9 @@ this.itemListElement.addEventListener('mousemove', this.proxy(this.onListMouseMove)) document.addEventListener('mouseup', this.proxy(this.onListMouseUp)) - this.itemListPosition = $.oc.foundation.element.absolutePosition(this.itemListElement, true) + this.itemListPosition = $.wn.foundation.element.absolutePosition(this.itemListElement, true) - var pagePosition = $.oc.foundation.event.pageCoordinates(ev), + var pagePosition = $.wn.foundation.event.pageCoordinates(ev), relativePosition = this.getRelativePosition(this.itemListElement, pagePosition.x, pagePosition.y, this.itemListPosition) this.selectionStartPoint = relativePosition @@ -1160,11 +1160,11 @@ this.unselectRoot() var items = this.itemListElement.querySelectorAll('[data-type="media-item"]:not([data-root])'), - selectionPosition = $.oc.foundation.element.absolutePosition(this.selectionMarker, true) + selectionPosition = $.wn.foundation.element.absolutePosition(this.selectionMarker, true) for (var index = 0, len = items.length; index < len; index++) { var item = items[index], - itemPosition = $.oc.foundation.element.absolutePosition(item, true) + itemPosition = $.wn.foundation.element.absolutePosition(item, true) if (this.doObjectsCollide( selectionPosition.top, @@ -1197,7 +1197,7 @@ } MediaManager.prototype.onListMouseMove = function(ev) { - var pagePosition = $.oc.foundation.event.pageCoordinates(ev), + var pagePosition = $.wn.foundation.event.pageCoordinates(ev), relativePosition = this.getRelativePosition(this.itemListElement, pagePosition.x, pagePosition.y, this.itemListPosition) var deltaX = relativePosition.x - this.selectionStartPoint.x, diff --git a/modules/backend/widgets/mediamanager/assets/js/mediamanager.popup.js b/modules/backend/widgets/mediamanager/assets/js/mediamanager.popup.js index 695d20eb0..4bd048112 100644 --- a/modules/backend/widgets/mediamanager/assets/js/mediamanager.popup.js +++ b/modules/backend/widgets/mediamanager/assets/js/mediamanager.popup.js @@ -3,10 +3,10 @@ */ +function ($) { "use strict"; - if ($.oc.mediaManager === undefined) - $.oc.mediaManager = {} + if ($.wn.mediaManager === undefined) + $.wn.mediaManager = {} - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var MediaManagerPopup = function(options) { @@ -96,7 +96,7 @@ mediaManager.remove() // Release clickedElement reference inside redactor.js - // If we don't do it, the Media Manager popup DOM elements + // If we don't do it, the Media Manager popup DOM elements // won't be removed from the memory. $(document).trigger('mousedown') @@ -117,10 +117,10 @@ MediaManagerPopup.prototype.onPopupCommand = function(ev, command, param) { switch (command) { - case 'insert' : + case 'insert' : this.insertMedia() break; - case 'insert-cropped' : + case 'insert-cropped' : this.insertCroppedImage(param) break; } @@ -136,5 +136,5 @@ onClose: undefined } - $.oc.mediaManager.popup = MediaManagerPopup + $.wn.mediaManager.popup = MediaManagerPopup }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm index 02749b1a3..530a53283 100644 --- a/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm +++ b/modules/backend/widgets/mediamanager/partials/_crop-toolbar.htm @@ -18,7 +18,7 @@ - +
    diff --git a/modules/backend/widgets/mediamanager/partials/_folder-toolbar.htm b/modules/backend/widgets/mediamanager/partials/_folder-toolbar.htm index 204939c9d..ed68a76f1 100644 --- a/modules/backend/widgets/mediamanager/partials/_folder-toolbar.htm +++ b/modules/backend/widgets/mediamanager/partials/_folder-toolbar.htm @@ -9,7 +9,7 @@
    diff --git a/modules/backend/widgets/mediamanager/partials/_toolbar.htm b/modules/backend/widgets/mediamanager/partials/_toolbar.htm index 265fb791d..4eb5de9a8 100644 --- a/modules/backend/widgets/mediamanager/partials/_toolbar.htm +++ b/modules/backend/widgets/mediamanager/partials/_toolbar.htm @@ -4,17 +4,17 @@
    readOnly) : ?>
    - - + +
    - + readOnly) : ?>
    - - + +
    diff --git a/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm b/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm index 2826b33c8..396481fa7 100644 --- a/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm +++ b/modules/backend/widgets/mediamanager/partials/_view-mode-buttons.htm @@ -1,18 +1,18 @@ \ No newline at end of file diff --git a/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js b/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js index 26fb91034..9ea9ea4bf 100644 --- a/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js +++ b/modules/backend/widgets/reportcontainer/assets/js/reportcontainer.js @@ -81,7 +81,7 @@ this.$el.on('click', '.content > button.close', function() { var $btn = $(this) - $.oc.confirm($.oc.lang.get('alert.widget_remove_confirm'), function() { + $.wn.confirm($.wn.lang.get('alert.widget_remove_confirm'), function() { self.$form.request(self.alias + '::onRemoveWidget', { data: { 'alias': $('[data-widget-alias]', $btn.closest('div.content')).val() diff --git a/modules/backend/widgets/reportcontainer/partials/_widget.htm b/modules/backend/widgets/reportcontainer/partials/_widget.htm index 2532271a7..6b08f9f54 100644 --- a/modules/backend/widgets/reportcontainer/partials/_widget.htm +++ b/modules/backend/widgets/reportcontainer/partials/_widget.htm @@ -9,7 +9,7 @@
    render() ?>
    @@ -24,7 +24,7 @@ @@ -39,7 +39,7 @@ data-request-success="$(window).trigger('oc.reportWidgetRefresh')" data-request="getEventHandler('onResetWidgets') ?>" data-request-confirm="" - class="oc-icon-repeat" + class="wn-icon-repeat" tabindex="-1"> diff --git a/modules/backend/widgets/table/README.md b/modules/backend/widgets/table/README.md index d823aa4ea..32a01b98d 100644 --- a/modules/backend/widgets/table/README.md +++ b/modules/backend/widgets/table/README.md @@ -32,12 +32,12 @@ The data source and cell processor JavaScript classes use the simple parasitic c ### Namespaces -All classes for the table widget are be defined in the **$.oc.table** namespace. There are several namespaces in this namespace: +All classes for the table widget are be defined in the **$.wn.table** namespace. There are several namespaces in this namespace: -- **$.oc.table.processor** - cell processors -- **$.oc.table.datasource** - data sources -- **$.oc.table.helper** - helper classes -- **$.oc.table.validator** - validation classes +- **$.wn.table.processor** - cell processors +- **$.wn.table.datasource** - data sources +- **$.wn.table.helper** - helper classes +- **$.wn.table.validator** - validation classes ### Client-side performance and memory usage considerations @@ -67,14 +67,14 @@ Any `DIV` elements that have the `data-control="table"` attributes are automatic ### Options -The options below are listed in the JavaScript notation. Corresponding data attributes would look like `data-client-data-source-class`. +The options below are listed in the JavaScript notation. Corresponding data attributes would look like `data-client-data-source-class`. - `clientDataSourceСlass` (default is **client**)- specifies the client-side data source class. There are two data source classes supported on the client side - **client** and **server**. - `data` - specifies the data in JSON format for the **client**. - `recordsPerPage` - specifies how many records per page to display. If the value is not defined or `false` or `null`, the pagination feature is disabled and all records are displayed. Pagination and `rowSorting` cannot be used in the same time. - `columns` - column definitions in JSON format, see the server-side column definition format below. - `rowSorting` - enables the drag & drop row sorting. The sorting cannot be used with the pagination (`recordsPerPage` is not `null` or `false`). -- `keyColumn` - specifies the name of the key column. The default value is **id**. +- `keyColumn` - specifies the name of the key column. The default value is **id**. - `postback` - post the client-memory data source data to the server automatically when the parent form gets submitted. The default value is `true`. The option is used only with client-memory data sources. When enabled, the data source data is available in the widget's server-side data source: `$table->getDataSource()->getRecords();` The data postback occurs only of the request handler name matches the `postbackHandlerName` option value. - `postbackHandlerName` - AJAX data handler name for the automatic data postback. The data will be posted only when the AJAX request posts data matching this handler name. The default value is **onSave**. - `adding` - determines whether users can add new records. Default value is **true**. @@ -84,11 +84,11 @@ The options below are listed in the JavaScript notation. Corresponding data attr ## Client-side helper classes -Some auxiliary code is factored out from the table class to helper classes. The helper classes are defined in the **$.oc.table.helper** namespace. +Some auxiliary code is factored out from the table class to helper classes. The helper classes are defined in the **$.wn.table.helper** namespace. - **table.helper.navigation.js** - implements the keyboard navigation within the table and pagination. -## Data sources ($.oc.table.datasource) +## Data sources ($.wn.table.datasource) ### Adding and removing records @@ -100,15 +100,15 @@ When user deletes a record, the table object calls the `deleteRecord(index, offs The `onSuccess` callback parameters are: data (records), count. -### Client memory data source ($.oc.table.datasource.client) +### Client memory data source ($.wn.table.datasource.client) The client memory data sources keeps the data in the client memory. The data is loaded from the control element's `data` property (`data-data` attribute) and posted back with the form data. -### Server memory data source ($.oc.table.datasource.server) +### Server memory data source ($.wn.table.datasource.server) **TODO:** document this -## Cell processors ($.oc.table.processor) +## Cell processors ($.wn.table.processor) Cell processors are responsible for rendering the cell content, creating the cell data editors and updating the cell value in the grid control. There is a single cell processor per the table column. All rows in a specific column are handled with a same cell processor. @@ -148,7 +148,7 @@ The drop-down options could depend on other columns. This works only with AJAX-b type: dropdown dependsOn: country -Multiple fields are allowed as well: +Multiple fields are allowed as well: state: title: State @@ -169,7 +169,7 @@ The autocomplete column type can load options from the column configuration or w green: Green blue: Blue -If the `options` element is not presented in the configuration, the options will be loaded with AJAX. +If the `options` element is not presented in the configuration, the options will be loaded with AJAX. **TODO:** Document the AJAX interface @@ -208,7 +208,7 @@ Columns are defined as array with the `columns` property. The array keys corresp - `dependsOn` (from drop-down elements) - validation - defines the column client-side validation rules. See the **Client-side validation** section below. -## Events +## Events ### table.getDropdownOptions @@ -251,7 +251,7 @@ The `initRecords()` method can be called multiple times. Each call adds records ## Emptying the data source -The `purge` method removes all records from the data source. This method should always be used with server memory data sources. Nonetheless, server side data sources should take care about providing the automatic ways of cleaning data with using the time-to-live mechanisms. +The `purge` method removes all records from the data source. This method should always be used with server memory data sources. Nonetheless, server side data sources should take care about providing the automatic ways of cleaning data with using the time-to-live mechanisms. ``` $table = new Table($this, $config); @@ -273,7 +273,7 @@ In PHP reading data from a data source of any type looks like this (it should be ``` public function onSave() { - // Assuming that the widget was initialized in the + // Assuming that the widget was initialized in the // controller constructor with the "table" alias. $dataSource = $this->widget->table->getDataSource(); @@ -287,7 +287,7 @@ public function onSave() There are two ways to validate the table data - with the client-side and server-side validation. -### Client-side validation ($.oc.table.validator) +### Client-side validation ($.wn.table.validator) The client-side validation is performed before the data is sent to the server, or before the user navigates to another page (if the pagination is enabled). Client-side validation is a fast, but simple validation implementation. It can't be used for complex cases like finding duplicating records, or comparing data with records existing in the database. @@ -319,13 +319,13 @@ Currently implemented client-side validation rules: - length - regex -Validation rules can be configured with extra parameters, which depend on a specific validator. +Validation rules can be configured with extra parameters, which depend on a specific validator. -#### required validator ($.oc.table.validator.required) +#### required validator ($.wn.table.validator.required) -Checks if the user has provided a value for the cell. +Checks if the user has provided a value for the cell. -#### integer validator ($.oc.table.validator.integer) +#### integer validator ($.wn.table.validator.integer) Checks if the value is integer. Parameters: @@ -337,7 +337,7 @@ Checks if the value is integer. Parameters: * `value` - defines the maximum value. * `message` - optional, defines the error message. -Example of defining the integer validator with the `min` parameter: +Example of defining the integer validator with the `min` parameter: length: title: Length @@ -348,7 +348,7 @@ Example of defining the integer validator with the `min` parameter: value: 3 message: "The length cannot be less than 3" -#### float validator ($.oc.table.validator.float) +#### float validator ($.wn.table.validator.float) Checks if the value is a floating point number. The parameters for this validator match the parameters of the **integer** validator. @@ -359,7 +359,7 @@ Valid floating point number formats: * -10 (if `allowNegative` is `true`) * -10.84 (if `allowNegative` is `true`) -#### length validator ($.oc.table.validator.length) +#### length validator ($.wn.table.validator.length) Checks if a string is not shorter or longer than specified values. Parameters: @@ -381,12 +381,12 @@ Example column definition: value: 3 message: "The name is too short." -#### regex validator ($.oc.table.validator.regex) +#### regex validator ($.wn.table.validator.regex) Checks a string against a provided regular expression: * `pattern` - specifies the regular expression pattern string. Example: **^[0-9a-z]+$** -* `modifiers` - optional, a string containing regular expression modifiers (https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/RegExp), for example **i** for "case insensitive". +* `modifiers` - optional, a string containing regular expression modifiers (https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/RegExp), for example **i** for "case insensitive". Example: diff --git a/modules/backend/widgets/table/ServerEventDataSource.php b/modules/backend/widgets/table/ServerEventDataSource.php index cfc40060b..800a758eb 100644 --- a/modules/backend/widgets/table/ServerEventDataSource.php +++ b/modules/backend/widgets/table/ServerEventDataSource.php @@ -5,7 +5,7 @@ */ class ServerEventDataSource extends DataSourceBase { - use \October\Rain\Support\Traits\Emitter; + use \Winter\Storm\Support\Traits\Emitter; /** * Return records from the data source. diff --git a/modules/backend/widgets/table/assets/js/build-min.js b/modules/backend/widgets/table/assets/js/build-min.js index 45068e70a..eca39ceb6 100644 --- a/modules/backend/widgets/table/assets/js/build-min.js +++ b/modules/backend/widgets/table/assets/js/build-min.js @@ -1,8 +1,10 @@ -+function($){"use strict";if($.oc===undefined) -$.oc={} -if($.oc.table===undefined) -$.oc.table={} ++function($){"use strict";if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn +if($.wn.table===undefined) +$.wn.table={} var Table=function(element,options){this.el=element this.$el=$(element) this.options=options @@ -29,11 +31,11 @@ this.search=null this.recordsAddedOrDeleted=0 this.disposeBound=this.dispose.bind(this) this.init() -$.oc.foundation.controlUtils.markDisposable(element)} +$.wn.foundation.controlUtils.markDisposable(element)} Table.prototype.init=function(){this.createDataSource() this.initCellProcessors() -this.navigation=new $.oc.table.helper.navigation(this) -this.search=new $.oc.table.helper.search(this) +this.navigation=new $.wn.table.helper.navigation(this) +this.search=new $.wn.table.helper.search(this) this.buildUi() this.registerHandlers()} Table.prototype.disposeCellProcessors=function(){for(var i=0,len=this.options.columns.length;i0} -$.oc.table.validator.base=Base;}(window.jQuery);+function($){"use strict";if($.oc.table===undefined) -throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded.");if($.oc.table.validator===undefined) -throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.oc.table.validator.base,BaseProto=Base.prototype +$.wn.table.validator.base=Base;}(window.jQuery);+function($){"use strict";if($.wn.table===undefined) +throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded.");if($.wn.table.validator===undefined) +throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.wn.table.validator.base,BaseProto=Base.prototype var Required=function(options){Base.call(this,options)};Required.prototype=Object.create(BaseProto) Required.prototype.constructor=Required Required.prototype.validateValue=function(value,rowData){value=this.trim(value) if(value.length===0) return this.getMessage("The value should not be empty.") return} -$.oc.table.validator.required=Required}(window.jQuery);+function($){"use strict";if($.oc.table===undefined) -throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded.");if($.oc.table.validator===undefined) -throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.oc.table.validator.base,BaseProto=Base.prototype +$.wn.table.validator.required=Required}(window.jQuery);+function($){"use strict";if($.wn.table===undefined) +throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded.");if($.wn.table.validator===undefined) +throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.wn.table.validator.base,BaseProto=Base.prototype var BaseNumber=function(options){Base.call(this,options)};BaseNumber.prototype=Object.create(BaseProto) BaseNumber.prototype.constructor=BaseNumber BaseNumber.prototype.doCommonChecks=function(value){if(this.options.min!==undefined||this.options.max!==undefined){if(this.options.min!==undefined){if(this.options.min.value===undefined) @@ -1027,10 +1029,10 @@ if(this.options.max!==undefined){if(this.options.max.value===undefined) throw new Error('The max.value parameter is not defined in the table validator configuration') if(value>this.options.max.value){return this.options.max.message!==undefined?this.options.max.message:"The value should not be more than "+this.options.max.value}}} return} -$.oc.table.validator.baseNumber=BaseNumber}(window.jQuery);+function($){"use strict";if($.oc.table===undefined) -throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded.");if($.oc.table.validator===undefined) -throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");if($.oc.table.validator.baseNumber===undefined) -throw new Error("The $.oc.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded.");var Base=$.oc.table.validator.baseNumber,BaseProto=Base.prototype +$.wn.table.validator.baseNumber=BaseNumber}(window.jQuery);+function($){"use strict";if($.wn.table===undefined) +throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded.");if($.wn.table.validator===undefined) +throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");if($.wn.table.validator.baseNumber===undefined) +throw new Error("The $.wn.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded.");var Base=$.wn.table.validator.baseNumber,BaseProto=Base.prototype var Integer=function(options){Base.call(this,options)};Integer.prototype=Object.create(BaseProto) Integer.prototype.constructor=Integer Integer.prototype.validateValue=function(value,rowData){value=this.trim(value) @@ -1039,10 +1041,10 @@ return var testResult=this.options.allowNegative?/^\-?[0-9]*$/.test(value):/^[0-9]*$/.test(value) if(!testResult){var defaultMessage=this.options.allowNegative?'The value should be an integer.':'The value should be a positive integer';return this.getMessage(defaultMessage)} return this.doCommonChecks(parseInt(value))} -$.oc.table.validator.integer=Integer}(window.jQuery);+function($){"use strict";if($.oc.table===undefined) -throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded.");if($.oc.table.validator===undefined) -throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");if($.oc.table.validator.baseNumber===undefined) -throw new Error("The $.oc.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded.");var Base=$.oc.table.validator.baseNumber,BaseProto=Base.prototype +$.wn.table.validator.integer=Integer}(window.jQuery);+function($){"use strict";if($.wn.table===undefined) +throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded.");if($.wn.table.validator===undefined) +throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");if($.wn.table.validator.baseNumber===undefined) +throw new Error("The $.wn.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded.");var Base=$.wn.table.validator.baseNumber,BaseProto=Base.prototype var Float=function(options){Base.call(this,options)};Float.prototype=Object.create(BaseProto) Float.prototype.constructor=Float Float.prototype.validateValue=function(value,rowData){value=this.trim(value) @@ -1051,9 +1053,9 @@ return var testResult=this.options.allowNegative?/^[-]?([0-9]+\.[0-9]+|[0-9]+)$/.test(value):/^([0-9]+\.[0-9]+|[0-9]+)$/.test(value) if(!testResult){var defaultMessage=this.options.allowNegative?'The value should be a floating point number.':'The value should be a positive floating point number';return this.getMessage(defaultMessage)} return this.doCommonChecks(parseFloat(value))} -$.oc.table.validator.float=Float}(window.jQuery);+function($){"use strict";if($.oc.table===undefined) -throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded.");if($.oc.table.validator===undefined) -throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.oc.table.validator.base,BaseProto=Base.prototype +$.wn.table.validator.float=Float}(window.jQuery);+function($){"use strict";if($.wn.table===undefined) +throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded.");if($.wn.table.validator===undefined) +throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.wn.table.validator.base,BaseProto=Base.prototype var Length=function(options){Base.call(this,options)};Length.prototype=Object.create(BaseProto) Length.prototype.constructor=Length Length.prototype.validateValue=function(value,rowData){value=this.trim(value) @@ -1066,9 +1068,9 @@ if(this.options.max!==undefined){if(this.options.max.value===undefined) throw new Error('The max.value parameter is not defined in the Length table validator configuration') if(value.length>this.options.max.value){return this.options.max.message!==undefined?this.options.max.message:"The string should not be longer than "+this.options.max.value}}} return} -$.oc.table.validator.length=Length}(window.jQuery);+function($){"use strict";if($.oc.table===undefined) -throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded.");if($.oc.table.validator===undefined) -throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.oc.table.validator.base,BaseProto=Base.prototype +$.wn.table.validator.length=Length}(window.jQuery);+function($){"use strict";if($.wn.table===undefined) +throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded.");if($.wn.table.validator===undefined) +throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded.");var Base=$.wn.table.validator.base,BaseProto=Base.prototype var Regex=function(options){Base.call(this,options)};Regex.prototype=Object.create(BaseProto) Regex.prototype.constructor=Regex Regex.prototype.validateValue=function(value,rowData){value=this.trim(value) @@ -1080,4 +1082,4 @@ var regexObj=new RegExp(this.options.pattern,this.options.modifiers) if(!regexObj.test(value)) return this.getMessage("Invalid value format.") return} -$.oc.table.validator.regex=Regex}(window.jQuery); \ No newline at end of file +$.wn.table.validator.regex=Regex}(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/build.js b/modules/backend/widgets/table/assets/js/build.js index 7e1638de6..c7f914624 100644 --- a/modules/backend/widgets/table/assets/js/build.js +++ b/modules/backend/widgets/table/assets/js/build.js @@ -1,8 +1,7 @@ /* - * This is a bundle file, you can compile this in two ways: - * (1) Using your favorite JS combiner - * (2) Using CLI command: - * php artisan october:util compile assets + * This is a bundle file, you can compile this by running + * + * php artisan winter:util compile assets * * @see build-min.js * diff --git a/modules/backend/widgets/table/assets/js/table.datasource.base.js b/modules/backend/widgets/table/assets/js/table.datasource.base.js index 07f1c0202..715328b15 100644 --- a/modules/backend/widgets/table/assets/js/table.datasource.base.js +++ b/modules/backend/widgets/table/assets/js/table.datasource.base.js @@ -6,11 +6,11 @@ // DATASOURCE NAMESPACES // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.datasource === undefined) - $.oc.table.datasource = {} + if ($.wn.table.datasource === undefined) + $.wn.table.datasource = {} // CLASS DEFINITION // ============================ @@ -31,8 +31,8 @@ * Fetches records from the underlying data source and * passes them to the onSuccess callback function. * The onSuccess callback parameters: records, totalCount. - * Each record contains the key field which uniquely identifies - * the record. The name of the key field is defined with the table + * Each record contains the key field which uniquely identifies + * the record. The name of the key field is defined with the table * widget options. */ Base.prototype.getRecords = function(offset, count, onSuccess) { @@ -49,7 +49,7 @@ /* * Creates a record with the passed data and returns the updated page records * to the onSuccess callback function. - * + * * - recordData - the record fields * - placement - "bottom" (the end of the data set), "above", "below" * - relativeToKey - a row key, required if the placement is not "bottom" @@ -88,5 +88,5 @@ onSuccess([], 0) } - $.oc.table.datasource.base = Base; + $.wn.table.datasource.base = Base; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.datasource.client.js b/modules/backend/widgets/table/assets/js/table.datasource.client.js index 4648d6226..26f1b1114 100644 --- a/modules/backend/widgets/table/assets/js/table.datasource.client.js +++ b/modules/backend/widgets/table/assets/js/table.datasource.client.js @@ -6,16 +6,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.datasource === undefined) - throw new Error("The $.oc.table.datasource namespace is not defined. Make sure that the table.datasource.base.js script is loaded."); + if ($.wn.table.datasource === undefined) + throw new Error("The $.wn.table.datasource namespace is not defined. Make sure that the table.datasource.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.datasource.base, + var Base = $.wn.table.datasource.base, BaseProto = Base.prototype var Client = function(tableObj) { @@ -41,8 +41,8 @@ * Fetches records from the underlying data source and * passes them to the onSuccess callback function. * The onSuccess callback parameters: records, totalCount. - * Each record contains the key field which uniquely identifies - * the record. The name of the key field is defined with the table + * Each record contains the key field which uniquely identifies + * the record. The name of the key field is defined with the table * widget options. */ Client.prototype.getRecords = function(offset, count, onSuccess) { @@ -59,7 +59,7 @@ /* * Creates a record with the passed data and returns the updated page records * to the onSuccess callback function. - * + * * - recordData - the record fields * - placement - "bottom" (the end of the data set), "above", "below" * - relativeToKey - a row key, required if the placement is not "bottom" @@ -144,5 +144,5 @@ return this.data } - $.oc.table.datasource.client = Client + $.wn.table.datasource.client = Client }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.datasource.server.js b/modules/backend/widgets/table/assets/js/table.datasource.server.js index acb9f5c02..1be3eb907 100644 --- a/modules/backend/widgets/table/assets/js/table.datasource.server.js +++ b/modules/backend/widgets/table/assets/js/table.datasource.server.js @@ -6,16 +6,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.datasource === undefined) - throw new Error("The $.oc.table.datasource namespace is not defined. Make sure that the table.datasource.base.js script is loaded."); + if ($.wn.table.datasource === undefined) + throw new Error("The $.wn.table.datasource namespace is not defined. Make sure that the table.datasource.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.datasource.base, + var Base = $.wn.table.datasource.base, BaseProto = Base.prototype var Server = function(tableObj) { @@ -41,8 +41,8 @@ * Fetches records from the underlying data source and * passes them to the onSuccess callback function. * The onSuccess callback parameters: records, totalCount. - * Each record contains the key field which uniquely identifies - * the record. The name of the key field is defined with the table + * Each record contains the key field which uniquely identifies + * the record. The name of the key field is defined with the table * widget options. */ Server.prototype.getRecords = function(offset, count, onSuccess) { @@ -76,7 +76,7 @@ /* * Creates a record with the passed data and returns the updated page records * to the onSuccess callback function. - * + * * - recordData - the record fields * - placement - "bottom" (the end of the data set), "above", "below" * - relativeToKey - a row key, required if the placement is not "bottom" @@ -142,5 +142,5 @@ }) } - $.oc.table.datasource.server = Server + $.wn.table.datasource.server = Server }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.helper.navigation.js b/modules/backend/widgets/table/assets/js/table.helper.navigation.js index 40bed11c0..155b5d805 100644 --- a/modules/backend/widgets/table/assets/js/table.helper.navigation.js +++ b/modules/backend/widgets/table/assets/js/table.helper.navigation.js @@ -8,11 +8,11 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.helper === undefined) - $.oc.table.helper = {} + if ($.wn.table.helper === undefined) + $.wn.table.helper = {} // NAVIGATION CLASS DEFINITION // ============================ @@ -109,7 +109,7 @@ var container = paginationContainer ? paginationContainer : this.tableObj.getElement().querySelector('.pagination') return parseInt(container.getAttribute('data-record-count')) - } + } Navigation.prototype.buildPaginationLinkList = function(recordCount, recordsPerPage, pageIndex) { // This method could be refactored and moved to a pagination @@ -420,6 +420,6 @@ return false } - $.oc.table.helper.navigation = Navigation; + $.wn.table.helper.navigation = Navigation; }(window.jQuery); diff --git a/modules/backend/widgets/table/assets/js/table.helper.search.js b/modules/backend/widgets/table/assets/js/table.helper.search.js index 751abc7a6..b576d44db 100644 --- a/modules/backend/widgets/table/assets/js/table.helper.search.js +++ b/modules/backend/widgets/table/assets/js/table.helper.search.js @@ -7,11 +7,11 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.helper === undefined) - $.oc.table.helper = {} + if ($.wn.table.helper === undefined) + $.wn.table.helper = {} // SEARCH CLASS DEFINITION // ============================ @@ -111,6 +111,6 @@ this.isActive = target && $(target).hasClass('table-search-input') } - $.oc.table.helper.search = Search; + $.wn.table.helper.search = Search; }(window.jQuery); diff --git a/modules/backend/widgets/table/assets/js/table.js b/modules/backend/widgets/table/assets/js/table.js index f20bd08e6..caba19311 100644 --- a/modules/backend/widgets/table/assets/js/table.js +++ b/modules/backend/widgets/table/assets/js/table.js @@ -2,18 +2,20 @@ * Table control class * * Dependences: - * - Scrollbar (october.scrollbar.js) + * - Scrollbar (winter.scrollbar.js) */ +function ($) { "use strict"; // TABLE CONTROL NAMESPACES // ============================ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.table === undefined) - $.oc.table = {} + if ($.wn.table === undefined) + $.wn.table = {} // TABLE CLASS DEFINITION // ============================ @@ -86,7 +88,7 @@ // Number of records added or deleted during the session this.recordsAddedOrDeleted = 0 - // Bound reference to dispose() - ideally the class should use the October foundation library base class + // Bound reference to dispose() - ideally the class should use the Winter foundation library base class this.disposeBound = this.dispose.bind(this) // @@ -95,7 +97,7 @@ this.init() - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) } // INTERNAL METHODS @@ -109,8 +111,8 @@ this.initCellProcessors() // Initialize helpers - this.navigation = new $.oc.table.helper.navigation(this) - this.search = new $.oc.table.helper.search(this) + this.navigation = new $.wn.table.helper.navigation(this) + this.search = new $.wn.table.helper.search(this) // Create the UI this.buildUi() @@ -141,11 +143,11 @@ Table.prototype.createDataSource = function() { var dataSourceClass = this.options.clientDataSourceClass - if ($.oc.table.datasource === undefined || $.oc.table.datasource[dataSourceClass] == undefined) + if ($.wn.table.datasource === undefined || $.wn.table.datasource[dataSourceClass] == undefined) throw new Error('The table client-side data source class "'+dataSourceClass+'" is not ' + - 'found in the $.oc.table.datasource namespace.') + 'found in the $.wn.table.datasource namespace.') - this.dataSource = new $.oc.table.datasource[dataSourceClass](this) + this.dataSource = new $.wn.table.datasource[dataSourceClass](this) } Table.prototype.registerHandlers = function() { @@ -196,11 +198,11 @@ this.options.columns[i].type = columnType } - if ($.oc.table.processor === undefined || $.oc.table.processor[columnType] == undefined) + if ($.wn.table.processor === undefined || $.wn.table.processor[columnType] == undefined) throw new Error('The table cell processor for the column type "'+columnType+'" is not ' + - 'found in the $.oc.table.processor namespace.') + 'found in the $.wn.table.processor namespace.') - this.cellProcessors[column] = new $.oc.table.processor[columnType](this, column, columnConfiguration) + this.cellProcessors[column] = new $.wn.table.processor[columnType](this, column, columnConfiguration) } } @@ -711,7 +713,7 @@ this.elementAddClass(row, 'error') this.elementAddClass(cell, 'error') - $.oc.flashMsg({text: message, 'class': 'error'}) + $.wn.flashMsg({text: message, 'class': 'error'}) window.setTimeout(function(){ self.focusCell(cell, false) @@ -865,7 +867,7 @@ Table.prototype.dispose = function() { if (this.disposed) { // Prevent errors when legacy code executes the dispose() method - // directly, bypassing $.oc.foundation.controlUtils.disposeControls(container) + // directly, bypassing $.wn.foundation.controlUtils.disposeControls(container) return } @@ -1150,7 +1152,7 @@ $.fn.table.Constructor = Table - $.oc.table.table = Table + $.wn.table.table = Table // TABLE NO CONFLICT // ================= diff --git a/modules/backend/widgets/table/assets/js/table.processor.autocomplete.js b/modules/backend/widgets/table/assets/js/table.processor.autocomplete.js index 6f74a2fbd..35b57eb18 100644 --- a/modules/backend/widgets/table/assets/js/table.processor.autocomplete.js +++ b/modules/backend/widgets/table/assets/js/table.processor.autocomplete.js @@ -7,16 +7,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.processor === undefined) - throw new Error("The $.oc.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); + if ($.wn.table.processor === undefined) + throw new Error("The $.wn.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.processor.string, + var Base = $.wn.table.processor.string, BaseProto = Base.prototype var AutocompleteProcessor = function(tableObj, columnName, columnConfiguration) { @@ -100,7 +100,7 @@ // The AJAX promises are cached here so that we have a single // request per caching key. - $.oc.foundation.element.addClass(viewContainer, 'loading') + $.wn.foundation.element.addClass(viewContainer, 'loading') if (!this.cachedOptionPromises[cachingKey]) { var requestData = { @@ -117,7 +117,7 @@ onSuccess(data.options) } }).always(function onAutocompleteLoadOptionsAlways(){ - $.oc.foundation.element.removeClass(viewContainer, 'loading') + $.wn.foundation.element.removeClass(viewContainer, 'loading') }) } } @@ -142,12 +142,12 @@ if (!tableElement) { return } - + var optionsEvent = $.Event('autocompleteitems.oc.table'), values = {} // TODO - implement loading values from the current row. $(tableElement).trigger(optionsEvent, [{ - values: values, + values: values, callback: callback, column: this.columnName, columnConfiguration: this.columnConfiguration @@ -211,5 +211,5 @@ $(input).autocomplete('destroy') } - $.oc.table.processor.autocomplete = AutocompleteProcessor; + $.wn.table.processor.autocomplete = AutocompleteProcessor; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.processor.base.js b/modules/backend/widgets/table/assets/js/table.processor.base.js index c6627bc27..84802e1d2 100644 --- a/modules/backend/widgets/table/assets/js/table.processor.base.js +++ b/modules/backend/widgets/table/assets/js/table.processor.base.js @@ -6,11 +6,11 @@ // PROCESSOR NAMESPACES // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.processor === undefined) - $.oc.table.processor = {} + if ($.wn.table.processor === undefined) + $.wn.table.processor = {} // CLASS DEFINITION // ============================ @@ -55,14 +55,14 @@ /* * Registers event handlers required for the cell processor. - * Event handers should be bound to the container control element + * Event handers should be bound to the container control element * (not to the table element). */ Base.prototype.registerHandlers = function() { } /* - * Unregisters event handlers previously registered with + * Unregisters event handlers previously registered with * registerHandlers(). */ Base.prototype.unregisterHandlers = function() { @@ -107,7 +107,7 @@ /* * Determines if the keyboard navigation in the specified direction is allowed * by the cell processor. Some processors could reject the navigation, for example - * the string processor could cancel the left array navigation if the caret + * the string processor could cancel the left array navigation if the caret * in the text input is not in the beginning of the text. */ Base.prototype.keyNavigationAllowed = function(ev, direction) { @@ -129,7 +129,7 @@ } /* - * Creates a cell view data container (a DIV element that contains + * Creates a cell view data container (a DIV element that contains * the current cell value). This functionality is required for most * of the processors, perhaps except the checkbox cell processor. */ @@ -173,7 +173,7 @@ } /* - * Determines whether the specified element is some element created by the + * Determines whether the specified element is some element created by the * processor. */ Base.prototype.elementBelongsToProcessor = function(element) { @@ -185,11 +185,11 @@ return for (var validatorName in this.columnConfiguration.validation) { - if ($.oc.table.validator === undefined || $.oc.table.validator[validatorName] == undefined) + if ($.wn.table.validator === undefined || $.wn.table.validator[validatorName] == undefined) throw new Error('The table cell validator "'+validatorName+'" for the column "'+this.columnName+'" is not ' + - 'found in the $.oc.table.validator namespace.') + 'found in the $.wn.table.validator namespace.') - var validator = new $.oc.table.validator[validatorName]( + var validator = new $.wn.table.validator[validatorName]( this.columnConfiguration.validation[validatorName] ) @@ -206,5 +206,5 @@ } } - $.oc.table.processor.base = Base + $.wn.table.processor.base = Base }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.processor.checkbox.js b/modules/backend/widgets/table/assets/js/table.processor.checkbox.js index e10e7a8fa..abe06426c 100644 --- a/modules/backend/widgets/table/assets/js/table.processor.checkbox.js +++ b/modules/backend/widgets/table/assets/js/table.processor.checkbox.js @@ -6,16 +6,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.processor === undefined) - throw new Error("The $.oc.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); + if ($.wn.table.processor === undefined) + throw new Error("The $.wn.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.processor.base, + var Base = $.wn.table.processor.base, BaseProto = Base.prototype var CheckboxProcessor = function(tableObj, columnName, columnConfiguration) { @@ -98,7 +98,7 @@ if (divElement.getAttribute('class') == 'checked') { divElement.setAttribute('class', '') this.tableObj.setCellValue(cell, 0) - } + } else { divElement.setAttribute('class', 'checked') this.tableObj.setCellValue(cell, 1) @@ -107,7 +107,7 @@ CheckboxProcessor.prototype.getCheckboxContainerNode = function(checkbox) { return checkbox.parentNode.parentNode - } + } /* * This method is called when a cell value in the row changes. @@ -128,5 +128,5 @@ } } - $.oc.table.processor.checkbox = CheckboxProcessor; + $.wn.table.processor.checkbox = CheckboxProcessor; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.processor.dropdown.js b/modules/backend/widgets/table/assets/js/table.processor.dropdown.js index 3155b8149..c609b5a23 100644 --- a/modules/backend/widgets/table/assets/js/table.processor.dropdown.js +++ b/modules/backend/widgets/table/assets/js/table.processor.dropdown.js @@ -11,16 +11,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.processor === undefined) - throw new Error("The $.oc.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); + if ($.wn.table.processor === undefined) + throw new Error("The $.wn.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.processor.base, + var Base = $.wn.table.processor.base, BaseProto = Base.prototype var DropdownProcessor = function(tableObj, columnName, columnConfiguration) { @@ -519,5 +519,5 @@ } - $.oc.table.processor.dropdown = DropdownProcessor; + $.wn.table.processor.dropdown = DropdownProcessor; }(window.jQuery); diff --git a/modules/backend/widgets/table/assets/js/table.processor.string.js b/modules/backend/widgets/table/assets/js/table.processor.string.js index 7aad59288..2c9b9ac86 100644 --- a/modules/backend/widgets/table/assets/js/table.processor.string.js +++ b/modules/backend/widgets/table/assets/js/table.processor.string.js @@ -8,16 +8,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.processor === undefined) - throw new Error("The $.oc.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); + if ($.wn.table.processor === undefined) + throw new Error("The $.wn.table.processor namespace is not defined. Make sure that the table.processor.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.processor.base, + var Base = $.wn.table.processor.base, BaseProto = Base.prototype var StringProcessor = function(tableObj, columnName, columnConfiguration) { @@ -81,12 +81,12 @@ this.showViewContainer(this.activeCell) this.activeCell = null } - + StringProcessor.prototype.buildEditor = function(cellElement, cellContentContainer) { // Hide the view container this.hideViewContainer(this.activeCell) - // Create the input control + // Create the input control var input = document.createElement('input') input.setAttribute('type', 'text') input.setAttribute('class', 'string-input') @@ -108,7 +108,7 @@ /* * Determines if the keyboard navigation in the specified direction is allowed * by the cell processor. Some processors could reject the navigation, for example - * the string processor could cancel the left array navigation if the caret + * the string processor could cancel the left array navigation if the caret * in the text input is not in the beginning of the text. */ StringProcessor.prototype.keyNavigationAllowed = function(ev, direction) { @@ -161,7 +161,7 @@ StringProcessor.prototype.getCaretPosition = function(input) { // TODO: use the foundation library - if (document.selection) { + if (document.selection) { var selection = document.selection.createRange() selection.moveStart('character', -input.value.length) @@ -177,7 +177,7 @@ StringProcessor.prototype.setCaretPosition = function(input, position) { // TODO: use the foundation library - if (document.selection) { + if (document.selection) { var range = input.createTextRange() setTimeout(function() { @@ -200,5 +200,5 @@ return 0 } - $.oc.table.processor.string = StringProcessor; + $.wn.table.processor.string = StringProcessor; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.validator.base.js b/modules/backend/widgets/table/assets/js/table.validator.base.js index 5f92b82b2..53db65c4d 100644 --- a/modules/backend/widgets/table/assets/js/table.validator.base.js +++ b/modules/backend/widgets/table/assets/js/table.validator.base.js @@ -6,11 +6,11 @@ // VALIDATOR NAMESPACES // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.validator === undefined) - $.oc.table.validator = {} + if ($.wn.table.validator === undefined) + $.wn.table.validator = {} // CLASS DEFINITION // ============================ @@ -44,7 +44,7 @@ * target row. */ Base.prototype.validateValue = function(value, rowData) { - + } Base.prototype.trim = function(value) { @@ -73,5 +73,5 @@ return value.length > 0 } - $.oc.table.validator.base = Base; + $.wn.table.validator.base = Base; }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.validator.basenumber.js b/modules/backend/widgets/table/assets/js/table.validator.basenumber.js index 9a0f6c04a..b07dc2729 100644 --- a/modules/backend/widgets/table/assets/js/table.validator.basenumber.js +++ b/modules/backend/widgets/table/assets/js/table.validator.basenumber.js @@ -6,16 +6,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.validator === undefined) - throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); + if ($.wn.table.validator === undefined) + throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.validator.base, + var Base = $.wn.table.validator.base, BaseProto = Base.prototype var BaseNumber = function(options) { @@ -53,5 +53,5 @@ return } - $.oc.table.validator.baseNumber = BaseNumber + $.wn.table.validator.baseNumber = BaseNumber }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.validator.float.js b/modules/backend/widgets/table/assets/js/table.validator.float.js index 8c44997e6..3eb2e7d44 100644 --- a/modules/backend/widgets/table/assets/js/table.validator.float.js +++ b/modules/backend/widgets/table/assets/js/table.validator.float.js @@ -6,19 +6,19 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.validator === undefined) - throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); + if ($.wn.table.validator === undefined) + throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); - if ($.oc.table.validator.baseNumber === undefined) - throw new Error("The $.oc.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded."); + if ($.wn.table.validator.baseNumber === undefined) + throw new Error("The $.wn.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.validator.baseNumber, + var Base = $.wn.table.validator.baseNumber, BaseProto = Base.prototype var Float = function(options) { @@ -40,8 +40,8 @@ if (value.length == 0) return - var testResult = this.options.allowNegative ? - /^[-]?([0-9]+\.[0-9]+|[0-9]+)$/.test(value) : + var testResult = this.options.allowNegative ? + /^[-]?([0-9]+\.[0-9]+|[0-9]+)$/.test(value) : /^([0-9]+\.[0-9]+|[0-9]+)$/.test(value) if (!testResult) { @@ -55,5 +55,5 @@ return this.doCommonChecks(parseFloat(value)) } - $.oc.table.validator.float = Float + $.wn.table.validator.float = Float }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.validator.integer.js b/modules/backend/widgets/table/assets/js/table.validator.integer.js index 4af60e6f2..d42179d87 100644 --- a/modules/backend/widgets/table/assets/js/table.validator.integer.js +++ b/modules/backend/widgets/table/assets/js/table.validator.integer.js @@ -6,19 +6,19 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.validator === undefined) - throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); + if ($.wn.table.validator === undefined) + throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); - if ($.oc.table.validator.baseNumber === undefined) - throw new Error("The $.oc.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded."); + if ($.wn.table.validator.baseNumber === undefined) + throw new Error("The $.wn.table.validator.baseNumber namespace is not defined. Make sure that the table.validator.baseNumber.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.validator.baseNumber, + var Base = $.wn.table.validator.baseNumber, BaseProto = Base.prototype var Integer = function(options) { @@ -40,8 +40,8 @@ if (value.length == 0) return - var testResult = this.options.allowNegative ? - /^\-?[0-9]*$/.test(value) : + var testResult = this.options.allowNegative ? + /^\-?[0-9]*$/.test(value) : /^[0-9]*$/.test(value) if (!testResult) { @@ -55,5 +55,5 @@ return this.doCommonChecks(parseInt(value)) } - $.oc.table.validator.integer = Integer + $.wn.table.validator.integer = Integer }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.validator.length.js b/modules/backend/widgets/table/assets/js/table.validator.length.js index 0461eab71..3b65363f6 100644 --- a/modules/backend/widgets/table/assets/js/table.validator.length.js +++ b/modules/backend/widgets/table/assets/js/table.validator.length.js @@ -6,16 +6,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.validator === undefined) - throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); + if ($.wn.table.validator === undefined) + throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.validator.base, + var Base = $.wn.table.validator.base, BaseProto = Base.prototype var Length = function(options) { @@ -64,5 +64,5 @@ return } - $.oc.table.validator.length = Length + $.wn.table.validator.length = Length }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.validator.regex.js b/modules/backend/widgets/table/assets/js/table.validator.regex.js index 90914503c..592a47010 100644 --- a/modules/backend/widgets/table/assets/js/table.validator.regex.js +++ b/modules/backend/widgets/table/assets/js/table.validator.regex.js @@ -6,16 +6,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.validator === undefined) - throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); + if ($.wn.table.validator === undefined) + throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.validator.base, + var Base = $.wn.table.validator.base, BaseProto = Base.prototype var Regex = function(options) { @@ -48,5 +48,5 @@ return } - $.oc.table.validator.regex = Regex + $.wn.table.validator.regex = Regex }(window.jQuery); \ No newline at end of file diff --git a/modules/backend/widgets/table/assets/js/table.validator.required.js b/modules/backend/widgets/table/assets/js/table.validator.required.js index b90357972..cf727f173 100644 --- a/modules/backend/widgets/table/assets/js/table.validator.required.js +++ b/modules/backend/widgets/table/assets/js/table.validator.required.js @@ -6,16 +6,16 @@ // NAMESPACE CHECK // ============================ - if ($.oc.table === undefined) - throw new Error("The $.oc.table namespace is not defined. Make sure that the table.js script is loaded."); + if ($.wn.table === undefined) + throw new Error("The $.wn.table namespace is not defined. Make sure that the table.js script is loaded."); - if ($.oc.table.validator === undefined) - throw new Error("The $.oc.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); + if ($.wn.table.validator === undefined) + throw new Error("The $.wn.table.validator namespace is not defined. Make sure that the table.validator.base.js script is loaded."); // CLASS DEFINITION // ============================ - var Base = $.oc.table.validator.base, + var Base = $.wn.table.validator.base, BaseProto = Base.prototype var Required = function(options) { @@ -40,5 +40,5 @@ return } - $.oc.table.validator.required = Required + $.wn.table.validator.required = Required }(window.jQuery); \ No newline at end of file diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php index f4e54b88b..63c1b4290 100644 --- a/modules/cms/ServiceProvider.php +++ b/modules/cms/ServiceProvider.php @@ -30,6 +30,7 @@ class ServiceProvider extends ModuleServiceProvider { parent::register('cms'); + $this->registerAssetBundles(); $this->registerComponents(); $this->registerThemeLogging(); $this->registerCombinerEvents(); @@ -110,7 +111,7 @@ class ServiceProvider extends ModuleServiceProvider protected function registerBackendNavigation() { BackendMenu::registerCallback(function ($manager) { - $manager->registerMenuItems('October.Cms', [ + $manager->registerMenuItems('Winter.Cms', [ 'cms' => [ 'label' => 'cms::lang.cms.menu_label', 'icon' => 'icon-magic', @@ -210,7 +211,7 @@ class ServiceProvider extends ModuleServiceProvider protected function registerBackendPermissions() { BackendAuth::registerCallback(function ($manager) { - $manager->registerPermissions('October.Cms', [ + $manager->registerPermissions('Winter.Cms', [ 'cms.manage_content' => [ 'label' => 'cms::lang.permissions.manage_content', 'tab' => 'cms::lang.permissions.name', @@ -253,6 +254,7 @@ class ServiceProvider extends ModuleServiceProvider 'order' => 100 ], ]); + $manager->registerPermissionOwnerAlias('Winter.Cms', 'October.Cms'); }); } @@ -272,7 +274,7 @@ class ServiceProvider extends ModuleServiceProvider protected function registerBackendSettings() { SettingsManager::instance()->registerCallback(function ($manager) { - $manager->registerSettingItems('October.Cms', [ + $manager->registerSettingItems('Winter.Cms', [ 'theme' => [ 'label' => 'cms::lang.theme.settings_menu', 'description' => 'cms::lang.theme.settings_menu_description', @@ -302,6 +304,7 @@ class ServiceProvider extends ModuleServiceProvider 'keywords' => 'theme change log' ] ]); + $manager->registerOwnerAlias('Winter.Cms', 'October.Cms'); }); } diff --git a/modules/cms/assets/css/october.components.css b/modules/cms/assets/css/october.components.css deleted file mode 100644 index 878e71ef0..000000000 --- a/modules/cms/assets/css/october.components.css +++ /dev/null @@ -1,366 +0,0 @@ -.draggable-component-item, -.component-list .components div.layout-cell, -div.control-componentlist div.components div.layout-cell { - font-size: 11px; - cursor: pointer; - background: #ffffff; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} -.draggable-component-item:hover, -.component-list .components div.layout-cell:hover, -div.control-componentlist div.components div.layout-cell:hover { - background: #3498db; -} -.draggable-component-item > div, -.component-list .components div.layout-cell > div, -div.control-componentlist div.components div.layout-cell > div { - white-space: normal; - color: #475354; - position: relative; - border-right: 1px solid #ecf0f1; -} -.draggable-component-item > div:before, -.component-list .components div.layout-cell > div:before, -div.control-componentlist div.components div.layout-cell > div:before { - position: absolute; - font-size: 16px; - left: 15px; - top: 7px; - opacity: 0.7; - filter: alpha(opacity=70); -} -.draggable-component-item > div:hover, -.component-list .components div.layout-cell > div:hover, -div.control-componentlist div.components div.layout-cell > div:hover { - color: #ffffff; -} -.draggable-component-item > div:hover:before, -.component-list .components div.layout-cell > div:hover:before, -div.control-componentlist div.components div.layout-cell > div:hover:before { - opacity: 1; - filter: alpha(opacity=100); -} -.draggable-component-item > div:after, -.component-list .components div.layout-cell > div:after, -div.control-componentlist div.components div.layout-cell > div:after { - position: absolute; - font-size: 37px; - top: 1px; - z-index: 50; - color: #ffffff; - text-shadow: 0 0 1px #475354; - width: 12px; - overflow: hidden; - text-indent: -25px; - right: -12px; - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - content: "\f12e"; -} -.draggable-component-item > div:hover:after, -.component-list .components div.layout-cell > div:hover:after, -div.control-componentlist div.components div.layout-cell > div:hover:after { - text-shadow: none; - color: #3498db; -} -.draggable-component-item > div span, -.component-list .components div.layout-cell > div span, -div.control-componentlist div.components div.layout-cell > div span { - display: block; -} -.draggable-component-item > div span.name, -.component-list .components div.layout-cell > div span.name, -div.control-componentlist div.components div.layout-cell > div span.name { - white-space: nowrap; - padding: 8px 15px 0; - font-weight: 400; - line-height: 20px; - font-size: 13px; -} -.draggable-component-item > div span.description, -.component-list .components div.layout-cell > div span.description, -div.control-componentlist div.components div.layout-cell > div span.description { - padding: 0 15px 10px; - margin-top: 8px; - font-weight: 100; - font-size: 11px; - line-height: 150%; -} -.draggable-component-item.placeholder > div, -.component-list .components div.layout-cell.placeholder > div, -div.control-componentlist div.components div.layout-cell.placeholder > div { - background: #e0e0e0; - color: #e0e0e0; -} -.draggable-component-item.placeholder > div:before, -.component-list .components div.layout-cell.placeholder > div:before, -div.control-componentlist div.components div.layout-cell.placeholder > div:before, -.draggable-component-item.placeholder > div:after, -.component-list .components div.layout-cell.placeholder > div:after, -div.control-componentlist div.components div.layout-cell.placeholder > div:after { - color: #e0e0e0 !important; - text-shadow: none !important; -} -[data-field-name="components"] + .control-tabs.primary-tabs { - margin-top: -10px; -} -div.control-componentlist { - position: relative; - padding: 0; - -webkit-transition: all 0.3s ease; - transition: all 0.3s ease; -} -div.control-componentlist.droppable { - background-color: #f0b37e; -} -div.control-componentlist.has-components { - padding: 0 20px 20px; -} -div.control-componentlist div.layout { - width: auto; -} -div.control-componentlist div.components div.layout-cell.error-component { - background: #ab2a1c; -} -div.control-componentlist div.components div.layout-cell.error-component > div { - color: #ffffff; -} -div.control-componentlist div.components div.layout-cell.error-component > div:after { - color: #ab2a1c; -} -div.control-componentlist div.components div.layout-cell.warning-component { - background: #ffc107; -} -div.control-componentlist div.components div.layout-cell.warning-component > div { - color: #343a40; -} -div.control-componentlist div.components div.layout-cell.warning-component > div:after { - color: #ffc107; -} -div.control-componentlist div.components div.layout-cell:first-child { - border-bottom-left-radius: 3px; - border-top-left-radius: 3px; -} -div.control-componentlist div.components div.layout-cell:last-child { - margin-right: 0; - border-bottom-right-radius: 3px; - border-top-right-radius: 3px; -} -div.control-componentlist div.components div.layout-cell:last-child > div { - border-right: none; -} -div.control-componentlist div.components div.layout-cell:last-child > div:after { - display: none; -} -div.control-componentlist div.components div.layout-cell:nth-child(2n) > div:after { - top: auto; - bottom: 5px; -} -div.control-componentlist div.components div.layout-cell:first-child > div.popover-highlight { - border-bottom-left-radius: 3px; - border-top-left-radius: 3px; -} -div.control-componentlist div.components div.layout-cell:last-child > div.popover-highlight { - border-bottom-right-radius: 3px; - border-top-right-radius: 3px; -} -div.control-componentlist div.components div.layout-cell > div { - -webkit-transform: translate(0, 0); - -ms-transform: translate(0, 0); - transform: translate(0, 0); - -webkit-transition: -webkit-transform 0.2s; - -moz-transition: -moz-transform 0.2s; - -o-transition: -o-transform 0.2s; - transition: transform 0.2s; - max-width: 250px; - min-width: 170px; -} -div.control-componentlist div.components div.layout-cell > div.popover-highlight { - border-right-color: rgba(0, 0, 0, 0); - background: #ffffff !important; - color: #475354 !important; -} -div.control-componentlist div.components div.layout-cell > div.popover-highlight:before { - opacity: 0.7; - filter: alpha(opacity=70); -} -div.control-componentlist div.components div.layout-cell > div.popover-highlight:after { - color: #ffffff; - text-shadow: none; -} -div.control-componentlist div.components div.layout-cell > div.popover-highlight a.remove { - display: none; -} -div.control-componentlist div.components div.layout-cell > div span.name { - padding-left: 38px; -} -div.control-componentlist div.components div.layout-cell > div span.description { - padding-bottom: 35px; -} -div.control-componentlist div.components div.layout-cell > div span.alias { - padding: 0 15px; - font-weight: 500; - position: absolute; - width: 100%; - bottom: 10px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; -} -div.control-componentlist div.components div.layout-cell > div span.alias:before { - margin-right: 4px; - opacity: 0.55; - filter: alpha(opacity=55.00000000000001); -} -div.control-componentlist div.components div.layout-cell > div a.remove { - position: absolute; - display: inline-block; - top: 1px; - right: 5px; - color: #000000; - font-size: 17px; - font-weight: bold; - opacity: 0.3; - filter: alpha(opacity=30); -} -div.control-componentlist div.components div.layout-cell > div a.remove:hover { - opacity: 0.5; - filter: alpha(opacity=50); - text-decoration: none; -} -div.control-componentlist div.components div.layout-cell.adding > div { - -webkit-transform: translate(0, -100px) !important; - -ms-transform: translate(0, -100px) !important; - transform: translate(0, -100px) !important; -} -.draggable-component-item { - opacity: 0.6; - filter: alpha(opacity=60); -} -.draggable-component-item span.alias { - display: none; -} -.draggable-component-item a.remove { - display: none; -} -.component-list .components div.layout div.layout-row div.layout-cell { - border-top: 1px solid #ecf0f1; -} -.component-list .components div.layout div.layout-row div.layout-cell span.alias { - display: none; -} -.component-list .components div.layout div.layout-row div.layout-cell a.remove { - display: none; -} -.component-list .components div.layout div.layout-row div.layout-cell:last-child > div { - border-right: none; -} -.component-list .components div.layout div.layout-row div.layout-cell:last-child > div:after { - display: none; -} -.component-list .components div.layout div.layout-row div.layout-cell > div:before { - position: absolute; - font-size: 37px; - top: 1px; - z-index: 50; - color: #ffffff; - text-shadow: 0 0 1px #475354; - width: 12px; - overflow: hidden; - text-indent: -25px; - right: -12px; - font-family: FontAwesome; - font-weight: normal; - font-style: normal; - text-decoration: inherit; - -webkit-font-smoothing: antialiased; - content: "\f12e"; - -webkit-transform: rotate(-90deg); - -ms-transform: rotate(-90deg); - transform: rotate(-90deg); - opacity: 1; - filter: alpha(opacity=100); - left: auto; - top: -17px; - right: 15px; -} -.component-list .components div.layout div.layout-row div.layout-cell > div:hover:before { - text-shadow: none; - color: #3498db; -} -.component-list .components div.layout div.layout-row:first-child div.layout-cell > div:before { - display: none; -} -.component-list .components div.layout.single div.layout-row > div.layout-cell > div { - border-right: none; -} -.component-list .components div.layout.single div.layout-row > div.layout-cell > div:before { - display: block; - right: 55.5%; -} -.control-filelist.component-list ul li div.group { - background: #f1f3f4; - border-top: 1px solid #e6ebed; - padding: 10px 15px 10px 10px; - position: relative; - cursor: pointer; -} -.control-filelist.component-list ul li div.group h4 { - text-transform: uppercase; - font-size: 14px; - margin-top: 3px; -} -.control-filelist.component-list ul li div.group h4 a { - padding-left: 33px; -} -.control-filelist.component-list ul li div.group h4 a:before { - left: 0; -} -.control-filelist.component-list ul li div.group h4 a:after { - display: none; -} -.control-filelist.component-list ul li div.group span.description { - display: block; - font-size: 13px; - padding-left: 33px; - color: #8f8f8f; -} -.control-filelist.component-list ul li div.group i { - position: absolute; - left: 22px; - top: 21px; - font-size: 16px; - opacity: 0.7; - filter: alpha(opacity=70); - color: #405261; -} -.touch div.control-componentlist div.components div.layout-cell > div:hover, -.touch div.control-componentlist div.components div.layout-cell > div:active, -.touch div.control-componentlist div.components div.layout-cell > div:active:focus { - background: #ffffff; - color: #475354; -} -.touch div.control-componentlist div.components div.layout-cell > div:hover:after, -.touch div.control-componentlist div.components div.layout-cell > div:active:after, -.touch div.control-componentlist div.components div.layout-cell > div:active:focus:after { - text-shadow: 0 0 1px #475354 !important; - color: #ffffff !important; -} -body.drag div.control-componentlist div.components div.layout-cell > div, -body.drag div.control-componentlist div.components div.layout-cell > div:hover, -body.drag div.control-componentlist div.components div.layout-cell > div:active { - background: #ffffff; - color: #475354; -} -body.drag div.control-componentlist div.components div.layout-cell > div:after, -body.drag div.control-componentlist div.components div.layout-cell > div:hover:after, -body.drag div.control-componentlist div.components div.layout-cell > div:active:after { - text-shadow: 0 0 1px #475354 !important; - color: #ffffff !important; -} diff --git a/modules/cms/assets/css/october.theme-selector.css b/modules/cms/assets/css/october.theme-selector.css deleted file mode 100644 index b50177485..000000000 --- a/modules/cms/assets/css/october.theme-selector.css +++ /dev/null @@ -1,131 +0,0 @@ -.theme-selector-layout .layout-cell { - padding: 24px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.theme-selector-layout .theme-thumbnail { - width: 288px; - background: #ecf0f1; - border-top: 1px solid #e3e7e9; -} -.theme-selector-layout .theme-thumbnail img { - opacity: 0.6; - filter: alpha(opacity=60); - width: 240px; -} -.theme-selector-layout .theme-description { - border-top: 1px solid #f2f3f4; -} -.theme-selector-layout .theme-description h3, -.theme-selector-layout .theme-description p { - opacity: 0.6; - filter: alpha(opacity=60); -} -.theme-selector-layout .theme-description h3 { - margin: 0 0 25px 0; - font-size: 28px; - color: #2b3e50; - display: inline-block; -} -.theme-selector-layout .theme-description p.author { - font-size: 13px; - display: inline-block; - color: #808c8d; -} -.theme-selector-layout .theme-description p.description { - color: #2b3e50; - font-size: 14px; - line-height: 180%; - margin-bottom: 30px; -} -.theme-selector-layout .theme-description .controls .btn > i { - margin-right: 5px; - font-size: 16px; - position: relative; - top: 1px; -} -.theme-selector-layout .theme-description .controls .btn > i.icon-star { - color: #f1a84e; -} -.theme-selector-layout .theme-description .controls .dropdown { - display: inline-block; -} -.theme-selector-layout .layout-row.active .theme-thumbnail { - background: #bdc3c7; - border-top-color: #bdc3c7; -} -.theme-selector-layout .layout-row.active .thumbnail-container { - position: relative; -} -.theme-selector-layout .layout-row.active .thumbnail-container:after { - content: ''; - display: block; - width: 0; - height: 0; - border-top: 14px solid transparent; - border-bottom: 14px solid transparent; - border-left: 15px solid #bdc3c7; - position: absolute; - right: -35px; - top: 50%; - margin-top: -14px; -} -.theme-selector-layout .layout-row.active .theme-description h3, -.theme-selector-layout .layout-row:hover .theme-description h3, -.theme-selector-layout .layout-row.active .theme-description p, -.theme-selector-layout .layout-row:hover .theme-description p { - opacity: 1; - filter: alpha(opacity=100); -} -.theme-selector-layout .layout-row.active .theme-thumbnail img, -.theme-selector-layout .layout-row:hover .theme-thumbnail img { - opacity: 1; - filter: alpha(opacity=100); -} -.theme-selector-layout .layout-row:first-child .theme-description, -.theme-selector-layout .layout-row.links .theme-description, -.theme-selector-layout .layout-row:first-child .theme-thumbnail, -.theme-selector-layout .layout-row.links .theme-thumbnail { - border-top: none; -} -.theme-selector-layout .layout-row.links .theme-thumbnail { - border-bottom: 1px solid #e3e7e9; -} -.theme-selector-layout .layout-row.links .theme-description { - border-bottom: 1px solid #f2f3f4; -} -.theme-selector-layout .create-new-theme { - margin-bottom: 10px; -} -.theme-selector-layout .create-new-theme, -.theme-selector-layout .find-more-themes { - background: #ecf0f1; - color: #2b3e50; - text-decoration: none; - display: block; - padding: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.theme-selector-layout .create-new-theme:hover, -.theme-selector-layout .find-more-themes:hover { - background: #0181b9; - color: white; -} -@media (max-width: 768px) { - .theme-selector-layout .layout-cell, - .theme-selector-layout .layout-row { - display: block!important; - width: auto!important; - height: auto!important; - } - .theme-selector-layout .theme-thumbnail img { - width: 100%; - } - .theme-selector-layout .layout-row.links .theme-thumbnail { - background: transparent; - padding: 0; - } -} diff --git a/modules/cms/assets/css/winter.components.css b/modules/cms/assets/css/winter.components.css new file mode 100644 index 000000000..4f2d2a8a4 --- /dev/null +++ b/modules/cms/assets/css/winter.components.css @@ -0,0 +1,104 @@ +.draggable-component-item, +.component-list .components div.layout-cell, +div.control-componentlist div.components div.layout-cell {font-size:11px;cursor:pointer;background:#fff;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} +.draggable-component-item:hover, +.component-list .components div.layout-cell:hover, +div.control-componentlist div.components div.layout-cell:hover {background:#3498db} +.draggable-component-item >div, +.component-list .components div.layout-cell >div, +div.control-componentlist div.components div.layout-cell >div {white-space:normal;color:#475354;position:relative;border-right:1px solid #ecf0f1} +.draggable-component-item >div:before, +.component-list .components div.layout-cell >div:before, +div.control-componentlist div.components div.layout-cell >div:before {position:absolute;font-size:16px;left:15px;top:7px;opacity:0.7;filter:alpha(opacity=70)} +.draggable-component-item >div:hover, +.component-list .components div.layout-cell >div:hover, +div.control-componentlist div.components div.layout-cell >div:hover {color:#fff} +.draggable-component-item >div:hover:before, +.component-list .components div.layout-cell >div:hover:before, +div.control-componentlist div.components div.layout-cell >div:hover:before {opacity:1;filter:alpha(opacity=100)} +.draggable-component-item >div:after, +.component-list .components div.layout-cell >div:after, +div.control-componentlist div.components div.layout-cell >div:after {position:absolute;font-size:37px;top:1px;z-index:50;color:#fff;text-shadow:0 0 1px #475354;width:12px;overflow:hidden;text-indent:-25px;right:-12px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f12e"} +.draggable-component-item >div:hover:after, +.component-list .components div.layout-cell >div:hover:after, +div.control-componentlist div.components div.layout-cell >div:hover:after {text-shadow:none;color:#3498db} +.draggable-component-item >div span, +.component-list .components div.layout-cell >div span, +div.control-componentlist div.components div.layout-cell >div span {display:block} +.draggable-component-item >div span.name, +.component-list .components div.layout-cell >div span.name, +div.control-componentlist div.components div.layout-cell >div span.name {white-space:nowrap;padding:8px 15px 0;font-weight:400;line-height:20px;font-size:13px} +.draggable-component-item >div span.description, +.component-list .components div.layout-cell >div span.description, +div.control-componentlist div.components div.layout-cell >div span.description {padding:0 15px 10px;margin-top:8px;font-weight:400;font-size:11px;line-height:150%} +.draggable-component-item.placeholder >div, +.component-list .components div.layout-cell.placeholder >div, +div.control-componentlist div.components div.layout-cell.placeholder >div {background:#e0e0e0;color:#e0e0e0} +.draggable-component-item.placeholder >div:before, +.component-list .components div.layout-cell.placeholder >div:before, +div.control-componentlist div.components div.layout-cell.placeholder >div:before, +.draggable-component-item.placeholder >div:after, +.component-list .components div.layout-cell.placeholder >div:after, +div.control-componentlist div.components div.layout-cell.placeholder >div:after {color:#e0e0e0 !important;text-shadow:none !important} +[data-field-name="components"] + .control-tabs.primary-tabs {margin-top:-10px} +div.control-componentlist {position:relative;padding:0;-webkit-transition:all 0.3s ease;transition:all 0.3s ease} +div.control-componentlist.droppable {background-color:#f0b37e} +div.control-componentlist.has-components {padding:0 20px 20px} +div.control-componentlist div.layout {width:auto} +div.control-componentlist div.components div.layout-cell.error-component {background:#ab2a1c} +div.control-componentlist div.components div.layout-cell.error-component >div {color:#fff} +div.control-componentlist div.components div.layout-cell.error-component >div:after {color:#ab2a1c} +div.control-componentlist div.components div.layout-cell.warning-component {background:#ffc107} +div.control-componentlist div.components div.layout-cell.warning-component >div {color:#343a40} +div.control-componentlist div.components div.layout-cell.warning-component >div:after {color:#ffc107} +div.control-componentlist div.components div.layout-cell:first-child {border-bottom-left-radius:3px;border-top-left-radius:3px} +div.control-componentlist div.components div.layout-cell:last-child {margin-right:0;border-bottom-right-radius:3px;border-top-right-radius:3px} +div.control-componentlist div.components div.layout-cell:last-child >div {border-right:none} +div.control-componentlist div.components div.layout-cell:last-child >div:after {display:none} +div.control-componentlist div.components div.layout-cell:nth-child(2n) >div:after {top:auto;bottom:5px} +div.control-componentlist div.components div.layout-cell:first-child >div.popover-highlight {border-bottom-left-radius:3px;border-top-left-radius:3px} +div.control-componentlist div.components div.layout-cell:last-child >div.popover-highlight {border-bottom-right-radius:3px;border-top-right-radius:3px} +div.control-componentlist div.components div.layout-cell >div {-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0);-webkit-transition:-webkit-transform 0.2s;-moz-transition:-moz-transform 0.2s;-o-transition:-o-transform 0.2s;transition:transform 0.2s;max-width:250px;min-width:170px} +div.control-componentlist div.components div.layout-cell >div.popover-highlight {border-right-color:rgba(0,0,0,0);background:#fff !important;color:#475354 !important} +div.control-componentlist div.components div.layout-cell >div.popover-highlight:before {opacity:0.7;filter:alpha(opacity=70)} +div.control-componentlist div.components div.layout-cell >div.popover-highlight:after {color:#fff;text-shadow:none} +div.control-componentlist div.components div.layout-cell >div.popover-highlight a.remove {display:none} +div.control-componentlist div.components div.layout-cell >div span.name {padding-left:38px} +div.control-componentlist div.components div.layout-cell >div span.description {padding-bottom:35px} +div.control-componentlist div.components div.layout-cell >div span.alias {padding:0 15px;font-weight:500;position:absolute;width:100%;bottom:10px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden} +div.control-componentlist div.components div.layout-cell >div span.alias:before {margin-right:4px;opacity:0.55;filter:alpha(opacity=55)} +div.control-componentlist div.components div.layout-cell >div a.remove {position:absolute;display:inline-block;top:1px;right:5px;color:#000;font-size:17px;font-weight:bold;opacity:0.3;filter:alpha(opacity=30)} +div.control-componentlist div.components div.layout-cell >div a.remove:hover {opacity:0.5;filter:alpha(opacity=50);text-decoration:none} +div.control-componentlist div.components div.layout-cell.adding >div {-webkit-transform:translate(0,-100px) !important;-ms-transform:translate(0,-100px) !important;transform:translate(0,-100px) !important} +.draggable-component-item {opacity:0.6;filter:alpha(opacity=60)} +.draggable-component-item span.alias {display:none} +.draggable-component-item a.remove {display:none} +.component-list .components div.layout div.layout-row div.layout-cell {border-top:1px solid #ecf0f1} +.component-list .components div.layout div.layout-row div.layout-cell span.alias {display:none} +.component-list .components div.layout div.layout-row div.layout-cell a.remove {display:none} +.component-list .components div.layout div.layout-row div.layout-cell:last-child >div {border-right:none} +.component-list .components div.layout div.layout-row div.layout-cell:last-child >div:after {display:none} +.component-list .components div.layout div.layout-row div.layout-cell >div:before {position:absolute;font-size:37px;top:1px;z-index:50;color:#fff;text-shadow:0 0 1px #475354;width:12px;overflow:hidden;text-indent:-25px;right:-12px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f12e";-webkit-transform:rotate(-90deg);-ms-transform:rotate(-90deg);transform:rotate(-90deg);opacity:1;filter:alpha(opacity=100);left:auto;top:-17px;right:15px} +.component-list .components div.layout div.layout-row div.layout-cell >div:hover:before {text-shadow:none;color:#3498db} +.component-list .components div.layout div.layout-row:first-child div.layout-cell >div:before {display:none} +.component-list .components div.layout.single div.layout-row >div.layout-cell >div {border-right:none} +.component-list .components div.layout.single div.layout-row >div.layout-cell >div:before {display:block;right:55.5%} +.control-filelist.component-list ul li div.group {background:#f1f3f4;border-top:1px solid #e6ebed;padding:10px 15px 10px 10px;position:relative;cursor:pointer} +.control-filelist.component-list ul li div.group h4 {text-transform:uppercase;font-size:14px;margin-top:3px} +.control-filelist.component-list ul li div.group h4 a {padding-left:33px} +.control-filelist.component-list ul li div.group h4 a:before {left:0} +.control-filelist.component-list ul li div.group h4 a:after {display:none} +.control-filelist.component-list ul li div.group span.description {display:block;font-size:13px;padding-left:33px;color:#8f8f8f} +.control-filelist.component-list ul li div.group i {position:absolute;left:22px;top:21px;font-size:16px;opacity:0.7;filter:alpha(opacity=70);color:#405261} +.touch div.control-componentlist div.components div.layout-cell >div:hover, +.touch div.control-componentlist div.components div.layout-cell >div:active, +.touch div.control-componentlist div.components div.layout-cell >div:active:focus {background:#fff;color:#475354} +.touch div.control-componentlist div.components div.layout-cell >div:hover:after, +.touch div.control-componentlist div.components div.layout-cell >div:active:after, +.touch div.control-componentlist div.components div.layout-cell >div:active:focus:after {text-shadow:0 0 1px #475354 !important;color:#fff !important} +body.drag div.control-componentlist div.components div.layout-cell >div, +body.drag div.control-componentlist div.components div.layout-cell >div:hover, +body.drag div.control-componentlist div.components div.layout-cell >div:active {background:#fff;color:#475354} +body.drag div.control-componentlist div.components div.layout-cell >div:after, +body.drag div.control-componentlist div.components div.layout-cell >div:hover:after, +body.drag div.control-componentlist div.components div.layout-cell >div:active:after {text-shadow:0 0 1px #475354 !important;color:#fff !important} \ No newline at end of file diff --git a/modules/cms/assets/css/winter.theme-selector.css b/modules/cms/assets/css/winter.theme-selector.css new file mode 100644 index 000000000..ffbc81dc1 --- /dev/null +++ b/modules/cms/assets/css/winter.theme-selector.css @@ -0,0 +1,33 @@ +.theme-selector-layout .layout-cell {padding:24px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} +.theme-selector-layout .theme-thumbnail {width:288px;background:#ecf0f1;border-top:1px solid #e3e7e9} +.theme-selector-layout .theme-thumbnail img {opacity:0.6;filter:alpha(opacity=60);width:240px} +.theme-selector-layout .theme-description {border-top:1px solid #f2f3f4} +.theme-selector-layout .theme-description h3, +.theme-selector-layout .theme-description p {opacity:0.6;filter:alpha(opacity=60)} +.theme-selector-layout .theme-description h3 {margin:0 0 25px 0;font-size:28px;color:#2b3e50;display:inline-block} +.theme-selector-layout .theme-description p.author {font-size:13px;display:inline-block;color:#808c8d} +.theme-selector-layout .theme-description p.description {color:#2b3e50;font-size:14px;line-height:180%;margin-bottom:30px} +.theme-selector-layout .theme-description .controls .btn >i {margin-right:5px;font-size:16px;position:relative;top:1px} +.theme-selector-layout .theme-description .controls .btn >i.icon-star {color:#f1a84e} +.theme-selector-layout .theme-description .controls .dropdown {display:inline-block} +.theme-selector-layout .layout-row.active .theme-thumbnail {background:#bdc3c7;border-top-color:#bdc3c7} +.theme-selector-layout .layout-row.active .thumbnail-container {position:relative} +.theme-selector-layout .layout-row.active .thumbnail-container:after {content:'';display:block;width:0;height:0;border-top:14px solid transparent;border-bottom:14px solid transparent;border-left:15px solid #bdc3c7;position:absolute;right:-35px;top:50%;margin-top:-14px} +.theme-selector-layout .layout-row.active .theme-description h3, +.theme-selector-layout .layout-row:hover .theme-description h3, +.theme-selector-layout .layout-row.active .theme-description p, +.theme-selector-layout .layout-row:hover .theme-description p {opacity:1;filter:alpha(opacity=100)} +.theme-selector-layout .layout-row.active .theme-thumbnail img, +.theme-selector-layout .layout-row:hover .theme-thumbnail img {opacity:1;filter:alpha(opacity=100)} +.theme-selector-layout .layout-row:first-child .theme-description, +.theme-selector-layout .layout-row.links .theme-description, +.theme-selector-layout .layout-row:first-child .theme-thumbnail, +.theme-selector-layout .layout-row.links .theme-thumbnail {border-top:none} +.theme-selector-layout .layout-row.links .theme-thumbnail {border-bottom:1px solid #e3e7e9} +.theme-selector-layout .layout-row.links .theme-description {border-bottom:1px solid #f2f3f4} +.theme-selector-layout .create-new-theme {margin-bottom:10px} +.theme-selector-layout .create-new-theme, +.theme-selector-layout .find-more-themes {background:#ecf0f1;color:#2b3e50;text-decoration:none;display:block;padding:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px} +.theme-selector-layout .create-new-theme:hover, +.theme-selector-layout .find-more-themes:hover {background:#0181b9;color:white} +@media (max-width:768px) {.theme-selector-layout .layout-cell,.theme-selector-layout .layout-row {display:block !important;width:auto !important;height:auto !important }.theme-selector-layout .theme-thumbnail img {width:100% }.theme-selector-layout .layout-row.links .theme-thumbnail {background:transparent;padding:0 }} \ No newline at end of file diff --git a/modules/cms/assets/js/october.cmspage.js b/modules/cms/assets/js/winter.cmspage.js similarity index 96% rename from modules/cms/assets/js/october.cmspage.js rename to modules/cms/assets/js/winter.cmspage.js index 6e6735efd..d279ef57b 100644 --- a/modules/cms/assets/js/october.cmspage.js +++ b/modules/cms/assets/js/winter.cmspage.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var CmsPage = function() { @@ -92,17 +92,17 @@ /* * Open a new tab */ - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() $form.request('onOpenTemplate', { data: data }).done(function(data) { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() $('#cms-master-tabs').ocTab('addTab', data.tabTitle, data.tab, tabId, $form.data('type-icon')) }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }).fail(function(jqXHR, textStatus, errorThrown) { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) return false @@ -147,7 +147,7 @@ if ($.fn.table !== undefined) $('[data-control=table]', ev.relatedTarget).table('dispose') - $.oc.foundation.controlUtils.disposeControls(ev.relatedTarget.get(0)) + $.wn.foundation.controlUtils.disposeControls(ev.relatedTarget.get(0)) } CmsPage.prototype.onBeforeRequest = function(ev) { @@ -307,7 +307,7 @@ var templateType = $('input[name=templateType]', element).val() if (templateType.length > 0) { - $.oc.cmsPage.updateTemplateList(templateType) + $.wn.cmsPage.updateTemplateList(templateType) if (templateType == 'layout') this.updateLayouts(element) @@ -315,7 +315,7 @@ this.updateFormEditorMode($(element).closest('.tab-pane'), false) - if (context.handler == 'onSave' && (!data['X_OCTOBER_ERROR_FIELDS'] && !data['X_OCTOBER_ERROR_MESSAGE'])) { + if (context.handler == 'onSave' && (!data['X_WINTER_ERROR_FIELDS'] && !data['X_WINTER_ERROR_MESSAGE'])) { $(element).trigger('unchange.oc.changeMonitor') } @@ -340,7 +340,7 @@ tabId = type + Math.random(), self = this - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() $form.request('onCreateTemplate', { data: {type: type} @@ -349,7 +349,7 @@ $('#layout-side-panel').trigger('close.oc.sidePanel') self.setPageTitle(data.tabTitle) }).always(function(){ - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) } @@ -362,7 +362,7 @@ if (!confirm($el.data('confirmation'))) return - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() $form.request('onDeleteTemplates', { data: {type: templateType} @@ -377,10 +377,10 @@ }) if (data.error !== undefined && $.type(data.error) === 'string' && data.error.length) - $.oc.flashMsg({text: data.error, 'class': 'error'}) + $.wn.flashMsg({text: data.error, 'class': 'error'}) }).always(function(){ self.updateTemplateList(templateType) - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) } @@ -543,7 +543,7 @@ parts = fileName.split('.'), extension = 'txt', mode = 'plain_text', - modes = $.oc.codeEditorExtensionModes, + modes = $.wn.codeEditorExtensionModes, editor = $('[data-control=codeeditor]', pane) if (parts.length >= 2) @@ -579,7 +579,7 @@ }) $.each(counters, function(type, data){ - $.oc.sideNav.setCounter('cms/' + data.menu, data.count); + $.wn.sideNav.setCounter('cms/' + data.menu, data.count); }) } @@ -671,7 +671,7 @@ * Update tab */ - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() $form.request('onOpenTemplate', { data: data @@ -680,7 +680,7 @@ $('#cms-master-tabs').ocTab('unmodifyTab', tab) self.updateModifiedCounter() }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }).fail(function(jqXHR, textStatus, errorThrown) { alert(jqXHR.responseText.length ? jqXHR.responseText : jqXHR.statusText) }) @@ -688,9 +688,9 @@ CmsPage.prototype.setPageTitle = function(title) { if (title.length) - $.oc.layout.setPageTitle(title + ' | ') + $.wn.layout.setPageTitle(title + ' | ') else - $.oc.layout.setPageTitle(title) + $.wn.layout.setPageTitle(title) } CmsPage.prototype.updateLayouts = function(form) { @@ -714,5 +714,5 @@ }) } - $.oc.cmsPage = new CmsPage(); + $.wn.cmsPage = new CmsPage(); }(window.jQuery); diff --git a/modules/cms/assets/js/october.dragcomponents.js b/modules/cms/assets/js/winter.dragcomponents.js similarity index 100% rename from modules/cms/assets/js/october.dragcomponents.js rename to modules/cms/assets/js/winter.dragcomponents.js diff --git a/modules/cms/assets/js/october.tokenexpander.js b/modules/cms/assets/js/winter.tokenexpander.js similarity index 100% rename from modules/cms/assets/js/october.tokenexpander.js rename to modules/cms/assets/js/winter.tokenexpander.js diff --git a/modules/cms/assets/less/october.components.less b/modules/cms/assets/less/winter.components.less similarity index 100% rename from modules/cms/assets/less/october.components.less rename to modules/cms/assets/less/winter.components.less diff --git a/modules/cms/assets/less/october.theme-selector.less b/modules/cms/assets/less/winter.theme-selector.less similarity index 100% rename from modules/cms/assets/less/october.theme-selector.less rename to modules/cms/assets/less/winter.theme-selector.less diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php index 9a83504ba..4d1d7f8d2 100644 --- a/modules/cms/classes/Asset.php +++ b/modules/cms/classes/Asset.php @@ -13,7 +13,7 @@ use October\Rain\Filesystem\PathResolver; /** * The CMS theme asset file class. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Asset extends Extendable diff --git a/modules/cms/classes/AutoDatasource.php b/modules/cms/classes/AutoDatasource.php index 126651138..0d18ec9b7 100644 --- a/modules/cms/classes/AutoDatasource.php +++ b/modules/cms/classes/AutoDatasource.php @@ -3,16 +3,16 @@ use Cache; use Exception; use ApplicationException; -use October\Rain\Halcyon\Model; -use October\Rain\Halcyon\Processors\Processor; -use October\Rain\Halcyon\Datasource\Datasource; -use October\Rain\Halcyon\Exception\DeleteFileException; -use October\Rain\Halcyon\Datasource\DatasourceInterface; +use Winter\Storm\Halcyon\Model; +use Winter\Storm\Halcyon\Processors\Processor; +use Winter\Storm\Halcyon\Datasource\Datasource; +use Winter\Storm\Halcyon\Exception\DeleteFileException; +use Winter\Storm\Halcyon\Datasource\DatasourceInterface; /** * Datasource that loads from other data sources automatically * - * @package october\cms + * @package winter\wn-cms-module * @author Luke Towers */ class AutoDatasource extends Datasource implements DatasourceInterface diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php index 254cf1ee2..ce7069ae3 100644 --- a/modules/cms/classes/CmsCompoundObject.php +++ b/modules/cms/classes/CmsCompoundObject.php @@ -9,7 +9,7 @@ use Cms\Twig\Extension as CmsTwigExtension; use Cms\Components\ViewBag; use Cms\Helpers\Cms as CmsHelpers; use System\Twig\Extension as SystemTwigExtension; -use October\Rain\Halcyon\Processors\SectionParser; +use Winter\Storm\Halcyon\Processors\SectionParser; use Twig\Source as TwigSource; use Twig\Environment as TwigEnvironment; use ApplicationException; @@ -19,7 +19,7 @@ use ApplicationException; * The class implements functionality for the compound object file parsing. It also provides a way * to access parameters defined in the INI settings section as the object properties. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class CmsCompoundObject extends CmsObject @@ -115,7 +115,7 @@ class CmsCompoundObject extends CmsObject * Create a new Collection instance. * * @param array $models - * @return \October\Rain\Halcyon\Collection + * @return \Winter\Storm\Halcyon\Collection */ public function newCollection(array $models = []) { diff --git a/modules/cms/classes/CmsController.php b/modules/cms/classes/CmsController.php index 6f9e1fb63..822a1a7c2 100644 --- a/modules/cms/classes/CmsController.php +++ b/modules/cms/classes/CmsController.php @@ -10,12 +10,12 @@ use Closure; * then the URL is passed to the front-end controller for processing. * * @see Cms\Classes\Controller Front-end controller class - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class CmsController extends ControllerBase { - use \October\Rain\Extension\ExtendableTrait; + use \Winter\Storm\Extension\ExtendableTrait; /** * @var array Behaviors implemented by this controller. diff --git a/modules/cms/classes/CmsException.php b/modules/cms/classes/CmsException.php index 602a9907e..8a72fe473 100644 --- a/modules/cms/classes/CmsException.php +++ b/modules/cms/classes/CmsException.php @@ -2,8 +2,8 @@ use File; use Twig\Error\Error as TwigError; -use October\Rain\Exception\ApplicationException; -use October\Rain\Halcyon\Processors\SectionParser; +use Winter\Storm\Exception\ApplicationException; +use Winter\Storm\Halcyon\Processors\SectionParser; use Exception; /** @@ -11,7 +11,7 @@ use Exception; * The exception class handles CMS related errors. Allows the masking of other exception types which * uses actual source CMS files -- instead of cached files -- for their error content. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class CmsException extends ApplicationException diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php index eb4e73e5f..1f9e059da 100644 --- a/modules/cms/classes/CmsObject.php +++ b/modules/cms/classes/CmsObject.php @@ -15,12 +15,12 @@ use October\Rain\Halcyon\Model as HalcyonModel; * This is a base class for all CMS objects - content files, pages, partials and layouts. * The class implements basic operations with file-based templates. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class CmsObject extends HalcyonModel implements CmsObjectContract { - use \October\Rain\Halcyon\Traits\Validation; + use \Winter\Storm\Halcyon\Traits\Validation; /** * @var array The rules to be applied to the data. @@ -159,7 +159,7 @@ class CmsObject extends HalcyonModel implements CmsObjectContract * \Event::listen('cms.object.listInTheme', function ($cmsObject, $objectList) { * // Get the current context of the Settings Manager to ensure we only affect what we need to affect * $context = \System\Classes\SettingsManager::instance()->getContext(); - * if ($context->owner === 'october.cms' && $context->itemCode === 'maintenance_settings') { + * if ($context->owner === 'winter.cms' && $context->itemCode === 'maintenance_settings') { * // Double check that this is a Page List that we're modifying * if ($cmsObject instanceof \Cms\Classes\Page) { * // Perform filtering with an original-object modifying method as $objectList is passed by reference (being that it's an object) @@ -322,12 +322,12 @@ class CmsObject extends HalcyonModel implements CmsObjectContract */ protected function throwHalcyonSaveException(Exception $ex) { - if ($ex instanceof \October\Rain\Halcyon\Exception\MissingFileNameException) { + if ($ex instanceof \Winter\Storm\Halcyon\Exception\MissingFileNameException) { throw new ValidationException([ 'fileName' => Lang::get('cms::lang.cms_object.file_name_required') ]); } - elseif ($ex instanceof \October\Rain\Halcyon\Exception\InvalidExtensionException) { + elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidExtensionException) { throw new ValidationException(['fileName' => Lang::get('cms::lang.cms_object.invalid_file_extension', [ 'allowed' => implode(', ', $ex->getAllowedExtensions()), @@ -335,22 +335,22 @@ class CmsObject extends HalcyonModel implements CmsObjectContract ]) ]); } - elseif ($ex instanceof \October\Rain\Halcyon\Exception\InvalidFileNameException) { + elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\InvalidFileNameException) { throw new ValidationException([ 'fileName' => Lang::get('cms::lang.cms_object.invalid_file', ['name'=>$ex->getInvalidFileName()]) ]); } - elseif ($ex instanceof \October\Rain\Halcyon\Exception\FileExistsException) { + elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\FileExistsException) { throw new ApplicationException( Lang::get('cms::lang.cms_object.file_already_exists', ['name' => $ex->getInvalidPath()]) ); } - elseif ($ex instanceof \October\Rain\Halcyon\Exception\CreateDirectoryException) { + elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\CreateDirectoryException) { throw new ApplicationException( Lang::get('cms::lang.cms_object.error_creating_directory', ['name' => $ex->getInvalidPath()]) ); } - elseif ($ex instanceof \October\Rain\Halcyon\Exception\CreateFileException) { + elseif ($ex instanceof \Winter\Storm\Halcyon\Exception\CreateFileException) { throw new ApplicationException( Lang::get('cms::lang.cms_object.error_saving', ['name' => $ex->getInvalidPath()]) ); diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php index 2105789ac..36d07dfc1 100644 --- a/modules/cms/classes/CmsObjectCollection.php +++ b/modules/cms/classes/CmsObjectCollection.php @@ -6,7 +6,7 @@ use October\Rain\Support\Collection as CollectionBase; /** * This class represents a collection of Cms Objects. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class CmsObjectCollection extends CollectionBase diff --git a/modules/cms/classes/CodeBase.php b/modules/cms/classes/CodeBase.php index 777f7ff9c..ce5d418eb 100644 --- a/modules/cms/classes/CodeBase.php +++ b/modules/cms/classes/CodeBase.php @@ -1,12 +1,12 @@ registerComponent('October\Demo\Components\Test', 'testComponent'); + * $manager->registerComponent('Winter\Demo\Components\Test', 'testComponent'); * }); * * @param callable $definitions diff --git a/modules/cms/classes/ComponentPartial.php b/modules/cms/classes/ComponentPartial.php index 68a444b2c..3df520001 100644 --- a/modules/cms/classes/ComponentPartial.php +++ b/modules/cms/classes/ComponentPartial.php @@ -4,13 +4,13 @@ use File; use Lang; use Cms\Contracts\CmsObject as CmsObjectContract; use Cms\Helpers\File as FileHelper; -use October\Rain\Extension\Extendable; +use Winter\Storm\Extension\Extendable; use ApplicationException; /** * The CMS component partial class. These objects are read-only. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ComponentPartial extends Extendable implements CmsObjectContract @@ -90,7 +90,7 @@ class ComponentPartial extends Extendable implements CmsObjectContract /** * Checks if a partial override exists in the supplied theme and returns it. - * Since the beginning of time, October inconsistently checked for overrides + * Since the beginning of time, Winter inconsistently checked for overrides * using the component alias exactly, resulting in a folder with uppercase * characters, subsequently this method checks for both variants. * diff --git a/modules/cms/classes/Content.php b/modules/cms/classes/Content.php index a2ba639b8..41d3a845e 100644 --- a/modules/cms/classes/Content.php +++ b/modules/cms/classes/Content.php @@ -6,7 +6,7 @@ use Markdown; /** * The CMS content file class. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Content extends CmsCompoundObject diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php index df0b5f499..b61f52061 100644 --- a/modules/cms/classes/Controller.php +++ b/modules/cms/classes/Controller.php @@ -25,16 +25,16 @@ use System\Helpers\View as ViewHelper; use System\Classes\CombineAssets; use System\Twig\Extension as SystemTwigExtension; use System\Twig\SecurityPolicy; -use October\Rain\Exception\AjaxException; -use October\Rain\Exception\ValidationException; -use October\Rain\Parse\Bracket as TextParser; +use Winter\Storm\Exception\AjaxException; +use Winter\Storm\Exception\ValidationException; +use Winter\Storm\Parse\Bracket as TextParser; use Illuminate\Http\RedirectResponse; /** * The CMS controller class. * The controller finds and serves requested pages. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Controller @@ -696,7 +696,7 @@ class Controller return null; } - if ($handler = Request::header('X_OCTOBER_REQUEST_HANDLER')) { + if ($handler = Request::header('X_WINTER_REQUEST_HANDLER')) { return trim($handler); } @@ -721,7 +721,7 @@ class Controller /* * Validate the handler partial list */ - if ($partialList = trim(Request::header('X_OCTOBER_REQUEST_PARTIALS'))) { + if ($partialList = trim(Request::header('X_WINTER_REQUEST_PARTIALS'))) { $partialList = explode('&', $partialList); foreach ($partialList as $partial) { @@ -755,14 +755,14 @@ class Controller * framework.js knows to redirect the browser and not the request! */ if ($result instanceof RedirectResponse) { - $responseContents['X_OCTOBER_REDIRECT'] = $result->getTargetUrl(); + $responseContents['X_WINTER_REDIRECT'] = $result->getTargetUrl(); $result = null; } /* * No redirect is used, look for any flash messages */ - elseif (Request::header('X_OCTOBER_REQUEST_FLASH') && Flash::check()) { - $responseContents['X_OCTOBER_FLASH_MESSAGES'] = Flash::all(); + elseif (Request::header('X_WINTER_REQUEST_FLASH') && Flash::check()) { + $responseContents['X_WINTER_FLASH_MESSAGES'] = Flash::all(); } /* @@ -786,8 +786,8 @@ class Controller /* * Handle validation errors */ - $responseContents['X_OCTOBER_ERROR_FIELDS'] = $ex->getFields(); - $responseContents['X_OCTOBER_ERROR_MESSAGE'] = $ex->getMessage(); + $responseContents['X_WINTER_ERROR_FIELDS'] = $ex->getFields(); + $responseContents['X_WINTER_ERROR_MESSAGE'] = $ex->getMessage(); throw new AjaxException($responseContents); } catch (Exception $ex) { diff --git a/modules/cms/classes/Layout.php b/modules/cms/classes/Layout.php index 8ef4b59b4..b1be111da 100644 --- a/modules/cms/classes/Layout.php +++ b/modules/cms/classes/Layout.php @@ -3,7 +3,7 @@ /** * The CMS layout class. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Layout extends CmsCompoundObject diff --git a/modules/cms/classes/LayoutCode.php b/modules/cms/classes/LayoutCode.php index c6a4d4bbe..d98ea1497 100644 --- a/modules/cms/classes/LayoutCode.php +++ b/modules/cms/classes/LayoutCode.php @@ -3,7 +3,7 @@ /** * Parent class for PHP classes created for layout PHP sections. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class LayoutCode extends CodeBase diff --git a/modules/cms/classes/MediaLibrary.php b/modules/cms/classes/MediaLibrary.php index 8506c1081..d8fb00b4f 100644 --- a/modules/cms/classes/MediaLibrary.php +++ b/modules/cms/classes/MediaLibrary.php @@ -6,7 +6,7 @@ use System\Classes\MediaLibrary as SystemMediaLibrary; * Provides abstraction level for the Media Library operations. * Implements the library caching features and security checks. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges * @deprecated Use System\Classes\MediaLibrary. Remove if year >= 2020. */ diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php index e6e37d921..e76f00996 100644 --- a/modules/cms/classes/MediaLibraryItem.php +++ b/modules/cms/classes/MediaLibraryItem.php @@ -5,7 +5,7 @@ use System\Classes\MediaLibraryItem as SystemMediaLibraryItem; /** * Represents a file or folder in the Media Library. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges * @deprecated Use System\Classes\MediaLibraryItem. Remove if year >= 2020. */ diff --git a/modules/cms/classes/MediaViewHelper.php b/modules/cms/classes/MediaViewHelper.php index 2d743dbac..a93f86559 100644 --- a/modules/cms/classes/MediaViewHelper.php +++ b/modules/cms/classes/MediaViewHelper.php @@ -5,12 +5,12 @@ use ApplicationException; /** * Helper class for processing video and audio tags inserted by the Media Manager. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class MediaViewHelper { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; protected $playerPartialFlags = []; @@ -71,6 +71,12 @@ class MediaViewHelper return Controller::getController()->renderPartial($partialName, ['src' => $src]); } + $partialName = $type == 'audio' ? 'wn-audio-player' : 'wn-video-player'; + + if ($this->playerPartialExists($partialName)) { + return Controller::getController()->renderPartial($partialName, ['src' => $src]); + } + return $this->getDefaultPlayerMarkup($type, $src); } diff --git a/modules/cms/classes/Meta.php b/modules/cms/classes/Meta.php index b74872e1e..732e7891a 100644 --- a/modules/cms/classes/Meta.php +++ b/modules/cms/classes/Meta.php @@ -5,7 +5,7 @@ use Yaml; /** * The CMS meta file class, used for interacting with YAML files within the Halcyon datasources * - * @package october\cms + * @package winter\wn-cms-module * @author Luke Towers */ class Meta extends CmsObject diff --git a/modules/cms/classes/ObjectMemoryCache.php b/modules/cms/classes/ObjectMemoryCache.php index 341fd6636..0e7b17223 100644 --- a/modules/cms/classes/ObjectMemoryCache.php +++ b/modules/cms/classes/ObjectMemoryCache.php @@ -3,7 +3,7 @@ /** * Provides a simple request-level cache for CMS objects. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ObjectMemoryCache diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php index 873b51855..f434e7ebb 100644 --- a/modules/cms/classes/Page.php +++ b/modules/cms/classes/Page.php @@ -8,7 +8,7 @@ use October\Rain\Filesystem\Definitions as FileDefinitions; /** * The CMS page class. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Page extends CmsCompoundObject @@ -182,7 +182,7 @@ class Page extends CmsCompoundObject * return all available records. * - items - an array of arrays with the same keys (url, isActive, items) + the title key. * The items array should be added only if the $item's $nesting property value is TRUE. - * @param \RainLab\Pages\Classes\MenuItem $item Specifies the menu item. + * @param \Winter\Pages\Classes\MenuItem $item Specifies the menu item. * @param string $url Specifies the current page URL, normalized, in lower case * @param \Cms\Classes\Theme $theme Specifies the current theme. * The URL is specified relative to the website root, it includes the subdirectory name, if any. diff --git a/modules/cms/classes/PageCode.php b/modules/cms/classes/PageCode.php index 36b614acc..24463a201 100644 --- a/modules/cms/classes/PageCode.php +++ b/modules/cms/classes/PageCode.php @@ -3,7 +3,7 @@ /** * Parent class for PHP classes created for page PHP sections. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PageCode extends CodeBase diff --git a/modules/cms/classes/Partial.php b/modules/cms/classes/Partial.php index 768d72e91..6a8287456 100644 --- a/modules/cms/classes/Partial.php +++ b/modules/cms/classes/Partial.php @@ -3,7 +3,7 @@ /** * The CMS partial class. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Partial extends CmsCompoundObject diff --git a/modules/cms/classes/PartialCode.php b/modules/cms/classes/PartialCode.php index 4f125efd1..0c910bf53 100644 --- a/modules/cms/classes/PartialCode.php +++ b/modules/cms/classes/PartialCode.php @@ -3,7 +3,7 @@ /** * Parent class for PHP classes created for partial PHP sections. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PartialCode extends CodeBase diff --git a/modules/cms/classes/PartialStack.php b/modules/cms/classes/PartialStack.php index 98136e8ae..019bfb17f 100644 --- a/modules/cms/classes/PartialStack.php +++ b/modules/cms/classes/PartialStack.php @@ -5,7 +5,7 @@ * of their components. Partial "objects" store the components * used by that partial for deferred retrieval. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PartialStack diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php index a0c434089..04b0f429b 100644 --- a/modules/cms/classes/Router.php +++ b/modules/cms/classes/Router.php @@ -5,8 +5,8 @@ use File; use Cache; use Config; use Event; -use October\Rain\Router\Router as RainRouter; -use October\Rain\Router\Helper as RouterHelper; +use Winter\Storm\Router\Router as StormRouter; +use Winter\Storm\Router\Helper as RouterHelper; /** * The router parses page URL patterns and finds pages by URLs. @@ -30,7 +30,7 @@ use October\Rain\Router\Helper as RouterHelper; * /blog/:post_id|^[0-9]+$ - this will match /blog/post/3 * /blog/:post_name?|^[a-z0-9\-]+$ - this will match /blog/my-blog-post * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Router @@ -56,7 +56,7 @@ class Router protected $urlMap = []; /** - * October\Rain\Router\Router Router object with routes preloaded. + * Winter\Storm\Router\Router Router object with routes preloaded. */ protected $routerObj; @@ -191,7 +191,7 @@ class Router /* * Load up each route rule */ - $router = new RainRouter(); + $router = new StormRouter(); foreach ($this->getUrlMap() as $pageInfo) { $router->route($pageInfo['file'], $pageInfo['pattern']); } diff --git a/modules/cms/classes/Theme.php b/modules/cms/classes/Theme.php index 6ce06a1c5..ab3b3226a 100644 --- a/modules/cms/classes/Theme.php +++ b/modules/cms/classes/Theme.php @@ -14,16 +14,16 @@ use DirectoryIterator; use ApplicationException; use Cms\Models\ThemeData; use System\Models\Parameter; -use October\Rain\Halcyon\Datasource\DbDatasource; -use October\Rain\Halcyon\Datasource\FileDatasource; -use October\Rain\Halcyon\Datasource\DatasourceInterface; +use Winter\Storm\Halcyon\Datasource\DbDatasource; +use Winter\Storm\Halcyon\Datasource\FileDatasource; +use Winter\Storm\Halcyon\Datasource\DatasourceInterface; /** * This class represents the CMS theme. * CMS theme is a directory that contains all CMS objects - pages, layouts, partials and asset files.. * The theme parameters are specified in the theme.ini file in the theme root directory. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Theme @@ -357,8 +357,8 @@ class Theme * Example usage: * * Event::listen('cms.theme.extendConfig', function ($themeCode, &$config) { - * $config['name'] = 'October Theme'; - * $config['description'] = 'Another great theme from October CMS'; + * $config['name'] = 'Winter Theme'; + * $config['description'] = 'Another great theme from Winter CMS'; * }); * */ diff --git a/modules/cms/classes/ThemeManager.php b/modules/cms/classes/ThemeManager.php index 20de61a25..e60fdcfd2 100644 --- a/modules/cms/classes/ThemeManager.php +++ b/modules/cms/classes/ThemeManager.php @@ -8,12 +8,12 @@ use Cms\Classes\Theme as CmsTheme; /** * Theme manager * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ThemeManager { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; // // Gateway spawned diff --git a/modules/cms/components/ViewBag.php b/modules/cms/components/ViewBag.php index 076e55e11..ef109e1b0 100644 --- a/modules/cms/components/ViewBag.php +++ b/modules/cms/components/ViewBag.php @@ -6,7 +6,7 @@ use Cms\Classes\ComponentBase; * The view bag stores custom template properties. * This is a hidden component ignored by the back-end UI. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ViewBag extends ComponentBase diff --git a/modules/cms/composer.json b/modules/cms/composer.json index ed41ab843..3cf712c04 100644 --- a/modules/cms/composer.json +++ b/modules/cms/composer.json @@ -1,9 +1,9 @@ { - "name": "october/cms", - "type": "october-module", - "description": "CMS module for October CMS", - "homepage": "https://octobercms.com", - "keywords": ["october cms", "october", "cms"], + "name": "winter/wn-cms-module", + "type": "winter-module", + "description": "CMS module for Winter CMS", + "homepage": "https://wintercms.com", + "keywords": ["winter cms", "winter", "cms"], "license": "MIT", "authors": [ { @@ -18,7 +18,7 @@ }, { "name": "Luke Towers", - "email": "octobercms@luketowers.ca", + "email": "wintercms@luketowers.ca", "homepage": "https://luketowers.ca", "role": "Maintainer" } diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php index 7aaab9963..6fb655ab4 100644 --- a/modules/cms/controllers/Index.php +++ b/modules/cms/controllers/Index.php @@ -24,14 +24,14 @@ use Cms\Classes\ComponentPartial; use Cms\Helpers\Cms as CmsHelpers; use Backend\Classes\Controller; use System\Helpers\DateTime; -use October\Rain\Router\Router as RainRouter; +use Winter\Storm\Router\Router as StormRouter; use ApplicationException; use Cms\Classes\Asset; /** * CMS index * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Index extends Controller @@ -79,7 +79,7 @@ class Index extends Controller }; }); - BackendMenu::setContext('October.Cms', 'cms', true); + BackendMenu::setContext('Winter.Cms', 'cms', true); try { if (!($theme = Theme::getEditTheme())) { @@ -123,10 +123,10 @@ class Index extends Controller */ public function index() { - $this->addJs('/modules/cms/assets/js/october.cmspage.js', 'core'); - $this->addJs('/modules/cms/assets/js/october.dragcomponents.js', 'core'); - $this->addJs('/modules/cms/assets/js/october.tokenexpander.js', 'core'); - $this->addCss('/modules/cms/assets/css/october.components.css', 'core'); + $this->addJs('/modules/cms/assets/js/winter.cmspage.js', 'core'); + $this->addJs('/modules/cms/assets/js/winter.dragcomponents.js', 'core'); + $this->addJs('/modules/cms/assets/js/winter.tokenexpander.js', 'core'); + $this->addCss('/modules/cms/assets/css/winter.components.css', 'core'); // Preload the code editor class as it could be needed // before it loads dynamically. @@ -159,7 +159,7 @@ class Index extends Controller $this->vars['canReset'] = $this->canResetTemplate($template); if ($type === 'page') { - $router = new RainRouter; + $router = new StormRouter; $this->vars['pageUrl'] = $router->urlFromPattern($template->url); } @@ -494,7 +494,7 @@ class Index extends Controller /** * Get the active theme's datasource * - * @return \October\Rain\Halcyon\Datasource\DatasourceInterface + * @return \Winter\Storm\Halcyon\Datasource\DatasourceInterface */ protected function getThemeDatasource() { diff --git a/modules/cms/controllers/Media.php b/modules/cms/controllers/Media.php index d45ddd609..525adb4e8 100644 --- a/modules/cms/controllers/Media.php +++ b/modules/cms/controllers/Media.php @@ -5,7 +5,7 @@ use Backend\Controllers\Media as MediaController; /** * CMS Media Manager * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges * @deprecated Use Backend\Controllers\Media. Remove if year >= 2020. */ diff --git a/modules/cms/controllers/ThemeLogs.php b/modules/cms/controllers/ThemeLogs.php index a229aef23..504cf4d45 100644 --- a/modules/cms/controllers/ThemeLogs.php +++ b/modules/cms/controllers/ThemeLogs.php @@ -10,7 +10,7 @@ use Cms\Models\ThemeLog; /** * Request Logs controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ThemeLogs extends Controller @@ -45,8 +45,8 @@ class ThemeLogs extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.Cms', 'theme_logs'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.Cms', 'theme_logs'); } public function index_onRefresh() diff --git a/modules/cms/controllers/ThemeOptions.php b/modules/cms/controllers/ThemeOptions.php index 78068c83a..64afc5c69 100644 --- a/modules/cms/controllers/ThemeOptions.php +++ b/modules/cms/controllers/ThemeOptions.php @@ -12,7 +12,7 @@ use Exception; /** * Theme customization controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -44,8 +44,8 @@ class ThemeOptions extends Controller $this->pageTitle = 'cms::lang.theme.settings_menu'; - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.Cms', 'theme'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.Cms', 'theme'); } public function update($dirName = null) diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php index 5bdf1625d..39521f0ed 100644 --- a/modules/cms/controllers/Themes.php +++ b/modules/cms/controllers/Themes.php @@ -19,7 +19,7 @@ use Backend\Widgets\Form; /** * Theme selector controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -40,11 +40,11 @@ class Themes extends Controller { parent::__construct(); - $this->addCss('/modules/cms/assets/css/october.theme-selector.css', 'core'); + $this->addCss('/modules/cms/assets/css/winter.theme-selector.css', 'core'); $this->pageTitle = 'cms::lang.theme.settings_menu'; - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.Cms', 'theme'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.Cms', 'theme'); /* * Custom redirect for unauthorized request diff --git a/modules/cms/controllers/index/_button_commit.htm b/modules/cms/controllers/index/_button_commit.htm index cf08583dd..81e50d871 100644 --- a/modules/cms/controllers/index/_button_commit.htm +++ b/modules/cms/controllers/index/_button_commit.htm @@ -1,6 +1,6 @@ diff --git a/modules/cms/controllers/index/_content_toolbar.htm b/modules/cms/controllers/index/_content_toolbar.htm index 02476a792..705e52821 100644 --- a/modules/cms/controllers/index/_content_toolbar.htm +++ b/modules/cms/controllers/index/_content_toolbar.htm @@ -1,7 +1,7 @@
    diff --git a/modules/cms/controllers/index/_layout_toolbar.htm b/modules/cms/controllers/index/_layout_toolbar.htm index fe336a1b1..a5de7a0d3 100644 --- a/modules/cms/controllers/index/_layout_toolbar.htm +++ b/modules/cms/controllers/index/_layout_toolbar.htm @@ -1,7 +1,7 @@
    diff --git a/modules/cms/controllers/index/_page_toolbar.htm b/modules/cms/controllers/index/_page_toolbar.htm index e72f76d0b..8883e99f3 100644 --- a/modules/cms/controllers/index/_page_toolbar.htm +++ b/modules/cms/controllers/index/_page_toolbar.htm @@ -1,7 +1,7 @@
    @@ -14,7 +14,7 @@ diff --git a/modules/cms/controllers/index/_partial_toolbar.htm b/modules/cms/controllers/index/_partial_toolbar.htm index 4f4df2cbd..2c6c74b76 100644 --- a/modules/cms/controllers/index/_partial_toolbar.htm +++ b/modules/cms/controllers/index/_partial_toolbar.htm @@ -1,7 +1,7 @@
    diff --git a/modules/cms/controllers/index/_sidepanel.htm b/modules/cms/controllers/index/_sidepanel.htm index e38e5059b..3fdbb3f70 100644 --- a/modules/cms/controllers/index/_sidepanel.htm +++ b/modules/cms/controllers/index/_sidepanel.htm @@ -11,7 +11,7 @@ class="layout " data-content-id="pages" data-template-type="page" - data-type-icon="oc-icon-copy" + data-type-icon="wn-icon-copy" onsubmit="return false"> widget->pageList->render() ?> @@ -23,7 +23,7 @@ class="layout " data-content-id="partials" data-template-type="partial" - data-type-icon="oc-icon-tags" + data-type-icon="wn-icon-tags" onsubmit="return false"> widget->partialList->render() ?> @@ -35,7 +35,7 @@ class="layout " data-content-id="layouts" data-template-type="layout" - data-type-icon="oc-icon-th-large" + data-type-icon="wn-icon-th-large" onsubmit="return false"> widget->layoutList->render() ?> @@ -47,7 +47,7 @@ class="layout " data-content-id="content" data-template-type="content" - data-type-icon="oc-icon-file-text-o" + data-type-icon="wn-icon-file-text-o" onsubmit="return false"> widget->contentList->render() ?> @@ -59,7 +59,7 @@ class="layout " data-content-id="assets" data-template-type="asset" - data-type-icon="oc-icon-file-text-o" + data-type-icon="wn-icon-file-text-o" onsubmit="return false"> widget->assetList->render() ?> diff --git a/modules/cms/controllers/index/index.htm b/modules/cms/controllers/index/index.htm index 98baa4586..138c663c8 100644 --- a/modules/cms/controllers/index/index.htm +++ b/modules/cms/controllers/index/index.htm @@ -13,7 +13,7 @@ data-pane-classes="layout-cell" data-max-title-symbols="15" data-title-as-file-names="true" - class="layout control-tabs master-tabs fancy-layout oc-logo-transparent" + class="layout control-tabs master-tabs fancy-layout wn-logo-transparent" id="cms-master-tabs">
    diff --git a/modules/cms/controllers/themelogs/_list_toolbar.htm b/modules/cms/controllers/themelogs/_list_toolbar.htm index cbcfde08a..e294789fd 100644 --- a/modules/cms/controllers/themelogs/_list_toolbar.htm +++ b/modules/cms/controllers/themelogs/_list_toolbar.htm @@ -3,7 +3,7 @@ href="javascript:;" data-request="onRefresh" data-load-indicator="" - class="btn btn-primary oc-icon-refresh"> + class="btn btn-primary wn-icon-refresh"> + class="btn btn-default wn-icon-eraser">
    • @@ -71,7 +71,7 @@ data-handler="onLoadDuplicateForm" data-request-data="theme: 'getDirName()) ?>'" href="javascript:;" - class="oc-icon-copy"> + class="wn-icon-copy"> @@ -84,7 +84,7 @@ data-handler="onLoadImportForm" data-request-data="theme: 'getDirName()) ?>'" href="javascript:;" - class="oc-icon-upload"> + class="wn-icon-upload"> @@ -96,7 +96,7 @@ data-handler="onLoadExportForm" data-request-data="theme: 'getDirName()) ?>'" href="javascript:;" - class="oc-icon-download"> + class="wn-icon-download"> @@ -110,7 +110,7 @@ data-request-confirm="" data-request-data="theme: 'getDirName()) ?>'" href="javascript:;" - class="oc-icon-trash"> + class="wn-icon-trash"> diff --git a/modules/cms/database/migrations/2014_10_01_000001_Db_Cms_Theme_Data.php b/modules/cms/database/migrations/2014_10_01_000001_Db_Cms_Theme_Data.php index 4f7cccd45..9f51c5144 100644 --- a/modules/cms/database/migrations/2014_10_01_000001_Db_Cms_Theme_Data.php +++ b/modules/cms/database/migrations/2014_10_01_000001_Db_Cms_Theme_Data.php @@ -1,7 +1,7 @@ = 2020. */ diff --git a/modules/cms/formwidgets/components/partials/_component.htm b/modules/cms/formwidgets/components/partials/_component.htm index 0707d8ba9..451321ba3 100644 --- a/modules/cms/formwidgets/components/partials/_component.htm +++ b/modules/cms/formwidgets/components/partials/_component.htm @@ -1,6 +1,6 @@
    inspectorEnabled): ?>data-inspectable data-inspector-title="getComponentName($component)) ?>" data-inspector-description="getComponentDescription($component)) ?>" @@ -8,7 +8,7 @@ data-inspector-class=""> - alias) ?> + alias) ?> diff --git a/modules/cms/helpers/Cms.php b/modules/cms/helpers/Cms.php index 34332c2ea..6c1063b97 100644 --- a/modules/cms/helpers/Cms.php +++ b/modules/cms/helpers/Cms.php @@ -7,7 +7,7 @@ use Config; /** * CMS Helper * - * @package october\cms + * @package winter\wn-cms-module * @see \Cms\Facades\Cms * @author Alexey Bobkov, Samuel Georges */ diff --git a/modules/cms/helpers/File.php b/modules/cms/helpers/File.php index 8849927e1..f79cd0a9a 100644 --- a/modules/cms/helpers/File.php +++ b/modules/cms/helpers/File.php @@ -6,7 +6,7 @@ use File as Filesystem; /** * Defines some file-system helpers for the CMS system. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class File diff --git a/modules/cms/lang/fr/lang.php b/modules/cms/lang/fr/lang.php index c22cf0661..44ac698fe 100644 --- a/modules/cms/lang/fr/lang.php +++ b/modules/cms/lang/fr/lang.php @@ -90,7 +90,7 @@ return [ 'new_directory_name_comment' => 'Indiquer un nouveau nom de répertoire pour le thème en dupliqué.', 'dir_name_invalid' => 'Le nom doit contenir uniquement des chiffres, des symboles latins et les symboles suivants : _-', 'dir_name_taken' => 'Le nom du répertoire indiqué existe déjà.', - 'find_more_themes' => 'Trouver davantage de thèmes sur le site du CMS October.', + 'find_more_themes' => 'Trouver davantage de thèmes sur le site du CMS Winter.', 'saving' => 'Enregistrement du thème en cours…', 'return' => 'Retourner à la liste des thèmes', ], diff --git a/modules/cms/lang/hu/lang.php b/modules/cms/lang/hu/lang.php index 21553f072..d5a6055f1 100644 --- a/modules/cms/lang/hu/lang.php +++ b/modules/cms/lang/hu/lang.php @@ -90,7 +90,7 @@ return [ 'new_directory_name_comment' => 'Adjon meg egy új könyvtárat a duplikált témának.', 'dir_name_invalid' => 'A név csak számokat, latin betűket, aláhúzásokat és kötőjeleket tartalmazhat.', 'dir_name_taken' => 'A megadott könyvtár már létezik.', - 'find_more_themes' => 'További témák az OctoberCMS piacterén', + 'find_more_themes' => 'További témák az Winter CMS piacterén', 'saving' => 'Téma mentése...', 'return' => 'Vissza a témákhoz' ], diff --git a/modules/cms/lang/id/lang.php b/modules/cms/lang/id/lang.php index c7a066d41..9430a0d2a 100644 --- a/modules/cms/lang/id/lang.php +++ b/modules/cms/lang/id/lang.php @@ -30,7 +30,7 @@ return [ ], 'settings_menu' => 'Tema front-end', 'settings_menu_description' => 'Tinjau senarai tema terpasang dan pilih tema aktif.', - 'find_more_themes' => 'Temukan lebih banyak tema pada Toko Tema OctoberCMS.', + 'find_more_themes' => 'Temukan lebih banyak tema pada Toko Tema Winter CMS.', 'activate_button' => 'Aktifkan', 'active_button' => 'Aktif', 'customize_button' => 'Ubah suai' diff --git a/modules/cms/lang/ja/lang.php b/modules/cms/lang/ja/lang.php index a410309d7..a208c7044 100644 --- a/modules/cms/lang/ja/lang.php +++ b/modules/cms/lang/ja/lang.php @@ -30,7 +30,7 @@ return [ ], 'settings_menu' => 'フロントエンドのテーマ', 'settings_menu_description' => 'インストール済みのテーマのプレビュー一覧とアクティブテーマの選択。', - 'find_more_themes' => 'OctoberCMSマーケットプレースで、もっとテーマを探す。', + 'find_more_themes' => 'Winter CMSマーケットプレースで、もっとテーマを探す。', 'activate_button' => 'これをアクティブにする', 'active_button' => '現在アクティブ中です', 'customize_button' => 'カスタマイズ', diff --git a/modules/cms/lang/nb-no/lang.php b/modules/cms/lang/nb-no/lang.php index c0d441627..3889fdc2f 100644 --- a/modules/cms/lang/nb-no/lang.php +++ b/modules/cms/lang/nb-no/lang.php @@ -86,7 +86,7 @@ return [ 'new_directory_name_comment' => 'Oppgi en ny mappe for det dupliserte temaet.', 'dir_name_invalid' => 'Navnet kan kun inneholde tall, latinske bokstaver og følgende symbol: _-', 'dir_name_taken' => 'Temamappen eksiterer allerede.', - 'find_more_themes' => 'Finn flere temaer på OctoberCMS Theme Marketplace', + 'find_more_themes' => 'Finn flere temaer på Winter CMS Theme Marketplace', 'saving' => 'Lagrer tema...', 'return' => 'Tilbake til temaliste', ], diff --git a/modules/cms/lang/ro/lang.php b/modules/cms/lang/ro/lang.php index 9fad12082..9b36d1976 100644 --- a/modules/cms/lang/ro/lang.php +++ b/modules/cms/lang/ro/lang.php @@ -24,7 +24,7 @@ return [ ], 'settings_menu' => 'Tema Front-end', 'settings_menu_description' => 'Previzualizati lista de teme instalate si selectati o tema activa.', - 'find_more_themes' => 'Gasiti mai multe teme in "Piata OctoberCMS".', + 'find_more_themes' => 'Gasiti mai multe teme in "Piata Winter CMS".', 'activate_button' => 'Activare', 'active_button' => 'Activare', ], diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php index 30adf256e..67573023a 100644 --- a/modules/cms/lang/sv/lang.php +++ b/modules/cms/lang/sv/lang.php @@ -83,7 +83,7 @@ return [ 'new_directory_name_comment' => 'Ange ett nytt katalognamn för det duplicerade temat.', 'dir_name_invalid' => 'Namn kan bara innehålla siffror, latinska bokstäver och följande symboler: _-', 'dir_name_taken' => 'Den önskade temakatalogen finns redan.', - 'find_more_themes' => 'Hitta fler teman på OctoberCMS Theme Marketplace', + 'find_more_themes' => 'Hitta fler teman på Winter CMS Theme Marketplace', 'saving' => 'Sparar tema...', 'return' => 'Återvänd till temalistan', ], diff --git a/modules/cms/lang/zh-cn/lang.php b/modules/cms/lang/zh-cn/lang.php index 074fbe3d0..3ba8a4bcf 100644 --- a/modules/cms/lang/zh-cn/lang.php +++ b/modules/cms/lang/zh-cn/lang.php @@ -90,7 +90,7 @@ return [ 'new_directory_name_comment' => '提供复制主题的新闻目录名.', 'dir_name_invalid' => '名称只能包含数字, 拉丁字母和以下字符: _-', 'dir_name_taken' => '主题目录已存在.', - 'find_more_themes' => '在 OctoberCMS 主题商店中查找更多主题', + 'find_more_themes' => '在 Winter CMS 主题商店中查找更多主题', 'saving' => '保存主题中...', 'return' => '返回主题列表', ], diff --git a/modules/cms/lang/zh-tw/lang.php b/modules/cms/lang/zh-tw/lang.php index 3c69e4484..72cf99525 100644 --- a/modules/cms/lang/zh-tw/lang.php +++ b/modules/cms/lang/zh-tw/lang.php @@ -83,7 +83,7 @@ return [ 'new_directory_name_comment' => '提供複製主題的新聞目錄名.', 'dir_name_invalid' => '名稱只能包含數字, 拉丁字母和以下字元: _-', 'dir_name_taken' => '主題目錄已存在.', - 'find_more_themes' => '在 OctoberCMS 主題商店中搜尋更多主題', + 'find_more_themes' => '在 Winter CMS 主題商店中搜尋更多主題', 'saving' => '保存主題...', 'return' => '返回主題列表', ], diff --git a/modules/cms/models/MaintenanceSetting.php b/modules/cms/models/MaintenanceSetting.php index 4530b5f6c..be806055b 100644 --- a/modules/cms/models/MaintenanceSetting.php +++ b/modules/cms/models/MaintenanceSetting.php @@ -8,12 +8,12 @@ use ApplicationException; /** * Maintenance mode settings * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class MaintenanceSetting extends Model { - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; /** * @var array Behaviors implemented by this model. diff --git a/modules/cms/models/ThemeData.php b/modules/cms/models/ThemeData.php index 49b7e4c01..907887d7e 100644 --- a/modules/cms/models/ThemeData.php +++ b/modules/cms/models/ThemeData.php @@ -10,12 +10,12 @@ use System\Models\File; /** * Customization data used by a theme * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ThemeData extends Model { - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; /** * @var string The database table used by the model. diff --git a/modules/cms/models/ThemeExport.php b/modules/cms/models/ThemeExport.php index 72b947557..a732b21f4 100644 --- a/modules/cms/models/ThemeExport.php +++ b/modules/cms/models/ThemeExport.php @@ -4,19 +4,19 @@ use File; use Model; use Response; use ApplicationException; -use October\Rain\Filesystem\Zip; +use Winter\Storm\Filesystem\Zip; use Cms\Classes\Theme as CmsTheme; use Exception; /** * Theme export model * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ThemeExport extends Model { - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; /** * @var string The database table used by the model. diff --git a/modules/cms/models/ThemeImport.php b/modules/cms/models/ThemeImport.php index 12bb509ba..4cfe2817e 100644 --- a/modules/cms/models/ThemeImport.php +++ b/modules/cms/models/ThemeImport.php @@ -3,7 +3,7 @@ use File; use Model; use ApplicationException; -use October\Rain\Filesystem\Zip; +use Winter\Storm\Filesystem\Zip; use Cms\Classes\Theme as CmsTheme; use FilesystemIterator; use Exception; @@ -11,12 +11,12 @@ use Exception; /** * Theme import model * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ThemeImport extends Model { - use \October\Rain\Database\Traits\Validation; + use \Winter\Storm\Database\Traits\Validation; /** * @var string The database table used by the model. diff --git a/modules/cms/models/ThemeLog.php b/modules/cms/models/ThemeLog.php index 6105e3150..b725715b3 100644 --- a/modules/cms/models/ThemeLog.php +++ b/modules/cms/models/ThemeLog.php @@ -5,13 +5,13 @@ use Model; use BackendAuth; use Cms\Classes\Theme; use System\Models\LogSetting; -use October\Rain\Halcyon\Model as HalcyonModel; +use Winter\Storm\Halcyon\Model as HalcyonModel; use Exception; /** * Model for changes made to the theme * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ThemeLog extends Model diff --git a/modules/cms/reportwidgets/ActiveTheme.php b/modules/cms/reportwidgets/ActiveTheme.php index 70668d702..afe4969b7 100644 --- a/modules/cms/reportwidgets/ActiveTheme.php +++ b/modules/cms/reportwidgets/ActiveTheme.php @@ -11,7 +11,7 @@ use Exception; /** * Active theme report widget. * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges */ class ActiveTheme extends ReportWidgetBase diff --git a/modules/cms/reportwidgets/activetheme/partials/_widget.htm b/modules/cms/reportwidgets/activetheme/partials/_widget.htm index 599522a7c..ce3baa30a 100644 --- a/modules/cms/reportwidgets/activetheme/partials/_widget.htm +++ b/modules/cms/reportwidgets/activetheme/partials/_widget.htm @@ -8,7 +8,7 @@
    • - + diff --git a/modules/cms/traits/UrlMaker.php b/modules/cms/traits/UrlMaker.php index ebe0c050f..d62f4fcf0 100644 --- a/modules/cms/traits/UrlMaker.php +++ b/modules/cms/traits/UrlMaker.php @@ -34,7 +34,7 @@ use ApplicationException; * ]; * } * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ trait UrlMaker diff --git a/modules/cms/twig/ComponentNode.php b/modules/cms/twig/ComponentNode.php index c375d154a..4787fe9b2 100644 --- a/modules/cms/twig/ComponentNode.php +++ b/modules/cms/twig/ComponentNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a component node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ComponentNode extends TwigNode diff --git a/modules/cms/twig/ComponentTokenParser.php b/modules/cms/twig/ComponentTokenParser.php index 568721f4a..79e98710a 100644 --- a/modules/cms/twig/ComponentTokenParser.php +++ b/modules/cms/twig/ComponentTokenParser.php @@ -10,7 +10,7 @@ use Twig\Error\SyntaxError as TwigErrorSyntax; * * {% component "pluginComponent" %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ComponentTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/ContentNode.php b/modules/cms/twig/ContentNode.php index 02d8ab101..f1f9df860 100644 --- a/modules/cms/twig/ContentNode.php +++ b/modules/cms/twig/ContentNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a content node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ContentNode extends TwigNode diff --git a/modules/cms/twig/ContentTokenParser.php b/modules/cms/twig/ContentTokenParser.php index 3bedc5796..895e9327a 100644 --- a/modules/cms/twig/ContentTokenParser.php +++ b/modules/cms/twig/ContentTokenParser.php @@ -14,7 +14,7 @@ use Twig\Error\SyntaxError as TwigErrorSyntax; * * {% content "intro/txt" name='John', year=2013 %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ContentTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/DefaultNode.php b/modules/cms/twig/DefaultNode.php index 2cc4efbb7..bcf05b501 100644 --- a/modules/cms/twig/DefaultNode.php +++ b/modules/cms/twig/DefaultNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a "default" node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class DefaultNode extends TwigNode @@ -25,7 +25,7 @@ class DefaultNode extends TwigNode { $compiler ->addDebugInfo($this) - ->write("echo '';\n") + ->write("echo '';\n") ; } } diff --git a/modules/cms/twig/DefaultTokenParser.php b/modules/cms/twig/DefaultTokenParser.php index e601c1b45..8129a818f 100644 --- a/modules/cms/twig/DefaultTokenParser.php +++ b/modules/cms/twig/DefaultTokenParser.php @@ -11,7 +11,7 @@ use Twig\TokenParser\AbstractTokenParser as TwigTokenParser; * {% default %} * {% endput %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class DefaultTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php index af95e6b0b..c8e2eeb83 100644 --- a/modules/cms/twig/Extension.php +++ b/modules/cms/twig/Extension.php @@ -10,7 +10,7 @@ use Cms\Classes\Controller; /** * The CMS Twig extension class implements the basic CMS Twig functions and filters. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Extension extends TwigExtension @@ -144,7 +144,7 @@ class Extension extends TwigExtension return null; } - $result = str_replace('', trim($default), $result); + $result = str_replace('', trim($default), $result); return $result; } @@ -210,7 +210,7 @@ class Extension extends TwigExtension $result = $event; } - $result = str_replace('', trim($default), $result); + $result = str_replace('', trim($default), $result); return $result; } diff --git a/modules/cms/twig/FlashNode.php b/modules/cms/twig/FlashNode.php index 462a5382f..5f2136cee 100644 --- a/modules/cms/twig/FlashNode.php +++ b/modules/cms/twig/FlashNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a flash node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class FlashNode extends TwigNode diff --git a/modules/cms/twig/FlashTokenParser.php b/modules/cms/twig/FlashTokenParser.php index e6f707196..209aed35d 100644 --- a/modules/cms/twig/FlashTokenParser.php +++ b/modules/cms/twig/FlashTokenParser.php @@ -7,7 +7,7 @@ use Twig\TokenParser\AbstractTokenParser as TwigTokenParser; /** * Parser for the {% flash %} Twig tag. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class FlashTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/FrameworkNode.php b/modules/cms/twig/FrameworkNode.php index 9aa2aa04b..0ad9c1873 100644 --- a/modules/cms/twig/FrameworkNode.php +++ b/modules/cms/twig/FrameworkNode.php @@ -7,7 +7,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a "framework" node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class FrameworkNode extends TwigNode diff --git a/modules/cms/twig/FrameworkTokenParser.php b/modules/cms/twig/FrameworkTokenParser.php index cea6aed82..7a8e2da13 100644 --- a/modules/cms/twig/FrameworkTokenParser.php +++ b/modules/cms/twig/FrameworkTokenParser.php @@ -8,7 +8,7 @@ use Twig\TokenParser\AbstractTokenParser as TwigTokenParser; * * {% framework %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class FrameworkTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/Loader.php b/modules/cms/twig/Loader.php index c0b1dc10a..87f13b9fc 100644 --- a/modules/cms/twig/Loader.php +++ b/modules/cms/twig/Loader.php @@ -10,7 +10,7 @@ use Cms\Classes\Partial as CmsPartial; /** * This class implements a Twig template loader for the CMS. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class Loader extends LoaderBase implements TwigLoaderInterface diff --git a/modules/cms/twig/PageNode.php b/modules/cms/twig/PageNode.php index 32c92f7a6..f4481c918 100644 --- a/modules/cms/twig/PageNode.php +++ b/modules/cms/twig/PageNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a page node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PageNode extends TwigNode diff --git a/modules/cms/twig/PageTokenParser.php b/modules/cms/twig/PageTokenParser.php index 1c6b48139..c346a98e8 100644 --- a/modules/cms/twig/PageTokenParser.php +++ b/modules/cms/twig/PageTokenParser.php @@ -8,7 +8,7 @@ use Twig\TokenParser\AbstractTokenParser as TwigTokenParser; * * {% page %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PageTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/PartialNode.php b/modules/cms/twig/PartialNode.php index c6a484289..34578dec7 100644 --- a/modules/cms/twig/PartialNode.php +++ b/modules/cms/twig/PartialNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a partial node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PartialNode extends TwigNode diff --git a/modules/cms/twig/PartialTokenParser.php b/modules/cms/twig/PartialTokenParser.php index b99625226..91de248c5 100644 --- a/modules/cms/twig/PartialTokenParser.php +++ b/modules/cms/twig/PartialTokenParser.php @@ -14,7 +14,7 @@ use Twig\Error\SyntaxError as TwigErrorSyntax; * * {% partial "sidebar" name='John', year=2013 %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PartialTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/PlaceholderNode.php b/modules/cms/twig/PlaceholderNode.php index 4a40c757e..46d8a809a 100644 --- a/modules/cms/twig/PlaceholderNode.php +++ b/modules/cms/twig/PlaceholderNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a placeholder node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PlaceholderNode extends TwigNode diff --git a/modules/cms/twig/PlaceholderTokenParser.php b/modules/cms/twig/PlaceholderTokenParser.php index 59d7c3d8b..863dd4748 100644 --- a/modules/cms/twig/PlaceholderTokenParser.php +++ b/modules/cms/twig/PlaceholderTokenParser.php @@ -16,7 +16,7 @@ use Twig\Error\SyntaxError as TwigErrorSyntax; * * {% endshowblock %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PlaceholderTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/PutNode.php b/modules/cms/twig/PutNode.php index 82ff67c9b..6b3927ac0 100644 --- a/modules/cms/twig/PutNode.php +++ b/modules/cms/twig/PutNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a put node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PutNode extends TwigNode diff --git a/modules/cms/twig/PutTokenParser.php b/modules/cms/twig/PutTokenParser.php index ec5572bf2..442e86ca3 100644 --- a/modules/cms/twig/PutTokenParser.php +++ b/modules/cms/twig/PutTokenParser.php @@ -17,7 +17,7 @@ use Twig\TokenParser\AbstractTokenParser as TwigTokenParser; * {% default %} * {% endput %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class PutTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/ScriptsNode.php b/modules/cms/twig/ScriptsNode.php index 96c71b642..4b2b9cdf5 100644 --- a/modules/cms/twig/ScriptsNode.php +++ b/modules/cms/twig/ScriptsNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a "scripts" node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ScriptsNode extends TwigNode diff --git a/modules/cms/twig/ScriptsTokenParser.php b/modules/cms/twig/ScriptsTokenParser.php index 8965aee85..8b2278203 100644 --- a/modules/cms/twig/ScriptsTokenParser.php +++ b/modules/cms/twig/ScriptsTokenParser.php @@ -8,7 +8,7 @@ use Twig\TokenParser\AbstractTokenParser as TwigTokenParser; * * {% scripts %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ScriptsTokenParser extends TwigTokenParser diff --git a/modules/cms/twig/StylesNode.php b/modules/cms/twig/StylesNode.php index e3ad91a5e..35a442c2f 100644 --- a/modules/cms/twig/StylesNode.php +++ b/modules/cms/twig/StylesNode.php @@ -6,7 +6,7 @@ use Twig\Compiler as TwigCompiler; /** * Represents a "styles" node * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class StylesNode extends TwigNode diff --git a/modules/cms/twig/StylesTokenParser.php b/modules/cms/twig/StylesTokenParser.php index eaa934626..4cb7b86d4 100644 --- a/modules/cms/twig/StylesTokenParser.php +++ b/modules/cms/twig/StylesTokenParser.php @@ -8,7 +8,7 @@ use Twig\TokenParser\AbstractTokenParser as TwigTokenParser; * * {% styles %} * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class StylesTokenParser extends TwigTokenParser diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php index a37643560..6c61fea93 100644 --- a/modules/cms/widgets/AssetList.php +++ b/modules/cms/widgets/AssetList.php @@ -12,7 +12,7 @@ use Cms\Classes\Asset; use Backend\Classes\WidgetBase; use ApplicationException; use Symfony\Component\HttpFoundation\File\UploadedFile; -use October\Rain\Filesystem\Definitions as FileDefinitions; +use Winter\Storm\Filesystem\Definitions as FileDefinitions; use RecursiveIteratorIterator; use RecursiveDirectoryIterator; use DirectoryIterator; @@ -21,7 +21,7 @@ use Exception; /** * CMS asset list widget. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class AssetList extends WidgetBase diff --git a/modules/cms/widgets/ComponentList.php b/modules/cms/widgets/ComponentList.php index b75b8dfb0..825be2118 100644 --- a/modules/cms/widgets/ComponentList.php +++ b/modules/cms/widgets/ComponentList.php @@ -11,7 +11,7 @@ use Backend\Classes\WidgetBase; /** * Component list widget. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class ComponentList extends WidgetBase diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php index 4161d62a8..93dc9f784 100644 --- a/modules/cms/widgets/MediaManager.php +++ b/modules/cms/widgets/MediaManager.php @@ -5,7 +5,7 @@ use Backend\Widgets\MediaManager as BackendMediaManager; /** * Media Manager widget. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges * @deprecated Use Backend\Widgets\MediaManager. Remove if year >= 2020. */ diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php index 40386cecd..5e2debd08 100644 --- a/modules/cms/widgets/TemplateList.php +++ b/modules/cms/widgets/TemplateList.php @@ -11,7 +11,7 @@ use Backend\Classes\WidgetBase; * Template list widget. * This widget displays templates of different types. * - * @package october\cms + * @package winter\wn-cms-module * @author Alexey Bobkov, Samuel Georges */ class TemplateList extends WidgetBase @@ -160,7 +160,7 @@ class TemplateList extends WidgetBase */ $items = call_user_func($this->dataSource); - if ($items instanceof \October\Rain\Support\Collection) { + if ($items instanceof \Winter\Storm\Support\Collection) { $items = $items->all(); } diff --git a/modules/cms/widgets/assetlist/assets/js/assetlist.js b/modules/cms/widgets/assetlist/assets/js/assetlist.js index 4fb3d41cc..458961b30 100644 --- a/modules/cms/widgets/assetlist/assets/js/assetlist.js +++ b/modules/cms/widgets/assetlist/assets/js/assetlist.js @@ -39,7 +39,7 @@ else $container.addClass('goForward') - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$form.request(this.alias+'::onOpenDirectory', { data: { path: path, @@ -54,7 +54,7 @@ alert(jqXHR.responseText.length ? jqXHR.responseText : jqXHR.statusText) } }).always(function(){ - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) } @@ -68,7 +68,7 @@ this.$form.request(this.alias+'::onDeleteFiles', { success: function(data) { if (data.error !== undefined && $.type(data.error) === 'string' && data.error.length) - $.oc.flashMsg({text: data.error, 'class': 'error'}) + $.wn.flashMsg({text: data.error, 'class': 'error'}) }, complete: function() { self.refresh() @@ -90,24 +90,24 @@ message = 'Error uploading file' } - $.oc.alert(message) + $.wn.alert(message) this.refresh() } AssetList.prototype.onUploadSuccess = function(file, data) { if (data !== 'success') { - $.oc.alert(data) + $.wn.alert(data) } } AssetList.prototype.onUploadComplete = function(file, data) { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() this.refresh() } AssetList.prototype.onUploadStart = function() { - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() } AssetList.prototype.onFileClick = function(event) { @@ -173,7 +173,7 @@ $.each(self.$form.serializeArray(), function (index, field) { formData.append(field.name, field.value) }) - xhr.setRequestHeader('X-OCTOBER-REQUEST-HANDLER', self.alias + '::onUpload') + xhr.setRequestHeader('X-WINTER-REQUEST-HANDLER', self.alias + '::onUpload') self.onUploadStart() }) } diff --git a/modules/cms/widgets/assetlist/partials/_items.htm b/modules/cms/widgets/assetlist/partials/_items.htm index 72fd06629..88f272a0b 100644 --- a/modules/cms/widgets/assetlist/partials/_items.htm +++ b/modules/cms/widgets/assetlist/partials/_items.htm @@ -27,7 +27,7 @@
      -
      -![image](https://github.com/octobercms/docs/blob/master/images/bar-chart.png?raw=true) {.img-responsive .frame} +![image](https://github.com/wintercms/docs/blob/master/assets/images/bar-chart.png?raw=true) {.img-responsive .frame} # Example diff --git a/modules/system/assets/ui/docs/drag-value.md b/modules/system/assets/ui/docs/drag-value.md index 00b44fa2c..99c320f1c 100644 --- a/modules/system/assets/ui/docs/drag-value.md +++ b/modules/system/assets/ui/docs/drag-value.md @@ -9,7 +9,7 @@ Allows the dragging of elements that result in a custom value when dropped. diff --git a/modules/system/assets/ui/docs/dropdown.md b/modules/system/assets/ui/docs/dropdown.md index 3efb72ace..d6c47efcd 100644 --- a/modules/system/assets/ui/docs/dropdown.md +++ b/modules/system/assets/ui/docs/dropdown.md @@ -3,11 +3,11 @@ Customized dropdown menu ### Small dropdown
      - Add small + Add small
      @@ -22,22 +22,22 @@ Add the `dropup` class to the dropdown container and the dropdown will appear in ### Large dropdown
      - Add large + Add large
      diff --git a/modules/system/assets/ui/docs/flag.md b/modules/system/assets/ui/docs/flag.md index 6fd07b416..3386b294e 100644 --- a/modules/system/assets/ui/docs/flag.md +++ b/modules/system/assets/ui/docs/flag.md @@ -1,6 +1,6 @@ -Provides flags of various descriptions using [flag-icon-css](https://github.com/lipis/flag-icon-css). +Provides flags of various descriptions using [flag-icon-css](https://github.com/lipis/flag-icon-css). -*Class 'flag-icon flag-icon-{@country}' was merged into flag-{@country}, to support OctoberCMS standards.* +*Class 'flag-icon flag-icon-{@country}' was merged into flag-{@country}, to support Winter CMS standards.* ## Usage Example ```html @@ -263,7 +263,7 @@ Provides flags of various descriptions using [flag-icon-css](https://github.com/

      Squared

      - + ``` diff --git a/modules/system/assets/ui/docs/flashmessage.md b/modules/system/assets/ui/docs/flashmessage.md index 3416e7ca5..602c4844f 100644 --- a/modules/system/assets/ui/docs/flashmessage.md +++ b/modules/system/assets/ui/docs/flashmessage.md @@ -20,15 +20,15 @@ Displays a floating flash message on the screen. ### Trigger

      - + Show Success - + Show Error - + Show Warning

      @@ -62,7 +62,7 @@ A flash message can be rendered as a static element by attaching the `static` cl ### JavaScript API ```js -$.oc.flashMsg({ +$.wn.flashMsg({ 'text': 'Record saved.', 'class': 'success', 'interval': 3 diff --git a/modules/system/assets/ui/docs/foundation.md b/modules/system/assets/ui/docs/foundation.md index 0f943db00..7213f5006 100644 --- a/modules/system/assets/ui/docs/foundation.md +++ b/modules/system/assets/ui/docs/foundation.md @@ -30,7 +30,7 @@ Clean all references to DOM elements. Usually it's done by assigning NULL to cor 1. Watch for any references caught by closures (or - better do not use closures, see below). 1. Unbind event handlers. -October Storm provides everything we need to meet the goals. Please read on to learn more! +Winter Storm UI provides everything we need to meet the goals. Please read on to learn more! ## How to write quality code @@ -50,9 +50,9 @@ function ($) { "use strict"; ## Basics of writing disposable classes -If a class should be disposable (all UI controls should be disposable), the class should extend `$.oc.foundation.base` class. That class has two useful methods: `proxy(method)` and `dispose()`. +If a class should be disposable (all UI controls should be disposable), the class should extend `$.wn.foundation.base` class. That class has two useful methods: `proxy(method)` and `dispose()`. -`proxy()` method is an alternative to jQuery's `$.proxy`, but as `$.oc.foundation.base` implements OOP approach, passing this parameter to the method is not required. This method is good for three reasons. +`proxy()` method is an alternative to jQuery's `$.proxy`, but as `$.wn.foundation.base` implements OOP approach, passing this parameter to the method is not required. This method is good for three reasons. 1. It's code is very simple and easily controllable and debuggable. 1. It caches bound functions and doesn't create new function as `$.proxy` does. @@ -64,7 +64,7 @@ Example of a disposable class: ```js +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var SomeDisposableClass = function(element) { @@ -98,7 +98,7 @@ When binding events, use this.proxy() to make references to event handlers. Alwa ```js +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var SomeDisposableClass = function(element) { @@ -124,17 +124,17 @@ When binding events, use this.proxy() to make references to event handlers. Alwa ## Making disposable controls -UI controls should support two ways of disposing - with calling their `dispose()` method and with invoking the dispose-control handler. Also, disposable controls should mark their corresponding DOM elements as disposable, with October foundation API. Example: +UI controls should support two ways of disposing - with calling their `dispose()` method and with invoking the dispose-control handler. Also, disposable controls should mark their corresponding DOM elements as disposable, with Winter foundation API. Example: ```js +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var SomeDisposableControl = function(element) { this.$el = $(element) - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } @@ -153,7 +153,7 @@ UI controls should support two ways of disposing - with calling their `dispose() } ``` -`$.oc.foundation.controlUtils.markDisposable(element)` call in the constructor adds `data-disposable` attribute to the DOM element, allowing the framework to find all disposable elements in a container and dispose them by calling their dispose-control handler when it's required. +`$.wn.foundation.controlUtils.markDisposable(element)` call in the constructor adds `data-disposable` attribute to the DOM element, allowing the framework to find all disposable elements in a container and dispose them by calling their dispose-control handler when it's required. ## Full example of a jQuery plugin that creates a disposable control @@ -161,14 +161,14 @@ We already have a boilerplate code for jQuery code. Disposable controls approach ```js +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var SomeDisposableControl = function (element, options) { this.$el = $(element) this.options = options || {} - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } @@ -188,7 +188,7 @@ We already have a boilerplate code for jQuery code. Disposable controls approach this.$el = null - // In some cases options could contain callbacks, + // In some cases options could contain callbacks, // so it's better to clean them up too. this.options = null diff --git a/modules/system/assets/ui/docs/icon.md b/modules/system/assets/ui/docs/icon.md index 1897618a4..1828987b4 100644 --- a/modules/system/assets/ui/docs/icon.md +++ b/modules/system/assets/ui/docs/icon.md @@ -1,21 +1,21 @@ # Icon library -October provides an icon library with icons of various descriptions, based on the popular [Font Awesome collection](http://fortawesome.github.io/Font-Awesome/). +Winter provides an icon library with icons of various descriptions, based on the popular [Font Awesome collection](http://fortawesome.github.io/Font-Awesome/). ### Inline icons -Place icons just about anywhere with the `` tag or to an existing element using the `oc-` prefix. +Place icons just about anywhere with the `` tag or to an existing element using the `wn-` prefix. ```html icon-camera-retro -oc-icon-flag-checkered +wn-icon-flag-checkered ```
      icon-camera-retro
      - oc-icon-flag-checkered + wn-icon-flag-checkered
      ### Icon sizes @@ -32,22 +32,22 @@ To increase icon sizes relative to their container, use the `icon-lg` (33% incre Feel free to use them alongside your buttons. - + Refresh - + Checkout - + Comment - + Delete - + Settings - + More Info diff --git a/modules/system/assets/ui/docs/inspector.md b/modules/system/assets/ui/docs/inspector.md index c109b8285..cc2a2ba3e 100644 --- a/modules/system/assets/ui/docs/inspector.md +++ b/modules/system/assets/ui/docs/inspector.md @@ -1,8 +1,8 @@ # Inspector control -Inspector is a visual configuration tool that is used in several places of October back-end. The most known usage of Inspector is the CMS components configuration feature, but Inspector is not limited with the CMS. In fact, it's a universal tool that can be used with any element on a back-end page. +Inspector is a visual configuration tool that is used in several places of Winter back-end. The most known usage of Inspector is the CMS components configuration feature, but Inspector is not limited with the CMS. In fact, it's a universal tool that can be used with any element on a back-end page. -The Inspector loads the configuration schema from an inspectable element, builds the user interface, and writes values entered by users back to the inspectable element. The first version of Inspector was supporting only a few scalar value types - strings and Booleans, without an option to edit any complex data. +The Inspector loads the configuration schema from an inspectable element, builds the user interface, and writes values entered by users back to the inspectable element. The first version of Inspector was supporting only a few scalar value types - strings and Booleans, without an option to edit any complex data. The current version of Inspector allows to edit any imaginable data structures, including cases where users create enumerable data elements right in the Inspector interface. @@ -21,13 +21,13 @@ Inspectable elements should also contain a hidden input element used by Inspecto Example inspectable element markup: ```html -
      -
      ``` @@ -40,24 +40,24 @@ There are several optional data attributes and features that could be defined in * `data-inspector-offset-x` - sets horizontal offset, in pixels, for the Inspector popup. * `data-inspector-offset-y` - sets vertical offset, in pixels, for the Inspector popup. * `data-inspector-placement` - sets defines placement for the Inspector popup, optional. If omitted, Inspector evaluates a placement automatically. Supported values: top, bottom, left, top. -* `data-inspector-fallback-placement` - sets less preferable placement for the Inspector popup, optional. This value is used if Inspector can't use the placement specified in data-inspector-placement. Supported values: top, bottom, left, top. +* `data-inspector-fallback-placement` - sets less preferable placement for the Inspector popup, optional. This value is used if Inspector can't use the placement specified in data-inspector-placement. Supported values: top, bottom, left, top. * `data-inspector-external-parameters` - if this attribute exists in any parent element of the inspectable element, the external parameters editors will be enabled in Inspector (unless property-specific rules cancel the external editor). ### Dynamic configuration and dynamic items -In case if the `data-inspector-config` attribute is missing in the inspectable element Inspector tries to load its configuration from the server. An important note - there should be a FORM element wrapping inspectable elements in order to use any dynamic features of Inspector. +In case if the `data-inspector-config` attribute is missing in the inspectable element Inspector tries to load its configuration from the server. An important note - there should be a FORM element wrapping inspectable elements in order to use any dynamic features of Inspector. The AJAX request used for loading the configuration from the server is named `onGetInspectorConfiguration`. The handler should be defined in the back-end controller and should return an array containing the Inspector configuration (in the PHP equivalent of the JSON configuration structure described later in this section), inspector title and description. Example of a server-side AJAX dynamic configuration request handler: ```php public function onGetInspectorConfiguration() { - // Load and use some values from the posted form + // Load and use some values from the posted form // $someValue = Request::input('someValue'); - + ... do some processing ... - + return [ 'configuration' => [ 'properties' => [list of properties], @@ -68,7 +68,7 @@ public function onGetInspectorConfiguration() } ``` -Some Inspector editors - (drop-down, set, autocomplete) support static and dynamic options. Dynamic options are requested from the server, rather than being defined in the configuration JSON string. For using this feature, the inspectable element must have the `data-inspector-class` attribute defined. The attribute value should contain a name of a PHP class corresponding to the inspectable element. +Some Inspector editors - (drop-down, set, autocomplete) support static and dynamic options. Dynamic options are requested from the server, rather than being defined in the configuration JSON string. For using this feature, the inspectable element must have the `data-inspector-class` attribute defined. The attribute value should contain a name of a PHP class corresponding to the inspectable element. The server-side controller should use the `Backend\Traits\InspectableContainer` trait in order to provide the dynamic options loading. The inspectable PHP class (specified with `data-inspector-class`) must either have a method `get[Property]Options()`, where the [Property] part corresponds the name of the dynamic property, or `getPropertyOptions($propertyName)` method that is more universal and accepts the property name as a parameter. The methods should return the `options` array containing associative arrays with keys `option` and `value`. Example: @@ -192,7 +192,7 @@ Allows users to enter lists of strings. The editor opens in a popup window and d } ``` -A value generated by the editor is an array of strings, for example: +A value generated by the editor is an array of strings, for example: ```json {"items":["String 1","String 2","String 3"]} @@ -261,7 +261,7 @@ Displays a drop-down list. Options for the drop-down list can be specified stati The `options` attribute should be a key-value object. If the attribute is not specified, Inspector will try to load options from the server - see [Dynamic configuration and dynamic items](#dynamic-configuration-and-dynamic-items) section above. -The editor generates a string value corresponding to the selected option, for example: +The editor generates a string value corresponding to the selected option, for example: ```json {"action":"hide"} @@ -280,7 +280,7 @@ Dictionary editor allows to create key-value pairs with a simple user interface } ``` -The editor generates an object value, for example: +The editor generates an object value, for example: ```json {"options":{"option1":"Option 1","option2":"Option 2"}} @@ -312,7 +312,7 @@ The dictionary editor supports validation for the entire set (`required` and `le }, "validationValue": { "regex": { - "pattern": "^[a-zA-Z0-9]+$", + "pattern": "^[a-zA-Z0-9]+$", "message": "Values can contain only Latin letters and digits" } } @@ -321,7 +321,7 @@ The dictionary editor supports validation for the entire set (`required` and `le ### Object editor -Allows to define an object with specific properties editable by users. Object properties are specified with the `properties` attribute. The value of the attribute is an array, which has exactly the same structure as the Inspector properties array. +Allows to define an object with specific properties editable by users. Object properties are specified with the `properties` attribute. The value of the attribute is an array, which has exactly the same structure as the Inspector properties array. ```json { @@ -349,7 +349,7 @@ Allows to define an object with specific properties editable by users. Object pr } ``` -The example above creates an object with three properties. Two of them are displayed as text fields, and the third as a drop-down. +The example above creates an object with three properties. Two of them are displayed as text fields, and the third as a drop-down. Object editor values are objects. Example: @@ -396,7 +396,7 @@ Object editors do not support the external property editor feature. ### Object list editor -The object list editor allows users to create multiple objects with a pre-defined structure. For example, it could be used for creating a list of person, where each person has a name and address. +The object list editor allows users to create multiple objects with a pre-defined structure. For example, it could be used for creating a list of person, where each person has a name and address. The properties of objects that can be created with the editor are defined with `itemProperties` parameter. The parameter should contain an array of properties, similar to Inspector configuration array. Another required parameter is `titleProperty`, which identifies a property that should be used as a title in Inspector UI. Example configuration: @@ -478,7 +478,7 @@ The `login` property in the example above will be used as a key in the result va ### Set editor -The set editor allows users to select multiple predefined options with checkboxes. Set items can be specified statically with the configuration, using the `items` parameter, or loaded dynamically. Example with static items definition: +The set editor allows users to select multiple predefined options with checkboxes. Set items can be specified statically with the configuration, using the `items` parameter, or loaded dynamically. Example with static items definition: ```json { @@ -502,7 +502,7 @@ Set editors do not support the external property editor feature. ## Defining the validation rules -Inspector support several validation rules that can be applied to properties. Validation rules can be applied to top-level properties as well as to internal property definitions of object and object list editors. There are two ways to define validation rules - the legacy syntax and the new syntax. +Inspector support several validation rules that can be applied to properties. Validation rules can be applied to top-level properties as well as to internal property definitions of object and object list editors. There are two ways to define validation rules - the legacy syntax and the new syntax. The legacy syntax is supported for the backwards compatibility with existing CMS components definitions. This syntax will always be supported, but it's limited, and cannot be mixed with the new syntax. Example of the legacy syntax: @@ -614,7 +614,7 @@ Supported parameters: ### float validator -Checks if the value is a floating point number. The parameters for this validator match the parameters of the **integer** validator described above. Example: +Checks if the value is a floating point number. The parameters for this validator match the parameters of the **integer** validator described above. Example: ```json { @@ -635,7 +635,7 @@ Valid floating point number formats: * 10.302 * -10 (if `allowNegative` is `true`) * -10.84 (if `allowNegative` is `true`) - + ### length validator Checks if a string, array or object is not shorter or longer than specified values. This validator can work with the string, text, set, string list, dictionary and object list editors. In multiple-value editors (set, string list, dictionary and object list) it validates the number of items created in the editor. diff --git a/modules/system/assets/ui/docs/list.md b/modules/system/assets/ui/docs/list.md index 4386a252d..a00d04389 100644 --- a/modules/system/assets/ui/docs/list.md +++ b/modules/system/assets/ui/docs/list.md @@ -13,7 +13,7 @@ - Welcome to October + Welcome to Winter Oct 01, 2013 News Oct 01, 2013 @@ -52,7 +52,7 @@
      - Welcome to October + Welcome to Winter Oct 01, 2013 Adam Person News @@ -196,15 +196,15 @@ It might be fun to include a status column! - + Draft - Welcome to October + Welcome to Winter - + Pending @@ -212,7 +212,7 @@ It might be fun to include a status column! - + Approved @@ -220,7 +220,7 @@ It might be fun to include a status column! - + Cancelled @@ -251,7 +251,7 @@ You can also include an icon badge inside a column. Draft - Welcome to October + Welcome to Winter @@ -293,7 +293,7 @@ You may link an entire row by adding the `data-control="rowlink"` attribute to t - Link to this + Link to this Row will be linked This will also be linked diff --git a/modules/system/assets/ui/docs/popup.md b/modules/system/assets/ui/docs/popup.md index c1ce47b03..39b9353fc 100644 --- a/modules/system/assets/ui/docs/popup.md +++ b/modules/system/assets/ui/docs/popup.md @@ -115,7 +115,7 @@ The partial for your rendered popup should follow this structure: @@ -137,9 +137,9 @@ The partial for your rendered popup should follow this structure: ### Data attributes - data-control="popup" - enables the ajax popup plugin - data-ajax="popup-content.htm" - ajax content to load -- data-handler="onLoadContent" - October ajax request name +- data-handler="onLoadContent" - Winter ajax request name - data-keyboard="false" - Allow popup to be closed with the keyboard -- data-extra-data="file_id: 1" - October ajax request data +- data-extra-data="file_id: 1" - Winter ajax request data - data-size="large" - Popup size, available sizes: giant, huge, large, small, tiny, adaptive (will scale to fit the window) - data-adaptive-height="false" - Allow the popup to fill the height of the screen diff --git a/modules/system/assets/ui/docs/scoreboard.md b/modules/system/assets/ui/docs/scoreboard.md index 5d3b24e07..9ee9ef481 100644 --- a/modules/system/assets/ui/docs/scoreboard.md +++ b/modules/system/assets/ui/docs/scoreboard.md @@ -18,7 +18,7 @@

      Latest commenter

      -

      John Smith

      +

      John Smith

      registered: yes

      @@ -64,7 +64,7 @@

      Latest commenter

      -

      John Smith

      +

      John Smith

      registered: yes

      diff --git a/modules/system/assets/ui/docs/tab.md b/modules/system/assets/ui/docs/tab.md index 5caddb26e..b4a2fb58c 100644 --- a/modules/system/assets/ui/docs/tab.md +++ b/modules/system/assets/ui/docs/tab.md @@ -58,7 +58,7 @@ These modifiers can be added in addition to the `control-tabs` class:
    -> **Note**: Primary tabs in the October back-end are inset by default and you should use `.tabs-no-inset` to disable this. +> **Note**: Primary tabs in the Winter back-end are inset by default and you should use `.tabs-no-inset` to disable this. ### Secondary tabs @@ -134,7 +134,7 @@ Example with data attributes (data-control="tab"): ### Supported options: - closable - adds the "close" icon to the tab and lets users to close tabs. Corresponds the data-closable attribute. - - closeConfirmation - a confirmation to show when a user tries to close a modified tab. Corresponds the data-close-confirmation + - closeConfirmation - a confirmation to show when a user tries to close a modified tab. Corresponds the data-close-confirmation attribute. The confirmation is displayed only if the tab was modified. - slidable - allows the tabs to be switched with the swipe gesture on touch devices. Corresponds the data-slidable attribute. - paneClasses - a list of CSS classes to apply new pane elements. Corresponds to the data-pane-classes attribute. @@ -144,6 +144,6 @@ Example with data attributes (data-control="tab"): ### Supported events: -- beforeClose.oc.tab - triggered on a tab pane element before tab is closed by the user. Call the event's +- beforeClose.oc.tab - triggered on a tab pane element before tab is closed by the user. Call the event's preventDefault() method to cancel the action. - afterAllClosed.oc.tab - triggered after all tabs have been closed diff --git a/modules/system/assets/ui/docs/toolbar.md b/modules/system/assets/ui/docs/toolbar.md index d4cbd0a13..43b80229e 100644 --- a/modules/system/assets/ui/docs/toolbar.md +++ b/modules/system/assets/ui/docs/toolbar.md @@ -2,28 +2,28 @@ A scrollable set of buttons aligned to the left with a fixed right section. -All toolbar items (`toolbar-item`) should have a fixed width, except for the primary item (`toolbar-primary`) which will stretch. In the October backend you can use the `data-calculate-width` attribute to have these widths calculated dynamically for you. +All toolbar items (`toolbar-item`) should have a fixed width, except for the primary item (`toolbar-primary`) which will stretch. In the Winter backend you can use the `data-calculate-width` attribute to have these widths calculated dynamically for you. ## Basic toolbar
    - + - + - + - + - + - + - + - +
    @@ -37,8 +37,8 @@ All toolbar items (`toolbar-item`) should have a fixed width, except for the pri
    - - + +
    @@ -54,7 +54,7 @@ All toolbar items (`toolbar-item`) should have a fixed width, except for the pri
    @@ -114,14 +114,14 @@ All toolbar items (`toolbar-item`) should have a fixed width, except for the pri
    @@ -156,7 +156,7 @@ All toolbar items (`toolbar-item`) should have a fixed width, except for the pri
- - + +
diff --git a/modules/system/assets/ui/js/chart.bar.js b/modules/system/assets/ui/js/chart.bar.js index 9ec2fae9a..6e50ea036 100644 --- a/modules/system/assets/ui/js/chart.bar.js +++ b/modules/system/assets/ui/js/chart.bar.js @@ -17,13 +17,13 @@ var BarChart = function (element, options) { this.options = options || {} - var + var $el = this.$el = $(element), size = this.size = $el.height(), self = this, - values = $.oc.chartUtils.loadListValues($('ul', $el)), - $legend = $.oc.chartUtils.createLegend($('ul', $el)), - indicators = $.oc.chartUtils.initLegendColorIndicators($legend), + values = $.wn.chartUtils.loadListValues($('ul', $el)), + $legend = $.wn.chartUtils.createLegend($('ul', $el)), + indicators = $.wn.chartUtils.initLegendColorIndicators($legend), isFullWidth = this.isFullWidth(), chartHeight = this.options.height !== undefined ? this.options.height : size, chartWidth = isFullWidth ? this.$el.width() : size, @@ -52,7 +52,7 @@ // Add bars var start = 0 $.each(values.values, function(index, valueInfo) { - var color = valueInfo.color !== undefined ? valueInfo.color : $.oc.chartUtils.getColor(index), + var color = valueInfo.color !== undefined ? valueInfo.color : $.wn.chartUtils.getColor(index), path = self.paper.path().attr({"stroke-width": 0}).attr({bar: [start, 0]}).attr({fill: color}) self.bars.push(path) @@ -60,10 +60,10 @@ start += barWidth + self.options.gap path.hover(function(ev){ - $.oc.chartUtils.showTooltip(ev.pageX, ev.pageY, - $.trim($.oc.chartUtils.getLegendLabel($legend, index)) + ': '+valueInfo.value+'') + $.wn.chartUtils.showTooltip(ev.pageX, ev.pageY, + $.trim($.wn.chartUtils.getLegendLabel($legend, index)) + ': '+valueInfo.value+'') }, function() { - $.oc.chartUtils.hideTooltip() + $.wn.chartUtils.hideTooltip() }) }) diff --git a/modules/system/assets/ui/js/chart.line.js b/modules/system/assets/ui/js/chart.line.js index 208b0e51d..cf59b1df4 100644 --- a/modules/system/assets/ui/js/chart.line.js +++ b/modules/system/assets/ui/js/chart.line.js @@ -208,9 +208,9 @@ $.fn.chartLine = function (option) { return this.each(function () { var $this = $(this) - var data = $this.data('october.chartLine') + var data = $this.data('winter.chartLine') var options = $.extend({}, ChartLine.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('october.chartLine', (data = new ChartLine(this, options))) + if (!data) $this.data('winter.chartLine', (data = new ChartLine(this, options))) if (typeof option == 'string') data[option].call($this) }) } diff --git a/modules/system/assets/ui/js/chart.pie.js b/modules/system/assets/ui/js/chart.pie.js index b478cefe8..9fe108db6 100644 --- a/modules/system/assets/ui/js/chart.pie.js +++ b/modules/system/assets/ui/js/chart.pie.js @@ -1,6 +1,6 @@ /* * The pie chart plugin. - * + * * Data attributes: * - data-control="chart-pie" - enables the pie chart plugin * - data-size="200" - optional, size of the graph @@ -11,21 +11,21 @@ * * Dependences: * - Raphaël (raphael-min.js) - * - October chart utilities (chart.utils.js) + * - Winter chart utilities (chart.utils.js) */ +function ($) { "use strict"; var PieChart = function (element, options) { this.options = options || {} - var + var $el = this.$el = $(element), size = this.size = (this.options.size !== undefined ? this.options.size : $el.height()), outerRadius = size/2 - 1, innerRadius = outerRadius - outerRadius/3.5, - values = $.oc.chartUtils.loadListValues($('ul', $el)), - $legend = $.oc.chartUtils.createLegend($('ul', $el)), - indicators = $.oc.chartUtils.initLegendColorIndicators($legend), + values = $.wn.chartUtils.loadListValues($('ul', $el)), + $legend = $.wn.chartUtils.createLegend($('ul', $el)), + indicators = $.wn.chartUtils.initLegendColorIndicators($legend), self = this var $canvas = $('
').addClass('canvas').width(size).height(size) @@ -36,14 +36,14 @@ self.segments = this.set() self.paper.customAttributes.segment = function (startAngle, endAngle) { - var + var p1 = self.arcCoords(outerRadius, startAngle), p2 = self.arcCoords(outerRadius, endAngle), p3 = self.arcCoords(innerRadius, endAngle), p4 = self.arcCoords(innerRadius, startAngle), flag = (endAngle - startAngle) > 180, path = [ - ["M", p1.x, p1.y], + ["M", p1.x, p1.y], ["A", outerRadius, outerRadius, 0, +flag, 0, p2.x, p2.y], ["L", p3.x, p3.y], ["A", innerRadius, innerRadius, 0, +flag, 1, p4.x, p4.y], @@ -56,21 +56,21 @@ // Draw the background self.paper.circle(size/2, size/2, innerRadius + (outerRadius - innerRadius)/2) .attr({"stroke-width": outerRadius - innerRadius - 0.5}) - .attr({stroke: $.oc.chartUtils.defaultValueColor}) + .attr({stroke: $.wn.chartUtils.defaultValueColor}) // Add segments $.each(values.values, function(index, valueInfo) { - var color = valueInfo.color !== undefined ? valueInfo.color : $.oc.chartUtils.getColor(index), + var color = valueInfo.color !== undefined ? valueInfo.color : $.wn.chartUtils.getColor(index), path = self.paper.path().attr({"stroke-width": 0}).attr({segment: [0, 0]}).attr({fill: color}) self.segments.push(path) indicators[index].css('background-color', color) path.hover(function(ev){ - $.oc.chartUtils.showTooltip(ev.pageX, ev.pageY, - $.trim($.oc.chartUtils.getLegendLabel($legend, index)) + ': '+valueInfo.value+'') + $.wn.chartUtils.showTooltip(ev.pageX, ev.pageY, + $.trim($.wn.chartUtils.getLegendLabel($legend, index)) + ': '+valueInfo.value+'') }, function() { - $.oc.chartUtils.hideTooltip() + $.wn.chartUtils.hideTooltip() }) }) @@ -93,7 +93,7 @@ } PieChart.prototype.arcCoords = function(radius, angle) { - var + var a = Raphael.rad(angle), x = this.size/2 + radius * Math.cos(a), y = this.size/2 - radius * Math.sin(a) @@ -116,7 +116,7 @@ var data = $this.data('oc.pieChart') var options = $.extend({}, PieChart.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data) + if (!data) $this.data('oc.pieChart', new PieChart(this, options)) }) } diff --git a/modules/system/assets/ui/js/chart.utils.js b/modules/system/assets/ui/js/chart.utils.js index 36d869b34..bad8e0a92 100644 --- a/modules/system/assets/ui/js/chart.utils.js +++ b/modules/system/assets/ui/js/chart.utils.js @@ -1,5 +1,5 @@ /* - * October charting utilities. + * Winter charting utilities. */ +function ($) { "use strict"; @@ -105,8 +105,10 @@ $('#chart-tooltip').remove() } + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - $.oc.chartUtils = new ChartUtils(); + $.wn.chartUtils = new ChartUtils(); }(window.jQuery); diff --git a/modules/system/assets/ui/js/checkbox.js b/modules/system/assets/ui/js/checkbox.js index fc61d6f91..6d22cadfb 100644 --- a/modules/system/assets/ui/js/checkbox.js +++ b/modules/system/assets/ui/js/checkbox.js @@ -9,11 +9,11 @@ if (e.key === '(Space character)' || e.key === 'Spacebar' || e.key === ' ') { var $cb = $('input[type=checkbox]', this) - if ($cb.data('oc-space-timestamp') == e.timeStamp) + if ($cb.data('wn-space-timestamp') == e.timeStamp) return $cb.get(0).checked = !$cb.get(0).checked - $cb.data('oc-space-timestamp', e.timeStamp) + $cb.data('wn-space-timestamp', e.timeStamp) $cb.trigger('change') return false } diff --git a/modules/system/assets/ui/js/datepicker.js b/modules/system/assets/ui/js/datepicker.js index d840f01de..310cc1d20 100644 --- a/modules/system/assets/ui/js/datepicker.js +++ b/modules/system/assets/ui/js/datepicker.js @@ -13,14 +13,14 @@ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var DatePicker = function (element, options) { this.$el = $(element) this.options = options || {} - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } @@ -308,11 +308,11 @@ } DatePicker.prototype.getLang = function(name, defaultValue) { - if ($.oc === undefined || $.oc.lang === undefined) { + if ($.oc === undefined || $.wn.lang === undefined) { return defaultValue } - return $.oc.lang.get(name, defaultValue) + return $.wn.lang.get(name, defaultValue) } DatePicker.DEFAULTS = { diff --git a/modules/system/assets/ui/js/drag.scroll.js b/modules/system/assets/ui/js/drag.scroll.js index bcade23d6..12a104551 100644 --- a/modules/system/assets/ui/js/drag.scroll.js +++ b/modules/system/assets/ui/js/drag.scroll.js @@ -36,7 +36,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var DragScroll = function (element, options) { diff --git a/modules/system/assets/ui/js/drag.sort.js b/modules/system/assets/ui/js/drag.sort.js index f7a2e8175..1b8ee76a0 100644 --- a/modules/system/assets/ui/js/drag.sort.js +++ b/modules/system/assets/ui/js/drag.sort.js @@ -9,7 +9,7 @@ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var Sortable = function (element, options) { @@ -17,7 +17,7 @@ this.options = options || {} this.cursorAdjustment = null - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init() } diff --git a/modules/system/assets/ui/js/filter.dates.js b/modules/system/assets/ui/js/filter.dates.js index 0d8b10405..a76480d5b 100644 --- a/modules/system/assets/ui/js/filter.dates.js +++ b/modules/system/assets/ui/js/filter.dates.js @@ -5,7 +5,7 @@ * - data-behavior="filter" - enables the filter plugin * * Dependences: - * - October Popover (october.popover.js) + * - Winter Popover (winter.popover.js) * * Notes: * Ideally this control would not depend on loader or the AJAX framework, diff --git a/modules/system/assets/ui/js/filter.js b/modules/system/assets/ui/js/filter.js index 3f260bc51..b7cab9ec8 100644 --- a/modules/system/assets/ui/js/filter.js +++ b/modules/system/assets/ui/js/filter.js @@ -5,7 +5,7 @@ * - data-behavior="filter" - enables the filter plugin * * Dependences: - * - October Popover (october.popover.js) + * - Winter Popover (winter.popover.js) * * Notes: * Ideally this control would not depend on loader or the AJAX framework, @@ -76,10 +76,10 @@ \
\
\ - \ - \
\ @@ -486,12 +486,12 @@ options: JSON.stringify(this.scopeValues[scopeName]) } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$el.request(this.options.updateHandler, { data: data }).always(function () { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }).done(function () { // Trigger dependsOn updates on successful requests self.$el.find('[data-scope-name="'+scopeName+'"]').trigger('change.oc.filterScope') @@ -511,11 +511,11 @@ value: isChecked } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$el.request(this.options.updateHandler, { data: data }).always(function(){ - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) } @@ -535,11 +535,11 @@ value: switchValue } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() this.$el.request(this.options.updateHandler, { data: data }).always(function(){ - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) } @@ -562,11 +562,11 @@ } FilterWidget.prototype.getLang = function(name, defaultValue) { - if ($.oc === undefined || $.oc.lang === undefined) { + if ($.oc === undefined || $.wn.lang === undefined) { return defaultValue } - return $.oc.lang.get(name, defaultValue) + return $.wn.lang.get(name, defaultValue) } FilterWidget.prototype.searchQuery = function ($el) { @@ -596,14 +596,14 @@ search: thisValue } - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() self.lastDataTrackInputRequest = self.$el.request(self.options.optionsHandler, { data: data }).success(function(data){ self.filterAvailable(self.activeScopeName, data.options.available) self.toggleFilterButtons() }).always(function(){ - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) }, 300) } diff --git a/modules/system/assets/ui/js/filter.numbers.js b/modules/system/assets/ui/js/filter.numbers.js index b4078b7bf..1dbe4b39f 100644 --- a/modules/system/assets/ui/js/filter.numbers.js +++ b/modules/system/assets/ui/js/filter.numbers.js @@ -5,7 +5,7 @@ * - data-behavior="filter" - enables the filter plugin * * Dependences: - * - October Popover (october.popover.js) + * - Winter Popover (winter.popover.js) * * Notes: * Ideally this control would not depend on loader or the AJAX framework, diff --git a/modules/system/assets/ui/js/flashmessage.js b/modules/system/assets/ui/js/flashmessage.js index 2bb8c8a34..72d7ddd8f 100644 --- a/modules/system/assets/ui/js/flashmessage.js +++ b/modules/system/assets/ui/js/flashmessage.js @@ -58,17 +58,19 @@ // FLASH MESSAGE PLUGIN DEFINITION // ============================ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - $.oc.flashMsg = FlashMessage + $.wn.flashMsg = FlashMessage // FLASH MESSAGE DATA-API // =============== $(document).render(function(){ $('[data-control=flash-message]').each(function(){ - $.oc.flashMsg($(this).data(), this) + $.wn.flashMsg($(this).data(), this) }) }) diff --git a/modules/system/assets/ui/js/foundation.baseclass.js b/modules/system/assets/ui/js/foundation.baseclass.js index 1de394811..1ea349cbb 100644 --- a/modules/system/assets/ui/js/foundation.baseclass.js +++ b/modules/system/assets/ui/js/foundation.baseclass.js @@ -1,18 +1,18 @@ /* - * October JavaScript foundation library. - * - * Base class for OctoberCMS back-end classes. + * Winter JavaScript foundation library. + * + * Base class for Winter CMS back-end classes. * * The class defines base functionality for dealing with memory management * and cleaning up bound (proxied) methods. * - * The base class defines the dispose method that cleans up proxied methods. - * If child classes implement their own dispose() method, they should call + * The base class defines the dispose method that cleans up proxied methods. + * If child classes implement their own dispose() method, they should call * the base class dispose method (see the example below). * * Use the simple parasitic combination inheritance pattern to create child classes: - * - * var Base = $.oc.foundation.base, + * + * var Base = $.wn.foundation.base, * BaseProto = Base.prototype * * var SubClass = function(params) { @@ -23,7 +23,7 @@ * SubClass.prototype = Object.create(BaseProto) * SubClass.prototype.constructor = SubClass * - * // Child class methods can be defined only after the + * // Child class methods can be defined only after the * // prototype is updated in the two previous lines * * SubClass.prototype.dispose = function() { @@ -31,7 +31,7 @@ * BaseProto.dispose.call(this) * }; * - * See: + * See: * * - https://developers.google.com/speed/articles/optimizing-javascript * - http://javascriptissexy.com/oop-in-javascript-what-you-need-to-know/ @@ -39,13 +39,15 @@ * */ +function ($) { "use strict"; + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.foundation === undefined) - $.oc.foundation = {} + if ($.wn.foundation === undefined) + $.wn.foundation = {} - $.oc.foundation._proxyCounter = 0 + $.wn.foundation._proxyCounter = 0 var Base = function() { this.proxiedMethods = {} @@ -64,8 +66,8 @@ */ Base.prototype.proxy = function(method) { if (method.ocProxyId === undefined) { - $.oc.foundation._proxyCounter++ - method.ocProxyId = $.oc.foundation._proxyCounter + $.wn.foundation._proxyCounter++ + method.ocProxyId = $.wn.foundation._proxyCounter } if (this.proxiedMethods[method.ocProxyId] !== undefined) @@ -75,5 +77,5 @@ return this.proxiedMethods[method.ocProxyId] } - $.oc.foundation.base = Base; + $.wn.foundation.base = Base; }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/foundation.controlutils.js b/modules/system/assets/ui/js/foundation.controlutils.js index 8292e76b9..a52d8ba40 100644 --- a/modules/system/assets/ui/js/foundation.controlutils.js +++ b/modules/system/assets/ui/js/foundation.controlutils.js @@ -1,20 +1,22 @@ /* - * October JavaScript foundation library. - * + * Winter JavaScript foundation library. + * * Utility functions for working back-end client-side UI controls. * * Usage examples: * - * $.oc.foundation.controlUtils.markDisposable(el) - * $.oc.foundation.controlUtils.disposeControls(container) + * $.wn.foundation.controlUtils.markDisposable(el) + * $.wn.foundation.controlUtils.disposeControls(container) * */ +function ($) { "use strict"; + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.foundation === undefined) - $.oc.foundation = {} + if ($.wn.foundation === undefined) + $.wn.foundation = {} var ControlUtils = { markDisposable: function(el) { @@ -23,7 +25,7 @@ /* * Destroys all disposable controls in a container. - * The disposable controls should watch the dispose-control + * The disposable controls should watch the dispose-control * event. */ disposeControls: function(container) { @@ -37,14 +39,14 @@ } } - $.oc.foundation.controlUtils = ControlUtils; + $.wn.foundation.controlUtils = ControlUtils; $(document).on('ajaxBeforeReplace', function(ev){ // Automatically dispose controls in an element // before the element contents is replaced. - // The ajaxBeforeReplace event is triggered in + // The ajaxBeforeReplace event is triggered in // framework.js - $.oc.foundation.controlUtils.disposeControls(ev.target) + $.wn.foundation.controlUtils.disposeControls(ev.target) }) }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/foundation.element.js b/modules/system/assets/ui/js/foundation.element.js index fd5fba037..e9e306eec 100644 --- a/modules/system/assets/ui/js/foundation.element.js +++ b/modules/system/assets/ui/js/foundation.element.js @@ -1,27 +1,29 @@ /* - * October JavaScript foundation library. - * + * Winter JavaScript foundation library. + * * Light-weight utility functions for working with DOM elements. The functions * work with elements directly, without jQuery, using the native JavaScript and DOM * features. * * Usage examples: * - * $.oc.foundation.element.addClass(myElement, myClass) + * $.wn.foundation.element.addClass(myElement, myClass) * */ +function ($) { "use strict"; + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.foundation === undefined) - $.oc.foundation = {} + if ($.wn.foundation === undefined) + $.wn.foundation = {} var Element = { hasClass: function(el, className) { if (el.classList) return el.classList.contains(className); - + return new RegExp('(^| )' + className + '( |$)', 'gi').test(el.className); }, @@ -95,7 +97,7 @@ }, getCaretPosition: function(input) { - if (document.selection) { + if (document.selection) { var selection = document.selection.createRange() selection.moveStart('character', -input.value.length) @@ -109,7 +111,7 @@ }, setCaretPosition: function(input, position) { - if (document.selection) { + if (document.selection) { var range = input.createTextRange() setTimeout(function() { @@ -134,14 +136,14 @@ }, elementContainsPoint: function(element, point) { - var elementPosition = $.oc.foundation.element.absolutePosition(element), + var elementPosition = $.wn.foundation.element.absolutePosition(element), elementRight = elementPosition.left + element.offsetWidth, elementBottom = elementPosition.top + element.offsetHeight - return point.x >= elementPosition.left && point.x <= elementRight + return point.x >= elementPosition.left && point.x <= elementRight && point.y >= elementPosition.top && point.y <= elementBottom } } - $.oc.foundation.element = Element; + $.wn.foundation.element = Element; }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/foundation.event.js b/modules/system/assets/ui/js/foundation.event.js index f2973a863..24c6ffb6c 100644 --- a/modules/system/assets/ui/js/foundation.event.js +++ b/modules/system/assets/ui/js/foundation.event.js @@ -1,21 +1,23 @@ /* - * October JavaScript foundation library. - * + * Winter JavaScript foundation library. + * * Light-weight utility functions for working with native DOM events. The functions * work with events directly, without jQuery, using the native JavaScript and DOM * features. * * Usage examples: * - * $.oc.foundation.event.stop(ev) + * $.wn.foundation.event.stop(ev) * */ +function ($) { "use strict"; + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.foundation === undefined) - $.oc.foundation = {} + if ($.wn.foundation === undefined) + $.wn.foundation = {} var Event = { /* @@ -77,5 +79,5 @@ } } - $.oc.foundation.event = Event; + $.wn.foundation.event = Event; }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/input.hotkey.js b/modules/system/assets/ui/js/input.hotkey.js index 53f47e0bc..23c1b87ed 100644 --- a/modules/system/assets/ui/js/input.hotkey.js +++ b/modules/system/assets/ui/js/input.hotkey.js @@ -10,7 +10,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var HotKey = function (element, options) { @@ -24,7 +24,7 @@ this.keyConditions = [] this.keyMap = null - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) diff --git a/modules/system/assets/ui/js/input.monitor.js b/modules/system/assets/ui/js/input.monitor.js index 914484f25..fda0d0815 100644 --- a/modules/system/assets/ui/js/input.monitor.js +++ b/modules/system/assets/ui/js/input.monitor.js @@ -5,7 +5,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var ChangeMonitor = function (element, options) { @@ -14,7 +14,7 @@ this.paused = false this.options = options || {} - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) Base.call(this) diff --git a/modules/system/assets/ui/js/inspector.datainteraction.js b/modules/system/assets/ui/js/inspector.datainteraction.js index f9bfbba39..3fcfa00c6 100644 --- a/modules/system/assets/ui/js/inspector.datainteraction.js +++ b/modules/system/assets/ui/js/inspector.datainteraction.js @@ -1,7 +1,7 @@ /* * Inspector data interaction class. * - * Provides methods for loading and writing Inspector configuration + * Provides methods for loading and writing Inspector configuration * and values form and to inspectable elements. */ +function ($) { "use strict"; @@ -9,7 +9,7 @@ // CLASS DEFINITION // ============================ - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var DataInteraction = function(element) { @@ -70,8 +70,8 @@ // Important - values contained in data-property-xxx attributes are // considered strings and never parsed with JSON. The use of the // data-property-xxx attributes is very limited - they're only - // used in Pages for creating snippets from partials, where properties - // are created with a table UI widget, which doesn't allow creating + // used in Pages for creating snippets from partials, where properties + // are created with a table UI widget, which doesn't allow creating // properties of any complex types. // // There is no a technically reliable way to determine when a string @@ -113,13 +113,13 @@ data = $element.data(), self = this - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() $form.request('onGetInspectorConfiguration', { data: data }).done(function inspectorConfigurationRequestDoneClosure(data) { self.configurartionRequestDone(data, onComplete, result) }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) } @@ -159,5 +159,5 @@ onComplete(result, this) } - $.oc.inspector.dataInteraction = DataInteraction + $.wn.inspector.dataInteraction = DataInteraction }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.autocomplete.js b/modules/system/assets/ui/js/inspector.editor.autocomplete.js index 64c835f3e..d20fd513a 100644 --- a/modules/system/assets/ui/js/inspector.editor.autocomplete.js +++ b/modules/system/assets/ui/js/inspector.editor.autocomplete.js @@ -1,11 +1,11 @@ /* * Inspector autocomplete editor class. * - * Depends on october.autocomplete.js + * Depends on winter.autocomplete.js */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.string, + var Base = $.wn.inspector.propertyEditors.string, BaseProto = Base.prototype var AutocompleteEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -46,7 +46,7 @@ editor.value = value - $.oc.foundation.element.addClass(this.containerCell, 'text autocomplete') + $.wn.foundation.element.addClass(this.containerCell, 'text autocomplete') container.appendChild(editor) this.containerCell.appendChild(container) @@ -193,7 +193,7 @@ data = this.getRootSurface().getValues(), $form = $(container).closest('form') - $.oc.foundation.element.addClass(container, 'loading-indicator-container size-small') + $.wn.foundation.element.addClass(container, 'loading-indicator-container size-small') this.showLoadingIndicator() if (this.triggerGetItems(data) === false) { @@ -252,5 +252,5 @@ this.buildAutoComplete(loadedItems) } - $.oc.inspector.propertyEditors.autocomplete = AutocompleteEditor + $.wn.inspector.propertyEditors.autocomplete = AutocompleteEditor }(window.jQuery); diff --git a/modules/system/assets/ui/js/inspector.editor.base.js b/modules/system/assets/ui/js/inspector.editor.base.js index 357404f77..bcc85768e 100644 --- a/modules/system/assets/ui/js/inspector.editor.base.js +++ b/modules/system/assets/ui/js/inspector.editor.base.js @@ -6,19 +6,21 @@ // NAMESPACES // ============================ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.inspector === undefined) - $.oc.inspector = {} + if ($.wn.inspector === undefined) + $.wn.inspector = {} - if ($.oc.inspector.propertyEditors === undefined) - $.oc.inspector.propertyEditors = {} + if ($.wn.inspector.propertyEditors === undefined) + $.wn.inspector.propertyEditors = {} // CLASS DEFINITION // ============================ - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var BaseEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -105,7 +107,7 @@ } /** - * Updates displayed value in the editor UI. The value is already set + * Updates displayed value in the editor UI. The value is already set * in the Inspector and should be loaded from Inspector. */ BaseEditor.prototype.updateDisplayedValue = function(value) { @@ -140,7 +142,7 @@ // BaseEditor.prototype.initValidation = function() { - this.validationSet = new $.oc.inspector.validationSet(this.propertyDefinition, this.propertyDefinition.property) + this.validationSet = new $.wn.inspector.validationSet(this.propertyDefinition, this.propertyDefinition.property) } BaseEditor.prototype.disposeValidation = function() { @@ -161,7 +163,7 @@ var validationResult = this.validationSet.validate(value) if (validationResult !== null) { if (!silentMode) { - $.oc.flashMsg({text: validationResult, 'class': 'error', 'interval': 5}) + $.wn.flashMsg({text: validationResult, 'class': 'error', 'interval': 5}) } return false } @@ -170,7 +172,7 @@ } BaseEditor.prototype.markInvalid = function() { - $.oc.foundation.element.addClass(this.containerRow, 'invalid') + $.wn.foundation.element.addClass(this.containerRow, 'invalid') this.inspector.getGroupManager().markGroupRowInvalid(this.parentGroup, this.inspector.getRootTable()) this.inspector.getRootSurface().expandGroupParents(this.parentGroup) @@ -206,10 +208,10 @@ this.inspector.applyGroupLevelToRow(row, this.group) - $.oc.foundation.element.addClass(row, 'property') - $.oc.foundation.element.addClass(row, groupedClass) + $.wn.foundation.element.addClass(row, 'property') + $.wn.foundation.element.addClass(row, groupedClass) return row } - $.oc.inspector.propertyEditors.base = BaseEditor + $.wn.inspector.propertyEditors.base = BaseEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.checkbox.js b/modules/system/assets/ui/js/inspector.editor.checkbox.js index 14e399be7..3f55f128f 100644 --- a/modules/system/assets/ui/js/inspector.editor.checkbox.js +++ b/modules/system/assets/ui/js/inspector.editor.checkbox.js @@ -1,13 +1,13 @@ /* * Inspector checkbox editor class. * - * This editor is used in $.oc.inspector.propertyEditors.set class. + * This editor is used in $.wn.inspector.propertyEditors.set class. * If updates that affect references to this.inspector and propertyDefinition are done, * the propertyEditors.set class implementation should be reviewed. */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.base, + var Base = $.wn.inspector.propertyEditors.base, BaseProto = Base.prototype var CheckboxEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -49,11 +49,11 @@ if (this.propertyDefinition.default !== undefined) { isChecked = this.normalizeCheckedValue(this.propertyDefinition.default) } - } + } else { isChecked = this.normalizeCheckedValue(value) } - + editor.checked = isChecked this.containerCell.appendChild(container) @@ -105,5 +105,5 @@ this.inspector.setPropertyValue(this.propertyDefinition.property, isChecked ? 1 : 0) } - $.oc.inspector.propertyEditors.checkbox = CheckboxEditor + $.wn.inspector.propertyEditors.checkbox = CheckboxEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.dictionary.js b/modules/system/assets/ui/js/inspector.editor.dictionary.js index 2ff645b08..5fa3f864b 100644 --- a/modules/system/assets/ui/js/inspector.editor.dictionary.js +++ b/modules/system/assets/ui/js/inspector.editor.dictionary.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.popupBase, + var Base = $.wn.inspector.propertyEditors.popupBase, BaseProto = Base.prototype var DictionaryEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -18,7 +18,7 @@ DictionaryEditor.prototype.dispose = function() { this.disposeValidators() - + this.keyValidationSet = null this.valueValidationSet = null @@ -40,7 +40,7 @@ // DictionaryEditor.prototype.setLinkText = function(link, value) { - var value = value !== undefined ? value + var value = value !== undefined ? value : this.inspector.getPropertyValue(this.propertyDefinition.property) if (value === undefined) { @@ -51,7 +51,7 @@ var placeholder = this.propertyDefinition.placeholder if (placeholder !== undefined) { - $.oc.foundation.element.addClass(link, 'placeholder') + $.wn.foundation.element.addClass(link, 'placeholder') link.textContent = placeholder } else { @@ -65,7 +65,7 @@ var itemCount = this.getValueKeys(value).length - $.oc.foundation.element.removeClass(link, 'placeholder') + $.wn.foundation.element.removeClass(link, 'placeholder') link.textContent = 'Items: ' + itemCount } } @@ -81,10 +81,10 @@
\
\ \ \
\
\ @@ -195,11 +195,11 @@ var activeCells = this.popup.querySelectorAll('td.active') for (var i = activeCells.length-1; i >= 0; i--) { - $.oc.foundation.element.removeClass(activeCells[i], 'active') + $.wn.foundation.element.removeClass(activeCells[i], 'active') } var activeCell = input.parentNode.parentNode // input / div / td - $.oc.foundation.element.addClass(activeCell, 'active') + $.wn.foundation.element.addClass(activeCell, 'active') } DictionaryEditor.prototype.createItem = function() { @@ -256,32 +256,32 @@ } if (key.length == 0) { - $.oc.flashMsg({text: 'The key cannot be empty.', 'class': 'error', 'interval': 3}) + $.wn.flashMsg({text: 'The key cannot be empty.', 'class': 'error', 'interval': 3}) this.focusAndMakeActive(keyInput) return false } if (value.length == 0) { - $.oc.flashMsg({text: 'The value cannot be empty.', 'class': 'error', 'interval': 3}) + $.wn.flashMsg({text: 'The value cannot be empty.', 'class': 'error', 'interval': 3}) this.focusAndMakeActive(valueInput) return false } if (result[key] !== undefined) { - $.oc.flashMsg({text: 'Keys should be unique.', 'class': 'error', 'interval': 3}) + $.wn.flashMsg({text: 'Keys should be unique.', 'class': 'error', 'interval': 3}) this.focusAndMakeActive(keyInput) return false } - + var validationResult = this.keyValidationSet.validate(key) if (validationResult !== null) { - $.oc.flashMsg({text: validationResult, 'class': 'error', 'interval': 5}) + $.wn.flashMsg({text: validationResult, 'class': 'error', 'interval': 5}) return false } validationResult = this.valueValidationSet.validate(value) if (validationResult !== null) { - $.oc.flashMsg({text: validationResult, 'class': 'error', 'interval': 5}) + $.wn.flashMsg({text: validationResult, 'class': 'error', 'interval': 5}) return false } @@ -387,11 +387,11 @@ // DictionaryEditor.prototype.initValidators = function() { - this.keyValidationSet = new $.oc.inspector.validationSet({ + this.keyValidationSet = new $.wn.inspector.validationSet({ validation: this.propertyDefinition.validationKey }, this.propertyDefinition.property+'.validationKey') - this.valueValidationSet = new $.oc.inspector.validationSet({ + this.valueValidationSet = new $.wn.inspector.validationSet({ validation: this.propertyDefinition.validationValue }, this.propertyDefinition.property+'.validationValue') } @@ -428,10 +428,10 @@ var command = ev.currentTarget.getAttribute('data-cmd') switch (command) { - case 'create-item' : + case 'create-item' : this.createItem() break; - case 'delete-item' : + case 'delete-item' : this.deleteItem() break; } @@ -446,5 +446,5 @@ } } - $.oc.inspector.propertyEditors.dictionary = DictionaryEditor + $.wn.inspector.propertyEditors.dictionary = DictionaryEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.dropdown.js b/modules/system/assets/ui/js/inspector.editor.dropdown.js index b5d2e25fe..124eb5484 100644 --- a/modules/system/assets/ui/js/inspector.editor.dropdown.js +++ b/modules/system/assets/ui/js/inspector.editor.dropdown.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.base, + var Base = $.wn.inspector.propertyEditors.base, BaseProto = Base.prototype var DropdownEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -38,8 +38,8 @@ DropdownEditor.prototype.build = function() { var select = document.createElement('select') - $.oc.foundation.element.addClass(this.containerCell, 'dropdown') - $.oc.foundation.element.addClass(select, 'custom-select') + $.wn.foundation.element.addClass(this.containerCell, 'dropdown') + $.wn.foundation.element.addClass(select, 'custom-select') if (!this.dynamicOptions) { this.loadStaticOptions(select) @@ -446,5 +446,5 @@ this.initialization = false } - $.oc.inspector.propertyEditors.dropdown = DropdownEditor + $.wn.inspector.propertyEditors.dropdown = DropdownEditor }(window.jQuery); diff --git a/modules/system/assets/ui/js/inspector.editor.object.js b/modules/system/assets/ui/js/inspector.editor.object.js index 641da5b7d..bfef7b6bb 100644 --- a/modules/system/assets/ui/js/inspector.editor.object.js +++ b/modules/system/assets/ui/js/inspector.editor.object.js @@ -5,7 +5,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.base, + var Base = $.wn.inspector.propertyEditors.base, BaseProto = Base.prototype var ObjectEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -43,10 +43,10 @@ values = {} } - this.childInspector = new $.oc.inspector.surface(inspectorContainer, - this.propertyDefinition.properties, - values, - this.inspector.getInspectorUniqueId() + '-' + this.propertyDefinition.property, + this.childInspector = new $.wn.inspector.surface(inspectorContainer, + this.propertyDefinition.properties, + values, + this.inspector.getInspectorUniqueId() + '-' + this.propertyDefinition.property, options, this.inspector, this.group, @@ -80,7 +80,7 @@ targetValue = value[targetProperty] if (this.isEmptyValue(targetValue)) { - return $.oc.inspector.removedProperty + return $.wn.inspector.removedProperty } return value @@ -116,8 +116,8 @@ ObjectEditor.prototype.validate = function(silentMode) { var values = this.childInspector.getValues() - if (this.cleanUpValue(values) === $.oc.inspector.removedProperty) { - // Ignore any validation rules if the object's required + if (this.cleanUpValue(values) === $.wn.inspector.removedProperty) { + // Ignore any validation rules if the object's required // property is empty (ignoreIfPropertyEmpty) return true @@ -136,5 +136,5 @@ this.inspector.setPropertyValue(this.propertyDefinition.property, this.cleanUpValue(values)) } - $.oc.inspector.propertyEditors.object = ObjectEditor + $.wn.inspector.propertyEditors.object = ObjectEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.objectlist.js b/modules/system/assets/ui/js/inspector.editor.objectlist.js index a8ed51d01..bc5705930 100644 --- a/modules/system/assets/ui/js/inspector.editor.objectlist.js +++ b/modules/system/assets/ui/js/inspector.editor.objectlist.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.base, + var Base = $.wn.inspector.propertyEditors.base, BaseProto = Base.prototype var ObjectListEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -29,7 +29,7 @@ var keyProperty = this.getKeyProperty() if (!keyProperty) { - throw new Error('Object list key property ' + this.propertyDefinition.keyProperty + throw new Error('Object list key property ' + this.propertyDefinition.keyProperty + ' is not defined in itemProperties. Property: ' + this.propertyDefinition.property) } } @@ -58,17 +58,17 @@ ObjectListEditor.prototype.build = function() { var link = document.createElement('a') - $.oc.foundation.element.addClass(link, 'trigger') + $.wn.foundation.element.addClass(link, 'trigger') link.setAttribute('href', '#') this.setLinkText(link) - $.oc.foundation.element.addClass(this.containerCell, 'trigger-cell') + $.wn.foundation.element.addClass(this.containerCell, 'trigger-cell') this.containerCell.appendChild(link) } ObjectListEditor.prototype.setLinkText = function(link, value) { - var value = value !== undefined && value !== null ? value + var value = value !== undefined && value !== null ? value : this.inspector.getPropertyValue(this.propertyDefinition.property) if (value === null) { @@ -79,7 +79,7 @@ var placeholder = this.propertyDefinition.placeholder if (placeholder !== undefined) { - $.oc.foundation.element.addClass(link, 'placeholder') + $.wn.foundation.element.addClass(link, 'placeholder') link.textContent = placeholder } else { @@ -95,7 +95,7 @@ } itemCount = value.length - } + } else { if (typeof value !== 'object') { throw new Error('Object list value should be an object. Property: ' + this.propertyDefinition.property) @@ -104,7 +104,7 @@ itemCount = this.getValueKeys(value).length } - $.oc.foundation.element.removeClass(link, 'placeholder') + $.wn.foundation.element.removeClass(link, 'placeholder') link.textContent = 'Items: ' + itemCount } } @@ -126,10 +126,10 @@
\
\ \ \
\
\ @@ -239,11 +239,11 @@ cell.textContent = text if (rowClass !== undefined) { - $.oc.foundation.element.addClass(row, rowClass) + $.wn.foundation.element.addClass(row, rowClass) } if (cellClass !== undefined) { - $.oc.foundation.element.addClass(cell, cellClass) + $.wn.foundation.element.addClass(cell, cellClass) } row.appendChild(cell) @@ -279,12 +279,12 @@ } this.applyDataToRow(selectedRow) - $.oc.foundation.element.removeClass(selectedRow, 'active') + $.wn.foundation.element.removeClass(selectedRow, 'active') } this.disposeInspector() - $.oc.foundation.element.addClass(row, 'active') + $.wn.foundation.element.addClass(row, 'active') this.createInspectorForRow(row, inspectorContainer) } @@ -304,12 +304,12 @@ inspectorClass: this.inspector.options.inspectorClass } - this.currentRowInspector = new $.oc.inspector.surface(inspectorContainer, properties, values, - $.oc.inspector.helpers.generateElementUniqueId(inspectorContainer), options) + this.currentRowInspector = new $.wn.inspector.surface(inspectorContainer, properties, values, + $.wn.inspector.helpers.generateElementUniqueId(inspectorContainer), options) } ObjectListEditor.prototype.disposeInspector = function() { - $.oc.foundation.controlUtils.disposeControls(this.popup.querySelector('[data-inspector-container]')) + $.wn.foundation.controlUtils.disposeControls(this.popup.querySelector('[data-inspector-container]')) this.currentRowInspector = null } @@ -324,7 +324,7 @@ ObjectListEditor.prototype.updateRowText = function(property, value) { var selectedRow = this.getSelectedRow() - + if (!selectedRow) { throw new Exception('A row is not found for the updated data') } @@ -337,10 +337,10 @@ if (value.length === 0) { value = '[No title]' - $.oc.foundation.element.addClass(selectedRow, 'disabled') + $.wn.foundation.element.addClass(selectedRow, 'disabled') } else { - $.oc.foundation.element.removeClass(selectedRow, 'disabled') + $.wn.foundation.element.removeClass(selectedRow, 'disabled') } selectedRow.firstChild.textContent = value @@ -354,7 +354,7 @@ var rows = this.getTableBody().children for (var i = 0, len = rows.length; i < len; i++) { - if ($.oc.foundation.element.hasClass(rows[i], 'active')) { + if ($.wn.foundation.element.hasClass(rows[i], 'active')) { return rows[i] } } @@ -377,7 +377,7 @@ } this.applyDataToRow(selectedRow) - $.oc.foundation.element.removeClass(selectedRow, 'active') + $.wn.foundation.element.removeClass(selectedRow, 'active') } this.disposeInspector() @@ -490,7 +490,7 @@ } if ($.trim(keyPropertyValue).length === 0) { - $.oc.flashMsg({text: 'The value of key property ' + keyPropertyTitle + ' cannot be empty.', 'class': 'error', 'interval': 3}) + $.wn.flashMsg({text: 'The value of key property ' + keyPropertyTitle + ' cannot be empty.', 'class': 'error', 'interval': 3}) return false } @@ -507,7 +507,7 @@ } if (rowData[keyProperty] == keyPropertyValue) { - $.oc.flashMsg({text: 'The value of key property ' + keyPropertyTitle + ' should be unique.', 'class': 'error', 'interval': 3}) + $.wn.flashMsg({text: 'The value of key property ' + keyPropertyTitle + ' should be unique.', 'class': 'error', 'interval': 3}) return false } } @@ -621,7 +621,7 @@ } ObjectListEditor.prototype.onTriggerClick = function(ev) { - $.oc.foundation.event.stop(ev) + $.wn.foundation.event.stop(ev) var content = this.getPopupContent() @@ -638,7 +638,7 @@ $(popup).on('submit.inspector', 'form', this.proxy(this.onSubmit)) $(popup).on('click', 'tr.rowlink', this.proxy(this.onRowClick)) $(popup).on('click.inspector', '[data-cmd]', this.proxy(this.onCommand)) - + this.popup = popup.get(0) this.buildPopupContents(this.popup) @@ -651,7 +651,7 @@ $(popup).off('click.inspector', '[data-cmd]', this.proxy(this.onCommand)) this.disposeInspector() - $.oc.foundation.controlUtils.disposeControls(this.popup) + $.wn.foundation.controlUtils.disposeControls(this.popup) this.popup = null this.getRootSurface().popupHidden() @@ -676,10 +676,10 @@ var command = ev.currentTarget.getAttribute('data-cmd') switch (command) { - case 'create-item' : + case 'create-item' : this.createItem() break; - case 'delete-item' : + case 'delete-item' : this.deleteItem() break; } @@ -695,5 +695,5 @@ } } - $.oc.inspector.propertyEditors.objectList = ObjectListEditor + $.wn.inspector.propertyEditors.objectList = ObjectListEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.popupbase.js b/modules/system/assets/ui/js/inspector.editor.popupbase.js index 03ea1c9ba..eedabf563 100644 --- a/modules/system/assets/ui/js/inspector.editor.popupbase.js +++ b/modules/system/assets/ui/js/inspector.editor.popupbase.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.base, + var Base = $.wn.inspector.propertyEditors.base, BaseProto = Base.prototype var PopupBase = function(inspector, propertyDefinition, containerCell, group) { @@ -25,11 +25,11 @@ PopupBase.prototype.build = function() { var link = document.createElement('a') - $.oc.foundation.element.addClass(link, 'trigger') + $.wn.foundation.element.addClass(link, 'trigger') link.setAttribute('href', '#') this.setLinkText(link) - $.oc.foundation.element.addClass(this.containerCell, 'trigger-cell') + $.wn.foundation.element.addClass(this.containerCell, 'trigger-cell') this.containerCell.appendChild(link) } @@ -91,7 +91,7 @@ } PopupBase.prototype.onTriggerClick = function(ev) { - $.oc.foundation.event.stop(ev) + $.wn.foundation.event.stop(ev) var content = this.getPopupContent() @@ -133,5 +133,5 @@ return false } - $.oc.inspector.propertyEditors.popupBase = PopupBase + $.wn.inspector.propertyEditors.popupBase = PopupBase }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.set.js b/modules/system/assets/ui/js/inspector.editor.set.js index ea40eda94..4222682aa 100644 --- a/modules/system/assets/ui/js/inspector.editor.set.js +++ b/modules/system/assets/ui/js/inspector.editor.set.js @@ -1,11 +1,11 @@ /* * Inspector set editor class. * - * This class uses $.oc.inspector.propertyEditors.checkbox editor. + * This class uses $.wn.inspector.propertyEditors.checkbox editor. */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.base, + var Base = $.wn.inspector.propertyEditors.base, BaseProto = Base.prototype var SetEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -40,11 +40,11 @@ SetEditor.prototype.build = function() { var link = document.createElement('a') - $.oc.foundation.element.addClass(link, 'trigger') + $.wn.foundation.element.addClass(link, 'trigger') link.setAttribute('href', '#') this.setLinkText(link) - $.oc.foundation.element.addClass(this.containerCell, 'trigger-cell') + $.wn.foundation.element.addClass(this.containerCell, 'trigger-cell') this.containerCell.appendChild(link) @@ -72,7 +72,7 @@ } SetEditor.prototype.setLinkText = function(link, value) { - var value = (value !== undefined && value !== null) ? value + var value = (value !== undefined && value !== null) ? value : this.getNormalizedValue(), text = '[ ]' @@ -87,7 +87,7 @@ } text = '[' + textValues.join(', ') + ']' - $.oc.foundation.element.removeClass(link, 'placeholder') + $.wn.foundation.element.removeClass(link, 'placeholder') } else { text = this.propertyDefinition.placeholder @@ -95,7 +95,7 @@ if ((typeof text === 'string' && text.length == 0) || text === undefined) { text = '[ ]' } - $.oc.foundation.element.addClass(link, 'placeholder') + $.wn.foundation.element.addClass(link, 'placeholder') } link.textContent = text @@ -124,7 +124,7 @@ title: title, default: this.isCheckedByDefault(value) }, - editor = new $.oc.inspector.propertyEditors.checkbox(this, property, cell, this.group) + editor = new $.wn.inspector.propertyEditors.checkbox(this, property, cell, this.group) this.editors.push[editor] } @@ -161,7 +161,7 @@ data = this.inspector.getValues(), $form = $(link).closest('form') - $.oc.foundation.element.addClass(link, 'loading-indicator-container size-small') + $.wn.foundation.element.addClass(link, 'loading-indicator-container size-small') this.showLoadingIndicator() data['inspectorProperty'] = this.getPropertyPath() @@ -226,7 +226,7 @@ return value } - /* + /* * Removes items that don't exist in the defined items from * the value. */ @@ -291,7 +291,7 @@ // When a checkbox requests the property value, we return // TRUE if the checkbox value is listed in the current values of // the set. - // For example, the available set items are [create, update], the + // For example, the available set items are [create, update], the // current set value is [create] and checkboxValue is "create". // The result of the method will be TRUE. @@ -325,13 +325,13 @@ var resultValue = [], items = this.getItemsSource() - + for (var itemValue in items) { if (itemValue !== checkboxValue) { if (currentValue.indexOf(itemValue) !== -1) { resultValue.push(itemValue) } - } + } else { if (isChecked) { resultValue.push(itemValue) @@ -369,5 +369,5 @@ link.parentNode.removeChild(link) } - $.oc.inspector.propertyEditors.set = SetEditor + $.wn.inspector.propertyEditors.set = SetEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.string.js b/modules/system/assets/ui/js/inspector.editor.string.js index 4d3f75b2e..d85f40e1c 100644 --- a/modules/system/assets/ui/js/inspector.editor.string.js +++ b/modules/system/assets/ui/js/inspector.editor.string.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.base, + var Base = $.wn.inspector.propertyEditors.base, BaseProto = Base.prototype var StringEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -38,7 +38,7 @@ editor.value = value - $.oc.foundation.element.addClass(this.containerCell, 'text') + $.wn.foundation.element.addClass(this.containerCell, 'text') this.containerCell.appendChild(editor) } @@ -84,5 +84,5 @@ this.focus() } - $.oc.inspector.propertyEditors.string = StringEditor + $.wn.inspector.propertyEditors.string = StringEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.stringlist.js b/modules/system/assets/ui/js/inspector.editor.stringlist.js index 2dd009201..dec17a578 100644 --- a/modules/system/assets/ui/js/inspector.editor.stringlist.js +++ b/modules/system/assets/ui/js/inspector.editor.stringlist.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.text, + var Base = $.wn.inspector.propertyEditors.text, BaseProto = Base.prototype var StringListEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -14,7 +14,7 @@ StringListEditor.prototype.constructor = Base StringListEditor.prototype.setLinkText = function(link, value) { - var value = value !== undefined ? value + var value = value !== undefined ? value : this.inspector.getPropertyValue(this.propertyDefinition.property) if (value === undefined) { @@ -25,17 +25,17 @@ if (!value) { value = this.propertyDefinition.placeholder - $.oc.foundation.element.addClass(link, 'placeholder') + $.wn.foundation.element.addClass(link, 'placeholder') if (!value) { value = '[]' } link.textContent = value - } + } else { - $.oc.foundation.element.removeClass(link, 'placeholder') - + $.wn.foundation.element.removeClass(link, 'placeholder') + link.textContent = '[' + value.join(', ') + ']' } } @@ -82,7 +82,7 @@ for (var i = 0, len = arrayValue.length; i < len; i++) { var currentValue = $.trim(arrayValue[i]) - + if (currentValue.length > 0) { resultValue.push(currentValue) } @@ -92,5 +92,5 @@ this.inspector.setPropertyValue(this.propertyDefinition.property, resultValue) } - $.oc.inspector.propertyEditors.stringList = StringListEditor + $.wn.inspector.propertyEditors.stringList = StringListEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.stringlistautocomplete.js b/modules/system/assets/ui/js/inspector.editor.stringlistautocomplete.js index bf960b136..7b7d9abb7 100644 --- a/modules/system/assets/ui/js/inspector.editor.stringlistautocomplete.js +++ b/modules/system/assets/ui/js/inspector.editor.stringlistautocomplete.js @@ -5,7 +5,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.popupBase, + var Base = $.wn.inspector.propertyEditors.popupBase, BaseProto = Base.prototype var StringListAutocomplete = function(inspector, propertyDefinition, containerCell, group) { @@ -30,7 +30,7 @@ } StringListAutocomplete.prototype.setLinkText = function(link, value) { - var value = value !== undefined ? value + var value = value !== undefined ? value : this.inspector.getPropertyValue(this.propertyDefinition.property) if (value === undefined) { @@ -41,17 +41,17 @@ if (!value) { value = this.propertyDefinition.placeholder - $.oc.foundation.element.addClass(link, 'placeholder') + $.wn.foundation.element.addClass(link, 'placeholder') if (!value) { value = '[]' } link.textContent = value - } + } else { - $.oc.foundation.element.removeClass(link, 'placeholder') - + $.wn.foundation.element.removeClass(link, 'placeholder') + link.textContent = '[' + value.join(', ') + ']' } } @@ -77,10 +77,10 @@
\
\ \ \
\
\ @@ -181,11 +181,11 @@ var activeCells = this.popup.querySelectorAll('td.active') for (var i = activeCells.length-1; i >= 0; i--) { - $.oc.foundation.element.removeClass(activeCells[i], 'active') + $.wn.foundation.element.removeClass(activeCells[i], 'active') } var activeCell = input.parentNode.parentNode // input / div / td - $.oc.foundation.element.addClass(activeCell, 'active') + $.wn.foundation.element.addClass(activeCell, 'active') this.buildAutoComplete(input) } @@ -446,7 +446,7 @@ var itemsEvent = $.Event('autocompleteitems.oc.inspector') $inspectable.trigger(itemsEvent, [{ - values: values, + values: values, callback: this.proxy(this.itemsRequestDone), property: this.inspector.getPropertyPath(this.propertyDefinition.property), propertyDefinition: this.propertyDefinition @@ -527,10 +527,10 @@ var command = ev.currentTarget.getAttribute('data-cmd') switch (command) { - case 'create-item' : + case 'create-item' : this.createItem() break; - case 'delete-item' : + case 'delete-item' : this.deleteItem() break; } @@ -545,5 +545,5 @@ } } - $.oc.inspector.propertyEditors.stringListAutocomplete = StringListAutocomplete + $.wn.inspector.propertyEditors.stringListAutocomplete = StringListAutocomplete }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.editor.text.js b/modules/system/assets/ui/js/inspector.editor.text.js index 2c9572ec9..8ecc731c7 100644 --- a/modules/system/assets/ui/js/inspector.editor.text.js +++ b/modules/system/assets/ui/js/inspector.editor.text.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.propertyEditors.popupBase, + var Base = $.wn.inspector.propertyEditors.popupBase, BaseProto = Base.prototype var TextEditor = function(inspector, propertyDefinition, containerCell, group) { @@ -23,10 +23,10 @@ if (!value) { value = this.propertyDefinition.placeholder - $.oc.foundation.element.addClass(link, 'placeholder') + $.wn.foundation.element.addClass(link, 'placeholder') } else { - $.oc.foundation.element.removeClass(link, 'placeholder') + $.wn.foundation.element.removeClass(link, 'placeholder') } if (typeof value === 'string') { @@ -93,5 +93,5 @@ this.inspector.setPropertyValue(this.propertyDefinition.property, value) } - $.oc.inspector.propertyEditors.text = TextEditor + $.wn.inspector.propertyEditors.text = TextEditor }(window.jQuery); diff --git a/modules/system/assets/ui/js/inspector.engine.js b/modules/system/assets/ui/js/inspector.engine.js index b5ff5df4f..af08e63e5 100644 --- a/modules/system/assets/ui/js/inspector.engine.js +++ b/modules/system/assets/ui/js/inspector.engine.js @@ -9,13 +9,15 @@ // NAMESPACES // ============================ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.inspector === undefined) - $.oc.inspector = {} + if ($.wn.inspector === undefined) + $.wn.inspector = {} - $.oc.inspector.engine = {} + $.wn.inspector.engine = {} // CLASS DEFINITION // ============================ @@ -32,7 +34,7 @@ return null } - $.oc.inspector.engine.processPropertyGroups = function(properties) { + $.wn.inspector.engine.processPropertyGroups = function(properties) { var fields = [], result = { hasGroups: false, diff --git a/modules/system/assets/ui/js/inspector.externalparametereditor.js b/modules/system/assets/ui/js/inspector.externalparametereditor.js index 669e32f05..f6dc1a5d2 100644 --- a/modules/system/assets/ui/js/inspector.externalparametereditor.js +++ b/modules/system/assets/ui/js/inspector.externalparametereditor.js @@ -1,7 +1,7 @@ /* * External parameter editor for Inspector. * - * The external parameter editor allows to use URL and + * The external parameter editor allows to use URL and * other external parameters as values for the inspectable * properties. * @@ -11,16 +11,18 @@ // NAMESPACES // ============================ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.inspector === undefined) - $.oc.inspector = {} + if ($.wn.inspector === undefined) + $.wn.inspector = {} // CLASS DEFINITION // ============================ - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var ExternalParameterEditor = function(inspector, propertyDefinition, containerCell, initialValue) { @@ -62,13 +64,13 @@ * *
* <-- original property editing input/markup - *
- *
- * - * - * - * - *
+ *
+ *
+ * + * + * + * + *
*
*
*/ @@ -92,7 +94,7 @@ link.setAttribute('title', this.tooltipText) $(link).tooltip({'container': 'body', delay: 500}) - icon.setAttribute('class', 'oc-icon-terminal') + icon.setAttribute('class', 'wn-icon-terminal') link.appendChild(icon) controls.appendChild(input) @@ -148,7 +150,7 @@ setTimeout(this.proxy(this.repositionEditor), 0) - $.oc.foundation.element.addClass(container, 'editor-visible') + $.wn.foundation.element.addClass(container, 'editor-visible') link.setAttribute('data-original-title', 'Click to enter the property value') this.toggleEditorVisibility(false) @@ -171,8 +173,8 @@ editor.style.left = 'auto' editor.style.right = '30px' - $.oc.foundation.element.removeClass(container, 'editor-visible') - $.oc.foundation.element.removeClass(this.containerCell, 'active') + $.wn.foundation.element.removeClass(container, 'editor-visible') + $.wn.foundation.element.removeClass(this.containerCell, 'active') var propertyEditor = this.inspector.findPropertyEditor(this.propertyDefinition.property) @@ -182,7 +184,7 @@ } ExternalParameterEditor.prototype.toggleEditor = function(ev) { - $.oc.foundation.event.stop(ev) + $.wn.foundation.event.stop(ev) var link = this.getLink(), container = this.getContainer(), @@ -229,16 +231,16 @@ for (var i = 0, len = children.length; i < len; i++) { var element = children[i] - if ($.oc.foundation.element.hasClass(element, 'external-editor')) { + if ($.wn.foundation.element.hasClass(element, 'external-editor')) { continue } if (show) { - $.oc.foundation.element.removeClass(element, 'hide') + $.wn.foundation.element.removeClass(element, 'hide') } else { container.style.height = height + 'px' - $.oc.foundation.element.addClass(element, 'hide') + $.wn.foundation.element.addClass(element, 'hide') } } } @@ -252,7 +254,7 @@ if (value.length === 0) { if (!silentMode) { - $.oc.flashMsg({text: 'Please enter the external parameter name.', 'class': 'error', 'interval': 5}) + $.wn.flashMsg({text: 'Please enter the external parameter name.', 'class': 'error', 'interval': 5}) this.focus() } @@ -327,8 +329,8 @@ } ExternalParameterEditor.prototype.isEditorVisible = function() { - return $.oc.foundation.element.hasClass(this.getContainer(), 'editor-visible') + return $.wn.foundation.element.hasClass(this.getContainer(), 'editor-visible') } - $.oc.inspector.externalParameterEditor = ExternalParameterEditor + $.wn.inspector.externalParameterEditor = ExternalParameterEditor }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.groups.js b/modules/system/assets/ui/js/inspector.groups.js index c9054157e..8a579cb48 100644 --- a/modules/system/assets/ui/js/inspector.groups.js +++ b/modules/system/assets/ui/js/inspector.groups.js @@ -110,7 +110,7 @@ while (currentGroup) { var row = currentGroup.findGroupRow(table) if (row) { - $.oc.foundation.element.addClass(row, 'invalid') + $.wn.foundation.element.addClass(row, 'invalid') } currentGroup = currentGroup.parentGroup @@ -121,7 +121,7 @@ var rows = table.querySelectorAll('tr.invalid') for (var i = rows.length-1; i >= 0; i--) { - $.oc.foundation.element.removeClass(rows[i], 'invalid') + $.wn.foundation.element.removeClass(rows[i], 'invalid') } } @@ -264,5 +264,5 @@ return table.querySelector('tr[data-group-index="'+this.groupIndex+'"]') } - $.oc.inspector.groupManager = GroupManager + $.wn.inspector.groupManager = GroupManager }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.helpers.js b/modules/system/assets/ui/js/inspector.helpers.js index 728911f03..4a8b03416 100644 --- a/modules/system/assets/ui/js/inspector.helpers.js +++ b/modules/system/assets/ui/js/inspector.helpers.js @@ -7,26 +7,28 @@ // NAMESPACES // ============================ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.inspector === undefined) - $.oc.inspector = {} + if ($.wn.inspector === undefined) + $.wn.inspector = {} - $.oc.inspector.helpers = {} + $.wn.inspector.helpers = {} - $.oc.inspector.helpers.generateElementUniqueId = function(element) { + $.wn.inspector.helpers.generateElementUniqueId = function(element) { if (element.hasAttribute('data-inspector-id')) { return element.getAttribute('data-inspector-id') } - var id = $.oc.inspector.helpers.generateUniqueId() + var id = $.wn.inspector.helpers.generateUniqueId() element.setAttribute('data-inspector-id', id) return id } - $.oc.inspector.helpers.generateUniqueId = function() { + $.wn.inspector.helpers.generateUniqueId = function() { return "inspectorid-" + Math.floor(Math.random() * new Date().getTime()); } diff --git a/modules/system/assets/ui/js/inspector.manager.js b/modules/system/assets/ui/js/inspector.manager.js index 8980cd5b6..e68a5b3be 100644 --- a/modules/system/assets/ui/js/inspector.manager.js +++ b/modules/system/assets/ui/js/inspector.manager.js @@ -6,7 +6,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var InspectorManager = function() { @@ -53,7 +53,7 @@ containerSupported: containerSupported }) - new $.oc.inspector.wrappers.popup($element, null, options) + new $.wn.inspector.wrappers.popup($element, null, options) } InspectorManager.prototype.createInspectorContainer = function($element, $container) { @@ -62,7 +62,7 @@ container: $container }) - new $.oc.inspector.wrappers.container($element, null, options) + new $.wn.inspector.wrappers.container($element, null, options) } InspectorManager.prototype.switchToPopup = function(wrapper) { @@ -70,7 +70,7 @@ containerSupported: true }) - new $.oc.inspector.wrappers.popup(wrapper.$element, wrapper, options) + new $.wn.inspector.wrappers.popup(wrapper.$element, wrapper, options) wrapper.cleanupAfterSwitch() this.setContainerPreference(false) @@ -87,7 +87,7 @@ throw new Error('Cannot switch to container: a container element is not found') } - new $.oc.inspector.wrappers.container(wrapper.$element, wrapper, options) + new $.wn.inspector.wrappers.container(wrapper.$element, wrapper, options) wrapper.cleanupAfterSwitch() this.setContainerPreference(true) @@ -106,7 +106,7 @@ // if (!$container) { this.createInspectorPopup($element, false) - } + } else { // If the container is already in use, apply values to the inspectable elements if (!this.applyValuesFromContainer($container) || !this.containerHidingAllowed($container)) { @@ -114,8 +114,8 @@ } // Dispose existing container wrapper, if any - $.oc.foundation.controlUtils.disposeControls($container.get(0)) - + $.wn.foundation.controlUtils.disposeControls($container.get(0)) + if (!this.getContainerPreference()) { // If container is not a preferred option, create Inspector popoup this.createInspectorPopup($element, true) @@ -168,11 +168,11 @@ return false } - $.oc.inspector.manager = new InspectorManager() + $.wn.inspector.manager = new InspectorManager() $.fn.inspector = function () { return this.each(function () { - $.oc.inspector.manager.createInspector(this) + $.wn.inspector.manager.createInspector(this) }) } }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.surface.js b/modules/system/assets/ui/js/inspector.surface.js index a9b3e1375..d5439e52f 100644 --- a/modules/system/assets/ui/js/inspector.surface.js +++ b/modules/system/assets/ui/js/inspector.surface.js @@ -11,16 +11,18 @@ // NAMESPACES // ============================ + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn - if ($.oc.inspector === undefined) - $.oc.inspector = {} + if ($.wn.inspector === undefined) + $.wn.inspector = {} // CLASS DEFINITION // ============================ - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype /** @@ -30,8 +32,8 @@ * - values - property values, an object * - inspectorUniqueId - a string containing the unique inspector identifier. * The identifier should be a constant for an inspectable element. Use - * $.oc.inspector.helpers.generateElementUniqueId(element) to generate a persistent ID - * for an element. Use $.oc.inspector.helpers.generateUniqueId() to generate an ID + * $.wn.inspector.helpers.generateElementUniqueId(element) to generate a persistent ID + * for an element. Use $.wn.inspector.helpers.generateUniqueId() to generate an ID * not associated with an element. Inspector uses the ID for storing configuration * related to an element in the document DOM. */ @@ -42,7 +44,7 @@ this.options = $.extend({}, Surface.DEFAULTS, typeof options == 'object' && options) this.rawProperties = properties - this.parsedProperties = $.oc.inspector.engine.processPropertyGroups(properties) + this.parsedProperties = $.wn.inspector.engine.processPropertyGroups(properties) this.container = containerElement this.inspectorUniqueId = inspectorUniqueId this.values = values !== null ? values : {} @@ -63,7 +65,7 @@ } if (!this.parentSurface) { - this.groupManager = new $.oc.inspector.groupManager(this.inspectorUniqueId) + this.groupManager = new $.wn.inspector.groupManager(this.inspectorUniqueId) } Base.call(this) @@ -111,7 +113,7 @@ this.build() if (!this.parentSurface) { - $.oc.foundation.controlUtils.markDisposable(this.tableContainer) + $.wn.foundation.controlUtils.markDisposable(this.tableContainer) } this.registerHandlers() @@ -169,9 +171,9 @@ var dataTable = document.createElement('table'), tbody = document.createElement('tbody') - $.oc.foundation.element.addClass(dataTable, 'inspector-fields') + $.wn.foundation.element.addClass(dataTable, 'inspector-fields') if (this.parsedProperties.hasGroups) { - $.oc.foundation.element.addClass(dataTable, 'has-groups') + $.wn.foundation.element.addClass(dataTable, 'has-groups') } var currentGroup = this.group @@ -238,7 +240,7 @@ } this.applyGroupIndexAttribute(property, row, group) - $.oc.foundation.element.addClass(row, this.getRowCssClass(property, group)) + $.wn.foundation.element.addClass(row, this.getRowCssClass(property, group)) // Property head // @@ -339,7 +341,7 @@ var span = document.createElement('span') span.setAttribute('title', this.escapeJavascriptString(property.description)) - span.setAttribute('class', 'info oc-icon-info with-tooltip') + span.setAttribute('class', 'info wn-icon-info with-tooltip') $(span).tooltip({ placement: 'auto right', container: 'body', delay: 500 }) @@ -353,7 +355,7 @@ var row = rows[i], property = row.getAttribute('data-property') - if ($.oc.foundation.element.hasClass(row, 'no-external-parameter') || !property) { + if ($.wn.foundation.element.hasClass(row, 'no-external-parameter') || !property) { continue } @@ -370,7 +372,7 @@ initialValue = propertyEditor.getUndefinedValue() } - var editor = new $.oc.inspector.externalParameterEditor(this, propertyDefinition, cell, initialValue) + var editor = new $.wn.inspector.externalParameterEditor(this, propertyDefinition, cell, initialValue) this.externalParameterEditors.push(editor) } @@ -416,11 +418,11 @@ groupManager = this.getGroupManager(), collapse = true - if ($.oc.foundation.element.hasClass(link, 'expanded') && !forceExpand) { - $.oc.foundation.element.removeClass(link, 'expanded') + if ($.wn.foundation.element.hasClass(link, 'expanded') && !forceExpand) { + $.wn.foundation.element.removeClass(link, 'expanded') } else { - $.oc.foundation.element.addClass(link, 'expanded') + $.wn.foundation.element.addClass(link, 'expanded') collapse = false } @@ -451,15 +453,15 @@ if (row) { if (!noAnimation) { setTimeout(function toggleRow() { - $.oc.foundation.element.toggleClass(row, 'collapsed', collapse) - $.oc.foundation.element.toggleClass(row, 'expanded', !collapse) + $.wn.foundation.element.toggleClass(row, 'collapsed', collapse) + $.wn.foundation.element.toggleClass(row, 'expanded', !collapse) self.expandOrCollapseRows(rows, collapse, duration, noAnimation) }, duration) } else { - $.oc.foundation.element.toggleClass(row, 'collapsed', collapse) - $.oc.foundation.element.toggleClass(row, 'expanded', !collapse) + $.wn.foundation.element.toggleClass(row, 'collapsed', collapse) + $.wn.foundation.element.toggleClass(row, 'expanded', !collapse) self.expandOrCollapseRows(rows, collapse, duration, noAnimation) } @@ -490,11 +492,11 @@ type = 'string' } - var editor = new $.oc.inspector.propertyEditors[type](this, property, cell, group) + var editor = new $.wn.inspector.propertyEditors[type](this, property, cell, group) if (editor.isGroupedEditor()) { - $.oc.foundation.element.addClass(dataTable, 'has-groups') - $.oc.foundation.element.addClass(row, 'control-group') + $.wn.foundation.element.addClass(dataTable, 'has-groups') + $.wn.foundation.element.addClass(row, 'control-group') this.applyGroupIndexAttribute(property, row, editor.group, true) this.buildGroupExpandControl(row.querySelector('span.title-element'), property, true, editor.hasChildSurface(), editor.group) @@ -582,10 +584,10 @@ cells = tbody.querySelectorAll('tr td') for (var i = 0, len = cells.length; i < len; i++) { - $.oc.foundation.element.removeClass(cells[i], 'active') + $.wn.foundation.element.removeClass(cells[i], 'active') } - $.oc.foundation.element.addClass(cell, 'active') + $.wn.foundation.element.addClass(cell, 'active') } Surface.prototype.markPropertyChanged = function(property, changed) { @@ -593,10 +595,10 @@ row = this.tableContainer.querySelector('tr[data-property-path="'+propertyPath+'"]') if (changed) { - $.oc.foundation.element.addClass(row, 'changed') + $.wn.foundation.element.addClass(row, 'changed') } else { - $.oc.foundation.element.removeClass(row, 'changed') + $.wn.foundation.element.removeClass(row, 'changed') } } @@ -637,9 +639,9 @@ type = 'string' } - if ($.oc.inspector.propertyEditors[type] === undefined) { + if ($.wn.inspector.propertyEditors[type] === undefined) { throw new Error('The Inspector editor class "' + type + - '" is not defined in the $.oc.inspector.propertyEditors namespace.') + '" is not defined in the $.wn.inspector.propertyEditors namespace.') } } @@ -846,7 +848,7 @@ } } - if (value === $.oc.inspector.removedProperty) { + if (value === $.wn.inspector.removedProperty) { continue } @@ -890,12 +892,12 @@ var externalEditor = this.findExternalParameterEditor(property) if (externalEditor && externalEditor.isEditorVisible() && !externalEditor.validate(true)) { - result[property] = $.oc.inspector.invalidProperty + result[property] = $.wn.inspector.invalidProperty continue } if (!editor.validate(true)) { - result[property] = $.oc.inspector.invalidProperty + result[property] = $.wn.inspector.invalidProperty continue } @@ -949,7 +951,7 @@ this.toggleGroup(row) - $.oc.foundation.event.stop(ev) + $.wn.foundation.event.stop(ev) return false } @@ -967,7 +969,7 @@ // REGISTRATION // ============================ - $.oc.inspector.surface = Surface - $.oc.inspector.removedProperty = {removed: true} - $.oc.inspector.invalidProperty = {invalid: true} + $.wn.inspector.surface = Surface + $.wn.inspector.removedProperty = {removed: true} + $.wn.inspector.invalidProperty = {invalid: true} }(window.jQuery); diff --git a/modules/system/assets/ui/js/inspector.validationset.js b/modules/system/assets/ui/js/inspector.validationset.js index ab64b204d..b21860525 100644 --- a/modules/system/assets/ui/js/inspector.validationset.js +++ b/modules/system/assets/ui/js/inspector.validationset.js @@ -6,13 +6,13 @@ // NAMESPACES // ============================ - if ($.oc.inspector.validators === undefined) - $.oc.inspector.validators = {} + if ($.wn.inspector.validators === undefined) + $.wn.inspector.validators = {} // CLASS DEFINITION // ============================ - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var ValidationSet = function(options, propertyName) { @@ -50,7 +50,7 @@ // // - required // - validationPattern - // - validationMessage + // - validationMessage if ((this.options.required !== undefined || this.options.validationPattern !== undefined || @@ -60,7 +60,7 @@ } if (this.options.required !== undefined && this.options.required) { - var validator = new $.oc.inspector.validators.required({ + var validator = new $.wn.inspector.validators.required({ message: this.options.validationMessage }) @@ -68,7 +68,7 @@ } if (this.options.validationPattern !== undefined) { - var validator = new $.oc.inspector.validators.regex({ + var validator = new $.wn.inspector.validators.regex({ message: this.options.validationMessage, pattern: this.options.validationPattern }) @@ -85,11 +85,11 @@ } for (var validatorName in this.options.validation) { - if ($.oc.inspector.validators[validatorName] == undefined) { - this.throwError('Inspector validator "' + validatorName + '" is not found in the $.oc.inspector.validators namespace.') + if ($.wn.inspector.validators[validatorName] == undefined) { + this.throwError('Inspector validator "' + validatorName + '" is not found in the $.wn.inspector.validators namespace.') } - var validator = new $.oc.inspector.validators[validatorName]( + var validator = new $.wn.inspector.validators[validatorName]( this.options.validation[validatorName] ) @@ -115,5 +115,5 @@ } } - $.oc.inspector.validationSet = ValidationSet + $.wn.inspector.validationSet = ValidationSet }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.validator.base.js b/modules/system/assets/ui/js/inspector.validator.base.js index 758cdbd47..df9370a41 100644 --- a/modules/system/assets/ui/js/inspector.validator.base.js +++ b/modules/system/assets/ui/js/inspector.validator.base.js @@ -6,13 +6,13 @@ // NAMESPACES // ============================ - if ($.oc.inspector.validators === undefined) - $.oc.inspector.validators = {} + if ($.wn.inspector.validators === undefined) + $.wn.inspector.validators = {} // CLASS DEFINITION // ============================ - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var BaseValidator = function(options) { @@ -55,5 +55,5 @@ return null } - $.oc.inspector.validators.base = BaseValidator + $.wn.inspector.validators.base = BaseValidator }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.validator.basenumber.js b/modules/system/assets/ui/js/inspector.validator.basenumber.js index b47841572..b96b7038e 100644 --- a/modules/system/assets/ui/js/inspector.validator.basenumber.js +++ b/modules/system/assets/ui/js/inspector.validator.basenumber.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.validators.base, + var Base = $.wn.inspector.validators.base, BaseProto = Base.prototype var BaseNumber = function(options) { @@ -41,5 +41,5 @@ } } - $.oc.inspector.validators.baseNumber = BaseNumber + $.wn.inspector.validators.baseNumber = BaseNumber }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.validator.float.js b/modules/system/assets/ui/js/inspector.validator.float.js index d1b97f62b..4e6c4fe97 100644 --- a/modules/system/assets/ui/js/inspector.validator.float.js +++ b/modules/system/assets/ui/js/inspector.validator.float.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.validators.baseNumber, + var Base = $.wn.inspector.validators.baseNumber, BaseProto = Base.prototype var FloatValidator = function(options) { @@ -28,8 +28,8 @@ return null } - var testResult = this.options.allowNegative ? - /^[-]?([0-9]+\.[0-9]+|[0-9]+)$/.test(string) : + var testResult = this.options.allowNegative ? + /^[-]?([0-9]+\.[0-9]+|[0-9]+)$/.test(string) : /^([0-9]+\.[0-9]+|[0-9]+)$/.test(string) if (!testResult) { @@ -43,5 +43,5 @@ return this.doCommonChecks(parseFloat(string)) } - $.oc.inspector.validators.float = FloatValidator + $.wn.inspector.validators.float = FloatValidator }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.validator.integer.js b/modules/system/assets/ui/js/inspector.validator.integer.js index 2fbcc7f55..111c88d59 100644 --- a/modules/system/assets/ui/js/inspector.validator.integer.js +++ b/modules/system/assets/ui/js/inspector.validator.integer.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.validators.baseNumber, + var Base = $.wn.inspector.validators.baseNumber, BaseProto = Base.prototype var IntegerValidator = function(options) { @@ -28,8 +28,8 @@ return null } - var testResult = this.options.allowNegative ? - /^\-?[0-9]*$/.test(string) : + var testResult = this.options.allowNegative ? + /^\-?[0-9]*$/.test(string) : /^[0-9]*$/.test(string) if (!testResult) { @@ -43,5 +43,5 @@ return this.doCommonChecks(parseInt(string)) } - $.oc.inspector.validators.integer = IntegerValidator + $.wn.inspector.validators.integer = IntegerValidator }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.validator.length.js b/modules/system/assets/ui/js/inspector.validator.length.js index f23b26516..b39f5dadf 100644 --- a/modules/system/assets/ui/js/inspector.validator.length.js +++ b/modules/system/assets/ui/js/inspector.validator.length.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.validators.base, + var Base = $.wn.inspector.validators.base, BaseProto = Base.prototype var LengthValidator = function(options) { @@ -68,5 +68,5 @@ return result } - $.oc.inspector.validators.length = LengthValidator + $.wn.inspector.validators.length = LengthValidator }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.validator.regex.js b/modules/system/assets/ui/js/inspector.validator.regex.js index 6585fa784..903ac99ec 100644 --- a/modules/system/assets/ui/js/inspector.validator.regex.js +++ b/modules/system/assets/ui/js/inspector.validator.regex.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.validators.base, + var Base = $.wn.inspector.validators.base, BaseProto = Base.prototype var RegexValidator = function(options) { @@ -37,5 +37,5 @@ return regexObj.test(string) ? null : this.getMessage() } - $.oc.inspector.validators.regex = RegexValidator + $.wn.inspector.validators.regex = RegexValidator }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.validator.required.js b/modules/system/assets/ui/js/inspector.validator.required.js index 08262b305..7d8341aac 100644 --- a/modules/system/assets/ui/js/inspector.validator.required.js +++ b/modules/system/assets/ui/js/inspector.validator.required.js @@ -3,7 +3,7 @@ */ +function ($) { "use strict"; - var Base = $.oc.inspector.validators.base, + var Base = $.wn.inspector.validators.base, BaseProto = Base.prototype var RequiredValidator = function(options) { @@ -31,5 +31,5 @@ return $.trim(String(value)).length > 0 ? null : this.getMessage() } - $.oc.inspector.validators.required = RequiredValidator + $.wn.inspector.validators.required = RequiredValidator }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.wrapper.base.js b/modules/system/assets/ui/js/inspector.wrapper.base.js index ed80fa92e..9d5dc01b4 100644 --- a/modules/system/assets/ui/js/inspector.wrapper.base.js +++ b/modules/system/assets/ui/js/inspector.wrapper.base.js @@ -6,16 +6,16 @@ // NAMESPACES // ============================ - if ($.oc.inspector === undefined) - $.oc.inspector = {} + if ($.wn.inspector === undefined) + $.wn.inspector = {} - if ($.oc.inspector.wrappers === undefined) - $.oc.inspector.wrappers = {} + if ($.wn.inspector.wrappers === undefined) + $.wn.inspector.wrappers = {} // CLASS DEFINITION // ============================ - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype var BaseWrapper = function($element, sourceWrapper, options) { @@ -37,7 +37,7 @@ this.surface = null this.title = null this.description = null - } + } else { this.surface = sourceWrapper.surface this.title = sourceWrapper.title @@ -124,11 +124,11 @@ options.enableExternalParameterEditor = this.isExternalParametersEditorEnabled() options.onGetInspectableElement = this.proxy(this.onGetInspectableElement) - this.surface = new $.oc.inspector.surface( + this.surface = new $.wn.inspector.surface( containerElement, properties, values, - $.oc.inspector.helpers.generateElementUniqueId(this.$element.get(0)), + $.wn.inspector.helpers.generateElementUniqueId(this.$element.get(0)), options) } @@ -186,8 +186,8 @@ // Important - values contained in data-property-xxx attributes are // considered strings and never parsed with JSON. The use of the // data-property-xxx attributes is very limited - they're only - // used in Pages for creating snippets from partials, where properties - // are created with a table UI widget, which doesn't allow creating + // used in Pages for creating snippets from partials, where properties + // are created with a table UI widget, which doesn't allow creating // properties of any complex types. // // There is no a technically reliable way to determine when a string @@ -208,8 +208,8 @@ BaseWrapper.prototype.applyValues = function(liveUpdateMode) { var $valuesField = this.getElementValuesInput(), - values = liveUpdateMode ? - this.surface.getValidValues() : + values = liveUpdateMode ? + this.surface.getValidValues() : this.surface.getValues() if (liveUpdateMode) { @@ -219,12 +219,12 @@ var existingValues = this.loadValues(this.configuration) for (var property in values) { - if (values[property] !== $.oc.inspector.invalidProperty) { + if (values[property] !== $.wn.inspector.invalidProperty) { existingValues[property] = values[property] } } - // Properties that use settings like ignoreIfPropertyEmpty could + // Properties that use settings like ignoreIfPropertyEmpty could // be removed from the list returned by getValidValues(). Removed // properties should be removed from the result list. @@ -242,7 +242,7 @@ if ($valuesField.length > 0) { $valuesField.val(JSON.stringify(values)) - } + } else { for (var property in values) { var value = values[property] @@ -255,7 +255,7 @@ } } - // In the live update mode the livechange event is triggered + // In the live update mode the livechange event is triggered // regardless of whether Surface properties match or don't match // the original properties of the inspectable element. Without it // there could be undesirable side effects. @@ -321,13 +321,13 @@ data = this.$element.data(), self = this - $.oc.stripeLoadIndicator.show() + $.wn.stripeLoadIndicator.show() $form.request('onGetInspectorConfiguration', { data: data }).done(function inspectorConfigurationRequestDoneClosure(data) { self.onConfigurartionRequestDone(data, result) }).always(function() { - $.oc.stripeLoadIndicator.hide() + $.wn.stripeLoadIndicator.hide() }) } @@ -408,5 +408,5 @@ containerSupported: false } - $.oc.inspector.wrappers.base = BaseWrapper + $.wn.inspector.wrappers.base = BaseWrapper }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.wrapper.container.js b/modules/system/assets/ui/js/inspector.wrapper.container.js index 3d5c226a5..b2821ca6e 100644 --- a/modules/system/assets/ui/js/inspector.wrapper.container.js +++ b/modules/system/assets/ui/js/inspector.wrapper.container.js @@ -6,7 +6,7 @@ // CLASS DEFINITION // ============================ - var Base = $.oc.inspector.wrappers.base, + var Base = $.wn.inspector.wrappers.base, BaseProto = Base.prototype var InspectorContainer = function($element, surface, options) { @@ -89,7 +89,7 @@ closeButton = document.createElement('span') container.setAttribute('class', 'inspector-header') - detachButton.setAttribute('class', 'oc-icon-external-link-square detach') + detachButton.setAttribute('class', 'wn-icon-external-link-square detach') closeButton.setAttribute('class', 'close') header.textContent = this.title @@ -136,9 +136,9 @@ this.options.container.get(0).appendChild(layout) - $.oc.foundation.controlUtils.markDisposable(layout) + $.wn.foundation.controlUtils.markDisposable(layout) this.registerLayoutHandlers(layout) - + return { headContainer: headRow, bodyContainer: bodyRow @@ -238,8 +238,8 @@ } InspectorContainer.prototype.onDetach = function() { - $.oc.inspector.manager.switchToPopup(this) + $.wn.inspector.manager.switchToPopup(this) } - $.oc.inspector.wrappers.container = InspectorContainer + $.wn.inspector.wrappers.container = InspectorContainer }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/inspector.wrapper.popup.js b/modules/system/assets/ui/js/inspector.wrapper.popup.js index 4a4c32bab..8f21cd998 100644 --- a/modules/system/assets/ui/js/inspector.wrapper.popup.js +++ b/modules/system/assets/ui/js/inspector.wrapper.popup.js @@ -6,7 +6,7 @@ // CLASS DEFINITION // ============================ - var Base = $.oc.inspector.wrappers.base, + var Base = $.wn.inspector.wrappers.base, BaseProto = Base.prototype var InspectorPopup = function($element, surface, options) { @@ -77,7 +77,7 @@ offsetX = this.$element.data('inspector-offset-x'), offsetY = this.$element.data('inspector-offset-y'), placement = this.$element.data('inspector-placement'), - fallbackPlacement = this.$element.data('inspector-fallback-placement') + fallbackPlacement = this.$element.data('inspector-fallback-placement') if (offset === undefined) { offset = 15 @@ -117,7 +117,7 @@ } if (this.options.containerSupported) { - var moveToContainerButton = $('') + var moveToContainerButton = $('') this.$popoverContainer.find('.popover-head').append(moveToContainerButton) } @@ -210,8 +210,8 @@ } InspectorPopup.prototype.onMoveToContainer = function() { - $.oc.inspector.manager.switchToContainer(this) + $.wn.inspector.manager.switchToContainer(this) } - $.oc.inspector.wrappers.popup = InspectorPopup + $.wn.inspector.wrappers.popup = InspectorPopup }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/list.sortable.js b/modules/system/assets/ui/js/list.sortable.js index 534115f3d..2c92b92b0 100644 --- a/modules/system/assets/ui/js/list.sortable.js +++ b/modules/system/assets/ui/js/list.sortable.js @@ -1,14 +1,14 @@ /* * Sortable plugin. - * + * * Status: experimental. The behavior is not perfect, but it's OK in terms of memory * usage and disposing. * - * This is a lightweight, October-style implementation of the drag & drop sorting + * This is a lightweight, Winter-style implementation of the drag & drop sorting * functionality. The plugin uses only HTML5 Drag&Drop feature and completely * disposable. * - * During the dragging the plugin creates a placeholder element, which should be + * During the dragging the plugin creates a placeholder element, which should be * styled separately. * * Draggable elements should be marked with "draggable" HTML5 attribute. @@ -18,7 +18,7 @@ * [x] Sorting a single list. * [ ] Dragging items between multiple lists. * [ ] Sorting nested lists. - + * JAVASCRIPT API * * $('#list').listSortable({}) @@ -29,7 +29,7 @@ *
    *
  • ...
    • * - * Multiple lists will not support this option and the plugin should be created + * Multiple lists will not support this option and the plugin should be created * and updated by a caller code. * * Options: @@ -42,7 +42,7 @@ +function ($) { "use strict"; - var Base = $.oc.foundation.base, + var Base = $.wn.foundation.base, BaseProto = Base.prototype, listSortableIdCounter = 0, elementsIdCounter = 0 @@ -55,7 +55,7 @@ Base.call(this) - $.oc.foundation.controlUtils.markDisposable(element) + $.wn.foundation.controlUtils.markDisposable(element) this.init() this.addList(element) @@ -152,7 +152,7 @@ } ListSortable.prototype.isDragStartAllowed = function(element) { - // TODO: if handle selector is specified - test if + // TODO: if handle selector is specified - test if // the element is a handle. return true @@ -189,7 +189,7 @@ ListSortable.prototype.removePlaceholders = function() { for (var i=this.lists.length-1; i >= 0; i--) { - var list = this.lists[i], + var list = this.lists[i], placeholders = list.querySelectorAll('.list-sortable-placeholder') for (var j=placeholders.length-1; j >= 0; j--) { @@ -251,8 +251,8 @@ } ListSortable.prototype.getPlaceholderPlacement = function(hoverElement, ev) { - var mousePosition = $.oc.foundation.event.pageCoordinates(ev), - elementPosition = $.oc.foundation.element.absolutePosition(hoverElement) + var mousePosition = $.wn.foundation.event.pageCoordinates(ev), + elementPosition = $.wn.foundation.element.absolutePosition(hoverElement) if (this.options.direction == 'vertical') { var elementCenter = elementPosition.top + hoverElement.offsetHeight/2 @@ -267,7 +267,7 @@ } ListSortable.prototype.lastMousePositionChanged = function(ev) { - var mousePosition = $.oc.foundation.event.pageCoordinates(ev.originalEvent) + var mousePosition = $.wn.foundation.event.pageCoordinates(ev.originalEvent) if (this.lastMousePosition === null || this.lastMousePosition.x != mousePosition.x || this.lastMousePosition.y != mousePosition.y) { this.lastMousePosition = mousePosition @@ -278,10 +278,10 @@ } ListSortable.prototype.mouseOutsideLists = function(ev) { - var mousePosition = $.oc.foundation.event.pageCoordinates(ev) + var mousePosition = $.wn.foundation.event.pageCoordinates(ev) for (var i=this.lists.length-1; i >= 0; i--) { - if ($.oc.foundation.element.elementContainsPoint(this.lists[i], mousePosition)) { + if ($.wn.foundation.element.elementContainsPoint(this.lists[i], mousePosition)) { return false } } @@ -320,9 +320,9 @@ // the dragend for removing the placeholders because dragend // is triggered before drop, but we need placeholder to exists // in the drop handler. - // + // // Mouse events are suppressed during the drag and drop operations, - // so we only need to handle it once (but we still must the handler + // so we only need to handle it once (but we still must the handler // explicitly). $(document).on('mousemove', this.proxy(this.onDocumentMouseMove)) @@ -436,7 +436,7 @@ $this.data('oc.listSortable', (data = new ListSortable(this, options))) } - if (typeof option == 'string' && data) { + if (typeof option == 'string' && data) { if (data[option]) { var methodArguments = Array.prototype.slice.call(args) // Clone the arguments array methodArguments.shift() diff --git a/modules/system/assets/ui/js/loader.cursor.js b/modules/system/assets/ui/js/loader.cursor.js index e23164765..1c32b4738 100644 --- a/modules/system/assets/ui/js/loader.cursor.js +++ b/modules/system/assets/ui/js/loader.cursor.js @@ -4,11 +4,11 @@ * Displays the animated loading indicator following the mouse cursor. * * JavaScript API: - * $.oc.cursorLoadIndicator.show(event) - * $.oc.cursorLoadIndicator.hide() + * $.wn.cursorLoadIndicator.show(event) + * $.wn.cursorLoadIndicator.hide() * * By default if the show() method has been called several times, the hide() method should be - * called the same number of times in order to hide the cursor. Use hide(true) to hide the + * called the same number of times in order to hide the cursor. Use hide(true) to hide the * indicator forcibly. * * The event parameter in the show() method is optional. If it is passed, the initial cursor position @@ -18,8 +18,10 @@ * - modernizr/modernizr */ +function ($) { "use strict"; + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn var CursorLoadIndicator = function () { if (Modernizr.touchevents) @@ -72,17 +74,17 @@ } $(document).ready(function() { - $.oc.cursorLoadIndicator = new CursorLoadIndicator(); + $.wn.cursorLoadIndicator = new CursorLoadIndicator(); }) // CURSORLOADINDICATOR DATA-API // ============== - + $(document) .on('ajaxPromise', '[data-cursor-load-indicator]', function() { - $.oc.cursorLoadIndicator.show() + $.wn.cursorLoadIndicator.show() }).on('ajaxFail ajaxDone', '[data-cursor-load-indicator]', function() { - $.oc.cursorLoadIndicator.hide() + $.wn.cursorLoadIndicator.hide() }) }(window.jQuery); \ No newline at end of file diff --git a/modules/system/assets/ui/js/loader.stripe.js b/modules/system/assets/ui/js/loader.stripe.js index 5af041def..1d3f7d7da 100644 --- a/modules/system/assets/ui/js/loader.stripe.js +++ b/modules/system/assets/ui/js/loader.stripe.js @@ -4,16 +4,18 @@ * Displays the animated loading indicator stripe at the top of the page. * * JavaScript API: - * $.oc.stripeLoadIndicator.show(event) - * $.oc.stripeLoadIndicator.hide() + * $.wn.stripeLoadIndicator.show(event) + * $.wn.stripeLoadIndicator.hide() * * By default if the show() method has been called several times, the hide() method should be - * called the same number of times in order to hide the stripe. Use hide(true) to hide the + * called the same number of times in order to hide the stripe. Use hide(true) to hide the * indicator forcibly. */ +function ($) { "use strict"; + if ($.wn === undefined) + $.wn = {} if ($.oc === undefined) - $.oc = {} + $.oc = $.wn var StripeLoadIndicator = function () { var self = this @@ -70,7 +72,7 @@ } } - $.oc.stripeLoadIndicator = new StripeLoadIndicator() + $.wn.stripeLoadIndicator = new StripeLoadIndicator() // STRIPE LOAD INDICATOR DATA-API // ============== @@ -81,18 +83,18 @@ // element, for example a tag wrapping a
\
\
\ - \ - \
\ @@ -3257,9 +3267,9 @@ if(lastValue!==undefined&&lastValue==thisValue){return} $el.data('oc.lastvalue',thisValue) if(self.lastDataTrackInputRequest){self.lastDataTrackInputRequest.abort()} var data={scopeName:self.activeScopeName,search:thisValue} -$.oc.stripeLoadIndicator.show() +$.wn.stripeLoadIndicator.show() self.lastDataTrackInputRequest=self.$el.request(self.options.optionsHandler,{data:data}).success(function(data){self.filterAvailable(self.activeScopeName,data.options.available) -self.toggleFilterButtons()}).always(function(){$.oc.stripeLoadIndicator.hide()})},300)} +self.toggleFilterButtons()}).always(function(){$.wn.stripeLoadIndicator.hide()})},300)} var old=$.fn.filterWidget $.fn.filterWidget=function(option){var args=arguments,result this.each(function(){var $this=$(this) @@ -3602,8 +3612,10 @@ $(document).on('ajaxPromise','[data-load-indicator]',function(){var indicatorContainer=$(this).closest('.loading-indicator-container'),loadingText=$(this).data('load-indicator'),options={opaque:$(this).data('load-indicator-opaque'),centered:$(this).data('load-indicator-centered'),size:$(this).data('load-indicator-size')} if(loadingText) options.text=loadingText -indicatorContainer.loadIndicator(options)}).on('ajaxFail ajaxDone','[data-load-indicator]',function(){$(this).closest('.loading-indicator-container').loadIndicator('hide')})}(window.jQuery);+function($){"use strict";if($.oc===undefined) -$.oc={} +indicatorContainer.loadIndicator(options)}).on('ajaxFail ajaxDone','[data-load-indicator]',function(){$(this).closest('.loading-indicator-container').loadIndicator('hide')})}(window.jQuery);+function($){"use strict";if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn var CursorLoadIndicator=function(){if(Modernizr.touchevents) return this.counter=0 @@ -3624,9 +3636,11 @@ if(force!==undefined&&force) this.counter=0 if(this.counter<=0){this.indicator.addClass('hide') $(window).off('.cursorLoadIndicator');}} -$(document).ready(function(){$.oc.cursorLoadIndicator=new CursorLoadIndicator();}) -$(document).on('ajaxPromise','[data-cursor-load-indicator]',function(){$.oc.cursorLoadIndicator.show()}).on('ajaxFail ajaxDone','[data-cursor-load-indicator]',function(){$.oc.cursorLoadIndicator.hide()})}(window.jQuery);+function($){"use strict";if($.oc===undefined) -$.oc={} +$(document).ready(function(){$.wn.cursorLoadIndicator=new CursorLoadIndicator();}) +$(document).on('ajaxPromise','[data-cursor-load-indicator]',function(){$.wn.cursorLoadIndicator.show()}).on('ajaxFail ajaxDone','[data-cursor-load-indicator]',function(){$.wn.cursorLoadIndicator.hide()})}(window.jQuery);+function($){"use strict";if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn var StripeLoadIndicator=function(){var self=this this.counter=0 this.indicator=this.makeIndicator() @@ -3647,13 +3661,13 @@ if(this.counter<=0){this.indicator.addClass('loaded') $(document.body).removeClass('loading') var self=this this.animationTimer=window.setTimeout(function(){self.indicator.hide()},1000)}} -$.oc.stripeLoadIndicator=new StripeLoadIndicator() +$.wn.stripeLoadIndicator=new StripeLoadIndicator() $(document).on('ajaxPromise','[data-stripe-load-indicator]',function(event){event.stopPropagation() -$.oc.stripeLoadIndicator.show() +$.wn.stripeLoadIndicator.show() var $el=$(this) $(window).one('ajaxUpdateComplete',function(){if($el.closest('html').length===0) -$.oc.stripeLoadIndicator.hide()})}).on('ajaxFail ajaxDone','[data-stripe-load-indicator]',function(event){event.stopPropagation() -$.oc.stripeLoadIndicator.hide()})}(window.jQuery);+function($){"use strict";var Popover=function(element,options){var $el=this.$el=$(element);this.options=options||{};this.arrowSize=15 +$.wn.stripeLoadIndicator.hide()})}).on('ajaxFail ajaxDone','[data-stripe-load-indicator]',function(event){event.stopPropagation() +$.wn.stripeLoadIndicator.hide()})}(window.jQuery);+function($){"use strict";var Popover=function(element,options){var $el=this.$el=$(element);this.options=options||{};this.arrowSize=15 this.docClickHandler=null this.show()} Popover.prototype.hide=function(){var e=$.Event('hiding.oc.popover',{relatedTarget:this.$el}) @@ -3664,7 +3678,7 @@ this.$container.removeClass('in') if(this.$overlay)this.$overlay.removeClass('in') this.disposeControls() $.support.transition&&this.$container.hasClass('fade')?this.$container.one($.support.transition.end,$.proxy(this.hidePopover,this)).emulateTransitionEnd(300):this.hidePopover()} -Popover.prototype.disposeControls=function(){if(this.$container){$.oc.foundation.controlUtils.disposeControls(this.$container.get(0))}} +Popover.prototype.disposeControls=function(){if(this.$container){$.wn.foundation.controlUtils.disposeControls(this.$container.get(0))}} Popover.prototype.hidePopover=function(){this.$container.remove();if(this.$overlay)this.$overlay.remove() this.$el.removeClass('popover-highlight') this.$el.trigger('hide.oc.popover') @@ -3775,7 +3789,7 @@ $.fn.ocPopover.Constructor=Popover $.fn.ocPopover.noConflict=function(){$.fn.ocPopover=old return this} $(document).on('click','[data-control=popover]',function(e){$(this).ocPopover() -return false;})}(window.jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype +return false;})}(window.jQuery);+function($){"use strict";var Base=$.wn.foundation.base,BaseProto=Base.prototype var Popup=function(element,options){this.options=options this.$el=$(element) this.$container=null @@ -3789,7 +3803,7 @@ this.$container=this.createPopupContainer() this.$content=this.$container.find('.modal-content:first') this.$dialog=this.$container.find('.modal-dialog:first') this.$modal=this.$container.modal({show:false,backdrop:false,keyboard:this.options.keyboard}) -$.oc.foundation.controlUtils.markDisposable(element) +$.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.initEvents() this.init()} @@ -3951,9 +3965,11 @@ var tooltipWidth=$tooltip.outerWidth() if((x+tooltipWidth)>$(window).width()) x=$(window).width()-tooltipWidth-10;$tooltip.css({top:y,left:x,visibility:'visible'});} ChartUtils.prototype.hideTooltip=function(){$('#chart-tooltip').remove()} +if($.wn===undefined) +$.wn={} if($.oc===undefined) -$.oc={} -$.oc.chartUtils=new ChartUtils();}(window.jQuery);+function($){"use strict";var ChartLine=function(element,options){var self=this +$.oc=$.wn +$.wn.chartUtils=new ChartUtils();}(window.jQuery);+function($){"use strict";var ChartLine=function(element,options){var self=this this.chartOptions={xaxis:{mode:"time",tickLength:5},selection:{mode:"x"},grid:{markingsColor:"rgba(0,0,0, 0.02)",backgroundColor:{colors:["#fff","#fff"]},borderColor:"#7bafcc",borderWidth:0,color:"#ddd",hoverable:true,clickable:true,labelMargin:10},series:{lines:{show:true,fill:true},points:{show:true}},tooltip:true,tooltipOpts:{defaultTheme:false,content:"%x: %y",dateFormat:"%y-%0m-%0d",shifts:{x:10,y:20}},legend:{show:true,noColumns:2}} this.defaultDataSetOptions={shadowSize:0} var parsedOptions={} @@ -3993,16 +4009,16 @@ ChartLine.prototype.clearZoom=function(){this.rebuildChart() this.resetZoomLink.hide()} var old=$.fn.chartLine $.fn.chartLine=function(option){return this.each(function(){var $this=$(this) -var data=$this.data('october.chartLine') +var data=$this.data('winter.chartLine') var options=$.extend({},ChartLine.DEFAULTS,$this.data(),typeof option=='object'&&option) -if(!data)$this.data('october.chartLine',(data=new ChartLine(this,options))) +if(!data)$this.data('winter.chartLine',(data=new ChartLine(this,options))) if(typeof option=='string')data[option].call($this)})} $.fn.chartLine.Constructor=ChartLine $.fn.chartLine.noConflict=function(){$.fn.chartLine=old return this} $(document).render(function(){$('[data-control="chart-line"]').chartLine()})}(window.jQuery);+function($){"use strict";var BarChart=function(element,options){this.options=options||{} var -$el=this.$el=$(element),size=this.size=$el.height(),self=this,values=$.oc.chartUtils.loadListValues($('ul',$el)),$legend=$.oc.chartUtils.createLegend($('ul',$el)),indicators=$.oc.chartUtils.initLegendColorIndicators($legend),isFullWidth=this.isFullWidth(),chartHeight=this.options.height!==undefined?this.options.height:size,chartWidth=isFullWidth?this.$el.width():size,barWidth=(chartWidth-(values.values.length-1)*this.options.gap)/values.values.length +$el=this.$el=$(element),size=this.size=$el.height(),self=this,values=$.wn.chartUtils.loadListValues($('ul',$el)),$legend=$.wn.chartUtils.createLegend($('ul',$el)),indicators=$.wn.chartUtils.initLegendColorIndicators($legend),isFullWidth=this.isFullWidth(),chartHeight=this.options.height!==undefined?this.options.height:size,chartWidth=isFullWidth?this.$el.width():size,barWidth=(chartWidth-(values.values.length-1)*this.options.gap)/values.values.length var $canvas=$('
').addClass('canvas').height(chartHeight).width(isFullWidth?'100%':chartWidth) $el.prepend($canvas) $el.toggleClass('full-width',isFullWidth) @@ -4010,11 +4026,11 @@ Raphael($canvas.get(0),isFullWidth?'100%':chartWidth,chartHeight,function(){self self.bars=this.set() self.paper.customAttributes.bar=function(start,height){return{path:[["M",start,chartHeight],["L",start,chartHeight-height],["L",start+barWidth,chartHeight-height],["L",start+barWidth,chartHeight],["Z"]]}} var start=0 -$.each(values.values,function(index,valueInfo){var color=valueInfo.color!==undefined?valueInfo.color:$.oc.chartUtils.getColor(index),path=self.paper.path().attr({"stroke-width":0}).attr({bar:[start,0]}).attr({fill:color}) +$.each(values.values,function(index,valueInfo){var color=valueInfo.color!==undefined?valueInfo.color:$.wn.chartUtils.getColor(index),path=self.paper.path().attr({"stroke-width":0}).attr({bar:[start,0]}).attr({fill:color}) self.bars.push(path) indicators[index].css('background-color',color) start+=barWidth+self.options.gap -path.hover(function(ev){$.oc.chartUtils.showTooltip(ev.pageX,ev.pageY,$.trim($.oc.chartUtils.getLegendLabel($legend,index))+': '+valueInfo.value+'')},function(){$.oc.chartUtils.hideTooltip()})}) +path.hover(function(ev){$.wn.chartUtils.showTooltip(ev.pageX,ev.pageY,$.trim($.wn.chartUtils.getLegendLabel($legend,index))+': '+valueInfo.value+'')},function(){$.wn.chartUtils.hideTooltip()})}) start=0 $.each(values.values,function(index,valueInfo){var height=(values.max&&valueInfo.value)?chartHeight/values.max*valueInfo.value:0 self.bars[index].animate({bar:[start,height]},1000,"bounce") @@ -4039,7 +4055,7 @@ return this} $(document).render(function(){$('[data-control=chart-bar]').barChart()})}(window.jQuery) +function($){"use strict";var PieChart=function(element,options){this.options=options||{} var -$el=this.$el=$(element),size=this.size=(this.options.size!==undefined?this.options.size:$el.height()),outerRadius=size/2-1,innerRadius=outerRadius-outerRadius/3.5,values=$.oc.chartUtils.loadListValues($('ul',$el)),$legend=$.oc.chartUtils.createLegend($('ul',$el)),indicators=$.oc.chartUtils.initLegendColorIndicators($legend),self=this +$el=this.$el=$(element),size=this.size=(this.options.size!==undefined?this.options.size:$el.height()),outerRadius=size/2-1,innerRadius=outerRadius-outerRadius/3.5,values=$.wn.chartUtils.loadListValues($('ul',$el)),$legend=$.wn.chartUtils.createLegend($('ul',$el)),indicators=$.wn.chartUtils.initLegendColorIndicators($legend),self=this var $canvas=$('
').addClass('canvas').width(size).height(size) $el.prepend($canvas) Raphael($canvas.get(0),size,size,function(){self.paper=this @@ -4047,11 +4063,11 @@ self.segments=this.set() self.paper.customAttributes.segment=function(startAngle,endAngle){var p1=self.arcCoords(outerRadius,startAngle),p2=self.arcCoords(outerRadius,endAngle),p3=self.arcCoords(innerRadius,endAngle),p4=self.arcCoords(innerRadius,startAngle),flag=(endAngle-startAngle)>180,path=[["M",p1.x,p1.y],["A",outerRadius,outerRadius,0,+flag,0,p2.x,p2.y],["L",p3.x,p3.y],["A",innerRadius,innerRadius,0,+flag,1,p4.x,p4.y],["Z"]] return{path:path}} -self.paper.circle(size/2,size/2,innerRadius+(outerRadius-innerRadius)/2).attr({"stroke-width":outerRadius-innerRadius-0.5}).attr({stroke:$.oc.chartUtils.defaultValueColor}) -$.each(values.values,function(index,valueInfo){var color=valueInfo.color!==undefined?valueInfo.color:$.oc.chartUtils.getColor(index),path=self.paper.path().attr({"stroke-width":0}).attr({segment:[0,0]}).attr({fill:color}) +self.paper.circle(size/2,size/2,innerRadius+(outerRadius-innerRadius)/2).attr({"stroke-width":outerRadius-innerRadius-0.5}).attr({stroke:$.wn.chartUtils.defaultValueColor}) +$.each(values.values,function(index,valueInfo){var color=valueInfo.color!==undefined?valueInfo.color:$.wn.chartUtils.getColor(index),path=self.paper.path().attr({"stroke-width":0}).attr({segment:[0,0]}).attr({fill:color}) self.segments.push(path) indicators[index].css('background-color',color) -path.hover(function(ev){$.oc.chartUtils.showTooltip(ev.pageX,ev.pageY,$.trim($.oc.chartUtils.getLegendLabel($legend,index))+': '+valueInfo.value+'')},function(){$.oc.chartUtils.hideTooltip()})}) +path.hover(function(ev){$.wn.chartUtils.showTooltip(ev.pageX,ev.pageY,$.trim($.wn.chartUtils.getLegendLabel($legend,index))+': '+valueInfo.value+'')},function(){$.wn.chartUtils.hideTooltip()})}) var start=self.options.startAngle $.each(values.values,function(index,valueInfo){var length=(values.total&&valueInfo.value)?360/values.total*valueInfo.value:0 if(length==360) @@ -4122,10 +4138,10 @@ else if(typeof option=='string')data[option].apply(data,args)})} $.fn.rowLink.Constructor=RowLink $.fn.rowLink.noConflict=function(){$.fn.rowLink=old return this} -$(document).render(function(){$('[data-control="rowlink"]').rowLink()})}(window.jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype +$(document).render(function(){$('[data-control="rowlink"]').rowLink()})}(window.jQuery);+function($){"use strict";var Base=$.wn.foundation.base,BaseProto=Base.prototype var ChangeMonitor=function(element,options){this.$el=$(element);this.paused=false this.options=options||{} -$.oc.foundation.controlUtils.markDisposable(element) +$.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init()} ChangeMonitor.prototype=Object.create(BaseProto) @@ -4185,14 +4201,14 @@ if(!data)$this.data('oc.changeMonitor',(data=new ChangeMonitor(this,options)))}) $.fn.changeMonitor.Constructor=ChangeMonitor $.fn.changeMonitor.noConflict=function(){$.fn.changeMonitor=old return this} -$(document).render(function(){$('[data-change-monitor]').changeMonitor()})}(window.jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype +$(document).render(function(){$('[data-change-monitor]').changeMonitor()})}(window.jQuery);+function($){"use strict";var Base=$.wn.foundation.base,BaseProto=Base.prototype var HotKey=function(element,options){if(!options.hotkey){throw new Error('No hotkey has been defined.');} this.$el=$(element) this.$target=$(options.hotkeyTarget) this.options=options||{} this.keyConditions=[] this.keyMap=null -$.oc.foundation.controlUtils.markDisposable(element) +$.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init()} HotKey.prototype=Object.create(BaseProto) @@ -4418,11 +4434,11 @@ return result?result:this} $.fn.dragValue.Constructor=DragValue $.fn.dragValue.noConflict=function(){$.fn.dragValue=old return this} -$(document).render(function(){$('[data-control="dragvalue"]').dragValue()});}(window.jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype +$(document).render(function(){$('[data-control="dragvalue"]').dragValue()});}(window.jQuery);+function($){"use strict";var Base=$.wn.foundation.base,BaseProto=Base.prototype var Sortable=function(element,options){this.$el=$(element) this.options=options||{} this.cursorAdjustment=null -$.oc.foundation.controlUtils.markDisposable(element) +$.wn.foundation.controlUtils.markDisposable(element) Base.call(this) this.init()} Sortable.prototype=Object.create(BaseProto) @@ -4474,7 +4490,7 @@ if(!data)$this.data('oc.sortable',(data=new Sortable(this,options))) if(typeof option=='string')data[option].apply(data,args)})} $.fn.sortable.Constructor=Sortable $.fn.sortable.noConflict=function(){$.fn.sortable=old -return this}}(window.jQuery);+function($){"use strict";var Base=$.oc.foundation.base,BaseProto=Base.prototype +return this}}(window.jQuery);+function($){"use strict";var Base=$.wn.foundation.base,BaseProto=Base.prototype var DragScroll=function(element,options){this.options=$.extend({},DragScroll.DEFAULTS,options) var $el=$(element),el=$el.get(0),dragStart=0,startOffset=0,self=this,dragging=false,eventElementName=this.options.vertical?'pageY':'pageX',isNative=this.options.useNative&&$('html').hasClass('mobile');this.el=$el @@ -4673,7 +4689,7 @@ var e=$.Event('beforeClose.oc.tab',{relatedTarget:$pane}) this.$el.trigger(e) if(e.isDefaultPrevented()) return -$.oc.foundation.controlUtils.disposeControls($pane.get(0)) +$.wn.foundation.controlUtils.disposeControls($pane.get(0)) $pane.remove() $tab.remove() if(isActive) @@ -4766,15 +4782,17 @@ $(window).on('ajaxInvalidField',function(event,element,name,messages,isFirst){if event.preventDefault() var $el=$(element) $el.closest('[data-control=tab]').ocTab('goToElement',$el) -$el.focus()})}(window.jQuery);+function($){"use strict";if($.oc===undefined) -$.oc={} -if($.oc.inspector===undefined) -$.oc.inspector={} -var Base=$.oc.foundation.base,BaseProto=Base.prototype +$el.focus()})}(window.jQuery);+function($){"use strict";if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn +if($.wn.inspector===undefined) +$.wn.inspector={} +var Base=$.wn.foundation.base,BaseProto=Base.prototype var Surface=function(containerElement,properties,values,inspectorUniqueId,options,parentSurface,group,propertyName){if(inspectorUniqueId===undefined){throw new Error('Inspector surface unique ID should be defined.')} this.options=$.extend({},Surface.DEFAULTS,typeof options=='object'&&options) this.rawProperties=properties -this.parsedProperties=$.oc.inspector.engine.processPropertyGroups(properties) +this.parsedProperties=$.wn.inspector.engine.processPropertyGroups(properties) this.container=containerElement this.inspectorUniqueId=inspectorUniqueId this.values=values!==null?values:{} @@ -4789,7 +4807,7 @@ this.tableContainer=null this.groupManager=null this.group=null if(group!==undefined){this.group=group} -if(!this.parentSurface){this.groupManager=new $.oc.inspector.groupManager(this.inspectorUniqueId)} +if(!this.parentSurface){this.groupManager=new $.wn.inspector.groupManager(this.inspectorUniqueId)} Base.call(this) this.init()} Surface.prototype=Object.create(BaseProto) @@ -4817,7 +4835,7 @@ this.group=null BaseProto.dispose.call(this)} Surface.prototype.init=function(){if(this.groupManager&&!this.group){this.group=this.groupManager.createGroup('root')} this.build() -if(!this.parentSurface){$.oc.foundation.controlUtils.markDisposable(this.tableContainer)} +if(!this.parentSurface){$.wn.foundation.controlUtils.markDisposable(this.tableContainer)} this.registerHandlers()} Surface.prototype.registerHandlers=function(){if(!this.parentSurface){$(this.tableContainer).one('dispose-control',this.proxy(this.dispose)) $(this.tableContainer).on('click','tr.group, tr.control-group',this.proxy(this.onGroupClick)) @@ -4827,8 +4845,8 @@ $(this.tableContainer).off('click','tr.group, tr.control-group',this.proxy(this. $(this.tableContainer).off('focus-control',this.proxy(this.focusFirstEditor))}} Surface.prototype.build=function(){this.tableContainer=document.createElement('div') var dataTable=document.createElement('table'),tbody=document.createElement('tbody') -$.oc.foundation.element.addClass(dataTable,'inspector-fields') -if(this.parsedProperties.hasGroups){$.oc.foundation.element.addClass(dataTable,'has-groups')} +$.wn.foundation.element.addClass(dataTable,'inspector-fields') +if(this.parsedProperties.hasGroups){$.wn.foundation.element.addClass(dataTable,'has-groups')} var currentGroup=this.group for(var i=0,len=this.parsedProperties.properties.length;i=0;i--){var row=groups[i].findGroupRow(table) if(row){this.toggleGroup(row,true)}}} Surface.prototype.expandOrCollapseRows=function(rows,collapse,duration,noAnimation){var row=rows.pop(),self=this -if(row){if(!noAnimation){setTimeout(function toggleRow(){$.oc.foundation.element.toggleClass(row,'collapsed',collapse) -$.oc.foundation.element.toggleClass(row,'expanded',!collapse) +if(row){if(!noAnimation){setTimeout(function toggleRow(){$.wn.foundation.element.toggleClass(row,'collapsed',collapse) +$.wn.foundation.element.toggleClass(row,'expanded',!collapse) self.expandOrCollapseRows(rows,collapse,duration,noAnimation)},duration)} -else{$.oc.foundation.element.toggleClass(row,'collapsed',collapse) -$.oc.foundation.element.toggleClass(row,'expanded',!collapse) +else{$.wn.foundation.element.toggleClass(row,'collapsed',collapse) +$.wn.foundation.element.toggleClass(row,'expanded',!collapse) self.expandOrCollapseRows(rows,collapse,duration,noAnimation)}}} Surface.prototype.getGroupManager=function(){return this.getRootSurface().groupManager} Surface.prototype.buildEditor=function(row,property,dataTable,group){if(property.itemType!=='property'){return} @@ -4929,9 +4947,9 @@ this.validateEditorType(property.type) var cell=document.createElement('td'),type=property.type row.appendChild(cell) if(type===undefined){type='string'} -var editor=new $.oc.inspector.propertyEditors[type](this,property,cell,group) -if(editor.isGroupedEditor()){$.oc.foundation.element.addClass(dataTable,'has-groups') -$.oc.foundation.element.addClass(row,'control-group') +var editor=new $.wn.inspector.propertyEditors[type](this,property,cell,group) +if(editor.isGroupedEditor()){$.wn.foundation.element.addClass(dataTable,'has-groups') +$.wn.foundation.element.addClass(row,'control-group') this.applyGroupIndexAttribute(property,row,editor.group,true) this.buildGroupExpandControl(row.querySelector('span.title-element'),property,true,editor.hasChildSurface(),editor.group) if(cell.children.length==0){row.querySelector('th').setAttribute('colspan',2) @@ -4954,11 +4972,11 @@ Surface.prototype.notifyEditorsPropertyChanged=function(propertyPath,value){for( editor.onInspectorPropertyChanged(propertyPath,value) editor.notifyChildSurfacesPropertyChanged(propertyPath,value)}} Surface.prototype.makeCellActive=function(cell){var tbody=cell.parentNode.parentNode.parentNode,cells=tbody.querySelectorAll('tr td') -for(var i=0,len=cells.length;i0){result.properties=this.parseConfiguration($conf this.configurationLoaded(result) return} var $form=this.$element.closest('form'),data=this.$element.data(),self=this -$.oc.stripeLoadIndicator.show() -$form.request('onGetInspectorConfiguration',{data:data}).done(function inspectorConfigurationRequestDoneClosure(data){self.onConfigurartionRequestDone(data,result)}).always(function(){$.oc.stripeLoadIndicator.hide()})} +$.wn.stripeLoadIndicator.show() +$form.request('onGetInspectorConfiguration',{data:data}).done(function inspectorConfigurationRequestDoneClosure(data){self.onConfigurartionRequestDone(data,result)}).always(function(){$.wn.stripeLoadIndicator.hide()})} BaseWrapper.prototype.parseConfiguration=function(configuration){if(!$.isArray(configuration)&&!$.isPlainObject(configuration)){if($.trim(configuration)===0){return{}} try{return JSON.parse(configuration)} catch(err){throw new Error('Error parsing Inspector configuration. '+err)}} @@ -5216,7 +5234,7 @@ this.$element.trigger(hidingEvent,[{values:values}]) return!hidingEvent.isDefaultPrevented();} BaseWrapper.prototype.onGetInspectableElement=function(){return this.$element} BaseWrapper.DEFAULTS={containerSupported:false} -$.oc.inspector.wrappers.base=BaseWrapper}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.wrappers.base,BaseProto=Base.prototype +$.wn.inspector.wrappers.base=BaseWrapper}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.wrappers.base,BaseProto=Base.prototype var InspectorPopup=function($element,surface,options){this.$popoverContainer=null this.popoverObj=null this.cleaningUp=false @@ -5259,7 +5277,7 @@ this.popoverObj=this.$element.data('oc.popover') this.$popoverContainer=this.popoverObj.$container this.$popoverContainer.addClass('inspector-temporary-placement') if(this.options.inspectorCssClass!==undefined){this.$popoverContainer.addClass(this.options.inspectorCssClass)} -if(this.options.containerSupported){var moveToContainerButton=$('') +if(this.options.containerSupported){var moveToContainerButton=$('') this.$popoverContainer.find('.popover-head').append(moveToContainerButton)} this.$popoverContainer.find('[data-inspector-title]').text(this.title) this.$popoverContainer.find('[data-inspector-description]').text(this.description)} @@ -5294,8 +5312,8 @@ this.popoverObj.options.closeOnEsc=false} InspectorPopup.prototype.onPopupEditorHidden=function(){this.popoverObj.options.closeOnPageClick=true this.popoverObj.options.closeOnEsc=true} InspectorPopup.prototype.onCheckDocumentClickTarget=function(element){if($.contains(this.$element,element)||this.$element.get(0)===element){return true}} -InspectorPopup.prototype.onMoveToContainer=function(){$.oc.inspector.manager.switchToContainer(this)} -$.oc.inspector.wrappers.popup=InspectorPopup}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.wrappers.base,BaseProto=Base.prototype +InspectorPopup.prototype.onMoveToContainer=function(){$.wn.inspector.manager.switchToContainer(this)} +$.wn.inspector.wrappers.popup=InspectorPopup}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.wrappers.base,BaseProto=Base.prototype var InspectorContainer=function($element,surface,options){if(!options.container){throw new Error('Cannot create Inspector container wrapper without a container element.')} this.surfaceContainer=null Base.call(this,$element,surface,options)} @@ -5324,7 +5342,7 @@ else{this.surfaceContainer=layoutElements.bodyContainer} this.setInspectorVisibleFlag(true)} InspectorContainer.prototype.buildHead=function(){var container=document.createElement('div'),header=document.createElement('h3'),paragraph=document.createElement('p'),detachButton=document.createElement('span'),closeButton=document.createElement('span') container.setAttribute('class','inspector-header') -detachButton.setAttribute('class','oc-icon-external-link-square detach') +detachButton.setAttribute('class','wn-icon-external-link-square detach') closeButton.setAttribute('class','close') header.textContent=this.title paragraph.textContent=this.description @@ -5347,7 +5365,7 @@ bodyRow.setAttribute('class','flex-layout-item stretch relative') layout.appendChild(headRow) layout.appendChild(bodyRow) this.options.container.get(0).appendChild(layout) -$.oc.foundation.controlUtils.markDisposable(layout) +$.wn.foundation.controlUtils.markDisposable(layout) this.registerLayoutHandlers(layout) return{headContainer:headRow,bodyContainer:bodyRow}} InspectorContainer.prototype.validateAndApply=function(){if(!this.surface.validate()){return false} @@ -5383,8 +5401,8 @@ return false} this.surface.dispose() this.dispose()} InspectorContainer.prototype.onLiveUpdate=function(){this.applyValues(true)} -InspectorContainer.prototype.onDetach=function(){$.oc.inspector.manager.switchToPopup(this)} -$.oc.inspector.wrappers.container=InspectorContainer}(window.jQuery);+function($){"use strict";var GroupManager=function(controlId){this.controlId=controlId +InspectorContainer.prototype.onDetach=function(){$.wn.inspector.manager.switchToPopup(this)} +$.wn.inspector.wrappers.container=InspectorContainer}(window.jQuery);+function($){"use strict";var GroupManager=function(controlId){this.controlId=controlId this.rootGroup=null this.cachedGroupStatuses=null} GroupManager.prototype.createGroup=function(groupId,parentGroup){var group=new Group(groupId) @@ -5417,10 +5435,10 @@ if(!group){throw new Error('Cannot find the requested row group.')} return group.findGroupRows(table,ignoreCollapsedSubgroups,this)} GroupManager.prototype.markGroupRowInvalid=function(group,table){var currentGroup=group while(currentGroup){var row=currentGroup.findGroupRow(table) -if(row){$.oc.foundation.element.addClass(row,'invalid')} +if(row){$.wn.foundation.element.addClass(row,'invalid')} currentGroup=currentGroup.parentGroup}} GroupManager.prototype.unmarkInvalidGroups=function(table){var rows=table.querySelectorAll('tr.invalid') -for(var i=rows.length-1;i>=0;i--){$.oc.foundation.element.removeClass(rows[i],'invalid')}} +for(var i=rows.length-1;i>=0;i--){$.wn.foundation.element.removeClass(rows[i],'invalid')}} GroupManager.prototype.isRowVisible=function(table,rowGroupIndex){var group=this.findGroupByIndex(index) if(!group){throw new Error('Cannot find the requested row group.')} var current=group @@ -5461,15 +5479,17 @@ var subgroupRows=subgroup.findGroupRows(table,ignoreCollapsedSubgroups,groupMana for(var j=0,subgroupLen=subgroupRows.length;j \ @@ -5787,7 +5809,7 @@ PopupBase.prototype.getLink=function(){return this.containerCell.querySelector(' PopupBase.prototype.configurePopup=function(popup){} PopupBase.prototype.handleSubmit=function($form){} PopupBase.prototype.hidePopup=function(){$(this.getLink()).popup('hide')} -PopupBase.prototype.onTriggerClick=function(ev){$.oc.foundation.event.stop(ev) +PopupBase.prototype.onTriggerClick=function(ev){$.wn.foundation.event.stop(ev) var content=this.getPopupContent() content=content.replace('{{property}}',this.propertyDefinition.title) $(ev.target).popup({content:content}) @@ -5804,15 +5826,15 @@ if(this.handleSubmit($(ev.target))===false){return false} this.setLinkText(this.getLink()) this.hidePopup() return false} -$.oc.inspector.propertyEditors.popupBase=PopupBase}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.propertyEditors.popupBase,BaseProto=Base.prototype +$.wn.inspector.propertyEditors.popupBase=PopupBase}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.propertyEditors.popupBase,BaseProto=Base.prototype var TextEditor=function(inspector,propertyDefinition,containerCell,group){Base.call(this,inspector,propertyDefinition,containerCell,group)} TextEditor.prototype=Object.create(BaseProto) TextEditor.prototype.constructor=Base TextEditor.prototype.setLinkText=function(link,value){var value=value!==undefined?value:this.inspector.getPropertyValue(this.propertyDefinition.property) if(value===undefined){value=this.propertyDefinition.default} if(!value){value=this.propertyDefinition.placeholder -$.oc.foundation.element.addClass(link,'placeholder')} -else{$.oc.foundation.element.removeClass(link,'placeholder')} +$.wn.foundation.element.addClass(link,'placeholder')} +else{$.wn.foundation.element.removeClass(link,'placeholder')} if(typeof value==='string'){value=value.replace(/(?:\r\n|\r|\n)/g,' ');value=$.trim(value) value=value.substring(0,300);} link.textContent=value} @@ -5844,7 +5866,7 @@ $textarea.focus() this.configureComment(popup)} TextEditor.prototype.handleSubmit=function($form){var $textarea=$form.find('textarea'),link=this.getLink(),value=$.trim($textarea.val()) this.inspector.setPropertyValue(this.propertyDefinition.property,value)} -$.oc.inspector.propertyEditors.text=TextEditor}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.propertyEditors.base,BaseProto=Base.prototype +$.wn.inspector.propertyEditors.text=TextEditor}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.propertyEditors.base,BaseProto=Base.prototype var SetEditor=function(inspector,propertyDefinition,containerCell,group){this.editors=[] this.loadedItems=null Base.call(this,inspector,propertyDefinition,containerCell,group)} @@ -5857,10 +5879,10 @@ this.disposeControls() this.editors=null BaseProto.dispose.call(this)} SetEditor.prototype.build=function(){var link=document.createElement('a') -$.oc.foundation.element.addClass(link,'trigger') +$.wn.foundation.element.addClass(link,'trigger') link.setAttribute('href','#') this.setLinkText(link) -$.oc.foundation.element.addClass(this.containerCell,'trigger-cell') +$.wn.foundation.element.addClass(this.containerCell,'trigger-cell') this.containerCell.appendChild(link) if(this.propertyDefinition.items!==undefined){this.loadStaticItems()} else{this.loadDynamicItems()}} @@ -5872,16 +5894,16 @@ if(value===undefined){value=this.propertyDefinition.default} if(value!==undefined&&value.length!==undefined&&value.length>0&&typeof value!=='string'){var textValues=[] for(var i=0,len=value.length;i-1} @@ -5891,7 +5913,7 @@ var $link=$(this.getLink()) $link.loadIndicator('hide') $link.loadIndicator('destroy')} SetEditor.prototype.loadDynamicItems=function(){var link=this.getLink(),data=this.inspector.getValues(),$form=$(link).closest('form') -$.oc.foundation.element.addClass(link,'loading-indicator-container size-small') +$.wn.foundation.element.addClass(link,'loading-indicator-container size-small') this.showLoadingIndicator() data['inspectorProperty']=this.getPropertyPath() data['inspectorClassName']=this.inspector.options.inspectorClass @@ -5938,7 +5960,7 @@ editor.dispose()}} SetEditor.prototype.disposeControls=function(){var link=this.getLink() if(this.propertyDefinition.items===undefined){$(link).loadIndicator('destroy')} link.parentNode.removeChild(link)} -$.oc.inspector.propertyEditors.set=SetEditor}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.propertyEditors.base,BaseProto=Base.prototype +$.wn.inspector.propertyEditors.set=SetEditor}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.propertyEditors.base,BaseProto=Base.prototype var ObjectListEditor=function(inspector,propertyDefinition,containerCell,group){this.currentRowInspector=null this.popup=null if(propertyDefinition.titleProperty===undefined){throw new Error('The titleProperty property should be specified in the objectList editor configuration. Property: '+propertyDefinition.property)} @@ -5957,15 +5979,15 @@ this.popup=null BaseProto.dispose.call(this)} ObjectListEditor.prototype.supportsExternalParameterEditor=function(){return false} ObjectListEditor.prototype.build=function(){var link=document.createElement('a') -$.oc.foundation.element.addClass(link,'trigger') +$.wn.foundation.element.addClass(link,'trigger') link.setAttribute('href','#') this.setLinkText(link) -$.oc.foundation.element.addClass(this.containerCell,'trigger-cell') +$.wn.foundation.element.addClass(this.containerCell,'trigger-cell') this.containerCell.appendChild(link)} ObjectListEditor.prototype.setLinkText=function(link,value){var value=value!==undefined&&value!==null?value:this.inspector.getPropertyValue(this.propertyDefinition.property) if(value===null){value=undefined} if(value===undefined){var placeholder=this.propertyDefinition.placeholder -if(placeholder!==undefined){$.oc.foundation.element.addClass(link,'placeholder') +if(placeholder!==undefined){$.wn.foundation.element.addClass(link,'placeholder') link.textContent=placeholder} else{link.textContent='Items: 0'}} else{var itemCount=0 @@ -5973,7 +5995,7 @@ if(!this.isKeyValueMode()){if(value.length===undefined){throw new Error('Object itemCount=value.length} else{if(typeof value!=='object'){throw new Error('Object list value should be an object. Property: '+this.propertyDefinition.property)} itemCount=this.getValueKeys(value).length} -$.oc.foundation.element.removeClass(link,'placeholder') +$.wn.foundation.element.removeClass(link,'placeholder') link.textContent='Items: '+itemCount}} ObjectListEditor.prototype.getPopupContent=function(){return' \
\ @@ -5991,10 +6013,10 @@ ObjectListEditor.prototype.getPopupContent=function(){return'
\
\ \ \
\
\ @@ -6057,8 +6079,8 @@ ObjectListEditor.prototype.removeEmptyRow=function(){var tbody=this.getTableBody if(row){tbody.removeChild(row)}} ObjectListEditor.prototype.buildTableRow=function(text,rowClass,cellClass){var row=document.createElement('tr'),cell=document.createElement('td') cell.textContent=text -if(rowClass!==undefined){$.oc.foundation.element.addClass(row,rowClass)} -if(cellClass!==undefined){$.oc.foundation.element.addClass(cell,cellClass)} +if(rowClass!==undefined){$.wn.foundation.element.addClass(row,rowClass)} +if(cellClass!==undefined){$.wn.foundation.element.addClass(cell,cellClass)} row.appendChild(cell) return row} ObjectListEditor.prototype.updateScrollpads=function(){$('.control-scrollpad',this.popup).scrollpad('update')} @@ -6067,15 +6089,15 @@ if(selectedRow===row&&!forceSelect){return} if(selectedRow){if(!this.validateKeyValue()){return} if(this.currentRowInspector){if(!this.currentRowInspector.validate()){return}} this.applyDataToRow(selectedRow) -$.oc.foundation.element.removeClass(selectedRow,'active')} +$.wn.foundation.element.removeClass(selectedRow,'active')} this.disposeInspector() -$.oc.foundation.element.addClass(row,'active') +$.wn.foundation.element.addClass(row,'active') this.createInspectorForRow(row,inspectorContainer)} ObjectListEditor.prototype.createInspectorForRow=function(row,inspectorContainer){var dataStr=row.getAttribute('data-inspector-values') if(dataStr===undefined||typeof dataStr!=='string'){throw new Error('Values not found for the selected row.')} var properties=this.propertyDefinition.itemProperties,values=JSON.parse(dataStr),options={enableExternalParameterEditor:false,onChange:this.proxy(this.onInspectorDataChange),inspectorClass:this.inspector.options.inspectorClass} -this.currentRowInspector=new $.oc.inspector.surface(inspectorContainer,properties,values,$.oc.inspector.helpers.generateElementUniqueId(inspectorContainer),options)} -ObjectListEditor.prototype.disposeInspector=function(){$.oc.foundation.controlUtils.disposeControls(this.popup.querySelector('[data-inspector-container]')) +this.currentRowInspector=new $.wn.inspector.surface(inspectorContainer,properties,values,$.wn.inspector.helpers.generateElementUniqueId(inspectorContainer),options)} +ObjectListEditor.prototype.disposeInspector=function(){$.wn.foundation.controlUtils.disposeControls(this.popup.querySelector('[data-inspector-container]')) this.currentRowInspector=null} ObjectListEditor.prototype.applyDataToRow=function(row){if(this.currentRowInspector===null){return} var data=this.currentRowInspector.getValues() @@ -6085,18 +6107,18 @@ if(!selectedRow){throw new Exception('A row is not found for the updated data')} if(property!==this.propertyDefinition.titleProperty){return} value=$.trim(value) if(value.length===0){value='[No title]' -$.oc.foundation.element.addClass(selectedRow,'disabled')} -else{$.oc.foundation.element.removeClass(selectedRow,'disabled')} +$.wn.foundation.element.addClass(selectedRow,'disabled')} +else{$.wn.foundation.element.removeClass(selectedRow,'disabled')} selectedRow.firstChild.textContent=value} ObjectListEditor.prototype.getSelectedRow=function(){if(!this.popup){throw new Error('Trying to get selected row without a popup reference.')} var rows=this.getTableBody().children -for(var i=0,len=rows.length;i0){resultValue.push(currentValue)}}} this.inspector.setPropertyValue(this.propertyDefinition.property,resultValue)} -$.oc.inspector.propertyEditors.stringList=StringListEditor}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.propertyEditors.popupBase,BaseProto=Base.prototype +$.wn.inspector.propertyEditors.stringList=StringListEditor}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.propertyEditors.popupBase,BaseProto=Base.prototype var StringListAutocomplete=function(inspector,propertyDefinition,containerCell,group){this.items=null Base.call(this,inspector,propertyDefinition,containerCell,group)} StringListAutocomplete.prototype=Object.create(BaseProto) @@ -6265,10 +6287,10 @@ StringListAutocomplete.prototype.setLinkText=function(link,value){var value=valu if(value===undefined){value=this.propertyDefinition.default} this.checkValueType(value) if(!value){value=this.propertyDefinition.placeholder -$.oc.foundation.element.addClass(link,'placeholder') +$.wn.foundation.element.addClass(link,'placeholder') if(!value){value='[]'} link.textContent=value} -else{$.oc.foundation.element.removeClass(link,'placeholder') +else{$.wn.foundation.element.removeClass(link,'placeholder') link.textContent='['+value.join(', ')+']'}} StringListAutocomplete.prototype.checkValueType=function(value){if(value&&Object.prototype.toString.call(value)!=='[object Array]'){this.throwError('The string list value should be an array.')}} StringListAutocomplete.prototype.getPopupContent=function(){return' \ @@ -6281,10 +6303,10 @@ StringListAutocomplete.prototype.getPopupContent=function(){return'
\
\ \ \
\
\ @@ -6334,9 +6356,9 @@ input.value=value controlContainer.appendChild(input) container.appendChild(controlContainer)} StringListAutocomplete.prototype.setActiveCell=function(input){var activeCells=this.popup.querySelectorAll('td.active') -for(var i=activeCells.length-1;i>=0;i--){$.oc.foundation.element.removeClass(activeCells[i],'active')} +for(var i=activeCells.length-1;i>=0;i--){$.wn.foundation.element.removeClass(activeCells[i],'active')} var activeCell=input.parentNode.parentNode -$.oc.foundation.element.addClass(activeCell,'active') +$.wn.foundation.element.addClass(activeCell,'active') this.buildAutoComplete(input)} StringListAutocomplete.prototype.createItem=function(){var activeRow=this.getActiveRow(),newRow=this.buildEmptyRow(),tbody=this.getTableBody(),nextSibling=activeRow?activeRow.nextElementSibling:null tbody.insertBefore(newRow,nextSibling) @@ -6438,7 +6460,7 @@ break;case'delete-item':this.deleteItem() break;}} StringListAutocomplete.prototype.onKeyDown=function(ev){if(ev.key==='ArrowDown'){return this.navigateDown(ev)} else if(ev.key==='ArrowUp'){return this.navigateUp(ev)}} -$.oc.inspector.propertyEditors.stringListAutocomplete=StringListAutocomplete}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.propertyEditors.popupBase,BaseProto=Base.prototype +$.wn.inspector.propertyEditors.stringListAutocomplete=StringListAutocomplete}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.propertyEditors.popupBase,BaseProto=Base.prototype var DictionaryEditor=function(inspector,propertyDefinition,containerCell,group){this.keyValidationSet=null this.valueValidationSet=null Base.call(this,inspector,propertyDefinition,containerCell,group)} @@ -6454,12 +6476,12 @@ DictionaryEditor.prototype.supportsExternalParameterEditor=function(){return fal DictionaryEditor.prototype.setLinkText=function(link,value){var value=value!==undefined?value:this.inspector.getPropertyValue(this.propertyDefinition.property) if(value===undefined){value=this.propertyDefinition.default} if(value===undefined||$.isEmptyObject(value)){var placeholder=this.propertyDefinition.placeholder -if(placeholder!==undefined){$.oc.foundation.element.addClass(link,'placeholder') +if(placeholder!==undefined){$.wn.foundation.element.addClass(link,'placeholder') link.textContent=placeholder} else{link.textContent='Items: 0'}} else{if(typeof value!=='object'){this.throwError('Object list value should be an object.')} var itemCount=this.getValueKeys(value).length -$.oc.foundation.element.removeClass(link,'placeholder') +$.wn.foundation.element.removeClass(link,'placeholder') link.textContent='Items: '+itemCount}} DictionaryEditor.prototype.getPopupContent=function(){return' \
\ @@ -6471,10 +6493,10 @@ DictionaryEditor.prototype.getPopupContent=function(){return'
\
\ \ \
\
\ @@ -6533,9 +6555,9 @@ input.value=value controlContainer.appendChild(input) container.appendChild(controlContainer)} DictionaryEditor.prototype.setActiveCell=function(input){var activeCells=this.popup.querySelectorAll('td.active') -for(var i=activeCells.length-1;i>=0;i--){$.oc.foundation.element.removeClass(activeCells[i],'active')} +for(var i=activeCells.length-1;i>=0;i--){$.wn.foundation.element.removeClass(activeCells[i],'active')} var activeCell=input.parentNode.parentNode -$.oc.foundation.element.addClass(activeCell,'active')} +$.wn.foundation.element.addClass(activeCell,'active')} DictionaryEditor.prototype.createItem=function(){var activeRow=this.getActiveRow(),newRow=this.buildEmptyRow(),tbody=this.getTableBody(),nextSibling=activeRow?activeRow.nextElementSibling:null tbody.insertBefore(newRow,nextSibling) this.focusAndMakeActive(newRow.querySelector('input')) @@ -6552,20 +6574,20 @@ this.updateScrollpads()} DictionaryEditor.prototype.applyValues=function(){var tbody=this.getTableBody(),dataRows=tbody.querySelectorAll('tr'),link=this.getLink(),result={} for(var i=0,len=dataRows.length;i=0;i--){loadedItems[data.options[i].value]=data.options[i].title}} this.buildAutoComplete(loadedItems)} -$.oc.inspector.propertyEditors.autocomplete=AutocompleteEditor}(window.jQuery);+function($){"use strict";if($.oc===undefined) -$.oc={} -if($.oc.inspector===undefined) -$.oc.inspector={} -$.oc.inspector.helpers={} -$.oc.inspector.helpers.generateElementUniqueId=function(element){if(element.hasAttribute('data-inspector-id')){return element.getAttribute('data-inspector-id')} -var id=$.oc.inspector.helpers.generateUniqueId() +$.wn.inspector.propertyEditors.autocomplete=AutocompleteEditor}(window.jQuery);+function($){"use strict";if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn +if($.wn.inspector===undefined) +$.wn.inspector={} +$.wn.inspector.helpers={} +$.wn.inspector.helpers.generateElementUniqueId=function(element){if(element.hasAttribute('data-inspector-id')){return element.getAttribute('data-inspector-id')} +var id=$.wn.inspector.helpers.generateUniqueId() element.setAttribute('data-inspector-id',id) return id} -$.oc.inspector.helpers.generateUniqueId=function(){return"inspectorid-"+Math.floor(Math.random()*new Date().getTime());}}(window.jQuery) -+function($){"use strict";if($.oc.inspector.validators===undefined) -$.oc.inspector.validators={} -var Base=$.oc.foundation.base,BaseProto=Base.prototype +$.wn.inspector.helpers.generateUniqueId=function(){return"inspectorid-"+Math.floor(Math.random()*new Date().getTime());}}(window.jQuery) ++function($){"use strict";if($.wn.inspector.validators===undefined) +$.wn.inspector.validators={} +var Base=$.wn.foundation.base,BaseProto=Base.prototype var ValidationSet=function(options,propertyName){this.validators=[] this.options=options this.propertyName=propertyName @@ -6713,21 +6737,21 @@ BaseProto.dispose.call(this)} ValidationSet.prototype.disposeValidators=function(){for(var i=0,len=this.validators.length;ithis.options.max.value){return this.options.max.message!==undefined?this.options.max.message:"The value should not be greater than "+this.options.max.value}}}} -$.oc.inspector.validators.baseNumber=BaseNumber}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.validators.base,BaseProto=Base.prototype +$.wn.inspector.validators.baseNumber=BaseNumber}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.validators.base,BaseProto=Base.prototype var RequiredValidator=function(options){Base.call(this,options) this.defaultMessage='The property is required.'} RequiredValidator.prototype=Object.create(BaseProto) @@ -6758,7 +6782,7 @@ RequiredValidator.prototype.isValid=function(value){if(value===undefined||value= if(typeof value==='boolean'){return value?null:this.getMessage()} if(typeof value==='object'){return!$.isEmptyObject(value)?null:this.getMessage()} return $.trim(String(value)).length>0?null:this.getMessage()} -$.oc.inspector.validators.required=RequiredValidator}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.validators.base,BaseProto=Base.prototype +$.wn.inspector.validators.required=RequiredValidator}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.validators.base,BaseProto=Base.prototype var RegexValidator=function(options){Base.call(this,options)} RegexValidator.prototype=Object.create(BaseProto) RegexValidator.prototype.constructor=Base @@ -6769,7 +6793,7 @@ var string=$.trim(String(value)) if(string.length===0){return null} var regexObj=new RegExp(this.options.pattern,this.options.modifiers) return regexObj.test(string)?null:this.getMessage()} -$.oc.inspector.validators.regex=RegexValidator}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.validators.baseNumber,BaseProto=Base.prototype +$.wn.inspector.validators.regex=RegexValidator}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.validators.baseNumber,BaseProto=Base.prototype var IntegerValidator=function(options){Base.call(this,options)} IntegerValidator.prototype=Object.create(BaseProto) IntegerValidator.prototype.constructor=Base @@ -6780,7 +6804,7 @@ if(string.length===0){return null} var testResult=this.options.allowNegative?/^\-?[0-9]*$/.test(string):/^[0-9]*$/.test(string) if(!testResult){var defaultMessage=this.options.allowNegative?'The value should be an integer.':'The value should be a positive integer.';return this.getMessage(defaultMessage)} return this.doCommonChecks(parseInt(string))} -$.oc.inspector.validators.integer=IntegerValidator}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.validators.baseNumber,BaseProto=Base.prototype +$.wn.inspector.validators.integer=IntegerValidator}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.validators.baseNumber,BaseProto=Base.prototype var FloatValidator=function(options){Base.call(this,options)} FloatValidator.prototype=Object.create(BaseProto) FloatValidator.prototype.constructor=Base @@ -6791,7 +6815,7 @@ if(string.length===0){return null} var testResult=this.options.allowNegative?/^[-]?([0-9]+\.[0-9]+|[0-9]+)$/.test(string):/^([0-9]+\.[0-9]+|[0-9]+)$/.test(string) if(!testResult){var defaultMessage=this.options.allowNegative?'The value should be a floating point number.':'The value should be a positive floating point number.';return this.getMessage(defaultMessage)} return this.doCommonChecks(parseFloat(string))} -$.oc.inspector.validators.float=FloatValidator}(window.jQuery);+function($){"use strict";var Base=$.oc.inspector.validators.base,BaseProto=Base.prototype +$.wn.inspector.validators.float=FloatValidator}(window.jQuery);+function($){"use strict";var Base=$.wn.inspector.validators.base,BaseProto=Base.prototype var LengthValidator=function(options){Base.call(this,options)} LengthValidator.prototype=Object.create(BaseProto) LengthValidator.prototype.constructor=Base @@ -6808,11 +6832,13 @@ if(length>this.options.max.value){return this.options.max.message!==undefined?th LengthValidator.prototype.getObjectLength=function(value){var result=0 for(var key in value){result++} return result} -$.oc.inspector.validators.length=LengthValidator}(window.jQuery);+function($){"use strict";if($.oc===undefined) -$.oc={} -if($.oc.inspector===undefined) -$.oc.inspector={} -var Base=$.oc.foundation.base,BaseProto=Base.prototype +$.wn.inspector.validators.length=LengthValidator}(window.jQuery);+function($){"use strict";if($.wn===undefined) +$.wn={} +if($.oc===undefined) +$.oc=$.wn +if($.wn.inspector===undefined) +$.wn.inspector={} +var Base=$.wn.foundation.base,BaseProto=Base.prototype var ExternalParameterEditor=function(inspector,propertyDefinition,containerCell,initialValue){this.inspector=inspector this.propertyDefinition=propertyDefinition this.containerCell=containerCell @@ -6843,7 +6869,7 @@ link.setAttribute('class','external-editor-link') link.setAttribute('tabindex','-1') link.setAttribute('title',this.tooltipText) $(link).tooltip({'container':'body',delay:500}) -icon.setAttribute('class','oc-icon-terminal') +icon.setAttribute('class','wn-icon-terminal') link.appendChild(icon) controls.appendChild(input) controls.appendChild(link) @@ -6865,7 +6891,7 @@ if(!building){editor.style.right=0 editor.style.left=position.left+'px'} else{editor.style.right=0} setTimeout(this.proxy(this.repositionEditor),0) -$.oc.foundation.element.addClass(container,'editor-visible') +$.wn.foundation.element.addClass(container,'editor-visible') link.setAttribute('data-original-title','Click to enter the property value') this.toggleEditorVisibility(false) input.setAttribute('tabindex',0) @@ -6875,11 +6901,11 @@ this.containerCell.scrollTop=0} ExternalParameterEditor.prototype.hideEditor=function(){var editor=this.getEditor(),container=this.getContainer() editor.style.left='auto' editor.style.right='30px' -$.oc.foundation.element.removeClass(container,'editor-visible') -$.oc.foundation.element.removeClass(this.containerCell,'active') +$.wn.foundation.element.removeClass(container,'editor-visible') +$.wn.foundation.element.removeClass(this.containerCell,'active') var propertyEditor=this.inspector.findPropertyEditor(this.propertyDefinition.property) if(propertyEditor){propertyEditor.onExternalPropertyEditorHidden()}} -ExternalParameterEditor.prototype.toggleEditor=function(ev){$.oc.foundation.event.stop(ev) +ExternalParameterEditor.prototype.toggleEditor=function(ev){$.wn.foundation.event.stop(ev) var link=this.getLink(),container=this.getContainer(),editor=this.getEditor() $(link).tooltip('hide') if(!this.isEditorVisible()){this.showEditor() @@ -6896,13 +6922,13 @@ if(!height){height=$(this.containerCell).height() this.containerCell.setAttribute('data-inspector-cell-height',height)}} height=Math.max(height,19) for(var i=0,len=children.length;i=0;i--){var list=this.lists[i],item=list.querySelector('[data-list-sortable-element-id="'+elementId+'"]') if(item){return item}} return null} -ListSortable.prototype.getPlaceholderPlacement=function(hoverElement,ev){var mousePosition=$.oc.foundation.event.pageCoordinates(ev),elementPosition=$.oc.foundation.element.absolutePosition(hoverElement) +ListSortable.prototype.getPlaceholderPlacement=function(hoverElement,ev){var mousePosition=$.wn.foundation.event.pageCoordinates(ev),elementPosition=$.wn.foundation.element.absolutePosition(hoverElement) if(this.options.direction=='vertical'){var elementCenter=elementPosition.top+hoverElement.offsetHeight/2 return mousePosition.y<=elementCenter?'before':'after'} else{var elementCenter=elementPosition.left+hoverElement.offsetWidth/2 return mousePosition.x<=elementCenter?'before':'after'}} -ListSortable.prototype.lastMousePositionChanged=function(ev){var mousePosition=$.oc.foundation.event.pageCoordinates(ev.originalEvent) +ListSortable.prototype.lastMousePositionChanged=function(ev){var mousePosition=$.wn.foundation.event.pageCoordinates(ev.originalEvent) if(this.lastMousePosition===null||this.lastMousePosition.x!=mousePosition.x||this.lastMousePosition.y!=mousePosition.y){this.lastMousePosition=mousePosition return true} return false} -ListSortable.prototype.mouseOutsideLists=function(ev){var mousePosition=$.oc.foundation.event.pageCoordinates(ev) -for(var i=this.lists.length-1;i>=0;i--){if($.oc.foundation.element.elementContainsPoint(this.lists[i],mousePosition)){return false}} +ListSortable.prototype.mouseOutsideLists=function(ev){var mousePosition=$.wn.foundation.event.pageCoordinates(ev) +for(var i=this.lists.length-1;i>=0;i--){if($.wn.foundation.element.elementContainsPoint(this.lists[i],mousePosition)){return false}} return true} ListSortable.prototype.getClosestDraggableParent=function(element){var current=element while(current){if(current.tagName==='LI'&¤t.hasAttribute('draggable')){return current} diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css index 11dd818d5..84a62d70c 100644 --- a/modules/system/assets/ui/storm.css +++ b/modules/system/assets/ui/storm.css @@ -887,14 +887,24 @@ input[type="button"].btn-block {width:100%} .btn:hover i[class*=" icon-"], .btn:focus i[class*=" icon-"], .btn.focus i[class*=" icon-"] {opacity:1} +.btn[class^="wn-icon-"]:before, +.btn[class*=" wn-icon-"]:before, .btn[class^="oc-icon-"]:before, .btn[class*=" oc-icon-"]:before {font-size:14px;line-height:14px;position:relative;opacity:.6} +.btn[class^="wn-icon-"].on:before, +.btn[class*=" wn-icon-"].on:before, .btn[class^="oc-icon-"].on:before, .btn[class*=" oc-icon-"].on:before, +.btn[class^="wn-icon-"]:hover:before, +.btn[class*=" wn-icon-"]:hover:before, .btn[class^="oc-icon-"]:hover:before, .btn[class*=" oc-icon-"]:hover:before, +.btn[class^="wn-icon-"]:focus:before, +.btn[class*=" wn-icon-"]:focus:before, .btn[class^="oc-icon-"]:focus:before, .btn[class*=" oc-icon-"]:focus:before, +.btn[class^="wn-icon-"].focus:before, +.btn[class*=" wn-icon-"].focus:before, .btn[class^="oc-icon-"].focus:before, .btn[class*=" oc-icon-"].focus:before {opacity:1} .btn-secondary {-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,.1);box-shadow:inset 0 -2px 0 rgba(0,0,0,.1)} @@ -939,6 +949,1578 @@ input[type="button"].btn-block {width:100%} .tooltip.bottom .tooltip-arrow {top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#34495e} .tooltip.bottom-left .tooltip-arrow {top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#34495e} .tooltip.bottom-right .tooltip-arrow {top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#34495e} +.wn-icon-glass:before, +.icon-glass:before {content:"\f000"} +.wn-icon-music:before, +.icon-music:before {content:"\f001"} +.wn-icon-search:before, +.icon-search:before {content:"\f002"} +.wn-icon-envelope-o:before, +.icon-envelope-o:before {content:"\f003"} +.wn-icon-heart:before, +.icon-heart:before {content:"\f004"} +.wn-icon-star:before, +.icon-star:before {content:"\f005"} +.wn-icon-star-o:before, +.icon-star-o:before {content:"\f006"} +.wn-icon-user:before, +.icon-user:before {content:"\f007"} +.wn-icon-film:before, +.icon-film:before {content:"\f008"} +.wn-icon-th-large:before, +.icon-th-large:before {content:"\f009"} +.wn-icon-th:before, +.icon-th:before {content:"\f00a"} +.wn-icon-th-list:before, +.icon-th-list:before {content:"\f00b"} +.wn-icon-check:before, +.icon-check:before {content:"\f00c"} +.wn-icon-remove:before, +.icon-remove:before, +.wn-icon-close:before, +.icon-close:before, +.wn-icon-times:before, +.icon-times:before {content:"\f00d"} +.wn-icon-search-plus:before, +.icon-search-plus:before {content:"\f00e"} +.wn-icon-search-minus:before, +.icon-search-minus:before {content:"\f010"} +.wn-icon-power-off:before, +.icon-power-off:before {content:"\f011"} +.wn-icon-signal:before, +.icon-signal:before {content:"\f012"} +.wn-icon-gear:before, +.icon-gear:before, +.wn-icon-cog:before, +.icon-cog:before {content:"\f013"} +.wn-icon-trash-o:before, +.icon-trash-o:before {content:"\f014"} +.wn-icon-home:before, +.icon-home:before {content:"\f015"} +.wn-icon-file-o:before, +.icon-file-o:before {content:"\f016"} +.wn-icon-clock-o:before, +.icon-clock-o:before {content:"\f017"} +.wn-icon-road:before, +.icon-road:before {content:"\f018"} +.wn-icon-download:before, +.icon-download:before {content:"\f019"} +.wn-icon-arrow-circle-o-down:before, +.icon-arrow-circle-o-down:before {content:"\f01a"} +.wn-icon-arrow-circle-o-up:before, +.icon-arrow-circle-o-up:before {content:"\f01b"} +.wn-icon-inbox:before, +.icon-inbox:before {content:"\f01c"} +.wn-icon-play-circle-o:before, +.icon-play-circle-o:before {content:"\f01d"} +.wn-icon-rotate-right:before, +.icon-rotate-right:before, +.wn-icon-repeat:before, +.icon-repeat:before {content:"\f01e"} +.wn-icon-refresh:before, +.icon-refresh:before {content:"\f021"} +.wn-icon-list-alt:before, +.icon-list-alt:before {content:"\f022"} +.wn-icon-lock:before, +.icon-lock:before {content:"\f023"} +.wn-icon-flag:before, +.icon-flag:before {content:"\f024"} +.wn-icon-headphones:before, +.icon-headphones:before {content:"\f025"} +.wn-icon-volume-off:before, +.icon-volume-off:before {content:"\f026"} +.wn-icon-volume-down:before, +.icon-volume-down:before {content:"\f027"} +.wn-icon-volume-up:before, +.icon-volume-up:before {content:"\f028"} +.wn-icon-qrcode:before, +.icon-qrcode:before {content:"\f029"} +.wn-icon-barcode:before, +.icon-barcode:before {content:"\f02a"} +.wn-icon-tag:before, +.icon-tag:before {content:"\f02b"} +.wn-icon-tags:before, +.icon-tags:before {content:"\f02c"} +.wn-icon-book:before, +.icon-book:before {content:"\f02d"} +.wn-icon-bookmark:before, +.icon-bookmark:before {content:"\f02e"} +.wn-icon-print:before, +.icon-print:before {content:"\f02f"} +.wn-icon-camera:before, +.icon-camera:before {content:"\f030"} +.wn-icon-font:before, +.icon-font:before {content:"\f031"} +.wn-icon-bold:before, +.icon-bold:before {content:"\f032"} +.wn-icon-italic:before, +.icon-italic:before {content:"\f033"} +.wn-icon-text-height:before, +.icon-text-height:before {content:"\f034"} +.wn-icon-text-width:before, +.icon-text-width:before {content:"\f035"} +.wn-icon-align-left:before, +.icon-align-left:before {content:"\f036"} +.wn-icon-align-center:before, +.icon-align-center:before {content:"\f037"} +.wn-icon-align-right:before, +.icon-align-right:before {content:"\f038"} +.wn-icon-align-justify:before, +.icon-align-justify:before {content:"\f039"} +.wn-icon-list:before, +.icon-list:before {content:"\f03a"} +.wn-icon-dedent:before, +.icon-dedent:before, +.wn-icon-outdent:before, +.icon-outdent:before {content:"\f03b"} +.wn-icon-indent:before, +.icon-indent:before {content:"\f03c"} +.wn-icon-video-camera:before, +.icon-video-camera:before {content:"\f03d"} +.wn-icon-photo:before, +.icon-photo:before, +.wn-icon-image:before, +.icon-image:before, +.wn-icon-picture-o:before, +.icon-picture-o:before {content:"\f03e"} +.wn-icon-pencil:before, +.icon-pencil:before {content:"\f040"} +.wn-icon-map-marker:before, +.icon-map-marker:before {content:"\f041"} +.wn-icon-adjust:before, +.icon-adjust:before {content:"\f042"} +.wn-icon-tint:before, +.icon-tint:before {content:"\f043"} +.wn-icon-edit:before, +.icon-edit:before, +.wn-icon-pencil-square-o:before, +.icon-pencil-square-o:before {content:"\f044"} +.wn-icon-share-square-o:before, +.icon-share-square-o:before {content:"\f045"} +.wn-icon-check-square-o:before, +.icon-check-square-o:before {content:"\f046"} +.wn-icon-arrows:before, +.icon-arrows:before {content:"\f047"} +.wn-icon-step-backward:before, +.icon-step-backward:before {content:"\f048"} +.wn-icon-fast-backward:before, +.icon-fast-backward:before {content:"\f049"} +.wn-icon-backward:before, +.icon-backward:before {content:"\f04a"} +.wn-icon-play:before, +.icon-play:before {content:"\f04b"} +.wn-icon-pause:before, +.icon-pause:before {content:"\f04c"} +.wn-icon-stop:before, +.icon-stop:before {content:"\f04d"} +.wn-icon-forward:before, +.icon-forward:before {content:"\f04e"} +.wn-icon-fast-forward:before, +.icon-fast-forward:before {content:"\f050"} +.wn-icon-step-forward:before, +.icon-step-forward:before {content:"\f051"} +.wn-icon-eject:before, +.icon-eject:before {content:"\f052"} +.wn-icon-chevron-left:before, +.icon-chevron-left:before {content:"\f053"} +.wn-icon-chevron-right:before, +.icon-chevron-right:before {content:"\f054"} +.wn-icon-plus-circle:before, +.icon-plus-circle:before {content:"\f055"} +.wn-icon-minus-circle:before, +.icon-minus-circle:before {content:"\f056"} +.wn-icon-times-circle:before, +.icon-times-circle:before {content:"\f057"} +.wn-icon-check-circle:before, +.icon-check-circle:before {content:"\f058"} +.wn-icon-question-circle:before, +.icon-question-circle:before {content:"\f059"} +.wn-icon-info-circle:before, +.icon-info-circle:before {content:"\f05a"} +.wn-icon-crosshairs:before, +.icon-crosshairs:before {content:"\f05b"} +.wn-icon-times-circle-o:before, +.icon-times-circle-o:before {content:"\f05c"} +.wn-icon-check-circle-o:before, +.icon-check-circle-o:before {content:"\f05d"} +.wn-icon-ban:before, +.icon-ban:before {content:"\f05e"} +.wn-icon-arrow-left:before, +.icon-arrow-left:before {content:"\f060"} +.wn-icon-arrow-right:before, +.icon-arrow-right:before {content:"\f061"} +.wn-icon-arrow-up:before, +.icon-arrow-up:before {content:"\f062"} +.wn-icon-arrow-down:before, +.icon-arrow-down:before {content:"\f063"} +.wn-icon-mail-forward:before, +.icon-mail-forward:before, +.wn-icon-share:before, +.icon-share:before {content:"\f064"} +.wn-icon-expand:before, +.icon-expand:before {content:"\f065"} +.wn-icon-compress:before, +.icon-compress:before {content:"\f066"} +.wn-icon-plus:before, +.icon-plus:before {content:"\f067"} +.wn-icon-minus:before, +.icon-minus:before {content:"\f068"} +.wn-icon-asterisk:before, +.icon-asterisk:before {content:"\f069"} +.wn-icon-exclamation-circle:before, +.icon-exclamation-circle:before {content:"\f06a"} +.wn-icon-gift:before, +.icon-gift:before {content:"\f06b"} +.wn-icon-leaf:before, +.icon-leaf:before {content:"\f06c"} +.wn-icon-fire:before, +.icon-fire:before {content:"\f06d"} +.wn-icon-eye:before, +.icon-eye:before {content:"\f06e"} +.wn-icon-eye-slash:before, +.icon-eye-slash:before {content:"\f070"} +.wn-icon-warning:before, +.icon-warning:before, +.wn-icon-exclamation-triangle:before, +.icon-exclamation-triangle:before {content:"\f071"} +.wn-icon-plane:before, +.icon-plane:before {content:"\f072"} +.wn-icon-calendar:before, +.icon-calendar:before {content:"\f073"} +.wn-icon-random:before, +.icon-random:before {content:"\f074"} +.wn-icon-comment:before, +.icon-comment:before {content:"\f075"} +.wn-icon-magnet:before, +.icon-magnet:before {content:"\f076"} +.wn-icon-chevron-up:before, +.icon-chevron-up:before {content:"\f077"} +.wn-icon-chevron-down:before, +.icon-chevron-down:before {content:"\f078"} +.wn-icon-retweet:before, +.icon-retweet:before {content:"\f079"} +.wn-icon-shopping-cart:before, +.icon-shopping-cart:before {content:"\f07a"} +.wn-icon-folder:before, +.icon-folder:before {content:"\f07b"} +.wn-icon-folder-open:before, +.icon-folder-open:before {content:"\f07c"} +.wn-icon-arrows-v:before, +.icon-arrows-v:before {content:"\f07d"} +.wn-icon-arrows-h:before, +.icon-arrows-h:before {content:"\f07e"} +.wn-icon-bar-chart-o:before, +.icon-bar-chart-o:before, +.wn-icon-bar-chart:before, +.icon-bar-chart:before {content:"\f080"} +.wn-icon-twitter-square:before, +.icon-twitter-square:before {content:"\f081"} +.wn-icon-facebook-square:before, +.icon-facebook-square:before {content:"\f082"} +.wn-icon-camera-retro:before, +.icon-camera-retro:before {content:"\f083"} +.wn-icon-key:before, +.icon-key:before {content:"\f084"} +.wn-icon-gears:before, +.icon-gears:before, +.wn-icon-cogs:before, +.icon-cogs:before {content:"\f085"} +.wn-icon-comments:before, +.icon-comments:before {content:"\f086"} +.wn-icon-thumbs-o-up:before, +.icon-thumbs-o-up:before {content:"\f087"} +.wn-icon-thumbs-o-down:before, +.icon-thumbs-o-down:before {content:"\f088"} +.wn-icon-star-half:before, +.icon-star-half:before {content:"\f089"} +.wn-icon-heart-o:before, +.icon-heart-o:before {content:"\f08a"} +.wn-icon-sign-out:before, +.icon-sign-out:before {content:"\f08b"} +.wn-icon-linkedin-square:before, +.icon-linkedin-square:before {content:"\f08c"} +.wn-icon-thumb-tack:before, +.icon-thumb-tack:before {content:"\f08d"} +.wn-icon-external-link:before, +.icon-external-link:before {content:"\f08e"} +.wn-icon-sign-in:before, +.icon-sign-in:before {content:"\f090"} +.wn-icon-trophy:before, +.icon-trophy:before {content:"\f091"} +.wn-icon-github-square:before, +.icon-github-square:before {content:"\f092"} +.wn-icon-upload:before, +.icon-upload:before {content:"\f093"} +.wn-icon-lemon-o:before, +.icon-lemon-o:before {content:"\f094"} +.wn-icon-phone:before, +.icon-phone:before {content:"\f095"} +.wn-icon-square-o:before, +.icon-square-o:before {content:"\f096"} +.wn-icon-bookmark-o:before, +.icon-bookmark-o:before {content:"\f097"} +.wn-icon-phone-square:before, +.icon-phone-square:before {content:"\f098"} +.wn-icon-twitter:before, +.icon-twitter:before {content:"\f099"} +.wn-icon-facebook-f:before, +.icon-facebook-f:before, +.wn-icon-facebook:before, +.icon-facebook:before {content:"\f09a"} +.wn-icon-github:before, +.icon-github:before {content:"\f09b"} +.wn-icon-unlock:before, +.icon-unlock:before {content:"\f09c"} +.wn-icon-credit-card:before, +.icon-credit-card:before {content:"\f09d"} +.wn-icon-feed:before, +.icon-feed:before, +.wn-icon-rss:before, +.icon-rss:before {content:"\f09e"} +.wn-icon-hdd-o:before, +.icon-hdd-o:before {content:"\f0a0"} +.wn-icon-bullhorn:before, +.icon-bullhorn:before {content:"\f0a1"} +.wn-icon-bell:before, +.icon-bell:before {content:"\f0f3"} +.wn-icon-certificate:before, +.icon-certificate:before {content:"\f0a3"} +.wn-icon-hand-o-right:before, +.icon-hand-o-right:before {content:"\f0a4"} +.wn-icon-hand-o-left:before, +.icon-hand-o-left:before {content:"\f0a5"} +.wn-icon-hand-o-up:before, +.icon-hand-o-up:before {content:"\f0a6"} +.wn-icon-hand-o-down:before, +.icon-hand-o-down:before {content:"\f0a7"} +.wn-icon-arrow-circle-left:before, +.icon-arrow-circle-left:before {content:"\f0a8"} +.wn-icon-arrow-circle-right:before, +.icon-arrow-circle-right:before {content:"\f0a9"} +.wn-icon-arrow-circle-up:before, +.icon-arrow-circle-up:before {content:"\f0aa"} +.wn-icon-arrow-circle-down:before, +.icon-arrow-circle-down:before {content:"\f0ab"} +.wn-icon-globe:before, +.icon-globe:before {content:"\f0ac"} +.wn-icon-wrench:before, +.icon-wrench:before {content:"\f0ad"} +.wn-icon-tasks:before, +.icon-tasks:before {content:"\f0ae"} +.wn-icon-filter:before, +.icon-filter:before {content:"\f0b0"} +.wn-icon-briefcase:before, +.icon-briefcase:before {content:"\f0b1"} +.wn-icon-arrows-alt:before, +.icon-arrows-alt:before {content:"\f0b2"} +.wn-icon-group:before, +.icon-group:before, +.wn-icon-users:before, +.icon-users:before {content:"\f0c0"} +.wn-icon-chain:before, +.icon-chain:before, +.wn-icon-link:before, +.icon-link:before {content:"\f0c1"} +.wn-icon-cloud:before, +.icon-cloud:before {content:"\f0c2"} +.wn-icon-flask:before, +.icon-flask:before {content:"\f0c3"} +.wn-icon-cut:before, +.icon-cut:before, +.wn-icon-scissors:before, +.icon-scissors:before {content:"\f0c4"} +.wn-icon-copy:before, +.icon-copy:before, +.wn-icon-files-o:before, +.icon-files-o:before {content:"\f0c5"} +.wn-icon-paperclip:before, +.icon-paperclip:before {content:"\f0c6"} +.wn-icon-save:before, +.icon-save:before, +.wn-icon-floppy-o:before, +.icon-floppy-o:before {content:"\f0c7"} +.wn-icon-square:before, +.icon-square:before {content:"\f0c8"} +.wn-icon-navicon:before, +.icon-navicon:before, +.wn-icon-reorder:before, +.icon-reorder:before, +.wn-icon-bars:before, +.icon-bars:before {content:"\f0c9"} +.wn-icon-list-ul:before, +.icon-list-ul:before {content:"\f0ca"} +.wn-icon-list-ol:before, +.icon-list-ol:before {content:"\f0cb"} +.wn-icon-strikethrough:before, +.icon-strikethrough:before {content:"\f0cc"} +.wn-icon-underline:before, +.icon-underline:before {content:"\f0cd"} +.wn-icon-table:before, +.icon-table:before {content:"\f0ce"} +.wn-icon-magic:before, +.icon-magic:before {content:"\f0d0"} +.wn-icon-truck:before, +.icon-truck:before {content:"\f0d1"} +.wn-icon-pinterest:before, +.icon-pinterest:before {content:"\f0d2"} +.wn-icon-pinterest-square:before, +.icon-pinterest-square:before {content:"\f0d3"} +.wn-icon-google-plus-square:before, +.icon-google-plus-square:before {content:"\f0d4"} +.wn-icon-google-plus:before, +.icon-google-plus:before {content:"\f0d5"} +.wn-icon-money:before, +.icon-money:before {content:"\f0d6"} +.wn-icon-caret-down:before, +.icon-caret-down:before {content:"\f0d7"} +.wn-icon-caret-up:before, +.icon-caret-up:before {content:"\f0d8"} +.wn-icon-caret-left:before, +.icon-caret-left:before {content:"\f0d9"} +.wn-icon-caret-right:before, +.icon-caret-right:before {content:"\f0da"} +.wn-icon-columns:before, +.icon-columns:before {content:"\f0db"} +.wn-icon-unsorted:before, +.icon-unsorted:before, +.wn-icon-sort:before, +.icon-sort:before {content:"\f0dc"} +.wn-icon-sort-down:before, +.icon-sort-down:before, +.wn-icon-sort-desc:before, +.icon-sort-desc:before {content:"\f0dd"} +.wn-icon-sort-up:before, +.icon-sort-up:before, +.wn-icon-sort-asc:before, +.icon-sort-asc:before {content:"\f0de"} +.wn-icon-envelope:before, +.icon-envelope:before {content:"\f0e0"} +.wn-icon-linkedin:before, +.icon-linkedin:before {content:"\f0e1"} +.wn-icon-rotate-left:before, +.icon-rotate-left:before, +.wn-icon-undo:before, +.icon-undo:before {content:"\f0e2"} +.wn-icon-legal:before, +.icon-legal:before, +.wn-icon-gavel:before, +.icon-gavel:before {content:"\f0e3"} +.wn-icon-dashboard:before, +.icon-dashboard:before, +.wn-icon-tachometer:before, +.icon-tachometer:before {content:"\f0e4"} +.wn-icon-comment-o:before, +.icon-comment-o:before {content:"\f0e5"} +.wn-icon-comments-o:before, +.icon-comments-o:before {content:"\f0e6"} +.wn-icon-flash:before, +.icon-flash:before, +.wn-icon-bolt:before, +.icon-bolt:before {content:"\f0e7"} +.wn-icon-sitemap:before, +.icon-sitemap:before {content:"\f0e8"} +.wn-icon-umbrella:before, +.icon-umbrella:before {content:"\f0e9"} +.wn-icon-paste:before, +.icon-paste:before, +.wn-icon-clipboard:before, +.icon-clipboard:before {content:"\f0ea"} +.wn-icon-lightbulb-o:before, +.icon-lightbulb-o:before {content:"\f0eb"} +.wn-icon-exchange:before, +.icon-exchange:before {content:"\f0ec"} +.wn-icon-cloud-download:before, +.icon-cloud-download:before {content:"\f0ed"} +.wn-icon-cloud-upload:before, +.icon-cloud-upload:before {content:"\f0ee"} +.wn-icon-user-md:before, +.icon-user-md:before {content:"\f0f0"} +.wn-icon-stethoscope:before, +.icon-stethoscope:before {content:"\f0f1"} +.wn-icon-suitcase:before, +.icon-suitcase:before {content:"\f0f2"} +.wn-icon-bell-o:before, +.icon-bell-o:before {content:"\f0a2"} +.wn-icon-coffee:before, +.icon-coffee:before {content:"\f0f4"} +.wn-icon-cutlery:before, +.icon-cutlery:before {content:"\f0f5"} +.wn-icon-file-text-o:before, +.icon-file-text-o:before {content:"\f0f6"} +.wn-icon-building-o:before, +.icon-building-o:before {content:"\f0f7"} +.wn-icon-hospital-o:before, +.icon-hospital-o:before {content:"\f0f8"} +.wn-icon-ambulance:before, +.icon-ambulance:before {content:"\f0f9"} +.wn-icon-medkit:before, +.icon-medkit:before {content:"\f0fa"} +.wn-icon-fighter-jet:before, +.icon-fighter-jet:before {content:"\f0fb"} +.wn-icon-beer:before, +.icon-beer:before {content:"\f0fc"} +.wn-icon-h-square:before, +.icon-h-square:before {content:"\f0fd"} +.wn-icon-plus-square:before, +.icon-plus-square:before {content:"\f0fe"} +.wn-icon-angle-double-left:before, +.icon-angle-double-left:before {content:"\f100"} +.wn-icon-angle-double-right:before, +.icon-angle-double-right:before {content:"\f101"} +.wn-icon-angle-double-up:before, +.icon-angle-double-up:before {content:"\f102"} +.wn-icon-angle-double-down:before, +.icon-angle-double-down:before {content:"\f103"} +.wn-icon-angle-left:before, +.icon-angle-left:before {content:"\f104"} +.wn-icon-angle-right:before, +.icon-angle-right:before {content:"\f105"} +.wn-icon-angle-up:before, +.icon-angle-up:before {content:"\f106"} +.wn-icon-angle-down:before, +.icon-angle-down:before {content:"\f107"} +.wn-icon-desktop:before, +.icon-desktop:before {content:"\f108"} +.wn-icon-laptop:before, +.icon-laptop:before {content:"\f109"} +.wn-icon-tablet:before, +.icon-tablet:before {content:"\f10a"} +.wn-icon-mobile-phone:before, +.icon-mobile-phone:before, +.wn-icon-mobile:before, +.icon-mobile:before {content:"\f10b"} +.wn-icon-circle-o:before, +.icon-circle-o:before {content:"\f10c"} +.wn-icon-quote-left:before, +.icon-quote-left:before {content:"\f10d"} +.wn-icon-quote-right:before, +.icon-quote-right:before {content:"\f10e"} +.wn-icon-spinner:before, +.icon-spinner:before {content:"\f110"} +.wn-icon-circle:before, +.icon-circle:before {content:"\f111"} +.wn-icon-mail-reply:before, +.icon-mail-reply:before, +.wn-icon-reply:before, +.icon-reply:before {content:"\f112"} +.wn-icon-github-alt:before, +.icon-github-alt:before {content:"\f113"} +.wn-icon-folder-o:before, +.icon-folder-o:before {content:"\f114"} +.wn-icon-folder-open-o:before, +.icon-folder-open-o:before {content:"\f115"} +.wn-icon-smile-o:before, +.icon-smile-o:before {content:"\f118"} +.wn-icon-frown-o:before, +.icon-frown-o:before {content:"\f119"} +.wn-icon-meh-o:before, +.icon-meh-o:before {content:"\f11a"} +.wn-icon-gamepad:before, +.icon-gamepad:before {content:"\f11b"} +.wn-icon-keyboard-o:before, +.icon-keyboard-o:before {content:"\f11c"} +.wn-icon-flag-o:before, +.icon-flag-o:before {content:"\f11d"} +.wn-icon-flag-checkered:before, +.icon-flag-checkered:before {content:"\f11e"} +.wn-icon-terminal:before, +.icon-terminal:before {content:"\f120"} +.wn-icon-code:before, +.icon-code:before {content:"\f121"} +.wn-icon-mail-reply-all:before, +.icon-mail-reply-all:before, +.wn-icon-reply-all:before, +.icon-reply-all:before {content:"\f122"} +.wn-icon-star-half-empty:before, +.icon-star-half-empty:before, +.wn-icon-star-half-full:before, +.icon-star-half-full:before, +.wn-icon-star-half-o:before, +.icon-star-half-o:before {content:"\f123"} +.wn-icon-location-arrow:before, +.icon-location-arrow:before {content:"\f124"} +.wn-icon-crop:before, +.icon-crop:before {content:"\f125"} +.wn-icon-code-fork:before, +.icon-code-fork:before {content:"\f126"} +.wn-icon-unlink:before, +.icon-unlink:before, +.wn-icon-chain-broken:before, +.icon-chain-broken:before {content:"\f127"} +.wn-icon-question:before, +.icon-question:before {content:"\f128"} +.wn-icon-info:before, +.icon-info:before {content:"\f129"} +.wn-icon-exclamation:before, +.icon-exclamation:before {content:"\f12a"} +.wn-icon-superscript:before, +.icon-superscript:before {content:"\f12b"} +.wn-icon-subscript:before, +.icon-subscript:before {content:"\f12c"} +.wn-icon-eraser:before, +.icon-eraser:before {content:"\f12d"} +.wn-icon-puzzle-piece:before, +.icon-puzzle-piece:before {content:"\f12e"} +.wn-icon-microphone:before, +.icon-microphone:before {content:"\f130"} +.wn-icon-microphone-slash:before, +.icon-microphone-slash:before {content:"\f131"} +.wn-icon-shield:before, +.icon-shield:before {content:"\f132"} +.wn-icon-calendar-o:before, +.icon-calendar-o:before {content:"\f133"} +.wn-icon-fire-extinguisher:before, +.icon-fire-extinguisher:before {content:"\f134"} +.wn-icon-rocket:before, +.icon-rocket:before {content:"\f135"} +.wn-icon-maxcdn:before, +.icon-maxcdn:before {content:"\f136"} +.wn-icon-chevron-circle-left:before, +.icon-chevron-circle-left:before {content:"\f137"} +.wn-icon-chevron-circle-right:before, +.icon-chevron-circle-right:before {content:"\f138"} +.wn-icon-chevron-circle-up:before, +.icon-chevron-circle-up:before {content:"\f139"} +.wn-icon-chevron-circle-down:before, +.icon-chevron-circle-down:before {content:"\f13a"} +.wn-icon-html5:before, +.icon-html5:before {content:"\f13b"} +.wn-icon-css3:before, +.icon-css3:before {content:"\f13c"} +.wn-icon-anchor:before, +.icon-anchor:before {content:"\f13d"} +.wn-icon-unlock-alt:before, +.icon-unlock-alt:before {content:"\f13e"} +.wn-icon-bullseye:before, +.icon-bullseye:before {content:"\f140"} +.wn-icon-ellipsis-h:before, +.icon-ellipsis-h:before {content:"\f141"} +.wn-icon-ellipsis-v:before, +.icon-ellipsis-v:before {content:"\f142"} +.wn-icon-rss-square:before, +.icon-rss-square:before {content:"\f143"} +.wn-icon-play-circle:before, +.icon-play-circle:before {content:"\f144"} +.wn-icon-ticket:before, +.icon-ticket:before {content:"\f145"} +.wn-icon-minus-square:before, +.icon-minus-square:before {content:"\f146"} +.wn-icon-minus-square-o:before, +.icon-minus-square-o:before {content:"\f147"} +.wn-icon-level-up:before, +.icon-level-up:before {content:"\f148"} +.wn-icon-level-down:before, +.icon-level-down:before {content:"\f149"} +.wn-icon-check-square:before, +.icon-check-square:before {content:"\f14a"} +.wn-icon-pencil-square:before, +.icon-pencil-square:before {content:"\f14b"} +.wn-icon-external-link-square:before, +.icon-external-link-square:before {content:"\f14c"} +.wn-icon-share-square:before, +.icon-share-square:before {content:"\f14d"} +.wn-icon-compass:before, +.icon-compass:before {content:"\f14e"} +.wn-icon-toggle-down:before, +.icon-toggle-down:before, +.wn-icon-caret-square-o-down:before, +.icon-caret-square-o-down:before {content:"\f150"} +.wn-icon-toggle-up:before, +.icon-toggle-up:before, +.wn-icon-caret-square-o-up:before, +.icon-caret-square-o-up:before {content:"\f151"} +.wn-icon-toggle-right:before, +.icon-toggle-right:before, +.wn-icon-caret-square-o-right:before, +.icon-caret-square-o-right:before {content:"\f152"} +.wn-icon-euro:before, +.icon-euro:before, +.wn-icon-eur:before, +.icon-eur:before {content:"\f153"} +.wn-icon-gbp:before, +.icon-gbp:before {content:"\f154"} +.wn-icon-dollar:before, +.icon-dollar:before, +.wn-icon-usd:before, +.icon-usd:before {content:"\f155"} +.wn-icon-rupee:before, +.icon-rupee:before, +.wn-icon-inr:before, +.icon-inr:before {content:"\f156"} +.wn-icon-cny:before, +.icon-cny:before, +.wn-icon-rmb:before, +.icon-rmb:before, +.wn-icon-yen:before, +.icon-yen:before, +.wn-icon-jpy:before, +.icon-jpy:before {content:"\f157"} +.wn-icon-ruble:before, +.icon-ruble:before, +.wn-icon-rouble:before, +.icon-rouble:before, +.wn-icon-rub:before, +.icon-rub:before {content:"\f158"} +.wn-icon-won:before, +.icon-won:before, +.wn-icon-krw:before, +.icon-krw:before {content:"\f159"} +.wn-icon-bitcoin:before, +.icon-bitcoin:before, +.wn-icon-btc:before, +.icon-btc:before {content:"\f15a"} +.wn-icon-file:before, +.icon-file:before {content:"\f15b"} +.wn-icon-file-text:before, +.icon-file-text:before {content:"\f15c"} +.wn-icon-sort-alpha-asc:before, +.icon-sort-alpha-asc:before {content:"\f15d"} +.wn-icon-sort-alpha-desc:before, +.icon-sort-alpha-desc:before {content:"\f15e"} +.wn-icon-sort-amount-asc:before, +.icon-sort-amount-asc:before {content:"\f160"} +.wn-icon-sort-amount-desc:before, +.icon-sort-amount-desc:before {content:"\f161"} +.wn-icon-sort-numeric-asc:before, +.icon-sort-numeric-asc:before {content:"\f162"} +.wn-icon-sort-numeric-desc:before, +.icon-sort-numeric-desc:before {content:"\f163"} +.wn-icon-thumbs-up:before, +.icon-thumbs-up:before {content:"\f164"} +.wn-icon-thumbs-down:before, +.icon-thumbs-down:before {content:"\f165"} +.wn-icon-youtube-square:before, +.icon-youtube-square:before {content:"\f166"} +.wn-icon-youtube:before, +.icon-youtube:before {content:"\f167"} +.wn-icon-xing:before, +.icon-xing:before {content:"\f168"} +.wn-icon-xing-square:before, +.icon-xing-square:before {content:"\f169"} +.wn-icon-youtube-play:before, +.icon-youtube-play:before {content:"\f16a"} +.wn-icon-dropbox:before, +.icon-dropbox:before {content:"\f16b"} +.wn-icon-stack-overflow:before, +.icon-stack-overflow:before {content:"\f16c"} +.wn-icon-instagram:before, +.icon-instagram:before {content:"\f16d"} +.wn-icon-flickr:before, +.icon-flickr:before {content:"\f16e"} +.wn-icon-adn:before, +.icon-adn:before {content:"\f170"} +.wn-icon-bitbucket:before, +.icon-bitbucket:before {content:"\f171"} +.wn-icon-bitbucket-square:before, +.icon-bitbucket-square:before {content:"\f172"} +.wn-icon-tumblr:before, +.icon-tumblr:before {content:"\f173"} +.wn-icon-tumblr-square:before, +.icon-tumblr-square:before {content:"\f174"} +.wn-icon-long-arrow-down:before, +.icon-long-arrow-down:before {content:"\f175"} +.wn-icon-long-arrow-up:before, +.icon-long-arrow-up:before {content:"\f176"} +.wn-icon-long-arrow-left:before, +.icon-long-arrow-left:before {content:"\f177"} +.wn-icon-long-arrow-right:before, +.icon-long-arrow-right:before {content:"\f178"} +.wn-icon-apple:before, +.icon-apple:before {content:"\f179"} +.wn-icon-windows:before, +.icon-windows:before {content:"\f17a"} +.wn-icon-android:before, +.icon-android:before {content:"\f17b"} +.wn-icon-linux:before, +.icon-linux:before {content:"\f17c"} +.wn-icon-dribbble:before, +.icon-dribbble:before {content:"\f17d"} +.wn-icon-skype:before, +.icon-skype:before {content:"\f17e"} +.wn-icon-foursquare:before, +.icon-foursquare:before {content:"\f180"} +.wn-icon-trello:before, +.icon-trello:before {content:"\f181"} +.wn-icon-female:before, +.icon-female:before {content:"\f182"} +.wn-icon-male:before, +.icon-male:before {content:"\f183"} +.wn-icon-gittip:before, +.icon-gittip:before, +.wn-icon-gratipay:before, +.icon-gratipay:before {content:"\f184"} +.wn-icon-sun-o:before, +.icon-sun-o:before {content:"\f185"} +.wn-icon-moon-o:before, +.icon-moon-o:before {content:"\f186"} +.wn-icon-archive:before, +.icon-archive:before {content:"\f187"} +.wn-icon-bug:before, +.icon-bug:before {content:"\f188"} +.wn-icon-vk:before, +.icon-vk:before {content:"\f189"} +.wn-icon-weibo:before, +.icon-weibo:before {content:"\f18a"} +.wn-icon-renren:before, +.icon-renren:before {content:"\f18b"} +.wn-icon-pagelines:before, +.icon-pagelines:before {content:"\f18c"} +.wn-icon-stack-exchange:before, +.icon-stack-exchange:before {content:"\f18d"} +.wn-icon-arrow-circle-o-right:before, +.icon-arrow-circle-o-right:before {content:"\f18e"} +.wn-icon-arrow-circle-o-left:before, +.icon-arrow-circle-o-left:before {content:"\f190"} +.wn-icon-toggle-left:before, +.icon-toggle-left:before, +.wn-icon-caret-square-o-left:before, +.icon-caret-square-o-left:before {content:"\f191"} +.wn-icon-dot-circle-o:before, +.icon-dot-circle-o:before {content:"\f192"} +.wn-icon-wheelchair:before, +.icon-wheelchair:before {content:"\f193"} +.wn-icon-vimeo-square:before, +.icon-vimeo-square:before {content:"\f194"} +.wn-icon-turkish-lira:before, +.icon-turkish-lira:before, +.wn-icon-try:before, +.icon-try:before {content:"\f195"} +.wn-icon-plus-square-o:before, +.icon-plus-square-o:before {content:"\f196"} +.wn-icon-space-shuttle:before, +.icon-space-shuttle:before {content:"\f197"} +.wn-icon-slack:before, +.icon-slack:before {content:"\f198"} +.wn-icon-envelope-square:before, +.icon-envelope-square:before {content:"\f199"} +.wn-icon-wordpress:before, +.icon-wordpress:before {content:"\f19a"} +.wn-icon-openid:before, +.icon-openid:before {content:"\f19b"} +.wn-icon-institution:before, +.icon-institution:before, +.wn-icon-bank:before, +.icon-bank:before, +.wn-icon-university:before, +.icon-university:before {content:"\f19c"} +.wn-icon-mortar-board:before, +.icon-mortar-board:before, +.wn-icon-graduation-cap:before, +.icon-graduation-cap:before {content:"\f19d"} +.wn-icon-yahoo:before, +.icon-yahoo:before {content:"\f19e"} +.wn-icon-google:before, +.icon-google:before {content:"\f1a0"} +.wn-icon-reddit:before, +.icon-reddit:before {content:"\f1a1"} +.wn-icon-reddit-square:before, +.icon-reddit-square:before {content:"\f1a2"} +.wn-icon-stumbleupon-circle:before, +.icon-stumbleupon-circle:before {content:"\f1a3"} +.wn-icon-stumbleupon:before, +.icon-stumbleupon:before {content:"\f1a4"} +.wn-icon-delicious:before, +.icon-delicious:before {content:"\f1a5"} +.wn-icon-digg:before, +.icon-digg:before {content:"\f1a6"} +.wn-icon-pied-piper-pp:before, +.icon-pied-piper-pp:before {content:"\f1a7"} +.wn-icon-pied-piper-alt:before, +.icon-pied-piper-alt:before {content:"\f1a8"} +.wn-icon-drupal:before, +.icon-drupal:before {content:"\f1a9"} +.wn-icon-joomla:before, +.icon-joomla:before {content:"\f1aa"} +.wn-icon-language:before, +.icon-language:before {content:"\f1ab"} +.wn-icon-fax:before, +.icon-fax:before {content:"\f1ac"} +.wn-icon-building:before, +.icon-building:before {content:"\f1ad"} +.wn-icon-child:before, +.icon-child:before {content:"\f1ae"} +.wn-icon-paw:before, +.icon-paw:before {content:"\f1b0"} +.wn-icon-spoon:before, +.icon-spoon:before {content:"\f1b1"} +.wn-icon-cube:before, +.icon-cube:before {content:"\f1b2"} +.wn-icon-cubes:before, +.icon-cubes:before {content:"\f1b3"} +.wn-icon-behance:before, +.icon-behance:before {content:"\f1b4"} +.wn-icon-behance-square:before, +.icon-behance-square:before {content:"\f1b5"} +.wn-icon-steam:before, +.icon-steam:before {content:"\f1b6"} +.wn-icon-steam-square:before, +.icon-steam-square:before {content:"\f1b7"} +.wn-icon-recycle:before, +.icon-recycle:before {content:"\f1b8"} +.wn-icon-automobile:before, +.icon-automobile:before, +.wn-icon-car:before, +.icon-car:before {content:"\f1b9"} +.wn-icon-cab:before, +.icon-cab:before, +.wn-icon-taxi:before, +.icon-taxi:before {content:"\f1ba"} +.wn-icon-tree:before, +.icon-tree:before {content:"\f1bb"} +.wn-icon-spotify:before, +.icon-spotify:before {content:"\f1bc"} +.wn-icon-deviantart:before, +.icon-deviantart:before {content:"\f1bd"} +.wn-icon-soundcloud:before, +.icon-soundcloud:before {content:"\f1be"} +.wn-icon-database:before, +.icon-database:before {content:"\f1c0"} +.wn-icon-file-pdf-o:before, +.icon-file-pdf-o:before {content:"\f1c1"} +.wn-icon-file-word-o:before, +.icon-file-word-o:before {content:"\f1c2"} +.wn-icon-file-excel-o:before, +.icon-file-excel-o:before {content:"\f1c3"} +.wn-icon-file-powerpoint-o:before, +.icon-file-powerpoint-o:before {content:"\f1c4"} +.wn-icon-file-photo-o:before, +.icon-file-photo-o:before, +.wn-icon-file-picture-o:before, +.icon-file-picture-o:before, +.wn-icon-file-image-o:before, +.icon-file-image-o:before {content:"\f1c5"} +.wn-icon-file-zip-o:before, +.icon-file-zip-o:before, +.wn-icon-file-archive-o:before, +.icon-file-archive-o:before {content:"\f1c6"} +.wn-icon-file-sound-o:before, +.icon-file-sound-o:before, +.wn-icon-file-audio-o:before, +.icon-file-audio-o:before {content:"\f1c7"} +.wn-icon-file-movie-o:before, +.icon-file-movie-o:before, +.wn-icon-file-video-o:before, +.icon-file-video-o:before {content:"\f1c8"} +.wn-icon-file-code-o:before, +.icon-file-code-o:before {content:"\f1c9"} +.wn-icon-vine:before, +.icon-vine:before {content:"\f1ca"} +.wn-icon-codepen:before, +.icon-codepen:before {content:"\f1cb"} +.wn-icon-jsfiddle:before, +.icon-jsfiddle:before {content:"\f1cc"} +.wn-icon-life-bouy:before, +.icon-life-bouy:before, +.wn-icon-life-buoy:before, +.icon-life-buoy:before, +.wn-icon-life-saver:before, +.icon-life-saver:before, +.wn-icon-support:before, +.icon-support:before, +.wn-icon-life-ring:before, +.icon-life-ring:before {content:"\f1cd"} +.wn-icon-circle-o-notch:before, +.icon-circle-o-notch:before {content:"\f1ce"} +.wn-icon-ra:before, +.icon-ra:before, +.wn-icon-resistance:before, +.icon-resistance:before, +.wn-icon-rebel:before, +.icon-rebel:before {content:"\f1d0"} +.wn-icon-ge:before, +.icon-ge:before, +.wn-icon-empire:before, +.icon-empire:before {content:"\f1d1"} +.wn-icon-git-square:before, +.icon-git-square:before {content:"\f1d2"} +.wn-icon-git:before, +.icon-git:before {content:"\f1d3"} +.wn-icon-y-combinator-square:before, +.icon-y-combinator-square:before, +.wn-icon-yc-square:before, +.icon-yc-square:before, +.wn-icon-hacker-news:before, +.icon-hacker-news:before {content:"\f1d4"} +.wn-icon-tencent-weibo:before, +.icon-tencent-weibo:before {content:"\f1d5"} +.wn-icon-qq:before, +.icon-qq:before {content:"\f1d6"} +.wn-icon-wechat:before, +.icon-wechat:before, +.wn-icon-weixin:before, +.icon-weixin:before {content:"\f1d7"} +.wn-icon-send:before, +.icon-send:before, +.wn-icon-paper-plane:before, +.icon-paper-plane:before {content:"\f1d8"} +.wn-icon-send-o:before, +.icon-send-o:before, +.wn-icon-paper-plane-o:before, +.icon-paper-plane-o:before {content:"\f1d9"} +.wn-icon-history:before, +.icon-history:before {content:"\f1da"} +.wn-icon-circle-thin:before, +.icon-circle-thin:before {content:"\f1db"} +.wn-icon-header:before, +.icon-header:before {content:"\f1dc"} +.wn-icon-paragraph:before, +.icon-paragraph:before {content:"\f1dd"} +.wn-icon-sliders:before, +.icon-sliders:before {content:"\f1de"} +.wn-icon-share-alt:before, +.icon-share-alt:before {content:"\f1e0"} +.wn-icon-share-alt-square:before, +.icon-share-alt-square:before {content:"\f1e1"} +.wn-icon-bomb:before, +.icon-bomb:before {content:"\f1e2"} +.wn-icon-soccer-ball-o:before, +.icon-soccer-ball-o:before, +.wn-icon-futbol-o:before, +.icon-futbol-o:before {content:"\f1e3"} +.wn-icon-tty:before, +.icon-tty:before {content:"\f1e4"} +.wn-icon-binoculars:before, +.icon-binoculars:before {content:"\f1e5"} +.wn-icon-plug:before, +.icon-plug:before {content:"\f1e6"} +.wn-icon-slideshare:before, +.icon-slideshare:before {content:"\f1e7"} +.wn-icon-twitch:before, +.icon-twitch:before {content:"\f1e8"} +.wn-icon-yelp:before, +.icon-yelp:before {content:"\f1e9"} +.wn-icon-newspaper-o:before, +.icon-newspaper-o:before {content:"\f1ea"} +.wn-icon-wifi:before, +.icon-wifi:before {content:"\f1eb"} +.wn-icon-calculator:before, +.icon-calculator:before {content:"\f1ec"} +.wn-icon-paypal:before, +.icon-paypal:before {content:"\f1ed"} +.wn-icon-google-wallet:before, +.icon-google-wallet:before {content:"\f1ee"} +.wn-icon-cc-visa:before, +.icon-cc-visa:before {content:"\f1f0"} +.wn-icon-cc-mastercard:before, +.icon-cc-mastercard:before {content:"\f1f1"} +.wn-icon-cc-discover:before, +.icon-cc-discover:before {content:"\f1f2"} +.wn-icon-cc-amex:before, +.icon-cc-amex:before {content:"\f1f3"} +.wn-icon-cc-paypal:before, +.icon-cc-paypal:before {content:"\f1f4"} +.wn-icon-cc-stripe:before, +.icon-cc-stripe:before {content:"\f1f5"} +.wn-icon-bell-slash:before, +.icon-bell-slash:before {content:"\f1f6"} +.wn-icon-bell-slash-o:before, +.icon-bell-slash-o:before {content:"\f1f7"} +.wn-icon-trash:before, +.icon-trash:before {content:"\f1f8"} +.wn-icon-copyright:before, +.icon-copyright:before {content:"\f1f9"} +.wn-icon-at:before, +.icon-at:before {content:"\f1fa"} +.wn-icon-eyedropper:before, +.icon-eyedropper:before {content:"\f1fb"} +.wn-icon-paint-brush:before, +.icon-paint-brush:before {content:"\f1fc"} +.wn-icon-birthday-cake:before, +.icon-birthday-cake:before {content:"\f1fd"} +.wn-icon-area-chart:before, +.icon-area-chart:before {content:"\f1fe"} +.wn-icon-pie-chart:before, +.icon-pie-chart:before {content:"\f200"} +.wn-icon-line-chart:before, +.icon-line-chart:before {content:"\f201"} +.wn-icon-lastfm:before, +.icon-lastfm:before {content:"\f202"} +.wn-icon-lastfm-square:before, +.icon-lastfm-square:before {content:"\f203"} +.wn-icon-toggle-off:before, +.icon-toggle-off:before {content:"\f204"} +.wn-icon-toggle-on:before, +.icon-toggle-on:before {content:"\f205"} +.wn-icon-bicycle:before, +.icon-bicycle:before {content:"\f206"} +.wn-icon-bus:before, +.icon-bus:before {content:"\f207"} +.wn-icon-ioxhost:before, +.icon-ioxhost:before {content:"\f208"} +.wn-icon-angellist:before, +.icon-angellist:before {content:"\f209"} +.wn-icon-cc:before, +.icon-cc:before {content:"\f20a"} +.wn-icon-shekel:before, +.icon-shekel:before, +.wn-icon-sheqel:before, +.icon-sheqel:before, +.wn-icon-ils:before, +.icon-ils:before {content:"\f20b"} +.wn-icon-meanpath:before, +.icon-meanpath:before {content:"\f20c"} +.wn-icon-buysellads:before, +.icon-buysellads:before {content:"\f20d"} +.wn-icon-connectdevelop:before, +.icon-connectdevelop:before {content:"\f20e"} +.wn-icon-dashcube:before, +.icon-dashcube:before {content:"\f210"} +.wn-icon-forumbee:before, +.icon-forumbee:before {content:"\f211"} +.wn-icon-leanpub:before, +.icon-leanpub:before {content:"\f212"} +.wn-icon-sellsy:before, +.icon-sellsy:before {content:"\f213"} +.wn-icon-shirtsinbulk:before, +.icon-shirtsinbulk:before {content:"\f214"} +.wn-icon-simplybuilt:before, +.icon-simplybuilt:before {content:"\f215"} +.wn-icon-skyatlas:before, +.icon-skyatlas:before {content:"\f216"} +.wn-icon-cart-plus:before, +.icon-cart-plus:before {content:"\f217"} +.wn-icon-cart-arrow-down:before, +.icon-cart-arrow-down:before {content:"\f218"} +.wn-icon-diamond:before, +.icon-diamond:before {content:"\f219"} +.wn-icon-ship:before, +.icon-ship:before {content:"\f21a"} +.wn-icon-user-secret:before, +.icon-user-secret:before {content:"\f21b"} +.wn-icon-motorcycle:before, +.icon-motorcycle:before {content:"\f21c"} +.wn-icon-street-view:before, +.icon-street-view:before {content:"\f21d"} +.wn-icon-heartbeat:before, +.icon-heartbeat:before {content:"\f21e"} +.wn-icon-venus:before, +.icon-venus:before {content:"\f221"} +.wn-icon-mars:before, +.icon-mars:before {content:"\f222"} +.wn-icon-mercury:before, +.icon-mercury:before {content:"\f223"} +.wn-icon-intersex:before, +.icon-intersex:before, +.wn-icon-transgender:before, +.icon-transgender:before {content:"\f224"} +.wn-icon-transgender-alt:before, +.icon-transgender-alt:before {content:"\f225"} +.wn-icon-venus-double:before, +.icon-venus-double:before {content:"\f226"} +.wn-icon-mars-double:before, +.icon-mars-double:before {content:"\f227"} +.wn-icon-venus-mars:before, +.icon-venus-mars:before {content:"\f228"} +.wn-icon-mars-stroke:before, +.icon-mars-stroke:before {content:"\f229"} +.wn-icon-mars-stroke-v:before, +.icon-mars-stroke-v:before {content:"\f22a"} +.wn-icon-mars-stroke-h:before, +.icon-mars-stroke-h:before {content:"\f22b"} +.wn-icon-neuter:before, +.icon-neuter:before {content:"\f22c"} +.wn-icon-genderless:before, +.icon-genderless:before {content:"\f22d"} +.wn-icon-facebook-official:before, +.icon-facebook-official:before {content:"\f230"} +.wn-icon-pinterest-p:before, +.icon-pinterest-p:before {content:"\f231"} +.wn-icon-whatsapp:before, +.icon-whatsapp:before {content:"\f232"} +.wn-icon-server:before, +.icon-server:before {content:"\f233"} +.wn-icon-user-plus:before, +.icon-user-plus:before {content:"\f234"} +.wn-icon-user-times:before, +.icon-user-times:before {content:"\f235"} +.wn-icon-hotel:before, +.icon-hotel:before, +.wn-icon-bed:before, +.icon-bed:before {content:"\f236"} +.wn-icon-viacoin:before, +.icon-viacoin:before {content:"\f237"} +.wn-icon-train:before, +.icon-train:before {content:"\f238"} +.wn-icon-subway:before, +.icon-subway:before {content:"\f239"} +.wn-icon-medium:before, +.icon-medium:before {content:"\f23a"} +.wn-icon-yc:before, +.icon-yc:before, +.wn-icon-y-combinator:before, +.icon-y-combinator:before {content:"\f23b"} +.wn-icon-optin-monster:before, +.icon-optin-monster:before {content:"\f23c"} +.wn-icon-opencart:before, +.icon-opencart:before {content:"\f23d"} +.wn-icon-expeditedssl:before, +.icon-expeditedssl:before {content:"\f23e"} +.wn-icon-battery-4:before, +.icon-battery-4:before, +.wn-icon-battery:before, +.icon-battery:before, +.wn-icon-battery-full:before, +.icon-battery-full:before {content:"\f240"} +.wn-icon-battery-3:before, +.icon-battery-3:before, +.wn-icon-battery-three-quarters:before, +.icon-battery-three-quarters:before {content:"\f241"} +.wn-icon-battery-2:before, +.icon-battery-2:before, +.wn-icon-battery-half:before, +.icon-battery-half:before {content:"\f242"} +.wn-icon-battery-1:before, +.icon-battery-1:before, +.wn-icon-battery-quarter:before, +.icon-battery-quarter:before {content:"\f243"} +.wn-icon-battery-0:before, +.icon-battery-0:before, +.wn-icon-battery-empty:before, +.icon-battery-empty:before {content:"\f244"} +.wn-icon-mouse-pointer:before, +.icon-mouse-pointer:before {content:"\f245"} +.wn-icon-i-cursor:before, +.icon-i-cursor:before {content:"\f246"} +.wn-icon-object-group:before, +.icon-object-group:before {content:"\f247"} +.wn-icon-object-ungroup:before, +.icon-object-ungroup:before {content:"\f248"} +.wn-icon-sticky-note:before, +.icon-sticky-note:before {content:"\f249"} +.wn-icon-sticky-note-o:before, +.icon-sticky-note-o:before {content:"\f24a"} +.wn-icon-cc-jcb:before, +.icon-cc-jcb:before {content:"\f24b"} +.wn-icon-cc-diners-club:before, +.icon-cc-diners-club:before {content:"\f24c"} +.wn-icon-clone:before, +.icon-clone:before {content:"\f24d"} +.wn-icon-balance-scale:before, +.icon-balance-scale:before {content:"\f24e"} +.wn-icon-hourglass-o:before, +.icon-hourglass-o:before {content:"\f250"} +.wn-icon-hourglass-1:before, +.icon-hourglass-1:before, +.wn-icon-hourglass-start:before, +.icon-hourglass-start:before {content:"\f251"} +.wn-icon-hourglass-2:before, +.icon-hourglass-2:before, +.wn-icon-hourglass-half:before, +.icon-hourglass-half:before {content:"\f252"} +.wn-icon-hourglass-3:before, +.icon-hourglass-3:before, +.wn-icon-hourglass-end:before, +.icon-hourglass-end:before {content:"\f253"} +.wn-icon-hourglass:before, +.icon-hourglass:before {content:"\f254"} +.wn-icon-hand-grab-o:before, +.icon-hand-grab-o:before, +.wn-icon-hand-rock-o:before, +.icon-hand-rock-o:before {content:"\f255"} +.wn-icon-hand-stop-o:before, +.icon-hand-stop-o:before, +.wn-icon-hand-paper-o:before, +.icon-hand-paper-o:before {content:"\f256"} +.wn-icon-hand-scissors-o:before, +.icon-hand-scissors-o:before {content:"\f257"} +.wn-icon-hand-lizard-o:before, +.icon-hand-lizard-o:before {content:"\f258"} +.wn-icon-hand-spock-o:before, +.icon-hand-spock-o:before {content:"\f259"} +.wn-icon-hand-pointer-o:before, +.icon-hand-pointer-o:before {content:"\f25a"} +.wn-icon-hand-peace-o:before, +.icon-hand-peace-o:before {content:"\f25b"} +.wn-icon-trademark:before, +.icon-trademark:before {content:"\f25c"} +.wn-icon-registered:before, +.icon-registered:before {content:"\f25d"} +.wn-icon-creative-commons:before, +.icon-creative-commons:before {content:"\f25e"} +.wn-icon-gg:before, +.icon-gg:before {content:"\f260"} +.wn-icon-gg-circle:before, +.icon-gg-circle:before {content:"\f261"} +.wn-icon-tripadvisor:before, +.icon-tripadvisor:before {content:"\f262"} +.wn-icon-odnoklassniki:before, +.icon-odnoklassniki:before {content:"\f263"} +.wn-icon-odnoklassniki-square:before, +.icon-odnoklassniki-square:before {content:"\f264"} +.wn-icon-get-pocket:before, +.icon-get-pocket:before {content:"\f265"} +.wn-icon-wikipedia-w:before, +.icon-wikipedia-w:before {content:"\f266"} +.wn-icon-safari:before, +.icon-safari:before {content:"\f267"} +.wn-icon-chrome:before, +.icon-chrome:before {content:"\f268"} +.wn-icon-firefox:before, +.icon-firefox:before {content:"\f269"} +.wn-icon-opera:before, +.icon-opera:before {content:"\f26a"} +.wn-icon-internet-explorer:before, +.icon-internet-explorer:before {content:"\f26b"} +.wn-icon-tv:before, +.icon-tv:before, +.wn-icon-television:before, +.icon-television:before {content:"\f26c"} +.wn-icon-contao:before, +.icon-contao:before {content:"\f26d"} +.wn-icon-500px:before, +.icon-500px:before {content:"\f26e"} +.wn-icon-amazon:before, +.icon-amazon:before {content:"\f270"} +.wn-icon-calendar-plus-o:before, +.icon-calendar-plus-o:before {content:"\f271"} +.wn-icon-calendar-minus-o:before, +.icon-calendar-minus-o:before {content:"\f272"} +.wn-icon-calendar-times-o:before, +.icon-calendar-times-o:before {content:"\f273"} +.wn-icon-calendar-check-o:before, +.icon-calendar-check-o:before {content:"\f274"} +.wn-icon-industry:before, +.icon-industry:before {content:"\f275"} +.wn-icon-map-pin:before, +.icon-map-pin:before {content:"\f276"} +.wn-icon-map-signs:before, +.icon-map-signs:before {content:"\f277"} +.wn-icon-map-o:before, +.icon-map-o:before {content:"\f278"} +.wn-icon-map:before, +.icon-map:before {content:"\f279"} +.wn-icon-commenting:before, +.icon-commenting:before {content:"\f27a"} +.wn-icon-commenting-o:before, +.icon-commenting-o:before {content:"\f27b"} +.wn-icon-houzz:before, +.icon-houzz:before {content:"\f27c"} +.wn-icon-vimeo:before, +.icon-vimeo:before {content:"\f27d"} +.wn-icon-black-tie:before, +.icon-black-tie:before {content:"\f27e"} +.wn-icon-fonticons:before, +.icon-fonticons:before {content:"\f280"} +.wn-icon-reddit-alien:before, +.icon-reddit-alien:before {content:"\f281"} +.wn-icon-edge:before, +.icon-edge:before {content:"\f282"} +.wn-icon-credit-card-alt:before, +.icon-credit-card-alt:before {content:"\f283"} +.wn-icon-codiepie:before, +.icon-codiepie:before {content:"\f284"} +.wn-icon-modx:before, +.icon-modx:before {content:"\f285"} +.wn-icon-fort-awesome:before, +.icon-fort-awesome:before {content:"\f286"} +.wn-icon-usb:before, +.icon-usb:before {content:"\f287"} +.wn-icon-product-hunt:before, +.icon-product-hunt:before {content:"\f288"} +.wn-icon-mixcloud:before, +.icon-mixcloud:before {content:"\f289"} +.wn-icon-scribd:before, +.icon-scribd:before {content:"\f28a"} +.wn-icon-pause-circle:before, +.icon-pause-circle:before {content:"\f28b"} +.wn-icon-pause-circle-o:before, +.icon-pause-circle-o:before {content:"\f28c"} +.wn-icon-stop-circle:before, +.icon-stop-circle:before {content:"\f28d"} +.wn-icon-stop-circle-o:before, +.icon-stop-circle-o:before {content:"\f28e"} +.wn-icon-shopping-bag:before, +.icon-shopping-bag:before {content:"\f290"} +.wn-icon-shopping-basket:before, +.icon-shopping-basket:before {content:"\f291"} +.wn-icon-hashtag:before, +.icon-hashtag:before {content:"\f292"} +.wn-icon-bluetooth:before, +.icon-bluetooth:before {content:"\f293"} +.wn-icon-bluetooth-b:before, +.icon-bluetooth-b:before {content:"\f294"} +.wn-icon-percent:before, +.icon-percent:before {content:"\f295"} +.wn-icon-gitlab:before, +.icon-gitlab:before {content:"\f296"} +.wn-icon-wpbeginner:before, +.icon-wpbeginner:before {content:"\f297"} +.wn-icon-wpforms:before, +.icon-wpforms:before {content:"\f298"} +.wn-icon-envira:before, +.icon-envira:before {content:"\f299"} +.wn-icon-universal-access:before, +.icon-universal-access:before {content:"\f29a"} +.wn-icon-wheelchair-alt:before, +.icon-wheelchair-alt:before {content:"\f29b"} +.wn-icon-question-circle-o:before, +.icon-question-circle-o:before {content:"\f29c"} +.wn-icon-blind:before, +.icon-blind:before {content:"\f29d"} +.wn-icon-audio-description:before, +.icon-audio-description:before {content:"\f29e"} +.wn-icon-volume-control-phone:before, +.icon-volume-control-phone:before {content:"\f2a0"} +.wn-icon-braille:before, +.icon-braille:before {content:"\f2a1"} +.wn-icon-assistive-listening-systems:before, +.icon-assistive-listening-systems:before {content:"\f2a2"} +.wn-icon-asl-interpreting:before, +.icon-asl-interpreting:before, +.wn-icon-american-sign-language-interpreting:before, +.icon-american-sign-language-interpreting:before {content:"\f2a3"} +.wn-icon-deafness:before, +.icon-deafness:before, +.wn-icon-hard-of-hearing:before, +.icon-hard-of-hearing:before, +.wn-icon-deaf:before, +.icon-deaf:before {content:"\f2a4"} +.wn-icon-glide:before, +.icon-glide:before {content:"\f2a5"} +.wn-icon-glide-g:before, +.icon-glide-g:before {content:"\f2a6"} +.wn-icon-signing:before, +.icon-signing:before, +.wn-icon-sign-language:before, +.icon-sign-language:before {content:"\f2a7"} +.wn-icon-low-vision:before, +.icon-low-vision:before {content:"\f2a8"} +.wn-icon-viadeo:before, +.icon-viadeo:before {content:"\f2a9"} +.wn-icon-viadeo-square:before, +.icon-viadeo-square:before {content:"\f2aa"} +.wn-icon-snapchat:before, +.icon-snapchat:before {content:"\f2ab"} +.wn-icon-snapchat-ghost:before, +.icon-snapchat-ghost:before {content:"\f2ac"} +.wn-icon-snapchat-square:before, +.icon-snapchat-square:before {content:"\f2ad"} +.wn-icon-pied-piper:before, +.icon-pied-piper:before {content:"\f2ae"} +.wn-icon-first-order:before, +.icon-first-order:before {content:"\f2b0"} +.wn-icon-yoast:before, +.icon-yoast:before {content:"\f2b1"} +.wn-icon-themeisle:before, +.icon-themeisle:before {content:"\f2b2"} +.wn-icon-google-plus-circle:before, +.icon-google-plus-circle:before, +.wn-icon-google-plus-official:before, +.icon-google-plus-official:before {content:"\f2b3"} +.wn-icon-fa:before, +.icon-fa:before, +.wn-icon-font-awesome:before, +.icon-font-awesome:before {content:"\f2b4"} +.wn-icon-handshake-o:before, +.icon-handshake-o:before {content:"\f2b5"} +.wn-icon-envelope-open:before, +.icon-envelope-open:before {content:"\f2b6"} +.wn-icon-envelope-open-o:before, +.icon-envelope-open-o:before {content:"\f2b7"} +.wn-icon-linode:before, +.icon-linode:before {content:"\f2b8"} +.wn-icon-address-book:before, +.icon-address-book:before {content:"\f2b9"} +.wn-icon-address-book-o:before, +.icon-address-book-o:before {content:"\f2ba"} +.wn-icon-vcard:before, +.icon-vcard:before, +.wn-icon-address-card:before, +.icon-address-card:before {content:"\f2bb"} +.wn-icon-vcard-o:before, +.icon-vcard-o:before, +.wn-icon-address-card-o:before, +.icon-address-card-o:before {content:"\f2bc"} +.wn-icon-user-circle:before, +.icon-user-circle:before {content:"\f2bd"} +.wn-icon-user-circle-o:before, +.icon-user-circle-o:before {content:"\f2be"} +.wn-icon-user-o:before, +.icon-user-o:before {content:"\f2c0"} +.wn-icon-id-badge:before, +.icon-id-badge:before {content:"\f2c1"} +.wn-icon-drivers-license:before, +.icon-drivers-license:before, +.wn-icon-id-card:before, +.icon-id-card:before {content:"\f2c2"} +.wn-icon-drivers-license-o:before, +.icon-drivers-license-o:before, +.wn-icon-id-card-o:before, +.icon-id-card-o:before {content:"\f2c3"} +.wn-icon-quora:before, +.icon-quora:before {content:"\f2c4"} +.wn-icon-free-code-camp:before, +.icon-free-code-camp:before {content:"\f2c5"} +.wn-icon-telegram:before, +.icon-telegram:before {content:"\f2c6"} +.wn-icon-thermometer-4:before, +.icon-thermometer-4:before, +.wn-icon-thermometer:before, +.icon-thermometer:before, +.wn-icon-thermometer-full:before, +.icon-thermometer-full:before {content:"\f2c7"} +.wn-icon-thermometer-3:before, +.icon-thermometer-3:before, +.wn-icon-thermometer-three-quarters:before, +.icon-thermometer-three-quarters:before {content:"\f2c8"} +.wn-icon-thermometer-2:before, +.icon-thermometer-2:before, +.wn-icon-thermometer-half:before, +.icon-thermometer-half:before {content:"\f2c9"} +.wn-icon-thermometer-1:before, +.icon-thermometer-1:before, +.wn-icon-thermometer-quarter:before, +.icon-thermometer-quarter:before {content:"\f2ca"} +.wn-icon-thermometer-0:before, +.icon-thermometer-0:before, +.wn-icon-thermometer-empty:before, +.icon-thermometer-empty:before {content:"\f2cb"} +.wn-icon-shower:before, +.icon-shower:before {content:"\f2cc"} +.wn-icon-bathtub:before, +.icon-bathtub:before, +.wn-icon-s15:before, +.icon-s15:before, +.wn-icon-bath:before, +.icon-bath:before {content:"\f2cd"} +.wn-icon-podcast:before, +.icon-podcast:before {content:"\f2ce"} +.wn-icon-window-maximize:before, +.icon-window-maximize:before {content:"\f2d0"} +.wn-icon-window-minimize:before, +.icon-window-minimize:before {content:"\f2d1"} +.wn-icon-window-restore:before, +.icon-window-restore:before {content:"\f2d2"} +.wn-icon-times-rectangle:before, +.icon-times-rectangle:before, +.wn-icon-window-close:before, +.icon-window-close:before {content:"\f2d3"} +.wn-icon-times-rectangle-o:before, +.icon-times-rectangle-o:before, +.wn-icon-window-close-o:before, +.icon-window-close-o:before {content:"\f2d4"} +.wn-icon-bandcamp:before, +.icon-bandcamp:before {content:"\f2d5"} +.wn-icon-grav:before, +.icon-grav:before {content:"\f2d6"} +.wn-icon-etsy:before, +.icon-etsy:before {content:"\f2d7"} +.wn-icon-imdb:before, +.icon-imdb:before {content:"\f2d8"} +.wn-icon-ravelry:before, +.icon-ravelry:before {content:"\f2d9"} +.wn-icon-eercast:before, +.icon-eercast:before {content:"\f2da"} +.wn-icon-microchip:before, +.icon-microchip:before {content:"\f2db"} +.wn-icon-snowflake-o:before, +.icon-snowflake-o:before {content:"\f2dc"} +.wn-icon-superpowers:before, +.icon-superpowers:before {content:"\f2dd"} +.wn-icon-wpexplorer:before, +.icon-wpexplorer:before {content:"\f2de"} +.wn-icon-meetup:before, +.icon-meetup:before {content:"\f2e0"} .oc-icon-glass:before, .icon-glass:before {content:"\f000"} .oc-icon-music:before, @@ -2524,8 +4106,12 @@ button.close {padding:0;cursor:pointer;background:transparent;border:0;-webkit-a [class*=" icon-"].pull-left {margin-right:.3em} [class^="icon-"].pull-right, [class*=" icon-"].pull-right {margin-left:.3em} +[class^="wn-icon-"]:before, +[class*=" wn-icon-"]:before, [class^="oc-icon-"]:before, [class*=" oc-icon-"]:before {display:inline-block;margin-right:8px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;vertical-align:baseline} +[class^="wn-icon-"].empty:before, +[class*=" wn-icon-"].empty:before, [class^="oc-icon-"].empty:before, [class*=" oc-icon-"].empty:before {margin-right:0} .icon-lg {font-size:1.33333333em;line-height:0.75em;vertical-align:-15%} @@ -2567,15 +4153,25 @@ button.close {padding:0;cursor:pointer;background:transparent;border:0;-webkit-a .dropdown-menu .dropdown-container >ul li a {outline:none;padding:10px 15px;font-size:13px;display:block;color:#39454a;position:relative;text-decoration:none} .dropdown-menu .dropdown-container >ul li a:hover, .dropdown-menu .dropdown-container >ul li a:focus {color:#fff;background-color:#4ea5e0} +.dropdown-menu .dropdown-container >ul li a:hover[class^="wn-icon-"]:before, +.dropdown-menu .dropdown-container >ul li a:focus[class^="wn-icon-"]:before, +.dropdown-menu .dropdown-container >ul li a:hover[class*=" wn-icon-"]:before, +.dropdown-menu .dropdown-container >ul li a:focus[class*=" wn-icon-"]:before, .dropdown-menu .dropdown-container >ul li a:hover[class^="oc-icon-"]:before, .dropdown-menu .dropdown-container >ul li a:focus[class^="oc-icon-"]:before, .dropdown-menu .dropdown-container >ul li a:hover[class*=" oc-icon-"]:before, .dropdown-menu .dropdown-container >ul li a:focus[class*=" oc-icon-"]:before {color:#fff} .dropdown-menu .dropdown-container >ul li a:active {color:#fff;background-color:#3498db} +.dropdown-menu .dropdown-container >ul li a:active[class^="wn-icon-"]:before, +.dropdown-menu .dropdown-container >ul li a:active[class*=" wn-icon-"]:before, .dropdown-menu .dropdown-container >ul li a:active[class^="oc-icon-"]:before, .dropdown-menu .dropdown-container >ul li a:active[class*=" oc-icon-"]:before {color:#fff} +.dropdown-menu .dropdown-container >ul li a[class^="wn-icon-"], +.dropdown-menu .dropdown-container >ul li a[class*=" wn-icon-"], .dropdown-menu .dropdown-container >ul li a[class^="oc-icon-"], .dropdown-menu .dropdown-container >ul li a[class*=" oc-icon-"] {padding-left:30px} +.dropdown-menu .dropdown-container >ul li a[class^="wn-icon-"]:before, +.dropdown-menu .dropdown-container >ul li a[class*=" wn-icon-"]:before, .dropdown-menu .dropdown-container >ul li a[class^="oc-icon-"]:before, .dropdown-menu .dropdown-container >ul li a[class*=" oc-icon-"]:before {position:absolute;font-size:14px;left:9px;top:8px;color:rgba(57,69,74,0.6)} .dropdown-menu .dropdown-container >ul li.first-item a:hover:after, @@ -2818,6 +4414,9 @@ body.compact-container .control-breadcrumb {margin-top:0;margin-left:0;margin-ri .control-tabs >ul.nav-tabs >li a >span.title >span, .control-tabs >div >ul.nav-tabs >li a >span.title >span, .control-tabs >div >div >ul.nav-tabs >li a >span.title >span {max-width:150px;overflow:hidden;text-overflow:ellipsis;display:inline-block;border-top:2px solid #e0e0e0;margin-top:-4px;padding-top:7px} +.control-tabs >ul.nav-tabs >li a >span.title >span >span:not([class*="wn-icon"]), +.control-tabs >div >ul.nav-tabs >li a >span.title >span >span:not([class*="wn-icon"]), +.control-tabs >div >div >ul.nav-tabs >li a >span.title >span >span:not([class*="wn-icon"]), .control-tabs >ul.nav-tabs >li a >span.title >span >span:not([class*="oc-icon"]), .control-tabs >div >ul.nav-tabs >li a >span.title >span >span:not([class*="oc-icon"]), .control-tabs >div >div >ul.nav-tabs >li a >span.title >span >span:not([class*="oc-icon"]) {margin-right:8px} @@ -3116,6 +4715,8 @@ html.mobile [data-control=toolbar].is-native-drag {overflow:auto;-webkit-overflo .control-toolbar.editor-toolbar .toolbar-item .btn.disabled, .control-toolbar.editor-toolbar .toolbar-item .btn[disabled] {opacity:1;color:#bdbdbd;cursor:default;background:transparent} .control-toolbar.editor-toolbar .toolbar-item .dropdown.open .btn {background-color:#d6d6d6;color:#000} +.control-toolbar.editor-toolbar .toolbar-item .btn[class^="wn-icon-"]:before, +.control-toolbar.editor-toolbar .toolbar-item .btn[class*=" wn-icon-"]:before, .control-toolbar.editor-toolbar .toolbar-item .btn[class^="oc-icon-"]:before, .control-toolbar.editor-toolbar .toolbar-item .btn[class*=" oc-icon-"]:before {opacity:1;margin:0} .control-toolbar.editor-toolbar .toolbar-item .btn.oc-autumn-button {color:#c03f31} @@ -3148,10 +4749,11 @@ div.scoreboard:before {left:7px} div.scoreboard:after {right:10px} div.scoreboard div.scoreboard-item {display:inline-block;margin-right:40px;margin-bottom:20px;vertical-align:top} div.scoreboard div.scoreboard-item:last-child {margin-right:0} -div.scoreboard .control-chart {height:67px} +div.scoreboard .control-chart {min-height:67px} div.scoreboard .control-chart ul {margin-left:77px;top:-2px} div.scoreboard .control-chart ul li {padding-left:18px} div.scoreboard .control-chart ul li >i {margin-left:-18px} +div.scoreboard .control-chart div.canvas {margin-bottom:0} div.scoreboard .control-chart .canvas + ul {margin-left:0} div.scoreboard .scoreboard-offset {padding-left:20px} body.slim-container div.scoreboard {padding:0 20px} @@ -3172,518 +4774,776 @@ body.slim-container div.scoreboard {padding:0 20px} [class^="flag-"]:before, [class*=" flag-"]:before {content:"\00a0"} [class^="flag-"].oc-flag-squared, -[class*=" flag-"].oc-flag-squared {width:1em} +[class*=" flag-"].oc-flag-squared, +[class^="flag-"].wn-flag-squared, +[class*=" flag-"].wn-flag-squared {width:1em} .flag-ad {background-image:url(vendor/flag-icon/flags/4x3/ad.svg)} +.flag-ad.wn-flag-squared, .flag-ad.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ad.svg)} .flag-ae {background-image:url(vendor/flag-icon/flags/4x3/ae.svg)} +.flag-ae.wn-flag-squared, .flag-ae.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ae.svg)} .flag-af {background-image:url(vendor/flag-icon/flags/4x3/af.svg)} +.flag-af.wn-flag-squared, .flag-af.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/af.svg)} .flag-ag {background-image:url(vendor/flag-icon/flags/4x3/ag.svg)} +.flag-ag.wn-flag-squared, .flag-ag.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ag.svg)} .flag-ai {background-image:url(vendor/flag-icon/flags/4x3/ai.svg)} +.flag-ai.wn-flag-squared, .flag-ai.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ai.svg)} .flag-al {background-image:url(vendor/flag-icon/flags/4x3/al.svg)} +.flag-al.wn-flag-squared, .flag-al.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/al.svg)} .flag-am {background-image:url(vendor/flag-icon/flags/4x3/am.svg)} +.flag-am.wn-flag-squared, .flag-am.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/am.svg)} .flag-ao {background-image:url(vendor/flag-icon/flags/4x3/ao.svg)} +.flag-ao.wn-flag-squared, .flag-ao.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ao.svg)} .flag-aq {background-image:url(vendor/flag-icon/flags/4x3/aq.svg)} +.flag-aq.wn-flag-squared, .flag-aq.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/aq.svg)} .flag-ar {background-image:url(vendor/flag-icon/flags/4x3/ar.svg)} +.flag-ar.wn-flag-squared, .flag-ar.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ar.svg)} .flag-as {background-image:url(vendor/flag-icon/flags/4x3/as.svg)} +.flag-as.wn-flag-squared, .flag-as.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/as.svg)} .flag-at {background-image:url(vendor/flag-icon/flags/4x3/at.svg)} +.flag-at.wn-flag-squared, .flag-at.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/at.svg)} .flag-au {background-image:url(vendor/flag-icon/flags/4x3/au.svg)} +.flag-au.wn-flag-squared, .flag-au.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/au.svg)} .flag-aw {background-image:url(vendor/flag-icon/flags/4x3/aw.svg)} +.flag-aw.wn-flag-squared, .flag-aw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/aw.svg)} .flag-ax {background-image:url(vendor/flag-icon/flags/4x3/ax.svg)} +.flag-ax.wn-flag-squared, .flag-ax.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ax.svg)} .flag-az {background-image:url(vendor/flag-icon/flags/4x3/az.svg)} +.flag-az.wn-flag-squared, .flag-az.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/az.svg)} .flag-ba {background-image:url(vendor/flag-icon/flags/4x3/ba.svg)} +.flag-ba.wn-flag-squared, .flag-ba.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ba.svg)} .flag-bb {background-image:url(vendor/flag-icon/flags/4x3/bb.svg)} +.flag-bb.wn-flag-squared, .flag-bb.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bb.svg)} .flag-bd {background-image:url(vendor/flag-icon/flags/4x3/bd.svg)} +.flag-bd.wn-flag-squared, .flag-bd.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bd.svg)} .flag-be {background-image:url(vendor/flag-icon/flags/4x3/be.svg)} +.flag-be.wn-flag-squared, .flag-be.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/be.svg)} .flag-bf {background-image:url(vendor/flag-icon/flags/4x3/bf.svg)} +.flag-bf.wn-flag-squared, .flag-bf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bf.svg)} .flag-bg {background-image:url(vendor/flag-icon/flags/4x3/bg.svg)} +.flag-bg.wn-flag-squared, .flag-bg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bg.svg)} .flag-bh {background-image:url(vendor/flag-icon/flags/4x3/bh.svg)} +.flag-bh.wn-flag-squared, .flag-bh.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bh.svg)} .flag-bi {background-image:url(vendor/flag-icon/flags/4x3/bi.svg)} +.flag-bi.wn-flag-squared, .flag-bi.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bi.svg)} .flag-bj {background-image:url(vendor/flag-icon/flags/4x3/bj.svg)} +.flag-bj.wn-flag-squared, .flag-bj.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bj.svg)} .flag-bl {background-image:url(vendor/flag-icon/flags/4x3/bl.svg)} +.flag-bl.wn-flag-squared, .flag-bl.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bl.svg)} .flag-bm {background-image:url(vendor/flag-icon/flags/4x3/bm.svg)} +.flag-bm.wn-flag-squared, .flag-bm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bm.svg)} .flag-bn {background-image:url(vendor/flag-icon/flags/4x3/bn.svg)} +.flag-bn.wn-flag-squared, .flag-bn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bn.svg)} .flag-bo {background-image:url(vendor/flag-icon/flags/4x3/bo.svg)} +.flag-bo.wn-flag-squared, .flag-bo.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bo.svg)} .flag-bq {background-image:url(vendor/flag-icon/flags/4x3/bq.svg)} +.flag-bq.wn-flag-squared, .flag-bq.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bq.svg)} .flag-br {background-image:url(vendor/flag-icon/flags/4x3/br.svg)} +.flag-br.wn-flag-squared, .flag-br.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/br.svg)} .flag-bs {background-image:url(vendor/flag-icon/flags/4x3/bs.svg)} +.flag-bs.wn-flag-squared, .flag-bs.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bs.svg)} .flag-bt {background-image:url(vendor/flag-icon/flags/4x3/bt.svg)} +.flag-bt.wn-flag-squared, .flag-bt.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bt.svg)} .flag-bv {background-image:url(vendor/flag-icon/flags/4x3/bv.svg)} +.flag-bv.wn-flag-squared, .flag-bv.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bv.svg)} .flag-bw {background-image:url(vendor/flag-icon/flags/4x3/bw.svg)} +.flag-bw.wn-flag-squared, .flag-bw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bw.svg)} .flag-by {background-image:url(vendor/flag-icon/flags/4x3/by.svg)} +.flag-by.wn-flag-squared, .flag-by.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/by.svg)} .flag-bz {background-image:url(vendor/flag-icon/flags/4x3/bz.svg)} +.flag-bz.wn-flag-squared, .flag-bz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/bz.svg)} .flag-ca {background-image:url(vendor/flag-icon/flags/4x3/ca.svg)} +.flag-ca.wn-flag-squared, .flag-ca.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ca.svg)} .flag-cc {background-image:url(vendor/flag-icon/flags/4x3/cc.svg)} +.flag-cc.wn-flag-squared, .flag-cc.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cc.svg)} .flag-cd {background-image:url(vendor/flag-icon/flags/4x3/cd.svg)} +.flag-cd.wn-flag-squared, .flag-cd.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cd.svg)} .flag-cf {background-image:url(vendor/flag-icon/flags/4x3/cf.svg)} +.flag-cf.wn-flag-squared, .flag-cf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cf.svg)} .flag-cg {background-image:url(vendor/flag-icon/flags/4x3/cg.svg)} +.flag-cg.wn-flag-squared, .flag-cg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cg.svg)} .flag-ch {background-image:url(vendor/flag-icon/flags/4x3/ch.svg)} +.flag-ch.wn-flag-squared, .flag-ch.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ch.svg)} .flag-ci {background-image:url(vendor/flag-icon/flags/4x3/ci.svg)} +.flag-ci.wn-flag-squared, .flag-ci.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ci.svg)} .flag-ck {background-image:url(vendor/flag-icon/flags/4x3/ck.svg)} +.flag-ck.wn-flag-squared, .flag-ck.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ck.svg)} .flag-cl {background-image:url(vendor/flag-icon/flags/4x3/cl.svg)} +.flag-cl.wn-flag-squared, .flag-cl.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cl.svg)} .flag-cm {background-image:url(vendor/flag-icon/flags/4x3/cm.svg)} +.flag-cm.wn-flag-squared, .flag-cm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cm.svg)} .flag-cn {background-image:url(vendor/flag-icon/flags/4x3/cn.svg)} +.flag-cn.wn-flag-squared, .flag-cn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cn.svg)} .flag-co {background-image:url(vendor/flag-icon/flags/4x3/co.svg)} +.flag-co.wn-flag-squared, .flag-co.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/co.svg)} .flag-cr {background-image:url(vendor/flag-icon/flags/4x3/cr.svg)} +.flag-cr.wn-flag-squared, .flag-cr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cr.svg)} .flag-cu {background-image:url(vendor/flag-icon/flags/4x3/cu.svg)} +.flag-cu.wn-flag-squared, .flag-cu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cu.svg)} .flag-cv {background-image:url(vendor/flag-icon/flags/4x3/cv.svg)} +.flag-cv.wn-flag-squared, .flag-cv.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cv.svg)} .flag-cw {background-image:url(vendor/flag-icon/flags/4x3/cw.svg)} +.flag-cw.wn-flag-squared, .flag-cw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cw.svg)} .flag-cx {background-image:url(vendor/flag-icon/flags/4x3/cx.svg)} +.flag-cx.wn-flag-squared, .flag-cx.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cx.svg)} .flag-cy {background-image:url(vendor/flag-icon/flags/4x3/cy.svg)} +.flag-cy.wn-flag-squared, .flag-cy.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cy.svg)} .flag-cz {background-image:url(vendor/flag-icon/flags/4x3/cz.svg)} +.flag-cz.wn-flag-squared, .flag-cz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/cz.svg)} .flag-de {background-image:url(vendor/flag-icon/flags/4x3/de.svg)} +.flag-de.wn-flag-squared, .flag-de.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/de.svg)} .flag-dj {background-image:url(vendor/flag-icon/flags/4x3/dj.svg)} +.flag-dj.wn-flag-squared, .flag-dj.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/dj.svg)} .flag-dk {background-image:url(vendor/flag-icon/flags/4x3/dk.svg)} +.flag-dk.wn-flag-squared, .flag-dk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/dk.svg)} .flag-dm {background-image:url(vendor/flag-icon/flags/4x3/dm.svg)} +.flag-dm.wn-flag-squared, .flag-dm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/dm.svg)} .flag-do {background-image:url(vendor/flag-icon/flags/4x3/do.svg)} +.flag-do.wn-flag-squared, .flag-do.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/do.svg)} .flag-dz {background-image:url(vendor/flag-icon/flags/4x3/dz.svg)} +.flag-dz.wn-flag-squared, .flag-dz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/dz.svg)} .flag-ec {background-image:url(vendor/flag-icon/flags/4x3/ec.svg)} +.flag-ec.wn-flag-squared, .flag-ec.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ec.svg)} .flag-ee {background-image:url(vendor/flag-icon/flags/4x3/ee.svg)} +.flag-ee.wn-flag-squared, .flag-ee.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ee.svg)} .flag-eg {background-image:url(vendor/flag-icon/flags/4x3/eg.svg)} +.flag-eg.wn-flag-squared, .flag-eg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/eg.svg)} .flag-eh {background-image:url(vendor/flag-icon/flags/4x3/eh.svg)} +.flag-eh.wn-flag-squared, .flag-eh.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/eh.svg)} .flag-er {background-image:url(vendor/flag-icon/flags/4x3/er.svg)} +.flag-er.wn-flag-squared, .flag-er.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/er.svg)} .flag-es {background-image:url(vendor/flag-icon/flags/4x3/es.svg)} +.flag-es.wn-flag-squared, .flag-es.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/es.svg)} .flag-et {background-image:url(vendor/flag-icon/flags/4x3/et.svg)} +.flag-et.wn-flag-squared, .flag-et.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/et.svg)} .flag-fi {background-image:url(vendor/flag-icon/flags/4x3/fi.svg)} +.flag-fi.wn-flag-squared, .flag-fi.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/fi.svg)} .flag-fj {background-image:url(vendor/flag-icon/flags/4x3/fj.svg)} +.flag-fj.wn-flag-squared, .flag-fj.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/fj.svg)} .flag-fk {background-image:url(vendor/flag-icon/flags/4x3/fk.svg)} +.flag-fk.wn-flag-squared, .flag-fk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/fk.svg)} .flag-fm {background-image:url(vendor/flag-icon/flags/4x3/fm.svg)} +.flag-fm.wn-flag-squared, .flag-fm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/fm.svg)} .flag-fo {background-image:url(vendor/flag-icon/flags/4x3/fo.svg)} +.flag-fo.wn-flag-squared, .flag-fo.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/fo.svg)} .flag-fr {background-image:url(vendor/flag-icon/flags/4x3/fr.svg)} +.flag-fr.wn-flag-squared, .flag-fr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/fr.svg)} .flag-ga {background-image:url(vendor/flag-icon/flags/4x3/ga.svg)} +.flag-ga.wn-flag-squared, .flag-ga.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ga.svg)} .flag-gb {background-image:url(vendor/flag-icon/flags/4x3/gb.svg)} +.flag-gb.wn-flag-squared, .flag-gb.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gb.svg)} .flag-gd {background-image:url(vendor/flag-icon/flags/4x3/gd.svg)} +.flag-gd.wn-flag-squared, .flag-gd.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gd.svg)} .flag-ge {background-image:url(vendor/flag-icon/flags/4x3/ge.svg)} +.flag-ge.wn-flag-squared, .flag-ge.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ge.svg)} .flag-gf {background-image:url(vendor/flag-icon/flags/4x3/gf.svg)} +.flag-gf.wn-flag-squared, .flag-gf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gf.svg)} .flag-gg {background-image:url(vendor/flag-icon/flags/4x3/gg.svg)} +.flag-gg.wn-flag-squared, .flag-gg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gg.svg)} .flag-gh {background-image:url(vendor/flag-icon/flags/4x3/gh.svg)} +.flag-gh.wn-flag-squared, .flag-gh.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gh.svg)} .flag-gi {background-image:url(vendor/flag-icon/flags/4x3/gi.svg)} +.flag-gi.wn-flag-squared, .flag-gi.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gi.svg)} .flag-gl {background-image:url(vendor/flag-icon/flags/4x3/gl.svg)} +.flag-gl.wn-flag-squared, .flag-gl.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gl.svg)} .flag-gm {background-image:url(vendor/flag-icon/flags/4x3/gm.svg)} +.flag-gm.wn-flag-squared, .flag-gm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gm.svg)} .flag-gn {background-image:url(vendor/flag-icon/flags/4x3/gn.svg)} +.flag-gn.wn-flag-squared, .flag-gn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gn.svg)} .flag-gp {background-image:url(vendor/flag-icon/flags/4x3/gp.svg)} +.flag-gp.wn-flag-squared, .flag-gp.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gp.svg)} .flag-gq {background-image:url(vendor/flag-icon/flags/4x3/gq.svg)} +.flag-gq.wn-flag-squared, .flag-gq.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gq.svg)} .flag-gr {background-image:url(vendor/flag-icon/flags/4x3/gr.svg)} +.flag-gr.wn-flag-squared, .flag-gr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gr.svg)} .flag-gs {background-image:url(vendor/flag-icon/flags/4x3/gs.svg)} +.flag-gs.wn-flag-squared, .flag-gs.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gs.svg)} .flag-gt {background-image:url(vendor/flag-icon/flags/4x3/gt.svg)} +.flag-gt.wn-flag-squared, .flag-gt.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gt.svg)} .flag-gu {background-image:url(vendor/flag-icon/flags/4x3/gu.svg)} +.flag-gu.wn-flag-squared, .flag-gu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gu.svg)} .flag-gw {background-image:url(vendor/flag-icon/flags/4x3/gw.svg)} +.flag-gw.wn-flag-squared, .flag-gw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gw.svg)} .flag-gy {background-image:url(vendor/flag-icon/flags/4x3/gy.svg)} +.flag-gy.wn-flag-squared, .flag-gy.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gy.svg)} .flag-hk {background-image:url(vendor/flag-icon/flags/4x3/hk.svg)} +.flag-hk.wn-flag-squared, .flag-hk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/hk.svg)} .flag-hm {background-image:url(vendor/flag-icon/flags/4x3/hm.svg)} +.flag-hm.wn-flag-squared, .flag-hm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/hm.svg)} .flag-hn {background-image:url(vendor/flag-icon/flags/4x3/hn.svg)} +.flag-hn.wn-flag-squared, .flag-hn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/hn.svg)} .flag-hr {background-image:url(vendor/flag-icon/flags/4x3/hr.svg)} +.flag-hr.wn-flag-squared, .flag-hr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/hr.svg)} .flag-ht {background-image:url(vendor/flag-icon/flags/4x3/ht.svg)} +.flag-ht.wn-flag-squared, .flag-ht.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ht.svg)} .flag-hu {background-image:url(vendor/flag-icon/flags/4x3/hu.svg)} +.flag-hu.wn-flag-squared, .flag-hu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/hu.svg)} .flag-id {background-image:url(vendor/flag-icon/flags/4x3/id.svg)} +.flag-id.wn-flag-squared, .flag-id.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/id.svg)} .flag-ie {background-image:url(vendor/flag-icon/flags/4x3/ie.svg)} +.flag-ie.wn-flag-squared, .flag-ie.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ie.svg)} .flag-il {background-image:url(vendor/flag-icon/flags/4x3/il.svg)} +.flag-il.wn-flag-squared, .flag-il.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/il.svg)} .flag-im {background-image:url(vendor/flag-icon/flags/4x3/im.svg)} +.flag-im.wn-flag-squared, .flag-im.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/im.svg)} .flag-in {background-image:url(vendor/flag-icon/flags/4x3/in.svg)} +.flag-in.wn-flag-squared, .flag-in.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/in.svg)} .flag-io {background-image:url(vendor/flag-icon/flags/4x3/io.svg)} +.flag-io.wn-flag-squared, .flag-io.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/io.svg)} .flag-iq {background-image:url(vendor/flag-icon/flags/4x3/iq.svg)} +.flag-iq.wn-flag-squared, .flag-iq.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/iq.svg)} .flag-ir {background-image:url(vendor/flag-icon/flags/4x3/ir.svg)} +.flag-ir.wn-flag-squared, .flag-ir.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ir.svg)} .flag-is {background-image:url(vendor/flag-icon/flags/4x3/is.svg)} +.flag-is.wn-flag-squared, .flag-is.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/is.svg)} .flag-it {background-image:url(vendor/flag-icon/flags/4x3/it.svg)} +.flag-it.wn-flag-squared, .flag-it.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/it.svg)} .flag-je {background-image:url(vendor/flag-icon/flags/4x3/je.svg)} +.flag-je.wn-flag-squared, .flag-je.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/je.svg)} .flag-jm {background-image:url(vendor/flag-icon/flags/4x3/jm.svg)} +.flag-jm.wn-flag-squared, .flag-jm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/jm.svg)} .flag-jo {background-image:url(vendor/flag-icon/flags/4x3/jo.svg)} +.flag-jo.wn-flag-squared, .flag-jo.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/jo.svg)} .flag-jp {background-image:url(vendor/flag-icon/flags/4x3/jp.svg)} +.flag-jp.wn-flag-squared, .flag-jp.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/jp.svg)} .flag-ke {background-image:url(vendor/flag-icon/flags/4x3/ke.svg)} +.flag-ke.wn-flag-squared, .flag-ke.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ke.svg)} .flag-kg {background-image:url(vendor/flag-icon/flags/4x3/kg.svg)} +.flag-kg.wn-flag-squared, .flag-kg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/kg.svg)} .flag-kh {background-image:url(vendor/flag-icon/flags/4x3/kh.svg)} +.flag-kh.wn-flag-squared, .flag-kh.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/kh.svg)} .flag-ki {background-image:url(vendor/flag-icon/flags/4x3/ki.svg)} +.flag-ki.wn-flag-squared, .flag-ki.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ki.svg)} .flag-km {background-image:url(vendor/flag-icon/flags/4x3/km.svg)} +.flag-km.wn-flag-squared, .flag-km.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/km.svg)} .flag-kn {background-image:url(vendor/flag-icon/flags/4x3/kn.svg)} +.flag-kn.wn-flag-squared, .flag-kn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/kn.svg)} .flag-kp {background-image:url(vendor/flag-icon/flags/4x3/kp.svg)} +.flag-kp.wn-flag-squared, .flag-kp.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/kp.svg)} .flag-kr {background-image:url(vendor/flag-icon/flags/4x3/kr.svg)} +.flag-kr.wn-flag-squared, .flag-kr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/kr.svg)} .flag-kw {background-image:url(vendor/flag-icon/flags/4x3/kw.svg)} +.flag-kw.wn-flag-squared, .flag-kw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/kw.svg)} .flag-ky {background-image:url(vendor/flag-icon/flags/4x3/ky.svg)} +.flag-ky.wn-flag-squared, .flag-ky.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ky.svg)} .flag-kz {background-image:url(vendor/flag-icon/flags/4x3/kz.svg)} +.flag-kz.wn-flag-squared, .flag-kz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/kz.svg)} .flag-la {background-image:url(vendor/flag-icon/flags/4x3/la.svg)} +.flag-la.wn-flag-squared, .flag-la.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/la.svg)} .flag-lb {background-image:url(vendor/flag-icon/flags/4x3/lb.svg)} +.flag-lb.wn-flag-squared, .flag-lb.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/lb.svg)} .flag-lc {background-image:url(vendor/flag-icon/flags/4x3/lc.svg)} +.flag-lc.wn-flag-squared, .flag-lc.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/lc.svg)} .flag-li {background-image:url(vendor/flag-icon/flags/4x3/li.svg)} +.flag-li.wn-flag-squared, .flag-li.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/li.svg)} .flag-lk {background-image:url(vendor/flag-icon/flags/4x3/lk.svg)} +.flag-lk.wn-flag-squared, .flag-lk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/lk.svg)} .flag-lr {background-image:url(vendor/flag-icon/flags/4x3/lr.svg)} +.flag-lr.wn-flag-squared, .flag-lr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/lr.svg)} .flag-ls {background-image:url(vendor/flag-icon/flags/4x3/ls.svg)} +.flag-ls.wn-flag-squared, .flag-ls.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ls.svg)} .flag-lt {background-image:url(vendor/flag-icon/flags/4x3/lt.svg)} +.flag-lt.wn-flag-squared, .flag-lt.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/lt.svg)} .flag-lu {background-image:url(vendor/flag-icon/flags/4x3/lu.svg)} +.flag-lu.wn-flag-squared, .flag-lu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/lu.svg)} .flag-lv {background-image:url(vendor/flag-icon/flags/4x3/lv.svg)} +.flag-lv.wn-flag-squared, .flag-lv.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/lv.svg)} .flag-ly {background-image:url(vendor/flag-icon/flags/4x3/ly.svg)} +.flag-ly.wn-flag-squared, .flag-ly.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ly.svg)} .flag-ma {background-image:url(vendor/flag-icon/flags/4x3/ma.svg)} +.flag-ma.wn-flag-squared, .flag-ma.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ma.svg)} .flag-mc {background-image:url(vendor/flag-icon/flags/4x3/mc.svg)} +.flag-mc.wn-flag-squared, .flag-mc.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mc.svg)} .flag-md {background-image:url(vendor/flag-icon/flags/4x3/md.svg)} +.flag-md.wn-flag-squared, .flag-md.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/md.svg)} .flag-me {background-image:url(vendor/flag-icon/flags/4x3/me.svg)} +.flag-me.wn-flag-squared, .flag-me.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/me.svg)} .flag-mf {background-image:url(vendor/flag-icon/flags/4x3/mf.svg)} +.flag-mf.wn-flag-squared, .flag-mf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mf.svg)} .flag-mg {background-image:url(vendor/flag-icon/flags/4x3/mg.svg)} +.flag-mg.wn-flag-squared, .flag-mg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mg.svg)} .flag-mh {background-image:url(vendor/flag-icon/flags/4x3/mh.svg)} +.flag-mh.wn-flag-squared, .flag-mh.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mh.svg)} .flag-mk {background-image:url(vendor/flag-icon/flags/4x3/mk.svg)} +.flag-mk.wn-flag-squared, .flag-mk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mk.svg)} .flag-ml {background-image:url(vendor/flag-icon/flags/4x3/ml.svg)} +.flag-ml.wn-flag-squared, .flag-ml.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ml.svg)} .flag-mm {background-image:url(vendor/flag-icon/flags/4x3/mm.svg)} +.flag-mm.wn-flag-squared, .flag-mm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mm.svg)} .flag-mn {background-image:url(vendor/flag-icon/flags/4x3/mn.svg)} +.flag-mn.wn-flag-squared, .flag-mn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mn.svg)} .flag-mo {background-image:url(vendor/flag-icon/flags/4x3/mo.svg)} +.flag-mo.wn-flag-squared, .flag-mo.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mo.svg)} .flag-mp {background-image:url(vendor/flag-icon/flags/4x3/mp.svg)} +.flag-mp.wn-flag-squared, .flag-mp.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mp.svg)} .flag-mq {background-image:url(vendor/flag-icon/flags/4x3/mq.svg)} +.flag-mq.wn-flag-squared, .flag-mq.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mq.svg)} .flag-mr {background-image:url(vendor/flag-icon/flags/4x3/mr.svg)} +.flag-mr.wn-flag-squared, .flag-mr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mr.svg)} .flag-ms {background-image:url(vendor/flag-icon/flags/4x3/ms.svg)} +.flag-ms.wn-flag-squared, .flag-ms.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ms.svg)} .flag-mt {background-image:url(vendor/flag-icon/flags/4x3/mt.svg)} +.flag-mt.wn-flag-squared, .flag-mt.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mt.svg)} .flag-mu {background-image:url(vendor/flag-icon/flags/4x3/mu.svg)} +.flag-mu.wn-flag-squared, .flag-mu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mu.svg)} .flag-mv {background-image:url(vendor/flag-icon/flags/4x3/mv.svg)} +.flag-mv.wn-flag-squared, .flag-mv.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mv.svg)} .flag-mw {background-image:url(vendor/flag-icon/flags/4x3/mw.svg)} +.flag-mw.wn-flag-squared, .flag-mw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mw.svg)} .flag-mx {background-image:url(vendor/flag-icon/flags/4x3/mx.svg)} +.flag-mx.wn-flag-squared, .flag-mx.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mx.svg)} .flag-my {background-image:url(vendor/flag-icon/flags/4x3/my.svg)} +.flag-my.wn-flag-squared, .flag-my.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/my.svg)} .flag-mz {background-image:url(vendor/flag-icon/flags/4x3/mz.svg)} +.flag-mz.wn-flag-squared, .flag-mz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/mz.svg)} .flag-na {background-image:url(vendor/flag-icon/flags/4x3/na.svg)} +.flag-na.wn-flag-squared, .flag-na.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/na.svg)} .flag-nc {background-image:url(vendor/flag-icon/flags/4x3/nc.svg)} +.flag-nc.wn-flag-squared, .flag-nc.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/nc.svg)} .flag-ne {background-image:url(vendor/flag-icon/flags/4x3/ne.svg)} +.flag-ne.wn-flag-squared, .flag-ne.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ne.svg)} .flag-nf {background-image:url(vendor/flag-icon/flags/4x3/nf.svg)} +.flag-nf.wn-flag-squared, .flag-nf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/nf.svg)} .flag-ng {background-image:url(vendor/flag-icon/flags/4x3/ng.svg)} +.flag-ng.wn-flag-squared, .flag-ng.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ng.svg)} .flag-ni {background-image:url(vendor/flag-icon/flags/4x3/ni.svg)} +.flag-ni.wn-flag-squared, .flag-ni.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ni.svg)} .flag-nl {background-image:url(vendor/flag-icon/flags/4x3/nl.svg)} +.flag-nl.wn-flag-squared, .flag-nl.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/nl.svg)} .flag-no {background-image:url(vendor/flag-icon/flags/4x3/no.svg)} +.flag-no.wn-flag-squared, .flag-no.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/no.svg)} .flag-np {background-image:url(vendor/flag-icon/flags/4x3/np.svg)} +.flag-np.wn-flag-squared, .flag-np.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/np.svg)} .flag-nr {background-image:url(vendor/flag-icon/flags/4x3/nr.svg)} +.flag-nr.wn-flag-squared, .flag-nr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/nr.svg)} .flag-nu {background-image:url(vendor/flag-icon/flags/4x3/nu.svg)} +.flag-nu.wn-flag-squared, .flag-nu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/nu.svg)} .flag-nz {background-image:url(vendor/flag-icon/flags/4x3/nz.svg)} +.flag-nz.wn-flag-squared, .flag-nz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/nz.svg)} .flag-om {background-image:url(vendor/flag-icon/flags/4x3/om.svg)} +.flag-om.wn-flag-squared, .flag-om.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/om.svg)} .flag-pa {background-image:url(vendor/flag-icon/flags/4x3/pa.svg)} +.flag-pa.wn-flag-squared, .flag-pa.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pa.svg)} .flag-pe {background-image:url(vendor/flag-icon/flags/4x3/pe.svg)} +.flag-pe.wn-flag-squared, .flag-pe.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pe.svg)} .flag-pf {background-image:url(vendor/flag-icon/flags/4x3/pf.svg)} +.flag-pf.wn-flag-squared, .flag-pf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pf.svg)} .flag-pg {background-image:url(vendor/flag-icon/flags/4x3/pg.svg)} +.flag-pg.wn-flag-squared, .flag-pg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pg.svg)} .flag-ph {background-image:url(vendor/flag-icon/flags/4x3/ph.svg)} +.flag-ph.wn-flag-squared, .flag-ph.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ph.svg)} .flag-pk {background-image:url(vendor/flag-icon/flags/4x3/pk.svg)} +.flag-pk.wn-flag-squared, .flag-pk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pk.svg)} .flag-pl {background-image:url(vendor/flag-icon/flags/4x3/pl.svg)} +.flag-pl.wn-flag-squared, .flag-pl.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pl.svg)} .flag-pm {background-image:url(vendor/flag-icon/flags/4x3/pm.svg)} +.flag-pm.wn-flag-squared, .flag-pm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pm.svg)} .flag-pn {background-image:url(vendor/flag-icon/flags/4x3/pn.svg)} +.flag-pn.wn-flag-squared, .flag-pn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pn.svg)} .flag-pr {background-image:url(vendor/flag-icon/flags/4x3/pr.svg)} +.flag-pr.wn-flag-squared, .flag-pr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pr.svg)} .flag-ps {background-image:url(vendor/flag-icon/flags/4x3/ps.svg)} +.flag-ps.wn-flag-squared, .flag-ps.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ps.svg)} .flag-pt {background-image:url(vendor/flag-icon/flags/4x3/pt.svg)} +.flag-pt.wn-flag-squared, .flag-pt.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pt.svg)} .flag-pw {background-image:url(vendor/flag-icon/flags/4x3/pw.svg)} +.flag-pw.wn-flag-squared, .flag-pw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/pw.svg)} .flag-py {background-image:url(vendor/flag-icon/flags/4x3/py.svg)} +.flag-py.wn-flag-squared, .flag-py.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/py.svg)} .flag-qa {background-image:url(vendor/flag-icon/flags/4x3/qa.svg)} +.flag-qa.wn-flag-squared, .flag-qa.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/qa.svg)} .flag-re {background-image:url(vendor/flag-icon/flags/4x3/re.svg)} +.flag-re.wn-flag-squared, .flag-re.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/re.svg)} .flag-ro {background-image:url(vendor/flag-icon/flags/4x3/ro.svg)} +.flag-ro.wn-flag-squared, .flag-ro.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ro.svg)} .flag-rs {background-image:url(vendor/flag-icon/flags/4x3/rs.svg)} +.flag-rs.wn-flag-squared, .flag-rs.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/rs.svg)} .flag-ru {background-image:url(vendor/flag-icon/flags/4x3/ru.svg)} +.flag-ru.wn-flag-squared, .flag-ru.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ru.svg)} .flag-rw {background-image:url(vendor/flag-icon/flags/4x3/rw.svg)} +.flag-rw.wn-flag-squared, .flag-rw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/rw.svg)} .flag-sa {background-image:url(vendor/flag-icon/flags/4x3/sa.svg)} +.flag-sa.wn-flag-squared, .flag-sa.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sa.svg)} .flag-sb {background-image:url(vendor/flag-icon/flags/4x3/sb.svg)} +.flag-sb.wn-flag-squared, .flag-sb.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sb.svg)} .flag-sc {background-image:url(vendor/flag-icon/flags/4x3/sc.svg)} +.flag-sc.wn-flag-squared, .flag-sc.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sc.svg)} .flag-sd {background-image:url(vendor/flag-icon/flags/4x3/sd.svg)} +.flag-sd.wn-flag-squared, .flag-sd.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sd.svg)} .flag-se {background-image:url(vendor/flag-icon/flags/4x3/se.svg)} +.flag-se.wn-flag-squared, .flag-se.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/se.svg)} .flag-sg {background-image:url(vendor/flag-icon/flags/4x3/sg.svg)} +.flag-sg.wn-flag-squared, .flag-sg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sg.svg)} .flag-sh {background-image:url(vendor/flag-icon/flags/4x3/sh.svg)} +.flag-sh.wn-flag-squared, .flag-sh.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sh.svg)} .flag-si {background-image:url(vendor/flag-icon/flags/4x3/si.svg)} +.flag-si.wn-flag-squared, .flag-si.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/si.svg)} .flag-sj {background-image:url(vendor/flag-icon/flags/4x3/sj.svg)} +.flag-sj.wn-flag-squared, .flag-sj.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sj.svg)} .flag-sk {background-image:url(vendor/flag-icon/flags/4x3/sk.svg)} +.flag-sk.wn-flag-squared, .flag-sk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sk.svg)} .flag-sl {background-image:url(vendor/flag-icon/flags/4x3/sl.svg)} +.flag-sl.wn-flag-squared, .flag-sl.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sl.svg)} .flag-sm {background-image:url(vendor/flag-icon/flags/4x3/sm.svg)} +.flag-sm.wn-flag-squared, .flag-sm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sm.svg)} .flag-sn {background-image:url(vendor/flag-icon/flags/4x3/sn.svg)} +.flag-sn.wn-flag-squared, .flag-sn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sn.svg)} .flag-so {background-image:url(vendor/flag-icon/flags/4x3/so.svg)} +.flag-so.wn-flag-squared, .flag-so.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/so.svg)} .flag-sr {background-image:url(vendor/flag-icon/flags/4x3/sr.svg)} +.flag-sr.wn-flag-squared, .flag-sr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sr.svg)} .flag-ss {background-image:url(vendor/flag-icon/flags/4x3/ss.svg)} +.flag-ss.wn-flag-squared, .flag-ss.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ss.svg)} .flag-st {background-image:url(vendor/flag-icon/flags/4x3/st.svg)} +.flag-st.wn-flag-squared, .flag-st.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/st.svg)} .flag-sv {background-image:url(vendor/flag-icon/flags/4x3/sv.svg)} +.flag-sv.wn-flag-squared, .flag-sv.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sv.svg)} .flag-sx {background-image:url(vendor/flag-icon/flags/4x3/sx.svg)} +.flag-sx.wn-flag-squared, .flag-sx.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sx.svg)} .flag-sy {background-image:url(vendor/flag-icon/flags/4x3/sy.svg)} +.flag-sy.wn-flag-squared, .flag-sy.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sy.svg)} .flag-sz {background-image:url(vendor/flag-icon/flags/4x3/sz.svg)} +.flag-sz.wn-flag-squared, .flag-sz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/sz.svg)} .flag-tc {background-image:url(vendor/flag-icon/flags/4x3/tc.svg)} +.flag-tc.wn-flag-squared, .flag-tc.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tc.svg)} .flag-td {background-image:url(vendor/flag-icon/flags/4x3/td.svg)} +.flag-td.wn-flag-squared, .flag-td.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/td.svg)} .flag-tf {background-image:url(vendor/flag-icon/flags/4x3/tf.svg)} +.flag-tf.wn-flag-squared, .flag-tf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tf.svg)} .flag-tg {background-image:url(vendor/flag-icon/flags/4x3/tg.svg)} +.flag-tg.wn-flag-squared, .flag-tg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tg.svg)} .flag-th {background-image:url(vendor/flag-icon/flags/4x3/th.svg)} +.flag-th.wn-flag-squared, .flag-th.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/th.svg)} .flag-tj {background-image:url(vendor/flag-icon/flags/4x3/tj.svg)} +.flag-tj.wn-flag-squared, .flag-tj.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tj.svg)} .flag-tk {background-image:url(vendor/flag-icon/flags/4x3/tk.svg)} +.flag-tk.wn-flag-squared, .flag-tk.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tk.svg)} .flag-tl {background-image:url(vendor/flag-icon/flags/4x3/tl.svg)} +.flag-tl.wn-flag-squared, .flag-tl.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tl.svg)} .flag-tm {background-image:url(vendor/flag-icon/flags/4x3/tm.svg)} +.flag-tm.wn-flag-squared, .flag-tm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tm.svg)} .flag-tn {background-image:url(vendor/flag-icon/flags/4x3/tn.svg)} +.flag-tn.wn-flag-squared, .flag-tn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tn.svg)} .flag-to {background-image:url(vendor/flag-icon/flags/4x3/to.svg)} +.flag-to.wn-flag-squared, .flag-to.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/to.svg)} .flag-tr {background-image:url(vendor/flag-icon/flags/4x3/tr.svg)} +.flag-tr.wn-flag-squared, .flag-tr.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tr.svg)} .flag-tt {background-image:url(vendor/flag-icon/flags/4x3/tt.svg)} +.flag-tt.wn-flag-squared, .flag-tt.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tt.svg)} .flag-tv {background-image:url(vendor/flag-icon/flags/4x3/tv.svg)} +.flag-tv.wn-flag-squared, .flag-tv.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tv.svg)} .flag-tw {background-image:url(vendor/flag-icon/flags/4x3/tw.svg)} +.flag-tw.wn-flag-squared, .flag-tw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tw.svg)} .flag-tz {background-image:url(vendor/flag-icon/flags/4x3/tz.svg)} +.flag-tz.wn-flag-squared, .flag-tz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/tz.svg)} .flag-ua {background-image:url(vendor/flag-icon/flags/4x3/ua.svg)} +.flag-ua.wn-flag-squared, .flag-ua.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ua.svg)} .flag-ug {background-image:url(vendor/flag-icon/flags/4x3/ug.svg)} +.flag-ug.wn-flag-squared, .flag-ug.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ug.svg)} .flag-um {background-image:url(vendor/flag-icon/flags/4x3/um.svg)} +.flag-um.wn-flag-squared, .flag-um.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/um.svg)} .flag-us {background-image:url(vendor/flag-icon/flags/4x3/us.svg)} +.flag-us.wn-flag-squared, .flag-us.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/us.svg)} .flag-uy {background-image:url(vendor/flag-icon/flags/4x3/uy.svg)} +.flag-uy.wn-flag-squared, .flag-uy.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/uy.svg)} .flag-uz {background-image:url(vendor/flag-icon/flags/4x3/uz.svg)} +.flag-uz.wn-flag-squared, .flag-uz.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/uz.svg)} .flag-va {background-image:url(vendor/flag-icon/flags/4x3/va.svg)} +.flag-va.wn-flag-squared, .flag-va.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/va.svg)} .flag-vc {background-image:url(vendor/flag-icon/flags/4x3/vc.svg)} +.flag-vc.wn-flag-squared, .flag-vc.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/vc.svg)} .flag-ve {background-image:url(vendor/flag-icon/flags/4x3/ve.svg)} +.flag-ve.wn-flag-squared, .flag-ve.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ve.svg)} .flag-vg {background-image:url(vendor/flag-icon/flags/4x3/vg.svg)} +.flag-vg.wn-flag-squared, .flag-vg.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/vg.svg)} .flag-vi {background-image:url(vendor/flag-icon/flags/4x3/vi.svg)} +.flag-vi.wn-flag-squared, .flag-vi.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/vi.svg)} .flag-vn {background-image:url(vendor/flag-icon/flags/4x3/vn.svg)} +.flag-vn.wn-flag-squared, .flag-vn.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/vn.svg)} .flag-vu {background-image:url(vendor/flag-icon/flags/4x3/vu.svg)} +.flag-vu.wn-flag-squared, .flag-vu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/vu.svg)} .flag-wf {background-image:url(vendor/flag-icon/flags/4x3/wf.svg)} +.flag-wf.wn-flag-squared, .flag-wf.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/wf.svg)} .flag-ws {background-image:url(vendor/flag-icon/flags/4x3/ws.svg)} +.flag-ws.wn-flag-squared, .flag-ws.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ws.svg)} .flag-ye {background-image:url(vendor/flag-icon/flags/4x3/ye.svg)} +.flag-ye.wn-flag-squared, .flag-ye.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/ye.svg)} .flag-yt {background-image:url(vendor/flag-icon/flags/4x3/yt.svg)} +.flag-yt.wn-flag-squared, .flag-yt.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/yt.svg)} .flag-za {background-image:url(vendor/flag-icon/flags/4x3/za.svg)} +.flag-za.wn-flag-squared, .flag-za.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/za.svg)} .flag-zm {background-image:url(vendor/flag-icon/flags/4x3/zm.svg)} +.flag-zm.wn-flag-squared, .flag-zm.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/zm.svg)} .flag-zw {background-image:url(vendor/flag-icon/flags/4x3/zw.svg)} +.flag-zw.wn-flag-squared, .flag-zw.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/zw.svg)} .flag-es-ct {background-image:url(vendor/flag-icon/flags/4x3/es-ct.svg)} +.flag-es-ct.wn-flag-squared, .flag-es-ct.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/es-ct.svg)} .flag-eu {background-image:url(vendor/flag-icon/flags/4x3/eu.svg)} +.flag-eu.wn-flag-squared, .flag-eu.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/eu.svg)} .flag-gb-eng {background-image:url(vendor/flag-icon/flags/4x3/gb-eng.svg)} +.flag-gb-eng.wn-flag-squared, .flag-gb-eng.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gb-eng.svg)} .flag-gb-nir {background-image:url(vendor/flag-icon/flags/4x3/gb-nir.svg)} +.flag-gb-nir.wn-flag-squared, .flag-gb-nir.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gb-nir.svg)} .flag-gb-sct {background-image:url(vendor/flag-icon/flags/4x3/gb-sct.svg)} +.flag-gb-sct.wn-flag-squared, .flag-gb-sct.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gb-sct.svg)} .flag-gb-wls {background-image:url(vendor/flag-icon/flags/4x3/gb-wls.svg)} +.flag-gb-wls.wn-flag-squared, .flag-gb-wls.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/gb-wls.svg)} .flag-un {background-image:url(vendor/flag-icon/flags/4x3/un.svg)} +.flag-un.wn-flag-squared, .flag-un.oc-flag-squared {background-image:url(vendor/flag-icon/flags/1x1/un.svg)} fieldset {padding:0;margin:0;border:0;min-width:0} legend {display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5} @@ -4096,7 +5956,7 @@ html.cssanimations .cursor-loading-indicator.hide {display:none} .custom-checkbox input[type=radio], .custom-radio input[type=radio], .custom-checkbox input[type=checkbox], -.custom-radio input[type=checkbox] {display:none} +.custom-radio input[type=checkbox] {display:block;opacity:0} .custom-checkbox label, .custom-radio label {display:inline-block;cursor:pointer;position:relative;padding-left:25px;margin-right:15px;margin-left:-20px;font-size:13px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .custom-checkbox label:before, diff --git a/modules/system/assets/ui/storm.js b/modules/system/assets/ui/storm.js index fe2706c85..8f66eaa4f 100644 --- a/modules/system/assets/ui/storm.js +++ b/modules/system/assets/ui/storm.js @@ -1,7 +1,9 @@ /* - __ _____ __ __ __ __ _____ __ __ - / \/ | / \|__)|_ |__) (_ | / \|__)|\/| - \__/\__ | \__/|__)|__| \ __) | \__/| \ | | + _ ___ __ _____ __ __ ______ +| | / (_)___ / /____ _____ / ___// /_____ _________ ___ / / / / _/ +| | /| / / / __ \/ __/ _ \/ ___/ \__ \/ __/ __ \/ ___/ __ `__ \ / / / // / +| |/ |/ / / / / / /_/ __/ / ___/ / /_/ /_/ / / / / / / / / / /_/ // / +|__/|__/_/_/ /_/\__/\___/_/ /____/\__/\____/_/ /_/ /_/ /_/ \____/___/ =require vendor/mustache/mustache.js =require vendor/modernizr/modernizr.js diff --git a/modules/system/assets/ui/vendor/select2/OCTOBER-README.md b/modules/system/assets/ui/vendor/select2/WINTER-README.md similarity index 100% rename from modules/system/assets/ui/vendor/select2/OCTOBER-README.md rename to modules/system/assets/ui/vendor/select2/WINTER-README.md diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php index 49b05268b..ac361d4ee 100644 --- a/modules/system/classes/CombineAssets.php +++ b/modules/system/classes/CombineAssets.php @@ -39,13 +39,13 @@ use DateTime; * - cms.enableAssetDeepHashing - Advanced caching of imports * * @see System\Classes\SystemController System controller - * @see https://octobercms.com/docs/services/session Session service - * @package october\system + * @see https://wintercms.com/docs/services/session Session service + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class CombineAssets { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; /** * @var array A list of known JavaScript extensions. @@ -552,7 +552,7 @@ class CombineAssets * function as an argument. Usage: * * CombineAssets::registerCallback(function ($combiner) { - * $combiner->registerBundle('~/modules/backend/assets/less/october.less'); + * $combiner->registerBundle('~/modules/backend/assets/less/winter.less'); * }); * * @param callable $callback A callable function. diff --git a/modules/system/classes/ComposerManager.php b/modules/system/classes/ComposerManager.php index f731c3593..a1505a018 100644 --- a/modules/system/classes/ComposerManager.php +++ b/modules/system/classes/ComposerManager.php @@ -8,12 +8,12 @@ * twice by the composer instance introduced by a plugin. This class * is used as a substitute for the vendor/autoload.php file. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ComposerManager { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; protected $namespacePool = []; diff --git a/modules/system/classes/ErrorHandler.php b/modules/system/classes/ErrorHandler.php index ec5524946..5da789761 100644 --- a/modules/system/classes/ErrorHandler.php +++ b/modules/system/classes/ErrorHandler.php @@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\Response; /** * System Error Handler, this class handles application exception events. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ErrorHandler extends ErrorHandlerBase diff --git a/modules/system/classes/MailManager.php b/modules/system/classes/MailManager.php index ab76bd516..3d3cc1269 100644 --- a/modules/system/classes/MailManager.php +++ b/modules/system/classes/MailManager.php @@ -12,12 +12,12 @@ use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles; /** * This class manages Mail sending functions * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class MailManager { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; /** * @var array Cache of registration callbacks. @@ -71,7 +71,7 @@ class MailManager } /** - * This function hijacks the `addContent` method of the `October\Rain\Mail\Mailer` + * This function hijacks the `addContent` method of the `Winter\Storm\Mail\Mailer` * class, using the `mailer.beforeAddContent` event. * * @param \Illuminate\Mail\Message $message diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php index d86af6364..71cd9b989 100644 --- a/modules/system/classes/MarkupManager.php +++ b/modules/system/classes/MarkupManager.php @@ -9,12 +9,12 @@ use ApplicationException; /** * This class manages Twig functions, token parsers and filters. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class MarkupManager { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; const EXTENSION_FILTER = 'filters'; const EXTENSION_FUNCTION = 'functions'; diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php index d4723cca6..99d3dc6f2 100644 --- a/modules/system/classes/MediaLibrary.php +++ b/modules/system/classes/MediaLibrary.php @@ -7,7 +7,7 @@ use Config; use Storage; use Request; use Url; -use October\Rain\Filesystem\Definitions as FileDefinitions; +use Winter\Storm\Filesystem\Definitions as FileDefinitions; use ApplicationException; use SystemException; @@ -15,12 +15,12 @@ use SystemException; * Provides abstraction level for the Media Library operations. * Implements the library caching features and security checks. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class MediaLibrary { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; const SORT_BY_TITLE = 'title'; const SORT_BY_SIZE = 'size'; diff --git a/modules/system/classes/MediaLibraryItem.php b/modules/system/classes/MediaLibraryItem.php index 073db4f60..09f8a380a 100644 --- a/modules/system/classes/MediaLibraryItem.php +++ b/modules/system/classes/MediaLibraryItem.php @@ -2,13 +2,13 @@ use File; use Config; -use October\Rain\Filesystem\Definitions as FileDefinitions; +use Winter\Storm\Filesystem\Definitions as FileDefinitions; use Carbon\Carbon; /** * Represents a file or folder in the Media Library. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class MediaLibraryItem diff --git a/modules/system/classes/ModelBehavior.php b/modules/system/classes/ModelBehavior.php index af76b8e7d..21437edbb 100644 --- a/modules/system/classes/ModelBehavior.php +++ b/modules/system/classes/ModelBehavior.php @@ -2,12 +2,12 @@ use Lang; use ApplicationException; -use October\Rain\Database\ModelBehavior as ModelBehaviorBase; +use Winter\Storm\Database\ModelBehavior as ModelBehaviorBase; /** * Base class for model behaviors. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ModelBehavior extends ModelBehaviorBase @@ -19,7 +19,7 @@ class ModelBehavior extends ModelBehaviorBase /** * Constructor - * @param October\Rain\Database\Model $model The extended model. + * @param Winter\Storm\Database\Model $model The extended model. */ public function __construct($model) { diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php index f21e99daa..d76b3a6fa 100644 --- a/modules/system/classes/PluginBase.php +++ b/modules/system/classes/PluginBase.php @@ -10,7 +10,7 @@ use Backend; /** * Plugin base class * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class PluginBase extends ServiceProviderBase diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php index dff071c75..d07185b7c 100644 --- a/modules/system/classes/PluginManager.php +++ b/modules/system/classes/PluginManager.php @@ -16,12 +16,12 @@ use RecursiveDirectoryIterator; /** * Plugin manager * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class PluginManager { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; /** * The application instance, since Plugins are an extension of a Service Provider diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php index 67873a78e..f6958f0db 100644 --- a/modules/system/classes/SettingsManager.php +++ b/modules/system/classes/SettingsManager.php @@ -8,12 +8,12 @@ use SystemException; /** * Manages the system settings. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class SettingsManager { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; /** * Allocated category types @@ -43,6 +43,11 @@ class SettingsManager */ protected $items; + /** + * @var array List of owner aliases. ['Aliased.Owner' => 'Real.Owner'] + */ + protected $aliases = []; + /** * @var array Grouped collection of all items, by category. */ @@ -126,7 +131,7 @@ class SettingsManager /* * Sort settings items */ - usort($this->items, function ($a, $b) { + uasort($this->items, function ($a, $b) { return $a->order - $b->order; }); @@ -238,6 +243,18 @@ class SettingsManager $this->addSettingItems($owner, $definitions); } + /** + * Register an owner alias + * + * @param string $owner The owner to register an alias for. Example: Real.Owner + * @param string $alias The alias to register. Example: Aliased.Owner + * @return void + */ + public function registerOwnerAlias(string $owner, string $alias) + { + $this->aliases[strtolower($alias)] = $owner; + } + /** * Dynamically add an array of setting items * @param string $owner @@ -336,7 +353,7 @@ class SettingsManager { return (object) [ 'itemCode' => $this->contextItemCode, - 'owner' => $this->contextOwner + 'owner' => strtolower($this->aliases[$this->contextOwner] ?? $this->contextOwner), ]; } @@ -352,13 +369,10 @@ class SettingsManager $this->loadItems(); } - $owner = strtolower($owner); - $code = strtolower($code); + $itemKey = $this->makeItemKey($owner, $code); - foreach ($this->items as $item) { - if (strtolower($item->owner) == $owner && strtolower($item->code) == $code) { - return $item; - } + if (isset($this->items[$itemKey])) { + return $this->items[$itemKey]; } return false; @@ -375,7 +389,7 @@ class SettingsManager if (!$user) { return $items; } - + $items = array_filter($items, function ($item) use ($user) { if (!$item->permissions || !count($item->permissions)) { return true; @@ -394,6 +408,6 @@ class SettingsManager */ protected function makeItemKey($owner, $code) { - return strtoupper($owner).'.'.strtoupper($code); + return strtoupper($this->aliases[strtolower($owner)] ?? $owner).'.'.strtoupper($code); } } diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php index 929683dce..300278d72 100644 --- a/modules/system/classes/UpdateManager.php +++ b/modules/system/classes/UpdateManager.php @@ -13,7 +13,7 @@ use Cms\Classes\ThemeManager; use System\Models\Parameter; use System\Models\PluginVersion; use System\Helpers\Cache as CacheHelper; -use October\Rain\Filesystem\Zip; +use Winter\Storm\Filesystem\Zip; use Carbon\Carbon; use Exception; @@ -22,7 +22,7 @@ use Exception; * * Handles the CMS install and update process. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class UpdateManager @@ -790,7 +790,7 @@ class UpdateManager */ public function requestChangelog() { - $result = Http::get('https://octobercms.com/changelog?json'); + $result = Http::get('https://api.wintercms.com/marketplace/changelog'); if ($result->code == 404) { throw new ApplicationException(Lang::get('system::lang.server.response_empty')); @@ -942,7 +942,7 @@ class UpdateManager */ protected function createServerUrl($uri) { - $gateway = Config::get('cms.updateServer', 'http://gateway.octobercms.com/api'); + $gateway = Config::get('cms.updateServer', 'https://api.wintercms.com/marketplace'); if (substr($gateway, -1) != '/') { $gateway .= '/'; } diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php index 696e567be..8bb56d388 100644 --- a/modules/system/classes/VersionManager.php +++ b/modules/system/classes/VersionManager.php @@ -4,19 +4,19 @@ use File; use Yaml; use Db; use Carbon\Carbon; -use October\Rain\Database\Updater; +use Winter\Storm\Database\Updater; /** * Version manager * * Manages the versions and database updates for plugins. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class VersionManager { - use \October\Rain\Support\Traits\Singleton; + use \Winter\Storm\Support\Traits\Singleton; /** * Value when no updates are found. @@ -50,7 +50,7 @@ class VersionManager protected $databaseHistory; /** - * @var October\Rain\Database\Updater + * @var Winter\Storm\Database\Updater */ protected $updater; diff --git a/modules/system/composer.json b/modules/system/composer.json index fbbb2e077..743c8cb6a 100644 --- a/modules/system/composer.json +++ b/modules/system/composer.json @@ -1,9 +1,9 @@ { - "name": "october/system", - "type": "october-module", - "description": "System module for October CMS", - "homepage": "https://octobercms.com", - "keywords": ["october cms", "october", "system"], + "name": "winter/wn-system-module", + "type": "winter-module", + "description": "System module for Winter CMS", + "homepage": "https://wintercms.com", + "keywords": ["winter cms", "winter", "system"], "license": "MIT", "authors": [ { @@ -18,7 +18,7 @@ }, { "name": "Luke Towers", - "email": "octobercms@luketowers.ca", + "email": "wintercms@luketowers.ca", "homepage": "https://luketowers.ca", "role": "Maintainer" } diff --git a/modules/system/console/PluginDisable.php b/modules/system/console/PluginDisable.php index cda25b53e..7b5464f63 100644 --- a/modules/system/console/PluginDisable.php +++ b/modules/system/console/PluginDisable.php @@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputArgument; /** * Console command to disable a plugin. * - * @package october\system + * @package winter\wn-system-module * @author Lucas Zamora */ class PluginDisable extends Command diff --git a/modules/system/console/PluginEnable.php b/modules/system/console/PluginEnable.php index 4c2db5ac6..6bece73f3 100644 --- a/modules/system/console/PluginEnable.php +++ b/modules/system/console/PluginEnable.php @@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputArgument; /** * Console command to enable a plugin. * - * @package october\system + * @package winter\wn-system-module * @author Lucas Zamora */ class PluginEnable extends Command diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/PluginInstall.php index bb48e11a3..049e861d3 100644 --- a/modules/system/console/PluginInstall.php +++ b/modules/system/console/PluginInstall.php @@ -8,9 +8,9 @@ use System\Classes\PluginManager; /** * Console command to install a new plugin. * - * This adds a new plugin by requesting it from the October marketplace. + * This adds a new plugin by requesting it from the Winter marketplace. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class PluginInstall extends Command @@ -26,7 +26,7 @@ class PluginInstall extends Command * The console command description. * @var string */ - protected $description = 'Install a plugin from the October marketplace.'; + protected $description = 'Install a plugin from the Winter marketplace.'; /** * Execute the console command. diff --git a/modules/system/console/PluginList.php b/modules/system/console/PluginList.php index 9f5dbe5a5..1420bd8ea 100644 --- a/modules/system/console/PluginList.php +++ b/modules/system/console/PluginList.php @@ -8,7 +8,7 @@ use Symfony\Component\Console\Helper\TableSeparator; /** * Console command to list existing plugins. * - * @package october\system + * @package winter\wn-system-module * @author Lucas Zamora */ class PluginList extends Command diff --git a/modules/system/console/PluginRefresh.php b/modules/system/console/PluginRefresh.php index b79be41ca..fe398b2cf 100644 --- a/modules/system/console/PluginRefresh.php +++ b/modules/system/console/PluginRefresh.php @@ -11,7 +11,7 @@ use Symfony\Component\Console\Input\InputArgument; * This destroys all database tables for a specific plugin, then builds them up again. * It is a great way for developers to debug and develop new plugins. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class PluginRefresh extends Command diff --git a/modules/system/console/PluginRemove.php b/modules/system/console/PluginRemove.php index 98d593bbd..57d324d2c 100644 --- a/modules/system/console/PluginRemove.php +++ b/modules/system/console/PluginRemove.php @@ -13,7 +13,7 @@ use Symfony\Component\Console\Input\InputArgument; * This completely deletes an existing plugin, including database tables, files * and directories. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class PluginRemove extends Command diff --git a/modules/system/console/PluginRollback.php b/modules/system/console/PluginRollback.php index af4d2065c..05c70d745 100644 --- a/modules/system/console/PluginRollback.php +++ b/modules/system/console/PluginRollback.php @@ -10,7 +10,7 @@ use System\Classes\VersionManager; /** * Console command to rollback a plugin. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class PluginRollback extends Command diff --git a/modules/system/console/ThemeInstall.php b/modules/system/console/ThemeInstall.php index 2f47fb34c..59426cbe7 100644 --- a/modules/system/console/ThemeInstall.php +++ b/modules/system/console/ThemeInstall.php @@ -11,9 +11,9 @@ use Exception; /** * Console command to install a new theme. * - * This adds a new theme by requesting it from the October marketplace. + * This adds a new theme by requesting it from the Winter marketplace. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ThemeInstall extends Command @@ -28,7 +28,7 @@ class ThemeInstall extends Command * The console command description. * @var string */ - protected $description = 'Install a theme from the October marketplace.'; + protected $description = 'Install a theme from the Winter marketplace.'; /** * Execute the console command. diff --git a/modules/system/console/ThemeList.php b/modules/system/console/ThemeList.php index 53287d1c6..b3d2f4d12 100644 --- a/modules/system/console/ThemeList.php +++ b/modules/system/console/ThemeList.php @@ -11,7 +11,7 @@ use System\Classes\UpdateManager; * * This lists all the available themes in the system. It also shows the active theme. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ThemeList extends Command @@ -62,7 +62,7 @@ class ThemeList extends Command protected function getOptions() { return [ - ['include-marketplace', 'm', InputOption::VALUE_NONE, 'Include downloadable themes from the October marketplace.'] + ['include-marketplace', 'm', InputOption::VALUE_NONE, 'Include downloadable themes from the Winter marketplace.'] ]; } } diff --git a/modules/system/console/ThemeRemove.php b/modules/system/console/ThemeRemove.php index ec41631cc..0ea9a0299 100644 --- a/modules/system/console/ThemeRemove.php +++ b/modules/system/console/ThemeRemove.php @@ -12,7 +12,7 @@ use Exception; * * This completely deletes an existing theme, including all files and directories. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ThemeRemove extends Command diff --git a/modules/system/console/ThemeSync.php b/modules/system/console/ThemeSync.php index 2f813ba27..b93f1f6d8 100644 --- a/modules/system/console/ThemeSync.php +++ b/modules/system/console/ThemeSync.php @@ -19,7 +19,7 @@ use Symfony\Component\Console\Input\InputArgument; * - --target defaults to "filesystem", the source will whichever of filesystem vs database is not the target * - --force bypasses the confirmation request * - * @package october\system + * @package winter\wn-system-module * @author Luke Towers */ class ThemeSync extends Command @@ -39,7 +39,7 @@ class ThemeSync extends Command protected $description = 'Sync an existing theme between the DB and Filesystem layers'; /** - * @var \October\Rain\Datasource\DatasourceInterface The theme's AutoDatasource instance + * @var \Winter\Storm\Datasource\DatasourceInterface The theme's AutoDatasource instance */ protected $datasource; @@ -145,7 +145,7 @@ class ThemeSync extends Command foreach ($result as $modelClass) { $modelObj = new $modelClass; - if ($modelObj instanceof \October\Rain\Halcyon\Model) { + if ($modelObj instanceof \Winter\Storm\Halcyon\Model) { $validModels[] = $modelObj; } } @@ -207,7 +207,7 @@ class ThemeSync extends Command * @param string $path * @param string $model * @param \Cms\Classes\Theme $theme - * @return \October\Rain\Halcyon\Model + * @return \Winter\Storm\Halcyon\Model */ protected function getModelForPath($path, $modelClass, $theme) { diff --git a/modules/system/console/ThemeUse.php b/modules/system/console/ThemeUse.php index 1e1e224ec..1c94b40c9 100644 --- a/modules/system/console/ThemeUse.php +++ b/modules/system/console/ThemeUse.php @@ -10,7 +10,7 @@ use Symfony\Component\Console\Input\InputArgument; * * This switches the active theme to another one, saved to the database. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class ThemeUse extends Command diff --git a/modules/system/console/OctoberDown.php b/modules/system/console/WinterDown.php similarity index 80% rename from modules/system/console/OctoberDown.php rename to modules/system/console/WinterDown.php index 5f39fdba9..c490f630c 100644 --- a/modules/system/console/OctoberDown.php +++ b/modules/system/console/WinterDown.php @@ -7,24 +7,24 @@ use Symfony\Component\Console\Input\InputOption; /** * Console command to tear down the database. * - * This destroys all database tables that are registered for October and all plugins. + * This destroys all database tables that are registered for Winter and all plugins. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ -class OctoberDown extends Command +class WinterDown extends Command { use \Illuminate\Console\ConfirmableTrait; /** * The console command name. */ - protected $name = 'october:down'; + protected $name = 'winter:down'; /** * The console command description. */ - protected $description = 'Destroys all database tables for October and all plugins.'; + protected $description = 'Destroys all database tables for Winter and all plugins.'; /** * Execute the console command. diff --git a/modules/system/console/OctoberEnv.php b/modules/system/console/WinterEnv.php similarity index 98% rename from modules/system/console/OctoberEnv.php rename to modules/system/console/WinterEnv.php index d13997b3e..acc6e2220 100644 --- a/modules/system/console/OctoberEnv.php +++ b/modules/system/console/WinterEnv.php @@ -9,16 +9,16 @@ use Illuminate\Console\Command; * This creates an .env file with some default configuration values, it also converts * the existing PHP-based configuration files to use the `env` function for values. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ -class OctoberEnv extends Command +class WinterEnv extends Command { /** * The console command name. */ - protected $name = 'october:env'; + protected $name = 'winter:env'; /** * The console command description. diff --git a/modules/system/console/OctoberFresh.php b/modules/system/console/WinterFresh.php similarity index 94% rename from modules/system/console/OctoberFresh.php rename to modules/system/console/WinterFresh.php index a10283268..859ceb12a 100644 --- a/modules/system/console/OctoberFresh.php +++ b/modules/system/console/WinterFresh.php @@ -10,17 +10,17 @@ use Symfony\Component\Console\Input\InputOption; * * This removes the demo theme and plugin. A great way to start a fresh project! * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ -class OctoberFresh extends Command +class WinterFresh extends Command { use \Illuminate\Console\ConfirmableTrait; /** * The console command name. */ - protected $name = 'october:fresh'; + protected $name = 'winter:fresh'; /** * The console command description. diff --git a/modules/system/console/OctoberInstall.php b/modules/system/console/WinterInstall.php similarity index 96% rename from modules/system/console/OctoberInstall.php rename to modules/system/console/WinterInstall.php index 63a27d5ed..12b76f615 100644 --- a/modules/system/console/OctoberInstall.php +++ b/modules/system/console/WinterInstall.php @@ -8,38 +8,38 @@ use File; use Config; use Backend\Database\Seeds\SeedSetupAdmin; use System\Classes\UpdateManager; -use October\Rain\Config\ConfigWriter; +use Winter\Storm\Config\ConfigWriter; use Illuminate\Console\Command; use Illuminate\Encryption\Encrypter; use Symfony\Component\Console\Input\InputOption; use Exception; /** - * Console command to install October. + * Console command to install Winter. * - * This sets up October for the first time. It will prompt the user for several + * This sets up Winter for the first time. It will prompt the user for several * configuration items, including application URL and database config, and then * perform a database migration. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ -class OctoberInstall extends Command +class WinterInstall extends Command { use \Illuminate\Console\ConfirmableTrait; /** * The console command name. */ - protected $name = 'october:install'; + protected $name = 'winter:install'; /** * The console command description. */ - protected $description = 'Set up October for the first time.'; + protected $description = 'Set up Winter for the first time.'; /** - * @var October\Rain\Config\ConfigWriter + * @var Winter\Storm\Config\ConfigWriter */ protected $configWriter; @@ -149,8 +149,8 @@ class OctoberInstall extends Command protected function askToInstallPlugins() { $chosenToInstall = []; - if ($this->confirm('Install the October.Drivers plugin?', false)) { - $chosenToInstall[] = 'October.Drivers'; + if ($this->confirm('Install the Winter.Drivers plugin?', false)) { + $chosenToInstall[] = 'Winter.Drivers'; } if ($this->confirm('Install the Rainlab.Builder plugin?', false)) { $chosenToInstall[] = 'Rainlab.Builder'; diff --git a/modules/system/console/OctoberManifest.php b/modules/system/console/WinterManifest.php similarity index 91% rename from modules/system/console/OctoberManifest.php rename to modules/system/console/WinterManifest.php index b92db74a7..83b92de49 100644 --- a/modules/system/console/OctoberManifest.php +++ b/modules/system/console/WinterManifest.php @@ -5,17 +5,17 @@ use ZipArchive; use System\Classes\FileManifest; use System\Classes\SourceManifest; -class OctoberManifest extends \Illuminate\Console\Command +class WinterManifest extends \Illuminate\Console\Command { /** * @var string The console command description. */ - protected $description = 'Generates a build manifest of October CMS builds.'; + protected $description = 'Generates a build manifest of Winter CMS builds.'; /** * @var string The name and signature of the console command. */ - protected $signature = 'october:manifest + protected $signature = 'winter:manifest {target : Specifies the target file for the build manifest.} {--minBuild= : Specifies the minimum build number to retrieve from the source.} {--maxBuild= : Specifies the maximum build number to retreive from the source.}'; @@ -28,7 +28,7 @@ class OctoberManifest extends \Illuminate\Console\Command /** * @var string Source repository download file. */ - protected $sourceBuildFile = 'https://github.com/octobercms/october/archive/v1.0.%d.zip'; + protected $sourceBuildFile = 'https://github.com/wintercms/winter/archive/v1.0.%d.zip'; /** @@ -110,9 +110,9 @@ class OctoberManifest extends \Illuminate\Console\Command if ($zip->open($buildDir . 'build-' . $build . '.zip')) { $toExtract = []; $paths = [ - 'october-1.0.' . $build . '/modules/backend/', - 'october-1.0.' . $build . '/modules/cms/', - 'october-1.0.' . $build . '/modules/system/', + 'winter-1.0.' . $build . '/modules/backend/', + 'winter-1.0.' . $build . '/modules/cms/', + 'winter-1.0.' . $build . '/modules/system/', ]; // Only get necessary files from the modules directory @@ -156,7 +156,7 @@ class OctoberManifest extends \Illuminate\Console\Command // Add build to manifest $this->line(' - Adding to manifest...'); - $buildManifest = new FileManifest($buildDir . $build . '/october-1.0.' . $build); + $buildManifest = new FileManifest($buildDir . $build . '/winter-1.0.' . $build); $manifest->addBuild($build, $buildManifest, $previous); $this->info(' - Added.'); } diff --git a/modules/system/console/OctoberMirror.php b/modules/system/console/WinterMirror.php similarity index 97% rename from modules/system/console/OctoberMirror.php rename to modules/system/console/WinterMirror.php index 602c12501..093bfa598 100644 --- a/modules/system/console/OctoberMirror.php +++ b/modules/system/console/WinterMirror.php @@ -13,16 +13,16 @@ use Symfony\Component\Console\Input\InputArgument; * This command will create symbolic links to files and directories * that are commonly required to be publicly available. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ -class OctoberMirror extends Command +class WinterMirror extends Command { /** * The console command name. */ - protected $name = 'october:mirror'; + protected $name = 'winter:mirror'; /** * The console command description. @@ -88,7 +88,7 @@ class OctoberMirror extends Command /** * @event system.console.mirror.extendPaths - * Enables extending the `php artisan october:mirror` command + * Enables extending the `php artisan winter:mirror` command * * You will have access to a $paths stdClass with `files`, `directories`, `wildcards` properties available for modifying. * diff --git a/modules/system/console/OctoberPasswd.php b/modules/system/console/WinterPasswd.php similarity index 96% rename from modules/system/console/OctoberPasswd.php rename to modules/system/console/WinterPasswd.php index aa642c024..921850a1c 100644 --- a/modules/system/console/OctoberPasswd.php +++ b/modules/system/console/WinterPasswd.php @@ -10,14 +10,14 @@ use Symfony\Component\Console\Question\Question; /** * Console command to change the password of a Backend user via CLI. * - * @package october\system + * @package winter\wn-system-module */ -class OctoberPasswd extends Command +class WinterPasswd extends Command { /** * @var string The console command name. */ - protected $name = 'october:passwd'; + protected $name = 'winter:passwd'; /** * @var string The console command description. diff --git a/modules/system/console/OctoberUp.php b/modules/system/console/WinterUp.php similarity index 68% rename from modules/system/console/OctoberUp.php rename to modules/system/console/WinterUp.php index a599732b6..ad295c315 100644 --- a/modules/system/console/OctoberUp.php +++ b/modules/system/console/WinterUp.php @@ -6,22 +6,22 @@ use System\Classes\UpdateManager; /** * Console command to migrate the database. * - * This builds up all database tables that are registered for October and all plugins. + * This builds up all database tables that are registered for Winter and all plugins. * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ -class OctoberUp extends Command +class WinterUp extends Command { /** * The console command name. */ - protected $name = 'october:up'; + protected $name = 'winter:up'; /** * The console command description. */ - protected $description = 'Builds database tables for October and all plugins.'; + protected $description = 'Builds database tables for Winter and all plugins.'; /** * Execute the console command. diff --git a/modules/system/console/OctoberUpdate.php b/modules/system/console/WinterUpdate.php similarity index 97% rename from modules/system/console/OctoberUpdate.php rename to modules/system/console/WinterUpdate.php index 200dcd221..c060d0c04 100644 --- a/modules/system/console/OctoberUpdate.php +++ b/modules/system/console/WinterUpdate.php @@ -32,7 +32,7 @@ class OctoberUpdate extends Command */ public function handle() { - $this->output->writeln('Updating October...'); + $this->output->writeln('Updating Winter...'); $manager = UpdateManager::instance()->setNotesOutput($this->output); $forceUpdate = $this->option('force'); @@ -98,7 +98,7 @@ class OctoberUpdate extends Command /* * Run migrations */ - $this->call('october:up'); + $this->call('winter:up'); } /** diff --git a/modules/system/console/OctoberUtil.php b/modules/system/console/WinterUtil.php similarity index 98% rename from modules/system/console/OctoberUtil.php rename to modules/system/console/WinterUtil.php index 14700a31f..5b31f26c2 100644 --- a/modules/system/console/OctoberUtil.php +++ b/modules/system/console/WinterUtil.php @@ -39,12 +39,12 @@ class OctoberUtil extends Command /** * The console command name. */ - protected $name = 'october:util'; + protected $name = 'winter:util'; /** * The console command description. */ - protected $description = 'Utility commands for October'; + protected $description = 'Utility commands for Winter'; /** * Execute the console command. @@ -56,7 +56,7 @@ class OctoberUtil extends Command $methods = preg_grep('/^util/', get_class_methods(get_called_class())); $list = array_map(function ($item) { - return "october:".snake_case($item, " "); + return "winter:".snake_case($item, " "); }, $methods); if (!$this->argument('name')) { diff --git a/modules/system/console/OctoberVersion.php b/modules/system/console/WinterVersion.php similarity index 81% rename from modules/system/console/OctoberVersion.php rename to modules/system/console/WinterVersion.php index 9f3d40c74..64180d985 100644 --- a/modules/system/console/OctoberVersion.php +++ b/modules/system/console/WinterVersion.php @@ -3,17 +3,17 @@ use App; use System\Classes\UpdateManager; -class OctoberVersion extends \Illuminate\Console\Command +class WinterVersion extends \Illuminate\Console\Command { /** * @var string The console command description. */ - protected $description = 'Detects the build number (version) of this October CMS instance.'; + protected $description = 'Detects the build number (version) of this Winter CMS instance.'; /** * @var string The name and signature of the console command. */ - protected $signature = 'october:version + protected $signature = 'winter:version {--changes : Include the list of changes between this install and the expected files for the detected build.}'; /** @@ -23,7 +23,7 @@ class OctoberVersion extends \Illuminate\Console\Command */ public function handle() { - $this->comment('*** Detecting October CMS build...'); + $this->comment('*** Detecting Winter CMS build...'); if (!App::hasDatabase()) { $build = UpdateManager::instance()->getBuildNumberManually($this->option('changes')); @@ -35,11 +35,11 @@ class OctoberVersion extends \Illuminate\Console\Command } if (!$build['confident']) { - $this->warn('*** We could not accurately determine your October CMS build due to the number of modifications. The closest detected build is October CMS build ' . $build['build'] . '.'); + $this->warn('*** We could not accurately determine your Winter CMS build due to the number of modifications. The closest detected build is Winter CMS build ' . $build['build'] . '.'); } else if ($build['modified']) { - $this->info('*** Detected a modified version of October CMS build ' . $build['build'] . '.'); + $this->info('*** Detected a modified version of Winter CMS build ' . $build['build'] . '.'); } else { - $this->info('*** Detected October CMS build ' . $build['build'] . '.'); + $this->info('*** Detected Winter CMS build ' . $build['build'] . '.'); } if ($this->option('changes')) { diff --git a/modules/system/controllers/EventLogs.php b/modules/system/controllers/EventLogs.php index 7d7f474f2..6ff1a1df7 100644 --- a/modules/system/controllers/EventLogs.php +++ b/modules/system/controllers/EventLogs.php @@ -11,7 +11,7 @@ use System\Models\EventLog; /** * Event Logs controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class EventLogs extends Controller @@ -46,8 +46,8 @@ class EventLogs extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.System', 'event_logs'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.System', 'event_logs'); } public function index_onRefresh() diff --git a/modules/system/controllers/MailBrandSettings.php b/modules/system/controllers/MailBrandSettings.php index ec3263f8b..f5920b4c0 100644 --- a/modules/system/controllers/MailBrandSettings.php +++ b/modules/system/controllers/MailBrandSettings.php @@ -16,7 +16,7 @@ use System\Models\MailTemplate; /** * Mail brand customization controller * - * @package october\backend + * @package winter\wn-backend-module * @author Alexey Bobkov, Samuel Georges * */ @@ -53,8 +53,8 @@ class MailBrandSettings extends Controller $this->pageTitle = 'system::lang.mail_brand.page_title'; - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.System', 'mail_brand_settings'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.System', 'mail_brand_settings'); } public function index() diff --git a/modules/system/controllers/MailLayouts.php b/modules/system/controllers/MailLayouts.php index 1dd97d5af..d50a5a818 100644 --- a/modules/system/controllers/MailLayouts.php +++ b/modules/system/controllers/MailLayouts.php @@ -10,7 +10,7 @@ use System\Classes\SettingsManager; /** * Mail layouts controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class MailLayouts extends Controller @@ -39,8 +39,8 @@ class MailLayouts extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.System', 'mail_templates'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.System', 'mail_templates'); } public function update_onResetDefault($recordId) diff --git a/modules/system/controllers/MailPartials.php b/modules/system/controllers/MailPartials.php index 481f93101..50a2db71b 100644 --- a/modules/system/controllers/MailPartials.php +++ b/modules/system/controllers/MailPartials.php @@ -7,7 +7,7 @@ use System\Classes\SettingsManager; /** * Mail partials controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class MailPartials extends Controller @@ -36,8 +36,8 @@ class MailPartials extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.System', 'mail_templates'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.System', 'mail_templates'); } public function formBeforeSave($model) diff --git a/modules/system/controllers/MailTemplates.php b/modules/system/controllers/MailTemplates.php index a3d87b0b9..583b88b8a 100644 --- a/modules/system/controllers/MailTemplates.php +++ b/modules/system/controllers/MailTemplates.php @@ -11,7 +11,7 @@ use Exception; /** * Mail templates controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class MailTemplates extends Controller @@ -50,8 +50,8 @@ class MailTemplates extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.System', 'mail_templates'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.System', 'mail_templates'); } public function index($tab = null) diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php index 23d0ceaaf..0069feb77 100644 --- a/modules/system/controllers/RequestLogs.php +++ b/modules/system/controllers/RequestLogs.php @@ -10,7 +10,7 @@ use System\Models\RequestLog; /** * Request Logs controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges */ class RequestLogs extends Controller @@ -44,8 +44,8 @@ class RequestLogs extends Controller { parent::__construct(); - BackendMenu::setContext('October.System', 'system', 'settings'); - SettingsManager::setContext('October.System', 'request_logs'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); + SettingsManager::setContext('Winter.System', 'request_logs'); } public function index_onRefresh() diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php index 719dff20e..4d70f463f 100644 --- a/modules/system/controllers/Settings.php +++ b/modules/system/controllers/Settings.php @@ -14,7 +14,7 @@ use Exception; /** * Settings controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges * */ @@ -43,7 +43,7 @@ class Settings extends Controller $this->addCss('/modules/system/assets/css/settings/settings.css', 'core'); - BackendMenu::setContext('October.System', 'system', 'settings'); + BackendMenu::setContext('Winter.System', 'system', 'settings'); } public function index() diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php index 230cd57c2..b6ad68836 100644 --- a/modules/system/controllers/Updates.php +++ b/modules/system/controllers/Updates.php @@ -23,7 +23,7 @@ use Exception; /** * Updates controller * - * @package october\system + * @package winter\wn-system-module * @author Alexey Bobkov, Samuel Georges * */ @@ -59,8 +59,8 @@ class Updates extends Controller $this->addJs('/modules/system/assets/js/updates/updates.js', 'core'); $this->addCss('/modules/system/assets/css/updates/updates.css', 'core'); - BackendMenu::setContext('October.System', 'system', 'updates'); - SettingsManager::setContext('October.System', 'updates'); + BackendMenu::setContext('Winter.System', 'system', 'updates'); + SettingsManager::setContext('Winter.System', 'updates'); if ($this->getAjaxHandler() == 'onExecuteStep') { $this->useSecurityToken = false; @@ -396,7 +396,7 @@ class Updates extends Controller continue; } - $detailsUrl = '//octobercms.com/support/articles/release-notes'; + $detailsUrl = '//wintercms.com/support/articles/release-notes'; $description = str_replace('!!!', '', $description); $result['core']['updates'][$build] = [$description, $detailsUrl]; $coreImportant = $hasImportantUpdates = true; diff --git a/modules/system/controllers/eventlogs/_list_toolbar.htm b/modules/system/controllers/eventlogs/_list_toolbar.htm index 6b04e6bfb..4dd78a55c 100644 --- a/modules/system/controllers/eventlogs/_list_toolbar.htm +++ b/modules/system/controllers/eventlogs/_list_toolbar.htm @@ -3,7 +3,7 @@ href="javascript:;" data-request="onRefresh" data-load-indicator="" - class="btn btn-primary oc-icon-refresh"> + class="btn btn-primary wn-icon-refresh"> + class="btn btn-default wn-icon-eraser">
diff --git a/modules/system/controllers/requestlogs/preview.htm b/modules/system/controllers/requestlogs/preview.htm index 4d73dff46..262e6a46b 100644 --- a/modules/system/controllers/requestlogs/preview.htm +++ b/modules/system/controllers/requestlogs/preview.htm @@ -39,7 +39,7 @@

- +

diff --git a/modules/system/controllers/settings/index.htm b/modules/system/controllers/settings/index.htm index 309f96805..7589f11f7 100644 --- a/modules/system/controllers/settings/index.htm +++ b/modules/system/controllers/settings/index.htm @@ -1,5 +1,5 @@
-
+
diff --git a/modules/system/controllers/updates/_install_plugins.htm b/modules/system/controllers/updates/_install_plugins.htm index 049eab0cb..461ff78d3 100644 --- a/modules/system/controllers/updates/_install_plugins.htm +++ b/modules/system/controllers/updates/_install_plugins.htm @@ -5,7 +5,7 @@ role="form" id="installPluginsForm" data-handler="onInstallPlugin" - onsubmit="$.oc.installProcess.searchSubmit(this); return false"> + onsubmit="$.wn.installProcess.searchSubmit(this); return false">
+ onsubmit="$.wn.installProcess.searchSubmit(this); return false">
is_disabled ? 'enable' : 'disable'; ?> -