Index: core/admin_templates/designs/without_login_design.tpl =================================================================== --- /dev/null +++ core/admin_templates/designs/without_login_design.tpl @@ -0,0 +1,144 @@ + + + + + + + +
+ +
+ +
+ +
+ + + +
+ + + + +

401 Authentication Required

+ +
+ +
+ +
+ +
+ + + + Index: core/admin_templates/incs/style_template.css =================================================================== --- core/admin_templates/incs/style_template.css +++ core/admin_templates/incs/style_template.css @@ -74,6 +74,11 @@ padding: 1px; } +.login-message { + max-width: 400px; + margin-bottom: 10px; +} + .disabled { background-color: #ebebeb; } Index: core/admin_templates/login.tpl =================================================================== --- core/admin_templates/login.tpl +++ core/admin_templates/login.tpl @@ -1,265 +1,126 @@ - - - - - - - -
- -
- -
- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

401 Authentication Required

- -
- -
- -
- -
- - - - - index"/> - - - - + + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + index"/> + + + + + Index: core/admin_templates/login/forgot_password.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password.tpl @@ -0,0 +1,39 @@ + + + +

+ + + + + + + + + + + + + + + + + Index: core/admin_templates/login/forgot_password_reset.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password_reset.tpl @@ -0,0 +1,56 @@ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + Index: core/admin_templates/login/forgot_password_reset_confirm.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password_reset_confirm.tpl @@ -0,0 +1,16 @@ + +

+ + + + + + Index: core/admin_templates/login/forgot_password_reset_notice.tpl =================================================================== --- /dev/null +++ core/admin_templates/login/forgot_password_reset_notice.tpl @@ -0,0 +1,8 @@ + +

+ + + + Index: core/install/english.lang =================================================================== --- core/install/english.lang +++ core/install/english.lang @@ -28,6 +28,7 @@ Q2hhbmdl Q2xlYXI= Q29udGVudCBNb2Rl + Q29udGludWU= RGVsZXRl RGVsZXRl ZGVsZXRlIHJldmlldw== @@ -51,16 +52,20 @@ UmVzZXQ= UmVzZXQgJmFtcDsgVmFsaWRhdGUgQ29uZmlnIEZpbGVz UmVzZXQgInJvb3QiIHBhc3N3b3Jk + UmV0dXJuIHRvIEhvbWU= U2F2ZQ== U2F2ZSBDaGFuZ2Vz U2VjdGlvbiBQcm9wZXJ0aWVz U2VjdGlvbiBUZW1wbGF0ZQ== U2VsZWN0IEFsbA== + U2VuZCBQYXNzd29yZA== + U2V0IE5ldyBQYXNzd29yZA== U2V0IFZhbHVl U2hvdyBTdHJ1Y3R1cmU= U3luY2hyb25pemU= VW5zZWxlY3Q= VXA= + VXBkYXRl VXNl Ynk= Q2FuY2Vs @@ -576,6 +581,7 @@ TXVsdGlsaW5ndWFs TmFtZQ== TmV3 + TmV3IFBhc3N3b3Jk TmV4dCBSdW4gT24= Tm90ZXM= UmV2aWV3IFdhc24ndCBIZWxwZnVs @@ -748,6 +754,7 @@ VXNlciBHcm91cHM= VXNlcm5hbWU= VXNlIFNlY3VyaXR5IEltYWdl + UmVwZWF0IE5ldyBQYXNzd29yZA== UmUtZW50ZXIgUGFzc3dvcmQ= VmVyc2lvbg== VmlzaWJpbGl0eQ== @@ -1369,7 +1376,12 @@ UGxlYXNlIG1ha2Ugc3VyZSB0byBCQUNLVVAgeW91ciBkYXRhYmFzZShzKSBiZWZvcmUgcnVubmluZyB0aGlzIHV0aWxpdHkh RWRpdA== RW1haWw= + RW50ZXIgeW91ciBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg== Rm9sbG93aW5nIGxpbmVzIHdlcmUgTk9UIGltcG9ydGVk + WW91ciBwYXNzd29yZCBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY2hhbmdlZC4= + UGxlYXNlIGVudGVyIHlvdXIgbmV3IHBhc3N3b3Jk + QW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhhdCBlbWFpbCB0byBzZXQgeW91ciBuZXcgcGFzc3dvcmQu + Rm9yZ290IHBhc3N3b3JkPw== RnJvbnQtRW5kIE9ubHk= R2VuZXJhbA== SG90 @@ -1387,6 +1399,7 @@ Tm9uZQ== Tm8gUGVybWlzc2lvbg== b3I= + UGxlYXNlIGNvbmZpcm0gdGhhdCB5b3Ugd2FudCB0byByZXNldCB5b3VyIHBhc3N3b3JkLiA= UGhvbmU= UG9wdWxhcg== UG9wdWxhcml0eQ== @@ -1510,6 +1523,10 @@ RXhwb3J0IExhbmd1YWdlIFBhY2sgLSBTdGVwMQ== RmllbGRz RmlsZXM= + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDEgb2YgNCk= + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDIgb2YgNCk= + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDMgb2YgNCk= + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDQgb2YgNCk= Rm9ybXM= Rm9ybSBTdWJtaXNzaW9ucw== R2VuZXJhbA== @@ -1905,7 +1922,7 @@ UmVzZXQgUGFzc3dvcmQgQ29uZmlybWF0aW9u - SGVsbG8sPGJyLz48YnIvPg0KDQpJdCBzZWVtcyB0aGF0IHlvdSBoYXZlIHJlcXVlc3RlZCBhIHBhc3N3b3JkIHJlc2V0IGZvciB5b3VyIEluLXBvcnRhbCBhY2NvdW50LiBJZiB5b3Ugd291bGQgbGlrZSB0byBwcm9jZWVkIGFuZCBjaGFuZ2UgdGhlIHBhc3N3b3JkLCBwbGVhc2UgY2xpY2sgb24gdGhlIGxpbmsgYmVsb3c6PGJyLz48YnIvPg0KDQo8YSBocmVmPSI8aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+Ij48aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+PC9hPjxici8+PGJyLz4NCg0KWW91IHdpbGwgcmVjZWl2ZSBhIHNlY29uZCBlbWFpbCB3aXRoIHlvdXIgbmV3IHBhc3N3b3JkIHNob3J0bHkuPGJyLz48YnIvPg0KDQpJZiB5b3UgYmVsaWV2ZSB5b3UgaGF2ZSByZWNlaXZlZCB0aGlzIGVtYWlsIGluIGVycm9yLCBwbGVhc2UgaWdub3JlIHRoaXMgZW1haWwuIFlvdXIgcGFzc3dvcmQgd2lsbCBub3QgYmUgY2hhbmdlZCB1bmxlc3MgeW91IGhhdmUgY2xpY2tlZCBvbiB0aGUgYWJvdmUgbGluay4NCg== + SGVsbG8sPGJyLz48YnIvPg0KDQpJdCBzZWVtcyB0aGF0IHlvdSBoYXZlIHJlcXVlc3RlZCBhIHBhc3N3b3JkIHJlc2V0IGZvciB5b3VyIGFjY291bnQuIElmIHlvdSB3b3VsZCBsaWtlIHRvIHByb2NlZWQgd2l0aCB0aGUgY2hhbmdlIG9mIHlvdXIgb2xkIHBhc3N3b3JkLCBwbGVhc2UgY2xpY2sgb24gdGhlIGxpbmsgYmVsb3c6PGJyLz48YnIvPg0KDQo8YSBocmVmPSI8aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+Ij48aW5wMjp1X0NvbmZpcm1QYXNzd29yZExpbmsgbm9fYW1wPSIxIi8+PC9hPjxici8+PGJyLz4NCg0KT25jZSBjbGlja2VkLCB5b3UnbGwgYmUgdGFrZW4gdG8gdGFrZW4gdG8gdGhlIHBhZ2Ugd2hlcmUgeW91IGNhbiBzZXQgeW91ciBuZXcgcGFzc3dvcmQuPGJyLz48YnIvPg0KDQpJZiB5b3UgYmVsaWV2ZSB5b3UgaGF2ZSByZWNlaXZlZCB0aGlzIGVtYWlsIGluIGVycm9yLCBwbGVhc2UgaWdub3JlIHRoaXMgZW1haWwuIFlvdXIgcGFzc3dvcmQgd2lsbCBub3QgYmUgY2hhbmdlZCB1bmxlc3MgeW91IHN1Y2Nlc3NmdWxseSBjaGFuZ2UgaXQgYnkgZm9sbG93aW5nIHRoZSBhYm92ZSBsaW5rLg0K U3Vic2NyaWJlZCB0byBhIE1haWxpbmcgTGlzdCBvbiA8aW5wMjptX0xpbmsgdGVtcGxhdGU9ImluZGV4Ii8+ Index: core/install/upgrades.css =================================================================== --- core/install/upgrades.css +++ core/install/upgrades.css @@ -681,7 +681,7 @@ +++ style_template.css (working copy) @@ -60,7 +60,7 @@ } - + .bordered, table.bordered, .bordered-no-bottom { - border: 1px solid #000000; + border: 1px solid #000000 !important; @@ -690,7 +690,7 @@ } @@ -269,7 +269,7 @@ } - + /* Main row definition */ -.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2 { +.grid-data-row td, .grid-data-row-selected td, .grid-data-row-even-selected td, .grid-data-row-mouseover td, .table-color1, .table-color2, .grid-edit-table .edit-form-odd > td, .grid-edit-table .edit-form-even > td { @@ -709,7 +709,7 @@ @@ -346,6 +346,29 @@ background-color: #FFFF00; } - + +div.filter, div.filter-active { + background-color: white; + border: 1px solid #AAAAAA; @@ -748,7 +748,7 @@ @@ -493,11 +516,18 @@ border-top-width: 0px; } - + +.form-notice, .form-warning { + font-size: 11px; +} @@ -757,7 +757,7 @@ color: red; - font-size: 11px; } - + +.form-notice { + color: green; +} @@ -766,7 +766,7 @@ color: red; padding-left: 1px; @@ -751,4 +781,17 @@ - + .summary-box li { padding-bottom: 4px; +} @@ -791,7 +791,7 @@ --- style_template.css (revision 15359) +++ style_template.css (working copy) @@ -424,7 +424,7 @@ - + .grid-status-bar td { background-color: @@TitleBarBgColor@@; - color: @@TitleBarColor@@; @@ -802,7 +802,7 @@ @@ -610,11 +610,13 @@ text-decoration: none; } - + -/* Left side of bluebar */ -.header_left_bg { +/* Page header (bluebar) */ @@ -815,7 +815,7 @@ + font-weight: normal; + padding: 2px 8px 2px 8px; } - + /* Right side of bluebar */ # ===== v 5.2.2-B1 ===== @@ -826,7 +826,7 @@ @@ -549,6 +549,10 @@ border-collapse: separate } - + +label.checkbox { + white-space: nowrap; +} @@ -840,10 +840,22 @@ =================================================================== --- style_template.css (revision 16502) +++ style_template.css (working copy) +@@ -74,6 +74,11 @@ + padding: 1px; + } + ++.login-message { + + max-width: 400px; + + margin-bottom: 10px; + +} ++ +.disabled { + background-color: #ebebeb; +} @@ -487,6 +487,14 @@ vertical-align: middle; } - + +.CodeMirror { + font-size: 13px; + border: 1px solid black; @@ -858,7 +870,7 @@ @@ -498,6 +506,18 @@ background: #fff none; } - + +.highlight-area, .code-highlight-area { + border: 1px solid black; + padding: 8px; Index: core/install/upgrades.sql =================================================================== --- core/install/upgrades.sql +++ core/install/upgrades.sql @@ -2936,6 +2936,34 @@ UPDATE SystemSettings SET VariableValue = 1 WHERE VariableName = 'CSVExportEncoding'; ALTER TABLE Semaphores ADD MainIDs INT NULL DEFAULT NULL AFTER MainPrefix; +UPDATE EmailTemplates +SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'your In-portal account', 'your account') +WHERE TemplateName = 'USER.PSWDC'; + +UPDATE EmailTemplates +SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'If you would like to proceed and change the password', 'If you would like to proceed with the change of your old password') +WHERE TemplateName = 'USER.PSWDC'; + +UPDATE EmailTemplates +SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'You will receive a second email with your new password shortly.', 'Once clicked, you''ll be taken to taken to the page where you can set your new password.') +WHERE TemplateName = 'USER.PSWDC'; + +UPDATE EmailTemplates +SET l1_HtmlBody = REPLACE(l1_HtmlBody, 'Your password will not be changed unless you have clicked on the above link.', 'Your password will not be changed unless you successfully change it by following the above link.') +WHERE TemplateName = 'USER.PSWDC'; + +UPDATE LanguageLabels +SET l1_Translation = 'Enter your Username or Email below to continue with resetting your password.' +WHERE PhraseKey = 'LU_ENTERFORGOTUSEREMAIL'; + +UPDATE LanguageLabels +SET l1_Translation = REPLACE(l1_Translation, 'Please follow the link in the email in order to receive a new password.', 'Please follow the link in that email to set your new password.') +WHERE PhraseKey = 'LU_TEXT_FORGOTPASSRESETEMAILSENT'; + +UPDATE LanguageLabels +SET l1_Translation = 'Your password has been successfully changed.' +WHERE PhraseKey = 'LU_TEXT_FORGOTPASSHASBEENRESET'; + # ===== v 5.3.0-B1 ===== ALTER TABLE ScheduledTasks ADD Settings TEXT NULL; ALTER TABLE Themes ADD ImageResizeRules TEXT NULL; Index: core/units/users/users_event_handler.php =================================================================== --- core/units/users/users_event_handler.php +++ core/units/users/users_event_handler.php @@ -858,7 +858,10 @@ $is_email = strpos($email_or_username, '@') !== false; if ( strlen($email_or_username) ) { - $user->Load($email_or_username, $is_email ? 'Email' : 'Username'); + $user->Load(array( + ($is_email ? 'Email' : 'Username') => $email_or_username, + 'UserType' => $this->Application->isAdmin ? UserType::ADMIN : UserType::USER, + )); } if ( $user->isLoaded() ) { @@ -1936,6 +1939,8 @@ $user_helper->loginUserById( $user->GetID() ); } } + + $this->setNextTemplate($event); } /** Index: themes/advanced/_install/english.lang =================================================================== --- themes/advanced/_install/english.lang +++ themes/advanced/_install/english.lang @@ -22,6 +22,7 @@ Q2xlYXI= Q2xvc2UgV2luZG93 Q29udGFjdA== + Q29udGludWU= Q3JlYXRl RGVsZXRl RGVsZXRlIEZpbGU= @@ -41,6 +42,7 @@ U2VsZWN0 UmVjb3ZlciBQYXNzd29yZA== U2V0 + U2V0IE5ldyBQYXNzd29yZA== U29ydA== U3Vic2NyaWJl VW5zdWJzY3JpYmU= @@ -172,6 +174,7 @@ TW9kdWxl QWRkaXRpb25hbCBDYXRlZ29yaWVz TmFtZQ== + TmV3IFBhc3N3b3Jk UGFzc3dvcmQ= UGhvbmU= UGhyYXNl @@ -192,6 +195,7 @@ VHJhbnNsYXRpb24= TWVtYmVyc2hpcCBHcm91cA== VXNlcm5hbWU= + UmVwZWF0IE5ldyBQYXNzd29yZA== VmVyaWZ5IFBhc3N3b3Jk VmVyc2lvbg== WmlwIGNvZGU= @@ -295,8 +299,9 @@ VGVybXMgYW5kIENvbmRpdGlvbnMgb2YgVXNl IFdlIGFyZSBzb3JyeSB5b3UgaGF2ZSB1bnN1YnNjcmliZWQgZnJvbSBvdXIgbWFpbGluZyBsaXN0 WW91ciB1c2VyIGFjY291bnQgaXMgY3VycmVudGx5IHBlbmRpbmcgb3IgZGlzYWJsZWQuIElmIHlvdSBoYXZlIHJlZ2lzdHJlZCByZWNlbnRseSwgcGxlYXNlIHdhaXQgdW50aWwgeW91ciBhY2NvdW50IHdpbGwgYmUgYXBwcm92ZWQsIG90aGVyd2lzZSBwbGVhc2Ugd3JpdGU= - WW91ciBwYXNzd29yZCBoYXMgYmVlbiByZXNldC4gVGhlIG5ldyBwYXNzd29yZCBoYXMgYmVlbiBzZW50IHRvIHlvdXIgZS1tYWlsIGFkZHJlc3MuIFlvdSBtYXkgbm93IGxvZ2luIHdpdGggdGhlIG5ldyBwYXNzd29yZC4= - WW91IGhhdmUgY2hvc2VuIHRvIHJlc2V0IHlvdXIgcGFzc3dvcmQuPEJSLz48QlIvPg0KQW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhlIGVtYWlsIGluIG9yZGVyIHRvIHJlY2VpdmUgYSBuZXcgcGFzc3dvcmQu + WW91ciBwYXNzd29yZCBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgY2hhbmdlZC4= + UGxlYXNlIGVudGVyIHlvdXIgbmV3IHBhc3N3b3Jk + WW91IGhhdmUgY2hvc2VuIHRvIHJlc2V0IHlvdXIgcGFzc3dvcmQuPEJSLz48QlIvPg0KQW4gYXV0b21hdGljIGVtYWlsIGhhcyBiZWVuIHNlbnQgdG8geW91ciBlbWFpbCBhZGRyZXNzIG9uIGZpbGUuIFBsZWFzZSBmb2xsb3cgdGhlIGxpbmsgaW4gdGhhdCBlbWFpbCB0byBzZXQgeW91ciBuZXcgcGFzc3dvcmQu VGhlIGtleXdvcmQgaXMgdG9vIHNob3J0 Tm8gY29tbWVudHMsIGFkZCBmaXJzdA== Tm8gcGVybWlzc2lvbnMgdG8gcGVyZm9ybSB0aGlzIG9wZXJhdGlvbg== @@ -328,6 +333,10 @@ Rm9yZ290IFBhc3N3b3Jk Rm9yZ290IFBhc3N3b3JkIENvbmZpcm1hdGlvbg== Rm9yZ290IFBhc3N3b3JkIE5vdGlmaWNhdGlvbg== + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDEgb2YgNCk= + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDIgb2YgNCk= + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDMgb2YgNCk= + Rm9yZ290IFBhc3N3b3JkIChTdGVwIDQgb2YgNCk= TG9naW4gQm94 TWFpbGluZyBMaXN0 TWFpbnRlbmFuY2UgTW9kZQ== @@ -390,4 +399,4 @@ WklQIENvZGU= - \ No newline at end of file + Index: themes/advanced/platform/login/forgot_password.tpl =================================================================== --- themes/advanced/platform/login/forgot_password.tpl +++ themes/advanced/platform/login/forgot_password.tpl @@ -6,7 +6,7 @@ - + @@ -33,13 +33,13 @@
- +
- + @@ -61,7 +61,7 @@ - + ');" value=""> @@ -75,4 +75,4 @@ - \ No newline at end of file + Index: themes/advanced/platform/login/forgot_password_reset.tpl =================================================================== --- themes/advanced/platform/login/forgot_password_reset.tpl +++ themes/advanced/platform/login/forgot_password_reset.tpl @@ -6,7 +6,7 @@ - + @@ -33,27 +33,27 @@
- +
- + - +

- - + + - +
@@ -74,4 +74,4 @@ - \ No newline at end of file + Index: themes/advanced/platform/login/forgot_password_reset_confirm.tpl =================================================================== --- themes/advanced/platform/login/forgot_password_reset_confirm.tpl +++ themes/advanced/platform/login/forgot_password_reset_confirm.tpl @@ -6,7 +6,7 @@ - + @@ -33,13 +33,13 @@
- +
- + @@ -58,4 +58,4 @@ - \ No newline at end of file + Index: themes/advanced/platform/login/forgot_password_reset_notice.tpl =================================================================== --- themes/advanced/platform/login/forgot_password_reset_notice.tpl +++ themes/advanced/platform/login/forgot_password_reset_notice.tpl @@ -6,7 +6,7 @@ - + @@ -33,21 +33,16 @@
- +
- + - - -

- - " class="button" onclick="redirect('');"/> - +
@@ -57,4 +52,4 @@ - \ No newline at end of file +