WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #56 from LDAPAccountManager/jquery-update 

Jquery update
This commit is contained in:
gruberroland 2018-11-02 19:51:34 +01:00 committed by GitHub
parent b197b6297b 94c122e44f
commit b42c694a8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 17124 additions and 14490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lam-packaging/debian/copyright
View File

@ -206,13 +206,17 @@ main license and authors:
lib/3rdParty/tcpdf/fonts/DejaVu*.ttf A Public Domain, Bitstream, Inc., Tavmjong Bah
lib/3rdParty/tcpdf/fonts/DejaVu*.z A Public Domain, Bitstream, Inc., Tavmjong Bah
lib/3rdParty/phpseclib B Jim Wigginton
templates/lib/*jquery*.js B 2010 John Resig, Paul Bakaus, Fred Heusschen
templates/lib/*jquery*.js B 2018 jQuery Foundation and other contributors
style/120_jquery-ui*.css B 2016 jQuery Foundation and other contributors
templates/lib/*jquery-dropmenu-*.js B 2010 Fred Heusschen
templates/lib/*jquery-validationEngine-*.js B 2010 Cedric Dugas and Olivier Refalo
style/150_jquery-dropmenu*.css B 2010 Fred Heusschen
templates/lib/*jquery-fineuploader-*.js B 2010 Andrew Valums
style/150_jquery-fineuploader*.css B 2010 Andrew Valums
templates/lib/*jquery-validationEngine-*.js B 2010 Cedric Dugas and Olivier Refalo
style/150_jquery-validationEngine*.css B 2010 Cedric Dugas and Olivier Refalo
templates/lib/extra/cropperjs B 2018 Chen Fengyuan
style/600_cropper*.css B 2018 Chen Fengyuan
templates/lib/600_jquery.magnific-popup.js B 2016 Dmitry Semenov
style/600_cropper.css B 2018 Chen Fengyuan
style/610_magnific-popup.css B 2016 Dmitry Semenov
style/responsive/105_normalize.css B Nicolas Gallagher and Jonathan Neal
style/responsive/110_grid.css B

10
lam/copyright
View File

@ -205,13 +205,17 @@ main license and authors:
lib/3rdParty/tcpdf/fonts/DejaVu*.ttf A Public Domain, Bitstream, Inc., Tavmjong Bah
lib/3rdParty/tcpdf/fonts/DejaVu*.z A Public Domain, Bitstream, Inc., Tavmjong Bah
lib/3rdParty/phpseclib B Jim Wigginton
templates/lib/*jquery*.js B 2010 John Resig, Paul Bakaus, Fred Heusschen
templates/lib/*jquery*.js B 2018 jQuery Foundation and other contributors
style/120_jquery-ui*.css B 2016 jQuery Foundation and other contributors
templates/lib/*jquery-dropmenu-*.js B 2010 Fred Heusschen
templates/lib/*jquery-validationEngine-*.js B 2010 Cedric Dugas and Olivier Refalo
style/150_jquery-dropmenu*.css B 2010 Fred Heusschen
templates/lib/*jquery-fineuploader-*.js B 2010 Andrew Valums
style/150_jquery-fineuploader*.css B 2010 Andrew Valums
templates/lib/*jquery-validationEngine-*.js B 2010 Cedric Dugas and Olivier Refalo
style/150_jquery-validationEngine*.css B 2010 Cedric Dugas and Olivier Refalo
templates/lib/extra/cropperjs B 2018 Chen Fengyuan
style/600_cropper*.css B 2018 Chen Fengyuan
templates/lib/600_jquery.magnific-popup.js B 2016 Dmitry Semenov
style/600_cropper.css B 2018 Chen Fengyuan
style/610_magnific-popup.css B 2016 Dmitry Semenov
style/responsive/105_normalize.css B Nicolas Gallagher and Jonathan Neal
style/responsive/110_grid.css B

8
lam/lib/adminHeader.inc
View File

@ -178,8 +178,8 @@ jQuery(document).ready(function() {
</script>
<br>
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<div class="ui-tabs ui-corner-all ui-widget ui-widget-content">
<ul class="ui-tabs-nav ui-corner-all ui-helper-reset ui-helper-clearfix ui-widget-header">
<?php
printTypeTabs($headerPrefix);
?>
@ -194,11 +194,11 @@ function printTypeTabs($headerPrefix) {
if ($type->isHidden()) {
continue;
}
$link = '<a href="' . $headerPrefix . '/templates/lists/list.php?type=' . $type->getId() .
$link = '<a class="ui-tabs-anchor" href="' . $headerPrefix . '/templates/lists/list.php?type=' . $type->getId() .
'" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">' .
'<img height="16" width="16" alt="' . $type->getId() . '" src="' . $headerPrefix . '/graphics/' . $type->getIcon() . '">&nbsp;' .
$type->getAlias() . '</a>';
echo '<li id="tab_' . $type->getId() . '" class="ui-state-default ui-corner-top">';
echo '<li id="tab_' . $type->getId() . '" class="ui-tabs-tab ui-corner-top ui-state-default ui-tab">';
echo $link;
echo "</li>\n";
}

12
lam/lib/configPages.inc
View File

@ -2,7 +2,7 @@
namespace LAM\CONFIG;
/*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2017 Roland Gruber
Copyright (C) 2017 - 2018 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -120,27 +120,27 @@ function printConfigurationPageTabs($active) {
// tabs
?>
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
<div class="ui-tabs ui-corner-all ui-widget ui-widget-content user-bright">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<ul class="ui-tabs-nav ui-corner-all ui-helper-reset ui-helper-clearfix ui-widget-header">
<?php
foreach ($tabs as $tab => $settings) {
$isActive = ($tab === $active);
$liClasses = 'ui-state-default ui-corner-top';
$liClasses = 'ui-tabs-tab ui-corner-top ui-state-default ui-tab';
$hover = ' onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');"';
if ($isActive) {
$liClasses .= ' lam-active-tab';
$hover = '';
}
echo '<li id="' . $settings['id'] . '" class="' . $liClasses . '"' . $hover . '>';
echo '<a href="#" onclick="document.getElementsByName(\'' . $settings['id'] . '\')[0].click();"><img src="../../graphics/' . $settings['icon'] . '" alt=""> ';
echo '<a class="ui-tabs-anchor" href="#" onclick="document.getElementsByName(\'' . $settings['id'] . '\')[0].click();"><img src="../../graphics/' . $settings['icon'] . '" alt=""> ';
echo '<span class="hide-on-mobile">' . $settings['label'] . '</span>';
echo '</a>';
echo '</li>';
}
?>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom user-bright">
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom">
<?php
}

1
lam/lib/modules/inetOrgPerson.inc
View File

@ -2986,7 +2986,6 @@ class inetOrgPerson extends baseModule implements passwordService {
$photoFile = '../../tmp/' . $jpeg_filename;
$img = new htmlImage($photoFile);
$img->setCSSClasses(array('photo'));
$img->enableLightbox();
if ($crop) {
$img->enableCropping();
}

841
lam/style/120_jquery-ui-1.10.1.custom.css → lam/style/120_jquery-ui-1.12.1.css
View File

File diff suppressed because it is too large Load Diff

9
lam/style/500_layout.css
View File

@ -531,6 +531,10 @@ tr.account {
/* --- workaround for vertical tabs --- */
#lamVerticalTabs {
background: none;
}
#lamVerticalTabs .ui-tabs-nav li {
margin: 0 -1px .2em 0;
clear: left;
@ -545,6 +549,7 @@ tr.account {
border-right-width: 1px;
padding-bottom: 0;
padding-right: .1em;
border: 1px solid #c5c5c5
}
#lamVerticalTabs .ui-tabs-nav {
@ -570,10 +575,6 @@ tr.account {
/* --- end of workaround for vertical tabs --- */
.tabs-hover {
background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x !important;
}
/* title bar */
.titleBar {
background: #AAAAAA url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) repeat-x scroll 50% 50%;

19
lam/style/600_cropper.css → lam/style/600_cropper-1.4.3.css
View File

@ -1,11 +1,11 @@
/*!
* Cropper.js v1.3.5
* https://github.com/fengyuanchen/cropperjs
* Cropper.js v1.4.3
* https://fengyuanchen.github.io/cropperjs
*
* Copyright (c) 2015-2018 Chen Fengyuan
* Copyright 2015-present Chen Fengyuan
* Released under the MIT license
*
* Date: 2018-04-15T06:19:56.029Z
* Date: 2018-10-24T13:07:11.429Z
*/
.cropper-container {
@ -21,8 +21,7 @@
user-select: none;
}
.cropper-container img {/*Avoid margin top issue (Occur only when margin-top <= -height)
*/
.cropper-container img {
display: block;
height: 100%;
image-orientation: 0deg;
@ -79,9 +78,9 @@
.cropper-dashed.dashed-h {
border-bottom-width: 1px;
border-top-width: 1px;
height: 33.33333%;
height: calc(100% / 3);
left: 0;
top: 33.33333%;
top: calc(100% / 3);
width: 100%;
}
@ -89,9 +88,9 @@
border-left-width: 1px;
border-right-width: 1px;
height: 100%;
left: 33.33333%;
left: calc(100% / 3);
top: 0;
width: 33.33333%;
width: calc(100% / 3);
}
.cropper-center {

BIN
lam/style/images/ui-icons_444444_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
lam/style/images/ui-icons_555555_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
lam/style/images/ui-icons_777620_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
lam/style/images/ui-icons_777777_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
lam/style/images/ui-icons_cc0000_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
lam/style/images/ui-icons_ffffff_256x240.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.2 KiB

4
lam/templates/3rdParty/pla/htdocs/css/default/style.css vendored
View File

@ -6,7 +6,6 @@ table.page {
color: #000000;
font-family: "bitstream vera sans","luxi sans",verdana,geneva,arial,helvetica,sans-serif;
background-color: #F5F5F5;
font-size: 13px;
empty-cells: hide;
}
@ -113,7 +112,6 @@ table.page table.control td.logo img.logo {
table.page td.tree {
border-right: 1px solid #AAAACC;
vertical-align: top;
background-color: #F5F5F5;
width: 10%;
}
@ -121,7 +119,6 @@ table.page td.tree {
table.page td.body {
vertical-align: top;
width: 100%;
background-color: #F5F5F5;
}
/* Global Page - Main Body System Message */
@ -148,7 +145,6 @@ table.page table.sysmsg td.icon {
/* Global Page - Main Body */
table.page table.body {
font-weight: normal;
background-color: #F5F5F5;
width: 100%;
}

7108
lam/templates/lib/100_jquery-2.1.4.js → lam/templates/lib/100_jquery-3.3.1.js
View File

File diff suppressed because it is too large Load Diff

15791
lam/templates/lib/110_jquery-ui-1.11.4.js → lam/templates/lib/100_jquery-ui-1.12.1.js
View File

File diff suppressed because it is too large Load Diff

2
lam/templates/lib/500_lam.js
View File

@ -860,7 +860,7 @@ window.lam.tools.addSavedSelectListener = function() {
* Activates tabs.
*/
window.lam.tools.activateTab = function() {
jQuery('.lam-active-tab').addClass('ui-tabs-active ui-state-active user-bright');
jQuery('.lam-active-tab').addClass('ui-tabs-active ui-state-active');
};
/**

7778
lam/templates/lib/extra/cropperjs/cropper.js
View File

File diff suppressed because it is too large Load Diff

11
lam/templates/main_header.php
View File

@ -1,10 +1,9 @@
<?php
namespace LAM\HEADER;
/*
$Id$
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2017 Roland Gruber
Copyright (C) 2003 - 2018 Roland Gruber
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -197,8 +196,8 @@ jQuery(document).ready(function() {
</script>
<br>
<div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<div class="ui-tabs ui-corner-all ui-widget ui-widget-content">
<ul class="ui-tabs-nav ui-corner-all ui-helper-reset ui-helper-clearfix ui-widget-header">
<?php
printTypeTabs($headerPrefix);
?>
@ -213,11 +212,11 @@ function printTypeTabs($headerPrefix) {
if ($type->isHidden()) {
continue;
}
$link = '<a href="' . $headerPrefix . 'lists/list.php?type=' . $type->getId() .
$link = '<a class="ui-tabs-anchor" href="' . $headerPrefix . 'lists/list.php?type=' . $type->getId() .
'" onmouseover="jQuery(this).addClass(\'tabs-hover\');" onmouseout="jQuery(this).removeClass(\'tabs-hover\');">' .
'<img height="16" width="16" alt="' . $type->getId() . '" src="' . $headerPrefix . '../graphics/' . $type->getIcon() . '">&nbsp;' .
$type->getAlias() . '</a>';
echo '<li id="tab_' . $type->getId() . '" class="ui-state-default ui-corner-top">';
echo '<li id="tab_' . $type->getId() . '" class="ui-tabs-tab ui-corner-top ui-state-default ui-tab">';
echo $link;
echo "</li>\n";
}

3
lam/templates/pdfedit/pdfmain.php
View File

@ -248,6 +248,7 @@ include '../../lib/adminHeader.inc';
$deleteLink->setOnClick("profileShowDeleteDialog('" . _('Delete') . "', '" . _('Ok') . "', '" .
_('Cancel') . "', '" . $templateClass['typeId'] . "', '" . 'template_' .
$templateClass['typeId'] . "'); return false;");
$deleteLink->setCSSClasses(array('margin3'));
$buttonGroup->addElement($deleteLink);
if (count($configProfiles) > 1) {
@ -256,6 +257,7 @@ include '../../lib/adminHeader.inc';
$importLink->setOnClick("showDistributionDialog('" . _("Import PDF structures") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', '" . $templateClass['typeId'] .
"', 'import'); return false;");
$importLink->setCSSClasses(array('margin3'));
$buttonGroup->addElement($importLink);
}
$exportLink = new htmlLink(null, '#', '../../graphics/export.png');
@ -264,6 +266,7 @@ include '../../lib/adminHeader.inc';
_('Ok') . "', '" . _('Cancel') . "', '" . $templateClass['typeId'] .
"', 'export', '" . 'template_' . $templateClass['typeId'] . "', '" .
$_SESSION['config']->getName() . "'); return false;");
$exportLink->setCSSClasses(array('margin3'));
$buttonGroup->addElement($exportLink);
$container->add($buttonGroup, 12, 4);
$container->addVerticalSpacer('1rem');

3
lam/templates/profedit/profilemain.php
View File

@ -226,18 +226,21 @@ foreach ($profileClasses as $profileClass) {
$deleteLink = new htmlLink(null, '#', '../../graphics/delete.png');
$deleteLink->setTitle(_('Delete'));
$deleteLink->setOnClick("profileShowDeleteDialog('" . _('Delete') . "', '" . _('Ok') . "', '" . _('Cancel') . "', '" . $profileClass['typeId'] . "', '" . 'profile_' . $profileClass['typeId'] . "'); return false;");
$deleteLink->setCSSClasses(array('margin3'));
$buttonGroup->addElement($deleteLink);
if (count($configProfiles) > 1) {
$importLink = new htmlLink(null, '#', '../../graphics/import.png');
$importLink->setTitle(_('Import profiles'));
$importLink->setOnClick("showDistributionDialog('" . _("Import profiles") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', '" . $profileClass['typeId'] . "', 'import'); return false;");
$importLink->setCSSClasses(array('margin3'));
$buttonGroup->addElement($importLink);
}
$exportLink = new htmlLink(null, '#', '../../graphics/export.png');
$exportLink->setTitle(_('Export profile'));
$exportLink->setOnClick("showDistributionDialog('" . _("Export profile") . "', '" .
_('Ok') . "', '" . _('Cancel') . "', '" . $profileClass['typeId'] . "', 'export', '" . 'profile_' . $profileClass['typeId'] . "'); return false;");
$exportLink->setCSSClasses(array('margin3'));
$buttonGroup->addElement($exportLink);
$container->add($buttonGroup, 12, 4);
$container->addVerticalSpacer('1rem');

4
lam/templates/tools/importexport.php
View File

@ -101,8 +101,8 @@ if (!empty($_GET['tab']) && ($_GET['tab'] === 'export')) {
});
</script>
<div class="user-bright smallPaddingContent">
<div id="tabs">
<div class="smallPaddingContent">
<div id="tabs" class="user-bright">
<ul>
<li id="tab_import">
<a href="#tab-import"><img alt="import" src="../../graphics/import.png"> <?php echo _('Import') ?> </a>