Initial rebrand commit generated from the 1.0 rebrand branch patch file

This commit is contained in:
Luke Towers 2021-03-10 15:02:53 -06:00
parent 3b471b9b0c
commit cfa763b714
826 changed files with 8107 additions and 4258 deletions

View File

@ -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.

4
.github/FUNDING.yml vendored
View File

@ -1,4 +0,0 @@
# These are supported funding model platforms
custom: ['https://octobercms.com/premium-support']
open_collective: octobercms
github: LukeTowers

View File

@ -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!

View File

@ -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: ### <!-- Or Commit hash if using composer -->
- Winter CMS Build: ### <!-- Or Commit hash if using composer -->
- PHP Version:
- Database Engine: <!-- Remove if not using a database -->
- Plugins Installed: <!-- In the format of Author.Plugin-v1.2.0 -->

View File

@ -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.

View File

@ -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!

View File

@ -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.
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.

View File

@ -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!**

View File

@ -1,7 +0,0 @@
<!--
Pull Requests without a descriptive title, thorough description, or tests will be closed.
Please include the benefit to end users; the reasons it does not break any existing features; how it makes building web applications easier, etc. The more detail the better.
If documentation improvements are required, you are expected to make a simultaneous pull request to https://github.com/octobercms/docs to update the documentation
-->

View File

@ -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'

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -1,12 +0,0 @@
#!/usr/bin/env php
<?php
if (empty($argv[1])) {
echo 'You must provide a version to switch the library dependency to.';
echo "\n";
exit(1);
}
$composer = json_decode(file_get_contents(getcwd() . '/composer.json'), true);
$composer['require']['october/rain'] = $argv[1];
file_put_contents(getcwd() . '/composer.json', json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));

View File

