From 91c37bbb7642b996e4c386b3033cca02831371ef Mon Sep 17 00:00:00 2001 From: Jakob Sack 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 7c7965ab847..702ddefc19c 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 072607f742b..6f7d7ce251e 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 6b9a1c38e11..69065e1ea16 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 -- 2.39.5