diff options
| author | Michiel de Jong <michiel@unhosted.org> | 2012-05-14 19:05:35 +0400 |
|---|---|---|
| committer | Michiel de Jong <michiel@unhosted.org> | 2012-05-14 19:05:35 +0400 |
| commit | 4c6d11e223580d9652dedf6a1d7de42be896fe1a (patch) | |
| tree | bee046f817c0d67cda2955c4ae80158ab9591c9e | |
| parent | 18c8896b3c27ca1419ddf6e79cb296d51db3c201 (diff) | |
move auth.css and remoteStorage-big.png to assets folders From where they can be included
| -rw-r--r-- | .htaccess | 2 | ||||
| -rwxr-xr-x | apps/remoteStorage/auth.php | 4 | ||||
| -rw-r--r-- | core/css/auth.css (renamed from apps/remoteStorage/auth.css) | 0 | ||||
| -rw-r--r-- | core/img/remoteStorage-big.png (renamed from apps/remoteStorage/remoteStorage-big.png) | bin | 9742 -> 9742 bytes |
4 files changed, 3 insertions, 3 deletions
diff --git a/.htaccess b/.htaccess index 085cc665ded..79904f8a9da 100644 --- a/.htaccess +++ b/.htaccess @@ -13,7 +13,7 @@ RewriteEngine on RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}] RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L] RewriteRule ^.well-known/carddav /remote.php/carddav/ [R] -RewriteRule ^.well-known/caldav /remote.php/caldav/ [R] +RewriteRule ^.well-known/caldav /remote.php/caldav/ [R] RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L] RewriteRule ^remote/(.*) remote.php [QSA,L] </IfModule> diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php index fcbeda44910..a54be37b2e6 100755 --- a/apps/remoteStorage/auth.php +++ b/apps/remoteStorage/auth.php @@ -67,7 +67,7 @@ if($userId && $appUrl && $categories) { <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="../../../core/img/favicon.png" /><link rel="apple-touch-icon-precomposed" href="../../../core/img/favicon-touch.png" /> <link rel="stylesheet" href="../../../core/css/styles.css" type="text/css" media="screen" /> - <link rel="stylesheet" href="?app=remoteStorage&getfile=auth.css" type="text/css" media="screen" /> + <link rel="stylesheet" href="../../../core/css/auth.css" type="text/css" media="screen" /> </head> <body id="body-login"> <div id="login"> @@ -78,7 +78,7 @@ if($userId && $appUrl && $categories) { </header> <section id="main"> <div id="oauth"> - <h2><img src="?app=remoteStorage&getfile=remoteStorage-big.png" alt="remoteStorage" /></h2> + <h2><img src="../../../core/img/remoteStorage-big.png" alt="remoteStorage" /></h2> <p><strong><?php $appUrlParts = explode('/', $_GET['redirect_uri']); echo htmlentities($appUrlParts[2]); ?></strong> requests read & write access to your <?php diff --git a/apps/remoteStorage/auth.css b/core/css/auth.css index 2dedad5dd0f..2dedad5dd0f 100644 --- a/apps/remoteStorage/auth.css +++ b/core/css/auth.css diff --git a/apps/remoteStorage/remoteStorage-big.png b/core/img/remoteStorage-big.png Binary files differindex 7c429a6a738..7c429a6a738 100644 --- a/apps/remoteStorage/remoteStorage-big.png +++ b/core/img/remoteStorage-big.png |
