Commit graph

142 commits

Author SHA1 Message Date
James Mason
1241d21f93 Provide an opportunity for including conference-specific CSS
There is currently no top-level selector for views that is conference-specific,
so all conferences on one OSEM instance end up sharing all the same CSS.

In order to allow individual conferences to have unique CSS, a class for the
current conference is applied to the <body> tag, and an scss template provided with
an example of conference-specific CSS.
2018-11-06 08:19:01 -08:00
James Mason
3af4dd5aac Move big statistics to a partial 2018-09-27 15:42:08 +02:00
Tyrant Davis
1333641a5f Change css id #publicorprivate to a class id. Upate splashpages/show.html.haml 2018-08-29 21:28:20 -07:00
Tyrant Davis
d3ce401cba Indicate if spalshpage is marked as public or not. 2018-08-29 21:28:20 -07:00
Stella Rouzi
9f3c0eff5d Add surveys; custom generated by admins
Available during registration or after conference

Co-authored-by: Shyukri <shshyukriev@suse.com>
Co-authored-by: Henne <hvogel@opensuse.org>
Co-authored-by: Moises <mdeniz@suse.com>
2018-07-03 08:46:15 +03:00
James Mason
4ecf078db6 Consistent, concise styling of datables
Add a semantic class to aggregate bootstrap classes and consistently
applyt them to all datatables.
2018-07-02 09:56:51 -06:00
Astradeni
7fa007d621 resolving conflict in conferences/_tickets
Added in css .word_break and applied it in conferences/_tickets
2018-06-14 11:42:58 -07:00
James Mason
9e10678542 Clean up rating partials 2018-03-14 18:00:37 -07:00
James Mason
f062f7f4ee Reduce deprecation warnings 2018-03-15 01:20:57 +01:00
AnkushMalik
ed21986cf1 Fix oauth btn alignment
Use flex for alignment of btn grp

Closes #1931
2018-01-31 09:56:05 -08:00
Naman Gupta
8e91f51940 Removed .css from .css.scss from files which were causing deprecation warning 2018-01-11 11:38:39 -08:00
Jan-Frederik Rieckers
e1e0bdb4fc Add possibility to link to mastodon 2018-01-06 18:55:27 +01:00
James Mason
29a640a267 Remove overlap in breakpoints 2017-12-22 10:48:55 -08:00
James Mason
a7fce677fc
Add reCAPTCHA support to registration.
Because I *hate* spam bots.
2017-11-03 20:36:57 -07:00
AEtherC0r3
7eea930269 Implement track scheduling
Add track association to schedule
Show schedules in admin sidebar to track organizers
Allow track organizers to manage the schedules of their tracks
Don't allow self-organized track events to be dragged or unscheduled in
a conference schedule
Make scheduled events of self-organized tracks appear semitransparent in
conference schedules
Make the rooms of confirmed self_organized tracks appear semitransparent
and don't allow events to be scheduled to it in the conference schedules
during the dates of its track
Create admin/SchedulesController#new action
Add a button in admin/Schedules#index to create schedules for tracks
Add self_organized scope to Track
Modify Schedules#show to handle track schedules and show a unified
schedule
Allow track organizers to create new schedules for their tracks
Correctly identify scheduled and unscheduled events in Schedules#events
Fix Event#room and Event#time for when the event is scheduled in a track
schedule
Modify Program#selected_event_schedules to include the event_schedules
of selected track schedules
Modify Track#revoke_role_and_cleanup to destroy the track's schedules
and revert its events' state to new
Add tabs for conference and track schedules in admin/Schedules#index
Add button to Create/Show a tracks schedule in Tracks#index and #show
Fix concurrent_events in application_helper because of changes in
Program#selected_event_schedules
Do not take into account cfp_active in Event#valid_track
Modify EventsController#get_tracks accordingly
Enforce cfp_active of track to be enabled for proposals in
ProposalsController#create and #update
Add support for multiple schedules per track
Add selected_schedule_id to Track
Load EventSchedules of selected track schedules for conference schedules
in admin/SchedulesController#show
Modify SchedulesController#show to take into account only the selected
track schedules
Create Event#selected_schedule_id and use it in Event#scheduled? and
Event#time
Validate that an EventSchedule for an event of a self-organized track
belongs to one of the track's schedules
Add 'Manage' button in Tracks#index, #show that sends you to the admin
side of things
Add admin/TracksController#update_selected_schedule to update the
selected_schedule_id of tracks
2017-08-26 00:31:44 +03:00
siddhantbajaj
4b735cff69 Added qr code
Added qr code on ticket pdf and ticket show page.
2017-08-21 16:49:50 +05:30
nikhilgupta1211
d0a9610992 Made Sidebar collapsible for small screens
Added a hamburger button in _admin_html.haml for navbar collapse

