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

Controle du fonctionnement des scripts

Browse Source 
Mise à jour JQuery en version 1.12.4
This commit is contained in:
Michael RICOIS 2016-06-13 14:33:50 +02:00
parent fe70284b6e
commit 3694bd6515
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/modules/user/views/default/scripts/identity/index.phtml
View File

@ -36,12 +36,14 @@
<?php if (in_array($this->UserProfil, array('Administrateur', 'SuperAdministrateur'))) {?>
<?php if ($this->UserModeEdit == 1) {?>
<button id="editsession" data-toggle="button" data-loading-text="Enregistrement..." data-url="<?=$this->url(array('module'=>'user',
'controller'=>'identity', 'action'=>'editsession', 'mode'=>0), 'default', true)?>" type="button"
<button type="button" id="editsession" data-toggle="button" data-loading-text="Enregistrement..."
data-url="<?=$this->url(array('module'=>'user', 'controller'=>'identity', 'action'=>'editsession',
'mode'=>0), 'default', true)?>" type="button"
class="btn btn-primary" autocomplete="off">Désactiver Mode Edition (session)</button>
<?php } else {?>
<button id="editsession" data-toggle="button" data-loading-text="Enregistrement..." data-url="<?=$this->url(array('module'=>'user',
'controller'=>'identity', 'action'=>'editsession', 'mode'=>1), 'default', true)?>" type="button"
<button type="button" id="editsession" data-toggle="button" data-loading-text="Enregistrement..."
data-url="<?=$this->url(array('module'=>'user', 'controller'=>'identity', 'action'=>'editsession',
'mode'=>1), 'default', true)?>" type="button"
class="btn btn-primary" autocomplete="off">Activer Mode Edition (session)</button>
<?php }?>
<span id="editsession-result"></span>

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

@ -97,11 +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/jquery/jquery-1.12.4.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');
->appendFile('/libs/bootstrap-3.3.6/js/bootstrap.min.js', 'text/javascript');
if ( $UserLogin ) {
$view->headScript()

10
public/libs/jquery/jquery-1.12.3.min.js → public/libs/jquery/jquery-1.12.4.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,5 @@
$(function() {
$(window).bind("load resize", function() {
var topOffset = 50;
var bottomOffset = 50;
@ -123,5 +124,5 @@ $(function() {
});
var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value
$.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the Bootstrap functionality
//var bootstrapButton = $.fn.button.noConflict();
//$.fn.bootstrapBtn = bootstrapButton;