diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-06-27 14:47:13 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-06-27 14:47:13 +0200 |
| commit | 1b3cb68c2fdc5224367ddc3a9414c323c7d5bb7f (patch) | |
| tree | 62898f931c8b82a198a4c0dc7bf4237c7b4e9077 /phpBB/styles/prosilver/template/mcp_post.html | |
| parent | f273ab16ae68d15832832e2b2c98a3b99c966c97 (diff) | |
| parent | 85ea062a0536edc46ea1a8893201777f8137e41e (diff) | |
| download | forums-1b3cb68c2fdc5224367ddc3a9414c323c7d5bb7f.tar forums-1b3cb68c2fdc5224367ddc3a9414c323c7d5bb7f.tar.gz forums-1b3cb68c2fdc5224367ddc3a9414c323c7d5bb7f.tar.bz2 forums-1b3cb68c2fdc5224367ddc3a9414c323c7d5bb7f.tar.xz forums-1b3cb68c2fdc5224367ddc3a9414c323c7d5bb7f.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/avatars
* upstream/develop: (255 commits)
[ticket/10935] Limit number of PM rules per user to 5000
[ticket/10801] Fixed quickmod tools.
[ticket/9551] uncomment line and change length to 255
[ticket/10925] Clarify installation requirements for SQLite
[ticket/10938] Serve subforum listing on forumlist from template loop
[ticket/10640] Change subject length in mcp in subsilver
[ticket/10640] Change subject length in MCP
[ticket/10640] Do not change default value of truncate_string()
[ticket/10640] Change maximum subject length
[ticket/10936] remove PCRE and mbstring support check
[ticket/10936] fix language key
[ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
[ticket/10829] $style_name -> $style_path in style class.
[ticket/10743] Renaming user->theme
[ticket/10743] Changing obtain_cfg_items
[ticket/10882] Fix test name - oops.
[ticket/10931] Apply strtolower() correctly, i.e. not on false.
[ticket/10931] Also test get_bytes() and get_string() with false.
[ticket/10931] Make to_numeric function globally available.
[ticket/10932] Use included composer.phar in build process
...
Conflicts:
phpBB/includes/mcp/mcp_warn.php
phpBB/install/database_update.php
phpBB/styles/prosilver/template/ucp_avatar_options.html
Diffstat (limited to 'phpBB/styles/prosilver/template/mcp_post.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 496d9ffd0f..752fbdd078 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -8,7 +8,7 @@ <!-- ENDIF --> <div id="report" class="panel"> - <div class="inner"><span class="corners-top"><span></span></span> + <div class="inner"> <div class="postbody"> <h3>{L_REPORT_REASON}: {REPORT_REASON_TITLE}</h3> @@ -25,7 +25,7 @@ </div> </div> - <span class="corners-bottom"><span></span></span></div> + </div> </div> <form method="post" id="mcp_report" action="{S_CLOSE_ACTION}"> @@ -45,7 +45,7 @@ <!-- ENDIF --> <div class="panel"> - <div class="inner"><span class="corners-top"><span></span></span> + <div class="inner"> <div class="postbody"> <!-- IF U_EDIT --> @@ -115,12 +115,12 @@ </div> - <span class="corners-bottom"><span></span></span></div> + </div> </div> <!-- IF S_CAN_LOCK_POST or S_CAN_DELETE_POST or S_CAN_CHGPOSTER --> <div class="panel"> - <div class="inner"><span class="corners-top"><span></span></span> + <div class="inner"> <h3>{L_MOD_OPTIONS}</h3> <!-- IF S_CAN_CHGPOSTER --> @@ -159,18 +159,18 @@ </form> <!-- ENDIF --> - <span class="corners-bottom"><span></span></span></div> + </div> </div> <!-- ENDIF --> <!-- IF S_MCP_QUEUE or S_MCP_REPORT or RETURN_TOPIC --> <div class="panel"> - <div class="inner"><span class="corners-top"><span></span></span> + <div class="inner"> <p><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS}<!-- IF not S_PM --> | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ENDIF --><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></p> - <span class="corners-bottom"><span></span></span></div> + </div> </div> <!-- ENDIF --> @@ -179,7 +179,7 @@ <!-- IF S_SHOW_USER_NOTES --> <div class="panel" id="usernotes"> - <div class="inner"><span class="corners-top"><span></span></span> + <div class="inner"> <form method="post" id="mcp_notes" action="{U_POST_ACTION}"> @@ -216,13 +216,13 @@ </fieldset> </form> - <span class="corners-bottom"><span></span></span></div> + </div> </div> <!-- ENDIF --> <!-- IF S_SHOW_REPORTS --> <div class="panel" id="reports"> - <div class="inner"><span class="corners-top"><span></span></span> + <div class="inner"> <h3>{L_MCP_POST_REPORTS}</h3> @@ -231,13 +231,13 @@ <p><em>{reports.REASON_TITLE}: {reports.REASON_DESC}</em><!-- IF reports.REPORT_TEXT --><br />{reports.REPORT_TEXT}<!-- ENDIF --></p> <!-- END reports --> - <span class="corners-bottom"><span></span></span></div> + </div> </div> <!-- ENDIF --> <!-- IF S_CAN_VIEWIP and not S_MCP_REPORT --> <div class="panel" id="ip"> - <div class="inner"><span class="corners-top"><span></span></span> + <div class="inner"> <p>{L_THIS_POST_IP}: <!-- IF U_WHOIS --> <a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->) @@ -289,7 +289,7 @@ <p><a href="{U_LOOKUP_ALL}#ip">{L_LOOKUP_ALL}</a></p> - <span class="corners-bottom"><span></span></span></div> + </div> </div> <!-- ENDIF --> |