TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

URL -> Url

This commit is contained in:
Samuel Georges 2017-06-02 23:34:50 +10:00
parent bfcab59021
commit e2781c5fdf
15 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/backend/controllers/preferences/_field_editor_preview.htm
View File

@ -17,6 +17,6 @@
data-show-gutter="<?= $model->editor_show_gutter ? 'true' : 'false' ?>"
data-language="css"
data-margin="0"
data-vendor-path="<?= URL::to('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>/">
data-vendor-path="<?= Url::to('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>/">
<textarea name="editorpreferences_codeeditor"><?= e($this->makePartial('example_code')) ?></textarea>
</div>

2
modules/backend/formwidgets/codeeditor/partials/_codeeditor.htm
View File

@ -24,7 +24,7 @@
data-read-only="<?= $readOnly ? 'true' : 'false' ?>"
data-language="<?= $language ?>"
data-margin="<?= $margin ?>"
data-vendor-path="<?= URL::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
data-vendor-path="<?= Url::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
<div class="editor-toolbar">
<ul>
<li class="searchbox-enable">

2
modules/backend/formwidgets/markdowneditor/partials/_markdowneditor.htm
View File

@ -7,7 +7,7 @@
data-control="markdowneditor"
data-refresh-handler="<?= $this->getEventHandler('onRefresh') ?>"
data-view-mode="<?= $mode ?>"
data-vendor-path="<?= URL::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
data-vendor-path="<?= Url::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>">
<div class="control-toolbar editor-toolbar"></div>

2
modules/backend/formwidgets/richeditor/partials/_richeditor.htm
View File

@ -19,7 +19,7 @@
<?php if ($tableStyles): ?>data-table-styles="<?= e(json_encode($tableStyles)) ?>"<?php endif ?>
<?php if ($tableCellStyles): ?>data-table-cell-styles="<?= e(json_encode($tableCellStyles)) ?>"<?php endif ?>
data-links-handler="<?= $this->getEventHandler('onLoadPageLinksForm') ?>"
data-ace-vendor-path="<?= URL::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>"
data-ace-vendor-path="<?= Url::asset('/modules/backend/formwidgets/codeeditor/assets/vendor/ace') ?>"
placeholder="<?= e(trans($field->placeholder)) ?>"
data-control="richeditor">
<textarea name="<?= $name ?>" id="<?= $this->getId('textarea') ?>"><?= e($value) ?></textarea>

8
modules/backend/layouts/_head.htm
View File

@ -14,13 +14,13 @@
<?php
$coreBuild = System\Models\Parameter::get('system::core.build', 1);
?>
<link href="<?= URL::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
<link href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
<link href="<?= Backend::skinAsset('assets/css/october.css') ?>?v<?= $coreBuild ?>" rel="stylesheet">
<script src="<?= Backend::skinAsset('assets/js/vendor/jquery.min.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= URL::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= URL::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= Url::asset('modules/system/assets/js/framework.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/october-min.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= URL::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= Url::asset('modules/system/assets/js/lang/lang.'.App::getLocale().'.js') ?>?v<?= $coreBuild ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/october.flyout.js') ?>"></script>
<script src="<?= Backend::skinAsset('assets/js/october.tabformexpandcontrols.js') ?>"></script>

14
modules/backend/layouts/auth.htm
View File

@ -8,13 +8,13 @@
<meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
<meta name="csrf-token" content="<?= csrf_token() ?>">
<title><?= e(trans('backend::lang.auth.title')) ?></title>
<link href="<?= URL::asset('modules/system/assets/ui/storm.css') ?>" rel="stylesheet">
<link href="<?= URL::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">
<script src="<?= URL::to('modules/backend/assets/js/vendor/jquery.min.js') ?>"></script>
<script src="<?= URL::to('modules/system/assets/js/framework.js') ?>"></script>
<script src="<?= URL::asset('modules/system/assets/ui/storm-min.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/october-min.js') ?>"></script>
<script src="<?= URL::to('modules/backend/assets/js/auth/auth.js') ?>"></script>
<link href="<?= Url::asset('modules/system/assets/ui/storm.css') ?>" rel="stylesheet">
<link href="<?= Url::to('modules/backend/assets/css/october.css') ?>" rel="stylesheet">
<script src="<?= Url::to('modules/backend/assets/js/vendor/jquery.min.js') ?>"></script>
<script src="<?= Url::to('modules/system/assets/js/framework.js') ?>"></script>
<script src="<?= Url::asset('modules/system/assets/ui/storm-min.js') ?>"></script>
<script src="<?= Url::to('modules/backend/assets/js/october-min.js') ?>"></script>
<script src="<?= Url::to('modules/backend/assets/js/auth/auth.js') ?>"></script>
<?= $this->makeAssets() ?>
<?= Block::placeholder('head') ?>
<?= $this->makeLayoutPartial('custom_styles') ?>