Fixes #853
2017-08-21 12:52:33 +03:00
Wexpo Lyu
033dbe4c40 Fix the dropdown to get enough bottom padding. 2017-08-07 13:41:10 +03:00
Moisés Déniz Alemán
121192d21a Merge branch 'master' into ticket-show-page 2017-07-18 12:04:21 +02:00
Svante
f9d8c9715c Add bootstrap styling to sign in form
Add class `.form-control` to inputs and remove additional width styling
2017-07-15 16:15:01 +03:00
siddhantbajaj
c5db5dba1e Ticket show page 2017-07-12 14:49:02 +05:30
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
gotens1211
9c2a09eaf2 changed dropdown for small devices 2017-03-11 08:48:21 +05:30
gotens1211
db2d776c3b Sign in Ui improved in mobile
hover fix for sign_in btn

improved osem-navbar.css.scss

removed class black
2017-03-08 21:20:11 +05:30
hitman
226d16dc63 fix markdown issue 2017-03-06 20:57:04 +05:30
Eugene Dubinin
ff9ca4a817 implements configurable schedule granularity and improves the schedule grid for denser schedule grids on smaller screens 2017-01-31 16:24:45 +02:00
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe
Online payment feature - direct stripe integration
2016-08-18 16:04:11 +02:00
Stella Rouzi
86ba2d005e Merge pull request #1019 from nishanthvijayan/changelog
Changelog/Revision History page
2016-08-15 14:16:12 +03:00
Rishabh Saxena
922440fb77 improve payment view styling 2016-08-15 10:59:35 +05:30
Rishabh Saxena
ab262ecb46 add payment views and styling 2016-08-15 10:59:34 +05:30
Christian Bruckmayer
72531c799a Merge pull request #1125 from Ana06/schedule-tags
Schedule tags improved
2016-08-12 11:53:05 +02:00
Nishanth Vijayan
a45e537bac Setup basic Revision History page
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
2016-08-12 13:35:56 +05:30
Christian Bruckmayer
3b1a474ee0 Merge pull request #1094 from Ana06/schedule-versioning
Schedule versioning
2016-08-12 09:56:31 +02:00
Ana
d1392c1cba Restore css removed
Restore css which was removed in https://github.com/openSUSE/osem/pull/1132 as it is used in the public schedule.
2016-08-12 01:23:54 +02:00
Ana
0e9b8b598f Use jquery-ui-rails gem 2016-08-11 15:11:27 +02:00
Ana
dfd64a4510 Integrate the schedule in the admin interface
Integrate the schedule in the admin interface while adapting it to the new associations and models.
2016-08-11 15:06:52 +02:00
Ana
96337ed081 Make the whole event panel clickable in all events
Make the whole event panel clickable in all events in the public schedule. It didn't work properly when having links inside the panel.

It also works with ctrl + click openning the event page in a new tab.
2016-08-11 11:19:05 +02:00
Ana
7f3ee13358 Schedule tags improved
Schedule tags introduced in https://github.com/openSUSE/osem/pull/1082
improved.
2016-08-07 21:49:35 +02:00
Nishanth Vijayan
a071d4497b Handle cancelation of scheduled events 2016-07-25 17:34:06 +05:30
Henne Vogelsang
63750345e7 Merge pull request #1032 from Ana06/all-events
All events grouped by date and time
2016-07-25 11:47:28 +02:00
Ana
6d9eabcc0e All events moved to a different controller method
All events moved to a different controller method and css changed to put together things with the same css attributes.
2016-07-25 11:33:30 +02:00
Ana
24364d0136 _all_events hamlfy
_all_events changed to haml and margins moved inside the content of bootstrat cols
2016-07-25 11:33:29 +02:00
Ana
70f30fcb1f Dropdown with date tags in all events
Dropdown with date tags in all events of the schedule
2016-07-25 11:33:28 +02:00
Ana
cc031b9f3a Unscheduled events added to all events
Unscheduled events added to all events of the schedule
2016-07-25 11:33:28 +02:00
Ana
69043e1549 All events grouped by date and time
The events are ordered by date and time in the all events section of the schedule. The event schdule definition in program has been changed to order the events.
2016-07-25 11:33:25 +02:00
Ana
540e19e015 unused css removed
osem-admin was not included in application.css neither in any other place, so it is not used. Some .css from osem-schedule-print do no exit since we merged https://github.com/openSUSE/osem/pull/1030
2016-07-14 12:31:04 +02:00
Henne Vogelsang
ff025a4839 Fix the venue display on splash 2016-06-30 17:31:11 +02:00
Henne Vogelsang
5a0328842e Merge branch 'venue-splash-page' of https://github.com/arun1595/osem into arun1595-venue-splash-page 2016-06-30 13:04:28 +02:00
Henne Vogelsang
5d5ad9348c Merge pull request #1034 from Ana06/statistic
Statistics
2016-06-30 12:25:59 +02:00
Ana
028d430885 Schedule height fits a 600px screen and the schedule is hiden if there is only one room 2016-06-27 18:24:47 +02:00