Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder

Browse source
This commit is contained in:
Albert Santoni 2015-08-14 20:00:17 -04:00
commit 31982a7238
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
airtime_mvc/public/css/images/airtime_logo_med.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

10
airtime_mvc/public/css/styles.css
View file

@ -71,11 +71,11 @@ fieldset {
position: absolute; position: absolute;
float: left; float: left;
background: transparent url(images/airtime_logo.png) no-repeat 0 0; background: transparent url(images/airtime_logo_med.png) no-repeat 0 0;
height: 35px; height: 46px;
width: 66px; width: 120px;
left: 35px; left: 5px;
top: 32px; top: 26px;
/*margin: 25px 5px 0 10px;*/ /*margin: 25px 5px 0 10px;*/
/*margin-top: -5px;*/ /*margin-top: -5px;*/
} }

7
airtime_mvc/public/js/airtime/library/_library.js
View file

@ -1297,11 +1297,18 @@ $(document).ready(function() {
} }
$("a[href$='"+location.hash+"']").parent().addClass("selected"); $("a[href$='"+location.hash+"']").parent().addClass("selected");
// Slightly hacky way of triggering the click event when it's outside of the anchor text
$(".media_type_selector").on("click", function() {
// Need get(0) here so we don't create a stack overflow by recurring the click on the parent
$(this).find("a").get(0).click();
});
$(window).on('hashchange', function() { $(window).on('hashchange', function() {
// If we click Dashboard from one of the media views, do nothing // If we click Dashboard from one of the media views, do nothing
if (!location.hash) { if (!location.hash) {
return; return;
} }
AIRTIME.library.selectNone();
$(".media_type_selector").each(function () { $(".media_type_selector").each(function () {
$(this).removeClass("selected"); $(this).removeClass("selected");
}); });