2
modules/backend/views/access_denied.php
View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title><?= Lang::get('backend::lang.page.access_denied.label') ?></title>
<link href="<?= URL::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
<link href="<?= Url::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
</head>
<body>
<div class="container">

2
modules/backend/views/no_database.php
View File

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title><?= Lang::get('backend::lang.page.no_database.label') ?></title>
<link href="<?= URL::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
<link href="<?= Url::to('/modules/system/assets/css/styles.css') ?>" rel="stylesheet">
</head>
<body>
<div class="container">

2
modules/cms/classes/Page.php
View File

@ -181,7 +181,7 @@ class Page extends CmsCompoundObject
* with the following keys:
* - url - the menu item URL. Not required for menu item types that return all available records.
* The URL should be returned relative to the website root and include the subdirectory, if any.
* Use the URL::to() helper to generate the URLs.
* Use the Url::to() helper to generate the URLs.
* - isActive - determines whether the menu item is active. Not required for menu item types that
* return all available records.
* - items - an array of arrays with the same keys (url, isActive, items) + the title key.

2
modules/cms/controllers/index/_page_toolbar.htm
View File

@ -12,7 +12,7 @@
$pageUrl = isset($pageUrl) ? $pageUrl : null;
?>
<a
href="<?= URL::to($pageUrl) ?>"
href="<?= Url::to($pageUrl) ?>"
target="_blank"
class="btn btn-primary oc-icon-crosshairs <?php if (!$templatePath): ?>hide<?php endif ?>"
data-control="preview-button">

1
modules/cms/twig/Extension.php
View File

@ -1,6 +1,5 @@
<?php namespace Cms\Twig;
use URL;
use Flash;
use Block;
use Event;

4
modules/cms/widgets/AssetList.php
View File

@ -1,7 +1,7 @@
<?php namespace Cms\Widgets;
use Str;
use URL;
use Url;
use File;
use Lang;
use Input;
@ -438,7 +438,7 @@ class AssetList extends WidgetBase
protected function getThemeFileUrl($path)
{
return URL::to('themes/'.$this->theme->getDirName().'/assets'.$path);
return Url::to('themes/'.$this->theme->getDirName().'/assets'.$path);
}
public function getCurrentRelativePath()

2
modules/cms/widgets/mediamanager/partials/_item-sidebar-preview.htm
View File

@ -9,7 +9,7 @@
</script>
<script type="text/template" data-control="video-template">
<video src="{src}" controls poster="<?= URL::to('modules/cms/widgets/mediamanager/assets/images/video-poster.png') ?>">
<video src="{src}" controls poster="<?= Url::to('modules/cms/widgets/mediamanager/assets/images/video-poster.png') ?>">
<div class="panel media-player-fallback">Your browser doesn't support HTML5 video.</div>
</video>
</script>

2
modules/system/partials/_settings_menu_items.htm
View File

@ -18,7 +18,7 @@
<ul>
<?php foreach ($items as $item): ?>
<li class="<?= strtolower($item->owner) == $context->owner && strtolower($item->code) == $context->itemCode ? 'active' : false ?>" data-keywords="<?= e(trans($item->keywords)) ?>">
<a href="<?= $item->url ?>">
<a href="<?= $item->url ?>" ontouchstart="">
<i class="<?= $item->icon ?>"></i>
<span class="header"><?= e(trans($item->label)) ?></span>
<span class="description"><?= e(trans($item->description)) ?></span>

4
modules/system/twig/Extension.php
View File

@ -1,6 +1,6 @@
<?php namespace System\Twig;
use URL;
use Url;
use Twig_Extension;
use Twig_TokenParser;
use Twig_SimpleFilter;
@ -90,6 +90,6 @@ class Extension extends Twig_Extension
*/
public function appFilter($url)
{
return URL::to($url);
return Url::to($url);
}
}