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 7c7965ab8473f09728731a320634930fe3ce1daa..702ddefc19c2aa375bfda781fc21b5e491335fa2 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
Binary files /dev/null and b/files/img/drop-arrow.png differ
diff --git a/lib/helper.php b/lib/helper.php
index 072607f742ba3e6781e0798dd12d780f666fac8c..6f7d7ce251e25a9c74d3de64296c9e630e8cbe26 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 6b9a1c38e11cccec969fd9ae0fd0532ab4b3b6a2..69065e1ea167e7a473a0487478448397ca474926 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