Commit graph

40 commits

Author SHA1 Message Date
Jimmy
bafeca7ab9
[fix]Remove duplicate code 2021-04-22 01:24:14 +08:00
Jimmy
24d2fa89a8
[style]Remove unused code 2021-04-19 19:23:41 +08:00
Jimmy
ab15a3fb10
[refractor]Use ? methods instead of boolean variables; rename happening_next? to happening_later? 2021-04-17 08:30:07 +08:00
Jimmy
2f8cee3c4f
[feat]Splashpage will display happening next event if no event is happening now 2021-04-17 00:00:52 +08:00
Jimmy
b7fbba162b [refactor]Move constants to configuration file 2021-04-12 14:01:49 +08:00
Jimmy
346f324bef [feat]Display happening now only if program is also displayed 2021-04-10 00:44:42 +08:00
Jimmy
3c7cc6cfdb [feat]Use Ajax for paginating happening_now 2021-04-09 17:16:16 +08:00
Jimmy
185b2773d7 [feat]Add bootstrap style to pagination navbar 2021-04-09 16:33:39 +08:00
madhekare
228ec4a650 items per page 2021-04-07 21:26:31 -07:00
madhekare
c9c31d6db5 pagination 2021-04-07 21:07:24 -07:00
madhekare
77b6dac6a2 pagination happening now 2021-04-07 20:56:03 -07:00
Jimmy
eda0c1a175 [feat] Display happening now events in splashpage 2021-04-07 10:34:49 +08:00
Jimmy
9bfe64c28f [temp]Ajax request of happening now JSON in progress 2021-04-05 15:07:18 +08:00
Michael Ball
d1ca21f479 Merge OSEM updates 2021-03-08 02:50:27 -08:00
Sasi Olin
56838b6eb0 Don't set venue related values without a venue 2021-03-07 10:19:10 +01:00
Sasi Olin
d540092bfc
Add icalendar files (fixes #2147) 2021-03-06 21:18:39 +01:00
Espartaco Palma
490ea3c4b4
DRY on controllers/conferences_controller
Conferences.incoming is defined on the model as scope:

  scope :upcoming, (-> { where('end_date >= ?', Date.current) })
Conference.past

  scope :past, (-> { where('end_date < ?', Date.current) })
2021-03-06 19:00:47 +01:00
Espartaco Palma
e7452a9d31
Use New Install within their own template
It used to be a partial inside #index, but having their own page
yields some extra benefits:

- Performance: Move logic from the view to the controller
  - Theres' no need to go extra steps inside the :index view
- UI: Remove the extra 'Upcoming Conferences' when the system needs
  to start the flow of the creation of the first user
2021-03-06 03:58:32 +01:00
Michael Ball
1964522f49 Add warnings when a user needs to register or complete a purchase 2020-07-11 01:50:17 -07:00
Michael Ball
4306fbe636 Merge branch 'master' into admin-ticketing
* master: (61 commits)
  Replace more Commercials with Materials
  Rename more commericals to materials
  UI -- Repalce "Commerials" with "Materials".
  Re-order Conference Associations
  Cleanup CSS add Snap! style block attachments
  hide venue link if there is no venue link
  No dropshadow
  Text with drop shadow for now
  Tidy up the look of lodging panels
  Show reg status for tickets.
  Tweak CSS, fix loding order
  Move the venue description to below the map.
  Update lodging styling. Add description for venu when map is shown.
  CSS tweaks...
  Make the edit form not so wide.
  Support markdown in more fields
  Cleanup CSS ordering, fix coloring for navdropdowns
  dumb...fix order of link_to args
  ARRRGHHH, another typo...same line...
  fix typo
  ...
2020-02-06 01:37:38 -08:00
Michael Ball
7586112f72 Merge master 2020-02-06 01:20:11 -08:00
Michael Ball
350371f79d Tweak CSS, fix loding order 2020-01-07 23:58:25 -08:00
Jesus Castello
ee50f25d46 Show old conferences in descending order
It is more likely that users look for recent conferences.

Fixes https://github.com/openSUSE/osem/issues/2331
2019-03-07 16:13:53 +01:00
James Mason
26f0377c76
Add (admin-only) tickets via 'visibile' attribute [migration]
(cherry picked from commit ce0db3d7a736e7bcde480721986dbfb4a82aa083)
2018-12-28 16:54:02 -08:00
James Mason
2785c3ab6d Raise handled error when conference not found
The current codebase will end in a 500 APPLICATION ERROR if Conference#short_title isn't found... this should be a 404 NOT FOUND INSTEAD, which will be handled if we raise ActiveRecord::RecordNotFound.
2018-11-06 08:18:35 -08:00
robotscissors
d53cc3b436 Add support for twitter cards and facebook shares
Added missing image url as well as created twitter card.
validated both with twitter validator and facebook validator.
All passed.

Need to check to see if no image is selected, what is outcome.
2018-05-24 16:42:31 -07:00
Zach Kemp
7d5d935a65 optimize queries 2018-05-09 10:07:08 -07:00
James Mason
6d31dfeef4 Add frozen_string_literal magic comment
re: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/FrozenStringLiteralComment
2018-05-09 06:54:26 -07:00
kostino
69de418ccd Add call for booths in cfp section in conference splashpage(conferences#show),modified after the design changes 2018-03-27 07:51:06 -07:00
James Mason
63515cef58 Change Conference#show to load sponsors
Caching on sponsorship levels alone is not changing; as a bonus the sponsor
modals are simplified a little.
2018-02-05 11:04:09 -08:00
Marie-Elise
5d816f934a Corrected formatting errors. 2018-01-17 19:18:39 -08:00
Marie-Elise
afff7e1c66 Refactored condition to check if splashpage is present. 2018-01-17 19:18:39 -08:00
Marie-Elise
34af9b840b Added condition to check for existing splashpage. Will redirect user if splashpage is not found. 2018-01-17 19:18:39 -08:00
James Mason
fa55224163 Break up the one-query-of-doom
The single query was producing a tremendously large ActiveRecord allocation.

While this isn't nearly as cool as one query, it's still a significant
reduction in SQL trips, and now has the bonus of only loading what is
actually going to be displayed.
2017-12-22 10:48:55 -08:00
James Mason
754d201b01 FIXUP fragment caching issues 2017-12-22 10:48:55 -08:00
James Mason
995176ffe5 Fewer queries for for Conference#show
Reduces SQL wait times by >90% on splash pages.
2017-12-22 10:48:55 -08:00
shlok007
835859e350 refactored DomainConstraint and conference_controller_spec
use params id instead of OSEM_HOSTNAME to load conference
2017-08-22 21:18:58 +00:00
shlok007
f4775f8e6a fix access denied error for program in custom domains 2017-08-22 21:18:58 +00:00
shlok007
0ac5d18ef2 route to conference#show for custom domain 2017-08-22 21:18:58 +00:00
richiethomas
daf1f805bd Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController' 2016-09-30 18:49:44 -04:00
Renamed from app/controllers/conference_controller.rb (Browse further)