Skip to content
This repository has been archived by the owner on Jul 31, 2019. It is now read-only.

Adding embed snippet to Thimble publishing dialog Error #1543 #2535

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
Open

Adding embed snippet to Thimble publishing dialog Error #1543 #2535

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
1d88c7a
First working code
Fatehsandhu Oct 13, 2017
2282100
modified: ../../locales/en-GB/server.properties
Fatehsandhu Oct 20, 2017
a0bbb83
Update Vagrantfile
Fatehsandhu Oct 20, 2017
73aa025
Update publish.html
Fatehsandhu Oct 20, 2017
8d0f366
Update publish.html
Fatehsandhu Oct 20, 2017
ed90fa6
Update publish.html
Fatehsandhu Oct 20, 2017
4100881
Update publish.html
Fatehsandhu Oct 20, 2017
d1214cf
Update publish.html
Fatehsandhu Oct 20, 2017
830358e
Jquery not working need help
Fatehsandhu Nov 22, 2017
1b8f3f5
Jquery not working help
Fatehsandhu Nov 22, 2017
e2e9c3d
Merge branch 'master' into master
Fatehsandhu Nov 22, 2017
ca4b149
Merge branch 'master' into master
Fatehsandhu Nov 22, 2017
f9bddb8
Jquery not working help
Fatehsandhu Nov 22, 2017
e6724ea
Merge branch 'master' of https://github.com/Fatehsandhu/thimble.mozil…
Fatehsandhu Nov 22, 2017
a4c0413
Jquery not working help
Fatehsandhu Nov 22, 2017
8b81b0d
Jquery not working help
Fatehsandhu Nov 22, 2017
9e0a749
Jquery not working help
Fatehsandhu Nov 22, 2017
36786b2
Jquery not working help
Fatehsandhu Nov 22, 2017
c1ab81e
Update publisher.js
Fatehsandhu Nov 23, 2017
5c5519d
Update publisher.js
Fatehsandhu Nov 23, 2017
25abc0f
Update setup-services.sh
Fatehsandhu Nov 23, 2017
1aaec7a
Update publish.html
Fatehsandhu Nov 23, 2017
901b84f
Update publisher.js
Fatehsandhu Jan 1, 2018
02c3fb4
Update publish.html
Fatehsandhu Jan 1, 2018
0428408
Update server.properties
Fatehsandhu Jan 1, 2018
66572fa
New
Fatehsandhu Jan 1, 2018
f6b2c1f
New
Fatehsandhu Jan 1, 2018
94d5557
Update server.properties
Fatehsandhu Jan 1, 2018
a4c44e0
Update server.properties
Fatehsandhu Jan 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions locales/en-GB/server.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ navToggleAutoUpdateLabel=Auto
# Publishing
publishHeader=Publish your Project
publishShareLink=Here's a link you can share...
publishEmbedLinkTitle=Copy this code into your HTML page to show off your project.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make this change in locales/en-US not locales/en-GB

publishChangesPrompt=You've made changes since you last published this project.
publishProjectDescription=Project Description
publishCancelBtn=Cancel
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup-services.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ echo "Setting up login.webmaker.org"
cd login.webmaker.org
cp env.sample .env
sudo npm install --no-bin-links --loglevel=error # sudo needed for bcrypt permissions
cd ..
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you def need this back

sudo npm install --no-bin-links || sudo npm install --no-bin-links
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's remove this and file as a follow-up issue.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Fatehsandhu, please undo this change

# ---

# --- id.webmaker.org setup and database setup ---
Expand Down
11 changes: 9 additions & 2 deletions views/editor/publish.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@ <h1>{{ gettext("publishHeader") }}</h1>
</div>

<div id="publish-live" class="hide">

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the trailing spaces

<p>{{ gettext("publishShareLink") }}</p>
<div id="publish-link">
<a id="link-publish-link" title="{{ gettext("publishShareLinkTitle") }}" target="_blank" href="test"></a>
</div>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the trailing spaces

<!-- Embed iFrame -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the extra leading spaces before the comment so that it aligns with the tag

<p>{{ gettext("publishEmbedLinkTitle") }}</p>
<div id="publish-link">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you cannot use the same id here as another element. Change this to publish-embed.

<span>&lt;iframe {{ gettext("PUBLISHED_PROJECTS_HOSTNAME") }} &gt; </span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why "PUBLISHED_PROJECTS_HOSTNAME" would be used here.
Instead, leave the text empty and dynamically change the text with JS instead:

  1. Add a property here called embed that is a jquery object linking to this span.
  2. After this line set the text of embed to be the string `<iframe src={$publishUrl}></iframe>`

</div>

<div id="publish-button-unpublish">
<img src="/img/icon/garbage-can-white.svg">
Expand All @@ -29,9 +36,9 @@ <h1>{{ gettext("publishHeader") }}</h1>

<div id="publish-details">
<label>{{ gettext("publishProjectDescription") }}</label>
<textarea class="publish-description" placeholder="{{ gettext("publishProjectDescriptionPlaceholder") }}"></textarea>
<textarea class="publish-description" placeholder="{{ gettext("publishProjectDescriptionPlaceholder") }}"></textarea>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undo this change

</div>

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

undo this change

</div>

<div id="publish-buttons">
Expand Down