Correct image path and apps path replacement

diff --git a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
index 5fdf7af14cbc790c9d60d133d42072ce485f363d..6e982805a44bcc3639a4574fbbd52c6e00a8d6ec 100644 (file)
--- a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
+++ b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
@@ -35,7 +35,7 @@
        left: 0;\r
        width: 40px;\r
        height: 480px;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');\r
 }\r
 \r
 #fancybox-overlay {\r
@@ -99,7 +99,7 @@
        right: -15px;\r
        width: 30px;\r
        height: 30px;\r
-       background: transparent url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -40px 0px;\r
+       background: transparent url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px 0px;\r
        cursor: pointer;\r
        z-index: 1103;\r
        display: none;\r
@@ -137,7 +137,7 @@
        width: 35%;\r
        cursor: pointer;\r
        outline: none;\r
-       background: transparent url('%appswebroot%/apps/files_imageviewer/img/blank.gif');\r
+       background: transparent url('%appswebroot%/files_imageviewer/img/blank.gif');\r
        z-index: 1102;\r
        display: none;\r
 }\r
@@ -163,12 +163,12 @@
 }\r
 \r
 #fancybox-left-ico {\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');\r
        background-position: -40px -30px;\r
 }\r
 \r
 #fancybox-right-ico {\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');\r
        background-position: -40px -60px;\r
 }\r
 \r
@@ -199,13 +199,13 @@
        top: -20px;\r
        left: 0;\r
        width: 100%;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox-x.png');\r
 }\r
 \r
 #fancybox-bg-ne {\r
        top: -20px;\r
        right: -20px;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');\r
        background-position: -40px -162px;\r
 }\r
 \r
@@ -213,14 +213,14 @@
        top: 0;\r
        right: -20px;\r
        height: 100%;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-y.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox-y.png');\r
        background-position: -20px 0px;\r
 }\r
 \r
 #fancybox-bg-se {\r
        bottom: -20px;\r
        right: -20px;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');\r
        background-position: -40px -182px; \r
 }\r
 \r
@@ -228,14 +228,14 @@
        bottom: -20px;\r
        left: 0;\r
        width: 100%;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox-x.png');\r
        background-position: 0px -20px;\r
 }\r
 \r
 #fancybox-bg-sw {\r
        bottom: -20px;\r
        left: -20px;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');\r
        background-position: -40px -142px;\r
 }\r
 \r
@@ -243,13 +243,13 @@
        top: 0;\r
        left: -20px;\r
        height: 100%;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox-y.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox-y.png');\r
 }\r
 \r
 #fancybox-bg-nw {\r
        top: -20px;\r
        left: -20px;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');\r
        background-position: -40px -122px;\r
 }\r
 \r
@@ -282,7 +282,7 @@
 \r
 #fancybox-title-over {\r
        padding: 10px;\r
-       background-image: url('%appswebroot%/apps/files_imageviewer/img/fancy_title_over.png');\r
+       background-image: url('%appswebroot%/files_imageviewer/img/fancy_title_over.png');\r
        display: block;\r
 }\r
 \r
@@ -306,7 +306,7 @@
 \r
 #fancybox-title-float-left {\r
        padding: 0 0 0 15px;\r
-       background: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -40px -90px no-repeat;\r
+       background: url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px -90px no-repeat;\r
 }\r
 \r
 #fancybox-title-float-main {\r
@@ -314,25 +314,25 @@
        line-height: 29px;\r
        font-weight: bold;\r
        padding: 0 0 3px 0;\r
-       background: url('%appswebroot%/apps/files_imageviewer/img/fancybox-x.png') 0px -40px;\r
+       background: url('%appswebroot%/files_imageviewer/img/fancybox-x.png') 0px -40px;\r
 }\r
 \r
 #fancybox-title-float-right {\r
        padding: 0 0 0 15px;\r
-       background: url('%appswebroot%/apps/files_imageviewer/img/fancybox.png') -55px -90px no-repeat;\r
+       background: url('%appswebroot%/files_imageviewer/img/fancybox.png') -55px -90px no-repeat;\r
 }\r
 \r
 /* IE6 */\r
 \r
-.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_close.png', sizingMethod='scale'); }\r
+.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_close.png', sizingMethod='scale'); }\r
 \r
-.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_nav_left.png', sizingMethod='scale'); }\r
-.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_nav_right.png', sizingMethod='scale'); }\r
+.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_nav_left.png', sizingMethod='scale'); }\r
+.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_nav_right.png', sizingMethod='scale'); }\r
 \r
