From bc5bf18eedb3c3afd4c9266b5c4a0738f467d54f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 11 Aug 2011 15:11:06 +0200 Subject: bit of work on app management --- admin/apps.php | 15 +++++++++++++-- lib/ocsclient.php | 16 ++++++++-------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/admin/apps.php b/admin/apps.php index 07e93728a39..c74f9032916 100644 --- a/admin/apps.php +++ b/admin/apps.php @@ -45,8 +45,19 @@ foreach($registeredApps as $app){ } } -$categories=OC_OCSClient::getCategories(); -// print_r($categories); +$categories=array_keys(OC_OCSClient::getCategories()); +$externalApps=OC_OCSClient::getApplications($categories); +foreach($externalApps as $app){ + $apps[]=array( + 'name'=>$app['name'], + 'id'=>$app['id'], + 'active'=>false, + 'description'=>$app['description'], + 'author'=>$app['personid'], + ); +} + + $tmpl = new OC_Template( "admin", "apps", "user" ); $tmpl->assign('apps',$apps); diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 2d85e715090..1df9e21e606 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -80,15 +80,15 @@ class OC_OCSClient{ $tmp=$data->data->content; for($i = 0; $i < count($tmp); $i++) { $app=array(); - $app['id']=$tmp[$i]->id; - $app['name']=$tmp[$i]->name; - $app['type']=$tmp[$i]->typeid; - $app['typename']=$tmp[$i]->typename; - $app['personid']=$tmp[$i]->personid; - $app['detailpage']=$tmp[$i]->detailpage; - $app['preview']=$tmp[$i]->smallpreviewpic1; + $app['id']=(string)$tmp[$i]->id; + $app['name']=(string)$tmp[$i]->name; + $app['type']=(string)$tmp[$i]->typeid; + $app['typename']=(string)$tmp[$i]->typename; + $app['personid']=(string)$tmp[$i]->personid; + $app['detailpage']=(string)$tmp[$i]->detailpage; + $app['preview']=(string)$tmp[$i]->smallpreviewpic1; $app['changed']=strtotime($tmp[$i]->changed); - $app['description']=$tmp[$i]->description; + $app['description']=(string)$tmp[$i]->description; $apps[]=$app; } -- cgit v1.2.3 From c824572b91ce8b85704b0dab11bba248e87610bc Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 11 Aug 2011 16:15:55 +0200 Subject: fix the getlink calls --- admin/system.php | 2 +- admin/users.php | 2 +- apps/user_ldap/settings.php | 2 +- files/admin.php | 2 +- files/ajax/download.php | 2 +- files/download.php | 2 +- files/settings.php | 2 +- help/index.php | 2 +- settings/index.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/admin/system.php b/admin/system.php index da77027f7aa..42ae8a6c2d1 100644 --- a/admin/system.php +++ b/admin/system.php @@ -23,7 +23,7 @@ require_once('../lib/base.php'); if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "", "index.php" )); exit(); } diff --git a/admin/users.php b/admin/users.php index b120e10d437..cbec28a544b 100644 --- a/admin/users.php +++ b/admin/users.php @@ -23,7 +23,7 @@ require_once('../lib/base.php'); if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "", "index.php" )); exit(); } diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php index cae3542a65b..696b95c37e0 100644 --- a/apps/user_ldap/settings.php +++ b/apps/user_ldap/settings.php @@ -24,7 +24,7 @@ require_once('../../lib/base.php'); if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( '', "index.php" )); exit(); } diff --git a/files/admin.php b/files/admin.php index 7161de6e196..db47bc7c033 100644 --- a/files/admin.php +++ b/files/admin.php @@ -28,7 +28,7 @@ require_once('../lib/base.php'); // Check if we are a user if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "files", "index.php" )); exit(); } diff --git a/files/ajax/download.php b/files/ajax/download.php index 2bbf1df4eca..4c756f9b190 100644 --- a/files/ajax/download.php +++ b/files/ajax/download.php @@ -26,7 +26,7 @@ require_once('../../lib/base.php'); // Check if we are a user if( !OC_User::isLoggedIn()){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "", "index.php" )); exit(); } diff --git a/files/download.php b/files/download.php index cc52b930f72..ccd3eb43d8e 100644 --- a/files/download.php +++ b/files/download.php @@ -26,7 +26,7 @@ require_once('../lib/base.php'); // Check if we are a user if( !OC_User::isLoggedIn()){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "", "index.php" )); exit(); } diff --git a/files/settings.php b/files/settings.php index 1f2e9d9868c..2bbcb2acd3a 100644 --- a/files/settings.php +++ b/files/settings.php @@ -27,7 +27,7 @@ require_once('../lib/base.php'); // Check if we are a user if( !OC_User::isLoggedIn()){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "", "index.php" )); exit(); } diff --git a/help/index.php b/help/index.php index 642b2131737..7eb0c6b1820 100644 --- a/help/index.php +++ b/help/index.php @@ -2,7 +2,7 @@ require_once('../lib/base.php'); if( !OC_User::isLoggedIn()){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "", "index.php" )); exit(); } diff --git a/settings/index.php b/settings/index.php index 9669b5b3dba..aea35054930 100644 --- a/settings/index.php +++ b/settings/index.php @@ -2,7 +2,7 @@ require_once('../lib/base.php'); if( !OC_User::isLoggedIn()){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); + header( "Location: ".OC_Helper::linkTo( "", "index.php" )); exit(); } -- cgit v1.2.3 From 50c1553c389c554c7297b44b03f5ff3c0410b69d Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 11 Aug 2011 16:21:40 +0200 Subject: automaticaly login after setup --- lib/setup.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/setup.php b/lib/setup.php index 192fd134608..c7259d6b8ce 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -206,6 +206,7 @@ class OC_Setup { OC_User::createUser($username, $password); OC_Group::createGroup('admin'); OC_Group::addToGroup($username, 'admin'); + OC_User::login($username, $password); //guess what this does OC_Installer::installShippedApps(true); -- cgit v1.2.3 From 5b9f6b4001b2b92b77a078b521c475ee4a352b03 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 11 Aug 2011 16:24:53 +0200 Subject: hide the files admin page as long as we don have settings on the page --- lib/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app.php b/lib/app.php index 6a2e3078596..b3a3779556e 100644 --- a/lib/app.php +++ b/lib/app.php @@ -202,7 +202,7 @@ class OC_App{ $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" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "files", "folder.png" )), ); $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" )), -- cgit v1.2.3 From 952d88a28cf62387e861c8d796caecf5cbfc6afe Mon Sep 17 00:00:00 2001 From: Dawid Opis Date: Thu, 11 Aug 2011 16:37:20 +0200 Subject: fixed mysql/sqlite selection labels in installation screen --- core/css/styles.css | 4 ++++ core/templates/installation.php | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 05bb63e0f07..1ccdc0b3981 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -75,6 +75,10 @@ legend { padding:.2em; font-size:1.2em; } #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } #login form ul.errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; } +#login form p { clear:both; } +#login form p label { float:left; position:static; margin:0; padding:0.1em;} +#login form p input { float:left; } + /* NAVIGATION ------------------------------------------------------------- */ #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; } #navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } diff --git a/core/templates/installation.php b/core/templates/installation.php index 80c3c273084..180405860f8 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -31,7 +31,10 @@

t( 'SQLite will be used.' ); ?>

-

/>

+

+ /> + +

@@ -41,7 +44,10 @@

t( 'MySQL will be used.' ); ?>

- /> +

+ /> + +

-- cgit v1.2.3 From 6b9cf8d2d546174cd212d9c9947d4eb253ff7384 Mon Sep 17 00:00:00 2001 From: Dawid Opis Date: Thu, 11 Aug 2011 16:38:54 +0200 Subject: fixed mysql/sqlite selection labels in installation screen --- core/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 1ccdc0b3981..39e7bd2a5b0 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -77,7 +77,7 @@ legend { padding:.2em; font-size:1.2em; } #login form p { clear:both; } #login form p label { float:left; position:static; margin:0; padding:0.1em;} -#login form p input { float:left; } +#login form p input { float:left; width: auto;} /* NAVIGATION ------------------------------------------------------------- */ #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; } -- cgit v1.2.3 From 26ac7f0f1d532d27b6e0ebd74b1a0e44f9d5a239 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 11 Aug 2011 16:53:00 +0200 Subject: get rid of some js errors on the login screen --- apps/media/js/loader.js | 1 + core/js/js.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js index b7ef2fb7be4..ef8647eeca5 100644 --- a/apps/media/js/loader.js +++ b/apps/media/js/loader.js @@ -49,6 +49,7 @@ $(document).ready(function() { FileActions.setDefault('audio','Play'); FileActions.setDefault('application/ogg','Play'); } + var oc_current_user=OC.currentUser; if(typeof PlayList==='undefined'){ if(typeof localStorage !== 'undefined' && localStorage){ if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){ diff --git a/core/js/js.js b/core/js/js.js index dc8345545a6..dd3f3b2ac33 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -27,7 +27,7 @@ t.cache={}; OC={ webroot:oc_webroot, - currentUser:oc_current_user, + currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false, coreApps:['files','admin','log','search','settings','core','3rdparty'], /** * get an absolute url to a file in an appen -- cgit v1.2.3 From aa582ec43a9060f5f9fba6540d1ea4e24bc70330 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Thu, 11 Aug 2011 17:49:36 +0200 Subject: more work on encryption --- lib/crypt.php | 54 +++++++++++++++++++++++++++++++++------- lib/user.php | 1 + lib/util.php | 2 +- settings/ajax/changepassword.php | 1 + 4 files changed, 48 insertions(+), 10 deletions(-) diff --git a/lib/crypt.php b/lib/crypt.php index d75515cf2de..83e6ac4cde0 100755 --- a/lib/crypt.php +++ b/lib/crypt.php @@ -24,9 +24,10 @@ // Todo: // Crypt/decrypt button in the userinterface +// setting if crypto should be on by default // transparent decrypt/encrpt in filesystem.php // don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster - +// check if the block lenght of the encrypted data stays the same require_once('Crypt_Blowfish/Blowfish.php'); @@ -38,15 +39,50 @@ class OC_Crypt { static $encription_extension='.encrypted'; - public static function createkey( $passcode) { - // generate a random key - $key=mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999); + public static function init($login,$password) { + $_SESSION['user_password'] = $password; // save the password as passcode for the encryption + if(OC_User::isLoggedIn()){ + // does key exist? + if(!file_exists(OC_Config::getValue( "datadirectory").'/'.$login.'/encryption.key')){ + OC_Crypt::createkey($_SESSION['user_password']); + } + } + } + - // encrypt the key with the passcode of the user - $enckey=OC_Crypt::encrypt($key,$passcode); - // Write the file - file_put_contents( "$SERVERROOT/config/encryption.key", $enckey ); + public static function createkey($passcode) { + if(OC_User::isLoggedIn()){ + // generate a random key + $key=mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999).mt_rand(10000,99999); + + // encrypt the key with the passcode of the user + $enckey=OC_Crypt::encrypt($key,$passcode); + + // Write the file + $username=OC_USER::getUser(); + file_put_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key', $enckey ); + } + } + + public static function changekeypasscode( $newpasscode) { + if(OC_User::isLoggedIn()){ + $username=OC_USER::getUser(); + + // read old key + $key=file_get_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key'); + + // decrypt key with old passcode + $key=OC_Crypt::decrypt($key, $_SESSION['user_password']); + + // encrypt again with new passcode + $key=OC_Crypt::encrypt($key,$newpassword); + + // store the new key + file_put_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key', $key ); + + $_SESSION['user_password']=$newpasscode; + } } /** @@ -59,7 +95,7 @@ class OC_Crypt { */ public static function encrypt( $content, $key) { $bf = new Crypt_Blowfish($key); - return($bf->encrypt($contents)); + return($bf->encrypt($content)); } diff --git a/lib/user.php b/lib/user.php index a2ede8234be..e53ba145c9e 100644 --- a/lib/user.php +++ b/lib/user.php @@ -193,6 +193,7 @@ class OC_User { if( $run && self::checkPassword( $uid, $password )){ $_SESSION['user_id'] = $uid; + OC_Crypt::init($uid,$password); OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid )); return true; } diff --git a/lib/util.php b/lib/util.php index 8b8a27657b2..83d39b3dd21 100644 --- a/lib/util.php +++ b/lib/util.php @@ -190,7 +190,7 @@ class OC_Util { global $SERVERROOT; global $CONFIG_DATADIRECTORY; - $CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );; + $CONFIG_DATADIRECTORY_ROOT = OC_Config::getValue( "datadirectory", "$SERVERROOT/data" ); $CONFIG_BACKUPDIRECTORY = OC_Config::getValue( "backupdirectory", "$SERVERROOT/backup" ); $CONFIG_INSTALLED = OC_Config::getValue( "installed", false ); $errors=array(); diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index c8c1f740889..750edf17696 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -29,6 +29,7 @@ if( !OC_User::checkPassword( $_SESSION["user_id"], $_POST["oldpassword"] )){ // Change password if( OC_User::setPassword( $_SESSION["user_id"], $_POST["password"] )){ echo json_encode( array( "status" => "success", "data" => array( "message" => $l->t("Password changed") ))); + OC_Crypt::changekeypasscode( $_POST["password"]) { } else{ echo json_encode( array( "status" => "error", "data" => array( "message" => $l->t("Unable to change password") ))); -- cgit v1.2.3 From ef5e253bf54fb3ec9f12d4d208fee18db05b16fe Mon Sep 17 00:00:00 2001 From: Dawid Opis Date: Thu, 11 Aug 2011 18:18:50 +0200 Subject: changed radiobuttons to jQuery UI buttons (restyled) on installation page --- core/css/styles.css | 8 +++++--- core/js/setup.js | 1 + core/templates/installation.php | 14 ++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 39e7bd2a5b0..0b12a4e9441 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -75,9 +75,11 @@ legend { padding:.2em; font-size:1.2em; } #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; } #login form ul.errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 4em 0; padding:1em 1em 1em 5em; } -#login form p { clear:both; } -#login form p label { float:left; position:static; margin:0; padding:0.1em;} -#login form p input { float:left; width: auto;} +#login form #selectDbType { text-align:center; } +#login form #selectDbType label { position:static; background:#F8F8F8 none; border:1px solid #DDD; box-shadow:0 1px 1px #FFF, 0 1px 0 #BBB inset; color: #555; font-size:1em; margin:0 -0.3em 1em; padding:0.6em 0.5em 0.4em; cursor:pointer; width:7.5em;} +#login form #selectDbType label span { cursor:pointer; } +#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color: #333; background-color: #FFF; } + /* NAVIGATION ------------------------------------------------------------- */ #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; } diff --git a/core/js/setup.js b/core/js/setup.js index 3fb895cc414..736bedac755 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -1,4 +1,5 @@ $(document).ready(function() { + $('#selectDbType').buttonset(); $('#datadirField').hide(250); if($('#hasSQLite').val()=='true'){ $('#databaseField').hide(250); diff --git a/core/templates/installation.php b/core/templates/installation.php index 180405860f8..c10e66ae2f5 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -25,16 +25,15 @@
t( 'Configure the database' ); ?> +

t( 'SQLite will be used.' ); ?>

-

- /> - -

+ /> + @@ -44,10 +43,8 @@

t( 'MySQL will be used.' ); ?>

-

- /> - -

+ /> + @@ -59,6 +56,7 @@

/>

+
-- cgit v1.2.3 From 99790d68058b56e4a1faa0bba401287e5aa9eab1 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 11 Aug 2011 18:59:01 +0200 Subject: lots of image changes, use svg EVERYWHERE POSSIBLE --- admin/img/administration.png | Bin 236 -> 0 bytes admin/img/apps.png | Bin 216 -> 255 bytes admin/img/apps.svg | 2164 ++++++++++++++++++++++++++++ admin/img/plugins.png | Bin 217 -> 0 bytes admin/img/users.png | Bin 741 -> 743 bytes admin/img/users.svg | 1743 +++++++++++++++++++++++ apps/contacts/appinfo/app.php | 2 +- apps/contacts/img/icon.png | Bin 741 -> 0 bytes apps/contacts/templates/part.details.php | 4 +- apps/contacts/templates/part.property.php | 20 +- apps/media/appinfo/app.php | 2 +- apps/media/img/media.png | Bin 562 -> 0 bytes core/css/styles.css | 4 +- core/img/actions/go-home.png | Bin 397 -> 0 bytes core/img/actions/search.svg | 1632 +++++++++++++++++++++ core/img/filetypes/audio.png | Bin 0 -> 561 bytes core/img/filetypes/audio.svg | 1670 ++++++++++++++++++++++ core/img/filetypes/file.png | Bin 0 -> 391 bytes core/img/filetypes/file.svg | 1841 ++++++++++++++++++++++++ core/img/filetypes/image.png | Bin 0 -> 307 bytes core/img/filetypes/image.svg | 1697 ++++++++++++++++++++++ core/img/loading.gif | Bin 0 -> 1849 bytes core/img/logo-wide.png | Bin 0 -> 3559 bytes core/img/logo-wide.svg | 875 ++++++++++++ core/img/mimetypes/audio.png | Bin 562 -> 0 bytes core/img/mimetypes/file.png | Bin 391 -> 0 bytes core/img/mimetypes/image.png | Bin 303 -> 0 bytes core/img/owncloud-logo-small-white.png | Bin 3550 -> 0 bytes core/img/places/folder.svg | 1830 ++++++++++++++++++++++++ core/img/places/home.png | Bin 0 -> 416 bytes core/img/places/home.svg | 1779 +++++++++++++++++++++++ core/templates/layout.user.php | 12 +- files/appinfo/app.php | 2 +- files/css/files.css | 4 +- files/img/file.png | Bin 391 -> 0 bytes files/img/folder.png | Bin 386 -> 0 bytes files/img/home.png | Bin 416 -> 0 bytes files/img/loading.gif | Bin 1849 -> 0 bytes files/js/filelist.js | 2 +- files/templates/part.list.php | 2 +- help/img/help.png | Bin 483 -> 474 bytes help/img/help.svg | 1758 +++++++++++++++++++++++ lib/app.php | 10 +- lib/helper.php | 18 +- settings/img/options.png | Bin 0 -> 302 bytes settings/img/options.svg | 2214 +++++++++++++++++++++++++++++ settings/img/personal.png | Bin 595 -> 589 bytes settings/img/personal.svg | 1724 ++++++++++++++++++++++ 48 files changed, 20968 insertions(+), 41 deletions(-) delete mode 100644 admin/img/administration.png create mode 100644 admin/img/apps.svg delete mode 100644 admin/img/plugins.png create mode 100644 admin/img/users.svg delete mode 100644 apps/contacts/img/icon.png delete mode 100644 apps/media/img/media.png delete mode 100644 core/img/actions/go-home.png create mode 100644 core/img/actions/search.svg create mode 100644 core/img/filetypes/audio.png create mode 100644 core/img/filetypes/audio.svg create mode 100644 core/img/filetypes/file.png create mode 100644 core/img/filetypes/file.svg create mode 100644 core/img/filetypes/image.png create mode 100644 core/img/filetypes/image.svg create mode 100644 core/img/loading.gif create mode 100644 core/img/logo-wide.png create mode 100644 core/img/logo-wide.svg delete mode 100644 core/img/mimetypes/audio.png delete mode 100644 core/img/mimetypes/file.png delete mode 100644 core/img/mimetypes/image.png delete mode 100644 core/img/owncloud-logo-small-white.png create mode 100644 core/img/places/folder.svg create mode 100644 core/img/places/home.png create mode 100644 core/img/places/home.svg delete mode 100644 files/img/file.png delete mode 100644 files/img/folder.png delete mode 100644 files/img/home.png delete mode 100644 files/img/loading.gif create mode 100644 help/img/help.svg create mode 100644 settings/img/options.png create mode 100644 settings/img/options.svg create mode 100644 settings/img/personal.svg diff --git a/admin/img/administration.png b/admin/img/administration.png deleted file mode 100644 index 8f4bb880aec..00000000000 Binary files a/admin/img/administration.png and /dev/null differ diff --git a/admin/img/apps.png b/admin/img/apps.png index ee3e8355e66..17f47d632b9 100644 Binary files a/admin/img/apps.png and b/admin/img/apps.png differ diff --git a/admin/img/apps.svg b/admin/img/apps.svg new file mode 100644 index 00000000000..cda246bc4a8 --- /dev/null +++ b/admin/img/apps.svg @@ -0,0 +1,2164 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/admin/img/plugins.png b/admin/img/plugins.png deleted file mode 100644 index 1e6f16651c2..00000000000 Binary files a/admin/img/plugins.png and /dev/null differ diff --git a/admin/img/users.png b/admin/img/users.png index ea2ed9e3335..f56e2442c9e 100644 Binary files a/admin/img/users.png and b/admin/img/users.png differ diff --git a/admin/img/users.svg b/admin/img/users.svg new file mode 100644 index 00000000000..1c8c8955693 --- /dev/null +++ b/admin/img/users.svg @@ -0,0 +1,1743 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php index 30aa0e1aaa1..4fbbd9c638c 100644 --- a/apps/contacts/appinfo/app.php +++ b/apps/contacts/appinfo/app.php @@ -14,5 +14,5 @@ OC_App::addNavigationEntry( array( 'id' => 'contacts_index', 'order' => 10, 'href' => OC_Helper::linkTo( 'contacts', 'index.php' ), - 'icon' => OC_Helper::imagePath( 'contacts', 'icon.png' ), + 'icon' => OC_Helper::imagePath( 'admin', 'users.svg' ), 'name' => 'Contacts' )); diff --git a/apps/contacts/img/icon.png b/apps/contacts/img/icon.png deleted file mode 100644 index ea2ed9e3335..00000000000 Binary files a/apps/contacts/img/icon.png and /dev/null differ diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php index e463459e78c..4277357b759 100644 --- a/apps/contacts/templates/part.details.php +++ b/apps/contacts/templates/part.details.php @@ -24,6 +24,6 @@
- - + +
diff --git a/apps/contacts/templates/part.property.php b/apps/contacts/templates/part.property.php index 1611e54b65f..06587269202 100644 --- a/apps/contacts/templates/part.property.php +++ b/apps/contacts/templates/part.property.php @@ -3,27 +3,27 @@
t('Name'); ?>
- +
t('Birthday'); ?>
l('date',new DateTime($_['property']['value'])); ?> - +
t('Organisation'); ?>
- - + +
t('Email'); ?>
- - + +
t('Telephone'); ?>
@@ -32,8 +32,8 @@ (t('tel_'.strtolower($_['property']['parameters']['TYPE'])); ?>) - - + +
@@ -51,8 +51,8 @@ t('Region'); ?>
t('Postal Code'); ?>
t('Country'); ?> - - + +
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php index ebd360eccb3..0d36217bd4d 100644 --- a/apps/media/appinfo/app.php +++ b/apps/media/appinfo/app.php @@ -28,5 +28,5 @@ OC_Util::addScript('media','loader'); OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' )); -OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => $l->t('Music') )); +OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'core', 'filetypes/audio.svg' ), 'name' => $l->t('Music') )); ?> diff --git a/apps/media/img/media.png b/apps/media/img/media.png deleted file mode 100644 index 6333b947f07..00000000000 Binary files a/apps/media/img/media.png and /dev/null differ diff --git a/core/css/styles.css b/core/css/styles.css index 0b12a4e9441..1349f662b0a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -44,7 +44,7 @@ input[type="checkbox"] { width:auto; } #body-login input { font-size:1.5em; } #body-login input[type="submit"] { float:right; margin-right:.8em; } #remember_login { margin:.8em .2em 0 1em; } -form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:4em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border- +form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:4em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.svg') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border- radius:1em; border-radius:1em; } input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } 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; } @@ -96,7 +96,7 @@ legend { padding:.2em; font-size:1.2em; } #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ccc; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; } #quota_indicator div { background:#76a9ea; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; } -li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#fee url('../img/task-attention.png') .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } +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; } .hidden{ display:none; } #notification{ z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:block; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; diff --git a/core/img/actions/go-home.png b/core/img/actions/go-home.png deleted file mode 100644 index 3802c98fc46..00000000000 Binary files a/core/img/actions/go-home.png and /dev/null differ diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg new file mode 100644 index 00000000000..c8d9d848c46 --- /dev/null +++ b/core/img/actions/search.svg @@ -0,0 +1,1632 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png new file mode 100644 index 00000000000..4c844425d64 Binary files /dev/null and b/core/img/filetypes/audio.png differ diff --git a/core/img/filetypes/audio.svg b/core/img/filetypes/audio.svg new file mode 100644 index 00000000000..1f397660970 --- /dev/null +++ b/core/img/filetypes/audio.svg @@ -0,0 +1,1670 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png new file mode 100644 index 00000000000..49790448897 Binary files /dev/null and b/core/img/filetypes/file.png differ diff --git a/core/img/filetypes/file.svg b/core/img/filetypes/file.svg new file mode 100644 index 00000000000..478714b75d1 --- /dev/null +++ b/core/img/filetypes/file.svg @@ -0,0 +1,1841 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png new file mode 100644 index 00000000000..980a7c69813 Binary files /dev/null and b/core/img/filetypes/image.png differ diff --git a/core/img/filetypes/image.svg b/core/img/filetypes/image.svg new file mode 100644 index 00000000000..26c3d6312c2 --- /dev/null +++ b/core/img/filetypes/image.svg @@ -0,0 +1,1697 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/loading.gif b/core/img/loading.gif new file mode 100644 index 00000000000..5b33f7e54f4 Binary files /dev/null and b/core/img/loading.gif differ diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png new file mode 100644 index 00000000000..b2c16a0f60a Binary files /dev/null and b/core/img/logo-wide.png differ diff --git a/core/img/logo-wide.svg b/core/img/logo-wide.svg new file mode 100644 index 00000000000..73b37cc7aaa --- /dev/null +++ b/core/img/logo-wide.svg @@ -0,0 +1,875 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/mimetypes/audio.png b/core/img/mimetypes/audio.png deleted file mode 100644 index 6333b947f07..00000000000 Binary files a/core/img/mimetypes/audio.png and /dev/null differ diff --git a/core/img/mimetypes/file.png b/core/img/mimetypes/file.png deleted file mode 100644 index 49790448897..00000000000 Binary files a/core/img/mimetypes/file.png and /dev/null differ diff --git a/core/img/mimetypes/image.png b/core/img/mimetypes/image.png deleted file mode 100644 index 3dda2729bc9..00000000000 Binary files a/core/img/mimetypes/image.png and /dev/null differ diff --git a/core/img/owncloud-logo-small-white.png b/core/img/owncloud-logo-small-white.png deleted file mode 100644 index c0d8a92d833..00000000000 Binary files a/core/img/owncloud-logo-small-white.png and /dev/null differ diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg new file mode 100644 index 00000000000..c04b00fedce --- /dev/null +++ b/core/img/places/folder.svg @@ -0,0 +1,1830 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/img/places/home.png b/core/img/places/home.png new file mode 100644 index 00000000000..b3fb9bbaf6f Binary files /dev/null and b/core/img/places/home.png differ diff --git a/core/img/places/home.svg b/core/img/places/home.svg new file mode 100644 index 00000000000..4b45ef12bcb --- /dev/null +++ b/core/img/places/home.svg @@ -0,0 +1,1779 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 849d3a1a09d..81c0e73ea46 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -29,15 +29,15 @@