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

Union Events Timeline issue #157

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
ab0e742
update gitignore
jlyon1 Sep 24, 2019
386d0b6
add adpage type, adpage column
jlyon1 Sep 24, 2019
f58a3e2
add an ad block with target link
jlyon1 Sep 24, 2019
37964cf
lint
jlyon1 Sep 24, 2019
752ec77
remove unused types and migrations
jlyon1 Sep 24, 2019
523d3ff
migrations
jlyon1 Sep 24, 2019
f7c4316
database
jlyon1 Sep 24, 2019
cbb4a5b
lint
jlyon1 Sep 24, 2019
2fc68e6
remove something that shoudlnt be there
jlyon1 Sep 24, 2019
15ac843
remove unused fields
jlyon1 Sep 25, 2019
d6705ce
undo
jlyon1 Sep 25, 2019
7755c3e
make link not reqd
jlyon1 Sep 25, 2019
d3f0884
optional link, add label
jlyon1 Sep 25, 2019
7841da3
migrations
jlyon1 Sep 25, 2019
93e7bbd
Started work on a marquee banner. Right now it shows moving text and …
Sep 27, 2019
542308e
Made the banner text stop on hover to make more readable. Removed bor…
Sep 27, 2019
ea605a5
Finished with rotating marquee.
Oct 8, 2019
2428103
Ran black formatting.
Oct 8, 2019
f834ce8
initial work on union timeline issue/new custom models added
Oct 18, 2019
1f1fb98
Data for timeline is inputted and saved correctly
Oct 25, 2019
d9b7ed9
Added a small photo to each event.
Oct 29, 2019
48485df
Trying to format photos to expand when clicked on
Oct 29, 2019
cd60beb
Trying to make the photo expandable.
Oct 31, 2019
ce7f46a
Trying to make photos expandable
Nov 6, 2019
a25ac02
Trying to add custom styling to text toolbar.
Nov 13, 2019
f0a2561
not done, will continue work during break
Dec 11, 2019
ae179a2
Not using bootstrap tooltip anymore. Using custom CSS tooltip.
Feb 25, 2020
80852b2
Have extra p tags, but almost close to having definitions for timeline.
Feb 28, 2020
ffa145a
Fixed merge conflict.
Feb 28, 2020
f4b97e7
Fixed migrations and CSS styling.
Feb 28, 2020
2fe0f4b
Added more text to check. Need to have better css styling.
Mar 3, 2020
fd3fd9d
Added authors to timeline page.
Apr 8, 2020
51596d4
Fixing photo size.
Apr 8, 2020
c21504e
Fixed author if statement.
Apr 8, 2020
b3a69ad
Fixed black formatting.
Apr 8, 2020
f10e819
Merge branch 'master' of github.com:thepoly/pipeline into timeline
Apr 15, 2020
20ac69e
Fixed migrations after pulling from master
Apr 15, 2020
79b8370
Attempted to move union timeline to News section.
Apr 29, 2020
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
Prev Previous commit
Next Next commit
Finished with rotating marquee.
  • Loading branch information
Pragati Pant committed Oct 8, 2019
commit ea605a52f6e19f5ce36b9e6bbf8604d689da2e19
6 changes: 6 additions & 0 deletions core/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,12 @@ class Meta:

class MarqueeBlock(StructBlock):
body=RichTextBlock(required=True)
banner_type = ChoiceBlock(
choices=[("moves", "Rotating")], # can add stationary later
default="moves",
help_text="Determines whether the marquee banner is stationary or rotating. Only rotating works right now.",
required=True
)


class GalleryPhotoBlock(StructBlock):
Expand Down
10 changes: 7 additions & 3 deletions home/templates/home/home_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,13 @@
{% for block in page.featured_articles %}
<div class="row mb-md-4">
{% if block.block_type == "marquee_banner" %}
<div class="w-100">
<marquee onmouseover="this.stop();" onmouseout="this.start();"><strong>{{block.value.body}}</strong></marquee>
</div>
{% if block.value.banner_type == "moves" %}
<div class="w-100">
<marquee onmouseover="this.stop();" onmouseout="this.start();">
<strong>{{block.value.body}}</strong>
</marquee>
</div>
{% endif %}
{% elif block.block_type == "one_column" %}
<div class="featured border-md-bottom pb-1 mb-5 mb-md-0 d-lg-flex">
<div class="col-lg-7">
Expand Down