mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
ENHANCEMENT Using a simple target=_blank for opening the logo link in CMS instead of javascript
ENHANCEMENT Moved the "edit profile" popup link to concrete git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92605 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
afc285cb12
commit
2ccc3669eb
@ -77,7 +77,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Suppress submission unless it is handled through save()
|
* Suppress submission unless it is handled through ajaxSubmit()
|
||||||
*/
|
*/
|
||||||
onsubmit: function(e) {
|
onsubmit: function(e) {
|
||||||
return false;
|
return false;
|
||||||
@ -218,6 +218,17 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Link for editing the profile for a logged-in member
|
||||||
|
* through a popup. Required "greybox" javascript library.
|
||||||
|
*/
|
||||||
|
$('#EditMemberProfile').concrete({
|
||||||
|
onclick: function(e) {
|
||||||
|
GB_show('Edit Profile', this.attr('href'), 290, 500);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
})(jQuery);
|
})(jQuery);
|
||||||
|
|
||||||
jQuery(document).ready(function() {
|
jQuery(document).ready(function() {
|
||||||
@ -250,29 +261,7 @@ Behaviour.register({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
'#Menu-help' : {
|
|
||||||
onclick : function() {
|
|
||||||
var w = window.open(this.getElementsByTagName('a')[0].href, 'help');
|
|
||||||
w.focus();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
'#Logo' : {
|
|
||||||
onclick : function() {
|
|
||||||
var w = window.open(this.getElementsByTagName('a')[0].href);
|
|
||||||
w.focus();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
'#EditMemberProfile': {
|
|
||||||
onclick: function(e) {
|
|
||||||
var el = Event.element(e);
|
|
||||||
GB_show('Edit Profile', el.attributes.href.value, 290, 500);
|
|
||||||
Event.stop(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<div id="Logo" style="$LogoStyle">
|
<div id="Logo" style="$LogoStyle">
|
||||||
<% if ApplicationLogoText %>
|
<% if ApplicationLogoText %>
|
||||||
<a href="$ApplicationLink">$ApplicationLogoText</a><br />
|
<a href="$ApplicationLink" target="_blank">$ApplicationLogoText</a><br />
|
||||||
<% end_if %>
|
<% end_if %>
|
||||||
</div>
|
</div>
|
||||||
<ul id="MainMenu">
|
<ul id="MainMenu">
|
||||||
|
Loading…
Reference in New Issue
Block a user