summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2012-10-28 17:10:31 +0100
committerJan-Christoph Borchardt <hey@jancborchardt.net>2012-10-28 17:10:31 +0100
commitd7abd44dea9eb37312615e7d737acecf945a38fe (patch)
treeb254ea8e226a9089d08d58132a5b365b6e9ee753
parent99ba05e766defb746284d6e93829fa81eebd530c (diff)
parent7af8c6c3cbf00444b81a6d3d0c4cede983ff8edc (diff)
downloadnextcloud-server-d7abd44dea9eb37312615e7d737acecf945a38fe.tar.gz
nextcloud-server-d7abd44dea9eb37312615e7d737acecf945a38fe.zip
merge breadcrumb root into navigation
Diffstat
-rw-r--r--apps/files/appinfo/app.php2
-rw-r--r--apps/files/css/files.css6
-rw-r--r--apps/files/js/fileactions.js208
-rw-r--r--apps/files/js/files.js8
-rw-r--r--apps/files/templates/part.breadcrumb.php11
-rw-r--r--core/css/styles.css14
-rw-r--r--core/img/places/files.pngbin0 -> 884 bytes
-rw-r--r--core/img/places/files.svg83
-rw-r--r--core/img/places/home.pngbin884 -> 364 bytes
-rw-r--r--core/img/places/home.svg1839
-rw-r--r--core/js/share.js17
-rw-r--r--core/templates/installation.php2
-rw-r--r--lib/setup.php3
-rw-r--r--lib/template.php16
-rwxr-xr-xlib/util.php13
15 files changed, 2029 insertions, 193 deletions
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index b431ddfec02..3f437679e05 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -3,6 +3,6 @@ $l=OC_L10N::get('files');
OCP\App::registerAdmin('files', 'admin');
-OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/home.svg" ), "name" => $l->t("Files") ));
+OCP\App::addNavigationEntry( array( "id" => "files_index", "order" => 0, "href" => OCP\Util::linkTo( "files", "index.php" ), "icon" => OCP\Util::imagePath( "core", "places/files.svg" ), "name" => $l->t("Files") ));
OC_Search::registerProvider('OC_Search_Provider_File');
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 48051a9a921..69cdb48e567 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -12,7 +12,7 @@
.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:block; float:left; padding-left:0; overflow:hidden; position:relative; margin:0; margin-left:2px; }
.file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
-#new { background-color:#5bb75b; float:left; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; }
+#new { background-color:#5bb75b; float:left; margin:0; border-right:none; z-index:1010; height:1.3em; }
#new:hover, a.file_upload_button_wrapper:hover + button.file_upload_filename { background-color:#4b964b; }
#new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; }
#new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; }
@@ -81,10 +81,6 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
.selectedActions a { display:inline; margin:-.5em 0; padding:.5em !important; }
.selectedActions a img { position:relative; top:.3em; }
-/* add breadcrumb divider to the File item in navigation panel */
-#navigation>ul>li:first-child { background:url('%webroot%/core/img/breadcrumb-start.svg') no-repeat 64px 0; width:64px; padding-right:1em; position:fixed; }
-#navigation>ul>li:first-child+li { padding-top:68px; }
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
-div.crumb a{ padding: 0.9em 0 0.7em 0; }
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 1cf80352bef..24c8e85656c 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -1,191 +1,189 @@
-var FileActions={
- actions:{},
- defaults:{},
- icons:{},
- currentFile:null,
- register:function(mime,name,permissions,icon,action){
- if(!FileActions.actions[mime]){
- FileActions.actions[mime]={};
+var FileActions = {
+ actions: {},
+ defaults: {},
+ icons: {},
+ currentFile: null,
+ register: function (mime, name, permissions, icon, action) {
+ if (!FileActions.actions[mime]) {
+ FileActions.actions[mime] = {};
}
if (!FileActions.actions[mime][name]) {
FileActions.actions[mime][name] = {};
}
FileActions.actions[mime][name]['action'] = action;
FileActions.actions[mime][name]['permissions'] = permissions;
- FileActions.icons[name]=icon;
+ FileActions.icons[name] = icon;
},
- setDefault:function(mime,name){
- FileActions.defaults[mime]=name;
+ setDefault: function (mime, name) {
+ FileActions.defaults[mime] = name;
},
- get:function(mime,type,permissions){
- var actions={};
- if(FileActions.actions.all){
- actions=$.extend( actions, FileActions.actions.all );
+ get: function (mime, type, permissions) {
+ var actions = {};
+ if (FileActions.actions.all) {
+ actions = $.extend(actions, FileActions.actions.all);
}
- if(mime){
- if(FileActions.actions[mime]){
- actions=$.extend( actions, FileActions.actions[mime] );
+ if (mime) {
+ if (FileActions.actions[mime]) {
+ actions = $.extend(actions, FileActions.actions[mime]);
}
- var mimePart=mime.substr(0,mime.indexOf('/'));
- if(FileActions.actions[mimePart]){
- actions=$.extend( actions, FileActions.actions[mimePart] );
+ var mimePart = mime.substr(0, mime.indexOf('/'));
+ if (FileActions.actions[mimePart]) {
+ actions = $.extend(actions, FileActions.actions[mimePart]);
}
}
- if(type){//type is 'dir' or 'file'
- if(FileActions.actions[type]){
- actions=$.extend( actions, FileActions.actions[type] );
+ if (type) {//type is 'dir' or 'file'
+ if (FileActions.actions[type]) {
+ actions = $.extend(actions, FileActions.actions[type]);
}
}
var filteredActions = {};
- $.each(actions, function(name, action) {
+ $.each(actions, function (name, action) {
if (action.permissions & permissions) {
filteredActions[name] = action.action;
}
});
return filteredActions;
},
- getDefault:function(mime,type,permissions){
- if(mime){
- var mimePart=mime.substr(0,mime.indexOf('/'));
+ getDefault: function (mime, type, permissions) {
+ if (mime) {
+ var mimePart = mime.substr(0, mime.indexOf('/'));
}
- var name=false;
- if(mime && FileActions.defaults[mime]){
- name=FileActions.defaults[mime];
- }else if(mime && FileActions.defaults[mimePart]){
- name=FileActions.defaults[mimePart];
- }else if(type && FileActions.defaults[type]){
- name=FileActions.defaults[type];
- }else{
- name=FileActions.defaults.all;
+ var name = false;
+ if (mime && FileActions.defaults[mime]) {
+ name = FileActions.defaults[mime];
+ } else if (mime && FileActions.defaults[mimePart]) {
+ name = FileActions.defaults[mimePart];
+ } else if (type && FileActions.defaults[type]) {
+ name = FileActions.defaults[type];
+ } else {
+ name = FileActions.defaults.all;
}
- var actions=this.get(mime,type,permissions);
+ var actions = this.get(mime, type, permissions);
return actions[name];
},
- display:function(parent){
- FileActions.currentFile=parent;
- $('#fileList span.fileactions, #fileList td.date a.action').remove();
- var actions=FileActions.get(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
- var file=FileActions.getCurrentFile();
- if($('tr').filterAttr('data-file',file).data('renaming')){
+ display: function (parent) {
+ FileActions.currentFile = parent;
+ var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
+ var file = FileActions.getCurrentFile();
+ if ($('tr').filterAttr('data-file', file).data('renaming')) {
return;
}
parent.children('a.name').append('<span class="fileactions" />');
- var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
- for(name in actions){
+ var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
+ for (name in actions) {
// NOTE: Temporary fix to prevent rename action in root of Shared directory
- if (name == 'Rename' && $('#dir').val() == '/Shared') {
+ if (name === 'Rename' && $('#dir').val() === '/Shared') {
continue;
}
- if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
- var img=FileActions.icons[name];
- if(img.call){
- img=img(file);
+ if ((name === 'Download' || actions[name] !== defaultAction) && name !== 'Delete') {
+ var img = FileActions.icons[name];
+ if (img.call) {
+ img = img(file);
}
- var html='<a href="#" class="action" style="display:none">';
- if(img) { html+='<img src="'+img+'"/> '; }
- html += t('files', name) +'</a>';
- var element=$(html);
- element.data('action',name);
- element.click(function(event){
+ var html = '<a href="#" class="action">';
+ if (img) {
+ html += '<img src="' + img + '"/> ';
+ }
+ html += t('files', name) + '</a>';
+ var element = $(html);
+ element.data('action', name);
+ element.click(function (event) {
+ FileActions.currentFile = $(this).parent().parent().parent();
event.stopPropagation();
event.preventDefault();
- var action=actions[$(this).data('action')];
- var currentFile=FileActions.getCurrentFile();
- FileActions.hide();
+ var action = actions[$(this).data('action')];
+ var currentFile = FileActions.getCurrentFile();
action(currentFile);
});
- element.hide();
parent.find('a.name>span.fileactions').append(element);
}
}
- if(actions['Delete']){
- var img=FileActions.icons['Delete'];
- if(img.call){
- img=img(file);
+ if (actions['Delete']) {
+ var img = FileActions.icons['Delete'];
+ if (img.call) {
+ img = img(file);
}
// NOTE: Temporary fix to allow unsharing of files in root of Shared folder
if ($('#dir').val() == '/Shared') {
- var html = '<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" style="display:none" />';
+ var html = '<a href="#" original-title="' + t('files', 'Unshare') + '" class="action delete" />';
} else {
- var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
+ var html = '<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" />';
}
- var element=$(html);
- if(img){
- element.append($('<img src="'+img+'"/>'));
+ var element = $(html);
+ if (img) {
+ element.append($('<img src="' + img + '"/>'));
}
- element.data('action','Delete');
- element.click(function(event){
+ element.data('action', 'Delete');
+ element.click(function (event) {
event.stopPropagation();
event.preventDefault();
- var action=actions[$(this).data('action')];
- var currentFile=FileActions.getCurrentFile();
- FileActions.hide();
+ var action = actions[$(this).data('action')];
+ var currentFile = FileActions.getCurrentFile();
action(currentFile);
});
- element.hide();
parent.parent().children().last().append(element);
}
- $('#fileList .action').css('-o-transition-property','none');//temporarly disable
- $('#fileList .action').fadeIn(200,function(){
- $('#fileList .action').css('-o-transition-property','opacity');
- });
- return false;
- },
- hide:function(){
- $('#fileList span.fileactions, #fileList td.date a.action').fadeOut(200,function(){
- $(this).remove();
- });
},
- getCurrentFile:function(){
+ getCurrentFile: function () {
return FileActions.currentFile.parent().attr('data-file');
},
- getCurrentMimeType:function(){
+ getCurrentMimeType: function () {
return FileActions.currentFile.parent().attr('data-mime');
},
- getCurrentType:function(){
+ getCurrentType: function () {
return FileActions.currentFile.parent().attr('data-type');
},
- getCurrentPermissions:function() {
+ getCurrentPermissions: function () {
return FileActions.currentFile.parent().data('permissions');
}
};
-$(document).ready(function(){
- if($('#allowZipDownload').val() == 1){
+$(document).ready(function () {
+ if ($('#allowZipDownload').val() == 1) {
var downloadScope = 'all';
} else {
var downloadScope = 'file';
}
- FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download');},function(filename){
- window.location=OC.filePath('files', 'ajax', 'download.php') + '?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val());
+ FileActions.register(downloadScope, 'Download', OC.PERMISSION_READ, function () {
+ return OC.imagePath('core', 'actions/download');
+ }, function (filename) {
+ window.location = OC.filePath('files', 'ajax', 'download.php') + '?files=' + encodeURIComponent(filename) + '&dir=' + encodeURIComponent($('#dir').val());
+ });
+
+ $('#fileList tr').each(function(){
+ FileActions.display($(this).children('td.filename'));
});
});
-FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete');},function(filename){
- if(Files.cancelUpload(filename)) {
- if(filename.substr){
- filename=[filename];
+FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
+ return OC.imagePath('core', 'actions/delete');
+}, function (filename) {
+ if (Files.cancelUpload(filename)) {
+ if (filename.substr) {
+ filename = [filename];
}
- $.each(filename,function(index,file){
- var filename = $('tr').filterAttr('data-file',file);
+ $.each(filename, function (index, file) {
+ var filename = $('tr').filterAttr('data-file', file);
filename.hide();
filename.find('input[type="checkbox"]').removeAttr('checked');
filename.removeClass('selected');
});
procesSelection();
- }else{
+ } else {
FileList.do_delete(filename);
}
$('.tipsy').remove();
});
// t('files', 'Rename')
-FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){
+FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
+ return OC.imagePath('core', 'actions/rename');
+}, function (filename) {
FileList.rename(filename);
});
-FileActions.register('dir','Open', OC.PERMISSION_READ, '', function(filename){
- window.location=OC.linkTo('files', 'index.php') + '?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
+FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
+ window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent($('#dir').val()).replace(/%2F/g, '/') + '/' + encodeURIComponent(filename);
});
-FileActions.setDefault('dir','Open');
+FileActions.setDefault('dir', 'Open');
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 549204e8572..2d9ccba424a 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -62,14 +62,6 @@ $(document).ready(function() {
return false;
});
- // Sets the file-action buttons behaviour :
- $('tr').live('mouseenter',function(event) {
- FileActions.display($(this).children('td.filename'));
- });
- $('tr').live('mouseleave',function(event) {
- FileActions.hide();
- });
-
var lastChecked;
// Sets the file link behaviour :
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 71b695f65f8..37b6b63eabd 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,13 @@
+ <?php if(count($_["breadcrumb"])):?>
+ <div class="crumb">
+ <a href="<?php echo $_['baseURL'].urlencode($crumb['dir']); ?>">
+ <img src="<?php echo OCP\image_path('core','places/home.svg');?>" />
+ </a>
+ </div>
+ <?php endif;?>
<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
$crumb = $_["breadcrumb"][$i]; ?>
- <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
- <a href="<?php echo $_['baseURL'].urlencode($crumb["dir"]); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+ <div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>'>
+ <a href="<?php echo $_['baseURL'].urlencode($crumb['dir']); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
</div>
<?php endfor;?>
diff --git a/core/css/styles.css b/core/css/styles.css
index a31c1e0aaa7..f2d986118eb 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -126,10 +126,11 @@ label.infield { cursor: text !important; }
#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
#notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
-.action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
-.action { width: 16px; height: 16px; }
+tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; }
+tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
+tr .action { width: 16px; height: 16px; }
.header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-.action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
table:not(.nostyle) tr { -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
tbody tr:hover, tr:active { background-color:#f8f8f8; }
@@ -190,6 +191,7 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
.arrow.down { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -o-transform: rotate(180deg); -ms-transform: rotate(180deg); transform: rotate(180deg); }
/* ---- BREADCRUMB ---- */
-div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
-div.crumb:first-child { padding-left:1em; }
-div.crumb.last { font-weight:bold; }
+div.crumb { float:left; display:block; background:url('../img/breadcrumb.svg') no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
+div.crumb:first-child { padding:10px 20px 10px 5px; }
+div.crumb.last { font-weight:bold; background:none; padding-right:10px; }
+div.crumb a{ padding: 0.9em 0 0.7em 0; }
diff --git a/core/img/places/files.png b/core/img/places/files.png
new file mode 100644
index 00000000000..a18264d3cea
--- /dev/null
+++ b/core/img/places/files.png
Binary files differ
diff --git a/core/img/places/files.svg b/core/img/places/files.svg
new file mode 100644
index 00000000000..e2db10ed36c
--- /dev/null
+++ b/core/img/places/files.svg
@@ -0,0 +1,83 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="64"
+ height="32"
+ id="svg3349"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="home.svg"
+ inkscape:export-filename="home.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs3351" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.2"
+ inkscape:cx="32.824304"
+ inkscape:cy="7.991749"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1280"
+ inkscape:window-height="800"
+ inkscape:window-x="0"
+ inkscape:window-y="-31"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3354">
+ <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
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(573.14286,110.2963)">
+ <path
+ inkscape:connector-curvature="0"
+ d="m -557.14286,-107.23533 -16,15.93883 6,0 0,12.0002 20,0 0,-12.0002 6,0 -6,-6.061184 0,-7.939046 -6,0 0,2.16233 -4,-4.10093 z"
+ id="path3307"
+ style="opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3883"
+ d="m -557.14286,-108.23534 -16,15.938823 6,0 0,12.0002 20,0 0,-12.0002 6,0 -6,-6.061183 0,-7.93905 -6,0 0,2.16234 -4,-4.10093 z"
+ inkscape:connector-curvature="0" />
+ <path
+ inkscape:connector-curvature="0"
+ d="m -525.14286,-108.23534 -16,15.938823 6,0 0,12.0002 20,0 0,-12.0002 6,0 -6,-6.061183 0,-7.93905 -6,0 0,2.16234 -4,-4.10093 z"
+ id="path3328"
+ style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="m -525.14286,-109.2343 -16,15.937766 1,0 15,-14.937746 4,4.12507 0,-1.00002 -4,-4.12507 z m 4,1.93753 0,1.00002 6,0 0,-1.00002 -6,0 z m 6,7.937635 0,1.000017 5,5.062584 1,0 -6,-6.062601 z"
+ id="path3330"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
diff --git a/core/img/places/home.png b/core/img/places/home.png
index a18264d3cea..5cbf1114cb7 100644
--- a/core/img/places/home.png
+++ b/core/img/places/home.png
Binary files differ
diff --git a/core/img/places/home.svg b/core/img/places/home.svg
index e2db10ed36c..c56f9661282 100644
--- a/core/img/places/home.svg
+++ b/core/img/places/home.svg
@@ -7,43 +7,20 @@
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="64"
- height="32"
- id="svg3349"
- version="1.1"
+ version="1.0"
+ width="16"
+ height="16"
+ id="svg11300"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="home.svg"
inkscape:export-filename="home.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
- <defs
- id="defs3351" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="11.2"
- inkscape:cx="32.824304"
- inkscape:cy="7.991749"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1280"
- inkscape:window-height="800"
- inkscape:window-x="0"
- inkscape:window-y="-31"
- inkscape:window-maximized="1" />
<metadata
- id="metadata3354">
+ id="metadata26">
<rdf:RDF>
<cc:Work
rdf:about="">
@@ -54,30 +31,1788 @@
</cc:Work>
</rdf:RDF>
</metadata>
+ <sodipodi:namedview
+ pagecolor="#cccccc"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1280"
+ inkscape:window-height="800"
+ id="namedview24"
+ showgrid="true"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:zoom="8.0000004"
+ inkscape:cx="15.733743"
+ inkscape:cy="8.9471081"
+ inkscape:window-x="0"
+ inkscape:window-y="-31"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g4146">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4330"
+ empspacing="5"
+ dotted="true"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient4085">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop4087" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:0.7"
+ id="stop4089" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4136">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;"
+ id="stop4138" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop4140" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4303">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop4305" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop4307" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4297">
+ <stop
+ id="stop4299"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4301"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4115">
+ <stop
+ id="stop4117"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4119"
+ style="stop-color:#363636;stop-opacity:0.698"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3785">
+ <stop
+ id="stop3787"
+ style="stop-color:#b8b8b8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3789"
+ style="stop-color:#878787;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient6954">
+ <stop
+ id="stop6960"
+ style="stop-color:#f5f5f5;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop6962"
+ style="stop-color:#d2d2d2;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3341">
+ <stop
+ id="stop3343"
+ style="stop-color:white;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3345"
+ style="stop-color:white;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ cx="24.999998"
+ cy="28.659998"
+ r="16"
+ fx="24.999998"
+ fy="28.659998"
+ id="radialGradient2856"
+ xlink:href="#linearGradient6954"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.56186795,0,0,0.15787922,-6.1682604,5.3385209)" />
+ <linearGradient
+ x1="30"
+ y1="25.084745"
+ x2="30"
+ y2="45"
+ id="linearGradient2858"
+ xlink:href="#linearGradient3785"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
+ <radialGradient
+ cx="26.375898"
+ cy="12.31301"
+ r="8"
+ fx="26.375898"
+ fy="12.31301"
+ id="radialGradient2860"
+ xlink:href="#linearGradient6954"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.55250164,-0.0426402,0.04315608,0.50971914,-6.3026675,-1.9765067)" />
+ <linearGradient
+ x1="30"
+ y1="5"
+ x2="30"
+ y2="44.678879"
+ id="linearGradient2862"
+ xlink:href="#linearGradient3785"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
+ <linearGradient
+ x1="30"
+ y1="0.91818392"
+ x2="30"
+ y2="25.792814"
+ id="linearGradient2864"
+ xlink:href="#linearGradient3341"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.33685737,0,0,0.32161283,-0.10572085,-0.29529973)" />
+ <linearGradient
+ x1="29.955881"
+ y1="21.86607"
+ x2="29.955881"
+ y2="43.144382"
+ id="linearGradient2866"
+ xlink:href="#linearGradient3341"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.42808986,0,0,0.42296591,-2.823809,-3.2486024)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+ id="linearGradient7308"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.54681372,0,0,0.39376081,3.7325729,-0.29182867)"
+ x1="34.992828"
+ y1="0.94087797"
+ x2="34.992828"
+ y2="33.955856" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+ id="linearGradient3796"
+ x1="8.3635759"
+ y1="15.028702"
+ x2="15.937561"
+ y2="11.00073"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+ id="linearGradient3798"
+ x1="6.9951797"
+ y1="4.7478018"
+ x2="13.00482"
+ y2="4.7478018"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+ id="linearGradient3815"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
+ id="linearGradient3815-3"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-5">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-9" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-0" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-5"
+ id="linearGradient3831"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3833">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3835" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3837" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+ id="linearGradient3874"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
+ id="linearGradient3892-2"
+ x1="8.7094374"
+ y1="1.0035814"
+ x2="8.6826077"
+ y2="16.052532"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-2">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-1" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-4" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(0.96967712,0,0,0.96967712,0.26437941,-0.96950812)"
+ y2="16.052532"
+ x2="8.6826077"
+ y1="1.0035814"
+ x1="8.7094374"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3909"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+ id="linearGradient3984"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-2-1">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-1-4" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-4-6" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(0.78786264,0,0,0.78786264,-1.5726929,-0.7389112)"
+ y2="16.052532"
+ x2="8.6826077"
+ y1="1.0035814"
+ x1="8.7094374"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3909-3"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-2"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-2-2">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-1-7" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-4-5" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4115-9"
+ id="linearGradient4113-3"
+ x1="0.86849999"
+ y1="13.895414"
+ x2="0.44923753"
+ y2="28.776533"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4115-9">
+ <stop
+ id="stop4117-5"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4119-6"
+ style="stop-color:#363636;stop-opacity:0.698"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3104"
+ id="linearGradient3815-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,0.35950872)"
+ x1="-51.786404"
+ y1="50.786446"
+ x2="-51.786404"
+ y2="2.9062471" />
+ <linearGradient
+ id="linearGradient3104">
+ <stop
+ id="stop3106"
+ style="stop-color:#aaaaaa;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3108"
+ style="stop-color:#c8c8c8;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ cx="13.138569"
+ cy="25.625349"
+ r="13.931416"
+ fx="13.138569"
+ fy="25.625349"
+ id="radialGradient2965"
+ xlink:href="#linearGradient3690-451"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0,0.92614711,-1.0546317,0,32.402583,-9.3345932)" />
+ <linearGradient
+ id="linearGradient3690-451">
+ <stop
+ id="stop2857"
+ style="stop-color:#e8e8e8;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2859"
+ style="stop-color:#d8d8d8;stop-opacity:1"
+ offset="0.26238" />
+ <stop
+ id="stop2861"
+ style="stop-color:#c2c2c2;stop-opacity:1"
+ offset="0.66093999" />
+ <stop
+ id="stop2863"
+ style="stop-color:#a5a5a5;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="21.483376"
+ y1="36.255058"
+ x2="21.483376"
+ y2="9.5799999"
+ id="linearGradient2967"
+ xlink:href="#linearGradient3603-84"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762279)" />
+ <linearGradient
+ id="linearGradient3603-84">
+ <stop
+ id="stop2867"
+ style="stop-color:#707070;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2869"
+ style="stop-color:#9e9e9e;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="11.566265"
+ y1="22.292103"
+ x2="15.214532"
+ y2="33.95525"
+ id="linearGradient3674-262"
+ xlink:href="#linearGradient8265-821-176-38-919-66-249-529"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4893617,0,0,0.4893617,1.7131795,22.728095)" />
+ <linearGradient
+ id="linearGradient8265-821-176-38-919-66-249-529">
+ <stop
+ id="stop2873"
+ style="stop-color:#ffffff;stop-opacity:0.27450982"
+ offset="0" />
+ <stop
+ id="stop2875"
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="24.046366"
+ y1="11.673002"
+ x2="24.046366"
+ y2="34.713669"
+ id="linearGradient3677-116"
+ xlink:href="#linearGradient3642-81"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)" />
+ <linearGradient
+ id="linearGradient3642-81">
+ <stop
+ id="stop2879"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2881"
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="34.713669"
+ x2="24.046366"
+ y1="11.673002"
+ x1="24.046366"
+ gradientTransform="matrix(0.55048262,0,0,0.57815823,-3.8262247,-5.2762276)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3037"
+ xlink:href="#linearGradient3642-81"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3155-40"
+ id="linearGradient8639"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.415777,-0.4174938,0.518983,0.5146192,-15.747227,2.6503673)"
+ spreadMethod="pad"
+ x1="23.575972"
+ y1="25.356892"
+ x2="23.575972"
+ y2="31.210939" />
+ <linearGradient
+ id="linearGradient3155-40">
+ <stop
+ id="stop2541"
+ offset="0"
+ style="stop-color:#181818;stop-opacity:1;" />
+ <stop
+ style="stop-color:#dbdbdb;stop-opacity:1;"
+ offset="0.13482948"
+ id="stop2543" />
+ <stop
+ id="stop2545"
+ offset="0.20224422"
+ style="stop-color:#a4a4a4;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0.26965895"
+ id="stop2547" />
+ <stop
+ id="stop2549"
+ offset="0.44650277"
+ style="stop-color:#8d8d8d;stop-opacity:1;" />
+ <stop
+ style="stop-color:#959595;stop-opacity:1;"
+ offset="0.57114136"
+ id="stop2551" />
+ <stop
+ id="stop2553"
+ offset="0.72038066"
+ style="stop-color:#cecece;stop-opacity:1;" />
+ <stop
+ id="stop2555"
+ offset="1"
+ style="stop-color:#181818;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3240-279"
+ id="linearGradient8641"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.867764,0.6930272)"
+ x1="30.037716"
+ y1="24.989594"
+ x2="30.037716"
+ y2="30.000141" />
+ <linearGradient
+ id="linearGradient3240-279">
+ <stop
+ style="stop-color:#565656;stop-opacity:1;"
+ offset="0"
+ id="stop2559" />
+ <stop
+ id="stop2561"
+ offset="0.5"
+ style="stop-color:#9a9a9a;stop-opacity:1;" />
+ <stop
+ style="stop-color:#545454;stop-opacity:1;"
+ offset="1"
+ id="stop2563" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3223-789"
+ id="linearGradient8643"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.983472,0.8092126)"
+ x1="30.037716"
+ y1="24.989594"
+ x2="30.037716"
+ y2="30.000141" />
+ <linearGradient
+ id="linearGradient3223-789">
+ <stop
+ id="stop2567"
+ offset="0"
+ style="stop-color:#b1b1b1;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0.5"
+ id="stop2569" />
+ <stop
+ id="stop2571"
+ offset="1"
+ style="stop-color:#8f8f8f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3240-686"
+ id="linearGradient8645"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.465684,0.2892868)"
+ x1="30.037716"
+ y1="24.989594"
+ x2="30.037716"
+ y2="30.000141" />
+ <linearGradient
+ id="linearGradient3240-686">
+ <stop
+ style="stop-color:#565656;stop-opacity:1;"
+ offset="0"
+ id="stop2575" />
+ <stop
+ id="stop2577"
+ offset="0.5"
+ style="stop-color:#9a9a9a;stop-opacity:1;" />
+ <stop
+ style="stop-color:#545454;stop-opacity:1;"
+ offset="1"
+ id="stop2579" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3223-768"
+ id="linearGradient8647"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.581392,0.4054707)"
+ x1="30.037716"
+ y1="24.989594"
+ x2="30.037716"
+ y2="30.000141" />
+ <linearGradient
+ id="linearGradient3223-768">
+ <stop
+ id="stop2583"
+ offset="0"
+ style="stop-color:#b1b1b1;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0.5"
+ id="stop2585" />
+ <stop
+ id="stop2587"
+ offset="1"
+ style="stop-color:#8f8f8f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3240-907"
+ id="linearGradient8649"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.061661,-0.1164056)"
+ x1="30.037716"
+ y1="24.989594"
+ x2="30.037716"
+ y2="30.000141" />
+ <linearGradient
+ id="linearGradient3240-907">
+ <stop
+ style="stop-color:#565656;stop-opacity:1;"
+ offset="0"
+ id="stop2591" />
+ <stop
+ id="stop2593"
+ offset="0.5"
+ style="stop-color:#9a9a9a;stop-opacity:1;" />
+ <stop
+ style="stop-color:#545454;stop-opacity:1;"
+ offset="1"
+ id="stop2595" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3223-699"
+ id="linearGradient8651"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.6022679,-17.177369,-2.1969969e-4)"
+ x1="30.037716"
+ y1="24.989594"
+ x2="30.037716"
+ y2="30.000141" />
+ <linearGradient
+ id="linearGradient3223-699">
+ <stop
+ id="stop2599"
+ offset="0"
+ style="stop-color:#b1b1b1;stop-opacity:1;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0.5"
+ id="stop2601" />
+ <stop
+ id="stop2603"
+ offset="1"
+ style="stop-color:#8f8f8f;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3290-678"
+ id="linearGradient8653"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4040235,-0.4056919,0.6073752,0.602268,-17.636692,0.462492)"
+ x1="9"
+ y1="29.056757"
+ x2="9"
+ y2="26.02973" />
+ <linearGradient
+ id="linearGradient3290-678">
+ <stop
+ id="stop2607"
+ offset="0"
+ style="stop-color:#ece5a5;stop-opacity:1;" />
+ <stop
+ id="stop2609"
+ offset="1"
+ style="stop-color:#fcfbf2;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3191-577"
+ id="linearGradient8655"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.3763801,0.03615261,0.03669995,0.374874,-2.2182805,-1.1331002)"
+ x1="5.5178981"
+ y1="37.371799"
+ x2="9.5220556"
+ y2="41.391716" />
+ <linearGradient
+ id="linearGradient3191-577">
+ <stop
+ id="stop2613"
+ offset="0"
+ style="stop-color:#dbce48;stop-opacity:1;" />
+ <stop
+ id="stop2615"
+ offset="1"
+ style="stop-color:#c5b625;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0"
+ id="linearGradient3934-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+ x1="8.7094374"
+ y1="1.0035814"
+ x2="8.6826077"
+ y2="16.052532" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-1-4-9" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-4-6-0" />
+ </linearGradient>
+ <linearGradient
+ y2="16.052532"
+ x2="8.6826077"
+ y1="1.0035814"
+ x1="8.7094374"
+ gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4154-8"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-9-0">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-1-4-9-8-3" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-4-6-0-4-8" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-2-1-0-3">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-1-4-9-3" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-4-6-0-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5"
+ id="linearGradient4326"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
+ x1="14.501121"
+ y1="-1.4095211"
+ x2="14.152531"
+ y2="20.074369" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5"
+ id="linearGradient4328"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+ x1="8.7094374"
+ y1="1.0035814"
+ x2="8.6826077"
+ y2="16.052532" />
+ <linearGradient
+ x1="-2.4040222"
+ y1="4.4573336"
+ x2="-2.4040222"
+ y2="18.967093"
+ id="linearGradient3878"
+ xlink:href="#linearGradient3587-6-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(13.927091,-3.4266134)" />
+ <linearGradient
+ id="linearGradient3587-6-5">
+ <stop
+ id="stop3589-9-2"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5"
+ id="linearGradient4357"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
+ x1="0.86849999"
+ y1="13.895414"
+ x2="0.44923753"
+ y2="28.776533" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1"
+ id="linearGradient4405"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+ id="linearGradient4413-7"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-4-5-4-0-1-55">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-3-2-53-4-3-95" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-7-9-86-9-3-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2"
+ id="linearGradient4411-3"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ id="linearGradient3587-6-5-2">
+ <stop
+ id="stop3589-9-2-8"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4"
+ id="linearGradient4466-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.23426255,0,0,0.2859159,18.734419,60.359508)"
+ x1="-41.553459"
+ y1="2.2401412"
+ x2="-41.553459"
+ y2="54.703121" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4">
+ <stop
+ id="stop3589-9-2-8-7"
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="54.703121"
+ x2="-41.553459"
+ y1="2.2401412"
+ x1="-41.553459"
+ gradientTransform="matrix(0.21864454,0,0,0.26685422,17.618755,60.402242)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4483-3"
+ xlink:href="#linearGradient3587-6-5-2-4-9"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4-9">
+ <stop
+ id="stop3589-9-2-8-7-2"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3-8"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+ id="linearGradient4564"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5"
+ id="linearGradient4566"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(13.927091,16.573387)"
+ x1="-2.4040222"
+ y1="4.4573336"
+ x2="-2.4040222"
+ y2="18.967093" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2"
+ id="linearGradient4578"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55"
+ id="linearGradient4580"
+ gradientUnits="userSpaceOnUse"
+ x1="209.34245"
+ y1="998.45801"
+ x2="209.34245"
+ y2="1013.451" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3"
+ id="linearGradient4359-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99998838,0,0,0.99998838,29.038238,-21.358617)"
+ x1="8.7094374"
+ y1="1.0035814"
+ x2="8.6826077"
+ y2="16.052532" />
+ <linearGradient
+ id="linearGradient3587-6-5-3">
+ <stop
+ id="stop3589-9-2-6"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-5"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3"
+ id="linearGradient4361-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
+ x1="8.7094374"
+ y1="1.0035814"
+ x2="8.6826077"
+ y2="16.052532" />
+ <linearGradient
+ id="linearGradient4597">
+ <stop
+ id="stop4599"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4601"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="16.052532"
+ x2="8.6826077"
+ y1="1.0035814"
+ x1="8.7094374"
+ gradientTransform="matrix(0.6858824,0,0,0.68591053,25.66524,-19.333318)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient4610"
+ xlink:href="#linearGradient3587-6-5-3"
+ inkscape:collect="always" />
+ <linearGradient
+ x1="1.3333321"
+ y1="6.6666665"
+ x2="1.3333321"
+ y2="33.333332"
+ id="linearGradient2422"
+ xlink:href="#linearGradient3587-6-5-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4090909,0,0,0.375,7.4545459,0.5)" />
+ <linearGradient
+ id="linearGradient3587-6-5-5">
+ <stop
+ id="stop3589-9-2-4"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-3"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837"
+ id="linearGradient3189"
+ xlink:href="#linearGradient3587-6-5-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)" />
+ <linearGradient
+ id="linearGradient3587-6-5-8">
+ <stop
+ id="stop3589-9-2-67"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-2"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837"
+ id="linearGradient3203"
+ xlink:href="#linearGradient3587-6-5-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)" />
+ <linearGradient
+ id="linearGradient3120">
+ <stop
+ id="stop3122"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3124"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837"
+ id="linearGradient3207"
+ xlink:href="#linearGradient3587-6-5-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)" />
+ <linearGradient
+ id="linearGradient3127">
+ <stop
+ id="stop3129"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3131"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837"
+ id="linearGradient3211"
+ xlink:href="#linearGradient3587-6-5-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)" />
+ <linearGradient
+ id="linearGradient3134">
+ <stop
+ id="stop3136"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3138"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="11"
+ y1="6"
+ x2="11"
+ y2="17"
+ id="linearGradient2409"
+ xlink:href="#linearGradient3587-6-5-1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2403101,0,0,0.8988764,10.387597,0.2247191)" />
+ <linearGradient
+ id="linearGradient3587-6-5-1">
+ <stop
+ id="stop3589-9-2-0"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-21"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="40.805084"
+ y1="5.6271191"
+ x2="40.805084"
+ y2="17.627119"
+ id="linearGradient3206"
+ xlink:href="#linearGradient3587-8-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-32.805085,-3.6271193)" />
+ <linearGradient
+ id="linearGradient3587-8-5">
+ <stop
+ id="stop3589-2-7"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-3-5"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="17.627119"
+ x2="40.805084"
+ y1="5.6271191"
+ x1="40.805084"
+ gradientTransform="translate(-32.805085,-3.6271193)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3180"
+ xlink:href="#linearGradient3587-8-5"
+ inkscape:collect="always" />
+ <linearGradient
+ x1="1.3333321"
+ y1="6.6666665"
+ x2="1.3333321"
+ y2="33.333332"
+ id="linearGradient2422-1"
+ xlink:href="#linearGradient3587-6-5-86"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2727273,0,0,0.375,9.636365,1.5)" />
+ <linearGradient
+ id="linearGradient3587-6-5-86">
+ <stop
+ id="stop3589-9-2-65"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-9"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="11"
+ y1="6"
+ x2="11"
+ y2="17"
+ id="linearGradient2427"
+ xlink:href="#linearGradient3587-6-5-86"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,1.5842703)" />
+ <linearGradient
+ id="linearGradient3207-3">
+ <stop
+ id="stop3209"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3211"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="11"
+ y1="6"
+ x2="11"
+ y2="17"
+ id="linearGradient2436"
+ xlink:href="#linearGradient3587-6-5-86"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,9.58427)" />
+ <linearGradient
+ id="linearGradient3214">
+ <stop
+ id="stop3216"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3218"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="11"
+ y1="6"
+ x2="11"
+ y2="17"
+ id="linearGradient2442"
+ xlink:href="#linearGradient3587-6-5-86"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4651163,0,0,0.3370786,4.3953488,5.5842706)" />
+ <linearGradient
+ id="linearGradient3221">
+ <stop
+ id="stop3223"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3225"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="1.3333321"
+ y1="4.9755898"
+ x2="1.3333321"
+ y2="37.373981"
+ id="linearGradient2422-1-0"
+ xlink:href="#linearGradient3587-6-5-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.39871888,0,0,0.3091132,71.812715,15.470662)" />
+ <linearGradient
+ id="linearGradient3587-6-5-0">
+ <stop
+ id="stop3589-9-2-5"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-1"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="46.395508"
+ y1="12.707516"
+ x2="46.395508"
+ y2="38.409042"
+ id="linearGradient3795-2"
+ xlink:href="#linearGradient3587-6-5-3-5-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" />
+ <linearGradient
+ id="linearGradient3587-6-5-3-5-7">
+ <stop
+ id="stop3589-9-2-2-6-2"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-73-5-1"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3587-6-5-3-5">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1"
+ id="stop3589-9-2-2-6" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop3591-7-4-73-5" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-3-5"
+ id="linearGradient4872"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-0.4100229,0,0,0.5447147,19.329265,-26.729116)"
+ x1="100.77747"
+ y1="17.859186"
+ x2="100.77747"
+ y2="38.055252" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient4894"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient4900"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient4906"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient4912"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ id="linearGradient3587-6-5-8-6">
+ <stop
+ id="stop3589-9-2-67-3"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-2-3"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4935">
+ <stop
+ id="stop4937"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4939"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4942">
+ <stop
+ id="stop4944"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4946"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8-6"
+ id="linearGradient4912-4"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ id="linearGradient4949">
+ <stop
+ id="stop4951"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop4953"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient5012"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient5015"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,7.5,7.499999)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient5018"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,-0.5000001,0.5)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-8"
+ id="linearGradient5021"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.375,0,0,0.375,7.5,0.5)"
+ x1="26.045763"
+ y1="9.6223383"
+ x2="26.045763"
+ y2="19.490837" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4"
+ id="linearGradient3335"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.21864454,0,0,0.26685422,18.618755,-19.597758)"
+ x1="-41.553459"
+ y1="2.2401412"
+ x2="-41.553459"
+ y2="54.703121" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4136"
+ id="linearGradient4134"
+ x1="9"
+ y1="0"
+ x2="9"
+ y2="15"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4136"
+ id="linearGradient4150"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad"
+ x1="9"
+ y1="0"
+ x2="9"
+ y2="15" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4-6"
+ id="linearGradient3335-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2186487,0,0,0.26685422,76.619476,1.402242)"
+ x1="-41.553459"
+ y1="2.2401412"
+ x2="-41.755585"
+ y2="47.208389" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4-6">
+ <stop
+ id="stop3589-9-2-8-7-8"
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3-4"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4-6-0"
+ id="linearGradient3335-7-8"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
+ x1="-41.553459"
+ y1="2.2401412"
+ x2="-41.553459"
+ y2="54.703121" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4-6-0">
+ <stop
+ id="stop3589-9-2-8-7-8-7"
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3-4-7"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4-6-4"
+ id="linearGradient3335-7-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,0.402242)"
+ x1="-41.553459"
+ y1="2.2401412"
+ x2="-41.553459"
+ y2="54.703121" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4-6-4">
+ <stop
+ id="stop3589-9-2-8-7-8-2"
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3-4-2"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4-6-7"
+ id="linearGradient3335-7-3"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2186487,0,0,0.26685422,16.619476,1.402242)"
+ x1="-41.553459"
+ y1="2.2401412"
+ x2="-41.755585"
+ y2="47.208389" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4-6-7">
+ <stop
+ id="stop3589-9-2-8-7-8-4"
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3-4-5"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4-6-2"
+ id="linearGradient3335-7-1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
+ x1="-39.421574"
+ y1="-5.2547116"
+ x2="-39.421574"
+ y2="47.208389" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4-6-2">
+ <stop
+ id="stop3589-9-2-8-7-8-77"
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3-4-9"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4136-9"
+ id="linearGradient4150-0"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad"
+ x1="9"
+ y1="0"
+ x2="9"
+ y2="15" />
+ <linearGradient
+ id="linearGradient4136-9">
+ <stop
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;"
+ id="stop4138-6" />
+ <stop
+ offset="1"
+ style="stop-color:#363636;stop-opacity:1"
+ id="stop4140-3" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
+ id="linearGradient3335-7-1-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
+ x1="-39.421574"
+ y1="-5.2547116"
+ x2="-39.421574"
+ y2="47.208389" />
+ <linearGradient
+ id="linearGradient3587-6-5-2-4-6-2-6">
+ <stop
+ id="stop3589-9-2-8-7-8-77-4"
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-0-3-4-9-3"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-10"
+ id="linearGradient4328-1"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.99998838,0,0,0.99998838,-1.9961264,-41.000004)"
+ x1="8.7094374"
+ y1="1.0035814"
+ x2="8.6826077"
+ y2="16.052532" />
+ <linearGradient
+ id="linearGradient3587-6-5-10">
+ <stop
+ id="stop3589-9-2-3"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-4"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-19"
+ id="linearGradient4326-9"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6858824,0,0,0.68591053,-5.3691237,-18.974705)"
+ x1="14.501121"
+ y1="-1.4095211"
+ x2="14.152531"
+ y2="20.074369" />
+ <linearGradient
+ id="linearGradient3587-6-5-19">
+ <stop
+ id="stop3589-9-2-62"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-54"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-4"
+ id="linearGradient4357-0"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
+ x1="0.86849999"
+ y1="13.895414"
+ x2="0.44923753"
+ y2="28.776533" />
+ <linearGradient
+ id="linearGradient3587-6-5-4">
+ <stop
+ id="stop3589-9-2-1"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-04"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="28.776533"
+ x2="0.44923753"
+ y1="13.895414"
+ x1="0.86849999"
+ gradientTransform="matrix(1.0344828,0,0,1.0344828,8.0707628,-14.513825)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3456"
+ xlink:href="#linearGradient3587-6-5-4"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-26"
+ id="linearGradient4566-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(13.927091,16.573387)"
+ x1="-2.4040222"
+ y1="4.4573336"
+ x2="-2.4040222"
+ y2="18.967093" />
+ <linearGradient
+ id="linearGradient3587-6-5-26">
+ <stop
+ id="stop3589-9-2-45"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop3591-7-4-20"
+ style="stop-color:#363636;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="18.967093"
+ x2="-2.4040222"
+ y1="4.4573336"
+ x1="-2.4040222"
+ gradientTransform="translate(13.927091,16.573387)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient3475"
+ xlink:href="#linearGradient3587-6-5-26"
+ inkscape:collect="always" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3587-6-5-26"
+ id="linearGradient4074"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(13.927091,-3.426613)"
+ x1="-2.4040222"
+ y1="4.4573336"
+ x2="-2.4040222"
+ y2="18.967093" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4085"
+ id="linearGradient4083"
+ x1="8"
+ y1="1"
+ x2="8"
+ y2="15.458407"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4085"
+ id="linearGradient4121"
+ gradientUnits="userSpaceOnUse"
+ x1="8"
+ y1="1"
+ x2="8"
+ y2="15.458407"
+ gradientTransform="translate(-20,0)" />
+ </defs>
<g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(573.14286,110.2963)">
- <path
- inkscape:connector-curvature="0"
- d="m -557.14286,-107.23533 -16,15.93883 6,0 0,12.0002 20,0 0,-12.0002 6,0 -6,-6.061184 0,-7.939046 -6,0 0,2.16233 -4,-4.10093 z"
- id="path3307"
- style="opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
- <path
- style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- id="path3883"
- d="m -557.14286,-108.23534 -16,15.938823 6,0 0,12.0002 20,0 0,-12.0002 6,0 -6,-6.061183 0,-7.93905 -6,0 0,2.16234 -4,-4.10093 z"
- inkscape:connector-curvature="0" />
- <path
- inkscape:connector-curvature="0"
- d="m -525.14286,-108.23534 -16,15.938823 6,0 0,12.0002 20,0 0,-12.0002 6,0 -6,-6.061183 0,-7.93905 -6,0 0,2.16234 -4,-4.10093 z"
- id="path3328"
- style="opacity:0.3;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ transform="matrix(0.78786264,0,0,0.78786264,-3.1483699,0.44173984)"
+ id="g3743-3"
+ style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+ <rect
+ style="color:#000000;fill:#ccc000;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3136"
+ width="163.31035"
+ height="97.986206"
+ x="-62.896553"
+ y="-32.993103" />
+ <g
+ transform="matrix(0.99998873,0,0,0.99998873,-3.996044,-20.001608)"
+ id="g3743-9-4"
+ style="opacity:0.6;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
+ <g
+ id="g4146">
<path
- style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m -525.14286,-109.2343 -16,15.937766 1,0 15,-14.937746 4,4.12507 0,-1.00002 -4,-4.12507 z m 4,1.93753 0,1.00002 6,0 0,-1.00002 -6,0 z m 6,7.937635 0,1.000017 5,5.062584 1,0 -6,-6.062601 z"
- id="path3330"
- inkscape:connector-curvature="0" />
+ style="fill:url(#linearGradient4083);fill-rule:evenodd;stroke:none;fill-opacity:1;opacity:0.69999999999999996"
+ d="M 4 2 C 2.892 2 2 2.892 2 4 L 2 12 C 2 13.108 2.892 14 4 14 L 12 14 C 13.108 14 14 13.108 14 12 L 14 4 C 14 2.892 13.108 2 12 2 L 4 2 z M 4.09375 4 L 11.90625 4 C 11.96165 4 12 4.03835 12 4.09375 L 12 11.90625 C 12 11.96165 11.96165 12 11.90625 12 L 4.09375 12 C 4.03835 12 4 11.96165 4 11.90625 L 4 4.09375 C 4 4.03835 4.03835 4 4.09375 4 z "
+ id="rect3298" />
+ <rect
+ rx="2"
+ ry="2"
+ y="2"
+ x="-18"
+ height="12"
+ width="12"
+ id="rect4119"
+ style="opacity:0.7;fill:url(#linearGradient4121);fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
</svg>
diff --git a/core/js/share.js b/core/js/share.js
index 7d8799edf51..00e5ef3eed6 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -483,15 +483,14 @@ $(document).ready(function() {
$('#linkPass').toggle('blind');
});
- $('#linkPassText').live('keyup', function(event) {
- if (event.keyCode == 13) {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
- $('#linkPassText').val('');
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
- });
- }
+ $('#linkPassText').live('focusout', function(event) {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+ $('#linkPassText').val('');
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ });
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
});
$('#expirationCheckbox').live('click', function() {
diff --git a/core/templates/installation.php b/core/templates/installation.php
index c0b29ea909d..5a3bd2cc9f0 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -111,7 +111,7 @@
</p>
<p class="infield">
<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
- <input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" />
+ <input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" />
</p>
</div>
<?php endif; ?>
diff --git a/lib/setup.php b/lib/setup.php
index a072e00f91e..9231845da51 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -70,6 +70,9 @@ class OC_Setup {
if(empty($options['dbname'])) {
$error[] = "$dbprettyname enter the database name.";
}
+ if(substr_count($options['dbname'], '.') >= 1){
+ $error[] = "$dbprettyname you may not use dots in the database name";
+ }
if($dbtype != 'oci' && empty($options['dbhost'])) {
$error[] = "$dbprettyname set the database host.";
}
diff --git a/lib/template.php b/lib/template.php
index 972d75807c7..1ad47cbe52c 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -22,6 +22,22 @@
*/
/**
+ * Prints an XSS escaped string
+ * @param string $string the string which will be escaped and printed
+ */
+function p($string){
+ print(OC_Util::sanitizeHTML($string));
+}
+
+/**
+ * Prints an unescaped string
+ * @param string $string the string which will be printed as it is
+ */
+function print_unescaped($string){
+ print($string);
+}
+
+/**
* @brief make OC_Helper::linkTo available as a simple function
* @param string $app app
* @param string $file file
diff --git a/lib/util.php b/lib/util.php
index 4ca84ba75af..f67f8d1fe3f 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -24,6 +24,11 @@ class OC_Util {
$user = OC_User::getUser();
}
+ // load all filesystem apps before, so no setup-hook gets lost
+ if(!$RUNTIME_NOAPPS) {
+ OC_App::loadApps(array('filesystem'));
+ }
+
// the filesystem will finish when $user is not empty,
// mark fs setup here to avoid doing the setup from loading
// OC_Filesystem
@@ -62,7 +67,7 @@ class OC_Util {
OC_Filesystem::tearDown();
self::$fsSetup=false;
}
-
+
public static function loadUserMountPoints($user) {
$user_dir = '/'.$user.'/files';
$user_root = OC_User::getHome($user);
@@ -74,14 +79,14 @@ class OC_Util {
OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);
}
}
-
+
$mtime=filemtime($user_root.'/mount.php');
$previousMTime=OC_Preferences::getValue($user,'files','mountconfigmtime',0);
if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
OC_FileCache::triggerUpdate($user);
OC_Preferences::setValue($user,'files','mountconfigmtime',$mtime);
}
- }
+ }
}
/**
@@ -429,7 +434,7 @@ class OC_Util {
}
return true;
}
-
+
/**
* Redirect to the user default page
*/
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-28 09:55:32 +0000