summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin/appinfo/app.php8
-rw-r--r--admin/img/administration.pngbin0 -> 236 bytes
-rw-r--r--admin/img/apps.pngbin0 -> 217 bytes
-rw-r--r--admin/img/navicon.pngbin874 -> 0 bytes
-rw-r--r--admin/img/users.pngbin0 -> 765 bytes
-rw-r--r--files/appinfo/app.php3
-rw-r--r--files/img/folder.pngbin0 -> 436 bytes
-rw-r--r--files/img/navicon.pngbin635 -> 397 bytes
-rw-r--r--help/appinfo/app.php2
-rw-r--r--help/img/help.pngbin0 -> 467 bytes
-rw-r--r--img/actions/go-home.pngbin635 -> 397 bytes
-rw-r--r--img/places/folder.pngbin386 -> 436 bytes
-rw-r--r--log/appinfo/app.php2
-rw-r--r--log/img/logs.pngbin0 -> 213 bytes
-rw-r--r--settings/appinfo/app.php2
-rw-r--r--settings/img/information.pngbin803 -> 0 bytes
-rw-r--r--settings/img/personal.pngbin0 -> 597 bytes
17 files changed, 9 insertions, 8 deletions
diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index ffe941552b8..04f8caf138c 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -2,10 +2,10 @@
OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
-OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System settings", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
-OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
-OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
-OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" => "System setting", "icon" => OC_HELPER::imagePath( "admin", "administration.png" )));
+OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "users.png" )));
+OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
+OC_APP::addAdminPage( array( "id" => "core_plugins", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "plugins.php" ), "name" => "Plugins", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
// Add subentries for App installer
OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_installed", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php?add=some&parameters=here" ), "name" => "Installed apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
diff --git a/admin/img/administration.png b/admin/img/administration.png
new file mode 100644
index 00000000000..8f4bb880aec
--- /dev/null
+++ b/admin/img/administration.png
Binary files differ
diff --git a/admin/img/apps.png b/admin/img/apps.png
new file mode 100644
index 00000000000..1e6f16651c2
--- /dev/null
+++ b/admin/img/apps.png
Binary files differ
diff --git a/admin/img/navicon.png b/admin/img/navicon.png
deleted file mode 100644
index f2c7c0867f6..00000000000
--- a/admin/img/navicon.png
+++ /dev/null
Binary files differ
diff --git a/admin/img/users.png b/admin/img/users.png
new file mode 100644
index 00000000000..0d3701918b9
--- /dev/null
+++ b/admin/img/users.png
Binary files differ
diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index 851a774286d..c542f47b24f 100644
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -3,7 +3,8 @@
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", "navicon.png" ), "name" => "Files" ));
-OC_APP::addSettingsPage( array( "id" => "files_administration", "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files" ));
+OC_APP::addSettingsPage( array( "id" => "files_administration", "order" => 1, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_HELPER::imagePath( "files", "folder.png" )));
+
// To add navigation sub entries use
// OC_APP::addNavigationSubEntry( "files_index", array( ... ));
diff --git a/files/img/folder.png b/files/img/folder.png
new file mode 100644
index 00000000000..3e7a3ba8cfe
--- /dev/null
+++ b/files/img/folder.png
Binary files differ
diff --git a/files/img/navicon.png b/files/img/navicon.png
index 9ee717c8b12..3802c98fc46 100644
--- a/files/img/navicon.png
+++ b/files/img/navicon.png
Binary files differ
diff --git a/help/appinfo/app.php b/help/appinfo/app.php
index 4743292ebb7..ee308624aaa 100644
--- a/help/appinfo/app.php
+++ b/help/appinfo/app.php
@@ -3,7 +3,7 @@
OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
// Workaround for having help as the last entry always
-$entry = array( "id" => "help", "order" => 1000, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "settings", "information.png" ));
+$entry = array( "id" => "help", "order" => 1000, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "help", "help.png" ));
if( OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
OC_APP::addAdminPage( $entry );
}
diff --git a/help/img/help.png b/help/img/help.png
new file mode 100644
index 00000000000..aa222ed83b3
--- /dev/null
+++ b/help/img/help.png
Binary files differ
diff --git a/img/actions/go-home.png b/img/actions/go-home.png
index 9ee717c8b12..3802c98fc46 100644
--- a/img/actions/go-home.png
+++ b/img/actions/go-home.png
Binary files differ
diff --git a/img/places/folder.png b/img/places/folder.png
index 536da3d1c39..3e7a3ba8cfe 100644
--- a/img/places/folder.png
+++ b/img/places/folder.png
Binary files differ
diff --git a/log/appinfo/app.php b/log/appinfo/app.php
index 7058c6ebc98..7247104b95d 100644
--- a/log/appinfo/app.php
+++ b/log/appinfo/app.php
@@ -1,6 +1,6 @@
<?php
OC_APP::register( array( "order" => 1, "id" => "log", "name" => "Log" ));
-OC_APP::addSettingsPage( array( "id" => "log", "order" => 999, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
+OC_APP::addSettingsPage( array( "id" => "log", "order" => 999, "href" => OC_HELPER::linkTo( "log", "index.php" ), "name" => "Log", "icon" => OC_HELPER::imagePath( "log", "logs.png" )));
?>
diff --git a/log/img/logs.png b/log/img/logs.png
new file mode 100644
index 00000000000..c3fad71133a
--- /dev/null
+++ b/log/img/logs.png
Binary files differ
diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php
index 2eb24b90efa..f0bf1c71bb4 100644
--- a/settings/appinfo/app.php
+++ b/settings/appinfo/app.php
@@ -1,6 +1,6 @@
<?php
OC_APP::register( array( "id" => "settings", "name" => "Settings" ));
-OC_APP::addSettingsPage( array( "id" => "settings", "order" => -1000, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Information", "icon" => OC_HELPER::imagePath( "settings", "information.png" )));
+OC_APP::addSettingsPage( array( "id" => "settings", "order" => -1000, "href" => OC_HELPER::linkTo( "settings", "index.php" ), "name" => "Personal", "icon" => OC_HELPER::imagePath( "settings", "personal.png" )));
?>
diff --git a/settings/img/information.png b/settings/img/information.png
deleted file mode 100644
index cbabb0e54a5..00000000000
--- a/settings/img/information.png
+++ /dev/null
Binary files differ
diff --git a/settings/img/personal.png b/settings/img/personal.png
new file mode 100644
index 00000000000..95b4ca396c1
--- /dev/null
+++ b/settings/img/personal.png
Binary files differ