diff --git a/core/css/styles.css b/core/css/styles.css index 6fc24d4c21..99090b9171 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -31,7 +31,7 @@ div.controls { width:100%; margin:0px; background-color:#f7f7f7; border-bottom:1 #body-login p.info { width:16em; margin:2em auto; padding:1em; background-color:#eee; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } #body-login p.info a { font-weight:bold; } -#login header { margin-top:-2em; height:10em; +#login div.header { margin-top:-2em; height:10em; -moz-box-shadow:0 0 5px #000; -webkit-box-shadow:0 0 20px #000; box-shadow:0 0 20px #000; background: #1d2d44; /* Old browsers */ background: -moz-linear-gradient(top, #35537a 0%, #1d2d42 100%); /* FF3.6+ */ @@ -39,8 +39,8 @@ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537 background: -webkit-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Chrome10+,Safari5.1+ */ background: -o-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* Opera11.10+ */ background: -ms-linear-gradient(top, #35537a 0%,#1d2d42 100%); /* IE10+ */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ -background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ } +background: linear-gradient(top, #35537a 0%,#1d2d42 100%); /* W3C */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d42',GradientType=0 ); /* IE6-9 */ } #login { margin:0 auto 0 auto; padding:2em 0 0 0; border-bottom:1px solid #FFF; text-align:center; background:#eee; } #login_form { width:20em; margin:4em auto; padding:0; } #login_form fieldset { background-color:transparent; border:0; } diff --git a/core/js/js.js b/core/js/js.js index 407c570870..db96a1adb3 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -103,3 +103,13 @@ if (!Array.prototype.indexOf){ function SVGSupport() { return document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") || document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Shape", "1.0"); } + +$(document).ready(function(){ + if(!SVGSupport()){//replace all svg images with png images for browser that dont support svg + $('img.svg').each(function(index,element){ + element=$(element); + var src=element.attr('src'); + element.attr('src',src.substr(0,src.length-3)+'png'); + }); + }; +}); diff --git a/core/templates/layout.admin.php b/core/templates/layout.admin.php index 78ccf87722..8077fd304f 100644 --- a/core/templates/layout.admin.php +++ b/core/templates/layout.admin.php @@ -30,8 +30,8 @@ diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 4077499a99..4440ae28b2 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,8 +31,8 @@ ownCloud diff --git a/core/templates/login.php b/core/templates/login.php index fb3177eb0e..c3095047f4 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,5 +1,9 @@
-
ownCloud
+
+
+ ownCloud +
+
diff --git a/files/js/filelist.js b/files/js/filelist.js index 260ca00b97..c3a2522fb6 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -114,10 +114,10 @@ FileList={ td.children('a.name').append(form) input.focus(); form.submit(function(event){ - var newname=input.val(); - tr.data('renaming',false); event.stopPropagation(); event.preventDefault(); + var newname=input.val(); + tr.data('renaming',false); tr.attr('data-file',newname); td.children('a.name').empty(); if(newname.indexOf('.')>0){ @@ -125,9 +125,11 @@ FileList={ }else{ basename=newname; } - td.children('a.name').text(basename); + var span=$(''); + span.text(basename); + td.children('a.name').append(span); if(newname.indexOf('.')>0){ - td.children('a.name').append($(''+newname.substr(newname.indexOf('.'))+'')); + span.append($(''+newname.substr(newname.indexOf('.'))+'')); } $.ajax({ url: 'ajax/rename.php', @@ -139,17 +141,7 @@ FileList={ event.preventDefault(); }); input.blur(function(){ - tr.data('renaming',false); - td.children('a.name').empty(); - if(name.indexOf('.')>0){ - basename=name.substr(0,name.indexOf('.')); - }else{ - basename=name; - } - td.children('a.name').text(basename); - if(name.indexOf('.')>0){ - td.children('a.name').append($(''+name.substr(name.indexOf('.'))+'')); - } + form.trigger('submit'); }); } } diff --git a/files/js/files.js b/files/js/files.js index 4e1de1b04a..be7e48aeee 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -5,6 +5,7 @@ $(document).ready(function() { $('#fileList tr td.filename').draggable(dragOptions); $('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions); $('div.crumb').droppable(crumbDropOptions); + $('#plugins>ul>li:first-child').data('dir',''); $('#plugins>ul>li:first-child').droppable(crumbDropOptions); // Sets the file-action buttons behaviour : diff --git a/files/templates/index.php b/files/templates/index.php index 9bc939ee90..df78cf0bb2 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -28,12 +28,12 @@ t( 'Name' ); ?> - Download + Download t( 'Size MB' ); ?> - t( 'Modified' ); ?>Delete + t( 'Modified' ); ?>Delete