mirror of
https://github.com/openSUSE/osem.git
synced 2026-08-13 19:54:02 +00:00
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
This commit is contained in:
parent
7acd16f923
commit
f2cdea4f1a
56 changed files with 1191 additions and 1266 deletions
|
|
@ -1,8 +1,11 @@
|
|||
%h1 Edit your profile
|
||||
.row
|
||||
.col-md-12
|
||||
= semantic_form_for(@user, url: user_path(@user.id)) do |f|
|
||||
= f.inputs name: 'Profile' do
|
||||
.container
|
||||
.row
|
||||
.col-md-12
|
||||
.page-header
|
||||
%h1 Edit your profile
|
||||
.row
|
||||
.col-md-12
|
||||
= semantic_form_for(@user, url: user_path(@user.id)) do |f|
|
||||
= f.input :name, as: :string
|
||||
= f.input :nickname, as: :string
|
||||
= f.input :affiliation, as: :string,
|
||||
|
|
@ -14,4 +17,4 @@
|
|||
words. Biographies are limited to 150 words.
|
||||
%br
|
||||
%br
|
||||
= f.action :submit, as: :button, label: 'Update', button_html: {class: 'btn btn-primary'}
|
||||
= f.action :submit, as: :button, label: 'Update', button_html: {class: 'btn btn-primary'}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,24 @@
|
|||
%h1
|
||||
= @user.name
|
||||
%h4
|
||||
= @user.biography
|
||||
|
||||
- if @user.events.confirmed.any?
|
||||
%h3
|
||||
= "#{@user.name} presents #{pluralize(@user.events.confirmed.count, 'Event')}:"
|
||||
%ul.list-unstyled
|
||||
- @user.events.confirmed.each do |event|
|
||||
%li
|
||||
%h4
|
||||
= link_to event.title, conference_proposal_path(event.conference.short_title, event.id)
|
||||
%strong
|
||||
at
|
||||
= event.conference.title
|
||||
.container
|
||||
.row
|
||||
.col-md-12
|
||||
.page-header
|
||||
%h1
|
||||
= image_tag(current_user.gravatar_url(size: '48'), title: "Yo #{current_user.name}!", :alt => '')
|
||||
= @user.name
|
||||
%small
|
||||
= @user.nickname
|
||||
%p
|
||||
= @user.biography
|
||||
.row
|
||||
.col-md-12
|
||||
- if @user.events.confirmed.any?
|
||||
%h3
|
||||
= "#{@user.name} presents #{pluralize(@user.events.confirmed.count, 'Event')}:"
|
||||
%ul.list-unstyled
|
||||
- @user.events.confirmed.each do |event|
|
||||
%li
|
||||
%h4
|
||||
= link_to event.title, conference_proposal_path(event.conference.short_title, event.id)
|
||||
%strong
|
||||
at
|
||||
= event.conference.title
|
||||
Loading…
Add table
Add a link
Reference in a new issue