Commit graph

112 commits

Author SHA1 Message Date
Christian Bruckmayer
aa925f9f75 Hide Submit proposal if iChain is enabled and user is not logged in
because it's not possible to create a user while submitting a proposal when iChain is enabled. User would get
not authorized error message.
2016-05-19 11:49:20 +02:00
Henne Vogelsang
1c7becb69a use :full_conference factory in the conference view specs 2016-05-02 16:06:32 +02:00
Henne Vogelsang
0ad3ff01c3 Use PictureUploader on Lodging 2016-04-27 17:40:23 +02:00
Henne Vogelsang
40023044af Use PictureUploader on Conference 2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f Remove danging :photos table and other photo cruft 2016-04-27 17:40:18 +02:00
Henne Vogelsang
1fdc2f8efe Merge pull request #946 from Shriyanshagro/venue_commercial
Defined Venue has_one Commercial nice new relationship
2016-04-26 14:32:54 +02:00
Aditya Prakash
d662ebd252 Remove sponsorship level from view and test 2016-04-21 21:22:14 +05:30
Shriyansh
f6b5cb03e8 redesigned view of splashpage 2016-04-21 20:21:23 +05:30
Aditya Prakash
8da80f28e2 Add pop up modal for sponsor 2016-04-21 19:51:24 +05:30
Aditya Prakash
af08d843a8 Maintain size of sponsor logos
Places logo on a white background if image is smaller than the given
constrains.
Resizes the logo if image is larger than constrains.
Validation of presence of logo was moved cause file field wasn't getting
marked as required field ('*' thingy) in form.
`- if logo presence` was removed cause logo is mandatory field.
2016-04-21 19:51:24 +05:30
Christian Bruckmayer
647a40be63 Prettify sponsors section 2016-04-21 19:51:24 +05:30
Shriyansh
0ca19ea67a added views for public view on splashpage,venue_edit,venue 2016-04-10 11:57:30 +05:30
Henne Vogelsang
80f63c7263 Switch back to leaflet-rails
The rails-assets version has too many issues with the asset pipeline
2016-04-01 16:15:52 +02:00
CamilleM
c5da563a48 Merge branch 'master' of https://github.com/camillem/osem 2016-03-26 23:37:35 +01:00
CamilleM
d11ea33cf0 Adding .notranslate classes to haml files to have transifex better handling dynamic text. See issue #908 2016-03-26 23:32:43 +01:00
Carlos Coelho
fda08ecdb5 Added email to social media section
related to #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
2016-03-07 09:47:21 -03:00
Henne Vogelsang
33e1c6eae1 Beautify venues#show 2016-03-04 17:05:42 +01:00
Henne Vogelsang
8f42f79423 Merge pull request #769 from hennevogel/gems
Gems: Update MySQL2, switch assets to rails-assets.org
2016-02-18 14:03:35 +01:00
David Sedeño
28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 2016-02-10 15:59:39 +01:00
Henne Vogelsang
09ec76a130 Switch javascript assets to rails-assets.org 2016-02-08 13:53:06 +01:00
Stella Rouzi
444356fbc7 Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels 2016-02-06 17:42:51 +01:00
David Sedeño
302d45f91a If there are tickets for the conference, not show the msg about the free of charge. fix #745 2016-02-02 21:19:14 +01:00
David Sedeño
3095787aa7 Add title in conference show view. fix #751 2016-01-17 20:49:30 +01:00
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
Stella Rouzi
759aa54689 Syntax style + code groomming 2015-10-06 14:15:38 +03:00
raluka
1de8f979cd Issue #649: Wrong days remaining label when submitting a new proposal 2015-08-27 10:35:43 +02:00
Stella Rouzi
ebadb84f2f Fix longitude latitude order 2015-06-17 22:08:18 +03:00
Björn Geuken
b685628208 Remove superflous condition
We ensured that the event has a track in the condition 3 lines above. Thus
we can remove this one.
2015-05-16 15:00:21 +02:00
Björn Geuken
94bb76f5ec Haml'fy schedule_item partial 2015-05-16 15:00:17 +02:00
Björn Geuken
7309782b05 TypoFix: <span> -> </span> 2015-05-16 14:50:12 +02:00
Björn Geuken
02e6f78153 Handle talks on the scheduler table as links
Previously the link functionality (open in window or tab) of those talks was
done via javascript. Because of that they couldn't be selected via right click
to be opened in a tab, copied or bookmarked.

By embedding the talk items into a link element and adding some css to hide
the link effects, like hover and underline, we get the desired behaviour
without changing it's appearance.
2015-05-15 17:52:51 +02:00
Björn Geuken
93135a6085 Move view for proposals on schedule board into a partial 2015-05-15 17:27:22 +02:00
Björn Geuken
1731625153 Remove superflous span element
At least firefox and chrome doesn't even render it
2015-05-15 17:22:46 +02:00
Björn Geuken
54f86a3212 Replace tabs by whitespaces and fix indentation 2015-05-15 17:20:38 +02:00
Stella Rouzi
e6bb168c5e Refactoring of proposal workflow. Fixes #215 2015-04-16 18:37:31 +03:00
chrisbr
232cc249d4 Implements program section for unscheduled events
close #610
2015-03-09 15:31:06 +01:00
Stella Rouzi
ecfc348ea8 add highlights and fix cfp in splashpage 2015-01-21 17:28:18 +02:00
chrisbr
5446c349c2 Events open now in new tab when clicking in schedule
close #71
2015-01-15 16:28:53 +01:00
Henne Vogelsang
87b1aba1e9 Add conference description to the index view 2014-12-16 15:07:57 +01:00
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +01:00
Henne Vogelsang
ce6ed0a8e9 Get rid of the schedule controller 2014-11-27 14:31:44 +01:00
Henne Vogelsang
c84ebf26e0 Better scroll handling for the venue map 2014-11-27 14:14:59 +01:00
Henne Vogelsang
28063129c7 Implement consistent admin interface
* Consistent route/model/controller/view layout
* Get rid of unused photos, speakers, dietchoices, social_events controllers
* Drop unused :public from Rooms and :description from CallForPapers
2014-11-25 10:47:18 +01:00
Henne Vogelsang
567d8689b8 Make sure an empty splash works 2014-11-21 13:22:20 +01:00
Henne Vogelsang
b6b0c104fd Mobile fixes for the splash 2014-11-20 16:52:55 +01:00
Henne Vogelsang
cb227a0afc Another round of splash design
* Add map to splash
* Reverse venue<->conference relation
* Split venue address into fields
* Don't go through venue for lodgings anymore
2014-11-20 15:39:26 +01:00
Henne Vogelsang
30e8ab856c Get rid of the splashpage banner photo and "descriptions" 2014-11-20 15:39:26 +01:00
Henne Vogelsang
f2cdea4f1a Integrate the splash page into the general layout
* Cleanup the CSS
* Fix more views then you have fingers and toes
* Introduce position(weight) for sponsor levels
* Fix bootstrap/datatable integration
2014-11-17 13:58:27 +01:00
Henne Vogelsang
e65ca7fb58 Get rid of the home controller 2014-11-14 17:24:24 +01:00
Chrisbr
9376fe57e3 Moves sponsor email attribute from conference to contact 2014-11-12 11:16:22 +01:00