]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18c8896)
move auth.css and remoteStorage-big.png to assets folders From where they can be...
authorMichiel de Jong <michiel@unhosted.org>
Mon, 14 May 2012 15:05:35 +0000 (17:05 +0200)
committerMichiel de Jong <michiel@unhosted.org>
Mon, 14 May 2012 15:05:35 +0000 (17:05 +0200)
.htaccess patch | blob | history
apps/remoteStorage/auth.css [deleted file] patch | blob | history
apps/remoteStorage/auth.php patch | blob | history
apps/remoteStorage/remoteStorage-big.png [deleted file] patch | blob | history
core/css/auth.css [new file with mode: 0644] patch | blob
core/img/remoteStorage-big.png [new file with mode: 0644] patch | blob

diff --git a/.htaccess b/.htaccess
index 085cc665ded5bb9323730d8eb5e5c35b6349d0fa..79904f8a9dab38ff08b39568f682295794321521 100644 (file)
--- 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.css b/apps/remoteStorage/auth.css
deleted file mode 100644 (file)
index 2dedad5..0000000
--- a/apps/remoteStorage/auth.css
+++ /dev/null
@@ -1,8 +0,0 @@
-h2 { font-size:2em; font-weight:bold; margin-bottom:1em; white-space:nowrap; }
-ul.scopes { list-style:disc; }
-ul.scopes li { white-space:nowrap; }
-h2 img { width: 50% }
-#oauth { margin:4em auto 2em; width:20em; }
-#allow-auth { background-color:#5c3; text-shadow:#5e3 0 1px 0; color:#fff;
--webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; }
-#deny-auth { padding:0; margin:.7em; border:0; background:none; font-size:1.2em; -moz-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; -webkit-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; }
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index fcbeda449101f0c28f7da72cec91d3bd04f11f39..a54be37b2e6dec7e2ba43aeed76487ba83aaf745 100755 (executable)
--- 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 &amp; write access to your 
                        <?php
diff --git a/apps/remoteStorage/remoteStorage-big.png b/apps/remoteStorage/remoteStorage-big.png
deleted file mode 100644 (file)
index 7c429a6..0000000
Binary files a/apps/remoteStorage/remoteStorage-big.png and /dev/null differ
diff --git a/core/css/auth.css b/core/css/auth.css
new file mode 100644 (file)
index 0000000..2dedad5
--- /dev/null
+++ b/core/css/auth.css
@@ -0,0 +1,8 @@
+h2 { font-size:2em; font-weight:bold; margin-bottom:1em; white-space:nowrap; }
+ul.scopes { list-style:disc; }
+ul.scopes li { white-space:nowrap; }
+h2 img { width: 50% }
+#oauth { margin:4em auto 2em; width:20em; }
+#allow-auth { background-color:#5c3; text-shadow:#5e3 0 1px 0; color:#fff;
+-webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; box-shadow:0 1px 1px #fff, 0 1px 1px #5f3 inset; }
+#deny-auth { padding:0; margin:.7em; border:0; background:none; font-size:1.2em; -moz-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; -webkit-box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; box-shadow: 0 0 0 #fff, 0 0 0 #fff inset; }
diff --git a/core/img/remoteStorage-big.png b/core/img/remoteStorage-big.png
new file mode 100644 (file)
index 0000000..7c429a6
Binary files /dev/null and b/core/img/remoteStorage-big.png differ
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server