This repository has been archived by the owner on Sep 13, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 69
Helpbutton #100
Open
thermoscookies
wants to merge
7
commits into
Glennmen:develop
Choose a base branch
from
thermoscookies:helpbutton
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Helpbutton #100
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
5ea1852
Merge pull request #35 from Glennmen/develop
Glennmen 81f06af
develop
thermoscookies a4b6bed
added $helppage to example.config.php and if statement to pre-index.html
thermoscookies 61589e3
added help.png image to static/images
thermoscookies 1b61f31
updated help image
thermoscookies 0bfb8ba
removed accidental map2 directory
thermoscookies 59e0440
removed width/height from pre-index
thermoscookies File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -147,6 +147,12 @@ function pokemonFilterImages($noPokemonNumbers) | |
title="PayPal - The safer, easier way to pay online!" alt="Donate" style="float: right;"> | ||
</a>'; | ||
} | ||
if ($helplink != "") { | ||
echo '<a href="' . $helplink . '" target="_blank" style="margin-bottom: 5px; vertical-align: middle; padding:0 5px;"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move CSS style into one of the SCSS files. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @iroken222 I copied and pasted this from the paypalurl/discordurl above it, do you want me to move those into stylesheets as well so they can be consistent? |
||
<img src="static/images/help.png" border="0" name="submit" | ||
title="Help for this map." alt="Help" style="float: right;"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move styles into stylesheets. |
||
</a>'; | ||
} | ||
?> | ||
<?php if (!$noWeatherOverlay) { | ||
?> | ||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change this to
if (!empty($helplink)) {