popup from bootstrap and not jquery-ui

This commit is contained in:
Martin Müller 2014-06-16 10:00:05 +02:00
parent c9fdf6d326
commit d12462c0f9
3 changed files with 6 additions and 12 deletions

View File

@ -27,7 +27,7 @@ if($isLoggedin){
</style> </style>
<ul class="list-unstyled"> <ul class="list-unstyled">
<li<?php if(isset($MENU_PROFIL)){?> class="active"<?php } ?>><?=$this->Html->link($this->Html->image('bar-profil.png'),array('controller'=>'user','action'=>'profil'),array('title'=>__('dreamjob.my.profil'),'escape'=>false)); ?></li> <li<?php if(isset($MENU_PROFIL)){?> class="active"<?php } ?>><?=$this->Html->link($this->Html->image('bar-profil.png'),array('controller'=>'user','action'=>'profil'),array('title'=>__('dreamjob.my.profil'), "data-placement"=>"auto right", "data-toggle"=>"tooltip",'escape'=>false)); ?></li>
<?php if(!empty($COMPANY)){ ?> <?php if(!empty($COMPANY)){ ?>
<li<?php if(isset($MENU_OPENING)){?> class="active"<?php } ?>><?=$this->Html->link($this->Html->image('bar-job.png'),array('controller'=>'job','action'=>'openingList'),array('title'=>__('dreamjob.my.opening'),'escape'=>false)); ?></li> <li<?php if(isset($MENU_OPENING)){?> class="active"<?php } ?>><?=$this->Html->link($this->Html->image('bar-job.png'),array('controller'=>'job','action'=>'openingList'),array('title'=>__('dreamjob.my.opening'),'escape'=>false)); ?></li>
<?php }elseif(!empty($WORKER)){ ?> <?php }elseif(!empty($WORKER)){ ?>

View File

@ -21,16 +21,6 @@ a:hover{
textarea { textarea {
resize: none; resize: none;
} }
.ui-tooltip {
background-color:#FCF8E3;
width:auto;
display:inline-block;
color:black;
border-radius: 2px;
padding:2px;
position: absolute;
z-index: 9999;
}
/* /*
* Default * Default
*/ */

View File

@ -48,7 +48,11 @@ var global_load = null;
$(this).select2({allowClear: true}); $(this).select2({allowClear: true});
}); });
$(where + ' .dropdown-toggle').dropdown(); $(where + ' .dropdown-toggle').dropdown();
$(where + " a").tooltip({'placement':"right"}); $(where + " a").tooltip({'placement':function(e){
if($(e).parents("#barleft"))
return 'right';
return 'auto bottom';
}});
$(where + " a").not('[href*="mailto:"]').each(function(that) { $(where + " a").not('[href*="mailto:"]').each(function(that) {
if ($(this).attr("rel") !== "external" && $(this).attr("ref") !== "eventOff" && !$(this).parents('ul').hasClass("wysihtml5-toolbar") && !$(this).hasClass(".select2-choice")) if ($(this).attr("rel") !== "external" && $(this).attr("ref") !== "eventOff" && !$(this).parents('ul').hasClass("wysihtml5-toolbar") && !$(this).hasClass(".select2-choice"))