Add an article to Umami - Mocktails

Working on this as part of DrupalCon Nashville!

v2 of proposed article content was hidden by benjifisher. Was that intentional? Which one should I use? Thanks!

I've been able to create the article body file with the v2 article text file provided here, updated the articles.csv, and successfully re-run the Drupal install process using the demo_umami install profile. Attached is a screenshot of the resulting article.

Patch file coming shortly...

Patch attached. It's lacking the non-placeholder image file and actual alt text in the articles.csv. The filename for the image referenced in articles.csv is mocktail-umami.jpg.

Removed <h1> tag content from article body html in patch because it was duplicating what's in the Drupal title.

Yeah, patch helps...

@timwood:

v2 of proposed article content was hidden by benjifisher. Was that intentional?

No, I am not sure how that happened.

You left this issue in the "Needs Work" (NW) state. Was that intentional? Is the Todo list in the issue summary still accurate?

Hi @benjifisher. Yes, the todo list in the issue summary is what I added after what I did at the sprints. I think @kjay intends to take an official photo for the article. I left it as needs work because of the todo items. I used the v2 article text, so the patch should include that.

+++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/articles.csv
@@ -3,3 +3,4 @@ Give it a go and grow your own herbs,give-it-a-go-and-grow-your-own-herbs.html,H
\ No newline at end of file

I am not sure if this file is auto generated. If this is not then it has missing new line at the end of file.

Added image and added patch. Please review.

+++ b/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/skip-the-spirits-with-delicious-mocktails.html
@@ -0,0 +1,21 @@
+<p>Strawberries add a beautiful rich red to this mocktail, while the ginger gives it a little kick. Serve in a proper martini glass, but maybe avoid the olive…</p>

Small typo here. I presume it should be 'olives', not 'olive…'

After that, I think this will be RTBC.

I have made changes as mentioned above. Please review.

Picking this up for review at DrupalCamp Scotland contribution sprint.

Just a minor typo - full-stop missing from the end of the sentence that was corrected in this latest patch.

<p>Strawberries add a beautiful rich red to this mocktail, while the ginger gives it a little kick. Serve in a proper martini glass, but maybe avoid the olives</p>

So should be "olives." rather than "olives".

After that should be good to go.

I have fixed the typo mentioned above and uploaded the patch

Hi Folks,

When supplying patches, can you also supply an interdiff between your patch and the patch your are working from? It makes it much easier to see exactly what has changed in your code.

Thanks for all the work!

in the patch file, I am getting some extra character and failing to apply patch can someone guide me on the same.

@johnny221B As far as I can see using the diff tool, the difference occurs within one of the binary files, as shown below:

user@machine ~/Development/Drupal/core (8.6.x*) $ diff 2960483-umami-mocktails-article-22.patch 2960483-umami-mocktails-article-28.patch
Binary files 2960483-umami-mocktails-article-22.patch and 2960483-umami-mocktails-article-28.patch differ
user@machine ~/Development/Drupal/core (8.6.x*) $

I would suggest resetting to the current 8.6.x branch using
[code]git checkout 8.6.x && git pull[/code]
You can then look at reapplying patch 22, and correcting the typo again. I have done this for this patch.

Attached are 2960483-umami-mocktails-article-32.patch and interdiff-2960483-22-32.txt

Forgot to mark as needs review.

Looks like test bot hickup. Even though build was successful.

I can confirm the patch #32 applies cleanly and creates a new article about mocktail. Here are screenshots.

This needs a reroll.

Reroll of #32.

Removed Needs Reroll tag

@cferthorney : i have applied your patch and it applied clearly but i m unable to see new article in my site ,please refer to my screen shot i have cleared the cache by drush and form admin menu .

@brahmjeet789 re: #39,

Did you do this on a fresh install of the `demo_umami` profile? Content is only added with a fresh install. With a fresh install, this worked for me. One way to do this is to drop and recreate your demo_umami site database, then install via drush again as before. With an empty database, you can also visit `{Your dev site URL}/core/install.php`.

I hope this helps.

@cferthorney sorry mine mistake now i can see the article ,please refer to my screenshots.

Don't mean to bikeshed but I think the language here needs further changes:

Then why not serve up something just as special for those who don't drink alcohol but do want to join in on all the fun. After all, what cocktail party is complete without those incredible looking glasses of mixed fruits, bright colors and of course, the little umbrellas.

These are both questions, so should end with a question mark.

and get hold of some great looking alternatives made out of glass, metal and even bamboo.

should be

and get hold of some great looking alternatives made out of glass, metal or even bamboo.

So, grab the cocktail mixer, skip the spirits and shake up these deliciously refreshing mocktails that won't leave you, or your guests, short on flavor or style.

