tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed confusing src/ dir

This commit is contained in:
Ingo Schommer 2017-03-15 11:58:01 +13:00
parent b24bb777f0
commit 6b43d79f3e
19 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
client/src/images/app_icons/archive_92.png → client/images/app_icons/archive_92.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 666 B

After

Width:  |  Height:  |  Size: 666 B

0
client/src/images/app_icons/audio_92.png → client/images/app_icons/audio_92.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
client/src/images/app_icons/document_92.png → client/images/app_icons/document_92.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 655 B

0
client/src/images/app_icons/folder_32.png → client/images/app_icons/folder_32.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
client/src/images/app_icons/folder_icon_large.png → client/images/app_icons/folder_icon_large.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 495 B

After

Width:  |  Height:  |  Size: 495 B

0
client/src/images/app_icons/generic_92.png → client/images/app_icons/generic_92.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 575 B

0
client/src/images/app_icons/video_92.png → client/images/app_icons/video_92.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 653 B

0
client/src/images/logo_small.png → client/images/logo_small.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 709 B

0
client/src/styles/debug.css → client/styles/debug.css
View File

6
src/Assets/File.php
View File

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

2
src/Assets/Folder.php
View File

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

2
src/Dev/DebugView.php
View File

@ -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 = '<!DOCTYPE html><html><head><title>' . $url . '</title>';

0
src/Dev/Install/client/src/images/ss-logo.png → src/Dev/Install/client/images/ss-logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 741 B

After

Width:  |  Height:  |  Size: 741 B

0
src/Dev/Install/client/src/js/install.js → src/Dev/Install/client/js/install.js
View File

0
src/Dev/Install/client/src/styles/install.css → src/Dev/Install/client/styles/install.css
View File

4
src/Dev/Install/config-form.html
View File

@ -7,8 +7,8 @@
<title>SilverStripe CMS / Framework Installation</title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<script type="application/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script>
<script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/src/js/install.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/src/styles/install.css">
<script type="application/javascript" src="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/js/install.js"></script>
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/styles/install.css">
<link rel="shortcut icon" href="favicon.ico">
</head>
<body>

2
src/Dev/Install/install.php5
View File

@ -1315,7 +1315,7 @@ class Installer extends InstallRequirements {
<head>
<meta charset="utf-8"/>
<title>Installing SilverStripe...</title>
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/src/styles/install.css"/>
<link rel="stylesheet" type="text/css" href="<?php echo FRAMEWORK_NAME; ?>/src/Dev/Install/client/styles/install.css"/>
<script src="//code.jquery.com/jquery-1.7.2.min.js"></script>
</head>
<body>

2
src/Dev/Install/php5-required.html
View File

@ -1,7 +1,7 @@
<html>
<head>
<title>PHP 5.5.0 is required</title>
<link rel="stylesheet" type="text/css" href="framework/src/Dev/Install/client/src/styles/install.css">
<link rel="stylesheet" type="text/css" href="framework/src/Dev/Install/client/styles/install.css">
</head>
<body>
<div id="BgContainer">

2
templates/SilverStripe/Control/Controller.ss
View File

@ -6,7 +6,7 @@
$MetaTags
<% require themedCSS('client/src/styles/debug') %>
<% require themedCSS('client/styles/debug') %>
</head>
<body>
<div class="info">