diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-11 18:59:01 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-11 19:00:32 +0200 |
| commit | 99790d68058b56e4a1faa0bba401287e5aa9eab1 (patch) | |
| tree | 644f70c614bb64c0683879b2309605b39072df15 /lib | |
| parent | ef5e253bf54fb3ec9f12d4d208fee18db05b16fe (diff) | |
| download | nextcloud-server-99790d68058b56e4a1faa0bba401287e5aa9eab1.tar.gz nextcloud-server-99790d68058b56e4a1faa0bba401287e5aa9eab1.zip | |
lots of image changes, use svg EVERYWHERE POSSIBLE
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/app.php | 10 | ||||
| -rwxr-xr-x | lib/helper.php | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/app.php b/lib/app.php index b3a3779556e..e7cf74af85c 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 fa5163ac266..272f4607011 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"; } } |