Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor

40 files changed, 24 insertions, 2 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index 84a024f95b9..5d4df586a8e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -50,7 +50,7 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; }
 
 /* CONTENT ------------------------------------------------------------------ */
-#controls { width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
+#controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
 #controls .button { display:inline-block; }
 #content { margin:3.5em 0 0 12.5em; }
 #leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
@@ -117,7 +117,7 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
 #quotatext {padding: .6em 1em;}
 div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
-.pager { list-style:none; float:right; display:inline; margin:.7em 12.7em 0 0; }
+.pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
 .pager li { display:inline-block; }
 
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 4c844425d64..a8b3ede3df9 100644
--- a/core/img/filetypes/audio.png
+++ b/core/img/filetypes/audio.png
diff --git a/core/img/filetypes/c.png b/core/img/filetypes/c.png
new file mode 100644
index 00000000000..34a05cccf06
--- /dev/null
+++ b/core/img/filetypes/c.png
diff --git a/core/img/filetypes/code.png b/core/img/filetypes/code.png
new file mode 100644
index 00000000000..0c76bd12977
--- /dev/null
+++ b/core/img/filetypes/code.png
diff --git a/core/img/filetypes/cplusplus.png b/core/img/filetypes/cplusplus.png
new file mode 100644
index 00000000000..a87cf847cb7
--- /dev/null
+++ b/core/img/filetypes/cplusplus.png
diff --git a/core/img/filetypes/csharp.png b/core/img/filetypes/csharp.png
new file mode 100644
index 00000000000..ffb8fc932f3
--- /dev/null
+++ b/core/img/filetypes/csharp.png
diff --git a/core/img/filetypes/css.png b/core/img/filetypes/css.png
new file mode 100644
index 00000000000..23f3101811f
--- /dev/null
+++ b/core/img/filetypes/css.png
diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png
new file mode 100644
index 00000000000..3d09261a26e
--- /dev/null
+++ b/core/img/filetypes/database.png
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 49790448897..8b8b1ca0000 100644
--- a/core/img/filetypes/file.png
+++ b/core/img/filetypes/file.png
diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png
new file mode 100644
index 00000000000..5769120b1b6
--- /dev/null
+++ b/core/img/filetypes/flash.png
diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
new file mode 100644
index 00000000000..784e8fa4823
--- /dev/null
+++ b/core/img/filetypes/folder.png
diff --git a/core/img/filetypes/font.png b/core/img/filetypes/font.png
new file mode 100644
index 00000000000..81e41de7d3a
--- /dev/null
+++ b/core/img/filetypes/font.png
diff --git a/core/img/filetypes/h.png b/core/img/filetypes/h.png
new file mode 100644
index 00000000000..e902abb0767
--- /dev/null
+++ b/core/img/filetypes/h.png
diff --git a/core/img/filetypes/html.png b/core/img/filetypes/html.png
new file mode 100644
index 00000000000..55d1072eafd
--- /dev/null
+++ b/core/img/filetypes/html.png
diff --git a/core/img/filetypes/ical.png b/core/img/filetypes/ical.png
new file mode 100644
index 00000000000..658913852d6
--- /dev/null
+++ b/core/img/filetypes/ical.png
diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 980a7c69813..4a158fef7e0 100644
--- a/core/img/filetypes/image.png
+++ b/core/img/filetypes/image.png
diff --git a/core/img/filetypes/link.png b/core/img/filetypes/link.png
new file mode 100644
index 00000000000..68f21d30116
--- /dev/null
+++ b/core/img/filetypes/link.png
diff --git a/core/img/filetypes/model.png b/core/img/filetypes/model.png
new file mode 100644
index 00000000000..7851cf34c94
--- /dev/null
+++ b/core/img/filetypes/model.png
diff --git a/core/img/filetypes/ms-excel.png b/core/img/filetypes/ms-excel.png
new file mode 100644
index 00000000000..abcd93689a0
--- /dev/null
+++ b/core/img/filetypes/ms-excel.png
diff --git a/core/img/filetypes/ms-powerpoint.png b/core/img/filetypes/ms-powerpoint.png
new file mode 100644
index 00000000000..b4aaad9a45c
--- /dev/null
+++ b/core/img/filetypes/ms-powerpoint.png
diff --git a/core/img/filetypes/msword.png b/core/img/filetypes/msword.png
new file mode 100644
index 00000000000..813f712f726
--- /dev/null
+++ b/core/img/filetypes/msword.png
diff --git a/core/img/filetypes/pdf.png b/core/img/filetypes/pdf.png
new file mode 100644
index 00000000000..8f8095e46fa
--- /dev/null
+++ b/core/img/filetypes/pdf.png
diff --git a/core/img/filetypes/php.png b/core/img/filetypes/php.png
new file mode 100644
index 00000000000..7868a25945c
--- /dev/null
+++ b/core/img/filetypes/php.png
diff --git a/core/img/filetypes/presentation.png b/core/img/filetypes/presentation.png
new file mode 100644
index 00000000000..b4aaad9a45c
--- /dev/null
+++ b/core/img/filetypes/presentation.png
diff --git a/core/img/filetypes/readme.txt b/core/img/filetypes/readme.txt
new file mode 100644
index 00000000000..400a64d7857
--- /dev/null
+++ b/core/img/filetypes/readme.txt
@@ -0,0 +1,22 @@
+Silk icon set 1.3

