Skip to content

Commit

Permalink
Updated jquery and jquery-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
jjdejong committed Dec 5, 2017
1 parent 0868941 commit 745b8d1
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 28,306 deletions.
6 changes: 3 additions & 3 deletions application/layouts/scripts/layout.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<?= $this->headMeta() ?>

<?= $this->headLink()->appendStylesheet($this->baseUrl('/css/layout-screen-new.css'), 'screen')
->headLink()->prependStylesheet($this->baseUrl('/js/jquery-ui.css'), 'screen') ?>
->headLink()->prependStylesheet($this->baseUrl('/js/jquery-ui.min.css'), 'screen') ?>

<?php
$this->headScript()->appendFile(
'/js/jquery-2.1.4.js',
'/js/jquery-3.2.1.min.js',
'text/javascript'
);

$this->headScript()->appendFile(
'/js/jquery-ui.js',
'/js/jquery-ui.min.js',
'text/javascript'
);

Expand Down
5 changes: 2 additions & 3 deletions application/views/scripts/index/index.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -230,14 +230,13 @@ $(document).ready(function(){
$('#ren-tasks-list').load('/index/task-filter', { task_type : 'ren', filter: tasks_flag });
});
$( "button, input:button").button();
$("#radio-tasks").buttonset();
$("#radio-renewals").buttonset();
$( "input[type='radio']" ).checkboxradio({icon: false});

var restricted = <?=$this->restricted?>;
if (restricted) {
$('.col-actions').show().hide();
$('.clear-tasks-box').show().hide();
$('.ui-buttonset').show().hide();
$('.ui-checkboxradio').show().hide();
$('.editable').show().hide();
}
});
Expand Down
5 changes: 2 additions & 3 deletions application/views/scripts/matter/index.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,8 @@ $(document).ready(function(){
});

$( "button, input:submit, input:button").button();
$( "#container-all" ).buttonset();
$( "#actor-status" ).buttonset();
$( "#mine-all" ).buttonset();
$( "input[type='radio']" ).checkboxradio({icon: false});
$( "input[type='checkbox']" ).checkboxradio({icon: false});

});

Expand Down
2 changes: 1 addition & 1 deletion application/views/scripts/matter/national.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $(document).ready(function(){
source: "/matter/get-country-codes",
autoFocus: true,
select: function( event, ui ) {
var mindex = $('#national-phases > div').size();
var mindex = $('#national-phases > div').length;
var new_country = '<div id="nmp-' + mindex + '">'
+ '<input type="hidden" name="matter_country[' + mindex + ']" value=' + ui.item.id + ' />'
+ '<span class="national-countries">' + ui.item.value + '</span>'
Expand Down
2 changes: 1 addition & 1 deletion application/views/scripts/matter/role-actors.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ $(document).ready(function(){

$('button, input:button').button();
$('#check').button();
$('#flag').buttonset();
$( "input[type='checkbox']" ).checkboxradio({icon: false});
});
</script>

Expand Down
Loading

0 comments on commit 745b8d1

Please sign in to comment.