Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SHARE-380 Correct links at bottom of pages #838

Merged

Conversation

leno12
Copy link
Contributor

@leno12 leno12 commented Aug 16, 2020

-Changed links in the footer
-Added Test case


Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name and id of the Jira ticket in the PR’s title eg.: SHARE-666 The devils ticket
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no warnings and errors
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Verify that all tests are passing, if not please state the test cases in the section below
  • Perform a self-review of the changes
  • Stick to the project’s git workflow (rebase and squash your commits)
  • Verify that your changes do not have any conflicts with the base branch
  • Put your ticket into the Code Review section in Jira
  • Post a message in the #catroweb Slack channel and ask for a code reviewer

Additional Description

TODO: Add additional information that is not in your commit-message here

Tests - additional information

TODO: add additional information about testruns here

@leno12 leno12 force-pushed the SHARE-380_Correct_links_at_bottom_of_pages branch from 1d2fc0d to 3335ff6 Compare August 16, 2020 19:24
Copy link
Collaborator

@dmetzner dmetzner left a comment

Choose a reason for hiding this comment

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

https://pr838-web.catrobat.ist.tugraz.at/app/privacypolicy

Footer -> privacy policy..... the page is not optimized for direct viewing.
It was made to be shown in the privacy policy pop up......

If we have to show the privacy policy, we have to create a new template that uses this privacy policy but extends the base layout

@@ -4,4 +4,4 @@
Pocket Alice Website
{% endblock %}

{% set google_play_url = "https://play.google.com/store/apps/details?id=org.catrobat.catroid" %}
{% set google_play_url = "https://catrob.at/gp" %}
Copy link
Collaborator

Choose a reason for hiding this comment

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

if all have the same URL. remove the variable overwrites from the themes and just set a default value.

@@ -6,19 +6,19 @@
<h3>{{ "footer.usefulLinks"|trans({}, "catroweb") }}</h3>
<ul class="list-vertical">
<li>
<a href="{{ url('catrobat_web_help') }}">{{ "tutorials"|trans({}, "catroweb") }}</a>
<a id="help" href="https://catrob.at/ShareHelp">{{ "tutorials"|trans({}, "catroweb") }}</a>
Copy link
Collaborator

Choose a reason for hiding this comment

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

not sure about this one.... Being on a test server brings you to the share server....

@dmetzner dmetzner self-assigned this Aug 17, 2020
@leno12 leno12 force-pushed the SHARE-380_Correct_links_at_bottom_of_pages branch from 3335ff6 to 7e64d81 Compare August 17, 2020 15:52
-Changed links in the footer
-Added Test case
@leno12 leno12 force-pushed the SHARE-380_Correct_links_at_bottom_of_pages branch from 7e64d81 to faf7b7d Compare August 17, 2020 16:01
@dmetzner dmetzner merged commit 117adb2 into Catrobat:develop Aug 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants