diff options
461 files changed, 4056 insertions, 4467 deletions
diff --git a/.gitignore b/.gitignore index 25cb1b227f9..e61ec6f0359 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /data /owncloud /config/config.php +/config/*.config.php /config/mount.php /apps/inc.php diff --git a/3rdparty b/3rdparty -Subproject 7c2c94c904c2721763e97d5bafd115f863080a6 +Subproject 478de4b756f3729f762d838b29f69f2a40e5f4f diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php index c69f5a8860c..69f859daa97 100644 --- a/apps/files/ajax/delete.php +++ b/apps/files/ajax/delete.php @@ -9,8 +9,21 @@ OCP\JSON::callCheck(); // Get data $dir = stripslashes($_POST["dir"]); $files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"]; +$allFiles = isset($_POST["allfiles"]) ? $_POST["allfiles"] : $_POST["allfiles"]; +if ($allFiles === 'true') { + $allFiles = true; +} -$files = json_decode($files); +// delete all files in dir ? +if ($allFiles) { + $files = array(); + $fileList = \OC\Files\Filesystem::getDirectoryContent($dir); + foreach ($fileList as $fileInfo) { + $files[] = $fileInfo['name']; + } +} else { + $files = json_decode($files); +} $filesWithError = ''; $success = true; diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 0be38c3b96f..c8286bc15ca 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -11,7 +11,8 @@ OCP\JSON::checkLoggedIn(); // Load the files $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; $dir = \OC\Files\Filesystem::normalizePath($dir); -if (!\OC\Files\Filesystem::is_dir($dir . '/')) { +$dirInfo = \OC\Files\Filesystem::getFileInfo($dir); +if (!$dirInfo->getType() === 'dir') { header("HTTP/1.0 404 Not Found"); exit(); } @@ -20,7 +21,7 @@ $doBreadcrumb = isset($_GET['breadcrumb']); $data = array(); $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir='; -$permissions = \OCA\Files\Helper::getDirPermissions($dir); +$permissions = $dirInfo->getPermissions(); // Make breadcrumb if($doBreadcrumb) { diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 1853098c507..0187b200759 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -50,16 +50,22 @@ $l10n = \OC_L10n::get('files'); $result = array( 'success' => false, 'data' => NULL - ); +); +$trimmedFileName = trim($filename); -if(trim($filename) === '') { +if($trimmedFileName === '') { $result['data'] = array('message' => (string)$l10n->t('File name cannot be empty.')); OCP\JSON::error($result); exit(); } +if($trimmedFileName === '.' || $trimmedFileName === '..') { + $result['data'] = array('message' => (string)$l10n->t('"%s" is an invalid file name.', $trimmedFileName)); + OCP\JSON::error($result); + exit(); +} -if(strpos($filename, '/') !== false) { - $result['data'] = array('message' => (string)$l10n->t('File name must not contain "/". Please choose a different name.')); +if(!OCP\Util::isValidFileName($filename)) { + $result['data'] = array('message' => (string)$l10n->t("Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.")); OCP\JSON::error($result); exit(); } diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php index 4cfcae3090d..b2b4fb27f74 100644 --- a/apps/files/ajax/newfolder.php +++ b/apps/files/ajax/newfolder.php @@ -23,8 +23,8 @@ if(trim($foldername) === '') { exit(); } -if(strpos($foldername, '/') !== false) { - $result['data'] = array('message' => $l10n->t('Folder name must not contain "/". Please choose a different name.')); +if(!OCP\Util::isValidFileName($foldername)) { + $result['data'] = array('message' => (string)$l10n->t("Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.")); OCP\JSON::error($result); exit(); } diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php index 3503678e7c7..f920f842166 100644 --- a/apps/files/appinfo/update.php +++ b/apps/files/appinfo/update.php @@ -3,17 +3,14 @@ // fix webdav properties,add namespace in front of the property, update for OC4.5 $installedVersion=OCP\Config::getAppValue('files', 'installed_version'); if (version_compare($installedVersion, '1.1.6', '<')) { - $query = OC_DB::prepare( 'SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`' ); - $result = $query->execute(); - $updateQuery = OC_DB::prepare('UPDATE `*PREFIX*properties`' - .' SET `propertyname` = ?' - .' WHERE `userid` = ?' - .' AND `propertypath` = ?'); - while( $row = $result->fetchRow()) { - if ( $row['propertyname'][0] != '{' ) { - $updateQuery->execute(array('{DAV:}' + $row['propertyname'], $row['userid'], $row['propertypath'])); - } - } + $concat = OC_DB::getConnection()->getDatabasePlatform()-> + getConcatExpression( '\'{DAV:}\'', '`propertyname`' ); + $query = OC_DB::prepare(' + UPDATE `*PREFIX*properties` + SET `propertyname` = ' . $concat . ' + WHERE `propertyname` NOT LIKE \'{%\' + '); + $query->execute(); } //update from OC 3 diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 3ad167054c2..af863aca33e 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -20,7 +20,7 @@ padding: 10px; font-weight: normal; } -#new>a { +#new > a { padding: 14px 10px; position: relative; top: 7px; @@ -30,7 +30,7 @@ border-bottom-right-radius: 0; border-bottom: none; } -#new>ul { +#new > ul { display: none; position: fixed; min-width: 112px; @@ -39,16 +39,26 @@ padding-bottom: 0; margin-top: 14px; margin-left: -1px; - text-align:left; + text-align: left; background: #f8f8f8; border: 1px solid #ddd; border-radius: 5px; border-top-left-radius: 0; - box-shadow:0 2px 7px rgba(170,170,170,.4); + box-shadow: 0 2px 7px rgba(170,170,170,.4); +} +#new > ul > li { + height: 36px; + margin: 5px; + padding-left: 42px; + padding-bottom: 2px; + background-position: initial; + cursor: pointer; +} +#new > ul > li > p { + cursor: pointer; + padding-top: 7px; + padding-bottom: 7px; } -#new>ul>li { height:36px; margin:5px; padding-left:48px; padding-bottom:2px; - background-repeat:no-repeat; cursor:pointer; } -#new>ul>li>p { cursor:pointer; padding-top: 7px; padding-bottom: 7px;} #new .error, #fileList .error { color: #e9322d; diff --git a/apps/files/index.php b/apps/files/index.php index dd63f29bc28..ad7a2e210ed 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -37,8 +37,9 @@ OCP\App::setActiveNavigationEntry('files_index'); // Load the files $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; $dir = \OC\Files\Filesystem::normalizePath($dir); +$dirInfo = \OC\Files\Filesystem::getFileInfo($dir); // Redirect if directory does not exist -if (!\OC\Files\Filesystem::is_dir($dir . '/')) { +if (!$dirInfo->getType() === 'dir') { header('Location: ' . OCP\Util::getScriptName() . ''); exit(); } @@ -79,6 +80,8 @@ if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we ne $needUpgrade = false; } +$config = \OC::$server->getConfig(); + // Make breadcrumb $breadcrumb = \OCA\Files\Helper::makeBreadcrumb($dir); @@ -92,7 +95,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb); $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir='); -$permissions = \OCA\Files\Helper::getDirPermissions($dir); +$permissions = $dirInfo->getPermissions(); if ($needUpgrade) { OCP\Util::addscript('files', 'upgrade'); @@ -104,7 +107,7 @@ if ($needUpgrade) { $freeSpace=$storageInfo['free']; $uploadLimit=OCP\Util::uploadLimit(); $maxUploadFilesize=OCP\Util::maxUploadFilesize($dir); - $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'); + $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes'); // if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code) $encryptionInitStatus = 2; if (OC_App::isEnabled('files_encryption')) { @@ -143,8 +146,8 @@ if ($needUpgrade) { $tmpl->assign('isPublic', false); $tmpl->assign('publicUploadEnabled', $publicUploadEnabled); $tmpl->assign("encryptedFiles", \OCP\Util::encryptedFiles()); - $tmpl->assign("mailNotificationEnabled", \OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes')); - $tmpl->assign("allowShareWithLink", \OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); + $tmpl->assign("mailNotificationEnabled", $config->getAppValue('core', 'shareapi_allow_mail_notification', 'yes')); + $tmpl->assign("allowShareWithLink", $config->getAppValue('core', 'shareapi_allow_links', 'yes')); $tmpl->assign("encryptionInitStatus", $encryptionInitStatus); $tmpl->assign('disableSharing', false); $tmpl->assign('ajaxLoad', $ajaxLoad); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index a855d6cbe59..d6cffde05de 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -582,30 +582,49 @@ window.FileList={ }}); } }, - do_delete:function(files) { - if (files.substr) { + do_delete:function(files, dir) { + var params; + if (files && files.substr) { files=[files]; } - for (var i=0; i<files.length; i++) { - var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete"); - deleteAction.removeClass('delete-icon').addClass('progress-icon'); + if (files) { + for (var i=0; i<files.length; i++) { + var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete"); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); + } } // Finish any existing actions if (FileList.lastAction) { FileList.lastAction(); } - var fileNames = JSON.stringify(files); + var params = { + dir: dir || FileList.getCurrentDirectory() + }; + if (files) { + params.files = JSON.stringify(files); + } + else { + // no files passed, delete all in current dir + params.allfiles = true; + } + $.post(OC.filePath('files', 'ajax', 'delete.php'), - {dir:$('#dir').val(),files:fileNames}, + params, function(result) { if (result.status === 'success') { - $.each(files,function(index,file) { - var files = FileList.findFileEl(file); - files.remove(); - files.find('input[type="checkbox"]').removeAttr('checked'); - files.removeClass('selected'); - }); + if (params.allfiles) { + // clear whole list + $('#fileList tr').remove(); + } + else { + $.each(files,function(index,file) { + var files = FileList.findFileEl(file); + files.remove(); + files.find('input[type="checkbox"]').removeAttr('checked'); + files.removeClass('selected'); + }); + } procesSelection(); checkTrashStatus(); FileList.updateFileSummary(); @@ -622,10 +641,17 @@ window.FileList={ setTimeout(function() { OC.Notification.hide(); }, 10000); - $.each(files,function(index,file) { - var deleteAction = FileList.findFileEl(file).find('.action.delete'); - deleteAction.removeClass('progress-icon').addClass('delete-icon'); - }); + if (params.allfiles) { + // reload the page as we don't know what files were deleted + // and which ones remain + FileList.reload(); + } + else { + $.each(files,function(index,file) { + var deleteAction = FileList.findFileEl(file).find('.action.delete'); + deleteAction.removeClass('progress-icon').addClass('delete-icon'); + }); + } } }); }, @@ -794,6 +820,13 @@ window.FileList={ $(e).removeClass("searchresult"); }); }, + /** + * Returns whether all files are selected + * @return true if all files are selected, false otherwise + */ + isAllSelected: function() { + return $('#select_all').prop('checked'); + }, /** * Returns the download URL of the given file @@ -801,10 +834,13 @@ window.FileList={ * @param dir optional directory in which the file name is, defaults to the current directory */ getDownloadUrl: function(filename, dir) { + var files = filename; + if ($.isArray(filename)) { + files = JSON.stringify(filename); + } var params = { - files: filename, dir: dir || FileList.getCurrentDirectory(), - download: null + files: files }; return OC.filePath('files', 'ajax', 'download.php') + '?' + OC.buildQueryString(params); } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 1ec4c4ec7ab..fbac601f67a 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -364,23 +364,26 @@ $(document).ready(function() { }); $('.download').click('click',function(event) { - var files=getSelectedFilesTrash('name'); - var fileslist = JSON.stringify(files); - var dir=$('#dir').val()||'/'; - OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.')); - // use special download URL if provided, e.g. for public shared files - var downloadURL = document.getElementById("downloadURL"); - if ( downloadURL ) { - window.location = downloadURL.value+"&download&files=" + encodeURIComponent(fileslist); - } else { - window.location = OC.filePath('files', 'ajax', 'download.php') + '?'+ $.param({ dir: dir, files: fileslist }); + var files; + var dir = FileList.getCurrentDirectory(); + if (FileList.isAllSelected()) { + files = OC.basename(dir); + dir = OC.dirname(dir) || '/'; } + else { + files = getSelectedFilesTrash('name'); + } + OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.')); + OC.redirect(FileList.getDownloadUrl(files, dir)); return false; }); $('.delete-selected').click(function(event) { var files=getSelectedFilesTrash('name'); event.preventDefault(); + if (FileList.isAllSelected()) { + files = null; + } FileList.do_delete(files); return false; }); diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 01fc65d76b7..ac8a2ad3200 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -112,26 +112,4 @@ class Helper } return $breadcrumb; } - - /** - * Returns the numeric permissions for the given directory. - * @param string $dir directory without trailing slash - * @return numeric permissions - */ - public static function getDirPermissions($dir){ - $permissions = \OCP\PERMISSION_READ; - if (\OC\Files\Filesystem::isCreatable($dir . '/')) { - $permissions |= \OCP\PERMISSION_CREATE; - } - if (\OC\Files\Filesystem::isUpdatable($dir . '/')) { - $permissions |= \OCP\PERMISSION_UPDATE; - } - if (\OC\Files\Filesystem::isDeletable($dir . '/')) { - $permissions |= \OCP\PERMISSION_DELETE; - } - if (\OC\Files\Filesystem::isSharable($dir . '/')) { - $permissions |= \OCP\PERMISSION_SHARE; - } - return $permissions; - } } diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 939043b2c9f..ed15e46a5ac 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -5,12 +5,17 @@ <div id="new" class="button"> <a><?php p($l->t('New'));?></a> <ul> - <li style="background-image:url('<?php p(OCP\mimetype_icon('text/plain')) ?>')" - data-type='file' data-newname='<?php p($l->t('New text file')) ?>.txt'><p><?php p($l->t('Text file'));?></p></li> - <li style="background-image:url('<?php p(OCP\mimetype_icon('dir')) ?>')" - data-type='folder' data-newname='<?php p($l->t('New folder')) ?>'><p><?php p($l->t('Folder'));?></p></li> - <li style="background-image:url('<?php p(OCP\image_path('core', 'places/link.svg')) ?>')" - data-type='web'><p><?php p($l->t('From link'));?></p></li> + <li class="icon icon-filetype-text" + data-type="file" data-newname="<?php p($l->t('New text file')) ?>.txt"> + <p><?php p($l->t('Text file'));?></p> + </li> + <li class="icon icon-filetype-folder" + data-type="folder" data-newname="<?php p($l->t('New folder')) ?>"> + <p><?php p($l->t('Folder'));?></p> + </li> + <li class="icon icon-link" data-type="web"> + <p><?php p($l->t('From link'));?></p> + </li> </ul> </div> <?php endif;?> diff --git a/apps/files/tests/js/fileactionsSpec.js b/apps/files/tests/js/fileactionsSpec.js index 8bbc1d3d141..ef7ddcb874a 100644 --- a/apps/files/tests/js/fileactionsSpec.js +++ b/apps/files/tests/js/fileactionsSpec.js @@ -69,7 +69,7 @@ describe('FileActions tests', function() { $tr.find('.action[data-action=Download]').click(); expect(redirectStub.calledOnce).toEqual(true); - expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?files=test%20download%20File.txt&dir=%2Fsubdir&download'); + expect(redirectStub.getCall(0).args[0]).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=test%20download%20File.txt'); redirectStub.restore(); }); }); diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js index c26e65fc4de..8f4cb86ab4a 100644 --- a/apps/files/tests/js/filelistSpec.js +++ b/apps/files/tests/js/filelistSpec.js @@ -58,8 +58,15 @@ describe('FileList tests', function() { expect($tr.attr('data-permissions')).toEqual('31'); //expect($tr.attr('data-mime')).toEqual('httpd/unix-directory'); }); - it('returns correct download URL', function() { - expect(FileList.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?files=some%20file.txt&dir=%2Fsubdir&download'); - expect(FileList.getDownloadUrl('some file.txt', '/anotherpath/abc')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?files=some%20file.txt&dir=%2Fanotherpath%2Fabc&download'); + describe('Download Url', function() { + it('returns correct download URL for single files', function() { + expect(FileList.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=some%20file.txt'); + expect(FileList.getDownloadUrl('some file.txt', '/anotherpath/abc')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fanotherpath%2Fabc&files=some%20file.txt'); + $('#dir').val('/'); + expect(FileList.getDownloadUrl('some file.txt')).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2F&files=some%20file.txt'); + }); + it('returns correct download URL for multiple files', function() { + expect(FileList.getDownloadUrl(['a b c.txt', 'd e f.txt'])).toEqual(OC.webroot + '/index.php/apps/files/ajax/download.php?dir=%2Fsubdir&files=%5B%22a%20b%20c.txt%22%2C%22d%20e%20f.txt%22%5D'); + }); }); }); diff --git a/apps/files_encryption/ajax/adminrecovery.php b/apps/files_encryption/ajax/adminrecovery.php index 6a0186d5a9b..61e43acc2c3 100644 --- a/apps/files_encryption/ajax/adminrecovery.php +++ b/apps/files_encryption/ajax/adminrecovery.php @@ -18,7 +18,7 @@ $l = OC_L10N::get('files_encryption'); $return = false; // Enable recoveryAdmin -$recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId'); +$recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId'); if (isset($_POST['adminEnableRecovery']) && $_POST['adminEnableRecovery'] === '1') { diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 50f322ddef4..3af43f10264 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -647,7 +647,7 @@ class Hooks { /**
* @brief if the file was really deleted we remove the encryption keys
* @param array $params
- * @return boolean
+ * @return boolean|null
*/
public static function postDelete($params) {
@@ -687,7 +687,7 @@ class Hooks { /**
* @brief remember the file which should be deleted and it's owner
* @param array $params
- * @return boolean
+ * @return boolean|null
*/
public static function preDelete($params) {
$path = $params[\OC\Files\Filesystem::signal_param_path];
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 9155d238c77..caca13acece 100755 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -182,6 +182,7 @@ class Crypt { * @param $data
* @param string $relPath The path of the file, relative to user/data;
* e.g. filename or /Docs/filename, NOT admin/files/filename
+ * @param boolean $isCatFileContent
* @return boolean
*/
public static function isLegacyEncryptedContent($isCatFileContent, $relPath) {
@@ -209,8 +210,8 @@ class Crypt { /**
* @brief Symmetrically encrypt a string
- * @param $plainContent
- * @param $iv
+ * @param string $plainContent
+ * @param string $iv
* @param string $passphrase
* @return string encrypted file content
*/
@@ -229,9 +230,9 @@ class Crypt { /**
* @brief Symmetrically decrypt a string
- * @param $encryptedContent
- * @param $iv
- * @param $passphrase
+ * @param string $encryptedContent
+ * @param string $iv
+ * @param string $passphrase
* @throws \Exception
* @return string decrypted file content
*/
@@ -292,8 +293,7 @@ class Crypt { * @brief Symmetrically encrypts a string and returns keyfile content
* @param string $plainContent content to be encrypted in keyfile
* @param string $passphrase
- * @return bool|string
- * @return string encrypted content combined with IV
+ * @return false|string encrypted content combined with IV
* @note IV need not be specified, as it will be stored in the returned keyfile
* and remain accessible therein.
*/
@@ -326,7 +326,7 @@ class Crypt { * @param $keyfileContent
* @param string $passphrase
* @throws \Exception
- * @return bool|string
+ * @return string|false
* @internal param string $source
* @internal param string $target
* @internal param string $key the decryption key
@@ -438,7 +438,7 @@ class Crypt { * @param $encryptedContent
* @param $shareKey
* @param $privateKey
- * @return bool
+ * @return false|string
* @internal param string $plainContent content to be encrypted
* @returns string $plainContent decrypted string
* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php index bb06a57c714..ef3775875f0 100755 --- a/apps/files_encryption/lib/helper.php +++ b/apps/files_encryption/lib/helper.php @@ -103,7 +103,7 @@ class Helper { * @brief enable recovery * * @param $recoveryKeyId - * @param $recoveryPassword + * @param string $recoveryPassword * @internal param \OCA\Encryption\Util $util * @internal param string $password * @return bool @@ -111,10 +111,11 @@ class Helper { public static function adminEnableRecovery($recoveryKeyId, $recoveryPassword) { $view = new \OC\Files\View('/'); + $appConfig = \OC::$server->getAppConfig(); if ($recoveryKeyId === null) { $recoveryKeyId = 'recovery_' . substr(md5(time()), 0, 8); - \OC_Appconfig::setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId); + $appConfig->setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId); } if (!$view->is_dir('/owncloud_private_key')) { @@ -147,7 +148,7 @@ class Helper { \OC_FileProxy::$enabled = true; // Set recoveryAdmin as enabled - \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1); + $appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1); $return = true; @@ -155,7 +156,7 @@ class Helper { $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), \OCP\User::getUser()); $return = $util->checkRecoveryPassword($recoveryPassword); if ($return) { - \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 1); + $appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1); } } @@ -209,7 +210,7 @@ class Helper { /** * @brief disable recovery * - * @param $recoveryPassword + * @param string $recoveryPassword * @return bool */ public static function adminDisableRecovery($recoveryPassword) { @@ -218,7 +219,7 @@ class Helper { if ($return) { // Set recoveryAdmin as disabled - \OC_Appconfig::setValue('files_encryption', 'recoveryAdminEnabled', 0); + \OC::$server->getAppConfig()->setValue('files_encryption', 'recoveryAdminEnabled', 0); } return $return; @@ -344,6 +345,7 @@ class Helper { /** * @brief redirect to a error page + * @param Session $session */ public static function redirectToErrorPage($session, $errorCode = null) { @@ -422,8 +424,8 @@ class Helper { /** * @brief glob uses different pattern than regular expressions, escape glob pattern only - * @param unescaped path - * @return escaped path + * @param string $path unescaped path + * @return string path */ public static function escapeGlobPattern($path) { return preg_replace('/(\*|\?|\[)/', '[$1]', $path); @@ -441,7 +443,7 @@ class Helper { /** * @brief get the path of the original file * @param string $tmpFile path of the tmp file - * @return mixed path of the original file or false + * @return string|false path of the original file or false */ public static function getPathFromTmpFile($tmpFile) { if (isset(self::$tmpFileMapping[$tmpFile])) { diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php index 7abc565f609..cb9f5e64af3 100755 --- a/apps/files_encryption/lib/keymanager.php +++ b/apps/files_encryption/lib/keymanager.php @@ -170,7 +170,7 @@ class Keymanager { * @brief retrieve keyfile for an encrypted file * @param \OC_FilesystemView $view * @param \OCA\Encryption\Util $util - * @param $filePath + * @param string|false $filePath * @internal param \OCA\Encryption\file $string name * @return string file key or false * @note The keyfile returned is asymmetrically encrypted. Decryption @@ -513,6 +513,8 @@ class Keymanager { /** * @brief Make preparations to vars and filesystem for saving a keyfile + * @param string|boolean $path + * @param string $basePath */ public static function keySetPreparation(\OC_FilesystemView $view, $path, $basePath, $userId) { @@ -542,7 +544,7 @@ class Keymanager { /** * @brief extract filename from share key name * @param string $shareKey (filename.userid.sharekey) - * @return mixed filename or false + * @return string|false filename or false */ protected static function getFilenameFromShareKey($shareKey) { $parts = explode('.', $shareKey); diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index 2ea477a6e4d..9d456f6c517 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -262,7 +262,7 @@ class Proxy extends \OC_FileProxy { } elseif ( self::shouldEncrypt($path) - and $meta ['mode'] !== 'r' + and $meta['mode'] !== 'r' and $meta['mode'] !== 'rb' ) { $result = fopen('crypt://' . $path, $meta['mode']); diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php index 25f2198181f..aa58e33e9d2 100644 --- a/apps/files_encryption/lib/session.php +++ b/apps/files_encryption/lib/session.php @@ -51,11 +51,13 @@ class Session { } - $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId'); + $appConfig = \OC::$server->getAppConfig(); + + $publicShareKeyId = $appConfig->getValue('files_encryption', 'publicShareKeyId'); if ($publicShareKeyId === null) { $publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8); - \OC_Appconfig::setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId); + $appConfig->setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId); } if ( @@ -195,7 +197,7 @@ class Session { /** * @brief Sets user legacy key to session - * @param $legacyKey + * @param string $legacyKey * @return bool */ public function setLegacyKey($legacyKey) { diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index f3f69997f2c..ec06bd52f5e 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -63,8 +63,10 @@ class Util { $this->client = $client; $this->userId = $userId; - $this->publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId'); - $this->recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId'); + $appConfig = \OC::$server->getAppConfig(); + + $this->publicShareKeyId = $appConfig->getValue('files_encryption', 'publicShareKeyId'); + $this->recoveryKeyId = $appConfig->getValue('files_encryption', 'recoveryKeyId'); $this->userDir = '/' . $this->userId; $this->fileFolderName = 'files'; @@ -569,7 +571,7 @@ class Util { /** - * @param $path + * @param string $path * @return bool */ public function isSharedPath($path) { @@ -1043,7 +1045,7 @@ class Util { * @brief Decrypt a keyfile * @param string $filePath * @param string $privateKey - * @return bool|string + * @return false|string */ private function decryptKeyfile($filePath, $privateKey) { @@ -1122,12 +1124,15 @@ class Util { /** * @brief Find, sanitise and format users sharing a file * @note This wraps other methods into a portable bundle + * @param boolean $sharingEnabled */ public function getSharingUsersArray($sharingEnabled, $filePath, $currentUserId = false) { + $appConfig = \OC::$server->getAppConfig(); + // Check if key recovery is enabled if ( - \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled') + $appConfig->getValue('files_encryption', 'recoveryAdminEnabled') && $this->recoveryEnabledForUser() ) { $recoveryEnabled = true; @@ -1156,7 +1161,7 @@ class Util { // Admin UID to list of users to share to if ($recoveryEnabled) { // Find recoveryAdmin user ID - $recoveryKeyId = \OC_Appconfig::getValue('files_encryption', 'recoveryKeyId'); + $recoveryKeyId = $appConfig->getValue('files_encryption', 'recoveryKeyId'); // Add recoveryAdmin to list of users sharing $userIds[] = $recoveryKeyId; } diff --git a/apps/files_encryption/settings-admin.php b/apps/files_encryption/settings-admin.php index 9ad9bfb8877..88e06613997 100644 --- a/apps/files_encryption/settings-admin.php +++ b/apps/files_encryption/settings-admin.php @@ -11,7 +11,7 @@ $tmpl = new OCP\Template('files_encryption', 'settings-admin'); // Check if an adminRecovery account is enabled for recovering files after lost pwd -$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled', '0'); +$recoveryAdminEnabled = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled', '0'); $tmpl->assign('recoveryEnabled', $recoveryAdminEnabled); diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php index ffcb99602e2..09e9df05352 100644 --- a/apps/files_encryption/settings-personal.php +++ b/apps/files_encryption/settings-personal.php @@ -20,7 +20,7 @@ $privateKeySet = $session->getPrivateKey() !== false; // did we tried to initialize the keys for this session?
$initialized = $session->getInitialized();
-$recoveryAdminEnabled = OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled');
+$recoveryAdminEnabled = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled');
$recoveryEnabledForUser = $util->recoveryEnabledForUser();
$result = false;
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php index 388980ad4fd..123943ea26a 100755 --- a/apps/files_encryption/tests/crypt.php +++ b/apps/files_encryption/tests/crypt.php @@ -661,7 +661,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase { /** * @brief encryption using legacy blowfish method - * @param $data string data to encrypt + * @param string $data data to encrypt * @param $passwd string password * @return string */ diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php index 6f32c50743c..0caf12e91a3 100644 --- a/apps/files_encryption/tests/keymanager.php +++ b/apps/files_encryption/tests/keymanager.php @@ -250,6 +250,10 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase { * dummy class to access protected methods of \OCA\Encryption\Keymanager for testing */ class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager { + + /** + * @param string $sharekey + */ public static function testGetFilenameFromShareKey($sharekey) { return self::getFilenameFromShareKey($sharekey); } diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php index 5c6569f20e7..46a21dd55cd 100755 --- a/apps/files_encryption/tests/share.php +++ b/apps/files_encryption/tests/share.php @@ -61,7 +61,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { \OC_User::useBackend('database'); // enable resharing - \OC_Appconfig::setValue('core', 'shareapi_allow_resharing', 'yes'); + \OC::$server->getAppConfig()->setValue('core', 'shareapi_allow_resharing', 'yes'); // clear share hooks \OC_Hook::clear('OCP\\Share'); @@ -531,7 +531,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); - $publicShareKeyId = \OC_Appconfig::getValue('files_encryption', 'publicShareKeyId'); + $publicShareKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'publicShareKeyId'); // check if share key for public exists $this->assertTrue($this->view->file_exists( @@ -662,7 +662,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'); - $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId'); + $recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId'); // login as admin \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1); @@ -755,7 +755,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { $this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123')); $this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123')); - $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')); + $this->assertEquals(0, \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled')); } /** @@ -769,7 +769,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { $result = \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'); $this->assertTrue($result); - $recoveryKeyId = OC_Appconfig::getValue('files_encryption', 'recoveryKeyId'); + $recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId'); // login as user2 \Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2); @@ -863,7 +863,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase { $this->assertTrue($util->setRecoveryForUser(0)); \OCA\Encryption\Helper::adminDisableRecovery('test123'); - $this->assertEquals(0, \OC_Appconfig::getValue('files_encryption', 'recoveryAdminEnabled')); + $this->assertEquals(0, \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryAdminEnabled')); } /** diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php index 321bdc76f8b..f70e30c4d73 100755 --- a/apps/files_encryption/tests/util.php +++ b/apps/files_encryption/tests/util.php @@ -538,7 +538,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase { * helper function to set migration status to the right value * to be able to test the migration path * - * @param $status needed migration status for test + * @param integer $status needed migration status for test * @param $user for which user the status should be set * @return boolean */ diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php index ae349bfcd3a..fcd3a617ada 100644 --- a/apps/files_external/ajax/addRootCertificate.php +++ b/apps/files_external/ajax/addRootCertificate.php @@ -4,7 +4,7 @@ OCP\JSON::checkAppEnabled('files_external'); OCP\JSON::callCheck(); if ( ! ($filename = $_FILES['rootcert_import']['name']) ) { - header("Location: settings/personal.php"); + header('Location:' . OCP\Util::linkToRoute( "settings_personal" )); exit; } diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 00baacd488c..06ccd5d16fa 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -54,6 +54,9 @@ class AmazonS3 extends \OC\Files\Storage\Common { */ private $timeout = 15; + /** + * @param string $path + */ private function normalizePath($path) { $path = trim($path, '/'); diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 8c85c5fbde8..b2109e5eacd 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -35,7 +35,7 @@ class OC_Mount_Config { * If the configuration parameter is a boolean, add a '!' to the beginning of the value * If the configuration parameter is optional, add a '&' to the beginning of the value * If the configuration parameter is hidden, add a '#' to the beginning of the value - * @return array + * @return string */ public static function getBackends() { @@ -263,13 +263,13 @@ class OC_Mount_Config { /** * Add a mount point to the filesystem - * @param string Mount point - * @param string Backend class + * @param string $mountPoint Mount point + * @param string $class Backend class * @param array Backend parameters for the class - * @param string MOUNT_TYPE_GROUP | MOUNT_TYPE_USER - * @param string User or group to apply mount to + * @param string $mountType MOUNT_TYPE_GROUP | MOUNT_TYPE_USER + * @param string $applicable User or group to apply mount to * @param bool Personal or system mount point i.e. is this being called from the personal or admin page - * @return bool + * @return boolean */ public static function addMountPoint($mountPoint, $class, @@ -343,7 +343,7 @@ class OC_Mount_Config { /** * Read the mount points in the config file into an array - * @param bool Personal or system config file + * @param boolean $isPersonal Personal or system config file * @return array */ private static function readData($isPersonal) { @@ -352,9 +352,8 @@ class OC_Mount_Config { $phpFile = OC_User::getHome(OCP\User::getUser()).'/mount.php'; $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { - $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); $phpFile = OC::$SERVERROOT.'/config/mount.php'; - $jsonFile = $datadir . '/mount.json'; + $jsonFile = \OC_Config::getValue("mount_file", \OC::$SERVERROOT . "/data/mount.json"); } if (is_file($jsonFile)) { $mountPoints = json_decode(file_get_contents($jsonFile), true); @@ -374,13 +373,13 @@ class OC_Mount_Config { * Write the mount points to the config file * @param bool Personal or system config file * @param array Mount points + * @param boolean $isPersonal */ private static function writeData($isPersonal, $data) { if ($isPersonal) { $file = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { - $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); - $file = $datadir . '/mount.json'; + $file = \OC_Config::getValue("mount_file", \OC::$SERVERROOT . "/data/mount.json"); } $content = json_encode($data); @file_put_contents($file, $content); diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php index f7d8d98cf03..0214e18020c 100755 --- a/apps/files_external/lib/dropbox.php +++ b/apps/files_external/lib/dropbox.php @@ -50,6 +50,9 @@ class Dropbox extends \OC\Files\Storage\Common { } } + /** + * @param string $path + */ private function deleteMetaData($path) { $path = $this->root.$path; if (isset($this->metaData[$path])) { @@ -61,7 +64,7 @@ class Dropbox extends \OC\Files\Storage\Common { /** * @brief Returns the path's metadata - * @param $path path for which to return the metadata + * @param string $path path for which to return the metadata * @param $list if true, also return the directory's contents * @return directory contents if $list is true, file metadata if $list is * false, null if the file doesn't exist or "false" if the operation failed diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 426caf008ec..35457f68528 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -67,7 +67,7 @@ class Google extends \OC\Files\Storage\Common { /** * Get the Google_DriveFile object for the specified path * @param string $path - * @return Google_DriveFile + * @return string */ private function getDriveFile($path) { // Remove leading and trailing slashes @@ -524,6 +524,7 @@ class Google extends \OC\Files\Storage\Common { } public function hasUpdated($path, $time) { + $appConfig = \OC::$server->getAppConfig(); if ($this->is_file($path)) { return parent::hasUpdated($path, $time); } else { @@ -533,7 +534,7 @@ class Google extends \OC\Files\Storage\Common { if ($folder) { $result = false; $folderId = $folder->getId(); - $startChangeId = \OC_Appconfig::getValue('files_external', $this->getId().'cId'); + $startChangeId = $appConfig->getValue('files_external', $this->getId().'cId'); $params = array( 'includeDeleted' => true, 'includeSubscribed' => true, @@ -578,7 +579,7 @@ class Google extends \OC\Files\Storage\Common { break; } } - \OC_Appconfig::setValue('files_external', $this->getId().'cId', $largestChangeId); + $appConfig->setValue('files_external', $this->getId().'cId', $largestChangeId); return $result; } } diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php index 6d4f66e856e..7a7e900fbf0 100644 --- a/apps/files_external/lib/irods.php +++ b/apps/files_external/lib/irods.php @@ -134,6 +134,7 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{ /** * get the best guess for the modification time of an iRODS collection + * @param string $path */ private function collectionMTime($path) { $dh = $this->opendir($path); diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php index cd8a0e78864..a0816e2870d 100644 --- a/apps/files_external/lib/sftp.php +++ b/apps/files_external/lib/sftp.php @@ -75,6 +75,9 @@ class SFTP extends \OC\Files\Storage\Common { return 'sftp::' . $this->user . '@' . $this->host . '/' . $this->root; } + /** + * @param string $path + */ private function absPath($path) { return $this->root . $this->cleanPath($path); } @@ -277,6 +280,9 @@ class SFTP extends \OC\Files\Storage\Common { } } + /** + * @param string $path + */ public function constructUrl($path) { $url = 'sftp://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path; return $url; diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php index e484325e2fb..44bd9a0161a 100644 --- a/apps/files_external/lib/streamwrapper.php +++ b/apps/files_external/lib/streamwrapper.php @@ -9,6 +9,11 @@ namespace OC\Files\Storage; abstract class StreamWrapper extends Common { + + /** + * @param string $path + * @return string|null + */ abstract public function constructUrl($path); public function mkdir($path) { @@ -76,10 +81,17 @@ abstract class StreamWrapper extends Common { } } + /** + * @param string $path + * @param string $target + */ public function getFile($path, $target) { return copy($this->constructUrl($path), $target); } + /** + * @param string $target + */ public function uploadFile($path, $target) { return copy($path, $this->constructUrl($target)); } diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index b615d24ce76..7a56fcfc8b7 100644 --- a/apps/files_external/lib/swift.php +++ b/apps/files_external/lib/swift.php @@ -52,6 +52,9 @@ class Swift extends \OC\Files\Storage\Common { */ private static $tmpFiles = array(); + /** + * @param string $path + */ private function normalizePath($path) { $path = trim($path, '/'); @@ -62,6 +65,9 @@ class Swift extends \OC\Files\Storage\Common { return $path; } + /** + * @param string $path + */ private function doesObjectExist($path) { try { $object = $this->container->DataObject($path); diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index f6f4cb16e87..9afe73aebd7 100644 --- a/apps/files_external/lib/webdav.php +++ b/apps/files_external/lib/webdav.php @@ -99,7 +99,9 @@ class DAV extends \OC\Files\Storage\Common{ public function rmdir($path) { $this->init(); - $path=$this->cleanPath($path); + $path=$this->cleanPath($path) . '/'; + // FIXME: some WebDAV impl return 403 when trying to DELETE + // a non-empty folder return $this->simpleResponse('DELETE', $path, null, 204); } @@ -107,7 +109,7 @@ class DAV extends \OC\Files\Storage\Common{ $this->init(); $path=$this->cleanPath($path); try { - $response=$this->client->propfind($path, array(), 1); + $response=$this->client->propfind($this->encodePath($path), array(), 1); $id=md5('webdav'.$this->root.$path); $content = array(); $files=array_keys($response); @@ -127,8 +129,11 @@ class DAV extends \OC\Files\Storage\Common{ $this->init(); $path=$this->cleanPath($path); try { - $response=$this->client->propfind($path, array('{DAV:}resourcetype')); - $responseType=$response["{DAV:}resourcetype"]->resourceType; + $response=$this->client->propfind($this->encodePath($path), array('{DAV:}resourcetype')); + $responseType = array(); + if (isset($response["{DAV:}resourcetype"])) { + $responseType=$response["{DAV:}resourcetype"]->resourceType; + } return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file'; } catch(\Exception $e) { error_log($e->getMessage()); @@ -141,7 +146,7 @@ class DAV extends \OC\Files\Storage\Common{ $this->init(); $path=$this->cleanPath($path); try { - $this->client->propfind($path, array('{DAV:}resourcetype')); + $this->client->propfind($this->encodePath($path), array('{DAV:}resourcetype')); return true;//no 404 exception } catch(\Exception $e) { return false; @@ -166,7 +171,7 @@ class DAV extends \OC\Files\Storage\Common{ $curl = curl_init(); $fp = fopen('php://temp', 'r+'); curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password); - curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $path)); + curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$this->encodePath($path)); curl_setopt($curl, CURLOPT_FILE, $fp); curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); if ($this->secure === true) { @@ -178,6 +183,10 @@ class DAV extends \OC\Files\Storage\Common{ } curl_exec ($curl); + $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); + if ($statusCode !== 200) { + \OCP\Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, \OCP\Util::ERROR); + } curl_close ($curl); rewind($fp); return $fp; @@ -220,7 +229,7 @@ class DAV extends \OC\Files\Storage\Common{ $this->init(); $path=$this->cleanPath($path); try { - $response=$this->client->propfind($path, array('{DAV:}quota-available-bytes')); + $response=$this->client->propfind($this->encodePath($path), array('{DAV:}quota-available-bytes')); if (isset($response['{DAV:}quota-available-bytes'])) { return (int)$response['{DAV:}quota-available-bytes']; } else { @@ -240,13 +249,22 @@ class DAV extends \OC\Files\Storage\Common{ // if file exists, update the mtime, else create a new empty file if ($this->file_exists($path)) { - $this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime)); + try { + $this->client->proppatch($this->encodePath($path), array('{DAV:}lastmodified' => $mtime)); + } + catch (\Sabre_DAV_Exception_NotImplemented $e) { + return false; + } } else { $this->file_put_contents($path, ''); } return true; } + /** + * @param string $path + * @param string $target + */ public function getFile($path, $target) { $this->init(); $source=$this->fopen($path, 'r'); @@ -272,13 +290,17 @@ class DAV extends \OC\Files\Storage\Common{ } } curl_exec ($curl); + $statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); + if ($statusCode !== 200) { + \OCP\Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, \OCP\Util::ERROR); + } curl_close ($curl); } public function rename($path1, $path2) { $this->init(); - $path1=$this->cleanPath($path1); - $path2=$this->createBaseUri().$this->cleanPath($path2); + $path1 = $this->encodePath($this->cleanPath($path1)); + $path2 = $this->createBaseUri().$this->encodePath($this->cleanPath($path2)); try { $this->client->request('MOVE', $path1, null, array('Destination'=>$path2)); return true; @@ -289,8 +311,8 @@ class DAV extends \OC\Files\Storage\Common{ public function copy($path1, $path2) { $this->init(); - $path1=$this->cleanPath($path1); - $path2=$this->createBaseUri().$this->cleanPath($path2); + $path1 = $this->encodePath($this->cleanPath($path1)); + $path2 = $this->createBaseUri().$this->encodePath($this->cleanPath($path2)); try { $this->client->request('COPY', $path1, null, array('Destination'=>$path2)); return true; @@ -303,7 +325,7 @@ class DAV extends \OC\Files\Storage\Common{ $this->init(); $path=$this->cleanPath($path); try { - $response=$this->client->propfind($path, array('{DAV:}getlastmodified', '{DAV:}getcontentlength')); + $response = $this->client->propfind($this->encodePath($path), array('{DAV:}getlastmodified', '{DAV:}getcontentlength')); return array( 'mtime'=>strtotime($response['{DAV:}getlastmodified']), 'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0, @@ -317,8 +339,11 @@ class DAV extends \OC\Files\Storage\Common{ $this->init(); $path=$this->cleanPath($path); try { - $response=$this->client->propfind($path, array('{DAV:}getcontenttype', '{DAV:}resourcetype')); - $responseType=$response["{DAV:}resourcetype"]->resourceType; + $response=$this->client->propfind($this->encodePath($path), array('{DAV:}getcontenttype', '{DAV:}resourcetype')); + $responseType = array(); + if (isset($response["{DAV:}resourcetype"])) { + $responseType=$response["{DAV:}resourcetype"]->resourceType; + } $type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file'; if ($type=='dir') { return 'httpd/unix-directory'; @@ -332,16 +357,34 @@ class DAV extends \OC\Files\Storage\Common{ } } + /** + * @param string $path + */ public function cleanPath($path) { $path = \OC\Files\Filesystem::normalizePath($path); // remove leading slash return substr($path, 1); } + /** + * URL encodes the given path but keeps the slashes + * @param string $path to encode + * @return string encoded path + */ + private function encodePath($path) { + // slashes need to stay + return str_replace('%2F', '/', rawurlencode($path)); + } + + /** + * @param string $method + * @param string $path + * @param integer $expected + */ private function simpleResponse($method, $path, $body, $expected) { $path=$this->cleanPath($path); try { - $response=$this->client->request($method, $path, $body); + $response=$this->client->request($method, $this->encodePath($path), $body); return $response['statusCode']==$expected; } catch(\Exception $e) { return false; diff --git a/apps/files_external/tests/config.php b/apps/files_external/tests/config.php index e296bfcb5b2..767c0adf58e 100644 --- a/apps/files_external/tests/config.php +++ b/apps/files_external/tests/config.php @@ -21,7 +21,11 @@ return array( 'host'=>'localhost', 'user'=>'test', 'password'=>'test', - 'root'=>'/owncloud/files/webdav.php', + 'root'=>'', + // wait delay in seconds after write operations + // (only in tests) + // set to higher value for lighttpd webdav + 'wait'=> 0 ), 'owncloud'=>array( 'run'=>true, diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php index 1f9b767eca6..74e905ccc89 100644 --- a/apps/files_external/tests/webdav.php +++ b/apps/files_external/tests/webdav.php @@ -18,6 +18,9 @@ class DAV extends Storage { if ( ! is_array($this->config) or ! isset($this->config['webdav']) or ! $this->config['webdav']['run']) { $this->markTestSkipped('WebDAV backend not configured'); } + if (isset($this->config['webdav']['wait'])) { + $this->waitDelay = $this->config['webdav']['wait']; + } $this->config['webdav']['root'] .= '/' . $id; //make sure we have an new empty folder to work in $this->instance = new \OC\Files\Storage\DAV($this->config['webdav']); $this->instance->mkdir('/'); diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index c1b7eee3fb7..06c168969de 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -1,3 +1,15 @@ +/* + * Copyright (c) 2014 + * + * This file is licensed under the Affero General Public License version 3 + * or later. + * + * See the COPYING-README file. + * + */ + +/* global OC, FileList, FileActions */ + // Override download path to files_sharing/public.php function fileDownloadPath(dir, file) { var url = $('#downloadURL').val(); @@ -28,12 +40,20 @@ $(document).ready(function() { // override since the format is different FileList.getDownloadUrl = function(filename, dir) { - // we use this because we need the service and token attributes - var tr = FileList.findFileEl(filename); - if (tr.length > 0) { - return $(tr).find('a.name').attr('href') + '&download'; + if ($.isArray(filename)) { + filename = JSON.stringify(filename); + } + var path = dir || FileList.getCurrentDirectory(); + var params = { + service: 'files', + t: $('#sharingToken').val(), + path: path, + download: null + }; + if (filename) { + params.files = filename; } - return null; + return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params); }; } diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php index 061e60ad8ed..19a2d22b068 100644 --- a/apps/files_sharing/lib/api.php +++ b/apps/files_sharing/lib/api.php @@ -218,7 +218,7 @@ class Api { //allow password protection $shareWith = isset($_POST['password']) ? $_POST['password'] : null; //check public link share - $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'); + $publicUploadEnabled = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes'); if(isset($_POST['publicUpload']) && $publicUploadEnabled !== 'yes') { return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator"); } @@ -317,7 +317,7 @@ class Api { $shareType = $share['share_type']; $permissions = isset($params['_put']['permissions']) ? (int)$params['_put']['permissions'] : null; - $publicUploadStatus = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'); + $publicUploadStatus = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes'); $publicUploadEnabled = ($publicUploadStatus === 'yes') ? true : false; @@ -356,7 +356,7 @@ class Api { */ private static function updatePublicUpload($share, $params) { - $publicUploadEnabled = \OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'); + $publicUploadEnabled = \OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes'); if($publicUploadEnabled !== 'yes') { return new \OC_OCS_Result(null, 403, "public upload disabled by the administrator"); } diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php index 1b102f9e5f8..4b0da0b002d 100644 --- a/apps/files_sharing/lib/cache.php +++ b/apps/files_sharing/lib/cache.php @@ -32,6 +32,9 @@ class Shared_Cache extends Cache { private $storage; private $files = array(); + /** + * @param \OC\Files\Storage\Shared $storage + */ public function __construct($storage) { $this->storage = $storage; } @@ -128,19 +131,15 @@ class Shared_Cache extends Cache { foreach ($files as &$file) { $file['mimetype'] = $this->getMimetype($file['mimetype']); $file['mimepart'] = $this->getMimetype($file['mimepart']); + $file['usersPath'] = 'files/Shared/' . ltrim($file['path'], '/'); } return $files; } else { - if ($cache = $this->getSourceCache($folder)) { + $cache = $this->getSourceCache($folder); + if ($cache) { $sourceFolderContent = $cache->getFolderContents($this->files[$folder]); foreach ($sourceFolderContent as $key => $c) { - $ownerPathParts = explode('/', \OC_Filesystem::normalizePath($c['path'])); - $userPathParts = explode('/', \OC_Filesystem::normalizePath($folder)); - $usersPath = 'files/Shared/'.$userPathParts[1]; - foreach (array_slice($ownerPathParts, 3) as $part) { - $usersPath .= '/'.$part; - } - $sourceFolderContent[$key]['usersPath'] = $usersPath; + $sourceFolderContent[$key]['usersPath'] = 'files/Shared/' . $folder . '/' . $c['name']; } return $sourceFolderContent; @@ -393,7 +392,7 @@ class Shared_Cache extends Cache { * use the one with the highest id gives the best result with the background scanner, since that is most * likely the folder where we stopped scanning previously * - * @return string|bool the path of the folder or false when no folder matched + * @return boolean the path of the folder or false when no folder matched */ public function getIncomplete() { return false; diff --git a/apps/files_sharing/lib/permissions.php b/apps/files_sharing/lib/permissions.php index 1dc53428a7f..31b7ac361ae 100644 --- a/apps/files_sharing/lib/permissions.php +++ b/apps/files_sharing/lib/permissions.php @@ -42,6 +42,10 @@ class Shared_Permissions extends Permissions { } } + /** + * @param integer $fileId + * @param string $user + */ private function getFile($fileId, $user) { if ($fileId == -1) { return \OCP\PERMISSION_READ; diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index afe5dffdebd..b922654e5ec 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -41,6 +41,7 @@ class Shared extends \OC\Files\Storage\Common { /** * @brief Get the source file path, permissions, and owner for a shared file * @param string Shared target file path + * @param string $target * @return Returns array with the keys path, permissions, and owner or false if not found */ public function getFile($target) { @@ -64,6 +65,7 @@ class Shared extends \OC\Files\Storage\Common { /** * @brief Get the source file path for a shared file * @param string Shared target file path + * @param string $target * @return string source file path or false if not found */ public function getSourcePath($target) { diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index f03ac7205a3..e7a5f5024b8 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -2,7 +2,9 @@ // Load other apps for file previews OC_App::loadApps(); -if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') { +$appConfig = \OC::$server->getAppConfig(); + +if ($appConfig->getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') { header('HTTP/1.0 404 Not Found'); $tmpl = new OCP\Template('', '404', 'guest'); $tmpl->printPage(); @@ -151,7 +153,7 @@ if (isset($path)) { $tmpl->assign('dirToken', $linkItem['token']); $tmpl->assign('sharingToken', $token); $allowPublicUploadEnabled = (bool) ($linkItem['permissions'] & OCP\PERMISSION_CREATE); - if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') { + if ($appConfig->getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') { $allowPublicUploadEnabled = false; } if ($linkItem['item_type'] !== 'folder') { diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php index 56a51c83f6b..a75e1860527 100644 --- a/apps/files_sharing/tests/cache.php +++ b/apps/files_sharing/tests/cache.php @@ -2,8 +2,9 @@ /** * ownCloud * - * @author Vincent Petry + * @author Vincent Petry, Bjoern Schiessle * @copyright 2014 Vincent Petry <pvince81@owncloud.com> + * 2014 Bjoern Schiessle <schiessle@owncloud.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE @@ -23,13 +24,19 @@ require_once __DIR__ . '/base.php'; class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base { + /** + * @var OC_FilesystemView + */ + public $user2View; + function setUp() { parent::setUp(); self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + $this->user2View = new \OC\Files\View('/'. self::TEST_FILES_SHARING_API_USER2 . '/files'); + // prepare user1's dir structure - $textData = "dummy file data\n"; $this->view->mkdir('container'); $this->view->mkdir('container/shareddir'); $this->view->mkdir('container/shareddir/subdir'); @@ -115,20 +122,128 @@ class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base { $this->verifyFiles($check, $results); } + function testGetFolderContentsInRoot() { + $results = $this->user2View->getDirectoryContent('/Shared/'); + + $this->verifyFiles( + array( + array( + 'name' => 'shareddir', + 'path' => '/shareddir', + 'mimetype' => 'httpd/unix-directory', + 'usersPath' => 'files/Shared/shareddir' + ), + array( + 'name' => 'shared single file.txt', + 'path' => '/shared single file.txt', + 'mimetype' => 'text/plain', + 'usersPath' => 'files/Shared/shared single file.txt' + ), + ), + $results + ); + } + + function testGetFolderContentsInSubdir() { + $results = $this->user2View->getDirectoryContent('/Shared/shareddir'); + + $this->verifyFiles( + array( + array( + 'name' => 'bar.txt', + 'path' => 'files/container/shareddir/bar.txt', + 'mimetype' => 'text/plain', + 'usersPath' => 'files/Shared/shareddir/bar.txt' + ), + array( + 'name' => 'emptydir', + 'path' => 'files/container/shareddir/emptydir', + 'mimetype' => 'httpd/unix-directory', + 'usersPath' => 'files/Shared/shareddir/emptydir' + ), + array( + 'name' => 'subdir', + 'path' => 'files/container/shareddir/subdir', + 'mimetype' => 'httpd/unix-directory', + 'usersPath' => 'files/Shared/shareddir/subdir' + ), + ), + $results + ); + } + + function testGetFolderContentsWhenSubSubdirShared() { + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + + $fileinfo = $this->view->getFileInfo('container/shareddir/subdir'); + \OCP\Share::shareItem('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, + self::TEST_FILES_SHARING_API_USER3, 31); + + self::loginHelper(self::TEST_FILES_SHARING_API_USER3); + + $thirdView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER3 . '/files'); + $results = $thirdView->getDirectoryContent('/Shared/subdir'); + + $this->verifyFiles( + array( + array( + 'name' => 'another too.txt', + 'path' => 'files/container/shareddir/subdir/another too.txt', + 'mimetype' => 'text/plain', + 'usersPath' => 'files/Shared/subdir/another too.txt' + ), + array( + 'name' => 'another.txt', + 'path' => 'files/container/shareddir/subdir/another.txt', + 'mimetype' => 'text/plain', + 'usersPath' => 'files/Shared/subdir/another.txt' + ), + array( + 'name' => 'not a text file.xml', + 'path' => 'files/container/shareddir/subdir/not a text file.xml', + 'mimetype' => 'application/xml', + 'usersPath' => 'files/Shared/subdir/not a text file.xml' + ), + ), + $results + ); + + self::loginHelper(self::TEST_FILES_SHARING_API_USER1); + + \OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, + self::TEST_FILES_SHARING_API_USER3); + } + /** - * Checks that all provided attributes exist in the files list, - * only the values provided in $examples will be used to check against - * the file list. The files order also needs to be the same. + * Check if 'results' contains the expected 'examples' only. * * @param array $examples array of example files - * @param array $files array of files + * @param array $results array of files */ - private function verifyFiles($examples, $files) { - $this->assertEquals(count($examples), count($files)); - foreach ($files as $i => $file) { - foreach ($examples[$i] as $key => $value) { - $this->assertEquals($value, $file[$key]); + private function verifyFiles($examples, $results) { + $this->assertEquals(count($examples), count($results)); + + foreach ($examples as $example) { + foreach ($results as $key => $result) { + if ($result['name'] === $example['name']) { + $this->verifyKeys($example, $result); + unset($results[$key]); + break; + } } } + $this->assertTrue(empty($results)); } + + /** + * @brief verify if each value from the result matches the expected result + * @param array $example array with the expected results + * @param array $result array with the results + */ + private function verifyKeys($example, $result) { + foreach ($example as $key => $value) { + $this->assertEquals($value, $result[$key]); + } + } + } diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php index 1a9a54cbcf8..5ab716e829f 100644 --- a/apps/files_sharing/tests/watcher.php +++ b/apps/files_sharing/tests/watcher.php @@ -145,6 +145,7 @@ class Test_Files_Sharing_Watcher extends Test_Files_Sharing_Base { /** * Returns the sizes of the path and its parent dirs in a hash * where the key is the path and the value is the size. + * @param string $path */ function getOwnerDirSizes($path) { $result = array(); diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index 75d481768ad..ebabc5bc7a2 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -2,42 +2,38 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); +$folder = isset($_POST['dir']) ? $_POST['dir'] : '/'; // "empty trash" command if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true'){ $deleteAll = true; - $folder = isset($_POST['dir']) ? $_POST['dir'] : '/'; if ($folder === '/' || $folder === '') { OCA\Files_Trashbin\Trashbin::deleteAll(); $list = array(); } else { - $dirname = dirname($folder); - if ( $dirname !== '/' && $dirname !== '.' ) { - $dirlisting = '1'; - } else { - $dirlisting = '0'; - } $list[] = $folder; + $folder = dirname($folder); } } else { $deleteAll = false; $files = $_POST['files']; - $dirlisting = $_POST['dirlisting']; $list = json_decode($files); } + +$folder = rtrim($folder, '/') . '/'; $error = array(); $success = array(); $i = 0; foreach ($list as $file) { - if ( $dirlisting === '0') { + if ($folder === '/') { $file = ltrim($file, '/'); $delimiter = strrpos($file, '.d'); $filename = substr($file, 0, $delimiter); $timestamp = substr($file, $delimiter+2); } else { - $filename = $file; + $filename = $folder . '/' . $file; $timestamp = null; } diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php index 876ad269a70..9c3ccba7ed8 100644 --- a/apps/files_trashbin/ajax/undelete.php +++ b/apps/files_trashbin/ajax/undelete.php @@ -4,15 +4,36 @@ OCP\JSON::checkLoggedIn(); OCP\JSON::callCheck(); $files = $_POST['files']; -$dirlisting = $_POST['dirlisting']; -$list = json_decode($files); +$dir = '/'; +if (isset($_POST['dir'])) { + $dir = rtrim($_POST['dir'], '/'). '/'; +} +$allFiles = false; +if (isset($_POST['allfiles']) and $_POST['allfiles'] === 'true') { + $allFiles = true; + $list = array(); + $dirListing = true; + if ($dir === '' || $dir === '/') { + $dirListing = false; + } + foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir) as $file) { + $fileName = $file['name']; + if (!$dirListing) { + $fileName .= '.d' . $file['timestamp']; + } + $list[] = $fileName; + } +} else { + $list = json_decode($files); +} $error = array(); $success = array(); $i = 0; foreach ($list as $file) { - if ( $dirlisting === '0') { + $path = $dir . '/' . $file; + if ($dir === '/') { $file = ltrim($file, '/'); $delimiter = strrpos($file, '.d'); $filename = substr($file, 0, $delimiter); @@ -23,9 +44,9 @@ foreach ($list as $file) { $timestamp = null; } - if ( !OCA\Files_Trashbin\Trashbin::restore($file, $filename, $timestamp) ) { + if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) { $error[] = $filename; - OC_Log::write('trashbin','can\'t restore ' . $filename, OC_Log::ERROR); + OC_Log::write('trashbin', 'can\'t restore ' . $filename, OC_Log::ERROR); } else { $success[$i]['filename'] = $file; $success[$i]['timestamp'] = $timestamp; diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js index 46d8b56308c..6aade210505 100644 --- a/apps/files_trashbin/js/trash.js +++ b/apps/files_trashbin/js/trash.js @@ -1,5 +1,29 @@ +/* + * Copyright (c) 2014 + * + * This file is licensed under the Affero General Public License version 3 + * or later. + * + * See the COPYING-README file. + * + */ + +/* global OC, t, FileList, FileActions */ $(document).ready(function() { + function removeCallback(result) { + if (result.status !== 'success') { + OC.dialogs.alert(result.data.message, t('core', 'Error')); + } + + var files = result.data.success; + for (var i = 0; i < files.length; i++) { + FileList.findFileEl(OC.basename(files[i].filename)).remove(); + } + FileList.updateFileSummary(); + FileList.updateEmptyContent(); + enableActions(); + } if (typeof FileActions !== 'undefined') { FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) { @@ -7,22 +31,12 @@ $(document).ready(function() { var deleteAction = tr.children("td.date").children(".action.delete"); deleteAction.removeClass('delete-icon').addClass('progress-icon'); disableActions(); - $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), - {files: JSON.stringify([$('#dir').val() + '/' + filename]), dirlisting: tr.attr('data-dirlisting')}, - function(result) { - for (var i = 0; i < result.data.success.length; i++) { - var row = document.getElementById(result.data.success[i].filename); - row.parentNode.removeChild(row); - } - if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); - } - enableActions(); - FileList.updateFileSummary(); - FileList.updateEmptyContent(); - } + $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), { + files: JSON.stringify([filename]), + dir: FileList.getCurrentDirectory() + }, + removeCallback ); - }); }; @@ -34,22 +48,12 @@ $(document).ready(function() { var deleteAction = tr.children("td.date").children(".action.delete"); deleteAction.removeClass('delete-icon').addClass('progress-icon'); disableActions(); - $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), - {files: JSON.stringify([$('#dir').val() + '/' +filename]), dirlisting: tr.attr('data-dirlisting')}, - function(result) { - for (var i = 0; i < result.data.success.length; i++) { - var row = document.getElementById(result.data.success[i].filename); - row.parentNode.removeChild(row); - } - if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); - } - enableActions(); - FileList.updateFileSummary(); - FileList.updateEmptyContent(); - } + $.post(OC.filePath('files_trashbin', 'ajax', 'delete.php'), { + files: JSON.stringify([filename]), + dir: FileList.getCurrentDirectory() + }, + removeCallback ); - }); // Sets the select_all checkbox behaviour : @@ -68,29 +72,45 @@ $(document).ready(function() { $('.undelete').click('click', function(event) { event.preventDefault(); - var files = getSelectedFiles('file'); - var fileslist = JSON.stringify(files); - var dirlisting = getSelectedFiles('dirlisting')[0]; + var allFiles = $('#select_all').is(':checked'); + var files = []; + var params = {}; disableActions(); - for (var i = 0; i < files.length; i++) { - var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete"); - deleteAction.removeClass('delete-icon').addClass('progress-icon'); + if (allFiles) { + FileList.showMask(); + params = { + allfiles: true, + dir: FileList.getCurrentDirectory() + }; + } + else { + files = getSelectedFiles('name'); + for (var i = 0; i < files.length; i++) { + var deleteAction = FileList.findFileEl(files[i]).children("td.date").children(".action.delete"); + deleteAction.removeClass('delete-icon').addClass('progress-icon'); + } + params = { + files: JSON.stringify(files), + dir: FileList.getCurrentDirectory() + }; } $.post(OC.filePath('files_trashbin', 'ajax', 'undelete.php'), - {files: fileslist, dirlisting: dirlisting}, - function(result) { - for (var i = 0; i < result.data.success.length; i++) { - var row = document.getElementById(result.data.success[i].filename); - row.parentNode.removeChild(row); - } + params, + function(result) { + if (allFiles) { if (result.status !== 'success') { OC.dialogs.alert(result.data.message, t('core', 'Error')); } + FileList.hideMask(); + // simply remove all files + FileList.update(''); enableActions(); - FileList.updateFileSummary(); - FileList.updateEmptyContent(); } + else { + removeCallback(result); + } + } ); }); @@ -101,17 +121,17 @@ $(document).ready(function() { var params = {}; if (allFiles) { params = { - allfiles: true, - dir: $('#dir').val() + allfiles: true, + dir: FileList.getCurrentDirectory() }; } else { - files = getSelectedFiles('file'); + files = getSelectedFiles('name'); params = { files: JSON.stringify(files), - dirlisting: getSelectedFiles('dirlisting')[0] + dir: FileList.getCurrentDirectory() }; - }; + } disableActions(); if (allFiles) { @@ -128,22 +148,17 @@ $(document).ready(function() { params, function(result) { if (allFiles) { + if (result.status !== 'success') { + OC.dialogs.alert(result.data.message, t('core', 'Error')); + } FileList.hideMask(); // simply remove all files - $('#fileList').empty(); + FileList.update(''); + enableActions(); } else { - for (var i = 0; i < result.data.success.length; i++) { - var row = document.getElementById(result.data.success[i].filename); - row.parentNode.removeChild(row); - } + removeCallback(result); } - if (result.status !== 'success') { - OC.dialogs.alert(result.data.message, t('core', 'Error')); - } - enableActions(); - FileList.updateFileSummary(); - FileList.updateEmptyContent(); } ); @@ -208,11 +223,9 @@ function getSelectedFiles(property){ var files=[]; elements.each(function(i,element){ var file={ - name:$(element).attr('data-filename'), - file:$('#dir').val() + "/" + $(element).attr('data-file'), + name:$(element).attr('data-file'), timestamp:$(element).attr('data-timestamp'), - type:$(element).attr('data-type'), - dirlisting:$(element).attr('data-dirlisting') + type:$(element).attr('data-type') }; if(property){ files.push(file[property]); diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 9b7d578c990..bc77e9c1543 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -61,6 +61,11 @@ class Trashbin { } + /** + * @param string $owner + * @param integer $timestamp + * @param string $type + */ private static function copyFilesToOwner($sourcePath, $owner, $ownerPath, $timestamp, $type, $mime) { self::setUpTrash($owner); @@ -169,7 +174,7 @@ class Trashbin { * * @param $file_path path to original file * @param $filename of deleted file - * @param $timestamp when the file was deleted + * @param integer $timestamp when the file was deleted * * @return size of stored versions */ @@ -214,7 +219,7 @@ class Trashbin { * * @param $file_path path to original file * @param $filename of deleted file - * @param $timestamp when the file was deleted + * @param integer $timestamp when the file was deleted * * @return size of encryption keys */ @@ -406,7 +411,7 @@ class Trashbin { * @param \OC\Files\View $view file view * @param $file complete path to file * @param $filename name of file once it was deleted - * @param $uniqueFilename new file name to restore the file without overwriting existing files + * @param string $uniqueFilename new file name to restore the file without overwriting existing files * @param $location location if file * @param $timestamp deleteion time * @@ -460,7 +465,7 @@ class Trashbin { * @param \OC\Files\View $view * @param $file complete path to file * @param $filename name of file - * @param $uniqueFilename new file name to restore the file without overwriting existing files + * @param string $uniqueFilename new file name to restore the file without overwriting existing files * @param $location location of file * @param $timestamp deleteion time * @@ -621,6 +626,9 @@ class Trashbin { return $size; } + /** + * @param \OC\Files\View $view + */ private static function deleteVersions($view, $file, $filename, $timestamp) { $size = 0; if (\OCP\App::isEnabled('files_versions')) { @@ -643,6 +651,9 @@ class Trashbin { return $size; } + /** + * @param \OC\Files\View $view + */ private static function deleteEncryptionKeys($view, $file, $filename, $timestamp) { $size = 0; if (\OCP\App::isEnabled('files_encryption')) { @@ -713,7 +724,7 @@ class Trashbin { /** * calculate remaining free space for trash bin * - * @param $trashbinSize current size of the trash bin + * @param integer $trashbinSize current size of the trash bin * @return available free space for trash bin */ private static function calculateFreeSpace($trashbinSize) { @@ -722,7 +733,7 @@ class Trashbin { $quota = \OC_Preferences::getValue($user, 'files', 'quota'); $view = new \OC\Files\View('/' . $user); if ($quota === null || $quota === 'default') { - $quota = \OC_Appconfig::getValue('files', 'default_quota'); + $quota = \OC::$server->getAppConfig()->getValue('files', 'default_quota'); } if ($quota === null || $quota === 'none') { $quota = \OC\Files\Filesystem::free_space('/'); @@ -826,9 +837,9 @@ class Trashbin { /** * recursive copy to copy a whole directory * - * @param $source source path, relative to the users files directory - * @param $destination destination path relative to the users root directoy - * @param $view file view for the users root directory + * @param string $source source path, relative to the users files directory + * @param string $destination destination path relative to the users root directoy + * @param \OC\Files\View $view file view for the users root directory */ private static function copy_recursive($source, $destination, $view) { $size = 0; @@ -887,7 +898,7 @@ class Trashbin { * find unique extension for restored file if a file with the same name already exists * @param $location where the file should be restored * @param $filename name of the file - * @param $view filesystem view relative to users root directory + * @param \OC\Files\View $view filesystem view relative to users root directory * @return string with unique extension */ private static function getUniqueFilename($location, $filename, $view) { @@ -916,8 +927,8 @@ class Trashbin { /** * @brief get the size from a given root folder - * @param $view file view on the root folder - * @return size of the folder + * @param \OC\Files\View $view file view on the root folder + * @return integer size of the folder */ private static function calculateSize($view) { $root = \OCP\Config::getSystemValue('datadirectory') . $view->getAbsolutePath(''); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 328ed4305f4..2bd9c15bae4 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -336,7 +336,7 @@ class Storage { * @brief deletes used space for files versions in db if user was deleted * * @param type $uid id of deleted user - * @return result of db delete operation + * @return \OC_DB_StatementWrapper of db delete operation */ public static function deleteUser($uid) { $query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_versions` WHERE `user`=?'); @@ -372,7 +372,7 @@ class Storage { /** * @brief returns all stored file versions from a given user - * @param $uid id to the user + * @param string $uid id of the user * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename */ private static function getAllVersions($uid) { @@ -420,8 +420,8 @@ class Storage { /** * @brief get list of files we want to expire - * @param int $currentTime timestamp of current time * @param array $versions list of versions + * @param integer $time * @return array containing the list of to deleted versions and the size of them */ protected static function getExpireList($time, $versions) { @@ -487,7 +487,7 @@ class Storage { $softQuota = true; $quota = \OC_Preferences::getValue($uid, 'files', 'quota'); if ( $quota === null || $quota === 'default') { - $quota = \OC_Appconfig::getValue('files', 'default_quota'); + $quota = \OC::$server->getAppConfig()->getValue('files', 'default_quota'); } if ( $quota === null || $quota === 'none' ) { $quota = \OC\Files\Filesystem::free_space('/'); diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php index 25490aa1a04..9f15b86d981 100644 --- a/apps/files_versions/tests/versions.php +++ b/apps/files_versions/tests/versions.php @@ -181,6 +181,9 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase { // extend the original class to make it possible to test protected methods class VersionStorageToTest extends \OCA\Files_Versions\Storage { + /** + * @param integer $time + */ public function callProtectedGetExpireList($time, $versions) { return self::getExpireList($time, $versions); diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index b619f62f296..b7e4023dd73 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -107,8 +107,8 @@ class Access extends LDAPUtility { /** * @brief checks wether the given attribute`s valua is probably a DN - * @param $attr the attribute in question - * @return if so true, otherwise false + * @param string $attr the attribute in question + * @return boolean if so true, otherwise false */ private function resemblesDN($attr) { $resemblingAttributes = array( @@ -164,6 +164,7 @@ class Access extends LDAPUtility { /** * gives back the database table for the query + * @param boolean $isUser */ private function getMapTable($isUser) { if($isUser) { @@ -175,7 +176,7 @@ class Access extends LDAPUtility { /** * @brief returns the LDAP DN for the given internal ownCloud name of the group - * @param $name the ownCloud name in question + * @param string $name the ownCloud name in question * @returns string with the LDAP DN on success, otherwise false * * returns the LDAP DN for the given internal ownCloud name of the group @@ -211,7 +212,7 @@ class Access extends LDAPUtility { /** * @brief returns the LDAP DN for the given internal ownCloud name * @param $name the ownCloud name in question - * @param $isUser is it a user? otherwise group + * @param boolean $isUser is it a user? otherwise group * @returns string with the LDAP DN on success, otherwise false * * returns the LDAP DN for the given internal ownCloud name @@ -417,6 +418,9 @@ class Access extends LDAPUtility { } + /** + * @param boolean $isUsers + */ private function ldap2ownCloudNames($ldapObjects, $isUsers) { if($isUsers) { $nameAttribute = $this->connection->ldapUserDisplayName; @@ -509,7 +513,7 @@ class Access extends LDAPUtility { /** * @brief creates a unique name for internal ownCloud use. * @param $name the display name of the object - * @param $isUser boolean, whether name should be created for a user (true) or a group (false) + * @param boolean $isUser whether name should be created for a user (true) or a group (false) * @returns string with with the name to use in ownCloud or false if unsuccessful */ private function createAltInternalOwnCloudName($name, $isUser) { @@ -545,6 +549,9 @@ class Access extends LDAPUtility { return $this->mappedComponents(true); } + /** + * @param boolean $isUsers + */ private function mappedComponents($isUsers) { $table = $this->getMapTable($isUsers); @@ -601,14 +608,26 @@ class Access extends LDAPUtility { return true; } + /** + * @param integer $limit + * @param integer $offset + */ public function fetchListOfUsers($filter, $attr, $limit = null, $offset = null) { return $this->fetchList($this->searchUsers($filter, $attr, $limit, $offset), (count($attr) > 1)); } + /** + * @param string $filter + * @param integer $limit + * @param integer $offset + */ public function fetchListOfGroups($filter, $attr, $limit = null, $offset = null) { return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), (count($attr) > 1)); } + /** + * @param boolean $manyAttributes + */ private function fetchList($list, $manyAttributes) { if(is_array($list)) { if($manyAttributes) { @@ -626,6 +645,8 @@ class Access extends LDAPUtility { * @brief executes an LDAP search, optimized for Users * @param $filter the LDAP filter for the search * @param $attr optional, when a certain attribute shall be filtered out + * @param integer $limit + * @param integer $offset * @returns array with the search result * * Executes an LDAP search @@ -634,14 +655,19 @@ class Access extends LDAPUtility { return $this->search($filter, $this->connection->ldapBaseUsers, $attr, $limit, $offset); } + /** + * @param string $filter + */ public function countUsers($filter, $attr = array('dn'), $limit = null, $offset = null) { return $this->count($filter, $this->connection->ldapBaseGroups, $attr, $limit, $offset); } /** * @brief executes an LDAP search, optimized for Groups - * @param $filter the LDAP filter for the search + * @param string $filter the LDAP filter for the search * @param $attr optional, when a certain attribute shall be filtered out + * @param integer $limit + * @param integer $offset * @returns array with the search result * * Executes an LDAP search @@ -702,7 +728,7 @@ class Access extends LDAPUtility { * @param $limit maximum results to be counted * @param $offset a starting point * @param $pagedSearchOK whether a paged search has been executed - * @param $skipHandling required for paged search when cookies to + * @param boolean $skipHandling required for paged search when cookies to * prior results need to be gained * @returns array with the search result as first value and pagedSearchOK as * second | false if not successful @@ -736,7 +762,7 @@ class Access extends LDAPUtility { /** * @brief executes an LDAP search, but counts the results only - * @param $filter the LDAP filter for the search + * @param string $filter the LDAP filter for the search * @param $base an array containing the LDAP subtree(s) that shall be searched * @param $attr optional, array, one or more attributes that shall be * retrieved. Results will according to the order in the array. @@ -896,6 +922,17 @@ class Access extends LDAPUtility { } /** + * @brief escapes (user provided) parts for LDAP filter + * @param String $input, the provided value + * @returns the escaped string + */ + public function escapeFilterPart($input) { + $search = array('*', '\\', '(', ')'); + $replace = array('\\*', '\\\\', '\\(', '\\)'); + return str_replace($search, $replace, $input); + } + + /** * @brief combines the input filters with AND * @param $filters array, the filters to connect * @returns the combined filter @@ -920,7 +957,7 @@ class Access extends LDAPUtility { /** * @brief combines the input filters with given operator * @param $filters array, the filters to connect - * @param $operator either & or | + * @param string $operator either & or | * @returns the combined filter * * Combines Filter arguments with AND @@ -985,6 +1022,9 @@ class Access extends LDAPUtility { return $this->combineFilterWithOr($filter); } + /** + * @param string $password + */ public function areCredentialsValid($name, $password) { $name = $this->DNasBaseParameter($name); $testConnection = clone $this->connection; @@ -1173,7 +1213,7 @@ class Access extends LDAPUtility { /** * @brief check wether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. - * @return true on success, null or false otherwise + * @return boolean|null true on success, null or false otherwise */ public function getPagedSearchResultState() { $result = $this->pagedSearchedSuccessful; diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php index 93f044e3152..954d0501fad 100644 --- a/apps/user_ldap/lib/configuration.php +++ b/apps/user_ldap/lib/configuration.php @@ -78,6 +78,9 @@ class Configuration { 'lastJpegPhotoLookup' => null, ); + /** + * @param string $configPrefix + */ public function __construct($configPrefix, $autoread = true) { $this->configPrefix = $configPrefix; if($autoread) { @@ -106,7 +109,7 @@ class Configuration { * @param $config array that holds the config parameters in an associated * array * @param &$applied optional; array where the set fields will be given to - * @return null + * @return false|null */ public function setConfiguration($config, &$applied = null) { if(!is_array($config)) { diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 7fbabda7106..b2075748a3b 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -140,6 +140,9 @@ class Connection extends LDAPUtility { return $prefix.md5($key); } + /** + * @param string $key + */ public function getFromCache($key) { if(!$this->configured) { $this->readConfiguration(); @@ -156,6 +159,9 @@ class Connection extends LDAPUtility { return unserialize(base64_decode($this->cache->get($key))); } + /** + * @param string $key + */ public function isCached($key) { if(!$this->configured) { $this->readConfiguration(); @@ -167,6 +173,9 @@ class Connection extends LDAPUtility { return $this->cache->hasKey($key); } + /** + * @param string $key + */ public function writeToCache($key, $value) { if(!$this->configured) { $this->readConfiguration(); @@ -201,7 +210,7 @@ class Connection extends LDAPUtility { * @brief set LDAP configuration with values delivered by an array, not read from configuration * @param $config array that holds the config parameters in an associated array * @param &$setParameters optional; array where the set fields will be given to - * @return true if config validates, false otherwise. Check with $setParameters for detailed success on single parameters + * @return boolean true if config validates, false otherwise. Check with $setParameters for detailed success on single parameters */ public function setConfiguration($config, &$setParameters = null) { if(is_null($setParameters)) { diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index 9727d847d27..7de7fe8667f 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -118,10 +118,16 @@ class Helper { return false; } + $saveOtherConfigurations = ''; + if(empty($prefix)) { + $saveOtherConfigurations = 'AND `Configkey` NOT LIKE \'s%\''; + } + $query = \OCP\DB::prepare(' DELETE FROM `*PREFIX*appconfig` WHERE `configkey` LIKE ? + '.$saveOtherConfigurations.' AND `appid` = \'user_ldap\' AND `configkey` NOT IN (\'enabled\', \'installed_version\', \'types\', \'bgjUpdateGroupsLastRun\') '); diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ildapwrapper.php index e60cf5ec63f..017d5549690 100644 --- a/apps/user_ldap/lib/ildapwrapper.php +++ b/apps/user_ldap/lib/ildapwrapper.php @@ -29,7 +29,7 @@ interface ILDAPWrapper { /** * @brief Bind to LDAP directory - * @param $link LDAP link resource + * @param resource $link LDAP link resource * @param $dn an RDN to log in with * @param $password the password * @return true on success, false otherwise @@ -50,7 +50,7 @@ interface ILDAPWrapper { * @brief Send LDAP pagination control * @param $link LDAP link resource * @param $pagesize number of results per page - * @param $isCritical Indicates whether the pagination is critical of not. + * @param boolean $isCritical Indicates whether the pagination is critical of not. * @param $cookie structure sent by LDAP server * @return true on success, false otherwise */ @@ -61,7 +61,7 @@ interface ILDAPWrapper { * @param $link LDAP link resource * @param $result LDAP result resource * @param $cookie structure sent by LDAP server - * @return true on success, false otherwise + * @return boolean on success, false otherwise * * Corresponds to ldap_control_paged_result_response */ @@ -124,7 +124,7 @@ interface ILDAPWrapper { /** * @brief Return next result id * @param $link LDAP link resource - * @param $result LDAP entry result resource + * @param resource $result LDAP entry result resource * @return an LDAP search result resource * */ public function nextEntry($link, $result); @@ -155,7 +155,7 @@ interface ILDAPWrapper { * @brief Sets the value of the specified option to be $value * @param $link LDAP link resource * @param $option a defined LDAP Server option - * @param $value the new value for the option + * @param integer $value the new value for the option * @return true on success, false otherwise */ public function setOption($link, $option, $value); @@ -177,7 +177,7 @@ interface ILDAPWrapper { /** * @brief Unbind from LDAP directory - * @param $link LDAP link resource + * @param resource $link LDAP link resource * @return true on success, false otherwise */ public function unbind($link); @@ -186,20 +186,20 @@ interface ILDAPWrapper { /** * @brief Checks whether the server supports LDAP - * @return true if it the case, false otherwise + * @return boolean if it the case, false otherwise * */ public function areLDAPFunctionsAvailable(); /** * @brief Checks whether PHP supports LDAP Paged Results - * @return true if it the case, false otherwise + * @return boolean if it the case, false otherwise * */ public function hasPagedResultSupport(); /** * @brief Checks whether the submitted parameter is a resource * @param $resource the resource variable to check - * @return true if it is a resource, false otherwise + * @return boolean if it is a resource, false otherwise */ public function isResource($resource); diff --git a/apps/user_ldap/lib/ldap.php b/apps/user_ldap/lib/ldap.php index a99c6480121..de9b7481c19 100644 --- a/apps/user_ldap/lib/ldap.php +++ b/apps/user_ldap/lib/ldap.php @@ -108,7 +108,7 @@ class LDAP implements ILDAPWrapper { /** * @brief Checks whether the server supports LDAP - * @return true if it the case, false otherwise + * @return boolean if it the case, false otherwise * */ public function areLDAPFunctionsAvailable() { return function_exists('ldap_connect'); @@ -116,7 +116,7 @@ class LDAP implements ILDAPWrapper { /** * @brief Checks whether PHP supports LDAP Paged Results - * @return true if it the case, false otherwise + * @return boolean if it the case, false otherwise * */ public function hasPagedResultSupport() { $hasSupport = function_exists('ldap_control_paged_result') @@ -127,7 +127,7 @@ class LDAP implements ILDAPWrapper { /** * @brief Checks whether the submitted parameter is a resource * @param $resource the resource variable to check - * @return true if it is a resource, false otherwise + * @return boolean if it is a resource, false otherwise */ public function isResource($resource) { return is_resource($resource); @@ -144,6 +144,9 @@ class LDAP implements ILDAPWrapper { } } + /** + * @param string $functionName + */ private function preFunctionCall($functionName, $args) { $this->curFunc = $functionName; $this->curArgs = $args; diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php index 30e1875901c..b27233bcd19 100644 --- a/apps/user_ldap/lib/proxy.php +++ b/apps/user_ldap/lib/proxy.php @@ -54,13 +54,21 @@ abstract class Proxy { return 'group-'.$gid.'-lastSeenOn'; } + /** + * @param boolean $passOnWhen + * @param string $method + */ abstract protected function callOnLastSeenOn($id, $method, $parameters, $passOnWhen); + + /** + * @param string $method + */ abstract protected function walkBackends($id, $method, $parameters); /** * @brief Takes care of the request to the User backend * @param $uid string, the uid connected to the request - * @param $method string, the method of the user backend that shall be called + * @param string $method string, the method of the user backend that shall be called * @param $parameters an array of parameters to be passed * @return mixed, the result of the specified method */ @@ -80,6 +88,9 @@ abstract class Proxy { return $prefix.md5($key); } + /** + * @param string $key + */ public function getFromCache($key) { if(!$this->isCached($key)) { return null; @@ -89,11 +100,17 @@ abstract class Proxy { return unserialize(base64_decode($this->cache->get($key))); } + /** + * @param string $key + */ public function isCached($key) { $key = $this->getCacheKey($key); return $this->cache->hasKey($key); } + /** + * @param string $key + */ public function writeToCache($key, $value) { $key = $this->getCacheKey($key); $value = base64_encode(serialize($value)); diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 00623b74fb1..e79090febc1 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -176,7 +176,7 @@ class Wizard extends LDAPUtility { /** * @brief return the state of the mode of the specified filter - * @param $confkey string, contains the access key of the Configuration + * @param string $confkey string, contains the access key of the Configuration */ private function getFilterMode($confkey) { $mode = $this->configuration->$confkey; @@ -240,6 +240,8 @@ class Wizard extends LDAPUtility { /** * @brief detects the available LDAP groups + * @param string $dbkey + * @param string $confkey * @returns the instance's WizardResult instance */ private function determineGroups($dbkey, $confkey, $testMemberOf = true) { @@ -554,7 +556,7 @@ class Wizard extends LDAPUtility { /** * @brief Checks whether for a given BaseDN results will be returned - * @param $base the BaseDN to test + * @param string $base the BaseDN to test * @return bool true on success, false otherwise */ private function testBaseDN($base) { @@ -619,7 +621,7 @@ class Wizard extends LDAPUtility { /** * @brief creates an LDAP Filter from given configuration - * @param $filterType int, for which use case the filter shall be created + * @param integer $filterType int, for which use case the filter shall be created * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or * self::LFILTER_GROUP_LIST * @return mixed, string with the filter on success, false otherwise @@ -846,6 +848,9 @@ class Wizard extends LDAPUtility { || (empty($agent) && empty($pwd))); } + /** + * @param string[] $reqs + */ private function checkRequirements($reqs) { $this->checkAgentRequirements(); foreach($reqs as $option) { @@ -860,11 +865,11 @@ class Wizard extends LDAPUtility { /** * @brief does a cumulativeSearch on LDAP to get different values of a * specified attribute - * @param $filters array, the filters that shall be used in the search - * @param $attr the attribute of which a list of values shall be returned + * @param string[] $filters array, the filters that shall be used in the search + * @param string $attr the attribute of which a list of values shall be returned * @param $lfw bool, whether the last filter is a wildcard which shall not * be processed if there were already findings, defaults to true - * @param $maxF string. if not null, this variable will have the filter that + * @param string $maxF string. if not null, this variable will have the filter that * yields most result entries * @return mixed, an array with the values on success, false otherwise * @@ -926,10 +931,10 @@ class Wizard extends LDAPUtility { /** * @brief determines if and which $attr are available on the LDAP server - * @param $objectclasses the objectclasses to use as search filter - * @param $attr the attribute to look for - * @param $dbkey the dbkey of the setting the feature is connected to - * @param $confkey the confkey counterpart for the $dbkey as used in the + * @param string[] $objectclasses the objectclasses to use as search filter + * @param string $attr the attribute to look for + * @param string $dbkey the dbkey of the setting the feature is connected to + * @param string $confkey the confkey counterpart for the $dbkey as used in the * Configuration class * @param $po boolean, whether the objectClass with most result entries * shall be pre-selected via the result diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php new file mode 100644 index 00000000000..9beb2b97336 --- /dev/null +++ b/apps/user_ldap/tests/access.php @@ -0,0 +1,71 @@ +<?php +/** +* ownCloud +* +* @author Arthur Schiwon +* @copyright 2013 Arthur Schiwon blizzz@owncloud.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +namespace OCA\user_ldap\tests; + +use \OCA\user_ldap\lib\Access; +use \OCA\user_ldap\lib\Connection; +use \OCA\user_ldap\lib\ILDAPWrapper; + +class Test_Access extends \PHPUnit_Framework_TestCase { + private function getConnecterAndLdapMock() { + static $conMethods; + static $accMethods; + + if(is_null($conMethods) || is_null($accMethods)) { + $conMethods = get_class_methods('\OCA\user_ldap\lib\Connection'); + $accMethods = get_class_methods('\OCA\user_ldap\lib\Access'); + } + $lw = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper'); + $connector = $this->getMock('\OCA\user_ldap\lib\Connection', + $conMethods, + array($lw, null, null)); + + return array($lw, $connector); + } + + public function testEscapeFilterPartValidChars() { + list($lw, $con) = $this->getConnecterAndLdapMock(); + $access = new Access($con, $lw); + + $input = 'okay'; + $this->assertTrue($input === $access->escapeFilterPart($input)); + } + + public function testEscapeFilterPartEscapeWildcard() { + list($lw, $con) = $this->getConnecterAndLdapMock(); + $access = new Access($con, $lw); + + $input = '*'; + $expected = '\\\\*'; + $this->assertTrue($expected === $access->escapeFilterPart($input)); + } + + public function testEscapeFilterPartEscapeWildcard2() { + list($lw, $con) = $this->getConnecterAndLdapMock(); + $access = new Access($con, $lw); + + $input = 'foo*bar'; + $expected = 'foo\\\\*bar'; + $this->assertTrue($expected === $access->escapeFilterPart($input)); + } +}
\ No newline at end of file diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php index 9193a005ae5..8c8d85b3c33 100644 --- a/apps/user_ldap/tests/user_ldap.php +++ b/apps/user_ldap/tests/user_ldap.php @@ -83,6 +83,12 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { * @return void */ private function prepareAccessForCheckPassword(&$access) { + $access->expects($this->once()) + ->method('escapeFilterPart') + ->will($this->returnCallback(function($uid) { + return $uid; + })); + $access->connection->expects($this->any()) ->method('__get') ->will($this->returnCallback(function($name) { @@ -116,17 +122,34 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { })); } - public function testCheckPassword() { + public function testCheckPasswordUidReturn() { $access = $this->getAccessMock(); + $this->prepareAccessForCheckPassword($access); $backend = new UserLDAP($access); \OC_User::useBackend($backend); $result = $backend->checkPassword('roland', 'dt19'); $this->assertEquals('gunslinger', $result); + } + + public function testCheckPasswordWrongPassword() { + $access = $this->getAccessMock(); + + $this->prepareAccessForCheckPassword($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = $backend->checkPassword('roland', 'wrong'); $this->assertFalse($result); + } + + public function testCheckPasswordWrongUser() { + $access = $this->getAccessMock(); + + $this->prepareAccessForCheckPassword($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = $backend->checkPassword('mallory', 'evil'); $this->assertFalse($result); @@ -140,9 +163,23 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { $result = \OCP\User::checkPassword('roland', 'dt19'); $this->assertEquals('gunslinger', $result); + } + + public function testCheckPasswordPublicAPIWrongPassword() { + $access = $this->getAccessMock(); + $this->prepareAccessForCheckPassword($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = \OCP\User::checkPassword('roland', 'wrong'); $this->assertFalse($result); + } + + public function testCheckPasswordPublicAPIWrongUser() { + $access = $this->getAccessMock(); + $this->prepareAccessForCheckPassword($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = \OCP\User::checkPassword('mallory', 'evil'); $this->assertFalse($result); @@ -154,6 +191,12 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { * @return void */ private function prepareAccessForGetUsers(&$access) { + $access->expects($this->once()) + ->method('escapeFilterPart') + ->will($this->returnCallback(function($search) { + return $search; + })); + $access->expects($this->any()) ->method('getFilterPartForUserSearch') ->will($this->returnCallback(function($search) { @@ -191,28 +234,52 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { ->will($this->returnArgument(0)); } - public function testGetUsers() { + public function testGetUsersNoParam() { $access = $this->getAccessMock(); $this->prepareAccessForGetUsers($access); $backend = new UserLDAP($access); $result = $backend->getUsers(); $this->assertEquals(3, count($result)); + } + + public function testGetUsersLimitOffset() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); $result = $backend->getUsers('', 1, 2); $this->assertEquals(1, count($result)); + } + + public function testGetUsersLimitOffset2() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); $result = $backend->getUsers('', 2, 1); $this->assertEquals(2, count($result)); + } + + public function testGetUsersSearchWithResult() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); $result = $backend->getUsers('yo'); $this->assertEquals(2, count($result)); + } + + public function testGetUsersSearchEmptyResult() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); $result = $backend->getUsers('nix'); $this->assertEquals(0, count($result)); } - public function testGetUsersViaAPI() { + public function testGetUsersViaAPINoParam() { $access = $this->getAccessMock(); $this->prepareAccessForGetUsers($access); $backend = new UserLDAP($access); @@ -220,15 +287,43 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase { $result = \OCP\User::getUsers(); $this->assertEquals(3, count($result)); + } + + public function testGetUsersViaAPILimitOffset() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = \OCP\User::getUsers('', 1, 2); $this->assertEquals(1, count($result)); + } + + public function testGetUsersViaAPILimitOffset2() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = \OCP\User::getUsers('', 2, 1); $this->assertEquals(2, count($result)); + } + + public function testGetUsersViaAPISearchWithResult() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = \OCP\User::getUsers('yo'); $this->assertEquals(2, count($result)); + } + + public function testGetUsersViaAPISearchEmptyResult() { + $access = $this->getAccessMock(); + $this->prepareAccessForGetUsers($access); + $backend = new UserLDAP($access); + \OC_User::useBackend($backend); $result = \OCP\User::getUsers('nix'); $this->assertEquals(0, count($result)); diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php index 619a992bd12..757de6b60f4 100644 --- a/apps/user_ldap/user_ldap.php +++ b/apps/user_ldap/user_ldap.php @@ -25,7 +25,6 @@ namespace OCA\user_ldap; -use OCA\user_ldap\lib\ILDAPWrapper; use OCA\user_ldap\lib\BackendUtility; class USER_LDAP extends BackendUtility implements \OCP\UserInterface { @@ -139,7 +138,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface { * @brief reads the image from LDAP that shall be used as Avatar * @param $uid string, the ownCloud user name * @param $dn string, the user DN - * @return image data (provided by LDAP) | false + * @return string data (provided by LDAP) | false */ private function getAvatarImage($uid, $dn) { $attributes = array('jpegPhoto', 'thumbnailPhoto'); @@ -157,13 +156,15 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface { /** * @brief Check if the password is correct - * @param $uid The username - * @param $password The password - * @returns true/false + * @param string $uid The username + * @param string $password The password + * @return boolean * * Check if the password is correct without logging in the user */ public function checkPassword($uid, $password) { + $uid = $this->access->escapeFilterPart($uid); + //find out dn of the user name $filter = \OCP\Util::mb_str_replace( '%uid', $uid, $this->access->connection->ldapLoginFilter, 'UTF-8'); @@ -204,6 +205,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface { * Get a list of all users. */ public function getUsers($search = '', $limit = 10, $offset = 0) { + $search = $this->access->escapeFilterPart($search); $cachekey = 'getUsers-'.$search.'-'.$limit.'-'.$offset; //check if users are cached, if so return diff --git a/config/config.sample.php b/config/config.sample.php index ed37c60adf0..9c5eca8a5ec 100755 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -266,4 +266,10 @@ $CONFIG = array( /* whether usage of the instance should be restricted to admin users only */ 'singleuser' => false, + +/* all css and js files will be served by the web server statically in one js file and ons css file*/ +'asset-pipeline.enabled' => false, + + /* where mount.json file should be stored, defaults to data/mount.json */ + 'mount_file' => '', ); diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php index 4f26dedc797..05b7572c6d7 100644 --- a/core/ajax/appconfig.php +++ b/core/ajax/appconfig.php @@ -9,28 +9,43 @@ OC_Util::checkAdminUser(); OCP\JSON::callCheck(); $action=isset($_POST['action'])?$_POST['action']:$_GET['action']; + +if(isset($_POST['app']) || isset($_GET['app'])) { + $app=OC_App::cleanAppId(isset($_POST['app'])?$_POST['app']:$_GET['app']); +} + +// An admin should not be able to add remote and public services +// on its own. This should only be possible programmatically. +// This change is due the fact that an admin may not be expected +// to execute arbitrary code in every environment. +if($app === 'core' && isset($_POST['key']) &&(substr($_POST['key'],0,7) === 'remote_' || substr($_POST['key'],0,7) === 'public_')) { + OC_JSON::error(array('data' => array('message' => 'Unexpected error!'))); + return; +} + $result=false; switch($action) { case 'getValue': - $result=OC_Appconfig::getValue($_GET['app'], $_GET['key'], $_GET['defaultValue']); + $result=OC_Appconfig::getValue($app, $_GET['key'], $_GET['defaultValue']); break; case 'setValue': - $result=OC_Appconfig::setValue($_POST['app'], $_POST['key'], $_POST['value']); + $result=OC_Appconfig::setValue($app, $_POST['key'], $_POST['value']); break; case 'getApps': $result=OC_Appconfig::getApps(); break; case 'getKeys': - $result=OC_Appconfig::getKeys($_GET['app']); + $result=OC_Appconfig::getKeys($app); break; case 'hasKey': - $result=OC_Appconfig::hasKey($_GET['app'], $_GET['key']); + $result=OC_Appconfig::hasKey($app, $_GET['key']); break; case 'deleteKey': - $result=OC_Appconfig::deleteKey($_POST['app'], $_POST['key']); + $result=OC_Appconfig::deleteKey($app, $_POST['key']); break; case 'deleteApp': - $result=OC_Appconfig::deleteApp($_POST['app']); + $result=OC_Appconfig::deleteApp($app); break; } OC_JSON::success(array('data'=>$result)); + diff --git a/core/ajax/share.php b/core/ajax/share.php index c251f8e7bae..86ee018e388 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -85,93 +85,32 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo } break; case 'informRecipients': - $l = OC_L10N::get('core'); - $shareType = (int) $_POST['shareType']; $itemType = $_POST['itemType']; $itemSource = $_POST['itemSource']; $recipient = $_POST['recipient']; - $ownerDisplayName = \OCP\User::getDisplayName(); - $from = \OCP\Util::getDefaultEmailAddress('sharing-noreply'); - - $noMail = array(); - $recipientList = array(); if($shareType === \OCP\Share::SHARE_TYPE_USER) { $recipientList[] = $recipient; } elseif ($shareType === \OCP\Share::SHARE_TYPE_GROUP) { $recipientList = \OC_Group::usersInGroup($recipient); } - // don't send a mail to the user who shared the file $recipientList = array_diff($recipientList, array(\OCP\User::getUser())); - // send mail to all recipients with an email address - foreach ($recipientList as $recipient) { - //get correct target folder name - $email = OC_Preferences::getValue($recipient, 'settings', 'email', ''); - - if ($email !== '') { - $displayName = \OCP\User::getDisplayName($recipient); - $items = \OCP\Share::getItemSharedWithUser($itemType, $itemSource, $recipient); - $filename = trim($items[0]['file_target'], '/'); - $subject = (string)$l->t('%s shared »%s« with you', array($ownerDisplayName, $filename)); - $expiration = null; - if (isset($items[0]['expiration'])) { - try { - $date = new DateTime($items[0]['expiration']); - $expiration = $l->l('date', $date->getTimestamp()); - } catch (Exception $e) { - \OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR); - } - } - - if ($itemType === 'folder') { - $foldername = "/Shared/" . $filename; - } else { - // if it is a file we can just link to the Shared folder, - // that's the place where the user will find the file - $foldername = "/Shared"; - } - - $link = \OCP\Util::linkToAbsolute('files', 'index.php', array("dir" => $foldername)); - - $content = new OC_Template("core", "mail", ""); - $content->assign('link', $link); - $content->assign('user_displayname', $ownerDisplayName); - $content->assign('filename', $filename); - $content->assign('expiration', $expiration); - $text = $content->fetchPage(); - - $content = new OC_Template("core", "altmail", ""); - $content->assign('link', $link); - $content->assign('user_displayname', $ownerDisplayName); - $content->assign('filename', $filename); - $content->assign('expiration', $expiration); - $alttext = $content->fetchPage(); - - $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply'); - $from = OCP\Config::getUserValue(\OCP\User::getUser(), 'settings', 'email', $default_from); - - // send it out now - try { - OCP\Util::sendMail($email, $displayName, $subject, $text, $from, $ownerDisplayName, 1, $alttext); - } catch (Exception $exception) { - $noMail[] = \OCP\User::getDisplayName($recipient); - } - } - } + $mailNotification = new OC\Share\MailNotifications(); + $result = $mailNotification->sendInternalShareMail($recipientList, $itemSource, $itemType); \OCP\Share::setSendMailStatus($itemType, $itemSource, $shareType, true); - if (empty($noMail)) { + if (empty($result)) { OCP\JSON::success(); } else { OCP\JSON::error(array( 'data' => array( 'message' => $l->t("Couldn't send mail to following users: %s ", - implode(', ', $noMail) + implode(', ', $result) ) ) )); @@ -187,56 +126,31 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo break; case 'email': - // enable l10n support - $l = OC_L10N::get('core'); // read post variables - $user = OCP\USER::getUser(); - $displayName = OCP\User::getDisplayName(); - $type = $_POST['itemType']; $link = $_POST['link']; $file = $_POST['file']; $to_address = $_POST['toaddress']; + $mailNotification = new \OC\Share\MailNotifications(); + $expiration = null; if (isset($_POST['expiration']) && $_POST['expiration'] !== '') { try { $date = new DateTime($_POST['expiration']); - $expiration = $l->l('date', $date->getTimestamp()); + $expiration = $date->getTimestamp(); } catch (Exception $e) { \OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR); } } - // setup the email - $subject = (string)$l->t('%s shared »%s« with you', array($displayName, $file)); - - $content = new OC_Template("core", "mail", ""); - $content->assign ('link', $link); - $content->assign ('type', $type); - $content->assign ('user_displayname', $displayName); - $content->assign ('filename', $file); - $content->assign('expiration', $expiration); - $text = $content->fetchPage(); - - $content = new OC_Template("core", "altmail", ""); - $content->assign ('link', $link); - $content->assign ('type', $type); - $content->assign ('user_displayname', $displayName); - $content->assign ('filename', $file); - $content->assign('expiration', $expiration); - $alttext = $content->fetchPage(); - - $default_from = OCP\Util::getDefaultEmailAddress('sharing-noreply'); - $from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from ); - - // send it out now - try { - OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $displayName, 1, $alttext); - OCP\JSON::success(); - } catch (Exception $exception) { - OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage())))); + $result = $mailNotification->sendLinkShareMail($to_address, $file, $link, $expiration); + if($result === true) { + \OCP\JSON::success(); + } else { + \OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($result)))); } + break; } } else if (isset($_GET['fetch'])) { diff --git a/core/command/db/generatechangescript.php b/core/command/db/generatechangescript.php index f971124cfdc..a4d710aa974 100644 --- a/core/command/db/generatechangescript.php +++ b/core/command/db/generatechangescript.php @@ -11,7 +11,6 @@ namespace OC\Core\Command\Db; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class GenerateChangeScript extends Command { diff --git a/core/command/status.php b/core/command/status.php index ea9825b0f61..6bc1dba44aa 100644 --- a/core/command/status.php +++ b/core/command/status.php @@ -9,9 +9,7 @@ namespace OC\Core\Command; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Status extends Command { diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 1d105b67a06..128d27aa3db 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -10,9 +10,7 @@ namespace OC\Core\Command; use OC\Updater; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class Upgrade extends Command { diff --git a/core/command/user/report.php b/core/command/user/report.php index f95ba251bcc..70c5a8566b7 100644 --- a/core/command/user/report.php +++ b/core/command/user/report.php @@ -9,10 +9,8 @@ namespace OC\Core\Command\User; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Helper\TableHelper; class Report extends Command { protected function configure() { diff --git a/core/css/fixes.css b/core/css/fixes.css index 4ee854addef..a33afd5cf77 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -54,11 +54,6 @@ background-color: #1B314D; } -/* in IE9 the nav bar on the left side is too narrow and leave a white area - original width is 80px */ -.ie9 #navigation { - width: 100px; -} - /* IE8 isn't able to display transparent background. So it is specified using a gradient */ .ie8 #nojavascript { filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); /* IE */ diff --git a/core/css/icons.css b/core/css/icons.css index 2dc35084122..814749c5af8 100644 --- a/core/css/icons.css +++ b/core/css/icons.css @@ -226,6 +226,12 @@ .icon-folder { background-image: url('../img/places/folder.svg'); } +.icon-filetype-text { + background-image: url('../img/filetypes/text.svg'); +} +.icon-filetype-folder { + background-image: url('../img/filetypes/folder.svg'); +} .icon-home { background-image: url('../img/places/home.svg'); diff --git a/core/css/mobile.css b/core/css/mobile.css new file mode 100644 index 00000000000..a63aa902d34 --- /dev/null +++ b/core/css/mobile.css @@ -0,0 +1,22 @@ +@media only screen and (max-width: 600px) { + +/* compress search box on mobile, expand when focused */ +.searchbox input[type="search"] { + width: 15%; + -webkit-transition: width 100ms; + -moz-transition: width 100ms; + -o-transition: width 100ms; + transition: width 100ms; +} +.searchbox input[type="search"]:focus, +.searchbox input[type="search"]:active { + width: 155px; +} + +/* do not show display name on mobile when profile picture is present */ +#header .avatardiv.avatardiv-shown + #expandDisplayName { + display: none; +} + + +} diff --git a/core/css/multiselect.css b/core/css/multiselect.css index 60f2f47e698..8d949e7cdb7 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -48,7 +48,7 @@ ul.multiselectoptions > li input[type='checkbox']:checked+label { font-weight: bold; } -div.multiselect { +div.multiselect, select.multiselect { display: inline-block; max-width: 400px; min-width: 150px; @@ -58,6 +58,12 @@ div.multiselect { vertical-align: bottom; } +/* To make a select look like a multiselect until it's initialized */ +select.multiselect { + height: 30px; + min-width: 113px; +} + div.multiselect.active { background-color: #fff; position: relative; diff --git a/core/css/styles.css b/core/css/styles.css index bee44785f12..341a507ce37 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -37,11 +37,12 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari .header-right { float:right; vertical-align:middle; padding:0.5em; } .header-right > * { vertical-align:middle; } +/* Profile picture in header */ #header .avatardiv { float: left; display: inline-block; + margin-right: 5px; } - #header .avatardiv img { opacity: 1; } @@ -74,6 +75,19 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari color: #aaa; } +#header .logo { + background-image: url(../img/logo.svg); + width: 250px; + height: 118px; + margin: 0 auto; +} + +#header .logo-wide { + background-image: url(../img/logo-wide.svg); + width: 147px; + height: 32px; +} + /* INPUTS */ input[type="text"], input[type="password"], @@ -205,17 +219,19 @@ textarea:disabled { color: #bbb; } - +/* Searchbox */ .searchbox input[type="search"] { + position: relative; font-size: 1.2em; - padding: .2em .5em .2em 1.5em; + padding-left: 1.5em; background: #fff url('../img/actions/search.svg') no-repeat .5em center; border: 0; - border-radius: 1em; + border-radius: 2em; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity: .7; - margin-top: 10px; + margin-top: 6px; float: right; } + input[type="submit"].enabled { background: #66f866; border: 1px solid #5e5; @@ -706,12 +722,11 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } /* USER MENU */ #settings { float: right; - margin-top: 7px; - margin-left: 10px; color: #bbb; } #expand { - padding: 15px 15px 15px 5px; + display: block; + padding: 7px 12px 6px 7px; cursor: pointer; font-weight: bold; } @@ -933,3 +948,20 @@ div.crumb:active { opacity:.7; } +.appear { + opacity: 1; + transition: opacity 500ms ease 0s; + -moz-transition: opacity 500ms ease 0s; + -ms-transition: opacity 500ms ease 0s; + -o-transition: opacity 500ms ease 0s; + -webkit-transition: opacity 500ms ease 0s; +} +.appear.transparent { + opacity: 0; +} + +/* for IE10 */ +@-ms-viewport { + width: device-width; +} + diff --git a/core/img/actions/add.png b/core/img/actions/add.png Binary files differindex 1aac02b8454..3c051e4d73e 100644 --- a/core/img/actions/add.png +++ b/core/img/actions/add.png diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png Binary files differindex f84e87e0a82..215af33ea4b 100644 --- a/core/img/actions/caret-dark.png +++ b/core/img/actions/caret-dark.png diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg index 3a5318e6fa2..2d75e4dd8c1 100644 --- a/core/img/actions/caret-dark.svg +++ b/core/img/actions/caret-dark.svg @@ -1,13 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" d="m4,5,4,7,4-6.989z" fill-opacity="0.19607843" fill="#FFF"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" fill="#000" d="m4,4,4,7,4-6.989z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" fill="#FFF" d="m4 5 4 7 4-6.989z" fill-opacity=".19608"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4 4 4 7 4-6.989z"/> </svg> diff --git a/core/img/actions/caret.png b/core/img/actions/caret.png Binary files differindex 00baea9ece6..7066b767a28 100644 --- a/core/img/actions/caret.png +++ b/core/img/actions/caret.png diff --git a/core/img/actions/caret.svg b/core/img/actions/caret.svg index d1ae8d60a6f..8cd758daf84 100644 --- a/core/img/actions/caret.svg +++ b/core/img/actions/caret.svg @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="a" y2="8.0832" gradientUnits="userSpaceOnUse" x2="8.4965" gradientTransform="matrix(1.0526 0 0 .98436 -3.4211 1.0602)" y1="-.061574" x1="8.4965"> + <linearGradient id="a" x1="8.4965" gradientUnits="userSpaceOnUse" y1="-.061574" gradientTransform="matrix(1.0526 0 0 .98436 -3.4211 1.0602)" x2="8.4965" y2="8.0832"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#e6e6e6" offset="1"/> </linearGradient> </defs> - <path opacity=".5" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 2 4 8 4-7.989z"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m1 1 4 8 4-7.989z" fill="url(#a)"/> + <path opacity=".5" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m1 2 4 8 4-7.989z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m1 1 4 8 4-7.989z" fill="url(#a)"/> </svg> diff --git a/core/img/actions/checkmark-white.png b/core/img/actions/checkmark-white.png Binary files differindex 08b8783649f..27f17204b1d 100644 --- a/core/img/actions/checkmark-white.png +++ b/core/img/actions/checkmark-white.png diff --git a/core/img/actions/checkmark-white.svg b/core/img/actions/checkmark-white.svg index 5e8fe8abccc..e6b63a4d599 100644 --- a/core/img/actions/checkmark-white.svg +++ b/core/img/actions/checkmark-white.svg @@ -1,4 +1,4 @@ -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="16px" viewBox="-0.5 -0.5 16 16" width="16px" enable-background="new -0.5 -0.5 16 16" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" overflow="visible"><metadata><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/></cc:Work></rdf:RDF></metadata><defs> -</defs> -<path fill="#ffffff" d="M12.438,3.6875c-0.363,0-0.726,0.1314-1,0.4063l-4.5005,4.5-1.9687-2c-0.5498-0.5484-1.4489-0.5498-2,0l-0.5,0.5c-0.5512,0.5496-0.5512,1.4502,0,2l2.9687,2.9682c0.0063,0.007-0.0065,0.025,0,0.032l0.5,0.5c0.5497,0.55,1.4503,0.55,2,0l0.5-0.5,0.1875-0.219,5.313-5.2812c0.549-0.5498,0.549-1.4503,0-2l-0.5-0.5c-0.275-0.2749-0.638-0.4063-1-0.4063z" transform="translate(-0.5,-0.5)"/> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" overflow="visible" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" enable-background="new -0.5 -0.5 16 16" viewBox="-0.5 -0.5 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<path transform="translate(-.5 -.5)" d="m12.438 3.6875c-0.363 0-0.726 0.1314-1 0.4063l-4.5005 4.5-1.9687-2c-0.5498-0.5484-1.4489-0.5498-2 0l-0.5 0.5c-0.5512 0.5496-0.5512 1.4502 0 2l2.9687 2.9682c0.0063 0.007-0.0065 0.025 0 0.032l0.5 0.5c0.5497 0.55 1.4503 0.55 2 0l0.5-0.5 0.1875-0.219 5.313-5.2812c0.549-0.5498 0.549-1.4503 0-2l-0.5-0.5c-0.275-0.2749-0.638-0.4063-1-0.4063z" fill="#fff"/> </svg> diff --git a/core/img/actions/checkmark.png b/core/img/actions/checkmark.png Binary files differindex 99a4019c69e..8b4c8ddc706 100644 --- a/core/img/actions/checkmark.png +++ b/core/img/actions/checkmark.png diff --git a/core/img/actions/checkmark.svg b/core/img/actions/checkmark.svg index f70a407c2ed..dbb97d1b469 100644 --- a/core/img/actions/checkmark.svg +++ b/core/img/actions/checkmark.svg @@ -1,4 +1,4 @@ -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="16px" viewBox="-0.5 -0.5 16 16" width="16px" enable-background="new -0.5 -0.5 16 16" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" overflow="visible"><metadata><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/></cc:Work></rdf:RDF></metadata><defs> -</defs> -<path fill="#000" d="M12.438,3.6875c-0.363,0-0.726,0.1314-1,0.4063l-4.5005,4.5-1.9687-2c-0.5498-0.5484-1.4489-0.5498-2,0l-0.5,0.5c-0.5512,0.5496-0.5512,1.4502,0,2l2.9687,2.9682c0.0063,0.007-0.0065,0.025,0,0.032l0.5,0.5c0.5497,0.55,1.4503,0.55,2,0l0.5-0.5,0.1875-0.219,5.313-5.2812c0.549-0.5498,0.549-1.4503,0-2l-0.5-0.5c-0.275-0.2749-0.638-0.4063-1-0.4063z" transform="translate(-0.5,-0.5)"/> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" overflow="visible" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" enable-background="new -0.5 -0.5 16 16" viewBox="-0.5 -0.5 16 16" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<path transform="translate(-.5 -.5)" d="m12.438 3.6875c-0.363 0-0.726 0.1314-1 0.4063l-4.5005 4.5-1.9687-2c-0.5498-0.5484-1.4489-0.5498-2 0l-0.5 0.5c-0.5512 0.5496-0.5512 1.4502 0 2l2.9687 2.9682c0.0063 0.007-0.0065 0.025 0 0.032l0.5 0.5c0.5497 0.55 1.4503 0.55 2 0l0.5-0.5 0.1875-0.219 5.313-5.2812c0.549-0.5498 0.549-1.4503 0-2l-0.5-0.5c-0.275-0.2749-0.638-0.4063-1-0.4063z"/> </svg> diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png Binary files differindex 9c3a284b8ba..5023cf4c3f6 100644 --- a/core/img/actions/clock.png +++ b/core/img/actions/clock.png diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg index f3fcb19031a..6b938deea82 100644 --- a/core/img/actions/clock.svg +++ b/core/img/actions/clock.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" viewBox="0 0 100 100" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink"> +<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100"> <path d="m50 89.836c-23.389 0-42.418-19.027-42.418-42.417s19.029-42.419 42.418-42.419 42.418 19.029 42.418 42.419-19.029 42.417-42.418 42.417zm0-79.924c-20.681 0-37.506 16.826-37.506 37.508 0 20.681 16.826 37.505 37.506 37.505s37.507-16.824 37.507-37.505c0-20.683-16.826-37.508-37.507-37.508z"/> <path d="m50.001 49.875c-0.141 0-0.283-0.011-0.427-0.037-1.173-0.206-2.03-1.226-2.03-2.419v-17.977c0-1.355 1.1-2.456 2.456-2.456 1.355 0 2.456 1.1 2.456 2.456v4.003l5.431-14.974c0.464-1.274 1.872-1.937 3.146-1.471 1.274 0.462 1.934 1.871 1.471 3.146l-10.195 28.11c-0.357 0.985-1.29 1.619-2.308 1.619z"/> <circle cy="12.956" cx="49.999" r="1.617"/> diff --git a/core/img/actions/close.png b/core/img/actions/close.png Binary files differindex 0d8c89a56e2..3389c66e03b 100644 --- a/core/img/actions/close.png +++ b/core/img/actions/close.png diff --git a/core/img/actions/delete-hover.png b/core/img/actions/delete-hover.png Binary files differindex 99f549faf9b..48e6c089c9d 100644 --- a/core/img/actions/delete-hover.png +++ b/core/img/actions/delete-hover.png diff --git a/core/img/actions/delete-hover.svg b/core/img/actions/delete-hover.svg index 568185c5c70..9e5150359de 100644 --- a/core/img/actions/delete-hover.svg +++ b/core/img/actions/delete-hover.svg @@ -1,12 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <path fill="#d40000" d="M8,1c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm-2.8438,2.75l2.8438,2.8438,2.844-2.8438,1.406,1.4062-2.8438,2.8438,2.8438,2.844-1.406,1.406-2.844-2.8438-2.8438,2.8438-1.4062-1.406,2.8438-2.844-2.8438-2.8438,1.4062-1.4062z"/> + <path d="m8 1c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm-2.8438 2.75l2.8438 2.8438 2.844-2.8438 1.406 1.4062-2.8438 2.8438 2.8438 2.844-1.406 1.406-2.844-2.8438-2.8438 2.8438-1.4062-1.406 2.8438-2.844-2.8438-2.8438 1.4062-1.4062z" fill="#d40000"/> </svg> diff --git a/core/img/actions/delete.png b/core/img/actions/delete.png Binary files differindex 0d8c89a56e2..3389c66e03b 100644 --- a/core/img/actions/delete.png +++ b/core/img/actions/delete.png diff --git a/core/img/actions/download.png b/core/img/actions/download.png Binary files differindex 65954f941bb..0f71a5a776f 100644 --- a/core/img/actions/download.png +++ b/core/img/actions/download.png diff --git a/core/img/actions/history.png b/core/img/actions/history.png Binary files differindex 3234880b25a..ec2bbd0587f 100644 --- a/core/img/actions/history.png +++ b/core/img/actions/history.png diff --git a/core/img/actions/info.png b/core/img/actions/info.png Binary files differindex 37ccb356830..9ebfe9cbdcc 100644 --- a/core/img/actions/info.png +++ b/core/img/actions/info.png diff --git a/core/img/actions/info.svg b/core/img/actions/info.svg index 55bdb17f2e1..7c93fd6a3ef 100644 --- a/core/img/actions/info.svg +++ b/core/img/actions/info.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="a" y2="28.777" gradientUnits="userSpaceOnUse" y1="13.895" gradientTransform="matrix(1.0345 0 0 1.0345 8.0708 -14.514)" x2=".44924" x1=".86850"> + <linearGradient id="a" x1=".8685" gradientUnits="userSpaceOnUse" x2=".44924" gradientTransform="matrix(1.0345 0 0 1.0345 8.0708 -14.514)" y1="13.895" y2="28.777"> <stop offset="0"/> <stop stop-color="#363636" offset="1"/> </linearGradient> diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png Binary files differindex f3121811ea6..2013ebad695 100644 --- a/core/img/actions/lock.png +++ b/core/img/actions/lock.png diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg index beef1d3ad3a..9ea5015c8a3 100644 --- a/core/img/actions/lock.svg +++ b/core/img/actions/lock.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'> -<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" viewBox="0 0 71 100" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink"> +<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 71 100"> <path d="m65.5 45v-15c0-16.542-13.458-30-30-30s-30 13.458-30 30v15h-5.5v55h71v-55h-5.5zm-52-15c0-12.131 9.869-22 22-22s22 9.869 22 22v15h-44v-15z"/> </svg> diff --git a/core/img/actions/logout.png b/core/img/actions/logout.png Binary files differindex e9c89a15a7a..5b94147732c 100644 --- a/core/img/actions/logout.png +++ b/core/img/actions/logout.png diff --git a/core/img/actions/logout.svg b/core/img/actions/logout.svg index 59543875d75..895080dab8f 100644 --- a/core/img/actions/logout.svg +++ b/core/img/actions/logout.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0001 0c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9435-0.047-4.048 2.1873-5.2187 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.0001 1c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9436-0.047-4.0481 2.1873-5.2188 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z" fill="#fff"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m8.0001 0c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9435-0.047-4.048 2.1873-5.2187 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m8.0001 1c-0.4714 0-0.96103 0.5419-0.95 1v6c-0.00747 0.52831 0.42163 1 0.95 1s0.95747-0.47169 0.95-1v-6c0.014622-0.6051-0.4786-1-0.95-1zm-3.3438 2.5c-0.087186 0.019294-0.17163 0.050959-0.25 0.09375-2.9995 1.5715-3.9184 4.7979-3.125 7.4688 0.7934 2.67 3.2799 4.937 6.6875 4.937 3.3592 0 5.8772-2.149 6.7192-4.781 0.841-2.6321-0.058-5.8234-3.125-7.594-0.434-0.2536-1.059-0.0899-1.313 0.3437-0.2536 0.4336-0.09 1.0589 0.344 1.3125 2.3908 1.3798 2.8825 3.4944 2.2812 5.375-0.6012 1.8806-2.344 3.4375-4.9062 3.4375-2.5759 0-4.2976-1.6502-4.875-3.5938-0.5776-1.9436-0.047-4.0481 2.1873-5.2188 0.3787-0.2063 0.5791-0.6925 0.4558-1.1057-0.1232-0.4133-0.5572-0.7103-0.987-0.6755-0.0313-0.0015-0.0626-0.0015-0.0938 0z" fill="#fff"/> </svg> diff --git a/core/img/actions/mail.png b/core/img/actions/mail.png Binary files differindex be6142444ae..6d06259cd08 100644 --- a/core/img/actions/mail.png +++ b/core/img/actions/mail.png diff --git a/core/img/actions/more.png b/core/img/actions/more.png Binary files differindex edcafdd9bbf..880d5dccce3 100644 --- a/core/img/actions/more.png +++ b/core/img/actions/more.png diff --git a/core/img/actions/password.png b/core/img/actions/password.png Binary files differindex 07365a5775e..3619fabab9a 100644 --- a/core/img/actions/password.png +++ b/core/img/actions/password.png diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg index a9b29fda093..4b772ae2dcb 100644 --- a/core/img/actions/password.svg +++ b/core/img/actions/password.svg @@ -1,3 +1,4 @@ -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 71 100"><metadata><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/></cc:Work></rdf:RDF></metadata> -<path d="M8,1c-2.2091,0-4,1.7909-4,4v2h-1v7h10v-7h-1v-2c0-2.2091-1.791-4-4-4zm0,2c1.1046,0,2,0.89543,2,2v2h-4v-2c0-1.1046,0.8954-2,2-2z" transform="matrix(6.25,0,0,6.25,-14.5,0)" fill="#000"/> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="16px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" viewBox="0 0 71 100" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<path d="m8 1c-2.2091 0-4 1.7909-4 4v2h-1v7h10v-7h-1v-2c0-2.2091-1.791-4-4-4zm0 2c1.1046 0 2 0.89543 2 2v2h-4v-2c0-1.1046 0.8954-2 2-2z" transform="matrix(6.25,0,0,6.25,-14.5,0)"/> </svg> diff --git a/core/img/actions/pause-big.png b/core/img/actions/pause-big.png Binary files differindex 1c4cf503b8d..054281c6314 100644 --- a/core/img/actions/pause-big.png +++ b/core/img/actions/pause-big.png diff --git a/core/img/actions/pause.png b/core/img/actions/pause.png Binary files differindex f74ed3a8619..d4b865e3401 100644 --- a/core/img/actions/pause.png +++ b/core/img/actions/pause.png diff --git a/core/img/actions/play-add.png b/core/img/actions/play-add.png Binary files differindex 0097f671aef..ccf77d2a062 100644 --- a/core/img/actions/play-add.png +++ b/core/img/actions/play-add.png diff --git a/core/img/actions/play-add.svg b/core/img/actions/play-add.svg index cdf4f6ea9f3..a0dec159d77 100644 --- a/core/img/actions/play-add.svg +++ b/core/img/actions/play-add.svg @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> <g transform="translate(0 -1036.4)"> - <g> - <path d="m2 1037.4 11 6-11 6z"/> - <path d="m11 1045.4v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/> - </g> + <path d="m2 1037.4 11 6-11 6z"/> + <path d="m11 1045.4v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/> </g> </svg> diff --git a/core/img/actions/play-big.png b/core/img/actions/play-big.png Binary files differindex 2da2426dcfc..7d4916cb204 100644 --- a/core/img/actions/play-big.png +++ b/core/img/actions/play-big.png diff --git a/core/img/actions/play-next.png b/core/img/actions/play-next.png Binary files differindex 08568b3dc0b..50cd91d240e 100644 --- a/core/img/actions/play-next.png +++ b/core/img/actions/play-next.png diff --git a/core/img/actions/play-previous.png b/core/img/actions/play-previous.png Binary files differindex 811cde46c15..c380e96bb58 100644 --- a/core/img/actions/play-previous.png +++ b/core/img/actions/play-previous.png diff --git a/core/img/actions/play.png b/core/img/actions/play.png Binary files differindex adbef1e576d..7994424c65c 100644 --- a/core/img/actions/play.png +++ b/core/img/actions/play.png diff --git a/core/img/actions/public.png b/core/img/actions/public.png Binary files differindex 9e56f2919fd..077bb7504de 100644 --- a/core/img/actions/public.png +++ b/core/img/actions/public.png diff --git a/core/img/actions/rename.png b/core/img/actions/rename.png Binary files differindex 3af6840071b..975bd2d7031 100644 --- a/core/img/actions/rename.png +++ b/core/img/actions/rename.png diff --git a/core/img/actions/search.png b/core/img/actions/search.png Binary files differindex 312e4f419e5..49b61754354 100644 --- a/core/img/actions/search.png +++ b/core/img/actions/search.png diff --git a/core/img/actions/search.svg b/core/img/actions/search.svg index 4f27369dbbc..28e36e2d5bd 100644 --- a/core/img/actions/search.svg +++ b/core/img/actions/search.svg @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="a" y2="38.409" gradientUnits="userSpaceOnUse" x2="46.396" gradientTransform="matrix(-.41002 0 0 .54471 28.023 -5.922)" y1="12.708" x1="46.396"> + <linearGradient id="a" x1="46.396" gradientUnits="userSpaceOnUse" y1="12.708" gradientTransform="matrix(-.41002 0 0 .54471 28.023 -5.922)" x2="46.396" y2="38.409"> <stop offset="0"/> <stop stop-color="#363636" offset="1"/> </linearGradient> </defs> <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> - <g> - <path opacity=".6" style="color:#000000" d="m6 1.9992c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.4068c0.4776-0.76635 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/> - <path opacity=".7" style="color:#000000" d="m6 1c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.406c0.478-0.7663 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#a)"/> - </g> + <path opacity=".6" style="color:#000000" d="m6 1.9992c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.4068c0.4776-0.76635 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/> + <path opacity=".7" style="color:#000000" d="m6 1c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5c0.98478 0 1.8823-0.28967 2.6562-0.78125l4.4688 4.625c0.09558 0.10527 0.22619 0.16452 0.375 0.15625 0.14882-0.0083 0.3031-0.07119 0.40625-0.1875l0.9375-1.0625c0.19194-0.22089 0.19549-0.53592 0-0.71875l-4.594-4.406c0.478-0.7663 0.75-1.6555 0.75-2.625 0-2.7614-2.2386-5-5-5zm0 2c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#a)"/> </svg> diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png Binary files differindex 9ada3087707..f6eb6ce0cc7 100644 --- a/core/img/actions/settings.png +++ b/core/img/actions/settings.png diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg index bd7ae3b3d7f..a3a4c6c51d3 100644 --- a/core/img/actions/settings.svg +++ b/core/img/actions/settings.svg @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="c" y2="7.556" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="15.5" y1="7.556" x1=".5"/> + <linearGradient id="d" x1=".5" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="15.5" y1="7.556" y2="7.556"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-color="#363636" offset="1"/> </linearGradient> - <linearGradient id="b" y2="14.998" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="7.493" y1=".0035527" x1="7.493"/> + <linearGradient id="e" x1="7.493" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="7.493" y1=".0035527" y2="14.998"/> </defs> <g opacity=".6" transform="translate(.027972 .944)" fill="#fff"> - <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="#fff"/> + <path fill="#fff" d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block"/> </g> - <g opacity=".7" transform="translate(0 -.056)" fill="url(#c)"> - <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="url(#b)"/> + <g opacity=".7" transform="translate(0 -.056)" fill="url(#d)"> + <path fill="url(#e)" d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0-0.24842-0.1891-0.4375-0.4375-0.4375zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block"/> </g> </svg> diff --git a/core/img/actions/share.png b/core/img/actions/share.png Binary files differindex 099e4d6ab35..fdacbbabebc 100644 --- a/core/img/actions/share.png +++ b/core/img/actions/share.png diff --git a/core/img/actions/shared.png b/core/img/actions/shared.png Binary files differindex 6e112e75b44..83ec1a0cf15 100644 --- a/core/img/actions/shared.png +++ b/core/img/actions/shared.png diff --git a/core/img/actions/shared.svg b/core/img/actions/shared.svg index 3e63cc54687..60b54015167 100644 --- a/core/img/actions/shared.svg +++ b/core/img/actions/shared.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4.5689 2.4831c-0.96481 0-1.7833 0.70559-1.7833 1.6162 0.00685 0.28781 0.032588 0.64272 0.20434 1.3933v0.018581l0.018574 0.018573c0.055135 0.15793 0.13537 0.24827 0.24149 0.37154 0.10612 0.12326 0.23263 0.26834 0.35294 0.39011 0.014154 0.014326 0.023227 0.023201 0.037149 0.037163 0.023859 0.10383 0.052763 0.21557 0.074304 0.3158 0.057317 0.26668 0.051439 0.45553 0.037155 0.52015-0.4146 0.1454-0.9304 0.3187-1.3932 0.5199-0.2598 0.113-0.4949 0.2139-0.6873 0.3344-0.1923 0.1206-0.3836 0.2116-0.4458 0.483-0.0007972 0.012367-0.0007972 0.024787 0 0.037163-0.060756 0.55788-0.15266 1.3783-0.22291 1.932-0.015166 0.11656 0.046264 0.23943 0.14861 0.29723 0.84033 0.45393 2.1312 0.63663 3.418 0.63161 1.2868-0.005 2.5674-0.19845 3.3808-0.63161 0.10234-0.0578 0.16378-0.18067 0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.059748-0.053461-0.23358 0-0.50157 0.014356-0.071959 0.036836-0.14903 0.055729-0.22292 0.045032-0.05044 0.080132-0.091658 0.13003-0.14861 0.1064-0.1215 0.2207-0.2489 0.3157-0.3715 0.0951-0.1226 0.1728-0.2279 0.223-0.3715l0.018574-0.018581c0.1941-0.7837 0.1942-1.1107 0.2043-1.3933v-0.018573c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067 0-2.6 1.0287-2.6 2.3562 0.00998 0.4196 0.047512 0.93701 0.29791 2.0312v0.027083l0.027081 0.027083c0.080384 0.23025 0.19736 0.36196 0.35208 0.54166s0.33917 0.39121 0.51458 0.56874c0.020637 0.020887 0.033864 0.033826 0.054161 0.054175 0.034785 0.15137 0.076926 0.31428 0.10833 0.46041 0.083566 0.38879 0.074995 0.66411 0.054171 0.75832-0.6045 0.2122-1.3565 0.465-2.0312 0.7583-0.3789 0.1647-0.7217 0.3118-1.0021 0.4875-0.28044 0.17574-0.55934 0.30851-0.64999 0.70416-0.00116 0.01804-0.00116 0.03613 0 0.05418-0.08858 0.81334-0.22257 2.0094-0.325 2.8166-0.022111 0.16993 0.067452 0.34906 0.21666 0.43333 1.2252 0.66179 3.1072 0.92814 4.9833 0.92082 1.8761-0.0073 3.7431-0.28932 4.9291-0.92082 0.14921-0.08427 0.23878-0.2634 0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.087106-0.07795-0.34054 0-0.73124 0.02093-0.10491 0.05371-0.21727 0.08125-0.325 0.06566-0.073537 0.11683-0.13363 0.18958-0.21666 0.15516-0.17709 0.32189-0.36287 0.46041-0.54166s0.25186-0.33217 0.325-0.54166l0.02708-0.027083c0.28309-1.1425 0.28324-1.6193 0.29792-2.0312v-0.027083c0-1.3275-1.1933-2.3562-2.6-2.3562z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4.5689 2.4831c-0.96481 0-1.7833 0.70559-1.7833 1.6162 0.00685 0.28781 0.032588 0.64272 0.20434 1.3933v0.018581l0.018574 0.018573c0.055135 0.15793 0.13537 0.24827 0.24149 0.37154 0.10612 0.12326 0.23263 0.26834 0.35294 0.39011 0.014154 0.014326 0.023227 0.023201 0.037149 0.037163 0.023859 0.10383 0.052763 0.21557 0.074304 0.3158 0.057317 0.26668 0.051439 0.45553 0.037155 0.52015-0.4146 0.1454-0.9304 0.3187-1.3932 0.5199-0.2598 0.113-0.4949 0.2139-0.6873 0.3344-0.1923 0.1206-0.3836 0.2116-0.4458 0.483-0.0007972 0.012367-0.0007972 0.024787 0 0.037163-0.060756 0.55788-0.15266 1.3783-0.22291 1.932-0.015166 0.11656 0.046264 0.23943 0.14861 0.29723 0.84033 0.45393 2.1312 0.63663 3.418 0.63161 1.2868-0.005 2.5674-0.19845 3.3808-0.63161 0.10234-0.0578 0.16378-0.18067 0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.059748-0.053461-0.23358 0-0.50157 0.014356-0.071959 0.036836-0.14903 0.055729-0.22292 0.045032-0.05044 0.080132-0.091658 0.13003-0.14861 0.1064-0.1215 0.2207-0.2489 0.3157-0.3715 0.0951-0.1226 0.1728-0.2279 0.223-0.3715l0.018574-0.018581c0.1941-0.7837 0.1942-1.1107 0.2043-1.3933v-0.018573c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067 0-2.6 1.0287-2.6 2.3562 0.00998 0.4196 0.047512 0.93701 0.29791 2.0312v0.027083l0.027081 0.027083c0.080384 0.23025 0.19736 0.36196 0.35208 0.54166s0.33917 0.39121 0.51458 0.56874c0.020637 0.020887 0.033864 0.033826 0.054161 0.054175 0.034785 0.15137 0.076926 0.31428 0.10833 0.46041 0.083566 0.38879 0.074995 0.66411 0.054171 0.75832-0.6045 0.2122-1.3565 0.465-2.0312 0.7583-0.3789 0.1647-0.7217 0.3118-1.0021 0.4875-0.28044 0.17574-0.55934 0.30851-0.64999 0.70416-0.00116 0.01804-0.00116 0.03613 0 0.05418-0.08858 0.81334-0.22257 2.0094-0.325 2.8166-0.022111 0.16993 0.067452 0.34906 0.21666 0.43333 1.2252 0.66179 3.1072 0.92814 4.9833 0.92082 1.8761-0.0073 3.7431-0.28932 4.9291-0.92082 0.14921-0.08427 0.23878-0.2634 0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.087106-0.07795-0.34054 0-0.73124 0.02093-0.10491 0.05371-0.21727 0.08125-0.325 0.06566-0.073537 0.11683-0.13363 0.18958-0.21666 0.15516-0.17709 0.32189-0.36287 0.46041-0.54166s0.25186-0.33217 0.325-0.54166l0.02708-0.027083c0.28309-1.1425 0.28324-1.6193 0.29792-2.0312v-0.027083c0-1.3275-1.1933-2.3562-2.6-2.3562z"/> </svg> diff --git a/core/img/actions/sound-off.png b/core/img/actions/sound-off.png Binary files differindex 2eddb00af0f..0457de8e4d1 100644 --- a/core/img/actions/sound-off.png +++ b/core/img/actions/sound-off.png diff --git a/core/img/actions/sound.png b/core/img/actions/sound.png Binary files differindex 9349c94e7a4..e849b4d248b 100644 --- a/core/img/actions/sound.png +++ b/core/img/actions/sound.png diff --git a/core/img/actions/star.png b/core/img/actions/star.png Binary files differindex 124ce495af6..6a04282f3fa 100644 --- a/core/img/actions/star.png +++ b/core/img/actions/star.png diff --git a/core/img/actions/star.svg b/core/img/actions/star.svg index 7bcd8dc0598..c2b3b60a2b8 100644 --- a/core/img/actions/star.svg +++ b/core/img/actions/star.svg @@ -1,14 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <g transform="matrix(0.06832234,0,0,0.06832234,-10.114234,-50.901693)"> - <path fill="#CCC" transform="translate(-21.071,-112.5)" d="m330.36,858.43,43.111,108.06,117.64,9.2572-89.445,74.392,27.55,114.75-98.391-62.079-100.62,61.66,28.637-112.76-89.734-76.638,116.09-7.6094z"/> + <g transform="matrix(.068322 0 0 .068322 -10.114 -50.902)"> + <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)" fill="#CCC"/> </g> </svg> diff --git a/core/img/actions/starred.png b/core/img/actions/starred.png Binary files differindex 5185d0f5381..22e68c757e7 100644 --- a/core/img/actions/starred.png +++ b/core/img/actions/starred.png diff --git a/core/img/actions/starred.svg b/core/img/actions/starred.svg index c7a5a7dac12..130bab366a2 100644 --- a/core/img/actions/starred.svg +++ b/core/img/actions/starred.svg @@ -1,14 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <g transform="matrix(0.06832234,0,0,0.06832234,-10.114235,-50.901693)"> - <path fill="#FC0" transform="translate(-21.071,-112.5)" d="m330.36,858.43,43.111,108.06,117.64,9.2572-89.445,74.392,27.55,114.75-98.391-62.079-100.62,61.66,28.637-112.76-89.734-76.638,116.09-7.6094z"/> + <g transform="matrix(.068322 0 0 .068322 -10.114 -50.902)"> + <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)" fill="#FC0"/> </g> </svg> diff --git a/core/img/actions/toggle-filelist.png b/core/img/actions/toggle-filelist.png Binary files differindex 45d363f1934..0926a726d53 100644 --- a/core/img/actions/toggle-filelist.png +++ b/core/img/actions/toggle-filelist.png diff --git a/core/img/actions/toggle-filelist.svg b/core/img/actions/toggle-filelist.svg index 940f6a49e63..57f4c67fb30 100644 --- a/core/img/actions/toggle-filelist.svg +++ b/core/img/actions/toggle-filelist.svg @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g> - <rect rx=".5" ry=".5" height="4" width="4" y="1" x="1"/> - <rect rx=".5" ry=".5" height="1" width="9" y="2" x="6"/> - <rect rx=".5" ry=".5" height="4" width="4" y="6" x="1"/> - <rect rx=".5" ry=".5" height="1" width="9" y="7" x="6"/> - <rect rx=".5" ry=".5" height="4" width="4" y="11" x="1"/> - <rect rx=".5" ry=".5" height="1" width="9" y="12" x="6"/> - </g> + <rect rx=".5" ry=".5" height="4" width="4" y="1" x="1"/> + <rect rx=".5" ry=".5" height="1" width="9" y="2" x="6"/> + <rect rx=".5" ry=".5" height="4" width="4" y="6" x="1"/> + <rect rx=".5" ry=".5" height="1" width="9" y="7" x="6"/> + <rect rx=".5" ry=".5" height="4" width="4" y="11" x="1"/> + <rect rx=".5" ry=".5" height="1" width="9" y="12" x="6"/> </svg> diff --git a/core/img/actions/toggle-pictures.png b/core/img/actions/toggle-pictures.png Binary files differindex 8068d17e30d..7499d5b7809 100644 --- a/core/img/actions/toggle-pictures.png +++ b/core/img/actions/toggle-pictures.png diff --git a/core/img/actions/toggle-pictures.svg b/core/img/actions/toggle-pictures.svg index 5205c0226d1..f25695537f9 100644 --- a/core/img/actions/toggle-pictures.svg +++ b/core/img/actions/toggle-pictures.svg @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g> - <rect rx=".5" ry=".5" height="6" width="6" y="1" x="1"/> - <rect rx=".5" ry=".5" height="6" width="6" y="1" x="9"/> - <rect rx=".5" ry=".5" height="6" width="6" y="9" x="9"/> - <rect rx=".5" ry=".5" height="6" width="6" y="9" x="1"/> - </g> + <rect rx=".5" ry=".5" height="6" width="6" y="1" x="1"/> + <rect rx=".5" ry=".5" height="6" width="6" y="1" x="9"/> + <rect rx=".5" ry=".5" height="6" width="6" y="9" x="9"/> + <rect rx=".5" ry=".5" height="6" width="6" y="9" x="1"/> </svg> diff --git a/core/img/actions/toggle.png b/core/img/actions/toggle.png Binary files differindex d06e5cb32b5..45f9407a1ab 100644 --- a/core/img/actions/toggle.png +++ b/core/img/actions/toggle.png diff --git a/core/img/actions/toggle.svg b/core/img/actions/toggle.svg index 1b774a19b11..774daa4fdf6 100644 --- a/core/img/actions/toggle.svg +++ b/core/img/actions/toggle.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 16 9" xml:space="preserve" overflow="visible" height="9px" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 16 9"> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="9px" viewBox="0 0 16 9" width="16px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" enable-background="new 0 0 16 9" overflow="visible" xmlns:dc="http://purl.org/dc/elements/1.1/"> <path d="m7.999 0c-3.109 0-5.926 1.719-7.999 4.5 2.073 2.781 4.89 4.5 7.999 4.5 3.111 0 5.928-1.719 8.001-4.5-2.073-2.781-4.892-4.5-8.001-4.5zm0.001 7.5c-1.657 0-3-1.343-3-3s1.343-3 3-3c1.657 0 3 1.343 3 3s-1.343 3-3 3z" fill="#222"/> <circle cy="4.501" cx="8" r="1.5" fill="#222"/> </svg> diff --git a/core/img/actions/triangle-e.png b/core/img/actions/triangle-e.png Binary files differindex 09d398f602e..8abe23a6280 100644 --- a/core/img/actions/triangle-e.png +++ b/core/img/actions/triangle-e.png diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png Binary files differindex 0ffcf6cbc44..0f37e950a45 100644 --- a/core/img/actions/triangle-n.png +++ b/core/img/actions/triangle-n.png diff --git a/core/img/actions/triangle-n.svg b/core/img/actions/triangle-n.svg index 4f866978f48..49d1ac99a7e 100644 --- a/core/img/actions/triangle-n.svg +++ b/core/img/actions/triangle-n.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m12 12-4-8-4 7.989z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m12 12-4-8-4 7.989z"/> </svg> diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png Binary files differindex 0f533b142eb..81f623eac17 100644 --- a/core/img/actions/triangle-s.png +++ b/core/img/actions/triangle-s.png diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg index b178b20a20b..4f35c38f689 100644 --- a/core/img/actions/triangle-s.svg +++ b/core/img/actions/triangle-s.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m4 4 4 8 4-7.989z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4 4 4 8 4-7.989z"/> </svg> diff --git a/core/img/actions/upload-white.png b/core/img/actions/upload-white.png Binary files differindex fd9bdccc240..a3b233e8aa6 100644 --- a/core/img/actions/upload-white.png +++ b/core/img/actions/upload-white.png diff --git a/core/img/actions/upload.png b/core/img/actions/upload.png Binary files differindex 1d90165a552..f6a0c4cfa83 100644 --- a/core/img/actions/upload.png +++ b/core/img/actions/upload.png diff --git a/core/img/actions/user.png b/core/img/actions/user.png Binary files differindex 2221ac679d1..5f2fddc0ea3 100644 --- a/core/img/actions/user.png +++ b/core/img/actions/user.png diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg index aa719573708..65edc5ebec8 100644 --- a/core/img/actions/user.svg +++ b/core/img/actions/user.svg @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"/> </svg> diff --git a/core/img/actions/view-close.png b/core/img/actions/view-close.png Binary files differindex 330ae09ea73..8422b733466 100644 --- a/core/img/actions/view-close.png +++ b/core/img/actions/view-close.png diff --git a/core/img/actions/view-next.png b/core/img/actions/view-next.png Binary files differindex f9e6174ae3f..8a23452e083 100644 --- a/core/img/actions/view-next.png +++ b/core/img/actions/view-next.png diff --git a/core/img/actions/view-pause.png b/core/img/actions/view-pause.png Binary files differindex 94696bf6868..1de1fb4654b 100644 --- a/core/img/actions/view-pause.png +++ b/core/img/actions/view-pause.png diff --git a/core/img/actions/view-pause.svg b/core/img/actions/view-pause.svg index d901a4d789e..f5fdc030479 100644 --- a/core/img/actions/view-pause.svg +++ b/core/img/actions/view-pause.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> <g transform="translate(0 -1020.4)"> - <path fill="#fff" d="m6 1026.4v20h8v-20h-8zm12 0v20h8v-20h-8z"/> + <path d="m6 1026.4v20h8v-20h-8zm12 0v20h8v-20h-8z" fill="#fff"/> </g> </svg> diff --git a/core/img/actions/view-play.png b/core/img/actions/view-play.png Binary files differindex 721787d9c44..c506815c0cf 100644 --- a/core/img/actions/view-play.png +++ b/core/img/actions/view-play.png diff --git a/core/img/actions/view-previous.png b/core/img/actions/view-previous.png Binary files differindex 97b41a195ff..79dcb2301df 100644 --- a/core/img/actions/view-previous.png +++ b/core/img/actions/view-previous.png diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png Binary files differindex 7e9593a36bf..5556920aa73 100644 --- a/core/img/breadcrumb.png +++ b/core/img/breadcrumb.png diff --git a/core/img/breadcrumb.svg b/core/img/breadcrumb.svg index f0b5c9218d5..10d6e4150cb 100644 --- a/core/img/breadcrumb.svg +++ b/core/img/breadcrumb.svg @@ -1,12 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="44" width="14" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <path d="M0.54879,0.047777,12.744,22,0.54879,43.951,12.744,22z" stroke="#d7d7d7" stroke-linecap="round" stroke-miterlimit="31.20000076000000178" stroke-width="1.09758711000000009" fill="#F00"/> + <path d="m0.54879 0.047777 12.195 21.952-12.195 21.951 12.195-21.951z" stroke="#d7d7d7" stroke-linecap="round" stroke-miterlimit="31.2" stroke-width="1.0976" fill="#F00"/> </svg> diff --git a/core/img/desktopapp.svg b/core/img/desktopapp.svg index c2cfb016299..d63cfef0848 100644 --- a/core/img/desktopapp.svg +++ b/core/img/desktopapp.svg @@ -1,4 +1,5 @@ -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" version="1.1" xml:space="preserve" height="60" width="170" enable-background="new 0 0 792 612" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" viewBox="0 0 1346.4 475.2"><metadata><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/></cc:Work></rdf:RDF></metadata> -<rect rx="50" ry="50" height="475.2" width="1346.4" y="-3.5527E-15" x="-2.8405E-15" fill="#000"/><path d="m150.48,126.72c-11.88,0-23.76,11.88-23.76,23.76v166.32l-47.52,23.76v11.88s0,11.88,11.88,11.88h356.4c11.88,0,11.88-11.88,11.88-11.88v-11.88l-47.52-23.76v-166.32c0-11.88-11.88-23.76-23.76-23.76zm0,23.667h237.6v142.65h-237.6z" fill="#fff"/><text style="word-spacing:0px;letter-spacing:0px;" xml:space="preserve" font-size="316.8px" y="239.58" x="451.44" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="126.72px" font-family="FreeSans" y="239.58" x="451.44" font-weight="600" fill="#ffffff">Desktop app</tspan></text> -<text style="word-spacing:0px;letter-spacing:0px;" xml:space="preserve" font-size="316.8px" y="342.54001" x="493.01996" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="71.28px" y="342.54001" x="493.01996" font-family="FreeSans" fill="#ffffff">Windows, OS X, Linux</tspan></text> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="60" width="170" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" enable-background="new 0 0 792 612" viewBox="0 0 1346.4 475.2" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<rect rx="50" ry="50" height="475.2" width="1346.4" y="-3.5527e-15" x="-2.8405e-15"/><path d="m150.48 126.72c-11.88 0-23.76 11.88-23.76 23.76v166.32l-47.52 23.76v11.88s0 11.88 11.88 11.88h356.4c11.88 0 11.88-11.88 11.88-11.88v-11.88l-47.52-23.76v-166.32c0-11.88-11.88-23.76-23.76-23.76zm0 23.667h237.6v142.65h-237.6z" fill="#fff"/><text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="239.58" x="451.44" font-family="Sans" line-height="125%" fill="#ffffff"><tspan font-size="126.72px" font-weight="600" y="239.58" x="451.44" font-family="FreeSans" fill="#ffffff">Desktop app</tspan></text> +<text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" font-size="316.8px" y="342.54001" x="493.01996" font-family="Sans" line-height="125%" fill="#ffffff"><tspan y="342.54001" x="493.01996" font-size="71.28px" font-family="FreeSans" fill="#ffffff">Windows, OS X, Linux</tspan></text> </svg> diff --git a/core/img/favicon-touch.png b/core/img/favicon-touch.png Binary files differindex 24770fb634f..27019a4ddef 100644 --- a/core/img/favicon-touch.png +++ b/core/img/favicon-touch.png diff --git a/core/img/favicon-touch.svg b/core/img/favicon-touch.svg index 68f36a8a9ac..8d548ef0359 100644 --- a/core/img/favicon-touch.svg +++ b/core/img/favicon-touch.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xml:space="preserve" height="128" viewBox="0 0 128 127.99999" xmlns:dc="http://purl.org/dc/elements/1.1/" width="128" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111"> -<rect rx="20" ry="20" height="128" width="128" y="-0.0000015" x="0" fill="#1d2d44"/><path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m58.332 29.124c-8.9317 0-16.148 7.216-16.148 16.148 0 3.6817 1.226 7.0702 3.2929 9.7836 4.4839-5.1898 11.102-8.4855 18.491-8.4855 3.615 0 7.0431 0.805 10.132 2.2164 0.25008-1.131 0.37996-2.3072 0.37996-3.5145 0-8.9317-7.216-16.148-16.148-16.148zm-21.087 7.472c-4.6514 0-8.3905 3.7708-8.3905 8.4222 0 1.506 0.38852 2.929 1.0765 4.1478 2.8068-1.5834 6.0519-2.5013 9.4987-2.5013 0.33264 0 0.65304 0.012 0.98154 0.032-0.0372-0.47152-0.06328-0.9438-0.06328-1.4248 0-2.5907 0.56269-5.0557 1.5515-7.2823-1.3313-0.89272-2.9263-1.3931-4.6544-1.3931zm39.831 5.7942c-0.34364 0-0.67487 0.042-1.0132 0.0632 0.14636 0.92272 0.25328 1.8544 0.25328 2.818 0 1.4994-0.19068 2.9463-0.53826 4.3377 4.0749 2.2551 7.459 5.6294 9.6887 9.7203 2.3126-1.204 4.8925-1.9695 7.6306-2.153-0.70568-8.2758-7.5618-14.786-16.021-14.786zm-13.108 6.0158c-12.498 0-22.607 10.108-22.607 22.607 0 12.498 10.108 22.607 22.607 22.607s22.607-10.109 22.607-22.607c0-12.499-10.109-22.607-22.607-22.607zm-24.538 0.0948c-9.6962 0-17.541 7.8447-17.541 17.541 0 5.708 2.7196 10.761 6.934 13.963 1.7767-3.4268 5.3452-5.7625 9.467-5.7625 0.49817 0 0.97633 0.0604 1.4565 0.1268-0.15072-1.0966-0.22164-2.2184-0.22164-3.3562 0-5.4397 1.7707-10.47 4.781-14.533-1.802-2.2548-3.0915-4.9641-3.6412-7.9156-0.40737-0.028-0.82022-0.0632-1.2348-0.0632zm54.966 10.449c-2.9442 0-5.7022 0.75168-8.1372 2.0264 1.3827 3.0627 2.153 6.4609 2.153 10.037 0 6.6958-2.6921 12.776-7.0607 17.193 3.2093 3.563 7.8657 5.7942 13.045 5.7942 9.6962 0 17.541-7.8446 17.541-17.541 0-9.6962-7.8447-17.509-17.541-17.509zm-74.216 2.3115c-8.933-0.001-16.18 7.183-16.18 16.115s7.2474 16.179 16.179 16.179c3.3996 0 6.5489-1.0592 9.1504-2.8496-1.075-1.6704-1.7098-3.6675-1.7098-5.7942 0-1.1038 0.16288-2.1643 0.47493-3.1662-4.8703-3.5197-8.0422-9.2473-8.0422-15.704 0-1.6406 0.2162-3.227 0.60159-4.7494-0.15996-0.004-0.3138-0.032-0.47494-0.032zm94.955 13.868c-0.47649 0-0.93756 0.0544-1.3931 0.1268 0.0252 0.40276 0.0316 0.79408 0.0316 1.2032 0 5.1501-2.0321 9.8246-5.3193 13.298 1.6172 1.8806 3.9926 3.0712 6.6808 3.0712 4.8964 0 8.8654-3.9373 8.8654-8.8338 0-4.8964-3.969-8.8654-8.8654-8.8654zm-76.844 0.94984c-4.8962 0-8.8338 3.9376-8.8338 8.8338s3.9376 8.8654 8.8338 8.8654c3.753 0 6.9386-2.3418 8.2322-5.6359-3.1565-3.2149-5.4251-7.3162-6.4274-11.873-0.58657-0.1212-1.1819-0.19-1.8048-0.19z" fill="#fff"/> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 595.275 311.111" xml:space="preserve" height="128" width="128" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 127.99999" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<rect rx="20" ry="20" height="128" width="128" y="-.0000015" x="0" fill="#1d2d44"/><path style="block-progression:tb;color:#000000;enable-background:accumulate;text-transform:none;text-indent:0" d="m58.332 29.124c-8.9317 0-16.148 7.216-16.148 16.148 0 3.6817 1.226 7.0702 3.2929 9.7836 4.4839-5.1898 11.102-8.4855 18.491-8.4855 3.615 0 7.0431 0.805 10.132 2.2164 0.25008-1.131 0.37996-2.3072 0.37996-3.5145 0-8.9317-7.216-16.148-16.148-16.148zm-21.087 7.472c-4.6514 0-8.3905 3.7708-8.3905 8.4222 0 1.506 0.38852 2.929 1.0765 4.1478 2.8068-1.5834 6.0519-2.5013 9.4987-2.5013 0.33264 0 0.65304 0.012 0.98154 0.032-0.0372-0.47152-0.06328-0.9438-0.06328-1.4248 0-2.5907 0.56269-5.0557 1.5515-7.2823-1.3313-0.89272-2.9263-1.3931-4.6544-1.3931zm39.831 5.7942c-0.34364 0-0.67487 0.042-1.0132 0.0632 0.14636 0.92272 0.25328 1.8544 0.25328 2.818 0 1.4994-0.19068 2.9463-0.53826 4.3377 4.0749 2.2551 7.459 5.6294 9.6887 9.7203 2.3126-1.204 4.8925-1.9695 7.6306-2.153-0.70568-8.2758-7.5618-14.786-16.021-14.786zm-13.108 6.0158c-12.498 0-22.607 10.108-22.607 22.607 0 12.498 10.108 22.607 22.607 22.607s22.607-10.109 22.607-22.607c0-12.499-10.109-22.607-22.607-22.607zm-24.538 0.0948c-9.6962 0-17.541 7.8447-17.541 17.541 0 5.708 2.7196 10.761 6.934 13.963 1.7767-3.4268 5.3452-5.7625 9.467-5.7625 0.49817 0 0.97633 0.0604 1.4565 0.1268-0.15072-1.0966-0.22164-2.2184-0.22164-3.3562 0-5.4397 1.7707-10.47 4.781-14.533-1.802-2.2548-3.0915-4.9641-3.6412-7.9156-0.40737-0.028-0.82022-0.0632-1.2348-0.0632zm54.966 10.449c-2.9442 0-5.7022 0.75168-8.1372 2.0264 1.3827 3.0627 2.153 6.4609 2.153 10.037 0 6.6958-2.6921 12.776-7.0607 17.193 3.2093 3.563 7.8657 5.7942 13.045 5.7942 9.6962 0 17.541-7.8446 17.541-17.541 0-9.6962-7.8447-17.509-17.541-17.509zm-74.216 2.3115c-8.933-0.001-16.18 7.183-16.18 16.115s7.2474 16.179 16.179 16.179c3.3996 0 6.5489-1.0592 9.1504-2.8496-1.075-1.6704-1.7098-3.6675-1.7098-5.7942 0-1.1038 0.16288-2.1643 0.47493-3.1662-4.8703-3.5197-8.0422-9.2473-8.0422-15.704 0-1.6406 0.2162-3.227 0.60159-4.7494-0.15996-0.004-0.3138-0.032-0.47494-0.032zm94.955 13.868c-0.47649 0-0.93756 0.0544-1.3931 0.1268 0.0252 0.40276 0.0316 0.79408 0.0316 1.2032 0 5.1501-2.0321 9.8246-5.3193 13.298 1.6172 1.8806 3.9926 3.0712 6.6808 3.0712 4.8964 0 8.8654-3.9373 8.8654-8.8338 0-4.8964-3.969-8.8654-8.8654-8.8654zm-76.844 0.94984c-4.8962 0-8.8338 3.9376-8.8338 8.8338s3.9376 8.8654 8.8338 8.8654c3.753 0 6.9386-2.3418 8.2322-5.6359-3.1565-3.2149-5.4251-7.3162-6.4274-11.873-0.58657-0.1212-1.1819-0.19-1.8048-0.19z" fill="#fff"/> </svg> diff --git a/core/img/favicon.png b/core/img/favicon.png Binary files differindex 02936243cb1..8067350ef47 100644 --- a/core/img/favicon.png +++ b/core/img/favicon.png diff --git a/core/img/favicon.svg b/core/img/favicon.svg index 39cb1742689..319fd434dc5 100644 --- a/core/img/favicon.svg +++ b/core/img/favicon.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xml:space="preserve" height="32" viewBox="0 0 32 31.999997" xmlns:dc="http://purl.org/dc/elements/1.1/" width="32" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111"> -<rect rx="5" ry="5" height="32" width="32" y="-.0000052588" x="0" fill="#1d2d44"/><path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m14.583 7.281c-2.2329 0-4.0369 1.804-4.0369 4.0369 0 0.92043 0.30649 1.7676 0.82322 2.4459 1.121-1.2974 2.7754-2.1214 4.6227-2.1214 0.90376 0 1.7608 0.20125 2.533 0.55409 0.06252-0.28275 0.09499-0.57681 0.09499-0.87863 0-2.2329-1.804-4.0369-4.0369-4.0369zm-5.2718 1.8681c-1.1629 0-2.0976 0.94269-2.0976 2.1055 0 0.3765 0.09713 0.73224 0.26913 1.0369 0.70171-0.39584 1.513-0.62533 2.3747-0.62533 0.08316 0 0.16326 0.003 0.24538 0.008-0.0093-0.11788-0.01582-0.23595-0.01582-0.3562 0-0.64768 0.14067-1.2639 0.38786-1.8206-0.33282-0.22318-0.73157-0.34828-1.1636-0.34828zm9.9578 1.4486c-0.08591 0-0.16872 0.0105-0.2533 0.0158 0.03659 0.23068 0.06332 0.46361 0.06332 0.70449 0 0.37486-0.04767 0.73658-0.13456 1.0844 1.0187 0.56378 1.8648 1.4073 2.4222 2.4301 0.57816-0.301 1.2231-0.49238 1.9077-0.53826-0.17642-2.0689-1.8904-3.6966-4.0053-3.6966zm-3.277 1.504c-3.1245 0-5.6517 2.527-5.6517 5.6517 0 3.1244 2.527 5.6517 5.6517 5.6517s5.6517-2.5273 5.6517-5.6517c0-3.1248-2.5272-5.6517-5.6517-5.6517zm-6.1346 0.0237c-2.4241 0-4.3852 1.9612-4.3852 4.3852 0 1.427 0.67991 2.6902 1.7335 3.4908 0.44418-0.85669 1.3363-1.4406 2.3668-1.4406 0.12454 0 0.24408 0.0151 0.36412 0.0317-0.03768-0.27414-0.05541-0.55461-0.05541-0.83905 0-1.3599 0.44267-2.6175 1.1952-3.6332-0.45049-0.56371-0.77288-1.241-0.91029-1.9789-0.10184-0.007-0.20505-0.0158-0.30871-0.0158zm13.741 2.6121c-0.73606 0-1.4255 0.18792-2.0343 0.5066 0.34567 0.76568 0.53826 1.6152 0.53826 2.5092 0 1.674-0.67302 3.1939-1.7652 4.2982 0.80233 0.89076 1.9664 1.4486 3.2612 1.4486 2.4241 0 4.3852-1.9612 4.3852-4.3852 0-2.4241-1.9612-4.3773-4.3852-4.3773zm-18.554 0.57788c-2.2321-0.001-4.044 1.795-4.044 4.028s1.8119 4.0449 4.0449 4.0449c0.84991 0 1.6372-0.2648 2.2876-0.7124-0.26875-0.41761-0.42744-0.91688-0.42744-1.4486 0-0.27596 0.04072-0.54107 0.11873-0.79156-1.2176-0.87992-2.0106-2.3118-2.0106-3.9261 0-0.41016 0.05405-0.80676 0.1504-1.1873-0.03999-0.001-0.07845-0.008-0.11874-0.008zm23.739 3.467c-0.11912 0-0.23439 0.0136-0.34828 0.0317 0.0063 0.10069 0.0079 0.19852 0.0079 0.30079 0 1.2875-0.50802 2.4561-1.3298 3.3245 0.4043 0.47015 0.99816 0.76781 1.6702 0.76781 1.2241 0 2.2164-0.98433 2.2164-2.2084s-0.99225-2.2164-2.2164-2.2164zm-19.211 0.23746c-1.224 0-2.2084 0.9844-2.2084 2.2084s0.98439 2.2164 2.2084 2.2164c0.93825 0 1.7346-0.58546 2.058-1.409-0.78913-0.80372-1.3563-1.8291-1.6069-2.9683-0.14664-0.0303-0.29548-0.0475-0.45119-0.0475z" fill="#fff"/> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 595.275 311.111" xml:space="preserve" height="32" width="32" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 31.999997" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<rect rx="5" ry="5" height="32" width="32" y="-.0000052588" x="0" fill="#1d2d44"/><path style="block-progression:tb;color:#000000;enable-background:accumulate;text-transform:none;text-indent:0" d="m14.583 7.281c-2.2329 0-4.0369 1.804-4.0369 4.0369 0 0.92043 0.30649 1.7676 0.82322 2.4459 1.121-1.2974 2.7754-2.1214 4.6227-2.1214 0.90376 0 1.7608 0.20125 2.533 0.55409 0.06252-0.28275 0.09499-0.57681 0.09499-0.87863 0-2.2329-1.804-4.0369-4.0369-4.0369zm-5.2718 1.8681c-1.1629 0-2.0976 0.94269-2.0976 2.1055 0 0.3765 0.09713 0.73224 0.26913 1.0369 0.70171-0.39584 1.513-0.62533 2.3747-0.62533 0.08316 0 0.16326 0.003 0.24538 0.008-0.0093-0.11788-0.01582-0.23595-0.01582-0.3562 0-0.64768 0.14067-1.2639 0.38786-1.8206-0.33282-0.22318-0.73157-0.34828-1.1636-0.34828zm9.9578 1.4486c-0.08591 0-0.16872 0.0105-0.2533 0.0158 0.03659 0.23068 0.06332 0.46361 0.06332 0.70449 0 0.37486-0.04767 0.73658-0.13456 1.0844 1.0187 0.56378 1.8648 1.4073 2.4222 2.4301 0.57816-0.301 1.2231-0.49238 1.9077-0.53826-0.17642-2.0689-1.8904-3.6966-4.0053-3.6966zm-3.277 1.504c-3.1245 0-5.6517 2.527-5.6517 5.6517 0 3.1244 2.527 5.6517 5.6517 5.6517s5.6517-2.5273 5.6517-5.6517c0-3.1248-2.5272-5.6517-5.6517-5.6517zm-6.1346 0.0237c-2.4241 0-4.3852 1.9612-4.3852 4.3852 0 1.427 0.67991 2.6902 1.7335 3.4908 0.44418-0.85669 1.3363-1.4406 2.3668-1.4406 0.12454 0 0.24408 0.0151 0.36412 0.0317-0.03768-0.27414-0.05541-0.55461-0.05541-0.83905 0-1.3599 0.44267-2.6175 1.1952-3.6332-0.45049-0.56371-0.77288-1.241-0.91029-1.9789-0.10184-0.007-0.20505-0.0158-0.30871-0.0158zm13.741 2.6121c-0.73606 0-1.4255 0.18792-2.0343 0.5066 0.34567 0.76568 0.53826 1.6152 0.53826 2.5092 0 1.674-0.67302 3.1939-1.7652 4.2982 0.80233 0.89076 1.9664 1.4486 3.2612 1.4486 2.4241 0 4.3852-1.9612 4.3852-4.3852 0-2.4241-1.9612-4.3773-4.3852-4.3773zm-18.554 0.57788c-2.2321-0.001-4.044 1.795-4.044 4.028s1.8119 4.0449 4.0449 4.0449c0.84991 0 1.6372-0.2648 2.2876-0.7124-0.26875-0.41761-0.42744-0.91688-0.42744-1.4486 0-0.27596 0.04072-0.54107 0.11873-0.79156-1.2176-0.87992-2.0106-2.3118-2.0106-3.9261 0-0.41016 0.05405-0.80676 0.1504-1.1873-0.03999-0.001-0.07845-0.008-0.11874-0.008zm23.739 3.467c-0.11912 0-0.23439 0.0136-0.34828 0.0317 0.0063 0.10069 0.0079 0.19852 0.0079 0.30079 0 1.2875-0.50802 2.4561-1.3298 3.3245 0.4043 0.47015 0.99816 0.76781 1.6702 0.76781 1.2241 0 2.2164-0.98433 2.2164-2.2084s-0.99225-2.2164-2.2164-2.2164zm-19.211 0.23746c-1.224 0-2.2084 0.9844-2.2084 2.2084s0.98439 2.2164 2.2084 2.2164c0.93825 0 1.7346-0.58546 2.058-1.409-0.78913-0.80372-1.3563-1.8291-1.6069-2.9683-0.14664-0.0303-0.29548-0.0475-0.45119-0.0475z" fill="#fff"/> </svg> diff --git a/core/img/filetypes/application-epub+zip.png b/core/img/filetypes/application-epub+zip.png Binary files differindex b3e3b28b4d5..2399088b28a 100644 --- a/core/img/filetypes/application-epub+zip.png +++ b/core/img/filetypes/application-epub+zip.png diff --git a/core/img/filetypes/application-epub+zip.svg b/core/img/filetypes/application-epub+zip.svg index 041f9f15e68..7de28f4f216 100644 --- a/core/img/filetypes/application-epub+zip.svg +++ b/core/img/filetypes/application-epub+zip.svg @@ -1,761 +1,74 @@ <?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:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg3194" - version="1.1" - inkscape:version="0.48.3.1 r9886" - sodipodi:docname="application-epub+zip.svg" - inkscape:export-filename="application-epub+zip.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs3196"> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3195" - id="linearGradient3066" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.502671,0,0,0.64629877,3.711822,0.79617735)" - x1="23.99999" - y1="14.915504" - x2="23.99999" - y2="32.595779" /> - <linearGradient - id="linearGradient3195"> - <stop - id="stop3197" - style="stop-color:#ffffff;stop-opacity:1" - offset="0" /> - <stop - id="stop3199" - style="stop-color:#ffffff;stop-opacity:0.23529412" - offset="0.12291458" /> - <stop - id="stop3201" - style="stop-color:#ffffff;stop-opacity:0.15686275" - offset="0.93706012" /> - <stop - id="stop3203" - style="stop-color:#ffffff;stop-opacity:0.39215687" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-7" - id="radialGradient3069" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,0.96917483,-0.82965977,0,24.014205,-1.7852207)" - cx="10.90426" - cy="8.4497671" - fx="10.90426" - fy="8.4497671" - r="19.99999" /> - <linearGradient - id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-7"> - <stop - id="stop5430-8-6" - style="stop-color:#5f5f5f;stop-opacity:1" - offset="0" /> - <stop - id="stop5432-3-5" - style="stop-color:#4f4f4f;stop-opacity:1" - offset="0.26238" /> - <stop - id="stop5434-1-6" - style="stop-color:#3b3b3b;stop-opacity:1" - offset="0.704952" /> - <stop - id="stop5436-8-9" - style="stop-color:#2b2b2b;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-7" - id="linearGradient3071" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.65627449,0,0,0.6892852,1.2531134,-0.21112011)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-7"> - <stop - id="stop5440-4-4" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-5" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3731" - id="linearGradient3075" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.56756757,0,0,0.67567567,2.3783793,-0.21620881)" - x1="23.99999" - y1="4.999989" - x2="23.99999" - y2="43" /> - <linearGradient - id="linearGradient3731"> - <stop - id="stop3733" - style="stop-color:#ffffff;stop-opacity:1" - offset="0" /> - <stop - id="stop3735" - style="stop-color:#ffffff;stop-opacity:0.23529412" - offset="0.02706478" /> - <stop - id="stop3737" - style="stop-color:#ffffff;stop-opacity:0.15686275" - offset="0.97377032" /> - <stop - id="stop3739" - style="stop-color:#ffffff;stop-opacity:0.39215687" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8" - id="radialGradient3078" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165708e-8,1.6179162,-1.483354,-2.9808191e-8,28.734063,-9.2240923)" - cx="7.4956832" - cy="8.4497671" - fx="7.4956832" - fy="8.4497671" - r="19.99999" /> - <linearGradient - id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8"> - <stop - id="stop5430-8" - style="stop-color:#5f5f5f;stop-opacity:1" - offset="0" /> - <stop - id="stop5432-3" - style="stop-color:#4f4f4f;stop-opacity:1" - offset="0.26238" /> - <stop - id="stop5434-1" - style="stop-color:#3b3b3b;stop-opacity:1" - offset="0.704952" /> - <stop - id="stop5436-8" - style="stop-color:#2b2b2b;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6" - id="linearGradient3080" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.60000001,0,0,0.69230771,1.8000008,-0.61538474)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6"> - <stop - id="stop5440-4" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8967-1" - id="radialGradient3083" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,1.8069473,-2.0594306,0,30.190262,-41.983847)" - cx="24.501682" - cy="6.6475959" - fx="24.501682" - fy="6.6475959" - r="17.49832" /> - <linearGradient - id="linearGradient8967"> - <stop - id="stop8969" - style="stop-color:#ddcfbd;stop-opacity:1" - offset="0" /> - <stop - id="stop8971" - style="stop-color:#856f50;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3319-1" - id="linearGradient3085" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.45330736,0,0,0.48530928,1.9941631,0.11705426)" - x1="32.901409" - y1="4.6481781" - x2="32.901409" - y2="61.481758" /> - <linearGradient - id="linearGradient3319"> - <stop - id="stop3321" - style="stop-color:#a79071;stop-opacity:1" - offset="0" /> - <stop - id="stop3323" - style="stop-color:#6f5d45;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2346" - id="linearGradient3088" - gradientUnits="userSpaceOnUse" - x1="10.654308" - y1="1" - x2="10.654308" - y2="3" - gradientTransform="matrix(0.60000001,0,0,0.75000464,0.6000147,0.12497942)" /> - <linearGradient - id="linearGradient2346"> - <stop - id="stop2348" - style="stop-color:#eeeeee;stop-opacity:1" - offset="0" /> - <stop - id="stop2350" - style="stop-color:#d9d9da;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2" - id="linearGradient3090" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.60000001,0,0,0.07692307,1.8001714,0.15384638)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2"> - <stop - id="stop5440-4-8" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-8" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - id="linearGradient3101"> - <stop - offset="0" - style="stop-color:#9b876c;stop-opacity:1" - id="stop3103" /> - <stop - offset="0.95429963" - style="stop-color:#9b876c;stop-opacity:1" - id="stop3105" /> - <stop - offset="0.95717829" - style="stop-color:#c2c2c2;stop-opacity:1" - id="stop3107" /> - <stop - offset="1" - style="stop-color:#c2c2c2;stop-opacity:1" - id="stop3109" /> - </linearGradient> - <linearGradient - y2="4.882647" - x2="24.640038" - y1="3.1234391" - x1="24.62738" - gradientTransform="matrix(0.69041563,0,0,1.0164576,0.2501926,-2.4916513)" - gradientUnits="userSpaceOnUse" - id="linearGradient3190" - xlink:href="#linearGradient2346" - inkscape:collect="always" /> - <linearGradient - y2="0.065301567" - x2="54.887218" - y1="0.065301567" - x1="5.2122574" - gradientTransform="matrix(0.49253714,0,0,0.4937733,0.8902917,0.14413039)" - gradientUnits="userSpaceOnUse" - id="linearGradient3192" - xlink:href="#linearGradient3911" - inkscape:collect="always" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3688-166-749" - id="radialGradient2976" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" - cx="4.9929786" - cy="43.5" - fx="4.9929786" - fy="43.5" - r="2.5" /> - <linearGradient - id="linearGradient3688-166-749"> - <stop - id="stop2883" - style="stop-color:#181818;stop-opacity:1" - offset="0" /> - <stop - id="stop2885" - style="stop-color:#181818;stop-opacity:0" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3688-464-309" - id="radialGradient2978" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" - cx="4.9929786" - cy="43.5" - fx="4.9929786" - fy="43.5" - r="2.5" /> - <linearGradient - id="linearGradient3688-464-309"> - <stop - id="stop2889" - style="stop-color:#181818;stop-opacity:1" - offset="0" /> - <stop - id="stop2891" - style="stop-color:#181818;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3702-501-757" - id="linearGradient2980" - gradientUnits="userSpaceOnUse" - x1="25.058096" - y1="47.027729" - x2="25.058096" - y2="39.999443" /> - <linearGradient - id="linearGradient3702-501-757"> - <stop - id="stop2895" - style="stop-color:#181818;stop-opacity:0" - offset="0" /> - <stop - id="stop2897" - style="stop-color:#181818;stop-opacity:1" - offset="0.5" /> - <stop - id="stop2899" - style="stop-color:#181818;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3100" - id="linearGradient3072" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.40540539,0,0,0.45945944,-21.967425,1.9253706)" - x1="23.99999" - y1="4.431067" - x2="24.107431" - y2="43.758408" /> - <linearGradient - id="linearGradient3100"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3102" /> - <stop - offset="0.06169702" - style="stop-color:#ffffff;stop-opacity:0.23529412" - id="stop3104" /> - <stop - offset="0.93279684" - style="stop-color:#ffffff;stop-opacity:0.15686275" - id="stop3106" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0.39215687" - id="stop3108" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-3" - id="radialGradient3075" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,1.1385335,-0.98890268,-2.0976135e-8,-4.5816524,-4.7978939)" - cx="7.4956832" - cy="8.4497671" - fx="7.4956832" - fy="8.4497671" - r="19.99999" /> - <linearGradient - id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-3"> - <stop - id="stop5430-8-4" - style="stop-color:#5f5f5f;stop-opacity:1" - offset="0" /> - <stop - id="stop5432-3-0" - style="stop-color:#4f4f4f;stop-opacity:1" - offset="0.26238" /> - <stop - id="stop5434-1-7" - style="stop-color:#3b3b3b;stop-opacity:1" - offset="0.704952" /> - <stop - id="stop5436-8-7" - style="stop-color:#2b2b2b;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-77" - id="linearGradient3077" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.40000001,0,0,0.48717951,-22.537695,1.2600855)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-77"> - <stop - id="stop5440-4-82" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-9" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8967-1" - id="radialGradient3080" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,1.2711776,-1.4972812,0,-1.7843744,-27.838648)" - cx="24.501682" - cy="6.6475959" - fx="24.501682" - fy="6.6475959" - r="17.49832" /> - <linearGradient - id="linearGradient8967-1"> - <stop - id="stop8969-2" - style="stop-color:#c4ea71;stop-opacity:1;" - offset="0" /> - <stop - id="stop8971-2" - style="stop-color:#7c9d35;stop-opacity:1;" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3319-1" - id="linearGradient3082" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.32957099,0,0,0.34141245,-22.283968,1.7791087)" - x1="32.901409" - y1="4.6481781" - x2="32.901409" - y2="61.481758" /> - <linearGradient - id="linearGradient3319-1"> - <stop - id="stop3321-3" - style="stop-color:#96bf3e;stop-opacity:1;" - offset="0" /> - <stop - id="stop3323-6" - style="stop-color:#4d6b0d;stop-opacity:1;" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2346-4" - id="linearGradient3085-0" - gradientUnits="userSpaceOnUse" - x1="10.654308" - y1="1" - x2="10.654308" - y2="3" - gradientTransform="matrix(0.39999999,0,0,0.50000335,-23.337674,1.202378)" /> - <linearGradient - id="linearGradient2346-4"> - <stop - id="stop2348-6" - style="stop-color:#eeeeee;stop-opacity:1" - offset="0" /> - <stop - id="stop2350-4" - style="stop-color:#d9d9da;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2-9" - id="linearGradient3087" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.39999999,0,0,0.05128207,-22.537569,1.2216233)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2-9"> - <stop - id="stop5440-4-8-9" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-8-1" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2346-4" - id="linearGradient3090-0" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.52589466,0,0,1.0164584,-24.496147,-1.5392617)" - x1="24.640038" - y1="3.3805361" - x2="24.640038" - y2="4.4969802" /> - <linearGradient - id="linearGradient3159"> - <stop - id="stop3161" - style="stop-color:#eeeeee;stop-opacity:1" - offset="0" /> - <stop - id="stop3163" - style="stop-color:#d9d9da;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3911" - id="linearGradient3092" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.37516915,0,0,0.49377366,-24.008579,1.096522)" - x1="10.199131" - y1="0.065301567" - x2="54.887218" - y2="0.065301567" /> - <linearGradient - id="linearGradient3911"> - <stop - id="stop3913" - style="stop-color:#96bf3e;stop-opacity:1;" - offset="0" /> - <stop - id="stop3915" - style="stop-color:#4d6b0d;stop-opacity:1;" - offset="1" /> - </linearGradient> - <radialGradient - r="2.5" - fy="43.5" - fx="4.9929786" - cy="43.5" - cx="4.9929786" - gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" - gradientUnits="userSpaceOnUse" - id="radialGradient3082-993" - xlink:href="#linearGradient3688-166-749-49" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3688-166-749-49"> - <stop - offset="0" - style="stop-color:#181818;stop-opacity:1" - id="stop3079" /> - <stop - offset="1" - style="stop-color:#181818;stop-opacity:0" - id="stop3081" /> - </linearGradient> - <radialGradient - r="2.5" - fy="43.5" - fx="4.9929786" - cy="43.5" - cx="4.9929786" - gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" - gradientUnits="userSpaceOnUse" - id="radialGradient3084-992" - xlink:href="#linearGradient3688-464-309-276" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3688-464-309-276"> - <stop - offset="0" - style="stop-color:#181818;stop-opacity:1" - id="stop3085" /> - <stop - offset="1" - style="stop-color:#181818;stop-opacity:0" - id="stop3087" /> - </linearGradient> - <linearGradient - y2="39.999443" - x2="25.058096" - y1="47.027729" - x1="25.058096" - gradientUnits="userSpaceOnUse" - id="linearGradient3086-631" - xlink:href="#linearGradient3702-501-757-979" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3702-501-757-979"> - <stop - offset="0" - style="stop-color:#181818;stop-opacity:0" - id="stop3091" /> - <stop - offset="0.5" - style="stop-color:#181818;stop-opacity:1" - id="stop3093" /> - <stop - offset="1" - style="stop-color:#181818;stop-opacity:0" - id="stop3095" /> - </linearGradient> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="6.0877475" - inkscape:cx="26.638683" - inkscape:cy="15.835736" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1075" - inkscape:window-height="715" - inkscape:window-x="289" - inkscape:window-y="24" - inkscape:window-maximized="0" /> - <metadata - id="metadata3199"> - <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 - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - style="display:inline" - id="g2036" - transform="matrix(0.64999974,0,0,0.3333336,0.39999974,15.33333)"> - <g - style="opacity:0.4" - id="g3712" - transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"> - <rect - style="fill:url(#radialGradient2976);fill-opacity:1;stroke:none" - id="rect2801" - y="40" - x="38" - height="7" - width="5" /> - <rect - style="fill:url(#radialGradient2978);fill-opacity:1;stroke:none" - id="rect3696" - transform="scale(-1,-1)" - y="-47" - x="-10" - height="7" - width="5" /> - <rect - style="fill:url(#linearGradient2980);fill-opacity:1;stroke:none" - id="rect3700" - y="40" - x="10" - height="7.0000005" - width="28" /> - </g> - </g> - <path - inkscape:connector-curvature="0" - style="fill:url(#linearGradient3190);fill-opacity:1;stroke:url(#linearGradient3192);stroke-width:1.01739752;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="path2723" - d="M 27.491301,2.3043778 C 27.288172,1.6493136 27.414776,1.1334476 27.302585,0.5086989 l -20.7938863,0 0.1227276,1.9826025" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:url(#linearGradient3088);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3090);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect5505-21-3-9" - d="m 7.5001709,3.5 -2.4000002,0 C 4.7576618,3.5 4.5001708,3.46825 4.5001708,3.426829 l 0,-2.0973288 c 0,-0.66594375 0.3354193,-0.82950023 0.7745366,-0.82950023 l 2.2254635,0" /> - <rect - ry="0.5" - style="fill:url(#radialGradient3083);fill-opacity:1.0;stroke:url(#linearGradient3085);stroke-width:1.01904130000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect2719" - y="2.5095644" - x="5.5095205" - rx="0.5" - height="26.980959" - width="21.980959" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:url(#radialGradient3078);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3080);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect5505-21-3" - d="m 7.5,2.5000001 c 0,0 0,18.7742959 0,26.9999999 l -2.4,0 c -0.3425089,0 -0.6,-0.285772 -0.6,-0.658537 l 0,-26.3414629 z" /> - <rect - style="opacity:0.5;fill:none;stroke:url(#linearGradient3075);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="rect6741-0" - y="3.5000002" - x="5.5" - height="25" - width="21" /> - <path - id="path3859" - d="m 16.999886,20.304641 -3.77084,-3.713998 3.77084,-3.71347 1.25705,1.237774 -2.514099,2.475696 1.256974,1.237999 3.770839,-3.713469 -3.284841,-3.235063 c -0.268233,-0.264393 -0.703306,-0.264393 -0.971768,0 l -5.312867,5.232353 c -0.268232,0.264166 -0.268232,0.692646 0,0.95704 l 5.312944,5.232203 c 0.268462,0.264392 0.703534,0.264392 0.971766,0 l 5.312942,-5.232203 c 0.268231,-0.264394 0.268231,-0.692874 0,-0.95704 l -0.77128,-0.759367 -5.02766,4.951545 z" - inkscape:connector-curvature="0" - style="opacity:0.2;fill:#000000;fill-opacity:1" /> - <path - style="fill:#ffffff;fill-opacity:1" - inkscape:connector-curvature="0" - d="m 16.999886,19.122826 -3.77084,-3.713998 3.77084,-3.713469 1.25705,1.237773 -2.514099,2.475696 1.256974,1.238 3.770839,-3.71347 -3.284841,-3.2350632 c -0.268233,-0.2643933 -0.703306,-0.2643933 -0.971768,0 l -5.312867,5.2323532 c -0.268232,0.264167 -0.268232,0.692647 0,0.95704 l 5.312944,5.232203 c 0.268462,0.264392 0.703534,0.264392 0.971766,0 l 5.312942,-5.232203 c 0.268231,-0.264393 0.268231,-0.692873 0,-0.95704 l -0.77128,-0.759366 -5.02766,4.951544 z" - id="path10" /> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs> + <linearGradient id="l" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .67568 2.3784 -.21621)" y1="5" x1="24"> + <stop stop-color="#fff" offset="0"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".027065"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".97377"/> + <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> + </linearGradient> + <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.1657e-8 1.6179 -1.4834 -2.9808e-8 28.734 -9.2241)" r="20"> + <stop stop-color="#5f5f5f" offset="0"/> + <stop stop-color="#4f4f4f" offset=".26238"/> + <stop stop-color="#3b3b3b" offset=".70495"/> + <stop stop-color="#2b2b2b" offset="1"/> + </radialGradient> + <linearGradient id="k" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .69231 1.8 -.61538)" y1="44" x1="24"> + <stop stop-color="#272727" offset="0"/> + <stop stop-color="#454545" offset="1"/> + </linearGradient> + <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="6.6476" cx="24.502" gradientTransform="matrix(0 1.8069 -2.0594 0 30.19 -41.984)" r="17.498"> + <stop stop-color="#c4ea71" offset="0"/> + <stop stop-color="#7c9d35" offset="1"/> + </radialGradient> + <linearGradient id="j" y2="61.482" gradientUnits="userSpaceOnUse" x2="32.901" gradientTransform="matrix(.45331 0 0 .48531 1.9942 .11705)" y1="4.6482" x1="32.901"> + <stop stop-color="#96bf3e" offset="0"/> + <stop stop-color="#4d6b0d" offset="1"/> + </linearGradient> + <linearGradient id="i" y2="3" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="10.654" gradientTransform="matrix(0.6 0 0 0.75 .60001 .12498)" y1="1" x1="10.654"/> + <linearGradient id="a"> + <stop stop-color="#eee" offset="0"/> + <stop stop-color="#d9d9da" offset="1"/> + </linearGradient> + <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .076923 1.8002 .15385)" y1="44" x1="24"> + <stop stop-color="#272727" offset="0"/> + <stop stop-color="#454545" offset="1"/> + </linearGradient> + <linearGradient id="g" y2="4.8826" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="3.1234" gradientTransform="matrix(.69042 0 0 1.0165 .25019 -2.4917)" x2="24.64" x1="24.627"/> + <linearGradient id="f" y2=".065302" gradientUnits="userSpaceOnUse" y1=".065302" gradientTransform="matrix(.49254 0 0 .49377 .89029 .14413)" x2="54.887" x1="5.2123"> + <stop stop-color="#96bf3e" offset="0"/> + <stop stop-color="#4d6b0d" offset="1"/> + </linearGradient> + <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> + <stop stop-color="#181818" offset="0"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </radialGradient> + <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> + <stop stop-color="#181818" offset="0"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </radialGradient> + <linearGradient id="m" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058"> + <stop stop-color="#181818" stop-opacity="0" offset="0"/> + <stop stop-color="#181818" offset=".5"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </linearGradient> + </defs> + <g transform="matrix(0.65 0 0 .33333 0.4 15.333)"> + <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)"> + <rect height="7" width="5" y="40" x="38" fill="url(#e)"/> + <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#d)"/> + <rect height="7" width="28" y="40" x="10" fill="url(#m)"/> </g> + </g> + <g stroke-linejoin="round"> + <path d="m27.491 2.3044c-0.203-0.6551-0.076-1.171-0.188-1.7957h-20.794l0.12273 1.9826" stroke="url(#f)" stroke-miterlimit="0" stroke-width="1.0174" fill="url(#g)"/> + <g stroke-linecap="round"> + <path style="color:#000000" d="m7.5002 3.5h-2.4c-0.3425 0-0.6-0.0318-0.6-0.0732v-2.0973c0-0.66594 0.33542-0.8295 0.77454-0.8295h2.2255" stroke="url(#h)" fill="url(#i)"/> + <rect rx=".5" ry=".5" height="26.981" width="21.981" stroke="url(#j)" stroke-miterlimit="0" y="2.5096" x="5.5095" stroke-width="1.019" fill="url(#b)"/> + <path style="color:#000000" d="m7.5 2.5v27h-2.4c-0.34251 0-0.6-0.28577-0.6-0.65854v-26.341z" stroke="url(#k)" fill="url(#c)"/> + <rect opacity=".5" height="25" width="21" stroke="url(#l)" y="3.5" x="5.5" fill="none"/> + </g> + </g> + <path opacity=".2" d="m17 20.305-3.7708-3.714 3.7708-3.7135 1.257 1.2378-2.5141 2.4757 1.257 1.238 3.7708-3.7135-3.2848-3.2351c-0.26823-0.26439-0.70331-0.26439-0.97177 0l-5.3129 5.2324c-0.26823 0.26417-0.26823 0.69265 0 0.95704l5.3129 5.2322c0.26846 0.26439 0.70353 0.26439 0.97177 0l5.3129-5.2322c0.26823-0.26439 0.26823-0.69287 0-0.95704l-0.77128-0.75937-5.0277 4.9515z"/> + <path d="m17 19.123-3.7708-3.714 3.7708-3.7135 1.257 1.2378-2.5141 2.4757 1.257 1.238 3.7708-3.7135-3.2848-3.2351c-0.26823-0.26439-0.70331-0.26439-0.97177 0l-5.3129 5.2324c-0.26823 0.26417-0.26823 0.69265 0 0.95704l5.3129 5.2322c0.26846 0.26439 0.70353 0.26439 0.97177 0l5.3129-5.2322c0.26823-0.26439 0.26823-0.69287 0-0.95704l-0.77128-0.75937-5.0277 4.9515z" fill="#fff"/> </svg> diff --git a/core/img/filetypes/application-javascript.png b/core/img/filetypes/application-javascript.png Binary files differnew file mode 100644 index 00000000000..1e1d3140f63 --- /dev/null +++ b/core/img/filetypes/application-javascript.png diff --git a/core/img/filetypes/application-javascript.svg b/core/img/filetypes/application-javascript.svg new file mode 100644 index 00000000000..4e9819bb685 --- /dev/null +++ b/core/img/filetypes/application-javascript.svg @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs> + <linearGradient id="f" x1="29.465" gradientUnits="userSpaceOnUse" y1="17.607" gradientTransform="translate(4.1161 -1.6069)" x2="29.465" y2="34.607"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".17647"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".82353"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> + </linearGradient> + <linearGradient id="g" x1="13.884" gradientUnits="userSpaceOnUse" y1="12.607" gradientTransform="translate(4.1161 -1.6069)" x2="13.884" y2="41.607"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".82759"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> + </linearGradient> + <linearGradient id="j" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749"> + <stop stop-color="#a3a3a3" offset="0"/> + <stop stop-color="#bababa" offset="1"/> + </linearGradient> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> + </linearGradient> + <linearGradient id="l" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013"> + <stop stop-color="#f4f4f4" offset="0"/> + <stop stop-color="#dbdbdb" offset="1"/> + </linearGradient> + <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062"> + <stop stop-color="#a0a0a0" offset="0"/> + <stop stop-color="#bebebe" offset="1"/> + </linearGradient> + <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> + </linearGradient> + <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/> + <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> + </linearGradient> + <radialGradient id="b" fx="8.5513" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.0816" gradientTransform="matrix(0 7.0761 -7.4527 0 100.32 -66.262)" r="12.672"> + <stop stop-color="#ffcd7d" offset="0"/> + <stop stop-color="#fc8f36" offset=".26238"/> + <stop stop-color="#e23a0e" offset=".70495"/> + <stop stop-color="#ac441f" offset="1"/> + </radialGradient> + <linearGradient id="i" x1="25" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="translate(2.1239 -1.9451)" x2="25" y2="4.9451"> + <stop stop-color="#ba3d12" offset="0"/> + <stop stop-color="#db6737" offset="1"/> + </linearGradient> + </defs> + <g transform="scale(.66667)"> + <g> + <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#e)"/> + <path opacity=".3" fill="url(#c)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/> + <path opacity=".3" fill="url(#d)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/> + </g> + <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#k)" stroke-width=".99992" fill="url(#l)"/> + <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#h)" stroke-linecap="round" fill="none"/> + <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#j)"/> + <g stroke-linejoin="round"> + <path style="color:#000000" d="m37.105 28.194c-0.000013 0.91667-0.16668 1.7188-0.5 2.4062-0.33335 0.6875-0.8073 1.2604-1.4219 1.7188-0.61459 0.45833-1.3594 0.80208-2.2344 1.0312-0.87501 0.22917-1.8542 0.34375-2.9375 0.34375-0.57292 0-1.1042-0.02083-1.5938-0.0625-0.48959-0.03125-0.95313-0.08854-1.3906-0.17188-0.4375-0.08333-0.85938-0.1875-1.2656-0.3125-0.40625-0.125-0.81771-0.28125-1.2344-0.46875v-3.9375c0.4375 0.21876 0.89583 0.41667 1.375 0.59375 0.48958 0.17709 0.97395 0.33334 1.4531 0.46875 0.47916 0.125 0.9427 0.22396 1.3906 0.29688 0.45833 0.07292 0.8802 0.10938 1.2656 0.10938 0.42708 0.000004 0.79166-0.03646 1.0938-0.10938 0.30208-0.08333 0.54687-0.1927 0.73438-0.32812 0.19791-0.14583 0.33853-0.3125 0.42188-0.5 0.09374-0.19791 0.14062-0.40624 0.14062-0.625-0.000008-0.21874-0.03647-0.41145-0.10938-0.57812-0.06251-0.17708-0.21355-0.35937-0.45312-0.54688-0.23959-0.19791-0.59376-0.41666-1.0625-0.65625-0.45834-0.24999-1.0781-0.55208-1.8594-0.90625-0.76042-0.34374-1.4219-0.68228-1.9844-1.0156-0.55209-0.34374-1.0104-0.72395-1.375-1.1406-0.35417-0.41666-0.61979-0.89061-0.79688-1.4219-0.17708-0.54166-0.26563-1.1823-0.26562-1.9219-0.000001-0.81249 0.15625-1.5208 0.46875-2.125 0.3125-0.61457 0.75521-1.125 1.3281-1.5312 0.57291-0.40623 1.2604-0.70832 2.0625-0.90625 0.8125-0.20832 1.7135-0.31248 2.7031-0.3125 1.0417 0.000018 2.0312 0.11981 2.9688 0.35938 0.93749 0.2396 1.901 0.59898 2.8906 1.0781l-1.4375 3.375c-0.794-0.376-1.549-0.683-2.268-0.923-0.71876-0.23957-1.4375-0.35936-2.1562-0.35938-0.64584 0.000015-1.1146 0.1146-1.4062 0.34375-0.28126 0.22918-0.42188 0.54168-0.42188 0.9375-0.000005 0.20835 0.03645 0.39585 0.10938 0.5625 0.07291 0.15626 0.21874 0.32293 0.4375 0.5 0.21874 0.16668 0.52603 0.35418 0.92188 0.5625 0.39582 0.19793 0.91145 0.44272 1.5469 0.73438 0.73957 0.32293 1.4062 0.64584 2 0.96875 0.59374 0.31251 1.1042 0.67188 1.5312 1.0781 0.42707 0.40626 0.7552 0.88022 0.98438 1.4219 0.22915 0.54167 0.34374 1.1979 0.34375 1.9688m-24.526 11.906c-0.67708-0.000006-1.2708-0.03646-1.7812-0.10938-0.511-0.063-0.9428-0.141-1.297-0.235v-4.0312c0.38542 0.08333 0.79167 0.15625 1.2188 0.21875 0.41667 0.0625 0.875 0.09375 1.375 0.09375 0.47917-0.000002 0.92188-0.05209 1.3281-0.15625 0.41666-0.10417 0.77604-0.28646 1.0781-0.54688 0.3125-0.25 0.55208-0.58854 0.71875-1.0156 0.17708-0.42708 0.26562-0.96354 0.26562-1.6094v-22.172h5.0906v22.016c0 1.3125-0.19272 2.4427-0.57812 3.3906-0.37501 0.94791-0.90626 1.7292-1.5938 2.3438-0.67709 0.625-1.4896 1.0833-2.4375 1.375-0.948 0.29-1.995 0.436-3.141 0.436z" stroke="url(#i)" fill="url(#b)"/> + <path opacity=".5" style="color:#000000" d="m16.531 11.562v21.156c-0.000003 0.74521-0.14604 1.4057-0.375 1.9688h0.03125c-0.0053 0.01356-0.02582 0.01774-0.03125 0.03125-0.21291 0.52977-0.51641 1.033-0.96875 1.4062-0.01075 0.0093-0.02039 0.02213-0.03125 0.03125-0.42364 0.35547-0.94402 0.58756-1.4688 0.71875-0.5068 0.12994-1.0399 0.1875-1.5938 0.1875-0.54293 0-1.0548-0.02228-1.5312-0.09375-0.01053-0.0015-0.02074 0.0016-0.03125 0v1.9375c0.14199 0.02453 0.25 0.04337 0.40625 0.0625a1.0305 1.0305 0 0 1 0.03125 0c0.4327 0.06181 0.93779 0.09374 1.5938 0.09375h0.25c1.0584-0.000006 2.0104-0.14984 2.8438-0.40625 0.8161-0.25111 1.5028-0.60837 2.0625-1.125a1.0305 1.0305 0 0 1 0 -0.03125c0.56066-0.5012 0.98871-1.119 1.3125-1.9375 0.32074-0.78887 0.5-1.7802 0.5-3v-21h-3z" stroke="url(#g)" fill="none"/> + <path opacity=".5" style="color:#000000" d="m31.062 16.625c-0.91729 0.000017-1.7568 0.09872-2.4688 0.28125-0.6983 0.17232-1.2665 0.42933-1.7188 0.75-0.43783 0.31048-0.75495 0.67432-1 1.1562-0.22591 0.43677-0.34375 0.97587-0.34375 1.6562-0.000001 0.67187 0.0572 1.1952 0.1875 1.5938 0.13076 0.39228 0.3626 0.74863 0.625 1.0625 0.27891 0.31876 0.63321 0.6313 1.125 0.9375 0.54028 0.32018 1.1571 0.64423 1.875 0.96875 0.78022 0.35371 1.4056 0.66564 1.9062 0.9375 0.0091 0.0047 0.02219-0.0047 0.03125 0 0.48031 0.2467 0.86296 0.48708 1.1875 0.75 0.01 0.0081 0.02142 0.02313 0.03125 0.03125 0.29407 0.23569 0.56733 0.5282 0.71875 0.90625 0.0064 0.0161-0.006 0.04609 0 0.0625 0.0023 0.0064 0.02897-0.0065 0.03125 0 0.11318 0.2766 0.18749 0.5805 0.1875 0.9375-0.000015 0.40344-0.11735 0.74498-0.25 1.0312-0.0031 0.0069 0.0032 0.02432 0 0.03125h-0.03125c-0.14902 0.31791-0.36691 0.67002-0.6875 0.90625a1.0305 1.0305 0 0 1 -0.03125 0c-0.37162 0.26839-0.71579 0.37311-1.0625 0.46875a1.0305 1.0305 0 0 1 -0.03125 0c-0.376 0.092-0.832 0.157-1.343 0.157-0.47826 0.000005-0.9298-0.0492-1.4062-0.125-0.45579-0.07419-0.96671-0.17338-1.5-0.3125a1.0305 1.0305 0 0 1 -0.03125 0c-0.50955-0.144-0.9949-0.3173-1.5-0.5v1.6562c0.16564 0.0631 0.33735 0.13746 0.5 0.1875 0.3613 0.11117 0.74977 0.23508 1.1562 0.3125 0.37252 0.07096 0.77865 0.09491 1.25 0.125a1.0305 1.0305 0 0 1 0.03125 0c0.45573 0.03879 0.95205 0.0625 1.5 0.0625 1.0107 0 1.9133-0.10974 2.6875-0.3125 0.77223-0.20225 1.389-0.48131 1.875-0.84375 0.4815-0.35909 0.82413-0.78767 1.0938-1.3438 0.25489-0.52574 0.40624-1.177 0.40625-1.9688-0.000011-0.66872-0.08918-1.1823-0.25-1.5625-0.17948-0.42419-0.42147-0.74998-0.75-1.0625-0.35949-0.34194-0.77277-0.66986-1.2812-0.9375a1.0305 1.0305 0 0 1 -0.03125 0c-0.56267-0.306-1.1894-0.62451-1.9062-0.9375a1.0305 1.0305 0 0 1 -0.03125 0c-0.62352-0.28619-1.1526-0.52942-1.5938-0.75-0.43674-0.22984-0.78885-0.44773-1.0625-0.65625a1.0305 1.0305 0 0 1 -0.03125 0c-0.29046-0.23511-0.54194-0.49605-0.71875-0.875a1.0305 1.0305 0 0 1 0 -0.03125c-0.11448-0.26163-0.21876-0.58868-0.21875-0.96875-0.000008-0.667 0.32053-1.3491 0.8125-1.75a1.0305 1.0305 0 0 1 0.03125 0c0.58219-0.45741 1.2635-0.56248 2.0312-0.5625 0.81828 0.000017 1.6395 0.12985 2.4688 0.40625 0.46119 0.15374 0.94101 0.36068 1.4062 0.5625l0.625-1.4375c-0.604-0.25-1.22-0.541-1.783-0.684-0.838-0.215-1.746-0.313-2.719-0.313z" stroke="url(#f)" fill="none"/> + </g> + </g> +</svg> diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png Binary files differindex a9ab6d279b6..74676372671 100644 --- a/core/img/filetypes/application-pdf.png +++ b/core/img/filetypes/application-pdf.png diff --git a/core/img/filetypes/application-pdf.svg b/core/img/filetypes/application-pdf.svg index 47c2caabdad..b671e98725d 100644 --- a/core/img/filetypes/application-pdf.svg +++ b/core/img/filetypes/application-pdf.svg @@ -1,52 +1,48 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="e" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="d" y2="54.78" gradientUnits="userSpaceOnUse" x2="167.98" gradientTransform="matrix(.44444 0 0 .44444 -24 2.7778)" y1="8.5081" x1="167.98"> + <linearGradient id="i" x1="167.98" gradientUnits="userSpaceOnUse" y1="8.5081" gradientTransform="matrix(.44444 0 0 .44444 -24 2.7778)" x2="167.98" y2="54.78"> <stop stop-color="#fffdf3" offset="0"/> <stop stop-color="#fbebeb" offset="1"/> </linearGradient> - <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="9.9941" cx="8.2761" gradientTransform="matrix(0 4.2742 -5.2474 0 68.489 -37.143)" r="12.672"> + <radialGradient id="l" gradientUnits="userSpaceOnUse" cy="9.9941" cx="8.2761" gradientTransform="matrix(0 4.2742 -5.2474 0 68.489 -37.143)" r="12.672"> <stop stop-color="#f89b7e" offset="0"/> <stop stop-color="#e35d4f" offset=".26238"/> <stop stop-color="#c6262e" offset=".66094"/> <stop stop-color="#690b2c" offset="1"/> </radialGradient> - <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> + <radialGradient id="j" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> <stop stop-color="#181818" offset="0"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> + <radialGradient id="k" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> <stop stop-color="#181818" offset="0"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="f" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058"> + <linearGradient id="g" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058"> <stop stop-color="#181818" stop-opacity="0" offset="0"/> <stop stop-color="#181818" offset=".5"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g transform="matrix(0.7 0 0 .33333 -0.8 15.333)"> + <g transform="matrix(.7 0 0 .33333 -.8 15.333)"> <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)"> - <rect height="7" width="5" y="40" x="38" fill="url(#c)"/> - <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#b)"/> - <rect height="7" width="28" y="40" x="10" fill="url(#f)"/> + <rect y="40" width="5" fill="url(#j)" x="38" height="7"/> + <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#k)"/> + <rect y="40" width="28" fill="url(#g)" x="10" height="7"/> </g> </g> - <g> - <g> - <rect style="color:#000000" rx="2" ry="2" height="25" width="25" y="4.5" x="3.5" fill="url(#a)"/> - <path opacity=".15" style="color:#000000" d="m18.188 4.9688a1.0386 1.0386 0 0 0 -0.46875 0.25c-8.0692 6.9232-12.522 7.7862-13.782 7.8752a1.0386 1.0386 0 0 0 -0.4375 0.125v8.7187a1.0386 1.0386 0 0 0 0.5 0.125c1.2408 0 3.1922 0.83225 5.0625 2.2812 1.726 1.337 3.383 3.164 4.594 5.156h12.844c1.108 0 2-0.892 2-2v-0.125c-1.2349-2.981-2.1282-7.0748-2.8125-10.781-0.003-0.023 0.003-0.0395 0-0.0625-0.61012-4.7373 0.28634-8.959 0.625-10.281a1.0386 1.0386 0 0 0 -1 -1.2812h-6.9062a1.0386 1.0386 0 0 0 -0.21875 0zm0 4.875c-0.19809 1.3497-0.34502 2.9178-0.46875 4.7812-0.23961 3.6087-0.31211 8.3302-0.34375 13.438-1.2326-2.3066-3.3956-4.6736-5.8438-6.6875-1.4134-1.1626-2.8465-2.1591-4.125-2.9062-0.81148-0.4742-1.5307-0.8115-2.2188-1.0312 1.5275-0.29509 3.8744-0.90217 6.625-2.625 2.3056-1.4441 4.5975-3.3663 6.375-4.9687z" fill-rule="evenodd" fill="#661215"/> - <path opacity=".3" style="color:#000000" d="m18.406 6c-8.18 7.019-12.852 8.016-14.406 8.125v2.5312c1.1732-0.164 4.1092-0.751 7.25-2.718 4.027-2.523 8.844-7.313 8.844-7.313-1.302 2.5536-1.684 11.312-1.719 22.875h8.125c0.60271 0 1.1339-0.26843 1.5-0.6875 0.00027-0.0105 0-0.0207 0-0.0312-1.565-3.227-2.576-7.895-3.344-12.062-0.655-4.973 0.298-9.3183 0.656-10.719h-6.9062zm-14.406 12.219v2.8125c3.2857 0 8.2665 3.8155 10.875 8.4688h2.2188c-1.665-4.451-10.589-11.282-13.094-11.282z" fill-rule="evenodd" fill="#661215"/> - <path style="color:#000000" d="m18.408 5c-8.18 7.019-12.854 8.01-14.408 8.119v2.5225c1.1732-0.16382 4.1224-0.73265 7.2632-2.6998 4.0274-2.5225 8.8421-7.3113 8.8421-7.3113-1.32 2.5898-1.705 11.522-1.73 23.333h8.441c0.661 0 1.184-0.523 1.184-1.183-1.565-3.227-2.588-7.893-3.355-12.06-0.656-4.973 0.312-9.3203 0.671-10.721h-6.9079zm-14.408 12.23v2.7938c3.3961 0 8.6171 4.0752 11.143 8.9398h2.1215c-1.187-4.423-10.673-11.734-13.264-11.734z" fill="url(#d)"/> - </g> - <path opacity=".05" d="m25.688 5.0313c-3.216 1.9588-13.74 7.9437-21.688 7.1877v5.4062s17.674 2.6262 24-2.5938v-8.7187c0-0.69873-0.55021-1.2812-1.25-1.2812h-1.0625zm2.312 12.25c-3.181 3.168-6.45 7.386-8.625 11.719h2.5312c1.761-2.975 4.072-6.235 6.094-8.25v-3.4688z" fill-rule="evenodd"/> - </g> - <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#e)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/> + <rect style="color:#000000" rx="2" ry="2" height="25" width="25" y="4.5" x="3.5" fill="url(#l)"/> + <path opacity=".15" style="color:#000000" fill="#661215" d="m18.188 4.9688a1.0386 1.0386 0 0 0 -0.46875 0.25c-8.0692 6.9232-12.522 7.7862-13.782 7.8752a1.0386 1.0386 0 0 0 -0.4375 0.125v8.7187a1.0386 1.0386 0 0 0 0.5 0.125c1.2408 0 3.1922 0.83225 5.0625 2.2812 1.726 1.337 3.383 3.164 4.594 5.156h12.844c1.108 0 2-0.892 2-2v-0.125c-1.2349-2.981-2.1282-7.0748-2.8125-10.781-0.003-0.023 0.003-0.0395 0-0.0625-0.61012-4.7373 0.28634-8.959 0.625-10.281a1.0386 1.0386 0 0 0 -1 -1.2812h-6.9062a1.0386 1.0386 0 0 0 -0.21875 0zm0 4.875c-0.19809 1.3497-0.34502 2.9178-0.46875 4.7812-0.23961 3.6087-0.31211 8.3302-0.34375 13.438-1.2326-2.3066-3.3956-4.6736-5.8438-6.6875-1.4134-1.1626-2.8465-2.1591-4.125-2.9062-0.81148-0.4742-1.5307-0.8115-2.2188-1.0312 1.5275-0.29509 3.8744-0.90217 6.625-2.625 2.3056-1.4441 4.5975-3.3663 6.375-4.9687z" fill-rule="evenodd"/> + <path opacity=".3" style="color:#000000" fill="#661215" d="m18.406 6c-8.18 7.019-12.852 8.016-14.406 8.125v2.5312c1.1732-0.164 4.1092-0.751 7.25-2.718 4.027-2.523 8.844-7.313 8.844-7.313-1.302 2.5536-1.684 11.312-1.719 22.875h8.125c0.60271 0 1.1339-0.26843 1.5-0.6875 0.00027-0.0105 0-0.0207 0-0.0312-1.565-3.227-2.576-7.895-3.344-12.062-0.655-4.973 0.298-9.3183 0.656-10.719h-6.9062zm-14.406 12.219v2.8125c3.2857 0 8.2665 3.8155 10.875 8.4688h2.2188c-1.665-4.451-10.589-11.282-13.094-11.282z" fill-rule="evenodd"/> + <path style="color:#000000" d="m18.408 5c-8.18 7.019-12.854 8.01-14.408 8.119v2.5225c1.1732-0.16382 4.1224-0.73265 7.2632-2.6998 4.0274-2.5225 8.8421-7.3113 8.8421-7.3113-1.32 2.5898-1.705 11.522-1.73 23.333h8.441c0.661 0 1.184-0.523 1.184-1.183-1.565-3.227-2.588-7.893-3.355-12.06-0.656-4.973 0.312-9.3203 0.671-10.721h-6.9079zm-14.408 12.23v2.7938c3.3961 0 8.6171 4.0752 11.143 8.9398h2.1215c-1.187-4.423-10.673-11.734-13.264-11.734z" fill="url(#i)"/> + <path opacity=".05" d="m25.688 5.0313c-3.216 1.9588-13.74 7.9437-21.688 7.1877v5.4062s17.674 2.6262 24-2.5938v-8.7187c0-0.69873-0.55021-1.2812-1.25-1.2812h-1.0625zm2.312 12.25c-3.181 3.168-6.45 7.386-8.625 11.719h2.5312c1.761-2.975 4.072-6.235 6.094-8.25v-3.4688z" fill-rule="evenodd"/> + <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#h)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/> <rect opacity=".35" stroke-linejoin="round" style="color:#000000" rx="2" ry="2" height="25" width="25" stroke="#410000" stroke-linecap="round" y="4.5" x="3.5" fill="none"/> </svg> diff --git a/core/img/filetypes/application-rss+xml.png b/core/img/filetypes/application-rss+xml.png Binary files differindex e5bb322c573..5b18ee2cd4f 100644 --- a/core/img/filetypes/application-rss+xml.png +++ b/core/img/filetypes/application-rss+xml.png diff --git a/core/img/filetypes/application-rss+xml.svg b/core/img/filetypes/application-rss+xml.svg index 4fd98545a7d..54a9f46e4ec 100644 --- a/core/img/filetypes/application-rss+xml.svg +++ b/core/img/filetypes/application-rss+xml.svg @@ -1,40 +1,38 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.57063 0 0 .57063 2.3049 3.3049)" y1="5.5641" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.57063 0 0 .57063 2.3049 3.3049)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.0673e-7 3.4663 -5.3421 -1.0405e-7 69.185 -26.355)" r="12.672"> + <radialGradient id="m" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.0673e-7 3.4663 -5.3421 -1.0405e-7 69.185 -26.355)" r="12.672"> <stop stop-color="#ffcd7d" offset="0"/> <stop stop-color="#fc8f36" offset=".26238"/> <stop stop-color="#e23a0e" offset=".70495"/> <stop stop-color="#ac441f" offset="1"/> </radialGradient> - <linearGradient id="f" y2=".91791" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(.66015 0 0 .52505 .15636 5.186)" y1="47.935" x1="25"> + <linearGradient id="i" x1="25" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="matrix(.66015 0 0 .52505 .15636 5.186)" x2="25" y2=".91791"> <stop stop-color="#ba3d12" offset="0"/> <stop stop-color="#db6737" offset="1"/> </linearGradient> - <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 24.981)" r="117.14"/> + <radialGradient id="k" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 24.981)" r="117.14"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 24.981)" r="117.14"/> - <linearGradient id="e" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 24.981)" x2="302.86" x1="302.86"> + <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 24.981)" r="117.14"/> + <linearGradient id="j" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 24.981)" y1="366.65" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g> - <rect opacity=".15" height="2" width="22.1" y="28" x="4.95" fill="url(#e)"/> - <path opacity=".15" d="m4.95 28v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#c)"/> - <path opacity=".15" d="m27.05 28v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#d)"/> - <path stroke-linejoin="round" style="color:#000000" d="m4.4473 5.4473c5.2946 0 23.105 0.00147 23.105 0.00147l0.000029 23.104h-23.105v-23.105z" stroke="url(#f)" stroke-width=".89464" fill="url(#b)"/> - </g> - <path opacity=".5" stroke-linejoin="round" d="m26.557 27.557h-21.113v-21.113h21.113z" stroke="url(#g)" stroke-linecap="round" stroke-width=".88668" fill="none"/> + <rect opacity=".15" height="2" width="22.1" y="28" x="4.95" fill="url(#j)"/> + <path opacity=".15" d="m4.95 28v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#l)"/> + <path opacity=".15" d="m27.05 28v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#k)"/> + <path stroke-linejoin="round" style="color:#000000" d="m4.4473 5.4473c5.2946 0 23.105 0.00147 23.105 0.00147l0.000029 23.104h-23.105v-23.105z" stroke="url(#i)" stroke-width=".89464" fill="url(#m)"/> + <path opacity=".5" stroke-linejoin="round" d="m26.557 27.557h-21.113v-21.113h21.113z" stroke="url(#h)" stroke-linecap="round" stroke-width=".88668" fill="none"/> <path d="m7.0633 24.902c0-0.30708 0.10601-0.56488 0.31803-0.7734 0.21203-0.2123 0.47138-0.31845 0.77805-0.31846 0.2991 0.000007 0.55277 0.10616 0.76101 0.31846 0.21202 0.20852 0.31803 0.46632 0.31803 0.7734 0 0.29951-0.10601 0.55541-0.31803 0.76771-0.20824 0.20852-0.46191 0.31278-0.76101 0.31277-0.30667 0.000007-0.56603-0.10425-0.77805-0.31277-0.2121-0.209-0.3181-0.465-0.3181-0.768m-0.0633-4.931v1.816c2.3202 0 4.2047 1.8882 4.2047 4.2129h1.8223c0-3.33-2.7035-6.0293-6.027-6.0293zm0.00312-3.9745v2.0078c4.4053 0 7.9822 3.5816 7.9822 7.9928h2.0147c0.000015-5.5219-4.4823-10.001-9.9969-10.001z" fill="#fff"/> </svg> diff --git a/core/img/filetypes/application-x-cbr.png b/core/img/filetypes/application-x-cbr.png Binary files differindex c61130cda31..c0d374a4596 100644 --- a/core/img/filetypes/application-x-cbr.png +++ b/core/img/filetypes/application-x-cbr.png diff --git a/core/img/filetypes/application-x-cbr.svg b/core/img/filetypes/application-x-cbr.svg index 9e3fc11d39d..3c9e150e790 100644 --- a/core/img/filetypes/application-x-cbr.svg +++ b/core/img/filetypes/application-x-cbr.svg @@ -1,771 +1,78 @@ <?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:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg3194" - version="1.1" - inkscape:version="0.48.3.1 r9886" - sodipodi:docname="application-cbr.svg" - inkscape:export-filename="application-cbr.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs3196"> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3195" - id="linearGradient3066" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.502671,0,0,0.64629877,3.711822,0.79617735)" - x1="23.99999" - y1="14.915504" - x2="23.99999" - y2="32.595779" /> - <linearGradient - id="linearGradient3195"> - <stop - id="stop3197" - style="stop-color:#ffffff;stop-opacity:1" - offset="0" /> - <stop - id="stop3199" - style="stop-color:#ffffff;stop-opacity:0.23529412" - offset="0.12291458" /> - <stop - id="stop3201" - style="stop-color:#ffffff;stop-opacity:0.15686275" - offset="0.93706012" /> - <stop - id="stop3203" - style="stop-color:#ffffff;stop-opacity:0.39215687" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-7" - id="radialGradient3069" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,0.96917483,-0.82965977,0,24.014205,-1.7852207)" - cx="10.90426" - cy="8.4497671" - fx="10.90426" - fy="8.4497671" - r="19.99999" /> - <linearGradient - id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-7"> - <stop - id="stop5430-8-6" - style="stop-color:#5f5f5f;stop-opacity:1" - offset="0" /> - <stop - id="stop5432-3-5" - style="stop-color:#4f4f4f;stop-opacity:1" - offset="0.26238" /> - <stop - id="stop5434-1-6" - style="stop-color:#3b3b3b;stop-opacity:1" - offset="0.704952" /> - <stop - id="stop5436-8-9" - style="stop-color:#2b2b2b;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-7" - id="linearGradient3071" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.65627449,0,0,0.6892852,1.2531134,-0.21112011)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-7"> - <stop - id="stop5440-4-4" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-5" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3731" - id="linearGradient3075" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.56756757,0,0,0.67567567,2.3783793,-0.21620881)" - x1="23.99999" - y1="4.999989" - x2="23.99999" - y2="43" /> - <linearGradient - id="linearGradient3731"> - <stop - id="stop3733" - style="stop-color:#ffffff;stop-opacity:1" - offset="0" /> - <stop - id="stop3735" - style="stop-color:#ffffff;stop-opacity:0.23529412" - offset="0.02706478" /> - <stop - id="stop3737" - style="stop-color:#ffffff;stop-opacity:0.15686275" - offset="0.97377032" /> - <stop - id="stop3739" - style="stop-color:#ffffff;stop-opacity:0.39215687" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8" - id="radialGradient3078" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.165708e-8,1.6179162,-1.483354,-2.9808191e-8,28.734063,-9.2240923)" - cx="7.4956832" - cy="8.4497671" - fx="7.4956832" - fy="8.4497671" - r="19.99999" /> - <linearGradient - id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8"> - <stop - id="stop5430-8" - style="stop-color:#5f5f5f;stop-opacity:1" - offset="0" /> - <stop - id="stop5432-3" - style="stop-color:#4f4f4f;stop-opacity:1" - offset="0.26238" /> - <stop - id="stop5434-1" - style="stop-color:#3b3b3b;stop-opacity:1" - offset="0.704952" /> - <stop - id="stop5436-8" - style="stop-color:#2b2b2b;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6" - id="linearGradient3080" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.60000001,0,0,0.69230771,1.8000008,-0.61538474)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6"> - <stop - id="stop5440-4" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8967-1" - id="radialGradient3083" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,1.8069473,-2.0594306,0,30.190262,-41.983847)" - cx="24.501682" - cy="6.6475959" - fx="24.501682" - fy="6.6475959" - r="17.49832" /> - <linearGradient - id="linearGradient8967"> - <stop - id="stop8969" - style="stop-color:#ddcfbd;stop-opacity:1" - offset="0" /> - <stop - id="stop8971" - style="stop-color:#856f50;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3319-1" - id="linearGradient3085" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.45330736,0,0,0.48530928,1.9941631,0.11705426)" - x1="32.901409" - y1="4.6481781" - x2="32.901409" - y2="61.481758" /> - <linearGradient - id="linearGradient3319"> - <stop - id="stop3321" - style="stop-color:#a79071;stop-opacity:1" - offset="0" /> - <stop - id="stop3323" - style="stop-color:#6f5d45;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2346" - id="linearGradient3088" - gradientUnits="userSpaceOnUse" - x1="10.654308" - y1="1" - x2="10.654308" - y2="3" - gradientTransform="matrix(0.60000001,0,0,0.75000464,0.6000147,0.12497942)" /> - <linearGradient - id="linearGradient2346"> - <stop - id="stop2348" - style="stop-color:#eeeeee;stop-opacity:1" - offset="0" /> - <stop - id="stop2350" - style="stop-color:#d9d9da;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2" - id="linearGradient3090" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.60000001,0,0,0.07692307,1.8001714,0.15384638)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2"> - <stop - id="stop5440-4-8" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-8" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - id="linearGradient3101"> - <stop - offset="0" - style="stop-color:#9b876c;stop-opacity:1" - id="stop3103" /> - <stop - offset="0.95429963" - style="stop-color:#9b876c;stop-opacity:1" - id="stop3105" /> - <stop - offset="0.95717829" - style="stop-color:#c2c2c2;stop-opacity:1" - id="stop3107" /> - <stop - offset="1" - style="stop-color:#c2c2c2;stop-opacity:1" - id="stop3109" /> - </linearGradient> - <linearGradient - y2="4.882647" - x2="24.640038" - y1="3.1234391" - x1="24.62738" - gradientTransform="matrix(0.69041563,0,0,1.0164576,0.2501926,-2.4916513)" - gradientUnits="userSpaceOnUse" - id="linearGradient3190" - xlink:href="#linearGradient2346" - inkscape:collect="always" /> - <linearGradient - y2="0.065301567" - x2="54.887218" - y1="0.065301567" - x1="5.2122574" - gradientTransform="matrix(0.49253714,0,0,0.4937733,0.8902917,0.14413039)" - gradientUnits="userSpaceOnUse" - id="linearGradient3192" - xlink:href="#linearGradient3911" - inkscape:collect="always" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3688-166-749" - id="radialGradient2976" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" - cx="4.9929786" - cy="43.5" - fx="4.9929786" - fy="43.5" - r="2.5" /> - <linearGradient - id="linearGradient3688-166-749"> - <stop - id="stop2883" - style="stop-color:#181818;stop-opacity:1" - offset="0" /> - <stop - id="stop2885" - style="stop-color:#181818;stop-opacity:0" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3688-464-309" - id="radialGradient2978" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" - cx="4.9929786" - cy="43.5" - fx="4.9929786" - fy="43.5" - r="2.5" /> - <linearGradient - id="linearGradient3688-464-309"> - <stop - id="stop2889" - style="stop-color:#181818;stop-opacity:1" - offset="0" /> - <stop - id="stop2891" - style="stop-color:#181818;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3702-501-757" - id="linearGradient2980" - gradientUnits="userSpaceOnUse" - x1="25.058096" - y1="47.027729" - x2="25.058096" - y2="39.999443" /> - <linearGradient - id="linearGradient3702-501-757"> - <stop - id="stop2895" - style="stop-color:#181818;stop-opacity:0" - offset="0" /> - <stop - id="stop2897" - style="stop-color:#181818;stop-opacity:1" - offset="0.5" /> - <stop - id="stop2899" - style="stop-color:#181818;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3100" - id="linearGradient3072" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.40540539,0,0,0.45945944,-21.967425,1.9253706)" - x1="23.99999" - y1="4.431067" - x2="24.107431" - y2="43.758408" /> - <linearGradient - id="linearGradient3100"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3102" /> - <stop - offset="0.06169702" - style="stop-color:#ffffff;stop-opacity:0.23529412" - id="stop3104" /> - <stop - offset="0.93279684" - style="stop-color:#ffffff;stop-opacity:0.15686275" - id="stop3106" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0.39215687" - id="stop3108" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-3" - id="radialGradient3075" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,1.1385335,-0.98890268,-2.0976135e-8,-4.5816524,-4.7978939)" - cx="7.4956832" - cy="8.4497671" - fx="7.4956832" - fy="8.4497671" - r="19.99999" /> - <linearGradient - id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641-289-620-227-114-444-680-744-8-3"> - <stop - id="stop5430-8-4" - style="stop-color:#5f5f5f;stop-opacity:1" - offset="0" /> - <stop - id="stop5432-3-0" - style="stop-color:#4f4f4f;stop-opacity:1" - offset="0.26238" /> - <stop - id="stop5434-1-7" - style="stop-color:#3b3b3b;stop-opacity:1" - offset="0.704952" /> - <stop - id="stop5436-8-7" - style="stop-color:#2b2b2b;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-77" - id="linearGradient3077" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.40000001,0,0,0.48717951,-22.537695,1.2600855)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-77"> - <stop - id="stop5440-4-82" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-9" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient8967-1" - id="radialGradient3080" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0,1.2711776,-1.4972812,0,-1.7843744,-27.838648)" - cx="24.501682" - cy="6.6475959" - fx="24.501682" - fy="6.6475959" - r="17.49832" /> - <linearGradient - id="linearGradient8967-1"> - <stop - id="stop8969-2" - style="stop-color:#c4ea71;stop-opacity:1;" - offset="0" /> - <stop - id="stop8971-2" - style="stop-color:#7c9d35;stop-opacity:1;" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3319-1" - id="linearGradient3082" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.32957099,0,0,0.34141245,-22.283968,1.7791087)" - x1="32.901409" - y1="4.6481781" - x2="32.901409" - y2="61.481758" /> - <linearGradient - id="linearGradient3319-1"> - <stop - id="stop3321-3" - style="stop-color:#96bf3e;stop-opacity:1;" - offset="0" /> - <stop - id="stop3323-6" - style="stop-color:#4d6b0d;stop-opacity:1;" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2346-4" - id="linearGradient3085-0" - gradientUnits="userSpaceOnUse" - x1="10.654308" - y1="1" - x2="10.654308" - y2="3" - gradientTransform="matrix(0.39999999,0,0,0.50000335,-23.337674,1.202378)" /> - <linearGradient - id="linearGradient2346-4"> - <stop - id="stop2348-6" - style="stop-color:#eeeeee;stop-opacity:1" - offset="0" /> - <stop - id="stop2350-4" - style="stop-color:#d9d9da;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2-9" - id="linearGradient3087" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.39999999,0,0,0.05128207,-22.537569,1.2216233)" - x1="24" - y1="44" - x2="24" - y2="3.8990016" /> - <linearGradient - id="linearGradient3707-319-631-407-324-616-674-812-821-107-178-392-400-6-2-9"> - <stop - id="stop5440-4-8-9" - style="stop-color:#272727;stop-opacity:1" - offset="0" /> - <stop - id="stop5442-3-8-1" - style="stop-color:#454545;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2346-4" - id="linearGradient3090-0" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.52589466,0,0,1.0164584,-24.496147,-1.5392617)" - x1="24.640038" - y1="3.3805361" - x2="24.640038" - y2="4.4969802" /> - <linearGradient - id="linearGradient3159"> - <stop - id="stop3161" - style="stop-color:#eeeeee;stop-opacity:1" - offset="0" /> - <stop - id="stop3163" - style="stop-color:#d9d9da;stop-opacity:1" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3911" - id="linearGradient3092" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.37516915,0,0,0.49377366,-24.008579,1.096522)" - x1="10.199131" - y1="0.065301567" - x2="54.887218" - y2="0.065301567" /> - <linearGradient - id="linearGradient3911"> - <stop - id="stop3913" - style="stop-color:#96bf3e;stop-opacity:1;" - offset="0" /> - <stop - id="stop3915" - style="stop-color:#4d6b0d;stop-opacity:1;" - offset="1" /> - </linearGradient> - <radialGradient - r="2.5" - fy="43.5" - fx="4.9929786" - cy="43.5" - cx="4.9929786" - gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" - gradientUnits="userSpaceOnUse" - id="radialGradient3082-993" - xlink:href="#linearGradient3688-166-749-49" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3688-166-749-49"> - <stop - offset="0" - style="stop-color:#181818;stop-opacity:1" - id="stop3079" /> - <stop - offset="1" - style="stop-color:#181818;stop-opacity:0" - id="stop3081" /> - </linearGradient> - <radialGradient - r="2.5" - fy="43.5" - fx="4.9929786" - cy="43.5" - cx="4.9929786" - gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" - gradientUnits="userSpaceOnUse" - id="radialGradient3084-992" - xlink:href="#linearGradient3688-464-309-276" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3688-464-309-276"> - <stop - offset="0" - style="stop-color:#181818;stop-opacity:1" - id="stop3085" /> - <stop - offset="1" - style="stop-color:#181818;stop-opacity:0" - id="stop3087" /> - </linearGradient> - <linearGradient - y2="39.999443" - x2="25.058096" - y1="47.027729" - x1="25.058096" - gradientUnits="userSpaceOnUse" - id="linearGradient3086-631" - xlink:href="#linearGradient3702-501-757-979" - inkscape:collect="always" /> - <linearGradient - id="linearGradient3702-501-757-979"> - <stop - offset="0" - style="stop-color:#181818;stop-opacity:0" - id="stop3091" /> - <stop - offset="0.5" - style="stop-color:#181818;stop-opacity:1" - id="stop3093" /> - <stop - offset="1" - style="stop-color:#181818;stop-opacity:0" - id="stop3095" /> - </linearGradient> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.1523438" - inkscape:cx="-47.81249" - inkscape:cy="58.888102" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1366" - inkscape:window-height="744" - inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="1" /> - <metadata - id="metadata3199"> - <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 - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <g - style="display:inline" - id="g2036" - transform="matrix(0.64999974,0,0,0.3333336,0.39999974,15.33333)"> - <g - style="opacity:0.4" - id="g3712" - transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"> - <rect - style="fill:url(#radialGradient2976);fill-opacity:1;stroke:none" - id="rect2801" - y="40" - x="38" - height="7" - width="5" /> - <rect - style="fill:url(#radialGradient2978);fill-opacity:1;stroke:none" - id="rect3696" - transform="scale(-1,-1)" - y="-47" - x="-10" - height="7" - width="5" /> - <rect - style="fill:url(#linearGradient2980);fill-opacity:1;stroke:none" - id="rect3700" - y="40" - x="10" - height="7.0000005" - width="28" /> - </g> - </g> - <path - inkscape:connector-curvature="0" - style="fill:url(#linearGradient3190);fill-opacity:1;stroke:url(#linearGradient3192);stroke-width:1.01739752;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="path2723" - d="M 27.491301,2.3043778 C 27.288172,1.6493136 27.414776,1.1334476 27.302585,0.5086989 l -20.7938863,0 0.1227276,1.9826025" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:url(#linearGradient3088);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3090);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect5505-21-3-9" - d="m 7.5001709,3.5 -2.4000002,0 C 4.7576618,3.5 4.5001708,3.46825 4.5001708,3.426829 l 0,-2.0973288 c 0,-0.66594375 0.3354193,-0.82950023 0.7745366,-0.82950023 l 2.2254635,0" /> - <rect - ry="0.5" - style="fill:url(#radialGradient3083);fill-opacity:1.0;stroke:url(#linearGradient3085);stroke-width:1.01904130000000004;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect2719" - y="2.5095644" - x="5.5095205" - rx="0.5" - height="26.980959" - width="21.980959" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:url(#radialGradient3078);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3080);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect5505-21-3" - d="m 7.5,2.5000001 c 0,0 0,18.7742959 0,26.9999999 l -2.4,0 c -0.3425089,0 -0.6,-0.285772 -0.6,-0.658537 l 0,-26.3414629 z" /> - <rect - style="opacity:0.5;fill:none;stroke:url(#linearGradient3075);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" - id="rect6741-0" - y="3.5000002" - x="5.5" - height="25" - width="21" /> - <g - style="fill:#000000;fill-opacity:1;opacity:0.2" - id="g3230" - transform="matrix(-0.17865757,0,0,0.17865757,25.443696,7.0670321)"> - <path - style="fill:#000000;fill-opacity:1" - id="path3232" - d="m 50.463,22.014 c -19.869,0 -35.984,11.045 -35.984,24.674 0,6.475 3.667,12.342 9.612,16.748 l -4.027,14.551 20.54,-7.582 c 3.132,0.615 6.438,0.967 9.859,0.967 19.873,0 35.98,-11.049 35.98,-24.684 0,-13.629 -16.107,-24.674 -35.98,-24.674 z" - inkscape:connector-curvature="0" /> - </g> - <g - transform="matrix(-0.17865757,0,0,0.17865757,25.443696,6.0670321)" - id="Layer_5" - style="fill:#ffffff"> - <path - inkscape:connector-curvature="0" - d="m 50.463,22.014 c -19.869,0 -35.984,11.045 -35.984,24.674 0,6.475 3.667,12.342 9.612,16.748 l -4.027,14.551 20.54,-7.582 c 3.132,0.615 6.438,0.967 9.859,0.967 19.873,0 35.98,-11.049 35.98,-24.684 0,-13.629 -16.107,-24.674 -35.98,-24.674 z" - id="path3196" - style="fill:#ffffff" /> - </g> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs> + <linearGradient id="l" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .67568 2.3784 -.21621)" y1="5" x1="24"> + <stop stop-color="#fff" offset="0"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".027065"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".97377"/> + <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> + </linearGradient> + <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.1657e-8 1.6179 -1.4834 -2.9808e-8 28.734 -9.2241)" r="20"> + <stop stop-color="#5f5f5f" offset="0"/> + <stop stop-color="#4f4f4f" offset=".26238"/> + <stop stop-color="#3b3b3b" offset=".70495"/> + <stop stop-color="#2b2b2b" offset="1"/> + </radialGradient> + <linearGradient id="k" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .69231 1.8 -.61538)" y1="44" x1="24"> + <stop stop-color="#272727" offset="0"/> + <stop stop-color="#454545" offset="1"/> + </linearGradient> + <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="6.6476" cx="24.502" gradientTransform="matrix(0 1.8069 -2.0594 0 30.19 -41.984)" r="17.498"> + <stop stop-color="#c4ea71" offset="0"/> + <stop stop-color="#7c9d35" offset="1"/> + </radialGradient> + <linearGradient id="j" y2="61.482" gradientUnits="userSpaceOnUse" x2="32.901" gradientTransform="matrix(.45331 0 0 .48531 1.9942 .11705)" y1="4.6482" x1="32.901"> + <stop stop-color="#96bf3e" offset="0"/> + <stop stop-color="#4d6b0d" offset="1"/> + </linearGradient> + <linearGradient id="i" y2="3" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="10.654" gradientTransform="matrix(0.6 0 0 0.75 .60001 .12498)" y1="1" x1="10.654"/> + <linearGradient id="a"> + <stop stop-color="#eee" offset="0"/> + <stop stop-color="#d9d9da" offset="1"/> + </linearGradient> + <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .076923 1.8002 .15385)" y1="44" x1="24"> + <stop stop-color="#272727" offset="0"/> + <stop stop-color="#454545" offset="1"/> + </linearGradient> + <linearGradient id="g" y2="4.8826" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="3.1234" gradientTransform="matrix(.69042 0 0 1.0165 .25019 -2.4917)" x2="24.64" x1="24.627"/> + <linearGradient id="f" y2=".065302" gradientUnits="userSpaceOnUse" y1=".065302" gradientTransform="matrix(.49254 0 0 .49377 .89029 .14413)" x2="54.887" x1="5.2123"> + <stop stop-color="#96bf3e" offset="0"/> + <stop stop-color="#4d6b0d" offset="1"/> + </linearGradient> + <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> + <stop stop-color="#181818" offset="0"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </radialGradient> + <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> + <stop stop-color="#181818" offset="0"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </radialGradient> + <linearGradient id="m" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058"> + <stop stop-color="#181818" stop-opacity="0" offset="0"/> + <stop stop-color="#181818" offset=".5"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </linearGradient> + </defs> + <g transform="matrix(0.65 0 0 .33333 0.4 15.333)"> + <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)"> + <rect height="7" width="5" y="40" x="38" fill="url(#e)"/> + <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#d)"/> + <rect height="7" width="28" y="40" x="10" fill="url(#m)"/> </g> + </g> + <g stroke-linejoin="round"> + <path d="m27.491 2.3044c-0.203-0.6551-0.076-1.171-0.188-1.7957h-20.794l0.12273 1.9826" stroke="url(#f)" stroke-miterlimit="0" stroke-width="1.0174" fill="url(#g)"/> + <g stroke-linecap="round"> + <path style="color:#000000" d="m7.5002 3.5h-2.4c-0.3425 0-0.6-0.0318-0.6-0.0732v-2.0973c0-0.66594 0.33542-0.8295 0.77454-0.8295h2.2255" stroke="url(#h)" fill="url(#i)"/> + <rect rx=".5" ry=".5" height="26.981" width="21.981" stroke="url(#j)" stroke-miterlimit="0" y="2.5096" x="5.5095" stroke-width="1.019" fill="url(#b)"/> + <path style="color:#000000" d="m7.5 2.5v27h-2.4c-0.34251 0-0.6-0.28577-0.6-0.65854v-26.341z" stroke="url(#k)" fill="url(#c)"/> + <rect opacity=".5" height="25" width="21" stroke="url(#l)" y="3.5" x="5.5" fill="none"/> + </g> + </g> + <g opacity=".2" transform="matrix(-.17866 0 0 .17866 25.444 7.067)"> + <path d="m50.463 22.014c-19.869 0-35.984 11.045-35.984 24.674 0 6.475 3.667 12.342 9.612 16.748l-4.027 14.551 20.54-7.582c3.132 0.615 6.438 0.967 9.859 0.967 19.873 0 35.98-11.049 35.98-24.684 0-13.629-16.107-24.674-35.98-24.674z"/> + </g> + <g fill="#fff" transform="matrix(-.17866 0 0 .17866 25.444 6.067)"> + <path fill="#fff" d="m50.463 22.014c-19.869 0-35.984 11.045-35.984 24.674 0 6.475 3.667 12.342 9.612 16.748l-4.027 14.551 20.54-7.582c3.132 0.615 6.438 0.967 9.859 0.967 19.873 0 35.98-11.049 35.98-24.684 0-13.629-16.107-24.674-35.98-24.674z"/> + </g> </svg> diff --git a/core/img/filetypes/application-x-shockwave-flash.png b/core/img/filetypes/application-x-shockwave-flash.png Binary files differnew file mode 100644 index 00000000000..75424f81d68 --- /dev/null +++ b/core/img/filetypes/application-x-shockwave-flash.png diff --git a/core/img/filetypes/flash.svg b/core/img/filetypes/application-x-shockwave-flash.svg index cb823703d9b..b373fd6512d 100644 --- a/core/img/filetypes/flash.svg +++ b/core/img/filetypes/application-x-shockwave-flash.svg @@ -5,56 +5,52 @@ <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="j" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24"> + <linearGradient id="k" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="i" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132"> + <linearGradient id="l" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> - <linearGradient id="h" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" x1="302.86"> + <radialGradient id="q" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <radialGradient id="r" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="m" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="g" y2="25.726" gradientUnits="userSpaceOnUse" x2="27.401" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" y1="22.442" x1="27.401"> + <linearGradient id="n" x1="27.401" gradientUnits="userSpaceOnUse" y1="22.442" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" x2="27.401" y2="25.726"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="f" y2="35" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" y1="12" x1="25"> + <linearGradient id="o" x1="25" gradientUnits="userSpaceOnUse" y1="12" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" x2="25" y2="35"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" fx="30.345" gradientUnits="userSpaceOnUse" cy="10.417" cx="28.897" gradientTransform="matrix(.85740 -2.1584e-8 0 1.4143 -9.1048 9.1644)" r="20"> + <radialGradient id="s" fx="30.345" gradientUnits="userSpaceOnUse" cy="10.417" cx="28.897" gradientTransform="matrix(.85740 -2.1584e-8 0 1.4143 -9.1048 9.1644)" r="20"> <stop stop-color="#f8b17e" offset="0"/> <stop stop-color="#e35d4f" offset=".26238"/> <stop stop-color="#c6262e" offset=".66094"/> <stop stop-color="#690b54" offset="1"/> </radialGradient> - <linearGradient id="e" y2="36.647" gradientUnits="userSpaceOnUse" x2="21.587" gradientTransform="matrix(.65714 0 0 .65901 -0.1 -.12653)" y1="11.492" x1="21.587"> + <linearGradient id="p" x1="21.587" gradientUnits="userSpaceOnUse" y1="11.492" gradientTransform="matrix(.65714 0 0 .65901 -.1 -.12653)" x2="21.587" y2="36.647"> <stop stop-color="#911313" offset="0"/> <stop stop-color="#bc301e" offset="1"/> </linearGradient> </defs> - <g> - <g> - <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#h)"/> - <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#c)"/> - <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#d)"/> - </g> - <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/> - </g> - <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#j)" stroke-linecap="round" fill="none"/> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#m)"/> + <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#r)"/> + <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#q)"/> + <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#l)"/> + <path stroke-linejoin="round" stroke="url(#k)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/> <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/> <path opacity=".6" style="color:#000000" d="m22.499 8.0004c-2.6636-0.029674-5.0587 1.658-6.5324 3.7793-0.94364 1.305-1.5732 2.7991-2.0832 4.3148-0.69136 1.6778-1.5201 3.4583-3.0765 4.5016-0.45903 0.43459-1.0981 0.2-1.5957 0.43224-0.34845 0.3228-0.14701 0.84514-0.20078 1.2625 0.014388 0.76734-0.029122 1.5402 0.022375 2.304 0.18898 0.54758 0.88853 0.37796 1.3325 0.38828 2.2257-0.09973 4.2002-1.5034 5.3804-3.336 0.54977-0.82122 0.97797-1.7194 1.3143-2.6473 1.5061-0.0077 3.0142 0.01532 4.519-0.01144 0.47522-0.09148 0.43944-0.63085 0.42264-1.001-0.0162-0.88446 0.03272-1.7755-0.02502-2.6558-0.16487-0.50455-0.76136-0.34818-1.1638-0.37106h-1.4529c0.52776-1.2578 1.4889-2.5011 2.8611-2.8681 0.36161 0.0036 0.81834-0.19473 0.77518-0.62481-0.01611-1.0312 0.03245-2.0689-0.02468-3.096-0.06232-0.20565-0.25794-0.35925-0.47259-0.37101z" fill="#fff"/> <g stroke-linecap="round"> - <path stroke-linejoin="round" style="color:#000000" d="m9.5 20.5v3s4.9977 0.73959 7.2131-6c0.14685-0.000002 4.7869 0 4.7869 0v-3h-3s1.2833-3.7081 4-4l-0.000016-3s-5.0297-0.35936-7.7464 6.7199c-2.35 6.933-5.254 6.28-5.254 6.28z" stroke="url(#e)" fill="url(#b)"/> - <path opacity=".1" style="color:#000000" d="m21.5 9.8357v-1.2407c-1.6165 0.19395-3.8735 2.0585-4.8706 4.0955-0.67454 1.078-0.96187 2.016-1.4144 3.1932-0.81519 1.9428-2.1324 4.1368-4.0625 5.1513" stroke="url(#f)" fill="none"/> - <path opacity=".1" style="color:#000000" d="m20.5 16.656v-1.1418l-2.3993-0.02926" stroke="url(#g)" fill="none"/> + <path stroke-linejoin="round" style="color:#000000" d="m9.5 20.5v3s4.9977 0.73959 7.2131-6c0.14685-0.000002 4.7869 0 4.7869 0v-3h-3s1.2833-3.7081 4-4l-0.000016-3s-5.0297-0.35936-7.7464 6.7199c-2.35 6.933-5.254 6.28-5.254 6.28z" stroke="url(#p)" fill="url(#s)"/> + <path opacity=".1" style="color:#000000" d="m21.5 9.8357v-1.2407c-1.6165 0.19395-3.8735 2.0585-4.8706 4.0955-0.67454 1.078-0.96187 2.016-1.4144 3.1932-0.81519 1.9428-2.1324 4.1368-4.0625 5.1513" stroke="url(#o)" fill="none"/> + <path opacity=".1" style="color:#000000" d="m20.5 16.656v-1.1418l-2.3993-0.02926" stroke="url(#n)" fill="none"/> </g> </svg> diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png Binary files differindex 9152cc1b744..b6b1bbce2f0 100644 --- a/core/img/filetypes/application.png +++ b/core/img/filetypes/application.png diff --git a/core/img/filetypes/application.svg b/core/img/filetypes/application.svg index 870a4ac2467..edce49e3e4e 100644 --- a/core/img/filetypes/application.svg +++ b/core/img/filetypes/application.svg @@ -1,59 +1,57 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="e" y2="25" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="16" gradientTransform="matrix(1 0 0 -1 0 34.004)" y1="9" x1="16"/> + <linearGradient id="p" x1="16" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="9" gradientTransform="matrix(1 0 0 -1 0 34.004)" x2="16" y2="25"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="f" y2="25" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="16" y1="9" x1="16"/> - <linearGradient id="g" y2="4.9969" gradientUnits="userSpaceOnUse" x2="19.927" gradientTransform="matrix(.66667 0 0 .66667 0.0000011 .33333)" y1="44.949" x1="19.927"> + <linearGradient id="o" x1="16" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="16" y1="9" y2="25"/> + <linearGradient id="n" x1="19.927" gradientUnits="userSpaceOnUse" y1="44.949" gradientTransform="matrix(.66667 0 0 .66667 .0000011 .33333)" x2="19.927" y2="4.9969"> <stop stop-color="#505050" offset="0"/> <stop stop-color="#8e8e8e" offset="1"/> </linearGradient> - <linearGradient id="i" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24"> + <linearGradient id="l" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20"> + <radialGradient id="s" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20"> <stop stop-color="#c7c7c7" offset="0"/> <stop stop-color="#a6a6a6" offset=".26238"/> <stop stop-color="#7b7b7b" offset=".70495"/> <stop stop-color="#595959" offset="1"/> </radialGradient> - <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64103 .61539 1.6154)" y1="44" x1="24"> + <linearGradient id="m" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.64103 0 0 .64103 .61539 1.6154)" x2="24" y2="3.899"> <stop stop-color="#505050" offset="0"/> <stop stop-color="#8e8e8e" offset="1"/> </linearGradient> - <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> + <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> <stop stop-color="#181818" offset="0"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> + <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> <stop stop-color="#181818" offset="0"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="j" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058"> + <linearGradient id="k" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058"> <stop stop-color="#181818" stop-opacity="0" offset="0"/> <stop stop-color="#181818" offset=".5"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g transform="matrix(0.7 0 0 .33333 -0.8 15.333)"> + <g transform="matrix(.7 0 0 .33333 -.8 15.333)"> <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)"> - <rect height="7" width="5" y="40" x="38" fill="url(#d)"/> - <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#c)"/> - <rect height="7" width="28" y="40" x="10" fill="url(#j)"/> + <rect y="40" width="5" fill="url(#q)" x="38" height="7"/> + <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#r)"/> + <rect y="40" width="28" fill="url(#k)" x="10" height="7"/> </g> </g> - <rect stroke-linejoin="round" height="25" stroke="url(#h)" stroke-linecap="round" fill="url(#b)" style="color:#000000" rx="2" ry="2" width="25" y="4.5" x="3.5"/> - <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#i)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/> - <g> - <path opacity="0.41" style="color:#000000" d="m15 10c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/> - <path style="color:#000000" d="m15 9c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#g)"/> - <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m15.062 9.5625c-0.02465 0.61514 0.0508 1.2431-0.0404 1.8499-0.22156 0.48267-0.86813 0.38946-1.2591 0.66131-0.35888 0.1777-0.83286 0.55716-1.2005 0.17633l-1.1562-1.1562-1.3125 1.3125c0.41328 0.43651 0.87815 0.8308 1.2579 1.2948 0.23668 0.48316-0.28717 0.88122-0.39325 1.3266-0.17191 0.37402-0.17866 1.0023-0.7161 1.0335-0.55991 0.0032-1.1199 0.000478-1.6798 0.0014v1.875c0.61514 0.02465 1.2431-0.0508 1.8499 0.0404 0.48267 0.22156 0.38946 0.86813 0.66131 1.2591 0.1777 0.35888 0.55716 0.83286 0.17633 1.2005l-1.1562 1.1562 1.3125 1.3125c0.43651-0.41328 0.8308-0.87815 1.2948-1.2579 0.48316-0.23668 0.88122 0.28717 1.3266 0.39325 0.37402 0.17191 1.0023 0.17866 1.0335 0.7161 0.0032 0.55991 0.000478 1.1199 0.0014 1.6798h1.875c0.02465-0.61514-0.0508-1.2431 0.0404-1.8499 0.22156-0.48267 0.86813-0.38946 1.2591-0.66131 0.35888-0.1777 0.83286-0.55716 1.2005-0.17633l1.1562 1.1562 1.3125-1.3125c-0.41328-0.43651-0.87815-0.8308-1.2579-1.2948-0.23668-0.48316 0.28717-0.88122 0.39325-1.3266 0.17191-0.37402 0.17866-1.0023 0.7161-1.0335 0.55991-0.0032 1.1199-0.000478 1.6798-0.0014v-1.875c-0.61514-0.02465-1.2431 0.0508-1.8499-0.0404-0.482-0.222-0.389-0.869-0.661-1.26-0.177-0.359-0.557-0.833-0.176-1.201l1.1562-1.1562-1.3125-1.3125c-0.43651 0.41328-0.8308 0.87815-1.2948 1.2579-0.48316 0.23668-0.88122-0.28717-1.3266-0.39325-0.37402-0.17191-1.0023-0.17866-1.0335-0.7161-0.0032-0.55991-0.000478-1.1199-0.0014-1.6798h-1.875z" stroke="url(#f)" fill="none"/> - <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m16 20.566c1.9374 0.05315 3.6634-1.7201 3.5613-3.6545 0.004-1.9389-1.8147-3.6163-3.7447-3.4659-1.9392 0.04516-3.5671 1.9074-3.3688 3.832 0.10413 1.8114 1.739 3.3229 3.5521 3.2884z" stroke="url(#e)" fill="none"/> - </g> + <rect stroke-linejoin="round" style="color:#000000" rx="2" ry="2" height="25" width="25" stroke="url(#m)" stroke-linecap="round" y="4.5" x="3.5" fill="url(#s)"/> + <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#l)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/> + <path opacity=".41" style="color:#000000" d="m15 10c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/> + <path style="color:#000000" d="m15 9c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#n)"/> + <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m15.062 9.5625c-0.02465 0.61514 0.0508 1.2431-0.0404 1.8499-0.22156 0.48267-0.86813 0.38946-1.2591 0.66131-0.35888 0.1777-0.83286 0.55716-1.2005 0.17633l-1.1562-1.1562-1.3125 1.3125c0.41328 0.43651 0.87815 0.8308 1.2579 1.2948 0.23668 0.48316-0.28717 0.88122-0.39325 1.3266-0.17191 0.37402-0.17866 1.0023-0.7161 1.0335-0.55991 0.0032-1.1199 0.000478-1.6798 0.0014v1.875c0.61514 0.02465 1.2431-0.0508 1.8499 0.0404 0.48267 0.22156 0.38946 0.86813 0.66131 1.2591 0.1777 0.35888 0.55716 0.83286 0.17633 1.2005l-1.1562 1.1562 1.3125 1.3125c0.43651-0.41328 0.8308-0.87815 1.2948-1.2579 0.48316-0.23668 0.88122 0.28717 1.3266 0.39325 0.37402 0.17191 1.0023 0.17866 1.0335 0.7161 0.0032 0.55991 0.000478 1.1199 0.0014 1.6798h1.875c0.02465-0.61514-0.0508-1.2431 0.0404-1.8499 0.22156-0.48267 0.86813-0.38946 1.2591-0.66131 0.35888-0.1777 0.83286-0.55716 1.2005-0.17633l1.1562 1.1562 1.3125-1.3125c-0.41328-0.43651-0.87815-0.8308-1.2579-1.2948-0.23668-0.48316 0.28717-0.88122 0.39325-1.3266 0.17191-0.37402 0.17866-1.0023 0.7161-1.0335 0.55991-0.0032 1.1199-0.000478 1.6798-0.0014v-1.875c-0.61514-0.02465-1.2431 0.0508-1.8499-0.0404-0.482-0.222-0.389-0.869-0.661-1.26-0.177-0.359-0.557-0.833-0.176-1.201l1.1562-1.1562-1.3125-1.3125c-0.43651 0.41328-0.8308 0.87815-1.2948 1.2579-0.48316 0.23668-0.88122-0.28717-1.3266-0.39325-0.37402-0.17191-1.0023-0.17866-1.0335-0.7161-0.0032-0.55991-0.000478-1.1199-0.0014-1.6798h-1.875z" stroke="url(#o)" fill="none"/> + <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m16 20.566c1.9374 0.05315 3.6634-1.7201 3.5613-3.6545 0.004-1.9389-1.8147-3.6163-3.7447-3.4659-1.9392 0.04516-3.5671 1.9074-3.3688 3.832 0.10413 1.8114 1.739 3.3229 3.5521 3.2884z" stroke="url(#p)" fill="none"/> </svg> diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png Binary files differindex 3f56a7e2a9a..3c78bcfd173 100644 --- a/core/img/filetypes/audio.png +++ b/core/img/filetypes/audio.png diff --git a/core/img/filetypes/audio.svg b/core/img/filetypes/audio.svg index d5eda38e8aa..1b37a1e6eab 100644 --- a/core/img/filetypes/audio.svg +++ b/core/img/filetypes/audio.svg @@ -1,49 +1,47 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="e" y2="24.628" gradientUnits="userSpaceOnUse" x2="20.055" gradientTransform="matrix(.52104 0 0 .81327 3.4707 .35442)" y1="15.298" x1="16.626"> + <linearGradient id="h" x1="16.626" gradientUnits="userSpaceOnUse" y1="15.298" gradientTransform="matrix(.52104 0 0 .81327 3.4707 .35442)" x2="20.055" y2="24.628"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="d" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24"> + <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20"> + <radialGradient id="l" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20"> <stop stop-color="#3e3e3e" offset="0"/> <stop stop-color="#343434" offset=".26238"/> <stop stop-color="#272727" offset=".70495"/> <stop stop-color="#1d1d1d" offset="1"/> </radialGradient> - <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> + <radialGradient id="j" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> <stop stop-color="#181818" offset="0"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> + <radialGradient id="k" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> <stop stop-color="#181818" offset="0"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="f" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058"> + <linearGradient id="g" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058"> <stop stop-color="#181818" stop-opacity="0" offset="0"/> <stop stop-color="#181818" offset=".5"/> <stop stop-color="#181818" stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g transform="matrix(0.7 0 0 .33333 -0.8 15.333)"> + <g transform="matrix(.7 0 0 .33333 -.8 15.333)"> <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)"> - <rect height="7" width="5" y="40" x="38" fill="url(#c)"/> - <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#b)"/> - <rect height="7" width="28" y="40" x="10" fill="url(#f)"/> + <rect y="40" width="5" fill="url(#j)" x="38" height="7"/> + <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#k)"/> + <rect y="40" width="28" fill="url(#g)" x="10" height="7"/> </g> </g> - <rect style="color:#000000" height="25" width="25" y="4.5" x="3.5" fill="url(#a)"/> + <rect style="color:#000000" height="25" width="25" y="4.5" x="3.5" fill="url(#l)"/> <rect opacity=".7" style="color:#000000" height="25" width="25" stroke="#000" y="4.5" x="3.5" fill="none"/> - <rect opacity=".5" height="23" width="23" stroke="url(#d)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/> - <g> - <path opacity=".1" d="m4 5 0.008 15c0.6904-0.015 23.468-5.529 23.992-5.795v-9.205z" fill-rule="evenodd" fill="url(#e)"/> - <path opacity=".1" style="color:#000000" d="m16.467 8.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.3305-1.3884-2.5797-3.0451-2.8335-5.0311-0.04896-0.18667-0.30655-0.18423-0.46044-0.19158z" fill="#fff"/> - <path opacity=".9" style="color:#000000" d="m16.467 7.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.33-1.388-2.58-3.0443-2.833-5.0303-0.049-0.1866-0.307-0.1842-0.461-0.1916z"/> - </g> + <rect opacity=".5" height="23" width="23" stroke="url(#i)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/> + <path opacity=".1" fill="url(#h)" d="m4 5 0.008 15c0.6904-0.015 23.468-5.529 23.992-5.795v-9.205z" fill-rule="evenodd"/> + <path opacity=".1" style="color:#000000" d="m16.467 8.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.3305-1.3884-2.5797-3.0451-2.8335-5.0311-0.04896-0.18667-0.30655-0.18423-0.46044-0.19158z" fill="#fff"/> + <path opacity=".9" style="color:#000000" d="m16.467 7.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.33-1.388-2.58-3.0443-2.833-5.0303-0.049-0.1866-0.307-0.1842-0.461-0.1916z"/> </svg> diff --git a/core/img/filetypes/calendar.png b/core/img/filetypes/calendar.png Binary files differdeleted file mode 100644 index d85b1db651c..00000000000 --- a/core/img/filetypes/calendar.png +++ /dev/null diff --git a/core/img/filetypes/calendar.svg b/core/img/filetypes/calendar.svg deleted file mode 100644 index 0016749b936..00000000000 --- a/core/img/filetypes/calendar.svg +++ /dev/null @@ -1,94 +0,0 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <defs> - <radialGradient id="radialGradient3134" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912316,-1.8501946e-8,3.7499995e-8,1.5922783,7.222757,-4.4685113)" r="2"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#8f8f8f" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient3139" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912316,-1.8501946e-8,3.7499995e-8,1.5922783,-5.7772427,-4.4685114)" r="2"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#8f8f8f" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient3144" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.60000361,0,0,0.64185429,1.599978,-16.778802)" y1="5" x1="24"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.063165"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3147" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.62162164,0,0,0.62162164,1.0810837,2.0810874)" y1="5" x1="24"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.063165"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient3150" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(0,0.90632943,-1.9732085,-3.8243502e-8,32.673223,-1.9201377)" r="20"> - <stop stop-color="#f89b7e" offset="0"/> - <stop stop-color="#e35d4f" offset="0.26238"/> - <stop stop-color="#c6262e" offset="0.66094"/> - <stop stop-color="#690b2c" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient3152" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.64102567,0,0,0.64102567,0.6153831,1.615384)" y1="44" x1="24"> - <stop stop-color="#791235" offset="0"/> - <stop stop-color="#dd3b27" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3155" y2="18.684" gradientUnits="userSpaceOnUse" x2="23.954" gradientTransform="matrix(0.65,0,0,0.50000001,0.4000028,3.9999996)" y1="15.999" x1="23.954"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3158" y2="44.984" gradientUnits="userSpaceOnUse" x2="19.36" gradientTransform="matrix(0.64102564,0,0,0.64185429,0.6153845,0.95838337)" y1="16.138" x1="19.36"> - <stop stop-color="#f4f4f4" offset="0"/> - <stop stop-color="#dbdbdb" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3160" y2="3.8905" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.64102564,0,0,0.64185429,0.6153845,1.5793381)" y1="44" x1="24"> - <stop stop-color="#787878" offset="0"/> - <stop stop-color="#AAA" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient2976" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" r="2.5"> - <stop stop-color="#181818" offset="0"/> - <stop stop-color="#181818" stop-opacity="0" offset="1"/> - </radialGradient> - <radialGradient id="radialGradient2978" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" r="2.5"> - <stop stop-color="#181818" offset="0"/> - <stop stop-color="#181818" stop-opacity="0" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient2980" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058"> - <stop stop-color="#181818" stop-opacity="0" offset="0"/> - <stop stop-color="#181818" offset="0.5"/> - <stop stop-color="#181818" stop-opacity="0" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3566" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.64102567,0,0,0.64102567,0.6153831,0.6153843)" y1="44" x1="24"> - <stop stop-color="#791235" offset="0"/> - <stop stop-color="#dd3b27" offset="1"/> - </linearGradient> - </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m5.5,3.5c7.0683,0.00685,14.137-0.013705,21.205,0.010288,1.238,0.083322,1.9649,1.3578,1.7949,2.5045l-24.99-0.7199c0.081-0.9961,0.9903-1.8161,1.9897-1.7949z" stroke-dashoffset="0" stroke="url(#linearGradient3566)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <g transform="matrix(0.6999997,0,0,0.3333336,-0.8000003,15.33333)"> - <g opacity="0.4" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"> - <rect height="7" width="5" y="40" x="38" fill="url(#radialGradient2976)"/> - <rect transform="scale(-1,-1)" height="7" width="5" y="-47" x="-10" fill="url(#radialGradient2978)"/> - <rect height="7" width="28" y="40" x="10" fill="url(#linearGradient2980)"/> - </g> - </g> - <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m28.5,7.0148s0.0137,13.794-0.01029,20.69c-0.084,1.238-1.358,1.965-2.505,1.795-6.896-0.007-13.794,0.014-20.69-0.01-1.238-0.084-1.9649-1.358-1.7949-2.505,0.0068-6.896,0.0103-20.69,0.0103-20.69z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3160)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="url(#linearGradient3158)"/> - <rect opacity="0.3" style="enable-background:accumulate;" fill-rule="nonzero" rx="0" ry="0" height="2" width="26" y="12" x="3" fill="url(#linearGradient3155)"/> - <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m5.5,4.5c7.0683,0.00685,14.137-0.013705,21.205,0.010288,1.238,0.083322,1.9649,1.3578,1.7949,2.5045l0.073,4.4852h-25.073l0.0103-5.2051c0.081-0.9961,0.9903-1.8161,1.9897-1.7949z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3152)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#radialGradient3150)"/> - <rect opacity="0.5" stroke-linejoin="round" stroke-dasharray="none" stroke-dashoffset="0" rx="1" ry="1" height="23" width="23" stroke="url(#linearGradient3147)" stroke-linecap="round" stroke-miterlimit="4" y="5.5" x="4.5" stroke-width="1" fill="none"/> - <path opacity="0.5" stroke-linejoin="round" d="m26.5,10.5h-21" stroke-dashoffset="0" stroke="url(#linearGradient3144)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999982" fill="none"/> - <rect opacity="0.4" style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="8" fill="#FFF"/> - <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="8" fill="#cc3429"/> - <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="8" fill="url(#radialGradient3139)"/> - <rect opacity="0.4" style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="21" fill="#FFF"/> - <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="21" fill="#cc3429"/> - <rect style="enable-background:accumulate;" fill-rule="nonzero" rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="21" fill="url(#radialGradient3134)"/> - <rect style="enable-background:accumulate;color:#000000;" height="3.9477" width="19.876" y="14.023" x="6.1231" fill="#c5c5c5"/> - <path opacity="0.3" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="M6.5182,14.553,25.505,14.564,25.415,26.505,6.4289,26.494zm0.33122,8.8955,18.622,0.01098m-18.89-2.957,18.622,0.01098m-18.532-14.898,18.622,0.011m-3.6545-2.8956-0.0893,11.828m-2.9014-11.783-0.0893,11.828m-2.902-11.917-0.089,11.827m-2.9014-11.783-0.0893,11.828m-2.8347-11.839-0.0893,11.828" stroke-dashoffset="0" stroke="#000" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> -</svg> diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png Binary files differindex 24788b2a37f..49b2b861757 100644 --- a/core/img/filetypes/database.png +++ b/core/img/filetypes/database.png diff --git a/core/img/filetypes/database.svg b/core/img/filetypes/database.svg index 6dfac54e68b..f3d4570015f 100644 --- a/core/img/filetypes/database.svg +++ b/core/img/filetypes/database.svg @@ -1,54 +1,47 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient3136" y2="-24.582" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="102.31" gradientTransform="matrix(0.4581255,0,0,0.4388939,-31.619713,14.933095)" y1="-2.3925" x1="102.31"> + <linearGradient id="k" x1="102.31" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-2.3925" gradientTransform="matrix(.45813 0 0 .43889 -31.62 14.933)" x2="102.31" y2="-24.582"> <stop stop-color="#a5a6a8" offset="0"/> <stop stop-color="#e8e8e8" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3138" y2="-2.3758" gradientUnits="userSpaceOnUse" x2="109.96" gradientTransform="matrix(0.4581255,0,0,0.4388939,-31.619713,14.933095)" y1="-24.911" x1="109.96"> + <linearGradient id="j" x1="109.96" gradientUnits="userSpaceOnUse" y1="-24.911" gradientTransform="matrix(.45813 0 0 .43889 -31.62 14.933)" x2="109.96" y2="-2.3758"> <stop stop-color="#b3b3b3" offset="0"/> <stop stop-color="#dadada" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3141" y2="-7.6657" xlink:href="#linearGradient2793" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="89.424" gradientTransform="matrix(0.4578345,0,0,0.432286,-31.591968,18.911518)" y1="-7.6657" x1="103.95"/> - <linearGradient id="linearGradient2793"> + <linearGradient id="i" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 18.912)" x2="89.424" y2="-7.6657"/> + <linearGradient id="b"> <stop stop-color="#868688" offset="0"/> <stop stop-color="#d9d9da" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3143" y2="27.546" xlink:href="#linearGradient3858" gradientUnits="userSpaceOnUse" x2="89.018" gradientTransform="translate(-78.157465,-9.546111)" y1="22.537" x1="89.018"/> - <linearGradient id="linearGradient3858"> + <linearGradient id="h" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 -9.5461)" x2="89.018" y2="27.546"/> + <linearGradient id="a"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#4a4a4a" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3147" y2="-7.6657" xlink:href="#linearGradient2793" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="89.424" gradientTransform="matrix(0.4578345,0,0,0.432286,-31.591968,24.911518)" y1="-7.6657" x1="103.95"/> - <linearGradient id="linearGradient3149" y2="27.546" xlink:href="#linearGradient3858" gradientUnits="userSpaceOnUse" x2="89.018" gradientTransform="translate(-78.157465,-3.546111)" y1="22.537" x1="89.018"/> - <linearGradient id="linearGradient3153" y2="-7.6657" xlink:href="#linearGradient2793" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="89.424" gradientTransform="matrix(0.4578345,0,0,0.432286,-31.591968,30.911518)" y1="-7.6657" x1="103.95"/> - <linearGradient id="linearGradient3155" y2="27.546" xlink:href="#linearGradient3858" gradientUnits="userSpaceOnUse" x2="89.018" gradientTransform="translate(-78.157465,2.453889)" y1="22.537" x1="89.018"/> - <linearGradient id="linearGradient3098" y2="44.137" gradientUnits="userSpaceOnUse" x2="21.381" gradientTransform="matrix(0.59999998,0,0,0.60526317,1.6000001,2.1710523)" y1="5.0525" x1="21.381"> + <linearGradient id="g" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 24.912)" x2="89.424" y2="-7.6657"/> + <linearGradient id="f" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 -3.5461)" x2="89.018" y2="27.546"/> + <linearGradient id="e" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 30.912)" x2="89.424" y2="-7.6657"/> + <linearGradient id="d" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 2.4539)" x2="89.018" y2="27.546"/> + <linearGradient id="l" x1="21.381" gradientUnits="userSpaceOnUse" y1="5.0525" gradientTransform="matrix(0.6 0 0 .60526 1.6 2.1711)" x2="21.381" y2="44.137"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.081258"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.92328"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".081258"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".92328"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3232" gradientUnits="userSpaceOnUse" cy="41.636" cx="23.335" gradientTransform="matrix(0.5745243,0,0,0.2209368,2.59375,17.801069)" r="22.627"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="41.636" cx="23.335" gradientTransform="matrix(.57452 0 0 .22094 2.5938 17.801)" r="22.627"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </radialGradient> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <path opacity="0.3" d="m29,27c0.0011,2.7613-5.8195,5-13,5s-13.001-2.239-13-5c-0.0011-2.761,5.8195-5,13-5s13.001,2.2387,13,5z" fill-rule="evenodd" fill="url(#radialGradient3232)"/> - <path d="m27.49,25.068c0,2.4466-5.1487,4.4322-11.493,4.4322-6.344,0-11.493-1.9856-11.493-4.4322,0.11446-5.4694-1.4047-4.34,11.493-4.4322,13.193-0.0952,11.331-1.1267,11.493,4.4322z" stroke="url(#linearGradient3155)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3153)"/> - <path d="m27.5,21c0,2.4853-5.1487,4.5-11.5,4.5s-11.5-2.0147-11.5-4.5,5.1487-4.5,11.5-4.5,11.5,2.0147,11.5,4.5z" stroke="#d8d8d8" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="#868688"/> - <path d="m27.49,19.068c0,2.4466-5.1487,4.4322-11.493,4.4322-6.344,0-11.493-1.9856-11.493-4.4322,0.11446-5.4694-1.4047-4.34,11.493-4.4322,13.193-0.0952,11.331-1.1267,11.493,4.4322z" stroke="url(#linearGradient3149)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3147)"/> - <path d="m27.5,15c0,2.4853-5.1487,4.5-11.5,4.5s-11.5-2.0147-11.5-4.5,5.1487-4.5,11.5-4.5,11.5,2.0147,11.5,4.5z" stroke="#d8d8d8" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="#868688"/> - <path d="M27.49,13.068c0,2.446-5.149,4.432-11.493,4.432-6.3435,0-11.492-1.986-11.492-4.432,0.1144-5.4697-1.4047-4.3402,11.492-4.4325,13.193-0.0952,11.331-1.1267,11.493,4.4325z" stroke="url(#linearGradient3143)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3141)"/> - <path d="m27.5,9c0,2.4853-5.1487,4.5-11.5,4.5s-11.5-2.015-11.5-4.5c0-2.4853,5.1487-4.5,11.5-4.5,6.351,0,11.5,2.0147,11.5,4.5z" stroke="url(#linearGradient3138)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#linearGradient3136)"/> - <rect opacity="0.5" style="enable-background:accumulate;color:#000000;" rx="17.5" ry="4" height="23" width="21" stroke="url(#linearGradient3098)" y="5.5" x="5.5" stroke-width="1" fill="none"/> + <path opacity=".3" fill="url(#c)" d="m29 27c0.0011 2.7613-5.8195 5-13 5s-13.001-2.239-13-5c-0.0011-2.761 5.8195-5 13-5s13.001 2.2387 13 5z" fill-rule="evenodd"/> + <g> + <path d="m27.49 25.068c0 2.4466-5.1487 4.4322-11.493 4.4322-6.344 0-11.493-1.9856-11.493-4.4322 0.11446-5.4694-1.4047-4.34 11.493-4.4322 13.193-0.0952 11.331-1.1267 11.493 4.4322z" stroke="url(#d)" fill="url(#e)"/> + <path d="m27.5 21c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.0147-11.5-4.5 5.1487-4.5 11.5-4.5 11.5 2.0147 11.5 4.5z" stroke="#d8d8d8" fill="#868688"/> + <path d="m27.49 19.068c0 2.4466-5.1487 4.4322-11.493 4.4322-6.344 0-11.493-1.9856-11.493-4.4322 0.11446-5.4694-1.4047-4.34 11.493-4.4322 13.193-0.0952 11.331-1.1267 11.493 4.4322z" stroke="url(#f)" fill="url(#g)"/> + <path d="m27.5 15c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.0147-11.5-4.5 5.1487-4.5 11.5-4.5 11.5 2.0147 11.5 4.5z" stroke="#d8d8d8" fill="#868688"/> + <path d="m27.49 13.068c0 2.446-5.149 4.432-11.493 4.432-6.3435 0-11.492-1.986-11.492-4.432 0.1144-5.4697-1.4047-4.3402 11.492-4.4325 13.193-0.0952 11.331-1.1267 11.493 4.4325z" stroke="url(#h)" fill="url(#i)"/> + <path d="m27.5 9c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.015-11.5-4.5c0-2.4853 5.1487-4.5 11.5-4.5 6.351 0 11.5 2.0147 11.5 4.5z" stroke="url(#j)" fill="url(#k)"/> + </g> + <rect opacity=".5" style="color:#000000" rx="17.5" ry="4" height="23" width="21" stroke="url(#l)" y="5.5" x="5.5" fill="none"/> </svg> diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png Binary files differindex c20f13c2e13..54a242d9d29 100644 --- a/core/img/filetypes/file.png +++ b/core/img/filetypes/file.png diff --git a/core/img/filetypes/file.svg b/core/img/filetypes/file.svg index 3d91c341143..ab7db2d2e45 100644 --- a/core/img/filetypes/file.svg +++ b/core/img/filetypes/file.svg @@ -5,32 +5,28 @@ <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="f" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24"> + <linearGradient id="g" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="e" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132"> + <linearGradient id="h" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> - <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> - <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" x1="302.86"> + <radialGradient id="j" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <radialGradient id="k" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="i" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g> - <g> - <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/> - <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/> - <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/> - </g> - <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#e)"/> - </g> - <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#f)" stroke-linecap="round" fill="none"/> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#i)"/> + <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#k)"/> + <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#j)"/> + <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#h)"/> + <path stroke-linejoin="round" stroke="url(#g)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/> <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/> </svg> diff --git a/core/img/filetypes/flash.png b/core/img/filetypes/flash.png Binary files differdeleted file mode 100644 index bcde641da3c..00000000000 --- a/core/img/filetypes/flash.png +++ /dev/null diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png Binary files differindex 19c2d2eebd4..086f38afd83 100644 --- a/core/img/filetypes/folder-drag-accept.png +++ b/core/img/filetypes/folder-drag-accept.png diff --git a/core/img/filetypes/folder-drag-accept.svg b/core/img/filetypes/folder-drag-accept.svg index a7885c80be7..5ee8f0e5ff3 100644 --- a/core/img/filetypes/folder-drag-accept.svg +++ b/core/img/filetypes/folder-drag-accept.svg @@ -1,335 +1,60 @@ <?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:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="32px" - height="32px" - id="svg17313" - version="1.1" - inkscape:version="0.48.3.1 r9886" - sodipodi:docname="folder-drag-accept.svg" - inkscape:export-filename="folder-drag-accept.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs17315"> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3454-2-5-0-3-4" - id="linearGradient8576" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.89186139,0,0,0.86792712,3.12074,9.575029)" - x1="27.557428" - y1="7.162672" - x2="27.557428" - y2="21.386522" /> - <linearGradient - id="linearGradient3454-2-5-0-3-4"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3456-4-9-38-1-8" /> - <stop - offset="0.0097359" - style="stop-color:#ffffff;stop-opacity:0.23529412" - id="stop3458-39-80-3-5-5" /> - <stop - offset="0.99001008" - style="stop-color:#ffffff;stop-opacity:0.15686275" - id="stop3460-7-0-2-4-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0.39215687" - id="stop3462-0-9-8-7-2" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6129-963-697-142-998-580-273-5" - id="linearGradient8564" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7467531,0,0,0.5519934,-1.92198,5.720099)" - x1="22.934725" - y1="49.629246" - x2="22.809399" - y2="36.657963" /> - <linearGradient - id="linearGradient6129-963-697-142-998-580-273-5"> - <stop - id="stop2661-1" - style="stop-color:#0a0a0a;stop-opacity:0.498" - offset="0" /> - <stop - id="stop2663-85" - style="stop-color:#0a0a0a;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4632-0-6-4-3-4" - id="linearGradient8568" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.64444432,0,0,0.54135319,0.53343,5.488719)" - x1="35.792694" - y1="17.118193" - x2="35.792694" - y2="43.761127" /> - <linearGradient - id="linearGradient4632-0-6-4-3-4"> - <stop - style="stop-color:#b4cee1;stop-opacity:1;" - offset="0" - id="stop4634-4-4-7-7-4" /> - <stop - style="stop-color:#5d9fcd;stop-opacity:1;" - offset="1" - id="stop4636-3-1-5-1-3" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5048-585-0" - id="linearGradient16107" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.05114282,0,0,0.01591575,-2.4899573,22.29927)" - x1="302.85715" - y1="366.64789" - x2="302.85715" - y2="609.50507" /> - <linearGradient - id="linearGradient5048-585-0"> - <stop - id="stop2667-18" - style="stop-color:#000000;stop-opacity:0" - offset="0" /> - <stop - id="stop2669-9" - style="stop-color:#000000;stop-opacity:1" - offset="0.5" /> - <stop - id="stop2671-33" - style="stop-color:#000000;stop-opacity:0" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060-179-67" - id="radialGradient16109" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.01983573,0,0,0.01591575,16.38765,22.29927)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - id="linearGradient5060-179-67"> - <stop - id="stop2675-81" - style="stop-color:#000000;stop-opacity:1" - offset="0" /> - <stop - id="stop2677-2" - style="stop-color:#000000;stop-opacity:0" - offset="1" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient5060-820-4" - id="radialGradient16111" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.01983573,0,0,0.01591575,15.60139,22.29927)" - cx="605.71429" - cy="486.64789" - fx="605.71429" - fy="486.64789" - r="117.14286" /> - <linearGradient - id="linearGradient5060-820-4"> - <stop - id="stop2681-5" - style="stop-color:#000000;stop-opacity:1" - offset="0" /> - <stop - id="stop2683-00" - style="stop-color:#000000;stop-opacity:0" - offset="1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4325" - id="linearGradient8584" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.54383556,0,0,0.61466406,3.26879,5.091139)" - x1="21.37039" - y1="4.73244" - x2="21.37039" - y2="34.143417" /> - <linearGradient - id="linearGradient4325"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4327" /> - <stop - offset="0.1106325" - style="stop-color:#ffffff;stop-opacity:0.23529412" - id="stop4329" /> - <stop - offset="0.99001008" - style="stop-color:#ffffff;stop-opacity:0.15686275" - id="stop4331" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0.39215687" - id="stop4333" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4646-7-4-3-5" - id="linearGradient8580" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.61904762,0,0,0.61904762,-30.3919,1.428569)" - x1="62.988873" - y1="17.469706" - x2="62.988873" - y2="20.469706" /> - <linearGradient - id="linearGradient4646-7-4-3-5"> - <stop - offset="0" - style="stop-color:#f9f9f9;stop-opacity:1" - id="stop4648-8-0-3-6" /> - <stop - offset="1" - style="stop-color:#d8d8d8;stop-opacity:1" - id="stop4650-1-7-3-4" /> - </linearGradient> - <linearGradient - id="linearGradient3104-8-8-97-4-6-11-5-5-0"> - <stop - offset="0" - style="stop-color:#000000;stop-opacity:0.32173914" - id="stop3106-5-4-3-5-0-2-1-0-6" /> - <stop - offset="1" - style="stop-color:#000000;stop-opacity:0.27826086" - id="stop3108-4-3-7-8-2-0-7-9-1" /> - </linearGradient> - <linearGradient - y2="3.6336823" - x2="-51.786404" - y1="53.514328" - x1="-51.786404" - gradientTransform="matrix(0.50703384,0,0,0.50300255,68.02913,1.329769)" - gradientUnits="userSpaceOnUse" - id="linearGradient17311" - xlink:href="#linearGradient3104-8-8-97-4-6-11-5-5-0" - inkscape:collect="always" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="11.197802" - inkscape:cx="16" - inkscape:cy="16" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1366" - inkscape:window-height="744" - inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="1" /> - <metadata - id="metadata17318"> - <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 - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <path - style="opacity:0.8;color:#000000;fill:none;stroke:url(#linearGradient17311);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="use8307" - inkscape:connector-curvature="0" - d="m 4.00009,6.500079 c -0.43342,0.005 -0.5,0.21723 -0.5,0.6349 l 0,1.36502 c -1.24568,0 -1,-0.002 -1,0.54389 l 0,9.45611 27,-1.36005 0,-8.09606 c 0,-0.41767 -0.34799,-0.54876 -0.78141,-0.54389 l -14.21859,0 0,-1.36502 c 0,-0.41767 -0.26424,-0.63977 -0.69767,-0.6349 z" - sodipodi:nodetypes="csccccsccscc" /> - <path - id="use8309" - d="m 4.00009,6.999999 0,2 -1,0 0,6 26,0 0,-6 -15,0 0,-2 z" - style="color:#000000;fill:url(#linearGradient8580);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccccc" /> - <path - id="use8311" - d="m 4.50009,7.499999 0,2 -1,0 0,6 25,0 0,-6 -15,0 0,-2 z" - style="color:#000000;fill:none;stroke:url(#linearGradient8584);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccccc" /> - <g - id="use8313" - transform="translate(9e-5,-1.000001)"> - <rect - style="opacity:0.3;fill:url(#linearGradient16107);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" - id="rect16101" - y="28.134747" - x="3.6471815" - height="3.8652544" - width="24.694677" /> - <path - style="opacity:0.3;fill:url(#radialGradient16109);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" - id="path16103" - inkscape:connector-curvature="0" - d="m 28.341859,28.13488 c 0,0 0,3.865041 0,3.865041 1.021491,0.0073 2.469468,-0.86596 2.469468,-1.932769 0,-1.06681 -1.139908,-1.932272 -2.469468,-1.932272 z" /> - <path - style="opacity:0.3;fill:url(#radialGradient16111);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" - id="path16105" - inkscape:connector-curvature="0" - d="m 3.6471816,28.13488 c 0,0 0,3.865041 0,3.865041 -1.0214912,0.0073 -2.4694678,-0.86596 -2.4694678,-1.932769 0,-1.06681 1.1399068,-1.932272 2.4694678,-1.932272 z" /> - </g> - <path - style="color:#000000;fill:url(#linearGradient8568);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9176628;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="use8315" - inkscape:connector-curvature="0" - d="m 0.92644,14.421049 c -0.69105,0.067 -0.32196,0.76007 -0.37705,1.14977 0.0802,0.25184 1.5982,13.2362 1.5982,13.68205 0,0.38752 0.22667,0.32187 0.80101,0.32187 8.4994,0 17.89808,0 26.39748,0 0.61872,0.012 0.48796,0.006 0.48796,-0.32797 0.0452,-0.17069 1.63945,-14.29767 1.66234,-14.52079 0,-0.23495 0.0581,-0.30493 -0.30493,-0.30493 -9.0765,0 -21.1885,0 -30.26501,0 z" - sodipodi:nodetypes="ccsscccsc" /> - <path - style="opacity:0.4;fill:url(#linearGradient8564);fill-opacity:1;stroke:none" - id="use8317" - inkscape:connector-curvature="0" - d="m 0.68182,13.999999 30.63618,2.3e-4 c 0.4137,0 0.68181,0.24597 0.68181,0.55177 l -1.67322,14.91546 c 0.01,0.38693 -0.1364,0.54035 -0.61707,0.53224 l -27.25613,-0.01 c -0.4137,0 -0.83086,-0.22836 -0.83086,-0.53417 L 0,14.551709 c 0,-0.3058 0.26812,-0.55199 0.68182,-0.55199 z" - sodipodi:nodetypes="cscccccccc" /> - <path - sodipodi:nodetypes="ccccc" - inkscape:connector-curvature="0" - id="use8572" - d="m 1.49991,15.411759 1.62516,13.17647 25.74917,0 1.62467,-13.17647 z" - style="opacity:0.5;color:#000000;fill:none;stroke:url(#linearGradient8576);stroke-width:0.90748531;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="opacity:0.3;color:#000000;fill:none;stroke:#000000;stroke-width:0.9176628;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="use8315-2" - inkscape:connector-curvature="0" - d="m 0.92644,14.42105 c -0.69105,0.067 -0.32196,0.76007 -0.37705,1.14977 0.0802,0.25184 1.5982,13.236199 1.5982,13.682049 0,0.38752 0.22667,0.32187 0.80101,0.32187 8.4994,0 17.89808,0 26.39748,0 0.61872,0.012 0.48796,0.006 0.48796,-0.32797 0.0452,-0.17069 1.63945,-14.297669 1.66234,-14.520789 0,-0.23495 0.0581,-0.30493 -0.30493,-0.30493 -9.0765,0 -21.1885,0 -30.26501,0 z" - sodipodi:nodetypes="ccsscccsc" /> - </g> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs> + <linearGradient id="e" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 .86793 3.1207 9.575)" y1="7.1627" x1="27.557"> + <stop stop-color="#fff" offset="0"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> + <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> + </linearGradient> + <linearGradient id="g" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(.74675 0 0 .55199 -1.922 5.7201)" y1="49.629" x1="22.935"> + <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/> + <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/> + </linearGradient> + <linearGradient id="f" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .54135 .53343 5.4887)" y1="17.118" x1="35.793"> + <stop stop-color="#b4cee1" offset="0"/> + <stop stop-color="#5d9fcd" offset="1"/> + </linearGradient> + <linearGradient id="i" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> + </linearGradient> + <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> + </radialGradient> + <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> + </radialGradient> + <linearGradient id="c" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2688 5.0911)" y1="4.7324" x1="21.37"> + <stop stop-color="#fff" offset="0"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> + <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> + </linearGradient> + <linearGradient id="d" y2="20.47" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="17.47" x1="62.989"> + <stop stop-color="#f9f9f9" offset="0"/> + <stop stop-color="#d8d8d8" offset="1"/> + </linearGradient> + <linearGradient id="h" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786"> + <stop stop-opacity=".32174" offset="0"/> + <stop stop-opacity=".27826" offset="1"/> + </linearGradient> + </defs> + <g> + <path opacity=".8" style="color:#000000" d="m4.0001 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389v9.4561l27-1.36v-8.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349z" stroke="url(#h)" fill="none"/> + <path style="color:#000000" d="m4.0001 7v2h-1v6h26v-6h-15v-2z" fill="url(#d)"/> + <path style="color:#000000" d="m4.5001 7.5v2h-1v6h25v-6h-15v-2z" stroke="url(#c)" stroke-linecap="round" fill="none"/> + </g> + <g transform="translate(.00009 -1)"> + <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#i)"/> + <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/> + <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/> + </g> + <path style="color:#000000" d="m0.92644 14.421c-0.69105 0.067-0.32196 0.76007-0.37705 1.1498 0.0802 0.25184 1.5982 13.236 1.5982 13.682 0 0.38752 0.22667 0.32187 0.80101 0.32187h26.397c0.61872 0.012 0.48796 0.006 0.48796-0.32797 0.0452-0.17069 1.6394-14.298 1.6623-14.521 0-0.23495 0.0581-0.30493-0.30493-0.30493h-30.265z" fill="url(#f)"/> + <path opacity=".4" d="m0.68182 14 30.636 0.00023c0.4137 0 0.68181 0.24597 0.68181 0.55177l-1.6732 14.915c0.01 0.38693-0.1364 0.54035-0.61707 0.53224l-27.256-0.01c-0.4137 0-0.83086-0.22836-0.83086-0.53417l-1.6231-14.903c0-0.3058 0.26812-0.55199 0.68182-0.55199z" fill="url(#g)"/> + <path opacity=".5" style="color:#000000" d="m1.4999 15.412 1.6252 13.176h25.749l1.6247-13.176z" stroke="url(#e)" stroke-linecap="round" stroke-width=".90749" fill="none"/> + <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m0.92644 14.421c-0.69105 0.067-0.32196 0.76007-0.37705 1.1498 0.0802 0.25184 1.5982 13.236 1.5982 13.682 0 0.38752 0.22667 0.32187 0.80101 0.32187h26.397c0.61872 0.012 0.48796 0.006 0.48796-0.32797 0.0452-0.17069 1.6394-14.298 1.6623-14.521 0-0.23495 0.0581-0.30493-0.30493-0.30493h-30.265z" stroke="#000" stroke-linecap="round" stroke-width=".91766" fill="none"/> </svg> diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png Binary files differindex 997f07b2bac..7da0a42fc24 100644 --- a/core/img/filetypes/folder-external.png +++ b/core/img/filetypes/folder-external.png diff --git a/core/img/filetypes/folder-external.svg b/core/img/filetypes/folder-external.svg index 89ec9a8ecaa..bf07bdd79ce 100644 --- a/core/img/filetypes/folder-external.svg +++ b/core/img/filetypes/folder-external.svg @@ -1,68 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> <defs> - <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557"> + <linearGradient id="p" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" x2="27.557" y2="21.387"> <stop stop-color="#fff" offset="0"/> - <stop stop-color="#fff" stop-opacity=".23529" offset="0.0097359"/> - <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(0.74675,0,0,0.65549,-1.9219,3.1676)" y1="49.629" x1="22.935"> + <linearGradient id="o" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 3.1676)" x2="22.809" y2="36.658"> <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/> <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793"> + <linearGradient id="n" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" x2="35.793" y2="43.761"> <stop stop-color="#b4cee1" offset="0"/> <stop stop-color="#5d9fcd" offset="1"/> </linearGradient> - <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86"> + <linearGradient id="m" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51"> <stop stop-opacity="0" offset="0"/> - <stop offset="0.5"/> + <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> + <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> + <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37"> + <linearGradient id="l" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" x2="21.37" y2="34.143"> <stop stop-color="#fff" offset="0"/> - <stop stop-color="#fff" stop-opacity=".23529" offset="0.11063"/> - <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989"> + <linearGradient id="k" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" x2="62.989" y2="16"> <stop stop-color="#f9f9f9" offset="0"/> <stop stop-color="#d8d8d8" offset="1"/> </linearGradient> - <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786"> + <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 1.3298)" y1="53.514" y2="3.6337"> <stop stop-opacity=".32174" offset="0"/> <stop stop-opacity=".27826" offset="1"/> </linearGradient> </defs> - <path opacity=".8" style="color:#000000;" d="m4.0002,6.5001c-0.43342,0.005-0.5,0.21723-0.5,0.6349v1.365c-1.2457,0-1-0.002-1,0.54389,0.0216,6.5331,0,6.9014,0,7.4561,0.90135,0,27-2.349,27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/> - <path style="color:#000000;" d="m4.0002,7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/> - <path style="color:#000000;" d="m4.5002,7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/> + <path opacity=".8" style="color:#000000" d="m4.0002 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#j)" fill="none"/> + <path style="color:#000000" d="m4.0002 7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#k)"/> + <path style="color:#000000" stroke-linecap="round" d="m4.5002 7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#l)" fill="none"/> <g transform="translate(.00017936 -1)"> - <rect opacity="0.3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/> - <path opacity=".3" d="m28.342,28.135v3.865c1.0215,0.0073,2.4695-0.86596,2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/> - <path opacity=".3" d="m3.6472,28.135v3.865c-1.0215,0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323,2.4695-1.9323z" fill="url(#a)"/> + <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#m)"/> + <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#q)"/> + <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#r)"/> </g> - <path style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/> - <path opacity="0.4" fill="url(#d)" d="m1.682,13,28.636,0.00027c0.4137,0,0.68181,0.29209,0.68181,0.65523l-0.6735,17.712c0.01,0.45948-0.1364,0.64166-0.61707,0.63203l-27.256-0.0115c-0.4137,0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314,0.26812-0.65549,0.68182-0.65549z"/> - <path opacity=".5" style="color:#000000;" d="m2.5002,12.5,0.62498,16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/> - <path opacity=".3" stroke-linejoin="round" style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/> - <path opacity="0.3" fill="#FFF" d="m16,16,2,2-3,3,2,2,3-3,2,2,0-6-6,0zm-4,1c-0.554,0-1,0.446-1,1v8c0,0.554,0.446,1,1,1h8c0.554,0,1-0.446,1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z"/> - <path opacity="0.7" fill="#000" d="m16,15,2,2-3,3,2,2,3-3,2,2,0-6-6,0zm-4,1c-0.554,0-1,0.446-1,1v8c0,0.554,0.446,1,1,1h8c0.554,0,1-0.446,1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z"/> + <path style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#n)"/> + <path opacity=".4" d="m1.682 13 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.0115c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#o)"/> + <path opacity=".5" style="color:#000000" d="m2.5002 12.5 0.62498 16h25.749l0.62498-16z" stroke="url(#p)" stroke-linecap="round" fill="none"/> + <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/> + <path opacity=".3" d="m16 16 2 2-3 3 2 2 3-3 2 2v-6h-6zm-4 1c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z" fill="#FFF"/> + <path opacity=".7" d="m16 15 2 2-3 3 2 2 3-3 2 2v-6h-6zm-4 1c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z"/> </svg> diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png Binary files differindex c716607e26e..4758fb25408 100644 --- a/core/img/filetypes/folder-public.png +++ b/core/img/filetypes/folder-public.png diff --git a/core/img/filetypes/folder-public.svg b/core/img/filetypes/folder-public.svg index a949833f95a..04a11f26899 100644 --- a/core/img/filetypes/folder-public.svg +++ b/core/img/filetypes/folder-public.svg @@ -1,68 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> <defs> - <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557"> + <linearGradient id="p" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" x2="27.557" y2="21.387"> <stop stop-color="#fff" offset="0"/> - <stop stop-color="#fff" stop-opacity=".23529" offset="0.0097359"/> - <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(0.74675,0,0,0.65549,-1.9219,3.1676)" y1="49.629" x1="22.935"> + <linearGradient id="o" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 3.1676)" x2="22.809" y2="36.658"> <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/> <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793"> + <linearGradient id="n" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" x2="35.793" y2="43.761"> <stop stop-color="#b4cee1" offset="0"/> <stop stop-color="#5d9fcd" offset="1"/> </linearGradient> - <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86"> + <linearGradient id="m" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51"> <stop stop-opacity="0" offset="0"/> - <stop offset="0.5"/> + <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> + <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> + <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37"> + <linearGradient id="l" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" x2="21.37" y2="34.143"> <stop stop-color="#fff" offset="0"/> - <stop stop-color="#fff" stop-opacity=".23529" offset="0.11063"/> - <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989"> + <linearGradient id="k" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" x2="62.989" y2="16"> <stop stop-color="#f9f9f9" offset="0"/> <stop stop-color="#d8d8d8" offset="1"/> </linearGradient> - <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786"> + <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 1.3298)" y1="53.514" y2="3.6337"> <stop stop-opacity=".32174" offset="0"/> <stop stop-opacity=".27826" offset="1"/> </linearGradient> </defs> - <path opacity=".8" style="color:#000000;" d="m4.0002,6.5001c-0.43342,0.005-0.5,0.21723-0.5,0.6349v1.365c-1.2457,0-1-0.002-1,0.54389,0.0216,6.5331,0,6.9014,0,7.4561,0.90135,0,27-2.349,27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/> - <path style="color:#000000;" d="m4.0002,7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/> - <path style="color:#000000;" d="m4.5002,7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/> + <path opacity=".8" style="color:#000000" d="m4.0002 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#j)" fill="none"/> + <path style="color:#000000" d="m4.0002 7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#k)"/> + <path style="color:#000000" stroke-linecap="round" d="m4.5002 7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#l)" fill="none"/> <g transform="translate(.00017936 -1)"> - <rect opacity="0.3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/> - <path opacity=".3" d="m28.342,28.135v3.865c1.0215,0.0073,2.4695-0.86596,2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/> - <path opacity=".3" d="m3.6472,28.135v3.865c-1.0215,0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323,2.4695-1.9323z" fill="url(#a)"/> + <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#m)"/> + <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#q)"/> + <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#r)"/> </g> - <path style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/> - <path opacity="0.4" fill="url(#d)" d="m1.682,13,28.636,0.00027c0.4137,0,0.68181,0.29209,0.68181,0.65523l-0.6735,17.712c0.01,0.45948-0.1364,0.64166-0.61707,0.63203l-27.256-0.0115c-0.4137,0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314,0.26812-0.65549,0.68182-0.65549z"/> - <path opacity=".5" style="color:#000000;" d="m2.5002,12.5,0.62498,16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/> - <path opacity=".3" stroke-linejoin="round" style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/> - <path opacity="0.3" fill="#FFF" d="m16,14c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm0.80208,0.89323c1.2011,0.02671,2.2625,0.74821,3.3359,1.2214l1.732,2.3971-0.274,1.03,0.529,0.3281-0.009,1.2213c-0.0121,0.34937,0.005,0.69921-0.0091,1.0482-0.16635,0.66235-0.55063,1.2666-0.875,1.8685-0.21989,0.10841,0.02005-0.7185-0.11849-0.97526,0.032-0.5934-0.471-0.566-0.811-0.2364-0.421,0.2454-1.346,0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526,0.291-2.3971l-0.537-0.6563,0.191-1.6862-0.857-0.8658,0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284,0.0814-0.0046,0.166-0.0109,0.2461-0.0091zm-2.4609,0.0091c0.03144,0.0046,0.06999,0.02643,0.1276,0.07292,0.338,0.1857-0.0825,0.3964-0.1823,0.5925-0.5398,0.3651,0.166,0.6641,0.401,0.957,0.3767-0.1082,0.7535-0.6467,1.3034-0.483,0.7034-0.2195,0.5913,0.5891,0.9935,0.9479,0.0522,0.1689,0.88,0.7185,0.3828,0.5377-0.4095-0.3174-0.8649-0.2935-1.1576,0.1641-0.7909,0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328,0.4775-0.401,0.8112-0.3725-0.0081-1.0681-0.2866-1.4492,0.1641l0.3736,0.6106,0.4467-0.6836c0.1085-0.2474,0.2447,0.1923,0.3645,0.2735,0.1431,0.2759,0.823,0.7434,0.3099,0.875-0.7606,0.4219-1.3589,1.0618-2.0052,1.6315-0.218,0.46-0.663,0.4074-0.9388,0.0273-0.6672-0.4105-0.6177,0.6566-0.5833,1.0573l0.58333-0.36458v0.60156c-0.0165,0.1138-0.0024,0.2322-0.0091,0.3464-0.4087,0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551,0.0091-1.2669,0.8038-0.8625,1.6202-1.7561,2.0964-2.8529h0.78385c0.5478,0.2654,0.2357-0.5881,0.4557-0.556zm-1.1576,7.8204c0.0951-0.01014,0.20328,0.01157,0.31901,0.07292,0.73794,0.10562,1.2897,0.6409,1.8776,1.0482,0.46872,0.46452,1.4828,0.31578,1.5951,1.1029-0.17061,0.85375-1.0105,1.3122-1.75,1.6133-0.1846,0.103-0.383,0.185-0.5925,0.219-0.6856,0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941,0.0182-0.397,0.235-1.0134,0.6471-1.0573z"/> - <path opacity="0.7" d="m16,13c-3.866,0-7,3.134-7,7s3.134,7,7,7,7-3.134,7-7-3.134-7-7-7zm0.80208,0.89323c1.2011,0.02671,2.2625,0.74821,3.3359,1.2214l1.732,2.3971-0.274,1.03,0.529,0.3281-0.009,1.2213c-0.0121,0.34937,0.005,0.69921-0.0091,1.0482-0.16635,0.66235-0.55063,1.2666-0.875,1.8685-0.21989,0.10841,0.02005-0.7185-0.11849-0.97526,0.032-0.5934-0.471-0.566-0.811-0.2364-0.421,0.2454-1.346,0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526,0.291-2.3971l-0.537-0.6563,0.191-1.6862-0.857-0.8658,0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284,0.0814-0.0046,0.166-0.0109,0.2461-0.0091zm-2.4609,0.0091c0.03144,0.0046,0.06999,0.02643,0.1276,0.07292,0.338,0.1857-0.0825,0.3964-0.1823,0.5925-0.5398,0.3651,0.166,0.6641,0.401,0.957,0.3767-0.1082,0.7535-0.6467,1.3034-0.483,0.7034-0.2195,0.5913,0.5891,0.9935,0.9479,0.0522,0.1689,0.88,0.7185,0.3828,0.5377-0.4095-0.3174-0.8649-0.2935-1.1576,0.1641-0.7909,0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328,0.4775-0.401,0.8112-0.3725-0.0081-1.0681-0.2866-1.4492,0.1641l0.3736,0.6106,0.4467-0.6836c0.1085-0.2474,0.2447,0.1923,0.3645,0.2735,0.1431,0.2759,0.823,0.7434,0.3099,0.875-0.7606,0.4219-1.3589,1.0618-2.0052,1.6315-0.218,0.46-0.663,0.4074-0.9388,0.0273-0.6672-0.4105-0.6177,0.6566-0.5833,1.0573l0.58333-0.36458v0.60156c-0.0165,0.1138-0.0024,0.2322-0.0091,0.3464-0.4087,0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551,0.0091-1.2669,0.8038-0.8625,1.6202-1.7561,2.0964-2.8529h0.78385c0.5478,0.2654,0.2357-0.5881,0.4557-0.556zm-1.1576,7.8204c0.0951-0.01014,0.20328,0.01157,0.31901,0.07292,0.73794,0.10562,1.2897,0.6409,1.8776,1.0482,0.46872,0.46452,1.4828,0.31578,1.5951,1.1029-0.17061,0.85375-1.0105,1.3122-1.75,1.6133-0.1846,0.103-0.383,0.185-0.5925,0.219-0.6856,0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941,0.0182-0.397,0.235-1.0134,0.6471-1.0573z"/> + <path style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#n)"/> + <path opacity=".4" d="m1.682 13 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.0115c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#o)"/> + <path opacity=".5" style="color:#000000" d="m2.5002 12.5 0.62498 16h25.749l0.62498-16z" stroke="url(#p)" stroke-linecap="round" fill="none"/> + <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/> + <path opacity=".3" d="m16 14c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm0.80208 0.89323c1.2011 0.02671 2.2625 0.74821 3.3359 1.2214l1.732 2.3971-0.274 1.03 0.529 0.3281-0.009 1.2213c-0.0121 0.34937 0.005 0.69921-0.0091 1.0482-0.16635 0.66235-0.55063 1.2666-0.875 1.8685-0.21989 0.10841 0.02005-0.7185-0.11849-0.97526 0.032-0.5934-0.471-0.566-0.811-0.2364-0.421 0.2454-1.346 0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526 0.291-2.3971l-0.537-0.6563 0.191-1.6862-0.857-0.8658 0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284 0.0814-0.0046 0.166-0.0109 0.2461-0.0091zm-2.4609 0.0091c0.03144 0.0046 0.06999 0.02643 0.1276 0.07292 0.338 0.1857-0.0825 0.3964-0.1823 0.5925-0.5398 0.3651 0.166 0.6641 0.401 0.957 0.3767-0.1082 0.7535-0.6467 1.3034-0.483 0.7034-0.2195 0.5913 0.5891 0.9935 0.9479 0.0522 0.1689 0.88 0.7185 0.3828 0.5377-0.4095-0.3174-0.8649-0.2935-1.1576 0.1641-0.7909 0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328 0.4775-0.401 0.8112-0.3725-0.0081-1.0681-0.2866-1.4492 0.1641l0.3736 0.6106 0.4467-0.6836c0.1085-0.2474 0.2447 0.1923 0.3645 0.2735 0.1431 0.2759 0.823 0.7434 0.3099 0.875-0.7606 0.4219-1.3589 1.0618-2.0052 1.6315-0.218 0.46-0.663 0.4074-0.9388 0.0273-0.6672-0.4105-0.6177 0.6566-0.5833 1.0573l0.58333-0.36458v0.60156c-0.0165 0.1138-0.0024 0.2322-0.0091 0.3464-0.4087 0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551 0.0091-1.2669 0.8038-0.8625 1.6202-1.7561 2.0964-2.8529h0.78385c0.5478 0.2654 0.2357-0.5881 0.4557-0.556zm-1.1576 7.8204c0.0951-0.01014 0.20328 0.01157 0.31901 0.07292 0.73794 0.10562 1.2897 0.6409 1.8776 1.0482 0.46872 0.46452 1.4828 0.31578 1.5951 1.1029-0.17061 0.85375-1.0105 1.3122-1.75 1.6133-0.1846 0.103-0.383 0.185-0.5925 0.219-0.6856 0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941 0.0182-0.397 0.235-1.0134 0.6471-1.0573z" fill="#FFF"/> + <path opacity=".7" d="m16 13c-3.866 0-7 3.134-7 7s3.134 7 7 7 7-3.134 7-7-3.134-7-7-7zm0.80208 0.89323c1.2011 0.02671 2.2625 0.74821 3.3359 1.2214l1.732 2.3971-0.274 1.03 0.529 0.3281-0.009 1.2213c-0.0121 0.34937 0.005 0.69921-0.0091 1.0482-0.16635 0.66235-0.55063 1.2666-0.875 1.8685-0.21989 0.10841 0.02005-0.7185-0.11849-0.97526 0.032-0.5934-0.471-0.566-0.811-0.2364-0.421 0.2454-1.346 0.3194-1.376-0.3464-0.239-0.8001-0.035-1.6526 0.291-2.3971l-0.537-0.6563 0.191-1.6862-0.857-0.8658 0.201-0.948-1.0028-0.5651c-0.1977-0.1552-0.5738-0.2166-0.6563-0.4284 0.0814-0.0046 0.166-0.0109 0.2461-0.0091zm-2.4609 0.0091c0.03144 0.0046 0.06999 0.02643 0.1276 0.07292 0.338 0.1857-0.0825 0.3964-0.1823 0.5925-0.5398 0.3651 0.166 0.6641 0.401 0.957 0.3767-0.1082 0.7535-0.6467 1.3034-0.483 0.7034-0.2195 0.5913 0.5891 0.9935 0.9479 0.0522 0.1689 0.88 0.7185 0.3828 0.5377-0.4095-0.3174-0.8649-0.2935-1.1576 0.1641-0.7909 0.4286-0.3228-0.8252-0.7018-1.1302-0.5729-0.6392-0.3328 0.4775-0.401 0.8112-0.3725-0.0081-1.0681-0.2866-1.4492 0.1641l0.3736 0.6106 0.4467-0.6836c0.1085-0.2474 0.2447 0.1923 0.3645 0.2735 0.1431 0.2759 0.823 0.7434 0.3099 0.875-0.7606 0.4219-1.3589 1.0618-2.0052 1.6315-0.218 0.46-0.663 0.4074-0.9388 0.0273-0.6672-0.4105-0.6177 0.6566-0.5833 1.0573l0.58333-0.36458v0.60156c-0.0165 0.1138-0.0024 0.2322-0.0091 0.3464-0.4087 0.427-0.8207-0.5995-1.1758-0.8295l-0.0273-1.5039c0.0129-0.4225-0.0763-0.8551 0.0091-1.2669 0.8038-0.8625 1.6202-1.7561 2.0964-2.8529h0.78385c0.5478 0.2654 0.2357-0.5881 0.4557-0.556zm-1.1576 7.8204c0.0951-0.01014 0.20328 0.01157 0.31901 0.07292 0.73794 0.10562 1.2897 0.6409 1.8776 1.0482 0.46872 0.46452 1.4828 0.31578 1.5951 1.1029-0.17061 0.85375-1.0105 1.3122-1.75 1.6133-0.1846 0.103-0.383 0.185-0.5925 0.219-0.6856 0.171-0.982-0.532-1.1211-1.058-0.3104-0.65-1.0862-1.142-0.9752-1.941 0.0182-0.397 0.235-1.0134 0.6471-1.0573z"/> </svg> diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png Binary files differindex e547a242062..e3c0ee9815a 100644 --- a/core/img/filetypes/folder-shared.png +++ b/core/img/filetypes/folder-shared.png diff --git a/core/img/filetypes/folder-shared.svg b/core/img/filetypes/folder-shared.svg index 56aa9634d27..a389e535439 100644 --- a/core/img/filetypes/folder-shared.svg +++ b/core/img/filetypes/folder-shared.svg @@ -1,68 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> <defs> - <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557"> + <linearGradient id="p" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" x2="27.557" y2="21.387"> <stop stop-color="#fff" offset="0"/> - <stop stop-color="#fff" stop-opacity=".23529" offset="0.0097359"/> - <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 1.1676)" y1="49.629" x1="22.935"> + <linearGradient id="o" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 1.1676)" x2="22.809" y2="36.658"> <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/> <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793"> + <linearGradient id="n" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" x2="35.793" y2="43.761"> <stop stop-color="#b4cee1" offset="0"/> <stop stop-color="#5d9fcd" offset="1"/> </linearGradient> - <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86"> + <linearGradient id="m" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51"> <stop stop-opacity="0" offset="0"/> - <stop offset="0.5"/> + <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> + <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> + <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37"> + <linearGradient id="l" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" x2="21.37" y2="34.143"> <stop stop-color="#fff" offset="0"/> - <stop stop-color="#fff" stop-opacity=".23529" offset="0.11063"/> - <stop stop-color="#fff" stop-opacity=".15686" offset="0.99001"/> + <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/> + <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989"> + <linearGradient id="k" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" x2="62.989" y2="16"> <stop stop-color="#f9f9f9" offset="0"/> <stop stop-color="#d8d8d8" offset="1"/> </linearGradient> - <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786"> + <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 1.3298)" y1="53.514" y2="3.6337"> <stop stop-opacity=".32174" offset="0"/> <stop stop-opacity=".27826" offset="1"/> </linearGradient> </defs> - <path opacity=".8" style="color:#000000;" d="m4.0002,6.5001c-0.43342,0.005-0.5,0.21723-0.5,0.6349v1.365c-1.2457,0-1-0.002-1,0.54389,0.0216,6.5331,0,6.9014,0,7.4561,0.90135,0,27-2.349,27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/> - <path style="color:#000000;" d="m4.0002,7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/> - <path style="color:#000000;" d="m4.5002,7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/> + <path opacity=".8" style="color:#000000" d="m4.0002 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#j)" fill="none"/> + <path style="color:#000000" d="m4.0002 7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#k)"/> + <path style="color:#000000" stroke-linecap="round" d="m4.5002 7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#l)" fill="none"/> <g transform="translate(.00017936 -1)"> - <rect opacity="0.3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/> - <path opacity=".3" d="m28.342,28.135v3.865c1.0215,0.0073,2.4695-0.86596,2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/> - <path opacity=".3" d="m3.6472,28.135v3.865c-1.0215,0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323,2.4695-1.9323z" fill="url(#a)"/> + <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#m)"/> + <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#q)"/> + <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#r)"/> </g> - <path style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/> - <path opacity=".4" d="m1.682,11,28.636,0.00027c0.4137,0,0.68181,0.29209,0.68181,0.65523l-0.6735,17.712c0.01,0.45948-0.1364,0.64166-0.61707,0.63203l-27.256-0.0115c-0.4137,0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314,0.26812-0.65549,0.68182-0.65549z" fill="url(#d)"/> - <path opacity=".5" style="color:#000000;" d="m2.5002,12.5,0.62498,16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/> - <path opacity=".3" stroke-linejoin="round" style="color:#000000;" d="m1.927,11.5c-0.69105,0.0796-0.32196,0.90258-0.37705,1.3654,0.0802,0.29906,0.59771,15.718,0.59771,16.247,0,0.46018,0.22667,0.38222,0.80101,0.38222h26.397c0.61872,0.0143,0.48796,0.007,0.48796-0.38947,0.0452-0.20269,0.63993-16.978,0.66282-17.243,0-0.279,0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/> - <path opacity="0.3" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none;" fill="#FFF" d="m12.388,16.483c-0.96482,0-1.7833,0.70559-1.7833,1.6162,0.0069,0.28781,0.03259,0.64272,0.20434,1.3933v0.01858l0.01857,0.01857c0.05513,0.15793,0.13537,0.24827,0.24149,0.37154,0.10612,0.12326,0.23263,0.26834,0.35294,0.39011,0.01415,0.01433,0.02323,0.0232,0.03715,0.03716,0.02386,0.10383,0.05276,0.21557,0.0743,0.3158,0.05732,0.26668,0.05144,0.45553,0.03716,0.52015-0.4146,0.1454-0.9304,0.3187-1.3932,0.5199-0.2598,0.113-0.4949,0.2139-0.6873,0.3344-0.1923,0.1206-0.3836,0.2116-0.4458,0.483-0.000797,0.01237-0.000797,0.02479,0,0.03716-0.06076,0.55788-0.15266,1.3783-0.22291,1.932-0.015166,0.11656,0.046264,0.23943,0.14861,0.29723,0.84033,0.45393,2.1312,0.63663,3.418,0.63161,1.2868-0.005,2.5674-0.19845,3.3808-0.63161,0.10234-0.0578,0.16378-0.18067,0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.05975-0.05346-0.23358,0-0.50157,0.01436-0.07196,0.03684-0.14903,0.05573-0.22292,0.04503-0.05044,0.08013-0.09166,0.13003-0.14861,0.1064-0.1215,0.2207-0.2489,0.3157-0.3715,0.0951-0.1226,0.1728-0.2279,0.223-0.3715l0.01857-0.01858c0.1941-0.7837,0.1942-1.1107,0.2043-1.3933v-0.01857c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067,0-2.6,1.0287-2.6,2.3562,0.01,0.4196,0.04751,0.93701,0.29791,2.0312v0.02708l0.02708,0.02708c0.08038,0.23025,0.19736,0.36196,0.35208,0.54166s0.33917,0.39121,0.51458,0.56874c0.02064,0.02089,0.03386,0.03383,0.05416,0.05418,0.03479,0.15137,0.07693,0.31428,0.10833,0.46041,0.08357,0.38879,0.07499,0.66411,0.05417,0.75832-0.6045,0.2122-1.3565,0.465-2.0312,0.7583-0.3789,0.1647-0.7217,0.3118-1.0021,0.4875-0.28044,0.17574-0.55934,0.30851-0.64999,0.70416-0.0012,0.01804-0.0012,0.03613,0,0.05418-0.08858,0.81334-0.22257,2.0094-0.325,2.8166-0.02211,0.16993,0.06745,0.34906,0.21666,0.43333,1.2252,0.66179,3.1072,0.92814,4.9833,0.92082,1.8761-0.0073,3.7431-0.28932,4.9291-0.92082,0.14921-0.08427,0.23878-0.2634,0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.08711-0.07795-0.34054,0-0.73124,0.02093-0.10491,0.05371-0.21727,0.08125-0.325,0.06566-0.07354,0.11683-0.13363,0.18958-0.21666,0.15516-0.17709,0.32189-0.36287,0.46041-0.54166s0.25186-0.33217,0.325-0.54166l0.02708-0.02708c0.28309-1.1425,0.28324-1.6193,0.29792-2.0312v-0.02708c0-1.3275-1.1933-2.3562-2.6-2.3562z"/> - <path opacity="0.7" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;" d="m12.388,15.483c-0.96482,0-1.7833,0.70559-1.7833,1.6162,0.0069,0.28781,0.03259,0.64272,0.20434,1.3933v0.01858l0.01857,0.01857c0.05513,0.15793,0.13537,0.24827,0.24149,0.37154,0.10612,0.12326,0.23263,0.26834,0.35294,0.39011,0.01415,0.01433,0.02323,0.0232,0.03715,0.03716,0.02386,0.10383,0.05276,0.21557,0.0743,0.3158,0.05732,0.26668,0.05144,0.45553,0.03716,0.52015-0.4146,0.1454-0.9304,0.3187-1.3932,0.5199-0.2598,0.113-0.4949,0.2139-0.6873,0.3344-0.1923,0.1206-0.3836,0.2116-0.4458,0.483-0.000797,0.01237-0.000797,0.02479,0,0.03716-0.06076,0.55788-0.15266,1.3783-0.22291,1.932-0.015166,0.11656,0.046264,0.23943,0.14861,0.29723,0.84033,0.45393,2.1312,0.63663,3.418,0.63161,1.2868-0.005,2.5674-0.19845,3.3808-0.63161,0.10234-0.0578,0.16378-0.18067,0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.05975-0.05346-0.23358,0-0.50157,0.01436-0.07196,0.03684-0.14903,0.05573-0.22292,0.04503-0.05044,0.08013-0.09166,0.13003-0.14861,0.1064-0.1215,0.2207-0.2489,0.3157-0.3715,0.0951-0.1226,0.1728-0.2279,0.223-0.3715l0.01857-0.01858c0.1941-0.7837,0.1942-1.1107,0.2043-1.3933v-0.01857c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067,0-2.6,1.0287-2.6,2.3562,0.01,0.4196,0.04751,0.93701,0.29791,2.0312v0.02708l0.02708,0.02708c0.08038,0.23025,0.19736,0.36196,0.35208,0.54166s0.33917,0.39121,0.51458,0.56874c0.02064,0.02089,0.03386,0.03383,0.05416,0.05418,0.03479,0.15137,0.07693,0.31428,0.10833,0.46041,0.08357,0.38879,0.07499,0.66411,0.05417,0.75832-0.6045,0.2122-1.3565,0.465-2.0312,0.7583-0.3789,0.1647-0.7217,0.3118-1.0021,0.4875-0.28044,0.17574-0.55934,0.30851-0.64999,0.70416-0.0012,0.01804-0.0012,0.03613,0,0.05418-0.08858,0.81334-0.22257,2.0094-0.325,2.8166-0.02211,0.16993,0.06745,0.34906,0.21666,0.43333,1.2252,0.66179,3.1072,0.92814,4.9833,0.92082,1.8761-0.0073,3.7431-0.28932,4.9291-0.92082,0.14921-0.08427,0.23878-0.2634,0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.08711-0.07795-0.34054,0-0.73124,0.02093-0.10491,0.05371-0.21727,0.08125-0.325,0.06566-0.07354,0.11683-0.13363,0.18958-0.21666,0.15516-0.17709,0.32189-0.36287,0.46041-0.54166s0.25186-0.33217,0.325-0.54166l0.02708-0.02708c0.28309-1.1425,0.28324-1.6193,0.29792-2.0312v-0.02708c0-1.3275-1.1933-2.3562-2.6-2.3562z"/> + <path style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#n)"/> + <path opacity=".4" d="m1.682 11 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.0115c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#o)"/> + <path opacity=".5" style="color:#000000" d="m2.5002 12.5 0.62498 16h25.749l0.62498-16z" stroke="url(#p)" stroke-linecap="round" fill="none"/> + <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/> + <path opacity=".3" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m12.388 16.483c-0.96482 0-1.7833 0.70559-1.7833 1.6162 0.0069 0.28781 0.03259 0.64272 0.20434 1.3933v0.01858l0.01857 0.01857c0.05513 0.15793 0.13537 0.24827 0.24149 0.37154 0.10612 0.12326 0.23263 0.26834 0.35294 0.39011 0.01415 0.01433 0.02323 0.0232 0.03715 0.03716 0.02386 0.10383 0.05276 0.21557 0.0743 0.3158 0.05732 0.26668 0.05144 0.45553 0.03716 0.52015-0.4146 0.1454-0.9304 0.3187-1.3932 0.5199-0.2598 0.113-0.4949 0.2139-0.6873 0.3344-0.1923 0.1206-0.3836 0.2116-0.4458 0.483-0.000797 0.01237-0.000797 0.02479 0 0.03716-0.06076 0.55788-0.15266 1.3783-0.22291 1.932-0.015166 0.11656 0.046264 0.23943 0.14861 0.29723 0.84033 0.45393 2.1312 0.63663 3.418 0.63161 1.2868-0.005 2.5674-0.19845 3.3808-0.63161 0.10234-0.0578 0.16378-0.18067 0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.05975-0.05346-0.23358 0-0.50157 0.01436-0.07196 0.03684-0.14903 0.05573-0.22292 0.04503-0.05044 0.08013-0.09166 0.13003-0.14861 0.1064-0.1215 0.2207-0.2489 0.3157-0.3715 0.0951-0.1226 0.1728-0.2279 0.223-0.3715l0.01857-0.01858c0.1941-0.7837 0.1942-1.1107 0.2043-1.3933v-0.01857c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067 0-2.6 1.0287-2.6 2.3562 0.01 0.4196 0.04751 0.93701 0.29791 2.0312v0.02708l0.02708 0.02708c0.08038 0.23025 0.19736 0.36196 0.35208 0.54166s0.33917 0.39121 0.51458 0.56874c0.02064 0.02089 0.03386 0.03383 0.05416 0.05418 0.03479 0.15137 0.07693 0.31428 0.10833 0.46041 0.08357 0.38879 0.07499 0.66411 0.05417 0.75832-0.6045 0.2122-1.3565 0.465-2.0312 0.7583-0.3789 0.1647-0.7217 0.3118-1.0021 0.4875-0.28044 0.17574-0.55934 0.30851-0.64999 0.70416-0.0012 0.01804-0.0012 0.03613 0 0.05418-0.08858 0.81334-0.22257 2.0094-0.325 2.8166-0.02211 0.16993 0.06745 0.34906 0.21666 0.43333 1.2252 0.66179 3.1072 0.92814 4.9833 0.92082 1.8761-0.0073 3.7431-0.28932 4.9291-0.92082 0.14921-0.08427 0.23878-0.2634 0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.08711-0.07795-0.34054 0-0.73124 0.02093-0.10491 0.05371-0.21727 0.08125-0.325 0.06566-0.07354 0.11683-0.13363 0.18958-0.21666 0.15516-0.17709 0.32189-0.36287 0.46041-0.54166s0.25186-0.33217 0.325-0.54166l0.02708-0.02708c0.28309-1.1425 0.28324-1.6193 0.29792-2.0312v-0.02708c0-1.3275-1.1933-2.3562-2.6-2.3562z" fill="#FFF"/> + <path opacity=".7" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m12.388 15.483c-0.96482 0-1.7833 0.70559-1.7833 1.6162 0.0069 0.28781 0.03259 0.64272 0.20434 1.3933v0.01858l0.01857 0.01857c0.05513 0.15793 0.13537 0.24827 0.24149 0.37154 0.10612 0.12326 0.23263 0.26834 0.35294 0.39011 0.01415 0.01433 0.02323 0.0232 0.03715 0.03716 0.02386 0.10383 0.05276 0.21557 0.0743 0.3158 0.05732 0.26668 0.05144 0.45553 0.03716 0.52015-0.4146 0.1454-0.9304 0.3187-1.3932 0.5199-0.2598 0.113-0.4949 0.2139-0.6873 0.3344-0.1923 0.1206-0.3836 0.2116-0.4458 0.483-0.000797 0.01237-0.000797 0.02479 0 0.03716-0.06076 0.55788-0.15266 1.3783-0.22291 1.932-0.015166 0.11656 0.046264 0.23943 0.14861 0.29723 0.84033 0.45393 2.1312 0.63663 3.418 0.63161 1.2868-0.005 2.5674-0.19845 3.3808-0.63161 0.10234-0.0578 0.16378-0.18067 0.14861-0.29723-0.0224-0.173-0.05-0.5633-0.0743-0.9474-0.0243-0.384-0.0454-0.7617-0.0743-0.9845-0.0101-0.0552-0.0362-0.1074-0.0743-0.1486-0.2584-0.3086-0.6445-0.4973-1.096-0.6874-0.4122-0.1735-0.8954-0.3538-1.3746-0.5573-0.02682-0.05975-0.05346-0.23358 0-0.50157 0.01436-0.07196 0.03684-0.14903 0.05573-0.22292 0.04503-0.05044 0.08013-0.09166 0.13003-0.14861 0.1064-0.1215 0.2207-0.2489 0.3157-0.3715 0.0951-0.1226 0.1728-0.2279 0.223-0.3715l0.01857-0.01858c0.1941-0.7837 0.1942-1.1107 0.2043-1.3933v-0.01857c0-0.91058-0.81848-1.6162-1.7833-1.6162zm5.101-1.4831c-1.4067 0-2.6 1.0287-2.6 2.3562 0.01 0.4196 0.04751 0.93701 0.29791 2.0312v0.02708l0.02708 0.02708c0.08038 0.23025 0.19736 0.36196 0.35208 0.54166s0.33917 0.39121 0.51458 0.56874c0.02064 0.02089 0.03386 0.03383 0.05416 0.05418 0.03479 0.15137 0.07693 0.31428 0.10833 0.46041 0.08357 0.38879 0.07499 0.66411 0.05417 0.75832-0.6045 0.2122-1.3565 0.465-2.0312 0.7583-0.3789 0.1647-0.7217 0.3118-1.0021 0.4875-0.28044 0.17574-0.55934 0.30851-0.64999 0.70416-0.0012 0.01804-0.0012 0.03613 0 0.05418-0.08858 0.81334-0.22257 2.0094-0.325 2.8166-0.02211 0.16993 0.06745 0.34906 0.21666 0.43333 1.2252 0.66179 3.1072 0.92814 4.9833 0.92082 1.8761-0.0073 3.7431-0.28932 4.9291-0.92082 0.14921-0.08427 0.23878-0.2634 0.21666-0.43333-0.0327-0.25234-0.07287-0.82136-0.10833-1.3812-0.03546-0.55988-0.06625-1.1106-0.10833-1.4354-0.01468-0.0805-0.05274-0.15661-0.10833-0.21666-0.377-0.4498-0.94-0.7248-1.598-1.002-0.601-0.253-1.306-0.5158-2.004-0.8125-0.0391-0.08711-0.07795-0.34054 0-0.73124 0.02093-0.10491 0.05371-0.21727 0.08125-0.325 0.06566-0.07354 0.11683-0.13363 0.18958-0.21666 0.15516-0.17709 0.32189-0.36287 0.46041-0.54166s0.25186-0.33217 0.325-0.54166l0.02708-0.02708c0.28309-1.1425 0.28324-1.6193 0.29792-2.0312v-0.02708c0-1.3275-1.1933-2.3562-2.6-2.3562z"/> </svg> diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png Binary files differindex b7be63d5836..bffa01fa071 100644 --- a/core/img/filetypes/folder.png +++ b/core/img/filetypes/folder.png diff --git a/core/img/filetypes/folder.svg b/core/img/filetypes/folder.svg index 92d4cc22718..8271ca3793a 100644 --- a/core/img/filetypes/folder.svg +++ b/core/img/filetypes/folder.svg @@ -1,60 +1,58 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" y1="7.1627" x1="27.557"> + <linearGradient id="p" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 5.4125)" x2="27.557" y2="21.387"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 1.1676)" y1="49.629" x1="22.935"> + <linearGradient id="o" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 1.1676)" x2="22.809" y2="36.658"> <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/> <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" y1="17.118" x1="35.793"> + <linearGradient id="n" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 .89286)" x2="35.793" y2="43.761"> <stop stop-color="#b4cee1" offset="0"/> <stop stop-color="#5d9fcd" offset="1"/> </linearGradient> - <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86"> + <linearGradient id="m" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> + <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> + <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" y1="4.7324" x1="21.37"> + <linearGradient id="l" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 5.0911)" x2="21.37" y2="34.143"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" y1="13" x1="62.989"> + <linearGradient id="k" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" x2="62.989" y2="16"> <stop stop-color="#f9f9f9" offset="0"/> <stop stop-color="#d8d8d8" offset="1"/> </linearGradient> - <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 0.503 68.029 1.3298)" x2="-51.786" x1="-51.786"> + <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 1.3298)" y1="53.514" y2="3.6337"> <stop stop-opacity=".32174" offset="0"/> <stop stop-opacity=".27826" offset="1"/> </linearGradient> </defs> - <g> - <path opacity=".8" style="color:#000000" d="m4.0002 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#i)" fill="none"/> - <path style="color:#000000" d="m4.0002 7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#h)"/> - <path style="color:#000000" d="m4.5002 7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#g)" stroke-linecap="round" fill="none"/> - </g> + <path opacity=".8" style="color:#000000" d="m4.0002 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0961c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#j)" fill="none"/> + <path style="color:#000000" d="m4.0002 7v2h-1v4h26v-4h-15v-2h-10z" fill="url(#k)"/> + <path style="color:#000000" stroke-linecap="round" d="m4.5002 7.5v2h-1v4h25v-4h-15v-2h-9z" stroke="url(#l)" fill="none"/> <g transform="translate(.00017936 -1)"> - <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/> - <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/> - <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/> + <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#m)"/> + <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#q)"/> + <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#r)"/> </g> - <path style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#e)"/> - <path opacity=".4" d="m1.682 11 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.0115c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#d)"/> - <path opacity=".5" style="color:#000000" d="m2.5002 12.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/> + <path style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#n)"/> + <path opacity=".4" d="m1.682 11 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.0115c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62244-17.698c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#o)"/> + <path opacity=".5" style="color:#000000" d="m2.5002 12.5 0.62498 16h25.749l0.62498-16z" stroke="url(#p)" stroke-linecap="round" fill="none"/> <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 11.5c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/> </svg> diff --git a/core/img/filetypes/font.png b/core/img/filetypes/font.png Binary files differindex 9404c3ca6ac..535e03dfa77 100644 --- a/core/img/filetypes/font.png +++ b/core/img/filetypes/font.png diff --git a/core/img/filetypes/font.svg b/core/img/filetypes/font.svg index 8fca5ff9eff..13c0596006b 100644 --- a/core/img/filetypes/font.svg +++ b/core/img/filetypes/font.svg @@ -5,33 +5,31 @@ <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="h" y2="45.497" gradientUnits="userSpaceOnUse" x2="22.056" gradientTransform="matrix(.85825 0 0 .86435 .35576 -11.07)" y1="15.834" x1="22.056"> + <linearGradient id="i" x1="22.056" gradientUnits="userSpaceOnUse" y1="15.834" gradientTransform="matrix(.85825 0 0 .86435 .35576 -11.07)" x2="22.056" y2="45.497"> <stop stop-color="#575757" offset="0"/> <stop stop-color="#333" offset="1"/> </linearGradient> - <radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 6.1544 20.059)" r="14.098"/> - <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.83270 0 0 .18284 17.869 20.171)" r="14.098"/> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.69391 0 0 .18504 25.492 20.059)" r="14.098"/> - <linearGradient id="g" y2="103.13" gradientUnits="userSpaceOnUse" x2="143.92" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" y1="75.221" x1="143.92"> + <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 6.1544 20.059)" r="14.098"/> + <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.83270 0 0 .18284 17.869 20.171)" r="14.098"/> + <radialGradient id="n" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.69391 0 0 .18504 25.492 20.059)" r="14.098"/> + <linearGradient id="j" x1="143.92" gradientUnits="userSpaceOnUse" y1="75.221" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" x2="143.92" y2="103.13"> <stop stop-color="#f8b17e" offset="0"/> - <stop stop-color="#e35d4f" offset=".31210"/> + <stop stop-color="#e35d4f" offset=".3121"/> <stop stop-color="#c6262e" offset=".57054"/> <stop stop-color="#690b54" offset="1"/> </linearGradient> - <linearGradient id="f" y2="75.221" gradientUnits="userSpaceOnUse" x2="153.41" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" y1="98.785" x1="153.41"> + <linearGradient id="k" x1="153.41" gradientUnits="userSpaceOnUse" y1="98.785" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" x2="153.41" y2="75.221"> <stop stop-color="#791235" offset="0"/> <stop stop-color="#dd3b27" offset="1"/> </linearGradient> - <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 22.459 20.059)" r="14.098"/> + <radialGradient id="o" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 22.459 20.059)" r="14.098"/> </defs> - <g> - <g fill-rule="evenodd"> - <path opacity=".2" d="m24.478 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#b)"/> - <path d="m29.106 9.9132c-0.478-1.0813-1.642-0.968-2.441-1.1397-2.646-0.3044-5.287 0.181-7.504 1.6705-2.1399 1.4497-4.0763 3.4112-5.4365 5.9425-1.1823 2.2548-1.7132 5.267-0.96727 8.1364 0.58709 1.9316 2.3544 3.1247 3.845 2.803 2.2818-0.38055 3.9079-2.4984 5.2493-4.5646 0.60658-0.85208 0.97918-1.9805 1.6952-2.6966-0.1019 1.8363-0.14753 3.7435 0.26981 5.6082 0.2372 1.0995 1.1049 1.9662 1.9843 1.9261 0.89467-0.10266 1.5757-0.87918 2.3174-1.386 0.66706-0.59088 1.4312-1.0989 1.9035-1.9532-0.08137-1.4151-1.3465-0.52654-1.7881-0.04084-0.61732 0.97151-1.8927 0.19955-1.6199-1.1225 0.14283-3.0198 0.84698-5.8557 1.4425-8.7028 0.3348-1.5009 0.68722-2.9931 1.0492-4.4802h-0.000001zm-3.696 1.8848c-1.1333 3.5797-2.3575 7.223-4.4519 9.9984-0.98815 1.2662-2.437 2.4144-4.0344 1.8053-1.1039-0.48951-1.3597-2.0989-1.3836-3.3097-0.14247-3.5752 1.5838-6.5362 3.7419-8.3224 1.5043-1.1975 3.4487-1.7396 5.3479-1.1547 0.35854 0.1335 0.74746 0.47906 0.78012 0.983v-0.000001z" stroke="url(#f)" fill="url(#g)"/> - <path opacity=".2" d="m31 26.848a9.7826 2.6087 0 1 1 -19.565 0 9.7826 2.6087 0 1 1 19.565 0z" fill="url(#c)"/> - <path opacity=".05" d="m24.478 26.879a11.739 2.5777 0 1 1 -23.478 0 11.739 2.5777 0 1 1 23.478 0z" fill="url(#d)"/> - <path opacity=".2" d="m8.1739 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#e)"/> - </g> - <path d="m19.663 27.5c-0.79147-2.2568-1.583-4.5913-2.3744-6.8481h-9.7253c-0.8117 2.284-1.6229 4.564-2.4341 6.848h-3.1514c3.0005-8.2609 6.001-15.739 9.0016-24h2.8497c3.0061 8.2609 6.0122 15.739 9.0183 24h-3.1849zm-3.337-10.109-3.913-10.391-3.913 10.391z" stroke="#333" stroke-width="1px" fill="url(#h)"/> + <g fill-rule="evenodd"> + <path opacity=".2" d="m24.478 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#o)"/> + <path stroke="url(#k)" d="m29.106 9.9132c-0.478-1.0813-1.642-0.968-2.441-1.1397-2.646-0.3044-5.287 0.181-7.504 1.6705-2.1399 1.4497-4.0763 3.4112-5.4365 5.9425-1.1823 2.2548-1.7132 5.267-0.96727 8.1364 0.58709 1.9316 2.3544 3.1247 3.845 2.803 2.2818-0.38055 3.9079-2.4984 5.2493-4.5646 0.60658-0.85208 0.97918-1.9805 1.6952-2.6966-0.1019 1.8363-0.14753 3.7435 0.26981 5.6082 0.2372 1.0995 1.1049 1.9662 1.9843 1.9261 0.89467-0.10266 1.5757-0.87918 2.3174-1.386 0.66706-0.59088 1.4312-1.0989 1.9035-1.9532-0.08137-1.4151-1.3465-0.52654-1.7881-0.04084-0.61732 0.97151-1.8927 0.19955-1.6199-1.1225 0.14283-3.0198 0.84698-5.8557 1.4425-8.7028 0.3348-1.5009 0.68722-2.9931 1.0492-4.4802h-0.000001zm-3.696 1.8848c-1.1333 3.5797-2.3575 7.223-4.4519 9.9984-0.98815 1.2662-2.437 2.4144-4.0344 1.8053-1.1039-0.48951-1.3597-2.0989-1.3836-3.3097-0.14247-3.5752 1.5838-6.5362 3.7419-8.3224 1.5043-1.1975 3.4487-1.7396 5.3479-1.1547 0.35854 0.1335 0.74746 0.47906 0.78012 0.983v-0.000001z" fill="url(#j)"/> + <path opacity=".2" d="m31 26.848a9.7826 2.6087 0 1 1 -19.565 0 9.7826 2.6087 0 1 1 19.565 0z" fill="url(#n)"/> + <path opacity=".05" d="m24.478 26.879a11.739 2.5777 0 1 1 -23.478 0 11.739 2.5777 0 1 1 23.478 0z" fill="url(#m)"/> + <path opacity=".2" d="m8.1739 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#l)"/> </g> + <path stroke="#333" stroke-width="1px" d="m19.663 27.5c-0.79147-2.2568-1.583-4.5913-2.3744-6.8481h-9.7253c-0.8117 2.284-1.6229 4.564-2.4341 6.848h-3.1514c3.0005-8.2609 6.001-15.739 9.0016-24h2.8497c3.0061 8.2609 6.0122 15.739 9.0183 24h-3.1849zm-3.337-10.109-3.913-10.391-3.913 10.391z" fill="url(#i)"/> </svg> diff --git a/core/img/filetypes/image-svg+xml.png b/core/img/filetypes/image-svg+xml.png Binary files differindex e3dd52489d3..a847f78fcd8 100644 --- a/core/img/filetypes/image-svg+xml.png +++ b/core/img/filetypes/image-svg+xml.png diff --git a/core/img/filetypes/image-svg+xml.svg b/core/img/filetypes/image-svg+xml.svg index 06df5f54da6..1f0a54a21ca 100644 --- a/core/img/filetypes/image-svg+xml.svg +++ b/core/img/filetypes/image-svg+xml.svg @@ -1,56 +1,48 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="h" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24"> + <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="g" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132"> + <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="f" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" y1="50.786" x1="-51.786"> + <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <radialGradient id="n" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> - <linearGradient id="e" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86"> + <radialGradient id="o" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="l" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="d" y2="13.664" gradientUnits="userSpaceOnUse" x2="16.887" gradientTransform="matrix(.65943 0 0 .64652 -27.821 1.2237)" y1="24.24" x1="28.534"> + <linearGradient id="m" x1="28.534" gradientUnits="userSpaceOnUse" y1="24.24" gradientTransform="matrix(.65943 0 0 .64652 -27.821 1.2237)" x2="16.887" y2="13.664"> <stop stop-color="#fda852" offset="0"/> <stop stop-color="#fff" stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g> - <g> - <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/> - <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/> - <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/> - </g> - <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#f)" stroke-width=".99992" fill="url(#g)"/> - </g> - <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#h)" stroke-linecap="round" fill="none"/> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#l)"/> + <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#o)"/> + <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#n)"/> + <path stroke-linejoin="round" stroke="url(#k)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#j)"/> + <path stroke-linejoin="round" stroke="url(#i)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/> <g transform="translate(27.788 -2.3184)"> - <g> - <path d="m-17.037 24.229c2.7541 1.8316 8.7672-0.61882 3.7681-7.1764-4.9538-6.4982 4.9219-10.76 7.8525-3.2453" fill-rule="evenodd" stroke="#ea541a" stroke-width="1px" fill="url(#d)"/> - <rect height="2" width="2" y="22.818" x="-18.788" fill="#ea541a"/> - <rect height="2" width="2" y="12.818" x="-6.788" fill="#ea541a"/> - </g> - <path d="m-17.699 11.147 9.5001 12.316" stroke="#ea541a" stroke-width="1px" fill="none"/> - <g> - <path d="m-16.288 11.318c0.000372 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" stroke="#ea541a" fill="#e6e6e6"/> - <path d="m-7.288 23.318c0.000373 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" stroke="#ea541a" fill="#e6e6e6"/> - <rect height="2" width="2" y="15.818" x="-14.788" fill="#ea541a"/> - </g> + <path stroke="#ea541a" stroke-width="1px" fill="url(#m)" d="m-17.037 24.229c2.7541 1.8316 8.7672-0.61882 3.7681-7.1764-4.9538-6.4982 4.9219-10.76 7.8525-3.2453" fill-rule="evenodd"/> + <rect y="22.818" width="2" fill="#ea541a" x="-18.788" height="2"/> + <rect y="12.818" width="2" fill="#ea541a" x="-6.788" height="2"/> + <path stroke="#ea541a" stroke-width="1px" d="m-17.699 11.147 9.5001 12.316" fill="none"/> + <path stroke="#ea541a" d="m-16.288 11.318c0.000372 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" fill="#e6e6e6"/> + <path stroke="#ea541a" d="m-7.288 23.318c0.000373 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" fill="#e6e6e6"/> + <rect y="15.818" width="2" fill="#ea541a" x="-14.788" height="2"/> </g> </svg> diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png Binary files differindex 087f5dcdbdf..5cdc05029af 100644 --- a/core/img/filetypes/image.png +++ b/core/img/filetypes/image.png diff --git a/core/img/filetypes/image.svg b/core/img/filetypes/image.svg index 50991f7359d..86cbb633bf3 100644 --- a/core/img/filetypes/image.svg +++ b/core/img/filetypes/image.svg @@ -1,61 +1,57 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.028917 0 0 .012353 26.973 38.471)" r="117.14"/> + <radialGradient id="t" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.028917 0 0 .012353 26.973 38.471)" r="117.14"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.028917 0 0 .012353 21.027 38.471)" r="117.14"/> - <linearGradient id="k" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.084497 0 0 .012353 -6.5396 38.471)" y1="366.65" x1="302.86"> + <radialGradient id="u" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.028917 0 0 .012353 21.027 38.471)" r="117.14"/> + <linearGradient id="l" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.084497 0 0 .012353 -6.5396 38.471)" x2="302.86" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="e" y2="24.628" gradientUnits="userSpaceOnUse" x2="20.055" gradientTransform="matrix(.57894 0 0 .65062 2.0784 1.9502)" y1="15.298" x1="16.626"> + <linearGradient id="r" x1="16.626" gradientUnits="userSpaceOnUse" y1="15.298" gradientTransform="matrix(.57894 0 0 .65062 2.0784 1.9502)" x2="20.055" y2="24.628"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="h" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.77477 0 0 .61261 -2.5946 1.2973)" y1="5.5641" x1="24"> + <linearGradient id="o" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.77477 0 0 .61261 -2.5946 1.2973)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="g" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.85714 0 0 .52148 -4.5714 2.6844)" y1=".98521" x1="25.132"> + <linearGradient id="p" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.85714 0 0 .52148 -4.5714 2.6844)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="f" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.69214 0 0 .48803 46.352 2.1033)" y1="50.786" x1="-51.786"> + <linearGradient id="q" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.69214 0 0 .48803 46.352 2.1033)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <linearGradient id="j" y2="96.253" gradientUnits="userSpaceOnUse" x2="45.567" gradientTransform="matrix(.32723 0 0 .25356 -38.234 -30.559)" y1="15.27" x1="45.414"> + <linearGradient id="m" x1="45.414" gradientUnits="userSpaceOnUse" y1="15.27" gradientTransform="matrix(.32723 0 0 .25356 -38.234 -30.559)" x2="45.567" y2="96.253"> <stop stop-color="#262626" offset="0"/> <stop stop-color="#4d4d4d" offset="1"/> </linearGradient> - <linearGradient id="i" y2="-40.164" gradientUnits="userSpaceOnUse" x2="-24.098" gradientTransform="matrix(.74286 0 0 .74074 1.8384 4.0069)" y1="-13.091" x1="-24.032"> + <linearGradient id="n" x1="-24.032" gradientUnits="userSpaceOnUse" y1="-13.091" gradientTransform="matrix(.74286 0 0 .74074 1.8384 4.0069)" x2="-24.098" y2="-40.164"> <stop stop-color="#1d1d1d" offset="0"/> <stop offset="1"/> </linearGradient> - <linearGradient id="d" y2="-174.97" gradientUnits="userSpaceOnUse" x2="149.98" gradientTransform="matrix(.28088 0 0 .28276 -22.128 49.806)" y1="-104.24" x1="149.98"> + <linearGradient id="s" x1="149.98" gradientUnits="userSpaceOnUse" y1="-104.24" gradientTransform="matrix(.28088 0 0 .28276 -22.128 49.806)" x2="149.98" y2="-174.97"> <stop stop-color="#272727" offset="0"/> <stop stop-color="#454545" offset="1"/> </linearGradient> </defs> - <g> - <g opacity=".4" transform="matrix(.66667 0 0 .66667 0 -1.6667)" stroke-width=".0225"> - <rect height="3" width="40.8" y="43" x="3.6" fill="url(#k)"/> - <path d="m3.6 43v2.9998c-1.4891 0.006-3.6-0.672-3.6-1.5s1.6618-1.5 3.6-1.5z" fill="url(#b)"/> - <path d="m44.4 43v2.9998c1.4891 0.0056 3.6-0.67211 3.6-1.5001 0-0.828-1.6618-1.4997-3.6-1.4997z" fill="url(#c)"/> - </g> - <path stroke-linejoin="round" d="m0.99997 4c6.8745 0 30 0.0015 30 0.0015l0.000036 23.999h-30v-24z" stroke="url(#f)" stroke-width=".0066667" fill="url(#g)"/> - <path stroke-linejoin="round" d="m30.333 27.333h-28.667v-22.667h28.667z" stroke="url(#h)" stroke-linecap="round" stroke-width=".0066667" fill="none"/> - </g> - <g> - <rect transform="matrix(-.99999 .0037552 .0024409 -1 0 0)" rx="0" ry="0" height="19.903" width="25.952" stroke="url(#i)" stroke-linecap="round" y="-26.012" x="-29.015" stroke-width=".0066668" fill="url(#j)"/> - <path style="color:#000000" d="m14.458 9.5417c-0.73638 0-1.3333 1.1939-1.3333 2.6667 0 0.24505 0.01072 0.48294 0.04167 0.70833-0.15826-0.15989-0.30816-0.33156-0.5-0.47917-1.1673-0.89808-2.4885-1.1461-2.9375-0.5625-0.44904 0.58363 0.14525 1.7894 1.3125 2.6875 0.22148 0.1704 0.44175 0.29391 0.66667 0.41667-0.25479 0.03257-0.52266 0.08822-0.79167 0.16667-1.4139 0.41232-2.3937 1.3347-2.1875 2.0417 0.20616 0.70693 1.5236 0.93315 2.9375 0.52083 0.2651-0.07731 0.52042-0.1633 0.75-0.27083-0.05604 0.10202-0.11595 0.20204-0.16667 0.3125-2.7782 2.4796-5.0625 7.2292-5.0625 7.2292l0.95833 0.02083c0.5207-1.25 1.8077-3.994 3.7925-6.293-0.28085 1.1684-0.0992 2.2006 0.5 2.4167 0.69271 0.24982 1.667-0.67708 2.1667-2.0625 0.04494-0.12462 0.06976-0.25209 0.10417-0.375 0.05396 0.11891 0.10152 0.23517 0.16667 0.35417 0.70727 1.2918 1.8124 2.062 2.4583 1.7083 0.64591-0.35364 0.58227-1.6874-0.125-2.9792-0.04035-0.07369-0.08227-0.13821-0.125-0.20833 0.07835 0.02437 0.14794 0.04131 0.22917 0.0625 1.4251 0.37181 2.7308 0.10836 2.9167-0.60417 0.18591-0.71253-0.82495-1.5865-2.25-1.9583-0.02183-0.0057-0.04073-0.01544-0.0625-0.02083 0.01921-0.01078 0.04331-0.0098 0.0625-0.02083 1.2754-0.73638 2.014-1.8623 1.6458-2.5-0.36819-0.63772-1.7037-0.54888-2.9792 0.1875-0.40854 0.23587-0.74162 0.50638-1.0208 0.79167 0.10589-0.38234 0.16667-0.82364 0.16667-1.2917 0-1.4728-0.59695-2.6667-1.3333-2.6667zm0.042 4.4583c0.92048 0 1.6667 0.74619 1.6667 1.6667 0 0.92047-0.74619 1.6667-1.6667 1.6667-0.92048 0-1.6667-0.74619-1.6667-1.6667 0-0.921 0.747-1.667 1.667-1.667z" fill="url(#d)"/> - <path fill="#d2d2d2" d="m14.458 10.188c-0.73638 0-1.3333 1.1939-1.3333 2.6667 0 0.24504 0.01072 0.48294 0.04167 0.70833-0.15826-0.15989-0.30816-0.33156-0.5-0.47917-1.1673-0.89808-2.4885-1.1461-2.9375-0.5625-0.44904 0.58363 0.14525 1.7894 1.3125 2.6875 0.22148 0.1704 0.44175 0.29391 0.66667 0.41667-0.25479 0.03257-0.52266 0.08822-0.79167 0.16667-1.4139 0.41232-2.3937 1.3347-2.1875 2.0417 0.20616 0.70693 1.5236 0.93315 2.9375 0.52083 0.2651-0.07731 0.52042-0.1633 0.75-0.27083-0.05604 0.10202-0.11595 0.20204-0.16667 0.3125-2.7782 2.479-5.0625 7.229-5.0625 7.229l0.95833 0.02083c0.52039-1.2493 1.8073-3.9927 3.7917-6.2917-0.28085 1.1684-0.0992 2.2006 0.5 2.4167 0.69271 0.24982 1.667-0.67708 2.1667-2.0625 0.04494-0.12462 0.06976-0.25209 0.10417-0.375 0.05396 0.11891 0.10152 0.23517 0.16667 0.35417 0.70727 1.2918 1.8124 2.062 2.4583 1.7083 0.64591-0.35364 0.58227-1.6874-0.125-2.9792-0.04035-0.07369-0.08227-0.13821-0.125-0.20833 0.07835 0.02437 0.14794 0.04131 0.22917 0.0625 1.4251 0.37181 2.7308 0.10836 2.9167-0.60417 0.18591-0.71253-0.82495-1.5865-2.25-1.9583-0.02183-0.0057-0.04073-0.01544-0.0625-0.02083 0.01921-0.01078 0.04331-0.0098 0.0625-0.02083 1.2754-0.73638 2.014-1.8623 1.6458-2.5-0.36819-0.63772-1.7037-0.54888-2.9792 0.1875-0.40854 0.23587-0.74162 0.50638-1.0208 0.79167 0.10589-0.38234 0.16667-0.82364 0.16667-1.2917 0-1.4728-0.59695-2.6667-1.3333-2.6667zm0.042 4.458c0.92048 0 1.6667 0.74619 1.6667 1.6667 0 0.92048-0.74619 1.6667-1.6667 1.6667-0.92048 0-1.6667-0.74619-1.6667-1.6667 0-0.92048 0.74619-1.6667 1.6667-1.6667z"/> - <path opacity=".15" d="m2.6667 5.6667 0.0087 12c0.7672-0.012 26.076-4.424 26.658-4.636l-0.000092-7.3644z" fill-rule="evenodd" fill="url(#e)"/> + <g opacity=".4" stroke-width=".0225" transform="matrix(.66667 0 0 .66667 0 -1.6667)"> + <rect y="43" width="40.8" fill="url(#l)" x="3.6" height="3"/> + <path d="m3.6 43v2.9998c-1.4891 0.006-3.6-0.672-3.6-1.5s1.6618-1.5 3.6-1.5z" fill="url(#u)"/> + <path d="m44.4 43v2.9998c1.4891 0.0056 3.6-0.67211 3.6-1.5001 0-0.828-1.6618-1.4997-3.6-1.4997z" fill="url(#t)"/> </g> + <path stroke-linejoin="round" stroke="url(#q)" stroke-width=".0066667" d="m0.99997 4c6.8745 0 30 0.0015 30 0.0015l0.000036 23.999h-30v-24z" fill="url(#p)"/> + <path stroke-linejoin="round" d="m30.333 27.333h-28.667v-22.667h28.667z" stroke="url(#o)" stroke-linecap="round" stroke-width=".0066667" fill="none"/> + <rect ry="0" rx="0" transform="matrix(-.99999 .0037552 .0024409 -1 0 0)" height="19.903" width="25.952" stroke="url(#n)" stroke-linecap="round" y="-26.012" x="-29.015" stroke-width=".0066668" fill="url(#m)"/> + <path style="color:#000000" d="m14.458 9.5417c-0.73638 0-1.3333 1.1939-1.3333 2.6667 0 0.24505 0.01072 0.48294 0.04167 0.70833-0.15826-0.15989-0.30816-0.33156-0.5-0.47917-1.1673-0.89808-2.4885-1.1461-2.9375-0.5625-0.44904 0.58363 0.14525 1.7894 1.3125 2.6875 0.22148 0.1704 0.44175 0.29391 0.66667 0.41667-0.25479 0.03257-0.52266 0.08822-0.79167 0.16667-1.4139 0.41232-2.3937 1.3347-2.1875 2.0417 0.20616 0.70693 1.5236 0.93315 2.9375 0.52083 0.2651-0.07731 0.52042-0.1633 0.75-0.27083-0.05604 0.10202-0.11595 0.20204-0.16667 0.3125-2.7782 2.4796-5.0625 7.2292-5.0625 7.2292l0.95833 0.02083c0.5207-1.25 1.8077-3.994 3.7925-6.293-0.28085 1.1684-0.0992 2.2006 0.5 2.4167 0.69271 0.24982 1.667-0.67708 2.1667-2.0625 0.04494-0.12462 0.06976-0.25209 0.10417-0.375 0.05396 0.11891 0.10152 0.23517 0.16667 0.35417 0.70727 1.2918 1.8124 2.062 2.4583 1.7083 0.64591-0.35364 0.58227-1.6874-0.125-2.9792-0.04035-0.07369-0.08227-0.13821-0.125-0.20833 0.07835 0.02437 0.14794 0.04131 0.22917 0.0625 1.4251 0.37181 2.7308 0.10836 2.9167-0.60417 0.18591-0.71253-0.82495-1.5865-2.25-1.9583-0.02183-0.0057-0.04073-0.01544-0.0625-0.02083 0.01921-0.01078 0.04331-0.0098 0.0625-0.02083 1.2754-0.73638 2.014-1.8623 1.6458-2.5-0.36819-0.63772-1.7037-0.54888-2.9792 0.1875-0.40854 0.23587-0.74162 0.50638-1.0208 0.79167 0.10589-0.38234 0.16667-0.82364 0.16667-1.2917 0-1.4728-0.59695-2.6667-1.3333-2.6667zm0.042 4.4583c0.92048 0 1.6667 0.74619 1.6667 1.6667 0 0.92047-0.74619 1.6667-1.6667 1.6667-0.92048 0-1.6667-0.74619-1.6667-1.6667 0-0.921 0.747-1.667 1.667-1.667z" fill="url(#s)"/> + <path d="m14.458 10.188c-0.73638 0-1.3333 1.1939-1.3333 2.6667 0 0.24504 0.01072 0.48294 0.04167 0.70833-0.15826-0.15989-0.30816-0.33156-0.5-0.47917-1.1673-0.89808-2.4885-1.1461-2.9375-0.5625-0.44904 0.58363 0.14525 1.7894 1.3125 2.6875 0.22148 0.1704 0.44175 0.29391 0.66667 0.41667-0.25479 0.03257-0.52266 0.08822-0.79167 0.16667-1.4139 0.41232-2.3937 1.3347-2.1875 2.0417 0.20616 0.70693 1.5236 0.93315 2.9375 0.52083 0.2651-0.07731 0.52042-0.1633 0.75-0.27083-0.05604 0.10202-0.11595 0.20204-0.16667 0.3125-2.7782 2.479-5.0625 7.229-5.0625 7.229l0.95833 0.02083c0.52039-1.2493 1.8073-3.9927 3.7917-6.2917-0.28085 1.1684-0.0992 2.2006 0.5 2.4167 0.69271 0.24982 1.667-0.67708 2.1667-2.0625 0.04494-0.12462 0.06976-0.25209 0.10417-0.375 0.05396 0.11891 0.10152 0.23517 0.16667 0.35417 0.70727 1.2918 1.8124 2.062 2.4583 1.7083 0.64591-0.35364 0.58227-1.6874-0.125-2.9792-0.04035-0.07369-0.08227-0.13821-0.125-0.20833 0.07835 0.02437 0.14794 0.04131 0.22917 0.0625 1.4251 0.37181 2.7308 0.10836 2.9167-0.60417 0.18591-0.71253-0.82495-1.5865-2.25-1.9583-0.02183-0.0057-0.04073-0.01544-0.0625-0.02083 0.01921-0.01078 0.04331-0.0098 0.0625-0.02083 1.2754-0.73638 2.014-1.8623 1.6458-2.5-0.36819-0.63772-1.7037-0.54888-2.9792 0.1875-0.40854 0.23587-0.74162 0.50638-1.0208 0.79167 0.10589-0.38234 0.16667-0.82364 0.16667-1.2917 0-1.4728-0.59695-2.6667-1.3333-2.6667zm0.042 4.458c0.92048 0 1.6667 0.74619 1.6667 1.6667 0 0.92048-0.74619 1.6667-1.6667 1.6667-0.92048 0-1.6667-0.74619-1.6667-1.6667 0-0.92048 0.74619-1.6667 1.6667-1.6667z" fill="#d2d2d2"/> + <path opacity=".15" fill="url(#r)" d="m2.6667 5.6667 0.0087 12c0.7672-0.012 26.076-4.424 26.658-4.636l-0.000092-7.3644z" fill-rule="evenodd"/> </svg> diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png Binary files differindex e08cc5480ce..4f5c6583bf1 100644 --- a/core/img/filetypes/package-x-generic.png +++ b/core/img/filetypes/package-x-generic.png diff --git a/core/img/filetypes/package-x-generic.svg b/core/img/filetypes/package-x-generic.svg index 13ab5b7550e..e00438421af 100644 --- a/core/img/filetypes/package-x-generic.svg +++ b/core/img/filetypes/package-x-generic.svg @@ -1,62 +1,53 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> <defs> - <linearGradient id="linearGradient2886" y2="17.5" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="3.0052" gradientTransform="matrix(0.70749164,0,0,0.69402746,-0.97979919,-1.6454802)" y1="17.5" x1="44.995"> + <linearGradient id="i" x1="44.995" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="17.5" gradientTransform="matrix(.70749 0 0 .69403 -.97980 -1.6455)" x2="3.0052" y2="17.5"> <stop stop-color="#FFF" stop-opacity="0" offset="0"/> - <stop stop-color="#FFF" offset="0.245"/> - <stop stop-color="#FFF" offset="0.7735"/> + <stop stop-color="#FFF" offset=".245"/> + <stop stop-color="#FFF" offset=".7735"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient2889" y2="8" gradientUnits="userSpaceOnUse" x2="26" gradientTransform="matrix(0.99999976,0,0,0.71428568,-7.9999942,-1.7142862)" y1="22" x1="26"> + <linearGradient id="h" x1="26" gradientUnits="userSpaceOnUse" y1="22" gradientTransform="matrix(1 0 0 .71429 -8 -1.7143)" x2="26" y2="8"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" offset="0.30213"/> - <stop stop-color="#FFF" stop-opacity="0.6901961" offset="0.39747"/> + <stop stop-color="#FFF" offset=".30213"/> + <stop stop-color="#FFF" stop-opacity=".69020" offset=".39747"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient2892" y2="45.934" gradientUnits="userSpaceOnUse" x2="43.007" gradientTransform="matrix(0.90694933,0,0,0.81526518,-5.2693853,-5.0638302)" y1="30.555" x1="23.452"> + <linearGradient id="g" x1="23.452" gradientUnits="userSpaceOnUse" y1="30.555" gradientTransform="matrix(.90695 0 0 .81527 -5.2694 -5.0638)" x2="43.007" y2="45.934"> <stop stop-color="#FFF" stop-opacity="0" offset="0"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient2895" y2="37.277" gradientUnits="userSpaceOnUse" x2="24.997" gradientTransform="matrix(0.90694933,0,0,1.0807825,-5.2693853,-11.995491)" y1="15.378" x1="24.823"> + <linearGradient id="f" x1="24.823" gradientUnits="userSpaceOnUse" y1="15.378" gradientTransform="matrix(.90695 0 0 1.0808 -5.2694 -11.995)" x2="24.997" y2="37.277"> <stop stop-color="#dac197" offset="0"/> - <stop stop-color="#c1a581" offset="0.23942"/> - <stop stop-color="#dbc298" offset="0.27582"/> + <stop stop-color="#c1a581" offset=".23942"/> + <stop stop-color="#dbc298" offset=".27582"/> <stop stop-color="#a68b60" offset="1"/> </linearGradient> - <linearGradient id="linearGradient2897" y2="45.042" gradientUnits="userSpaceOnUse" x2="15.464" gradientTransform="matrix(0.70732457,0,0,0.69402746,-0.97578945,-1.3832872)" y1="7.9757" x1="15.464"> + <linearGradient id="e" x1="15.464" gradientUnits="userSpaceOnUse" y1="7.9757" gradientTransform="matrix(.70732 0 0 .69403 -.97579 -1.3833)" x2="15.464" y2="45.042"> <stop stop-color="#c9af8b" offset="0"/> - <stop stop-color="#ad8757" offset="0.23942"/> - <stop stop-color="#c2a57f" offset="0.27582"/> + <stop stop-color="#ad8757" offset=".23942"/> + <stop stop-color="#c2a57f" offset=".27582"/> <stop stop-color="#9d7d53" offset="1"/> </linearGradient> - <radialGradient id="radialGradient2903" xlink:href="#linearGradient3681" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(0.5938225,0,0,1.5366531,-6.6594735,-103.93618)" r="5"/> - <linearGradient id="linearGradient3681"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(.59382 0 0 1.5367 -6.6595 -103.94)" r="5"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient2905" y2="35" gradientUnits="userSpaceOnUse" x2="17.554" gradientTransform="matrix(1.7570316,0,0,1.3969574,-17.394014,-16.411698)" y1="46" x1="17.554"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <linearGradient id="d" x1="17.554" gradientUnits="userSpaceOnUse" y1="46" gradientTransform="matrix(1.757 0 0 1.397 -17.394 -16.412)" x2="17.554" y2="35"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient2983" xlink:href="#linearGradient3681" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(0.5938225,0,0,1.5366531,41.140892,-103.93618)" r="5"/> + <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(.59382 0 0 1.5367 41.141 -103.94)" r="5"/> </defs> - <g opacity="0.4" transform="matrix(0.6905424,0,0,0.6781532,-0.50408884,-0.4485072)"> - <rect transform="scale(-1,-1)" height="15.367" width="2.9602" y="-47.848" x="-3.6904" fill="url(#radialGradient2903)"/> - <rect height="15.367" width="40.412" y="32.482" x="3.6904" fill="url(#linearGradient2905)"/> - <rect transform="scale(1,-1)" height="15.367" width="2.9602" y="-47.848" x="44.11" fill="url(#radialGradient2983)"/> + <g opacity=".4" transform="matrix(.69054 0 0 .67815 -.50409 -.44851)"> + <rect transform="scale(-1)" height="15.367" width="2.9602" y="-47.848" x="-3.6904" fill="url(#c)"/> + <rect y="32.482" width="40.412" fill="url(#d)" x="3.6904" height="15.367"/> + <rect transform="scale(1,-1)" height="15.367" width="2.9602" y="-47.848" x="44.11" fill="url(#b)"/> </g> - <path stroke-linejoin="miter" d="m5.3977,4.5159,20.864,0c1.218,0,1.7661-0.19887,2.116,0.69403l2.1232,5.29v18.081c0,1.078,0.0728,0.91332-1.1452,0.91332h-26.712c-1.218,0-1.1452,0.16471-1.1452-0.91332v-18.081l2.1232-5.29c0.3401-0.87486,0.55789-0.69403,1.7759-0.69403z" fill-rule="nonzero" stroke-dashoffset="0" display="block" stroke="url(#linearGradient2897)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99420077" fill="url(#linearGradient2895)"/> - <path opacity="0.50549454" stroke-linejoin="miter" d="m6.0608,5.219,19.56,0c1.1418,0,1.8485,0.38625,2.3268,1.4478l1.6473,4.4555v16.063c0,1.0137-0.57913,1.5241-1.721,1.5241h-23.86c-1.1418,0-1.6076-0.56135-1.6076-1.5751v-16.012l1.5942-4.551c0.31884-0.82269,0.91924-1.3522,2.0611-1.3522z" stroke-dashoffset="0" display="block" stroke="url(#linearGradient2892)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.74211526" fill="none"/> - <path opacity="0.4" style="enable-background:accumulate;" d="m14,4h4v10h-1.1812-1.2094-0.97359-0.63585v-10z" fill-rule="nonzero" fill="url(#linearGradient2889)"/> - <path opacity="0.4" stroke-linejoin="miter" d="m1.5001,10.5,29,0" stroke="url(#linearGradient2886)" stroke-linecap="square" stroke-width="0.99999994px" fill="none"/> + <path d="m5.3977 4.5159h20.864c1.218 0 1.7661-0.19887 2.116 0.69403l2.1232 5.29v18.081c0 1.078 0.0728 0.91332-1.1452 0.91332h-26.712c-1.218 0-1.1452 0.16471-1.1452-0.91332v-18.081l2.1232-5.29c0.3401-0.87486 0.55789-0.69403 1.7759-0.69403z" stroke="url(#e)" stroke-linecap="round" stroke-width=".99420" display="block" fill="url(#f)"/> + <path opacity=".50549" d="m6.0608 5.219h19.56c1.1418 0 1.8485 0.38625 2.3268 1.4478l1.6473 4.4555v16.063c0 1.0137-0.57913 1.5241-1.721 1.5241h-23.86c-1.1418 0-1.6076-0.56135-1.6076-1.5751v-16.012l1.5942-4.551c0.31884-0.82269 0.91924-1.3522 2.0611-1.3522z" stroke="url(#g)" stroke-width=".74212" display="block" fill="none"/> + <path opacity=".4" fill="url(#h)" d="m14 4h4v10h-4v-10z"/> + <path opacity=".4" d="m1.5001 10.5h29" stroke="url(#i)" stroke-linecap="square" stroke-width="1px" fill="none"/> </svg> diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png Binary files differnew file mode 100644 index 00000000000..d5c666a7695 --- /dev/null +++ b/core/img/filetypes/text-calendar.png diff --git a/core/img/filetypes/text-calendar.svg b/core/img/filetypes/text-calendar.svg new file mode 100644 index 00000000000..7d62bb8fa12 --- /dev/null +++ b/core/img/filetypes/text-calendar.svg @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs> + <radialGradient id="c" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912 -1.8502e-8 3.75e-8 1.5923 7.2228 -4.4685)" r="2"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#8f8f8f" offset="1"/> + </radialGradient> + <radialGradient id="b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912 -1.8502e-8 3.75e-8 1.5923 -5.7772 -4.4685)" r="2"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#8f8f8f" offset="1"/> + </radialGradient> + <linearGradient id="l" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(0.6 0 0 .64185 1.6 -16.779)" x2="24" y2="43"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".063165"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> + </linearGradient> + <linearGradient id="k" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43"> + <stop stop-color="#FFF" offset="0"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".063165"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> + </linearGradient> + <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(0 .90633 -1.9732 -3.8244e-8 32.673 -1.9201)" r="20"> + <stop stop-color="#f89b7e" offset="0"/> + <stop stop-color="#e35d4f" offset=".26238"/> + <stop stop-color="#c6262e" offset=".66094"/> + <stop stop-color="#690b2c" offset="1"/> + </radialGradient> + <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.64103 0 0 .64103 .61538 1.6154)" x2="24" y2="3.899"> + <stop stop-color="#791235" offset="0"/> + <stop stop-color="#dd3b27" offset="1"/> + </linearGradient> + <linearGradient id="i" x1="23.954" gradientUnits="userSpaceOnUse" y1="15.999" gradientTransform="matrix(.65 0 0 0.5 0.4 4)" x2="23.954" y2="18.684"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> + </linearGradient> + <linearGradient id="h" x1="19.36" gradientUnits="userSpaceOnUse" y1="16.138" gradientTransform="matrix(.64103 0 0 .64185 .61538 .95838)" x2="19.36" y2="44.984"> + <stop stop-color="#f4f4f4" offset="0"/> + <stop stop-color="#dbdbdb" offset="1"/> + </linearGradient> + <linearGradient id="g" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.64103 0 0 .64185 .61538 1.5793)" x2="24" y2="3.8905"> + <stop stop-color="#787878" offset="0"/> + <stop stop-color="#AAA" offset="1"/> + </linearGradient> + <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5"> + <stop stop-color="#181818" offset="0"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </radialGradient> + <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5"> + <stop stop-color="#181818" offset="0"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </radialGradient> + <linearGradient id="m" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058"> + <stop stop-color="#181818" stop-opacity="0" offset="0"/> + <stop stop-color="#181818" offset=".5"/> + <stop stop-color="#181818" stop-opacity="0" offset="1"/> + </linearGradient> + <linearGradient id="f" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.64103 0 0 .64103 .61538 .61538)" x2="24" y2="3.899"> + <stop stop-color="#791235" offset="0"/> + <stop stop-color="#dd3b27" offset="1"/> + </linearGradient> + </defs> + <path stroke-linejoin="round" style="color:#000000" d="m5.5 3.5c7.0683 0.00685 14.137-0.013705 21.205 0.010288 1.238 0.083322 1.9649 1.3578 1.7949 2.5045l-24.99-0.7199c0.081-0.9961 0.9903-1.8161 1.9897-1.7949z" stroke="url(#f)" stroke-linecap="round" fill="none"/> + <g transform="matrix(0.7 0 0 .33333 -0.8 15.333)"> + <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)"> + <rect y="40" width="5" fill="url(#e)" x="38" height="7"/> + <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#d)"/> + <rect y="40" width="28" fill="url(#m)" x="10" height="7"/> + </g> + </g> + <g> + <path stroke-linejoin="round" style="color:#000000" d="m28.5 7.0148s0.0137 13.794-0.01029 20.69c-0.084 1.238-1.358 1.965-2.505 1.795-6.896-0.007-13.794 0.014-20.69-0.01-1.238-0.084-1.9649-1.358-1.7949-2.505 0.0068-6.896 0.0103-20.69 0.0103-20.69z" stroke="url(#g)" stroke-linecap="round" fill="url(#h)"/> + <rect opacity=".3" rx="0" ry="0" height="2" width="26" y="12" x="3" fill="url(#i)"/> + <path stroke-linejoin="round" style="color:#000000" d="m5.5 4.5c7.0683 0.00685 14.137-0.013705 21.205 0.010288 1.238 0.083322 1.9649 1.3578 1.7949 2.5045l0.073 4.4852h-25.073l0.0103-5.2051c0.081-0.9961 0.9903-1.8161 1.9897-1.7949z" stroke="url(#j)" stroke-linecap="round" fill="url(#a)"/> + </g> + <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" width="23" stroke="url(#k)" stroke-linecap="round" x="4.5" y="5.5" height="23" fill="none"/> + <path opacity=".5" stroke-linejoin="round" d="m26.5 10.5h-21" stroke="url(#l)" stroke-linecap="square" fill="none"/> + <g> + <rect opacity=".4" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="8" fill="#FFF"/> + <rect rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="8" fill="#cc3429"/> + <rect rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="8" fill="url(#b)"/> + <rect opacity=".4" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="21" fill="#FFF"/> + <rect rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="21" fill="#cc3429"/> + <rect rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="21" fill="url(#c)"/> + </g> + <rect style="color:#000000" height="3.9477" width="19.876" y="14.023" x="6.1231" fill="#c5c5c5"/> + <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m6.5182 14.553 18.987 0.011-0.09 11.941-18.986-0.011zm0.33122 8.8955 18.622 0.01098m-18.89-2.957 18.622 0.01098m-18.532-14.898 18.622 0.011m-3.6545-2.8956-0.0893 11.828m-2.9014-11.783-0.0893 11.828m-2.902-11.917-0.089 11.827m-2.9014-11.783-0.0893 11.828m-2.8347-11.839-0.0893 11.828" stroke="#000" stroke-linecap="round" fill="none"/> +</svg> diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png Binary files differindex 753d151f538..c0e75901081 100644 --- a/core/img/filetypes/text-code.png +++ b/core/img/filetypes/text-code.png diff --git a/core/img/filetypes/text-code.svg b/core/img/filetypes/text-code.svg index 61a5c19f511..b85ddece9c0 100644 --- a/core/img/filetypes/text-code.svg +++ b/core/img/filetypes/text-code.svg @@ -1,42 +1,38 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="f" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132"> + <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="e" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" y1="50.786" x1="-51.786"> + <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> - <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86"> + <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g> - <g> - <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/> - <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/> - <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/> - </g> - <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#e)" stroke-width=".99992" fill="url(#f)"/> - </g> - <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#g)" stroke-linecap="round" fill="none"/> - <path d="m8 5.505h2.3438zm2.6875 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm-7.4688 2h3.6562zm4.0625 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm-9.282 1.995h4.2812zm4.625 0h4.625zm1.703 8h0.84375zm1.1875 0h1.875zm2.25 0h4.9062zm-2.6875 2.075h1.8438zm-1.028 5.925h2.9688zm3.8562 0h1.1875z" stroke="#89adc2" stroke-width="1px" fill="none"/> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/> + <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/> + <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/> + <path stroke-linejoin="round" stroke="url(#j)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/> + <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/> + <path stroke="#89adc2" stroke-width="1px" d="m8 5.505h2.3438zm2.6875 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm-7.4688 2h3.6562zm4.0625 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm-9.282 1.995h4.2812zm4.625 0h4.625zm1.703 8h0.84375zm1.1875 0h1.875zm2.25 0h4.9062zm-2.6875 2.075h1.8438zm-1.028 5.925h2.9688zm3.8562 0h1.1875z" fill="none"/> <g transform="translate(27.06 6.7752)"> <path d="m-15.57 10.277h0.93368v1h-0.93368z" fill="#d48eb3"/> <path d="m-14.483 10.277h0.41011v1h-0.41011z" fill="#d48eb3"/> @@ -58,9 +54,7 @@ <path d="m-19.06 18.277h1.4875v1h-1.4875v-1z" fill="#de6161"/> <path opacity=".7" d="m-17.334 18.277h2.6472v1h-2.6472v-1z" fill="#666"/> </g> - <g> - <path d="m8 12v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094z" fill="#b78ed4"/> - <path d="m12.406 12v1h5.594v-1zm0.03125 2v1h5.0938v-1z" fill="#d48eb3"/> - <path d="m8 17v1h2.5312v-1zm0 2.031v0.969h2.2188v-0.96875z" fill="#94d48e"/> - </g> + <path d="m8 12v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094z" fill="#b78ed4"/> + <path d="m12.406 12v1h5.594v-1zm0.03125 2v1h5.0938v-1z" fill="#d48eb3"/> + <path d="m8 17v1h2.5312v-1zm0 2.031v0.969h2.2188v-0.96875z" fill="#94d48e"/> </svg> diff --git a/core/img/filetypes/text-html.png b/core/img/filetypes/text-html.png Binary files differindex dd17b750103..c3bbf2bfd91 100644 --- a/core/img/filetypes/text-html.png +++ b/core/img/filetypes/text-html.png diff --git a/core/img/filetypes/text-html.svg b/core/img/filetypes/text-html.svg index c41964738d0..99215d303ea 100644 --- a/core/img/filetypes/text-html.svg +++ b/core/img/filetypes/text-html.svg @@ -1,49 +1,43 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="f" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132"> + <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="e" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" y1="50.786" x1="-51.786"> + <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> - <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86"> + <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g> - <g> - <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/> - <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/> - <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/> - </g> - <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#e)" stroke-width=".99992" fill="url(#f)"/> - </g> - <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#g)" stroke-linecap="round" fill="none"/> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/> + <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/> + <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/> + <path stroke-linejoin="round" stroke="url(#j)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/> + <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/> <g fill="#fff"> <rect opacity=".6" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="14.363" x="23.867"/> <path opacity=".6" d="m23.142 16.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z"/> <path opacity=".6" d="m8.8581 16.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z"/> </g> - <g> - <path opacity=".4" d="m8.8581 15.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z" fill="#666"/> - <rect opacity=".4" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="13.259" x="23.397"/> - <path opacity=".4" d="m23.142 15.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z" fill="#666"/> - </g> + <path opacity=".4" d="m8.8581 15.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z" fill="#666"/> + <rect opacity=".4" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="13.259" x="23.397"/> + <path opacity=".4" d="m23.142 15.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z" fill="#666"/> </svg> diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png Binary files differindex 2e52d1ecb3a..6849792dfd2 100644 --- a/core/img/filetypes/text-vcard.png +++ b/core/img/filetypes/text-vcard.png diff --git a/core/img/filetypes/text-vcard.svg b/core/img/filetypes/text-vcard.svg index 27054be57e6..f9d50fef77c 100644 --- a/core/img/filetypes/text-vcard.svg +++ b/core/img/filetypes/text-vcard.svg @@ -1,60 +1,53 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3013" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.56756757,0,0,0.72972971,2.378382,-2.5135063)" y1="5.5641" x1="24"> + <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3016" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.65714319,0,0,0.63012397,0.228556,-1.0896478)" y1="0.98521" x1="25.132"> + <linearGradient id="h" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3021" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01566318,0,0,0.00823529,17.610433,25.980565)" r="117.14"/> - <radialGradient id="radialGradient3024" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01566318,0,0,0.00823529,14.389566,25.980565)" r="117.14"/> - <linearGradient id="linearGradient3027" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.04576928,0,0,0.00823529,-0.5423243,25.980548)" y1="366.65" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="g" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3032" y2="32.596" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.502671,0,0,0.64629877,2.711822,0.7961773)" y1="14.916" x1="24"> + <linearGradient id="f" x1="24" gradientUnits="userSpaceOnUse" y1="14.916" gradientTransform="matrix(.50267 0 0 .64630 2.7118 .79618)" x2="24" y2="32.596"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.12291"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.93706"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".12291"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".93706"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3035" gradientUnits="userSpaceOnUse" cy="8.4498" cx="10.904" gradientTransform="matrix(0,0.96917483,-0.82965977,0,23.014205,-1.785221)" r="20"> + <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="8.4498" cx="10.904" gradientTransform="matrix(0 .96917 -.82966 0 23.014 -1.7852)" r="20"> <stop stop-color="#5f5f5f" offset="0"/> - <stop stop-color="#4f4f4f" offset="0.26238"/> - <stop stop-color="#3b3b3b" offset="0.70495"/> + <stop stop-color="#4f4f4f" offset=".26238"/> + <stop stop-color="#3b3b3b" offset=".70495"/> <stop stop-color="#2b2b2b" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3037" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.65627449,0,0,0.6892852,0.2531134,-0.2111202)" y1="44" x1="24"> + <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.65627 0 0 .68929 .25311 -.21112)" x2="24" y2="3.899"> <stop stop-color="#272727" offset="0"/> <stop stop-color="#454545" offset="1"/> </linearGradient> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect opacity="0.15" fill-rule="nonzero" height="2" width="22.1" y="29" x="4.95" fill="url(#linearGradient3027)"/> - <path opacity="0.15" d="m4.95,29v1.9999c-0.80662,0.0038-1.95-0.44807-1.95-1.0001,0-0.552,0.90012-0.99982,1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3024)"/> - <path opacity="0.15" d="m27.05,29v1.9999c0.80661,0.0038,1.95-0.44807,1.95-1.0001,0-0.552-0.90012-0.99982-1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3021)"/> - <path d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" fill="url(#linearGradient3016)"/> - <path stroke-linejoin="round" d="m26.5,28.5-21,0,0-27,21,0z" stroke-dashoffset="0" stroke="url(#linearGradient3013)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="round" opacity="0.3" d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" stroke-dashoffset="0" stroke="#000" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186000000005" fill="none"/> - <path opacity="0.4" style="enable-background:accumulate;" d="m15.942,10c-0.43193-0.00263-0.8112,0.0802-1.0693,0.25173-0.33304,0.22128-0.47989,0.24937-0.57286,0.09682-0.08897-0.14595-0.16986-0.12965-0.24824,0.07745-0.06628,0.17515-0.20484,0.25511-0.36281,0.19364-0.15062-0.05862-0.21239-0.03973-0.15276,0.05809,0.05729,0.09402,0.02929,0.17427-0.05728,0.17427s-0.36382,0.2966-0.61105,0.65837c-0.39411,0.57668-0.45839,0.84025-0.45829,2.0526,0.000055,0.76062,0.07517,1.5012-0.15276,1.5491-0.13368,0.02806-0.12095,0.55674-0.05728,1.1037,0.08325,0.71528,0.20761,1.0657,0.55377,1.3942,0.53917,0.51164,1.0312,1.3973,1.0312,1.8783,0,0.65888-1.5163,1.812-3.7844,2.8648l-0.001,1.647h11.999l0.001-1.818c-1.8832-0.86856-3.4418-2.0704-3.4418-2.6933,0-0.47982,0.47343-1.3672,1.0121-1.8783,0.34616-0.32849,0.48961-0.6789,0.57286-1.3942,0.06366-0.54699,0.07227-1.0601-0.05728-1.1037-0.17854-0.06014-0.17188-0.79471-0.17188-1.5491-0.000001-1.0814-0.06787-1.4838-0.34372-1.9364-0.54889-0.9006-2.3323-1.6188-3.6281-1.6265z" fill-rule="evenodd" fill="#FFF"/> - <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m15.942,9.5292c-0.6255-0.1462-1.3748,0.30347-1.3748,0.30347l-0.6729,0.33632s-0.72918,0.63672-0.73698,0.85303c-0.41044,0.72679-0.22336,1.6075-0.26498,2.4026,0.03999,0.68261-0.43452,1.1887-0.1965,1.8808-0.03472,0.66822,0.51558,1.0601,0.86937,1.5434,0.39816,0.61145,0.93889,1.4093,0.51306,2.141-0.78719,1.1416-2.0959,1.7466-3.2907,2.3686-0.4059,0.04157-0.25309,0.43145-0.28027,0.70942-0.000647,0.22106-0.07334,0.51408,0.25088,0.41058h10.742v-1.1474c-1.1567-0.58611-2.3639-1.2139-3.1747-2.2562-0.48709-0.69808,0.0011-1.5369,0.38553-2.1576,0.2993-0.51701,0.92489-0.84736,0.93383-1.5066,0.23004-0.66882-0.1171-1.2225-0.18189-1.8604-0.08471-0.84572,0.14453-1.7705-0.25914-2.5574-0.54732-0.80518-1.5498-1.1578-2.4596-1.3737-0.26389-0.053253-0.53234-0.088037-0.80184-0.09011z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3037)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="url(#radialGradient3035)"/> - <path opacity="0.5" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m15.797,10.502c-0.10657-0.01105-0.27196,0.03765-0.51076,0.15329-0.17676,0.08559-0.43781,0.15994-0.7045,0.21077l0.01761,0.01916c-0.0033,0.002-0.1837,0.11082-0.29941,0.19161-0.02225,0.01554-0.034,0.0057-0.05284,0.01916-0.0059,0.0083-0.01447,0.01546-0.01761,0.01916-0.07635,0.08979-0.22535,0.27657-0.33464,0.47903-0.11417,0.2115-0.16633,0.4404-0.15851,0.49819a0.52517,0.57134,0,0,1,0.01761,0.13413c-0.05039,0.58523,0.11775,1.3768-0.1409,2.261a0.52517,0.57134,0,0,1,-0.035,0.115c-0.09831,0.18139-0.02434,0.78987,0.1409,1.2455,0.54115,0.61932,1.1974,1.4444,1.18,2.5676a0.52517,0.57134,0,0,1,-0.0176,0.13412c-0.28591,1.0661-1.1672,1.5797-1.726,2.0119a0.52517,0.57134,0,0,1,-0.01761,0.01916c-0.524,0.378-1.084,0.623-1.637,0.919h9c-1.027-0.52495-2.0438-1.1451-2.8532-2.1077-0.0057-0.0069-0.0119-0.01231-0.01761-0.01916-0.37728-0.42677-0.45342-1.0116-0.36986-1.4754,0.08208-0.45566,0.27492-0.83741,0.45793-1.1497,0.0063-0.01067,0.01139-0.02783,0.01761-0.03833,0.18432-0.36085,0.41144-0.60748,0.5636-0.80477,0.15849-0.2055,0.22438-0.31795,0.22896-0.47903a0.52517,0.57134,0,0,1,0.03523,-0.15329c0.05659-0.18584,0.03263-0.33442-0.01761-0.57483-0.04928-0.23579-0.14777-0.55211-0.17612-0.9389-0.000556-0.0075,0.000501-0.01151,0-0.01916-0.04688-0.50185,0.0086-0.95368,0-1.3413-0.0086-0.3855-0.07421-0.66627-0.22896-0.90057-0.0021-0.0024,0.0021-0.01679,0-0.01916-0.54915-0.61896-1.4523-0.93653-2.3073-0.97721a0.52517,0.57134,0,0,1,-0.03523,0z" stroke-dashoffset="0" stroke="url(#linearGradient3032)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> + <g> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#g)"/> + <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/> + <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/> + </g> + <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#h)"/> + <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#i)" stroke-linecap="round" fill="none"/> + <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/> + <path opacity=".4" fill="#FFF" d="m15.942 10c-0.43193-0.00263-0.8112 0.0802-1.0693 0.25173-0.33304 0.22128-0.47989 0.24937-0.57286 0.09682-0.08897-0.14595-0.16986-0.12965-0.24824 0.07745-0.06628 0.17515-0.20484 0.25511-0.36281 0.19364-0.15062-0.05862-0.21239-0.03973-0.15276 0.05809 0.05729 0.09402 0.02929 0.17427-0.05728 0.17427s-0.36382 0.2966-0.61105 0.65837c-0.39411 0.57668-0.45839 0.84025-0.45829 2.0526 0.000055 0.76062 0.07517 1.5012-0.15276 1.5491-0.13368 0.02806-0.12095 0.55674-0.05728 1.1037 0.08325 0.71528 0.20761 1.0657 0.55377 1.3942 0.53917 0.51164 1.0312 1.3973 1.0312 1.8783 0 0.65888-1.5163 1.812-3.7844 2.8648l-0.001 1.647h11.999l0.001-1.818c-1.8832-0.86856-3.4418-2.0704-3.4418-2.6933 0-0.47982 0.47343-1.3672 1.0121-1.8783 0.34616-0.32849 0.48961-0.6789 0.57286-1.3942 0.06366-0.54699 0.07227-1.0601-0.05728-1.1037-0.17854-0.06014-0.17188-0.79471-0.17188-1.5491-0.000001-1.0814-0.06787-1.4838-0.34372-1.9364-0.54889-0.9006-2.3323-1.6188-3.6281-1.6265z" fill-rule="evenodd"/> + <path stroke-linejoin="round" style="color:#000000" d="m15.942 9.5292c-0.6255-0.1462-1.3748 0.30347-1.3748 0.30347l-0.6729 0.33632s-0.72918 0.63672-0.73698 0.85303c-0.41044 0.72679-0.22336 1.6075-0.26498 2.4026 0.03999 0.68261-0.43452 1.1887-0.1965 1.8808-0.03472 0.66822 0.51558 1.0601 0.86937 1.5434 0.39816 0.61145 0.93889 1.4093 0.51306 2.141-0.78719 1.1416-2.0959 1.7466-3.2907 2.3686-0.4059 0.04157-0.25309 0.43145-0.28027 0.70942-0.000647 0.22106-0.07334 0.51408 0.25088 0.41058h10.742v-1.1474c-1.1567-0.58611-2.3639-1.2139-3.1747-2.2562-0.48709-0.69808 0.0011-1.5369 0.38553-2.1576 0.2993-0.51701 0.92489-0.84736 0.93383-1.5066 0.23004-0.66882-0.1171-1.2225-0.18189-1.8604-0.08471-0.84572 0.14453-1.7705-0.25914-2.5574-0.54732-0.80518-1.5498-1.1578-2.4596-1.3737-0.26389-0.053253-0.53234-0.088037-0.80184-0.09011z" stroke="url(#e)" stroke-linecap="round" fill="url(#b)"/> + <path opacity=".5" stroke-linejoin="round" style="color:#000000" d="m15.797 10.502c-0.10657-0.01105-0.27196 0.03765-0.51076 0.15329-0.17676 0.08559-0.43781 0.15994-0.7045 0.21077l0.01761 0.01916c-0.0033 0.002-0.1837 0.11082-0.29941 0.19161-0.02225 0.01554-0.034 0.0057-0.05284 0.01916-0.0059 0.0083-0.01447 0.01546-0.01761 0.01916-0.07635 0.08979-0.22535 0.27657-0.33464 0.47903-0.11417 0.2115-0.16633 0.4404-0.15851 0.49819a0.52517 0.57134 0 0 1 0.01761 0.13413c-0.05039 0.58523 0.11775 1.3768-0.1409 2.261a0.52517 0.57134 0 0 1 -0.035 0.115c-0.09831 0.18139-0.02434 0.78987 0.1409 1.2455 0.54115 0.61932 1.1974 1.4444 1.18 2.5676a0.52517 0.57134 0 0 1 -0.0176 0.13412c-0.28591 1.0661-1.1672 1.5797-1.726 2.0119a0.52517 0.57134 0 0 1 -0.01761 0.01916c-0.524 0.378-1.084 0.623-1.637 0.919h9c-1.027-0.52495-2.0438-1.1451-2.8532-2.1077-0.0057-0.0069-0.0119-0.01231-0.01761-0.01916-0.37728-0.42677-0.45342-1.0116-0.36986-1.4754 0.08208-0.45566 0.27492-0.83741 0.45793-1.1497 0.0063-0.01067 0.01139-0.02783 0.01761-0.03833 0.18432-0.36085 0.41144-0.60748 0.5636-0.80477 0.15849-0.2055 0.22438-0.31795 0.22896-0.47903a0.52517 0.57134 0 0 1 0.03523 -0.15329c0.05659-0.18584 0.03263-0.33442-0.01761-0.57483-0.04928-0.23579-0.14777-0.55211-0.17612-0.9389-0.000556-0.0075 0.000501-0.01151 0-0.01916-0.04688-0.50185 0.0086-0.95368 0-1.3413-0.0086-0.3855-0.07421-0.66627-0.22896-0.90057-0.0021-0.0024 0.0021-0.01679 0-0.01916-0.54915-0.61896-1.4523-0.93653-2.3073-0.97721a0.52517 0.57134 0 0 1 -0.03523 0z" stroke="url(#f)" stroke-linecap="round" fill="none"/> </svg> diff --git a/core/img/filetypes/text-x-c.png b/core/img/filetypes/text-x-c.png Binary files differindex b9edd1e866e..2bdb16a2a77 100644 --- a/core/img/filetypes/text-x-c.png +++ b/core/img/filetypes/text-x-c.png diff --git a/core/img/filetypes/text-x-c.svg b/core/img/filetypes/text-x-c.svg index 35a6a0cdfe2..462286754f9 100644 --- a/core/img/filetypes/text-x-c.svg +++ b/core/img/filetypes/text-x-c.svg @@ -1,75 +1,70 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient3161" y2="14" xlink:href="#linearGradient3830" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="translate(0,-4.6093084e-4)" y1="43" x1="25"/> - <linearGradient id="linearGradient3830"> + <linearGradient id="n" x1="25" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="43" gradientTransform="translate(0 -.00046093)" x2="25" y2="14"/> + <linearGradient id="b"> <stop stop-color="#FFF" offset="0"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3164" y2="28.585" xlink:href="#linearGradient3830" gradientUnits="userSpaceOnUse" x2="30" gradientTransform="translate(0,-4.6093084e-4)" y1="9.9828" x1="30"/> - <radialGradient id="radialGradient3167" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.6167311e-7,6.6018651,-8.0922115,-1.9817022e-7,104.56429,-60.072946)" r="12.672"> + <linearGradient id="m" x1="30" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="9.9828" gradientTransform="translate(0 -.00046093)" x2="30" y2="28.585"/> + <radialGradient id="f" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.6167e-7 6.6019 -8.0922 -1.9817e-7 104.56 -60.073)" r="12.672"> <stop stop-color="#90dbec" offset="0"/> - <stop stop-color="#55c1ec" offset="0.26238"/> - <stop stop-color="#3689e6" offset="0.70495"/> + <stop stop-color="#55c1ec" offset=".26238"/> + <stop stop-color="#3689e6" offset=".70495"/> <stop stop-color="#2b63a0" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3169" y2="0.91791" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="translate(0,-4.6093084e-4)" y1="47.935" x1="25"> + <linearGradient id="l" x1="25" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="translate(0 -.00046093)" x2="25" y2=".91791"> <stop stop-color="#185f9a" offset="0"/> <stop stop-color="#599ec9" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3172" gradientUnits="userSpaceOnUse" cy="63.965" cx="15.116" gradientTransform="matrix(1.139227,0,0,0.4068666,6.7799989,7.7466159)" r="12.289"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="63.965" cx="15.116" gradientTransform="matrix(1.1392 0 0 .40687 6.78 7.7466)" r="12.289"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3243" y2="0.50543" gradientUnits="userSpaceOnUse" x2="21.253" gradientTransform="translate(0,0.99953907)" y1="44.301" x1="21.253"> + <linearGradient id="k" x1="21.253" gradientUnits="userSpaceOnUse" y1="44.301" gradientTransform="translate(0 .99954)" x2="21.253" y2=".50543"> <stop stop-color="#AAA" offset="0"/> <stop stop-color="#c8c8c8" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132"> + <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786"> + <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/> - <linearGradient id="linearGradient4091" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/> + <linearGradient id="g" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <g transform="matrix(0.66666667,0,0,0.66666667,0,0.00184133)"> - <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4091)"/> - <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/> - <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/> - <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/> - <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <path d="m11,6.9995,0,1,2.375,0,0-1zm2.6875,0,0,1,2.25,0,0-1zm2.5625,0,0,1,1.9688,0,0-1zm2.2812,0,0,1,0.875,0,0-1zm1.1875,0,0,1,1.9375,0,0-1zm2.2812,0,0,1,5,0,0-1zm-11,2,0,1,3.7812,0,0-1zm4.1562,0,0,1,1.8125,0,0-1zm2.1562,0,0,1,0.84375,0,0-1zm1.2188,0,0,1,1.625,0,0-1zm2,0,0,1,1.625,0,0-1zm1.9688,0,0,1,2.6562,0,0-1zm3.0312,0,0,1,3.4688,0,0-1zm-16.904,2.0005v1h4.1875v-1zm4.5,0,0,1,4.5,0,0-1zm-4.5,2,0,1,2.3125,0,0-1zm2.625,0,0,1,2.1562,0,0-1zm2.4688,0,0,1,1.9062,0,0-1zm-5.0938,3,0,1,3.0625,0,0-1zm3.4062,0,0,1,5.5938,0,0-1zm-3.4062,2,0,1,3.0938,0,0-1zm3.4375,0,0,1,5.0938,0,0-1c-2.793,2.816-6.7194,8.5464-5.0938,0zm5.4688,0,0,1,1.9062,0,0-1zm2.2188,0,0,1,1.9062,0,0-1zm2.2188,0,0,1,2.75,0,0-1zm3.0938,0,0,1,0.5625,0,0-1zm-16.438,3,0,1,2.3438,0,0-1zm0,2,0,1,1,0,0-1zm0,2,0,1,2.75,0,0-1zm9,0,0,1,2.3438,0,0-1zm2.6562,0,0,1,2.1875,0,0-1zm2.5,0,0,1,1.8438,0,0-1zm-14.156,2,0,1,2.9375,0,0-1zm9,0,0,1,1.875,0,0-1zm2.1875,0,0,1,4.8125,0,0-1zm5.125,0,0,1,3.6875,0,0-1zm-16.312,2,0,1,2.5312,0,0-1zm9,0,0,1,2.4375,0,0-1zm2.7812,0,0,1,4.2812,0,0-1zm4.5938,0,0,1,2.9375,0,0-1zm-16.376,2.156v0.96875h2.2188v-0.96875zm2.5625,0,0,0.96875,2.125,0,0-0.96875zm-2.562,2.844v1h4.2812v-1zm4.625,0,0,1,4.5938,0,0-1zm11.75,0,0,1,2.9688,0,0-1zm3.2812,0,0,1,1.1562,0,0-1zm1.5,0,0,1,0.6875,0,0-1zm1,0,0,1,1.8438,0,0-1zm-22.156,2,0,1,3.6875,0,0-1zm3.9688,0,0,1,1.7812,0,0-1zm2.1562,0,0,1,0.8125,0,0-1zm1.0312,0,0,1,1.625,0,0-1zm1.875,0,0,1,1.625,0,0-1zm2.125,0,0,1,2.5938,0,0-1zm2.9062,0,0,1,3.375,0,0-1zm3.8438,0,0,1,2.2812,0,0-1zm2.5625,0,0,1,0.53125,0,0-1zm-20.469,2,0,1,3.0312,0,0-1zm3.3438,0,0,1,3.3438,0,0-1zm5.5938,0,0,1,2.4375,0,0-1zm2.75,0,0,1,2.25,0,0-1zm2.5938,0,0,1,1.9375,0,0-1zm2.25,0,0,1,3.0938,0,0-1zm3.4375,0,0,1,5.0312,0,0-1z" fill="url(#linearGradient3243)"/> - <path opacity="0.3" d="M38,33.772c0.002,2.762-6.267,5.001-14,5.001s-14.002-2.239-14-5.001c-0.0015-2.762,6.267-5.001,14-5.001,7.7331,0,14.002,2.2392,14,5.001z" fill="url(#radialGradient3172)"/> - <path stroke-linejoin="round" style="enable-background:accumulate;" d="m24,10.5c-6.9,0-12.5,5.6-12.5,12.5s5.6,12.5,12.5,12.5c5.1254,0,10-3.5,11.553-8h-5.536c-1.3314,1.7506-3.794,3-6.0175,3-4.14,0-7.5-3.36-7.5-7.5-0.000002-4.14,3.36-7.5,7.5-7.5,2.6674,0,5.1835,1.9004,6.5132,4h4.9491c-0.46238-4.5-5.9604-9-11.462-9z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3169)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#radialGradient3167)"/> - <path opacity="0.5" stroke-linejoin="miter" style="enable-background:accumulate;" d="m34.125,17.937c-1.85-3.7875-5.876-6.4337-10.125-6.375-4.4493-0.06217-8.7511,2.7592-10.485,6.8537-1.8453,4.1071-0.95053,9.2567,2.2024,12.479,2.1403,2.3057,5.2836,3.5679,8.4064,3.5424" stroke-dashoffset="0" stroke="url(#linearGradient3164)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <path opacity="0.5" stroke-linejoin="miter" style="enable-background:accumulate;" d="m23.561,14.448c-4.0197,0.13299-7.6119,3.4686-8.0541,7.4638-0.56609,3.8529,1.8882,7.8464,5.5554,9.1288,3.0106,1.1697,7.3287,0.17216,9.3618-2.5497h4.5763" stroke-dashoffset="0" stroke="url(#linearGradient3161)" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> + <g transform="matrix(.66667 0 0 .66667 0 .0018413)"> + <g> + <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#g)"/> + <path opacity=".3" fill="url(#c)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/> + <path opacity=".3" fill="url(#d)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/> + </g> + <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#i)" stroke-width=".99992" fill="url(#j)"/> + <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#h)" stroke-linecap="round" fill="none"/> + <path d="m11 6.9995v1h2.375v-1zm2.6875 0v1h2.25v-1zm2.5625 0v1h1.9688v-1zm2.2812 0v1h0.875v-1zm1.1875 0v1h1.9375v-1zm2.2812 0v1h5v-1zm-11 2v1h3.7812v-1zm4.1562 0v1h1.8125v-1zm2.1562 0v1h0.84375v-1zm1.2188 0v1h1.625v-1zm2 0v1h1.625v-1zm1.9688 0v1h2.6562v-1zm3.0312 0v1h3.4688v-1zm-16.904 2.0005v1h4.1875v-1zm4.5 0v1h4.5v-1zm-4.5 2v1h2.3125v-1zm2.625 0v1h2.1562v-1zm2.4688 0v1h1.9062v-1zm-5.0938 3v1h3.0625v-1zm3.4062 0v1h5.5938v-1zm-3.4062 2v1h3.0938v-1zm3.4375 0v1h5.0938v-1c-2.793 2.816-6.7194 8.5464-5.0938 0zm5.4688 0v1h1.9062v-1zm2.2188 0v1h1.9062v-1zm2.2188 0v1h2.75v-1zm3.0938 0v1h0.5625v-1zm-16.438 3v1h2.3438v-1zm0 2v1h1v-1zm0 2v1h2.75v-1zm9 0v1h2.3438v-1zm2.6562 0v1h2.1875v-1zm2.5 0v1h1.8438v-1zm-14.156 2v1h2.9375v-1zm9 0v1h1.875v-1zm2.1875 0v1h4.8125v-1zm5.125 0v1h3.6875v-1zm-16.312 2v1h2.5312v-1zm9 0v1h2.4375v-1zm2.7812 0v1h4.2812v-1zm4.5938 0v1h2.9375v-1zm-16.376 2.156v0.96875h2.2188v-0.96875zm2.5625 0v0.96875h2.125v-0.96875zm-2.562 2.844v1h4.2812v-1zm4.625 0v1h4.5938v-1zm11.75 0v1h2.9688v-1zm3.2812 0v1h1.1562v-1zm1.5 0v1h0.6875v-1zm1 0v1h1.8438v-1zm-22.156 2v1h3.6875v-1zm3.9688 0v1h1.7812v-1zm2.1562 0v1h0.8125v-1zm1.0312 0v1h1.625v-1zm1.875 0v1h1.625v-1zm2.125 0v1h2.5938v-1zm2.9062 0v1h3.375v-1zm3.8438 0v1h2.2812v-1zm2.5625 0v1h0.53125v-1zm-20.469 2v1h3.0312v-1zm3.3438 0v1h3.3438v-1zm5.5938 0v1h2.4375v-1zm2.75 0v1h2.25v-1zm2.5938 0v1h1.9375v-1zm2.25 0v1h3.0938v-1zm3.4375 0v1h5.0312v-1z" fill="url(#k)"/> + <path opacity=".3" d="m38 33.772c0.002 2.762-6.267 5.001-14 5.001s-14.002-2.239-14-5.001c-0.0015-2.762 6.267-5.001 14-5.001 7.7331 0 14.002 2.2392 14 5.001z" fill="url(#e)"/> + <g stroke-linecap="square"> + <path stroke-linejoin="round" d="m24 10.5c-6.9 0-12.5 5.6-12.5 12.5s5.6 12.5 12.5 12.5c5.1254 0 10-3.5 11.553-8h-5.536c-1.3314 1.7506-3.794 3-6.0175 3-4.14 0-7.5-3.36-7.5-7.5-0.000002-4.14 3.36-7.5 7.5-7.5 2.6674 0 5.1835 1.9004 6.5132 4h4.9491c-0.46238-4.5-5.9604-9-11.462-9z" stroke="url(#l)" fill="url(#f)"/> + <path opacity=".5" d="m34.125 17.937c-1.85-3.7875-5.876-6.4337-10.125-6.375-4.4493-0.06217-8.7511 2.7592-10.485 6.8537-1.8453 4.1071-0.95053 9.2567 2.2024 12.479 2.1403 2.3057 5.2836 3.5679 8.4064 3.5424" stroke="url(#m)" fill="none"/> + <path opacity=".5" d="m23.561 14.448c-4.0197 0.13299-7.6119 3.4686-8.0541 7.4638-0.56609 3.8529 1.8882 7.8464 5.5554 9.1288 3.0106 1.1697 7.3287 0.17216 9.3618-2.5497h4.5763" stroke="url(#n)" fill="none"/> + </g> </g> </svg> diff --git a/core/img/filetypes/text-x-h.png b/core/img/filetypes/text-x-h.png Binary files differindex 37a8805b506..7b4a36cdbe9 100644 --- a/core/img/filetypes/text-x-h.png +++ b/core/img/filetypes/text-x-h.png diff --git a/core/img/filetypes/text-x-h.svg b/core/img/filetypes/text-x-h.svg index 38ed04690fc..9ed1bd6ff9c 100644 --- a/core/img/filetypes/text-x-h.svg +++ b/core/img/filetypes/text-x-h.svg @@ -1,79 +1,74 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient3471" y2="36.456" gradientUnits="userSpaceOnUse" x2="21.038" gradientTransform="matrix(0.58514285,0,0,0.60235363,3.8713637,10.911281)" y1="29.845" x1="21.038"> + <linearGradient id="l" x1="21.038" gradientUnits="userSpaceOnUse" y1="29.845" gradientTransform="matrix(.58514 0 0 .60235 3.8714 10.911)" x2="21.038" y2="36.456"> <stop stop-color="#FFF" offset="0"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient4596-7" y2="34.607" gradientUnits="userSpaceOnUse" x2="26.884" gradientTransform="translate(4.1160985,-1.6069009)" y1="12.607" x1="26.884"> + <linearGradient id="h" x1="26.884" gradientUnits="userSpaceOnUse" y1="12.607" gradientTransform="translate(4.1161 -1.6069)" x2="26.884" y2="34.607"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.090909"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95455"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".090909"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95455"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3394" fx="9.3065" xlink:href="#linearGradient3242-6-6" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0,7.1403659,-7.3430977,0,93.723115,-67.567174)" r="12.672"/> - <linearGradient id="linearGradient3242-6-6"> + <radialGradient id="e" fx="9.3065" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0 7.1404 -7.3431 0 93.723 -67.567)" r="12.672"/> + <linearGradient id="b"> <stop stop-color="#f8b17e" offset="0"/> - <stop stop-color="#e35d4f" offset="0.26238"/> - <stop stop-color="#c6262e" offset="0.66094"/> + <stop stop-color="#e35d4f" offset=".26238"/> + <stop stop-color="#c6262e" offset=".66094"/> <stop stop-color="#690b54" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3396" y2="4.9451" xlink:href="#linearGradient2490-6-6" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(0.98529211,0,0,1.0090832,-3.0293205,-2.6661519)" y1="49.945" x1="25"/> - <linearGradient id="linearGradient2490-6-6"> + <linearGradient id="n" x1="25" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="matrix(.98529 0 0 1.0091 -3.0293 -2.6662)" x2="25" y2="4.9451"/> + <linearGradient id="c"> <stop stop-color="#791235" offset="0"/> <stop stop-color="#dd3b27" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3399" fx="9.3065" xlink:href="#linearGradient3242-6-6" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0,7.1403659,-7.3430977,0,93.723115,-67.168075)" r="12.672"/> - <linearGradient id="linearGradient3401" y2="4.9451" xlink:href="#linearGradient2490-6-6" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(0.98529211,0,0,1.0090832,-3.0293205,-2.2670529)" y1="49.945" x1="25"/> - <linearGradient id="linearGradient3797" y2="0.4976" gradientUnits="userSpaceOnUse" x2="23.749" y1="44.759" x1="23.749"> + <radialGradient id="d" fx="9.3065" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0 7.1404 -7.3431 0 93.723 -67.168)" r="12.672"/> + <linearGradient id="m" x1="25" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="matrix(.98529 0 0 1.0091 -3.0293 -2.2671)" x2="25" y2="4.9451"/> + <linearGradient id="k" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749"> <stop stop-color="#a3a3a3" offset="0"/> <stop stop-color="#bababa" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24"> + <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132"> + <linearGradient id="p" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786"> + <linearGradient id="o" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="g" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/> - <linearGradient id="linearGradient4333" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/> + <linearGradient id="i" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <g transform="matrix(0.66666667,0,0,0.66666667,0,0.00184133)"> - <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4333)"/> - <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/> - <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/> - <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/> - <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <path d="m11,21,0,1,2.3438,0,0-1h-2.344zm0,4,0,1,2.75,0,0-1-2.75,0zm0,2,0,1,2.9375,0,0-1h-5.282zm0,2,0,1,2.5312,0,0-1h-4.875zm0,2.1562,0,0.96875,2.2188,0,0-0.96875-2.2188,0zm0.406-10.156v1h2.25v-1h-2.25zm-2.75,2,0,1,1,0,0-1-1,0zm3.1562,2,0,1,1.8438,0,0-1-1.8438,0zm0.125,2,0,1,2.7188,0,0-1-2.7188,0zm-0.34375,2,0,1,2.0625,0,0-1-2.0625,0zm-0.375,2.1562,0,0.96875,2.125,0,0-0.96875-2.125,0zm-2.562,2.844v1h4.2812v-1h-4.281zm0,2,0,1,3.6875,0,0-1h-3.688zm3.9688,0,0,1,1.7812,0,0-1-1.7812,0zm-0.625,2,0,1,3.3438,0,0-1-3.3438,0zm-3.344,0h3.0367v1h-3.037v-1zm3.4062-22,0,1,5.5938,0,0-1-5.5938,0zm0.03125,2,0,1,5.0938,0,0-1-5.0938,0zm1.1875,16,0,1,4.5938,0,0-1-4.5938,0zm4.9375,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,4.3125,0,0-1-4.3125,0zm4.6562,0,0,1,2.9688,0,0-1-2.9688,0zm3.2812,0,0,1,1.1562,0,0-1-1.1562,0zm1.5,0,0,1,0.6875,0,0-1-0.6875,0zm1,0,0,1,1.8438,0,0-1-1.8438,0zm-16.031,2,0,1,0.8125,0,0-1-0.8125,0zm1.0312,0,0,1,1.625,0,0-1-1.625,0zm1.875,0,0,1,1.625,0,0-1-1.625,0zm2.125,0,0,1,2.5938,0,0-1-2.5938,0zm2.9062,0,0,1,3.375,0,0-1-3.375,0zm3.8438,0,0,1,2.2812,0,0-1-2.2812,0zm2.5625,0,0,1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0,2,0,1,3.0938,0,0-1h-3.094zm0-11,0,1,2.375,0,0-1-2.375,0zm2.6875,0,0,1,2.25,0,0-1-2.25,0zm2.5625,0,0,1,1.9688,0,0-1-1.9688,0zm2.2812,0,0,1,0.875,0,0-1-0.875,0zm1.1875,0,0,1,1.9375,0,0-1-1.9375,0zm2.2812,0,0,1,5,0,0-1-5,0zm-11,2l0.001,1h3.7812v-1h-3.7812zm4.1562,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,0.84375,0,0-1-0.84375,0zm1.2188,0,0,1,1.625,0,0-1-1.625,0zm2,0,0,1,1.625,0,0-1-1.625,0zm1.9688,0,0,1,2.6562,0,0-1-2.6562,0zm3.0312,0,0,1,3.4688,0,0-1-3.4688,0zm-14.53,2v1h4.1875v-1h-4.188zm4.5,0,0,1,4.5,0,0-1-4.5,0zm-4.5,2,0,1,2.3125,0,0-1h-2.312zm2.625,0,0,1,2.1562,0,0-1-2.1562,0zm2.4688,0,0,1,1.9062,0,0-1-1.9062,0zm3.8125,5,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,2.75,0,0-1-2.75,0zm3.0938,0,0,1,0.5625,0,0-1-0.5625,0zm-7.438,7v1h2.3438v-1h-2.344zm2.6562,0,0,1,2.1875,0,0-1-2.1875,0zm2.5,0,0,1h1.844v-1h-1.844zm-5.156,2v1h1.875v-1h-1.875zm2.1875,0,0,1,4.8125,0,0-1-4.8125,0zm5.125,0,0,1,3.6875,0,0-1-3.6875,0zm-7.313,2v1h2.4375v-1h-2.438zm2.7812,0,0,1,4.2812,0,0-1-4.2812,0zm4.5938,0,0,1,2.9375,0,0-1-2.9375,0zm-7.375,2.125v0.96875h1.875v-0.96875h-1.875zm2.1875,0,0,0.96875,1.9062,0,0-0.96875-1.9062,0zm2.2188,0,0,0.96875,2.7188,0,0-0.96875-2.7188,0zm3.0312,0,0,0.96875,0.5625,0,0-0.96875-0.5625,0zm0.875,0,0,0.96875,3.5312,0,0-0.96875-3.5312,0zm-8.375,6.875,0,1,2.4375,0,0-1-2.4375,0zm2.75,0,0,1,2.25,0,0-1-2.25,0zm2.5938,0,0,1,1.9375,0,0-1-1.9375,0zm2.25,0,0,1,3.0938,0,0-1-3.0938,0zm3.4375,0,0,1,5.0312,0,0-1-5.0312,0z" fill="url(#linearGradient3797)"/> - <path stroke-linejoin="round" style="color:#000000;enable-background:accumulate;" d="m34.549,33.5-4.4021,0,0-9.6523c-0.000012-1.1924-0.18283-2.0842-0.54845-2.6754-0.35602-0.6011-0.90929-0.90166-1.6598-0.90167-0.56771,0.000013-1.044,0.11826-1.4289,0.35476-0.38489,0.23652-0.69279,0.58634-0.92371,1.0495-0.23094,0.46316-0.39451,1.0347-0.49072,1.7147-0.09623,0.67996-0.14434,1.4584-0.14433,2.3355v7.7751h-4.4021v-23h4.4021l0.02888,8.588c0.47147-0.85731,1.0728-1.4732,1.8041-1.8477,0.73126-0.3843,1.5588-0.57646,2.4825-0.57648,0.79861,0.000017,1.5203,0.11827,2.1649,0.35476,0.65428,0.22666,1.2124,0.58635,1.6742,1.079,0.46184,0.49273,0.81785,1.1234,1.068,1.892,0.25016,0.7588,0.37524,1.6703,0.37526,2.7346v10.776z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3401)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.99999994" fill="url(#radialGradient3399)"/> - <path stroke-linejoin="round" style="color:#000000;enable-background:accumulate;" d="m11.5,30.987c-0.000001-0.46315,0.06254-0.8524,0.18763-1.1677,0.1347-0.32519,0.31752-0.58633,0.54845-0.78342,0.23092-0.19708,0.50034-0.33997,0.80825-0.42866,0.3079-0.08868,0.63986-0.13303,0.99588-0.13303,0.33676,0.000004,0.65429,0.04435,0.95258,0.13303,0.3079,0.08869,0.57731,0.23158,0.80825,0.42866,0.23092,0.19709,0.41374,0.45823,0.54845,0.78342,0.1347,0.31534,0.20206,0.70459,0.20206,1.1677-0.000007,0.44345-0.06736,0.82284-0.20206,1.1382-0.13471,0.31534-0.31753,0.57648-0.54845,0.78342-0.23093,0.20694-0.50035,0.35476-0.80825,0.44344-0.299,0.1-0.616,0.149-0.953,0.149-0.35602,0-0.68798-0.04927-0.99588-0.14782-0.30791-0.08869-0.57732-0.2365-0.80825-0.44344s-0.41375-0.46808-0.54845-0.78342c-0.12509-0.31534-0.18763-0.69473-0.18763-1.1382" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3396)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.99999994" fill="url(#radialGradient3394)"/> - <path stroke-linejoin="round" opacity="0.5" style="color:#000000;enable-background:accumulate;" d="m18.531,11.75,0,20.719,2.4062,0,0-6.6875c-0.000007-0.91545,0.051-1.7426,0.15625-2.4688,0.11019-0.76037,0.32838-1.4191,0.625-2,0.30993-0.60695,0.75513-1.1031,1.3125-1.4375,0.54784-0.32869,1.2249-0.53123,1.9688-0.53125,1.0265,0.000018,1.9995,0.53062,2.5312,1.375h0.03125c0.0051,0.008-0.005,0.02321,0,0.03125,0.52572,0.84456,0.71874,1.9068,0.71875,3.1875v8.5312h2.4062v-9.6562c-0.000015-0.95546-0.12792-1.7045-0.34375-2.3438a1.0305,1.0305,0,0,1,0,-0.03125c-0.218-0.661-0.505-1.118-0.842-1.469-0.357-0.372-0.809-0.674-1.312-0.844-0.52338-0.18746-1.1259-0.28124-1.8438-0.28125-0.80443,0.000015-1.4868,0.14206-2.0625,0.4375-0.52554,0.26278-0.96905,0.71674-1.375,1.4375a1.0305,1.0305,0,0,1,-0.907,0.53h-0.25a1.0305,1.0305,0,0,1,-1.0312,-1.0938c0.03222-0.47267,0.08842-0.92314,0.125-1.3438,0.02673-0.34755,0.04266-0.73126,0.0625-1.1875,0.01907-0.44831,0.03124-0.89069,0.03125-1.2812v-3.5938h-2.4062z" transform="matrix(1,0,0,1.0135747,2.96875,-0.44075226)" stroke-dashoffset="0" stroke="url(#linearGradient4596-7)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99328101" fill="none"/> - <path stroke-linejoin="round" opacity="0.5" style="color:#000000;enable-background:accumulate;" d="m12.5,31c-0.000001-0.27647,0.03714-0.50882,0.11143-0.69706,0.08-0.19412,0.18857-0.35,0.32571-0.46765,0.13714-0.11764,0.29714-0.20294,0.48-0.25588,0.18286-0.05293,0.38-0.07941,0.59143-0.07941,0.2,0.000003,0.38857,0.02647,0.56571,0.07941,0.18285,0.05294,0.34285,0.13824,0.48,0.25588,0.13714,0.11765,0.24571,0.27353,0.32571,0.46765,0.08,0.18824,0.12,0.42059,0.12,0.69706-0.000004,0.26471-0.04001,0.49118-0.12,0.67941-0.08,0.18824-0.18858,0.34412-0.32571,0.46765-0.13715,0.12353-0.29715,0.21176-0.48,0.26471-0.17715,0.05882-0.36572,0.08823-0.56571,0.08823-0.21143,0-0.40857-0.02941-0.59143-0.08823-0.18286-0.05294-0.34286-0.14118-0.48-0.26471-0.137-0.123-0.246-0.279-0.326-0.468-0.074-0.188-0.111-0.414-0.111-0.679" stroke-dashoffset="0" stroke="url(#linearGradient3471)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.99999994" fill="none"/> + <g transform="matrix(.66667 0 0 .66667 0 .0018413)"> + <g> + <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#i)"/> + <path opacity=".3" fill="url(#f)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/> + <path opacity=".3" fill="url(#g)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/> + </g> + <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#o)" stroke-width=".99992" fill="url(#p)"/> + <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#j)" stroke-linecap="round" fill="none"/> + <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#k)"/> + <g stroke-linejoin="round"> + <path style="color:#000000" d="m34.549 33.5h-4.4021v-9.6523c-0.000012-1.1924-0.18283-2.0842-0.54845-2.6754-0.35602-0.6011-0.90929-0.90166-1.6598-0.90167-0.56771 0.000013-1.044 0.11826-1.4289 0.35476-0.38489 0.23652-0.69279 0.58634-0.92371 1.0495-0.23094 0.46316-0.39451 1.0347-0.49072 1.7147-0.09623 0.67996-0.14434 1.4584-0.14433 2.3355v7.7751h-4.4021v-23h4.4021l0.02888 8.588c0.47147-0.85731 1.0728-1.4732 1.8041-1.8477 0.73126-0.3843 1.5588-0.57646 2.4825-0.57648 0.79861 0.000017 1.5203 0.11827 2.1649 0.35476 0.65428 0.22666 1.2124 0.58635 1.6742 1.079 0.46184 0.49273 0.81785 1.1234 1.068 1.892 0.25016 0.7588 0.37524 1.6703 0.37526 2.7346v10.776z" stroke="url(#m)" fill="url(#d)"/> + <path style="color:#000000" d="m11.5 30.987c-0.000001-0.46315 0.06254-0.8524 0.18763-1.1677 0.1347-0.32519 0.31752-0.58633 0.54845-0.78342 0.23092-0.19708 0.50034-0.33997 0.80825-0.42866 0.3079-0.08868 0.63986-0.13303 0.99588-0.13303 0.33676 0.000004 0.65429 0.04435 0.95258 0.13303 0.3079 0.08869 0.57731 0.23158 0.80825 0.42866 0.23092 0.19709 0.41374 0.45823 0.54845 0.78342 0.1347 0.31534 0.20206 0.70459 0.20206 1.1677-0.000007 0.44345-0.06736 0.82284-0.20206 1.1382-0.13471 0.31534-0.31753 0.57648-0.54845 0.78342-0.23093 0.20694-0.50035 0.35476-0.80825 0.44344-0.299 0.1-0.616 0.149-0.953 0.149-0.35602 0-0.68798-0.04927-0.99588-0.14782-0.30791-0.08869-0.57732-0.2365-0.80825-0.44344s-0.41375-0.46808-0.54845-0.78342c-0.12509-0.31534-0.18763-0.69473-0.18763-1.1382" stroke="url(#n)" fill="url(#e)"/> + <path opacity=".5" style="color:#000000" d="m18.531 11.75v20.719h2.4062v-6.6875c-0.000007-0.91545 0.051-1.7426 0.15625-2.4688 0.11019-0.76037 0.32838-1.4191 0.625-2 0.30993-0.60695 0.75513-1.1031 1.3125-1.4375 0.54784-0.32869 1.2249-0.53123 1.9688-0.53125 1.0265 0.000018 1.9995 0.53062 2.5312 1.375h0.03125c0.0051 0.008-0.005 0.02321 0 0.03125 0.52572 0.84456 0.71874 1.9068 0.71875 3.1875v8.5312h2.4062v-9.6562c-0.000015-0.95546-0.12792-1.7045-0.34375-2.3438a1.0305 1.0305 0 0 1 0 -0.03125c-0.218-0.661-0.505-1.118-0.842-1.469-0.357-0.372-0.809-0.674-1.312-0.844-0.52338-0.18746-1.1259-0.28124-1.8438-0.28125-0.80443 0.000015-1.4868 0.14206-2.0625 0.4375-0.52554 0.26278-0.96905 0.71674-1.375 1.4375a1.0305 1.0305 0 0 1 -0.907 0.53h-0.25a1.0305 1.0305 0 0 1 -1.0312 -1.0938c0.03222-0.47267 0.08842-0.92314 0.125-1.3438 0.02673-0.34755 0.04266-0.73126 0.0625-1.1875 0.01907-0.44831 0.03124-0.89069 0.03125-1.2812v-3.5938h-2.4062z" transform="matrix(1 0 0 1.0136 2.9688 -.44075)" stroke="url(#h)" stroke-width=".99328" fill="none"/> + <path opacity=".5" style="color:#000000" d="m12.5 31c-0.000001-0.27647 0.03714-0.50882 0.11143-0.69706 0.08-0.19412 0.18857-0.35 0.32571-0.46765 0.13714-0.11764 0.29714-0.20294 0.48-0.25588 0.18286-0.05293 0.38-0.07941 0.59143-0.07941 0.2 0.000003 0.38857 0.02647 0.56571 0.07941 0.18285 0.05294 0.34285 0.13824 0.48 0.25588 0.13714 0.11765 0.24571 0.27353 0.32571 0.46765 0.08 0.18824 0.12 0.42059 0.12 0.69706-0.000004 0.26471-0.04001 0.49118-0.12 0.67941-0.08 0.18824-0.18858 0.34412-0.32571 0.46765-0.13715 0.12353-0.29715 0.21176-0.48 0.26471-0.17715 0.05882-0.36572 0.08823-0.56571 0.08823-0.21143 0-0.40857-0.02941-0.59143-0.08823-0.18286-0.05294-0.34286-0.14118-0.48-0.26471-0.137-0.123-0.246-0.279-0.326-0.468-0.074-0.188-0.111-0.414-0.111-0.679" stroke="url(#l)" fill="none"/> + </g> </g> </svg> diff --git a/core/img/filetypes/text-x-javascript.png b/core/img/filetypes/text-x-javascript.png Binary files differdeleted file mode 100644 index 24d09ce9781..00000000000 --- a/core/img/filetypes/text-x-javascript.png +++ /dev/null diff --git a/core/img/filetypes/text-x-javascript.svg b/core/img/filetypes/text-x-javascript.svg deleted file mode 100644 index 0cc52ce6ba7..00000000000 --- a/core/img/filetypes/text-x-javascript.svg +++ /dev/null @@ -1,76 +0,0 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <defs> - <linearGradient id="linearGradient4596" y2="34.607" gradientUnits="userSpaceOnUse" x2="29.465" gradientTransform="translate(4.1160985,-1.6069009)" y1="17.607" x1="29.465"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.17647"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.82353"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient4467-5" y2="41.607" gradientUnits="userSpaceOnUse" x2="13.884" gradientTransform="translate(4.1160985,-1.6069009)" y1="12.607" x1="13.884"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.82759"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3797" y2="0.4976" gradientUnits="userSpaceOnUse" x2="23.749" y1="44.759" x1="23.749"> - <stop stop-color="#a3a3a3" offset="0"/> - <stop stop-color="#bababa" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24"> - <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132"> - <stop stop-color="#f4f4f4" offset="0"/> - <stop stop-color="#dbdbdb" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786"> - <stop stop-color="#a0a0a0" offset="0"/> - <stop stop-color="#bebebe" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/> - <linearGradient id="linearGradient4704" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> - </linearGradient> - <radialGradient id="radialGradient3815" fx="8.5513" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.0816" gradientTransform="matrix(0,7.0760926,-7.4527115,0,100.32061,-66.261922)" r="12.672"> - <stop stop-color="#ffcd7d" offset="0"/> - <stop stop-color="#fc8f36" offset="0.26238"/> - <stop stop-color="#e23a0e" offset="0.70495"/> - <stop stop-color="#ac441f" offset="1"/> - </radialGradient> - <linearGradient id="linearGradient3817" y2="4.9451" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="translate(2.123909,-1.9451008)" y1="49.945" x1="25"> - <stop stop-color="#ba3d12" offset="0"/> - <stop stop-color="#db6737" offset="1"/> - </linearGradient> - </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <g transform="scale(0.66666667,0.66666667)"> - <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4704)"/> - <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/> - <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/> - <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/> - <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <path d="m11,21,0,1,2.3438,0,0-1h-2.344zm0,4,0,1,2.75,0,0-1-2.75,0zm0,2,0,1,2.9375,0,0-1h-5.282zm0,2,0,1,2.5312,0,0-1h-4.875zm0,2.1562,0,0.96875,2.2188,0,0-0.96875-2.2188,0zm0.406-10.156v1h2.25v-1h-2.25zm-2.75,2,0,1,1,0,0-1-1,0zm3.1562,2,0,1,1.8438,0,0-1-1.8438,0zm0.125,2,0,1,2.7188,0,0-1-2.7188,0zm-0.34375,2,0,1,2.0625,0,0-1-2.0625,0zm-0.375,2.1562,0,0.96875,2.125,0,0-0.96875-2.125,0zm-2.562,2.844v1h4.2812v-1h-4.281zm0,2,0,1,3.6875,0,0-1h-3.688zm3.9688,0,0,1,1.7812,0,0-1-1.7812,0zm-0.625,2,0,1,3.3438,0,0-1-3.3438,0zm-3.344,0h3.0367v1h-3.037v-1zm3.4062-22,0,1,5.5938,0,0-1-5.5938,0zm0.03125,2,0,1,5.0938,0,0-1-5.0938,0zm1.1875,16,0,1,4.5938,0,0-1-4.5938,0zm4.9375,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,4.3125,0,0-1-4.3125,0zm4.6562,0,0,1,2.9688,0,0-1-2.9688,0zm3.2812,0,0,1,1.1562,0,0-1-1.1562,0zm1.5,0,0,1,0.6875,0,0-1-0.6875,0zm1,0,0,1,1.8438,0,0-1-1.8438,0zm-16.031,2,0,1,0.8125,0,0-1-0.8125,0zm1.0312,0,0,1,1.625,0,0-1-1.625,0zm1.875,0,0,1,1.625,0,0-1-1.625,0zm2.125,0,0,1,2.5938,0,0-1-2.5938,0zm2.9062,0,0,1,3.375,0,0-1-3.375,0zm3.8438,0,0,1,2.2812,0,0-1-2.2812,0zm2.5625,0,0,1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0,2,0,1,3.0938,0,0-1h-3.094zm0-11,0,1,2.375,0,0-1-2.375,0zm2.6875,0,0,1,2.25,0,0-1-2.25,0zm2.5625,0,0,1,1.9688,0,0-1-1.9688,0zm2.2812,0,0,1,0.875,0,0-1-0.875,0zm1.1875,0,0,1,1.9375,0,0-1-1.9375,0zm2.2812,0,0,1,5,0,0-1-5,0zm-11,2l0.001,1h3.7812v-1h-3.7812zm4.1562,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,0.84375,0,0-1-0.84375,0zm1.2188,0,0,1,1.625,0,0-1-1.625,0zm2,0,0,1,1.625,0,0-1-1.625,0zm1.9688,0,0,1,2.6562,0,0-1-2.6562,0zm3.0312,0,0,1,3.4688,0,0-1-3.4688,0zm-14.53,2v1h4.1875v-1h-4.188zm4.5,0,0,1,4.5,0,0-1-4.5,0zm-4.5,2,0,1,2.3125,0,0-1h-2.312zm2.625,0,0,1,2.1562,0,0-1-2.1562,0zm2.4688,0,0,1,1.9062,0,0-1-1.9062,0zm3.8125,5,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,2.75,0,0-1-2.75,0zm3.0938,0,0,1,0.5625,0,0-1-0.5625,0zm-7.438,7v1h2.3438v-1h-2.344zm2.6562,0,0,1,2.1875,0,0-1-2.1875,0zm2.5,0,0,1h1.844v-1h-1.844zm-5.156,2v1h1.875v-1h-1.875zm2.1875,0,0,1,4.8125,0,0-1-4.8125,0zm5.125,0,0,1,3.6875,0,0-1-3.6875,0zm-7.313,2v1h2.4375v-1h-2.438zm2.7812,0,0,1,4.2812,0,0-1-4.2812,0zm4.5938,0,0,1,2.9375,0,0-1-2.9375,0zm-7.375,2.125v0.96875h1.875v-0.96875h-1.875zm2.1875,0,0,0.96875,1.9062,0,0-0.96875-1.9062,0zm2.2188,0,0,0.96875,2.7188,0,0-0.96875-2.7188,0zm3.0312,0,0,0.96875,0.5625,0,0-0.96875-0.5625,0zm0.875,0,0,0.96875,3.5312,0,0-0.96875-3.5312,0zm-8.375,6.875,0,1,2.4375,0,0-1-2.4375,0zm2.75,0,0,1,2.25,0,0-1-2.25,0zm2.5938,0,0,1,1.9375,0,0-1-1.9375,0zm2.25,0,0,1,3.0938,0,0-1-3.0938,0zm3.4375,0,0,1,5.0312,0,0-1-5.0312,0z" fill="url(#linearGradient3797)"/> - <path stroke-linejoin="round" style="color:#000000;" d="m37.105,28.194c-0.000013,0.91667-0.16668,1.7188-0.5,2.4062-0.33335,0.6875-0.8073,1.2604-1.4219,1.7188-0.61459,0.45833-1.3594,0.80208-2.2344,1.0312-0.87501,0.22917-1.8542,0.34375-2.9375,0.34375-0.57292,0-1.1042-0.02083-1.5938-0.0625-0.48959-0.03125-0.95313-0.08854-1.3906-0.17188-0.4375-0.08333-0.85938-0.1875-1.2656-0.3125-0.40625-0.125-0.81771-0.28125-1.2344-0.46875v-3.9375c0.4375,0.21876,0.89583,0.41667,1.375,0.59375,0.48958,0.17709,0.97395,0.33334,1.4531,0.46875,0.47916,0.125,0.9427,0.22396,1.3906,0.29688,0.45833,0.07292,0.8802,0.10938,1.2656,0.10938,0.42708,0.000004,0.79166-0.03646,1.0938-0.10938,0.30208-0.08333,0.54687-0.1927,0.73438-0.32812,0.19791-0.14583,0.33853-0.3125,0.42188-0.5,0.09374-0.19791,0.14062-0.40624,0.14062-0.625-0.000008-0.21874-0.03647-0.41145-0.10938-0.57812-0.06251-0.17708-0.21355-0.35937-0.45312-0.54688-0.23959-0.19791-0.59376-0.41666-1.0625-0.65625-0.45834-0.24999-1.0781-0.55208-1.8594-0.90625-0.76042-0.34374-1.4219-0.68228-1.9844-1.0156-0.55209-0.34374-1.0104-0.72395-1.375-1.1406-0.35417-0.41666-0.61979-0.89061-0.79688-1.4219-0.17708-0.54166-0.26563-1.1823-0.26562-1.9219-0.000001-0.81249,0.15625-1.5208,0.46875-2.125,0.3125-0.61457,0.75521-1.125,1.3281-1.5312,0.57291-0.40623,1.2604-0.70832,2.0625-0.90625,0.8125-0.20832,1.7135-0.31248,2.7031-0.3125,1.0417,0.000018,2.0312,0.11981,2.9688,0.35938,0.93749,0.2396,1.901,0.59898,2.8906,1.0781l-1.4375,3.375c-0.794-0.376-1.549-0.683-2.268-0.923-0.71876-0.23957-1.4375-0.35936-2.1562-0.35938-0.64584,0.000015-1.1146,0.1146-1.4062,0.34375-0.28126,0.22918-0.42188,0.54168-0.42188,0.9375-0.000005,0.20835,0.03645,0.39585,0.10938,0.5625,0.07291,0.15626,0.21874,0.32293,0.4375,0.5,0.21874,0.16668,0.52603,0.35418,0.92188,0.5625,0.39582,0.19793,0.91145,0.44272,1.5469,0.73438,0.73957,0.32293,1.4062,0.64584,2,0.96875,0.59374,0.31251,1.1042,0.67188,1.5312,1.0781,0.42707,0.40626,0.7552,0.88022,0.98438,1.4219,0.22915,0.54167,0.34374,1.1979,0.34375,1.9688m-24.526,11.906c-0.67708-0.000006-1.2708-0.03646-1.7812-0.10938-0.511-0.063-0.9428-0.141-1.297-0.235v-4.0312c0.38542,0.08333,0.79167,0.15625,1.2188,0.21875,0.41667,0.0625,0.875,0.09375,1.375,0.09375,0.47917-0.000002,0.92188-0.05209,1.3281-0.15625,0.41666-0.10417,0.77604-0.28646,1.0781-0.54688,0.3125-0.25,0.55208-0.58854,0.71875-1.0156,0.17708-0.42708,0.26562-0.96354,0.26562-1.6094v-22.172h5.0906v22.016c0,1.3125-0.19272,2.4427-0.57812,3.3906-0.37501,0.94791-0.90626,1.7292-1.5938,2.3438-0.67709,0.625-1.4896,1.0833-2.4375,1.375-0.948,0.29-1.995,0.436-3.141,0.436z" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3817)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="url(#radialGradient3815)"/> - <path opacity="0.5" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m16.531,11.562,0,21.156c-0.000003,0.74521-0.14604,1.4057-0.375,1.9688h0.03125c-0.0053,0.01356-0.02582,0.01774-0.03125,0.03125-0.21291,0.52977-0.51641,1.033-0.96875,1.4062-0.01075,0.0093-0.02039,0.02213-0.03125,0.03125-0.42364,0.35547-0.94402,0.58756-1.4688,0.71875-0.5068,0.12994-1.0399,0.1875-1.5938,0.1875-0.54293,0-1.0548-0.02228-1.5312-0.09375-0.01053-0.0015-0.02074,0.0016-0.03125,0v1.9375c0.14199,0.02453,0.25,0.04337,0.40625,0.0625a1.0305,1.0305,0,0,1,0.03125,0c0.4327,0.06181,0.93779,0.09374,1.5938,0.09375h0.25c1.0584-0.000006,2.0104-0.14984,2.8438-0.40625,0.8161-0.25111,1.5028-0.60837,2.0625-1.125a1.0305,1.0305,0,0,1,0,-0.03125c0.56066-0.5012,0.98871-1.119,1.3125-1.9375,0.32074-0.78887,0.5-1.7802,0.5-3v-21h-3z" stroke-dashoffset="0" stroke="url(#linearGradient4467-5)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/> - <path opacity="0.5" stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m31.062,16.625c-0.91729,0.000017-1.7568,0.09872-2.4688,0.28125-0.6983,0.17232-1.2665,0.42933-1.7188,0.75-0.43783,0.31048-0.75495,0.67432-1,1.1562-0.22591,0.43677-0.34375,0.97587-0.34375,1.6562-0.000001,0.67187,0.0572,1.1952,0.1875,1.5938,0.13076,0.39228,0.3626,0.74863,0.625,1.0625,0.27891,0.31876,0.63321,0.6313,1.125,0.9375,0.54028,0.32018,1.1571,0.64423,1.875,0.96875,0.78022,0.35371,1.4056,0.66564,1.9062,0.9375,0.0091,0.0047,0.02219-0.0047,0.03125,0,0.48031,0.2467,0.86296,0.48708,1.1875,0.75,0.01,0.0081,0.02142,0.02313,0.03125,0.03125,0.29407,0.23569,0.56733,0.5282,0.71875,0.90625,0.0064,0.0161-0.006,0.04609,0,0.0625,0.0023,0.0064,0.02897-0.0065,0.03125,0,0.11318,0.2766,0.18749,0.5805,0.1875,0.9375-0.000015,0.40344-0.11735,0.74498-0.25,1.0312-0.0031,0.0069,0.0032,0.02432,0,0.03125h-0.03125c-0.14902,0.31791-0.36691,0.67002-0.6875,0.90625a1.0305,1.0305,0,0,1,-0.03125,0c-0.37162,0.26839-0.71579,0.37311-1.0625,0.46875a1.0305,1.0305,0,0,1,-0.03125,0c-0.376,0.092-0.832,0.157-1.343,0.157-0.47826,0.000005-0.9298-0.0492-1.4062-0.125-0.45579-0.07419-0.96671-0.17338-1.5-0.3125a1.0305,1.0305,0,0,1,-0.03125,0c-0.50955-0.144-0.9949-0.3173-1.5-0.5v1.6562c0.16564,0.0631,0.33735,0.13746,0.5,0.1875,0.3613,0.11117,0.74977,0.23508,1.1562,0.3125,0.37252,0.07096,0.77865,0.09491,1.25,0.125a1.0305,1.0305,0,0,1,0.03125,0c0.45573,0.03879,0.95205,0.0625,1.5,0.0625,1.0107,0,1.9133-0.10974,2.6875-0.3125,0.77223-0.20225,1.389-0.48131,1.875-0.84375,0.4815-0.35909,0.82413-0.78767,1.0938-1.3438,0.25489-0.52574,0.40624-1.177,0.40625-1.9688-0.000011-0.66872-0.08918-1.1823-0.25-1.5625-0.17948-0.42419-0.42147-0.74998-0.75-1.0625-0.35949-0.34194-0.77277-0.66986-1.2812-0.9375a1.0305,1.0305,0,0,1,-0.03125,0c-0.56267-0.306-1.1894-0.62451-1.9062-0.9375a1.0305,1.0305,0,0,1,-0.03125,0c-0.62352-0.28619-1.1526-0.52942-1.5938-0.75-0.43674-0.22984-0.78885-0.44773-1.0625-0.65625a1.0305,1.0305,0,0,1,-0.03125,0c-0.29046-0.23511-0.54194-0.49605-0.71875-0.875a1.0305,1.0305,0,0,1,0,-0.03125c-0.11448-0.26163-0.21876-0.58868-0.21875-0.96875-0.000008-0.667,0.32053-1.3491,0.8125-1.75a1.0305,1.0305,0,0,1,0.03125,0c0.58219-0.45741,1.2635-0.56248,2.0312-0.5625,0.81828,0.000017,1.6395,0.12985,2.4688,0.40625,0.46119,0.15374,0.94101,0.36068,1.4062,0.5625l0.625-1.4375c-0.604-0.25-1.22-0.541-1.783-0.684-0.838-0.215-1.746-0.313-2.719-0.313z" stroke-dashoffset="0" stroke="url(#linearGradient4596)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/> - </g> -</svg> diff --git a/core/img/filetypes/text-x-python.png b/core/img/filetypes/text-x-python.png Binary files differindex 57148f4b90d..fbaf9a342f6 100644 --- a/core/img/filetypes/text-x-python.png +++ b/core/img/filetypes/text-x-python.png diff --git a/core/img/filetypes/text-x-python.svg b/core/img/filetypes/text-x-python.svg index 00755e6d0c2..b0ed6fc536f 100644 --- a/core/img/filetypes/text-x-python.svg +++ b/core/img/filetypes/text-x-python.svg @@ -1,87 +1,80 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient4326" y2="41.607" gradientUnits="userSpaceOnUse" x2="49.884" gradientTransform="translate(-15.883902,-1.6069009)" y1="20.607" x1="49.884"> + <linearGradient id="i" x1="49.884" gradientUnits="userSpaceOnUse" y1="20.607" gradientTransform="translate(-15.884 -1.6069)" x2="49.884" y2="41.607"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.66667"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".66667"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient4352" y2="14.148" gradientUnits="userSpaceOnUse" x2="33.715" gradientTransform="translate(-15.883902,-1.6069009)" y1="26.955" x1="33.715"> + <linearGradient id="g" x1="33.715" gradientUnits="userSpaceOnUse" y1="26.955" gradientTransform="translate(-15.884 -1.6069)" x2="33.715" y2="14.148"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.38322"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".38322"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient4338" y2="35.642" gradientUnits="userSpaceOnUse" x2="29.465" gradientTransform="translate(-15.883902,-1.6069009)" y1="13.12" x1="29.465"> + <linearGradient id="h" x1="29.465" gradientUnits="userSpaceOnUse" y1="13.12" gradientTransform="translate(-15.884 -1.6069)" x2="29.465" y2="35.642"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.2789"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".2789"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3352" xlink:href="#linearGradient3846-5" gradientUnits="userSpaceOnUse" cy="23.403" cx="9.966" gradientTransform="matrix(0,3.4561718,-4.1186673,0,121.20805,-33.840698)" r="13.931"/> - <linearGradient id="linearGradient3846-5"> + <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="23.403" cx="9.966" gradientTransform="matrix(0 3.4562 -4.1187 0 121.21 -33.841)" r="13.931"> <stop stop-color="#fff3cb" offset="0"/> - <stop stop-color="#fdde76" offset="0.26238"/> - <stop stop-color="#f9c440" offset="0.66094"/> + <stop stop-color="#fdde76" offset=".26238"/> + <stop stop-color="#f9c440" offset=".66094"/> <stop stop-color="#e48b20" offset="1"/> - </linearGradient> - <linearGradient id="linearGradient3354" y2="8.4049" xlink:href="#linearGradient3856-6" gradientUnits="userSpaceOnUse" x2="21.483" gradientTransform="matrix(1.6508808,0,0,1.6568311,-9.7968269,-13.801098)" y1="35.376" x1="21.483"/> - <linearGradient id="linearGradient3856-6"> + </radialGradient> + <linearGradient id="c" x1="21.483" gradientUnits="userSpaceOnUse" y1="35.376" gradientTransform="matrix(1.6509 0 0 1.6568 -9.7968 -13.801)" x2="21.483" y2="8.4049"> <stop stop-color="#b67926" offset="0"/> <stop stop-color="#eab41a" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3797" y2="0.4976" gradientUnits="userSpaceOnUse" x2="23.749" y1="44.759" x1="23.749"> + <linearGradient id="k" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749"> <stop stop-color="#a3a3a3" offset="0"/> <stop stop-color="#bababa" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3988" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.89189189,0,0,1.1351351,2.5945999,-4.7432314)" y1="5.5641" x1="24"> + <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3322" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-9.9999999e-8,-1.9149218)" y1="0.98521" x1="25.132"> + <linearGradient id="m" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3324" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,59.410232,-2.9805531)" y1="50.786" x1="-51.786"> + <linearGradient id="l" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3327" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.02303995,0,0,0.01470022,26.360882,37.040176)" r="117.14"/> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="e" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/> + <linearGradient id="b"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3330" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.02303994,0,0,0.01470022,21.62311,37.040176)" r="117.14"/> - <linearGradient id="linearGradient4474" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.06732488,0,0,0.01470022,-0.3411391,37.040146)" y1="366.65" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="d" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/> + <linearGradient id="f" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <g transform="matrix(0.66666667,0,0,0.66666667,0,0.00184133)"> - <rect opacity="0.3" fill-rule="nonzero" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#linearGradient4474)"/> - <path opacity="0.3" d="m7.7378,42.43v3.5699c-1.1865,0.0067-2.8684-0.79982-2.8684-1.7852,0-0.98533,1.324-1.7847,2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3330)"/> - <path opacity="0.3" d="m40.246,42.43v3.5699c1.1865,0.0067,2.8684-0.79982,2.8684-1.7852,0-0.98533-1.324-1.7847-2.8684-1.7847z" fill-rule="nonzero" fill="url(#radialGradient3327)"/> - <path stroke-linejoin="round" d="M6.5,0.4972c8.02,0,35,0.0028,35,0.0028l0.000042,44.003h-35v-44.006z" stroke-dashoffset="0" stroke="url(#linearGradient3324)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3322)"/> - <path stroke-linejoin="round" d="m40.5,43.5-33,0,0-42,33,0z" stroke-dashoffset="0" stroke="url(#linearGradient3988)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <path d="m11,21,0,1,2.3438,0,0-1h-2.344zm0,4,0,1,2.75,0,0-1-2.75,0zm0,2,0,1,2.9375,0,0-1h-5.282zm0,2,0,1,2.5312,0,0-1h-4.875zm0,2.1562,0,0.96875,2.2188,0,0-0.96875-2.2188,0zm0.406-10.156v1h2.25v-1h-2.25zm-2.75,2,0,1,1,0,0-1-1,0zm3.1562,2,0,1,1.8438,0,0-1-1.8438,0zm0.125,2,0,1,2.7188,0,0-1-2.7188,0zm-0.34375,2,0,1,2.0625,0,0-1-2.0625,0zm-0.375,2.1562,0,0.96875,2.125,0,0-0.96875-2.125,0zm-2.562,2.844v1h4.2812v-1h-4.281zm0,2,0,1,3.6875,0,0-1h-3.688zm3.9688,0,0,1,1.7812,0,0-1-1.7812,0zm-0.625,2,0,1,3.3438,0,0-1-3.3438,0zm-3.344,0h3.0367v1h-3.037v-1zm3.4062-22,0,1,5.5938,0,0-1-5.5938,0zm0.03125,2,0,1,5.0938,0,0-1-5.0938,0zm1.1875,16,0,1,4.5938,0,0-1-4.5938,0zm4.9375,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,4.3125,0,0-1-4.3125,0zm4.6562,0,0,1,2.9688,0,0-1-2.9688,0zm3.2812,0,0,1,1.1562,0,0-1-1.1562,0zm1.5,0,0,1,0.6875,0,0-1-0.6875,0zm1,0,0,1,1.8438,0,0-1-1.8438,0zm-16.031,2,0,1,0.8125,0,0-1-0.8125,0zm1.0312,0,0,1,1.625,0,0-1-1.625,0zm1.875,0,0,1,1.625,0,0-1-1.625,0zm2.125,0,0,1,2.5938,0,0-1-2.5938,0zm2.9062,0,0,1,3.375,0,0-1-3.375,0zm3.8438,0,0,1,2.2812,0,0-1-2.2812,0zm2.5625,0,0,1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0,2,0,1,3.0938,0,0-1h-3.094zm0-11,0,1,2.375,0,0-1-2.375,0zm2.6875,0,0,1,2.25,0,0-1-2.25,0zm2.5625,0,0,1,1.9688,0,0-1-1.9688,0zm2.2812,0,0,1,0.875,0,0-1-0.875,0zm1.1875,0,0,1,1.9375,0,0-1-1.9375,0zm2.2812,0,0,1,5,0,0-1-5,0zm-11,2l0.001,1h3.7812v-1h-3.7812zm4.1562,0,0,1,1.8125,0,0-1-1.8125,0zm2.1562,0,0,1,0.84375,0,0-1-0.84375,0zm1.2188,0,0,1,1.625,0,0-1-1.625,0zm2,0,0,1,1.625,0,0-1-1.625,0zm1.9688,0,0,1,2.6562,0,0-1-2.6562,0zm3.0312,0,0,1,3.4688,0,0-1-3.4688,0zm-14.53,2v1h4.1875v-1h-4.188zm4.5,0,0,1,4.5,0,0-1-4.5,0zm-4.5,2,0,1,2.3125,0,0-1h-2.312zm2.625,0,0,1,2.1562,0,0-1-2.1562,0zm2.4688,0,0,1,1.9062,0,0-1-1.9062,0zm3.8125,5,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,1.9062,0,0-1-1.9062,0zm2.2188,0,0,1,2.75,0,0-1-2.75,0zm3.0938,0,0,1,0.5625,0,0-1-0.5625,0zm-7.438,7v1h2.3438v-1h-2.344zm2.6562,0,0,1,2.1875,0,0-1-2.1875,0zm2.5,0,0,1h1.844v-1h-1.844zm-5.156,2v1h1.875v-1h-1.875zm2.1875,0,0,1,4.8125,0,0-1-4.8125,0zm5.125,0,0,1,3.6875,0,0-1-3.6875,0zm-7.313,2v1h2.4375v-1h-2.438zm2.7812,0,0,1,4.2812,0,0-1-4.2812,0zm4.5938,0,0,1,2.9375,0,0-1-2.9375,0zm-7.375,2.125v0.96875h1.875v-0.96875h-1.875zm2.1875,0,0,0.96875,1.9062,0,0-0.96875-1.9062,0zm2.2188,0,0,0.96875,2.7188,0,0-0.96875-2.7188,0zm3.0312,0,0,0.96875,0.5625,0,0-0.96875-0.5625,0zm0.875,0,0,0.96875,3.5312,0,0-0.96875-3.5312,0zm-8.375,6.875,0,1,2.4375,0,0-1-2.4375,0zm2.75,0,0,1,2.25,0,0-1-2.25,0zm2.5938,0,0,1,1.9375,0,0-1-1.9375,0zm2.25,0,0,1,3.0938,0,0-1-3.0938,0zm3.4375,0,0,1,5.0312,0,0-1-5.0312,0z" fill="url(#linearGradient3797)"/> - <g stroke-linejoin="round" style="color:#000000;letter-spacing:0px;word-spacing:0px;enable-background:accumulate;" font-weight="bold" font-family="Droid Sans" fill-rule="nonzero" line-height="125%" stroke-dashoffset="0" font-size="32px" font-style="normal" stroke="url(#linearGradient3354)" stroke-linecap="butt" stroke-miterlimit="4" font-stretch="normal" font-variant="normal" stroke-width="0.9922713" fill="url(#radialGradient3352)"> - <path d="m25.746,18.293,4.5664,0,2.4609,8.5996,0.60156,2.2695c0.03645-0.2552,0.07747-0.51497,0.12305-0.7793,0.04556-0.26432,0.09569-0.52408,0.15039-0.7793,0.06379-0.26432,0.1276-0.5013,0.19141-0.71094l2.4062-8.5996h4.5938l-6.043,17.24c-0.56511,1.6133-1.3353,2.8118-2.3105,3.5957-0.97527,0.78385-2.1966,1.1758-3.6641,1.1758-0.47396-0.000006-0.88412-0.02735-1.2305-0.08203-0.34636-0.04558-0.64258-0.09571-0.88867-0.15039v-3.3086c0.1914,0.04557,0.43294,0.08658,0.72461,0.12305,0.29166,0.03646,0.597,0.05468,0.91602,0.05469,0.4375-0.000003,0.81119-0.05925,1.1211-0.17773,0.30989-0.11849,0.57421-0.28711,0.79297-0.50586,0.22786-0.20964,0.41927-0.46484,0.57422-0.76562,0.16406-0.30078,0.30533-0.63802,0.42383-1.0117l0.25977-0.76562-5.7695-15.422m-11.406,3.1914,0.95312,0c1.3646,0.000012,2.3906-0.27082,3.0781-0.8125,0.6979-0.54165,1.0469-1.4219,1.0469-2.6406-0.000013-1.1354-0.31251-1.9739-0.9375-2.5156-0.6146-0.54165-1.5833-0.81248-2.9062-0.8125h-1.2344v6.7812m9.9844-3.625c-0.000018,1-0.15106,1.9583-0.45312,2.875-0.3021,0.91668-0.8021,1.724-1.5,2.4219-0.68752,0.69793-1.599,1.2552-2.7344,1.6719-1.125,0.41668-2.5208,0.62501-4.1875,0.625h-1.1094v8.125h-4.8438v-22.844h6.3438c1.4687,0.000023,2.7344,0.16669,3.7969,0.5,1.0729,0.32294,1.9531,0.79169,2.6406,1.4062,0.6979,0.60419,1.2135,1.349,1.5469,2.2344,0.33332,0.87502,0.49998,1.8698,0.5,2.9844" stroke="url(#linearGradient3354)" fill="url(#radialGradient3352)"/> + <g transform="matrix(.66667 0 0 .66667 0 .0018413)"> + <g> + <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#f)"/> + <path opacity=".3" fill="url(#d)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/> + <path opacity=".3" fill="url(#e)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/> + </g> + <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#l)" stroke-width=".99992" fill="url(#m)"/> + <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#j)" stroke-linecap="round" fill="none"/> + <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#k)"/> + <g stroke-linejoin="round" style="color:#000000" font-family="Droid Sans" fill="url(#a)" stroke="url(#c)" font-size="32px" font-weight="bold" line-height="125%" stroke-width=".99227"> + <path stroke="url(#c)" d="m25.746 18.293h4.5664l2.4609 8.5996 0.60156 2.2695c0.03645-0.2552 0.07747-0.51497 0.12305-0.7793 0.04556-0.26432 0.09569-0.52408 0.15039-0.7793 0.06379-0.26432 0.1276-0.5013 0.19141-0.71094l2.4062-8.5996h4.5938l-6.043 17.24c-0.56511 1.6133-1.3353 2.8118-2.3105 3.5957-0.97527 0.78385-2.1966 1.1758-3.6641 1.1758-0.47396-0.000006-0.88412-0.02735-1.2305-0.08203-0.34636-0.04558-0.64258-0.09571-0.88867-0.15039v-3.3086c0.1914 0.04557 0.43294 0.08658 0.72461 0.12305 0.29166 0.03646 0.597 0.05468 0.91602 0.05469 0.4375-0.000003 0.81119-0.05925 1.1211-0.17773 0.30989-0.11849 0.57421-0.28711 0.79297-0.50586 0.22786-0.20964 0.41927-0.46484 0.57422-0.76562 0.16406-0.30078 0.30533-0.63802 0.42383-1.0117l0.25977-0.76562-5.7695-15.422m-11.406 3.1914h0.95312c1.3646 0.000012 2.3906-0.27082 3.0781-0.8125 0.6979-0.54165 1.0469-1.4219 1.0469-2.6406-0.000013-1.1354-0.31251-1.9739-0.9375-2.5156-0.6146-0.54165-1.5833-0.81248-2.9062-0.8125h-1.2344v6.7812m9.9844-3.625c-0.000018 1-0.15106 1.9583-0.45312 2.875-0.3021 0.91668-0.8021 1.724-1.5 2.4219-0.68752 0.69793-1.599 1.2552-2.7344 1.6719-1.125 0.41668-2.5208 0.62501-4.1875 0.625h-1.1094v8.125h-4.8438v-22.844h6.3438c1.4687 0.000023 2.7344 0.16669 3.7969 0.5 1.0729 0.32294 1.9531 0.79169 2.6406 1.4062 0.6979 0.60419 1.2135 1.349 1.5469 2.2344 0.33332 0.87502 0.49998 1.8698 0.5 2.9844" fill="url(#a)"/> + </g> + <g stroke-linejoin="round" fill="none"> + <path opacity=".8" style="color:#000000" d="m10.469 11.719v20.875h2.9062v-7.1562a0.97158 0.97158 0 0 1 0.96875 -0.96875h1.0938c1.5857 0.000008 2.8653-0.20009 3.8438-0.5625 1.0403-0.38177 1.8488-0.8716 2.4062-1.4375 0.60221-0.60221 0.9956-1.2593 1.25-2.0312 0.26608-0.80746 0.40623-1.6502 0.40625-2.5625-0.000016-1.0177-0.1544-1.913-0.4375-2.6562-0.28511-0.75726-0.68346-1.3533-1.25-1.8438a0.97158 0.97158 0 0 1 -0.031 -0.03c-0.5457-0.48779-1.2973-0.86009-2.2812-1.1562-0.94313-0.29586-2.1047-0.46873-3.5-0.46875h-5.375z" stroke="url(#h)"/> + <path opacity=".8" style="color:#000000" d="m14.188 13.719a0.97158 0.97158 0 0 1 0.15625 0h1.2188c1.444 0.000021 2.6588 0.30588 3.5312 1.0625 0.0069 0.006 0.02437-0.0061 0.03125 0l-0.03125 0.03125c0.8717 0.76818 1.2812 1.915 1.2812 3.2188-0.000015 1.3862-0.43158 2.6369-1.4062 3.4062h-0.03125c-0.93629 0.7268-2.1746 1.0313-3.6562 1.0312h-0.9375a0.97158 0.97158 0 0 1 -0.969 -0.969v-6.8125a0.97158 0.97158 0 0 1 0.8125 -0.96875z" stroke="url(#g)"/> + <path opacity=".8" style="color:#000000" d="m27.156 19.25 5.2812 14.125c0.08288 0.21909 0.08288 0.46841 0 0.6875l-0.25 0.6875-0.03125 0.0625c-0.11452 0.35874-0.24034 0.75454-0.4375 1.125-0.0067 0.01252-0.02443 0.01874-0.03125 0.03125-0.21274 0.39778-0.48826 0.72429-0.75 0.96875-0.01011 0.01011-0.02099 0.02128-0.03125 0.03125-0.30722 0.29848-0.68482 0.53114-1.0938 0.6875-0.43825 0.16756-0.9291 0.25-1.4688 0.25-0.23646-0.000002-0.44385-0.01211-0.65625-0.03125v1.375c0.01198 0.0016 0.01908-0.0016 0.03125 0 0.01042-0.000168 0.02083-0.000168 0.03125 0 0.30338 0.0479 0.64191 0.09374 1.0625 0.09375 1.2893-0.000006 2.3062-0.33575 3.0938-0.96875 0.79412-0.63827 1.4766-1.6621 2-3.1562l5.594-15.969h-2.5l-2.2188 7.9062c0.000168 0.01042 0.000168 0.02083 0 0.03125-0.05961 0.19584-0.12825 0.37949-0.1875 0.625-0.05465 0.25498-0.08383 0.47993-0.125 0.71875-0.04289 0.24875-0.09138 0.48621-0.125 0.71875-0.0011 0.0099 0.001 0.02129 0 0.03125l-1.0312 1.5625c-0.488-0.552-0.84-1.577-1.188-2.313-0.058-0.485-0.153-0.926-0.281-1.343l-2.282-7.938z" stroke="url(#i)"/> </g> - <path stroke-linejoin="round" opacity="0.8" style="color:#000000;enable-background:accumulate;" d="m10.469,11.719,0,20.875,2.9062,0,0-7.1562a0.97158,0.97158,0,0,1,0.96875,-0.96875h1.0938c1.5857,0.000008,2.8653-0.20009,3.8438-0.5625,1.0403-0.38177,1.8488-0.8716,2.4062-1.4375,0.60221-0.60221,0.9956-1.2593,1.25-2.0312,0.26608-0.80746,0.40623-1.6502,0.40625-2.5625-0.000016-1.0177-0.1544-1.913-0.4375-2.6562-0.28511-0.75726-0.68346-1.3533-1.25-1.8438a0.97158,0.97158,0,0,1,-0.031,-0.03c-0.5457-0.48779-1.2973-0.86009-2.2812-1.1562-0.94313-0.29586-2.1047-0.46873-3.5-0.46875h-5.375z" stroke-dashoffset="0" stroke="url(#linearGradient4338)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/> - <path stroke-linejoin="round" opacity="0.8" style="color:#000000;enable-background:accumulate;" d="m14.188,13.719a0.97158,0.97158,0,0,1,0.15625,0h1.2188c1.444,0.000021,2.6588,0.30588,3.5312,1.0625,0.0069,0.006,0.02437-0.0061,0.03125,0l-0.03125,0.03125c0.8717,0.76818,1.2812,1.915,1.2812,3.2188-0.000015,1.3862-0.43158,2.6369-1.4062,3.4062h-0.03125c-0.93629,0.7268-2.1746,1.0313-3.6562,1.0312h-0.9375a0.97158,0.97158,0,0,1,-0.969,-0.969v-6.8125a0.97158,0.97158,0,0,1,0.8125,-0.96875z" stroke-dashoffset="0" stroke="url(#linearGradient4352)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/> - <path stroke-linejoin="round" opacity="0.8" style="color:#000000;enable-background:accumulate;" d="m27.156,19.25,5.2812,14.125c0.08288,0.21909,0.08288,0.46841,0,0.6875l-0.25,0.6875-0.03125,0.0625c-0.11452,0.35874-0.24034,0.75454-0.4375,1.125-0.0067,0.01252-0.02443,0.01874-0.03125,0.03125-0.21274,0.39778-0.48826,0.72429-0.75,0.96875-0.01011,0.01011-0.02099,0.02128-0.03125,0.03125-0.30722,0.29848-0.68482,0.53114-1.0938,0.6875-0.43825,0.16756-0.9291,0.25-1.4688,0.25-0.23646-0.000002-0.44385-0.01211-0.65625-0.03125v1.375c0.01198,0.0016,0.01908-0.0016,0.03125,0,0.01042-0.000168,0.02083-0.000168,0.03125,0,0.30338,0.0479,0.64191,0.09374,1.0625,0.09375,1.2893-0.000006,2.3062-0.33575,3.0938-0.96875,0.79412-0.63827,1.4766-1.6621,2-3.1562l5.594-15.969h-2.5l-2.2188,7.9062c0.000168,0.01042,0.000168,0.02083,0,0.03125-0.05961,0.19584-0.12825,0.37949-0.1875,0.625-0.05465,0.25498-0.08383,0.47993-0.125,0.71875-0.04289,0.24875-0.09138,0.48621-0.125,0.71875-0.0011,0.0099,0.001,0.02129,0,0.03125l-1.0312,1.5625c-0.488-0.552-0.84-1.577-1.188-2.313-0.058-0.485-0.153-0.926-0.281-1.343l-2.282-7.938z" stroke-dashoffset="0" stroke="url(#linearGradient4326)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="1" fill="none"/> </g> </svg> diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png Binary files differindex 6b069c82c11..73080fb3ea0 100644 --- a/core/img/filetypes/text.png +++ b/core/img/filetypes/text.png diff --git a/core/img/filetypes/text.svg b/core/img/filetypes/text.svg index 69a1bcd98c3..32685b586cb 100644 --- a/core/img/filetypes/text.svg +++ b/core/img/filetypes/text.svg @@ -1,43 +1,39 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="e" y2="3.3639" gradientUnits="userSpaceOnUse" x2="22.004" gradientTransform="matrix(.66858 0 0 .67037 -.67962 -2.3083)" y1="47.813" x1="22.004"> + <linearGradient id="j" x1="22.004" gradientUnits="userSpaceOnUse" y1="47.813" gradientTransform="matrix(.66858 0 0 .67037 -.67962 -2.3083)" x2="22.004" y2="3.3639"> <stop stop-color="#aaa" offset="0"/> <stop stop-color="#c8c8c8" offset="1"/> </linearGradient> - <linearGradient id="g" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" y1="5.5641" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#fff" offset="0"/> <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/> <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/> <stop stop-color="#fff" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="f" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" y1=".98521" x1="25.132"> + <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> <linearGradient id="a"> <stop offset="0"/> <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> - <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86"> + <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51"> <stop stop-opacity="0" offset="0"/> <stop offset=".5"/> <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <g> - <g> - <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/> - <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#b)"/> - <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#c)"/> - </g> - <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#f)"/> - </g> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/> + <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/> + <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/> + <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/> <g fill="none"> - <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#g)" stroke-linecap="round"/> - <path opacity=".3" stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992"/> - <path d="m8 5.5677h1.567zm1.7968 0h1.4625zm1.6924 0h1.2954zm1.5043 0h0.56412zm0.79394 0h1.2536zm1.5043 0h3.3011zm3.5101 0h2.5281zm2.737 0h0.77305zm-13.539 1.9218h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.020955zm2.2565 0.020955h3.3638zm-13.266 1.9895h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h1.0656zm1.3998 0h3.9488zm-1.3998 3h2.6325zm2.8415 0h2.8206zm3.0295 0h1.0864zm1.2954 0h2.6534zm2.8624 0h3.3429zm3.5727 0h1.2327zm-13.602 2h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h2.4445zm2.7161 0h1.17zm1.379 0h0.58501zm0.81484 0h1.0656zm1.2954 0h1.0864zm1.2954 0h1.7341zm1.964 0h2.2565zm2.4654 0h1.5043zm1.7132 0h0.37608zm-13.643 2.9895h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.02095zm2.2565 0.02095h3.3638zm-13.266 1.989h2.5908zm2.8206 0h0.81484zm1.0238 0h1.8595zm2.0684 0h2.737zm2.9668 0h1.8595zm2.0475 0h0.39697zm0.6059 0h2.3609zm2.6117 0h1.2327zm-14.145 2h2.5908zm2.8206 0h1.17zm1.379 0h1.8386zm2.0475 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327z" stroke="url(#e)" stroke-width="1px"/> + <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z"/> + <path opacity=".3" stroke-linejoin="round" stroke="#000" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z"/> + <path stroke="url(#j)" stroke-width="1px" d="m8 5.5677h1.567zm1.7968 0h1.4625zm1.6924 0h1.2954zm1.5043 0h0.56412zm0.79394 0h1.2536zm1.5043 0h3.3011zm3.5101 0h2.5281zm2.737 0h0.77305zm-13.539 1.9218h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.020955zm2.2565 0.020955h3.3638zm-13.266 1.9895h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h1.0656zm1.3998 0h3.9488zm-1.3998 3h2.6325zm2.8415 0h2.8206zm3.0295 0h1.0864zm1.2954 0h2.6534zm2.8624 0h3.3429zm3.5727 0h1.2327zm-13.602 2h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h2.4445zm2.7161 0h1.17zm1.379 0h0.58501zm0.81484 0h1.0656zm1.2954 0h1.0864zm1.2954 0h1.7341zm1.964 0h2.2565zm2.4654 0h1.5043zm1.7132 0h0.37608zm-13.643 2.9895h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.02095zm2.2565 0.02095h3.3638zm-13.266 1.989h2.5908zm2.8206 0h0.81484zm1.0238 0h1.8595zm2.0684 0h2.737zm2.9668 0h1.8595zm2.0475 0h0.39697zm0.6059 0h2.3609zm2.6117 0h1.2327zm-14.145 2h2.5908zm2.8206 0h1.17zm1.379 0h1.8386zm2.0475 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327z"/> </g> </svg> diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png Binary files differindex 045754df26f..a5793d6eb10 100644 --- a/core/img/filetypes/video.png +++ b/core/img/filetypes/video.png diff --git a/core/img/filetypes/video.svg b/core/img/filetypes/video.svg index 67691369ac9..b54e08bdf2f 100644 --- a/core/img/filetypes/video.svg +++ b/core/img/filetypes/video.svg @@ -1,85 +1,92 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <radialGradient id="radialGradient4384" xlink:href="#linearGradient5747" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.6030273,0,0,0.59999988,541.99052,860.76219)" r="2.5"/> - <linearGradient id="linearGradient5747"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="h" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.603 0 0 0.6 541.99 860.76)" r="2.5"/> + <linearGradient id="b"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient4386" xlink:href="#linearGradient5747" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.6030273,0,0,0.59999988,-535.0095,-912.96218)" r="2.5"/> - <linearGradient id="linearGradient4388" y2="39.999" xlink:href="#linearGradient5747" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="25.058" gradientTransform="matrix(0.82142859,0,0,0.42857134,518.78572,868.21933)" y1="43.544" x1="25.058"/> - <radialGradient id="radialGradient4390" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(-0.00959868,1.5579153,-1.486926,-0.02419163,551.13616,849.77731)" r="20"> + <radialGradient id="g" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.603 0 0 0.6 -535.01 -912.96)" r="2.5"/> + <linearGradient id="u" x1="25.058" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="43.544" gradientTransform="matrix(.82143 0 0 .42857 518.79 868.22)" x2="25.058" y2="39.999"/> + <radialGradient id="f" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(-.0095987 1.5579 -1.4869 -.024192 551.14 849.78)" r="20"> <stop stop-color="#f8b17e" offset="0"/> - <stop stop-color="#e35d4f" offset="0.26238"/> - <stop stop-color="#c6262e" offset="0.66094"/> + <stop stop-color="#e35d4f" offset=".26238"/> + <stop stop-color="#c6262e" offset=".66094"/> <stop stop-color="#690b54" offset="1"/> </radialGradient> - <linearGradient id="linearGradient4392" y2="860.36" xlink:href="#linearGradient3173" gradientUnits="userSpaceOnUse" x2="547" y1="887.36" x1="547"/> - <linearGradient id="linearGradient3173" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(2.641026,0,0,2.641026,0.6153903,-60.384616)" y1="44" x1="24"> + <linearGradient id="t" x1="547" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="547" y1="887.36" y2="860.36"/> + <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(2.641 0 0 2.641 .61539 -60.385)" x2="24" y2="3.899"> <stop stop-color="#791235" offset="0"/> <stop stop-color="#bf1d09" offset="1"/> </linearGradient> - <linearGradient id="linearGradient4394" y2="43" xlink:href="#linearGradient3128" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.37837838,0,0,0.64864865,529.41891,858.29461)" y1="5" x1="24"/> - <linearGradient id="linearGradient3128" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(2.7297298,0,0,2.7297298,-1.5135111,-62.513486)" y1="5.3301" x1="24"> + <linearGradient id="s" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.37838 0 0 .64865 529.42 858.29)" x2="24" y2="43"/> + <linearGradient id="c" x1="24" gradientUnits="userSpaceOnUse" y1="5.3301" gradientTransform="matrix(2.7297 0 0 2.7297 -1.5135 -62.513)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.029825"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.96141"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".029825"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".96141"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient4396" y2="43" xlink:href="#linearGradient3128" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.10810808,0,0,0.64864865,524.90556,858.29461)" y1="5" x1="24"/> - <linearGradient id="linearGradient4398" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1306.0622,-122.38971)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient5761"> + <linearGradient id="r" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.10811 0 0 .64865 524.91 858.29)" x2="24" y2="43"/> + <linearGradient id="q" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1306.1 -122.39)" x2="532" y2="812.36"/> + <linearGradient id="a"> <stop stop-color="#FFF" offset="0"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient4400" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1300.0622,-122.38971)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient4402" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1294.0622,-122.38971)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient4404" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1288.0622,-122.38971)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient4406" y2="43" xlink:href="#linearGradient3128" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(-0.10810808,0,0,0.64864865,552.09444,858.29461)" y1="5" x1="24"/> - <linearGradient id="linearGradient4408" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1306.0622,-1199.3897)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient4410" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1300.0622,-1199.3897)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient4412" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1294.0622,-1199.3897)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient4414" y2="812.36" xlink:href="#linearGradient5761" gradientUnits="userSpaceOnUse" x2="532" gradientTransform="matrix(0.79999998,0,0,0.79999998,-1288.0622,-1199.3897)" y1="812.36" x1="526"/> - <linearGradient id="linearGradient4417" y2="448.3" xlink:href="#linearGradient3173" gradientUnits="userSpaceOnUse" x2="598.77" y1="475.7" x1="598.77"/> + <linearGradient id="p" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1300.1 -122.39)" x2="532" y2="812.36"/> + <linearGradient id="o" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1294.1 -122.39)" x2="532" y2="812.36"/> + <linearGradient id="n" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1288.1 -122.39)" x2="532" y2="812.36"/> + <linearGradient id="m" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(-.10811 0 0 .64865 552.09 858.29)" x2="24" y2="43"/> + <linearGradient id="l" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1306.1 -1199.4)" x2="532" y2="812.36"/> + <linearGradient id="k" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1300.1 -1199.4)" x2="532" y2="812.36"/> + <linearGradient id="j" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1294.1 -1199.4)" x2="532" y2="812.36"/> + <linearGradient id="i" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1288.1 -1199.4)" x2="532" y2="812.36"/> + <linearGradient id="d" x1="598.77" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="598.77" y1="475.7" y2="448.3"/> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <g transform="translate(0,-1020.3622)"> - <g transform="translate(-523,163.00004)"> - <rect opacity="0.4" height="3" width="4" y="885.36" x="550" fill="url(#radialGradient4384)"/> - <rect opacity="0.4" transform="scale(-1,-1)" height="3" width="4" y="-888.36" x="-527" fill="url(#radialGradient4386)"/> - <rect opacity="0.4" height="3" width="23" y="885.36" x="527" fill="url(#linearGradient4388)"/> - <rect stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" stroke-dasharray="none" fill-rule="nonzero" stroke-dashoffset="0" height="26" width="16" stroke="url(#linearGradient4392)" stroke-linecap="round" stroke-miterlimit="4" y="860.86" x="530.5" stroke-width="1" fill="url(#radialGradient4390)"/> - <rect opacity="0.5" stroke-linejoin="round" stroke-dasharray="none" stroke-dashoffset="0" height="24" width="14" stroke="url(#linearGradient4394)" stroke-linecap="round" stroke-miterlimit="4" y="861.86" x="531.5" stroke-width="1" fill="none"/> - <path stroke-linejoin="miter" style="enable-background:accumulate;color:#000000;" d="m525.5,860.86c-0.554,0-1,0.446-1,1v24c0,0.554,0.446,1,1,1h2,2,1v-1-2-20-2-1h-1-2-2zm1,3,1,0,1,0,0,2-2,0,0-2zm0,6,2,0,0,2-2,0,0-2zm0,6,2,0,0,2-2,0,0-2zm0,6,2,0,0,2-1,0-1,0,0-2z" fill-opacity="0.78431373" fill-rule="nonzero" stroke-dashoffset="0" stroke="#000" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="#000"/> - <path opacity="0.3" stroke-linejoin="miter" d="m525.5,861.86,0,24,1,0,3,0,0-3,0-18,0-3-3,0-1,0z" stroke-dashoffset="0" stroke="url(#linearGradient4396)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4398)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-884.86" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4400)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-878.86" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4402)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-872.86" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4404)" stroke-linecap="butt" stroke-miterlimit="4" y="525.5" x="-866.86" stroke-width="1" fill="none"/> - <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="863.36" x="526" fill="#000"/> - <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="869.36" x="526" fill="#000"/> - <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="875.36" x="526" fill="#000"/> - <rect opacity="0.4" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="881.36" x="526" fill="#000"/> - <path stroke-linejoin="miter" style="enable-background:accumulate;color:#000000;" d="m551.5,860.86c0.554,0,1,0.446,1,1v24c0,0.554-0.446,1-1,1h-2-2-1v-1-2-20-2-1h1,2,2zm-1,3-1,0-1,0,0,2,2,0,0-2zm0,6-2,0,0,2,2,0,0-2zm0,6-2,0,0,2,2,0,0-2zm0,6-2,0,0,2,1,0,1,0,0-2z" fill-opacity="0.78431373" fill-rule="nonzero" stroke-dashoffset="0" stroke="#000" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="#000"/> - <path opacity="0.3" stroke-linejoin="miter" d="m551.5,861.86,0,24-1,0-3,0,0-3,0-18,0-3,3,0,1,0z" stroke-dashoffset="0" stroke="url(#linearGradient4406)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4408)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-884.86" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4410)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-878.86" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4412)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-872.86" stroke-width="1" fill="none"/> - <rect opacity="0.12" stroke-linejoin="round" stroke-dasharray="none" transform="matrix(0,-1,-1,0,0,0)" stroke-dashoffset="0" rx="1" ry="1" height="4" width="4" stroke="url(#linearGradient4414)" stroke-linecap="butt" stroke-miterlimit="4" y="-551.5" x="-866.86" stroke-width="1" fill="none"/> - <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="863.36" x="-551" fill="#000"/> - <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="869.36" x="-551" fill="#000"/> - <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="875.36" x="-551" fill="#000"/> - <rect opacity="0.4" transform="scale(-1,1)" fill-rule="evenodd" rx="1" ry="1" height="3" width="3" y="881.36" x="-551" fill="#000"/> - <path opacity="0.31999996" stroke-linejoin="round" d="m599.62,474.79,0-25.573l22.14,12.78z" fill-rule="evenodd" transform="matrix(0.45152364,0,0,0.43013404,262.75848,675.64025)" stroke="url(#linearGradient4417)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="2.26912189" fill="url(#linearGradient4417)"/> - <path stroke-linejoin="round" d="m599.62,474.79,0-25.573l22.14,12.78z" fill-rule="evenodd" transform="matrix(0.36121892,0,0,0.35192785,317.90678,710.77151)" stroke="#FFF" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="2.80470967" fill="#fafafa"/> + <g transform="translate(0 -1020.4)"> + <g transform="translate(-523 163)"> + <rect opacity=".4" height="3" width="4" y="885.36" x="550" fill="url(#h)"/> + <rect opacity=".4" transform="scale(-1)" height="3" width="4" y="-888.36" x="-527" fill="url(#g)"/> + <rect opacity=".4" height="3" width="23" y="885.36" x="527" fill="url(#u)"/> + <g stroke-linecap="round"> + <rect stroke-linejoin="round" style="color:#000000" height="26" width="16" stroke="url(#t)" x="530.5" y="860.86" fill="url(#f)"/> + <rect opacity=".5" stroke-linejoin="round" height="24" width="14" stroke="url(#s)" x="531.5" y="861.86" fill="none"/> + <path style="color:#000000" d="m525.5 860.86c-0.554 0-1 0.446-1 1v24c0 0.554 0.446 1 1 1h5v-26h-5zm1 3h1 1v2h-2v-2zm0 6h2v2h-2v-2zm0 6h2v2h-2v-2zm0 6h2v2h-1-1v-2z" fill-opacity=".78431" stroke="#000"/> + </g> + <g fill="none"> + <path opacity=".3" d="m525.5 861.86v24h1 3v-3-18-3h-3-1z" stroke="url(#r)" stroke-linecap="round"/> + <g stroke-linejoin="round"> + <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#q)" x="-884.86" y="525.5" height="4"/> + <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#p)" x="-878.86" y="525.5" height="4"/> + <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#o)" x="-872.86" y="525.5" height="4"/> + <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#n)" x="-866.86" y="525.5" height="4"/> + </g> + </g> + <g> + <g fill-rule="evenodd"> + <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="863.36" x="526"/> + <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="869.36" x="526"/> + <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="875.36" x="526"/> + <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="881.36" x="526"/> + </g> + <path style="color:#000000" d="m551.5 860.86c0.554 0 1 0.446 1 1v24c0 0.554-0.446 1-1 1h-5v-26h5zm-1 3h-1-1v2h2v-2zm0 6h-2v2h2v-2zm0 6h-2v2h2v-2zm0 6h-2v2h1 1v-2z" fill-opacity=".78431" stroke="#000" stroke-linecap="round"/> + </g> + <g fill="none"> + <path opacity=".3" d="m551.5 861.86v24h-1-3v-3-18-3h3 1z" stroke="url(#m)" stroke-linecap="round"/> + <g stroke-linejoin="round"> + <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#l)" x="-884.86" y="-551.5" height="4"/> + <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#k)" x="-878.86" y="-551.5" height="4"/> + <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#j)" x="-872.86" y="-551.5" height="4"/> + <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#i)" x="-866.86" y="-551.5" height="4"/> + </g> + </g> + <g fill-rule="evenodd"> + <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="863.36" x="-551"/> + <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="869.36" x="-551"/> + <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="875.36" x="-551"/> + <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="881.36" x="-551"/> + </g> + <path opacity="0.32" stroke-linejoin="round" d="m599.62 474.79v-25.573l22.14 12.78z" fill-rule="evenodd" transform="matrix(.45152 0 0 .43013 262.76 675.64)" stroke="url(#d)" stroke-width="2.2691" fill="url(#d)"/> + <path stroke-linejoin="round" d="m599.62 474.79v-25.573l22.14 12.78z" fill-rule="evenodd" transform="matrix(.36122 0 0 .35193 317.91 710.77)" stroke="#FFF" stroke-width="2.8047" fill="#fafafa"/> </g> </g> </svg> diff --git a/core/img/filetypes/web.png b/core/img/filetypes/web.png Binary files differindex c3802312645..33063212466 100644 --- a/core/img/filetypes/web.png +++ b/core/img/filetypes/web.png diff --git a/core/img/filetypes/web.svg b/core/img/filetypes/web.svg index 67775a2233b..5b5a9c3b771 100644 --- a/core/img/filetypes/web.svg +++ b/core/img/filetypes/web.svg @@ -1,45 +1,36 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> <defs> - <radialGradient id="radialGradient2418" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.643979,0,2.93653e-8,2.534421,78.72514,-37.986139)" r="9.125"> + <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.644 0 2.9365e-8 2.5344 78.725 -37.986)" r="9.125"> <stop stop-color="#FFF" offset="0"/> <stop stop-color="#b6b6b6" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3036" y2="-1.4615" gradientUnits="userSpaceOnUse" x2="62.2" gradientTransform="matrix(1.4102489,0,0,1.4102168,-71.718053,20.951038)" y1="-12.489" x1="62.2"> + <linearGradient id="e" x1="62.2" gradientUnits="userSpaceOnUse" y1="-12.489" gradientTransform="matrix(1.4102 0 0 1.4102 -71.718 20.951)" x2="62.2" y2="-1.4615"> <stop stop-color="#FFF" offset="0"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3040" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="61.24" gradientTransform="matrix(0,2.3489394,-2.3489382,0,-4.4959784,-137.19908)" r="9.7553"> + <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="61.24" gradientTransform="matrix(0 2.3489 -2.3489 0 -4.496 -137.2)" r="9.7553"> <stop stop-color="#51cfee" offset="0"/> - <stop stop-color="#49a3d2" offset="0.26238"/> - <stop stop-color="#3470b4" offset="0.70495"/> + <stop stop-color="#49a3d2" offset=".26238"/> + <stop stop-color="#3470b4" offset=".70495"/> <stop stop-color="#273567" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3042" y2="2.6887" gradientUnits="userSpaceOnUse" x2="20" gradientTransform="matrix(0.65334267,0,0,0.65332778,0.05996007,0.58024139)" y1="43" x1="20"> + <linearGradient id="d" x1="20" gradientUnits="userSpaceOnUse" y1="43" gradientTransform="matrix(.65334 0 0 .65333 .059960 .58024)" x2="20" y2="2.6887"> <stop stop-color="#254b6d" offset="0"/> - <stop stop-color="#415b73" offset="0.5"/> + <stop stop-color="#415b73" offset=".5"/> <stop stop-color="#6195b5" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3045" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1.4431373,0,0,0.58310714,-74.376473,23.107603)" r="10.625"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1.4431 0 0 .58311 -74.376 23.108)" r="10.625"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </radialGradient> </defs> - <path opacity="0.4" d="m31.333,25.804a15.333,6.1955,0,0,1,-30.667,0,15.333,6.1955,0,1,1,30.667,0z" fill-rule="evenodd" fill="url(#radialGradient3045)"/> - <path d="M29,15.999c0,7.18-5.821,13.001-13,13.001-7.1793,0-13-5.821-13-13.001,0-7.179,5.8207-12.999,13-12.999,7.179,0,13,5.8199,13,12.999z" fill-rule="nonzero" stroke="url(#linearGradient3042)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.66666669" fill="url(#radialGradient3040)"/> - <path opacity="0.4" d="M16.219,3.4688l-1.563,0.1874-1.75,0.4688c0.148-0.0517,0.316-0.1067,0.469-0.1562l-0.219-0.3438-0.656,0.0938-0.344,0.3124-0.531,0.0938-0.469,0.2188-0.218,0.0937-0.063,0.0937-0.344,0.0626-0.219,0.4374-0.25-0.5312-0.0932,0.2188,0.0312,0.5937-0.4062,0.375-0.25,0.6563h0.5l0.2182-0.4376,0.063-0.1562c0.228-0.1612,0.456-0.3448,0.687-0.5l0.532,0.1875c0.08,0.055,0.169,0.101,0.25,0.1563l-1.532,0.3124,0.5,0.375h0.126c-1.3646,1.3155-3.5724,3.8488-4.1255,8.2808,0.024,0.113,0.4375,0.782,0.4375,0.782l1,0.562,0.9688,0.282,0.4374,0.531,0.6558,0.5,0.376-0.094,0.281,0.156v0.094l-0.375,1-0.282,0.437,0.094,0.188-0.2498,0.812,0.8438,1.532,0.844,0.75,0.406,0.531-0.062,1.125,0.281,0.656-0.281,1.219c-0.005,0.013-0.019,0.032,0,0.094,0.036,0.123,1.5,0.944,1.593,0.875,0.093-0.071,0.188-0.125,0.188-0.125l-0.094-0.281,0.375-0.344,0.156-0.375,0.594-0.219,0.469-1.156-0.125-0.344,0.312-0.469,0.719-0.187,0.375-0.844-0.094-1.062,0.563-0.782,0.093-0.812c-0.771-0.384-1.546-0.793-2.312-1.188l-0.375-0.718-0.687-0.157-0.407-1.031-0.906,0.125-0.813-0.594-0.843,0.75v0.094c-0.256-0.074-0.585-0.079-0.8128-0.219l-0.1562-0.531v-0.594l-0.5938,0.063c0.0471-0.374,0.1089-0.752,0.1563-1.125h-0.3437l-0.3438,0.437-0.3125,0.156-0.4687-0.281-0.0313-0.562,0.0937-0.657,0.6876-0.531h0.5624l0.125-0.312,0.6876,0.156,0.5002,0.656,0.093-1.093,0.907-0.719,0.312-0.813,0.688-0.25,0.343-0.562,0.876-0.1565,0.406-0.625h-1.282l0.813-0.375h0.563l0.718-0.25,0.156,0.6875,0.313-0.5-0.375-0.25,0.094-0.2812-0.282-0.2813-0.312-0.0625,0.062-0.3438-0.218-0.4687-0.156,0.0625,0.468-0.7188c0.759-0.2351,1.44-0.4872,2.156-0.8124l-0.062,0.3124,0.375,0.25,0.625-0.4374-0.312-0.3438-0.438,0.2188-0.125-0.0313c0.031-0.0142,0.063-0.0168,0.094-0.0313l0.625-1.625-1.375-0.5624zm-3.563,0.7812l-0.344,0.3125,0.876,0.5937,0.593-0.1874-0.406,0.2812h-0.063l0.219,0.1562v0.4688l-0.469,0.5,0.126,0.25-0.5,0.875,0.031,0.3125-0.5,0.2187-0.313,0.6876-0.156-0.6563-0.875-0.3437-0.156-0.5,1.187-0.6876,0.438-0.4062c0.019,0.0129,0.043,0.0183,0.062,0.0312l0.5-0.4687-0.437-0.1875v-0.0312l-0.063-0.0313-0.062,0.0313-0.032-0.0313,0.063-0.0313-0.094-0.0312-0.219-0.4688-1-0.125-0.031-0.0937,0.438,0.0625,0.25-0.25,0.531-0.0938c0.128-0.0622,0.277-0.1055,0.406-0.1562zm-0.281,1.1562l0.031,0.0313,0.906-0.1875-0.124-0.0938-0.813,0.25zm11.687,0l-0.25,0.1563v0.3437l-0.937,0.5938,0.187,0.875,0.532-0.375,0.344,0.375,0.374,0.2188,0.25-0.6563-0.124-0.375,0.124-0.2813,0.282-0.25c-0.251-0.2223-0.515-0.4216-0.782-0.625zm-12.437,0.25l-0.063,0.1876s-0.398,0.0687-0.5,0.0937c-0.019,0.018-0.042,0.0438-0.062,0.0625v-0.1562l0.625-0.1876zm13.5,0.625l-0.031,0.0626v0.5c0.162-0.0442,0.335-0.0728,0.5-0.0938-0.154-0.159-0.308-0.3175-0.469-0.4688zm-3.687,0.0626v0.3437l0.218,0.25v0.5313l-0.125,0.7187,0.594-0.125,0.406-0.4063-0.375-0.375c-0.124-0.3308-0.251-0.6201-0.406-0.9374h-0.312zm4.218,0.4687l-0.5,0.375-0.062,0.25-0.719,0.625-0.719-0.1875v-0.4375l-0.344,0.2187,0.157,0.4063h-0.531l-0.313,0.5-0.344,0.4063-0.656,0.125,0.375,0.375,0.094,0.375h-0.469l-0.625,0.3442v1h0.281l0.281,0.281,0.594-0.281,0.219-0.594,0.469-0.282,0.094-0.218,0.718-0.1878,0.406,0.4378,0.407,0.25-0.25,0.468,0.406-0.093,0.187-0.5-0.5-0.5628h0.219l0.5,0.4058,0.063,0.532,0.437,0.5,0.125-0.719,0.219-0.125c0.239,0.249,0.423,0.563,0.625,0.844l0.75,0.031,0.406,0.281-0.187,0.282-0.438,0.406h-0.625l-0.812-0.282-0.438,0.063-0.312,0.344-0.906-0.907-0.626-0.187-0.937,0.125-0.813,0.219c-0.462,0.524-0.937,1.049-1.374,1.593l-0.5,1.282,0.25,0.281-0.469,0.625,0.5,1.156c0.412,0.467,0.838,0.94,1.25,1.406l0.593-0.531,0.25,0.313,0.657-0.406,0.219,0.25h0.656l0.375,0.406-0.219,0.781,0.469,0.531-0.031,0.875,0.343,0.657-0.25,0.562c-0.024,0.404-0.062,0.815-0.062,1.219,0.198,0.547,0.406,1.073,0.593,1.625l0.126,0.875v0.469h0.218c0.885-0.838,1.651-1.794,2.282-2.844,0.482-0.804,0.881-1.661,1.187-2.563v-0.656l0.437-0.937c0.179-0.869,0.282-1.768,0.282-2.688,0-3.561-1.408-6.7926-3.688-9.1875zm-4.718,0.25l-0.344,0.125,0.094,0.6563,0.468-0.25-0.218-0.5313zm6.593,5.9375l0.531,0.625,0.657,1.406,0.406,0.438-0.187,0.469,0.343,0.437c-0.165,0.011-0.33,0.031-0.5,0.031-0.308-0.649-0.546-1.32-0.781-2l-0.406-0.437-0.219-0.813,0.156-0.156z" fill-rule="nonzero" fill="#000"/> - <path opacity="0.4" d="m28.333,15.999c0,6.812-5.5222,12.334-12.333,12.334-6.8111,0-12.333-5.5221-12.333-12.334-0.0003-6.811,5.5216-12.332,12.333-12.332,6.8107,0,12.333,5.5215,12.333,12.333z" stroke="url(#linearGradient3036)" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.66666704" fill="none"/> - <g transform="matrix(0.66660406,-0.00913426,0.00913426,0.66660406,-0.1924644,0.35723586)" stroke-dashoffset="0" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1"> - <path stroke-linejoin="round" d="m30.5,20.937,17,16.5-7.75,0.25s3.25,6.75,3.25,6.75c1,3-3.5,4.125-4.25,1.875,0,0-3-6.75-3-6.75l-5.5,5.875,0.25-24.5z" fill-rule="evenodd" stroke="#666" fill="url(#radialGradient2418)"/> - <path opacity="0.4" stroke-linejoin="miter" d="m31.657,23.379,13.476,13.186-6.9219,0.27746s3.8721,7.7566,3.8721,7.7566c0.40273,1.6501-2.0283,2.4126-2.5071,1.1529,0,0-3.6831-7.845-3.6831-7.845l-4.4247,4.7083,0.18907-19.236z" stroke="#FFF" fill="none"/> + <path opacity=".4" fill="url(#a)" d="m31.333 25.804a15.333 6.1955 0 0 1 -30.667 0 15.333 6.1955 0 1 1 30.667 0z" fill-rule="evenodd"/> + <path d="m29 15.999c0 7.18-5.821 13.001-13 13.001-7.1793 0-13-5.821-13-13.001 0-7.179 5.8207-12.999 13-12.999 7.179 0 13 5.8199 13 12.999z" stroke="url(#d)" stroke-width=".66667" fill="url(#b)"/> + <path opacity=".4" d="m16.219 3.4688l-1.563 0.1874-1.75 0.4688c0.148-0.0517 0.316-0.1067 0.469-0.1562l-0.219-0.3438-0.656 0.0938-0.344 0.3124-0.531 0.0938-0.469 0.2188-0.218 0.0937-0.063 0.0937-0.344 0.0626-0.219 0.4374-0.25-0.5312-0.0932 0.2188 0.0312 0.5937-0.4062 0.375-0.25 0.6563h0.5l0.2182-0.4376 0.063-0.1562c0.228-0.1612 0.456-0.3448 0.687-0.5l0.532 0.1875c0.08 0.055 0.169 0.101 0.25 0.1563l-1.532 0.3124 0.5 0.375h0.126c-1.3646 1.3155-3.5724 3.8488-4.1255 8.2808 0.024 0.113 0.4375 0.782 0.4375 0.782l1 0.562 0.9688 0.282 0.4374 0.531 0.6558 0.5 0.376-0.094 0.281 0.156v0.094l-0.375 1-0.282 0.437 0.094 0.188-0.2498 0.812 0.8438 1.532 0.844 0.75 0.406 0.531-0.062 1.125 0.281 0.656-0.281 1.219c-0.005 0.013-0.019 0.032 0 0.094 0.036 0.123 1.5 0.944 1.593 0.875 0.093-0.071 0.188-0.125 0.188-0.125l-0.094-0.281 0.375-0.344 0.156-0.375 0.594-0.219 0.469-1.156-0.125-0.344 0.312-0.469 0.719-0.187 0.375-0.844-0.094-1.062 0.563-0.782 0.093-0.812c-0.771-0.384-1.546-0.793-2.312-1.188l-0.375-0.718-0.687-0.157-0.407-1.031-0.906 0.125-0.813-0.594-0.843 0.75v0.094c-0.256-0.074-0.585-0.079-0.8128-0.219l-0.1562-0.531v-0.594l-0.5938 0.063c0.0471-0.374 0.1089-0.752 0.1563-1.125h-0.3437l-0.3438 0.437-0.3125 0.156-0.4687-0.281-0.0313-0.562 0.0937-0.657 0.6876-0.531h0.5624l0.125-0.312 0.6876 0.156 0.5002 0.656 0.093-1.093 0.907-0.719 0.312-0.813 0.688-0.25 0.343-0.562 0.876-0.1565 0.406-0.625h-1.282l0.813-0.375h0.563l0.718-0.25 0.156 0.6875 0.313-0.5-0.375-0.25 0.094-0.2812-0.282-0.2813-0.312-0.0625 0.062-0.3438-0.218-0.4687-0.156 0.0625 0.468-0.7188c0.759-0.2351 1.44-0.4872 2.156-0.8124l-0.062 0.3124 0.375 0.25 0.625-0.4374-0.312-0.3438-0.438 0.2188-0.125-0.0313c0.031-0.0142 0.063-0.0168 0.094-0.0313l0.625-1.625-1.375-0.5624zm-3.563 0.7812l-0.344 0.3125 0.876 0.5937 0.593-0.1874-0.406 0.2812h-0.063l0.219 0.1562v0.4688l-0.469 0.5 0.126 0.25-0.5 0.875 0.031 0.3125-0.5 0.2187-0.313 0.6876-0.156-0.6563-0.875-0.3437-0.156-0.5 1.187-0.6876 0.438-0.4062c0.019 0.0129 0.043 0.0183 0.062 0.0312l0.5-0.4687-0.437-0.1875v-0.0312l-0.063-0.0313-0.062 0.0313-0.032-0.0313 0.063-0.0313-0.094-0.0312-0.219-0.4688-1-0.125-0.031-0.0937 0.438 0.0625 0.25-0.25 0.531-0.0938c0.128-0.0622 0.277-0.1055 0.406-0.1562zm-0.281 1.1562l0.031 0.0313 0.906-0.1875-0.124-0.0938-0.813 0.25zm11.687 0l-0.25 0.1563v0.3437l-0.937 0.5938 0.187 0.875 0.532-0.375 0.344 0.375 0.374 0.2188 0.25-0.6563-0.124-0.375 0.124-0.2813 0.282-0.25c-0.251-0.2223-0.515-0.4216-0.782-0.625zm-12.437 0.25l-0.063 0.1876s-0.398 0.0687-0.5 0.0937c-0.019 0.018-0.042 0.0438-0.062 0.0625v-0.1562l0.625-0.1876zm13.5 0.625l-0.031 0.0626v0.5c0.162-0.0442 0.335-0.0728 0.5-0.0938-0.154-0.159-0.308-0.3175-0.469-0.4688zm-3.687 0.0626v0.3437l0.218 0.25v0.5313l-0.125 0.7187 0.594-0.125 0.406-0.4063-0.375-0.375c-0.124-0.3308-0.251-0.6201-0.406-0.9374h-0.312zm4.218 0.4687l-0.5 0.375-0.062 0.25-0.719 0.625-0.719-0.1875v-0.4375l-0.344 0.2187 0.157 0.4063h-0.531l-0.313 0.5-0.344 0.4063-0.656 0.125 0.375 0.375 0.094 0.375h-0.469l-0.625 0.3442v1h0.281l0.281 0.281 0.594-0.281 0.219-0.594 0.469-0.282 0.094-0.218 0.718-0.1878 0.406 0.4378 0.407 0.25-0.25 0.468 0.406-0.093 0.187-0.5-0.5-0.5628h0.219l0.5 0.4058 0.063 0.532 0.437 0.5 0.125-0.719 0.219-0.125c0.239 0.249 0.423 0.563 0.625 0.844l0.75 0.031 0.406 0.281-0.187 0.282-0.438 0.406h-0.625l-0.812-0.282-0.438 0.063-0.312 0.344-0.906-0.907-0.626-0.187-0.937 0.125-0.813 0.219c-0.462 0.524-0.937 1.049-1.374 1.593l-0.5 1.282 0.25 0.281-0.469 0.625 0.5 1.156c0.412 0.467 0.838 0.94 1.25 1.406l0.593-0.531 0.25 0.313 0.657-0.406 0.219 0.25h0.656l0.375 0.406-0.219 0.781 0.469 0.531-0.031 0.875 0.343 0.657-0.25 0.562c-0.024 0.404-0.062 0.815-0.062 1.219 0.198 0.547 0.406 1.073 0.593 1.625l0.126 0.875v0.469h0.218c0.885-0.838 1.651-1.794 2.282-2.844 0.482-0.804 0.881-1.661 1.187-2.563v-0.656l0.437-0.937c0.179-0.869 0.282-1.768 0.282-2.688 0-3.561-1.408-6.7926-3.688-9.1875zm-4.718 0.25l-0.344 0.125 0.094 0.6563 0.468-0.25-0.218-0.5313zm6.593 5.9375l0.531 0.625 0.657 1.406 0.406 0.438-0.187 0.469 0.343 0.437c-0.165 0.011-0.33 0.031-0.5 0.031-0.308-0.649-0.546-1.32-0.781-2l-0.406-0.437-0.219-0.813 0.156-0.156z"/> + <path opacity=".4" d="m28.333 15.999c0 6.812-5.5222 12.334-12.333 12.334-6.8111 0-12.333-5.5221-12.333-12.334-0.0003-6.811 5.5216-12.332 12.333-12.332 6.8107 0 12.333 5.5215 12.333 12.333z" stroke="url(#e)" stroke-width=".66667" fill="none"/> + <g transform="matrix(.66660 -.0091343 .0091343 .66660 -.19246 .35724)"> + <path stroke-linejoin="round" stroke="#666" fill="url(#c)" d="m30.5 20.937 17 16.5-7.75 0.25s3.25 6.75 3.25 6.75c1 3-3.5 4.125-4.25 1.875l-3-6.75-5.5 5.875 0.25-24.5z" fill-rule="evenodd"/> + <path opacity=".4" stroke="#FFF" d="m31.657 23.379 13.476 13.186-6.9219 0.27746s3.8721 7.7566 3.8721 7.7566c0.40273 1.6501-2.0283 2.4126-2.5071 1.1529l-3.6831-7.845-4.4247 4.7083 0.18907-19.236z" fill="none"/> </g> </svg> diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png Binary files differindex fcd28e9a292..6c0c4f8c228 100644 --- a/core/img/filetypes/x-office-document.png +++ b/core/img/filetypes/x-office-document.png diff --git a/core/img/filetypes/x-office-document.svg b/core/img/filetypes/x-office-document.svg index fc51a3a1b70..eb2368722e2 100644 --- a/core/img/filetypes/x-office-document.svg +++ b/core/img/filetypes/x-office-document.svg @@ -1,60 +1,53 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient3128" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.66891894,0,0,0.72972973,1.8209495,-2.513506)" y1="5.5641" x1="24"> + <linearGradient id="f" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.66892 0 0 .72973 1.8209 -2.5135)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3134" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.1778817e-7,4.3521887,-5.895642,-1.3064099e-7,75.941947,-39.43508)" r="12.672"> + <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.1779e-7 4.3522 -5.8956 -1.3064e-7 75.942 -39.435)" r="12.672"> <stop stop-color="#90dbec" offset="0"/> - <stop stop-color="#55c1ec" offset="0.26238"/> - <stop stop-color="#3689e6" offset="0.70495"/> + <stop stop-color="#55c1ec" offset=".26238"/> + <stop stop-color="#3689e6" offset=".70495"/> <stop stop-color="#2b63a0" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3071" y2="6.0421" gradientUnits="userSpaceOnUse" y1="36.042" gradientTransform="translate(-2.9820961,-6.0420673)" x2="21.982" x1="21.982"> + <linearGradient id="i" x1="21.982" gradientUnits="userSpaceOnUse" x2="21.982" gradientTransform="translate(-2.9821 -6.0421)" y1="36.042" y2="6.0421"> <stop stop-color="#AAA" offset="0"/> <stop stop-color="#c8c8c8" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3119" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.56756757,0,0,0.72972971,2.378382,-2.5135063)" y1="5.5641" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3122" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.65714319,0,0,0.63012397,0.228556,-1.0896478)" y1="0.98521" x1="25.132"> + <linearGradient id="g" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3045" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01566318,0,0,0.00823529,17.610433,25.980565)" r="117.14"/> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3048" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01566318,0,0,0.00823529,14.389566,25.980565)" r="117.14"/> - <linearGradient id="linearGradient3936" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(0.04576928,0,0,0.00823529,-0.5423243,25.980548)" x2="302.86" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect opacity="0.15" fill-rule="nonzero" height="2" width="22.1" y="29" x="4.95" fill="url(#linearGradient3936)"/> - <path opacity="0.15" d="m4.95,29v1.9999c-0.80662,0.0038-1.95-0.44807-1.95-1.0001,0-0.552,0.90012-0.99982,1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3048)"/> - <path opacity="0.15" d="m27.05,29v1.9999c0.80661,0.0038,1.95-0.44807,1.95-1.0001,0-0.552-0.90012-0.99982-1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3045)"/> - <path d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" fill="url(#linearGradient3122)"/> - <path stroke-linejoin="round" d="m26.5,28.5-21,0,0-27,21,0z" stroke-dashoffset="0" stroke="url(#linearGradient3119)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="miter" d="m11,5.505,1.3436,0zm1.6874,0,2.1875,0zm2.5312,0,1.9375,0zm2.25,0,0.84375,0zm1.1875,0,1.875,0zm2.25,0,3.0938,0zm-9.9061,2,2.6561,0zm3.0624,0,1.75,0zm2.0625,0,0.875,0zm1.2188,0,1.5938,0zm1.9375,0,1.625,0zm1.9375,0,2.5938,0zm-10.219,1.995,3.2811,0zm3.6249,0,4.625,0zm4.9375,0,1.8438,0zm-9.906,2h1.5938zm1.0936,0,5.9062,0zm-1.0936,3.0372,2.0936,0zm2.4061,0,5.0625,0zm5.375,0,2.4688,0zm2.7812,0,2.3125,0zm-10.562,1.963h1.3436zm1.6874,0,2.1562,0zm2.5312,0,1.9375,0zm2.25,0,0.84375,0zm1.1875,0,1.875,0zm2.25,0,3.0938,0zm-9.9061,2.0753,3.2811,0zm3.6249,0,4.625,0zm4.9375,0,1.8438,0zm-8.562,2.925h2.0936zm2.4061,0,5.0625,0zm5.375,0,2.4688,0zm-7.7811,2,2.8749,0zm3.2186,0,1.2188,0zm1.5312,0,2.7812,0zm3.0938,0,4.0938,0zm-7.8436,2,2.8749,0zm3.2186,0,1.75,0zm2.0625,0,2.75,0zm3.0625,0,2.9688,0z" stroke="url(#linearGradient3071)" stroke-linecap="butt" stroke-width="1px" fill="none"/> - <path style="enable-background:accumulate;color:#000000;" d="m8.0261,29.5h-3.3605c-0.31067-0.34338-0.074432-1.0251-0.14825-1.5112v-27.322l0.043327-0.11794,0.10492-0.048698h3.3084" fill-rule="nonzero" fill="url(#radialGradient3134)"/> - <path opacity="0.5" stroke-linejoin="round" d="m8.5,28.5-3,0,0-27,3,0" stroke-dashoffset="0" stroke="url(#linearGradient3128)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path opacity="0.3" stroke-linejoin="round" d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" stroke-dashoffset="0" stroke="#000" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="none"/> + <g> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/> + <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/> + <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/> + </g> + <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#g)"/> + <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#h)" stroke-linecap="round" fill="none"/> + <path d="m11 5.505h1.3436zm1.6874 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm1.1875 0h1.875zm2.25 0h3.0938zm-9.9061 2h2.6561zm3.0624 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm1.9375 0h2.5938zm-10.219 1.995h3.2811zm3.6249 0h4.625zm4.9375 0h1.8438zm-9.906 2h1.5938zm1.0936 0h5.9062zm-1.0936 3.0372h2.0936zm2.4061 0h5.0625zm5.375 0h2.4688zm2.7812 0h2.3125zm-10.562 1.963h1.3436zm1.6874 0h2.1562zm2.5312 0h1.9375zm2.25 0h0.84375zm1.1875 0h1.875zm2.25 0h3.0938zm-9.9061 2.0753h3.2811zm3.6249 0h4.625zm4.9375 0h1.8438zm-8.562 2.925h2.0936zm2.4061 0h5.0625zm5.375 0h2.4688zm-7.7811 2h2.8749zm3.2186 0h1.2188zm1.5312 0h2.7812zm3.0938 0h4.0938zm-7.8436 2h2.8749zm3.2186 0h1.75zm2.0625 0h2.75zm3.0625 0h2.9688z" stroke="url(#i)" stroke-width="1px" fill="none"/> + <path style="color:#000000" fill="url(#b)" d="m8.0261 29.5h-3.3605c-0.31067-0.34338-0.074432-1.0251-0.14825-1.5112v-27.322l0.043327-0.11794 0.10492-0.048698h3.3084"/> + <path opacity=".5" stroke-linejoin="round" d="m8.5 28.5h-3v-27h3" stroke="url(#f)" fill="none"/> + <path opacity=".3" stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/> </svg> diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png Binary files differindex 7ee552ba7c8..b129c76de60 100644 --- a/core/img/filetypes/x-office-presentation.png +++ b/core/img/filetypes/x-office-presentation.png diff --git a/core/img/filetypes/x-office-presentation.svg b/core/img/filetypes/x-office-presentation.svg index 821798d50fd..534e695537e 100644 --- a/core/img/filetypes/x-office-presentation.svg +++ b/core/img/filetypes/x-office-presentation.svg @@ -1,109 +1,108 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3012" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.72972916,0,0,0.56756756,-1.5145621,3.3783836)" y1="3.5542" x1="24"> + <linearGradient id="q" x1="24" gradientUnits="userSpaceOnUse" y1="3.5542" gradientTransform="matrix(.72973 0 0 .56757 -1.5146 3.3784)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.11257"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".11257"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3015" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.82857173,0,0,0.49975339,-3.8857226,4.2392369)" y1="0.98521" x1="25.132"> + <linearGradient id="p" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.82857 0 0 .49975 -3.8857 4.2392)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3017" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.66906899,0,0,0.46769474,45.339917,3.6822722)" y1="50.786" x1="-51.786"> + <linearGradient id="o" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.66907 0 0 .46769 45.34 3.6823)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3020" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01927775,0,0,0.0082353,17.982069,24.980564)" r="117.14"/> - <radialGradient id="radialGradient3023" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01927775,0,0,0.0082353,14.01793,24.980564)" r="117.14"/> - <linearGradient id="linearGradient3026" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(0.05633135,0,0,0.0082353,-4.3597632,24.980547)" y1="366.65" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019278 0 0 .0082353 17.982 24.981)" r="117.14"/> + <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019278 0 0 .0082353 14.018 24.981)" r="117.14"/> + <linearGradient id="n" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.056331 0 0 .0082353 -4.3598 24.981)" x2="302.86" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3076" y2="43" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(0.66891892,0,0,0.56756756,-1.17905,3.378385)" x2="24" x1="24"> + <linearGradient id="m" x1="24" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.66892 0 0 .56757 -1.179 3.3784)" y1="5.5641" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3192" gradientUnits="userSpaceOnUse" fx="7.2758" cx="7.8061" cy="9.9571" r="12.672" gradientTransform="matrix(-1.3251168e-7,3.451736,-6.6325968,-1.0361182e-7,81.872186,-26.172651)"> + <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.3251e-7 3.4517 -6.6326 -1.0361e-7 81.872 -26.173)" r="12.672"> <stop stop-color="#f9c590" offset="0"/> - <stop stop-color="#f19860" offset="0.39698"/> + <stop stop-color="#f19860" offset=".39698"/> <stop stop-color="#ce5d36" offset="1"/> </radialGradient> - <linearGradient id="linearGradient3194" y2="0.91791" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="matrix(0.81962722,0,0,0.52284254,-3.8315518,5.2357996)" x2="25" x1="25"> + <linearGradient id="l" x1="25" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(.81963 0 0 .52284 -3.8316 5.2358)" y1="47.935" y2=".91791"> <stop stop-color="#71171c" offset="0"/> <stop stop-color="#ed8137" offset="1"/> </linearGradient> - <clipPath id="clipPath3877"> - <path style="enable-background:accumulate;color:#000000;" fill-rule="nonzero" fill="#FFF" d="m10.751-0.72642,19.105,0.025195,0,10.481-19.105-0.025202z"/> + <clipPath id="r"> + <path style="color:#000000" fill="#FFF" d="m10.751-0.72642 19.105 0.025195v10.481l-19.105-0.025202z"/> </clipPath> - <linearGradient id="linearGradient3514" y2="25.647" gradientUnits="userSpaceOnUse" x2="22.004" gradientTransform="matrix(1.3394176,0,0,-1.9826305,-11.198083,94.86293)" y1="63.218" x1="22.004"> + <linearGradient id="k" x1="22.004" gradientUnits="userSpaceOnUse" y1="63.218" gradientTransform="matrix(1.3394 0 0 -1.9826 -11.198 94.863)" x2="22.004" y2="25.647"> <stop stop-color="#AAA" offset="0"/> <stop stop-color="#c8c8c8" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3550" y2="37.546" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1.081295,0,0,0.62485417,-6.1734925,-3.6471464)" y1="15.285" x1="25.132"> + <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1="15.285" gradientTransform="matrix(1.0813 0 0 .62485 -6.1735 -3.6471)" x2="25.132" y2="37.546"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3552" y2="17.555" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.87314224,0,0,0.58477041,58.066492,-4.3435334)" y1="41.798" x1="-51.786"> + <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" y1="41.798" gradientTransform="matrix(.87314 0 0 .58477 58.066 -4.3435)" x2="-51.786" y2="17.555"> <stop stop-color="#AAA" offset="0"/> <stop stop-color="#c8c8c8" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3554" y2="35.721" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(1.0820661,0,0,0.61449222,-5.6480107,-2.535845)" y1="14.203" x1="24"> + <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="14.203" gradientTransform="matrix(1.0821 0 0 .61449 -5.648 -2.5358)" x2="24" y2="35.721"> <stop stop-color="#FFF" offset="0"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3556" y2="37.546" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(1,0,0,0.9561695,-0.49905668,-2.9300489)" y1="15.285" x1="25.132"> + <linearGradient id="g" x1="25.132" gradientUnits="userSpaceOnUse" y1="15.285" gradientTransform="matrix(1 0 0 .95617 -.49906 -2.93)" x2="25.132" y2="37.546"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3558" y2="17.555" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.8074968,0,0,0.8948322,58.911175,-3.9956799)" y1="41.798" x1="-51.786"> + <linearGradient id="f" x1="-51.786" gradientUnits="userSpaceOnUse" y1="41.798" gradientTransform="matrix(.80750 0 0 .89483 58.911 -3.9957)" x2="-51.786" y2="17.555"> <stop stop-color="#AAA" offset="0"/> <stop stop-color="#c8c8c8" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3560" y2="35.721" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(1.0351164,0,0,0.9866216,-0.70291674,-2.1699512)" y1="14.203" x1="24"> + <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="14.203" gradientTransform="matrix(1.0351 0 0 .98662 -.70292 -2.17)" x2="24" y2="35.721"> <stop stop-color="#FFF" offset="0"/> <stop stop-color="#FFF" stop-opacity="0" offset="1"/> </linearGradient> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect opacity="0.15" fill-rule="nonzero" height="2" width="27.2" y="28" x="2.4" fill="url(#linearGradient3026)"/> - <path opacity="0.15" d="m2.4,28v1.9999c-0.9928,0.004-2.4-0.448-2.4-1s1.1078-1,2.4-1z" fill-rule="nonzero" fill="url(#radialGradient3023)"/> - <path opacity="0.15" d="m29.6,28v1.9999c0.99276,0.0038,2.4-0.44808,2.4-1.0001,0-0.552-1.1078-0.99982-2.4-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3020)"/> - <g stroke-linejoin="round" opacity="0.5" clip-path="url(#clipPath3877)" stroke-dashoffset="0" transform="matrix(1.6122259,0,0,1.1260917,-16.324081,-7.0128768)" stroke-linecap="butt" stroke-miterlimit="4"> - <path style="enable-background:accumulate;color:#000000;" d="m13.531,7.5891,13.037,0,0,24.901-13.037,0z" fill-rule="nonzero" stroke="url(#linearGradient3558)" stroke-width="0.74210644" fill="url(#linearGradient3556)"/> - <path opacity="0.6" style="enable-background:accumulate;color:#000000;" d="m14.31,9.4115,11.413,0,0,22.194-11.413,0z" stroke="url(#linearGradient3560)" stroke-width="0.74210638" fill="none"/> + <g> + <rect opacity=".15" height="2" width="27.2" y="28" x="2.4" fill="url(#n)"/> + <path opacity=".15" fill="url(#c)" d="m2.4 28v1.9999c-0.9928 0.004-2.4-0.448-2.4-1s1.1078-1 2.4-1z"/> + <path opacity=".15" fill="url(#d)" d="m29.6 28v1.9999c0.99276 0.0038 2.4-0.44808 2.4-1.0001 0-0.552-1.1078-0.99982-2.4-0.99982z"/> </g> - <g stroke-linejoin="round" stroke-dashoffset="0" transform="translate(0,1)" stroke-linecap="butt" stroke-miterlimit="4" stroke-width="0.9999218"> - <path opacity="0.75" style="enable-background:accumulate;color:#000000;" d="m3.5,2.5,25,0.037621,0,16.962-24.859,0z" fill-rule="nonzero" stroke="url(#linearGradient3552)" fill="url(#linearGradient3550)"/> - <path opacity="0.45" style="enable-background:accumulate;color:#000000;" d="m4.5,3.5,23,0.016517-0.11298,14.984-22.701,0z" stroke="url(#linearGradient3554)" fill="none"/> + <g stroke-linejoin="round" opacity=".5" clip-path="url(#r)" transform="matrix(1.6122 0 0 1.1261 -16.324 -7.0129)"> + <path style="color:#000000" d="m13.531 7.5891h13.037v24.901h-13.037z" stroke="url(#f)" stroke-width=".74211" fill="url(#g)"/> + <path opacity=".6" style="color:#000000" d="m14.31 9.4115h11.413v22.194h-11.413z" stroke="url(#e)" stroke-width=".74211" fill="none"/> </g> - <path stroke-linejoin="round" d="m1.5,5.5c6.6454,0,29,0.00149,29,0.00149l0.000036,22.999h-29v-23z" stroke-dashoffset="0" stroke="url(#linearGradient3017)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.9999218" fill="url(#linearGradient3015)"/> - <path stroke-linejoin="miter" d="m29.5,27.5-27,0,0-21h27z" stroke-dashoffset="0" stroke="url(#linearGradient3012)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="round" style="enable-background:accumulate;color:#000000;" d="m6,28.5h-4.3138c-0.3495-0.27233-0.083736-0.81302-0.16678-1.1986v-21.669l0.048743-0.093529,0.11803-0.038626h4.2551" fill-rule="nonzero" stroke-dashoffset="0" stroke="url(#linearGradient3194)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="url(#radialGradient3192)"/> - <path opacity="0.5" stroke-linejoin="round" d="m5.5,27.5-3,0,0-21,3,0" stroke-dashoffset="0" stroke="url(#linearGradient3076)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="miter" d="m11,8.5,4,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/> - <path stroke-linejoin="miter" d="m16,8.5,2,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/> - <path stroke-linejoin="miter" d="m19,8.5,1,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/> - <path stroke-linejoin="miter" d="m21,8.5,2,0" stroke="#AAA" stroke-linecap="butt" stroke-width="1px" fill="none"/> - <g transform="matrix(1.1415362,0,0,1.1415362,-13.519352,-19.587007)" fill-rule="nonzero"> - <path opacity="0.4" style="enable-background:accumulate;color:#000000;" d="m34.75,25.813a3.8795,3.8795,0,1,1,-2.0522,-3.4222l-1.8273,3.4222z" transform="matrix(1.57008,0,0,1.57008,-16.477866,-6.8527053)" fill="#FFF"/> - <path opacity="0.15" style="enable-background:accumulate;color:#000000;" d="m34.75,25.813a3.8795,3.8795,0,1,1,-2.0522,-3.4222l-1.8273,3.4222z" transform="matrix(1.57008,0,0,1.57008,-16.477866,-7.6014805)" fill="#000"/> + <g stroke-linejoin="round" transform="translate(0,1)" stroke-width=".99992"> + <path opacity=".75" style="color:#000000" d="m3.5 2.5 25 0.037621v16.962h-24.859z" stroke="url(#i)" fill="url(#j)"/> + <path opacity=".45" style="color:#000000" d="m4.5 3.5 23 0.016517-0.11298 14.984h-22.701z" stroke="url(#h)" fill="none"/> </g> - <path style="baseline-shift:baseline;block-progression:tb;color:#000000;direction:ltr;text-indent:0;text-align:start;enable-background:accumulate;text-transform:none;" fill="url(#linearGradient3514)" d="m7.1562,25,0-1,2.2188,0,0,1zm2.6562,0,0-1,6.3438,0,0,1zm-2.6562-4,0-1,2.9688,0,0,1zm3.7188,0,0-1,2.3438,0,0,1zm2.9375,0,0-1,1.1875,0,0,1zm-6.6562-4,0-1,3.2812,0,0,1zm3.875,0,0-1,1.6562,0,0,1zm2.2188,0,0-1,1.75,0,0,1zm-6.0938-4,0-1,3.2812,0,0,1zm3.9062,0,0-1,2.3438,0,0,1z"/> + <g> + <path stroke-linejoin="round" d="m1.5 5.5c6.6454 0 29 0.00149 29 0.00149l0.000036 22.999h-29v-23z" stroke="url(#o)" stroke-width=".99992" fill="url(#p)"/> + <path d="m29.5 27.5h-27v-21h27z" stroke="url(#q)" stroke-linecap="round" fill="none"/> + <path stroke-linejoin="round" style="color:#000000" d="m6 28.5h-4.3138c-0.3495-0.27233-0.083736-0.81302-0.16678-1.1986v-21.669l0.048743-0.093529 0.11803-0.038626h4.2551" stroke="url(#l)" fill="url(#b)"/> + </g> + <g fill="none"> + <path opacity=".5" stroke-linejoin="round" d="m5.5 27.5h-3v-21h3" stroke="url(#m)" stroke-linecap="round"/> + <g stroke="#AAA" stroke-width="1px"> + <path d="m11 8.5h4"/> + <path d="m16 8.5h2"/> + <path d="m19 8.5h1"/> + <path d="m21 8.5h2"/> + </g> + </g> + <g transform="matrix(1.1415 0 0 1.1415 -13.519 -19.587)"> + <path opacity=".4" style="color:#000000" fill="#FFF" d="m34.75 25.813a3.8795 3.8795 0 1 1 -2.0522 -3.4222l-1.8273 3.4222z" transform="matrix(1.5701 0 0 1.5701 -16.478 -6.8527)"/> + <path opacity=".15" style="color:#000000" d="m34.75 25.813a3.8795 3.8795 0 1 1 -2.0522 -3.4222l-1.8273 3.4222z" transform="matrix(1.5701 0 0 1.5701 -16.478 -7.6015)"/> + </g> + <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m7.1562 25v-1h2.2188v1zm2.6562 0v-1h6.3438v1zm-2.6562-4v-1h2.9688v1zm3.7188 0v-1h2.3438v1zm2.9375 0v-1h1.1875v1zm-6.6562-4v-1h3.2812v1zm3.875 0v-1h1.6562v1zm2.2188 0v-1h1.75v1zm-6.0938-4v-1h3.2812v1zm3.9062 0v-1h2.3438v1z" fill="url(#k)"/> </svg> diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png Binary files differindex dfdc74a8bf6..9efe6f29501 100644 --- a/core/img/filetypes/x-office-spreadsheet.png +++ b/core/img/filetypes/x-office-spreadsheet.png diff --git a/core/img/filetypes/x-office-spreadsheet.svg b/core/img/filetypes/x-office-spreadsheet.svg index af40bb252a2..aae8f3c95ca 100644 --- a/core/img/filetypes/x-office-spreadsheet.svg +++ b/core/img/filetypes/x-office-spreadsheet.svg @@ -1,64 +1,63 @@ -<!-- Created with Inkscape (http://www.inkscape.org/) --> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="linearGradient3119" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.56756757,0,0,0.72972971,2.378382,-2.5135063)" y1="5.5641" x1="24"> + <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43"> <stop stop-color="#FFF" offset="0"/> - <stop stop-color="#FFF" stop-opacity="0.23529412" offset="0.036262"/> - <stop stop-color="#FFF" stop-opacity="0.15686275" offset="0.95056"/> - <stop stop-color="#FFF" stop-opacity="0.39215687" offset="1"/> + <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/> + <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/> + <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3122" y2="47.013" gradientUnits="userSpaceOnUse" x2="25.132" gradientTransform="matrix(0.65714319,0,0,0.63012397,0.228556,-1.0896478)" y1="0.98521" x1="25.132"> + <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013"> <stop stop-color="#f4f4f4" offset="0"/> <stop stop-color="#dbdbdb" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3124" y2="2.9062" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(0.53064102,0,0,0.58970216,39.269585,-1.7919079)" y1="50.786" x1="-51.786"> + <linearGradient id="h" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062"> <stop stop-color="#a0a0a0" offset="0"/> <stop stop-color="#bebebe" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3045" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(0.01566318,0,0,0.00823529,17.610433,25.980565)" r="117.14"/> - <linearGradient id="linearGradient5060"> - <stop stop-color="#000" offset="0"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/> + <linearGradient id="a"> + <stop offset="0"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <radialGradient id="radialGradient3048" xlink:href="#linearGradient5060" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-0.01566318,0,0,0.00823529,14.389566,25.980565)" r="117.14"/> - <linearGradient id="linearGradient3180" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(0.04576928,0,0,0.00823529,-0.5423243,25.980548)" x2="302.86" x1="302.86"> - <stop stop-color="#000" stop-opacity="0" offset="0"/> - <stop stop-color="#000" offset="0.5"/> - <stop stop-color="#000" stop-opacity="0" offset="1"/> + <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/> + <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51"> + <stop stop-opacity="0" offset="0"/> + <stop offset=".5"/> + <stop stop-opacity="0" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3522"> + <linearGradient id="b"> <stop stop-color="#a3c0d0" offset="0"/> <stop stop-color="#5a8caa" offset="1"/> </linearGradient> - <linearGradient id="linearGradient3160" y2="46.562" xlink:href="#linearGradient3522" gradientUnits="userSpaceOnUse" x2="19.515" gradientTransform="matrix(0.66297508,0,0,0.5353155,-0.83152673,1.3896027)" y1="12.443" x1="19.515"/> - <linearGradient id="linearGradient3163" y2="46.562" xlink:href="#linearGradient3522" gradientUnits="userSpaceOnUse" x2="19.515" gradientTransform="matrix(0.5348003,0,0,0.65679881,2.2155346,-0.57397791)" y1="12.443" x1="19.515"/> + <linearGradient id="g" x1="19.515" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="12.443" gradientTransform="matrix(.66298 0 0 .53532 -.83153 1.3896)" x2="19.515" y2="46.562"/> + <linearGradient id="f" x1="19.515" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="12.443" gradientTransform="matrix(.53480 0 0 .65680 2.2155 -.57398)" x2="19.515" y2="46.562"/> </defs> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect opacity="0.15" fill-rule="nonzero" height="2" width="22.1" y="29" x="4.95" fill="url(#linearGradient3180)"/> - <path opacity="0.15" d="m4.95,29v1.9999c-0.80662,0.0038-1.95-0.44807-1.95-1.0001,0-0.552,0.90012-0.99982,1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3048)"/> - <path opacity="0.15" d="m27.05,29v1.9999c0.80661,0.0038,1.95-0.44807,1.95-1.0001,0-0.552-0.90012-0.99982-1.95-0.99982z" fill-rule="nonzero" fill="url(#radialGradient3045)"/> - <path stroke-linejoin="round" d="m4.5,0.49996c5.2705,0,23,0.00185,23,0.00185l0.000028,28.998h-23v-29z" stroke-dashoffset="0" stroke="url(#linearGradient3124)" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99992186" fill="url(#linearGradient3122)"/> - <path stroke-linejoin="round" d="m26.5,28.5-21,0,0-27,21,0z" stroke-dashoffset="0" stroke="url(#linearGradient3119)" stroke-linecap="round" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path d="m8.5605,7.7356,3.0828,0,0,17.645-3.0828,0,0-17.645z" fill="url(#linearGradient3163)"/> - <path d="m11,6,12.036,0,0,2-12.036,0,0-2z" fill="url(#linearGradient3160)"/> - <rect height="2.0746" width="3.0786" y="5.9254" x="8.0005" fill="#c0d4df"/> - <path stroke-linejoin="miter" d="m15.5,5.5,0,20" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="miter" d="m23.333,8.5-14.667,0" stroke="#6c6c6c" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="none"/> - <path stroke-linejoin="miter" d="m23.334,10.5-14.667,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="miter" d="m23.5,13.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="miter" d="m23.5,16.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="miter" d="m23.5,19.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path opacity="0.2" stroke-linejoin="round" d="M8.5005,6.5093,22.447,6.4907" fill-rule="evenodd" stroke="#FFF" stroke-linecap="square" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="1" fill="#FFF"/> - <path stroke-linejoin="miter" d="m11.5,5.5,0,20" stroke="#6c6c6c" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <rect stroke-linejoin="miter" stroke-dasharray="none" stroke-dashoffset="0" height="19.998" width="14.998" stroke="#6c6c6c" stroke-linecap="square" stroke-miterlimit="4" y="5.5011" x="8.5011" stroke-width="1.0022" fill="none"/> - <path stroke-linejoin="miter" d="m23.5,22.5-15,0" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> - <path stroke-linejoin="miter" d="m19.5,5.5,0,20" stroke-opacity="0.3241762" stroke="#2c465d" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="0.99999994" fill="none"/> + <g> + <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/> + <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/> + <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/> + </g> + <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#h)" stroke-width=".99992" fill="url(#i)"/> + <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#j)" stroke-linecap="round" fill="none"/> + <path d="m8.5605 7.7356h3.0828v17.645h-3.0828v-17.645z" fill="url(#f)"/> + <path d="m11 6h12.036v2h-12.036v-2z" fill="url(#g)"/> + <rect y="5.9254" width="3.0786" fill="#c0d4df" x="8.0005" height="2.0746"/> + <g fill="none"> + <path d="m15.5 5.5v20" stroke-opacity=".32418" stroke="#2c465d"/> + <path d="m23.333 8.5h-14.667" stroke="#6c6c6c"/> + <g stroke-opacity=".32418" stroke="#2c465d"> + <path d="m23.334 10.5h-14.667"/> + <path d="m23.5 13.5h-15"/> + <path d="m23.5 16.5h-15"/> + <path d="m23.5 19.5h-15"/> + </g> + </g> + <path opacity=".2" stroke-linejoin="round" d="m8.5005 6.5093 13.946-0.0186" fill-rule="evenodd" stroke="#FFF" stroke-linecap="square" fill="#FFF"/> + <g fill="none"> + <path d="m11.5 5.5v20" stroke="#6c6c6c"/> + <rect height="19.998" width="14.998" stroke="#6c6c6c" stroke-linecap="square" x="8.5011" y="5.5011" stroke-width="1.0022"/> + <path d="m23.5 22.5h-15" stroke-opacity=".32418" stroke="#2c465d"/> + <path d="m19.5 5.5v20" stroke-opacity=".32418" stroke="#2c465d"/> + </g> </svg> diff --git a/core/img/image-optimization.sh b/core/img/image-optimization.sh index 0a96bf558d1..e6374c419b2 100755 --- a/core/img/image-optimization.sh +++ b/core/img/image-optimization.sh @@ -2,7 +2,7 @@ function recursive_optimize_images() { cd $1; -optipng -o6 *.png; +optipng -o6 -strip all *.png; jpegoptim --strip-all *.jpg; for svg in `ls *.svg`; do diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png Binary files differindex 5b7d4c6f915..b15c76ecb15 100644 --- a/core/img/logo-wide.png +++ b/core/img/logo-wide.png diff --git a/core/img/logo-wide.svg b/core/img/logo-wide.svg index 29c617d6f83..bacba6755c5 100644 --- a/core/img/logo-wide.svg +++ b/core/img/logo-wide.svg @@ -1,3 +1,3 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xml:space="preserve" height="32" viewBox="0 0 147.33262 32" xmlns:dc="http://purl.org/dc/elements/1.1/" width="147.33" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111"><g fill="#fff"> -<path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m104 13v15.344c0 2.008 1.71 3.656 3.72 3.656v-1c-1.52 0-2.72-1.137-2.72-2.656v-15.344h-1zm42 0v8h-4.53c-2.99 0-5.47 2.571-5.47 5.562s2.48 5.466 5.47 5.438h1.78c0.88 0 1.74-0.442 2.44-1.094 0.7-0.651 1.29-1.555 1.31-2.562v-15.344h-1zm-44.5 2c-4.635 0-8.5 3.865-8.5 8.5s3.865 8.5 8.5 8.5v-1c-4.146 0-7.5-3.353-7.5-7.5s3.354-7.5 7.5-7.5v-1zm-46 6c-0.606 0-1.201 0.092-1.75 0.281 0.071 0.325 0.15 0.664 0.188 1 0.489-0.18 1.007-0.281 1.562-0.281 2.503 0 4.5 1.997 4.5 4.5s-1.997 4.5-4.5 4.5c-1.444 0-2.71-0.676-3.531-1.719-0.198 0.255-0.434 0.485-0.657 0.719 1.017 1.208 2.521 2 4.188 2 2.991 0 5.5-2.509 5.5-5.5s-2.509-5.5-5.5-5.5zm7.5 0v7.344c0 2.008 1.992 3.656 4 3.656 1.368 0 2.905-0.695 3.531-1.812 0.622 1.117 2.101 1.812 3.469 1.812 2.008 0 4-1.648 4-3.656v-7.344h-1v7.344c0 1.519-1.481 2.656-3 2.656s-3-1.002-3-2.656v-7.344h-1v7.344c0 1.519-1.48 2.656-3 2.656-1.519 0-3-1.137-3-2.656v-7.344h-1zm22.531 0c-2.991 0-5.531 2.54-5.531 5.531v5.469h1v-5.469c0-2.502 2.029-4.531 4.531-4.531 2.503 0 4.469 2.029 4.469 4.531v5.469h1v-5.469c0-2.991-2.477-5.531-5.469-5.531zm29.969 0c-2.99 0-5.5 2.509-5.5 5.5s2.51 5.5 5.5 5.5 5.5-2.509 5.5-5.5-2.51-5.5-5.5-5.5zm7.5 0v5.562c0 2.991 2.48 5.438 5.47 5.438s5.53-2.447 5.53-5.438v-5.562h-1v5.562c0 2.502-2.03 4.438-4.53 4.438s-4.47-1.936-4.47-4.438v-5.562h-1zm-7.5 1c2.5 0 4.5 1.997 4.5 4.5s-2 4.5-4.5 4.5-4.5-1.997-4.5-4.5 2-4.5 4.5-4.5zm25.97 0h4.53v6.344c-0.01 0.7-0.35 1.387-0.91 1.906-0.55 0.519-1.27 0.75-1.84 0.75h-1.78c-2.5 0-4.47-1.936-4.47-4.438s1.97-4.562 4.47-4.562z" transform="translate(-.0000031714)"/><path d="m16.398 3.6857c-2.2943 0-4.1386 1.8599-4.1386 4.1542 0 0.74283 0.19165 1.4447 0.53099 2.0459 1.3845-0.781 2.9851-1.2338 4.6852-1.2338 0.16408 0 0.32211 0.00666 0.48414 0.015617-0.01834-0.23258-0.03123-0.46554-0.03123-0.70278 0-1.2779 0.27755-2.4937 0.76525-3.592-0.657-0.4403-1.443-0.6871-2.296-0.6871z"/><path d="m7.9805 15.852c-4.4057 0-7.9805 3.5435-7.9805 7.9492s3.5748 7.9805 7.9805 7.9805c1.6769 0 3.2302-0.52246 4.5134-1.4056-0.53024-0.82393-0.84334-1.809-0.84334-2.858 0-0.54446 0.08034-1.0675 0.23426-1.5617-2.4023-1.7361-3.9668-4.5612-3.9668-7.7462 0-0.80924 0.10664-1.5917 0.29673-2.3426-0.078902-0.0023-0.15479-0.01562-0.23426-0.01562z"/><path d="m17.476 9.5578c-4.7826 0-8.652 3.8694-8.652 8.652 0 2.8154 1.3414 5.3078 3.4202 6.8873 0.87636-1.6903 2.6365-2.8424 4.6696-2.8424 0.24572 0 0.48158 0.02978 0.7184 0.06247-0.07434-0.54088-0.10932-1.0943-0.10932-1.6554 0-2.6831 0.87339-5.1644 2.3582-7.1684-0.889-1.112-1.525-2.448-1.796-3.9039-0.201-0.014-0.405-0.0313-0.609-0.0313z"/><path d="m36.045 6.5437c-0.1695 0-0.33288 0.02081-0.49976 0.031235 0.07218 0.45513 0.12494 0.9147 0.12494 1.3899 0 0.7396-0.09406 1.4533-0.2655 2.1396 2.01 1.1123 3.6791 2.7767 4.7789 4.7945 1.1407-0.59386 2.4132-0.97147 3.7638-1.062-0.34807-4.082-3.7298-7.2933-7.9024-7.2933z"/><path d="m26.799 5.1362e-7c-4.4056 0-7.9649 3.5593-7.9649 7.9649 0 1.816 0.60469 3.4874 1.6242 4.8258 2.2117-2.5599 5.4759-4.1855 9.1205-4.1855 1.7831 0 3.474 0.39707 4.9976 1.0932 0.124-0.5582 0.188-1.1384 0.188-1.7338 0-4.4056-3.559-7.9649-7.965-7.9649z"/><path d="m44.588 14.712c-1.4522 0-2.8126 0.37076-4.0137 0.99951 0.682 1.5107 1.062 3.1868 1.062 4.9507 0 3.3027-1.3279 6.3016-3.4827 8.4802 1.583 1.7575 3.8797 2.858 6.4344 2.858 4.7826 0 8.652-3.8694 8.652-8.652 0-4.7827-3.8694-8.6364-8.652-8.6364z"/><path d="m16.914 23.161c-2.415 0-4.3572 1.9422-4.3572 4.3572s1.9422 4.3729 4.3572 4.3729c1.8512 0 3.4224-1.1551 4.0605-2.7799-1.557-1.5857-2.6759-3.6087-3.1703-5.8565-0.28932-0.05983-0.58298-0.09371-0.89019-0.09371z"/><path d="m29.579 9.511c-6.1647 0-11.151 4.9857-11.151 11.151 0 6.1645 4.9858 11.151 11.151 11.151 6.165 0 11.151-4.9864 11.151-11.151 0-6.1651-4.9861-11.151-11.151-11.151z"/></g></svg> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 595.275 311.111" xml:space="preserve" height="32" width="147.33" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 147.33262 32" xmlns:dc="http://purl.org/dc/elements/1.1/"><g fill="#fff"> +<path style="block-progression:tb;color:#000000;enable-background:accumulate;text-transform:none;text-indent:0" d="m104 13v15.344c0 2.008 1.71 3.656 3.72 3.656v-1c-1.52 0-2.72-1.137-2.72-2.656v-15.344h-1zm42 0v8h-4.53c-2.99 0-5.47 2.571-5.47 5.562s2.48 5.466 5.47 5.438h1.78c0.88 0 1.74-0.442 2.44-1.094 0.7-0.651 1.29-1.555 1.31-2.562v-15.344h-1zm-44.5 2c-4.635 0-8.5 3.865-8.5 8.5s3.865 8.5 8.5 8.5v-1c-4.146 0-7.5-3.353-7.5-7.5s3.354-7.5 7.5-7.5v-1zm-46 6c-0.606 0-1.201 0.092-1.75 0.281 0.071 0.325 0.15 0.664 0.188 1 0.489-0.18 1.007-0.281 1.562-0.281 2.503 0 4.5 1.997 4.5 4.5s-1.997 4.5-4.5 4.5c-1.444 0-2.71-0.676-3.531-1.719-0.198 0.255-0.434 0.485-0.657 0.719 1.017 1.208 2.521 2 4.188 2 2.991 0 5.5-2.509 5.5-5.5s-2.509-5.5-5.5-5.5zm7.5 0v7.344c0 2.008 1.992 3.656 4 3.656 1.368 0 2.905-0.695 3.531-1.812 0.622 1.117 2.101 1.812 3.469 1.812 2.008 0 4-1.648 4-3.656v-7.344h-1v7.344c0 1.519-1.481 2.656-3 2.656s-3-1.002-3-2.656v-7.344h-1v7.344c0 1.519-1.48 2.656-3 2.656-1.519 0-3-1.137-3-2.656v-7.344h-1zm22.531 0c-2.991 0-5.531 2.54-5.531 5.531v5.469h1v-5.469c0-2.502 2.029-4.531 4.531-4.531 2.503 0 4.469 2.029 4.469 4.531v5.469h1v-5.469c0-2.991-2.477-5.531-5.469-5.531zm29.969 0c-2.99 0-5.5 2.509-5.5 5.5s2.51 5.5 5.5 5.5 5.5-2.509 5.5-5.5-2.51-5.5-5.5-5.5zm7.5 0v5.562c0 2.991 2.48 5.438 5.47 5.438s5.53-2.447 5.53-5.438v-5.562h-1v5.562c0 2.502-2.03 4.438-4.53 4.438s-4.47-1.936-4.47-4.438v-5.562h-1zm-7.5 1c2.5 0 4.5 1.997 4.5 4.5s-2 4.5-4.5 4.5-4.5-1.997-4.5-4.5 2-4.5 4.5-4.5zm25.97 0h4.53v6.344c-0.01 0.7-0.35 1.387-0.91 1.906-0.55 0.519-1.27 0.75-1.84 0.75h-1.78c-2.5 0-4.47-1.936-4.47-4.438s1.97-4.562 4.47-4.562z" transform="translate(-.0000031714)"/><path d="m16.398 3.6857c-2.2943 0-4.1386 1.8599-4.1386 4.1542 0 0.74283 0.19165 1.4447 0.53099 2.0459 1.3845-0.781 2.9851-1.2338 4.6852-1.2338 0.16408 0 0.32211 0.00666 0.48414 0.015617-0.01834-0.23258-0.03123-0.46554-0.03123-0.70278 0-1.2779 0.27755-2.4937 0.76525-3.592-0.657-0.4403-1.443-0.6871-2.296-0.6871z"/><path d="m7.9805 15.852c-4.4057 0-7.9805 3.5435-7.9805 7.9492s3.5748 7.9805 7.9805 7.9805c1.6769 0 3.2302-0.52246 4.5134-1.4056-0.53024-0.82393-0.84334-1.809-0.84334-2.858 0-0.54446 0.08034-1.0675 0.23426-1.5617-2.4023-1.7361-3.9668-4.5612-3.9668-7.7462 0-0.80924 0.10664-1.5917 0.29673-2.3426-0.078902-0.0023-0.15479-0.01562-0.23426-0.01562z"/><path d="m17.476 9.5578c-4.7826 0-8.652 3.8694-8.652 8.652 0 2.8154 1.3414 5.3078 3.4202 6.8873 0.87636-1.6903 2.6365-2.8424 4.6696-2.8424 0.24572 0 0.48158 0.02978 0.7184 0.06247-0.07434-0.54088-0.10932-1.0943-0.10932-1.6554 0-2.6831 0.87339-5.1644 2.3582-7.1684-0.889-1.112-1.525-2.448-1.796-3.9039-0.201-0.014-0.405-0.0313-0.609-0.0313z"/><path d="m36.045 6.5437c-0.1695 0-0.33288 0.02081-0.49976 0.031235 0.07218 0.45513 0.12494 0.9147 0.12494 1.3899 0 0.7396-0.09406 1.4533-0.2655 2.1396 2.01 1.1123 3.6791 2.7767 4.7789 4.7945 1.1407-0.59386 2.4132-0.97147 3.7638-1.062-0.34807-4.082-3.7298-7.2933-7.9024-7.2933z"/><path d="m26.799 5.1362e-7c-4.4056 0-7.9649 3.5593-7.9649 7.9649 0 1.816 0.60469 3.4874 1.6242 4.8258 2.2117-2.5599 5.4759-4.1855 9.1205-4.1855 1.7831 0 3.474 0.39707 4.9976 1.0932 0.124-0.5582 0.188-1.1384 0.188-1.7338 0-4.4056-3.559-7.9649-7.965-7.9649z"/><path d="m44.588 14.712c-1.4522 0-2.8126 0.37076-4.0137 0.99951 0.682 1.5107 1.062 3.1868 1.062 4.9507 0 3.3027-1.3279 6.3016-3.4827 8.4802 1.583 1.7575 3.8797 2.858 6.4344 2.858 4.7826 0 8.652-3.8694 8.652-8.652 0-4.7827-3.8694-8.6364-8.652-8.6364z"/><path d="m16.914 23.161c-2.415 0-4.3572 1.9422-4.3572 4.3572s1.9422 4.3729 4.3572 4.3729c1.8512 0 3.4224-1.1551 4.0605-2.7799-1.557-1.5857-2.6759-3.6087-3.1703-5.8565-0.28932-0.05983-0.58298-0.09371-0.89019-0.09371z"/><path d="m29.579 9.511c-6.1647 0-11.151 4.9857-11.151 11.151 0 6.1645 4.9858 11.151 11.151 11.151 6.165 0 11.151-4.9864 11.151-11.151 0-6.1651-4.9861-11.151-11.151-11.151z"/></g></svg> diff --git a/core/img/logo.png b/core/img/logo.png Binary files differindex 8d112d99be5..2c551a1c22c 100644 --- a/core/img/logo.png +++ b/core/img/logo.png diff --git a/core/img/logo.svg b/core/img/logo.svg index cfb20b60e4f..06008c41c57 100644 --- a/core/img/logo.svg +++ b/core/img/logo.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xml:space="preserve" height="118.23" viewBox="0 0 250.00001 118.22802" xmlns:dc="http://purl.org/dc/elements/1.1/" width="250" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" y="0px" x="0px" enable-background="new 0 0 595.275 311.111"> -<path style="block-progression:tb;text-indent:0;color:#000000;enable-background:accumulate;text-transform:none" d="m150.66 0c-11.241 0-20.322 9.0815-20.322 20.322 0 4.6335 1.5429 8.898 4.1442 12.313 5.6431-6.5315 13.972-10.679 23.271-10.679 4.5496 0 8.8639 1.0131 12.751 2.7893 0.31474-1.4234 0.47817-2.9037 0.47817-4.4231 0.01-11.24-9.08-20.322-20.32-20.322zm-26.539 9.404c-5.8539 0-10.56 4.7456-10.56 10.599 0 1.8953 0.48899 3.6862 1.3548 5.22 3.5325-1.9927 7.6164-3.148 11.954-3.148 0.41864 0 0.82186 0.01699 1.2353 0.03985-0.0468-0.59343-0.0797-1.1878-0.0797-1.7931 0-3.2605 0.70816-6.3627 1.9525-9.165-1.6754-1.1235-3.6828-1.7533-5.8576-1.7533zm50.128 7.2921c-0.43247 0-0.84934 0.05309-1.2751 0.0797 0.18418 1.1613 0.31878 2.3339 0.31878 3.5464 0 1.8871-0.24 3.708-0.67741 5.4591 5.1284 2.8381 9.3873 7.0847 12.193 12.233 2.9105-1.5152 6.1573-2.4787 9.6033-2.7096-0.8881-10.415-9.5166-18.609-20.163-18.609zm-16.497 7.5711c-15.729 0-28.451 12.721-28.451 28.451 0 15.729 12.721 28.451 28.451 28.451s28.451-12.723 28.451-28.451c0-15.73-12.722-28.451-28.451-28.451zm-30.882 0.11954c-12.203 0-22.076 9.8727-22.076 22.076 0 7.1836 3.4227 13.543 8.7266 17.573 2.236-4.3127 6.727-7.2523 11.914-7.2523 0.62695 0 1.2287 0.07599 1.833 0.15939-0.18969-1.3801-0.27893-2.792-0.27893-4.2239 0-6.846 2.2284-13.177 6.017-18.29-2.2678-2.8377-3.8907-6.2474-4.5825-9.9619-0.51269-0.03551-1.0323-0.0797-1.5541-0.0797zm69.18 13.149c-3.7054 0-7.1763 0.94599-10.241 2.5503 1.7401 3.8545 2.7096 8.1312 2.7096 12.632 0 8.4268-3.3881 16.079-8.886 21.637 4.039 4.4841 9.8991 7.2921 16.417 7.2921 12.203 0 22.076-9.8727 22.076-22.076s-9.8727-22.036-22.076-22.036zm-93.403 2.9089c-11.241 0-20.362 9.0413-20.362 20.282s9.121 20.362 20.362 20.362c4.2785 0 8.2419-1.333 11.516-3.5863-1.3529-2.1023-2.1518-4.6156-2.1518-7.2921 0-1.3892 0.20497-2.7238 0.59771-3.9848-6.1294-4.4296-10.121-11.638-10.121-19.764 0-2.0648 0.27209-4.0613 0.75711-5.9772-0.20132-0.0058-0.39495-0.03985-0.59772-0.03985zm119.5 17.453c-0.59968 0-1.1799 0.06831-1.7533 0.15939 0.0316 0.50688 0.0398 0.99939 0.0398 1.5142 0 6.4816-2.5574 12.364-6.6944 16.736 2.0353 2.3668 5.0248 3.8652 8.4079 3.8652 6.1623 0 11.157-4.9552 11.157-11.117 0-6.1623-4.9951-11.157-11.157-11.157zm-96.71 1.1954c-6.162 0-11.118 4.9555-11.118 11.117 0 6.162 4.9555 11.157 11.118 11.157 4.7232 0 8.7323-2.9472 10.36-7.0929-3.9726-4.046-6.8276-9.2077-8.0891-14.943-0.73821-0.15266-1.4875-0.23909-2.2713-0.23909zm122.21 9.3642v22.036h-11.675c-7.6322 0-13.827 6.2347-13.827 13.867 0 7.6311 6.195 13.827 13.827 13.827h3.387 1.1556c2.239 0 4.4748-1.0874 6.2561-2.7495s3.1409-3.9644 3.1878-6.535c0.0801-4.4122 0-17.254 0-17.254v-0.55787-22.633h-2.3112zm-106.75 9.9619v30.483c0 5.1232 4.2011 9.2845 9.3244 9.2845v-2.3112c-3.8766 0-7.0132-3.0967-7.0132-6.9733v-29.049c-0.80461-0.4325-1.5514-0.93449-2.3112-1.4345zm-23.112 2.8292c-4.0935 3.9059-6.6546 9.4053-6.6546 15.501 0 11.827 9.6118 21.438 21.438 21.438v-2.3112c-10.579 0-19.127-8.5469-19.127-19.127 0-5.6905 2.4839-10.805 6.4155-14.305-0.73485-0.33851-1.4155-0.73502-2.0721-1.1954zm-27.216 9.165c-7.6322 0-13.827 6.1949-13.827 13.827v12.791h2.3112v-12.791c0-6.3852 5.1309-11.556 11.516-11.556 6.3864 0 11.556 5.1706 11.556 11.556v12.791h2.3112v-12.791c0-7.6322-6.2338-13.827-13.867-13.827zm77.583 0.0797c-7.6326 0-13.827 6.2344-13.827 13.867s6.1945 13.867 13.827 13.867c7.6326 0 13.867-6.2344 13.867-13.867s-6.2344-13.867-13.867-13.867zm-154.29 0.0398c-7.632 0-13.867 6.1952-13.867 13.827 0 7.632 6.235 13.827 13.867 13.827s13.827-6.1952 13.827-13.827c0-7.632-6.1952-13.827-13.827-13.827zm20.761 1.036v17.334c0 5.1234 4.1622 9.2845 9.2845 9.2845 3.4912 0 6.5716-1.9303 8.1688-4.7817 1.5857 2.8514 4.6384 4.7817 8.1289 4.7817 5.1233 0 9.3243-4.1611 9.3243-9.2845v-17.334h-2.3112v17.334c0 3.8764-3.1366 6.9733-7.0132 6.9733s-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112v17.334c0 3.8766-3.1352 6.9733-7.0132 6.9733-3.8753 0-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112zm153.45 0v12.791c0 7.6311 6.195 13.827 13.827 13.827 7.6322 0 13.867-6.1959 13.867-13.827v-12.791h-2.3112v12.791c0 6.3837-5.1707 11.516-11.556 11.516-6.3851 0-11.516-5.1322-11.516-11.516v-12.791h-2.3112zm-19.924 1.2353c6.3856 0 11.556 5.1702 11.556 11.556 0 6.3856-5.1702 11.556-11.556 11.556-6.3856 0-11.516-5.1702-11.516-11.556 0-6.3856 5.1304-11.556 11.516-11.556zm67.821 0h11.675c0.009 1.5271 0.0728 12.046 0 16.059-0.0326 1.7858-1.0121 3.5776-2.4307 4.9013-1.4186 1.3236-3.2544 2.1119-4.702 2.1119h-4.5426c-6.3851 0-11.516-5.1322-11.516-11.516 0-6.3852 5.1309-11.556 11.516-11.556zm-222.11 0.0399c6.385 0 11.516 5.131 11.516 11.516s-5.131 11.516-11.516 11.516-11.556-5.131-11.556-11.516 5.1708-11.516 11.556-11.516z" fill="#fff"/> +<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 595.275 311.111" xml:space="preserve" height="118.23" width="250" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 250.00001 118.22802" xmlns:dc="http://purl.org/dc/elements/1.1/"> +<path style="block-progression:tb;color:#000000;enable-background:accumulate;text-transform:none;text-indent:0" d="m150.66 0c-11.241 0-20.322 9.0815-20.322 20.322 0 4.6335 1.5429 8.898 4.1442 12.313 5.6431-6.5315 13.972-10.679 23.271-10.679 4.5496 0 8.8639 1.0131 12.751 2.7893 0.31474-1.4234 0.47817-2.9037 0.47817-4.4231 0.01-11.24-9.08-20.322-20.32-20.322zm-26.539 9.404c-5.8539 0-10.56 4.7456-10.56 10.599 0 1.8953 0.48899 3.6862 1.3548 5.22 3.5325-1.9927 7.6164-3.148 11.954-3.148 0.41864 0 0.82186 0.01699 1.2353 0.03985-0.0468-0.59343-0.0797-1.1878-0.0797-1.7931 0-3.2605 0.70816-6.3627 1.9525-9.165-1.6754-1.1235-3.6828-1.7533-5.8576-1.7533zm50.128 7.2921c-0.43247 0-0.84934 0.05309-1.2751 0.0797 0.18418 1.1613 0.31878 2.3339 0.31878 3.5464 0 1.8871-0.24 3.708-0.67741 5.4591 5.1284 2.8381 9.3873 7.0847 12.193 12.233 2.9105-1.5152 6.1573-2.4787 9.6033-2.7096-0.8881-10.415-9.5166-18.609-20.163-18.609zm-16.497 7.5711c-15.729 0-28.451 12.721-28.451 28.451 0 15.729 12.721 28.451 28.451 28.451s28.451-12.723 28.451-28.451c0-15.73-12.722-28.451-28.451-28.451zm-30.882 0.11954c-12.203 0-22.076 9.8727-22.076 22.076 0 7.1836 3.4227 13.543 8.7266 17.573 2.236-4.3127 6.727-7.2523 11.914-7.2523 0.62695 0 1.2287 0.07599 1.833 0.15939-0.18969-1.3801-0.27893-2.792-0.27893-4.2239 0-6.846 2.2284-13.177 6.017-18.29-2.2678-2.8377-3.8907-6.2474-4.5825-9.9619-0.51269-0.03551-1.0323-0.0797-1.5541-0.0797zm69.18 13.149c-3.7054 0-7.1763 0.94599-10.241 2.5503 1.7401 3.8545 2.7096 8.1312 2.7096 12.632 0 8.4268-3.3881 16.079-8.886 21.637 4.039 4.4841 9.8991 7.2921 16.417 7.2921 12.203 0 22.076-9.8727 22.076-22.076s-9.8727-22.036-22.076-22.036zm-93.403 2.9089c-11.241 0-20.362 9.0413-20.362 20.282s9.121 20.362 20.362 20.362c4.2785 0 8.2419-1.333 11.516-3.5863-1.3529-2.1023-2.1518-4.6156-2.1518-7.2921 0-1.3892 0.20497-2.7238 0.59771-3.9848-6.1294-4.4296-10.121-11.638-10.121-19.764 0-2.0648 0.27209-4.0613 0.75711-5.9772-0.20132-0.0058-0.39495-0.03985-0.59772-0.03985zm119.5 17.453c-0.59968 0-1.1799 0.06831-1.7533 0.15939 0.0316 0.50688 0.0398 0.99939 0.0398 1.5142 0 6.4816-2.5574 12.364-6.6944 16.736 2.0353 2.3668 5.0248 3.8652 8.4079 3.8652 6.1623 0 11.157-4.9552 11.157-11.117 0-6.1623-4.9951-11.157-11.157-11.157zm-96.71 1.1954c-6.162 0-11.118 4.9555-11.118 11.117 0 6.162 4.9555 11.157 11.118 11.157 4.7232 0 8.7323-2.9472 10.36-7.0929-3.9726-4.046-6.8276-9.2077-8.0891-14.943-0.73821-0.15266-1.4875-0.23909-2.2713-0.23909zm122.21 9.3642v22.036h-11.675c-7.6322 0-13.827 6.2347-13.827 13.867 0 7.6311 6.195 13.827 13.827 13.827h4.5426c2.239 0 4.4748-1.0874 6.2561-2.7495s3.1409-3.9644 3.1878-6.535c0.0801-4.4122 0-17.254 0-17.254v-23.191h-2.3112zm-106.75 9.9619v30.483c0 5.1232 4.2011 9.2845 9.3244 9.2845v-2.3112c-3.8766 0-7.0132-3.0967-7.0132-6.9733v-29.049c-0.80461-0.4325-1.5514-0.93449-2.3112-1.4345zm-23.112 2.8292c-4.0935 3.9059-6.6546 9.4053-6.6546 15.501 0 11.827 9.6118 21.438 21.438 21.438v-2.3112c-10.579 0-19.127-8.5469-19.127-19.127 0-5.6905 2.4839-10.805 6.4155-14.305-0.73485-0.33851-1.4155-0.73502-2.0721-1.1954zm-27.216 9.165c-7.6322 0-13.827 6.1949-13.827 13.827v12.791h2.3112v-12.791c0-6.3852 5.1309-11.556 11.516-11.556 6.3864 0 11.556 5.1706 11.556 11.556v12.791h2.3112v-12.791c0-7.6322-6.2338-13.827-13.867-13.827zm77.583 0.0797c-7.6326 0-13.827 6.2344-13.827 13.867s6.1945 13.867 13.827 13.867c7.6326 0 13.867-6.2344 13.867-13.867s-6.2344-13.867-13.867-13.867zm-154.29 0.0398c-7.632 0-13.867 6.1952-13.867 13.827 0 7.632 6.235 13.827 13.867 13.827s13.827-6.1952 13.827-13.827c0-7.632-6.1952-13.827-13.827-13.827zm20.761 1.036v17.334c0 5.1234 4.1622 9.2845 9.2845 9.2845 3.4912 0 6.5716-1.9303 8.1688-4.7817 1.5857 2.8514 4.6384 4.7817 8.1289 4.7817 5.1233 0 9.3243-4.1611 9.3243-9.2845v-17.334h-2.3112v17.334c0 3.8764-3.1366 6.9733-7.0132 6.9733s-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112v17.334c0 3.8766-3.1352 6.9733-7.0132 6.9733-3.8753 0-6.9733-3.0969-6.9733-6.9733v-17.334h-2.3112zm153.45 0v12.791c0 7.6311 6.195 13.827 13.827 13.827 7.6322 0 13.867-6.1959 13.867-13.827v-12.791h-2.3112v12.791c0 6.3837-5.1707 11.516-11.556 11.516-6.3851 0-11.516-5.1322-11.516-11.516v-12.791h-2.3112zm-19.924 1.2353c6.3856 0 11.556 5.1702 11.556 11.556 0 6.3856-5.1702 11.556-11.556 11.556-6.3856 0-11.516-5.1702-11.516-11.556 0-6.3856 5.1304-11.556 11.516-11.556zm67.821 0h11.675c0.009 1.5271 0.0728 12.046 0 16.059-0.0326 1.7858-1.0121 3.5776-2.4307 4.9013-1.4186 1.3236-3.2544 2.1119-4.702 2.1119h-4.5426c-6.3851 0-11.516-5.1322-11.516-11.516 0-6.3852 5.1309-11.556 11.516-11.556zm-222.11 0.0399c6.385 0 11.516 5.131 11.516 11.516s-5.131 11.516-11.516 11.516-11.556-5.131-11.556-11.516 5.1708-11.516 11.556-11.516z" fill="#fff"/> </svg> diff --git a/core/img/places/calendar-dark.png b/core/img/places/calendar-dark.png Binary files differindex 920dee610dd..39032bcfa1a 100644 --- a/core/img/places/calendar-dark.png +++ b/core/img/places/calendar-dark.png diff --git a/core/img/places/contacts-dark.png b/core/img/places/contacts-dark.png Binary files differindex a08339d1d3d..ec60fb603fb 100644 --- a/core/img/places/contacts-dark.png +++ b/core/img/places/contacts-dark.png diff --git a/core/img/places/contacts-dark.svg b/core/img/places/contacts-dark.svg index 3fc10cfe08f..9c95478cdfe 100644 --- a/core/img/places/contacts-dark.svg +++ b/core/img/places/contacts-dark.svg @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> <g transform="translate(-359.05 -515.86)"> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m368.29 523.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z" fill="#fff"/> - <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m368.29 522.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m368.29 523.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z" fill="#fff"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m368.29 522.53c-1.9549 0-3.6133 1.4297-3.6133 3.2747 0.0139 0.58316 0.066 1.3023 0.41402 2.823v0.0376l0.0377 0.0377c0.11171 0.32 0.27429 0.50305 0.4893 0.7528 0.21502 0.24974 0.47136 0.54371 0.71513 0.79045 0.0288 0.029 0.047 0.0469 0.0752 0.0753 0.0483 0.21038 0.1069 0.43679 0.15055 0.63988 0.11614 0.54034 0.10423 0.92299 0.0752 1.0539-0.84004 0.29496-1.8851 0.64623-2.8229 1.0539-0.52647 0.22889-1.0029 0.43328-1.3926 0.67751-0.38974 0.24425-0.77735 0.42877-0.90332 0.97865-0.002 0.025-0.002 0.0502 0 0.0753-0.1231 1.1304-0.30932 2.7926-0.45166 3.9146-0.0307 0.23616 0.0937 0.48512 0.3011 0.60223 1.7027 0.91975 4.3182 1.2899 6.9255 1.2798 2.6073-0.0102 5.202-0.4021 6.8502-1.2798 0.20736-0.11711 0.33184-0.36607 0.3011-0.60223-0.0454-0.35072-0.10126-1.1415-0.15055-1.9197-0.0493-0.77812-0.092-1.5435-0.15055-1.9949-0.0204-0.1119-0.0734-0.21766-0.15056-0.30112-0.52359-0.62524-1.3058-1.0075-2.2207-1.3927-0.83517-0.35169-1.8143-0.71689-2.7852-1.1292-0.0543-0.12106-0.10833-0.47327 0-1.0163 0.029-0.1458 0.0747-0.30196 0.11292-0.45168 0.0913-0.1022 0.16236-0.18571 0.26346-0.30112 0.21564-0.24614 0.44734-0.50432 0.63986-0.7528 0.19251-0.24849 0.35001-0.46165 0.45166-0.7528l0.0377-0.0376c0.39341-1.5879 0.39363-2.2504 0.41403-2.823v-0.0377c0-1.845-1.6584-3.2747-3.6133-3.2747zm10.336-3.005c-2.8502 0-5.268 2.0843-5.268 4.7742 0.0202 0.85019 0.0963 1.8986 0.60362 4.1157v0.0549l0.0549 0.0549c0.16287 0.46651 0.39989 0.73339 0.71338 1.0975s0.68722 0.79267 1.0426 1.1524c0.0418 0.0423 0.0686 0.0686 0.10975 0.10977 0.0705 0.3067 0.15586 0.63679 0.21951 0.93288 0.16931 0.78776 0.15194 1.3456 0.10976 1.5365-1.2247 0.43004-2.7484 0.94215-4.1156 1.5365-0.76758 0.3337-1.4622 0.63168-2.0304 0.98778-0.56823 0.35608-1.1333 0.6251-1.317 1.4268-0.003 0.0365-0.003 0.0733 0 0.10977-0.17948 1.648-0.45098 4.0713-0.6585 5.707-0.0448 0.34431 0.13667 0.70727 0.439 0.87801 2.4824 1.3409 6.2957 1.8806 10.097 1.8658s7.5842-0.58622 9.9873-1.8658c0.30232-0.17074 0.4838-0.5337 0.439-0.87801-0.0663-0.51129-0.14765-1.6642-0.21951-2.7986-0.0719-1.1344-0.13422-2.2504-0.21948-2.9084-0.0298-0.16311-0.10688-0.31733-0.2195-0.43899-0.76337-0.91154-1.9039-1.4688-3.2376-2.0304-1.2177-0.51271-2.6452-1.0452-4.0608-1.6462-0.0791-0.1765-0.15794-0.69001 0-1.4816 0.0424-0.21256 0.10883-0.44024 0.16463-0.65849 0.13304-0.14901 0.23672-0.27077 0.38413-0.43901 0.3144-0.35883 0.6522-0.73526 0.93288-1.0975 0.28067-0.36226 0.51031-0.67304 0.65849-1.0975l0.0549-0.0549c0.57359-2.3149 0.57389-3.2809 0.60364-4.1157v-0.0549c0-2.6898-2.4179-4.7742-5.268-4.7742z"/> </g> </svg> diff --git a/core/img/places/file.png b/core/img/places/file.png Binary files differindex 63837a1af90..ff179e96b64 100644 --- a/core/img/places/file.png +++ b/core/img/places/file.png diff --git a/core/img/places/file.svg b/core/img/places/file.svg index f93f3ef6fae..ea2ea068ce6 100644 --- a/core/img/places/file.svg +++ b/core/img/places/file.svg @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="a" y2="54.703" gradientUnits="userSpaceOnUse" y1="2.2401" gradientTransform="matrix(.21864 0 0 .26685 18.619 -19.598)" x2="-41.553" x1="-41.553"> + <linearGradient id="a" x1="-41.553" gradientUnits="userSpaceOnUse" x2="-41.553" gradientTransform="matrix(.21864 0 0 .26685 18.619 -19.598)" y1="2.2401" y2="54.703"> <stop offset="0"/> <stop stop-color="#363636" offset="1"/> </linearGradient> </defs> <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> <g transform="translate(-3.1069e-8 20)"> - <path opacity=".6" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m3.3501-17.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="#fff"/> - <path opacity=".7" style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m3.3501-18.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="url(#a)"/> + <path opacity=".6" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m3.3501-17.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="#fff"/> + <path opacity=".7" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m3.3501-18.998c-0.19747 0.03825-0.35355 0.23333-0.35 0.43744v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.0033-0.06685-0.02179-0.13289-0.05384-0.19138-0.96556-1.3896-2.0351-2.4191-3.3115-3.1988-0.04304-0.01632-0.08869-0.02559-0.13462-0.02734h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.2643 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z" fill="url(#a)"/> </g> </svg> diff --git a/core/img/places/files.png b/core/img/places/files.png Binary files differindex 52e0c6bf949..16c78efe40f 100644 --- a/core/img/places/files.png +++ b/core/img/places/files.png diff --git a/core/img/places/files.svg b/core/img/places/files.svg index d446ef655ae..970f5b56296 100644 --- a/core/img/places/files.svg +++ b/core/img/places/files.svg @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <g fill-rule="evenodd" transform="translate(573.14 110.3)"> + <g transform="translate(573.14 110.3)" fill-rule="evenodd"> <path d="m-570.22-108.3c-0.50115 0-0.92082 0.41966-0.92082 0.92081v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86215 0.88497-0.86215h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z"/> <path d="m-570.22-107.3c-0.50115 0-0.92082 0.41966-0.92082 0.92081v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86214 0.88497-0.86214h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z" fill="#fff"/> </g> diff --git a/core/img/places/folder.png b/core/img/places/folder.png Binary files differindex 46079e03e9e..d8eb4ccf4c6 100644 --- a/core/img/places/folder.png +++ b/core/img/places/folder.png diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg index 676f10afe0b..edc9e7e208a 100644 --- a/core/img/places/folder.svg +++ b/core/img/places/folder.svg @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" x2="209.34" y1="998.46" x1="209.34"> + <linearGradient id="a" y2="1013.5" gradientUnits="userSpaceOnUse" y1="998.46" x2="209.34" x1="209.34"> <stop offset="0"/> <stop stop-color="#363636" offset="1"/> </linearGradient> </defs> <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> - <g fill-rule="evenodd" transform="translate(-7.5118e-7 40)"> + <g transform="translate(-7.5118e-7 40)" fill-rule="evenodd"> <g opacity=".6" transform="matrix(.86667 0 0 .86667 -172.04 -903.43)" fill="#fff"> - <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd" fill="#fff"/> + <path fill="#fff" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/> </g> <g opacity=".7" transform="matrix(.86667 0 0 .86667 -172.04 -904.43)" fill="url(#a)"> - <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd" fill="url(#a)"/> + <path fill="url(#a)" d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2326 0.53125-0.5312l0.0004-8.166c0-0.2891-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.277-0.30237 0.5637-0.57937 0.5637s-0.57447-0.2867-0.57447-0.5637l0.0004-7.0056c0-0.277 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/> </g> </g> </svg> diff --git a/core/img/places/home.png b/core/img/places/home.png Binary files differindex e664719e2ec..8905bd7fb3c 100644 --- a/core/img/places/home.png +++ b/core/img/places/home.png diff --git a/core/img/places/home.svg b/core/img/places/home.svg index 80b7dcc8663..bb75f259b4b 100644 --- a/core/img/places/home.svg +++ b/core/img/places/home.svg @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/"> <defs> - <linearGradient id="a" y2="15" gradientUnits="userSpaceOnUse" x2="8" y1="1" x1="8"> + <linearGradient id="a" y2="15" gradientUnits="userSpaceOnUse" y1="1" x2="8" x1="8"> <stop offset="0"/> <stop stop-color="#363636" stop-opacity=".7" offset="1"/> </linearGradient> </defs> <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/> - <path opacity=".7" d="m8 1.0306-8 7.9694h3v6.0001h10v-6h3l-3-3.0306v-3.9695h-3v1.0812l-2-2.0505z" fill-rule="evenodd" fill="url(#a)"/> + <path opacity=".7" fill="url(#a)" d="m8 1.0306-8 7.9694h3v6.0001h10v-6h3l-3-3.0306v-3.9695h-3v1.0812l-2-2.0505z" fill-rule="evenodd"/> </svg> diff --git a/core/img/places/link.png b/core/img/places/link.png Binary files differindex 44b7e199a72..7cf97115ded 100644 --- a/core/img/places/link.png +++ b/core/img/places/link.png diff --git a/core/img/places/link.svg b/core/img/places/link.svg index 8784ebc1456..f012db6315c 100644 --- a/core/img/places/link.svg +++ b/core/img/places/link.svg @@ -1,12 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <metadata> - <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/> - </cc:Work> - </rdf:RDF> - </metadata> - <path fill="#333" d="M16,4c-6.6274,0-12,5.3726-12,12,0,6.627,5.3726,12,12,12,6.627,0,12-5.373,12-12,0-6.6274-5.373-12-12-12zm1.375,1.5313c2.059,0.0457,3.879,1.2826,5.719,2.0938l2.9691,4.1093-0.46971,1.7657,0.90686,0.56246-0.01543,2.0937c-0.02074,0.59892,0.0086,1.1986-0.0156,1.7969-0.28517,1.1355-0.94394,2.1713-1.5,3.2031-0.37695,0.18585,0.03437-1.2317-0.20313-1.6719,0.05486-1.0173-0.80743-0.97029-1.3903-0.40526-0.72172,0.42068-2.3074,0.54754-2.3589-0.59383-0.40972-1.3716-0.06-2.833,0.49886-4.1093l-0.921-1.125,0.327-2.891-1.469-1.4839,0.345-1.6252-1.719-0.9687c-0.339-0.2661-0.984-0.3713-1.125-0.7344,0.13954-0.00789,0.28457-0.018686,0.42189-0.0156zm-4.2187,0.015634c0.0539,0.00789,0.11999,0.045309,0.21874,0.125,0.57943,0.31834-0.14143,0.67954-0.31251,1.0157-0.92537,0.62589,0.28457,1.1385,0.68743,1.6406,0.64577-0.18549,1.2917-1.1086,2.2344-0.828,1.2058-0.37629,1.0137,1.0099,1.7031,1.625,0.08948,0.28954,1.5086,1.2317,0.65623,0.92177-0.702-0.54411-1.4827-0.50314-1.9845,0.28131-1.355,0.735-0.552-1.4144-1.202-1.9373-0.982-1.0957-0.57,0.8186-0.687,1.3907-0.639-0.0139-1.831-0.4913-2.485,0.2816l0.64046,1.0467,0.76577-1.1719c0.186-0.42411,0.41949,0.32966,0.62486,0.46886,0.24531,0.47297,1.4109,1.2744,0.53126,1.5-1.3039,0.72326-2.3295,1.8202-3.4375,2.7969-0.37371,0.78857-1.1366,0.6984-1.6094,0.0468-1.1438-0.70372-1.0589,1.1256-0.99994,1.8125l1.0013-0.626v1.0312c-0.028286,0.19509-0.00411,0.39806-0.0156,0.59383-0.70063,0.732-1.4069-1.0277-2.0157-1.422l-0.0468-2.5781c0.022114-0.72429-0.1308-1.4659,0.0156-2.1718,1.3779-1.4789,2.7775-3.0107,3.5935-4.891h1.3437c0.93909,0.45497,0.40406-1.0082,0.7812-0.95314zm-1.984,13.406c0.16303-0.01739,0.34848,0.01984,0.54688,0.12501,1.265,0.18106,2.2109,1.0987,3.2187,1.7969,0.80352,0.79632,2.5419,0.54134,2.7345,1.8907-0.29248,1.4636-1.7323,2.2495-3,2.7657-0.31646,0.17657-0.65657,0.31714-1.0157,0.37543-1.1753,0.29314-1.6834-0.912-1.9219-1.8137-0.53212-1.1143-1.8621-1.9577-1.6718-3.3274,0.0312-0.68057,0.40286-1.7373,1.1093-1.8125z"/> + <path d="m16 4c-6.6274 0-12 5.3726-12 12 0 6.627 5.3726 12 12 12 6.627 0 12-5.373 12-12 0-6.6274-5.373-12-12-12zm1.375 1.5313c2.059 0.0457 3.879 1.2826 5.719 2.0938l2.9691 4.1093-0.46971 1.7657 0.90686 0.56246-0.01543 2.0937c-0.02074 0.59892 0.0086 1.1986-0.0156 1.7969-0.28517 1.1355-0.94394 2.1713-1.5 3.2031-0.37695 0.18585 0.03437-1.2317-0.20313-1.6719 0.05486-1.0173-0.80743-0.97029-1.3903-0.40526-0.72172 0.42068-2.3074 0.54754-2.3589-0.59383-0.40972-1.3716-0.06-2.833 0.49886-4.1093l-0.921-1.125 0.327-2.891-1.469-1.4839 0.345-1.6252-1.719-0.9687c-0.339-0.2661-0.984-0.3713-1.125-0.7344 0.13954-0.00789 0.28457-0.018686 0.42189-0.0156zm-4.2187 0.015634c0.0539 0.00789 0.11999 0.045309 0.21874 0.125 0.57943 0.31834-0.14143 0.67954-0.31251 1.0157-0.92537 0.62589 0.28457 1.1385 0.68743 1.6406 0.64577-0.18549 1.2917-1.1086 2.2344-0.828 1.2058-0.37629 1.0137 1.0099 1.7031 1.625 0.08948 0.28954 1.5086 1.2317 0.65623 0.92177-0.702-0.54411-1.4827-0.50314-1.9845 0.28131-1.355 0.735-0.552-1.4144-1.202-1.9373-0.982-1.0957-0.57 0.8186-0.687 1.3907-0.639-0.0139-1.831-0.4913-2.485 0.2816l0.64046 1.0467 0.76577-1.1719c0.186-0.42411 0.41949 0.32966 0.62486 0.46886 0.24531 0.47297 1.4109 1.2744 0.53126 1.5-1.3039 0.72326-2.3295 1.8202-3.4375 2.7969-0.37371 0.78857-1.1366 0.6984-1.6094 0.0468-1.1438-0.70372-1.0589 1.1256-0.99994 1.8125l1.0013-0.626v1.0312c-0.028286 0.19509-0.00411 0.39806-0.0156 0.59383-0.70063 0.732-1.4069-1.0277-2.0157-1.422l-0.0468-2.5781c0.022114-0.72429-0.1308-1.4659 0.0156-2.1718 1.3779-1.4789 2.7775-3.0107 3.5935-4.891h1.3437c0.93909 0.45497 0.40406-1.0082 0.7812-0.95314zm-1.984 13.406c0.16303-0.01739 0.34848 0.01984 0.54688 0.12501 1.265 0.18106 2.2109 1.0987 3.2187 1.7969 0.80352 0.79632 2.5419 0.54134 2.7345 1.8907-0.29248 1.4636-1.7323 2.2495-3 2.7657-0.31646 0.17657-0.65657 0.31714-1.0157 0.37543-1.1753 0.29314-1.6834-0.912-1.9219-1.8137-0.53212-1.1143-1.8621-1.9577-1.6718-3.3274 0.0312-0.68057 0.40286-1.7373 1.1093-1.8125z" fill="#333"/> </svg> diff --git a/core/img/places/music.png b/core/img/places/music.png Binary files differindex 5b71e19ee3c..953a2c24665 100644 --- a/core/img/places/music.png +++ b/core/img/places/music.png diff --git a/core/img/places/picture.png b/core/img/places/picture.png Binary files differindex 2b96ea518ce..b60da3b5fd8 100644 --- a/core/img/places/picture.png +++ b/core/img/places/picture.png diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg index 82d457f5c7c..b4c81b7a937 100644 --- a/core/img/places/picture.svg +++ b/core/img/places/picture.svg @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"> - <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" fill="#fff" d="m0.6875 4c-0.39495 0.0765-0.69461 0.4668-0.6875 0.875v22.25c0.00001 0.458 0.4239 0.875 0.875 0.875h30.25c0.4511-0.000012 0.87499-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm2.3125 3h26v10l-2-2-5 7-6.625-4-9.1875 7h-3.1875zm6 3c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z"/> + <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m0.6875 4c-0.39495 0.0765-0.69461 0.4668-0.6875 0.875v22.25c0.00001 0.458 0.4239 0.875 0.875 0.875h30.25c0.4511-0.000012 0.87499-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm2.3125 3h26v10l-2-2-5 7-6.625-4-9.1875 7h-3.1875zm6 3c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z" fill="#fff"/> </svg> diff --git a/core/img/rating/s1.png b/core/img/rating/s1.png Binary files differindex 015f9483714..9d5014106e5 100644 --- a/core/img/rating/s1.png +++ b/core/img/rating/s1.png diff --git a/core/img/rating/s10.png b/core/img/rating/s10.png Binary files differindex b47b05e4f89..b9c190f8ce7 100644 --- a/core/img/rating/s10.png +++ b/core/img/rating/s10.png diff --git a/core/img/rating/s11.png b/core/img/rating/s11.png Binary files differindex 3dcb4bb4830..c674569c389 100644 --- a/core/img/rating/s11.png +++ b/core/img/rating/s11.png diff --git a/core/img/rating/s2.png b/core/img/rating/s2.png Binary files differindex 94ac5bc9566..6846c8771f5 100644 --- a/core/img/rating/s2.png +++ b/core/img/rating/s2.png diff --git a/core/img/rating/s3.png b/core/img/rating/s3.png Binary files differindex 42a814ca081..2f132cc5fa1 100644 --- a/core/img/rating/s3.png +++ b/core/img/rating/s3.png diff --git a/core/img/rating/s4.png b/core/img/rating/s4.png Binary files differindex 5ce38887570..55e917f92e6 100644 --- a/core/img/rating/s4.png +++ b/core/img/rating/s4.png diff --git a/core/img/rating/s5.png b/core/img/rating/s5.png Binary files differindex da4bbc58479..fa76c311c69 100644 --- a/core/img/rating/s5.png +++ b/core/img/rating/s5.png diff --git a/core/img/rating/s6.png b/core/img/rating/s6.png Binary files differindex 267c52ad3c0..8856309f838 100644 --- a/core/img/rating/s6.png +++ b/core/img/rating/s6.png diff --git a/core/img/rating/s7.png b/core/img/rating/s7.png Binary files differindex 3381d066d87..4112e14fde2 100644 --- a/core/img/rating/s7.png +++ b/core/img/rating/s7.png diff --git a/core/img/rating/s8.png b/core/img/rating/s8.png Binary files differindex 091dc5b21f0..ce25cf58df9 100644 --- a/core/img/rating/s8.png +++ b/core/img/rating/s8.png diff --git a/core/img/rating/s9.png b/core/img/rating/s9.png Binary files differindex dfe83563433..3197f23785f 100644 --- a/core/img/rating/s9.png +++ b/core/img/rating/s9.png diff --git a/core/js/avatar.js b/core/js/avatar.js index c54c4068768..67d6b9b7b95 100644 --- a/core/js/avatar.js +++ b/core/js/avatar.js @@ -1,6 +1,13 @@ $(document).ready(function(){ if (OC.currentUser) { - $('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true); + var callback = function() { + // do not show display name on mobile when profile picture is present + if($('#header .avatardiv').children().length > 0) { + $('#header .avatardiv').addClass('avatardiv-shown'); + } + }; + + $('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true, callback); // Personal settings $('#avatar .avatardiv').avatar(OC.currentUser, 128); } diff --git a/core/js/config.php b/core/js/config.php index b6875fb73f9..139c3b6d485 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -24,6 +24,7 @@ foreach(OC_App::getEnabledApps() as $app) { $array = array( "oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false', + "oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false', "oc_webroot" => "\"".OC::$WEBROOT."\"", "oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 6012eccfad6..02a40c088b4 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -39,10 +39,15 @@ * This will behave like the first example, but it will hide the avatardiv, if * it will display the default placeholder. undefined is the ie8fix from * example 4 and can be either true, or false/undefined, to be ignored. + * + * 6. $('.avatardiv').avatar('jdoe', 128, undefined, true, callback); + * This will behave like the above example, but it will call the function + * defined in callback after the avatar is placed into the DOM. + * */ (function ($) { - $.fn.avatar = function(user, size, ie8fix, hidedefault) { + $.fn.avatar = function(user, size, ie8fix, hidedefault, callback) { if (typeof(size) === 'undefined') { if (this.height() > 0) { size = this.height(); @@ -91,6 +96,9 @@ $div.html('<img src="'+url+'">'); } } + if(typeof callback === 'function') { + callback(); + } }); }); }; diff --git a/core/js/js.js b/core/js/js.js index d4d2583f1e5..ec890be4541 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -860,6 +860,7 @@ function initCore() { // checkShowCredentials(); // $('input#user, input#password').keyup(checkShowCredentials); + // user menu $('#settings #expand').keydown(function(event) { if (event.which === 13 || event.which === 32) { $('#expand').click() @@ -872,7 +873,8 @@ function initCore() { $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); - $(document).click(function(){//hide the settings menu when clicking outside it + //hide the user menu when clicking outside it + $(document).click(function(){ $('#settings #expanddiv').slideUp(200); }); @@ -987,6 +989,17 @@ OC.set=function(name, value) { context[tail]=value; }; +// fix device width on windows phone +(function() { + if ("-ms-user-select" in document.documentElement.style && navigator.userAgent.match(/IEMobile\/10\.0/)) { + var msViewportStyle = document.createElement("style"); + msViewportStyle.appendChild( + document.createTextNode("@-ms-viewport{width:auto!important}") + ); + document.getElementsByTagName("head")[0].appendChild(msViewportStyle); + } +})(); + /** * select a range in an input field * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f4e3ec01447..d1bcb4659b8 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -293,7 +293,7 @@ var OCdialogs = { conflict.find('.replacement .size').text(humanFileSize(replacement.size)); conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); } - var path = getPathForPreview(original.name); + var path = original.directory + '/' +original.name; Files.lazyLoadPreview(path, original.mime, function(previewpath){ conflict.find('.original .icon').css('background-image','url('+previewpath+')'); }, 96, 96, original.etag); diff --git a/core/js/tags.js b/core/js/tags.js index 16dd3d4bf97..bc6d7b4e071 100644 --- a/core/js/tags.js +++ b/core/js/tags.js @@ -25,11 +25,11 @@ OC.Tags= { }); self.deleteButton = { text: t('core', 'Delete'), - click: function() {self._deleteTags(self, type, self._selectedIds())}, + click: function() {self._deleteTags(self, type, self._selectedIds())} }; self.addButton = { text: t('core', 'Add'), - click: function() {self._addTag(self, type, self.$taginput.val())}, + click: function() {self._addTag(self, type, self.$taginput.val())} }; self._fillTagList(type, self.$taglist); @@ -349,5 +349,5 @@ OC.Tags= { console.warn(response); }); } -} +}; diff --git a/core/lostpassword/controller.php b/core/lostpassword/controller.php index 3c8099591a1..fd20c6ba249 100644 --- a/core/lostpassword/controller.php +++ b/core/lostpassword/controller.php @@ -8,6 +8,11 @@ namespace OC\Core\LostPassword; class Controller { + + /** + * @param boolean $error + * @param boolean $requested + */ protected static function displayLostPasswordPage($error, $requested) { $isEncrypted = \OC_App::isEnabled('files_encryption'); \OC_Template::printGuestPage('core/lostpassword', 'lostpassword', @@ -16,6 +21,9 @@ class Controller { 'isEncrypted' => $isEncrypted)); } + /** + * @param boolean $success + */ protected static function displayResetPasswordPage($success, $args) { $route_args = array(); $route_args['token'] = $args['token']; diff --git a/core/minimizer.php b/core/minimizer.php deleted file mode 100644 index eeeddf86a81..00000000000 --- a/core/minimizer.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -session_write_close(); - -OC_App::loadApps(); - -if ($service == 'core.css') { - $minimizer = new OC_Minimizer_CSS(); - $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles); - $minimizer->output($files, $service); -} -else if ($service == 'core.js') { - $minimizer = new OC_Minimizer_JS(); - $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts); - $minimizer->output($files, $service); -} diff --git a/core/routes.php b/core/routes.php index f8454877e03..aea788bdc6b 100644 --- a/core/routes.php +++ b/core/routes.php @@ -100,9 +100,6 @@ $this->create('core_avatar_post_cropped', '/avatar/cropped') ->action('OC\Core\Avatar\Controller', 'postCroppedAvatar'); // Not specifically routed -$this->create('app_css', '/apps/{app}/{file}') - ->requirements(array('file' => '.*.css')) - ->action('OC', 'loadCSSFile'); $this->create('app_index_script', '/apps/{app}/') ->defaults(array('file' => 'index.php')) //->requirements(array('file' => '.*.php')) diff --git a/core/templates/installation.php b/core/templates/installation.php index 9670a5e9ee5..d3adb34f412 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -48,13 +48,15 @@ <legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend> <p class="infield grouptop"> <input type="text" name="adminlogin" id="adminlogin" placeholder="" - value="<?php p($_['adminlogin']); ?>" autocomplete="off" autofocus required /> + value="<?php p($_['adminlogin']); ?>" + autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required /> <label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label> <img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="" /> </p> <p class="infield groupbottom"> <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" placeholder="" - value="<?php p($_['adminpass']); ?>" required /> + value="<?php p($_['adminpass']); ?>" + autocomplete="off" autocapitalize="off" autocorrect="off" required /> <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> <img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" /> <input type="checkbox" id="show" name="show" /> @@ -74,8 +76,9 @@ <div id="datadirContent"> <label for="directory"><?php p($l->t( 'Data folder' )); ?></label> <input type="text" name="directory" id="directory" - placeholder="<?php p(OC::$SERVERROOT."/data"); ?>" - value="<?php p($_['directory']); ?>" /> + placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>" + value="<?php p($_['directory']); ?>" + autocomplete="off" autocapitalize="off" autocorrect="off" /> </div> </fieldset> <?php endif; ?> @@ -103,11 +106,13 @@ <p class="infield grouptop"> <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> <input type="text" name="dbuser" id="dbuser" placeholder="" - value="<?php p($_['dbuser']); ?>" autocomplete="off" /> + value="<?php p($_['dbuser']); ?>" + autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> <p class="infield groupmiddle"> <input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" - value="<?php p($_['dbpass']); ?>" /> + value="<?php p($_['dbpass']); ?>" + autocomplete="off" autocapitalize="off" autocorrect="off" /> <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> <input type="checkbox" id="dbpassword" name="dbpassword" /> <label for="dbpassword"></label> @@ -116,21 +121,24 @@ <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> <input type="text" name="dbname" id="dbname" placeholder="" value="<?php p($_['dbname']); ?>" - autocomplete="off" pattern="[0-9a-zA-Z$_-]+" /> + autocomplete="off" autocapitalize="off" autocorrect="off" + pattern="[0-9a-zA-Z$_-]+" /> </p> <?php if($_['hasOracle']): ?> <div id="use_oracle_db"> <p class="infield groupmiddle"> <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> <input type="text" name="dbtablespace" id="dbtablespace" placeholder="" - value="<?php p($_['dbtablespace']); ?>" autocomplete="off" /> + value="<?php p($_['dbtablespace']); ?>" + autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> </div> <?php endif; ?> <p class="infield groupbottom"> <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> <input type="text" name="dbhost" id="dbhost" placeholder="" - value="<?php p($_['dbhost']); ?>" /> + value="<?php p($_['dbhost']); ?>" + autocomplete="off" autocapitalize="off" autocorrect="off" /> </p> </div> <?php endif; ?> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 6a96b17b100..91157b923a5 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -36,7 +36,7 @@ <body id="body-login"> <div class="wrapper"><!-- for sticky footer --> <header><div id="header"> - <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($theme->getName()); ?>" /> + <div class='logo'></div> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> </div></header> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index bc1c700402e..3d897503480 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -15,7 +15,7 @@ </title> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.0"> <meta name="apple-itunes-app" content="app-id=543672169"> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" /> @@ -45,17 +45,18 @@ <?php endif; ?> </div> <header><div id="header"> - <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> + <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"> + <div class='logo-wide'></div> + </a> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> + <?php if ($_['enableAvatars']): ?> + <div class="avatardiv"></div> + <?php endif; ?> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> <img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /> </span> - <?php if ($_['enableAvatars']): ?> - <div class="avatardiv"></div> - <?php endif; ?> <div id="expanddiv"> <ul> <?php foreach($_['settingsnavigation'] as $entry):?> diff --git a/core/templates/login.php b/core/templates/login.php index e697ebe5326..b534e1edea5 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -26,15 +26,17 @@ </p> <p class="infield grouptop"> <input type="text" name="user" id="user" placeholder="" - value="<?php p($_['username']); ?>"<?php p($_['user_autofocus'] ? ' autofocus' : ''); ?> - autocomplete="on" required/> + value="<?php p($_['username']); ?>" + <?php p($_['user_autofocus'] ? 'autofocus' : ''); ?> + autocomplete="on" autocapitalize="off" autocorrect="off" required /> <label for="user" class="infield"><?php p($l->t('Username')); ?></label> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/> </p> <p class="infield groupbottom"> <input type="password" name="password" id="password" value="" placeholder="" - required<?php p($_['user_autofocus'] ? '' : ' autofocus'); ?> /> + <?php p($_['user_autofocus'] ? '' : 'autofocus'); ?> + autocomplete="on" autocapitalize="off" autocorrect="off" required /> <label for="password" class="infield"><?php p($l->t('Password')); ?></label> <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> </p> diff --git a/lib/base.php b/lib/base.php index f2d9251294d..525d290931f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -284,10 +284,6 @@ class OC { if (self::needUpgrade()) { if ($showTemplate && !OC_Config::getValue('maintenance', false)) { OC_Config::setValue('theme', ''); - $minimizerCSS = new OC_Minimizer_CSS(); - $minimizerCSS->clearCache(); - $minimizerJS = new OC_Minimizer_JS(); - $minimizerJS->clearCache(); OC_Util::addScript('config'); // needed for web root OC_Util::addScript('update'); $tmpl = new OC_Template('', 'update.admin', 'guest'); @@ -332,6 +328,7 @@ class OC { } OC_Util::addStyle("styles"); + OC_Util::addStyle("mobile"); OC_Util::addStyle("icons"); OC_Util::addStyle("apps"); OC_Util::addStyle("fixes"); @@ -385,7 +382,7 @@ class OC { } /** - * @return int + * @return string */ private static function getSessionLifeTime() { return OC_Config::getValue('session_lifetime', 60 * 60 * 24); @@ -724,11 +721,6 @@ class OC { $app = OC::$REQUESTEDAPP; $file = OC::$REQUESTEDFILE; $param = array('app' => $app, 'file' => $file); - // Handle app css files - if (substr($file, -3) == 'css') { - self::loadCSSFile($param); - return; - } // Handle redirect URL for logged in users if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) { @@ -795,19 +787,6 @@ class OC { return false; } - public static function loadCSSFile($param) { - $app = $param['app']; - $file = $param['file']; - $app_path = OC_App::getAppPath($app); - if (file_exists($app_path . '/' . $file)) { - $app_web_path = OC_App::getAppWebPath($app); - $filepath = $app_web_path . '/' . $file; - $minimizer = new OC_Minimizer_CSS(); - $info = array($app_path, $app_web_path, $file); - $minimizer->output(array($info), $filepath); - } - } - protected static function handleLogin() { OC_App::loadApps(array('prelogin')); $error = array(); diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php index 7e7e2257874..685809581ac 100755 --- a/lib/private/activitymanager.php +++ b/lib/private/activitymanager.php @@ -59,7 +59,6 @@ class ActivityManager implements IManager { * * $callable has to return an instance of OCA\Activity\IConsumer * - * @param string $key * @param \Closure $callable */ function registerConsumer(\Closure $callable) { diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php index a4aa69d43fb..de3ac973637 100644 --- a/lib/private/allconfig.php +++ b/lib/private/allconfig.php @@ -17,7 +17,7 @@ class AllConfig implements \OCP\IConfig { * Sets a new system wide value * * @param string $key the key of the value, under which will be saved - * @param string $value the value that should be stored + * @param mixed $value the value that should be stored * @todo need a use case for this */ // public function setSystemValue($key, $value) { @@ -28,7 +28,7 @@ class AllConfig implements \OCP\IConfig { * Looks up a system wide defined value * * @param string $key the key of the value, under which it was saved - * @param string $default the default value to be returned if the value isn't set + * @param mixed $default the default value to be returned if the value isn't set * @return string the saved value */ public function getSystemValue($key, $default = '') { diff --git a/lib/private/api.php b/lib/private/api.php index c713368125c..3f96196e6df 100644 --- a/lib/private/api.php +++ b/lib/private/api.php @@ -328,6 +328,9 @@ class OC_API { } } + /** + * @param XMLWriter $writer + */ private static function toXML($array, $writer) { foreach($array as $k => $v) { if ($k[0] === '@') { diff --git a/lib/private/app.php b/lib/private/app.php index da09021cf3f..048d4d4aeb1 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -38,7 +38,7 @@ class OC_App{ /** * @brief clean the appid - * @param $app Appid that needs to be cleaned + * @param string|boolean $app Appid that needs to be cleaned * @return string */ public static function cleanAppId($app) { @@ -69,17 +69,6 @@ class OC_App{ } ob_end_clean(); - if (!defined('DEBUG') || !DEBUG) { - if (is_null($types) - && empty(OC_Util::$coreScripts) - && empty(OC_Util::$coreStyles)) { - OC_Util::$coreScripts = OC_Util::$scripts; - OC_Util::$scripts = array(); - OC_Util::$coreStyles = OC_Util::$styles; - OC_Util::$styles = array(); - } - } - // return return true; } @@ -261,7 +250,7 @@ class OC_App{ /** * @brief disables an app * @param string $app app - * @return bool + * @return boolean|null * * This function set an app as disabled in appconfig. */ @@ -342,7 +331,7 @@ class OC_App{ /** * @brief Returns the Settings Navigation - * @return array + * @return string * * This function returns an array containing all settings pages added. The * entries are sorted by the key 'order' ascending. @@ -437,6 +426,7 @@ class OC_App{ /** * Get the path where to install apps + * @return string */ public static function getInstallPath() { if(OC_Config::getValue('appstoreenabled', true)==false) { @@ -490,6 +480,7 @@ class OC_App{ /** * get the last version of the app, either from appinfo/version or from appinfo/info.xml + * @return string */ public static function getAppVersion($appid) { $file= self::getAppPath($appid).'/appinfo/version'; @@ -570,7 +561,7 @@ class OC_App{ /** * @brief Returns the navigation - * @return array + * @return string * * This function returns an array containing all entries added. The * entries are sorted by the key 'order' ascending. Additional to the keys @@ -638,6 +629,8 @@ class OC_App{ /** * register an admin form to be shown + * @param string $app + * @param string $page */ public static function registerAdmin($app, $page) { self::$adminForms[]= $app.'/'.$page.'.php'; @@ -854,6 +847,7 @@ class OC_App{ /** * check if the app needs updating and update when needed + * @param string $app */ public static function checkUpgrade($app) { if (in_array($app, self::$checkedApps)) { diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php index a47e1ad49e6..cdaaebb87e5 100644 --- a/lib/private/appconfig.php +++ b/lib/private/appconfig.php @@ -69,6 +69,9 @@ class AppConfig implements \OCP\IAppConfig { return $this->cache[$app]; } + /** + * @param string $app + */ private function getAppValues($app) { $appCache = $this->getAppCache($app); if (array_search($app, $this->appsLoaded) === false) { @@ -184,9 +187,7 @@ class AppConfig implements \OCP\IAppConfig { * @brief Deletes a key * @param string $app app * @param string $key key - * @return bool - * - * Deletes a key. + * @return boolean|null */ public function deleteKey($app, $key) { $where = array( @@ -202,7 +203,7 @@ class AppConfig implements \OCP\IAppConfig { /** * @brief Remove app from appconfig * @param string $app app - * @return bool + * @return boolean|null * * Removes all keys in appconfig belonging to the app. */ @@ -217,8 +218,8 @@ class AppConfig implements \OCP\IAppConfig { /** * get multiply values, either the app or key can be used as wildcard by setting it to false * - * @param app - * @param key + * @param boolean $app + * @param string $key * @return array */ public function getValues($app, $key) { diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php index b835188661a..3b13194862d 100644 --- a/lib/private/appframework/app.php +++ b/lib/private/appframework/app.php @@ -25,7 +25,6 @@ namespace OC\AppFramework; use OC\AppFramework\DependencyInjection\DIContainer; -use OCP\AppFramework\IAppContainer; /** diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php index e2ea974e104..4821ecaf67b 100644 --- a/lib/private/appframework/dependencyinjection/dicontainer.php +++ b/lib/private/appframework/dependencyinjection/dicontainer.php @@ -34,7 +34,6 @@ use OC\AppFramework\Utility\SimpleContainer; use OC\AppFramework\Utility\TimeFactory; use OCP\AppFramework\IApi; use OCP\AppFramework\IAppContainer; -use OCP\AppFramework\IMiddleWare; use OCP\AppFramework\Middleware; use OCP\IServerContainer; @@ -135,7 +134,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{ /** * @param Middleware $middleWare - * @return boolean + * @return boolean|null */ function registerMiddleWare(Middleware $middleWare) { array_push($this->middleWares, $middleWare); diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php index 41fc0db6b38..65d926105f1 100644 --- a/lib/private/appframework/http.php +++ b/lib/private/appframework/http.php @@ -108,7 +108,7 @@ class Http extends BaseHttp { * Gets the correct header * @param Http::CONSTANT $status the constant from the Http class * @param \DateTime $lastModified formatted last modified date - * @param string $Etag the etag + * @param string $ETag the etag */ public function getStatusHeader($status, \DateTime $lastModified=null, $ETag=null) { diff --git a/lib/private/appframework/http/redirectresponse.php b/lib/private/appframework/http/redirectresponse.php index c4e21059480..05353349065 100644 --- a/lib/private/appframework/http/redirectresponse.php +++ b/lib/private/appframework/http/redirectresponse.php @@ -24,8 +24,8 @@ namespace OC\AppFramework\Http; -use OCP\AppFramework\Http\Response, - OCP\AppFramework\Http; +use OCP\AppFramework\Http\Response; +use OCP\AppFramework\Http; /** diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php index 3e1f4ff87ed..40f47a7bd2f 100644 --- a/lib/private/appframework/http/request.php +++ b/lib/private/appframework/http/request.php @@ -114,7 +114,7 @@ class Request implements \ArrayAccess, \Countable, IRequest { * $request['myvar'] = 'something'; // This throws an exception. * * @param string $offset The key to lookup - * @return string|null + * @return boolean */ public function offsetExists($offset) { return isset($this->items['parameters'][$offset]); diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php index 681140c2242..598743e523f 100644 --- a/lib/private/appframework/middleware/middlewaredispatcher.php +++ b/lib/private/appframework/middleware/middlewaredispatcher.php @@ -56,7 +56,7 @@ class MiddlewareDispatcher { /** * Adds a new middleware - * @param Middleware $middleware the middleware which will be added + * @param Middleware $middleWare the middleware which will be added */ public function registerMiddleware(Middleware $middleWare){ array_push($this->middlewares, $middleWare); diff --git a/lib/private/appframework/middleware/security/securityexception.php b/lib/private/appframework/middleware/security/securityexception.php index b32a2769ff5..e551675acdf 100644 --- a/lib/private/appframework/middleware/security/securityexception.php +++ b/lib/private/appframework/middleware/security/securityexception.php @@ -32,7 +32,6 @@ class SecurityException extends \Exception { /** * @param string $msg the security error message - * @param bool $ajax true if it resulted because of an ajax request */ public function __construct($msg, $code = 0) { parent::__construct($msg, $code); diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php index c3143754823..bb02d565fa4 100644 --- a/lib/private/appframework/middleware/security/securitymiddleware.php +++ b/lib/private/appframework/middleware/security/securitymiddleware.php @@ -66,7 +66,7 @@ class SecurityMiddleware extends Middleware { * This runs all the security checks before a method call. The * security checks are determined by inspecting the controller method * annotations - * @param string/Controller $controller the controllername or string + * @param string $controller the controllername or string * @param string $methodName the name of the method * @throws SecurityException when a security check fails */ diff --git a/lib/private/appframework/routing/routeactionhandler.php b/lib/private/appframework/routing/routeactionhandler.php index 2b9dc38dc43..6a5c64745ae 100644 --- a/lib/private/appframework/routing/routeactionhandler.php +++ b/lib/private/appframework/routing/routeactionhandler.php @@ -30,6 +30,10 @@ class RouteActionHandler { private $actionName; private $container; + /** + * @param string $controllerName + * @param string $actionName + */ public function __construct(DIContainer $container, $controllerName, $actionName) { $this->controllerName = $controllerName; $this->actionName = $actionName; diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php index 53ab11bf2f5..716358444a2 100644 --- a/lib/private/appframework/routing/routeconfig.php +++ b/lib/private/appframework/routing/routeconfig.php @@ -37,7 +37,6 @@ class RouteConfig { /** * @param \OC\AppFramework\DependencyInjection\DIContainer $container * @param \OC_Router $router - * @param string $pathToYml * @internal param $appName */ public function __construct(DIContainer $container, \OC_Router $router, $routes) { diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php index e631e657756..d08a4879e34 100644 --- a/lib/private/appframework/utility/simplecontainer.php +++ b/lib/private/appframework/utility/simplecontainer.php @@ -31,7 +31,7 @@ class SimpleContainer extends \Pimple implements \OCP\IContainer { * Created instance will be cached in case $shared is true. * * @param string $name name of the service to register another backend for - * @param callable $closure the closure to be called on service creation + * @param \Closure $closure the closure to be called on service creation */ function registerService($name, \Closure $closure, $shared = true) { diff --git a/lib/private/archive.php b/lib/private/archive.php index 85bfae57295..6f51066ddf8 100644 --- a/lib/private/archive.php +++ b/lib/private/archive.php @@ -9,7 +9,7 @@ abstract class OC_Archive{ /** * open any of the supported archive types - * @param string path + * @param string $path * @return OC_Archive */ public static function open($path) { @@ -32,39 +32,39 @@ abstract class OC_Archive{ abstract function __construct($source); /** * add an empty folder to the archive - * @param string path + * @param string $path * @return bool */ abstract function addFolder($path); /** * add a file to the archive - * @param string path + * @param string $path * @param string source either a local file or string data * @return bool */ abstract function addFile($path, $source=''); /** * rename a file or folder in the archive - * @param string source - * @param string dest + * @param string $source + * @param string $dest * @return bool */ abstract function rename($source, $dest); /** * get the uncompressed size of a file in the archive - * @param string path + * @param string $path * @return int */ abstract function filesize($path); /** * get the last modified time of a file in the archive - * @param string path + * @param string $path * @return int */ abstract function mtime($path); /** * get the files in a folder - * @param path + * @param string $path * @return array */ abstract function getFolder($path); @@ -75,48 +75,47 @@ abstract class OC_Archive{ abstract function getFiles(); /** * get the content of a file - * @param string path + * @param string $path * @return string */ abstract function getFile($path); /** * extract a single file from the archive - * @param string path - * @param string dest + * @param string $path + * @param string $dest * @return bool */ abstract function extractFile($path, $dest); /** * extract the archive - * @param string path - * @param string dest + * @param string $dest * @return bool */ abstract function extract($dest); /** * check if a file or folder exists in the archive - * @param string path + * @param string $path * @return bool */ abstract function fileExists($path); /** * remove a file or folder from the archive - * @param string path + * @param string $path * @return bool */ abstract function remove($path); /** * get a file handler - * @param string path - * @param string mode + * @param string $path + * @param string $mode * @return resource */ abstract function getStream($path, $mode); /** * add a folder and all its content * @param string $path - * @param string source - * @return bool + * @param string $source + * @return boolean|null */ function addRecursive($path, $source) { $dh = opendir($source); diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php index a1c0535b1c3..cbdb565ba35 100644 --- a/lib/private/archive/tar.php +++ b/lib/private/archive/tar.php @@ -22,6 +22,9 @@ class OC_Archive_TAR extends OC_Archive{ private $tar=null; private $path; + /** + * @param string $source + */ function __construct($source) { $types=array(null, 'gz', 'bz'); $this->path=$source; @@ -30,8 +33,8 @@ class OC_Archive_TAR extends OC_Archive{ /** * try to detect the type of tar compression - * @param string file - * @return str + * @param string $file + * @return integer */ static public function getTarType($file) { if(strpos($file, '.')) { @@ -53,7 +56,7 @@ class OC_Archive_TAR extends OC_Archive{ /** * add an empty folder to the archive - * @param string path + * @param string $path * @return bool */ function addFolder($path) { @@ -80,8 +83,8 @@ class OC_Archive_TAR extends OC_Archive{ } /** * add a file to the archive - * @param string path - * @param string source either a local file or string data + * @param string $path + * @param string $source either a local file or string data * @return bool */ function addFile($path, $source='') { @@ -103,8 +106,8 @@ class OC_Archive_TAR extends OC_Archive{ /** * rename a file or folder in the archive - * @param string source - * @param string dest + * @param string $source + * @param string $dest * @return bool */ function rename($source, $dest) { @@ -122,6 +125,9 @@ class OC_Archive_TAR extends OC_Archive{ return true; } + /** + * @param string $file + */ private function getHeader($file) { if ( ! $this->cachedHeaders ) { $this->cachedHeaders = $this->tar->listContent(); @@ -139,7 +145,7 @@ class OC_Archive_TAR extends OC_Archive{ /** * get the uncompressed size of a file in the archive - * @param string path + * @param string $path * @return int */ function filesize($path) { @@ -158,7 +164,7 @@ class OC_Archive_TAR extends OC_Archive{ /** * get the files in a folder - * @param path + * @param string $path * @return array */ function getFolder($path) { @@ -201,7 +207,7 @@ class OC_Archive_TAR extends OC_Archive{ } /** * get the content of a file - * @param string path + * @param string $path * @return string */ function getFile($path) { @@ -209,8 +215,8 @@ class OC_Archive_TAR extends OC_Archive{ } /** * extract a single file from the archive - * @param string path - * @param string dest + * @param string $path + * @param string $dest * @return bool */ function extractFile($path, $dest) { @@ -231,8 +237,7 @@ class OC_Archive_TAR extends OC_Archive{ } /** * extract the archive - * @param string path - * @param string dest + * @param string $dest * @return bool */ function extract($dest) { @@ -240,7 +245,7 @@ class OC_Archive_TAR extends OC_Archive{ } /** * check if a file or folder exists in the archive - * @param string path + * @param string $path * @return bool */ function fileExists($path) { @@ -268,7 +273,7 @@ class OC_Archive_TAR extends OC_Archive{ /** * remove a file or folder from the archive - * @param string path + * @param string $path * @return bool */ function remove($path) { @@ -289,8 +294,8 @@ class OC_Archive_TAR extends OC_Archive{ } /** * get a file handler - * @param string path - * @param string mode + * @param string $path + * @param string $mode * @return resource */ function getStream($path, $mode) { diff --git a/lib/private/archive/zip.php b/lib/private/archive/zip.php index 8a866716a79..fa5630d7665 100644 --- a/lib/private/archive/zip.php +++ b/lib/private/archive/zip.php @@ -13,6 +13,9 @@ class OC_Archive_ZIP extends OC_Archive{ private $zip=null; private $path; + /** + * @param string $source + */ function __construct($source) { $this->path=$source; $this->zip=new ZipArchive(); @@ -23,7 +26,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * add an empty folder to the archive - * @param string path + * @param string $path * @return bool */ function addFolder($path) { @@ -31,8 +34,8 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * add a file to the archive - * @param string path - * @param string source either a local file or string data + * @param string $path + * @param string $source either a local file or string data * @return bool */ function addFile($path, $source='') { @@ -49,9 +52,9 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * rename a file or folder in the archive - * @param string source - * @param string dest - * @return bool + * @param string $source + * @param string $dest + * @return boolean|null */ function rename($source, $dest) { $source=$this->stripPath($source); @@ -60,7 +63,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * get the uncompressed size of a file in the archive - * @param string path + * @param string $path * @return int */ function filesize($path) { @@ -69,7 +72,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * get the last modified time of a file in the archive - * @param string path + * @param string $path * @return int */ function mtime($path) { @@ -77,7 +80,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * get the files in a folder - * @param path + * @param string $path * @return array */ function getFolder($path) { @@ -107,7 +110,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * get the content of a file - * @param string path + * @param string $path * @return string */ function getFile($path) { @@ -115,9 +118,9 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * extract a single file from the archive - * @param string path - * @param string dest - * @return bool + * @param string $path + * @param string $dest + * @return boolean|null */ function extractFile($path, $dest) { $fp = $this->zip->getStream($path); @@ -125,8 +128,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * extract the archive - * @param string path - * @param string dest + * @param string $dest * @return bool */ function extract($dest) { @@ -134,7 +136,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * check if a file or folder exists in the archive - * @param string path + * @param string $path * @return bool */ function fileExists($path) { @@ -142,7 +144,7 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * remove a file or folder from the archive - * @param string path + * @param string $path * @return bool */ function remove($path) { @@ -154,8 +156,8 @@ class OC_Archive_ZIP extends OC_Archive{ } /** * get a file handler - * @param string path - * @param string mode + * @param string $path + * @param string $mode * @return resource */ function getStream($path, $mode) { @@ -191,6 +193,10 @@ class OC_Archive_ZIP extends OC_Archive{ } } + /** + * @param string $path + * @return string + */ private function stripPath($path) { if(!$path || $path[0]=='/') { return substr($path, 1); diff --git a/lib/private/arrayparser.php b/lib/private/arrayparser.php index 3bb394a5163..d353e486577 100644 --- a/lib/private/arrayparser.php +++ b/lib/private/arrayparser.php @@ -30,12 +30,18 @@ class ArrayParser { const TYPE_STRING = 3; const TYPE_ARRAY = 4; + /** + * @param string $string + */ function parsePHP($string) { $string = $this->stripPHPTags($string); $string = $this->stripAssignAndReturn($string); return $this->parse($string); } + /** + * @param string $string + */ function stripPHPTags($string) { $string = trim($string); if (substr($string, 0, 5) === '<?php') { @@ -47,6 +53,9 @@ class ArrayParser { return $string; } + /** + * @param string $string + */ function stripAssignAndReturn($string) { $string = trim($string); if (substr($string, 0, 6) === 'return') { @@ -74,6 +83,9 @@ class ArrayParser { return null; } + /** + * @param string $string + */ function getType($string) { $string = strtolower($string); $first = substr($string, 0, 1); @@ -90,19 +102,31 @@ class ArrayParser { } } + /** + * @param string $string + */ function parseString($string) { return substr($string, 1, -1); } + /** + * @param string $string + */ function parseNum($string) { return intval($string); } + /** + * @param string $string + */ function parseBool($string) { $string = strtolower($string); return $string === 'true'; } + /** + * @param string $string + */ function parseArray($string) { $body = substr($string, 5); $body = trim($body); @@ -131,6 +155,9 @@ class ArrayParser { return $result; } + /** + * @param string $body + */ function splitArray($body) { $inSingleQuote = false;//keep track if we are inside quotes $inDoubleQuote = false; diff --git a/lib/private/backgroundjob.php b/lib/private/backgroundjob.php index 9619dcb732c..afc3c270405 100644 --- a/lib/private/backgroundjob.php +++ b/lib/private/backgroundjob.php @@ -37,8 +37,8 @@ class OC_BackgroundJob{ /** * @brief sets the background jobs execution type - * @param $type execution type - * @return boolean + * @param string $type execution type + * @return false|null * * This method sets the execution type of the background jobs. Possible types * are "none", "ajax", "webcron", "cron" diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php index 586e99a3cbc..26c90269349 100644 --- a/lib/private/backgroundjob/joblist.php +++ b/lib/private/backgroundjob/joblist.php @@ -31,7 +31,7 @@ class JobList implements IJobList { } /** - * @param Job|string $job + * @param \Test\BackgroundJob\TestJob $job * @param mixed $argument */ public function add($job, $argument = null) { @@ -48,7 +48,7 @@ class JobList implements IJobList { } /** - * @param Job|string $job + * @param Job $job * @param mixed $argument */ public function remove($job, $argument = null) { @@ -168,7 +168,7 @@ class JobList implements IJobList { /** * get the id of the last ran job * - * @return int + * @return string */ public function getLastJob() { return $this->config->getAppValue('backgroundjob', 'lastjob', 0); diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php index b0738d2a92b..8a6ef39f61b 100644 --- a/lib/private/cache/file.php +++ b/lib/private/cache/file.php @@ -29,6 +29,9 @@ class File { } } + /** + * @param string $key + */ public function get($key) { $result = null; $proxyStatus = \OC_FileProxy::$enabled; @@ -59,6 +62,9 @@ class File { return $result; } + /** + * @param string $key + */ public function set($key, $value, $ttl=0) { $storage = $this->getStorage(); $result = false; @@ -87,6 +93,9 @@ class File { return false; } + /** + * @param string $key + */ public function remove($key) { $storage = $this->getStorage(); if(!$storage) { diff --git a/lib/private/cache/fileglobal.php b/lib/private/cache/fileglobal.php index bd049bba4d0..d9e0fd46d37 100644 --- a/lib/private/cache/fileglobal.php +++ b/lib/private/cache/fileglobal.php @@ -21,6 +21,9 @@ class FileGlobal { return str_replace('/', '_', $key); } + /** + * @param string $key + */ public function get($key) { $key = $this->fixKey($key); if ($this->hasKey($key)) { @@ -30,6 +33,10 @@ class FileGlobal { return null; } + /** + * @param string $key + * @param string $value + */ public function set($key, $value, $ttl=0) { $key = $this->fixKey($key); $cache_dir = self::getCacheDir(); @@ -81,13 +88,14 @@ class FileGlobal { } static public function gc() { - $last_run = \OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0); + $appConfig = \OC::$server->getAppConfig(); + $last_run = $appConfig->getValue('core', 'global_cache_gc_lastrun', 0); $now = time(); if (($now - $last_run) < 300) { // only do cleanup every 5 minutes return; } - \OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now); + $appConfig->setValue('core', 'global_cache_gc_lastrun', $now); $cache_dir = self::getCacheDir(); if($cache_dir and is_dir($cache_dir)) { $dh=opendir($cache_dir); diff --git a/lib/private/cache/usercache.php b/lib/private/cache/usercache.php index baa8820700b..486e08218a2 100644 --- a/lib/private/cache/usercache.php +++ b/lib/private/cache/usercache.php @@ -35,7 +35,7 @@ class UserCache implements \OCP\ICache { * Set a value in the user cache * * @param string $key - * @param mixed $value + * @param string $value * @param int $ttl Time To Live in seconds. Defaults to 60*60*24 * @return bool */ diff --git a/lib/private/config.php b/lib/private/config.php index 8a9d5ca6158..3649da84973 100644 --- a/lib/private/config.php +++ b/lib/private/config.php @@ -77,7 +77,7 @@ class Config { /** * @brief Gets a value from config.php * @param string $key key - * @param string $default = null default value + * @param string|null $default = null default value * @return string the value or $default * * This function gets the value from config.php. If it does not exist, diff --git a/lib/private/connector/sabre/aborteduploaddetectionplugin.php b/lib/private/connector/sabre/aborteduploaddetectionplugin.php index 10cca647e8d..ad759d1d84a 100644 --- a/lib/private/connector/sabre/aborteduploaddetectionplugin.php +++ b/lib/private/connector/sabre/aborteduploaddetectionplugin.php @@ -47,7 +47,7 @@ class OC_Connector_Sabre_AbortedUploadDetectionPlugin extends Sabre_DAV_ServerPl } /** - * @param $filePath + * @param string $filePath * @param Sabre_DAV_INode $node * @throws Sabre_DAV_Exception_BadRequest */ diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index ed27cef440d..ef6caaf22a7 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -58,6 +58,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D throw new \Sabre_DAV_Exception_ServiceUnavailable(); } + $fileName = basename($this->path); + if (!\OCP\Util::isValidFileName($fileName)) { + throw new \Sabre_DAV_Exception_BadRequest(); + } + // chunked handling if (isset($_SERVER['HTTP_OC_CHUNKED'])) { return $this->createFileChunked($data); @@ -142,15 +147,16 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D * @throws Sabre_DAV_Exception_Forbidden */ public function delete() { + $fs = $this->getFS(); if ($this->path === 'Shared') { throw new \Sabre_DAV_Exception_Forbidden(); } - if (!\OC\Files\Filesystem::isDeletable($this->path)) { + if (!$fs->isDeletable($this->path)) { throw new \Sabre_DAV_Exception_Forbidden(); } - \OC\Files\Filesystem::unlink($this->path); + $fs->unlink($this->path); // remove properties $this->removeProperties(); @@ -206,6 +212,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D } + /** + * @param resource $data + */ private function createFileChunked($data) { list($path, $name) = \Sabre_DAV_URLUtil::splitPath($this->path); diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php index 993aa73faeb..5807c5c7f71 100644 --- a/lib/private/connector/sabre/node.php +++ b/lib/private/connector/sabre/node.php @@ -85,19 +85,24 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr * @return void */ public function setName($name) { + $fs = $this->getFS(); // rename is only allowed if the update privilege is granted - if (!\OC\Files\Filesystem::isUpdatable($this->path)) { + if (!$fs->isUpdatable($this->path)) { throw new \Sabre_DAV_Exception_Forbidden(); } list($parentPath, ) = Sabre_DAV_URLUtil::splitPath($this->path); list(, $newName) = Sabre_DAV_URLUtil::splitPath($name); + if (!\OCP\Util::isValidFileName($newName)) { + throw new \Sabre_DAV_Exception_BadRequest(); + } + $newPath = $parentPath . '/' . $newName; $oldPath = $this->path; - \OC\Files\Filesystem::rename($this->path, $newPath); + $fs->rename($this->path, $newPath); $this->path = $newPath; @@ -153,9 +158,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr /** * @brief Updates properties on this node, - * @param array $mutations * @see Sabre_DAV_IProperties::updateProperties - * @return bool|array + * @return boolean */ public function updateProperties($properties) { $existing = $this->getProperties(array()); @@ -267,7 +271,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr } /** - * @return mixed + * @return string|null */ public function getFileId() { diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php index d1e179af2ec..d2fa425b22c 100644 --- a/lib/private/connector/sabre/objecttree.php +++ b/lib/private/connector/sabre/objecttree.php @@ -105,6 +105,11 @@ class ObjectTree extends \Sabre_DAV_ObjectTree { } } + $fileName = basename($destinationPath); + if (!\OCP\Util::isValidFileName($fileName)) { + throw new \Sabre_DAV_Exception_BadRequest(); + } + $renameOkay = $fs->rename($sourcePath, $destinationPath); if (!$renameOkay) { throw new \Sabre_DAV_Exception_Forbidden(''); diff --git a/lib/private/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php index 59a96797c16..2075aa55c86 100644 --- a/lib/private/connector/sabre/principal.php +++ b/lib/private/connector/sabre/principal.php @@ -62,7 +62,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { * Returns the list of members for a group-principal * * @param string $principal - * @return array + * @return string[] */ public function getGroupMemberSet($principal) { // TODO: for now the group principal has only one member, the user itself diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php index ea2cb81d1f7..8099794f670 100644 --- a/lib/private/connector/sabre/quotaplugin.php +++ b/lib/private/connector/sabre/quotaplugin.php @@ -45,8 +45,8 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin { /** * This method is called before any HTTP method and validates there is enough free space to store the file * - * @param string $method * @throws Sabre_DAV_Exception + * @param string $uri * @return bool */ public function checkQuota($uri, $data = null) { diff --git a/lib/private/connector/sabre/server.php b/lib/private/connector/sabre/server.php index 41e8885917a..2660b043f46 100644 --- a/lib/private/connector/sabre/server.php +++ b/lib/private/connector/sabre/server.php @@ -67,6 +67,7 @@ class OC_Connector_Sabre_Server extends Sabre_DAV_Server { /** * Small helper to support PROPFIND with DEPTH_INFINITY. + * @param string $path */ private function addPathNodesRecursively(&$nodes, $path) { foreach($this->tree->getChildren($path) as $childNode) { diff --git a/lib/private/davclient.php b/lib/private/davclient.php index 28f48f3b921..afa4e1103b4 100644 --- a/lib/private/davclient.php +++ b/lib/private/davclient.php @@ -31,7 +31,7 @@ class OC_DAVClient extends \Sabre_DAV_Client { /** * @brief Sets the request timeout or 0 to disable timeout. - * @param int timeout in seconds or 0 to disable + * @param integer $timeout in seconds or 0 to disable */ public function setRequestTimeout($timeout) { $this->requestTimeout = (int)$timeout; diff --git a/lib/private/db.php b/lib/private/db.php index 562065259fa..cfdac766bff 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -44,14 +44,14 @@ class OC_DB { /** * @var \OC\DB\Connection $connection */ - static private $connection; //the prefered connection to use, only Doctrine + static private $connection; //the preferred connection to use, only Doctrine static private $prefix=null; static private $type=null; /** * @brief connects to the database - * @return bool true if connection can be established or false on error + * @return boolean|null true if connection can be established or false on error * * Connects to the database as specified in config.php */ @@ -196,7 +196,7 @@ class OC_DB { * @param int $offset * @param bool $isManipulation * @throws DatabaseException - * @return \Doctrine\DBAL\Statement prepared SQL query + * @return OC_DB_StatementWrapper prepared SQL query * * SQL query via Doctrine prepare(), needs to be execute()'d! */ @@ -252,7 +252,7 @@ class OC_DB { * an array with 'sql' and optionally 'limit' and 'offset' keys * .. or a simple sql query string * @param array $parameters - * @return result + * @return OC_DB_StatementWrapper * @throws DatabaseException */ static public function executeAudited( $stmt, array $parameters = null) { @@ -298,7 +298,7 @@ class OC_DB { /** * @brief gets last value of autoincrement * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix - * @return int id + * @return string id * @throws DatabaseException * * \Doctrine\DBAL\Connection lastInsertId @@ -315,7 +315,8 @@ class OC_DB { * @brief Insert a row if a matching row doesn't exists. * @param string $table. The table to insert into in the form '*PREFIX*tableName' * @param array $input. An array of fieldname/value pairs - * @return int number of updated rows + * @param string $table + * @return boolean number of updated rows */ public static function insertIfNotExist($table, $input) { self::connect(); @@ -368,7 +369,7 @@ class OC_DB { * @brief update the database schema * @param string $file file to read structure from * @throws Exception - * @return bool + * @return string|boolean */ public static function updateDbFromStructure($file) { $schemaManager = self::getMDB2SchemaManager(); diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php index 2581969dbd0..2bd7b093020 100644 --- a/lib/private/db/connection.php +++ b/lib/private/db/connection.php @@ -94,7 +94,7 @@ class Connection extends \Doctrine\DBAL\Connection { * If an SQLLogger is configured, the execution is logged. * * @param string $query The SQL query to execute. - * @param array $params The parameters to bind to the query, if any. + * @param string[] $params The parameters to bind to the query, if any. * @param array $types The types the previous parameters are in. * @param QueryCacheProfile $qcp * @return \Doctrine\DBAL\Driver\Statement The executed statement. diff --git a/lib/private/db/connectionwrapper.php b/lib/private/db/connectionwrapper.php index 93d4fb57f74..c2cfc21d204 100644 --- a/lib/private/db/connectionwrapper.php +++ b/lib/private/db/connectionwrapper.php @@ -31,8 +31,8 @@ class ConnectionWrapper implements \OCP\IDBConnection { /** * Used to get the id of the just inserted element - * @param string $tableName the name of the table where we inserted the item - * @return int the id of the inserted element + * @param string $table the name of the table where we inserted the item + * @return string the id of the inserted element */ public function lastInsertId($table = null) { diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php index 6378c769055..c050d47b499 100644 --- a/lib/private/db/mdb2schemamanager.php +++ b/lib/private/db/mdb2schemamanager.php @@ -53,7 +53,7 @@ class MDB2SchemaManager { /** * @brief update the database scheme * @param string $file file to read structure from - * @return bool + * @return string|boolean */ public function updateDbFromStructure($file, $generateSql = false) { $sm = $this->conn->getSchemaManager(); diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index b1fd2454cb0..f9a76786c3e 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -288,12 +288,13 @@ class MDB2SchemaReader { if (!empty($fields)) { if (isset($primary) && $primary) { $table->setPrimaryKey($fields, $name); - } else + } else { if (isset($unique) && $unique) { $table->addUniqueIndex($fields, $name); } else { $table->addIndex($fields, $name); } + } } else { throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true)); } diff --git a/lib/private/db/mdb2schemawriter.php b/lib/private/db/mdb2schemawriter.php index 21b43cbfe80..a2a62a81475 100644 --- a/lib/private/db/mdb2schemawriter.php +++ b/lib/private/db/mdb2schemawriter.php @@ -9,7 +9,7 @@ class OC_DB_MDB2SchemaWriter { /** - * @param $file + * @param string $file * @param \Doctrine\DBAL\Schema\AbstractSchemaManager $sm * @return bool */ @@ -26,6 +26,9 @@ class OC_DB_MDB2SchemaWriter { return true; } + /** + * @param SimpleXMLElement $xml + */ private static function saveTable($table, $xml) { $xml->addChild('name', $table->getName()); $declaration = $xml->addChild('declaration'); @@ -48,6 +51,9 @@ class OC_DB_MDB2SchemaWriter { } } + /** + * @param SimpleXMLElement $xml + */ private static function saveColumn($column, $xml) { $xml->addChild('name', $column->getName()); switch($column->getType()) { @@ -111,6 +117,9 @@ class OC_DB_MDB2SchemaWriter { } } + /** + * @param SimpleXMLElement $xml + */ private static function saveIndex($index, $xml) { $xml->addChild('name', $index->getName()); if ($index->isPrimary()) { diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php index a71df315e2f..eaf215c7231 100644 --- a/lib/private/db/statementwrapper.php +++ b/lib/private/db/statementwrapper.php @@ -17,6 +17,9 @@ class OC_DB_StatementWrapper { private $isManipulation = false; private $lastArguments = array(); + /** + * @param boolean $isManipulation + */ public function __construct($statement, $isManipulation) { $this->statement = $statement; $this->isManipulation = $isManipulation; @@ -172,4 +175,18 @@ class OC_DB_StatementWrapper { public function fetchOne($colnum = 0) { return $this->statement->fetchColumn($colnum); } + + /** + * Binds a PHP variable to a corresponding named or question mark placeholder in the + * SQL statement that was use to prepare the statement. + * + * @param mixed $column Either the placeholder name or the 1-indexed placeholder index + * @param mixed $variable The variable to bind + * @param integer|null $type one of the PDO::PARAM_* constants + * @param integer|null $length max length when using an OUT bind + * @return boolean + */ + public function bindParam($column, &$variable, $type = null, $length = null){ + return $this->statement->bindParam($column, $variable, $type, $length); + } } diff --git a/lib/private/defaults.php b/lib/private/defaults.php index cec9a65c7f3..0b97497baa1 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -39,6 +39,9 @@ class OC_Defaults { } } + /** + * @param string $method + */ private function themeExist($method) { if (OC_Util::getTheme() !== '' && method_exists('OC_Theme', $method)) { return true; diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php index aa4f73c7c05..be7f4e14a11 100644 --- a/lib/private/filechunking.php +++ b/lib/private/filechunking.php @@ -16,6 +16,9 @@ class OC_FileChunking { return $matches; } + /** + * @param string[] $info + */ public function __construct($info) { $this->info = $info; } @@ -37,8 +40,8 @@ class OC_FileChunking { /** * Stores the given $data under the given $key - the number of stored bytes is returned * - * @param $index - * @param $data + * @param string $index + * @param resource $data * @return int */ public function store($index, $data) { @@ -87,7 +90,7 @@ class OC_FileChunking { /** * Removes one specific chunk - * @param $index + * @param string $index */ public function remove($index) { $cache = $this->getCache(); @@ -124,6 +127,9 @@ class OC_FileChunking { ); } + /** + * @param string $path + */ public function file_assemble($path) { $absolutePath = \OC\Files\Filesystem::normalizePath(\OC\Files\Filesystem::getView()->getAbsolutePath($path)); $data = ''; diff --git a/lib/private/fileproxy.php b/lib/private/fileproxy.php index 2997aaf81b6..88976c1b8e5 100644 --- a/lib/private/fileproxy.php +++ b/lib/private/fileproxy.php @@ -67,6 +67,9 @@ class OC_FileProxy{ self::$proxies[]=$proxy; } + /** + * @param string $operation + */ public static function getProxies($operation = null) { if ($operation === null) { // return all @@ -81,6 +84,10 @@ class OC_FileProxy{ return $proxies; } + /** + * @param string $operation + * @param string|boolean $filepath + */ public static function runPreProxies($operation,&$filepath,&$filepath2=null) { if(!self::$enabled) { return true; @@ -101,6 +108,12 @@ class OC_FileProxy{ return true; } + /** + * @param string $operation + * @param string|boolean $path + * + * @return string + */ public static function runPostProxies($operation, $path, $result) { if(!self::$enabled) { return $result; diff --git a/lib/private/files.php b/lib/private/files.php index 24fca4a5df3..656d6f044ca 100644 --- a/lib/private/files.php +++ b/lib/private/files.php @@ -32,6 +32,9 @@ class OC_Files { return \OC\Files\Filesystem::getFileInfo($path, $includeMountPoints); } + /** + * @param string $path + */ static public function getDirectoryContent($path){ return \OC\Files\Filesystem::getDirectoryContent($path); } @@ -40,7 +43,7 @@ class OC_Files { * return the content of a file or return a zip file containing multiple files * * @param string $dir - * @param string $file ; separated list of files to download + * @param string $files ; separated list of files to download * @param boolean $only_header ; boolean to only send header of the request */ public static function get($dir, $files, $only_header = false) { @@ -103,7 +106,12 @@ class OC_Files { if ($xsendfile) { $filename = OC_Helper::moveToNoClean($filename); } - $name = $files . '.zip'; + // downloading root ? + if ($files === '') { + $name = 'download.zip'; + } else { + $name = $files . '.zip'; + } set_time_limit($executionTime); } else { $zip = false; @@ -170,6 +178,9 @@ class OC_Files { } } + /** + * @param false|string $filename + */ private static function addSendfileHeader($filename) { if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) { header("X-Sendfile: " . $filename); @@ -194,10 +205,16 @@ class OC_Files { } } + /** + * @param string $dir + * @param ZipArchive $zip + */ public static function zipAddDir($dir, $zip, $internalDir='') { $dirname=basename($dir); $zip->addEmptyDir($internalDir.$dirname); $internalDir.=$dirname.='/'; + // prevent absolute dirs + $internalDir = ltrim($internalDir, '/'); $files=OC_Files::getDirectoryContent($dir); foreach($files as $file) { $filename=$file['name']; @@ -215,7 +232,7 @@ class OC_Files { /** * checks if the selected files are within the size constraint. If not, outputs an error page. * - * @param dir $dir + * @param string $dir * @param files $files */ static function validateZipDownload($dir, $files) { diff --git a/lib/private/files/cache/backgroundwatcher.php b/lib/private/files/cache/backgroundwatcher.php index 923804f48d0..2194651233d 100644 --- a/lib/private/files/cache/backgroundwatcher.php +++ b/lib/private/files/cache/backgroundwatcher.php @@ -24,6 +24,9 @@ class BackgroundWatcher { return $row['id']; } + /** + * @param integer $id + */ static private function checkUpdate($id) { $cacheItem = Cache::getById($id); if (is_null($cacheItem)) { diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index 1e7936ca26d..4cab4619149 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -487,7 +487,7 @@ class Cache { /** * update the folder size and the size of all parent folders * - * @param $path + * @param string|boolean $path */ public function correctFolderSize($path) { $this->calculateFolderSize($path); diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php index 71bb944da71..a7c310a3782 100644 --- a/lib/private/files/cache/homecache.php +++ b/lib/private/files/cache/homecache.php @@ -38,6 +38,9 @@ class HomeCache extends Cache { return $totalSize; } + /** + * @param string $path + */ public function get($path) { $data = parent::get($path); if ($path === '' or $path === '/') { diff --git a/lib/private/files/cache/legacy.php b/lib/private/files/cache/legacy.php index 8eed1f67a5d..4d5f58741e9 100644 --- a/lib/private/files/cache/legacy.php +++ b/lib/private/files/cache/legacy.php @@ -16,6 +16,9 @@ class Legacy { private $cacheHasItems = null; + /** + * @param string $user + */ public function __construct($user) { $this->user = $user; } @@ -69,7 +72,7 @@ class Legacy { /** * get an item from the legacy cache * - * @param string|int $path + * @param string $path * @return array */ function get($path) { diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php index 5b1b30176e8..6b6b0bce9d7 100644 --- a/lib/private/files/cache/storage.php +++ b/lib/private/files/cache/storage.php @@ -47,6 +47,9 @@ class Storage { return $this->numericId; } + /** + * @return string + */ public static function getStorageId($numericId) { $sql = 'SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?'; @@ -58,6 +61,9 @@ class Storage { } } + /** + * @param string $storageId + */ public static function exists($storageId) { if (strlen($storageId) > 64) { $storageId = md5($storageId); diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php index 73bc30e538f..7a45b9e9e96 100644 --- a/lib/private/files/cache/updater.php +++ b/lib/private/files/cache/updater.php @@ -8,8 +8,6 @@ namespace OC\Files\Cache; -use OCP\Util; - /** * listen to filesystem hooks and change the cache accordingly */ @@ -112,7 +110,7 @@ class Updater { /** * @brief get file owner and path * @param string $filename - * @return array with the oweners uid and the owners path + * @return string[] with the oweners uid and the owners path */ private static function getUidAndFilename($filename) { diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php index 251ecbe7071..48aa6f853ce 100644 --- a/lib/private/files/cache/watcher.php +++ b/lib/private/files/cache/watcher.php @@ -12,6 +12,14 @@ namespace OC\Files\Cache; * check the storage backends for updates and change the cache accordingly */ class Watcher { + const CHECK_NEVER = 0; // never check the underlying filesystem for updates + const CHECK_ONCE = 1; // check the underlying filesystem for updates once every request for each file + const CHECK_ALWAYS = 2; // always check the underlying filesystem for updates + + protected $watchPolicy = self::CHECK_ONCE; + + protected $checkedPaths = array(); + /** * @var \OC\Files\Storage\Storage $storage */ @@ -23,7 +31,7 @@ class Watcher { protected $cache; /** - * @var Scanner $scanner; + * @var Scanner $scanner ; */ protected $scanner; @@ -37,26 +45,38 @@ class Watcher { } /** + * @param int $policy either \OC\Files\Cache\Watcher::UPDATE_NEVER, \OC\Files\Cache\Watcher::UPDATE_ONCE, \OC\Files\Cache\Watcher::UPDATE_ALWAYS + */ + public function setPolicy($policy) { + $this->watchPolicy = $policy; + } + + /** * check $path for updates * * @param string $path * @return boolean | array true if path was updated, otherwise the cached data is returned */ public function checkUpdate($path) { - $cachedEntry = $this->cache->get($path); - if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) { - if ($this->storage->is_dir($path)) { - $this->scanner->scan($path, Scanner::SCAN_SHALLOW); - } else { - $this->scanner->scanFile($path); - } - if ($cachedEntry['mimetype'] === 'httpd/unix-directory') { - $this->cleanFolder($path); + if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) { + $cachedEntry = $this->cache->get($path); + $this->checkedPaths[] = $path; + if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) { + if ($this->storage->is_dir($path)) { + $this->scanner->scan($path, Scanner::SCAN_SHALLOW); + } else { + $this->scanner->scanFile($path); + } + if ($cachedEntry['mimetype'] === 'httpd/unix-directory') { + $this->cleanFolder($path); + } + $this->cache->correctFolderSize($path); + return true; } - $this->cache->correctFolderSize($path); - return true; + return $cachedEntry; + } else { + return false; } - return $cachedEntry; } /** diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php index c77571cd2a7..2dbdd80a26b 100644 --- a/lib/private/files/fileinfo.php +++ b/lib/private/files/fileinfo.php @@ -29,6 +29,10 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess { */ private $internalPath; + /** + * @param string|boolean $path + * @param Storage\Storage $storage + */ public function __construct($path, $storage, $internalPath, $data) { $this->path = $path; $this->storage = $storage; diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index a83e9aa86d2..952f9f9febf 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -320,16 +320,16 @@ class Filesystem { else { self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); } - $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + $mount_file = \OC_Config::getValue("mount_file", \OC::$SERVERROOT . "/data/mount.json"); //move config file to it's new position if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { - rename(\OC::$SERVERROOT . '/config/mount.json', $datadir . '/mount.json'); + rename(\OC::$SERVERROOT . '/config/mount.json', $mount_file); } // Load system mount points - if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($datadir . '/mount.json')) { - if (is_file($datadir . '/mount.json')) { - $mountConfig = json_decode(file_get_contents($datadir . '/mount.json'), true); + if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($mount_file)) { + if (is_file($mount_file)) { + $mountConfig = json_decode(file_get_contents($mount_file), true); } elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) { $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); } @@ -614,6 +614,9 @@ class Filesystem { return self::$defaultInstance->touch($path, $mtime); } + /** + * @return string + */ static public function file_get_contents($path) { return self::$defaultInstance->file_get_contents($path); } @@ -638,6 +641,9 @@ class Filesystem { return self::$defaultInstance->fopen($path, $mode); } + /** + * @return string + */ static public function toTmpFile($path) { return self::$defaultInstance->toTmpFile($path); } @@ -662,6 +668,9 @@ class Filesystem { return self::$defaultInstance->search($query); } + /** + * @param string $query + */ static public function searchByMime($query) { return self::$defaultInstance->searchByMime($query); } @@ -727,14 +736,7 @@ class Filesystem { * @param string $path * @param boolean $includeMountPoints whether to add mountpoint sizes, * defaults to true - * @return array - * - * returns an associative array with the following keys: - * - size - * - mtime - * - mimetype - * - encrypted - * - versioned + * @return \OC\Files\FileInfo */ public static function getFileInfo($path, $includeMountPoints = true) { return self::$defaultInstance->getFileInfo($path, $includeMountPoints); diff --git a/lib/private/files/mapper.php b/lib/private/files/mapper.php index 47abd4e52fe..833d4bd8d1c 100644 --- a/lib/private/files/mapper.php +++ b/lib/private/files/mapper.php @@ -44,7 +44,7 @@ class Mapper /** * @param string $path * @param bool $isLogicPath indicates if $path is logical or physical - * @param $recursive + * @param boolean $recursive * @return void */ public function removePath($path, $isLogicPath, $recursive) { @@ -60,8 +60,8 @@ class Mapper } /** - * @param $path1 - * @param $path2 + * @param string $path1 + * @param string $path2 * @throws \Exception */ public function copy($path1, $path2) @@ -99,7 +99,7 @@ class Mapper /** * @param $path * @param $root - * @return bool|string + * @return false|string */ public function stripRootFolder($path, $root) { if (strpos($path, $root) !== 0) { @@ -120,6 +120,9 @@ class Mapper return $path; } + /** + * @param string $logicPath + */ private function resolveLogicPath($logicPath) { $logicPath = $this->stripLast($logicPath); $sql = 'SELECT * FROM `*PREFIX*file_map` WHERE `logic_path_hash` = ?'; @@ -141,6 +144,10 @@ class Mapper return $result['logic_path']; } + /** + * @param string $logicPath + * @param boolean $store + */ private function create($logicPath, $store) { $logicPath = $this->stripLast($logicPath); $index = 0; @@ -167,6 +174,9 @@ class Mapper \OC_DB::executeAudited($sql, array($logicPath, $physicalPath, md5($logicPath), md5($physicalPath))); } + /** + * @param integer $index + */ public function slugifyPath($path, $index=null) { $path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot); diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php index 4c432dcf724..ff4a336f347 100644 --- a/lib/private/files/mount/manager.php +++ b/lib/private/files/mount/manager.php @@ -106,7 +106,7 @@ class Manager { * Find mounts by numeric storage id * * @param string $id - * @return Mount + * @return Mount[] */ public function findByNumericId($id) { $storageId = \OC\Files\Cache\Storage::getStorageId($id); diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php index 923f53821b2..d9e0ddc2d61 100644 --- a/lib/private/files/node/folder.php +++ b/lib/private/files/node/folder.php @@ -9,7 +9,6 @@ namespace OC\Files\Node; use OC\Files\Cache\Cache; -use OC\Files\Cache\Scanner; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php index 063e2424a64..bc075911749 100644 --- a/lib/private/files/node/node.php +++ b/lib/private/files/node/node.php @@ -8,8 +8,6 @@ namespace OC\Files\Node; -use OC\Files\Cache\Cache; -use OC\Files\Cache\Scanner; use OCP\Files\NotFoundException; use OCP\Files\NotPermittedException; @@ -31,7 +29,7 @@ class Node implements \OCP\Files\Node { /** * @param \OC\Files\View $view - * @param \OC\Files\Node\Root Root $root + * @param \OC\Files\Node\Root $root * @param string $path */ public function __construct($root, $view, $path) { diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php index e3d58476e9c..70135285b0d 100644 --- a/lib/private/files/node/root.php +++ b/lib/private/files/node/root.php @@ -9,7 +9,6 @@ namespace OC\Files\Node; use OC\Files\Cache\Cache; -use OC\Files\Cache\Scanner; use OC\Files\Mount\Manager; use OC\Files\Mount\Mount; use OCP\Files\NotFoundException; @@ -95,7 +94,7 @@ class Root extends Folder implements Emitter { /** * @param string $scope * @param string $method - * @param array $arguments + * @param Node[] $arguments */ public function emit($scope, $method, $arguments = array()) { $this->emitter->emit($scope, $method, $arguments); @@ -154,7 +153,7 @@ class Root extends Folder implements Emitter { * @param string $path * @throws \OCP\Files\NotFoundException * @throws \OCP\Files\NotPermittedException - * @return Node + * @return string */ public function get($path) { $path = $this->normalizePath($path); diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index 55b1471593d..d4dca780ff3 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -202,6 +202,9 @@ abstract class Common implements \OC\Files\Storage\Storage { return $this->toTmpFile($path); } + /** + * @param string $path + */ private function toTmpFile($path) { //no longer in the storage api, still useful here $source = $this->fopen($path, 'r'); if (!$source) { @@ -224,6 +227,10 @@ abstract class Common implements \OC\Files\Storage\Storage { return $baseDir; } + /** + * @param string $path + * @param string $target + */ private function addLocalFolder($path, $target) { $dh = $this->opendir($path); if (is_resource($dh)) { @@ -241,6 +248,9 @@ abstract class Common implements \OC\Files\Storage\Storage { } } + /** + * @param string $query + */ protected function searchInDir($query, $dir = '') { $files = array(); $dh = $this->opendir($dir); diff --git a/lib/private/files/storage/loader.php b/lib/private/files/storage/loader.php index 2572ef443bc..966234cb04d 100644 --- a/lib/private/files/storage/loader.php +++ b/lib/private/files/storage/loader.php @@ -25,10 +25,17 @@ class Loader { $this->storageWrappers[] = $callback; } + /** + * @param string|boolean $mountPoint + * @param string $class + */ public function load($mountPoint, $class, $arguments) { return $this->wrap($mountPoint, new $class($arguments)); } + /** + * @param string|boolean $mountPoint + */ public function wrap($mountPoint, $storage) { foreach ($this->storageWrappers as $wrapper) { $storage = $wrapper($mountPoint, $storage); diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index fa0788f2377..a62230bdba5 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -203,6 +203,9 @@ if (\OC_Util::runningOnWindows()) { return $return; } + /** + * @param string $dir + */ private function delTree($dir) { $dirRelative = $dir; $dir = $this->datadir . $dir; @@ -224,6 +227,9 @@ if (\OC_Util::runningOnWindows()) { return $return; } + /** + * @param string $fullPath + */ private static function getFileSizeFromOS($fullPath) { $name = strtolower(php_uname('s')); // Windows OS: we use COM to access the filesystem @@ -274,6 +280,9 @@ if (\OC_Util::runningOnWindows()) { return $this->datadir . $path; } + /** + * @param string $query + */ protected function searchInDir($query, $dir = '') { $files = array(); foreach (scandir($this->datadir . $dir) as $item) { diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php index 6c37d445867..1bab3489a28 100644 --- a/lib/private/files/storage/mappedlocal.php +++ b/lib/private/files/storage/mappedlocal.php @@ -210,6 +210,9 @@ class MappedLocal extends \OC\Files\Storage\Common{ return $return; } + /** + * @param string $dir + */ private function delTree($dir, $isLogicPath=true) { $dirRelative=$dir; if ($isLogicPath) { @@ -244,6 +247,9 @@ class MappedLocal extends \OC\Files\Storage\Common{ return $return; } + /** + * @param string $fullPath + */ private static function getFileSizeFromOS($fullPath) { $name = strtolower(php_uname('s')); // Windows OS: we use COM to access the filesystem @@ -288,6 +294,9 @@ class MappedLocal extends \OC\Files\Storage\Common{ return $this->buildPath($path); } + /** + * @param string $query + */ protected function searchInDir($query, $dir='') { $files=array(); $physicalDir = $this->buildPath($dir); @@ -317,12 +326,18 @@ class MappedLocal extends \OC\Files\Storage\Common{ return $this->filemtime($path)>$time; } + /** + * @param string $path + */ private function buildPath($path, $create=true) { $path = $this->stripLeading($path); $fullPath = $this->datadir.$path; return $this->mapper->logicToPhysical($fullPath, $create); } + /** + * @param string $path + */ private function cleanMapper($path, $isLogicPath=true, $recursive=true) { $fullPath = $path; if ($isLogicPath) { @@ -331,6 +346,10 @@ class MappedLocal extends \OC\Files\Storage\Common{ $this->mapper->removePath($fullPath, $isLogicPath, $recursive); } + /** + * @param string $path1 + * @param string $path2 + */ private function copyMapping($path1, $path2) { $path1 = $this->stripLeading($path1); $path2 = $this->stripLeading($path2); diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php index a430e3e4617..26c952e694a 100644 --- a/lib/private/files/storage/wrapper/quota.php +++ b/lib/private/files/storage/wrapper/quota.php @@ -16,13 +16,22 @@ class Quota extends Wrapper { protected $quota; /** + * @var string $sizeRoot + */ + protected $sizeRoot; + + /** * @param array $parameters */ public function __construct($parameters) { $this->storage = $parameters['storage']; $this->quota = $parameters['quota']; + $this->sizeRoot = isset($parameters['root']) ? $parameters['root'] : ''; } + /** + * @param string $path + */ protected function getSize($path) { $cache = $this->getCache(); $data = $cache->get($path); @@ -43,7 +52,7 @@ class Quota extends Wrapper { if ($this->quota < 0) { return $this->storage->free_space($path); } else { - $used = $this->getSize(''); + $used = $this->getSize($this->sizeRoot); if ($used < 0) { return \OC\Files\SPACE_NOT_COMPUTED; } else { diff --git a/lib/private/files/stream/close.php b/lib/private/files/stream/close.php index 80de3497c36..0e1f088fcf9 100644 --- a/lib/private/files/stream/close.php +++ b/lib/private/files/stream/close.php @@ -94,6 +94,9 @@ class Close { return unlink($path); } + /** + * @param string $path + */ public static function registerCallback($path, $callback) { self::$callBacks[$path] = $callback; } diff --git a/lib/private/files/stream/dir.php b/lib/private/files/stream/dir.php index 6ca884fc994..2483385c1d8 100644 --- a/lib/private/files/stream/dir.php +++ b/lib/private/files/stream/dir.php @@ -41,6 +41,9 @@ class Dir { return true; } + /** + * @param string $path + */ public static function register($path, $content) { self::$dirs[$path] = $content; } diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php index 2cad7dd77bd..a802a8fcb8b 100644 --- a/lib/private/files/utils/scanner.php +++ b/lib/private/files/utils/scanner.php @@ -69,6 +69,9 @@ class Scanner extends PublicEmitter { }); } + /** + * @param string $dir + */ public function backgroundScan($dir) { $mounts = $this->getMounts($dir); foreach ($mounts as $mount) { @@ -81,6 +84,9 @@ class Scanner extends PublicEmitter { } } + /** + * @param string $dir + */ public function scan($dir) { $mounts = $this->getMounts($dir); foreach ($mounts as $mount) { diff --git a/lib/private/files/view.php b/lib/private/files/view.php index 6fc534757b2..530aa8f7514 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -48,7 +48,7 @@ class View { * change the root to a fake root * * @param string $fakeRoot - * @return bool + * @return boolean|null */ public function chroot($fakeRoot) { if (!$fakeRoot == '') { @@ -352,6 +352,9 @@ class View { return $this->basicOperation('unlink', $path, array('delete')); } + /** + * @param string $directory + */ public function deleteAll($directory, $empty = false) { return $this->rmdir($directory); } @@ -735,6 +738,9 @@ class View { return (strlen($this->fakeRoot) > strlen($defaultRoot)) && (substr($this->fakeRoot, 0, strlen($defaultRoot) + 1) === $defaultRoot . '/'); } + /** + * @param string $path + */ private function runHooks($hooks, $path, $post = false) { $path = $this->getHookPath($path); $prefix = ($post) ? 'post_' : ''; diff --git a/lib/private/geo.php b/lib/private/geo.php index ed01ad0b616..7094d885af6 100644 --- a/lib/private/geo.php +++ b/lib/private/geo.php @@ -12,6 +12,10 @@ class OC_Geo{ * @param (string) $longitude - Longitude * @return (string) $timezone - closest timezone */ + /** + * @param integer $latitude + * @param integer $longitude + */ public static function timezone($latitude, $longitude) { $alltimezones = DateTimeZone::listIdentifiers(); $variances = array(); diff --git a/lib/private/group.php b/lib/private/group.php index 444788c97f1..4c187b538af 100644 --- a/lib/private/group.php +++ b/lib/private/group.php @@ -243,7 +243,7 @@ class OC_Group { /** * @brief get a list of all users in several groups - * @param array $gids + * @param string[] $gids * @param string $search * @param int $limit * @param int $offset diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php index 9516fd52ff8..da26e1b910e 100644 --- a/lib/private/group/dummy.php +++ b/lib/private/group/dummy.php @@ -28,7 +28,7 @@ class OC_Group_Dummy extends OC_Group_Backend { private $groups=array(); /** * @brief Try to create a new group - * @param $gid The name of the group to create + * @param string $gid The name of the group to create * @returns true/false * * Trys to create a new group. If the group name already exists, false will diff --git a/lib/private/helper.php b/lib/private/helper.php index e5d1fa9b513..1aab2f296e1 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -152,7 +152,32 @@ class OC_Helper { public static function mimetypeIcon($mimetype) { $alias = array( 'application/octet-stream' => 'file', // use file icon as fallback - 'application/xml' => 'code/xml', + + 'application/illustrator' => 'image', + 'application/coreldraw' => 'image', + 'application/x-gimp' => 'image', + 'application/x-photoshop' => 'image', + + 'application/x-font-ttf' => 'font', + 'application/font-woff' => 'font', + 'application/vnd.ms-fontobject' => 'font', + + 'application/json' => 'text/code', + 'application/x-perl' => 'text/code', + 'application/x-php' => 'text/code', + 'text/x-shellscript' => 'text/code', + 'application/xml' => 'text/html', + 'text/css' => 'text/code', + 'application/x-tex' => 'text', + + 'application/x-compressed' => 'package/x-generic', + 'application/x-7z-compressed' => 'package/x-generic', + 'application/x-deb' => 'package/x-generic', + 'application/x-gzip' => 'package/x-generic', + 'application/x-rar-compressed' => 'package/x-generic', + 'application/x-tar' => 'package/x-generic', + 'application/zip' => 'package/x-generic', + 'application/msword' => 'x-office/document', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'x-office/document', 'application/vnd.openxmlformats-officedocument.wordprocessingml.template' => 'x-office/document', @@ -162,6 +187,7 @@ class OC_Helper { 'application/vnd.oasis.opendocument.text-template' => 'x-office/document', 'application/vnd.oasis.opendocument.text-web' => 'x-office/document', 'application/vnd.oasis.opendocument.text-master' => 'x-office/document', + 'application/mspowerpoint' => 'x-office/presentation', 'application/vnd.ms-powerpoint' => 'x-office/presentation', 'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'x-office/presentation', @@ -173,6 +199,7 @@ class OC_Helper { 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' => 'x-office/presentation', 'application/vnd.oasis.opendocument.presentation' => 'x-office/presentation', 'application/vnd.oasis.opendocument.presentation-template' => 'x-office/presentation', + 'application/msexcel' => 'x-office/spreadsheet', 'application/vnd.ms-excel' => 'x-office/spreadsheet', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'x-office/spreadsheet', @@ -183,6 +210,8 @@ class OC_Helper { 'application/vnd.ms-excel.sheet.binary.macroEnabled.12' => 'x-office/spreadsheet', 'application/vnd.oasis.opendocument.spreadsheet' => 'x-office/spreadsheet', 'application/vnd.oasis.opendocument.spreadsheet-template' => 'x-office/spreadsheet', + 'text/csv' => 'x-office/spreadsheet', + 'application/msaccess' => 'database', ); diff --git a/lib/private/hooks/emitter.php b/lib/private/hooks/emitter.php index 8e9074bad67..8d58dd936cc 100644 --- a/lib/private/hooks/emitter.php +++ b/lib/private/hooks/emitter.php @@ -20,6 +20,7 @@ interface Emitter { * @param string $scope * @param string $method * @param callable $callback + * @return void */ public function listen($scope, $method, $callback); @@ -27,6 +28,7 @@ interface Emitter { * @param string $scope optional * @param string $method optional * @param callable $callback optional + * @return void */ public function removeListener($scope = null, $method = null, $callback = null); } diff --git a/lib/private/image.php b/lib/private/image.php index 91a9f91e1d6..17caaa012f5 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -34,7 +34,7 @@ class OC_Image { /** * @brief Get mime type for an image file. - * @param $filepath The path to a local image file. + * @param string|null $filepath The path to a local image file. * @returns string The mime type if the it could be determined, otherwise an empty string. */ static public function getMimeTypeForFile($filePath) { @@ -163,6 +163,7 @@ class OC_Image { /** * @brief Saves the image. * @returns bool + * @param string $filePath */ public function save($filePath=null) { @@ -230,7 +231,7 @@ class OC_Image { } /** - * @returns Returns the image resource in any. + * @returns resource Returns the image resource in any. */ public function resource() { return $this->resource; @@ -396,7 +397,7 @@ class OC_Image { /** * @brief Loads an image from an open file handle. * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again. - * @param $handle + * @param resource $handle * @returns An image resource or false on error */ public function loadFromFileHandle($handle) { @@ -563,7 +564,7 @@ class OC_Image { * Create a new image from file or URL * @link http://www.programmierer-forum.de/function-imagecreatefrombmp-laeuft-mit-allen-bitraten-t143137.htm * @version 1.00 - * @param string $filename <p> + * @param string $fileName <p> * Path to the BMP image. * </p> * @return resource an image resource identifier on success, <b>FALSE</b> on errors. @@ -704,7 +705,7 @@ class OC_Image { /** * @brief Resizes the image preserving ratio. - * @param $maxsize The maximum size of either the width or height. + * @param integer $maxSize The maximum size of either the width or height. * @returns bool */ public function resize($maxSize) { @@ -852,8 +853,8 @@ class OC_Image { /** * @brief Resizes the image to fit within a boundry while preserving ratio. - * @param $maxWidth - * @param $maxHeight + * @param integer $maxWidth + * @param integer $maxHeight * @returns bool */ public function fitIn($maxWidth, $maxHeight) { @@ -891,8 +892,7 @@ if ( ! function_exists( 'imagebmp') ) { * @link http://www.programmierer-forum.de/imagebmp-gute-funktion-gefunden-t143716.htm * @author mgutt <marc@gutt.it> * @version 1.00 - * @param resource $image - * @param string $filename [optional] <p>The path to save the file to.</p> + * @param string $fileName [optional] <p>The path to save the file to.</p> * @param int $bit [optional] <p>Bit depth, (default is 24).</p> * @param int $compression [optional] * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure. @@ -1008,7 +1008,7 @@ if ( ! function_exists( 'exif_imagetype' ) ) { /** * Workaround if exif_imagetype does not exist * @link http://www.php.net/manual/en/function.exif-imagetype.php#80383 - * @param string $filename + * @param string $fileName * @return string|boolean */ function exif_imagetype ( $fileName ) { diff --git a/lib/private/installer.php b/lib/private/installer.php index 835b6b4c01a..11633a4d4a1 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -25,10 +25,6 @@ */ class OC_Installer{ /** - * @brief Installs an app - * @param $data array with all information - * @throws \Exception - * @returns integer * * This function installs an app. All information needed are passed in the * associative array $data. @@ -55,6 +51,11 @@ class OC_Installer{ * * It is the task of oc_app_install to create the tables and do whatever is * needed to get the app working. + * + * @brief Installs an app + * @param array $data with all information + * @throws \Exception + * @return integer */ public static function installApp( $data = array()) { $l = \OC_L10N::get('lib'); @@ -153,7 +154,7 @@ class OC_Installer{ }else{ $version = trim($info['version']); } - + if($version<>trim($data['appdata']['version'])) { OC_Helper::rmdirr($extractDir); throw new \Exception($l->t("App can't be installed because the version in info.xml/version is not the same as the version reported from the app store")); @@ -219,7 +220,7 @@ class OC_Installer{ /** * @brief checks whether or not an app is installed - * @param $app app + * @param string $app app * @returns true/false * * Checks whether or not an app is installed, i.e. registered in apps table. @@ -235,7 +236,6 @@ class OC_Installer{ /** * @brief Update an application - * @param $data array with all information * * This function installs an app. All information needed are passed in the * associative array $data. @@ -269,8 +269,7 @@ class OC_Installer{ /** * @brief Check if an update for the app is available - * @param $name name of the application - * @return boolean false or the version number of the update + * @return string|false false or the version number of the update * * The function will check if an update for a version is available */ @@ -297,8 +296,8 @@ class OC_Installer{ /** * @brief Check if app is already downloaded - * @param $name name of the application to remove - * @returns true/false + * @param string $name name of the application to remove + * @return boolean * * The function will check if the app is already downloaded in the apps repository */ @@ -313,9 +312,9 @@ class OC_Installer{ /** * @brief Removes an app - * @param $name name of the application to remove + * @param string $name name of the application to remove * @param $options array with options - * @returns true/false + * @return boolean|null * * This function removes an app. $options is an associative array. The * following keys are optional:ja @@ -394,7 +393,7 @@ class OC_Installer{ /** * install an app already placed in the app folder * @param string $app id of the app to install - * @returns array see OC_App::getAppInfo + * @return integer */ public static function installShippedApp($app) { //install the database @@ -429,7 +428,7 @@ class OC_Installer{ /** * check the code of an app with some static code checks * @param string $folder the folder of the app to check - * @returns true for app is o.k. and false for app is not o.k. + * @return boolean true for app is o.k. and false for app is not o.k. */ public static function checkCode($appname, $folder) { diff --git a/lib/private/json.php b/lib/private/json.php index 5c5d7e3a3da..4ccdb490a6c 100644 --- a/lib/private/json.php +++ b/lib/private/json.php @@ -21,6 +21,7 @@ class OC_JSON{ /** * Check if the app is enabled, send json error msg if not + * @param string $app */ public static function checkAppEnabled($app) { if( !OC_App::isEnabled($app)) { diff --git a/lib/private/l10n.php b/lib/private/l10n.php index 1aa1dc5ea28..ad979a92870 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -99,6 +99,9 @@ class OC_L10N implements \OCP\IL10N { $this->lang = $lang; } + /** + * @param string $transFile + */ public function load($transFile) { $this->app = true; include $transFile; @@ -115,7 +118,7 @@ class OC_L10N implements \OCP\IL10N { return; } $app = OC_App::cleanAppId($this->app); - $lang = $this->lang; + $lang = str_replace(array('\0', '/', '\\', '..'), '', $this->lang); $this->app = true; // Find the right language if(is_null($lang) || $lang == '') { @@ -160,7 +163,7 @@ class OC_L10N implements \OCP\IL10N { } } - if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) { + if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::issubdirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) { // Include the file, save the data from $CONFIG include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php'; if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) { @@ -529,6 +532,9 @@ class OC_L10N implements \OCP\IL10N { return $available; } + /** + * @param string $lang + */ public static function languageExists($app, $lang) { if ($lang == 'en') {//english is always available return true; diff --git a/lib/private/l10n/string.php b/lib/private/l10n/string.php index 88c85b32e70..04eaacab57b 100644 --- a/lib/private/l10n/string.php +++ b/lib/private/l10n/string.php @@ -27,6 +27,9 @@ class OC_L10N_String{ */ protected $count; + /** + * @param OC_L10N $l10n + */ public function __construct($l10n, $text, $parameters, $count = 1) { $this->l10n = $l10n; $this->text = $text; diff --git a/lib/private/legacy/appconfig.php b/lib/private/legacy/appconfig.php index 46a8068c3b4..b6c3542a673 100644 --- a/lib/private/legacy/appconfig.php +++ b/lib/private/legacy/appconfig.php @@ -118,6 +118,8 @@ class OC_Appconfig { * * @param app * @param key + * @param string|false $app + * @param string|false $key * @return array */ public static function getValues($app, $key) { diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php index a663db7598b..fcde12796ca 100644 --- a/lib/private/legacy/preferences.php +++ b/lib/private/legacy/preferences.php @@ -41,7 +41,7 @@ class OC_Preferences{ /** * @brief Get all apps of a user * @param string $user user - * @return array with app ids + * @return integer[] with app ids * * This function returns a list of all apps of the user that have at least * one entry in the preferences table. diff --git a/lib/private/mail.php b/lib/private/mail.php index b339b33e962..90c3e343199 100644 --- a/lib/private/mail.php +++ b/lib/private/mail.php @@ -25,7 +25,7 @@ class OC_Mail { * @param string $mailtext * @param string $fromaddress * @param string $fromname - * @param bool|int $html + * @param integer $html * @param string $altbody * @param string $ccaddress * @param string $ccname diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php index 334cf9a1f0e..d60b157efe2 100644 --- a/lib/private/memcache/factory.php +++ b/lib/private/memcache/factory.php @@ -57,7 +57,7 @@ class Factory implements ICacheFactory { * get a in-server cache instance, will return null if no backend is available * * @param string $prefix - * @return \OC\Memcache\Cache + * @return null|Cache */ public static function createLowLatency($prefix = '') { if (XCache::isAvailable()) { diff --git a/lib/private/migrate.php b/lib/private/migrate.php index 0b319177400..3fb3e334ea2 100644 --- a/lib/private/migrate.php +++ b/lib/private/migrate.php @@ -35,12 +35,8 @@ class OC_Migrate{ static private $zip=false; // Stores the type of export static private $exporttype=false; - // Array of temp files to be deleted after zip creation - static private $tmpfiles=array(); // Holds the db object - static private $MDB2=false; - // Schema db object - static private $schema=false; + static private $migration_database=false; // Path to the sqlite db static private $dbpath=false; // Holds the path to the zip file @@ -50,7 +46,7 @@ class OC_Migrate{ /** * register a new migration provider - * @param OC_Migrate_Provider $provider + * @param OC_Migration_Provider $provider */ public static function registerProvider($provider) { self::$providers[]=$provider; @@ -76,7 +72,7 @@ class OC_Migrate{ * @param optional $uid string user id of user to export if export type is user, defaults to current * @param ootional $type string type of export, defualts to user * @param otional $path string path to zip output folder - * @return false on error, path to zip on success + * @return string on error, path to zip on success */ public static function export( $uid=null, $type='user', $path=null ) { $datadir = OC_Config::getValue( 'datadirectory' ); @@ -131,7 +127,7 @@ class OC_Migrate{ if( !self::connectDB() ) { return json_encode( array( 'success' => false ) ); } - self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 ); + self::$content = new OC_Migration_Content( self::$zip, self::$migration_database ); // Export the app info $exportdata = self::exportAppData(); // Add the data dir to the zip @@ -257,7 +253,7 @@ class OC_Migrate{ $userfolder = $extractpath . $json->exporteduser; $newuserfolder = $datadir . '/' . self::$uid; foreach(scandir($userfolder) as $file){ - if($file !== '.' && $file !== '..' && is_dir($file)) { + if($file !== '.' && $file !== '..' && is_dir($userfolder.'/'.$file)) { $file = str_replace(array('/', '\\'), '', $file); // Then copy the folder over @@ -311,7 +307,7 @@ class OC_Migrate{ /** * @brief recursively deletes a directory - * @param $dir string path of dir to delete + * @param string $dir string path of dir to delete * $param optional $deleteRootToo bool delete the root directory * @return bool */ @@ -359,24 +355,6 @@ class OC_Migrate{ } /** - * @brief connects to a MDB2 database scheme - * @returns bool - */ - static private function connectScheme() { - // We need a mdb2 database connection - self::$MDB2->loadModule( 'Manager' ); - self::$MDB2->loadModule( 'Reverse' ); - - // Connect if this did not happen before - if( !self::$schema ) { - require_once 'MDB2/Schema.php'; - self::$schema=MDB2_Schema::factory( self::$MDB2 ); - } - - return true; - } - - /** * @brief creates a migration.db in the users data dir with their app data in * @return bool whether operation was successfull */ @@ -429,7 +407,7 @@ class OC_Migrate{ /** * @brief generates json containing export info, and merges any data supplied * @param optional $array array of data to include in the returned json - * @return bool + * @return string */ static private function getExportInfo( $array=array() ) { $info = array( @@ -453,6 +431,7 @@ class OC_Migrate{ /** * @brief connects to migration.db, or creates if not found * @param $db optional path to migration.db, defaults to user data dir + * @param string $path * @return bool whether the operation was successful */ static private function connectDB( $path=null ) { @@ -463,47 +442,18 @@ class OC_Migrate{ return false; } // Already connected - if(!self::$MDB2) { - require_once 'MDB2.php'; - + if(!self::$migration_database) { $datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ); - - // DB type - if( class_exists( 'SQLite3' ) ) { - $dbtype = 'sqlite3'; - } else if( is_callable( 'sqlite_open' ) ) { - $dbtype = 'sqlite'; - } else { - OC_Log::write( 'migration', 'SQLite not found', OC_Log::ERROR ); - return false; - } - - // Prepare options array - $options = array( - 'portability' => MDB2_PORTABILITY_ALL & (!MDB2_PORTABILITY_FIX_CASE), - 'log_line_break' => '<br>', - 'idxname_format' => '%s', - 'debug' => true, - 'quote_identifier' => true - ); - $dsn = array( - 'phptype' => $dbtype, - 'database' => self::$dbpath, - 'mode' => '0644' + $connectionParams = array( + 'path' => self::$dbpath, + 'driver' => 'pdo_sqlite', ); + $connectionParams['adapter'] = '\OC\DB\AdapterSqlite'; + $connectionParams['wrapperClass'] = 'OC\DB\Connection'; + $connectionParams['tablePrefix'] = ''; // Try to establish connection - self::$MDB2 = MDB2::factory( $dsn, $options ); - // Die if we could not connect - if( PEAR::isError( self::$MDB2 ) ) { - die( self::$MDB2->getMessage() ); - OC_Log::write( 'migration', 'Failed to create/connect to migration.db', OC_Log::FATAL ); - OC_Log::write( 'migration', self::$MDB2->getUserInfo(), OC_Log::FATAL ); - OC_Log::write( 'migration', self::$MDB2->getMessage(), OC_Log::FATAL ); - return false; - } - // We always, really always want associative arrays - self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC); + self::$migration_database = \Doctrine\DBAL\DriverManager::getConnection($connectionParams); } return true; @@ -511,14 +461,11 @@ class OC_Migrate{ /** * @brief creates the tables in migration.db from an apps database.xml - * @param $appid string id of the app + * @param string $appid string id of the app * @return bool whether the operation was successful */ static private function createAppTables( $appid ) { - - if( !self::connectScheme() ) { - return false; - } + $schema_manager = new OC\DB\MDB2SchemaManager(self::$migration_database); // There is a database.xml file $content = file_get_contents(OC_App::getAppPath($appid) . '/appinfo/database.xml' ); @@ -538,29 +485,16 @@ class OC_Migrate{ file_put_contents( $file2, $content ); // Try to create tables - $definition = self::$schema->parseDatabaseDefinitionFile( $file2 ); - - unlink( $file2 ); - - // Die in case something went wrong - if( $definition instanceof MDB2_Schema_Error ) { - OC_Log::write( 'migration', 'Failed to parse database.xml for: '.$appid, OC_Log::FATAL ); - OC_Log::write( 'migration', $definition->getMessage().': '.$definition->getUserInfo(), OC_Log::FATAL ); - return false; - } - - $definition['overwrite'] = true; - - $ret = self::$schema->createDatabase( $definition ); - - // Die in case something went wrong - if( $ret instanceof MDB2_Error ) { + try { + $schema_manager->createDbFromStructure($file2); + } catch(Exception $e) { + unlink( $file2 ); OC_Log::write( 'migration', 'Failed to create tables for: '.$appid, OC_Log::FATAL ); - OC_Log::write( 'migration', $ret->getMessage().': '.$ret->getUserInfo(), OC_Log::FATAL ); + OC_Log::write( 'migration', $e->getMessage(), OC_Log::FATAL ); return false; } - return $tables; + return $tables; } /** @@ -602,7 +536,7 @@ class OC_Migrate{ /** * @brief imports a new user - * @param $db string path to migration.db + * @param string $db string path to migration.db * @param $info object of migration info * @param $uid optional uid to use * @return array of apps with import statuses, or false on failure. @@ -646,7 +580,7 @@ class OC_Migrate{ if( !self::connectDB( $db ) ) { return false; } - $content = new OC_Migration_Content( self::$zip, self::$MDB2 ); + $content = new OC_Migration_Content( self::$zip, self::$migration_database ); $provider->setData( self::$uid, $content, $info ); // Then do the import if( !$appsstatus[$id] = $provider->import( $info->apps->$id, $importinfo ) ) { diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php index 4413d722731..43eba89b8d5 100644 --- a/lib/private/migration/content.php +++ b/lib/private/migration/content.php @@ -27,16 +27,16 @@ class OC_Migration_Content{ private $zip=false; - // Holds the MDB2 object + // Holds the database object private $db=null; // Holds an array of tmpfiles to delete after zip creation private $tmpfiles=array(); /** * @brief sets up the - * @param $zip ZipArchive object - * @param optional $db a MDB2 database object (required for exporttype user) - * @return bool + * @param ZipArchive $zip ZipArchive object + * @param $db a database object (required for exporttype user) + * @return boolean|null */ public function __construct( $zip, $db=null ) { @@ -47,6 +47,10 @@ class OC_Migration_Content{ // @brief prepares the db // @param $query the sql query to prepare + + /** + * @param string $query + */ public function prepare( $query ) { // Only add database to tmpfiles if actually used @@ -63,22 +67,14 @@ class OC_Migration_Content{ // Optimize the query $query = $this->db->prepare( $query ); + $query = new OC_DB_StatementWrapper($query, false); - // Die if we have an error (error means: bad query, not 0 results!) - if( PEAR::isError( $query ) ) { - $entry = 'DB Error: "'.$query->getMessage().'"<br />'; - $entry .= 'Offending command was: '.$query.'<br />'; - OC_Log::write( 'migration', $entry, OC_Log::FATAL ); - return false; - } else { - return $query; - } - + return $query; } /** * @brief processes the db query - * @param $query the query to process + * @param string $query the query to process * @return string of processed query */ private function processQuery( $query ) { @@ -134,7 +130,7 @@ class OC_Migration_Content{ /** * @brief saves a sql data set into migration.db - * @param $data a sql data set returned from self::prepare()->query() + * @param OC_DB_StatementWrapper $data a sql data set returned from self::prepare()->query() * @param $options array of copyRows options * @return void */ @@ -156,20 +152,14 @@ class OC_Migration_Content{ $sql .= $valuessql . " )"; // Make the query $query = $this->prepare( $sql ); - if( !$query ) { - OC_Log::write( 'migration', 'Invalid sql produced: '.$sql, OC_Log::FATAL ); - return false; - exit(); + $query->execute( $values ); + // Do we need to return some values? + if( array_key_exists( 'idcol', $options ) ) { + // Yes we do + $return[] = $row[$options['idcol']]; } else { - $query->execute( $values ); - // Do we need to return some values? - if( array_key_exists( 'idcol', $options ) ) { - // Yes we do - $return[] = $row[$options['idcol']]; - } else { - // Take a guess and return the first field :) - $return[] = reset($row); - } + // Take a guess and return the first field :) + $return[] = reset($row); } $fields = ''; $values = ''; @@ -179,7 +169,7 @@ class OC_Migration_Content{ /** * @brief adds a directory to the zip object - * @param $dir string path of the directory to add + * @param boolean|string $dir string path of the directory to add * @param $recursive bool * @param $internaldir string path of folder to add dir to in zip * @return bool @@ -214,8 +204,8 @@ class OC_Migration_Content{ /** * @brief adds a file to the zip from a given string - * @param $data string of data to add - * @param $path the relative path inside of the zip to save the file to + * @param string $data string of data to add + * @param string $path the relative path inside of the zip to save the file to * @return bool */ public function addFromString( $data, $path ) { diff --git a/lib/private/migration/provider.php b/lib/private/migration/provider.php index 234ab3351f3..2829a97a776 100644 --- a/lib/private/migration/provider.php +++ b/lib/private/migration/provider.php @@ -30,7 +30,7 @@ abstract class OC_Migration_Provider{ /** * @brief sets the OC_Migration_Content object to $this->content - * @param $content a OC_Migration_Content object + * @param OC_Migration_Content $content a OC_Migration_Content object */ public function setData( $uid, $content, $info=null ) { $this->content = $content; diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index 174877d623b..9bd07b89023 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -24,11 +24,13 @@ * Array mapping file extensions to mimetypes (in alphabetical order). */ return array( - 'accdb'=>'application/msaccess', + '7z' => 'application/x-7z-compressed', + 'accdb' => 'application/msaccess', 'ai' => 'application/illustrator', - 'avi'=>'video/x-msvideo', + 'avi' => 'video/x-msvideo', 'bash' => 'text/x-shellscript', - 'blend'=>'application/x-blender', + 'blend' => 'application/x-blender', + 'bin' => 'application/x-bin', 'cb7' => 'application/x-cbr', 'cba' => 'application/x-cbr', 'cbr' => 'application/x-cbr', @@ -38,81 +40,91 @@ return array( 'cc' => 'text/x-c', 'cdr' => 'application/coreldraw', 'cpp' => 'text/x-c++src', - 'css'=>'text/css', + 'css' => 'text/css', + 'csv' => 'text/csv', 'cvbdl' => 'application/x-cbr', 'c' => 'text/x-c', 'c++' => 'text/x-c++src', - 'doc'=>'application/msword', - 'docx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document', - 'dot'=>'application/msword', - 'dotx'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template', - 'dv'=>'video/dv', + 'deb' => 'application/x-deb', + 'doc' => 'application/msword', + 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'dot' => 'application/msword', + 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'dv' => 'video/dv', + 'eot' => 'application/vnd.ms-fontobject', 'epub' => 'application/epub+zip', - 'exe'=>'application/x-ms-dos-executable', - 'flac'=>'audio/flac', - 'gif'=>'image/gif', - 'gz'=>'application/x-gzip', - 'gzip'=>'application/x-gzip', - 'html'=>'text/html', - 'htm'=>'text/html', - 'ical'=>'text/calendar', - 'ics'=>'text/calendar', + 'exe' => 'application/x-ms-dos-executable', + 'flac' => 'audio/flac', + 'gif' => 'image/gif', + 'gz' => 'application/x-gzip', + 'gzip' => 'application/x-gzip', + 'html' => 'text/html', + 'htm' => 'text/html', + 'ical' => 'text/calendar', + 'ics' => 'text/calendar', 'impress' => 'text/impress', - 'jpeg'=>'image/jpeg', - 'jpg'=>'image/jpeg', - 'js'=>'application/javascript', - 'keynote'=>'application/x-iwork-keynote-sffkey', - 'kra'=>'application/x-krita', - 'm2t'=>'video/mp2t', - 'm4v'=>'video/mp4', + 'jpeg' => 'image/jpeg', + 'jpg' => 'image/jpeg', + 'js' => 'application/javascript', + 'json' => 'application/json', + 'keynote' => 'application/x-iwork-keynote-sffkey', + 'kra' => 'application/x-krita', + 'm2t' => 'video/mp2t', + 'm4v' => 'video/mp4', 'markdown' => 'text/markdown', 'mdown' => 'text/markdown', 'md' => 'text/markdown', - 'mdb'=>'application/msaccess', + 'mdb' => 'application/msaccess', 'mdwn' => 'text/markdown', 'mobi' => 'application/x-mobipocket-ebook', - 'mov'=>'video/quicktime', - 'mp3'=>'audio/mpeg', - 'mp4'=>'video/mp4', - 'mpeg'=>'video/mpeg', - 'mpg'=>'video/mpeg', - 'msi'=>'application/x-msi', - 'numbers'=>'application/x-iwork-numbers-sffnumbers', - 'odg'=>'application/vnd.oasis.opendocument.graphics', - 'odp'=>'application/vnd.oasis.opendocument.presentation', - 'ods'=>'application/vnd.oasis.opendocument.spreadsheet', - 'odt'=>'application/vnd.oasis.opendocument.text', - 'oga'=>'audio/ogg', - 'ogg'=>'audio/ogg', - 'ogv'=>'video/ogg', - 'pages'=>'application/x-iwork-pages-sffpages', - 'pdf'=>'application/pdf', - 'php'=>'application/x-php', - 'pl'=>'application/x-pearl', - 'png'=>'image/png', - 'ppt'=>'application/mspowerpoint', - 'pptx'=>'application/vnd.openxmlformats-officedocument.presentationml.presentation', - 'psd'=>'application/x-photoshop', - 'py'=>'text/x-script.python', + 'mov' => 'video/quicktime', + 'mp3' => 'audio/mpeg', + 'mp4' => 'video/mp4', + 'mpeg' => 'video/mpeg', + 'mpg' => 'video/mpeg', + 'msi' => 'application/x-msi', + 'numbers' => 'application/x-iwork-numbers-sffnumbers', + 'odg' => 'application/vnd.oasis.opendocument.graphics', + 'odp' => 'application/vnd.oasis.opendocument.presentation', + 'ods' => 'application/vnd.oasis.opendocument.spreadsheet', + 'odt' => 'application/vnd.oasis.opendocument.text', + 'oga' => 'audio/ogg', + 'ogg' => 'audio/ogg', + 'ogv' => 'video/ogg', + 'otf' => 'font/opentype', + 'pages' => 'application/x-iwork-pages-sffpages', + 'pdf' => 'application/pdf', + 'php' => 'application/x-php', + 'pl' => 'application/x-perl', + 'png' => 'image/png', + 'ppt' => 'application/mspowerpoint', + 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'psd' => 'application/x-photoshop', + 'py' => 'text/x-python', + 'rar' => 'application/x-rar-compressed', 'reveal' => 'text/reveal', 'sgf' => 'application/sgf', 'sh-lib' => 'text/x-shellscript', 'sh' => 'text/x-shellscript', - 'svg'=>'image/svg+xml', - 'tar'=>'application/x-tar', - 'tar.gz'=>'application/x-compressed', - 'tgz'=>'application/x-compressed', - 'tiff'=>'image/tiff', - 'tif'=>'image/tiff', - 'txt'=>'text/plain', + 'svg' => 'image/svg+xml', + 'swf' => 'application/x-shockwave-flash', + 'tar' => 'application/x-tar', + 'tar.gz' => 'application/x-compressed', + 'tex' => 'application/x-tex', + 'tgz' => 'application/x-compressed', + 'tiff' => 'image/tiff', + 'tif' => 'image/tiff', + 'ttf' => 'application/x-font-ttf', + 'txt' => 'text/plain', 'vcard' => 'text/vcard', 'vcf' => 'text/vcard', - 'wav'=>'audio/wav', - 'webm'=>'video/webm', - 'wmv'=>'video/x-ms-asf', - 'xcf'=>'application/x-gimp', - 'xls'=>'application/msexcel', - 'xlsx'=>'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', - 'xml'=>'application/xml', - 'zip'=>'application/zip', + 'wav' => 'audio/wav', + 'webm' => 'video/webm', + 'woff' => 'application/font-woff', + 'wmv' => 'video/x-ms-asf', + 'xcf' => 'application/x-gimp', + 'xls' => 'application/msexcel', + 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'xml' => 'application/xml', + 'zip' => 'application/zip', ); diff --git a/lib/private/minimizer.php b/lib/private/minimizer.php deleted file mode 100644 index db522de74dc..00000000000 --- a/lib/private/minimizer.php +++ /dev/null @@ -1,64 +0,0 @@ -<?php - -abstract class OC_Minimizer { - public function generateETag($files) { - $fullpath_files = array(); - foreach($files as $file_info) { - $fullpath_files[] = $file_info[0] . '/' . $file_info[2]; - } - return OC_Cache::generateCacheKeyFromFiles($fullpath_files); - } - - abstract public function minimizeFiles($files); - - public function output($files, $cache_key) { - header('Content-Type: '.$this->contentType); - OC_Response::enableCaching(); - $etag = $this->generateETag($files); - $cache_key .= '-'.$etag; - - $gzout = false; - $cache = OC_Cache::getGlobalCache(); - if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)) { - OC_Response::setETagHeader($etag); - $gzout = $cache->get($cache_key.'.gz'); - } - - if (!$gzout) { - $out = $this->minimizeFiles($files); - $gzout = gzencode($out); - $cache->set($cache_key.'.gz', $gzout); - OC_Response::setETagHeader($etag); - } - // on some systems (e.g. SLES 11, but not Ubuntu) mod_deflate and zlib compression will compress the output twice. - // This results in broken core.css and core.js. To avoid it, we switch off zlib compression. - // Since mod_deflate is still active, Apache will compress what needs to be compressed, i.e. no disadvantage. - if(function_exists('apache_get_modules') && ini_get('zlib.output_compression') && in_array('mod_deflate', apache_get_modules())) { - ini_set('zlib.output_compression', 'Off'); - } - if ($encoding = OC_Request::acceptGZip()) { - header('Content-Encoding: '.$encoding); - $out = $gzout; - } else { - $out = gzdecode($gzout); - } - header('Content-Length: '.strlen($out)); - echo $out; - } - - public function clearCache() { - $cache = OC_Cache::getGlobalCache(); - $cache->clear('core.css'); - $cache->clear('core.js'); - } -} - -if (!function_exists('gzdecode')) { - function gzdecode($data, $maxlength=null, &$filename='', &$error='') - { - if (strcmp(substr($data, 0, 9),"\x1f\x8b\x8\0\0\0\0\0\0")) { - return null; // Not the GZIP format we expect (See RFC 1952) - } - return gzinflate(substr($data, 10, -8)); - } -} diff --git a/lib/private/minimizer/css.php b/lib/private/minimizer/css.php deleted file mode 100644 index 8d130572e2b..00000000000 --- a/lib/private/minimizer/css.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php - -require_once 'mediawiki/CSSMin.php'; - -class OC_Minimizer_CSS extends OC_Minimizer -{ - protected $contentType = 'text/css'; - - public function minimizeFiles($files) { - $css_out = ''; - $webroot = (string) OC::$WEBROOT; - foreach($files as $file_info) { - $file = $file_info[0] . '/' . $file_info[2]; - $css_out .= '/* ' . $file . ' */' . "\n"; - $css = file_get_contents($file); - - $in_root = false; - foreach(OC::$APPSROOTS as $app_root) { - if(strpos($file, $app_root['path'].'/') === 0) { - $in_root = rtrim($webroot.$app_root['url'], '/'); - break; - } - } - if ($in_root !== false) { - $css = str_replace('%appswebroot%', $in_root, $css); - $css = str_replace('%webroot%', $webroot, $css); - } - $remote = $file_info[1]; - $remote .= '/'; - $remote .= dirname($file_info[2]); - $css_out .= CSSMin::remap($css, dirname($file), $remote, true); - } - if (!defined('DEBUG') || !DEBUG) { - $css_out = CSSMin::minify($css_out); - } - return $css_out; - } -} diff --git a/lib/private/minimizer/js.php b/lib/private/minimizer/js.php deleted file mode 100644 index bd2d836deb0..00000000000 --- a/lib/private/minimizer/js.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - -require_once 'mediawiki/JavaScriptMinifier.php'; - -class OC_Minimizer_JS extends OC_Minimizer -{ - protected $contentType = 'application/javascript'; - - public function minimizeFiles($files) { - $js_out = ''; - foreach($files as $file_info) { - $file = $file_info[0] . '/' . $file_info[2]; - $js_out .= '/* ' . $file . ' */' . "\n"; - $js_out .= file_get_contents($file); - } - if (!defined('DEBUG') || !DEBUG) { - $js_out = JavaScriptMinifier::minify($js_out); - } - return $js_out; - } -} diff --git a/lib/private/ocs.php b/lib/private/ocs.php index e067196cf11..bbe965ce561 100644 --- a/lib/private/ocs.php +++ b/lib/private/ocs.php @@ -23,9 +23,6 @@ * */ -use Symfony\Component\Routing\Exception\ResourceNotFoundException; -use Symfony\Component\Routing\Exception\MethodNotAllowedException; - /** * Class to handle open collaboration services API requests * @@ -35,11 +32,11 @@ class OC_OCS { /** * reads input date from get/post/cookies and converts the date to a special data-type * - * @param string HTTP method to read the key from - * @param string Parameter to read - * @param string Variable type to format data - * @param mixed Default value to return if the key is not found - * @return mixed Data or if the key is not found and no default is set it will exit with a 400 Bad request + * @param string $method HTTP method to read the key from + * @param string $key Parameter to read + * @param string $type Variable type to format data + * @param string $default Default value to return if the key is not found + * @return string Data or if the key is not found and no default is set it will exit with a 400 Bad request */ public static function readData($method, $key, $type = 'raw', $default = null) { if ($method == 'get') { @@ -96,7 +93,7 @@ class OC_OCS { /** * generated some debug information to make it easier to find faild API calls - * @return debug data string + * @return string data string */ private static function getDebugOutput() { $txt=''; @@ -214,6 +211,9 @@ class OC_OCS { } } + /** + * @param string $node + */ public static function toXml($writer, $data, $node) { foreach($data as $key => $value) { if (is_numeric($key)) { diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index e35556d92b8..fa6e3fac1bb 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -50,6 +50,7 @@ class OC_OCSClient{ * @brief Get the content of an OCS url call. * @returns string of the response * This function calls an OCS server and returns the response. It also sets a sane timeout + * @param string $url */ private static function getOCSresponse($url) { $data = \OC_Util::getUrlContent($url); @@ -92,6 +93,8 @@ class OC_OCSClient{ * @returns array with application data * * This function returns a list of all the applications on the OCS server + * @param integer $page + * @param string $filter */ public static function getApplications($categories, $page, $filter) { if(OC_Config::getValue('appstoreenabled', true)==false) { @@ -184,6 +187,7 @@ class OC_OCSClient{ * @returns array with application data * * This function returns an download url for an applications from the OCS server + * @param integer $item */ public static function getApplicationDownload($id, $item) { if(OC_Config::getValue('appstoreenabled', true)==false) { diff --git a/lib/private/preferences.php b/lib/private/preferences.php index 359d9a83589..d45e6e77089 100644 --- a/lib/private/preferences.php +++ b/lib/private/preferences.php @@ -43,8 +43,26 @@ use \OC\DB\Connection; * This class provides an easy way for storing user preferences. */ class Preferences { + /** + * @var \OC\DB\Connection + */ protected $conn; + /** + * 3 dimensional array with the following structure: + * [ $userId => + * [ $appId => + * [ $key => $value ] + * ] + * ] + * + * @var array $cache + */ + protected $cache = array(); + + /** + * @param \OC\DB\Connection $conn + */ public function __construct(Connection $conn) { $this->conn = $conn; } @@ -58,10 +76,10 @@ class Preferences { */ public function getUsers() { $query = 'SELECT DISTINCT `userid` FROM `*PREFIX*preferences`'; - $result = $this->conn->executeQuery( $query ); + $result = $this->conn->executeQuery($query); $users = array(); - while( $userid = $result->fetchColumn()) { + while ($userid = $result->fetchColumn()) { $users[] = $userid; } @@ -69,23 +87,38 @@ class Preferences { } /** + * @param string $user + * @return array[] + */ + protected function getUserValues($user) { + if (isset($this->cache[$user])) { + return $this->cache[$user]; + } + $data = array(); + $query = 'SELECT `appid`, `configkey`, `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ?'; + $result = $this->conn->executeQuery($query, array($user)); + while ($row = $result->fetch()) { + $app = $row['appid']; + if (!isset($data[$app])) { + $data[$app] = array(); + } + $data[$app][$row['configkey']] = $row['configvalue']; + } + $this->cache[$user] = $data; + return $data; + } + + /** * @brief Get all apps of an user * @param string $user user - * @return array with app ids + * @return integer[] with app ids * * This function returns a list of all apps of the user that have at least * one entry in the preferences table. */ - public function getApps( $user ) { - $query = 'SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?'; - $result = $this->conn->executeQuery( $query, array( $user ) ); - - $apps = array(); - while( $appid = $result->fetchColumn()) { - $apps[] = $appid; - } - - return $apps; + public function getApps($user) { + $data = $this->getUserValues($user); + return array_keys($data); } /** @@ -97,16 +130,13 @@ class Preferences { * This function gets all keys of an app of an user. Please note that the * values are not returned. */ - public function getKeys( $user, $app ) { - $query = 'SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?'; - $result = $this->conn->executeQuery( $query, array( $user, $app )); - - $keys = array(); - while( $key = $result->fetchColumn()) { - $keys[] = $key; + public function getKeys($user, $app) { + $data = $this->getUserValues($user); + if (isset($data[$app])) { + return array_keys($data[$app]); + } else { + return array(); } - - return $keys; } /** @@ -120,13 +150,10 @@ class Preferences { * This function gets a value from the preferences table. If the key does * not exist the default value will be returned */ - public function getValue( $user, $app, $key, $default = null ) { - // Try to fetch the value, return default if not exists. - $query = 'SELECT `configvalue` FROM `*PREFIX*preferences`' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'; - $row = $this->conn->fetchAssoc( $query, array( $user, $app, $key )); - if($row) { - return $row["configvalue"]; + public function getValue($user, $app, $key, $default = null) { + $data = $this->getUserValues($user); + if (isset($data[$app]) and isset($data[$app][$key])) { + return $data[$app][$key]; } else { return $default; } @@ -142,14 +169,14 @@ class Preferences { * Adds a value to the preferences. If the key did not exist before, it * will be added automagically. */ - public function setValue( $user, $app, $key, $value ) { + public function setValue($user, $app, $key, $value) { // Check if the key does exist $query = 'SELECT COUNT(*) FROM `*PREFIX*preferences`' - .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'; - $count = $this->conn->fetchColumn( $query, array( $user, $app, $key )); + . ' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'; + $count = $this->conn->fetchColumn($query, array($user, $app, $key)); $exists = $count > 0; - if( !$exists ) { + if (!$exists) { $data = array( 'userid' => $user, 'appid' => $app, @@ -168,6 +195,14 @@ class Preferences { ); $this->conn->update('*PREFIX*preferences', $data, $where); } + + // only add to the cache if we already loaded data for the user + if (isset($this->cache[$user])) { + if (!isset($this->cache[$user][$app])) { + $this->cache[$user][$app] = array(); + } + $this->cache[$user][$app][$key] = $value; + } } /** @@ -178,13 +213,17 @@ class Preferences { * * Deletes a key. */ - public function deleteKey( $user, $app, $key ) { + public function deleteKey($user, $app, $key) { $where = array( 'userid' => $user, 'appid' => $app, 'configkey' => $key, ); $this->conn->delete('*PREFIX*preferences', $where); + + if (isset($this->cache[$user]) and isset($this->cache[$user][$app])) { + unset($this->cache[$user][$app][$key]); + } } /** @@ -194,12 +233,16 @@ class Preferences { * * Removes all keys in preferences belonging to the app and the user. */ - public function deleteApp( $user, $app ) { + public function deleteApp($user, $app) { $where = array( 'userid' => $user, 'appid' => $app, ); $this->conn->delete('*PREFIX*preferences', $where); + + if (isset($this->cache[$user])) { + unset($this->cache[$user][$app]); + } } /** @@ -208,11 +251,13 @@ class Preferences { * * Removes all keys in preferences belonging to the user. */ - public function deleteUser( $user ) { + public function deleteUser($user) { $where = array( 'userid' => $user, ); $this->conn->delete('*PREFIX*preferences', $where); + + unset($this->cache[$user]); } /** @@ -221,12 +266,16 @@ class Preferences { * * Removes all keys in preferences belonging to the app. */ - public function deleteAppFromAllUsers( $app ) { + public function deleteAppFromAllUsers($app) { $where = array( 'appid' => $app, ); $this->conn->delete('*PREFIX*preferences', $where); + + foreach ($this->cache as &$userCache) { + unset($userCache[$app]); + } } } -require_once __DIR__.'/legacy/'.basename(__FILE__); +require_once __DIR__ . '/legacy/' . basename(__FILE__); diff --git a/lib/private/preview.php b/lib/private/preview.php index ff93f438f73..80fd003ed8d 100755 --- a/lib/private/preview.php +++ b/lib/private/preview.php @@ -138,7 +138,7 @@ class Preview { /** * @brief returns the max scale factor - * @return integer + * @return string */ public function getMaxScaleFactor() { return $this->maxScaleFactor; @@ -146,7 +146,7 @@ class Preview { /** * @brief returns the max width set in ownCloud's config - * @return integer + * @return string */ public function getConfigMaxX() { return $this->configMaxX; @@ -154,7 +154,7 @@ class Preview { /** * @brief returns the max height set in ownCloud's config - * @return integer + * @return string */ public function getConfigMaxY() { return $this->configMaxY; @@ -570,7 +570,6 @@ class Preview { /** * @brief register a new preview provider to be used - * @param string $provider class name of a Preview_Provider * @param array $options * @return void */ @@ -619,6 +618,9 @@ class Preview { $preview->deleteAllPreviews(); } + /** + * @param string $mimetype + */ public static function isMimeSupported($mimetype) { if(!\OC_Config::getValue('enable_previews', true)) { return false; diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php index 65d09705f40..88337d64e4b 100644 --- a/lib/private/preview/provider.php +++ b/lib/private/preview/provider.php @@ -15,7 +15,7 @@ abstract class Provider { * @param string $path Path of file * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image - * @param bool $scalingUp Disable/Enable upscaling of previews + * @param bool $scalingup Disable/Enable upscaling of previews * @param object $fileview fileview object of user folder * @return mixed * false if no preview was generated diff --git a/lib/private/request.php b/lib/private/request.php index c3e28a9f08b..14f3bf2cbb7 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -103,6 +103,7 @@ class OC_Request { * * Returns the request uri, even if the website uses one or more * reverse proxies + * @return string */ public static function requestUri() { $uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : ''; @@ -114,7 +115,7 @@ class OC_Request { /** * @brief Returns the script name - * @returns string the script name + * @return string the script name * * Returns the script name, even if the website uses one or more * reverse proxies @@ -131,7 +132,7 @@ class OC_Request { /** * @brief get Path info from request - * @returns string Path info or false when not found + * @return string Path info or false when not found */ public static function getPathInfo() { if (array_key_exists('PATH_INFO', $_SERVER)) { @@ -155,7 +156,7 @@ class OC_Request { /** * @brief get Path info from request, not urldecoded - * @returns string Path info or false when not found + * @return string Path info or false when not found */ public static function getRawPathInfo() { $requestUri = $_SERVER['REQUEST_URI']; @@ -195,35 +196,8 @@ class OC_Request { } /** - * @brief Check if this is a no-cache request - * @returns boolean true for no-cache - */ - static public function isNoCache() { - if (!isset($_SERVER['HTTP_CACHE_CONTROL'])) { - return false; - } - return $_SERVER['HTTP_CACHE_CONTROL'] == 'no-cache'; - } - - /** - * @brief Check if the requestor understands gzip - * @returns boolean true for gzip encoding supported - */ - static public function acceptGZip() { - if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) { - return false; - } - $HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"]; - if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false ) - return 'x-gzip'; - else if( strpos($HTTP_ACCEPT_ENCODING, 'gzip') !== false ) - return 'gzip'; - return false; - } - - /** * @brief Check if the requester sent along an mtime - * @returns false or an mtime + * @return false or an mtime */ static public function hasModificationTime () { if (isset($_SERVER['HTTP_X_OC_MTIME'])) { diff --git a/lib/private/response.php b/lib/private/response.php index 52dbb9d90f8..71c538fb311 100644 --- a/lib/private/response.php +++ b/lib/private/response.php @@ -15,7 +15,7 @@ class OC_Response { /** * @brief Enable response caching by sending correct HTTP headers - * @param $cache_time time to cache the response + * @param integer $cache_time time to cache the response * >0 cache time in seconds * 0 and <0 enable default browser caching * null cache indefinitly @@ -80,7 +80,7 @@ class OC_Response { /** * @brief Send redirect response - * @param $location to redirect to + * @param string $location to redirect to */ static public function redirect($location) { self::setStatus(self::STATUS_TEMPORARY_REDIRECT); @@ -167,7 +167,7 @@ class OC_Response { /** * @brief Send file as response, checking and setting caching headers - * @param $filepath of file to send + * @param string $filepath of file to send */ static public function sendFile($filepath) { $fp = fopen($filepath, 'rb'); diff --git a/lib/private/search.php b/lib/private/search.php index b9c75dfc333..70d670e048e 100644 --- a/lib/private/search.php +++ b/lib/private/search.php @@ -38,7 +38,6 @@ class OC_Search{ /** * register a new search provider to be used - * @param string $provider class name of a OC_Search_Provider */ public static function registerProvider($class, $options=array()) { self::$registeredProviders[]=array('class'=>$class, 'options'=>$options); diff --git a/lib/private/search/result.php b/lib/private/search/result.php index 42275c2df11..ceefeab2dae 100644 --- a/lib/private/search/result.php +++ b/lib/private/search/result.php @@ -15,6 +15,7 @@ class OC_Search_Result{ * @param string $text some more information about the result * @param string $link link for the result * @param string $type the type of result as human readable string ('File', 'Music', etc) + * @param string $container */ public function __construct($name, $text, $link, $type, $container) { $this->name=$name; diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php index 134cee582ed..1b9ac452575 100644 --- a/lib/private/session/memory.php +++ b/lib/private/session/memory.php @@ -25,7 +25,7 @@ class Memory extends Session { /** * @param string $key - * @param mixed $value + * @param integer $value */ public function set($key, $value) { $this->data[$key] = $value; diff --git a/lib/private/setup.php b/lib/private/setup.php index f3ef4df200d..3906204bda3 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -95,10 +95,9 @@ class OC_Setup { } if(count($error) == 0) { - OC_Appconfig::setValue('core', 'installedat', microtime(true)); - OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true)); - OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php'); - OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php'); + $appConfig = \OC::$server->getAppConfig(); + $appConfig->setValue('core', 'installedat', microtime(true)); + $appConfig->setValue('core', 'lastupdatedat', microtime(true)); OC_Group::createGroup('admin'); OC_Group::addToGroup($username, 'admin'); diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php new file mode 100644 index 00000000000..360376294cc --- /dev/null +++ b/lib/private/share/mailnotifications.php @@ -0,0 +1,160 @@ +<?php +/** +* ownCloud +* +* @author Bjoern Schiessle +* @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com> +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +*/ + +namespace OC\Share; + +class MailNotifications { + + private $senderId; // sender userId + private $from; // sender email address + private $senderDisplayName; + private $l; + + /** + * + * @param string $recipient user id + * @param string $sender user id (if nothing is set we use the currently logged-in user) + */ + public function __construct($sender = null) { + $this->l = \OC_L10N::get('core'); + + $this->senderId = $sender; + + $this->from = \OCP\Util::getDefaultEmailAddress('sharing-noreply'); + if ($this->senderId) { + $this->from = \OCP\Config::getUserValue($this->senderId, 'settings', 'email', $this->from); + $this->senderDisplayName = \OCP\User::getDisplayName($this->senderId); + } else { + $this->senderDisplayName = \OCP\User::getDisplayName(); + } + } + + /** + * @brief inform users if a file was shared with them + * + * @param array $recipientList list of recipients + * @param type $itemSource shared item source + * @param type $itemType shared item type + * @return array list of user to whom the mail send operation failed + */ + public function sendInternalShareMail($recipientList, $itemSource, $itemType) { + + $noMail = array(); + + foreach ($recipientList as $recipient) { + $recipientDisplayName = \OCP\User::getDisplayName($recipient); + $to = \OC_Preferences::getValue($recipient, 'settings', 'email', ''); + + if ($to === '') { + $noMail[] = $recipientDisplayName; + continue; + } + + $items = \OCP\Share::getItemSharedWithUser($itemType, $itemSource, $recipient); + $filename = trim($items[0]['file_target'], '/'); + $subject = (string) $this->l->t('%s shared »%s« with you', array($this->senderDisplayName, $filename)); + $expiration = null; + if (isset($items[0]['expiration'])) { + try { + $date = new DateTime($items[0]['expiration']); + $expiration = $date->getTimestamp(); + } catch (\Exception $e) { + \OCP\Util::writeLog('sharing', "Couldn't read date: " . $e->getMessage(), \OCP\Util::ERROR); + } + } + + if ($itemType === 'folder') { + $foldername = "/Shared/" . $filename; + } else { + // if it is a file we can just link to the Shared folder, + // that's the place where the user will find the file + $foldername = "/Shared"; + } + + $link = \OCP\Util::linkToAbsolute('files', 'index.php', array("dir" => $foldername)); + + list($htmlMail, $alttextMail) = $this->createMailBody($filename, $link, $expiration); + + // send it out now + try { + \OCP\Util::sendMail($to, $recipientDisplayName, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail); + } catch (\Exception $e) { + \OCP\Util::writeLog('sharing', "Can't send mail to inform the user abaut an internal share: " . $e->getMessage() , \OCP\Util::ERROR); + $noMail[] = $recipientDisplayName; + } + } + + return $noMail; + + } + + /** + * @brief inform recipient about public link share + * + * @param string recipient recipient email address + * @param string $filename the shared file + * @param string $link the public link + * @param int $expiration expiration date (timestamp) + * @return mixed $result true or error message + */ + public function sendLinkShareMail($recipient, $filename, $link, $expiration) { + $subject = (string)$this->l->t('%s shared »%s« with you', array($this->senderDisplayName, $filename)); + list($htmlMail, $alttextMail) = $this->createMailBody($filename, $link, $expiration); + try { + \OCP\Util::sendMail($recipient, $recipient, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail); + } catch (\Exception $e) { + \OCP\Util::writeLog('sharing', "Can't send mail with public link: " . $e->getMessage(), \OCP\Util::ERROR); + return $e->getMessage(); + } + + return true; + } + + /** + * @brief create mail body for plain text and html mail + * + * @param string $filename the shared file + * @param string $link link to the shared file + * @param int $expiration expiration date (timestamp) + * @return array with the html mail body and the plain text mail body + */ + private function createMailBody($filename, $link, $expiration) { + + $formatedDate = $expiration ? $this->l->l('date', $expiration) : null; + + $html = new \OC_Template("core", "mail", ""); + $html->assign ('link', $link); + $html->assign ('user_displayname', $this->senderDisplayName); + $html->assign ('filename', $filename); + $html->assign('expiration', $formatedDate); + $htmlMail = $html->fetchPage(); + + $alttext = new \OC_Template("core", "altmail", ""); + $alttext->assign ('link', $link); + $alttext->assign ('user_displayname', $this->senderDisplayName); + $alttext->assign ('filename', $filename); + $alttext->assign('expiration', $formatedDate); + $alttextMail = $alttext->fetchPage(); + + return array($htmlMail, $alttextMail); + } + +} diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php index fbf77179097..76abbf30846 100644 --- a/lib/private/share/searchresultsorter.php +++ b/lib/private/share/searchresultsorter.php @@ -15,8 +15,8 @@ class SearchResultSorter { private $log; /** - * @param $search the search term as was given by the user - * @param $key the array key containing the value that should be compared + * @param string $search the search term as was given by the user + * @param string $key the array key containing the value that should be compared * against * @param $encoding optional, encoding to use, defaults to UTF-8 * @param $log optional, an \OC\Log instance diff --git a/lib/private/tags.php b/lib/private/tags.php index fe7de1073a0..06550068f76 100644 --- a/lib/private/tags.php +++ b/lib/private/tags.php @@ -73,6 +73,7 @@ class Tags implements \OCP\ITags { * Constructor. * * @param string $user The user whos data the object will operate on. + * @param string $type */ public function __construct($user, $type, $defaultTags = array()) { $this->user = $user; @@ -83,8 +84,6 @@ class Tags implements \OCP\ITags { /** * Load tags from db. * - * @param string $type The type identifier e.g. 'contact' or 'event'. - * @param array $defaultTags An array of default tags to be used if none are stored. */ protected function loadTags($defaultTags=array()) { $this->tags = array(); @@ -176,7 +175,7 @@ class Tags implements \OCP\ITags { * * Throws an exception if the tag could not be found. * - * @param string|integer $tag Tag id or name. + * @param string $tag Tag id or name. * @return array An array of object ids or false on error. */ public function getIdsForTag($tag) { @@ -235,7 +234,7 @@ class Tags implements \OCP\ITags { * Add a new tag. * * @param string $name A string with a name of the tag - * @return int the id of the added tag or false if it already exists. + * @return false|string the id of the added tag or false if it already exists. */ public function add($name) { $name = trim($name); @@ -512,7 +511,7 @@ class Tags implements \OCP\ITags { * Creates a tag/object relation. * * @param int $objid The id of the object - * @param int|string $tag The id or name of the tag + * @param string $tag The id or name of the tag * @return boolean Returns false on database error. */ public function tagAs($objid, $tag) { @@ -544,7 +543,7 @@ class Tags implements \OCP\ITags { * Delete single tag/object relation from the db * * @param int $objid The id of the object - * @param int|string $tag The id or name of the tag + * @param string $tag The id or name of the tag * @return boolean */ public function unTag($objid, $tag) { diff --git a/lib/private/template.php b/lib/private/template.php index b2c3a20f281..c6851c6cc8d 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -156,6 +156,9 @@ class OC_Template extends \OC\Template\Base { * * Will select the template file for the selected theme and formfactor. * Checking all the possible locations. + * @param string $theme + * @param string $app + * @param string $fext */ protected function findTemplate($theme, $app, $name, $fext) { // Check if it is a app template or not. @@ -182,7 +185,7 @@ class OC_Template extends \OC\Template\Base { /** * @brief Process the template - * @return bool + * @return boolean|string * * This function process the template. If $this->renderas is set, it * will produce a full page. @@ -223,7 +226,7 @@ class OC_Template extends \OC\Template\Base { * @param string $application The application we render the template for * @param string $name Name of the template * @param array $parameters Parameters for the template - * @return bool + * @return boolean|null */ public static function printUserPage( $application, $name, $parameters = array() ) { $content = new OC_Template( $application, $name, "user" ); diff --git a/lib/private/template/base.php b/lib/private/template/base.php index 88941bc7132..232a29939cc 100644 --- a/lib/private/template/base.php +++ b/lib/private/template/base.php @@ -14,6 +14,11 @@ class Base { private $l10n; // The l10n-Object private $theme; // theme defaults + /** + * @param string $template + * @param \OC_L10N $l10n + * @param \OC_Defaults $theme + */ public function __construct( $template, $requesttoken, $l10n, $theme ) { $this->vars = array(); $this->vars['requesttoken'] = $requesttoken; @@ -22,6 +27,12 @@ class Base { $this->theme = $theme; } + /** + * @param string $serverroot + * @param string|false $app_dir + * @param string $theme + * @param string $app + */ protected function getAppTemplateDirs($theme, $app, $serverroot, $app_dir) { // Check if the app is in the app folder or in the root if( file_exists($app_dir.'/templates/' )) { @@ -36,6 +47,10 @@ class Base { ); } + /** + * @param string $serverroot + * @param string $theme + */ protected function getCoreTemplateDirs($theme, $serverroot) { return array( $serverroot.'/themes/'.$theme.'/core/templates/', @@ -63,7 +78,7 @@ class Base { * @brief Appends a variable * @param string $key key * @param string $value value - * @return bool + * @return boolean|null * * This function assigns a variable in an array context. If the key already * exists, the value will be appended. It can be accessed via @@ -97,7 +112,7 @@ class Base { /** * @brief Process the template - * @return bool + * @return string * * This function processes the template. */ @@ -107,6 +122,7 @@ class Base { /** * @brief doing the actual work + * @param string $file * @return string content * * Includes the template file, fetches its output diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/template/cssresourcelocator.php index 8e7831ca549..e26daa25827 100644 --- a/lib/private/template/cssresourcelocator.php +++ b/lib/private/template/cssresourcelocator.php @@ -22,7 +22,7 @@ class CSSResourceLocator extends ResourceLocator { $app = substr($style, 0, strpos($style, '/')); $style = substr($style, strpos($style, '/')+1); $app_path = \OC_App::getAppPath($app); - $app_url = $this->webroot . '/index.php/apps/' . $app; + $app_url = \OC_App::getAppWebPath($app); if ($this->appendIfExist($app_path, $style.$this->form_factor.'.css', $app_url) || $this->appendIfExist($app_path, $style.'.css', $app_url) ) { diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php index ce42633b364..a72d41f72da 100644 --- a/lib/private/template/functions.php +++ b/lib/private/template/functions.php @@ -78,6 +78,9 @@ function preview_icon( $path ) { return OC_Helper::previewIcon( $path ); } +/** + * @param string $path + */ function publicPreview_icon ( $path, $token ) { return OC_Helper::publicPreviewIcon( $path, $token ); } @@ -110,7 +113,7 @@ function strip_time($timestamp){ * @param int $timestamp timestamp to format * @param int $fromTime timestamp to compare from, defaults to current time * @param bool $dateOnly whether to strip time information - * @return formatted timestamp + * @return OC_L10N_String timestamp */ function relative_modified_date($timestamp, $fromTime = null, $dateOnly = false) { $l=OC_L10N::get('lib'); diff --git a/lib/private/template/resourcelocator.php b/lib/private/template/resourcelocator.php index 9f83673664d..8a3dd5e7fa9 100644 --- a/lib/private/template/resourcelocator.php +++ b/lib/private/template/resourcelocator.php @@ -19,6 +19,10 @@ abstract class ResourceLocator { protected $resources = array(); + /** + * @param string $theme + * @param string $form_factor + */ public function __construct( $theme, $form_factor, $core_map, $party_map ) { $this->theme = $theme; $this->form_factor = $form_factor; @@ -53,6 +57,10 @@ abstract class ResourceLocator { * @param $file the filename * @param $web base for path, default map $root to $webroot */ + /** + * @param string $file + * @param string|false $webroot + */ protected function appendIfExist($root, $file, $webroot = null) { if (is_file($root.'/'.$file)) { if (!$webroot) { diff --git a/lib/private/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php index d5a484b1a14..4676fceb37d 100644 --- a/lib/private/template/templatefilelocator.php +++ b/lib/private/template/templatefilelocator.php @@ -13,11 +13,18 @@ class TemplateFileLocator { protected $dirs; private $path; + /** + * @param string[] $dirs + * @param string $form_factor + */ public function __construct( $form_factor, $dirs ) { $this->form_factor = $form_factor; $this->dirs = $dirs; } + /** + * @param string $template + */ public function find( $template ) { if ($template === '') { throw new \InvalidArgumentException('Empty template name'); diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index d5cd5039753..af17adb11c6 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -1,4 +1,11 @@ <?php +use Assetic\Asset\AssetCollection; +use Assetic\Asset\FileAsset; +use Assetic\Asset\GlobAsset; +use Assetic\AssetManager; +use Assetic\AssetWriter; +use Assetic\Filter\CssRewriteFilter; + /** * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl> * This file is licensed under the Affero General Public License version 3 or @@ -7,6 +14,10 @@ */ class OC_TemplateLayout extends OC_Template { + + /** + * @param string $renderas + */ public function __construct( $renderas ) { // Decide which page we show @@ -53,35 +64,38 @@ class OC_TemplateLayout extends OC_Template { } else { parent::__construct('core', 'layout.base'); } + $versionParameter = '?v=' . md5(implode(OC_Util::getVersion())); - // Add the js files - $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); - $this->assign('jsfiles', array(), false); - if (OC_Config::getValue('installed', false) && $renderas!='error') { + $useAssetPipeline = OC_Config::getValue('asset-pipeline.enabled', false); + if ($useAssetPipeline) { + $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter); - } - if (!empty(OC_Util::$coreScripts)) { - $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter); - } - foreach($jsfiles as $info) { - $root = $info[0]; - $web = $info[1]; - $file = $info[2]; - $this->append( 'jsfiles', $web.'/'.$file . $versionParameter); - } - // Add the css files - $cssfiles = self::findStylesheetFiles(OC_Util::$styles); - $this->assign('cssfiles', array()); - if (!empty(OC_Util::$coreStyles)) { - $this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false) . $versionParameter); - } - foreach($cssfiles as $info) { - $root = $info[0]; - $web = $info[1]; - $file = $info[2]; + $this->generateAssets(); + + } else { + + // Add the js files + $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); + $this->assign('jsfiles', array(), false); + if (OC_Config::getValue('installed', false) && $renderas!='error') { + $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter); + } + foreach($jsfiles as $info) { + $web = $info[1]; + $file = $info[2]; + $this->append( 'jsfiles', $web.'/'.$file . $versionParameter); + } + + // Add the css files + $cssfiles = self::findStylesheetFiles(OC_Util::$styles); + $this->assign('cssfiles', array()); + foreach($cssfiles as $info) { + $web = $info[1]; + $file = $info[2]; - $this->append( 'cssfiles', $web.'/'.$file . $versionParameter); + $this->append( 'cssfiles', $web.'/'.$file . $versionParameter); + } } } @@ -112,4 +126,57 @@ class OC_TemplateLayout extends OC_Template { $locator->find($scripts); return $locator->getResources(); } + + public function generateAssets() + { + $jsFiles = self::findJavascriptFiles(OC_Util::$scripts); + $jsHash = self::hashScriptNames($jsFiles); + + if (!file_exists("assets/$jsHash.js")) { + $jsFiles = array_map(function ($item) { + $root = $item[0]; + $file = $item[2]; + return new FileAsset($root . '/' . $file, array(), $root, $file); + }, $jsFiles); + $jsCollection = new AssetCollection($jsFiles); + $jsCollection->setTargetPath("assets/$jsHash.js"); + + $writer = new AssetWriter(\OC::$SERVERROOT); + $writer->writeAsset($jsCollection); + } + + $cssFiles = self::findStylesheetFiles(OC_Util::$styles); + $cssHash = self::hashScriptNames($cssFiles); + + if (!file_exists("assets/$cssHash.css")) { + $cssFiles = array_map(function ($item) { + $root = $item[0]; + $file = $item[2]; + $assetPath = $root . '/' . $file; + $sourceRoot = \OC::$SERVERROOT; + $sourcePath = substr($assetPath, strlen(\OC::$SERVERROOT)); + return new FileAsset($assetPath, array(new CssRewriteFilter()), $sourceRoot, $sourcePath); + }, $cssFiles); + $cssCollection = new AssetCollection($cssFiles); + $cssCollection->setTargetPath("assets/$cssHash.css"); + + $writer = new AssetWriter(\OC::$SERVERROOT); + $writer->writeAsset($cssCollection); + } + + $this->append('jsfiles', OC_Helper::linkTo('assets', "$jsHash.js")); + $this->append('cssfiles', OC_Helper::linkTo('assets', "$cssHash.css")); + } + + private static function hashScriptNames($files) + { + $files = array_map(function ($item) { + $root = $item[0]; + $file = $item[2]; + return $root . '/' . $file; + }, $files); + + sort($files); + return hash('md5', implode('', $files)); + } } diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php index 4e3c1109000..60da34f2d6e 100644 --- a/lib/private/urlgenerator.php +++ b/lib/private/urlgenerator.php @@ -147,6 +147,7 @@ class URLGenerator implements IURLGenerator { * @return string the absolute version of the url */ public function getAbsoluteURL($url) { - return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $url; + $separator = $url[0] === '/' ? '' : '/'; + return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $separator . $url; } } diff --git a/lib/private/user.php b/lib/private/user.php index 2519200d0f0..a89b7286c10 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -222,11 +222,12 @@ class OC_User { * @brief Try to login a user * @param $uid The username of the user to log in * @param $password The password of the user - * @return bool + * @return boolean|null * * Log in a user and regenerate a new session - if the password is ok */ public static function login($uid, $password) { + session_regenerate_id(true); return self::getUserSession()->login($uid, $password); } @@ -246,7 +247,6 @@ class OC_User { OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid )); if($uid) { - session_regenerate_id(true); self::setUserId($uid); self::setDisplayName($uid); self::getUserSession()->setLoginName($uid); @@ -290,6 +290,7 @@ class OC_User { /** * @brief Sets user display name for session + * @param string $uid */ public static function setDisplayName($uid, $displayName = null) { if (is_null($displayName)) { @@ -481,7 +482,7 @@ class OC_User { * @brief Check if the password is correct * @param string $uid The username * @param string $password The password - * @return mixed user id a string on success, false otherwise + * @return string|false user id a string on success, false otherwise * * Check if the password is correct without logging in the user * returns the user id or false @@ -515,6 +516,8 @@ class OC_User { * @returns array with all uids * * Get a list of all users. + * @param integer $limit + * @param integer $offset */ public static function getUsers($search = '', $limit = null, $offset = null) { $users = self::getManager()->search($search, $limit, $offset); @@ -609,7 +612,7 @@ class OC_User { /** * @brief Returns the first active backend from self::$_usedBackends. - * @return null if no backend active, otherwise OCP\Authentication\IApacheBackend + * @return OCP\Authentication\IApacheBackend|null if no backend active, otherwise OCP\Authentication\IApacheBackend */ private static function findFirstActiveUsedBackend() { foreach (self::$_usedBackends as $backend) { diff --git a/lib/private/user/database.php b/lib/private/user/database.php index 1a63755b980..15e6643dfb3 100644 --- a/lib/private/user/database.php +++ b/lib/private/user/database.php @@ -236,7 +236,7 @@ class OC_User_Database extends OC_User_Backend { /** * @brief get the user's home directory * @param string $uid the username - * @return boolean + * @return string|false */ public function getHome($uid) { if ($this->userExists($uid)) { @@ -256,7 +256,7 @@ class OC_User_Database extends OC_User_Backend { /** * counts the users in the database * - * @return int | bool + * @return false|string | bool */ public function countUsers() { $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`'); diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php index fc15a630cf3..2fb51d02de3 100644 --- a/lib/private/user/dummy.php +++ b/lib/private/user/dummy.php @@ -100,7 +100,7 @@ class OC_User_Dummy extends OC_User_Backend { * @param string $search * @param int $limit * @param int $offset - * @return array with all uids + * @return string[] with all uids * * Get a list of all users. */ diff --git a/lib/private/user/http.php b/lib/private/user/http.php index e99afe59ba7..a0394521012 100644 --- a/lib/private/user/http.php +++ b/lib/private/user/http.php @@ -98,7 +98,7 @@ class OC_User_HTTP extends OC_User_Backend { /** * @brief get the user's home directory * @param string $uid the username - * @return boolean + * @return string|false */ public function getHome($uid) { if($this->userExists($uid)) { diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php index c72bdfaf3fd..cdcab3e5d00 100644 --- a/lib/private/user/interface.php +++ b/lib/private/user/interface.php @@ -30,6 +30,7 @@ interface OC_User_Interface { * * Returns the supported actions as int to be * compared with OC_USER_BACKEND_CREATE_USER etc. + * @return boolean */ public function implementsActions($actions); @@ -39,6 +40,7 @@ interface OC_User_Interface { * @returns true/false * * Deletes a user + * @return boolean */ public function deleteUser($uid); diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php index 90970ef9963..8583a451f2d 100644 --- a/lib/private/user/manager.php +++ b/lib/private/user/manager.php @@ -144,8 +144,8 @@ class Manager extends PublicEmitter { /** * Check if the password is valid for the user * - * @param $loginname - * @param $password + * @param string $loginname + * @param string $password * @return mixed the User object on success, false otherwise */ public function checkPassword($loginname, $password) { diff --git a/lib/private/user/session.php b/lib/private/user/session.php index 1e299416fb3..1740bad5abe 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -149,7 +149,7 @@ class Session implements Emitter, \OCP\IUserSession { * * @param string $uid * @param string $password - * @return bool + * @return boolean|null */ public function login($uid, $password) { $this->manager->emit('\OC\User', 'preLogin', array($uid, $password)); diff --git a/lib/private/util.php b/lib/private/util.php index 0585749d615..920161949ae 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -11,8 +11,6 @@ class OC_Util { public static $headers=array(); private static $rootMounted=false; private static $fsSetup=false; - public static $coreStyles=array(); - public static $coreScripts=array(); /** * @brief Can be set up @@ -65,7 +63,7 @@ class OC_Util { $user = $storage->getUser()->getUID(); $quota = OC_Util::getUserQuota($user); if ($quota !== \OC\Files\SPACE_UNLIMITED) { - return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota)); + return new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => $quota, 'root' => 'files')); } } @@ -90,10 +88,14 @@ class OC_Util { return true; } + /** + * @param string $user + */ public static function getUserQuota($user){ - $userQuota = OC_Preferences::getValue($user, 'files', 'quota', 'default'); + $config = \OC::$server->getConfig(); + $userQuota = $config->getUserValue($user, 'files', 'quota', 'default'); if($userQuota === 'default') { - $userQuota = OC_AppConfig::getValue('files', 'default_quota', 'none'); + $userQuota = $config->getAppValue('files', 'default_quota', 'none'); } if($userQuota === 'none') { return \OC\Files\SPACE_UNLIMITED; @@ -214,7 +216,7 @@ class OC_Util { * @brief add a javascript file * * @param string $application - * @param filename $file + * @param string|null $file filename * @return void */ public static function addScript( $application, $file = null ) { @@ -233,7 +235,7 @@ class OC_Util { * @brief add a css file * * @param string $application - * @param filename $file + * @param string|null $file filename * @return void */ public static function addStyle( $application, $file = null ) { @@ -512,7 +514,7 @@ class OC_Util { /** * @brief Check for correct file permissions of data directory - * @paran string $dataDirectory + * @param string $dataDirectory * @return array arrays with error messages and hints */ public static function checkDataDirectoryPermissions($dataDirectory) { @@ -566,6 +568,7 @@ class OC_Util { /** * @brief Check if the app is enabled, redirects to home if not + * @param string $app * @return void */ public static function checkAppEnabled($app) { @@ -625,7 +628,7 @@ class OC_Util { /** * @brief Check if the user is a subadmin, redirects to home if not - * @return array $groups where the current user is subadmin + * @return null|boolean $groups where the current user is subadmin */ public static function checkSubAdminUser() { OC_Util::checkLoggedIn(); @@ -924,7 +927,7 @@ class OC_Util { /** * @brief Check if the connection to the internet is disabled on purpose - * @return bool + * @return string */ public static function isInternetConnectionEnabled(){ return \OC_Config::getValue("has_internet_connection", true); @@ -1129,6 +1132,7 @@ class OC_Util { } /** + * @param boolean|string $file * @return string */ public static function basename($file) { @@ -1149,4 +1153,25 @@ class OC_Util { } return $version; } + + /** + * Returns whether the given file name is valid + * @param $file string file name to check + * @return bool true if the file name is valid, false otherwise + */ + public static function isValidFileName($file) { + $trimmed = trim($file); + if ($trimmed === '') { + return false; + } + if ($trimmed === '.' || $trimmed === '..') { + return false; + } + foreach (str_split($trimmed) as $char) { + if (strpos(\OCP\FILENAME_INVALID_CHARS, $char) !== false) { + return false; + } + } + return true; + } } diff --git a/lib/public/activity/imanager.php b/lib/public/activity/imanager.php index 086e430d677..449fdcc934d 100644 --- a/lib/public/activity/imanager.php +++ b/lib/public/activity/imanager.php @@ -53,6 +53,7 @@ interface IManager { * $callable has to return an instance of OCA\Activity\IConsumer * * @param \Closure $callable + * @return void */ function registerConsumer(\Closure $callable); diff --git a/lib/public/app.php b/lib/public/app.php index e0b5682242b..96162299ec4 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -85,6 +85,7 @@ class App { * Register a Configuration Screen that should appear in the personal settings section. * @param $app string appid * @param $page string page to be included + * @return void */ public static function registerPersonal( $app, $page ) { \OC_App::registerPersonal( $app, $page ); @@ -92,8 +93,9 @@ class App { /** * Register a Configuration Screen that should appear in the Admin section. - * @param $app string appid - * @param $page string page to be included + * @param string $app string appid + * @param string $page string page to be included + * @return void */ public static function registerAdmin( $app, $page ) { \OC_App::registerAdmin( $app, $page ); @@ -111,7 +113,7 @@ class App { /** * checks whether or not an app is enabled - * @param string + * @param string $app * @return boolean * * This function checks whether or not an app is enabled. @@ -122,7 +124,8 @@ class App { /** * Check if the app is enabled, redirects to home if not - * @param string + * @param string $app + * @return void */ public static function checkAppEnabled( $app ) { \OC_Util::checkAppEnabled( $app ); @@ -130,8 +133,8 @@ class App { /** * Get the last version of the app, either from appinfo/version or from appinfo/info.xml - * @param string - * @return boolean + * @param string $app + * @return string */ public static function getAppVersion( $app ) { return \OC_App::getAppVersion( $app ); diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php index dc8da967871..7c2219bd046 100644 --- a/lib/public/appframework/controller.php +++ b/lib/public/appframework/controller.php @@ -68,7 +68,7 @@ abstract class Controller { * 1. URL parameters * 2. POST parameters * 3. GET parameters - * @param mixed $default If the key is not found, this value will be returned + * @param string $default If the key is not found, this value will be returned * @return mixed the content of the array */ public function params($key, $default=null){ @@ -131,7 +131,7 @@ abstract class Controller { * @param array $params the template parameters in key => value structure * @param string $renderAs user renders a full page, blank only your template * admin an entry in the admin settings - * @param array $headers set additional headers in name/value pairs + * @param string[] $headers set additional headers in name/value pairs * @return \OCP\AppFramework\Http\TemplateResponse containing the page */ public function render($templateName, array $params=array(), diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php index 0f5a18ca4fe..d223621d4fd 100644 --- a/lib/public/appframework/http/response.php +++ b/lib/public/appframework/http/response.php @@ -155,7 +155,7 @@ class Response { /** * Get "last modified" date - * @return string RFC2822 formatted last modified date + * @return \DateTime RFC2822 formatted last modified date */ public function getLastModified() { return $this->lastModified; diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php index 963e870f79b..c4aeea2d4e5 100644 --- a/lib/public/appframework/iapi.php +++ b/lib/public/appframework/iapi.php @@ -45,6 +45,7 @@ interface IApi { * Adds a new javascript file * @param string $scriptName the name of the javascript in js/ without the suffix * @param string $appName the name of the app, defaults to the current one + * @return void */ function addScript($scriptName, $appName = null); @@ -53,6 +54,7 @@ interface IApi { * Adds a new css file * @param string $styleName the name of the css file in css/without the suffix * @param string $appName the name of the app, defaults to the current one + * @return void */ function addStyle($styleName, $appName = null); @@ -60,6 +62,7 @@ interface IApi { /** * shorthand for addScript for files in the 3rdparty directory * @param string $name the name of the file without the suffix + * @return void */ function add3rdPartyScript($name); @@ -67,6 +70,7 @@ interface IApi { /** * shorthand for addStyle for files in the 3rdparty directory * @param string $name the name of the file without the suffix + * @return void */ function add3rdPartyStyle($name); diff --git a/lib/public/appframework/iappcontainer.php b/lib/public/appframework/iappcontainer.php index 7e6ec6016b7..e4f5f37cad2 100644 --- a/lib/public/appframework/iappcontainer.php +++ b/lib/public/appframework/iappcontainer.php @@ -66,8 +66,8 @@ interface IAppContainer extends IContainer{ function isAdminUser(); /** - * @param $message - * @param $level + * @param string $message + * @param string $level * @return mixed */ function log($message, $level); diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php index bcaf6e35454..03b94403b47 100644 --- a/lib/public/backgroundjob.php +++ b/lib/public/backgroundjob.php @@ -59,7 +59,7 @@ class BackgroundJob { * sets the background jobs execution type * * @param string $type execution type - * @return boolean + * @return false|null * * This method sets the execution type of the background jobs. Possible types * are "none", "ajax", "webcron", "cron" @@ -69,7 +69,7 @@ class BackgroundJob { } /** - * @param \OC\BackgroundJob\Job|string $job + * @param string $job * @param mixed $argument */ public static function registerJob($job, $argument = null) { @@ -82,7 +82,7 @@ class BackgroundJob { * creates a regular task * @param string $klass class name * @param string $method method name - * @return true + * @return boolean|null */ public static function addRegularTask($klass, $method) { if (!\OC::needUpgrade()) { @@ -115,7 +115,7 @@ class BackgroundJob { * @deprecated * Gets one queued task * @param int $id ID of the task - * @return associative array + * @return BackgroundJob\IJob array */ public static function findQueuedTask($id) { $jobList = \OC::$server->getJobList(); @@ -170,7 +170,7 @@ class BackgroundJob { * @param string $class class name * @param string $method method name * @param string $parameters all useful data as text - * @return int id of task + * @return boolean id of task */ public static function addQueuedTask($app, $class, $method, $parameters) { self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters)); @@ -181,7 +181,7 @@ class BackgroundJob { * @deprecated * deletes a queued task * @param int $id id of task - * @return bool + * @return boolean|null * * Deletes a report */ diff --git a/lib/public/backgroundjob/ijob.php b/lib/public/backgroundjob/ijob.php index 5231e9537a9..eaf11c4f684 100644 --- a/lib/public/backgroundjob/ijob.php +++ b/lib/public/backgroundjob/ijob.php @@ -14,6 +14,7 @@ interface IJob { * * @param \OCP\BackgroundJob\IJobList $jobList The job list that manages the state of this job * @param \OC\Log $logger + * @return void */ public function execute($jobList, $logger = null); diff --git a/lib/public/backgroundjob/ijoblist.php b/lib/public/backgroundjob/ijoblist.php index 72f3fe863da..c9b546605b8 100644 --- a/lib/public/backgroundjob/ijoblist.php +++ b/lib/public/backgroundjob/ijoblist.php @@ -14,14 +14,17 @@ interface IJobList { * * @param \OCP\BackgroundJob\IJob |string $job * @param mixed $argument The argument to be passed to $job->run() when the job is exectured + * @param string $job + * @return void */ public function add($job, $argument = null); /** * Remove a job from the list * - * @param \OCP\BackgroundJob\IJob|string $job + * @param IJob $job * @param mixed $argument + * @return void */ public function remove($job, $argument = null); @@ -58,6 +61,7 @@ interface IJobList { * set the job that was last ran to the current time * * @param \OCP\BackgroundJob\IJob $job + * @return void */ public function setLastJob($job); @@ -72,6 +76,7 @@ interface IJobList { * set the lastRun of $job to now * * @param \OCP\BackgroundJob\IJob $job + * @return void */ public function setLastRun($job); } diff --git a/lib/public/config.php b/lib/public/config.php index d9355a0605f..bb973939f44 100644 --- a/lib/public/config.php +++ b/lib/public/config.php @@ -42,7 +42,7 @@ class Config { /** * Gets a value from config.php * @param string $key key - * @param string $default = null default value + * @param mixed $default = null default value * @return string the value or $default * * This function gets the value from config.php. If it does not exist, @@ -55,7 +55,7 @@ class Config { /** * Sets a value * @param string $key key - * @param string $value value + * @param mixed $value value * @return bool * * This function sets the value and writes the config.php. If the file can @@ -89,7 +89,7 @@ class Config { * @param string $app app * @param string $key key * @param string $value value - * @return string true/false + * @return boolean true/false * * Sets a value. If the key did not exist before it will be created. */ diff --git a/lib/public/constants.php b/lib/public/constants.php index 1495c620dc9..350646a0ac0 100644 --- a/lib/public/constants.php +++ b/lib/public/constants.php @@ -35,3 +35,6 @@ const PERMISSION_UPDATE = 2; const PERMISSION_DELETE = 8; const PERMISSION_SHARE = 16; const PERMISSION_ALL = 31; + +const FILENAME_INVALID_CHARS = "\\/<>:\"|?*\n"; + diff --git a/lib/public/contacts/imanager.php b/lib/public/contacts/imanager.php index 973d48be5ec..5b9d64ecc41 100644 --- a/lib/public/contacts/imanager.php +++ b/lib/public/contacts/imanager.php @@ -96,7 +96,7 @@ namespace OCP\Contacts { * This function can be used to delete the contact identified by the given id * * @param object $id the unique identifier to a contact - * @param $address_book_key + * @param $address_book_key * @return bool successful or not */ function delete($id, $address_book_key); @@ -106,7 +106,7 @@ namespace OCP\Contacts { * Otherwise the contact will be updated by replacing the entire data set. * * @param array $properties this array if key-value-pairs defines a contact - * @param $address_book_key string to identify the address book in which the contact shall be created or updated + * @param $address_book_key string to identify the address book in which the contact shall be created or updated * @return array representing the contact just created or updated */ function createOrUpdate($properties, $address_book_key); @@ -122,6 +122,7 @@ namespace OCP\Contacts { * Registers an address book * * @param \OCP\IAddressBook $address_book + * @return void */ function registerAddressBook(\OCP\IAddressBook $address_book); @@ -129,6 +130,7 @@ namespace OCP\Contacts { * Unregisters an address book * * @param \OCP\IAddressBook $address_book + * @return void */ function unregisterAddressBook(\OCP\IAddressBook $address_book); @@ -138,6 +140,7 @@ namespace OCP\Contacts { * * @param string $key * @param \Closure $callable + * @return void */ function register($key, \Closure $callable); @@ -148,6 +151,7 @@ namespace OCP\Contacts { /** * removes all registered address book instances + * @return void */ function clear(); } diff --git a/lib/public/db.php b/lib/public/db.php index 4a19d78d444..cb876b4d1f9 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -39,7 +39,7 @@ class DB { * @param string $query Query string * @param int $limit Limit of the SQL statement * @param int $offset Offset of the SQL statement - * @return \Doctrine\DBAL\Statement prepared SQL query + * @return \OC_DB_StatementWrapper prepared SQL query * * SQL query via Doctrine prepare(), needs to be execute()'d! */ @@ -49,7 +49,7 @@ class DB { /** * Insert a row if a matching row doesn't exists. - * @param $table string The table name (will replace *PREFIX*) to perform the replace on. + * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix * @param $input array * * The input array if in the form: @@ -70,8 +70,8 @@ class DB { /** * Gets last value of autoincrement - * @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix - * @return int + * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix + * @return string * * \Doctrine\DBAL\Connection lastInsertID() * diff --git a/lib/public/files.php b/lib/public/files.php index d36d74fdf77..e2d9c81d442 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -37,7 +37,6 @@ namespace OCP; class Files { /** * Recusive deletion of folders - * @param string path to the folder * @return bool */ static function rmdirr( $dir ) { @@ -46,7 +45,7 @@ class Files { /** * Get the mimetype form a local file - * @param string path + * @param string $path * @return string * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead */ @@ -56,7 +55,7 @@ class Files { /** * Search for files by mimetype - * @param string mimetype + * @param string $mimetype * @return array */ static public function searchByMime( $mimetype ) { @@ -65,8 +64,8 @@ class Files { /** * Copy the contents of one stream to another - * @param resource source - * @param resource target + * @param resource $source + * @param resource $target * @return int the number of bytes copied */ public static function streamCopy( $source, $target ) { @@ -76,7 +75,7 @@ class Files { /** * Create a temporary file with an unique filename - * @param string postfix + * @param string $postfix * @return string * * temporary files are automatically cleaned up after the script is finished @@ -97,8 +96,8 @@ class Files { /** * Adds a suffix to the name in case the file exists - * @param string path - * @param string filename + * @param string $path + * @param string $filename * @return string */ public static function buildNotExistingFileName( $path, $filename ) { @@ -108,7 +107,7 @@ class Files { /** * Gets the Storage for an app - creates the needed folder if they are not * existant - * @param string appid + * @param string $app * @return \OC\Files\View */ public static function getStorage( $app ) { diff --git a/lib/public/files/file.php b/lib/public/files/file.php index c6cda59f9b0..6208aeff426 100644 --- a/lib/public/files/file.php +++ b/lib/public/files/file.php @@ -43,6 +43,7 @@ interface File extends Node { * * @param string $data * @throws \OCP\Files\NotPermittedException + * @return void */ public function putContent($data); diff --git a/lib/public/files/node.php b/lib/public/files/node.php index 972b1cfa492..a380394095b 100644 --- a/lib/public/files/node.php +++ b/lib/public/files/node.php @@ -41,6 +41,7 @@ interface Node { /** * Delete the file or folder + * @return void */ public function delete(); @@ -58,6 +59,7 @@ interface Node { * * @param int $mtime (optional) modified date as unix timestamp * @throws \OCP\Files\NotPermittedException + * @return void */ public function touch($mtime = null); diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php index fe30f8f50af..5ec8ac6245c 100644 --- a/lib/public/files/storage.php +++ b/lib/public/files/storage.php @@ -39,6 +39,7 @@ interface Storage { * $parameters is a free form array with the configuration options needed to construct the storage * * @param array $parameters + * @return void */ public function __construct($parameters); diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php index 3b6484c09d5..1f31898bf2c 100644 --- a/lib/public/iappconfig.php +++ b/lib/public/iappconfig.php @@ -57,6 +57,7 @@ interface IAppConfig { * * @param app * @param key + * @param string $key * @return array */ public function getValues($app, $key); @@ -68,6 +69,7 @@ interface IAppConfig { * @param string $value value * * Sets a value. If the key did not exist before it will be created. + * @return void */ public function setValue($app, $key, $value); diff --git a/lib/public/iavatar.php b/lib/public/iavatar.php index 2cbec0d45c3..43fa32556de 100644 --- a/lib/public/iavatar.php +++ b/lib/public/iavatar.php @@ -22,7 +22,7 @@ interface IAvatar { /** * @brief sets the users avatar - * @param $data mixed imagedata or path to set a new avatar + * @param Image $data mixed imagedata or path to set a new avatar * @throws Exception if the provided file is not a jpg or png image * @throws Exception if the provided image is not valid * @throws \OCP\NotSquareException if the image is not square diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php index 1d0f8e0015c..0ebbd9f5a71 100644 --- a/lib/public/iconfig.php +++ b/lib/public/iconfig.php @@ -38,7 +38,7 @@ interface IConfig { * Sets a new system wide value * * @param string $key the key of the value, under which will be saved - * @param string $value the value that should be stored + * @param mixed $value the value that should be stored * @todo need a use case for this */ // public function setSystemValue($key, $value); @@ -59,6 +59,7 @@ interface IConfig { * @param string $appName the appName that we want to store the value under * @param string $key the key of the value, under which will be saved * @param string $value the value that should be stored + * @return void */ public function setAppValue($appName, $key, $value); @@ -80,6 +81,7 @@ interface IConfig { * @param string $appName the appName that we want to store the value under * @param string $key the key under which the value is being stored * @param string $value the value that you want to store + * @return void */ public function setUserValue($userId, $appName, $key, $value); @@ -90,6 +92,7 @@ interface IConfig { * @param string $appName the appName that we stored the value under * @param string $key the key under which the value is being stored * @param string $default the default value to be returned if the value isn't set + * @return string */ public function getUserValue($userId, $appName, $key, $default = ''); } diff --git a/lib/public/il10n.php b/lib/public/il10n.php index 817b299b0b7..1c025e7824f 100644 --- a/lib/public/il10n.php +++ b/lib/public/il10n.php @@ -25,7 +25,7 @@ interface IL10N { * Translating * @param $text String The text we need a translation for * @param array $parameters default:array() Parameters for sprintf - * @return \OC_L10N_String|string Translation or the same text + * @return \OC_L10N_String Translation or the same text * * Returns the translation. If no translation is found, $text will be * returned. @@ -38,7 +38,7 @@ interface IL10N { * @param $text_plural String the string to translate for n objects * @param $count Integer Number of objects * @param array $parameters default:array() Parameters for sprintf - * @return \OC_L10N_String|string Translation or the same text + * @return \OC_L10N_String Translation or the same text * * Returns the translation. If no translation is found, $text will be * returned. %n will be replaced with the number of objects. diff --git a/lib/public/inavigationmanager.php b/lib/public/inavigationmanager.php index 73e85d03761..9497d3fd08e 100644 --- a/lib/public/inavigationmanager.php +++ b/lib/public/inavigationmanager.php @@ -37,12 +37,14 @@ interface INavigationManager { /** * Creates a new navigation entry * @param array $entry containing: id, name, order, icon and href key + * @return void */ public function add(array $entry); /** * Sets the current navigation entry of the currently running app * @param string $appId id of the app entry to activate (from added $entry) + * @return void */ public function setActiveEntry($appId); } diff --git a/lib/public/irequest.php b/lib/public/irequest.php index ca23e12b7f5..d77a9bc887a 100644 --- a/lib/public/irequest.php +++ b/lib/public/irequest.php @@ -55,6 +55,11 @@ namespace OCP; interface IRequest { + /** + * @param string $name + * + * @return string + */ function getHeader($name); /** diff --git a/lib/public/itags.php b/lib/public/itags.php index ea62fb38ecb..f8ebaa668f1 100644 --- a/lib/public/itags.php +++ b/lib/public/itags.php @@ -49,7 +49,7 @@ interface ITags { /** * Check if any tags are saved for this type and user. * - * @return boolean. + * @return boolean */ public function isEmpty(); @@ -147,7 +147,7 @@ interface ITags { * Creates a tag/object relation. * * @param int $objid The id of the object - * @param int|string $tag The id or name of the tag + * @param string $tag The id or name of the tag * @return boolean Returns false on database error. */ public function tagAs($objid, $tag); @@ -156,7 +156,7 @@ interface ITags { * Delete single tag/object relation from the db * * @param int $objid The id of the object - * @param int|string $tag The id or name of the tag + * @param string $tag The id or name of the tag * @return boolean */ public function unTag($objid, $tag); diff --git a/lib/public/iusersession.php b/lib/public/iusersession.php index 131b326ab90..adc706cc7c3 100644 --- a/lib/public/iusersession.php +++ b/lib/public/iusersession.php @@ -45,6 +45,7 @@ interface IUserSession { /** * Logs the user out including all the session data * Logout, destroys session + * @return void */ public function logout(); diff --git a/lib/public/json.php b/lib/public/json.php index cd5d233ef90..e7371ad63f3 100644 --- a/lib/public/json.php +++ b/lib/public/json.php @@ -81,7 +81,7 @@ class JSON { * parameter to the ajax call, then assign it to the template and finally * add a hidden input field also named 'requesttoken' containing the value. * - * @return string json formatted error string if not valid. + * @return \json|null json formatted error string if not valid. */ public static function callCheck() { return(\OC_JSON::callCheck()); diff --git a/lib/public/share.php b/lib/public/share.php index ae7d29e8b87..ebc555dba5f 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -78,7 +78,10 @@ class Share { * @param string Backend class * @param string (optional) Depends on item type * @param array (optional) List of supported file extensions if this item type depends on files - * @return Returns true if backend is registered or false if error + * @param string $itemType + * @param string $class + * @param string $collectionOf + * @return boolean true if backend is registered or false if error */ public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) { if (self::isEnabled()) { @@ -104,7 +107,7 @@ class Share { /** * Check if the Share API is enabled - * @return Returns true if enabled or false + * @return boolean true if enabled or false * * The Share API is enabled by default if not configured */ @@ -135,7 +138,7 @@ class Share { /** * Find which users can access a shared item - * @param $path to the file + * @param string $path to the file * @param $user owner of the file * @param include owner to the list of users with access to the file * @return array @@ -247,6 +250,7 @@ class Share { * @param mixed Parameters (optional) * @param int Number of items to return (optional) Returns all by default * @param bool include collections (optional) + * @param string $itemType * @return Return depends on format */ public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE, @@ -262,7 +266,7 @@ class Share { * @param int $format (optional) Format type must be defined by the backend * @param mixed Parameters (optional) * @param bool include collections (optional) - * @return Return depends on format + * @return string depends on format */ public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE, $parameters = null, $includeCollections = false) { @@ -403,6 +407,7 @@ class Share { * @param mixed Parameters * @param int Number of items to return (optional) Returns all by default * @param bool include collections + * @param string $itemType * @return Return depends on format */ public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null, @@ -646,7 +651,7 @@ class Share { * @param string Item source * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK * @param string User or group the item is being shared with - * @return Returns true on success or false on failure + * @return boolean true on success or false on failure */ public static function unshare($itemType, $itemSource, $shareType, $shareWith) { if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(), @@ -661,7 +666,9 @@ class Share { * Unshare an item from all users, groups, and remove all links * @param string Item type * @param string Item source - * @return Returns true on success or false on failure + * @param string $itemType + * @param string $itemSource + * @return boolean true on success or false on failure */ public static function unshareAll($itemType, $itemSource) { // Get all of the owners of shares of this item. @@ -693,7 +700,9 @@ class Share { * Unshare an item shared with the current user * @param string Item type * @param string Item target - * @return Returns true on success or false on failure + * @param string $itemType + * @param string $itemTarget + * @return boolean true on success or false on failure * * Unsharing from self is not allowed for items inside collections */ @@ -749,12 +758,12 @@ class Share { /** * Set the permissions of an item for a specific user or group - * @param string Item type - * @param string Item source - * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK - * @param string User or group the item is being shared with - * @param int CRUDS permissions - * @return Returns true on success or false on failure + * @param string $itemType Item type + * @param string $itemSource Item source + * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK + * @param string $shareWith User or group the item is being shared with + * @param integer|null $permissions CRUDS + * @return boolean true on success or false on failure */ public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) { if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, @@ -836,7 +845,7 @@ class Share { * @param string $itemType * @param string $itemSource * @param string $date expiration date - * @return Share_Backend + * @return boolean */ public static function setExpirationDate($itemType, $itemSource, $date) { if ($items = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), @@ -930,7 +939,7 @@ class Share { /** * Check if resharing is allowed - * @return Returns true if allowed or false + * @return boolean true if allowed or false * * Resharing is allowed by default if not configured */ @@ -1380,15 +1389,15 @@ class Share { /** * Put shared item into the database - * @param string Item type - * @param string Item source - * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK - * @param string User or group the item is being shared with - * @param string User that is the owner of shared item - * @param int CRUDS permissions - * @param bool|array Parent folder target (optional) - * @param string token (optional) - * @param string name of the source item (optional) + * @param string $itemType Item type + * @param string $itemSource Item source + * @param integer $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK + * @param string $shareWith User or group the item is being shared with + * @param string $uidOwner User that is the owner of shared item + * @param int $permissions CRUDS permissions + * @param bool|array, $parentFolder Parent folder target (optional) + * @param string $token (optional) + * @param string $itemSourceName name of the source item (optional) * @return bool Returns true on success or false on failure */ private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, @@ -1629,6 +1638,7 @@ class Share { * @param string User that is the owner of shared item * @param string The suggested target originating from a reshare (optional) * @param int The id of the parent group share (optional) + * @param integer $shareType * @return string Item target */ private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, @@ -1936,7 +1946,9 @@ interface Share_Backend { * Get the source of the item to be stored in the database * @param string Item source * @param string Owner of the item - * @return mixed|array|false Source + * @param string $itemSource + * @param string $uidOwner + * @return boolean Source * * Return an array if the item is file dependent, the array needs two keys: 'item' and 'file' * Return false if the item does not exist for the user @@ -1959,8 +1971,8 @@ interface Share_Backend { /** * Converts the shared item sources back into the item in the specified format - * @param array Shared items - * @param int Format + * @param array $items Shared items + * @param integer $format * @return TODO * * The items array is a 3-dimensional array with the item_source as the @@ -1992,6 +2004,9 @@ interface Share_Backend_File_Dependent extends Share_Backend { * Get the file path of the item * @param string Item source * @param string User that is the owner of shared item + * @param string $itemSource + * @param string $uidOwner + * @return boolean */ public function getFilePath($itemSource, $uidOwner); diff --git a/lib/public/template.php b/lib/public/template.php index 320b7c6393f..9a994c1bea8 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -35,7 +35,7 @@ namespace OCP; * Make OC_Helper::imagePath available as a simple function * @param string app * @param string image - * @return link to the image + * @return string to the image * * @see OC_Helper::imagePath */ @@ -47,7 +47,7 @@ function image_path( $app, $image ) { /** * Make OC_Helper::mimetypeIcon available as a simple function * @param string mimetype - * @return path to the image of this file type. + * @return string to the image of this file type. */ function mimetype_icon( $mimetype ) { return(\mimetype_icon( $mimetype )); @@ -56,7 +56,7 @@ function mimetype_icon( $mimetype ) { /** * Make preview_icon available as a simple function * @param string path of file - * @return path to the preview of the image + * @return string to the preview of the image */ function preview_icon( $path ) { return(\preview_icon( $path )); @@ -65,8 +65,8 @@ function preview_icon( $path ) { /** * Make publicpreview_icon available as a simple function * Returns the path to the preview of the image. - * @param string path of file - * @param string token + * @param string $path of file + * @param string $token * @return link to the preview */ function publicPreview_icon ( $path, $token ) { @@ -77,7 +77,7 @@ function publicPreview_icon ( $path, $token ) { * Make OC_Helper::humanFileSize available as a simple function * Example: 2048 to 2 kB. * @param int size in bytes - * @return size as string + * @return string size as string */ function human_file_size( $bytes ) { return(\human_file_size( $bytes )); @@ -88,7 +88,7 @@ function human_file_size( $bytes ) { * Return the relative date in relation to today. Returns something like "last hour" or "two month ago" * @param int unix timestamp * @param boolean date only - * @return human readable interpretation of the timestamp + * @return OC_L10N_String human readable interpretation of the timestamp */ function relative_modified_date( $timestamp, $dateOnly = false ) { return(\relative_modified_date($timestamp, null, $dateOnly)); @@ -99,7 +99,7 @@ function relative_modified_date( $timestamp, $dateOnly = false ) { * Return a human readable outout for a file size. * @deprecated human_file_size() instead * @param integer size of a file in byte - * @return human readable interpretation of a file size + * @return string human readable interpretation of a file size */ function simple_file_size($bytes) { return(\human_file_size($bytes)); @@ -111,7 +111,7 @@ function simple_file_size($bytes) { * @param $options the options * @param $selected which one is selected? * @param array the parameters - * @return html options + * @return string html options */ function html_select_options($options, $selected, $params=array()) { return(\html_select_options($options, $selected, $params)); diff --git a/lib/public/user.php b/lib/public/user.php index acc0e3b737b..7bac938b838 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -46,8 +46,8 @@ class User { /** * Get a list of all users * @param string search pattern - * @param int limit - * @param int offset + * @param integer $limit + * @param integer $offset * @return array with all uids */ public static function getUsers( $search = '', $limit = null, $offset = null ) { @@ -101,9 +101,9 @@ class User { /** * Check if the password is correct - * @param string The username - * @param string The password - * @return mixed username on success, false otherwise + * @param string $uid The username + * @param string $password The password + * @return string|false username on success, false otherwise * * Check if the password is correct without logging in the user */ diff --git a/lib/public/util.php b/lib/public/util.php index 570283e2a8a..585c5d22634 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -486,4 +486,13 @@ class Util { public static function uploadLimit() { return \OC_Helper::uploadLimit(); } + + /** + * Returns whether the given file name is valid + * @param $file string file name to check + * @return bool true if the file name is valid, false otherwise + */ + public static function isValidFileName($file) { + return \OC_Util::isValidFileName($file); + } } diff --git a/remote.php b/remote.php index 2d0088cd903..9e18c8f80a9 100644 --- a/remote.php +++ b/remote.php @@ -14,7 +14,7 @@ try { } $service=substr($path_info, 1, $pos-1); - $file = OC_AppConfig::getValue('core', 'remote_' . $service); + $file = \OC::$server->getAppConfig()->getValue('core', 'remote_' . $service); if(is_null($file)) { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); @@ -32,11 +32,7 @@ try { default: OC_Util::checkAppEnabled($app); OC_App::loadApp($app); - if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { - $file = OC_App::getAppPath($app) .'/'. $parts[1]; - }else{ - $file = '/' . OC_App::getAppPath($app) .'/'. $parts[1]; - } + $file = OC_App::getAppPath($app) .'/'. $parts[1]; break; } $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/'; diff --git a/settings/js/isadmin.php b/settings/js/isadmin.php deleted file mode 100644 index 13a8ba1d312..00000000000 --- a/settings/js/isadmin.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php -/** - * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch> - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -// Set the content type to Javascript -header("Content-type: text/javascript"); - -// Disallow caching -header("Cache-Control: no-cache, must-revalidate"); -header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); - -if (OC_User::isAdminUser(OC_User::getUser())) { - echo("var isadmin = true;"); -} else { - echo("var isadmin = false;"); -} diff --git a/settings/js/personal.js b/settings/js/personal.js index 3b876467756..5944272067b 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -52,9 +52,11 @@ function updateAvatar (hidedefault) { if(hidedefault) { $headerdiv.hide(); + $('#header .avatardiv').removeClass('avatardiv-shown'); } else { $headerdiv.css({'background-color': ''}); $headerdiv.avatar(OC.currentUser, 32, true); + $('#header .avatardiv').addClass('avatardiv-shown'); } $displaydiv.css({'background-color': ''}); $displaydiv.avatar(OC.currentUser, 128, true); @@ -163,7 +165,7 @@ $(document).ready(function(){ }); - $('#email').keyup(function(){ + $('#email').keyup(function(event){ if ($('#email').val() !== '' ){ // if this is the enter key changeEmailAddress() is already invoked // so it doesn't need to be triggered again diff --git a/settings/js/users.js b/settings/js/users.js index 6886db668b5..160d0a8d9d2 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -85,19 +85,24 @@ var UserList = { add: function (username, displayname, groups, subadmin, quota, sort) { var tr = $('tbody tr').first().clone(); - if (tr.find('div.avatardiv')){ + var subadminsEl; + var subadminSelect; + var groupsSelect; + if (tr.find('div.avatardiv').length){ $('div.avatardiv', tr).avatar(username, 32); } tr.attr('data-uid', username); tr.attr('data-displayName', displayname); tr.find('td.name').text(username); tr.find('td.displayName > span').text(displayname); - var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>') + + // make them look like the multiselect buttons + // until they get time to really get initialized + groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>') .attr('data-username', username) .data('user-groups', groups); - tr.find('td.groups').empty(); if (tr.find('td.subadmins').length > 0) { - var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">') + subadminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">') .attr('data-username', username) .data('user-groups', groups) .data('subadmin', subadmin); @@ -109,11 +114,10 @@ var UserList = { subadminSelect.append($('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>')); } }); - tr.find('td.groups').append(groupsSelect); - UserList.applyMultiplySelect(groupsSelect); - if (tr.find('td.subadmins').length > 0) { - tr.find('td.subadmins').append(subadminSelect); - UserList.applyMultiplySelect(subadminSelect); + tr.find('td.groups').empty().append(groupsSelect); + subadminsEl = tr.find('td.subadmins'); + if (subadminsEl.length > 0) { + subadminsEl.append(subadminSelect); } if (tr.find('td.remove img').length === 0 && OC.currentUser !== username) { var rm_img = $('<img class="svg action">').attr({ @@ -139,11 +143,11 @@ var UserList = { } } $(tr).appendTo('tbody'); + if (sort) { UserList.doSort(); } - quotaSelect.singleSelect(); quotaSelect.on('change', function () { var uid = $(this).parent().parent().attr('data-uid'); var quota = $(this).val(); @@ -153,6 +157,16 @@ var UserList = { } }); }); + + // defer init so the user first sees the list appear more quickly + window.setTimeout(function(){ + quotaSelect.singleSelect(); + UserList.applyMultiplySelect(groupsSelect); + if (subadminSelect) { + UserList.applyMultiplySelect(subadminSelect); + } + }, 0); + return tr; }, // From http://my.opera.com/GreyWyvern/blog/show.dml/1671288 alphanum: function(a, b) { @@ -209,28 +223,39 @@ var UserList = { if (UserList.updating) { return; } + $('table+.loading').css('visibility', 'visible'); UserList.updating = true; $.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad }), function (result) { + var loadedUsers = 0; + var trs = []; if (result.status === 'success') { //The offset does not mirror the amount of users available, //because it is backend-dependent. For correct retrieval, //always the limit(requested amount of users) needs to be added. - UserList.offset += UserList.usersToLoad; $.each(result.data, function (index, user) { if($('tr[data-uid="' + user.name + '"]').length > 0) { return true; } var tr = UserList.add(user.name, user.displayname, user.groups, user.subadmin, user.quota, false); - if (index === 9) { - $(tr).bind('inview', function (event, isInView, visiblePartX, visiblePartY) { - $(this).unbind(event); - UserList.update(); - }); - } + tr.addClass('appear transparent'); + trs.push(tr); + loadedUsers++; }); if (result.data.length > 0) { UserList.doSort(); + $('table+.loading').css('visibility', 'hidden'); } + else { + UserList.noMoreEntries = true; + $('table+.loading').remove(); + } + UserList.offset += loadedUsers; + // animate + setTimeout(function() { + for (var i = 0; i < trs.length; i++) { + trs[i].removeClass('transparent'); + } + }, 0); } UserList.updating = false; }); @@ -239,7 +264,7 @@ var UserList = { applyMultiplySelect: function (element) { var checked = []; var user = element.attr('data-username'); - if ($(element).attr('class') === 'groupsselect') { + if ($(element).hasClass('groupsselect')) { if (element.data('userGroups')) { checked = element.data('userGroups'); } @@ -248,7 +273,7 @@ var UserList = { if (user === OC.currentUser && group === 'admin') { return false; } - if (!isadmin && checked.length === 1 && checked[0] === group) { + if (!oc_isadmin && checked.length === 1 && checked[0] === group) { return false; } $.post( @@ -280,7 +305,7 @@ var UserList = { }); }; var label; - if (isadmin) { + if (oc_isadmin) { label = t('settings', 'add group'); } else { label = null; @@ -295,7 +320,7 @@ var UserList = { minWidth: 100 }); } - if ($(element).attr('class') === 'subadminsselect') { + if ($(element).hasClass('subadminsselect')) { if (element.data('subadmin')) { checked = element.data('subadmin'); } @@ -330,18 +355,26 @@ var UserList = { minWidth: 100 }); } - } + }, + + _onScroll: function(e) { + if (!!UserList.noMoreEntries) { + return; + } + if ($(window).scrollTop() + $(window).height() > $(document).height() - 500) { + UserList.update(true); + } + }, }; $(document).ready(function () { UserList.doSort(); UserList.availableGroups = $('#content table').data('groups'); - $('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) { - OC.Router.registerLoadedCallback(function () { - UserList.update(); - }); + OC.Router.registerLoadedCallback(function() { + $(window).scroll(function(e) {UserList._onScroll(e);}); }); + $('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>')); $('select[multiple]').each(function (index, element) { UserList.applyMultiplySelect($(element)); diff --git a/settings/routes.php b/settings/routes.php index 60f9d8e1001..895a9f5ccea 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -72,5 +72,3 @@ $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php') ->actionInclude('settings/ajax/setloglevel.php'); $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php') ->actionInclude('settings/ajax/setsecurity.php'); -$this->create('isadmin', '/settings/js/isadmin.js') - ->actionInclude('settings/js/isadmin.php'); diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 31ae3a991b6..188ff75f96b 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -40,10 +40,12 @@ if($_['passwordChangeSupported']) { <div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div> <div id="passworderror"><?php echo $l->t('Unable to change your password');?></div> <input type="password" id="pass1" name="oldpassword" - placeholder="<?php echo $l->t('Current password');?>" autocomplete="off" /> + placeholder="<?php echo $l->t('Current password');?>" + autocomplete="off" autocapitalize="off" autocorrect="off" /> <input type="password" id="pass2" name="personal-password" placeholder="<?php echo $l->t('New password');?>" - data-typetoggle="#personal-show" autocomplete="off" /> + data-typetoggle="#personal-show" + autocomplete="off" autocapitalize="off" autocorrect="off" /> <input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label> <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> <br/> @@ -60,7 +62,9 @@ if($_['displayNameChangeSupported']) { <form id="displaynameform"> <fieldset class="personalblock"> <h2><?php echo $l->t('Full Name');?></h2> - <input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" /> + <input type="text" id="displayName" name="displayName" + value="<?php p($_['displayName'])?>" + autocomplete="on" autocapitalize="off" autocorrect="off" /> <span class="msg"></span> <input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" /> </fieldset> @@ -76,7 +80,9 @@ if($_['passwordChangeSupported']) { <fieldset class="personalblock"> <h2><?php p($l->t('Email'));?></h2> <input type="text" name="email" id="email" value="<?php p($_['email']); ?>" - placeholder="<?php p($l->t('Your email address'));?>" /><span class="msg"></span><br /> + placeholder="<?php p($l->t('Your email address'));?>" + autocomplete="on" autocapitalize="off" autocorrect="off" /> + <span class="msg"></span><br /> <em><?php p($l->t('Fill in an email address to enable password recovery'));?></em> </fieldset> </form> diff --git a/settings/templates/users.php b/settings/templates/users.php index aabda0fac2f..937b40611b0 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -14,8 +14,6 @@ unset($items['admin']); $_['subadmingroups'] = array_flip($items); ?> -<script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkToRoute('isadmin'));?>"></script> - <div id="controls"> <form id="newuser" autocomplete="off"> <input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input diff --git a/tests/lib/api.php b/tests/lib/api.php index 9c4324e63e0..233beebd68a 100644 --- a/tests/lib/api.php +++ b/tests/lib/api.php @@ -9,6 +9,10 @@ class Test_API extends PHPUnit_Framework_TestCase { // Helps build a response variable + + /** + * @param string $message + */ function buildResponse($shipped, $data, $code, $message=null) { return array( 'shipped' => $shipped, @@ -18,6 +22,10 @@ class Test_API extends PHPUnit_Framework_TestCase { } // Validate details of the result + + /** + * @param OC_OCS_Result $result + */ function checkResult($result, $success) { // Check response is of correct type $this->assertInstanceOf('OC_OCS_Result', $result); diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php index 6cf0da879ff..9841dcaa1f7 100644 --- a/tests/lib/appframework/http/DispatcherTest.php +++ b/tests/lib/appframework/http/DispatcherTest.php @@ -24,7 +24,6 @@ namespace OC\AppFramework\Http; -use OC\AppFramework\Core\API; use OC\AppFramework\Middleware\MiddlewareDispatcher; use OCP\AppFramework\Http; //require_once(__DIR__ . "/../classloader.php"); @@ -78,6 +77,10 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase { } + /** + * @param string $out + * @param string $httpHeaders + */ private function setMiddlewareExpections($out=null, $httpHeaders=null, $responseHeaders=array(), $ex=false, $catchEx=true) { diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php index 1a38c38c1e7..4f21d77a170 100644 --- a/tests/lib/appframework/http/ResponseTest.php +++ b/tests/lib/appframework/http/ResponseTest.php @@ -25,8 +25,8 @@ namespace OC\AppFramework\Http; -use OCP\AppFramework\Http\Response, - OCP\AppFramework\Http; +use OCP\AppFramework\Http\Response; +use OCP\AppFramework\Http; class ResponseTest extends \PHPUnit_Framework_TestCase { diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php index 95d42e4eb8e..f16b14150c3 100644 --- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php +++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php @@ -50,6 +50,9 @@ class TestMiddleware extends Middleware { private $beforeControllerThrowsEx; + /** + * @param boolean $beforeControllerThrowsEx + */ public function __construct($beforeControllerThrowsEx) { self::$beforeControllerCalled = 0; self::$afterControllerCalled = 0; diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php index dae6135dc54..63c48a62829 100644 --- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php +++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php @@ -58,6 +58,9 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { } + /** + * @param string $method + */ private function checkNavEntry($method){ $api = $this->getAPI(); @@ -79,6 +82,10 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { } + /** + * @param string $method + * @param string $test + */ private function ajaxExceptionStatus($method, $test, $status) { $api = $this->getAPI(); $api->expects($this->any()) @@ -183,6 +190,10 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase { } + /** + * @param string $method + * @param string $expects + */ private function securityCheck($method, $expects, $shouldFail=false){ $api = $this->getAPI(); $api->expects($this->once()) diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php index a7aa922db12..d0244cf2511 100644 --- a/tests/lib/appframework/routing/RoutingTest.php +++ b/tests/lib/appframework/routing/RoutingTest.php @@ -78,6 +78,13 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase $this->assertResource($routes, 'admin_accounts', '/admin/accounts', 'AdminAccountsController', 'adminAccountId'); } + /** + * @param string $name + * @param string $verb + * @param string $url + * @param string $controllerName + * @param string $actionName + */ private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName) { // route mocks @@ -100,6 +107,12 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase $config->register(); } + /** + * @param string $resourceName + * @param string $url + * @param string $controllerName + * @param string $paramName + */ private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName) { // router mock diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php index e1fed0384c6..c2f0ffa12d4 100644 --- a/tests/lib/connector/sabre/file.php +++ b/tests/lib/connector/sabre/file.php @@ -36,6 +36,31 @@ class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase { } /** + * @expectedException Sabre_DAV_Exception_BadRequest + */ + public function testSimplePutInvalidChars() { + // setup + $file = new OC_Connector_Sabre_File('/super*star.txt'); + $file->fileView = $this->getMock('\OC\Files\View', array('file_put_contents'), array(), '', FALSE); + $file->fileView->expects($this->any())->method('file_put_contents')->withAnyParameters()->will($this->returnValue(false)); + + // action + $etag = $file->put('test data'); + } + + /** + * Test setting name with setName() with invalid chars + * @expectedException Sabre_DAV_Exception_BadRequest + */ + public function testSetNameInvalidChars() { + // setup + $file = new OC_Connector_Sabre_File('/test.txt'); + $file->fileView = $this->getMock('\OC\Files\View', array('isUpdatable'), array(), '', FALSE); + $file->fileView->expects($this->any())->method('isUpdatable')->withAnyParameters()->will($this->returnValue(true)); + $file->setName('/super*star.txt'); + } + + /** * @expectedException Sabre_DAV_Exception_Forbidden */ public function testDeleteSharedFails() { diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php index e32f2365f95..fb50c736edd 100644 --- a/tests/lib/connector/sabre/objecttree.php +++ b/tests/lib/connector/sabre/objecttree.php @@ -52,6 +52,20 @@ class ObjectTree extends PHPUnit_Framework_TestCase { $this->assertTrue(true); } + /** + * @dataProvider moveFailedInvalidCharsProvider + * @expectedException Sabre_DAV_Exception_BadRequest + */ + public function testMoveFailedInvalidChars($source, $dest, $updatables, $deletables) { + $this->moveTest($source, $dest, $updatables, $deletables); + } + + function moveFailedInvalidCharsProvider() { + return array( + array('a/b', 'a/c*', array('a' => false, 'a/b' => true, 'a/c*' => false), array()), + ); + } + function moveFailedProvider() { return array( array('a/b', 'a/c', array('a' => false, 'a/b' => false, 'a/c' => false), array()), @@ -66,6 +80,8 @@ class ObjectTree extends PHPUnit_Framework_TestCase { return array( array('a/b', 'a/c', array('a' => false, 'a/b' => true, 'a/c' => false), array()), array('a/b', 'b/b', array('a' => true, 'a/b' => true, 'b' => true, 'b/b' => false), array('a/b' => true)), + // older files with special chars can still be renamed to valid names + array('a/b*', 'b/b', array('a' => true, 'a/b*' => true, 'b' => true, 'b/b' => false), array('a/b*' => true)), ); } diff --git a/tests/lib/db.php b/tests/lib/db.php index f0b271a36f1..2fca67b5638 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -30,7 +30,7 @@ class Test_DB extends PHPUnit_Framework_TestCase { public function setUp() { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; - $r = '_'.OC_Util::generateRandomBytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes(4).'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( self::$schema_file, $content ); diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php index 4a7b7f7aac0..11e9fcdf4fa 100644 --- a/tests/lib/dbschema.php +++ b/tests/lib/dbschema.php @@ -16,7 +16,7 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; $dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml'; - $r = '_'.OC_Util::generateRandomBytes('4').'_'; + $r = '_'.OC_Util::generateRandomBytes(4).'_'; $content = file_get_contents( $dbfile ); $content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content ); file_put_contents( $this->schema_file, $content ); @@ -111,10 +111,16 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase { } } + /** + * @param string $table + */ public function assertTableExist($table) { $this->assertTrue($this->tableExist($table), 'Table ' . $table . ' does not exist'); } + /** + * @param string $table + */ public function assertTableNotExist($table) { $type=OC_Config::getValue( "dbtype", "sqlite" ); if( $type == 'sqlite' || $type == 'sqlite3' ) { diff --git a/tests/lib/errorHandler.php b/tests/lib/errorHandler.php index 68b87deccb6..32396eafbea 100644 --- a/tests/lib/errorHandler.php +++ b/tests/lib/errorHandler.php @@ -56,6 +56,10 @@ class Test_ErrorHandler extends \PHPUnit_Framework_TestCase { * @brief dummy class to access protected methods of \OC\Log\ErrorHandler */ class TestableErrorHandler extends \OC\Log\ErrorHandler { + + /** + * @param string $msg + */ public static function testRemovePassword($msg) { return self::removePassword($msg); } diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php index 87fd0dba4c6..dbcf6e9caa0 100644 --- a/tests/lib/files/cache/homecache.php +++ b/tests/lib/files/cache/homecache.php @@ -19,6 +19,10 @@ class DummyUser extends \OC\User\User { */ private $uid; + /** + * @param string $uid + * @param string $home + */ public function __construct($uid, $home) { $this->home = $home; $this->uid = $uid; diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php index 1920c276907..7f4f3c5ee98 100644 --- a/tests/lib/files/cache/watcher.php +++ b/tests/lib/files/cache/watcher.php @@ -11,7 +11,7 @@ namespace Test\Files\Cache; class Watcher extends \PHPUnit_Framework_TestCase { /** - * @var \OC\Files\Storage\Storage[] $storages; + * @var \OC\Files\Storage\Storage[] $storages */ private $storages = array(); @@ -105,6 +105,60 @@ class Watcher extends \PHPUnit_Framework_TestCase { $this->assertTrue($cache->inCache('foo.txt/bar.txt')); } + public function testPolicyNever() { + $storage = $this->getTestStorage(); + $cache = $storage->getCache(); + $updater = $storage->getWatcher(); + + //set the mtime to the past so it can detect an mtime change + $cache->put('foo.txt', array('storage_mtime' => 10)); + + $updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_NEVER); + + $storage->file_put_contents('foo.txt', 'q'); + $this->assertFalse($updater->checkUpdate('foo.txt')); + + $cache->put('foo.txt', array('storage_mtime' => 20)); + $storage->file_put_contents('foo.txt', 'w'); + $this->assertFalse($updater->checkUpdate('foo.txt')); + } + + public function testPolicyOnce() { + $storage = $this->getTestStorage(); + $cache = $storage->getCache(); + $updater = $storage->getWatcher(); + + //set the mtime to the past so it can detect an mtime change + $cache->put('foo.txt', array('storage_mtime' => 10)); + + $updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE); + + $storage->file_put_contents('foo.txt', 'q'); + $this->assertTrue($updater->checkUpdate('foo.txt')); + + $cache->put('foo.txt', array('storage_mtime' => 20)); + $storage->file_put_contents('foo.txt', 'w'); + $this->assertFalse($updater->checkUpdate('foo.txt')); + } + + public function testPolicyAlways() { + $storage = $this->getTestStorage(); + $cache = $storage->getCache(); + $updater = $storage->getWatcher(); + + //set the mtime to the past so it can detect an mtime change + $cache->put('foo.txt', array('storage_mtime' => 10)); + + $updater->setPolicy(\OC\Files\Cache\Watcher::CHECK_ALWAYS); + + $storage->file_put_contents('foo.txt', 'q'); + $this->assertTrue($updater->checkUpdate('foo.txt')); + + $cache->put('foo.txt', array('storage_mtime' => 20)); + $storage->file_put_contents('foo.txt', 'w'); + $this->assertTrue($updater->checkUpdate('foo.txt')); + } + /** * @param bool $scan * @return \OC\Files\Storage\Storage diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php index 6c41413c4df..ce05adb188a 100644 --- a/tests/lib/files/etagtest.php +++ b/tests/lib/files/etagtest.php @@ -68,6 +68,9 @@ class EtagTest extends \PHPUnit_Framework_TestCase { $this->assertEquals($originalEtags, $this->getEtags($files)); } + /** + * @param string[] $files + */ private function getEtags($files) { $etags = array(); foreach ($files as $file) { diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php index 14e1d05853d..319f2f9f5f7 100644 --- a/tests/lib/files/node/integration.php +++ b/tests/lib/files/node/integration.php @@ -9,10 +9,7 @@ namespace Test\Files\Node; use OC\Files\Cache\Cache; -use OC\Files\Mount\Manager; use OC\Files\Node\Root; -use OCP\Files\NotFoundException; -use OCP\Files\NotPermittedException; use OC\Files\Storage\Temporary; use OC\Files\View; use OC\User\User; diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php index 97eaf7f7162..27f1a937826 100644 --- a/tests/lib/files/node/root.php +++ b/tests/lib/files/node/root.php @@ -8,7 +8,6 @@ namespace Test\Files\Node; -use OC\Files\Cache\Cache; use OCP\Files\NotPermittedException; use OC\Files\Mount\Manager; diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php index 885291e4404..51315a2a556 100644 --- a/tests/lib/files/storage/home.php +++ b/tests/lib/files/storage/home.php @@ -29,6 +29,10 @@ class DummyUser extends User { private $uid; + /** + * @param string $uid + * @param string $home + */ public function __construct($uid, $home) { $this->uid = $uid; $this->home = $home; diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php index 182c014d999..f9291758606 100644 --- a/tests/lib/files/storage/storage.php +++ b/tests/lib/files/storage/storage.php @@ -27,6 +27,17 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { * @var \OC\Files\Storage\Storage instance */ protected $instance; + protected $waitDelay = 0; + + /** + * Sleep for the number of seconds specified in the + * $waitDelay attribute + */ + protected function wait() { + if ($this->waitDelay > 0) { + sleep($this->waitDelay); + } + } /** * the root folder of the storage should always exist, be readable and be recognized as a directory @@ -77,6 +88,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { $this->assertFalse($this->instance->mkdir('/'.$directory)); //cant create existing folders $this->assertTrue($this->instance->rmdir('/'.$directory)); + $this->wait(); $this->assertFalse($this->instance->file_exists('/'.$directory)); $this->assertFalse($this->instance->rmdir('/'.$directory)); //cant remove non existing folders @@ -97,6 +109,8 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { array('folder'), array(' folder'), array('folder '), + array('folder with space'), + array('spéciäl földer'), ); } /** @@ -144,6 +158,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { $this->assertEquals($this->instance->file_get_contents('/source.txt'), $this->instance->file_get_contents('/target.txt')); $this->instance->rename('/source.txt', '/target2.txt'); + $this->wait(); $this->assertTrue($this->instance->file_exists('/target2.txt')); $this->assertFalse($this->instance->file_exists('/source.txt')); $this->assertEquals(file_get_contents($textFile), $this->instance->file_get_contents('/target2.txt')); @@ -225,6 +240,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { $this->assertTrue($this->instance->file_exists('/lorem.txt')); $this->assertTrue($this->instance->unlink('/lorem.txt')); + $this->wait(); $this->assertFalse($this->instance->file_exists('/lorem.txt')); } @@ -259,9 +275,11 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { public function testRecursiveRmdir() { $this->instance->mkdir('folder'); $this->instance->mkdir('folder/bar'); + $this->wait(); $this->instance->file_put_contents('folder/asd.txt', 'foobar'); $this->instance->file_put_contents('folder/bar/foo.txt', 'asd'); $this->assertTrue($this->instance->rmdir('folder')); + $this->wait(); $this->assertFalse($this->instance->file_exists('folder/asd.txt')); $this->assertFalse($this->instance->file_exists('folder/bar/foo.txt')); $this->assertFalse($this->instance->file_exists('folder/bar')); @@ -274,6 +292,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase { $this->instance->file_put_contents('folder/asd.txt', 'foobar'); $this->instance->file_put_contents('folder/bar/foo.txt', 'asd'); $this->assertTrue($this->instance->unlink('folder')); + $this->wait(); $this->assertFalse($this->instance->file_exists('folder/asd.txt')); $this->assertFalse($this->instance->file_exists('folder/bar/foo.txt')); $this->assertFalse($this->instance->file_exists('folder/bar')); diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php index 87bafb64d41..43eae78415d 100644 --- a/tests/lib/files/storage/wrapper/quota.php +++ b/tests/lib/files/storage/wrapper/quota.php @@ -27,6 +27,9 @@ class Quota extends \Test\Files\Storage\Storage { \OC_Helper::rmdirr($this->tmpDir); } + /** + * @param integer $limit + */ protected function getLimitedStorage($limit) { $storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir)); $storage->getScanner()->scan(''); @@ -59,7 +62,7 @@ class Quota extends \Test\Files\Storage\Storage { $this->assertEquals('foobarqwe', $instance->file_get_contents('foo')); } - public function testReturnFalseWhenFopenFailed(){ + public function testReturnFalseWhenFopenFailed() { $failStorage = $this->getMock( '\OC\Files\Storage\Local', array('fopen'), @@ -73,7 +76,7 @@ class Quota extends \Test\Files\Storage\Storage { $this->assertFalse($instance->fopen('failedfopen', 'r')); } - public function testReturnRegularStreamOnRead(){ + public function testReturnRegularStreamOnRead() { $instance = $this->getLimitedStorage(9); // create test file first @@ -92,11 +95,30 @@ class Quota extends \Test\Files\Storage\Storage { fclose($stream); } - public function testReturnQuotaStreamOnWrite(){ + public function testReturnQuotaStreamOnWrite() { $instance = $this->getLimitedStorage(9); $stream = $instance->fopen('foo', 'w+'); $meta = stream_get_meta_data($stream); $this->assertEquals('user-space', $meta['wrapper_type']); fclose($stream); } + + public function testSpaceRoot() { + $storage = $this->getMockBuilder('\OC\Files\Storage\Local')->disableOriginalConstructor()->getMock(); + $cache = $this->getMockBuilder('\OC\Files\Cache\Cache')->disableOriginalConstructor()->getMock(); + $storage->expects($this->once()) + ->method('getCache') + ->will($this->returnValue($cache)); + $storage->expects($this->once()) + ->method('free_space') + ->will($this->returnValue(2048)); + $cache->expects($this->once()) + ->method('get') + ->with('files') + ->will($this->returnValue(array('size' => 50))); + + $instance = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => 1024, 'root' => 'files')); + + $this->assertEquals(1024 - 50, $instance->free_space('')); + } } diff --git a/tests/lib/files/stream/quota.php b/tests/lib/files/stream/quota.php index b11f0ac74c0..d5edace544d 100644 --- a/tests/lib/files/stream/quota.php +++ b/tests/lib/files/stream/quota.php @@ -13,6 +13,10 @@ class Quota extends \PHPUnit_Framework_TestCase { \OC\Files\Stream\Quota::clear(); } + /** + * @param string $mode + * @param integer $limit + */ protected function getStream($mode, $limit) { $source = fopen('php://temp', $mode); return \OC\Files\Stream\Quota::wrap($source, $limit); diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php index 72a2f854cb2..371d1ed1798 100644 --- a/tests/lib/files/view.php +++ b/tests/lib/files/view.php @@ -7,6 +7,8 @@ namespace Test\Files; +use OC\Files\Cache\Watcher; + class TemporaryNoTouch extends \OC\Files\Storage\Temporary { public function touch($path, $mtime = null) { return false; @@ -249,6 +251,7 @@ class View extends \PHPUnit_Framework_TestCase { function testWatcher() { $storage1 = $this->getTestStorage(); \OC\Files\Filesystem::mount($storage1, array(), '/'); + $storage1->getWatcher()->setPolicy(Watcher::CHECK_ALWAYS); $rootView = new \OC\Files\View(''); diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php index d308232a78b..2c563ae9ac9 100644 --- a/tests/lib/group/backend.php +++ b/tests/lib/group/backend.php @@ -29,7 +29,7 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase { /** * get a new unique group name * test cases can override this in order to clean up created groups - * @return array + * @return string */ public function getGroupName() { return uniqid('test_'); @@ -38,7 +38,7 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase { /** * get a new unique user name * test cases can override this in order to clean up created user - * @return array + * @return string */ public function getUserName() { return uniqid('test_'); diff --git a/tests/lib/group/database.php b/tests/lib/group/database.php index 5278c26f4df..3e05c656061 100644 --- a/tests/lib/group/database.php +++ b/tests/lib/group/database.php @@ -26,7 +26,7 @@ class Test_Group_Database extends Test_Group_Backend { /** * get a new unique group name * test cases can override this in order to clean up created groups - * @return array + * @return string */ public function getGroupName() { $name=uniqid('test_'); @@ -37,7 +37,7 @@ class Test_Group_Database extends Test_Group_Backend { /** * get a new unique user name * test cases can override this in order to clean up created user - * @return array + * @return string */ public function getUserName() { return uniqid('test_'); diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php index f1fda3b9288..3982c00e45f 100644 --- a/tests/lib/group/group.php +++ b/tests/lib/group/group.php @@ -13,7 +13,7 @@ use OC\User\User; class Group extends \PHPUnit_Framework_TestCase { /** - * @return \PHPUnit_Framework_MockObject_MockObject | \OC\User\Manager + * @return \OC\User\Manager | \OC\User\Manager */ protected function getUserManager() { $userManager = $this->getMock('\OC\User\Manager'); diff --git a/tests/lib/migrate.php b/tests/lib/migrate.php new file mode 100644 index 00000000000..d438a7a692e --- /dev/null +++ b/tests/lib/migrate.php @@ -0,0 +1,90 @@ +<?php +/** + * Copyright (c) 2014 Tom Needham <tom@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class Test_Migrate extends PHPUnit_Framework_TestCase { + + public $users; + public $tmpfiles = array(); + + /** + * @brief Generates a test user and sets up their file system + * @return string the test users id + */ + public function generateUser() { + $username = uniqid(); + \OC_User::createUser($username, 'password'); + \OC_Util::tearDownFS(); + \OC_User::setUserId(''); + \OC\Files\Filesystem::tearDown(); + \OC_Util::setupFS($username); + $this->users[] = $username; + return $username; + } + + /** + * @brief validates an export for a user + * @brief checks for existence of export_info.json and file folder + * @param string $exportedUser the user that was exported + * @param string $path the path to the .zip export + * @param string $exportedBy + */ + public function validateUserExport($exportedBy, $exportedUser, $path) { + $this->assertTrue(file_exists($path)); + // Extract + $extract = get_temp_dir() . '/oc_import_' . uniqid(); + //mkdir($extract); + $this->tmpfiles[] = $extract; + $zip = new ZipArchive; + $zip->open($path); + $zip->extractTo($extract); + $zip->close(); + $this->assertTrue(file_exists($extract.'/export_info.json')); + $exportInfo = file_get_contents($extract.'/export_info.json'); + $exportInfo = json_decode($exportInfo); + $this->assertNotNull($exportInfo); + $this->assertEquals($exportedUser, $exportInfo->exporteduser); + $this->assertEquals($exportedBy, $exportInfo->exportedby); + $this->assertTrue(file_exists($extract.'/'.$exportedUser.'/files')); + } + + public function testUserSelfExport() { + // Create a user + $user = $this->generateUser(); + \OC_User::setUserId($user); + $export = \OC_Migrate::export($user); + // Check it succeeded and exists + $this->assertTrue(json_decode($export)->success); + // Validate the export + $this->validateUserExport($user, $user, json_decode($export)->data); + } + + public function testUserOtherExport() { + $user = $this->generateUser(); + $user2 = $this->generateUser(); + \OC_User::setUserId($user2); + $export = \OC_Migrate::export($user); + // Check it succeeded and exists + $this->assertTrue(json_decode($export)->success); + // Validate the export + $this->validateUserExport($user2, $user, json_decode($export)->data); + } + + public function tearDown() { + $u = new OC_User(); + foreach($this->users as $user) { + $u->deleteUser($user); + } + foreach($this->tmpfiles as $file) { + \OC_Helper::rmdirr($file); + } + } + + + + +} diff --git a/tests/lib/ocs/privatedata.php b/tests/lib/ocs/privatedata.php index ea8413734f1..498ab718621 100644 --- a/tests/lib/ocs/privatedata.php +++ b/tests/lib/ocs/privatedata.php @@ -131,6 +131,7 @@ class Test_OC_OCS_Privatedata extends PHPUnit_Framework_TestCase /** * @param \OC_OCS_Result $result + * @param integer $expectedArraySize */ public function assertOcsResult($expectedArraySize, $result) { $this->assertEquals(100, $result->getStatusCode()); diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php index a8236909ded..f1f6ed08003 100644 --- a/tests/lib/preferences.php +++ b/tests/lib/preferences.php @@ -144,58 +144,6 @@ class Test_Preferences_Object extends PHPUnit_Framework_TestCase { $this->assertEquals(array('foo'), $apps); } - public function testGetApps() - { - $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); - $statementMock->expects($this->exactly(2)) - ->method('fetchColumn') - ->will($this->onConsecutiveCalls('foo', false)); - $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); - $connectionMock->expects($this->once()) - ->method('executeQuery') - ->with($this->equalTo('SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?'), - $this->equalTo(array('bar'))) - ->will($this->returnValue($statementMock)); - - $preferences = new OC\Preferences($connectionMock); - $apps = $preferences->getApps('bar'); - $this->assertEquals(array('foo'), $apps); - } - - public function testGetKeys() - { - $statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false); - $statementMock->expects($this->exactly(2)) - ->method('fetchColumn') - ->will($this->onConsecutiveCalls('foo', false)); - $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); - $connectionMock->expects($this->once()) - ->method('executeQuery') - ->with($this->equalTo('SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?'), - $this->equalTo(array('bar', 'moo'))) - ->will($this->returnValue($statementMock)); - - $preferences = new OC\Preferences($connectionMock); - $keys = $preferences->getKeys('bar', 'moo'); - $this->assertEquals(array('foo'), $keys); - } - - public function testGetValue() - { - $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); - $connectionMock->expects($this->exactly(2)) - ->method('fetchAssoc') - ->with($this->equalTo('SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?'), - $this->equalTo(array('grg', 'bar', 'red'))) - ->will($this->onConsecutiveCalls(array('configvalue'=>'foo'), null)); - - $preferences = new OC\Preferences($connectionMock); - $value = $preferences->getValue('grg', 'bar', 'red'); - $this->assertEquals('foo', $value); - $value = $preferences->getValue('grg', 'bar', 'red', 'def'); - $this->assertEquals('def', $value); - } - public function testSetValue() { $connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false); diff --git a/tests/lib/share/backend.php b/tests/lib/share/backend.php index 2f6c84678ff..420bd9d88b3 100644 --- a/tests/lib/share/backend.php +++ b/tests/lib/share/backend.php @@ -26,7 +26,7 @@ class Test_Share_Backend implements OCP\Share_Backend { const FORMAT_SOURCE = 0; const FORMAT_TARGET = 1; const FORMAT_PERMISSIONS = 2; - + private $testItem1 = 'test.txt'; private $testItem2 = 'share.txt'; @@ -57,11 +57,11 @@ class Test_Share_Backend implements OCP\Share_Backend { public function formatItems($items, $format, $parameters = null) { $testItems = array(); foreach ($items as $item) { - if ($format == self::FORMAT_SOURCE) { + if ($format === self::FORMAT_SOURCE) { $testItems[] = $item['item_source']; - } else if ($format == self::FORMAT_TARGET) { + } else if ($format === self::FORMAT_TARGET) { $testItems[] = $item['item_target']; - } else if ($format == self::FORMAT_PERMISSIONS) { + } else if ($format === self::FORMAT_PERMISSIONS) { $testItems[] = $item['permissions']; } } diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index d6acee6c924..b5cba9430aa 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -151,6 +151,10 @@ class Test_Share extends PHPUnit_Framework_TestCase { ); } + /** + * @param string $sharer + * @param string $receiver + */ protected function shareUserTestFileWithUser($sharer, $receiver) { OC_User::setUserId($sharer); $this->assertTrue( @@ -558,6 +562,9 @@ class Test_Share extends PHPUnit_Framework_TestCase { ); } + /** + * @param boolean|string $token + */ protected function getShareByValidToken($token) { $row = OCP\Share::getShareByToken($token); $this->assertInternalType( @@ -615,21 +622,21 @@ class Test_Share extends PHPUnit_Framework_TestCase { OC_User::setUserId($this->user1); $this->assertEquals( array('test.txt', 'test.txt'), - OCP\Share::getItemsShared('test', 'test.txt'), + OCP\Share::getItemsShared('test', Test_Share_Backend::FORMAT_SOURCE), 'Failed asserting that the test.txt file is shared exactly two times by user1.' ); OC_User::setUserId($this->user2); $this->assertEquals( array('test.txt'), - OCP\Share::getItemsShared('test', 'test.txt'), + OCP\Share::getItemsShared('test', Test_Share_Backend::FORMAT_SOURCE), 'Failed asserting that the test.txt file is shared exactly once by user2.' ); OC_User::setUserId($this->user3); $this->assertEquals( array('test.txt'), - OCP\Share::getItemsShared('test', 'test.txt'), + OCP\Share::getItemsShared('test', Test_Share_Backend::FORMAT_SOURCE), 'Failed asserting that the test.txt file is shared exactly once by user3.' ); diff --git a/tests/lib/template/resourcelocator.php b/tests/lib/template/resourcelocator.php index d80d222e2c9..619560643fe 100644 --- a/tests/lib/template/resourcelocator.php +++ b/tests/lib/template/resourcelocator.php @@ -7,6 +7,11 @@ */ class Test_ResourceLocator extends PHPUnit_Framework_TestCase { + + /** + * @param string $theme + * @param string $form_factor + */ public function getResourceLocator( $theme, $form_factor, $core_map, $party_map, $appsroots ) { return $this->getMockForAbstractClass('OC\Template\ResourceLocator', array( $theme, $form_factor, $core_map, $party_map, $appsroots ), diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlgenerator.php new file mode 100644 index 00000000000..875a7f06580 --- /dev/null +++ b/tests/lib/urlgenerator.php @@ -0,0 +1,34 @@ +<?php +/** + * Copyright (c) 2014 Bjoern Schiessle <schiessle@owncloud.com> + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +class Test_Urlgenerator extends PHPUnit_Framework_TestCase { + + + /** + * @small + * @brief test absolute URL construction + * @dataProvider provideURLs + */ + function testGetAbsoluteURL($url, $expectedResult) { + + $urlGenerator = new \OC\URLGenerator(null); + $result = $urlGenerator->getAbsoluteURL($url); + + $this->assertEquals($expectedResult, $result); + } + + public function provideURLs() { + return array( + array("index.php", "http://localhost/index.php"), + array("/index.php", "http://localhost/index.php"), + array("/apps/index.php", "http://localhost/apps/index.php"), + array("apps/index.php", "http://localhost/apps/index.php"), + ); + } +} + diff --git a/tests/lib/user.php b/tests/lib/user.php index fdf9e7a08e0..e2c3282a19f 100644 --- a/tests/lib/user.php +++ b/tests/lib/user.php @@ -9,8 +9,6 @@ namespace Test; -use OC\Hooks\PublicEmitter; - class User extends \PHPUnit_Framework_TestCase { /** * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend diff --git a/tests/lib/util.php b/tests/lib/util.php index bfe68f5f680..ee336aa1118 100644 --- a/tests/lib/util.php +++ b/tests/lib/util.php @@ -170,4 +170,52 @@ class Test_Util extends PHPUnit_Framework_TestCase { array('442aa682de2a64db1e010f50e60fd9c9', 'local::C:\Users\ADMINI~1\AppData\Local\Temp\2/442aa682de2a64db1e010f50e60fd9c9/') ); } + + /** + * @dataProvider filenameValidationProvider + */ + public function testFilenameValidation($file, $valid) { + // private API + $this->assertEquals($valid, \OC_Util::isValidFileName($file)); + // public API + $this->assertEquals($valid, \OCP\Util::isValidFileName($file)); + } + + public function filenameValidationProvider() { + return array( + // valid names + array('boringname', true), + array('something.with.extension', true), + array('now with spaces', true), + array('.a', true), + array('..a', true), + array('.dotfile', true), + array('single\'quote', true), + array(' spaces before', true), + array('spaces after ', true), + array('allowed chars including the crazy ones $%&_-^@!,()[]{}=;#', true), + array('汉字也能用', true), + array('und Ümläüte sind auch willkommen', true), + // disallowed names + array('', false), + array(' ', false), + array('.', false), + array('..', false), + array('back\\slash', false), + array('sl/ash', false), + array('lt<lt', false), + array('gt>gt', false), + array('col:on', false), + array('double"quote', false), + array('pi|pe', false), + array('dont?ask?questions?', false), + array('super*star', false), + array('new\nline', false), + // better disallow these to avoid unexpected trimming to have side effects + array(' ..', false), + array('.. ', false), + array('. ', false), + array(' .', false), + ); + } } diff --git a/tests/testcleanuplistener.php b/tests/testcleanuplistener.php index a969ece6dd5..299a589ef4e 100644 --- a/tests/testcleanuplistener.php +++ b/tests/testcleanuplistener.php @@ -57,6 +57,9 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener { return $this->verbosity === 'detail'; } + /** + * @param string $dir + */ private function unlinkDir($dir) { if ($dh = @opendir($dir)) { while (($file = readdir($dh)) !== false) { |
