scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Résolution conflict bootstrap jquery-ui

Browse Source
This commit is contained in:
Michael RICOIS 2016-06-09 15:59:46 +02:00
parent 7e1ccc1bf9
commit 15157dc9e7
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/modules/auth/views/default/scripts/user/login.phtml
View File

@ -23,7 +23,7 @@
<input name="pass" value="" type="password" class="form-control" placeholder="Mot de passe" required/>
<script>document.write('<input name="screenSize" type="hidden" value="'+ screen.width +'x'+screen.height + '">');</script>
<button class="btn btn-lg btn-primary btn-block clearfix"" type="submit">Connexion</button>
<button class="btn btn-lg btn-primary btn-block clearfix" type="submit">Connexion</button>
</form>
@ -52,6 +52,8 @@
$('<div id="dlg"></div>').dialog(dlgOpts);
return false;
});
var bootstrapButton = $.fn.button.noConflict();
$.fn.bootstrapBtn = bootstrapButton;
</script>
</div>

11
library/Application/Controller/Plugin/Theme.php
View File

@ -80,7 +80,7 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
/**
* ===> Standard Styles
*/
$view->headLink()
$view->headLink()
->appendStylesheet('/libs/bootstrap-3.3.6/css/bootstrap.min.css', 'all')
->appendStylesheet('/libs/ui-1.11.4/themes/smoothness/jquery-ui.min.css', 'all')
->appendStylesheet('/libs/qtip/jquery.qtip.min.css', 'all')
@ -97,10 +97,11 @@ class Application_Controller_Plugin_Theme extends Zend_Controller_Plugin_Abstrac
$view->headScript()
->appendFile('/libs/html5shiv.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
->appendFile('/libs/respond.min.js', 'text/javascript', array('conditional' => 'lt IE 9'))
->appendFile('/libs/jquery/jquery-1.12.3.min.js', 'text/javascript')
->appendFile('/libs/bootstrap-3.3.6/js/bootstrap.min.js', 'text/javascript')
->appendFile('/libs/ui-1.11.4/jquery-ui.min.js', 'text/javascript')
->appendFile('/libs/ui-1.11.4/i18n/datepicker-fr.js', 'text/javascript');
->appendFile('/libs/jquery/jquery-1.12.3.min.js', 'text/javascript')
->appendFile('/libs/ui-1.11.4/jquery-ui.min.js', 'text/javascript')
->appendFile('/libs/ui-1.11.4/i18n/datepicker-fr.js', 'text/javascript')
->appendFile('/themes/default/scripts/bridge.js', 'text/javascript')
->appendFile('/libs/bootstrap-3.3.6/js/bootstrap.min.js', 'text/javascript');
if ( $UserLogin ) {
$view->headScript()

2
public/themes/default/scripts/bridge.js Normal file
View File

@ -0,0 +1,2 @@
$.widget.bridge('uitooltip', $.ui.tooltip);
$.widget.bridge('uibutton', $.ui.button);

4
public/themes/default/scripts/recherche.js
View File

@ -19,7 +19,7 @@ $(document).ready(function(){
}
//Goidentite
$('#goidentite').click(function(){ goidentite(); });
$('#goidentite').on('click', function(){ goidentite(); });
$(document).keydown(function(e) {
if(e.keyCode == 13 && e.ctrlKey) {
goidentite();
@ -163,7 +163,7 @@ function goidentite()
verif = EstSiretValide(siret);
}
if (verif) {
window.location.href = '/identite/fiche/siret/' + siret;
window.location.href = '/legal/identite/fiche/siret/' + siret;
} else {
$('form[name=recherche] input[name=submit]').click();
}

12
public/themes/default/scripts/script.js
View File

@ -11,9 +11,8 @@ $(function() {
});
$('#side-menu').metisMenu();
var url = window.location;
var element = $('ul.nav a').filter(function() {
return this.href == url || url.href.indexOf(this.href) == 0;
var element = $('ul#side-menu.nav a').filter(function() {
return this.href == window.location || window.location.href.indexOf(this.href) == 0;
}).addClass('active').parent().parent().addClass('in').parent();
if (element.is('li')) {
element.addClass('active');
@ -26,8 +25,6 @@ $(function() {
});
});
/*$('input.button, button, span.ui-button').button();*/
$('.demanderef').on('click', function(){
var title = '';
var hrefSuiv = $(this).attr('href');
@ -124,4 +121,7 @@ $(function() {
});
}
});
});
var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value
$.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the Bootstrap functionality