From d9ef6da2e49de52a694f1c7684624e68e4de6a21 Mon Sep 17 00:00:00 2001
From: Robin Appelman
Date: Sun, 28 Oct 2012 11:51:54 +0100
Subject: [PATCH 1/9] code style
---
apps/files/js/fileactions.js | 194 ++++++++++++++++++-----------------
1 file changed, 101 insertions(+), 93 deletions(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 1cf80352be..fc7c117cfc 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -1,96 +1,98 @@
-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;
+ 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')){
+ 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('');
- 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') {
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='';
- if(img) { html+=' '; }
- html += t('files', name) +'';
- var element=$(html);
- element.data('action',name);
- element.click(function(event){
+ var html = '';
+ if (img) {
+ html += ' ';
+ }
+ html += t('files', name) + '';
+ var element = $(html);
+ element.data('action', name);
+ element.click(function (event) {
event.stopPropagation();
event.preventDefault();
- var action=actions[$(this).data('action')];
- var currentFile=FileActions.getCurrentFile();
+ var action = actions[$(this).data('action')];
+ var currentFile = FileActions.getCurrentFile();
FileActions.hide();
action(currentFile);
});
@@ -98,94 +100,100 @@ var FileActions={
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 = '';
} else {
- var html='';
+ var html = '';
}
- var element=$(html);
- if(img){
- element.append($(''));
+ var element = $(html);
+ if (img) {
+ element.append($(''));
}
- 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();
+ var action = actions[$(this).data('action')];
+ var currentFile = FileActions.getCurrentFile();
FileActions.hide();
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');
+ $('#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(){
+ 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());
});
});
-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');
From fe6b987b3d48a5fc9bab8f4bfdccb99e9605f07a Mon Sep 17 00:00:00 2001
From: Robin Appelman
Date: Sun, 28 Oct 2012 12:47:33 +0100
Subject: [PATCH 2/9] use css to show/hide fileactions
---
apps/files/js/fileactions.js | 30 ++++++++++--------------------
apps/files/js/files.js | 8 --------
core/css/styles.css | 7 ++++---
3 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index fc7c117cfc..24c8e85656 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -63,7 +63,6 @@ var FileActions = {
},
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')) {
@@ -73,15 +72,15 @@ var FileActions = {
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') {
+ if ((name === 'Download' || actions[name] !== defaultAction) && name !== 'Delete') {
var img = FileActions.icons[name];
if (img.call) {
img = img(file);
}
- var html = '';
+ var html = '';
if (img) {
html += ' ';
}
@@ -89,14 +88,13 @@ var FileActions = {
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();
action(currentFile);
});
- element.hide();
parent.find('a.name>span.fileactions').append(element);
}
}
@@ -107,9 +105,9 @@ var FileActions = {
}
// NOTE: Temporary fix to allow unsharing of files in root of Shared folder
if ($('#dir').val() == '/Shared') {
- var html = '';
+ var html = '';
} else {
- var html = '';
+ var html = '';
}
var element = $(html);
if (img) {
@@ -121,22 +119,10 @@ var FileActions = {
event.preventDefault();
var action = actions[$(this).data('action')];
var currentFile = FileActions.getCurrentFile();
- FileActions.hide();
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 () {
return FileActions.currentFile.parent().attr('data-file');
@@ -163,6 +149,10 @@ $(document).ready(function () {
}, 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 () {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 549204e857..2d9ccba424 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/core/css/styles.css b/core/css/styles.css
index a6c1050407..95dceb50de 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -112,10 +112,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; }
From bf3dac05d10ffb18854e73e823a83503099aa77d Mon Sep 17 00:00:00 2001
From: Bernhard Posselt
Date: Sun, 28 Oct 2012 13:27:13 +0100
Subject: [PATCH 3/9] added functions for printing escaped and unescaped values
---
lib/template.php | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/lib/template.php b/lib/template.php
index 972d75807c..1ad47cbe52 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -21,6 +21,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
From 5b9ba2e0331cdfa986a090c61f33f36eca1a0f33 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon
Date: Sun, 28 Oct 2012 13:45:37 +0100
Subject: [PATCH 4/9] remove whitespaces, no code change
---
lib/util.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/util.php b/lib/util.php
index 4ca84ba75a..c49e7cfc23 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -62,7 +62,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 +74,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 +429,7 @@ class OC_Util {
}
return true;
}
-
+
/**
* Redirect to the user default page
*/
From b8a48b55a359bb56f9cdf2d4c8099394d7f0cbb1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon
Date: Sun, 28 Oct 2012 13:47:53 +0100
Subject: [PATCH 5/9] make sure all filesystem apps are loaded when setupFS is
proceeded, to make sure the emmited setup-hook is received. Fixes #89
---
lib/util.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/lib/util.php b/lib/util.php
index c49e7cfc23..f67f8d1fe3 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
From d7a6b094063a89b8ecce9392a603cb3c3a967db2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke
Date: Sun, 28 Oct 2012 14:11:41 +0100
Subject: [PATCH 6/9] deny the usage of dots in database name
---
core/templates/installation.php | 2 +-
lib/setup.php | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/templates/installation.php b/core/templates/installation.php
index c0b29ea909..5a3bd2cc9f 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -111,7 +111,7 @@
-
+
diff --git a/lib/setup.php b/lib/setup.php
index a072e00f91..9231845da5 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.";
}
From a4a1dad8312db8060009be0dd315cd7b5b1e4fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?=
Date: Sun, 28 Oct 2012 13:47:29 +0100
Subject: [PATCH 7/9] set password if user leaves password field (issue #57)
---
core/js/share.js | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/core/js/share.js b/core/js/share.js
index 7d8799edf5..8d359dd3fc 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -483,15 +483,13 @@ $(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'));
+ });
});
$('#expirationCheckbox').live('click', function() {
From f2f2b8ba3b315365591784dcc1c172625768f241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?=
Date: Sun, 28 Oct 2012 14:57:36 +0100
Subject: [PATCH 8/9] added some visual feedback is password was set
---
core/js/share.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/js/share.js b/core/js/share.js
index 8d359dd3fc..00e5ef3eed 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -490,6 +490,7 @@ $(document).ready(function() {
$('#linkPassText').val('');
$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
});
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
});
$('#expirationCheckbox').live('click', function() {
From 7af8c6c3cbf00444b81a6d3d0c4cede983ff8edc Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt
Date: Sun, 28 Oct 2012 16:05:31 +0100
Subject: [PATCH 9/9] first version of breadcrumb 'root', still have a weird
feeling about this
---
apps/files/appinfo/app.php | 2 +-
apps/files/css/files.css | 4 -
apps/files/templates/part.breadcrumb.php | 11 +-
core/css/styles.css | 5 +-
core/img/places/files.png | Bin 0 -> 372 bytes
core/img/places/files.svg | 1779 ++++++++++++++++++++++
core/img/places/home.png | Bin 372 -> 364 bytes
core/img/places/home.svg | 83 +-
8 files changed, 1853 insertions(+), 31 deletions(-)
create mode 100644 core/img/places/files.png
create mode 100644 core/img/places/files.svg
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index b431ddfec0..3f437679e0 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 0b886fc3fa..64e49d687d 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -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 12.5em 0px; width:12.5em; padding-right:1em; position:fixed; }
-#navigation>ul>li:first-child+li { padding-top:2.9em; }
#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/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 71b695f65f..37b6b63eab 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,13 @@
+
+
+
- svg" data-dir='' style='background-image:url("")'>
-
">
+
diff --git a/core/css/styles.css b/core/css/styles.css
index 95dceb50de..0dbba19742 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -177,6 +177,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 { 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-left:1em; }
-div.crumb.last { font-weight:bold; }
+div.crumb.last { font-weight:bold; background:none; padding-right:0; }
+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 0000000000000000000000000000000000000000..c3dbd3e35386f938b7e8928a0f90ec4660eb88a5
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf
2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4XK2Qi{56`sSx;f&^RV;~8eY%-?4$
ztK7jEG0k<7%EH{+O&un_`Z`AcSY(b@p5OH5PN}So()rKbxwqvn*_`)3Q`jiLB>1|P
z?Jm#8_tgRi|F$MdIIx&E7_tf8VNhgoDPVqV(ZrFLV0<_Bw)uUdU!0PLtIsL|JgTe~DWM4fyC09M
literal 0
HcmV?d00001
diff --git a/core/img/places/files.svg b/core/img/places/files.svg
new file mode 100644
index 0000000000..4b45ef12bc
--- /dev/null
+++ b/core/img/places/files.svg
@@ -0,0 +1,1779 @@
+
+
+
+
diff --git a/core/img/places/home.png b/core/img/places/home.png
index c3dbd3e35386f938b7e8928a0f90ec4660eb88a5..5cbf1114cb7c3300ebcc14c9ba75243e31a361ef 100644
GIT binary patch
delta 262
zcmV+h0r~#)0_*~iZhz@XL_t(Ijm48aYQ!)Qh2Q+hm5;E2T}TtuPUR!y3Sn_>lWU~O
z4ML9KN`0EZ7ReD@O4e3dvXN~94n!ar!F%7lkr0Itux0TkHvla~*L8P9^q6zLT{95T
zN6z_q7>4(&1gd&u=7Wf&wav^2RXtV-n0XH%j^p?cLdbL7&3}yAwtWGxzxYbwoQux6
zxMT)^5JE1xDuJq|wb_?+-vP0f&jPM=e+OXZUjcsVHs8VJ6+|S8NHjBAGMgC{U6sH&
zcLH$Zy?^Taeiq=p2Y?9RvjQ|t^O{n+XXf472-7ruiO5?y)4%`5GbiXwY2s`-1^@s6
M07*qoM6N<$f_b!jP5=M^
delta 271
zcmV+q0r39p0`vlqZh!GfL_t(I%caplYJ@NpfMG!p1Xm)uQB)9I2!fz)L>D41q(O>p
zno^m2%{h99GMVuZ^G;%8L2#gPGVS7nge3psMVh8b`j6d1S(aaz=RXD5!&lGqPOj^o
z*cvH{^0~SjP*oKNK|qV5fQ9e-U+a3Y8_+Zjhha#os)AKnmVejno*U40{Vj?jTGut~
z`88k|28rXCHcbQfn5KES30Rgzk|d#R+k%KRO)o4m{sbJydC#)!+;ts1BG2=SZQCEx
zJkL+eae)v55$k;h-3+nsdl13>g<%*#1UG;&1`*rD%PDHLkV1kzyc|HID
diff --git a/core/img/places/home.svg b/core/img/places/home.svg
index 4b45ef12bc..c56f966128 100644
--- a/core/img/places/home.svg
+++ b/core/img/places/home.svg
@@ -14,9 +14,9 @@
width="16"
height="16"
id="svg11300"
- inkscape:version="0.48.1 r9760"
- sodipodi:docname="help.svg"
- inkscape:export-filename="/home/jancborchardt/jancborchardt/ownCloud/icons/help.png"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="home.svg"
+ inkscape:export-filename="home.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
+
+
+
+
+
+
+
-
-
-
-
+
+