-.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }\r
-.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_left.png', sizingMethod='scale'); }\r
-.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_main.png', sizingMethod='scale'); }\r
-.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_title_right.png', sizingMethod='scale'); }\r
+.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }\r
+.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_left.png', sizingMethod='scale'); }\r
+.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_main.png', sizingMethod='scale'); }\r
+.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_title_right.png', sizingMethod='scale'); }\r
 \r
 .fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {\r
        height: expression(this.parentNode.clientHeight + "px");\r
@@ -343,17 +343,17 @@
        top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');\r
 }\r
 \r
-#fancybox-loading.fancybox-ie6 div     { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_loading.png', sizingMethod='scale'); }\r
+#fancybox-loading.fancybox-ie6 div     { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_loading.png', sizingMethod='scale'); }\r
 \r
 /* IE6, IE7, IE8 */\r
 \r
 .fancybox-ie .fancybox-bg { background: transparent !important; }\r
 \r
-.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_n.png', sizingMethod='scale'); }\r
-.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_ne.png', sizingMethod='scale'); }\r
-.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_e.png', sizingMethod='scale'); }\r
-.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_se.png', sizingMethod='scale'); }\r
-.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_s.png', sizingMethod='scale'); }\r
-.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_sw.png', sizingMethod='scale'); }\r
-.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_w.png', sizingMethod='scale'); }\r
-.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/apps/files_imageviewer/img/fancy_shadow_nw.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_n.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_ne.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_e.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_se.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_s.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_sw.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_w.png', sizingMethod='scale'); }\r
+.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%appswebroot%/files_imageviewer/img/fancy_shadow_nw.png', sizingMethod='scale'); }\r

diff --git a/apps/files_texteditor/css/DroidSansMono/stylesheet.css b/apps/files_texteditor/css/DroidSansMono/stylesheet.css
index 5bf9122ed7d421974c08b807df987cb5235501ae..4d814b262d3fe566f57b11ea03aec95484e77f67 100644 (file)
--- a/apps/files_texteditor/css/DroidSansMono/stylesheet.css
+++ b/apps/files_texteditor/css/DroidSansMono/stylesheet.css
@@ -4,11 +4,11 @@
 
 @font-face {
     font-family: 'Droid Sans Mono';
-    src: url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot');
-    src: url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot?#iefix') format('embedded-opentype'),
-         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff') format('woff'),
-         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf') format('truetype'),
-         url('%appswebroot%/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg#DroidSansMonoRegular') format('svg');
+    src: url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot');
+    src: url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot?#iefix') format('embedded-opentype'),
+         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff') format('woff'),
+         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf') format('truetype'),
+         url('%appswebroot%/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg#DroidSansMonoRegular') format('svg');
     font-weight: normal;
     font-style: normal;
 

diff --git a/apps/gallery/css/sharing.css b/apps/gallery/css/sharing.css
index d061fc3e6c1436db68dd7cbd0a18b06fa2ac2fc1..4712369cc84553a8a2901acfc420d7300876a952 100644 (file)
--- a/apps/gallery/css/sharing.css
+++ b/apps/gallery/css/sharing.css
@@ -5,4 +5,4 @@ div.gallery_box:hover { color: black; }
 div.gallery_box h1 {font-size: 17px; font-weight: normal;}
 div#breadcrumb { border: 0; width: 70%; margin: 0 auto; padding: 25px 0; font-family: Verdana; text-align: center;}
 span.breadcrumbelement { margin: 10px; margin-right: 0; cursor: pointer;}
-span.inside { background-image: url('%appswebroot%/apps/gallery/img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;}
+span.inside { background-image: url('%appswebroot%/gallery/img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;}

diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 97099adbdf635746b396e378b3b05e610721ed0b..bf2a6d1d18e8945f722c3cd60e51e9044c3dd9a0 100644 (file)
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -17,7 +17,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
                        $in_root = false;
                        foreach(OC::$APPSROOTS as $app_root) {
                                if(strpos($file, $app_root['path']) == 0) {
-                                       $in_root = $app_root['url'];
+                                       $in_root = $webroot.$app_root['url'];
                                        break;
                                }
                        }
@@ -33,6 +33,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
                if (!defined('DEBUG') || !DEBUG){
                        $css_out = CSSMin::minify($css_out);
                }
+// die();
                return $css_out;
        }
 }