UI problems solved. Bookmarks app updated.
This commit is contained in:
Marvin Thomas Rabe
parent
c5c843bfef
commit
b3f3b8c23f
|
|
@ -1,4 +1,7 @@
|
|||
#content { overflow: auto; }
|
||||
#content { overflow: auto; height: 100%; }
|
||||
#firstrun { width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em; color:#777;}
|
||||
#firstrun small { display: block; font-weight: normal; font-size: 0.5em; }
|
||||
#firstrun #selections { font-size:0.8em; width: 100%; margin: 2em auto auto auto; clear: both; }
|
||||
|
||||
.bookmarks_headline {
|
||||
font-size: large;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ function getBookmarks() {
|
|||
|
||||
for(var i in bookmarks.data) {
|
||||
updateBookmarksList(bookmarks.data[i]);
|
||||
$("#firstrun").hide();
|
||||
}
|
||||
|
||||
$('.bookmark_link').click(recordClick);
|
||||
|
|
@ -71,6 +72,8 @@ function addOrEditBookmark(event) {
|
|||
var tags = encodeEntities($('#bookmark_add_tags').val());
|
||||
var taglist = tags.split(' ');
|
||||
var tagshtml = '';
|
||||
$("#firstrun").hide();
|
||||
|
||||
for ( var i=0, len=taglist.length; i<len; ++i ){
|
||||
tagshtml += '<a class="bookmark_tag" href="?tag=' + encodeURI(taglist[i]) + '">' + taglist[i] + '</a> ';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,9 +21,11 @@
|
|||
<p><label class="bookmarks_label"></label><input type="submit" value="<?php echo $l->t('Add bookmark'); ?>" id="bookmark_add_submit" /></p>
|
||||
</div>
|
||||
<div class="bookmarks_list">
|
||||
</div>
|
||||
<div id="firstrun">
|
||||
<?php echo $l->t('You have no bookmarks'); ?>
|
||||
</div>
|
||||
<div id="footer">
|
||||
Bookmark pages more easily. Drag this bookmarklet to the Bookmarks bar of your browser:
|
||||
<a style='background-color:#dddddd;border:1px groove #999; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px' href='javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open("<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') ?>?output=popup&url="+c(b.location)+"&title="+c(b.title),"bkmk_popup","left="+((a.screenX||a.screenLeft)+10)+",top="+((a.screenY||a.screenTop)+10)+",height=510px,width=550px,resizable=1,alwaysRaised=1");a.setTimeout(function(){d.focus()},300)})();'>ownCloud bookmark</a>
|
||||
<small><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></small>
|
||||
<div id="selections">
|
||||
<a class="button" href='javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open("<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') ?>?output=popup&url="+c(b.location)+"&title="+c(b.title),"bkmk_popup","left="+((a.screenX||a.screenLeft)+10)+",top="+((a.screenY||a.screenTop)+10)+",height=510px,width=550px,resizable=1,alwaysRaised=1");a.setTimeout(function(){d.focus()},300)})();'><?php echo $l->t('Add page to ownCloud'); ?></a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
?>
|
||||
<form id="bookmarks">
|
||||
<fieldset class="personalblock">
|
||||
<span class="bold"><?php echo $l->t('Bookmarklet:');?></span> <a class="bookmarks_addBml" href="javascript:(function(){url=encodeURIComponent(location.href);window.open('<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php'); ?>?url='+url, 'owncloud-bookmarks') })()"><?php echo $l->t('Add page to ownCloud'); ?></a>
|
||||
<span class="bold"><?php echo $l->t('Bookmarklet:');?></span> <a class="bookmarks_addBml" href='javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open("<?php echo OC_Helper::linkToAbsolute('bookmarks', 'addBm.php') ?>?output=popup&url="+c(b.location)+"&title="+c(b.title),"bkmk_popup","left="+((a.screenX||a.screenLeft)+10)+",top="+((a.screenY||a.screenTop)+10)+",height=510px,width=550px,resizable=1,alwaysRaised=1");a.setTimeout(function(){d.focus()},300)})();'><?php echo $l->t('Add page to ownCloud'); ?></a>
|
||||
<br/><em><?php echo $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage.'); ?></em><br />
|
||||
</fieldset>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
#contacts_propertymenu li a:hover { color: #fff }
|
||||
#actionbar { height: 30px; width: 200px; position: fixed; right: 0px; top: 75px; margin: 0 0 0 0; padding: 0 0 0 0;}
|
||||
#card { /*max-width: 70em; border: thin solid lightgray; display: block;*/ }
|
||||
#firstrun { /*border: thin solid lightgray;*/ width: 80%; margin: 5em auto auto auto; text-align: center; font-weight:bold; font-size:1.5em; color:#777;}
|
||||
#firstrun #selections { /*border: thin solid lightgray;*/ font-size:0.8em; width: 100%; margin: 2em auto auto auto; clear: both; }
|
||||
#firstrun { width: 100%; position: absolute; top: 5em; left: 0; text-align: center; font-weight:bold; font-size:1.5em; color:#777; }
|
||||
#firstrun #selections { font-size:0.8em; margin: 2em auto auto auto; clear: both; }
|
||||
|
||||
#card input[type="text"].contacts_property,input[type="email"].contacts_property { width: 16em; }
|
||||
#card input[type="text"],input[type="email"],input[type="tel"],input[type="date"], select { background-color: #f8f8f8; border: 0 !important; -webkit-appearance:none !important; -moz-appearance:none !important; -webkit-box-sizing:none !important; -moz-box-sizing:none !important; box-sizing:none !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; float: left; }
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ String.prototype.strip_tags = function(){
|
|||
tags = this;
|
||||
stripped = tags.replace(/[\<\>]/gi, "");
|
||||
return stripped;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Contacts={
|
||||
|
|
@ -142,7 +142,7 @@ Contacts={
|
|||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
};
|
||||
},
|
||||
loadListHandlers:function() {
|
||||
//$('.add,.delete').hide();
|
||||
|
|
@ -323,7 +323,7 @@ Contacts={
|
|||
}
|
||||
});
|
||||
},
|
||||
delete:function() {
|
||||
delete: function() {
|
||||
$('#contacts_deletecard').tipsy('hide');
|
||||
$.getJSON('ajax/deletecard.php',{'id':this.id},function(jsondata){
|
||||
if(jsondata.status == 'success'){
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
div#gallery_list { margin: 70pt 20pt 0 20pt; }
|
||||
div#gallery_list { margin: 4.5em 2em 0 2em; }
|
||||
div#gallery_list.leftcontent { padding-top: 15pt; margin: 0; position: absolute; bottom:0px; text-align: center; overflow: auto; }
|
||||
div.gallery_album_box { width: 200px; position:relative; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 20px 5px 5px 5px; position: relative; -webkit-transition: color 0.5s ease-in-out; -o-transition: color 0.5s ease-in-out; -moz-transition: color 0.5s ease-in-out;color: #BBB;}
|
||||
div.gallery_album_box { width: 200px; position:relative; text-align: center; border: 0; display: inline-block; margin: 5pt; vertical-align: top; padding: 5px 5px 5px 5px; position: relative; -webkit-transition: color 0.5s ease-in-out; -o-transition: color 0.5s ease-in-out; -moz-transition: color 0.5s ease-in-out;color: #BBB;}
|
||||
div.gallery_album_box h1 { font-size: 9pt; font-family: Verdana; }
|
||||
div.gallery_album_decoration { width: 200px; position: absolute; border: 0; height: 20px; top: 20px; text-align:right; vertical-align:middle; background-color: #eee; opacity: 0; -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; border-bottom-right-radius: 7px; border-bottom-left-radius: 7px; -moz-border-radius-bottomright: 7px; -moz-border-radius-bottomleft:7px;}
|
||||
div.gallery_album_decoration { width: 200px; position: absolute; border: 0; height: 20px; top: 5px; text-align:right; vertical-align:middle; background-color: #eee; opacity: 0; -webkit-transition: opacity 0.5s ease-in-out; -moz-transition: opacity 0.5s ease-in-out; -o-transition: opacity 0.5s ease-in-out; border-bottom-right-radius: 7px; border-bottom-left-radius: 7px; -moz-border-radius-bottomright: 7px; -moz-border-radius-bottomleft:7px;}
|
||||
div.gallery_album_box:hover { color: black; }
|
||||
div.gallery_album_box:hover div.gallery_album_decoration { opacity: 0.7;}
|
||||
div.gallery_album_decoration a {padding: 0 4pt; cursor: pointer;}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
var initScanned = false;
|
||||
|
||||
Collection={
|
||||
artists:[],
|
||||
albums:[],
|
||||
|
|
@ -68,10 +70,10 @@ Collection={
|
|||
for(var i=0;i<Collection.loadedListeners.length;i++){
|
||||
Collection.loadedListeners[i]();
|
||||
}
|
||||
if(data.songs.length==0){
|
||||
if(data.songs.length==0 && initScanned == false){
|
||||
$('#scan input.start').click();
|
||||
initScanned = true;
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -81,13 +83,11 @@ Collection={
|
|||
Collection.parent.show();
|
||||
}
|
||||
if(!Collection.loaded){
|
||||
Collection.load(Collection.display)
|
||||
Collection.load(Collection.display);
|
||||
}else{
|
||||
if(Collection.parent){
|
||||
Collection.parent.find('tr:not(.template)').remove();
|
||||
var template=Collection.parent.find('tr.template');
|
||||
var lastArtist='';
|
||||
var lastAlbum='';
|
||||
$.each(Collection.artists,function(i,artist){
|
||||
if(artist.name && artist.songs.length>0){
|
||||
var tr=template.clone().removeClass('template');
|
||||
|
|
@ -108,7 +108,7 @@ Collection={
|
|||
$('tr[data-artist="'+artist.name+'"]').addClass('active');
|
||||
});
|
||||
if(artist.songs.length>1){
|
||||
var expander=$('<a class="expander">></a>');
|
||||
expander=$('<a class="expander">></a>');
|
||||
expander.data('expanded',false);
|
||||
expander.click(function(event){
|
||||
var tr=$(this).parent().parent();
|
||||
|
|
@ -136,10 +136,11 @@ Collection={
|
|||
var first=true;
|
||||
$.each(artist.albums,function(j,album){
|
||||
$.each(album.songs,function(i,song){
|
||||
var newRow;
|
||||
if(first){
|
||||
newRow=tr;
|
||||
}else{
|
||||
var newRow=tr.clone();
|
||||
newRow=tr.clone();
|
||||
newRow.find('td.artist').text('');
|
||||
newRow.find('.expander').remove();
|
||||
}
|
||||
|
|
@ -221,13 +222,14 @@ Collection={
|
|||
tr.find('td.album-expander a.expander').addClass('expanded');
|
||||
tr.find('td.album-expander a.expander').text('v');
|
||||
$.each(albumData.songs,function(i,song){
|
||||
var newRow;
|
||||
if(i>0){
|
||||
var newRow=tr.clone();
|
||||
newRow=tr.clone();
|
||||
newRow.find('a.expander').remove();
|
||||
newRow.find('td.album a').text('');
|
||||
newRow.find('td.artist a').text('');
|
||||
}else{
|
||||
var newRow=tr;
|
||||
newRow=tr;
|
||||
}
|
||||
newRow.find('td.title a').text(song.name);
|
||||
newRow.find('td.title a').click(function(event){
|
||||
|
|
@ -339,11 +341,11 @@ Collection={
|
|||
path:song.song_path,
|
||||
playCount:song.song_playcount,
|
||||
};
|
||||
album.songs.push(songData)
|
||||
album.songs.push(songData);
|
||||
artist.songs.push(songData);
|
||||
Collection.songs.push(songData);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
$(document).ready(function(){
|
||||
Collection.parent=$('#collection');
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
function musicTypeFromFile(file){
|
||||
var extention=file.substr(file.indexOf('.')+1);
|
||||
if(extention=='ogg'){
|
||||
return 'oga'
|
||||
return 'oga';
|
||||
}
|
||||
//TODO check for more specific cases
|
||||
return extention;
|
||||
|
|
@ -39,7 +39,7 @@ function loadPlayer(type,ready){
|
|||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
loadPlayer.done=false
|
||||
loadPlayer.done=false;
|
||||
|
||||
// FileActions.register('audio','Add to playlist','',addAudio);
|
||||
// FileActions.register('application/ogg','Add to playlist','',addAudio);
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ $(document).ready(function(){
|
|||
PlayList.render();
|
||||
});
|
||||
var button=$('<input type="button" title="'+t('media','Add album to playlist')+'" class="add"></input>');
|
||||
button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
|
||||
button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')');
|
||||
button.click(function(event){
|
||||
event.stopPropagation();
|
||||
PlayList.add(media);
|
||||
|
|
@ -24,7 +24,7 @@ $(document).ready(function(){
|
|||
});
|
||||
row.find('div.name').append(button);
|
||||
button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
|
||||
}
|
||||
};
|
||||
Collection.display();
|
||||
|
||||
Collection.load(function(){
|
||||
|
|
@ -34,11 +34,9 @@ $(document).ready(function(){
|
|||
PlayList.add(song);
|
||||
PlayList.play(0);
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
function getUrlVars(){
|
||||
var vars = {}, hash;
|
||||
var hashes = window.location.hash.substr(1).split('&');
|
||||
|
|
@ -52,7 +50,7 @@ function getUrlVars(){
|
|||
function musicTypeFromFile(file){
|
||||
var extention=file.split('.').pop();
|
||||
if(extention=='ogg'){
|
||||
return 'oga'
|
||||
return 'oga';
|
||||
}
|
||||
//TODO check for more specific cases
|
||||
return extention;
|
||||
|
|
|
|||
|
|
@ -26,19 +26,19 @@ PlayList.render=function(){
|
|||
li.click(function(event){
|
||||
PlayList.play($(this).data('index'));
|
||||
});
|
||||
li.append(img)
|
||||
li.append(img);
|
||||
li.data('index',i);
|
||||
li.addClass('song');
|
||||
PlayList.parent.append(li);
|
||||
}
|
||||
$(".jp-playlist-" + PlayList.current).addClass("collection_playing");
|
||||
}
|
||||
};
|
||||
PlayList.getSelected=function(){
|
||||
return $('tbody td.name input:checkbox:checked').parent().parent();
|
||||
}
|
||||
};
|
||||
PlayList.hide=function(){
|
||||
$('#playlist').hide();
|
||||
}
|
||||
};
|
||||
|
||||
$(document).ready(function(){
|
||||
PlayList.parent=$('#leftcontent');
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ Scanner={
|
|||
$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=find_music',function(songs){
|
||||
Scanner.songsFound=songs.length;
|
||||
if(ready){
|
||||
ready(songs)
|
||||
ready(songs);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
@ -24,13 +24,13 @@ Scanner={
|
|||
Scanner.songsScanned=data.count;
|
||||
$('#scan span.songCount').text(Scanner.songsScanned);
|
||||
var progress=(Scanner.songsScanned/Scanner.songsFound)*100;
|
||||
$('#scanprogressbar').progressbar('value',progress)
|
||||
$('#scanprogressbar').progressbar('value',progress);
|
||||
});
|
||||
Scanner.eventSource.listen('done',function(count){
|
||||
$('#scan input.start').show();
|
||||
$('#scan input.stop').hide();
|
||||
$('#scanprogressbar').hide();
|
||||
Collection.load(Collection.display)
|
||||
Collection.load(Collection.display);
|
||||
if(ready){
|
||||
ready();
|
||||
}
|
||||
|
|
@ -41,4 +41,4 @@ Scanner={
|
|||
Scanner.close();
|
||||
},
|
||||
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
See the COPYING-README file. */
|
||||
|
||||
html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
|
||||
html, body { height: 100%; }
|
||||
article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
|
||||
body { line-height:1.5; }
|
||||
table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
|
||||
|
|
@ -55,11 +56,11 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
|
|||
/* CONTENT ------------------------------------------------------------------ */
|
||||
#controls { padding: 0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
|
||||
#controls .button { display:inline-block; }
|
||||
#content { margin:3.5em 0 0 12.5em; }
|
||||
#content { top: 3.5em; left: 12.5em; position: absolute; }
|
||||
#leftcontent, .leftcontent { position:fixed; overflow: auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
|
||||
#leftcontent li, .leftcontent li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
|
||||
#leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
|
||||
#rightcontent, .rightcontent { position:absolute; top:6.4em; left:33em; }
|
||||
#rightcontent, .rightcontent { position:fixed; top: 6.4em; left: 32.5em; }
|
||||
|
||||
|
||||
/* LOG IN & INSTALLATION ------------------------------------------------------------ */
|
||||
|
|
@ -113,8 +114,8 @@ table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transit
|
|||
tbody tr:hover, tr:active { background-color:#f8f8f8; }
|
||||
|
||||
#body-settings .personalblock, #body-settings .helpblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
|
||||
#body-settings .personalblock#quota { position:relative; margin-top:4.5em; padding:0; }
|
||||
#body-settings #controls+.helpblock { position:relative; margin-top:7.3em; }
|
||||
#body-settings .personalblock#quota { position:relative; padding:0; }
|
||||
#body-settings #controls+.helpblock { position:relative; margin-top: 3em; }
|
||||
.personalblock > legend { margin-top:2em; }
|
||||
|
||||
#quota div, div.jp-play-bar, div.jp-seek-bar { padding:0; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function t(app,text){
|
|||
success:function(jsondata){
|
||||
t.cache[app] = jsondata.data;
|
||||
},
|
||||
})
|
||||
});
|
||||
|
||||
// Bad answer ...
|
||||
if( !( app in t.cache )){
|
||||
|
|
@ -58,7 +58,7 @@ OC={
|
|||
}
|
||||
link+=app;
|
||||
if(type){
|
||||
link+=type+'/'
|
||||
link+=type+'/';
|
||||
}
|
||||
link+=file;
|
||||
return link;
|
||||
|
|
@ -73,7 +73,7 @@ OC={
|
|||
*/
|
||||
imagePath:function(app,file){
|
||||
if(file.indexOf('.')==-1){//if no extention is given, use png or svg depending on browser support
|
||||
file+=(SVGSupport())?'.svg':'.png'
|
||||
file+=(SVGSupport())?'.svg':'.png';
|
||||
}
|
||||
return OC.filePath(app,'img',file);
|
||||
},
|
||||
|
|
@ -126,7 +126,7 @@ OC={
|
|||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
OC.search.customResults={};
|
||||
OC.search.currentResult=-1;
|
||||
OC.search.lastQuery='';
|
||||
|
|
@ -147,7 +147,7 @@ if(typeof localStorage !='undefined'){
|
|||
getItem:function(name){
|
||||
return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
|
||||
}
|
||||
}
|
||||
};
|
||||
}else{
|
||||
//dummy localstorage
|
||||
OC.localStorage={
|
||||
|
|
@ -160,7 +160,7 @@ if(typeof localStorage !='undefined'){
|
|||
getItem:function(name){
|
||||
return null;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -182,7 +182,7 @@ if (!Array.prototype.filter) {
|
|||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
};
|
||||
}
|
||||
/**
|
||||
* implement Array.indexOf for browsers without native support
|
||||
|
|
@ -235,11 +235,11 @@ SVGSupport.checkMimeType=function(){
|
|||
});
|
||||
if(headers["Content-Type"]!='image/svg+xml'){
|
||||
replaceSVG();
|
||||
SVGSupport.checkMimeType.correct=false
|
||||
SVGSupport.checkMimeType.correct=false;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
SVGSupport.checkMimeType.correct=true;
|
||||
|
||||
//replace all svg images with png for browser compatibility
|
||||
|
|
@ -305,11 +305,12 @@ $(document).ready(function(){
|
|||
|
||||
$(window).resize(function () {
|
||||
fillHeight($('#leftcontent'));
|
||||
fillWindow($('#content'));
|
||||
fillWindow($('#rightcontent'));
|
||||
});
|
||||
$(window).trigger('resize');
|
||||
|
||||
if(!SVGSupport()){//replace all svg images with png images for browser that dont support svg
|
||||
if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
|
||||
replaceSVG();
|
||||
}else{
|
||||
SVGSupport.checkMimeType();
|
||||
|
|
@ -379,7 +380,6 @@ $(document).ready(function(){
|
|||
}
|
||||
});
|
||||
|
||||
if($('body').attr("id")=="body-user") { $('#settings #expanddiv').hide(); }
|
||||
$('#settings #expand').click(function(event) {
|
||||
$('#settings #expanddiv').slideToggle();
|
||||
event.stopPropagation();
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@
|
|||
|
||||
<ul id="settings" class="svg">
|
||||
<img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
|
||||
<span style="display:none"><?php echo $l->t('Settings');?></span>
|
||||
<div id="expanddiv">
|
||||
<span style="display:none;"><?php echo $l->t('Settings');?></span>
|
||||
<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
|
||||
<?php foreach($_['settingsnavigation'] as $entry):?>
|
||||
<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
|
||||
<?php endforeach; ?>
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@ tr:hover>td.password>span { margin:0; cursor:pointer; }
|
|||
tr:hover>td.remove>img, tr:hover>td.password>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
|
||||
tr:hover>td.remove>img { float:right; }
|
||||
li.selected { background-color:#ddd; }
|
||||
#content>table:not(.nostyle) { margin-top:6.5em; }
|
||||
#content>table:not(.nostyle) { margin-top:3em; }
|
||||
table:not(.nostyle) { width:100%; }
|
||||
|
||||
#rightcontent { padding-left: 1em; }
|
||||
|
||||
/* APPS */
|
||||
li { color:#888; }
|
||||
|
|
|
|||
Loading…
Reference in New Issue