Far too many commas here. Suggest

So grab the cocktail mixer, skip the spirits and shake up these deliciously refreshing mocktails that won't leave you or your guests, short on flavor or style.

Sugar, a squeeze of lime and mint leaves can be squidged into a tall glass

I believe the correct term in cocktail parlance is muddled

In fact, the structure of

Sugar, a squeeze of lime and mint leaves can be squidged into a tall glass, then add a few chunks of ice and top with the juice of a blood orange (for the sunset effect) and a splash of soda water.

is odd, because the first part is written as to not be an explicit instruction, but is followed by then second part.

This could be fixed by for example

Muddle sugar, a squeeze of lime and mint leaves in a tall glass, then add a few chunks of ice, top with the juice of a blood orange (for the sunset effect) and add a splash of soda water.

Take a strawberry and squish it

Again, suggest muddle

+1 for muddled/muddle parlance

Added a patch according to #43 above mentioned points.

patch fails to apply on 8.6x dev

@mahtab_alam The patch #45 is not failing it is just throwing warnings about whitespace because this patch has binary content of a jpg file. @Vidushi Mehta Can you please provide the interdiff? See https://www.drupal.org/documentation/git/interdiff

@msankhala The patch should apply cleanly without warning

@mahtab_alam that's unfortunately not the case when you are including images in your patches. Whilst it's annoying to get the warnings when applying the patches, this is accepted if the patch still works correctly. There have been lots of successful patches for Umami where this is the case!

Just spun this up on simplytest.me and we're definitely getting closer! I can verify all the points I raised in #43 have been addressed.

We still need to add alt text for the image - it currently reads "Alt text to be supplied".

Also the writing style for Umami advocates Oxford Commas where possible: https://www.drupal.org/project/drupal/issues/2940146 - so we should add these as follows:

Do your bit for the environment by ditching the plastic straws and get hold of some great looking alternatives made out of glass, metal, or even bamboo

Don't forget the classic cocktail glasses, cool tumblers, and colored glass to really bring these recipes to life.

So, grab the cocktail mixer, skip the spirits, and shake up these deliciously refreshing mocktails that won't leave you or your guests, short on flavor or style.

Muddle sugar, a squeeze of lime, and mint leaves in a tall glass

top with the juice of a blood orange (for the sunset effect), and add a

Add sliced cucumbers, the juice of a lime or two, and some mint leaves

Also I'm slightly confused over

Don't forget the classic cocktail glasses, cool tumblers and colored glass to really bring these recipes to life.

What colored glass are we adding to drinks? Should this be glasses as the previous two in the list are pluralised? If so, we've already mentioned glasses so perhaps this is redundant.

Serve poured into glass full of ice with sliced cucumber and mint leaves.

Should be a glass or glasses. As we've just made a full pitcher, I'd go with glasses

Added a patch with above mention points of #51. Let me know if there's any change regarding alt text.

Reviewing this patch at Design4Drupal in Boston.

The patch applies cleanly with:

warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

All the whitespace errors come from the binary, mojito-mocktail.jpg, and there is nothing we can do about binaries.

I have reviewed the content and it reads correctly to my eyes. Changing the status of this issue to RTBC.

We've replaced

Don't forget the classic cocktail glasses, cool tumblers and colored glass to really bring these recipes to life.

with

Don't forget the classic cocktail glasses, cool tumblers to really bring these recipes to life.

- if we removed the bit about colored glass, we need to add and in between cocktail glasses, cool tumblers. That is

Don't forget the classic cocktail glasses and cool tumblers to really bring these recipes to life.

Apart from that, my comments in #51 have all been addressed satisfactorily.

Oops!! Sorry my mistake.

Here's a patch with a change.

@Vidishu Mehta it would be really helpful to provide an interdiff when supplying a patch when a patch already exists. It helps reviewers check that just the latest requested changes are required.

https://www.drupal.org/documentation/git/interdiff

Reviewed the patch manually. The text is now changed to "Don't forget the classic cocktail glasses and cool tumblers to really bring these recipes to life." Refer the screenshot

Thanks @Surabhi Gokte, I concur with your RTBC!

Whilst testing this I noticed that the tags on each article and recipe probably need review - it seems most tags are only used once which I'm not sure achieves what's wanted.

diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/skip-the-spirits-with-delicious-mocktails.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/skip-the-spirits-with-delicious-mocktails.html
old mode 100755
new mode 100644
diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/articles.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/articles.csv
old mode 100755
new mode 100644

I fixed the file modes on commit.

Committed 89a86c1 and pushed to 8.6.x. Thanks!