gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

font awesome gem updated, validation test added and user show page design updated

Browse source
This commit is contained in:
AnithaPal 2016-09-15 13:30:58 -04:00
parent a2dd90d355
commit 17aa374b99
7 changed files with 136 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/osem.css.scss
View file

@ -90,3 +90,12 @@ p.comment-body {
.changeset{
display: none;
}
.user-profile-icon{
text-align: center;
display: table;
.concat-text{
display: block;
font-size: 14px;
}
}

27
app/views/users/edit.html.haml
View file

@ -16,16 +16,25 @@
hint: 'This could be a company, a user group, or nothing at all.'
= f.input :website_url, type: :url, label: 'Personal Website'
= f.inputs :name => 'Social Media' do
= f.input :linkedin, type: :url
= f.input :twitter, type: :url
= f.input :googleplus, type: :url, label: 'Google+ Url'
= f.input :gnu, type: :url, label: 'GNU Social'
= f.input :diaspora, type: :url
= f.input :linkedin, type: :url, as: :string,
hint: 'e.g. https://linkedin.com/osem'
= f.input :twitter, type: :url, as: :string,
hint: 'e.g. https://twitter.com/osem'
= f.input :googleplus, type: :url, label: 'Google+ Url', as: :string,
hint: 'e.g. https://googleplus.com/798239DR45'
= f.input :gnu, type: :url, label: 'GNU Social', as: :string,
hint: 'e.g. https://gnu.io/osem'
= f.input :diaspora, type: :url, as: :string,
hint: 'e.g http://joindiaspora.com/osem'
= f.inputs :name => 'Social Code' do
= f.input :github, type: :url
= f.input :gitlab, type: :url
= f.input :savannah, type: :url
= f.input :gna, type: :url, label: 'Gna!'
= f.input :github, type: :url, as: :string,
hint: 'e.g http://github.com/osem'
= f.input :gitlab, type: :url, as: :string,
hint: 'e.g http://gitlab.com/osem'
= f.input :savannah, type: :url, as: :string,
hint: 'e.g http://savannah.gnu.org/osem'
= f.input :gna, type: :url, label: 'Gna!', as: :string,
hint: 'e.g http://gna.com/osem'
= f.input :biography, input_html: { rows: 5, data: { provide: 'markdown-editable' }, 'onkeyup' => "word_count(this, 'biography-count', 150)" },
hint: markdown_hint
You have used

119
app/views/users/show.html.haml
View file

@ -7,63 +7,72 @@
= @user.name
%small
= @user.nickname
%h3.text-center
Social Media and Social Code
%ul.list-inline.list-unstyled.text-center
- if @user.website_url.present?
%li
= link_to(@user.website_url) do
%div.user-profile-icon
%icon.fa.fa-external-link.fa-3x
%span.concat-text Blog
- if @user.linkedin.present?
%li
= link_to(@user.linkedin) do
%div.user-profile-icon
%icon.fa.fa-linkedin.fa-3x
%span.concat-text Linkedin
- if @user.twitter.present?
%li
= link_to(@user.twitter) do
%div.user-profile-icon
%icon.fa.fa-twitter.fa-3x
%span.concat-text Twitter
- if @user.googleplus.present?
%li
= link_to(@user.googleplus) do
%div.user-profile-icon
%icon.fa.fa-google-plus.fa-3x
%span.concat-text Google+
- if @user.gnu.present?
%li
= link_to(@user.gnu) do
%div.user-profile-icon
%icon.fa.fa-linux.fa-3x
%span.concat-text Gnu
- if @user.diaspora.present?
%li
= link_to(@user.diaspora) do
%div.user-profile-icon
%icon.fa.fa-asterisk.fa-3x
%span.concat-text Diaspora
- if @user.savannah.present?
%li
= link_to(@user.savannah) do
%div.user-profile-icon
%icon.fa.fa-linux.fa-3x
%span.concat-text Savannah
- if @user.gna.present?
%li
= link_to(@user.gna) do
%div.user-profile-icon
%icon.fa.fa-linux.fa-3x
%span.concat-text Gna!
- if @user.github.present?
%li
= link_to(@user.github) do
%div.user-profile-icon
%icon.fa.fa-github.fa-3x
%span.concat-text Github
- if @user.gitlab.present?
%li
= link_to(@user.gitlab) do
%div.user-profile-icon
%icon.fa.fa-gitlab.fa-3x
%span.concat-text Gitlab
%h3.text-center Bio
%p
= markdown(@user.biography)
.row
.col-md-12
%h3 Social Media and Social Code
%table.table
%tr
%td
%b Website
%td
= @user.website_url.present? ? @user.website_url : '-'
%tr
%td
%b Linkedin
%td
= @user.linkedin.present? ? @user.linkedin : '-'
%tr
%td
%b Twitter
%td
= @user.twitter.present? ? @user.twitter : '-'
%tr
%td
%b GooglePlus
%td
= @user.googleplus.present? ? @user.googleplus : '-'
%tr
%td
%b GNU Social
%td
= @user.gnu.present? ? @user.gnu : '-'
%tr
%td
%b Diaspora
%td
= @user.diaspora.present? ? @user.diaspora : '-'
%tr
%td
%b Savannah
%td
= @user.savannah.present? ? @user.savannah : '-'
%tr
%td
%b Github
%td
= @user.github.present? ? @user.github : '-'
%tr
%td
%b Gitlab
%td
= @user.gitlab.present? ? @user.gitlab : '-'
%tr
%td
%b Gna!
%td
= @user.gna.present? ? @user.gna : '-'
.row
.col-md-12
- if @user.events.confirmed.any?