@ -1,77 +0,0 @@
#!/usr/bin/env php
<?php
if (empty($argv[1])) {
echo 'You must provide a base branch to check this PR against.';
echo "\n";
exit(1);
}
// Get a changelist of files from Git for this PR.
$fileList = shell_exec('git diff --name-only --diff-filter=ACMR origin/' . $argv[1] . ' HEAD');
$files = array_filter(explode("\n", $fileList));
foreach ($files as &$file) {
if (strpos($file, ' ') !== false) {
$file = str_replace(' ', '\\ ', $file);
}
}
// Run all changed files through the PHPCS code sniffer and generate a CSV report
$csv = shell_exec('phpcs --colors -nq --report="csv" --extensions="php" ' . implode(' ', $files));
$lines = array_map(function ($row) {
return array_map(function ($column) {
return trim($column, '"');
}, explode(',', $row));
}, array_filter(explode("\n", $csv)));
// Remove header row
array_shift($lines);
if (!count($lines)) {
echo "\e[0;32mFound no issues with code quality.\e[0m";
echo "\n";
exit(0);
} else {
// Group errors by file
$files = [];
foreach ($lines as $line) {
$filename = str_replace(dirname(dirname(dirname(__DIR__))), '', $line[0]);
if (empty($files[$filename])) {
$files[$filename] = [];
}
$files[$filename][] = [
'warning' => ($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);
}

View File

@ -1,77 +0,0 @@
#!/usr/bin/env php
<?php
if (empty($argv[1])) {
echo 'You must provide a commit SHA to check.';
echo "\n";
exit(1);
}
// Get a changelist of files from Git for this push.
$fileList = shell_exec('git show --name-only --pretty="" --diff-filter=ACMR ' . $argv[1]);
$files = array_filter(explode("\n", $fileList));
foreach ($files as &$file) {
if (strpos($file, ' ') !== false) {
$file = str_replace(' ', '\\ ', $file);
}
}
// Run all changed files through the PHPCS code sniffer and generate a CSV report
$csv = shell_exec('phpcs --colors -nq --report="csv" --extensions="php" ' . implode(' ', $files));
$lines = array_map(function ($row) {
return array_map(function ($column) {
return trim($column, '"');
}, explode(',', $row));
}, array_filter(explode("\n", $csv)));
// Remove header row
array_shift($lines);
if (!count($lines)) {
echo "\e[0;32mFound no issues with code quality.\e[0m";
echo "\n";
exit(0);
} else {
// Group errors by file
$files = [];
foreach ($lines as $line) {
$filename = str_replace(dirname(dirname(dirname(__DIR__))), '', $line[0]);
if (empty($files[$filename])) {
$files[$filename] = [];
}
$files[$filename][] = [
'warning' => ($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);
}

View File

@ -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)

View File

@ -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.

View File

@ -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

View File

@ -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.

View File

@ -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.

0
artisan Normal file → Executable file
View File

View File

@ -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
);
/*

View File

@ -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;

View File

@ -28,7 +28,7 @@ return [
| any other location as required by the application or its packages.
*/
'name' => 'October CMS',
'name' => 'Winter CMS',
/*
|--------------------------------------------------------------------------

View File

@ -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.
|
*/

View File

@ -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.
|
*/

View File

@ -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.

View File

@ -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`.

View File

@ -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.

View File

@ -55,7 +55,7 @@ return [
|
*/
'from' => ['address' => 'noreply@domain.tld', 'name' => 'OctoberCMS'],
'from' => ['address' => 'noreply@example.com', 'name' => 'Winter CMS'],
/*
|--------------------------------------------------------------------------

View File

@ -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,
/*

View File

@ -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.
|
*/

View File

@ -1,8 +1,8 @@
<?php
/**
* October - The PHP platform that gets back to basics.
* Winter CMS - The PHP platform that gets back to basics.
*
* @package October
* @package Winter
* @author Alexey Bobkov, Samuel Georges
*/

View File

@ -9,7 +9,7 @@ use Backend\Classes\WidgetManager;
use System\Classes\MailManager;
use System\Classes\CombineAssets;
use System\Classes\SettingsManager;
use October\Rain\Support\ModuleServiceProvider;
use Winter\Storm\Support\ModuleServiceProvider;
class ServiceProvider extends ModuleServiceProvider
{
@ -66,8 +66,8 @@ class ServiceProvider extends ModuleServiceProvider
protected function registerAssetBundles()
{
CombineAssets::registerCallback(function ($combiner) {
$combiner->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');
});
}
}

View File

@ -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}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 1988 2212" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-miterlimit:10;"><g id="Snowflake"><g><path d="M993.872,1105.52l-0,833.334" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M807.62,1476.42l186.252,-186.252l186.252,186.252" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M752.928,1781.55l240.944,-240.944l240.944,240.944" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M993.872,1105.52l-721.688,416.667" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M579.534,1129.67l254.425,68.173l-68.173,254.425" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M287.943,1234.87l329.135,88.191l-88.191,329.135" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M993.872,1105.52l-721.688,-416.666" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M765.786,758.767l68.173,254.425l-254.425,68.173" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M528.887,558.841l88.191,329.135l-329.135,88.191" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M993.872,1105.52l-0,-833.333" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M1180.12,734.614l-186.252,186.252l-186.252,-186.252" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M1234.82,429.49l-240.944,240.944l-240.944,-240.944" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M993.872,1105.52l721.688,-416.666" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M1408.21,1081.37l-254.425,-68.173l68.173,-254.425" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M1699.8,976.167l-329.135,-88.191l88.191,-329.135" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M993.872,1105.52l721.688,416.667" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M1221.96,1452.27l-68.173,-254.425l254.425,-68.173" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M1458.86,1652.19l-88.191,-329.135l329.135,-88.191" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g></g></svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="49px" height="65px" viewBox="0 0 49 65" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
<!-- Generator: Sketch 3.4.4 (17249) - http://www.bohemiancoding.com/sketch -->
<title>october-leaf</title>
<desc>Created with Sketch.</desc>
<defs>
<path id="path-1" d="M0,0.658 L48.736,0.658 L48.736,65 L0,65"></path>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
<g id="logo" sketch:type="MSLayerGroup">
<mask id="mask-2" sketch:name="Clip 2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="Clip-2"></g>
<path d="M48.6875,31.4795 C47.6665,15.0415 29.5165,0.8175 22.0395,0.6595 C14.5595,0.5005 0.5805,17.9095 0.0145,35.5975 C-0.5155,52.1825 13.8335,63.5555 20.0105,65.0005 C20.1825,57.1965 20.8155,28.4665 20.9215,25.1165 C21.1445,18.2705 21.4855,7.6195 22.6445,7.2645 C23.3095,7.0615 24.2155,13.0495 24.1045,16.5885 C24.0815,17.2635 24.0735,19.4515 24.0735,22.5545 C25.3245,21.2995 26.6305,19.9975 27.4245,19.2265 C29.6015,17.1175 30.5645,17.3685 29.5205,19.2505 C28.8775,20.4075 26.1125,24.2575 24.0795,27.0475 C24.0905,32.6745 24.1165,39.7565 24.1435,46.3565 C27.0145,43.0425 30.5295,39.0675 32.3755,37.2995 C36.2485,33.5965 36.6605,34.0645 34.8315,37.9515 C33.7085,40.3335 28.2165,46.6875 24.1635,51.6985 C24.1885,57.5535 24.2085,62.4765 24.2125,64.8275 C35.0855,62.4675 49.6865,47.6185 48.6875,31.4795" id="Fill-1" fill="#DB6A26" sketch:type="MSShapeGroup" mask="url(#mask-2)"></path>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

View File

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.0"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="408px" height="71px" viewBox="-5.208 -4.384 408 71" enable-background="new -5.208 -4.384 408 71"
xml:space="preserve">
<defs>
</defs>
<path opacity="0.3" fill="#596667" d="M111.401,42.425c-1.112,0-2.896,0.109-4.007,1.986c-0.441,0.744-0.816,1.564-1.631,2.516
c-1.481,1.727-3.297,3.045-5.44,3.952c-2.146,0.908-4.589,1.36-7.325,1.36c-2.766,0-5.23-0.452-7.385-1.36
c-2.162-0.907-3.98-2.226-5.462-3.952c-1.485-1.73-2.618-3.84-3.411-6.334c-0.789-2.489-1.185-5.306-1.185-8.444
c0-3.114,0.396-5.913,1.185-8.406c0.793-2.489,1.926-4.603,3.411-6.33c1.482-1.729,3.3-3.052,5.462-3.976
c2.155-0.922,4.619-1.383,7.385-1.383c2.736,0,5.179,0.461,7.325,1.383c2.143,0.924,3.959,2.247,5.44,3.976
c0.716,0.834,1.352,1.757,1.903,2.772c1.064,1.96,3.735,1.726,3.735,1.726h12.112c-0.248-0.817-0.505-1.63-0.817-2.422
c-1.538-3.918-3.702-7.318-6.497-10.198c-2.794-2.88-6.16-5.148-10.097-6.807C102.163,0.827,97.799,0,92.998,0
C88.2,0,83.827,0.82,79.876,2.462c-3.951,1.642-7.331,3.902-10.14,6.783c-2.811,2.884-4.981,6.28-6.521,10.197
c-0.092,0.235-0.173,0.476-0.26,0.713c-0.083-0.222-0.159-0.447-0.247-0.667c-1.562-3.918-3.757-7.318-6.594-10.198
c-2.835-2.879-6.251-5.147-10.248-6.807c-3.997-1.656-8.428-2.483-13.299-2.483c-4.87,0-9.308,0.819-13.319,2.461
c-4.01,1.642-7.439,3.903-10.29,6.784c-2.854,2.883-5.056,6.279-6.619,10.196C0.78,23.363,0,27.598,0,32.148
c0,4.553,0.78,8.787,2.34,12.705c1.563,3.917,3.765,7.324,6.619,10.218c2.851,2.894,6.28,5.162,10.29,6.804
c4.011,1.643,8.449,2.465,13.319,2.465c4.871,0,9.302-0.822,13.299-2.465c3.997-1.642,7.413-3.91,10.248-6.804
c2.837-2.894,5.032-6.301,6.594-10.218c0.091-0.228,0.169-0.46,0.255-0.689c0.084,0.229,0.162,0.462,0.251,0.689
c1.54,3.917,3.71,7.324,6.521,10.218c2.809,2.894,6.189,5.162,10.14,6.804c3.951,1.643,8.324,2.465,13.122,2.465
c4.801,0,9.165-0.822,13.104-2.465c3.937-1.642,7.303-3.91,10.097-6.804c2.795-2.894,4.959-6.301,6.497-10.218
c0.312-0.793,0.57-1.609,0.818-2.428H111.401z M48.981,40.593c-0.8,2.494-1.954,4.604-3.458,6.334
c-1.503,1.727-3.346,3.045-5.521,3.951c-2.178,0.909-4.657,1.361-7.434,1.361c-2.807,0-5.308-0.452-7.496-1.361
c-2.193-0.906-4.038-2.225-5.543-3.951c-1.506-1.73-2.657-3.84-3.462-6.334c-0.8-2.489-1.202-5.306-1.202-8.445
c0-3.113,0.402-5.912,1.202-8.405c0.805-2.489,1.956-4.603,3.462-6.329c1.505-1.73,3.35-3.053,5.543-3.977
c2.188-0.921,4.689-1.382,7.496-1.382c2.777,0,5.256,0.461,7.434,1.382c2.175,0.924,4.018,2.247,5.521,3.977
c1.504,1.726,2.658,3.84,3.458,6.329c0.802,2.493,1.204,5.292,1.204,8.405C50.185,35.288,49.783,38.104,48.981,40.593z"/>
<path opacity="0.3" fill="#596667" d="M208.964,32.148c0,4.553-0.784,8.787-2.341,12.705c-1.564,3.917-3.761,7.324-6.594,10.218
c-2.838,2.894-6.252,5.162-10.251,6.804c-3.996,1.643-8.427,2.465-13.299,2.465c-4.87,0-9.307-0.822-13.317-2.465
c-4.012-1.642-7.442-3.91-10.29-6.804c-2.856-2.894-5.059-6.301-6.62-10.218c-1.56-3.918-2.34-8.152-2.34-12.705
c0-4.55,0.78-8.785,2.34-12.706c1.561-3.917,3.764-7.313,6.62-10.196c2.848-2.881,6.278-5.142,10.29-6.784
c4.01-1.642,8.447-2.461,13.317-2.461c4.872,0,9.303,0.827,13.299,2.483c3.999,1.66,7.413,3.928,10.251,6.807
c2.833,2.88,5.029,6.28,6.594,10.198C208.18,23.406,208.964,27.626,208.964,32.148 M194.097,32.148c0-3.113-0.401-5.912-1.202-8.405
c-0.8-2.489-1.954-4.603-3.458-6.329c-1.504-1.73-3.347-3.053-5.521-3.977c-2.179-0.921-4.658-1.382-7.436-1.382
c-2.806,0-5.306,0.461-7.494,1.382c-2.195,0.924-4.04,2.247-5.544,3.977c-1.506,1.726-2.658,3.84-3.462,6.329
c-0.8,2.493-1.203,5.292-1.203,8.405c0,3.14,0.403,5.956,1.203,8.445c0.804,2.494,1.956,4.604,3.462,6.334
c1.504,1.727,3.349,3.045,5.544,3.951c2.188,0.909,4.688,1.361,7.494,1.361c2.778,0,5.257-0.452,7.436-1.361
c2.174-0.906,4.017-2.225,5.521-3.951c1.504-1.73,2.658-3.84,3.458-6.334C193.696,38.104,194.097,35.288,194.097,32.148"/>
<path opacity="0.3" fill="#596667" d="M210.603,63.648V0.69h23.159c4.351,0,8.053,0.405,11.104,1.21
c3.053,0.808,5.546,1.944,7.475,3.415c1.931,1.468,3.334,3.255,4.214,5.358c0.878,2.103,1.319,4.452,1.319,7.044
c0,1.41-0.204,2.77-0.606,4.082c-0.404,1.312-1.036,2.542-1.902,3.696c-0.864,1.15-1.971,2.193-3.326,3.133
c-1.354,0.935-2.982,1.748-4.885,2.44c4.151,1.01,7.217,2.645,9.208,4.906c1.985,2.262,2.979,5.161,2.979,8.705
c0,2.676-0.519,5.17-1.556,7.473c-1.037,2.307-2.558,4.314-4.557,6.031c-2.004,1.713-4.474,3.053-7.412,4.016
c-2.938,0.967-6.294,1.449-10.069,1.449H210.603z M225.208,27.178h7.604c1.612,0,3.066-0.114,4.365-0.343
c1.294-0.232,2.397-0.633,3.306-1.21c0.907-0.577,1.596-1.369,2.074-2.378c0.476-1.009,0.71-2.275,0.71-3.804
c0-1.494-0.185-2.742-0.56-3.738c-0.375-0.991-0.952-1.79-1.73-2.398c-0.775-0.605-1.765-1.034-2.958-1.294
c-1.197-0.26-2.614-0.39-4.256-0.39h-8.555V27.178z M225.208,36.944V52.63h10.279c1.931,0,3.511-0.246,4.735-0.734
c1.224-0.492,2.183-1.126,2.872-1.902c0.692-0.777,1.166-1.656,1.426-2.639c0.259-0.977,0.389-1.971,0.389-2.978
c0-1.153-0.15-2.19-0.452-3.112c-0.302-0.921-0.82-1.698-1.554-2.334c-0.736-0.634-1.711-1.123-2.921-1.471
c-1.21-0.344-2.735-0.517-4.578-0.517H225.208z"/>
<polygon opacity="0.3" fill="#596667" points="301.985,0.689 301.985,11.924 276.144,11.924 276.144,26.616 295.934,26.616
295.934,37.419 276.144,37.419 276.144,52.412 301.985,52.412 301.985,63.647 261.454,63.647 261.454,0.689 "/>
<path opacity="0.3" fill="#596667" d="M319.388,40.358v23.29h-14.604V0.689h20.481c4.549,0,8.431,0.472,11.646,1.407
c3.211,0.936,5.835,2.24,7.862,3.91c2.032,1.672,3.506,3.643,4.433,5.919c0.919,2.275,1.38,4.753,1.38,7.434
c0,2.046-0.274,3.973-0.823,5.787c-0.543,1.815-1.36,3.496-2.438,5.036c-1.08,1.54-2.406,2.915-3.975,4.126
c-1.572,1.211-3.38,2.203-5.426,2.98c0.98,0.492,1.896,1.098,2.745,1.814c0.848,0.721,1.592,1.6,2.229,2.637l13.393,21.908h-13.221
c-2.451,0-4.207-0.922-5.272-2.764l-10.457-18.279c-0.461-0.809-1.003-1.382-1.622-1.73c-0.617-0.344-1.491-0.517-2.611-0.517
H319.388z M319.388,30.291h5.877c1.985,0,3.679-0.253,5.076-0.756c1.397-0.506,2.544-1.203,3.437-2.097
c0.894-0.892,1.54-1.937,1.944-3.131c0.4-1.197,0.606-2.487,0.606-3.869c0-2.764-0.902-4.927-2.702-6.48
c-1.8-1.558-4.588-2.335-8.361-2.335h-5.877V30.291z"/>
<path opacity="0.3" fill="#596667" d="M127.329,0.689v25.243h-16.043c-1.452,0-2.628,1.128-2.628,2.517v7.438
c0,1.392,1.176,2.519,2.628,2.519h16.043v25.241h14.604V0.689H127.329z"/>
<path opacity="0.3" fill="#DB6B26" d="M400.482,30.821c-1.021-16.438-19.171-30.662-26.648-30.819
c-7.479-0.159-21.459,17.25-22.024,34.938c-0.53,16.585,13.818,27.958,19.996,29.401c0.172-7.803,0.805-36.532,0.911-39.882
c0.223-6.846,0.563-17.498,1.723-17.852c0.665-0.203,1.571,5.785,1.46,9.324c-0.023,0.675-0.031,2.862-0.031,5.966
c1.251-1.255,2.558-2.558,3.352-3.328c2.177-2.11,3.14-1.859,2.096,0.023c-0.643,1.158-3.408,5.008-5.441,7.798
c0.012,5.627,0.037,12.709,0.064,19.309c2.871-3.315,6.386-7.289,8.232-9.057c3.872-3.702,4.284-3.235,2.455,0.651
c-1.123,2.382-6.614,8.736-10.668,13.747c0.025,5.855,0.045,10.778,0.05,13.129C386.88,61.81,401.481,46.96,400.482,30.821"/>
</svg>

Before

Width:  |  Height:  |  Size: 7.2 KiB

View File

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.0"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" viewBox="-5.208 -4.384 408 71" enable-background="new -5.208 -4.384 408 71"
xml:space="preserve">
<defs>
</defs>
<path fill="#FFFFFF" d="M111.401,42.425c-1.112,0-2.896,0.109-4.007,1.986c-0.441,0.744-0.816,1.564-1.631,2.516
c-1.481,1.727-3.297,3.045-5.44,3.952c-2.146,0.908-4.589,1.36-7.325,1.36c-2.766,0-5.23-0.452-7.385-1.36
c-2.162-0.907-3.98-2.226-5.462-3.952c-1.485-1.73-2.618-3.84-3.411-6.334c-0.789-2.489-1.185-5.306-1.185-8.444
c0-3.114,0.396-5.913,1.185-8.406c0.793-2.489,1.926-4.603,3.411-6.33c1.482-1.729,3.3-3.052,5.462-3.976
c2.155-0.922,4.619-1.383,7.385-1.383c2.736,0,5.179,0.461,7.325,1.383c2.143,0.924,3.959,2.247,5.44,3.976
c0.716,0.834,1.352,1.757,1.903,2.772c1.064,1.96,3.735,1.726,3.735,1.726h12.112c-0.248-0.817-0.505-1.63-0.817-2.422
c-1.538-3.918-3.702-7.318-6.497-10.198c-2.794-2.88-6.16-5.148-10.097-6.807C102.163,0.827,97.799,0,92.998,0
C88.2,0,83.827,0.82,79.876,2.462c-3.951,1.642-7.331,3.902-10.14,6.783c-2.811,2.884-4.981,6.28-6.521,10.197
c-0.092,0.235-0.173,0.476-0.26,0.713c-0.083-0.222-0.159-0.447-0.247-0.667c-1.562-3.918-3.757-7.318-6.594-10.198
c-2.835-2.879-6.251-5.147-10.248-6.807c-3.997-1.656-8.428-2.483-13.299-2.483c-4.87,0-9.308,0.819-13.319,2.461
c-4.01,1.642-7.439,3.903-10.29,6.784c-2.854,2.883-5.056,6.279-6.619,10.196C0.78,23.363,0,27.598,0,32.148
c0,4.553,0.78,8.787,2.34,12.705c1.563,3.917,3.765,7.324,6.619,10.218c2.851,2.894,6.28,5.162,10.29,6.804
c4.011,1.643,8.449,2.465,13.319,2.465c4.871,0,9.302-0.822,13.299-2.465c3.997-1.642,7.413-3.91,10.248-6.804
c2.837-2.894,5.032-6.301,6.594-10.218c0.091-0.228,0.169-0.46,0.255-0.689c0.084,0.229,0.162,0.462,0.251,0.689
c1.54,3.917,3.71,7.324,6.521,10.218c2.809,2.894,6.189,5.162,10.14,6.804c3.951,1.643,8.324,2.465,13.122,2.465
c4.801,0,9.165-0.822,13.104-2.465c3.937-1.642,7.303-3.91,10.097-6.804c2.795-2.894,4.959-6.301,6.497-10.218
c0.312-0.793,0.57-1.609,0.818-2.428H111.401z M48.981,40.593c-0.8,2.494-1.954,4.604-3.458,6.334
c-1.503,1.727-3.346,3.045-5.521,3.951c-2.178,0.909-4.657,1.361-7.434,1.361c-2.807,0-5.308-0.452-7.496-1.361
c-2.193-0.906-4.038-2.225-5.543-3.951c-1.506-1.73-2.657-3.84-3.462-6.334c-0.8-2.489-1.202-5.306-1.202-8.445
c0-3.113,0.402-5.912,1.202-8.405c0.805-2.489,1.956-4.603,3.462-6.329c1.505-1.73,3.35-3.053,5.543-3.977
c2.188-0.921,4.689-1.382,7.496-1.382c2.777,0,5.256,0.461,7.434,1.382c2.175,0.924,4.018,2.247,5.521,3.977
c1.504,1.726,2.658,3.84,3.458,6.329c0.802,2.493,1.204,5.292,1.204,8.405C50.185,35.288,49.783,38.104,48.981,40.593z"/>
<path fill="#FFFFFF" d="M208.964,32.148c0,4.553-0.784,8.787-2.341,12.705c-1.564,3.917-3.761,7.324-6.594,10.218
c-2.838,2.894-6.252,5.162-10.251,6.804c-3.996,1.643-8.427,2.465-13.299,2.465c-4.87,0-9.307-0.822-13.317-2.465
c-4.012-1.642-7.442-3.91-10.29-6.804c-2.856-2.894-5.059-6.301-6.62-10.218c-1.56-3.918-2.34-8.152-2.34-12.705
c0-4.55,0.78-8.785,2.34-12.706c1.561-3.917,3.764-7.313,6.62-10.196c2.848-2.881,6.278-5.142,10.29-6.784
c4.01-1.642,8.447-2.461,13.317-2.461c4.872,0,9.303,0.827,13.299,2.483c3.999,1.66,7.413,3.928,10.251,6.807
c2.833,2.88,5.029,6.28,6.594,10.198C208.18,23.406,208.964,27.626,208.964,32.148 M194.097,32.148c0-3.113-0.401-5.912-1.202-8.405
c-0.8-2.489-1.954-4.603-3.458-6.329c-1.504-1.73-3.347-3.053-5.521-3.977c-2.179-0.921-4.658-1.382-7.436-1.382
c-2.806,0-5.306,0.461-7.494,1.382c-2.195,0.924-4.04,2.247-5.544,3.977c-1.506,1.726-2.658,3.84-3.462,6.329
c-0.8,2.493-1.203,5.292-1.203,8.405c0,3.14,0.403,5.956,1.203,8.445c0.804,2.494,1.956,4.604,3.462,6.334
c1.504,1.727,3.349,3.045,5.544,3.951c2.188,0.909,4.688,1.361,7.494,1.361c2.778,0,5.257-0.452,7.436-1.361
c2.174-0.906,4.017-2.225,5.521-3.951c1.504-1.73,2.658-3.84,3.458-6.334C193.696,38.104,194.097,35.288,194.097,32.148"/>
<path fill="#FFFFFF" d="M210.603,63.648V0.69h23.159c4.351,0,8.053,0.405,11.104,1.21
c3.053,0.808,5.546,1.944,7.475,3.415c1.931,1.468,3.334,3.255,4.214,5.358c0.878,2.103,1.319,4.452,1.319,7.044
c0,1.41-0.204,2.77-0.606,4.082c-0.404,1.312-1.036,2.542-1.902,3.696c-0.864,1.15-1.971,2.193-3.326,3.133
c-1.354,0.935-2.982,1.748-4.885,2.44c4.151,1.01,7.217,2.645,9.208,4.906c1.985,2.262,2.979,5.161,2.979,8.705
c0,2.676-0.519,5.17-1.556,7.473c-1.037,2.307-2.558,4.314-4.557,6.031c-2.004,1.713-4.474,3.053-7.412,4.016
c-2.938,0.967-6.294,1.449-10.069,1.449H210.603z M225.208,27.178h7.604c1.612,0,3.066-0.114,4.365-0.343
c1.294-0.232,2.397-0.633,3.306-1.21c0.907-0.577,1.596-1.369,2.074-2.378c0.476-1.009,0.71-2.275,0.71-3.804
c0-1.494-0.185-2.742-0.56-3.738c-0.375-0.991-0.952-1.79-1.73-2.398c-0.775-0.605-1.765-1.034-2.958-1.294
c-1.197-0.26-2.614-0.39-4.256-0.39h-8.555V27.178z M225.208,36.944V52.63h10.279c1.931,0,3.511-0.246,4.735-0.734
c1.224-0.492,2.183-1.126,2.872-1.902c0.692-0.777,1.166-1.656,1.426-2.639c0.259-0.977,0.389-1.971,0.389-2.978
c0-1.153-0.15-2.19-0.452-3.112c-0.302-0.921-0.82-1.698-1.554-2.334c-0.736-0.634-1.711-1.123-2.921-1.471
c-1.21-0.344-2.735-0.517-4.578-0.517H225.208z"/>
<polygon fill="#FFFFFF" points="301.985,0.689 301.985,11.924 276.144,11.924 276.144,26.616 295.934,26.616
295.934,37.419 276.144,37.419 276.144,52.412 301.985,52.412 301.985,63.647 261.454,63.647 261.454,0.689 "/>
<path fill="#FFFFFF" d="M319.388,40.358v23.29h-14.604V0.689h20.481c4.549,0,8.431,0.472,11.646,1.407
c3.211,0.936,5.835,2.24,7.862,3.91c2.032,1.672,3.506,3.643,4.433,5.919c0.919,2.275,1.38,4.753,1.38,7.434
c0,2.046-0.274,3.973-0.823,5.787c-0.543,1.815-1.36,3.496-2.438,5.036c-1.08,1.54-2.406,2.915-3.975,4.126
c-1.572,1.211-3.38,2.203-5.426,2.98c0.98,0.492,1.896,1.098,2.745,1.814c0.848,0.721,1.592,1.6,2.229,2.637l13.393,21.908h-13.221
c-2.451,0-4.207-0.922-5.272-2.764l-10.457-18.279c-0.461-0.809-1.003-1.382-1.622-1.73c-0.617-0.344-1.491-0.517-2.611-0.517
H319.388z M319.388,30.291h5.877c1.985,0,3.679-0.253,5.076-0.756c1.397-0.506,2.544-1.203,3.437-2.097
c0.894-0.892,1.54-1.937,1.944-3.131c0.4-1.197,0.606-2.487,0.606-3.869c0-2.764-0.902-4.927-2.702-6.48
c-1.8-1.558-4.588-2.335-8.361-2.335h-5.877V30.291z"/>
<path fill="#FFFFFF" d="M127.329,0.689v25.243h-16.043c-1.452,0-2.628,1.128-2.628,2.517v7.438
c0,1.392,1.176,2.519,2.628,2.519h16.043v25.241h14.604V0.689H127.329z"/>
<path fill="#DB6B26" d="M400.482,30.821c-1.021-16.438-19.171-30.662-26.648-30.819
c-7.479-0.159-21.459,17.25-22.024,34.938c-0.53,16.585,13.818,27.958,19.996,29.401c0.172-7.803,0.805-36.532,0.911-39.882
c0.223-6.846,0.563-17.498,1.723-17.852c0.665-0.203,1.571,5.785,1.46,9.324c-0.023,0.675-0.031,2.862-0.031,5.966
c1.251-1.255,2.558-2.558,3.352-3.328c2.177-2.11,3.14-1.859,2.096,0.023c-0.643,1.158-3.408,5.008-5.441,7.798
c0.012,5.627,0.037,12.709,0.064,19.309c2.871-3.315,6.386-7.289,8.232-9.057c3.872-3.702,4.284-3.235,2.455,0.651
c-1.123,2.382-6.614,8.736-10.668,13.747c0.025,5.855,0.045,10.778,0.05,13.129C386.88,61.81,401.481,46.96,400.482,30.821"/>
</svg>

Before

Width:  |  Height:  |  Size: 7.1 KiB

View File

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [
<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
]>
<svg version="1.0"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
x="0px" y="0px" width="408px" height="71px" viewBox="-5.208 -4.384 408 71" enable-background="new -5.208 -4.384 408 71"
xml:space="preserve">
<defs>
</defs>
<path fill="#596667" d="M111.401,42.425c-1.112,0-2.896,0.109-4.007,1.986c-0.441,0.744-0.816,1.564-1.631,2.516
c-1.481,1.727-3.297,3.045-5.44,3.952c-2.146,0.908-4.589,1.36-7.325,1.36c-2.766,0-5.23-0.452-7.385-1.36
c-2.162-0.907-3.98-2.226-5.462-3.952c-1.485-1.73-2.618-3.84-3.411-6.334c-0.789-2.489-1.185-5.306-1.185-8.444
c0-3.114,0.396-5.913,1.185-8.406c0.793-2.489,1.926-4.603,3.411-6.33c1.482-1.729,3.3-3.052,5.462-3.976
c2.155-0.922,4.619-1.383,7.385-1.383c2.736,0,5.179,0.461,7.325,1.383c2.143,0.924,3.959,2.247,5.44,3.976
c0.716,0.834,1.352,1.757,1.903,2.772c1.064,1.96,3.735,1.726,3.735,1.726h12.112c-0.248-0.817-0.505-1.63-0.817-2.422
c-1.538-3.918-3.702-7.318-6.497-10.198c-2.794-2.88-6.16-5.148-10.097-6.807C102.163,0.827,97.799,0,92.998,0
C88.2,0,83.827,0.82,79.876,2.462c-3.951,1.642-7.331,3.902-10.14,6.783c-2.811,2.884-4.981,6.28-6.521,10.197
c-0.092,0.235-0.173,0.476-0.26,0.713c-0.083-0.222-0.159-0.447-0.247-0.667c-1.562-3.918-3.757-7.318-6.594-10.198
c-2.835-2.879-6.251-5.147-10.248-6.807c-3.997-1.656-8.428-2.483-13.299-2.483c-4.87,0-9.308,0.819-13.319,2.461
c-4.01,1.642-7.439,3.903-10.29,6.784c-2.854,2.883-5.056,6.279-6.619,10.196C0.78,23.363,0,27.598,0,32.148
c0,4.553,0.78,8.787,2.34,12.705c1.563,3.917,3.765,7.324,6.619,10.218c2.851,2.894,6.28,5.162,10.29,6.804
c4.011,1.643,8.449,2.465,13.319,2.465c4.871,0,9.302-0.822,13.299-2.465c3.997-1.642,7.413-3.91,10.248-6.804
c2.837-2.894,5.032-6.301,6.594-10.218c0.091-0.228,0.169-0.46,0.255-0.689c0.084,0.229,0.162,0.462,0.251,0.689
c1.54,3.917,3.71,7.324,6.521,10.218c2.809,2.894,6.189,5.162,10.14,6.804c3.951,1.643,8.324,2.465,13.122,2.465
c4.801,0,9.165-0.822,13.104-2.465c3.937-1.642,7.303-3.91,10.097-6.804c2.795-2.894,4.959-6.301,6.497-10.218
c0.312-0.793,0.57-1.609,0.818-2.428H111.401z M48.981,40.593c-0.8,2.494-1.954,4.604-3.458,6.334
c-1.503,1.727-3.346,3.045-5.521,3.951c-2.178,0.909-4.657,1.361-7.434,1.361c-2.807,0-5.308-0.452-7.496-1.361
c-2.193-0.906-4.038-2.225-5.543-3.951c-1.506-1.73-2.657-3.84-3.462-6.334c-0.8-2.489-1.202-5.306-1.202-8.445
c0-3.113,0.402-5.912,1.202-8.405c0.805-2.489,1.956-4.603,3.462-6.329c1.505-1.73,3.35-3.053,5.543-3.977
c2.188-0.921,4.689-1.382,7.496-1.382c2.777,0,5.256,0.461,7.434,1.382c2.175,0.924,4.018,2.247,5.521,3.977
c1.504,1.726,2.658,3.84,3.458,6.329c0.802,2.493,1.204,5.292,1.204,8.405C50.185,35.288,49.783,38.104,48.981,40.593z"/>
<path fill="#596667" d="M208.964,32.148c0,4.553-0.784,8.787-2.341,12.705c-1.564,3.917-3.761,7.324-6.594,10.218
c-2.838,2.894-6.252,5.162-10.251,6.804c-3.996,1.643-8.427,2.465-13.299,2.465c-4.87,0-9.307-0.822-13.317-2.465
c-4.012-1.642-7.442-3.91-10.29-6.804c-2.856-2.894-5.059-6.301-6.62-10.218c-1.56-3.918-2.34-8.152-2.34-12.705
c0-4.55,0.78-8.785,2.34-12.706c1.561-3.917,3.764-7.313,6.62-10.196c2.848-2.881,6.278-5.142,10.29-6.784
c4.01-1.642,8.447-2.461,13.317-2.461c4.872,0,9.303,0.827,13.299,2.483c3.999,1.66,7.413,3.928,10.251,6.807
c2.833,2.88,5.029,6.28,6.594,10.198C208.18,23.406,208.964,27.626,208.964,32.148 M194.097,32.148c0-3.113-0.401-5.912-1.202-8.405
c-0.8-2.489-1.954-4.603-3.458-6.329c-1.504-1.73-3.347-3.053-5.521-3.977c-2.179-0.921-4.658-1.382-7.436-1.382
c-2.806,0-5.306,0.461-7.494,1.382c-2.195,0.924-4.04,2.247-5.544,3.977c-1.506,1.726-2.658,3.84-3.462,6.329
c-0.8,2.493-1.203,5.292-1.203,8.405c0,3.14,0.403,5.956,1.203,8.445c0.804,2.494,1.956,4.604,3.462,6.334
c1.504,1.727,3.349,3.045,5.544,3.951c2.188,0.909,4.688,1.361,7.494,1.361c2.778,0,5.257-0.452,7.436-1.361
c2.174-0.906,4.017-2.225,5.521-3.951c1.504-1.73,2.658-3.84,3.458-6.334C193.696,38.104,194.097,35.288,194.097,32.148"/>
<path fill="#596667" d="M210.603,63.648V0.69h23.159c4.351,0,8.053,0.405,11.104,1.21
c3.053,0.808,5.546,1.944,7.475,3.415c1.931,1.468,3.334,3.255,4.214,5.358c0.878,2.103,1.319,4.452,1.319,7.044
c0,1.41-0.204,2.77-0.606,4.082c-0.404,1.312-1.036,2.542-1.902,3.696c-0.864,1.15-1.971,2.193-3.326,3.133
c-1.354,0.935-2.982,1.748-4.885,2.44c4.151,1.01,7.217,2.645,9.208,4.906c1.985,2.262,2.979,5.161,2.979,8.705
c0,2.676-0.519,5.17-1.556,7.473c-1.037,2.307-2.558,4.314-4.557,6.031c-2.004,1.713-4.474,3.053-7.412,4.016
c-2.938,0.967-6.294,1.449-10.069,1.449H210.603z M225.208,27.178h7.604c1.612,0,3.066-0.114,4.365-0.343
c1.294-0.232,2.397-0.633,3.306-1.21c0.907-0.577,1.596-1.369,2.074-2.378c0.476-1.009,0.71-2.275,0.71-3.804
c0-1.494-0.185-2.742-0.56-3.738c-0.375-0.991-0.952-1.79-1.73-2.398c-0.775-0.605-1.765-1.034-2.958-1.294
c-1.197-0.26-2.614-0.39-4.256-0.39h-8.555V27.178z M225.208,36.944V52.63h10.279c1.931,0,3.511-0.246,4.735-0.734
c1.224-0.492,2.183-1.126,2.872-1.902c0.692-0.777,1.166-1.656,1.426-2.639c0.259-0.977,0.389-1.971,0.389-2.978
c0-1.153-0.15-2.19-0.452-3.112c-0.302-0.921-0.82-1.698-1.554-2.334c-0.736-0.634-1.711-1.123-2.921-1.471
c-1.21-0.344-2.735-0.517-4.578-0.517H225.208z"/>
<polygon fill="#596667" points="301.985,0.689 301.985,11.924 276.144,11.924 276.144,26.616 295.934,26.616
295.934,37.419 276.144,37.419 276.144,52.412 301.985,52.412 301.985,63.647 261.454,63.647 261.454,0.689 "/>
<path fill="#596667" d="M319.388,40.358v23.29h-14.604V0.689h20.481c4.549,0,8.431,0.472,11.646,1.407
c3.211,0.936,5.835,2.24,7.862,3.91c2.032,1.672,3.506,3.643,4.433,5.919c0.919,2.275,1.38,4.753,1.38,7.434
c0,2.046-0.274,3.973-0.823,5.787c-0.543,1.815-1.36,3.496-2.438,5.036c-1.08,1.54-2.406,2.915-3.975,4.126
c-1.572,1.211-3.38,2.203-5.426,2.98c0.98,0.492,1.896,1.098,2.745,1.814c0.848,0.721,1.592,1.6,2.229,2.637l13.393,21.908h-13.221
c-2.451,0-4.207-0.922-5.272-2.764l-10.457-18.279c-0.461-0.809-1.003-1.382-1.622-1.73c-0.617-0.344-1.491-0.517-2.611-0.517
H319.388z M319.388,30.291h5.877c1.985,0,3.679-0.253,5.076-0.756c1.397-0.506,2.544-1.203,3.437-2.097
c0.894-0.892,1.54-1.937,1.944-3.131c0.4-1.197,0.606-2.487,0.606-3.869c0-2.764-0.902-4.927-2.702-6.48
c-1.8-1.558-4.588-2.335-8.361-2.335h-5.877V30.291z"/>
<path fill="#596667" d="M127.329,0.689v25.243h-16.043c-1.452,0-2.628,1.128-2.628,2.517v7.438
c0,1.392,1.176,2.519,2.628,2.519h16.043v25.241h14.604V0.689H127.329z"/>
<path fill="#DB6B26" d="M400.482,30.821c-1.021-16.438-19.171-30.662-26.648-30.819
c-7.479-0.159-21.459,17.25-22.024,34.938c-0.53,16.585,13.818,27.958,19.996,29.401c0.172-7.803,0.805-36.532,0.911-39.882
c0.223-6.846,0.563-17.498,1.723-17.852c0.665-0.203,1.571,5.785,1.46,9.324c-0.023,0.675-0.031,2.862-0.031,5.966
c1.251-1.255,2.558-2.558,3.352-3.328c2.177-2.11,3.14-1.859,2.096,0.023c-0.643,1.158-3.408,5.008-5.441,7.798
c0.012,5.627,0.037,12.709,0.064,19.309c2.871-3.315,6.386-7.289,8.232-9.057c3.872-3.702,4.284-3.235,2.455,0.651
c-1.123,2.382-6.614,8.736-10.668,13.747c0.025,5.855,0.045,10.778,0.05,13.129C386.88,61.81,401.481,46.96,400.482,30.821"/>
</svg>

Before

Width:  |  Height:  |  Size: 7.1 KiB

View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 2159 531" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-miterlimit:10;">
<g transform="matrix(1,0,0,1,-203.164,-34.6758)">
<g id="Snowflake" transform="matrix(1,0,0,1,1723.13,0)">
<g>
<path d="M400,300L400,500" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
<path d="M355.3,389.017L400,344.316L444.7,389.017" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;stroke-linecap:square;"/>
<path d="M342.174,462.247L400,404.42L457.826,462.247" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
</g>
<g>
<path d="M400,300L226.795,400" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
<path d="M300.559,305.797L361.621,322.158L345.259,383.22" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;stroke-linecap:square;"/>
<path d="M230.577,331.044L309.57,352.21L288.404,431.202" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
</g>
<g>
<path d="M400,300L226.795,200" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
<path d="M345.259,216.78L361.621,277.842L300.559,294.203" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;stroke-linecap:square;"/>
<path d="M288.404,168.798L309.57,247.79L230.577,268.956" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
</g>
<g>
<path d="M400,300L400,100" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
<path d="M444.7,210.983L400,255.684L355.3,210.983" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;stroke-linecap:square;"/>
<path d="M457.826,137.753L400,195.58L342.174,137.753" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
</g>
<g>
<path d="M400,300L573.205,200" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
<path d="M499.441,294.203L438.379,277.842L454.741,216.78" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;stroke-linecap:square;"/>
<path d="M569.423,268.956L490.43,247.79L511.596,168.798" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
</g>
<g>
<path d="M400,300L573.205,400" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
<path d="M454.741,383.22L438.379,322.158L499.441,305.797" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;stroke-linecap:square;"/>
<path d="M511.596,431.202L490.43,352.21L569.423,331.044" style="fill:none;fill-rule:nonzero;stroke:rgb(45,167,199);stroke-width:13px;"/>
</g>
</g>
<g transform="matrix(4.85947,0,0,4.85947,-731.059,-919.349)">
<path d="M217.275,286.281L210.955,286.281L192.351,215.563L197.717,215.563L214.055,278.172L231.228,215.563L238.502,215.563L255.794,278.172L272.132,215.563L277.499,215.563L258.895,286.281L252.574,286.281L234.925,222.361L217.275,286.281Z" style="fill:white;fill-rule:nonzero;stroke:white;stroke-width:0.21px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:2;"/>
<rect x="286.681" y="215.563" width="4.77" height="70.718" style="fill:white;fill-rule:nonzero;stroke:white;stroke-width:0.21px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:2;"/>
<path d="M311.486,286.281L306.716,286.281L306.716,215.563L313.275,215.563L355.968,280.438L355.968,215.563L360.738,215.563L360.738,286.281L354.179,286.281L311.486,222.361L311.486,286.281Z" style="fill:white;fill-rule:nonzero;stroke:white;stroke-width:0.21px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:2;"/>
<path d="M397.827,286.281L393.056,286.281L393.056,220.214L368.848,220.214L368.848,215.563L422.274,215.563L422.274,220.214L397.827,220.214L397.827,286.281Z" style="fill:white;fill-rule:nonzero;stroke:white;stroke-width:0.21px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:2;"/>
<path d="M476.535,286.281L430.383,286.281L430.383,215.563L476.535,215.563L476.535,220.214L435.153,220.214L435.153,247.404L472.957,247.404L472.957,251.817L435.153,251.817L435.153,281.75L476.535,281.75L476.535,286.281Z" style="fill:white;fill-rule:nonzero;stroke:white;stroke-width:0.21px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:2;"/>
<path d="M490.249,286.281L485.479,286.281L485.479,215.563L519.228,215.563C524.078,215.563 528.212,217.392 531.63,221.049C535.049,224.627 536.758,228.999 536.758,234.167C536.758,238.699 535.725,242.634 533.658,245.973C531.511,249.312 528.848,251.26 525.668,251.817C528.609,252.612 530.994,255.116 532.823,259.33C534.651,263.543 535.566,268.632 535.566,274.594C535.566,277.933 535.645,280.438 535.804,282.107C535.963,284.095 536.281,285.486 536.758,286.281L531.988,286.281C531.193,285.327 530.676,283.578 530.438,281.034L530.08,270.897C530.08,266.127 528.927,262.033 526.622,258.614C524.396,255.275 521.653,253.606 518.393,253.606L490.249,253.606L490.249,286.281ZM490.249,249.193L518.393,249.193C522.13,249.193 525.35,247.762 528.053,244.9C530.676,242.117 531.988,238.699 531.988,234.644C531.988,230.669 530.676,227.25 528.053,224.388C525.35,221.606 522.13,220.214 518.393,220.214L490.249,220.214L490.249,249.193Z" style="fill:white;fill-rule:nonzero;stroke:white;stroke-width:0.21px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:2;"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 8992 2212" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-miterlimit:10;"><g id="Snowflake"><g><path d="M7997.78,1105.52l0,833.334" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M7811.52,1476.42l186.252,-186.252l186.252,186.252" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M7756.83,1781.55l240.943,-240.944l240.944,240.944" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M7997.78,1105.52l-721.688,416.667" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M7583.44,1129.67l254.425,68.173l-68.173,254.425" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M7291.85,1234.87l329.135,88.191l-88.192,329.135" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M7997.78,1105.52l-721.688,-416.666" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M7769.69,758.767l68.173,254.425l-254.425,68.173" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M7532.79,558.841l88.192,329.135l-329.135,88.191" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M7997.78,1105.52l0,-833.333" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M8184.03,734.614l-186.252,186.252l-186.252,-186.252" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M8238.72,429.49l-240.944,240.944l-240.943,-240.944" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M7997.78,1105.52l721.688,-416.666" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M8412.11,1081.37l-254.425,-68.173l68.173,-254.425" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M8703.7,976.167l-329.135,-88.191l88.191,-329.135" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g><g><path d="M7997.78,1105.52l721.688,416.667" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/><path d="M8225.86,1452.27l-68.173,-254.425l254.425,-68.173" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;stroke-linecap:square;"/><path d="M8462.76,1652.19l-88.191,-329.135l329.135,-88.191" style="fill:none;fill-rule:nonzero;stroke:#2da7c7;stroke-width:54.17px;"/></g></g><path d="M504.66,1821.46l-127.976,0l-376.684,-1431.88l108.659,-0l330.806,1267.69l347.709,-1267.69l147.293,-0l350.123,1267.69l330.806,-1267.69l108.659,-0l-376.684,1431.88l-127.976,0l-357.367,-1294.25l-357.368,1294.25Z" style="fill:#103141;fill-rule:nonzero;"/><rect x="1909.98" y="389.576" width="96.586" height="1431.88" style="fill:#103141;fill-rule:nonzero;"/><path d="M2412.23,1821.46l-96.586,0l-0,-1431.88l132.805,-0l864.443,1313.57l-0,-1313.57l96.585,-0l0,1431.88l-132.805,0l-864.442,-1294.25l-0,1294.25Z" style="fill:#103141;fill-rule:nonzero;"/><path d="M4160.43,1821.46l-96.585,0l-0,-1337.71l-490.173,-0l0,-94.171l1081.76,-0l0,94.171l-495.002,-0l0,1337.71Z" style="fill:#103141;fill-rule:nonzero;"/><path d="M5754.1,1821.46l-934.467,0l0,-1431.88l934.467,-0l0,94.171l-837.881,-0l-0,550.538l765.442,0l-0,89.342l-765.442,0l-0,606.076l837.881,-0l0,91.756Z" style="fill:#103141;fill-rule:nonzero;"/><path d="M6031.78,1821.46l-96.586,0l0,-1431.88l683.344,-0c98.196,-0 181.904,37.024 251.123,111.073c69.22,72.44 103.83,160.977 103.83,265.611c-0,91.757 -20.927,171.44 -62.781,239.05c-43.463,67.61 -97.39,107.049 -161.781,118.317c59.561,16.098 107.854,66.805 144.879,152.123c37.024,85.317 55.537,188.342 55.537,309.074c-0,67.61 1.609,118.318 4.829,152.123c3.219,40.244 9.658,68.415 19.317,84.512l-96.586,0c-16.097,-19.317 -26.561,-54.732 -31.39,-106.244l-7.244,-205.245c-0,-96.586 -23.342,-179.488 -70.025,-248.708c-45.073,-67.61 -100.61,-101.415 -166.61,-101.415l-569.856,-0l0,661.612Zm0,-750.954l569.856,0c75.659,0 140.854,-28.976 195.586,-86.927c53.122,-56.342 79.683,-125.561 79.683,-207.659c0,-80.488 -26.561,-149.708 -79.683,-207.66c-54.732,-56.341 -119.927,-84.512 -195.586,-84.512l-569.856,-0l0,586.758Z" style="fill:#103141;fill-rule:nonzero;"/></svg>

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

View File

@ -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 = {
'&': '&amp;',
'<': '&lt;',
@ -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.
*/
/*

View File

@ -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
*/

File diff suppressed because one or more lines are too long

View File

@ -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')
}
}

View File

@ -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()
}

View File

@ -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
}

View File

@ -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
*/

View File

@ -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);
})($.wn.lang || {}, $.wn.langMessages);

View File

@ -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);

View File

@ -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($){

View File

@ -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()

View File

@ -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 @@
* <div class="control-scrollpad" data-control="scrollpad" data-direction="vertical">
* <div>
* <div>
* The content goes here. The two wrapping
* The content goes here. The two wrapping
* DIV elements are required.
* </div>
* </div>
* </div>
*
*
* 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
}

View File

@ -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

View File

@ -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)
}
}

View File

@ -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);

View File

@ -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();
})

View File

@ -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()
}

View File

@ -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";

View File

@ -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;

View File

@ -11,7 +11,7 @@
// With icons (no bullets):
// <div class="control-simplelist with-icons">
// <ul>
// <li class="oc-icon-check">Hello friend</li>
// <li class="wn-icon-check">Hello friend</li>
// </ul>
// </div>
//

View File

@ -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);
}

View File

@ -26,6 +26,7 @@ body.outer {
margin-left: -28px;
}
h1.wn-logo,
h1.oc-logo {
.hide-text();
display: inline-block;

View File

@ -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";

View File

@ -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 <khallman@gmail.com>
* 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 = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
position: 'relative',
backgroundColor: options.bgColor
@ -340,24 +340,24 @@
var $img2 = $('<div />'),
$img_holder = $('<div />')
$img_holder = $('<div />')
.width('100%').height('100%').css({
zIndex: 310,
position: 'absolute',
overflow: 'hidden'
}),
$hdl_holder = $('<div />')
.width('100%').height('100%').css('zIndex', 320),
$hdl_holder = $('<div />')
.width('100%').height('100%').css('zIndex', 320),
$sel = $('<div />')
$sel = $('<div />')
.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) //{{{
{

View File

@ -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
* <?= $this->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
* <?= $this->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
* <?= $this->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)

View File

@ -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

View File

@ -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 (<tr class="...">).
* @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 (<td>...</td>)
* @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

View File

@ -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)
{

View File

@ -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)

View File

@ -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';

View File

@ -18,5 +18,5 @@
}
$.oc.exportBehavior = new ExportBehavior;
$.wn.exportBehavior = new ExportBehavior;
}(window.jQuery);

View File

@ -145,5 +145,5 @@
}
}
$.oc.importBehavior = new ImportBehavior;
$.wn.importBehavior = new ImportBehavior;
}(window.jQuery);

View File

@ -11,7 +11,7 @@
<div class="control-simplelist is-divided is-scrollable size-small" data-control="simplelist">
<ul>
<?php foreach ($columnData as $sample): ?>
<li class="oc-icon-file-o">
<li class="wn-icon-file-o">
<?= e($sample) ?>
</li>
<?php endforeach ?>

View File

@ -24,7 +24,7 @@
<script>
$('#exportFormPopup').on('popupComplete', function() {
$.oc.exportBehavior.processExport()
$.wn.exportBehavior.processExport()
})
</script>

View File

@ -19,5 +19,5 @@
</div>
<script>
$.oc.importBehavior.bindColumnSorting()
$.wn.importBehavior.bindColumnSorting()
</script>

View File

@ -13,14 +13,14 @@
data-delay="300"
data-placement="right"
title="<?= e(trans('backend::lang.import_export.ignore_this_column')) ?>"
onclick="$.oc.importBehavior.ignoreFileColumn(this)"
onclick="$.wn.importBehavior.ignoreFileColumn(this)"
>
<i class="icon-close"></i>
</a>
<a
href="javascript:;"
class="column-label"
onclick="$.oc.importBehavior.loadFileColumnSample(this)"
onclick="$.wn.importBehavior.loadFileColumnSample(this)"
>
<?= e($column) ?>
</a>
@ -40,5 +40,5 @@
</div>
<script>
$.oc.importBehavior.bindColumnSorting()
$.wn.importBehavior.bindColumnSorting()
</script>

View File

@ -24,7 +24,7 @@
<script>
$('#importFormPopup').on('popupComplete', function() {
$.oc.importBehavior.processImport()
$.wn.importBehavior.processImport()
})
</script>

View File

@ -2,15 +2,15 @@
<a
href="javascript:;"
id="showIgnoredColumnsButton"
class="btn btn-sm btn-secondary oc-icon-eye disabled"
onclick="$.oc.importBehavior.showIgnoredColumns()">
class="btn btn-sm btn-secondary wn-icon-eye disabled"
onclick="$.wn.importBehavior.showIgnoredColumns()">
<?= e(trans('backend::lang.import_export.show_ignored_columns')) ?>
</a>
<a
href="javascript:;"
id="autoMatchColumnsButton"
class="btn btn-sm btn-secondary oc-icon-bullseye"
onclick="$.oc.importBehavior.autoMatchColumns()">
class="btn btn-sm btn-secondary wn-icon-bullseye"
onclick="$.wn.importBehavior.autoMatchColumns()">
<?= e(trans('backend::lang.import_export.auto_match_columns')) ?>
</a>
</div>

View File

@ -96,5 +96,5 @@
}
$.oc.relationBehavior = new RelationBehavior;
$.wn.relationBehavior = new RelationBehavior;
}(window.jQuery);

View File

@ -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">
<?= e(trans($text, ['name' => trans($relationLabel)])) ?>
</a>

View File

@ -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">
<?= e(trans($text, ['name' => trans($relationLabel)])) ?>
</a>

View File

@ -1,22 +1,22 @@
<?php if ($relationViewMode == 'single'): ?>
<button
class="btn btn-sm btn-secondary oc-icon-trash-o"
class="btn btn-sm btn-secondary wn-icon-trash-o"
data-request="onRelationButtonDelete"
data-request-confirm="<?= e(trans('backend::lang.relation.delete_confirm')) ?>"
data-request-success="$.oc.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'deleted')"
data-request-success="$.wn.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'deleted')"
data-stripe-load-indicator>
<?= e(trans($text)) ?>
</button>
<?php else: ?>
<button
class="btn btn-sm btn-secondary oc-icon-trash-o"
class="btn btn-sm btn-secondary wn-icon-trash-o"
onclick="$(this).data('request-data', {
checked: $('#<?= $this->relationGetId('view') ?> .control-list').listWidget('getChecked')
})"
disabled="disabled"
data-request="onRelationButtonDelete"
data-request-confirm="<?= e(trans('backend::lang.relation.delete_confirm')) ?>"
data-request-success="$.oc.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'deleted')"
data-request-success="$.wn.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'deleted')"
data-trigger-action="enable"
data-trigger="#<?= $this->relationGetId('view') ?> .control-list input[type=checkbox]"
data-trigger-condition="checked"

View File

@ -3,6 +3,6 @@
data-size="huge"
data-handler="onRelationButtonLink"
href="javascript:;"
class="btn btn-sm btn-secondary oc-icon-link">
class="btn btn-sm btn-secondary wn-icon-link">
<?= e(trans($text, ['name' => trans($relationLabel)])) ?>
</a>

View File

@ -1,20 +1,20 @@
<?php if ($relationViewMode == 'single'): ?>
<button
class="btn btn-sm btn-secondary oc-icon-minus"
class="btn btn-sm btn-secondary wn-icon-minus"
data-request="onRelationButtonRemove"
data-request-success="$.oc.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'removed')"
data-request-success="$.wn.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'removed')"
data-stripe-load-indicator>
<?= e(trans($text)) ?>
</button>
<?php else: ?>
<button
class="btn btn-sm btn-secondary oc-icon-minus"
class="btn btn-sm btn-secondary wn-icon-minus"
onclick="$(this).data('request-data', {
checked: $('#<?= $this->relationGetId('view') ?> .control-list').listWidget('getChecked')
})"
disabled="disabled"
data-request="onRelationButtonRemove"
data-request-success="$.oc.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'removed')"
data-request-success="$.wn.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'removed')"
data-trigger-action="enable"
data-trigger="#<?= $this->relationGetId('view') ?> .control-list input[type=checkbox]"
data-trigger-condition="checked"

View File

@ -1,8 +1,8 @@
<a
href="javascript:;"
class="btn btn-sm btn-secondary oc-icon-unlink"
class="btn btn-sm btn-secondary wn-icon-unlink"
data-request="onRelationButtonUnlink"
data-request-success="$.oc.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'removed')"
data-request-success="$.wn.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'removed')"
data-request-confirm="<?= e(trans('backend::lang.relation.unlink_confirm')) ?>"
data-stripe-load-indicator>
<?= e(trans($text)) ?>

View File

@ -4,6 +4,6 @@
data-handler="onRelationButtonUpdate"
data-request-data="manage_id: '<?= $relationManageId ?>'"
href="javascript:;"
class="btn btn-sm btn-secondary oc-icon-pencil">
class="btn btn-sm btn-secondary wn-icon-pencil">
<?= e(trans($text, ['name' => trans($relationLabel)])) ?>
</a>

View File

@ -4,7 +4,7 @@
<?= Form::ajax('onRelationManageUpdate', [
'data-popup-load-indicator' => true,
'sessionKey' => $newSessionKey,
'data-request-success' => "$.oc.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'updated')",
'data-request-success' => "$.wn.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'updated')",
]) ?>
<!-- Passable fields -->
@ -53,7 +53,7 @@
<?= Form::ajax('onRelationManageCreate', [
'data-popup-load-indicator' => true,
'data-request-success' => "$.oc.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'created')",
'data-request-success' => "$.wn.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'created')",
'sessionKey' => $newSessionKey
]) ?>
@ -93,7 +93,7 @@
</div>
<script>
$.oc.relationBehavior.bindToPopups('#<?= $relationManageWidget->getId("managePopup") ?>', {
$.wn.relationBehavior.bindToPopups('#<?= $relationManageWidget->getId("managePopup") ?>', {
_relation_field: '<?= $relationField ?>',
_relation_mode: 'form'
})

View File

@ -24,7 +24,7 @@
class="btn btn-primary"
data-request="onRelationManageAdd"
data-dismiss="popup"
data-request-success="$.oc.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'added')"
data-request-success="$.wn.relationBehavior.changed('<?= e($this->vars['relationField']) ?>', 'added')"
data-stripe-load-indicator>
<?= e(trans('backend::lang.relation.add_selected')) ?>
</button>

View File

@ -2,7 +2,7 @@
<?= Form::ajax('onRelationManagePivotUpdate', [
'data' => ['_relation_field' => $relationField, 'manage_id' => $relationManageId],
'data-request-success' => "$.oc.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'updated')",
'data-request-success' => "$.wn.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'updated')",
'data-popup-load-indicator' => true
]) ?>
@ -42,7 +42,7 @@
<?= Form::ajax('onRelationManagePivotCreate', [
'data' => ['_relation_field' => $relationField, 'foreign_id' => $foreignId],
'data-request-success' => "$.oc.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'created')",
'data-request-success' => "$.wn.relationBehavior.changed('" . e($this->vars['relationField']) . "', 'created')",
'data-popup-load-indicator' => true
]) ?>

Some files were not shown because too many files have changed in this diff Show More