From 91c37bbb7642b996e4c386b3033cca02831371ef Mon Sep 17 00:00:00 2001
From: Jakob Sack <kde@jakobsack.de>
Date: Mon, 20 Jun 2011 20:29:30 +0200
Subject: [PATCH] moved core stuff to /core
---
{css => core/css}/images/no.png | Bin
.../ui-bg_diagonals-thick_90_eeeeee_40x40.png | Bin
.../images/ui-bg_flat_15_cd0a0a_40x100.png | Bin
.../images/ui-bg_glass_100_e4f1fb_1x400.png | Bin
.../images/ui-bg_glass_50_3baae3_1x400.png | Bin
.../images/ui-bg_glass_80_d7ebf9_1x400.png | Bin
.../ui-bg_highlight-hard_100_f2f5f7_1x100.png | Bin
.../ui-bg_highlight-hard_70_000000_1x100.png | Bin
.../ui-bg_highlight-soft_100_deedf7_1x100.png | Bin
.../ui-bg_highlight-soft_25_ffef8f_1x100.png | Bin
.../css}/images/ui-icons_2694e8_256x240.png | Bin
.../css}/images/ui-icons_2e83ff_256x240.png | Bin
.../css}/images/ui-icons_3d80b3_256x240.png | Bin
.../css}/images/ui-icons_72a7cf_256x240.png | Bin
.../css}/images/ui-icons_ffffff_256x240.png | Bin
{css => core/css}/jquery-ui-1.8.10.custom.css | 0
{css => core/css}/styles.css | 0
{img => core/img}/actions/arrow-down.png | Bin
{img => core/img}/actions/arrow-left.png | Bin
{img => core/img}/actions/arrow-right.png | Bin
{img => core/img}/actions/arrow-up.png | Bin
{img => core/img}/actions/go-home.png | Bin
{img => core/img}/body_background.jpg | Bin
{img => core/img}/drop-arrow.png | Bin
{img => core/img}/favicon-touch.png | Bin
{img => core/img}/favicon.png | Bin
{img => core/img}/header-a.png | Bin
{img => core/img}/header-login.png | Bin
{img => core/img}/header-settings-a.png | Bin
{img => core/img}/header-settings.png | Bin
{img => core/img}/header.png | Bin
{img => core/img}/layout/back.png | Bin
{img => core/img}/layout/logout.png | Bin
{img => core/img}/layout/settings.png | Bin
{img => core/img}/mimetypes/file.png | Bin
.../img}/owncloud-logo-medium-white.png | Bin
.../img}/owncloud-logo-small-white.png | Bin
{img => core/img}/places/folder.png | Bin
{img => core/img}/weather-clear.png | Bin
{js => core/js}/jquery-1.5.min.js | 0
.../js}/jquery-ui-1.8.10.custom.min.js | 0
{js => core/js}/js.js | 0
{js => core/js}/setup.js | 0
{l10n => core/l10n}/de.php | 0
{l10n => core/l10n}/de.po | 0
{l10n => core/l10n}/javascript.php | 0
{l10n => core/l10n}/l10n-de.php | 0
{l10n => core/l10n}/messages.pot | 0
{l10n => core/l10n}/nl.php | 0
{l10n => core/l10n}/nl.po | 0
{l10n => core/l10n}/xgettextfiles | 0
{templates => core/templates}/404.php | 0
{templates => core/templates}/error.php | 0
.../templates}/installation.php | 0
.../templates}/layout.admin.php | 0
.../templates}/layout.guest.php | 0
{templates => core/templates}/layout.user.php | 0
{templates => core/templates}/login.php | 0
{templates => core/templates}/logout.php | 0
.../templates}/part.pagenavi.php | 0
.../templates}/part.searchbox.php | 0
files/css/files.css | 2 +-
files/img/drop-arrow.png | Bin 0 -> 2899 bytes
lib/helper.php | 19 +++++++++++-------
lib/template.php | 16 +++++++++++----
65 files changed, 25 insertions(+), 12 deletions(-)
rename {css => core/css}/images/no.png (100%)
rename {css => core/css}/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png (100%)
rename {css => core/css}/images/ui-bg_flat_15_cd0a0a_40x100.png (100%)
rename {css => core/css}/images/ui-bg_glass_100_e4f1fb_1x400.png (100%)
rename {css => core/css}/images/ui-bg_glass_50_3baae3_1x400.png (100%)
rename {css => core/css}/images/ui-bg_glass_80_d7ebf9_1x400.png (100%)
rename {css => core/css}/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png (100%)
rename {css => core/css}/images/ui-bg_highlight-hard_70_000000_1x100.png (100%)
rename {css => core/css}/images/ui-bg_highlight-soft_100_deedf7_1x100.png (100%)
rename {css => core/css}/images/ui-bg_highlight-soft_25_ffef8f_1x100.png (100%)
rename {css => core/css}/images/ui-icons_2694e8_256x240.png (100%)
rename {css => core/css}/images/ui-icons_2e83ff_256x240.png (100%)
rename {css => core/css}/images/ui-icons_3d80b3_256x240.png (100%)
rename {css => core/css}/images/ui-icons_72a7cf_256x240.png (100%)
rename {css => core/css}/images/ui-icons_ffffff_256x240.png (100%)
rename {css => core/css}/jquery-ui-1.8.10.custom.css (100%)
rename {css => core/css}/styles.css (100%)
rename {img => core/img}/actions/arrow-down.png (100%)
rename {img => core/img}/actions/arrow-left.png (100%)
rename {img => core/img}/actions/arrow-right.png (100%)
rename {img => core/img}/actions/arrow-up.png (100%)
rename {img => core/img}/actions/go-home.png (100%)
rename {img => core/img}/body_background.jpg (100%)
rename {img => core/img}/drop-arrow.png (100%)
rename {img => core/img}/favicon-touch.png (100%)
rename {img => core/img}/favicon.png (100%)
rename {img => core/img}/header-a.png (100%)
rename {img => core/img}/header-login.png (100%)
rename {img => core/img}/header-settings-a.png (100%)
rename {img => core/img}/header-settings.png (100%)
rename {img => core/img}/header.png (100%)
rename {img => core/img}/layout/back.png (100%)
rename {img => core/img}/layout/logout.png (100%)
rename {img => core/img}/layout/settings.png (100%)
rename {img => core/img}/mimetypes/file.png (100%)
rename {img => core/img}/owncloud-logo-medium-white.png (100%)
rename {img => core/img}/owncloud-logo-small-white.png (100%)
rename {img => core/img}/places/folder.png (100%)
rename {img => core/img}/weather-clear.png (100%)
rename {js => core/js}/jquery-1.5.min.js (100%)
rename {js => core/js}/jquery-ui-1.8.10.custom.min.js (100%)
rename {js => core/js}/js.js (100%)
rename {js => core/js}/setup.js (100%)
rename {l10n => core/l10n}/de.php (100%)
rename {l10n => core/l10n}/de.po (100%)
rename {l10n => core/l10n}/javascript.php (100%)
rename {l10n => core/l10n}/l10n-de.php (100%)
rename {l10n => core/l10n}/messages.pot (100%)
rename {l10n => core/l10n}/nl.php (100%)
rename {l10n => core/l10n}/nl.po (100%)
rename {l10n => core/l10n}/xgettextfiles (100%)
rename {templates => core/templates}/404.php (100%)
rename {templates => core/templates}/error.php (100%)
rename {templates => core/templates}/installation.php (100%)
rename {templates => core/templates}/layout.admin.php (100%)
rename {templates => core/templates}/layout.guest.php (100%)
rename {templates => core/templates}/layout.user.php (100%)
rename {templates => core/templates}/login.php (100%)
rename {templates => core/templates}/logout.php (100%)
rename {templates => core/templates}/part.pagenavi.php (100%)
rename {templates => core/templates}/part.searchbox.php (100%)
create mode 100644 files/img/drop-arrow.png
diff --git a/css/images/no.png b/core/css/images/no.png
similarity index 100%
rename from css/images/no.png
rename to core/css/images/no.png
diff --git a/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/core/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
similarity index 100%
rename from css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
rename to core/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
diff --git a/css/images/ui-bg_flat_15_cd0a0a_40x100.png b/core/css/images/ui-bg_flat_15_cd0a0a_40x100.png
similarity index 100%
rename from css/images/ui-bg_flat_15_cd0a0a_40x100.png
rename to core/css/images/ui-bg_flat_15_cd0a0a_40x100.png
diff --git a/css/images/ui-bg_glass_100_e4f1fb_1x400.png b/core/css/images/ui-bg_glass_100_e4f1fb_1x400.png
similarity index 100%
rename from css/images/ui-bg_glass_100_e4f1fb_1x400.png
rename to core/css/images/ui-bg_glass_100_e4f1fb_1x400.png
diff --git a/css/images/ui-bg_glass_50_3baae3_1x400.png b/core/css/images/ui-bg_glass_50_3baae3_1x400.png
similarity index 100%
rename from css/images/ui-bg_glass_50_3baae3_1x400.png
rename to core/css/images/ui-bg_glass_50_3baae3_1x400.png
diff --git a/css/images/ui-bg_glass_80_d7ebf9_1x400.png b/core/css/images/ui-bg_glass_80_d7ebf9_1x400.png
similarity index 100%
rename from css/images/ui-bg_glass_80_d7ebf9_1x400.png
rename to core/css/images/ui-bg_glass_80_d7ebf9_1x400.png
diff --git a/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/core/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
similarity index 100%
rename from css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
rename to core/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
diff --git a/css/images/ui-bg_highlight-hard_70_000000_1x100.png b/core/css/images/ui-bg_highlight-hard_70_000000_1x100.png
similarity index 100%
rename from css/images/ui-bg_highlight-hard_70_000000_1x100.png
rename to core/css/images/ui-bg_highlight-hard_70_000000_1x100.png
diff --git a/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/core/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
similarity index 100%
rename from css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
rename to core/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
diff --git a/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/core/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
similarity index 100%
rename from css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
rename to core/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
diff --git a/css/images/ui-icons_2694e8_256x240.png b/core/css/images/ui-icons_2694e8_256x240.png
similarity index 100%
rename from css/images/ui-icons_2694e8_256x240.png
rename to core/css/images/ui-icons_2694e8_256x240.png
diff --git a/css/images/ui-icons_2e83ff_256x240.png b/core/css/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from css/images/ui-icons_2e83ff_256x240.png
rename to core/css/images/ui-icons_2e83ff_256x240.png
diff --git a/css/images/ui-icons_3d80b3_256x240.png b/core/css/images/ui-icons_3d80b3_256x240.png
similarity index 100%
rename from css/images/ui-icons_3d80b3_256x240.png
rename to core/css/images/ui-icons_3d80b3_256x240.png
diff --git a/css/images/ui-icons_72a7cf_256x240.png b/core/css/images/ui-icons_72a7cf_256x240.png
similarity index 100%
rename from css/images/ui-icons_72a7cf_256x240.png
rename to core/css/images/ui-icons_72a7cf_256x240.png
diff --git a/css/images/ui-icons_ffffff_256x240.png b/core/css/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from css/images/ui-icons_ffffff_256x240.png
rename to core/css/images/ui-icons_ffffff_256x240.png
diff --git a/css/jquery-ui-1.8.10.custom.css b/core/css/jquery-ui-1.8.10.custom.css
similarity index 100%
rename from css/jquery-ui-1.8.10.custom.css
rename to core/css/jquery-ui-1.8.10.custom.css
diff --git a/css/styles.css b/core/css/styles.css
similarity index 100%
rename from css/styles.css
rename to core/css/styles.css
diff --git a/img/actions/arrow-down.png b/core/img/actions/arrow-down.png
similarity index 100%
rename from img/actions/arrow-down.png
rename to core/img/actions/arrow-down.png
diff --git a/img/actions/arrow-left.png b/core/img/actions/arrow-left.png
similarity index 100%
rename from img/actions/arrow-left.png
rename to core/img/actions/arrow-left.png
diff --git a/img/actions/arrow-right.png b/core/img/actions/arrow-right.png
similarity index 100%
rename from img/actions/arrow-right.png
rename to core/img/actions/arrow-right.png
diff --git a/img/actions/arrow-up.png b/core/img/actions/arrow-up.png
similarity index 100%
rename from img/actions/arrow-up.png
rename to core/img/actions/arrow-up.png
diff --git a/img/actions/go-home.png b/core/img/actions/go-home.png
similarity index 100%
rename from img/actions/go-home.png
rename to core/img/actions/go-home.png
diff --git a/img/body_background.jpg b/core/img/body_background.jpg
similarity index 100%
rename from img/body_background.jpg
rename to core/img/body_background.jpg
diff --git a/img/drop-arrow.png b/core/img/drop-arrow.png
similarity index 100%
rename from img/drop-arrow.png
rename to core/img/drop-arrow.png
diff --git a/img/favicon-touch.png b/core/img/favicon-touch.png
similarity index 100%
rename from img/favicon-touch.png
rename to core/img/favicon-touch.png
diff --git a/img/favicon.png b/core/img/favicon.png
similarity index 100%
rename from img/favicon.png
rename to core/img/favicon.png
diff --git a/img/header-a.png b/core/img/header-a.png
similarity index 100%
rename from img/header-a.png
rename to core/img/header-a.png
diff --git a/img/header-login.png b/core/img/header-login.png
similarity index 100%
rename from img/header-login.png
rename to core/img/header-login.png
diff --git a/img/header-settings-a.png b/core/img/header-settings-a.png
similarity index 100%
rename from img/header-settings-a.png
rename to core/img/header-settings-a.png
diff --git a/img/header-settings.png b/core/img/header-settings.png
similarity index 100%
rename from img/header-settings.png
rename to core/img/header-settings.png
diff --git a/img/header.png b/core/img/header.png
similarity index 100%
rename from img/header.png
rename to core/img/header.png
diff --git a/img/layout/back.png b/core/img/layout/back.png
similarity index 100%
rename from img/layout/back.png
rename to core/img/layout/back.png
diff --git a/img/layout/logout.png b/core/img/layout/logout.png
similarity index 100%
rename from img/layout/logout.png
rename to core/img/layout/logout.png
diff --git a/img/layout/settings.png b/core/img/layout/settings.png
similarity index 100%
rename from img/layout/settings.png
rename to core/img/layout/settings.png
diff --git a/img/mimetypes/file.png b/core/img/mimetypes/file.png
similarity index 100%
rename from img/mimetypes/file.png
rename to core/img/mimetypes/file.png
diff --git a/img/owncloud-logo-medium-white.png b/core/img/owncloud-logo-medium-white.png
similarity index 100%
rename from img/owncloud-logo-medium-white.png
rename to core/img/owncloud-logo-medium-white.png
diff --git a/img/owncloud-logo-small-white.png b/core/img/owncloud-logo-small-white.png
similarity index 100%
rename from img/owncloud-logo-small-white.png
rename to core/img/owncloud-logo-small-white.png
diff --git a/img/places/folder.png b/core/img/places/folder.png
similarity index 100%
rename from img/places/folder.png
rename to core/img/places/folder.png
diff --git a/img/weather-clear.png b/core/img/weather-clear.png
similarity index 100%
rename from img/weather-clear.png
rename to core/img/weather-clear.png
diff --git a/js/jquery-1.5.min.js b/core/js/jquery-1.5.min.js
similarity index 100%
rename from js/jquery-1.5.min.js
rename to core/js/jquery-1.5.min.js
diff --git a/js/jquery-ui-1.8.10.custom.min.js b/core/js/jquery-ui-1.8.10.custom.min.js
similarity index 100%
rename from js/jquery-ui-1.8.10.custom.min.js
rename to core/js/jquery-ui-1.8.10.custom.min.js
diff --git a/js/js.js b/core/js/js.js
similarity index 100%
rename from js/js.js
rename to core/js/js.js
diff --git a/js/setup.js b/core/js/setup.js
similarity index 100%
rename from js/setup.js
rename to core/js/setup.js
diff --git a/l10n/de.php b/core/l10n/de.php
similarity index 100%
rename from l10n/de.php
rename to core/l10n/de.php
diff --git a/l10n/de.po b/core/l10n/de.po
similarity index 100%
rename from l10n/de.po
rename to core/l10n/de.po
diff --git a/l10n/javascript.php b/core/l10n/javascript.php
similarity index 100%
rename from l10n/javascript.php
rename to core/l10n/javascript.php
diff --git a/l10n/l10n-de.php b/core/l10n/l10n-de.php
similarity index 100%
rename from l10n/l10n-de.php
rename to core/l10n/l10n-de.php
diff --git a/l10n/messages.pot b/core/l10n/messages.pot
similarity index 100%
rename from l10n/messages.pot
rename to core/l10n/messages.pot
diff --git a/l10n/nl.php b/core/l10n/nl.php
similarity index 100%
rename from l10n/nl.php
rename to core/l10n/nl.php
diff --git a/l10n/nl.po b/core/l10n/nl.po
similarity index 100%
rename from l10n/nl.po
rename to core/l10n/nl.po
diff --git a/l10n/xgettextfiles b/core/l10n/xgettextfiles
similarity index 100%
rename from l10n/xgettextfiles
rename to core/l10n/xgettextfiles
diff --git a/templates/404.php b/core/templates/404.php
similarity index 100%
rename from templates/404.php
rename to core/templates/404.php
diff --git a/templates/error.php b/core/templates/error.php
similarity index 100%
rename from templates/error.php
rename to core/templates/error.php
diff --git a/templates/installation.php b/core/templates/installation.php
similarity index 100%
rename from templates/installation.php
rename to core/templates/installation.php
diff --git a/templates/layout.admin.php b/core/templates/layout.admin.php
similarity index 100%
rename from templates/layout.admin.php
rename to core/templates/layout.admin.php
diff --git a/templates/layout.guest.php b/core/templates/layout.guest.php
similarity index 100%
rename from templates/layout.guest.php
rename to core/templates/layout.guest.php
diff --git a/templates/layout.user.php b/core/templates/layout.user.php
similarity index 100%
rename from templates/layout.user.php
rename to core/templates/layout.user.php
diff --git a/templates/login.php b/core/templates/login.php
similarity index 100%
rename from templates/login.php
rename to core/templates/login.php
diff --git a/templates/logout.php b/core/templates/logout.php
similarity index 100%
rename from templates/logout.php
rename to core/templates/logout.php
diff --git a/templates/part.pagenavi.php b/core/templates/part.pagenavi.php
similarity index 100%
rename from templates/part.pagenavi.php
rename to core/templates/part.pagenavi.php
diff --git a/templates/part.searchbox.php b/core/templates/part.searchbox.php
similarity index 100%
rename from templates/part.searchbox.php
rename to core/templates/part.searchbox.php
diff --git a/files/css/files.css b/files/css/files.css
index 7c7965ab84..702ddefc19 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -110,5 +110,5 @@ table td.filename a
width:16px;
display: -moz-inline-box; /* fallback for older firefox versions*/
display: inline-block;
- background-image:url('../../img/drop-arrow.png');
+ background-image:url('../img/drop-arrow.png');
}
\ No newline at end of file
diff --git a/files/img/drop-arrow.png b/files/img/drop-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..315395d5d4240bb8c2372e92f0af90ce0c9450b4
GIT binary patch
literal 2899
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
literal 0
HcmV?d00001
diff --git a/lib/helper.php b/lib/helper.php
index 072607f742..6f7d7ce251 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -44,6 +44,9 @@ class OC_HELPER {
return $WEBROOT . '/apps/' . $app . $file;
}
}
+ else{
+ $app = 'core';
+ }
return $WEBROOT . '/' . $app . $file;
}
@@ -58,14 +61,16 @@ class OC_HELPER {
public static function imagePath( $app, $image ){
global $SERVERROOT;
global $WEBROOT;
+
// Check if the app is in the app folder
if( file_exists( "$SERVERROOT/apps/$app/img/$image" )){
return "$WEBROOT/apps/$app/img/$image";
}
- if( !empty( $app )){
+ elseif( !empty( $app )){
return "$WEBROOT/$app/img/$image";
- }else{
- return "$WEBROOT/img/$image";
+ }
+ else{
+ return "$WEBROOT/core/img/$image";
}
}
@@ -84,15 +89,15 @@ class OC_HELPER {
// Is it a dir?
if( $mimetype == "dir" ){
- return "$WEBROOT/img/places/folder.png";
+ return "$WEBROOT/core/img/places/folder.png";
}
// Icon exists?
- if( file_exists( "$SERVERROOT/img/mimetypes/$mimetype.png" )){
- return "$WEBROOT/img/mimetypes/$mimetype.png";
+ if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){
+ return "$WEBROOT/core/img/mimetypes/$mimetype.png";
}
else{
- return "$WEBROOT/img/mimetypes/file.png";
+ return "$WEBROOT/core/img/mimetypes/file.png";
}
}
diff --git a/lib/template.php b/lib/template.php
index 6b9a1c38e1..69065e1ea1 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -95,8 +95,8 @@ class OC_TEMPLATE{
global $SERVERROOT;
// Get the right template folder
- $template = "$SERVERROOT/templates/";
- if( $app != "core" && $app != "" ){
+ $template = "$SERVERROOT/core/templates/";
+ if( $app != "" ){
// Check if the app is in the app folder
if( file_exists( "$SERVERROOT/apps/$app/templates/" )){
$template = "$SERVERROOT/apps/$app/templates/";
@@ -222,16 +222,24 @@ class OC_TEMPLATE{
foreach(OC_UTIL::$scripts as $script){
if(is_file("$SERVERROOT/apps/$script.js" )){
$page->append( "jsfiles", "$WEBROOT/apps/$script.js" );
- }else{
+ }
+ elseif(is_file("$SERVERROOT/$script.js" )){
$page->append( "jsfiles", "$WEBROOT/$script.js" );
}
+ else{
+ $page->append( "jsfiles", "$WEBROOT/core/$script.js" );
+ }
}
foreach(OC_UTIL::$styles as $style){
if(is_file("$SERVERROOT/apps/$style.css" )){
$page->append( "cssfiles", "$WEBROOT/apps/$style.css" );
- }else{
+ }
+ elseif(is_file("$SERVERROOT/$style.css" )){
$page->append( "cssfiles", "$WEBROOT/$style.css" );
}
+ else{
+ $page->append( "cssfiles", "$WEBROOT/core/$style.css" );
+ }
}
// Add css files and js files
--
GitLab