diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index 94cd43ab0a..e8b2f0c316 100644
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -4,6 +4,6 @@ $l=new OC_L10N('files');
OC_App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
-OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "files", "home.png" ), "name" => $l->t("Files") ));
+OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
?>
diff --git a/files/css/files.css b/files/css/files.css
index 9af064ccbe..d24de2b327 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -12,7 +12,7 @@
.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .3em; padding-left:2em; }
.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin-right:1.5em;}
-#file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:8em; }
+#file_newfolder_name { background-image:url('../../core/img/places/folder.svg'); font-weight:bold; width:8em; }
.file_upload_start, .file_upload_filename { font-size:1em; }
#file_newfolder_submit, #file_upload_submit { width:3em; }
.file_upload_target { display:none; }
@@ -57,4 +57,4 @@ table thead.fixed {height:2em}
.selectedActions a:hover, a.file_action:hover { background:#fff; -moz-box-shadow:0 0 10px #fff; -webkit-box-shadow:0 0 10px #fff; box-shadow:0 0 10px #fff; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
/* add breadcrumb divider to the File item in navigation panel */
-#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.png') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; }
+#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.svg') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; }
diff --git a/files/img/file.png b/files/img/file.png
deleted file mode 100644
index 4979044889..0000000000
Binary files a/files/img/file.png and /dev/null differ
diff --git a/files/img/folder.png b/files/img/folder.png
deleted file mode 100644
index 3edbe257a3..0000000000
Binary files a/files/img/folder.png and /dev/null differ
diff --git a/files/js/filelist.js b/files/js/filelist.js
index 4a34385fd0..50a995bf25 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -3,7 +3,7 @@ FileList={
$('#fileList').empty().html(fileListHtml);
},
addFile:function(name,size,lastModified,loading){
- var img=(loading)?'img/loading.gif':'img/file.png';
+ var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
var html='
';
if(name.indexOf('.')!=-1){
var basename=name.substr(0,name.indexOf('.'));
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 8b3823f391..34d727dde2 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -9,7 +9,7 @@
'>
-
+
diff --git a/help/img/help.png b/help/img/help.png
index 487c6e6fd9..2257d144d1 100644
Binary files a/help/img/help.png and b/help/img/help.png differ
diff --git a/help/img/help.svg b/help/img/help.svg
new file mode 100644
index 0000000000..1e07aed852
--- /dev/null
+++ b/help/img/help.svg
@@ -0,0 +1,1758 @@
+
+
+
+
diff --git a/lib/app.php b/lib/app.php
index b3a3779556..e7cf74af85 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -200,13 +200,13 @@ class OC_App{
public static function getSettingsNavigation(){
$l=new OC_L10N('core');
$admin=array(
- array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "admin", "users.png" )),
- array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "admin", "apps.png" )),
-// array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "files", "folder.png" )),
+ array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "admin", "users.svg" )),
+ array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "admin", "apps.svg" )),
+// array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "settings", "options.svg" )),
);
$settings=array(
- array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "help", "help.png" )),
- array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.png" ))
+ array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "help", "help.svg" )),
+ array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" ))
);
if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
$settings=array_merge($admin,$settings);
diff --git a/lib/helper.php b/lib/helper.php
index fa5163ac26..272f460701 100755
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -89,11 +89,11 @@ class OC_Helper {
}
/**
- * @brief get path to icon of mime type
+ * @brief get path to icon of file type
* @param $mimetype mimetype
* @returns the url
*
- * Returns the path to the image of this mime type.
+ * Returns the path to the image of this file type.
*/
public static function mimetypeIcon( $mimetype ){
global $SERVERROOT;
@@ -103,20 +103,20 @@ class OC_Helper {
// Is it a dir?
if( $mimetype == "dir" ){
- return "$WEBROOT/core/img/places/folder.png";
+ return "$WEBROOT/core/img/places/folder.svg";
}
// Icon exists?
- if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){
- return "$WEBROOT/core/img/mimetypes/$mimetype.png";
+ if( file_exists( "$SERVERROOT/core/img/filetypes/$mimetype.svg" )){
+ return "$WEBROOT/core/img/filetypes/$mimetype.svg";
}
- //try only the first part of the mimetype
+ //try only the first part of the filetype
$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
- if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){
- return "$WEBROOT/core/img/mimetypes/$mimetype.png";
+ if( file_exists( "$SERVERROOT/core/img/filetypes/$mimetype.svg" )){
+ return "$WEBROOT/core/img/filetypes/$mimetype.svg";
}
else{
- return "$WEBROOT/core/img/mimetypes/file.png";
+ return "$WEBROOT/core/img/filetypes/file.svg";
}
}
diff --git a/settings/img/options.png b/settings/img/options.png
new file mode 100644
index 0000000000..c1e6d6b8a7
Binary files /dev/null and b/settings/img/options.png differ
diff --git a/settings/img/options.svg b/settings/img/options.svg
new file mode 100644
index 0000000000..b3c4a32451
--- /dev/null
+++ b/settings/img/options.svg
@@ -0,0 +1,2214 @@
+
+
+
+
diff --git a/settings/img/personal.png b/settings/img/personal.png
index ae22c1c1da..8204028f70 100644
Binary files a/settings/img/personal.png and b/settings/img/personal.png differ
diff --git a/settings/img/personal.svg b/settings/img/personal.svg
new file mode 100644
index 0000000000..6131861999
--- /dev/null
+++ b/settings/img/personal.svg
@@ -0,0 +1,1724 @@
+
+
+
+
|