Conversation
|
Did you, for some reason, run a refactoring tool on the two CSS files? There's a lot of changes that are irrelevant to this pull request and shouldn't be here and makes reviewing the applicable changes very difficult, if not impossible. Things like changing double quotes to single quotes, re-arranging of style properties, adding of extra properties for browser compatibility, etc., which are not needed for this enhancement and have caused the build to fail as they are against the style linting rules set for our repository. |
|
Sorry, Didn't get what you mean? |
|
I just included some style classes and changed some style to match with my modification. |
|
Ah I see, it looks like your rebasing was not done properly as your CSS files are not in line with the latest version of those files. You'll need to fix that. |
|
Simillar issue happend earliar also. So just now I re cloned the phpbb
repository and made the changes. So i'm sure that I have modified the
latest versions of those files.
…On Apr 4, 2017 18:03, "David Colón" ***@***.***> wrote:
Ah I see, it looks like your rebasing was not done properly as your CSS
files are not in line with the latest version of those files. You'll need
to fix that.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#4787 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALtWzYgTOl0YdweAmZ48yKJAxxxRk62lks5rsjiBgaJpZM4Myxbo>
.
|
| /* stylelint-disable selector-max-compound-selectors */ | ||
| /* stylelint-disable selector-no-qualifying-type */ | ||
| /* stylelint-disable declaration-property-unit-whitelist */ | ||
| /* stylelint-disable declaration-property-unit-blacklist */ |
There was a problem hiding this comment.
you are not or have not achieved a proper re-base as this should not be removed. The issue is maybe that you are trying to rebase and then apply changes that you made from a 3.2 or older master version of these files which is causing conflicts. all the css changes will need to be reverted and then manually re-added to properly clean things up.
There was a problem hiding this comment.
Would you think that the issue would be solved if I revert the files? Okay, Then I'll give a try, Thanks a lot for your support.
There was a problem hiding this comment.
not just the css but this was just an example as posting_editor.html is old 3.2 for sure
|
After modifying files I couldn't see any changes when I check on the browser. The class I removed from posting editor was there. Thought it because of cache issue and I renamed one file inside phpbb\phpBB\cache\production\twig to observe the results of my modifications. |
|
but I have modified the files from the latest version. I'll try to fix that.
*Yasara Peiris,University of Moratuwa,mobile : +94 710 197 418email :
[email protected] <[email protected]>*
…On 4 April 2017 at 18:16, Michael Miday ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In phpBB/styles/prosilver/theme/common.css
<#4787 (comment)>:
> @@ -3,8 +3,6 @@
/* -------------------------------------------------------------- */
/* stylelint-disable selector-max-compound-selectors */
/* stylelint-disable selector-no-qualifying-type */
-/* stylelint-disable declaration-property-unit-whitelist */
-/* stylelint-disable declaration-property-unit-blacklist */
not just the css but this was just an example as posting_editor.html is
old 3.2 for sure
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#4787 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALtWzVhuqFR3QfdGcy2GcoPm0qeAaFtZks5rsjuogaJpZM4Myxbo>
.
|
|
you have corrected the issues with the basing however your commit msgs are not formatted properly you will need to rebase and make sure to only perform clean changes to avoid merge and revert commits squash everything into a single commit and you still need to fix all the stylelint errors. |
|
Why still I need to fix the stylint errors. In my common.css file it
includes
/* -------------------------------------------------------------- */
/* stylelint-disable selector-max-compound-selectors */
/* stylelint-disable selector-no-qualifying-type */
/* stylelint-disable declaration-property-unit-whitelist */
/* stylelint-disable declaration-property-unit-blacklist */
Isn't this correct. Or do I need to remove last 2 lines.
*Yasara Peiris,University of Moratuwa,mobile : +94 710 197 418email :
[email protected] <[email protected]>*
…On 4 April 2017 at 20:19, Michael Miday ***@***.***> wrote:
you have corrected the issues with the basing however your commit msgs are
not formatted properly you will need to rebase and make sure to only
perform clean changes to avoid merge and revert commits squash everything
into a single commit and you still need to fix all the stylelint errors.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#4787 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALtWzZ0711GNEpKAMw0d8vhiqO5OneuBks5rslhxgaJpZM4Myxbo>
.
|
|
those just temporarily ignore those specific errors which is supposed to be there but you still need to fix the 50+ individual errors that you have as your code is not formated properly to match all the stylelint rules. I am still working on all the documentation for all the rules but for now if you read the following http://hanakin.github.io/base-l/#/codeing-guidelines and everything under the CSS section as well that is essentially the rules we follow. You should see all your errors if you have correctly setup your editor...or from the project root folder run |
|
Okay. I'll work on that. Sorry for bothering you.
…On Apr 5, 2017 10:24, "Michael Miday" ***@***.***> wrote:
those just temporarily ignore those specific errors which is supposed to
be there but you still need to fix the 50+ individual errors that you have
as you code is not formated properly to match all the stylelint rules. I am
still working on all the documentation for all the rules but for now if you
read the following http://hanakin.github.io/base-l/#/codeing-guidelines
and everything under the CSS section as well that is essentially the rules
we follow. You should see all your errors if you have correctly setup your
editor...or from the project root folder run stylelint
"phpBB/styles/prosilver/theme/*.css" to see all the errors. You can also
look at the travis log to see them as well...https://travis-ci.org/
phpbb/phpbb/jobs/218455733#L915
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#4787 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALtWzV9YztfIdj7uqMchfvmX1l1aQiNcks5rsx59gaJpZM4Myxbo>
.
|
|
I fixed the issue from .https://travis-ci.org/phpbb/phpbb/jobs/218455733#
L915. But I have an issue with the command stylelint
"phpBB/styles/prosilver/theme/*.css" . It gives me an error saying
stylelint is not recognized as an internal or external command. It would be
really grateful if you could help me with this. Then I will be able to fix
all the errors before sending a pull request.
*Yasara Peiris,University of Moratuwa,mobile : +94 710 197 418email :
[email protected] <[email protected]>*
On 5 April 2017 at 10:26, Yasara Peiris <[email protected]>
wrote:
… Okay. I'll work on that. Sorry for bothering you.
On Apr 5, 2017 10:24, "Michael Miday" ***@***.***> wrote:
> those just temporarily ignore those specific errors which is supposed to
> be there but you still need to fix the 50+ individual errors that you have
> as you code is not formated properly to match all the stylelint rules. I am
> still working on all the documentation for all the rules but for now if you
> read the following http://hanakin.github.io/base-l/#/codeing-guidelines
> and everything under the CSS section as well that is essentially the rules
> we follow. You should see all your errors if you have correctly setup your
> editor...or from the project root folder run stylelint
> "phpBB/styles/prosilver/theme/*.css" to see all the errors. You can also
> look at the travis log to see them as well...https://travis-ci.org/p
> hpbb/phpbb/jobs/218455733#L915
>
> —
> You are receiving this because you authored the thread.
> Reply to this email directly, view it on GitHub
> <#4787 (comment)>, or mute
> the thread
> <https://github.com/notifications/unsubscribe-auth/ALtWzV9YztfIdj7uqMchfvmX1l1aQiNcks5rsx59gaJpZM4Myxbo>
> .
>
|
|
did you run |
|
Yes, but stylelint "phpBB/styles/prosilver/theme/*.css" , command didn't
not worked. Any reason for this.
*Yasara Peiris,University of Moratuwa,mobile : +94 710 197 418email :
[email protected] <[email protected]>*
…On 8 April 2017 at 03:51, Michael Miday ***@***.***> wrote:
did you run npm install in the project root before running that command
from the same location? Also it's not just L915 that was only one of the
errors on there.
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#4787 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALtWzb5Qy9Mazz25EN-uGmQqNvbfT344ks5rtrbfgaJpZM4Myxbo>
.
|
|
The issue is related to things not being installed and setup properly in the correct places. Try deleting your node_modules folder from the project root and rerunning the npm install again from the same location the retry the stylelint command |
|
Just on a side note, you might have to run |
|
None of them worked properly. In the project root inside the node_modules
folder there is a folder with the name of stylelint.
*Yasara Peiris,University of Moratuwa,mobile : +94 710 197 418email :
[email protected] <[email protected]>*
…On 9 April 2017 at 19:46, Marc Alexander ***@***.***> wrote:
Just on a side note, you might have to run npm install with the global
flag first, e.g. npm install -g
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#4787 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALtWzXpUvJVH4v7xHl1CzjkrIziT-3m-ks5ruOhWgaJpZM4Myxbo>
.
|
|
i was having some issues with some other repos earlier last month, there was an update to node or npm that was causing some issues and I had to reinstall node delete my modules folder and re install the pkgs. |
|
|
||
| <div class="dropdown-container smiley-container" data-skip-responsive="true"> | ||
| <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"> | ||
| <img src="./images/smilies/icon_e_biggrin.gif" width="16" height="16" alt="" title="Add an emticon."> |
There was a problem hiding this comment.
this needs to no be an img use an icon from fontawsome
There was a problem hiding this comment.
also the title will become sr-only text and should be a language variable
There was a problem hiding this comment.
I just needed to include one smiley for the label of the dropdown container. So used one from the emticon panel.
There was a problem hiding this comment.
it needs to be themed the same as the buttons around it so use fa-smile
|
|
||
| <!-- BEGIN smiley --> | ||
| <li class="smiley-list"> | ||
| <a href="#" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> |
There was a problem hiding this comment.
js code should never be inserted into your html use jquery and data elements to abstract it into the forum_fn.js file
There was a problem hiding this comment.
This was used inside the code.
<!-- IF S_SMILIES_ALLOWED and .smiley --> <strong>{L_SMILIES}</strong><br /> <!-- BEGIN smiley --> <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%23" onclick="insert_text('{smiley.A_SMILEY_CODE}', true); return false;"><img src="proxy.php?url=https%3A%2F%2Fgithub.com%2F%7Bsmiley.SMILEY_IMG%7D" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> <!-- END smiley --> <!-- ENDIF -->
That's why I used this.. Do I need to insert this function to forum_fn.js file.
| <!-- END smiley --> | ||
| <!-- ENDIF --> | ||
| <!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED --> | ||
| <br /><li><a href="{U_MORE_SMILIES}" onclick="popup(this.href, 750, 350, '_phpbbsmilies'); return false;">{L_MORE_SMILIES}</a></li> |
There was a problem hiding this comment.
give this an id (maybe#show_smileys) and abstract the js out into forum_fn.js using jquery.
There was a problem hiding this comment.
This was also used, thought itz better to use the same way. If extracting to forum_fn.jsis better, then I'll work on that.
There was a problem hiding this comment.
you are overhauling or replacing the code. It makes sense to overall the whole thing cleanly rather than to perpetuate and old practices/stds. So why not use data attributes to store template vars and jquery to extract and execute the events rather than inline JS.
There was a problem hiding this comment.
I have commited again after modifying my code.
<div id="smiley-dropdown" class="dropdown dropdown-extended" > <div class="pointer"><div class="pointer-inner"></div></div> <div class="smiley-content"> <div id="smiley-box" class="smiley-box"> <ul> <!-- EVENT posting_editor_smilies_before --> <!-- IF S_SMILIES_ALLOWED and .smiley --> <!-- BEGIN smiley --> <li class="smiley-list"> <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%23" onclick="insertText('{smiley.A_SMILEY_CODE}')"><img src="proxy.php?url=https%3A%2F%2Fgithub.com%2F%7Bsmiley.SMILEY_IMG%7D" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> </li> <!-- END smiley --> <!-- ENDIF --> <!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED --> <br /><li><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%7BU_MORE_SMILIES%7D" onclick="popupSmileys(this.href)">{L_MORE_SMILIES}</a></li> <!-- ENDIF --> <!-- EVENT posting_editor_smilies_after --> <!-- IF BBCODE_STATUS --> <div class="bbcode-status"> <!-- IF .smiley --><hr /><!-- ENDIF --> {BBCODE_STATUS}<br /> <!-- IF S_BBCODE_ALLOWED --> {IMG_STATUS}<br /> {FLASH_STATUS}<br /> {URL_STATUS}<br /> <!-- ENDIF --> {SMILIES_STATUS} </div> <!-- ENDIF --> <!-- EVENT posting_editor_bbcode_status_after --> <!-- IF S_EDIT_DRAFT || S_DISPLAY_REVIEW --> <!-- IF S_DISPLAY_REVIEW --><hr /><!-- ENDIF --> <!-- IF S_EDIT_DRAFT --><strong><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%7BS_UCP_ACTION%7D">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF --> <!-- IF S_DISPLAY_REVIEW --><strong><a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%23review">{L_TOPIC_REVIEW}</a></strong><!-- ENDIF --> <!-- ENDIF --> </ul> </div> </div> </div>
| resize: vertical; | ||
| -webkit-transition: all 0.5s ease; | ||
| -moz-transition: all 0.5s ease; | ||
| -ms-transition: all 0.5s ease; |
There was a problem hiding this comment.
run everything through autoprefixer as you have way too many prefixes for the proper browser support we use > 1%, last 2 versions
|
|
||
| <div class="dropdown-container smiley-container" data-skip-responsive="true"> | ||
| <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"> | ||
| <img src="./images/smilies/icon_e_biggrin.gif" width="16" height="16" alt="" title="Add an emticon."> |
There was a problem hiding this comment.
also the title will become sr-only text and should be a language variable
| <textarea <!-- IF S_UCP_ACTION and not S_PRIVMSGS and not S_EDIT_DRAFT -->name="signature" id="signature" style="height: 9em;"<!-- ELSE -->name="message" id="message"<!-- ENDIF --> rows="1" cols="76" tabindex="4" onselect="storeCaret(this);" onclick="storeCaret(this);" readonly="readonly" onkeyup="storeCaret(this);" onfocus="initInsertions();" class="inputbox">{MESSAGE}{DRAFT_MESSAGE}{SIGNATURE}</textarea> | ||
|
|
||
| <div class="dropdown-container smiley-container" data-skip-responsive="true"> | ||
| <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"> |
There was a problem hiding this comment.
U_VIEW_ALL_NOTIFICATIONS > U_VIEW_ALL_SMILIES
| } | ||
|
|
||
| /* Main message box */ | ||
| /* Main message box - Edited to add smiley dropdown */ |
|
|
||
| <div class="dropdown-container smiley-container" data-skip-responsive="true"> | ||
| <a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification_list_button" class="dropdown-trigger"> | ||
| <img src="./images/smilies/icon_e_biggrin.gif" width="16" height="16" alt="" title="Add an emticon."> |
|
posting_editor_smilies_before, posting_editor_smilies_after, posting_editor_bbcode_status_after must be moved in events.md and posting_editor_message_before should not be removed. |
| } | ||
|
|
||
| /* Smiley Dropdown | ||
| ---------------------------------------- */ |
There was a problem hiding this comment.
you have a mix of tabs and spaces. please just use tabs
| <!-- IF S_SMILIES_ALLOWED and .smiley --> | ||
| <!-- BEGIN smiley --> | ||
| <li class="smiley-list"> | ||
| <a href="#" onclick="insertText('{smiley.A_SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" alt="{smiley.SMILEY_CODE}" title="{smiley.SMILEY_DESC}" /></a> |
There was a problem hiding this comment.
you completely misunderstood what I was talking about are you familiar with jquery and dom selection
There was a problem hiding this comment.
yeah, I'm familiar with jquery and dome selection. Do you need me to insert an id attribute here and select that inside forum_fn.js using $('#id').click(function(){ /*function to run });
I used previous way because I thought it would be good to use the same way as it was.
There was a problem hiding this comment.
no never assume whats there is good it was code over a decade ago ;) ... always use best practices! ie no inline js, always data attr's and #selectors via jquery for handling js. that is if its this simple obviously if it requires a complete re-write than its best left for a separate pr...
There was a problem hiding this comment.
Thanks a lot. I was little bit afraid to changed your code completely. Now I ll do. :)
There was a problem hiding this comment.
just use data attributes for the vars. ie <a href="proxy.php?url=https%3A%2F%2Fgithub.com%2F%23" id="smiley-add" data-smiley-text="{smiley.A_SMILEY_CODE}">
then you can get it via get click event on $('#smiley-add') then get the code via $(this).attr('data-smiley-text')` and call insert_text using this value
| <!-- END smiley --> | ||
| <!-- ENDIF --> | ||
| <!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED --> | ||
| <br /><li><a href="{U_MORE_SMILIES}" onclick="popupSmileys(this.href)">{L_MORE_SMILIES}</a></li> |
There was a problem hiding this comment.
not sure this is necessary any more since we are using a dropdown already just show all smiles...so remove this bit completely
There was a problem hiding this comment.
okay, sure,,, Morevoer um little bit worried about where those variables get assigned. which means variables with curly braces. I tried to find inside the project,, But couldn't found. Can u help me with that.
There was a problem hiding this comment.
well this function is not needed anymore anywhere so do not worry about this one check comment on other line for how to handle that one
There was a problem hiding this comment.
@hanakin Do you have any idea about this. If soo could you help me with this. Sorry for bothering you. Nd no hurry.
|
can you please post a screen capture of what the posting page looks like after these changes... |
c98100f to
fcc186e
Compare
|
you did not fix your conflicts properly you can not just save a copy of a file over top. This completely re-writes the entire file contents. You need to rebase and i would suggest you manually add the changes to common.css & colours.css back |
|
Okay. I ll do. |
7866a42 to
6bac41b
Compare
6bac41b to
7532914
Compare
| .dropdown-extended .dropdown-contents.smiley-wrap { | ||
| width: 200px; | ||
| padding: 8px; | ||
| } |
There was a problem hiding this comment.
hmm did not work, try putting the padding on .smiley-list instead then change width here to 187px.
There was a problem hiding this comment.
okay. In the smiley list there's an exisiting padding of 2px. Shall I increase it to 8px.
| display: none !important; | ||
| } | ||
|
|
||
| /* Smiley Dropdown---------------------------------------- */ |
There was a problem hiding this comment.
please put ----------- on a new line
| {SMILIES_STATUS} | ||
| </div> | ||
| <!-- ENDIF --> | ||
| <!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF --> |
There was a problem hiding this comment.
delete this line its duplicated
| </div> | ||
| <!-- ENDIF --> | ||
| <!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF --> | ||
| <!-- IF S_DISPLAY_REVIEW --><strong><a href="#review">{L_TOPIC_REVIEW}</a></strong><!-- ENDIF --> |
There was a problem hiding this comment.
delete this line its duplicated
7532914 to
2d084ad
Compare
| cursor: pointer; | ||
| } | ||
|
|
||
| .smiley-wrap { |
There was a problem hiding this comment.
so this still needs dropdown-contents apparently until the dropdowns can be re-factored
| padding: 3px; | ||
| } | ||
|
|
||
| .smiley-add { |
There was a problem hiding this comment.
again this still needs smiley-list-item until dropdowns are refactored
| <!-- ENDIF --> | ||
| </div> | ||
| </div> | ||
|
|
There was a problem hiding this comment.
I thnk you have a mix of tabs and spaces through out this file please clean this all up and only use tabs!
PHPBB3-15109
2d084ad to
c74b817
Compare
hanakin
left a comment
There was a problem hiding this comment.
ensure the screenshot is up todate, but other than that this finally looks good
| 'use strict'; | ||
| // View more smileys. | ||
| var a = $(this).attr('href'); | ||
| popupSmileys(a); |
There was a problem hiding this comment.
this function does not exist and is not executed correctly as you need to call popup() on click. Also you have spaces instead of tabs here
There was a problem hiding this comment.
All I need to do is replace popupSmileys(a) function with popup() ??? @hanakin
There was a problem hiding this comment.
not sure, just make the popup work cause its not right now
There was a problem hiding this comment.
also can you pls delete this branch https://github.com/YasaraPeiris/phpbb/tree/Ticket/15109 from your repo as its causing conflicts for me to test things
|
|
||
| <!-- IF S_SHOW_SMILEY_LINK and S_SMILIES_ALLOWED --> | ||
| <div class="footer"> | ||
| <a href="{U_MORE_SMILIES}"><span>{L_MORE_SMILIES}</span></a> |
There was a problem hiding this comment.
you have spaces instead of tabs here
|
@Derky This is still on my todo list since she has not made the changes...Thos only thing really missing is the JS function hookup. |
|
Ok, thanks for taking it over! 😀 |
|
closing due to time constraints and BC issues easier to push as new pr |

#Checklist:
Correct branch: master for new features
Tests pass
Code follows coding guidelines: master
Commit follows commit message format
PHPBB3-15109
https://tracker.phpbb.com/browse/PHPBB3-15109
In here I have added a smiley dropdown toeditor to save some screen
space. Mainly I have modified posting_editor.html file to remove the
existing side smilebox container. Then I have added a new file called
smiley_dropdown.html display smiley dropdown. This newly created file is
included to the posting_editor.html. After that I did necessarry
modifications to styles in colour.css, forms.css and common.css. All the
modifications are commented for easy identification.
View of the smiley dropdown