Merge branch 'master' of gitorious.org:owncloud/owncloud

41 files changed, 22 insertions, 73 deletions

diff --git a/core/img/actions/selected.png b/core/img/actions/selected.png
deleted file mode 100644
index 98c29df9cf5..00000000000
--- a/core/img/actions/selected.png
+++ /dev/null
diff --git a/core/img/actions/selected.svg b/core/img/actions/selected.svg
deleted file mode 100644
index 3294f68c68d..00000000000
--- a/core/img/actions/selected.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg3875"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="play.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs3877" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.345359"
-     inkscape:cx="10.565719"
-     inkscape:cy="5.327912"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="969"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3883"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3880">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0, -1036.36)">
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 14,1038.3622 -6,12 -6,-12 6,6.9978 z"
-       id="path3086"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
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