From 9988679d567a8bba9bade92dd9524bb012a1fe43 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 12 Mar 2006 23:19:55 +0000 Subject: - streamlined reports to consist of the feature set we decided upon (Nils, your turn now) - use getenv instead of $_ENV (with $_ENV the case could be wrong) - permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently) - implemented max login attempts - changed the expected return parameters for logins/sessions - added acp page for editing report/denial reasons - other fixes here and there git-svn-id: file:///svn/phpbb/trunk@5622 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/subSilver/template/index_body.html | 8 +++++ phpBB/styles/subSilver/template/login_body.html | 19 +++++++++++- phpBB/styles/subSilver/template/report_body.html | 15 ++++++---- .../subSilver/template/ucp_pm_viewfolder.html | 3 -- .../subSilver/template/ucp_pm_viewmessage.html | 12 +------- .../subSilver/template/ucp_prefs_personal.html | 4 --- .../subSilver/template/ucp_reports_list.html | 32 -------------------- .../subSilver/template/ucp_reports_report.html | 34 ---------------------- phpBB/styles/subSilver/theme/stylesheet.css | 3 -- 9 files changed, 36 insertions(+), 94 deletions(-) delete mode 100755 phpBB/styles/subSilver/template/ucp_reports_list.html delete mode 100755 phpBB/styles/subSilver/template/ucp_reports_report.html (limited to 'phpBB/styles') diff --git a/phpBB/styles/subSilver/template/index_body.html b/phpBB/styles/subSilver/template/index_body.html index 2773e7d2ab..6754e7c785 100644 --- a/phpBB/styles/subSilver/template/index_body.html +++ b/phpBB/styles/subSilver/template/index_body.html @@ -2,6 +2,14 @@ + + + +

+ + diff --git a/phpBB/styles/subSilver/template/login_body.html b/phpBB/styles/subSilver/template/login_body.html index 9621aa0464..5d5e14663f 100644 --- a/phpBB/styles/subSilver/template/login_body.html +++ b/phpBB/styles/subSilver/template/login_body.html @@ -20,7 +20,6 @@

{L_TERMS_USE} | {L_PRIVACY}

+ + + + + + + + + + + + + + + diff --git a/phpBB/styles/subSilver/template/report_body.html b/phpBB/styles/subSilver/template/report_body.html index dac3fdc28c..8e192cc3b4 100644 --- a/phpBB/styles/subSilver/template/report_body.html +++ b/phpBB/styles/subSilver/template/report_body.html @@ -2,27 +2,30 @@ - + +
{L_MARK_FORUMS_READ}  - @@ -51,6 +50,24 @@
{LOGIN_ERROR}
{L_LOGIN_CONFIRMATION}
{L_LOGIN_CONFIRM_EXPLAIN}
+ + {CONFIRM_IMAGE} +
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}
{S_HIDDEN_FIELDS}
- + - + - + - + - + diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html index e9839d3f84..b2e6468f5b 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/subSilver/template/ucp_pm_viewfolder.html @@ -60,9 +60,6 @@ - - - - diff --git a/phpBB/styles/subSilver/template/ucp_reports_list.html b/phpBB/styles/subSilver/template/ucp_reports_list.html deleted file mode 100755 index cbb8b23852..0000000000 --- a/phpBB/styles/subSilver/template/ucp_reports_list.html +++ /dev/null @@ -1,32 +0,0 @@ - - - -
{L_REPORT_POST}{L_REPORT_MESSAGE}{L_REPORT_POST}
{L_REPORT_POST_EXPLAIN}{L_REPORT_MESSAGE_EXPLAIN}{L_REPORT_POST_EXPLAIN}
{L_REASON}:
{L_REPORT_NOTIFY}:
{L_REPORT_NOTIFY_EXPLAIN}		checked="checked" />{L_YES}  checked="checked" />{L_NO} checked="checked" />  {L_YES}   checked="checked" />  {L_NO}
{L_MORE_INFO}:
{L_CAN_LEAVE_BLANK}
 {messagerow.PM_ICON_IMG} - - {REPORTED_IMG}  -   diff --git a/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html b/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html index 4f175ac0ff..0e3cd78e4f 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/subSilver/template/ucp_pm_viewmessage.html @@ -64,16 +64,6 @@
- - - - - -
» {L_MESSAGE_REPORTED}
- -
- -
{MESSAGE}
@@ -105,7 +95,7 @@ - +
{REPORT_IMG} {INFO_IMG} {DELETE_IMG} {INFO_IMG} {DELETE_IMG}
diff --git a/phpBB/styles/subSilver/template/ucp_prefs_personal.html b/phpBB/styles/subSilver/template/ucp_prefs_personal.html index b364b990c4..670ddc8a15 100644 --- a/phpBB/styles/subSilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/subSilver/template/ucp_prefs_personal.html @@ -55,10 +55,6 @@ function dE(n,s){ 		{L_POPUP_ON_PM}: {L_YES}  {L_NO}
{L_REPORT_PM_NOTIFY}:
{L_REPORT_PM_NOTIFY_EXPLAIN}		{L_YES}  {L_NO}
{L_BOARD_LANGUAGE}:
- - - - - - - - - - - - - - - - - - - - - - - -
{L_YOUR_REPORTS}
 {L_USER}  {L_TOPIC}  {L_FORUM}  {L_DATE}  {L_STATUS} 
{report.POSTER}{report.TOPIC_TITLE}{report.FORUM_NAME}{report.REPORT_TIME}{report.REPORT_STATUS}
{L_REPORTS_ZERO_TOTAL}
- -

- - \ No newline at end of file diff --git a/phpBB/styles/subSilver/template/ucp_reports_report.html b/phpBB/styles/subSilver/template/ucp_reports_report.html deleted file mode 100755 index beb5bed551..0000000000 --- a/phpBB/styles/subSilver/template/ucp_reports_report.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_REPORT_POST}{L_REPORT_GENERAL}
{L_REPORT_POST_EXPLAIN}{L_REPORT_GENERAL_EXPLAIN}
{L_REASON}:
{L_REPORT_NOTIFY}:
{L_REPORT_NOTIFY_EXPLAIN}		checked="checked" /> {L_YES}  checked="checked" /> {L_NO}
{L_REPORT_MORE_INFO}:
{L_REPORT_CAN_LEAVE_BLANK}
 
- - - - \ No newline at end of file diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css index 8709f0f665..49ef82c870 100644 --- a/phpBB/styles/subSilver/theme/stylesheet.css +++ b/phpBB/styles/subSilver/theme/stylesheet.css @@ -498,9 +498,6 @@ input.radio { /* Private messages ------------------ */ -.pm_message_reported_colour { - background-color: #FFFFFF; - } .pm_marked_colour { background-color: #000000; } -- cgit v1.2.1