From 6b43d79f3ebb8b315a6aedfead00daa098c1902e Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 15 Mar 2017 11:58:01 +1300 Subject: [PATCH] Removed confusing src/ dir --- client/{src => }/images/app_icons/archive_92.png | Bin client/{src => }/images/app_icons/audio_92.png | Bin client/{src => }/images/app_icons/document_92.png | Bin client/{src => }/images/app_icons/folder_32.png | Bin .../images/app_icons/folder_icon_large.png | Bin client/{src => }/images/app_icons/generic_92.png | Bin client/{src => }/images/app_icons/video_92.png | Bin client/{src => }/images/logo_small.png | Bin client/{src => }/styles/debug.css | 0 src/Assets/File.php | 6 +++--- src/Assets/Folder.php | 2 +- src/Dev/DebugView.php | 2 +- src/Dev/Install/client/{src => }/images/ss-logo.png | Bin src/Dev/Install/client/{src => }/js/install.js | 0 src/Dev/Install/client/{src => }/styles/install.css | 0 src/Dev/Install/config-form.html | 4 ++-- src/Dev/Install/install.php5 | 2 +- src/Dev/Install/php5-required.html | 2 +- templates/SilverStripe/Control/Controller.ss | 2 +- 19 files changed, 10 insertions(+), 10 deletions(-) rename client/{src => }/images/app_icons/archive_92.png (100%) rename client/{src => }/images/app_icons/audio_92.png (100%) rename client/{src => }/images/app_icons/document_92.png (100%) rename client/{src => }/images/app_icons/folder_32.png (100%) rename client/{src => }/images/app_icons/folder_icon_large.png (100%) rename client/{src => }/images/app_icons/generic_92.png (100%) rename client/{src => }/images/app_icons/video_92.png (100%) rename client/{src => }/images/logo_small.png (100%) rename client/{src => }/styles/debug.css (100%) rename src/Dev/Install/client/{src => }/images/ss-logo.png (100%) rename src/Dev/Install/client/{src => }/js/install.js (100%) rename src/Dev/Install/client/{src => }/styles/install.css (100%) diff --git a/client/src/images/app_icons/archive_92.png b/client/images/app_icons/archive_92.png similarity index 100% rename from client/src/images/app_icons/archive_92.png rename to client/images/app_icons/archive_92.png diff --git a/client/src/images/app_icons/audio_92.png b/client/images/app_icons/audio_92.png similarity index 100% rename from client/src/images/app_icons/audio_92.png rename to client/images/app_icons/audio_92.png diff --git a/client/src/images/app_icons/document_92.png b/client/images/app_icons/document_92.png similarity index 100% rename from client/src/images/app_icons/document_92.png rename to client/images/app_icons/document_92.png diff --git a/client/src/images/app_icons/folder_32.png b/client/images/app_icons/folder_32.png similarity index 100% rename from client/src/images/app_icons/folder_32.png rename to client/images/app_icons/folder_32.png diff --git a/client/src/images/app_icons/folder_icon_large.png b/client/images/app_icons/folder_icon_large.png similarity index 100% rename from client/src/images/app_icons/folder_icon_large.png rename to client/images/app_icons/folder_icon_large.png diff --git a/client/src/images/app_icons/generic_92.png b/client/images/app_icons/generic_92.png similarity index 100% rename from client/src/images/app_icons/generic_92.png rename to client/images/app_icons/generic_92.png diff --git a/client/src/images/app_icons/video_92.png b/client/images/app_icons/video_92.png similarity index 100% rename from client/src/images/app_icons/video_92.png rename to client/images/app_icons/video_92.png diff --git a/client/src/images/logo_small.png b/client/images/logo_small.png similarity index 100% rename from client/src/images/logo_small.png rename to client/images/logo_small.png diff --git a/client/src/styles/debug.css b/client/styles/debug.css similarity index 100% rename from client/src/styles/debug.css rename to client/styles/debug.css diff --git a/src/Assets/File.php b/src/Assets/File.php index 383615ab3..c48db1501 100644 --- a/src/Assets/File.php +++ b/src/Assets/File.php @@ -925,16 +925,16 @@ class File extends DataObject implements ShortcodeHandler, AssetContainer, Thumb $extension = strtolower($extension); // Check if exact extension has an icon - if (!file_exists(FRAMEWORK_PATH ."/client/src/images/app_icons/{$extension}_92.png")) { + if (!file_exists(FRAMEWORK_PATH ."/client/images/app_icons/{$extension}_92.png")) { $extension = static::get_app_category($extension); // Fallback to category specific icon - if (!file_exists(FRAMEWORK_PATH ."/client/src/images/app_icons/{$extension}_92.png")) { + if (!file_exists(FRAMEWORK_PATH ."/client/images/app_icons/{$extension}_92.png")) { $extension ="generic"; } } - return FRAMEWORK_DIR ."/client/src/images/app_icons/{$extension}_92.png"; + return FRAMEWORK_DIR ."/client/images/app_icons/{$extension}_92.png"; } /** diff --git a/src/Assets/Folder.php b/src/Assets/Folder.php index 580c4b17f..a9458f47d 100644 --- a/src/Assets/Folder.php +++ b/src/Assets/Folder.php @@ -104,7 +104,7 @@ class Folder extends File */ public function getIcon() { - return FRAMEWORK_DIR . "/client/src/images/app_icons/folder_icon_large.png"; + return FRAMEWORK_DIR . "/client/images/app_icons/folder_icon_large.png"; } /** diff --git a/src/Dev/DebugView.php b/src/Dev/DebugView.php index 9f986144a..33f341b81 100644 --- a/src/Dev/DebugView.php +++ b/src/Dev/DebugView.php @@ -216,7 +216,7 @@ class DebugView extends Object $debugCSS = Controller::join_links( Director::absoluteBaseURL(), FRAMEWORK_DIR, - 'client/src/styles/debug.css' + 'client/styles/debug.css' ); $output = '' . $url . ''; diff --git a/src/Dev/Install/client/src/images/ss-logo.png b/src/Dev/Install/client/images/ss-logo.png similarity index 100% rename from src/Dev/Install/client/src/images/ss-logo.png rename to src/Dev/Install/client/images/ss-logo.png diff --git a/src/Dev/Install/client/src/js/install.js b/src/Dev/Install/client/js/install.js similarity index 100% rename from src/Dev/Install/client/src/js/install.js rename to src/Dev/Install/client/js/install.js diff --git a/src/Dev/Install/client/src/styles/install.css b/src/Dev/Install/client/styles/install.css similarity index 100% rename from src/Dev/Install/client/src/styles/install.css rename to src/Dev/Install/client/styles/install.css diff --git a/src/Dev/Install/config-form.html b/src/Dev/Install/config-form.html index ae5064927..4318ce148 100644 --- a/src/Dev/Install/config-form.html +++ b/src/Dev/Install/config-form.html @@ -7,8 +7,8 @@ SilverStripe CMS / Framework Installation - - + + diff --git a/src/Dev/Install/install.php5 b/src/Dev/Install/install.php5 index 80da844bf..44fa5e712 100755 --- a/src/Dev/Install/install.php5 +++ b/src/Dev/Install/install.php5 @@ -1315,7 +1315,7 @@ class Installer extends InstallRequirements { Installing SilverStripe... - + diff --git a/src/Dev/Install/php5-required.html b/src/Dev/Install/php5-required.html index fe565748c..104cc275b 100644 --- a/src/Dev/Install/php5-required.html +++ b/src/Dev/Install/php5-required.html @@ -1,7 +1,7 @@ PHP 5.5.0 is required - +
diff --git a/templates/SilverStripe/Control/Controller.ss b/templates/SilverStripe/Control/Controller.ss index b7aee1dab..81c125e91 100644 --- a/templates/SilverStripe/Control/Controller.ss +++ b/templates/SilverStripe/Control/Controller.ss @@ -6,7 +6,7 @@ $MetaTags - <% require themedCSS('client/src/styles/debug') %> + <% require themedCSS('client/styles/debug') %>