diff options
Diffstat (limited to 'mayor-orig/mayor-base/www')
9 files changed, 39 insertions, 12 deletions
diff --git a/mayor-orig/mayor-base/www/include/backend/ads/base/attrs.php b/mayor-orig/mayor-base/www/include/backend/ads/base/attrs.php index e01aa00c..dd88e863 100644 --- a/mayor-orig/mayor-base/www/include/backend/ads/base/attrs.php +++ b/mayor-orig/mayor-base/www/include/backend/ads/base/attrs.php @@ -55,7 +55,7 @@ 'shadowmin', 'shadowmax', 'shadowinactive', - + 'otherpager' /* 'gecos', 'mail', @@ -132,6 +132,7 @@ 'shadowmin' => array('desc' => _ADSSHADOWMIN, 'type' => 'text', 'rights' => 'wrr'), 'shadowmax' => array('desc' => _ADSSHADOWMAX, 'type' => 'text', 'rights' => 'wrr'), 'shadowinactive' => array('desc' => _ADSSHADOWINACTICE, 'type' => 'text', 'rights' => 'wrr'), + 'otherpager' => array('desc' => _ADSOTHERPAGER, 'type' => 'text', 'rights' => 'wrr'), /* 'gecos' => array('desc' => _ADSGECOS, 'type' => 'text', 'rights' => 'w--'), 'mail' => array('desc' => _ADSMAIL, 'type' => 'text', 'rights' => 'wwr'), diff --git a/mayor-orig/mayor-base/www/include/share/net/upload.php b/mayor-orig/mayor-base/www/include/share/net/upload.php index a909f6c2..bbc90db8 100644 --- a/mayor-orig/mayor-base/www/include/share/net/upload.php +++ b/mayor-orig/mayor-base/www/include/share/net/upload.php @@ -37,7 +37,7 @@ try { array( 'jpg' => 'image/jpeg', 'png' => 'image/png', - 'gif' => 'image/gif', + 'gif' => 'image/gif' ), true )) { diff --git a/mayor-orig/mayor-base/www/lang/hu_HU/backend/ads/attrs.php b/mayor-orig/mayor-base/www/lang/hu_HU/backend/ads/attrs.php index 215e1420..1e8a133e 100644 --- a/mayor-orig/mayor-base/www/lang/hu_HU/backend/ads/attrs.php +++ b/mayor-orig/mayor-base/www/lang/hu_HU/backend/ads/attrs.php @@ -36,6 +36,8 @@ define('_ADSSHADOWINACTICE','shadow inaktív'); define('_ADSMEMBER', 'tag'); define('_ADSMEMBERUID', 'tag azonosító'); +define('_ADSOTHERPAGER', 'személyhívó'); + // A kakukktojások /* define('_ADS_USERACCOUNT','Azonosító'); diff --git a/mayor-orig/mayor-base/www/lang/hu_HU/share/session/attrs.php b/mayor-orig/mayor-base/www/lang/hu_HU/share/session/attrs.php index 6b66965e..cd5524f1 100644 --- a/mayor-orig/mayor-base/www/lang/hu_HU/share/session/attrs.php +++ b/mayor-orig/mayor-base/www/lang/hu_HU/share/session/attrs.php @@ -4,7 +4,7 @@ Nyelv: hu_HU (magyar) */ -define('_ATTR_USERACCOUNT','Felhasználónév (azonosító)'); +define('_ATTR_USERACCOUNT','Felhasználói azonosító'); define('_ATTR_USERCN','Saját név'); define('_ATTR_USERPASSWORD','Jelszó'); define('_ATTR_STUDYID','Oktatási azonosító'); diff --git a/mayor-orig/mayor-base/www/policy/private/session/accountInfo-pre.php b/mayor-orig/mayor-base/www/policy/private/session/accountInfo-pre.php index 9b54adf5..48de57c5 100644 --- a/mayor-orig/mayor-base/www/policy/private/session/accountInfo-pre.php +++ b/mayor-orig/mayor-base/www/policy/private/session/accountInfo-pre.php @@ -69,7 +69,6 @@ $ADAT['activity'] = getMyActivity(); if ($toPolicy=='private' && _POLICY ==='private') { - $ADAT['eduroamAdat'] = getEduroamSettings($userAccount, $toPolicy); - // dump($ADAT); + //DISABLED $ADAT['eduroamAdat'] = getEduroamSettings($userAccount, $toPolicy, array()); } ?> diff --git a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css index a550588b..9a958693 100644 --- a/mayor-orig/mayor-base/www/skin/classic/base/css/base.css +++ b/mayor-orig/mayor-base/www/skin/classic/base/css/base.css @@ -709,6 +709,15 @@ border: solid 0px #eee; div#mayorGlobalLogin form.passwordAuth span {display:none;} } + + +@media (prefers-color-scheme: dark) { + body { + // background-color: black; + // color: white; + } +} + @keyframes niceMaYoR { 0% { border-top: rgb(247,197,14) solid 4px; } 100% { border-top: rgb(147,197,214) solid 4px; } diff --git a/mayor-orig/mayor-base/www/skin/classic/module-session/css/createAccount.css b/mayor-orig/mayor-base/www/skin/classic/module-session/css/createAccount.css index 6c1e19ca..843484d6 100644 --- a/mayor-orig/mayor-base/www/skin/classic/module-session/css/createAccount.css +++ b/mayor-orig/mayor-base/www/skin/classic/module-session/css/createAccount.css @@ -1,6 +1,6 @@ @media screen,print { - table.new input { border: solid 1px black; } + table.new input { } table.searchresult { background-color: #aaaaaa; margin-bottom:20px; } table.searchresult thead th { background-color: #d6bddb; height:2em; border-bottom: solid 2px purple; } @@ -9,16 +9,17 @@ table.searchresult a { color: black; text-decoration: none; } table.searchresult a:hover { text-decoration: underline; } - table.new { background-color: #aaaaaa; margin-bottom:20px; margin-top:30px;} + table.new { background-color: #aaaaaa; margin-bottom:20px; margin-top:30px; font-size:16px; } table.new thead th { background-color: #ccccee; height:2em; border-bottom: solid 2px purple; } - table.new thead td { text-align: center; background-color: #ccccee; height:2em; border-bottom: solid 2px purple; } - table.new th { background-color: #ffffff; } + table.new thead td { background-color: #ccccee; height:2em; border-bottom: solid 2px purple; text-align:center; } + table.new tfoot th { background-color: #cce;} + table.new th { padding:2px 4px; background-color: #ffffff; text-align: center; font-weight: normal; } table.new td { background-color: #ffffff; } - table.new td input { } + table.new input, table.new select { font-size: 16px; } .paros { background-color: #eeeeee; } .paratlan { background-color: #dddddd; } - table.new input.hiba { outline: solid 1px red; } + table.new input.hiba { outline: solid 2px red; } }
\ No newline at end of file diff --git a/mayor-orig/mayor-base/www/skin/classic/module-session/html/accountInfo.phtml b/mayor-orig/mayor-base/www/skin/classic/module-session/html/accountInfo.phtml index b38ffa8f..4d9f0304 100644 --- a/mayor-orig/mayor-base/www/skin/classic/module-session/html/accountInfo.phtml +++ b/mayor-orig/mayor-base/www/skin/classic/module-session/html/accountInfo.phtml @@ -26,7 +26,7 @@ } function putEduroamForm($ADAT) { -// return false; + return false; global $eduroamDOMAINS; if (__TANAR===true) { $eduroamAFFILIATION = 'faculty'; diff --git a/mayor-orig/mayor-base/www/skin/classic/module-session/javascript/accountInfo.jquery.min.js b/mayor-orig/mayor-base/www/skin/classic/module-session/javascript/accountInfo.jquery.min.js new file mode 100644 index 00000000..2f3f32a2 --- /dev/null +++ b/mayor-orig/mayor-base/www/skin/classic/module-session/javascript/accountInfo.jquery.min.js @@ -0,0 +1,15 @@ +$(document).ready(function() { + $('table.personalSettings.asAdmin input[type="text"]').click( + function(event) { + element = $(event.target); + var elementData = element.val(); + if (elementData[0] == '0' && elementData[1] == 'C') { + var s = elementData.substring(2); + var a = parseInt(s,16); + if (a.toString(16) == s) { + console.log('Decimálisan: ',a); + } + } + } + ); +});
\ No newline at end of file |