makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'crizz0/ticket/8785' into develop

Browse source 
* crizz0/ticket/8785:
  [ticket/8785] Deletes additional add and add_bcc buttons
  [ticket/8785] Fixed problem with add empty.png and travis will now pass
  [ticket/8785] and again a fresh line
  [ticket/8785] Just one blank line
  [ticket/8785] pm_layout.html back to more standard code
  [ticket/8785] <hr /> will only displayed when needed
  [ticket/8785] Adds blank lines at file end
  [ticket/8785] Adds a new optical improvement, new file and fixes html bugs
  [ticket/8785] Adds two <hr /> to seperate recipients and BCC
  [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px
  [ticket/8785] Little spaces mistake
  [ticket/8785] Rebuilding posting_editor pm head + new language vars
This commit is contained in:
Joas Schilling 2014-03-13 11:28:21 +01:00
commit 8a61e4b4c0
5 changed files with 120 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/language/en/ucp.php
View file

@ -476,7 +476,11 @@ $lang = array_merge($lang, array(
'TIMEZONE' => 'Timezone', 'TIMEZONE' => 'Timezone',
'TIMEZONE_DATE_SUGGESTION' => 'Suggestion: %s', 'TIMEZONE_DATE_SUGGESTION' => 'Suggestion: %s',
'TIMEZONE_INVALID' => 'The timezone you selected is invalid.', 'TIMEZONE_INVALID' => 'The timezone you selected is invalid.',
'TO' => 'To', 'TO' => 'Recipient',
'TO_MASS' => 'Recipients',
'TO_ADD' => 'Add recipient',
'TO_ADD_MASS' => 'Add recipients',
'TO_ADD_GROUPS' => 'Add groups',
'TOO_MANY_RECIPIENTS' => 'You tried to send a private message to too many recipients.', 'TOO_MANY_RECIPIENTS' => 'You tried to send a private message to too many recipients.',
'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.', 'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',

68
phpBB/styles/prosilver/template/posting_editor.html
View file

@ -1,74 +1,6 @@
<fieldset class="fields1"> <fieldset class="fields1">
<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF --> <!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
<!-- IF S_PRIVMSGS and not S_SHOW_DRAFTS -->
<div class="column1">
<!-- IF S_ALLOW_MASS_PM -->
<!-- IF .to_recipient -->
<dl>
<dt><label>{L_TO}{L_COLON}</label></dt>
<dd>
<!-- BEGIN to_recipient -->
<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF -->
<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
<!-- END to_recipient -->
</dd>
</dl>
<!-- ENDIF -->
<!-- IF .bcc_recipient -->
<dl>
<dt><label>{L_BCC}{L_COLON}</label></dt>
<dd>
<!-- BEGIN bcc_recipient -->
<!-- IF not bcc_recipient.S_FIRST_ROW and bcc_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF -->
<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
<!-- END bcc_recipient -->
</dd>
</dl>
<!-- ENDIF -->
<!-- IF not S_EDIT_POST -->
<dl class="pmlist">
<dt><label>{L_TO}{L_COLON}<textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></dt>
<dd><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span></dd>
<dd><input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" /></dd>
<dd><input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" /></dd>
</dl>
<!-- ENDIF -->
<!-- ELSE -->
<dl>
<dt><label for="username_list">{L_TO}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
<!-- IF .to_recipient -->
<dd>
<!-- BEGIN to_recipient -->
<!-- IF not to_recipient.S_FIRST_ROW and to_recipient.S_ROW_COUNT mod 2 eq 0 --></dd><dd><!-- ENDIF -->
<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" />&nbsp;<!-- ENDIF -->
<!-- END to_recipient -->
</dd>
<!-- ENDIF -->
<!-- IF not S_EDIT_POST -->
<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
<!-- ENDIF -->
</dl>
<!-- ENDIF -->
</div>
<!-- IF S_GROUP_OPTIONS -->
<div class="column2">
<dl>
<dd><label for="group_list">{L_USERGROUPS}{L_COLON}</label> <select name="group_list[]" id="group_list" multiple="multiple" size="4" class="inputbox">{S_GROUP_OPTIONS}</select></dd>
</dl>
</div>
<!-- ENDIF -->
<div class="clear"></div>
<!-- ENDIF -->
<!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS --> <!-- IF S_SHOW_TOPIC_ICONS or S_SHOW_PM_ICONS -->
<dl> <dl>
<dt><label for="icon">{L_ICON}{L_COLON}</label></dt> <dt><label for="icon">{L_ICON}{L_COLON}</label></dt>

82
phpBB/styles/prosilver/template/posting_pm_header.html Normal file
View file

@ -0,0 +1,82 @@
<fieldset class="fields1">
<!-- IF not S_SHOW_DRAFTS -->
<!-- IF S_GROUP_OPTIONS -->
<div class="column2">
<label for="group_list"><strong>{L_TO_ADD_GROUPS}{L_COLON}</strong></label><br />
<select name="group_list[]" id="group_list" multiple="multiple" size="3" class="inputbox">{S_GROUP_OPTIONS}</select><br />
</div>
<!-- ENDIF -->
<!-- IF S_ALLOW_MASS_PM -->
<div class="column1">
<!-- IF not S_EDIT_POST -->
<dl class="pmlist">
<dt><label><strong>{L_TO_ADD_MASS}{L_COLON}</strong><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></dt>
<dd class="recipients">
<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span>
</dd>
</dl>
<!-- ENDIF -->
</div>
<!-- IF .to_recipient or .bcc_recipient --><hr /><!-- ENDIF -->
<div class="column1">
<!-- IF .to_recipient -->
<dl>
<dt><label>{L_TO_MASS}{L_COLON}</label></dt>
<dd class="recipients">
<ul class="recipients">
<!-- BEGIN to_recipient -->
<li>
<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
</li>
<!-- END to_recipient -->
</ul>
</dd>
</dl>
<!-- ENDIF -->
</div>
<!-- IF .bcc_recipient -->
<div class="column2">
<dl>
<dt><label>{L_BCC}{L_COLON}</label></dt>
<dd class="recipients">
<ul class="recipients">
<!-- BEGIN bcc_recipient -->
<li>
<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->
</li>
<!-- END bcc_recipient -->
</ul>
</dd>
</dl>
</div>
<!-- ENDIF -->
<!-- ELSE -->
<div class="column1">
<dl>
<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
<!-- IF not S_EDIT_POST -->
<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
<!-- ENDIF -->
<!-- IF .to_recipient -->
<dd class="recipients">
<ul class="recipients">
<!-- BEGIN to_recipient -->
<li>
<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
</li>
<!-- END to_recipient -->
</dd>
<!-- ENDIF -->
</dl>
</div>
<!-- ENDIF -->
<div class="clear"></div>
<!-- ENDIF -->
</fieldset>

6
phpBB/styles/prosilver/template/posting_pm_layout.html
View file

@ -17,6 +17,12 @@
<h2>{L_TITLE}</h2> <h2>{L_TITLE}</h2>
<div class="panel" id="pmheader-postingbox">
<div class="inner">
<!-- INCLUDE posting_pm_header.html -->
</div>
</div>
<div class="panel" id="postingbox"> <div class="panel" id="postingbox">
<div class="inner"> <div class="inner">

25
phpBB/styles/prosilver/theme/common.css
View file

@ -751,6 +751,31 @@ dl.details dd {
overflow: hidden; overflow: hidden;
} }
fieldset.fields1 ul.recipients {
list-style-type: none;
line-height: 1.8;
max-height: 150px;
overflow-y: auto;
}
fieldset.fields1 dd.recipients {
clear: left;
margin-left: 1em;
}
fieldset.fields1 ul.recipients input.button2{
font-size: 0.8em;
margin-right: 0;
padding: 0;
}
fieldset.fields1 dl.pmlist > dt {
width: auto !important;
}
fieldset.fields1 dl.pmlist dd.recipients {
margin-left: 0 !important;
}
/* Pagination /* Pagination
---------------------------------------- */ ---------------------------------------- */