+

+_________________________________________

+Mark James

+http://www.famfamfam.com/lab/icons/silk/

+_________________________________________

+

+This work is licensed under a

+Creative Commons Attribution 2.5 License.

+[ http://creativecommons.org/licenses/by/2.5/ ]

+

+This means you may use it for any purpose,

+and make any changes you like.

+All I ask is that you include a link back

+to this page in your credits.

+

+Are you using this icon set? Send me an email

+(including a link or picture if available) to

+mjames@gmail.com

+

+Any other questions about this icon set please

+contact mjames@gmail.com
\ No newline at end of file
diff --git a/core/img/filetypes/rss.png b/core/img/filetypes/rss.png
new file mode 100644
index 00000000000..315c4f4fa62
--- /dev/null
+++ b/core/img/filetypes/rss.png
diff --git a/core/img/filetypes/ruby.png b/core/img/filetypes/ruby.png
new file mode 100644
index 00000000000..f59b7c4365f
--- /dev/null
+++ b/core/img/filetypes/ruby.png
diff --git a/core/img/filetypes/script.png b/core/img/filetypes/script.png
new file mode 100644
index 00000000000..63fe6ceff5b
--- /dev/null
+++ b/core/img/filetypes/script.png
diff --git a/core/img/filetypes/spreadsheet.png b/core/img/filetypes/spreadsheet.png
new file mode 100644
index 00000000000..abcd93689a0
--- /dev/null
+++ b/core/img/filetypes/spreadsheet.png
diff --git a/core/img/filetypes/svg.png b/core/img/filetypes/svg.png
new file mode 100644
index 00000000000..a1291c2dfad
--- /dev/null
+++ b/core/img/filetypes/svg.png
diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
new file mode 100644
index 00000000000..813f712f726
--- /dev/null
+++ b/core/img/filetypes/text.png
diff --git a/core/img/filetypes/vcf.png b/core/img/filetypes/vcf.png
new file mode 100644
index 00000000000..c02f315d207
--- /dev/null
+++ b/core/img/filetypes/vcf.png
diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
new file mode 100644
index 00000000000..b0ce7bb198a
--- /dev/null
+++ b/core/img/filetypes/video.png
diff --git a/core/img/filetypes/x-.png b/core/img/filetypes/x-.png
new file mode 100644
index 00000000000..8443c23eb94
--- /dev/null
+++ b/core/img/filetypes/x-.png
diff --git a/core/img/places/file.png b/core/img/places/file.png
new file mode 100644
index 00000000000..49790448897
--- /dev/null
+++ b/core/img/places/file.png
diff --git a/core/img/filetypes/file.svg b/core/img/places/file.svg
index 478714b75d1..478714b75d1 100644
--- a/core/img/filetypes/file.svg
+++ b/core/img/places/file.svg
diff --git a/core/img/places/music.png b/core/img/places/music.png
new file mode 100644
index 00000000000..4c844425d64
--- /dev/null
+++ b/core/img/places/music.png
diff --git a/core/img/filetypes/audio.svg b/core/img/places/music.svg
index 1f397660970..1f397660970 100644
--- a/core/img/filetypes/audio.svg
+++ b/core/img/places/music.svg
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
new file mode 100644
index 00000000000..980a7c69813
--- /dev/null
+++ b/core/img/places/picture.png
diff --git a/core/img/filetypes/image.svg b/core/img/places/picture.svg
index 26c3d6312c2..26c3d6312c2 100644
--- a/core/img/filetypes/image.svg
+++ b/core/img/places/picture.svg